tlapbot/__init__.py

@@ -4,7 +4,7 @@ from flask import Flask
 from apscheduler.schedulers.background import BackgroundScheduler
 from tlapbot.db import get_db
 from tlapbot.owncast_requests import is_stream_live, give_points_to_chat
-
+from tlapbot.redeems import remove_inactive_redeems 
 
 def create_app(test_config=None):
     app = Flask(__name__, instance_relative_config=True)
@@ -42,6 +42,7 @@ def create_app(test_config=None):
             app.logger.warning(f"Redeem '{redeem}' has spaces in its name.")
             app.logger.warning("Redeems with spaces are impossible to redeem.")
 
+
     # prepare webhooks and redeem dashboard blueprints
     from . import owncast_webhooks
     from . import tlapbot_dashboard

tlapbot/db.py

@@ -6,7 +6,6 @@ from flask.cli import with_appcontext
 
 from tlapbot.redeems import milestone_complete
 
-
 def get_db():
     if 'db' not in g:
         g.db = sqlite3.connect(
@@ -128,7 +127,7 @@ def refresh_milestones():
 
 
 def reset_milestone(milestone):
-    if milestone not in current_app.config['REDEEMS']:
+    if not milestone in current_app.config['REDEEMS']:
         print(f"Failed resetting milestone, {milestone} not in redeems file.")
         return False
     try:
@@ -148,6 +147,7 @@ def reset_milestone(milestone):
         return False
 
 
+
 @click.command('init-db')
 @with_appcontext
 def init_db_command():

tlapbot/owncast_helpers.py

@@ -2,7 +2,6 @@ from flask import current_app
 from sqlite3 import Error
 from re import sub
 
-
 # # # db stuff # # #
 def read_users_points(db, user_id):
     """Errors out if user doesn't exist."""
@@ -98,7 +97,7 @@ def add_user_to_database(db, user_id, display_name):
 
 def change_display_name(db, user_id, new_name):
     try:
-        db.execute(
+        cursor = db.execute(
             "UPDATE points SET name = ? WHERE id = ?",
             (new_name, user_id)
         )
@@ -110,7 +109,7 @@ def change_display_name(db, user_id, new_name):
 
 def remove_duplicate_usernames(db, user_id, username):
     try:
-        db.execute(
+        cursor = db.execute(
             """UPDATE points
             SET name = NULL
             WHERE name = ? AND NOT id = ?""",

tlapbot/owncast_requests.py

@@ -45,3 +45,4 @@ def send_chat(message):
         current_app.logger.error(f"Check owncast instance url and access key.")
         return
     return r.json()
+

tlapbot/redeems.py

@@ -23,7 +23,7 @@ def counter_exists(db, counter_name):
 def add_to_counter(db, counter_name):
     if counter_exists(db, counter_name):
         try:
-            db.execute(
+            cursor = db.execute(
                 "UPDATE counters SET count = count + 1 WHERE name = ?",
                 (counter_name,)
             )
@@ -37,7 +37,7 @@ def add_to_counter(db, counter_name):
 
 def add_to_redeem_queue(db, user_id, redeem_name, note=None):
     try:
-        db.execute(
+        cursor = db.execute(
             "INSERT INTO redeem_queue(redeem, redeemer_id, note) VALUES(?, ?, ?)",
             (redeem_name, user_id, note)
             )
@@ -159,7 +159,7 @@ def all_active_milestones(db):
     return all_active_milestones
 
 
-def all_active_redeems():
+def all_active_redeems(db):
     redeems = current_app.config['REDEEMS']
     all_active_redeems = {}
     for redeem_name, redeem_dict in redeems.items():

tlapbot/tlapbot_dashboard.py

@@ -2,7 +2,7 @@ from flask import render_template, Blueprint, request, current_app
 from tlapbot.db import get_db
 from tlapbot.redeems import all_active_counters, all_active_milestones, all_active_redeems, pretty_redeem_queue
 from tlapbot.owncast_helpers import  read_all_users_with_username
-from datetime import timezone
+from datetime import datetime, timezone
 
 bp = Blueprint('redeem_dashboard', __name__)
 
@@ -20,7 +20,7 @@ def dashboard():
                            queue=pretty_redeem_queue(db),
                            counters=all_active_counters(db),
                            milestones=all_active_milestones(db),
-                           redeems=all_active_redeems(),
+                           redeems=all_active_redeems(db),
                            prefix=current_app.config['PREFIX'],
                            passive=current_app.config['PASSIVE'],
                            username=username,