From e4850ab89f98f71583b8362edd8ac062f4a471b5 Mon Sep 17 00:00:00 2001 From: Lili Date: Mon, 7 Nov 2022 17:30:40 +0100 Subject: [PATCH] move help to own file, rewrite it for speed and for better info --- tlapbot/help_message.py | 19 +++++++++++++++++++ tlapbot/owncast_webhooks.py | 12 +++--------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 tlapbot/help_message.py diff --git a/tlapbot/help_message.py b/tlapbot/help_message.py new file mode 100644 index 0000000..95b7903 --- /dev/null +++ b/tlapbot/help_message.py @@ -0,0 +1,19 @@ +from flask import current_app +from tlapbot.owncast_helpers import send_chat + + +def send_help(): + message = [] + message.append("""Tlapbot commands: + !help to see this help message. + !points to see your points. + !name_update to force name update if tlapbot didn't catch it.\n""" + ) + if current_app.config['LIST_REDEEMS']: + message.append("Tlapbot redeems:\n") + for redeem, redeem_info in current_app.config['REDEEMS'].items(): + if 'info' in redeem_info: + message.append(f"!{redeem} for {redeem_info['price']} points. {redeem_info['info']}\n") + else: + message.append(f"!{redeem} for {redeem_info['price']} points.\n") + send_chat(''.join(message)) \ No newline at end of file diff --git a/tlapbot/owncast_webhooks.py b/tlapbot/owncast_webhooks.py index 64f8cd2..e83f9ec 100644 --- a/tlapbot/owncast_webhooks.py +++ b/tlapbot/owncast_webhooks.py @@ -3,8 +3,10 @@ from sqlite3 import Error from tlapbot.db import get_db from tlapbot.owncast_helpers import (add_user_to_database, change_display_name, user_exists, send_chat, read_users_points, remove_duplicate_usernames) +from tlapbot.help_message import send_help from tlapbot.redeems_handler import handle_redeem + bp = Blueprint('owncast_webhooks', __name__) @@ -31,15 +33,7 @@ def owncast_webhook(): print(f'New chat message from {display_name}:') print(f'{data["eventData"]["body"]}') if "!help" in data["eventData"]["body"]: - message = """Tlapbot commands: - !help to see this help message. - !points to see your points. - !name_update to force name update if tlapbot didn't catch it. - Tlapbot redeems:\n""" - for redeem, redeem_info in current_app.config['REDEEMS'].items(): - message += (f"!{redeem} for {redeem_info['price']} points.\n") - # TODO: also make this customizable - send_chat(message) + send_help() elif "!points" in data["eventData"]["body"]: if not user_exists(db, user_id): add_user_to_database(db, user_id, display_name)