Merge branch 'main' of https://github.com/john-david3/cs3305-team11
This commit is contained in:
@@ -61,6 +61,11 @@ const ChatPanel: React.FC<ChatPanelProps> = ({ streamId }) => {
|
||||
setMessages((prev) => [...prev, data]);
|
||||
});
|
||||
|
||||
// Handle live viewership
|
||||
socket.on("status", (data: ChatMessage) => {
|
||||
console.log("Live viewership: ", data) // returns dictionary {message: message, num_viewers: num_viewers}
|
||||
})
|
||||
|
||||
// Cleanup function
|
||||
return () => {
|
||||
window.removeEventListener("beforeunload", handleBeforeUnload);
|
||||
|
||||
@@ -25,7 +25,13 @@ def handle_join(data) -> None:
|
||||
stream_id = data.get("stream_id")
|
||||
if stream_id:
|
||||
join_room(stream_id)
|
||||
emit("status", {"message": f"Welcome to the chat, stream_id: {stream_id}"}, room=stream_id)
|
||||
num_viewers = len(list(socketio.server.manager.get_participants("/", stream_id)))
|
||||
emit("status",
|
||||
{
|
||||
"message": f"Welcome to the chat, stream_id: {stream_id}",
|
||||
"num_viewers": num_viewers
|
||||
},
|
||||
room=stream_id)
|
||||
|
||||
|
||||
@socketio.on("leave")
|
||||
@@ -36,7 +42,13 @@ def handle_leave(data) -> None:
|
||||
stream_id = data.get("stream_id")
|
||||
if stream_id:
|
||||
leave_room(stream_id)
|
||||
emit("status", {"message": f"user left room {stream_id}"}, room=stream_id)
|
||||
num_viewers = len(list(socketio.server.manager.get_participants("/", stream_id)))
|
||||
emit("status",
|
||||
{
|
||||
"message": f"Welcome to the chat, stream_id: {stream_id}",
|
||||
"num_viewers": num_viewers
|
||||
},
|
||||
room=stream_id)
|
||||
|
||||
|
||||
@chat_bp.route("/chat/<int:stream_id>")
|
||||
|
||||
@@ -31,7 +31,7 @@ def send_email(username) -> None:
|
||||
<html>
|
||||
<head></head>
|
||||
<body>
|
||||
<b>Thank you for choosing Gander</b>
|
||||
<h1>Thank you for choosing Gander</h1>
|
||||
<p>Your Gander login code is: {login_code}</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user