more style fixes everywhere else

tlapbot/__init__.py

@@ -4,6 +4,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from tlapbot.db import get_db
 from tlapbot.owncast_helpers import is_stream_live, give_points_to_chat
 
+
 def create_app(test_config=None):
     app = Flask(__name__, instance_relative_config=True)
 
@@ -27,7 +28,7 @@ def create_app(test_config=None):
     from . import owncast_redeem_dashboard
     app.register_blueprint(owncast_webhooks.bp)
     app.register_blueprint(owncast_redeem_dashboard.bp)
-    
+
     # add db initialization CLI command
     from . import db
     db.init_app(app)
@@ -44,12 +45,11 @@ def create_app(test_config=None):
 
     # start scheduler that will give points to users
     points_giver = BackgroundScheduler()
-    points_giver.add_job(proxy_job, 'interval', seconds=app.config['POINTS_CYCLE_TIME']) # change to 10 minutes out of testing
+    points_giver.add_job(proxy_job, 'interval', seconds=app.config['POINTS_CYCLE_TIME'])
     points_giver.start()
 
     return app
 
 
-
 if __name__ == '__main__':
-    create_app()
+    create_app()

tlapbot/db.py

@@ -22,6 +22,7 @@ def close_db(e=None):
     if db is not None:
         db.close()
 
+
 def insert_counters(db):
     for redeem, redeem_info in current_app.config['REDEEMS'].items():
         if redeem_info["type"] == "counter":
@@ -34,12 +35,13 @@ def insert_counters(db):
             except Error as e:
                 print("Failed inserting counters to db:", e.args[0])
 
+
 def init_db():
     db = get_db()
 
     with current_app.open_resource('schema.sql') as f:
         db.executescript(f.read().decode('utf8'))
-    
+
     insert_counters(db)
 
 
@@ -50,6 +52,7 @@ def init_db_command():
     init_db()
     click.echo('Initialized the database.')
 
+
 def init_app(app):
     app.teardown_appcontext(close_db)
-    app.cli.add_command(init_db_command)
+    app.cli.add_command(init_db_command)

tlapbot/owncast_helpers.py

@@ -5,6 +5,7 @@ import click
 from flask.cli import with_appcontext
 from tlapbot.db import get_db
 
+
 # # # requests stuff # # #
 def is_stream_live():
     url = current_app.config['OWNCAST_INSTANCE_URL'] + '/api/status'
@@ -12,6 +13,7 @@ def is_stream_live():
     print(r.json()["online"])
     return r.json()["online"]
 
+
 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']}
@@ -22,6 +24,7 @@ def give_points_to_chat(db):
                             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']}
@@ -41,6 +44,7 @@ def read_users_points(db, user_id):
         print("Error occured reading points:", e.args[0])
         print("To user:", user_id)
 
+
 def give_points_to_user(db, user_id, points):
     try:
         db.execute(
@@ -52,6 +56,7 @@ def give_points_to_user(db, user_id, points):
         print("Error occured giving points:", e.args[0])
         print("To user:", user_id, "  amount of points:", points)
 
+
 def use_points(db, user_id, points):
     try:
         db.execute(
@@ -65,27 +70,29 @@ def use_points(db, user_id, points):
         print("From user:", user_id, "  amount of points:", points)
         return False
 
+
 def user_exists(db, user_id):
     try:
         cursor = db.execute(
             "SELECT points FROM points WHERE id = ?",
             (user_id,)
         )
-        if cursor.fetchone() == None:
+        if cursor.fetchone() is None:
             return False
         return True
     except Error as e:
         print("Error occured checking if user exists:", e.args[0])
         print("To user:", user_id)
 
-""" Adds a new user to the database. Does nothing if user is already in."""
+
 def add_user_to_database(db, user_id, display_name):
+    """ Adds a new user to the database. Does nothing if user is already in."""
     try:
         cursor = db.execute(
             "SELECT points FROM points WHERE id = ?",
             (user_id,)
         )
-        if cursor.fetchone() == None:
+        if cursor.fetchone() is None:
             cursor.execute(
                 "INSERT INTO points(id, name, points) VALUES(?, ?, 10)",
                 (user_id, display_name)
@@ -95,6 +102,7 @@ def add_user_to_database(db, user_id, display_name):
         print("Error occured adding user to db:", e.args[0])
         print("To user:", user_id, display_name)
 
+
 def change_display_name(db, user_id, new_name):
     try:
         cursor = db.execute(
@@ -118,6 +126,7 @@ def add_to_counter(db, counter_name):
         print("Error occured adding to counter:", e.args[0])
         print("To counter:", counter_name)
 
+
 def add_to_redeem_queue(db, user_id, redeem_name, note=None):
     try:
         cursor = db.execute(
@@ -129,6 +138,7 @@ def add_to_redeem_queue(db, user_id, redeem_name, note=None):
         print("Error occured adding to redeem queue:", e.args[0])
         print("To user:", user_id, " with redeem:", redeem_name, "with note:", note)
 
+
 def clear_redeem_queue(db):
     try:
         cursor = db.execute(
@@ -141,6 +151,7 @@ def clear_redeem_queue(db):
     except Error as e:
         print("Error occured deleting redeem queue:", e.args[0])
 
+
 def all_counters(db):
     try:
         cursor = db.execute(
@@ -150,6 +161,7 @@ def all_counters(db):
     except Error as e:
         print("Error occured selecting all counters:", e.args[0])
 
+
 def pretty_redeem_queue(db):
     try:
         cursor = db.execute(
@@ -162,6 +174,7 @@ def pretty_redeem_queue(db):
     except Error as e:
         print("Error occured selecting pretty redeem queue:", e.args[0])
 
+
 def whole_redeem_queue(db):
     try:
         cursor = db.execute(
@@ -171,6 +184,7 @@ def whole_redeem_queue(db):
     except Error as e:
         print("Error occured selecting redeem queue:", e.args[0])
 
+
 @click.command('clear-queue')
 @with_appcontext
 def clear_queue_command():

tlapbot/owncast_redeem_dashboard.py

@@ -5,7 +5,8 @@ from datetime import datetime, timezone
 
 bp = Blueprint('redeem_dashboard', __name__)
 
-@bp.route('/dashboard',methods=['GET'])
+
+@bp.route('/dashboard', methods=['GET'])
 def dashboard():
     db = get_db()
     queue = pretty_redeem_queue(db)
@@ -14,4 +15,4 @@ def dashboard():
     return render_template('dashboard.html',
                            queue=queue,
                            counters=counters,
-                           utc_timezone=utc_timezone)
+                           utc_timezone=utc_timezone)

tlapbot/owncast_webhooks.py

@@ -2,12 +2,13 @@ from flask import Flask, request, json, Blueprint
 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)
+        user_exists, send_chat, read_users_points)
 from tlapbot.redeems_handler import handle_redeem
 
 bp = Blueprint('owncast_webhooks', __name__)
 
-@bp.route('/owncastWebhook',methods=['POST'])
+
+@bp.route('/owncastWebhook', methods=['POST'])
 def owncast_webhook():
     data = request.json
     db = get_db()
@@ -42,6 +43,6 @@ def owncast_webhook():
             # Forces name update in case bot didn't catch the NAME_CHANGE
             # event. Theoretically only needed when bot was off.
             change_display_name(db, user_id, display_name)
-        elif data["eventData"]["body"].startswith("!"): # TODO: make prefix configurable
+        elif data["eventData"]["body"].startswith("!"):  # TODO: make prefix configurable
             handle_redeem(data["eventData"]["body"], user_id)
-    return data
+    return data