tlapbot/__init__.py

@@ -26,15 +26,10 @@ def create_app(test_config: None = None) -> Flask:
     app.config.from_pyfile('redeems.py', silent=True)
 
     # set up polls if they're enabled
-    if app.config['POLLS_ENABLED']:
+    if app.config['POLLS']:
         app.config.from_object('tlapbot.defaults.default_polls')
         app.config.from_pyfile('polls.py', silent=True)
 
-        for poll in app.config['POLLS']:
-            if ' ' in poll:
-                app.logger.warning(f"Poll '{poll}' has spaces in its name.")
-                app.logger.warning("Poll with spaces are impossible to redeem.")
-
     # Make logging work for gunicorn-ran instances of tlapbot.
     if app.config['GUNICORN']:
         gunicorn_logger = logging.getLogger('gunicorn.error')
@@ -67,8 +62,6 @@ def create_app(test_config: None = None) -> Flask:
     app.cli.add_command(db.refresh_milestones_command)
     app.cli.add_command(db.reset_milestone_command)
     app.cli.add_command(db.hard_reset_milestone_command)
-    app.cli.add_command(db.refresh_polls_command)
-    app.cli.add_command(db.reset_poll_command)
 
     # scheduler job for giving points to users
     def proxy_job() -> None:

tlapbot/db.py

@@ -18,7 +18,7 @@ def get_db() -> sqlite3.Connection:
     return g.db
 
 
-def close_db(*_args) -> None:
+def close_db() -> None:
     db: sqlite3.Connection = g.pop('db', None)
 
     if db is not None:
@@ -92,24 +92,12 @@ def refresh_counters() -> bool:
     return insert_counters(db)
 
 
-def populate_poll_options(db: sqlite3.Connection, poll: str) -> bool:
-    for option in current_app.config['POLLS'][poll]['options']:
-        db.execute(
-            "INSERT INTO polls(poll_name, points, option) VALUES(?, ?, ?)",
-            (poll, 0, option)
-        )
-    db.commit()
-    return True
-
-
 def refresh_polls() -> bool:
     db = get_db()
+
     try:
         db.execute("DELETE FROM polls")
         db.commit()
-        for poll in current_app.config['POLLS']:
-            populate_poll_options(db, poll)
-        db.commit()
     except sqlite3.Error as e:
         print("Error occurred deleting old counters:", e.args[0])
         return False
@@ -117,19 +105,16 @@ def refresh_polls() -> bool:
 
 
 def reset_poll(poll: str) -> bool:
-    if poll not in current_app.config['POLLS']:
-        print(f"Failed resetting poll, {poll} not in polls file.")
-        return False
     try:
         db = get_db()
         db.execute(
-            "DELETE FROM polls WHERE poll_name = ?",
+            "UPDATE polls SET points = 0 WHERE poll_name = ?",
             (poll,)
         )
-        populate_poll_options(db, poll)
+        db.commit()
         return True
     except sqlite3.Error as e:
-        current_app.logger.error(f"Error occurred resetting poll: {e.args[0]}")
+        current_app.logger.error(f"Error occurred adding a milestone: {e.args[0]}")
         return False
 
 
@@ -272,8 +257,8 @@ def refresh_polls_command() -> None:
         click.echo('Refreshed polls.')
 
 
-@click.command('reset-poll')
-@click.argument('poll')
+@click.command('reset-polls')
+@click.argument('milestone')
 def reset_poll_command(poll: str) -> None:
     """Resets polls progress back to zero."""
     if reset_poll(poll):

tlapbot/defaults/default_config.py

@@ -8,4 +8,4 @@ LIST_REDEEMS=False
 ACTIVE_CATEGORIES=[]
 GUNICORN=False
 PREFIX='!'
-POLLS_ENABLED=True
+POLLS=True

tlapbot/poll_handler.py

@@ -6,10 +6,9 @@ from tlapbot.redeems.polls import poll_option_exists, vote_in_poll
 
 
 def handle_poll_vote(message: str, user_id: str) -> None:
-    split_message = message[5:].split(maxsplit=2)
-    if len(split_message) < 3:
+    split_message = message[5:].split(maxsplit=1)
+    if len(split_message < 3):
         send_chat("Can't vote for poll, not enough arguments in message.")
-        return
     poll_name = split_message[0]
     option = split_message[1]
     poll_points = split_message[2]
@@ -25,10 +24,8 @@ def handle_poll_vote(message: str, user_id: str) -> None:
     if not user_points:
         send_chat(f"Can't vote in {poll_name} poll, failed to read users' points.")
         return
-    poll_points = int(poll_points)
     if user_points < poll_points:
         send_chat(f"Can't vote in {poll_name} poll, you're voting with more points than you have.")
-        return
     if (vote_in_poll(db, poll_name, option, poll_points) and 
             use_points(db, user_id, poll_points)):
-        send_chat(f"{poll_points} points donated to {option} in poll {poll_name}")
+        send_chat(f"{poll_points} donated to {option} in poll {poll_name}")

tlapbot/redeems/milestones.py

@@ -2,7 +2,7 @@ from flask import current_app
 from sqlite3 import Error, Connection
 from typing import Tuple, Any
 from tlapbot.owncast_helpers import use_points
-from tlapbot.redeems.redeems import is_redeem_active
+from tlapbot.redeems import is_redeem_active
 
 
 # TODO: add a milestone_exists check?

tlapbot/redeems/polls.py

@@ -2,43 +2,6 @@ from flask import current_app
 from sqlite3 import Error, Connection
 
 
-def get_poll_votes(db: Connection, poll_name: str) -> dict[str, int] | None:
-    """Get all poll votes and point values for a given `poll_name`"""
-    try:
-        options = {}
-        cursor = db.execute(
-            "SELECT option, points from polls WHERE poll_name = ?",
-            (poll_name,)
-        )
-        for row in cursor:
-            options[row[0]] = row[1]
-        return options
-    except Error as e:
-        current_app.logger.error(f"Error occurred getting poll votes: {e.args[0]}")
-        current_app.logger.error(f"For poll {poll_name}")
-
-
-def all_active_polls(db: Connection) -> dict[str, dict[str, int]] | None:
-    """Returns a dict where the keys are poll names, values is a dict of options and points.
-    Returns None if polls aren't enabled."""
-    if not current_app.config['POLLS_ENABLED']:
-        return None
-    polls = current_app.config['POLLS']
-    poll_votes = {}
-    for poll_name in polls.keys():
-        poll_votes[poll_name] = get_poll_votes(db, poll_name)
-    return poll_votes
-
-
-def max_poll_votes(poll_dict: dict[str, int]) -> int:
-    """Returns the maximum number of poll votes/points. Input is the output of `get_poll_votes`"""
-    highest_points = 0
-    for _, points in poll_dict.items():
-        if points > highest_points:
-            highest_points = points
-    return highest_points
-
-
 def poll_option_exists(db: Connection, poll_name: str, option: str) -> bool | None:
     """Returns None only if error was logged."""
     try:
@@ -65,11 +28,11 @@ def vote_in_poll(db: Connection, poll_name: str, option: str, points: int) -> bo
     if poll_option_exists(db, poll_name, option):
         try:
             cursor = db.execute(
-                "UPDATE polls SET points = points + ? WHERE poll_name = ? and option = ?",
+                "UPDATE polls SET progress = progress + ? WHERE poll_name = ? and option = ?",
                 (points, poll_name, option)
                 )
             db.commit()
             return True
         except Error as e:
-            current_app.logger.error(f"Error occurred updating poll: {e.args[0]}")
+            current_app.logger.error(f"Error occurred updating milestone: {e.args[0]}")
         return False

tlapbot/schema.sql

@@ -1,7 +1,6 @@
 DROP TABLE IF EXISTS counters;
 DROP TABLE IF EXISTS redeem_queue;
 DROP TABLE IF EXISTS milestones;
-DROP TABLE IF EXISTS polls;
 
 CREATE TABLE IF NOT EXISTS points (
   id TEXT PRIMARY KEY,
@@ -35,5 +34,5 @@ CREATE TABLE polls (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   points INTEGER NOT NULL,
   option TEXT NOT NULL,
-  poll_name TEXT NOT NULL
-);
+  poll_name TEXT NOT NULL,
+)

tlapbot/templates/dashboard.html

@@ -23,7 +23,7 @@
 
         <body>
             <h3>Redeems Dashboard</h3>
-            {% if (username and users) %}
+            {% if (username and users ) %}
             <table>
                 <thead>
                     <tr>
@@ -47,31 +47,6 @@
             {% endif %}
 
             {% if not passive %}
-            {% if polls %}
-
-            <table>
-                <thead>
-                    <tr>
-                        <th colspan="2">Active polls</th>
-                        <th colspan="2">Points</th>
-                    </tr>
-                </thead>
-                <tbody>
-                {% for poll_name, poll_dict in polls.items() %}
-                {% for option in poll_dict.keys() %}
-                {% set max_vote = max_poll_votes(poll_dict) %}
-                    <tr>
-                        <td> {{ poll_name }} </td>
-                        <td> {{ option }} </td>
-                        <td> {{ poll_dict[option] }} </td>
-                        <td> <progress id="file" max={{ max_vote }} value={{ poll_dict[option] }}></progress></td>
-                    </tr>
-                {% endfor %}
-                {% endfor %}
-                </tbody>
-            </table>
-
-            {% endif %}
             {% if counters %}
             <table>
                 <thead>

tlapbot/tlapbot_dashboard.py

@@ -3,7 +3,6 @@ from tlapbot.db import get_db
 from tlapbot.redeems.redeems import all_active_redeems, pretty_redeem_queue
 from tlapbot.redeems.counters import all_active_counters
 from tlapbot.redeems.milestones import all_active_milestones
-from tlapbot.redeems.polls import all_active_polls, max_poll_votes
 from tlapbot.owncast_helpers import read_all_users_with_username
 from datetime import timezone
 
@@ -23,9 +22,7 @@ def dashboard() -> str:
                            queue=pretty_redeem_queue(db),
                            counters=all_active_counters(db),
                            milestones=all_active_milestones(db),
-                           polls=all_active_polls(db),
                            redeems=all_active_redeems(),
-                           max_poll_votes=max_poll_votes,
                            prefix=current_app.config['PREFIX'],
                            passive=current_app.config['PASSIVE'],
                            username=username,