From 9e665318c04003ae213769ae7713b8a932199d82 Mon Sep 17 00:00:00 2001 From: Chris-1010 <122332721@umail.ucc.ie> Date: Wed, 5 Mar 2025 17:35:28 +0000 Subject: [PATCH] FIX: Celery preferences task using Redis Co-authored-by: JustIceO7 --- frontend/src/components/Stream/ChatPanel.tsx | 10 +++++----- web_server/blueprints/chat.py | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/Stream/ChatPanel.tsx b/frontend/src/components/Stream/ChatPanel.tsx index 550eb46..0a8ddec 100644 --- a/frontend/src/components/Stream/ChatPanel.tsx +++ b/frontend/src/components/Stream/ChatPanel.tsx @@ -36,7 +36,7 @@ const ChatPanel: React.FC = ({ streamId, onViewerCountChange }) if (socket && isConnected) { // Add username check socket.emit("join", { - userId: userId ? userId : null, + user_id: userId ? userId : null, username: username ? username : "Guest", stream_id: streamId, }); @@ -44,7 +44,7 @@ const ChatPanel: React.FC = ({ streamId, onViewerCountChange }) // Handle beforeunload event const handleBeforeUnload = () => { socket.emit("leave", { - userId: userId ? userId : null, + user_id: userId ? userId : null, username: username ? username : "Guest", stream_id: streamId, }); @@ -83,7 +83,7 @@ const ChatPanel: React.FC = ({ streamId, onViewerCountChange }) // Update our subscription tracking subscribedUsersRef.current[data.chatter_username] = true; } - + setMessages((prev) => [...prev, data]); }); @@ -205,7 +205,7 @@ const ChatPanel: React.FC = ({ streamId, onViewerCountChange }) }} alt="User Avatar" className="w-full h-full object-cover" - style={{ width: "2.5em", height: "2.5em", backgroundColor: 'white' }} + style={{ width: "2.5em", height: "2.5em", backgroundColor: "white" }} /> @@ -268,4 +268,4 @@ const ChatPanel: React.FC = ({ streamId, onViewerCountChange }) ); }; -export default ChatPanel; \ No newline at end of file +export default ChatPanel; diff --git a/web_server/blueprints/chat.py b/web_server/blueprints/chat.py index 402bb27..45e6a18 100644 --- a/web_server/blueprints/chat.py +++ b/web_server/blueprints/chat.py @@ -24,10 +24,9 @@ def handle_join(data) -> None: """ Allow a user to join the chat of the stream they are watching. """ - print(data, flush=True) stream_id = data.get("stream_id") if stream_id: - user_id = get_user_id(data["username"]) + user_id = data["user_id"] if user_id: add_favourability_entry(str(user_id), str(stream_id)) join_room(stream_id) @@ -46,13 +45,12 @@ def handle_leave(data) -> None: """ Handle what happens when a user leaves the stream they are watching in regards to the chat. """ - print(data, flush=True) stream_id = data.get("stream_id") user_id = data.get("user_id") if stream_id: leave_room(stream_id) if user_id: - remove_favourability_entry(data["user_id"], stream_id) + remove_favourability_entry(str(data["user_id"]), str(stream_id)) num_viewers = len(list(socketio.server.manager.get_participants("/", stream_id))) update_viewers(stream_id, num_viewers) emit("status",