Merge branch 'master' into reload-users-cmd

destinygg · Apr 18, 2024 · e77af14 · e77af14
2 parents e7ba647 + 60e0445
commit e77af14
Show file tree

Hide file tree

Showing 6 changed files with 630 additions and 491 deletions.
diff --git a/assets/chat/js/autocomplete.js b/assets/chat/js/autocomplete.js
@@ -39,7 +39,7 @@ function buildSearchCriteria(str, offset) {
   if (endCaret > -1) post = post.substring(0, endCaret);
 
   // Ignore the first char as part of the search and flag as a user only search
-  if (pre.lastIndexOf('@') === 0) {
+  if (pre.lastIndexOf('@') === 0 || pre.lastIndexOf('>') === 0) {
     startCaret += 1;
     pre = pre.substring(1);
     useronly = true;

diff --git a/assets/chat/js/commands.js b/assets/chat/js/commands.js
@@ -32,7 +32,7 @@ const CHAT_COMMANDS = [
   },
   {
     name: 'broadcast',
-    description: 'Broadcast a message to chat.',
+    description: 'Send a system-wide message to all users present in the chat.',
     admin: true,
   },
   {

diff --git a/assets/chat/js/formatters/MentionedUserFormatter.js b/assets/chat/js/formatters/MentionedUserFormatter.js
@@ -3,7 +3,7 @@ export default class MentionedUserFormatter {
     if (message && message.mentioned && message.mentioned.length > 0) {
       return str.replace(
         new RegExp(
-          `((?:^|\\s)@?)(${message.mentioned.join('|')})(?=$|\\s|[.?!,'])`,
+          `((?:^|\\s)@?|&gt;)(${message.mentioned.join('|')})(?=$|\\s|[.?!,'])`,
           'igm',
         ),
         `$1<span class="chat-user">$2</span>`,

diff --git a/assets/chat/js/regex.js b/assets/chat/js/regex.js