Merge branch 'master' into feat/phrases

destinygg · Sep 13, 2023 · d354748 · d354748
2 parents dbada19 + 71f205d
commit d354748
Show file tree

Hide file tree

Showing 40 changed files with 2,958 additions and 2,278 deletions.
diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml
@@ -17,7 +17,7 @@ jobs:
   bump-and-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/formatting-and-lint.yml b/.github/workflows/formatting-and-lint.yml
@@ -7,7 +7,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/assets/chat/css/style.scss b/assets/chat/css/style.scss
@@ -335,6 +335,17 @@ hr {
   .hidden {
     display: none !important;
   }
+
+  .embed-button {
+    position: relative;
+    top: 2.5px;
+    margin-left: $gutter-sm;
+    margin-right: $gutter-xs;
+    opacity: 0.5;
+    &:hover {
+      opacity: 1;
+    }
+  }
 }
 
 /* Base ChatUserMessage */
@@ -909,7 +920,10 @@ hr {
   .combo,
   .count,
   .x {
-    text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000,
+    text-shadow:
+      -1px -1px 0 #000,
+      1px -1px 0 #000,
+      -1px 1px 0 #000,
       1px 1px 0 #000;
   }
   .combo {

diff --git a/assets/chat/js/autocomplete.js b/assets/chat/js/autocomplete.js
@@ -85,7 +85,7 @@ class ChatAutoComplete {
     /** @member jQuery */
     this.ui = $(`<div id="chat-auto-complete"><ul></ul></div>`);
     this.ui.on('click', 'li', (e) =>
-      this.select(parseInt(e.currentTarget.getAttribute('data-index'), 10))
+      this.select(parseInt(e.currentTarget.getAttribute('data-index'), 10)),
     );
     this.container = $(this.ui[0].firstElementChild);
     this.buckets = new Map();
@@ -111,7 +111,7 @@ class ChatAutoComplete {
       if (keycode === KEYCODES.TAB) {
         if (this.results.length > 0)
           this.select(
-            this.selected >= this.results.length - 1 ? 0 : this.selected + 1
+            this.selected >= this.results.length - 1 ? 0 : this.selected + 1,
           );
         e.preventDefault();
         e.stopPropagation();
@@ -192,7 +192,7 @@ class ChatAutoComplete {
         .filter(
           (a) =>
             (!a.isemote || !(criteria.useronly || useronly)) &&
-            regex.test(a.data)
+            regex.test(a.data),
         )
         .sort(sortResults)
         .slice(0, maxResults);
@@ -239,7 +239,7 @@ class ChatAutoComplete {
 
     const pre = this.criteria.orig.substr(0, this.criteria.startCaret);
     let post = this.criteria.orig.substr(
-      this.criteria.startCaret + this.criteria.word.length
+      this.criteria.startCaret + this.criteria.word.length,
     );
 
     // always add a space after our completion if there isn't one since people