Compare commits

...

2 Commits

Author SHA1 Message Date
Lili (Tlapka) f1a57c16e4 style corrections 2024-02-10 13:38:26 +01:00
Lili (Tlapka) 7da002eb00 remove unused imports, variables 2024-02-10 13:33:09 +01:00
7 changed files with 19 additions and 20 deletions

View File

@ -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,7 +42,6 @@ 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

View File

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

View File

@ -2,6 +2,7 @@ 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."""
@ -97,7 +98,7 @@ def add_user_to_database(db, user_id, display_name):
def change_display_name(db, user_id, new_name):
try:
cursor = db.execute(
db.execute(
"UPDATE points SET name = ? WHERE id = ?",
(new_name, user_id)
)
@ -109,7 +110,7 @@ def change_display_name(db, user_id, new_name):
def remove_duplicate_usernames(db, user_id, username):
try:
cursor = db.execute(
db.execute(
"""UPDATE points
SET name = NULL
WHERE name = ? AND NOT id = ?""",

View File

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

View File

@ -23,7 +23,7 @@ def counter_exists(db, counter_name):
def add_to_counter(db, counter_name):
if counter_exists(db, counter_name):
try:
cursor = db.execute(
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:
cursor = db.execute(
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(db):
def all_active_redeems():
redeems = current_app.config['REDEEMS']
all_active_redeems = {}
for redeem_name, redeem_dict in redeems.items():

View File

@ -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 datetime, timezone
from datetime import 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(db),
redeems=all_active_redeems(),
prefix=current_app.config['PREFIX'],
passive=current_app.config['PASSIVE'],
username=username,