Merge pull request #45 from BP602/fix/7tv-cosmetics-subscription-id

fix(7tv): use correct user ID for cosmetic subscriptions

Author: BP602

src/renderer/src/providers/ChatProvider.jsx

@@ -1908,6 +1908,12 @@ const useChatStore = create((set, get) => ({
         useCosmeticsStore?.getState()?.addUserStyle(transformedUsername, body);
         break;
       }
+      case "entitlement.delete": {
+        const username = body?.object?.user?.connections?.find((c) => c.platform === "KICK")?.username;
+        const transformedUsername = username?.replaceAll("-", "_").toLowerCase();
+        useCosmeticsStore?.getState()?.removeUserStyle(transformedUsername, body);
+        break;
+      }
       default:
         break;
     }

src/renderer/src/providers/CosmeticsProvider.jsx

@@ -35,6 +35,50 @@ const useCosmeticsStore = create((set, get) => ({
     });
   },
 
+  removeUserStyle: (username, body) => {
+    if (!username) return;
+    const transformedUsername = username.toLowerCase();
+    const refId = body?.object?.ref_id;
+    const kind = body?.object?.kind;
+
+    if (!refId || !kind) return;
+
+    set((state) => {
+      const currentStyle = state.userStyles[transformedUsername];
+      if (!currentStyle) return state;
+
+      // Remove by kind and ref_id
+      let updatedStyle = { ...currentStyle };
+      let hasChanges = false;
+
+      if (kind === "BADGE" && currentStyle.badgeId === refId) {
+        updatedStyle.badgeId = null;
+        hasChanges = true;
+      } else if (kind === "PAINT" && currentStyle.paintId === refId) {
+        updatedStyle.paintId = null;
+        hasChanges = true;
+      }
+
+      if (!hasChanges) return state;
+
+      // If both badge and paint are removed, remove the entire user style entry
+      if (!updatedStyle.badgeId && !updatedStyle.paintId) {
+        const { [transformedUsername]: removed, ...restUserStyles } = state.userStyles;
+        return { userStyles: restUserStyles };
+      }
+
+      return {
+        userStyles: {
+          ...state.userStyles,
+          [transformedUsername]: {
+            ...updatedStyle,
+            updatedAt: new Date().toISOString(),
+          },
+        },
+      };
+    });
+  },
+
   getUserStyle: (username) => {
     if (!username) return null;
     const transformedUsername = username.toLowerCase();

utils/services/connectionManager.js

@@ -311,7 +311,7 @@ class ConnectionManager {
       span.addEvent('7tv_websocket_add_start');
       this.stvWebSocket.addChatroom(
         chatroom.id,
-        chatroom.streamerData.id, // Use the Kick channel ID for cosmetic/entitlement subscriptions
+        chatroom.streamerData.user_id, // Use the correct Kick user ID for cosmetic/entitlement subscriptions
         stvId,
         stvEmoteSetId
       );
@@ -591,7 +591,7 @@ class ConnectionManager {
 
     this.stvWebSocket.addChatroom(
       chatroom.id,
-      chatroom.streamerData?.id,
+      chatroom.streamerData?.user_id,
       stvId,
       stvEmoteSetId,
     );

utils/services/seventv/sharedStvWebSocket.js

@@ -615,12 +615,13 @@ class SharedStvWebSocket extends EventTarget {
             break;
 
           case "entitlement.create":
+          case "entitlement.delete":
             if (body.kind === 10) {
               this.dispatchEvent(
                 new CustomEvent("message", {
                   detail: {
                     body,
-                    type: "entitlement.create",
+                    type: type, // Use the actual event type (create or delete)
                     chatroomId,
                   },
                 }),