diff --git a/.pids/get_user_list-config.cmd b/.pids/get_user_list-config.cmd deleted file mode 100644 index 7e76119..0000000 --- a/.pids/get_user_list-config.cmd +++ /dev/null @@ -1 +0,0 @@ -(source .venv/bin/activate && python3 "get_user_list.py" configs/config.yaml > "/home/nolan/dev/titlebot-ng-ng/logs/get_user_list-config.log" 2>&1) & diff --git a/.pids/get_user_list-config.pid b/.pids/get_user_list-config.pid deleted file mode 100644 index f05cae0..0000000 --- a/.pids/get_user_list-config.pid +++ /dev/null @@ -1 +0,0 @@ -1850235 diff --git a/.pids/get_votes-config.cmd b/.pids/get_votes-config.cmd deleted file mode 100644 index 2df49ec..0000000 --- a/.pids/get_votes-config.cmd +++ /dev/null @@ -1 +0,0 @@ -(source .venv/bin/activate && python3 "get_votes.py" configs/config.yaml > "/home/nolan/dev/titlebot-ng-ng/logs/get_votes-config.log" 2>&1) & diff --git a/.pids/get_votes-config.pid b/.pids/get_votes-config.pid deleted file mode 100644 index 8034e6c..0000000 --- a/.pids/get_votes-config.pid +++ /dev/null @@ -1 +0,0 @@ -1850182 diff --git a/.pids/jsonEndpoint.cmd b/.pids/jsonEndpoint.cmd deleted file mode 100644 index df5ddd7..0000000 --- a/.pids/jsonEndpoint.cmd +++ /dev/null @@ -1 +0,0 @@ -(cd "jsonEndpoint" && ."/jep" > "/home/nolan/dev/titlebot-ng-ng/logs/jsonEndpoint.log" 2>&1) & diff --git a/.pids/jsonEndpoint.pid b/.pids/jsonEndpoint.pid deleted file mode 100644 index 7f2706f..0000000 --- a/.pids/jsonEndpoint.pid +++ /dev/null @@ -1 +0,0 @@ -1849964 diff --git a/.pids/post_results-config.cmd b/.pids/post_results-config.cmd deleted file mode 100644 index d57028f..0000000 --- a/.pids/post_results-config.cmd +++ /dev/null @@ -1 +0,0 @@ -(source .venv/bin/activate && python3 "post_results.py" configs/config.yaml > "/home/nolan/dev/titlebot-ng-ng/logs/post_results-config.log" 2>&1) & diff --git a/.pids/post_results-config.pid b/.pids/post_results-config.pid deleted file mode 100644 index 92aa23b..0000000 --- a/.pids/post_results-config.pid +++ /dev/null @@ -1 +0,0 @@ -1850091 diff --git a/.pids/scraper-config.cmd b/.pids/scraper-config.cmd deleted file mode 100644 index 40e0720..0000000 --- a/.pids/scraper-config.cmd +++ /dev/null @@ -1 +0,0 @@ -(source .venv/bin/activate && python3 "scraper.py" configs/config.yaml > "/home/nolan/dev/titlebot-ng-ng/logs/scraper-config.log" 2>&1) & diff --git a/.pids/scraper-config.pid b/.pids/scraper-config.pid deleted file mode 100644 index 0b565b8..0000000 --- a/.pids/scraper-config.pid +++ /dev/null @@ -1 +0,0 @@ -1849912 diff --git a/.pids/voteServer.cmd b/.pids/voteServer.cmd deleted file mode 100644 index 3c55b66..0000000 --- a/.pids/voteServer.cmd +++ /dev/null @@ -1 +0,0 @@ -(cd "voteServer" && ."/vs" > "/home/nolan/dev/titlebot-ng-ng/logs/voteServer.log" 2>&1) & diff --git a/.pids/voteServer.pid b/.pids/voteServer.pid deleted file mode 100644 index 589392b..0000000 --- a/.pids/voteServer.pid +++ /dev/null @@ -1 +0,0 @@ -1850043 diff --git a/__pycache__/get_votes.cpython-314.pyc b/__pycache__/get_votes.cpython-314.pyc index ef2e510..7e0af0d 100644 Binary files a/__pycache__/get_votes.cpython-314.pyc and b/__pycache__/get_votes.cpython-314.pyc differ diff --git a/__pycache__/room.cpython-314.pyc b/__pycache__/room.cpython-314.pyc index 243a3d0..2912818 100644 Binary files a/__pycache__/room.cpython-314.pyc and b/__pycache__/room.cpython-314.pyc differ diff --git a/configs/config.yaml b/configs/config.yaml index 6d7c3a2..6dd1fe7 100755 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -17,9 +17,9 @@ vote_activity_hours: 6672 # Hours a user must have been active within to be eli # --- Wait times (seconds) --- sync_timeout: 3000 # Initial sync timeout for scraper/user-list (ms) -poll_interval: 30 # How often the scraper polls for new messages (s) +poll_interval: 10 # How often the scraper polls for new messages (s) command_sync_timeout: 30000 # Sync timeout when listening for chat commands (ms) -post_interval: 0.5 # Delay between posting each suggestion (s) +post_interval: 0.2 # Delay between posting each suggestion (s) initial_sync_timeout: 300 # Initial sync timeout for post_results (ms) post_loop_interval: 1 # Delay between post_results loop iterations (s) user_list_interval: 300 # How often the user-list service refreshes (s) diff --git a/get_votes.py b/get_votes.py index 6763f26..883c463 100755 --- a/get_votes.py +++ b/get_votes.py @@ -39,7 +39,10 @@ async def main(): if command: print("!getvotes command detected, posting vote results...") - + + # Clear the web poll by marking all pending suggestions as posted + room.mark_submissions_posted() + # Read and format vote results vote_message = format_vote_results(room) diff --git a/last_run.db b/last_run.db index ec4a7ea..e75b400 100644 Binary files a/last_run.db and b/last_run.db differ diff --git a/logs/jsonEndpoint.log b/logs/jsonEndpoint.log index 175a4b1..919eabe 100644 --- a/logs/jsonEndpoint.log +++ b/logs/jsonEndpoint.log @@ -14,3 +14,5 @@ 2026/09/04 10:20:33 Loaded 4 users from database (most recent post: 1788535088) 2026/09/04 10:21:03 Loaded 0 submissions from database 2026/09/04 10:21:03 Loaded 4 users from database (most recent post: 1788535088) +2026/09/04 10:21:33 Loaded 0 submissions from database +2026/09/04 10:21:33 Loaded 4 users from database (most recent post: 1788535088) diff --git a/logs/scraper-config.log b/logs/scraper-config.log index 185432a..c339230 100644 --- a/logs/scraper-config.log +++ b/logs/scraper-config.log @@ -34,4 +34,6 @@ Looked back on 100 messages... Looked back on 200 messages... Looked back on 300 Last run for this room was at UNIX timestamp 1788535208 Looked back on 100 messages... Looked back on 200 messages... Looked back on 300 messages... Looked back on 400 messages... Stored 70 suggestions in database. Last run for this room was at UNIX timestamp 1788535240 +Looked back on 100 messages... Looked back on 200 messages... Looked back on 300 messages... Looked back on 400 messages... Stored 70 suggestions in database. +Last run for this room was at UNIX timestamp 1788535270 Looked back on 100 messages... Looked back on 200 messages... Looked back on 300 messages... Looked back on 400 messages... \ No newline at end of file diff --git a/logs/voteServer.log b/logs/voteServer.log index 6ff58e2..197110d 100644 --- a/logs/voteServer.log +++ b/logs/voteServer.log @@ -14,3 +14,5 @@ 2026/09/04 10:20:37 Fetched 4 users (most recent post: 1788535088) 2026/09/04 10:21:07 Fetched 0 submissions 2026/09/04 10:21:07 Fetched 4 users (most recent post: 1788535088) +2026/09/04 10:21:37 Fetched 4 users (most recent post: 1788535088) +2026/09/04 10:21:37 Fetched 0 submissions diff --git a/room.py b/room.py index ba431a8..dcf1810 100755 --- a/room.py +++ b/room.py @@ -838,8 +838,6 @@ class Room: print(f"Failed to post suggestion {idx}: {resp}") continue - post.is_posted = True - reaction = { "m.relates_to": { "rel_type": "m.annotation", @@ -855,7 +853,6 @@ class Room: await asyncio.sleep(self.config.post_interval) - self.mark_posts_as_posted([p for p in unposted_posts if p.is_posted]) print("Suggestions posted!") def mark_posts_as_posted(self, posts=None): @@ -873,6 +870,13 @@ class Room: dbutil.commit(conn) conn.close() + def mark_submissions_posted(self): + conn = dbutil.connect(self.db_path) + c = conn.cursor() + _ = c.execute("UPDATE suggestions SET is_posted = 1 WHERE is_posted = 0") + dbutil.commit(conn) + conn.close() + async def close(self): if self.client: await self.client.close()