From 7e3b3dff6dda2f7b660e0dacae744d492bb529d5 Mon Sep 17 00:00:00 2001 From: nolan Date: Wed, 12 Aug 2026 17:14:01 -0500 Subject: [PATCH] tweaks --- .gitignore | 2 ++ __pycache__/get_user_list.cpython-314.pyc | Bin 14135 -> 14434 bytes __pycache__/post.cpython-314.pyc | Bin 1636 -> 1639 bytes __pycache__/room.cpython-314.pyc | Bin 42719 -> 43181 bytes configs/config.yaml | 1 + configs/daLunch.yaml | 13 +++++++++++++ configs/mainChat.yaml | 4 ++-- get_user_list.py | 8 +++++--- ...yYVEZOMRtkyvarN_jupiterbroadcasting_com.db | 0 ...yYVEZOMRtkyvarN_jupiterbroadcasting_com.db | 0 ...yYVEZOMRtkyvarN_jupiterbroadcasting_com.db | Bin 0 -> 16384 bytes 11 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 configs/daLunch.yaml create mode 100644 suggestions__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db create mode 100644 users__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db create mode 100644 votes__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3fb4d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +config/* + diff --git a/__pycache__/get_user_list.cpython-314.pyc b/__pycache__/get_user_list.cpython-314.pyc index 5c336b3bc79699a797bc9fd8d9edb9de83379042..64f77e5b01f3919d2da73b74a0a8401214e3bdb6 100644 GIT binary patch delta 2456 zcmZuzYit}>6~1?8-#hz$uh*W5pIO_@x{jTs#*VsFW}QA)TbQ)4iP`Lqmj&<4a%VQJ zqo%2ds3Ihw)~zZ)Ak0Icg2Y4nqyAOlCaKG>JX&EG3P}A&B`8Tj2>1c_-1WK?F|xlo z_ndp~}QQ0wP11E&cK-rl@X7Eg?>^kuTLiG$nS#(Ay4fpK-jfc>g;O48p#CCcG zXR}tUtm~~uRKut?RHLjKZCx`|OMHAot98GLI~Y4@L{Q{>{xf<@&1?F4Rm<1a^Levr zuB+#C^B%3i{_@?Xa1qbI9V}-}*VdX1%SG7AtIc}OMuMQX8`U+{fD@0)B+On!qzOk2 z$GR6BSDe^S1#t!k>6|$1gUKBrhCxuRY0^f0?>@xm`@i^P^3q!>W-onL@ z{W~5e{rDJzokO@7weJiU7TMscR1n$g+7vD(?ANBjetj4hQ_kxng(GaR8^wSLjw!&} zKJD1*2sshU#bt!V_ixj8V?V%abTj_lnF^E%e-w8m)R+5t?(@1H1zs!eQiL8)jQQjJ zd0ew&i_)787rmSa;|QZ*-1R+#+MY_1{yZ^(lk_)A#Zmxpjn2M-<_xuumvSMwNp;_R<1oigFQ(J?uYhXv8u>6+R$o4Q8k zm@?<*Tp|US^-%y$qlf6P(hGQnhBITmX0kvRnW(V|#>=#kc`5Z*5v7K=4!<>h|6a0i zJ6U)mbz|tp&>KTt_W&cu1m1}kJVk_F8^Rx3vcD!xG5M+w7boylae>L#d_h3z7{lus zz}Mqxz`PT1-pyvdzJ!^)i+sgVVb>QZO2Tg1$@IID12m%olRrcYKRX`lcH;ZpuVnw} zh#!;znT3n>YO(vRVFh1;OI~oECc3H07rZi*nIW6H%*vEk5QK(6QpgAZEKEiLcr;If zGzI_>wgRU#Q*Dr@xv@-$PDlkTkAX$d^rtLO)6my+(yE%4ixqj*G)aL>z?{Pja?V}? za-f(5C$ZKcL}kTqHe0G?hqLh|4aWNYVrG@x9lZ~4b^kQ_o^a{I_q4?Is=+!(yIwWb z`u?q9BhUZ65WmJaY`zEp$L^iW@jvJ41!jub4d`3EtMJbd{Z#G*{xy9u*TpfqGWm@` zPE~$4%-1lWbjN$2ti$x*lNtOj%}mXQcvLyvxQCCfPE|%DZ~*AQBmnRLzyd%GpaF20 z{$Xm_$G>rI7`thHdfYMMh~IsXesVhNjB#c6ndztP_;cOA&0rjb+`o)+*utIuX{cv* zEGn?08L-H6X#4ZO7De!d#j zk7m^}^RdDYsT=3?Dyah}2A0M3G^fK8~`UQC+9^l3tCerHZTYPb^u6S zua^LudKZC(3F}JCgLE`<9)>)I5Ms-{*wX8rb@e3q5*tD)4SbsZ_Si`L(KpefzeDlA UJ1YW~?;yat&(hHG5j%MQ2ldwrAOHXW delta 2241 zcmZuyeQZ-z6u)=xqhGIYYrC!=>$YxXogL$2pNs*6C9D%c(o`vi3})TRELr=?eXp`D z!cY?9H(PEZ2{A+@K}BOoY9fEBz!>ol48$nOOH2%Zs4+1z{KIH8@t#`>Lb%EMy>st9 z=e%>z@0|N?6+X|aD^;f*vGLPC+JRf`3#uQVUuYW{XhQo?QrKpH++jGHkQX(hr07FQ zsiz8*5i*pd>_digubQ;+QVd-mJMdxv-bRFj~7U`gn!ZoGO zgu{5Pm6@CJxR&3aoir^(({f|kiC7hJ!n&xZ_h)qYNHk2U*^Ag|S{ldh(iQ1d89V4s zWi58nIi*GByGrQ;WgEr?y6n7$o9MwhKW(b6_3|Sz>;H{}lb))J(M+SKDp5mEuk_G* z*%55Jt1-C-;vbbN21$vYuk%&3f303qE%)H^W)n)Ggok-(uQ?>J03!u)H7ZCcoT#Pq zjb7<6LIoMDJAD;z_ur{|ZbncNA7J*=_^7Z$vZI0}CDC+eZ8&L3$w_O2L8|GzXCpp9uX)ynt3AiFuVrtljW^WB zn`-2S8u@VRbv5#>+IiF3dEMGs>aVrnxlO31^Nt_~wnUJ=?mvV>v?|aWOChw| zof5i*yA;~OXcRc&L%!Rl1!c6EJ{vfW89#xf)kPrh#800HwtBmnXgYaU<}$jTp3LZs z#P0!2!ILw$!(l zTX!96Y;WDTR?Hh?MLk2t3Yu={Q_MhrmrmEe*CK3i{25j1_8#sQ-A-;QAi|II*dh)kbc z6_uJL@0~cEUKNtve6e(L)wGBwOP(%_Jx~oFp%^xCu@Vh!>u&X678<|Zj-m?(zpDS@ z2yxS~?iM@Tdb3pnVbVa~=)M&$v#QVNrkEy^FA)A&UMxJmG5S_dD6^BX=Ag1PBB0DxF~xE5oct;FnEUo1pS#B7(%j2Y2Lo2BtuYc|u^y zGY5$^ts8UNL~$xJNM2!6AW(mr!EFI!yiAq;pu7DCiX#3ZS#pOK%Ns-KsilbEOPl3J!;l39|Inv`F%Ig{xh FGXRON5XS%j diff --git a/__pycache__/room.cpython-314.pyc b/__pycache__/room.cpython-314.pyc index b7ab58a5f6d614af13055c41a8238d2ae3960f24..d7c763cd93dc71f5a4b811ee8c0c2513716fcd37 100644 GIT binary patch delta 528 zcmcbAmTB!pCSGkmUM>b8aAK{>(%Hy+gh@e7KO;XkRX;C3CoxYyCACbyB(o$ZH7UPD zH!mHC^fzB(5}(A{%*epNHTmNd>B*c^Wtq6Z%*`%Sbs5=9PlKeu0ul-e3c;ZP0scWD z3cil+PW~YZ9Y)`fmZ3|=jCMPr7ApH z)B1i#KQgHh5LB#Co|=;kbfY2{#2TPUJ}&-#jv=lJKA!F#A%32I?h0=HK?*LeVXi*@ z0luz&AqpX$zOGgZK;wZP%SOfPc2EzNvhNXnhSHCovwnZ zfww|&Vo9+=L1JaGLRx;2LT;);NxnjHNn)h}D3}z|it=+6N-}_q#G+iVihQ8EQxYp- zrl{yDgaD<(0)iDXixmvv2Bred%Fipw0QvzMdK0FtU}Q33n!K-1d2;LwZz*0+CixHi zBJxU~8ASM%zcYw%Dt`bGUvxGfn$gWD=+49-<;(bp$Ndub8SokMD>;FdHBTS6!n?Ev%PhxFhWMJT$Y&czRvi4LdW(6)V zdvoekEk>p)h0XRejxsVCGflqRr#xA6mbVm>CzJdKeolF%&kUUW%HJ6{Ih8+vh%aKB z`(|}B3KTLjNcl28;&K1P1{D3Mw^?h>7bZrw&GPfz85u=4r!Tn7%qY3pdPye}xdtP@4-cc&X9f^iBm{IS02)d--2eap diff --git a/configs/config.yaml b/configs/config.yaml index f02769c..5af98cf 100755 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -3,6 +3,7 @@ password: "zC1b9qCKT8Cv0D" room_id: "!ajyOBbqoCIbBhEqNPU:matrix.org" # Magbot Testing Space #room_id: "!HXiyYVEZOMRtkyvarN:jupiterbroadcasting.com" # Da Lunch #room_id: "!gJYEKNllaubNlNkFIj:jupiterbroadcasting.com" # The Main Chat +# Da Lunch and The Main Chat each have their own config (daLunch.yaml, mainChat.yaml). lookback_seconds: 86400 # 24 hours lookback_limit: 400 dump_mode: True diff --git a/configs/daLunch.yaml b/configs/daLunch.yaml new file mode 100644 index 0000000..a9aacca --- /dev/null +++ b/configs/daLunch.yaml @@ -0,0 +1,13 @@ +username: "magbot" +password: "zC1b9qCKT8Cv0D" +#room_id: "!ajyOBbqoCIbBhEqNPU:matrix.org" # Magbot Testing Space +room_id: "!HXiyYVEZOMRtkyvarN:jupiterbroadcasting.com" # Da Lunch +#room_id: "!gJYEKNllaubNlNkFIj:jupiterbroadcasting.com" # The Main Chat +lookback_seconds: 86400 # 24 hours +lookback_limit: 400 +dump_mode: True +dbName: "" +# vote_host: "agmninex.online" # Hostname where voting interface is accessible (e.g., "localhost", "example.com", "vote.mysite.xyz") +vote_host: "agmninex.online" +vote_path: "lunch" # URL slug for this room's voting page (http://:9081/) +vote_activity_hours: 6672 # Hours a user must have been active within to be eligible to vote diff --git a/configs/mainChat.yaml b/configs/mainChat.yaml index ce415e5..7e536e5 100755 --- a/configs/mainChat.yaml +++ b/configs/mainChat.yaml @@ -1,8 +1,8 @@ username: "magbot" password: "zC1b9qCKT8Cv0D" -room_id: "!ajyOBbqoCIbBhEqNPU:matrix.org" # Magbot Testing Space +#room_id: "!ajyOBbqoCIbBhEqNPU:matrix.org" # Magbot Testing Space #room_id: "!HXiyYVEZOMRtkyvarN:jupiterbroadcasting.com" # Da Lunch -#room_id: "!gJYEKNllaubNlNkFIj:jupiterbroadcasting.com" # The Main Chat +room_id: "!gJYEKNllaubNlNkFIj:jupiterbroadcasting.com" # The Main Chat lookback_seconds: 86400 # 24 hours lookback_limit: 400 dump_mode: True diff --git a/get_user_list.py b/get_user_list.py index a712683..2a48bac 100755 --- a/get_user_list.py +++ b/get_user_list.py @@ -9,7 +9,7 @@ import asyncio import sqlite3 import time import sys -from nio import AsyncClient, LoginResponse +from nio import AsyncClient, LoginResponse, RoomMessagesResponse, SyncResponse from room import Room @@ -78,7 +78,9 @@ class UserListManager: return [] # Sync to get room state - await self.room.client.sync(timeout=3000) + sync_resp = await self.room.client.sync(timeout=3000) + if not isinstance(sync_resp, SyncResponse): + print(f"Sync failed: {sync_resp}") # Get the room object room_obj = self.room.client.rooms.get(self.room.config.room_id) @@ -124,7 +126,7 @@ class UserListManager: limit=batch_size ) - if not response.chunk: + if not isinstance(response, RoomMessagesResponse) or not response.chunk: break fetched += len(response.chunk) diff --git a/suggestions__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db b/suggestions__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db new file mode 100644 index 0000000..e69de29 diff --git a/users__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db b/users__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db new file mode 100644 index 0000000..e69de29 diff --git a/votes__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db b/votes__HXiyYVEZOMRtkyvarN_jupiterbroadcasting_com.db new file mode 100644 index 0000000000000000000000000000000000000000..2f492163ac2300c655ddabc26a587c144dd04592 GIT binary patch literal 16384 zcmeI%O>4q17zglFMW^7)LFhF{i!vBH59US~Wm>gsVV+9085HVk;@GZZr+uJ(i+!IR zmu4#H+!rYSKoZhCPm=!3rT8%F#gfyf#d;P>dPy3@FvvBfgb+j3f~vc6YP_5KuQ$l~ zN3&Z0Ciz-KYM=El)uBKD0uX=z1Rwwb2tWV=5P(2N1%~;e*=`$S8BP)|R*CxH3oMweZ+eU##kS_*jCWL~_0}{>rfC}QCB5eJLUN&-+(Ev6L|c_|xg1B- zc06{+Tsm~^e%Bq-dp4$B-y7JDO6oJm>!g8c&N_%!(77v*m8;aAV)GM?P!)J*1`1 zZdtjad1V?To=5y;ix+O>LXQKj5nSjluddozdflpN(?}Z>2tWV=5P$##AOHafKmY;| zfB*!tDo{yZ4B!7*{dw_T5P$##AOHafKmY;|fB*y_00Aw4|Nn6jAOHafKmY;|fB*y_ N009U<00P+;_yNM