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

Merge branch 'main' of https://github.com/john-david3/cs3305-team11

Browse Source
This commit is contained in:
white
2025-03-05 13:33:51 +00:00
parent 1bb3f60ec0 b3afdab8a2
commit 30dcddd1fa
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web_server/blueprints/streams.py
View File

@@ -87,7 +87,7 @@ def stream_data(username=None, streamer_id=None) -> dict:
else: else:
data = {"stream_key": stream_key["stream_key"]} data = {"stream_key": stream_key["stream_key"]}
return jsonify([data]) return jsonify(data)
# Category Routes # Category Routes
@@ -321,6 +321,7 @@ def update_stream():
# TODO: Add thumbnails (paths) to table, allow user to update thumbnail # TODO: Add thumbnails (paths) to table, allow user to update thumbnail
print("Updating stream info", flush=True) print("Updating stream info", flush=True)
print(request.is_json, flush=True)
data = request.get_json() data = request.get_json()
stream_key = data.get("key") stream_key = data.get("key")

2
web_server/celery_tasks/preferences.py
View File

@@ -24,7 +24,7 @@ def user_preferences():
# Retrieves category associated with stream # Retrieves category associated with stream
current_category = db.fetchone("""SELECT category_id FROM streams current_category = db.fetchone("""SELECT category_id FROM streams
WHERE user_id = ? WHERE user_id = ?
""", (stream_id)) """, (stream_id,))
# If stream is still live then update the user_preferences table to reflect their preferences # If stream is still live then update the user_preferences table to reflect their preferences
if current_category: if current_category:
db.execute("""INSERT INTO user_preferences (user_id,category_id,favourability) db.execute("""INSERT INTO user_preferences (user_id,category_id,favourability)