From bafa1eca165b7d9a81f22c741b69e54c48bfdad1 Mon Sep 17 00:00:00 2001
From: Lili <pastrnakie@seznam.cz>
Date: Mon, 5 Dec 2022 11:36:25 +0100
Subject: [PATCH] fix behavior with 2 commands + new user crashes issue #5
 crash i discovered when testing (users joining when bot is resetting)

---
 tlapbot/owncast_webhooks.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tlapbot/owncast_webhooks.py b/tlapbot/owncast_webhooks.py
index 652f3a5..7621252 100644
--- a/tlapbot/owncast_webhooks.py
+++ b/tlapbot/owncast_webhooks.py
@@ -13,11 +13,14 @@ bp = Blueprint('owncast_webhooks', __name__)
 def owncast_webhook():
     data = request.json
     db = get_db()
-    if data["type"] == "USER_JOINED":
+
+    # Make sure user is in db before doing anything else.
+    if data["type"] in ["CHAT", "NAME_CHANGED", "USER_JOINED"]:
         user_id = data["eventData"]["user"]["id"]
         display_name = data["eventData"]["user"]["displayName"]
-        # CONSIDER: join points for joining stream
         add_user_to_database(db, user_id, display_name)
+
+    if data["type"] == "USER_JOINED":
         if data["eventData"]["user"]["authenticated"]:
             remove_duplicate_usernames(db, user_id, display_name)
     elif data["type"] == "NAME_CHANGE":
@@ -31,15 +34,12 @@ def owncast_webhook():
         display_name = data["eventData"]["user"]["displayName"]
         current_app.logger.debug(f'New chat message from {display_name}:')
         current_app.logger.debug(f'{data["eventData"]["body"]}')
-        if "!help" in data["eventData"]["body"]:
+        if data["eventData"]["body"].startswith("!help"):
             send_help()
-        elif "!points" in data["eventData"]["body"]:
-            if not user_exists(db, user_id):
-                add_user_to_database(db, user_id, display_name)
+        elif data["eventData"]["body"].startswith("!points"):
             points = read_users_points(db, user_id)
-            message = f"{display_name}'s points: {points}"
-            send_chat(message)
-        elif "!name_update" in data["eventData"]["body"]:
+            send_chat(f"{display_name}'s points: {points}")
+        elif data["eventData"]["body"].startswith("!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.