From f6f6721f3a6d050861bcad143d58b1c0fbe1bebe Mon Sep 17 00:00:00 2001 From: nolan Date: Fri, 4 Sep 2026 10:43:53 -0500 Subject: [PATCH] Tweaked voting logic --- .pids/get_user_list-config.cmd | 1 - .pids/get_user_list-config.pid | 1 - .pids/get_votes-config.cmd | 1 - .pids/get_votes-config.pid | 1 - .pids/jsonEndpoint.cmd | 1 - .pids/jsonEndpoint.pid | 1 - .pids/post_results-config.cmd | 1 - .pids/post_results-config.pid | 1 - .pids/scraper-config.cmd | 1 - .pids/scraper-config.pid | 1 - .pids/voteServer.cmd | 1 - .pids/voteServer.pid | 1 - __pycache__/get_votes.cpython-314.pyc | Bin 9236 -> 9307 bytes __pycache__/room.cpython-314.pyc | Bin 48891 -> 49189 bytes configs/config.yaml | 4 ++-- get_votes.py | 5 ++++- last_run.db | Bin 12288 -> 12288 bytes logs/jsonEndpoint.log | 2 ++ logs/scraper-config.log | 2 ++ logs/voteServer.log | 2 ++ room.py | 10 +++++++--- 21 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 .pids/get_user_list-config.cmd delete mode 100644 .pids/get_user_list-config.pid delete mode 100644 .pids/get_votes-config.cmd delete mode 100644 .pids/get_votes-config.pid delete mode 100644 .pids/jsonEndpoint.cmd delete mode 100644 .pids/jsonEndpoint.pid delete mode 100644 .pids/post_results-config.cmd delete mode 100644 .pids/post_results-config.pid delete mode 100644 .pids/scraper-config.cmd delete mode 100644 .pids/scraper-config.pid delete mode 100644 .pids/voteServer.cmd delete mode 100644 .pids/voteServer.pid 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 ef2e5102a633cefe47ce61b6f23beb27cfe7ad21..7e0af0d170ae707f36b9a7b6eef4d7ffeb0f7360 100644 GIT binary patch delta 1143 zcmYjQOH30%7~bh_+ojNU+tMwzMHZnb4>1uRqymYiAfiS>3tPfqEyGF>WC zTC_~6mn~{zgN^$x2Ox8pciPLo_^xeIy{Y%1=(qI72gaN9;5&8j^6npD^~%{#O8k|& z_pP$;r%#B)-zhz>m7cdsFT3vVsvi^@HY{sGVraREz4Y(C7(ugZP;Q$vo2(n*ynW|- zKFl?Qa|6O$3g!BxxpW=yt}Ms-c9hFX^O*?nZHO!9`w{T0iv#L#TwI8HhWmttMg%-A z0&j|O|z10i#FHja1k+lFV02)9m2S+}J?ZOGm#Kg_v z{hx!hfvBCG4#rTDT?)2(JGo<=Jqi|4rWy}XPtq+#Hu5&MizU1|KD(>5rE3X@b+%wt zOq;BOcy5*eQQ2puRdK7@1n!kw(MTo*8*#z}7c64v$FY6JvN0w7+^e&R$UUC>cVtOy z-3rURpq2lLIunj)7A=y6sU1vGj~*O!1q7eLgkpmXf$8V^yloTG=UNqtiC#1uY1%T* zJ6>v&VwnUX1mx`GwE|B7tOS0pX0{vv8)|R@Hq|Mw)-))E57PnH;kMeHD4+y5eJ_%b zQ8$aWJf6sbbBu%Iv8W@J^Y#hHhtCzMP2CHwouvkS(k1lCNlyV{1Z`*5OQ1F-4`ZN@XLgY5@^ zA4Wm|Zg3AU_<6Or22a90CwGT#1V`3&Ghf2G?uevfJ`_j>MDDf910~C-%-|t%p51Tj Q@phrquS4v8TfYRFzblRrcK`qY delta 984 zcmZ8g&rcIU6yE7>ceg-GOMiv7(5)?{6ykx96bLjLTfm4!jS?}{TG~Ns+TCV$K@txf zO+27xylA{}GI}vRc_h$-3IBlWMUNaX!atz%cJW8tWWM>{n>XKk^JezT!pjBssK?#K zv2Xe7>xb7rxOWf|+i%b@ij?}n4c{`FKsIX$%jjB^?(;?e9gdT@#X~k0*$66JDMq70 z4#nvOSA;f&fj=zJ{wQ2V$V+)qrBB5tT@fbM%Z9GdsPqi^={rfGpQUVfj_b*sC|o#y z(nme={5C>+{iu)@_9Cu1##0xE*|gu&TNvZ^qo|M(_G2#K*(}3@04ijKgP;$18nMWO z3<93Da4b}G@*RhxnB+PF0`BC2%YGKwiK615(1}UFlYwHM@8nR?JuP=8MKJRG9BO}) zA3MeatnLwk1ldGl3{0V_sj7*py1=Zoq9_FVMtXk3RC}lU2U>zyG5|0L5C>2gnDQDn zs_UAHi6!m)D^1QpP!fW8qCL``j6njHfgZXO&J44!(o=UGrP?Kr?uc0R$hC@rjd~OR zn~ffMlQ9L9WTsTrHdKQom}%$iB0-w*CA?OR=fQ1frYpW7)K9m4L1&J6OZ1g*m*tx6 zJLb^@9SudqDF~jXS3>s(XBcJbcoP#H*T^iG(gSQ%41joL|+ZC2zP0%ZA*pxOk1D9*=RXfXB zcU~wr#Jiw!iykQ%yKEoW0MFY>qTyJ*2et$N51x1ctn)j7!H;0S6u3(Q{jtt$DVTD( ttX7)1TxQq5p}yrv3f7@JraaTsY8wrlCtLJ;a?Cl5qNg`$JT)mm%r6d_*irxh diff --git a/__pycache__/room.cpython-314.pyc b/__pycache__/room.cpython-314.pyc index 243a3d08779c682e5c15a0ab9569a3e217a7b9a1..291281819441d8e154b25a1f38ead75085f8ef82 100644 GIT binary patch delta 2986 zcmZ{m3s98T6@dS{kAGQ~1;PT$t~_>Sc`QD_7Od}T@PQgo|5gJHg3I!gEG+Ey{y&LA zDr*!6YBUqiOiL0|Ad~pW3}fXtt?>atYaxzCXXrFDJJWVzY~zg0OfgPcV$=4XyD^YV zx-)#7d+xdC-h1vj_x=yR)V&qaTjwQO;|2E1{M)O|J!h;J5}b>PAozrcuv1WpB&fQ& zVpX3mgapY8w-bD%2-aHNTZ*JKyAUL5hEyb_bIHLZJC~eH%HYx*$zd1NOxAYtc9t|x zn!}}RDU39%3~~)@)^BS0b`L=sLtCVsPiR~D|i=Z z|FPalA*ZyDT{Q-xXe;wRC*(P;w1AjN4=gVE9_iHrB|0NH3c<4cw8LzVbP*yG(T#Xb zJ5koJCj+oyX{F^jYEB^fwf?0^Ix?W0UcOo+WAKkP+w48qVPc3H{m-Qmd5dVh#baU6`BeXo3jkbD#{lT6^NT~ zXv+pMg5r}fcEqOL+u|`M-@x_<2)?3e$k|@56NuKheXBn0bJYJ6@h`+Q;tP1cx|UGL zuUSj3Xe~9pI?F@U{~Pfo{P(F>oM;!dHqlTkE}AW}HB9+D1cqxp^UeOn{sS}p>kX;QR9o&FAn>+anLKNHHgQKMEcfR^QB%##2s;ck zc}c2vt!blK{0%O23>@KnatT(4kCN*!8Gb$~hxx2JC3tmF-NF(&1a&|Ct0fzkgdMa1 zs%RbYz!0^Qhj5iH>$-|=c+wb9`aR<7bfDv`85QN-DxNIQDiIAP5bqEe zQ0X<4O;ipCeSVp~f-OUHD9{$wE3!)OqB&*=eF?{KA?LNxeV2)4R!+c+`yE|; zTV@>3SHNp#DMn?caQLb!nJyYf>iGR^o$ZKtn0h-~yLa*j`X#?*!(%~u8h3#wOfwPuh`%!gthd7nzClNq zi@MQtE+QAfi_3#j9>W*$tqZBlvM>;8qX(G6n@%_4d^}_7P~wr)m=rb3ZSCwm@Tu~* za)}1e-%JwCM7!(T;YN?Rgs91<>}m4{LhMor%5s=`nbI2{%ee?z9b`V)W7N3&tHi@W z#-Oi34$jm7mT+wG3O-P*7{2=PnuunFp>t>*acg5kdkCyKy{C(1vvb7*R;}j5TZy@U zjPp$2U!xP8mE?B9hWlcwId^I;F{CC=%{5pPrxFC~@@b`+IesChB9jc-DlCR~MTXIA z)*Qq%n<7Jtw zF<~Rfbj}P;C!^N)Yf)$6Ya~tbKPvvtR%+#ZD%16ZXfHW zhp?{!9-LD)cH=;v;WH`tT^Yzz^)54hbjw9>;LGR;uU7W>u&)ld^6o0qsp-y-6S4rV zUGR4C&y?M0(23ZG_&I`qKqcTePQc$PtIvcQ>1(JTK%7Qk0nsSpQ^aQoJ-S14{uzYPwv3Yi@$rU zoEY;SY|>ecY4@{@42jTx>FJyiTmipt`JG&h%_&3;;xOcmEV4vU#1f--z&DcNEI`+3 g*v7{v8n>b~)Yu-BSJAfsMrx9ptYq0|0+Jj34=WB7=Kufz delta 3046 zcmZved2o}*6~K2tNuPCC@+BV#WLv&KV0;jmAz+9dI|kJU@D&`~I<^)0GZwWadG(3I zgvudiz~Iut_7B292}xZ-OK9;22{**W6$~Ze=%j`=jjOf zen9F$(MOw~ow;BasKub{Ym-S-dEf21L#6#NP#rW{d0!5I!NICz|r` z74>%0qyHP;!-tz%SBh~g>xhy5xIJC%Z9OWOo|uQ0dHSB{r?)-D+7xE4R=8io^fz+d z#6@l3UQ5~=$48ap6!luW%OD~fdYJnRtI+BEA&?2rG!l8ul^8n3Q?h`gdC=A z-G4LLVM)+I3g~juJSmrn(KsTnkx5XFYS;J``Jpf`n>?gf$h`1HaLn^b3(^SSn@l0U zW6h{2uT$XAdBTZc5CL2QTmjTDM0LSHr&l4DL1wcBI^7)2GPD?aq@dicBaO%DGT)P(~;oR(iYLca;svoFmT6$aLze{7Mo@kNNQI^g zkO3H?MSZiy*zVPiz6HAMdZuQZc^>|0W5HU+vxq26gA)nLKn zz=O^Y*T|2()9aIiqz?Ka0SKHZd5*!Ui>wm{fbu09Kzg$B2KEx$gmdPGUx78E8T;mn zT*PX_z7I92%`m8ZU()LiD=qJ^Os`2p zsKHn-)YxM7At7L#&6W(mEYy@6lMs?7(US-5`TvMR&*9pOoMIfR-NydD7ZS3VHb zB6$oCja@}VW;x7Cn!Lgk&U6B08Oyh3koY+aF)3=0S<%bHt;iEHk#vB+@e~|CtMJ6b z0*|nSXq+1g-|J_WSEnooh!cAHUD{Nt{;B zG|mj2%dTGiwJ4Z)iN~s&{`qL$WFFDy*#d)bQNqRZ`0DAS_MuGt0xcV&^whCe9Y?{4 zg&q~euBLV-Mvd?ZRpjaP2jxyxIld5!y-ZDhNKd@I5(m_zcRmzyCL|l=SxCdIM)z(e z+gO9uw)Ird#qVgIiQ}pAZJEMT>LWJ(@m$R5z|2OI%Fl9O8i{wj=tB*0w5AXz}-4+noP z_)Edx40sjD_W`U_N)X|9RtVZJ0m6VSfL#DcaRTuquY$CfM$Q)EztFp9FUD76UH;vr zf?1b3mPs$4Tb0Ex<*Q)Juh3$UJ_j@c2I!LWr3-jO-~*BT70?Q(1jGX>00l5nDoDu; dQGHpLzb(`$FC?$iv*#NVUNqx*|3pA;^gqCe8#@31 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 ec4a7eab1ab237e928601fc072cd11f14a876e36..e75b400263ff6ba068e02d09a26b8c6d02cf2c53 100644 GIT binary patch delta 42 xcmZojXh_)LAkXMI*->6a^bxC(fsvW6fu*j2iGrblm64&9iQ(od`Bni&PXGX*3kCoH delta 42 xcmZojXh_)LAkXMA*->6a^x-oj10yqC14~^469q#9D