add reset-milestone and hard-reset-milestone

commands to click

tlapbot/db.py

@@ -4,6 +4,7 @@ import click
 from flask import current_app, g
 from flask.cli import with_appcontext
 
+from tlapbot.redeems import milestone_complete
 
 def get_db():
     if 'db' not in g:
@@ -115,6 +116,25 @@ def refresh_milestones():
         print("Failed inserting milestones to db:", e.args[0])
 
 
+def reset_milestone(milestone):
+    if not redeem_name in current_app.config['REDEEMS']:
+        print(f"Failed resetting milestone, {milestone} not in redeems file.")
+        return None
+    try:
+        db.execute(
+            "DELETE FROM milestones WHERE name = ?",
+            (milestone,)
+        )
+        db.execute(
+            "INSERT INTO milestones(name, progress, goal) VALUES(?, ?, ?)",
+            (milestone, 0, current_app.config['REDEEMS'][milestone]['goal'])
+        )
+        db.commit()
+        return True
+    except Error as e:
+        current_app.logger.error(f"Error occured adding a milestone: {e.args[0]}")
+        return None
+
 
 
 @click.command('init-db')
@@ -160,6 +180,28 @@ def refresh_milestones_command():
     click.echo('Refreshed milestones.')
 
 
+@click.command('reset-milestone')
+@click.argument('milestone')
+def reset_milestone_command(milestone):
+    """Resets a completed milestone back to zero."""
+    if milestone_complete(milestone):
+        if reset_milestone(milestone):
+            click.echo(f"Reset milestone {milestone}.")
+        else:
+            click.echo(f"Resetting milestone {milestone} failed.")
+    else:
+        click.echo(f"Could not reset milestone {milestone}, milestone not completed.")
+        click.echo("(You can hard-reset-milestone if you really want to reset it.)")
+
+@click.command('hard-reset-milestone')
+@click.argument('milestone')
+def hard_reset_milestone_command(milestone):
+    """Resets any milestone back to zero."""
+    if reset_milestone(milestone):
+            click.echo(f"Hard reset milestone {milestone}.")
+        else:
+            click.echo(f"Hard resetting milestone {milestone} failed.")
+
 def init_app(app):
     app.teardown_appcontext(close_db)
     app.cli.add_command(init_db_command)

tlapbot/default_redeems.py

@@ -3,6 +3,6 @@ REDEEMS={
     "lurk": {"price": 1, "type": "counter", "info": "Let us know you're going to lurk."},
     "react": {"price": 200, "type": "note", "info": "Attach link to a video for me to react to."},
     "request": {"price": 100, "type": "note", "info": "Request a level, gamemode, skin, etc."},
-    "go_nap": {"price": 1, "type": "milestone", "info": "Streamer will go nap when the goal is reached.", "goal": 1000},
+    "go_nap": {"type": "milestone", "info": "Streamer will go nap when the goal is reached.", "goal": 1000},
     "inactive": {"price": 100, "type": "note", "info": "Example redeem that is inactive by default", "category": ["inactive"]}
 }

tlapbot/owncast_requests.py

@@ -16,17 +16,33 @@ def is_stream_live():
 def give_points_to_chat(db):
     url = current_app.config['OWNCAST_INSTANCE_URL'] + '/api/integrations/clients'
     headers = {"Authorization": "Bearer " + current_app.config['OWNCAST_ACCESS_TOKEN']}
+    try:
         r = requests.get(url, headers=headers)
+    except requests.exceptions.RequestException as e:
+        current_app.logger.error(f"Error occured getting users to give points to: {e.args[0]}")
+        return
+    if r.status_code != 200:
+        current_app.logger.error(f"Error occured when giving points: Response code not 200.")
+        current_app.logger.error(f"Response code received: {r.status_code}.")
+        current_app.logger.error(f"Check owncast instance url and access key.")
+        return
     unique_users = set(map(lambda user_object: user_object["user"]["id"], r.json()))
     for user_id in unique_users:
-        give_points_to_user(db,
+        give_points_to_user(db, user_id, current_app.config['POINTS_AMOUNT_GIVEN'])
-                            user_id,
-                            current_app.config['POINTS_AMOUNT_GIVEN'])
 
 
 def send_chat(message):
     url = current_app.config['OWNCAST_INSTANCE_URL'] + '/api/integrations/chat/send'
     headers = {"Authorization": "Bearer " + current_app.config['OWNCAST_ACCESS_TOKEN']}
+    try:
         r = requests.post(url, headers=headers, json={"body": message})
+    except requests.exceptions.RequestException as e:
+        current_app.logger.error(f"Error occured sending chat message: {e.args[0]}")
+        return
+    if r.status_code != 200:
+        current_app.logger.error(f"Error occured when sending chat: Response code not 200.")
+        current_app.logger.error(f"Response code received: {r.status_code}.")
+        current_app.logger.error(f"Check owncast instance url and access key.")
+        return
     return r.json()
 

tlapbot/redeems.py

@@ -49,24 +49,6 @@ def add_to_redeem_queue(db, user_id, redeem_name, note=None):
     return False
 
 
-def start_milestone(db, redeem_name):
-    try:
-        cursor = db.execute(
-            "SELECT progress, goal FROM milestones WHERE name = ?",
-            (redeem_name,)
-        )
-        milestone = cursor.fetchone()
-        current_app.logger.error(f"Milestone: {milestone}")
-        if milestone is None:
-            cursor = db.execute(
-                    "INSERT INTO milestones(name, progress, goal) VALUES(?, ?, ?)",
-                    (redeem_name, 0, current_app.config['REDEEMS'][redeem_name]['goal'])
-                )
-        db.commit()
-    except Error as e:
-        current_app.logger.error(f"Error occured adding a milestone: {e.args[0]}")
-
-
 def add_to_milestone(db, user_id, redeem_name, points_donated):
     try:
         cursor = db.execute(

tlapbot/redeems_handler.py

@@ -57,8 +57,6 @@ def handle_redeem(message, user_id):
             send_chat(f"Cannot redeem {redeem}, no amount of points specified.")
         elif not note.isdigit():
             send_chat(f"Cannot redeem {redeem}, amount of points is not an integer.")
-        elif int(note) < price:
-            send_chat(f"Can't redeem {redeem}, your donation is below the minimum bid of {price}.")
         elif int(note) > points:
             send_chat(f"Can't redeem {redeem}, you're donating more points than you have.")
         elif add_to_milestone(db, user_id, redeem, int(note)):