fix: send userProfileId in queue:update

datsmysong · Mar 22, 2024 · 69de807 · 69de807
1 parent aa0bfb2
commit 69de807
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/backend/src/socketio/Room.ts b/backend/src/socketio/Room.ts
@@ -79,7 +79,7 @@ export default class Room {
     }
   }
 
-  async add(rawUrl: string, userProfileId: string) {
+  async add(rawUrl: string) {
     const trackMetadata = this.trackFactory.fromUrl(rawUrl);
     if (trackMetadata !== null) {
       const track = await trackMetadata.toJSON();

diff --git a/backend/src/socketio/RoomIO.ts b/backend/src/socketio/RoomIO.ts
@@ -59,8 +59,8 @@ export default function RoomIO(
     roomSocket.emit("queue:update", Room.toJSON(room));
 
     socket.on("queue:add", async (url: string, userProfileId: string) => {
-      await room.add(url, userProfileId);
-      sendQueueUpdated();
+      await room.add(url);
+      sendQueueUpdated(userProfileId);
     });
 
     // We should check the origin of the request to prevent anyone that isn't the host from removing anything
@@ -94,8 +94,8 @@ export default function RoomIO(
       }
     });
 
-    const sendQueueUpdated = () => {
-      roomSocket.emit("queue:update", Room.toJSON(room));
+    const sendQueueUpdated = (userProfileId?: string) => {
+      roomSocket.emit("queue:update", Room.toJSON(room), userProfileId);
     };
 
     socket.on("player:playTrack", async (trackId) => {

diff --git a/commons/socket.io-types.ts b/commons/socket.io-types.ts
@@ -1,7 +1,7 @@
 import { JSONTrack, PlayingJSONTrack, RoomJSON } from "./backend-types";
 
 export interface ServerToClientEvents {
-  "queue:update": (room: RoomJSON | Error) => void;
+  "queue:update": (room: RoomJSON | Error, userProfileId?: string) => void;
   "player:updatePlaybackState": (
     playbackState: PlayingJSONTrack | null
   ) => void;

diff --git a/expo/components/ActiveRoomView.tsx b/expo/components/ActiveRoomView.tsx
@@ -80,8 +80,8 @@ const ActiveRoomView: React.FC<ActiveRoomViewProps> = ({ room }) => {
       setLiveRoom(data);
     });
 
-    socket.on("queue:update", (data: RoomJSON) => {
-      setLiveRoom(data);
+    socket.on("queue:update", (room: RoomJSON, userProfileId: string) => {
+      setLiveRoom(room);
     });
   }, [socket]);