chat: implement message tags, closes #57

u-wave · Feb 14, 2021 · fe914f9 · fe914f9
1 parent 28f6e0a
commit fe914f9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/SocketServer.js b/src/SocketServer.js
@@ -147,7 +147,11 @@ class SocketServer {
     this.clientActions = {
       sendChat: (user, message) => {
         debug('sendChat', user, message);
-        this.uw.chat.send(user, message);
+        if (typeof message === 'string') {
+          this.uw.chat.send(user, { message });
+        } else {
+          this.uw.chat.send(user, message);
+        }
       },
       vote: (user, direction) => {
         socketVote(this.uw, user.id, direction);
@@ -162,7 +166,18 @@ class SocketServer {
 
     this.clientActionSchemas = new Map();
     this.clientActionSchemas.set('sendChat', ajv.compile({
-      type: 'string',
+      oneOf: [{
+        type: 'string',
+      }, {
+        type: 'object',
+        properties: {
+          message: { type: 'string' },
+          tags: {
+            type: 'object',
+          },
+        },
+        required: ['message'],
+      }],
     }));
     this.clientActionSchemas.set('vote', ajv.compile({
       type: 'integer',

diff --git a/src/plugins/chat.js b/src/plugins/chat.js
@@ -48,17 +48,30 @@ class Chat {
     return message.slice(0, this.options.maxLength);
   }
 
-  async send(user, message) {
+  async send(user, { message, tags }) {
+    const { acl } = this.uw;
+
     if (await this.isMuted(user)) {
       return;
     }
 
+    const filteredTags = {};
+    if (tags && Object.keys(tags).length > 0) {
+      const permissions = await acl.getAllPermissions(user);
+      Object.entries(tags).forEach(([tagName, value]) => {
+        if (permissions.includes(`chat.tags.${tagName}`)) {
+          filteredTags[tagName] = value;
+        }
+      });
+    }
+
     this.chatID += 1;
 
     this.uw.publish('chat:message', {
       id: `${user.id}-${this.chatID}`,
       userID: user.id,
       message: this.truncate(message),
+      tags: filteredTags,
       timestamp: Date.now(),
     });
   }