From 480ca9726b5eff0abe6d15c583403562194619f3 Mon Sep 17 00:00:00 2001 From: Lyncoln Date: Sat, 17 Oct 2026 11:58:00 -0400 Subject: [PATCH] Refined apply conditions --- .../applyconditions.cpython-314.pyc | Bin 1129 -> 1513 bytes core/runtime/applyconditions.py | 32 +++++++++++------- .../createlistener.cpython-314.pyc | Bin 1878 -> 1672 bytes core/server/createlistener.py | 10 +++--- .../synapselistener.cpython-314.pyc | Bin 725 -> 848 bytes plugins/rmass/listeners/synapselistener.py | 5 ++- savedata/rmmanager.db | Bin 16384 -> 16384 bytes savedata/tokens.json | 2 +- 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/core/runtime/__pycache__/applyconditions.cpython-314.pyc b/core/runtime/__pycache__/applyconditions.cpython-314.pyc index 0841e47195eec71693bb79b65a4ad2ff0de9971e..f69e748e607c551cada678d1808e236190560514 100644 GIT binary patch literal 1513 zcmdT^%}yFo6h1Sk1E`=yF;p$6kwX7SQzc4-#2;vE6EPztZQ^Faj5ro%$Yr#FbitBk zyQ*o@#HCGNpo=d02u*}wZd^3!3ux#A^jri*yXZnTJ;}Xu?m6Fg=euXlo%^K`BL~aWFe2Q;@@Y#*Sgrh!*a|t$EJV+vErir}UBt$v+ zEx;ITGDgEhZl=j_w?&g}(Il*+w(B+kQ7)DM$ni;Dxp{1%3&aw%ckDmXSN4WyEH)6{dF=EI4 z*!9kba4x}#U@I5*=WD|BkuZH??*Cz%u9&^(ly@p-*Rj)6bNZ@IUpe;EKKyQ{YM(er zRP6p^$M}cH`^bU!aI`u(d*ldy^?o0(hT;`R{A9?r?>!j#6sQc{qoeNsj8%ovOig^2PiF)^k=@PU_x7AS6Qb9+a^j0unU z#^WCKNqytd2Os?dh^|0xc)^m~HV5!c71>}tQ$bO%oe+B5q z%#)ykpG&~Z9)Ke*amDIVg%Mw^2O6gff+}Xa>KK3q=J$*fS`gJx5UYkqp8@DMco&Pe z)JQNFjFHzA+>d@lR-CgMeW+5Sau2A{H2hJm`JB~wkN;n-g;!g}chL=x-U9FD7Y~bV zfA>3vkJD#J+KVnrgBv%o}pUNa*WR6m~ne zW*3Z{u5FlljuZ--rL7tyw`>z5M~W6TFJ07^4NjY`&sHeOeqJcfl6v%d*&#X+-tjEiA`d#(_ilQ+OAh(>0`O8e8-d1+fye| zNThbwz4*1)^Obn!Q0^$d@GcK}a(1_A_oa7px*|^>wRi4yWh?DN>`KpZ{L;D5`&_%T zJmkp(?`A*T^+smB?A*RQ7t}r-gpSPVFvOB)=m{QYgsRK;K$5s6IH16y_X@UN%o`I# W#%=Wh@L$SFNDzb{VyBR-Vt)cB_w57# diff --git a/core/runtime/applyconditions.py b/core/runtime/applyconditions.py index 7cd6287..1dbff6f 100644 --- a/core/runtime/applyconditions.py +++ b/core/runtime/applyconditions.py @@ -1,26 +1,32 @@ -def applyConditions(definition, outputs): +def applyConditions(definition, dictionary): if hasattr(definition, "filters"): + print("DEBUG DICTIONARY PASS") + print(dictionary) for filter in definition.filters: - print("DEBUG applyConditons filter item consumption") - print(outputs["event"]) - - item = outputs["event"] - - #current_value = item[filter["filterkey"]] if filter["operator"] == ">=": - if item[filter["filterkey"]] >= filter["filtervalue"]: - print("Applying filters") + if dictionary.get(filter["filterkey"]) >= filter["filtervalue"]: + print(filter["print"]) + return True + + if filter["operator"] == "<=": + if dictionary.get(filter["filterkey"]) <= filter["filtervalue"]: + print(filter["print"]) return True if filter["operator"] == "==": - if item[filter["filterkey"]] == filter["filtervalue"]: - print("Applying filters") + if dictionary.get(filter["filterkey"]) == filter["filtervalue"]: + print(filter["print"]) + return True + + if filter["operator"] == "!=": + if dictionary.get(filter["filterkey"]) != filter["filtervalue"]: + print(filter["print"]) return True if filter["operator"] == "in": - if filter["filtervalue"] in outputs[filter["filterkey"]]: - print("Applying filters") + if filter["filtervalue"] in dictionary: + print(filter["print"]) return True return False \ No newline at end of file diff --git a/core/server/__pycache__/createlistener.cpython-314.pyc b/core/server/__pycache__/createlistener.cpython-314.pyc index fd427326c6788e42e8a3f28d97df6b195f5e4a0e..b2b6712094eac67812ead103f949e57011839a60 100644 GIT binary patch delta 238 zcmcb{*TKuH&Bx2d00gRim$N=j0&St^{ zVW~qXhID2I1{nr#pgM1f$vc?rnVExFCjVkmW@Mc##~jMYHo1gZRgm3;5u#k4A%azz zL6c+hDrVEo%q;1Q8cIM3HXtr$0V-)=c)-rxUfEcAon87OyYvi?>oWQmW%RGJ8(f+^ zi8YJ&ivWXw{EUk0{CZdT^(LFMRWS-q-o%zD12SYKLyWHa^HWN5QtgT~ LChM~+vw&m(8bC6~ delta 428 zcmeC+y~f9@&Bx2d00e<;m$N=h(IdLK!(H|6o!TBr`wn7Heu*YF^3aWae~64HckmY(QLW1ay1@!vl8i_R7Y}>+I4O z*`;TAT$jxCp>}|gfy=3XaX4% zRC>Jc04enu>Q{x7uJ9;7;g_3Hah>1r3cumxOx7w!;mJ=}6JTZlX-=wLk=EoyHf0u&3;@4QS|s1Z ph`7NaG{NNthv)@y1F)nXl4KY{QXMR543U%;=4NVQFOmkD3jmjQT;%`& delta 205 zcmcb>c9m6Kn~#@^0SI(EE@yQxF)%y^abSQ0%J`fyQQcKTpE-y-NFazONHB;mNC?am z2J%FJJW+jSJ?0XQATebIP4S5f)=e&8RFS&HQc_uvTE%2*Tg8{FSCpThtCyQvT%4Gm zI{78z7A_f};fz3B+&_6aQ-u8ob{1B)4?GNERa0pFsxxpcNLEHdII1C}I4iOd? N;AU!KFOmY90stf(F>3$- diff --git a/plugins/rmass/listeners/synapselistener.py b/plugins/rmass/listeners/synapselistener.py index 09c9a86..02a84aa 100644 --- a/plugins/rmass/listeners/synapselistener.py +++ b/plugins/rmass/listeners/synapselistener.py @@ -23,16 +23,19 @@ filters = [ "filterkey": "event", "operator": "in", "filtervalue": "state_key", + "print": "Excluding state.key event", }, { "filterkey": "sender", "operator": "!=", "filtervalue": "@lyncoln:loxthelion.com", + "print": "Excluding message loop item", }, { "filterkey": "type", - "operator": "==", + "operator": "!=", "filtervalue": "m.room.message", + "print": "Excluding non-room message event", }, ] diff --git a/savedata/rmmanager.db b/savedata/rmmanager.db index 8b30ea3ac6b978a8ac4fcfed61696435f026d6c9..b669e955ce2237bd695cec3c19ee0c1154e6bfbd 100644 GIT binary patch delta 702 zcmc)G-%f&10LSss+FI9b-K6yZjdl*C=tXUaC`UX9h#+ic{4qgL+Eg$u8W*{BS@TJn zPt#5B&=b^J*KOUjUf{Ry?~~_5o)b?;#QM3w5$l)hs9;NVoJkXQj;5u+3Q!qqZV68i z#2QX9mj?Dsy+xBaaQTwnhDyoceW*mW)P)gkYEf!|1+6uG=+b)ItG9Ho;m1}_T3Ss^ zW1uAFhAdw0ea%sr+uUCq>ZBKOPWQ-z5S# ztN9^24Y_3(FCuRkBM3;x7~*+N69bM5tebHewy_BSDNze=W>O{=?eU8CRLg2fW5MVH t81@B?qgG@Gh*h*SGJE@R^7;>^gTFD|c{td8Jl)^C7t6n(9sVt?@(Iq}xfQtZ^mH ztLdbB=n87BhHPFR{DK8CGnO=NDFmc@=L!_i1|*mW zn8;Q$pvJB>Rp!EE=C)bUGs_Krq${SPG135otftZ{@rD#Z8wQG@H;3MEECxPM>P$z) ztBKl?7gkjhO5CK%1Sw%~D=i^u3JY64fHkPNq15a!cCW~UgE)Uj1(cOj@avZ?d)h_re@YDO zf*y9-VH4n-8Bi5=y+RKTzrqw7uQZ%3r>z>V*IR diff --git a/savedata/tokens.json b/savedata/tokens.json index 4f64dc8..4889e90 100644 --- a/savedata/tokens.json +++ b/savedata/tokens.json @@ -1 +1 @@ -{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyNDQyMTEsIm5iZiI6MTc5MjI0NDAzMSwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MX0.9dWUqLM3EYm68Dvk4_BzlEgbxJky8OtJtufM7S9MqOFF3gB3waVX9Q4usf4fbpy1BokDou8EJ4y3mR26PDrQnQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4MzYwOTEsIm5iZiI6MTc5MjI0NDAzMSwianRpIjoiUDNkY2JFeVRYRTBOc0tDTS9vNG5NMUtmRXVLdkdhNmlMRHBWS3AxSWQraz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MSwic3ViIjoiMjM4MzAyIn0.ttcy40iHuhgVqXq1zgRre1Xxufs3m2auyKFTPsl9qHCFXIz6xixABmy4XEvTx5960qPlMtCtRiqOLWBf_-Bqcw"} \ No newline at end of file +{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyNTE0ODAsIm5iZiI6MTc5MjI1MTMwMCwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI1MTM2MH0.BhkAmkCuSMtld_oI10-bW_MsBTKiCCiZfg61LMY00-N2tdnY2YMKagx3dRZZJNgHWX01kXHTC2x-O0K9IuWzaQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4NDMzNjAsIm5iZiI6MTc5MjI1MTMwMCwianRpIjoicE5VL1Q5WEh1QlBwc1l3YTlwZ0t3TGh1c3VLdDJVdFhoZUNuZGM3M0QvYz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI1MTM2MCwic3ViIjoiMjM4MzAyIn0.RahV0ZwvoAvRjPSFeza1eP7EHoP8zK4JFUIh7L7U9Pe9MCcJEaWoi7b7y0vXvbPSx3uMbkxzgOsMI8WYYtPRKA"} \ No newline at end of file