dylan/gander
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UPDATE: Display altered message in chat when sent by streamer;

Browse Source 
FIX: Chat order;
FIX: `num_viewers` display on `HomePage`;
FIX: Remove ability for streamer to follow themselves;
This commit is contained in:
Chris-1010
2025-03-06 22:40:21 +00:00
parent 555aedffcb
commit 9c44dfe598
4 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web_server/blueprints/chat.py
View File

@@ -76,9 +76,10 @@ def get_past_chat(stream_id: int):
# fetched in format: [(username, message, time_sent, is_subscribed)]
all_chats = db.fetchall("""
SELECT username, message, time_sent, is_subscribed
SELECT user_id, username, message, time_sent, is_subscribed
FROM (
SELECT
u.user_id,
u.username,
c.message,
c.time_sent,
@@ -95,11 +96,13 @@ def get_past_chat(stream_id: int):
) subquery
ORDER BY time_sent ASC;
""", (stream_id, stream_id))
#! ASC - Oldest to Newest
db.close_connection()
# Create JSON output of chat_history to pass through NGINX proxy
chat_history = [{"chatter_username": chat["username"],
chat_history = [{"chatter_id": chat["user_id"],
"chatter_username": chat["username"],
"message": chat["message"],
"time_sent": chat["time_sent"],
"is_subscribed": bool(chat["is_subscribed"])} for chat in all_chats]

2
web_server/utils/recommendation_utils.py
View File

@@ -100,7 +100,7 @@ def get_user_category_recommendations(user_id = 1, no_categories: int = 4) -> Op
"""
with Database() as db:
categories = db.fetchall("""
SELECT categories.category_id, categories.category_name
SELECT categories.category_id, categories.category_name, categories.num_viewers
FROM categories
JOIN user_preferences ON categories.category_id = user_preferences.category_id
WHERE user_preferences.user_id = ?