Update tags when changed through message

src/channel/Channel.ts

@@ -1049,7 +1049,7 @@ export class Channel extends EventEmitter {
      * @param part Participant to give crown to (or undefined to drop crown)
      */
     public chown(part?: IParticipant, admin = false) {
-        this.logger.debug("chown called");
+        // this.logger.debug("chown called");
         if (part) {
             this.giveCrown(part, admin);
         } else {

src/event/behaviors.ts

@@ -83,5 +83,11 @@ export function loadBehaviors() {
         }
     });
 
+    bus.on("user data update", user => {
+        for (const ch of ChannelList.getList()) {
+            ch.emit("user data update", user);
+        }
+    });
+
     bus.emit("ready");
 }

src/util/tags.ts

@@ -3,6 +3,7 @@ import { Tag } from "./types";
 import { User } from "@prisma/client";
 import { readUser, updateUser } from "~/data/user";
 import { ChannelList } from "~/channel/ChannelList";
+import { bus } from "~/event/bus";
 
 export const builtinTags = ConfigManager.loadConfig<Record<string, Tag>>(
     "config/tags.yml",
@@ -35,11 +36,7 @@ export const builtinTags = ConfigManager.loadConfig<Record<string, Tag>>(
 );
 
 function propogateUser(user: User) {
-    const channelList = ChannelList.getList();
+    bus.emit("user data update", user);
-
-    for (const ch of channelList) {
-        ch.emit("user data update", user);
-    }
 }
 
 export async function setBuiltinTag(userId: string, tagId: string) {

src/util/types.d.ts

@@ -328,6 +328,11 @@ declare interface IncomingSocketEvents {
         m: "eval";
         str: string;
     };
+
+    remove_tag: {
+        m: "remove_tag";
+        _id: string;
+    };
 }
 
 declare interface OutgoingSocketEvents {

src/ws/Socket.ts

@@ -43,7 +43,7 @@ import {
     validatePermission
 } from "~/data/permissions";
 import { getRoles } from "~/data/role";
-import { setTag } from "~/util/tags";
+import { removeTag, setTag } from "~/util/tags";
 import { bus } from "~/event/bus";
 import { notificationConfig } from "~/util/notificationConfig";
 
@@ -812,10 +812,18 @@ export class Socket extends EventEmitter {
      * @param text Text of the tag
      * @param color Color of the tag
      **/
-    public setTag(text: string, color: string) {
+    public async setTag(text: string, color: string) {
         //logger.debug("Setting tag:", text, color);
         if (!this.user) return;
-        setTag(this.user.id, { text, color });
+        await setTag(this.user.id, { text, color });
+    }
+
+    /**
+     * Remove this socket's user's tag
+     */
+    public async removeTag() {
+        if (!this.user) return;
+        await removeTag(this.user.id);
     }
 
     /**

src/ws/events/admin/handlers/remove_tag.ts

@@ -0,0 +1,21 @@
+import { ChannelList } from "~/channel/ChannelList";
+import { readUser, updateUser } from "~/data/user";
+import { removeTag } from "~/util/tags";
+import { ServerEventListener } from "~/util/types";
+import { findSocketsByUserID } from "~/ws/Socket";
+
+export const remove_tag: ServerEventListener<"remove_tag"> = {
+    id: "remove_tag",
+    callback: async (msg, socket) => {
+        // Change someone else's tag
+        const id = msg._id;
+
+        if (typeof id !== "string") return;
+
+        // Check if user exists
+        const user = await readUser(msg._id);
+        if (!user) return;
+
+        await removeTag(msg._id);
+    }
+};

src/ws/events/admin/handlers/tag.ts

@@ -1,34 +1,29 @@
-import { ChannelList } from "~/channel/ChannelList";
+import { readUser } from "~/data/user";
-import { readUser, updateUser } from "~/data/user";
+import { Logger } from "~/util/Logger";
+import { setTag } from "~/util/tags";
 import { ServerEventListener } from "~/util/types";
-import { findSocketsByUserID } from "~/ws/Socket";
+
+const logger = new Logger("tag");
 
 export const tag: ServerEventListener<"tag"> = {
     id: "tag",
     callback: async (msg, socket) => {
-        // Change someone else's tag
+        // Remove someone else's tag
         const id = msg._id;
         const tag = msg.tag;
 
         if (typeof id !== "string") return;
+
+        // Validate tag info
         if (typeof tag !== "object") return;
-        if (typeof tag["text"] !== "string") return;
+        if (typeof tag.text !== "string") return;
         if (typeof tag.color !== "string") return;
-        if (!tag.color.match(/^#[0-9a-f]{6}$/i)) return;
+        //if (!tag.color.match(/^#[0-9a-f]{6}$/i)) return;
 
         const user = await readUser(msg._id);
         if (!user) return;
 
         user.tag = JSON.stringify(tag);
-        await updateUser(id, user);
+        await setTag(id, tag);
-
-        const toUpdate = findSocketsByUserID(id);
-        toUpdate.forEach(s => {
-            s.setTag(msg.tag.text, msg.tag.color);
-        });
-
-        for (const ch of ChannelList.getList()) {
-            ch.emit("user data update", user);
-        }
     }
 };

src/ws/events/admin/index.ts

@@ -11,6 +11,7 @@ import { forceload } from "./handlers/forceload";
 import { move } from "./handlers/move";
 import { name } from "./handlers/name";
 import { notification } from "./handlers/notification";
+import { remove_tag } from "./handlers/remove_tag";
 import { rename_channel } from "./handlers/rename_channel";
 import { restart } from "./handlers/restart";
 import { setcolor } from "./handlers/setcolor";
@@ -39,7 +40,8 @@ EVENT_GROUP_ADMIN.addMany(
     forceload,
     unforceload,
     setcolor,
-    setname
+    setname,
+    remove_tag
 );
 
 eventGroups.push(EVENT_GROUP_ADMIN);