diff --git a/tlapbot/owncast_helpers.py b/tlapbot/owncast_helpers.py index c727e25..a6e5009 100644 --- a/tlapbot/owncast_helpers.py +++ b/tlapbot/owncast_helpers.py @@ -121,6 +121,7 @@ def remove_duplicate_usernames(db, user_id, username): # # # misc. stuff # # # +# This is now unused since rawBody attribute of the webhook now returns cleaned-up emotes. def remove_emoji(message): return sub( r'(:.*?:)', diff --git a/tlapbot/owncast_webhooks.py b/tlapbot/owncast_webhooks.py index aaaab05..b5038d4 100644 --- a/tlapbot/owncast_webhooks.py +++ b/tlapbot/owncast_webhooks.py @@ -36,22 +36,23 @@ def owncast_webhook(): user_id = data["eventData"]["user"]["id"] display_name = data["eventData"]["user"]["displayName"] current_app.logger.debug(f'New chat message from {display_name}:') + current_app.logger.debug(f'{data["eventData"]["rawBody"]}') current_app.logger.debug(f'{data["eventData"]["body"]}') - if data["eventData"]["body"].startswith(f"{prefix}help"): + if data["eventData"]["rawBody"].startswith(f"{prefix}help"): send_help() - elif data["eventData"]["body"].startswith(f"{prefix}points"): + elif data["eventData"]["rawBody"].startswith(f"{prefix}points"): points = read_users_points(db, user_id) if points is None: send_chat("Error reading points.") else: send_chat(f"{display_name}'s points: {points}") - elif data["eventData"]["body"].startswith(f"{prefix}name_update"): + elif data["eventData"]["rawBody"].startswith(f"{prefix}name_update"): # Forces name update in case bot didn't catch the NAME_CHANGE # event. Also removes saved usernames from users with same name # if user is authenticated. change_display_name(db, user_id, display_name) if data["eventData"]["user"]["authenticated"]: remove_duplicate_usernames(db, user_id, display_name) - elif data["eventData"]["body"].startswith(prefix): - handle_redeem(data["eventData"]["body"], user_id) + elif data["eventData"]["rawBody"].startswith(prefix): + handle_redeem(data["eventData"]["rawBody"], user_id) return data diff --git a/tlapbot/redeems_handler.py b/tlapbot/redeems_handler.py index 510110b..1e6ae57 100644 --- a/tlapbot/redeems_handler.py +++ b/tlapbot/redeems_handler.py @@ -3,7 +3,7 @@ from tlapbot.db import get_db from tlapbot.owncast_requests import send_chat from tlapbot.redeems import (add_to_redeem_queue, add_to_counter, add_to_milestone, check_apply_milestone_completion, milestone_complete, is_redeem_active) -from tlapbot.owncast_helpers import use_points, read_users_points, remove_emoji +from tlapbot.owncast_helpers import use_points, read_users_points def handle_redeem(message, user_id): @@ -64,7 +64,7 @@ def handle_redeem(message, user_id): if not note: send_chat(f"Cannot redeem {redeem}, no note included.") return - if (add_to_redeem_queue(db, user_id, redeem, remove_emoji(note)) and + if (add_to_redeem_queue(db, user_id, redeem, note) and use_points(db, user_id, price)): send_chat(f"{redeem} redeemed for {price} points.") else: