From 434d0408ee547bea73bfb79129b15708c4a22761 Mon Sep 17 00:00:00 2001 From: Lyncoln Date: Sat, 17 Oct 2026 10:46:20 -0400 Subject: [PATCH] applyConditions filter added and in working state. Needs to be made more generic by removing specific output target --- .../applyconditions.cpython-314.pyc | Bin 0 -> 1129 bytes .../__pycache__/outputs.cpython-314.pyc | Bin 1199 -> 1199 bytes .../__pycache__/recursive.cpython-314.pyc | Bin 1414 -> 1290 bytes .../__pycache__/resolver.cpython-314.pyc | Bin 1925 -> 1777 bytes .../__pycache__/skipstep.cpython-314.pyc | Bin 846 -> 846 bytes core/runtime/applyconditions.py | 26 +++++++++++++ core/runtime/outputs.py | 2 +- .../createlistener.cpython-314.pyc | Bin 2114 -> 1878 bytes .../server/__pycache__/server.cpython-314.pyc | Bin 3683 -> 3681 bytes core/server/createlistener.py | 35 +++++++++++------- .../rmassmessagepush.cpython-314.pyc | Bin 872 -> 872 bytes .../synapselistener.cpython-314.pyc | Bin 494 -> 725 bytes plugins/rmass/listeners/synapselistener.py | 19 +++++++++- savedata/rmmanager.db | Bin 16384 -> 16384 bytes savedata/tokens.json | 2 +- 15 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 core/runtime/__pycache__/applyconditions.cpython-314.pyc create mode 100644 core/runtime/applyconditions.py diff --git a/core/runtime/__pycache__/applyconditions.cpython-314.pyc b/core/runtime/__pycache__/applyconditions.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0841e47195eec71693bb79b65a4ad2ff0de9971e GIT binary patch literal 1129 zcmbVM-%ry}6h7@XI$*ku;t(WKUHCB>%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# literal 0 HcmV?d00001 diff --git a/core/runtime/__pycache__/outputs.cpython-314.pyc b/core/runtime/__pycache__/outputs.cpython-314.pyc index d4124be06fcab78cbe3ced5146239dcd6ee9702f..aa58071ab52b8e95d8ed60c83c988ccba76c95a7 100644 GIT binary patch delta 22 ccmZ3_xt^0(n~#@^0SKgh($ delta 22 ccmZ3_xt^0(n~#@^0SIpMT+Yhd$h(LI06NtL!~g&Q diff --git a/core/runtime/__pycache__/recursive.cpython-314.pyc b/core/runtime/__pycache__/recursive.cpython-314.pyc index 980851dd83bc1c940376dea9e6e81772bef65044..4f3c28a1ec9b5fbad15247808609a7023b7c9cb7 100644 GIT binary patch delta 170 zcmZqU?&9Lp=HumJ0D^dp%URo*H}bt@VicPEhe?6y5W{3S=2%9(i4XK9uVU6w^EO~$ z;AD_v2xC-c&}1%R1?nkc0}<>%LX)Y81H@*Y9K)i;B?4p$0daBC(s}vf)s&3 z7-JB#jueCqB25?}Y;@>3rO!uh9V)5X#zmv7Kcr4eoARh ps$G#JkPGrlu{eF9tjR5}pJRbl6 diff --git a/core/runtime/__pycache__/resolver.cpython-314.pyc b/core/runtime/__pycache__/resolver.cpython-314.pyc index 4cd847b8a933b9ff8b17e7bc9e6d58f473764ab1..f3f5c4f22325bdb71068579340bb44e0d2a24839 100644 GIT binary patch delta 201 zcmZqW|H#X$&Bx2d00dkbm$NJ;@;Wk3nCP#?xN))^qx8n9HB5}DAl77EW*tVW$x+Nj z65cip44e#d3=zCxOcC5_K%HSs$_$!plTBERnKaoax3QQ`KE!g8OAaW*2*ky`o2Rmt zFvfglWsp_<$j+eZ#rT1bK|!~}V?x+P9+?N+!VUhPf$A9iG#QIPnpQFt$pfh(Ss-zX h!zMRBr8Fniu1FEc1)B$Q?FVK?M#e8pYK$UawE)u5D~tdD delta 373 zcmey!+selHk=K#&!9;&8#+#Gn7^OE(tzly91+gaUGV3q~OpanM zs*m9ZsRn@{HWNk&OP&EC8pewd^$ucS;AD_vh~N!lir`iQDn?Sr6vVD01QRZm}1o7U$=brQTvrPc6B{nVg?jTvAjz`8TtSe3h_^tFymfa7a+7bBIESYjB9C zpZhJg;?%s9)FMre$&xIl?6+78iZb&`Ci}6R=": + if item[filter["filterkey"]] >= filter["filtervalue"]: + print("Applying filters") + return True + + if filter["operator"] == "==": + if item[filter["filterkey"]] == filter["filtervalue"]: + print("Applying filters") + return True + + if filter["operator"] == "in": + if filter["filtervalue"] in outputs[filter["filterkey"]]: + print("Applying filters") + return True + + return False \ No newline at end of file diff --git a/core/runtime/outputs.py b/core/runtime/outputs.py index 3719817..f5dc045 100644 --- a/core/runtime/outputs.py +++ b/core/runtime/outputs.py @@ -20,7 +20,7 @@ def buildOutput(response, action, outputs): for output_name, response_key in action.outputs.items(): if key == response_key: outputs[output_name] = value - + #print (response_data) else: print("No response received"), diff --git a/core/server/__pycache__/createlistener.cpython-314.pyc b/core/server/__pycache__/createlistener.cpython-314.pyc index 4ad6ddc857fea3f447471b6265788126d340e4ee..fd427326c6788e42e8a3f28d97df6b195f5e4a0e 100644 GIT binary patch delta 732 zcmX>kaE*^on~#@^0SE%yE@ypUo5&}@XfaV;)gg`{h{coDgRO*3o*{@;oS}q0h*6nA zlkFu)t)C|2E$*b!%$yYe(vpJG5+Ij9v7jKQ(m6jbC9@JW+{omqr|L59H_=pgS< z1_n+BIgq=hCz~@XGRjUiWD*u+3u1?9k_X8_L>YrPP(#xQ5mF9m=ocE zFji%dPF1jZTnO<9ptvUYWO){IrJTg1)SN027gwiHcZJN7)Lez))ST30P}tsLO)X2! zE17(p#eh+G@(-3+)*=?5>nCTh*0HjHlumxb8px#r6k-G7Vx!6KYz46&1QDm~tJ zfRy?S^{YZkS9p}4@XO7pxXy2Qh2QX|h|EV}22raIdXt0M^Bg&fgn`!G5=qW4O4TbW z%`3^wP1VZ>r;p+yP%^kBgCYe^Fv;))Q^Yd)KD(R;D9sds+`f{bNEO6Z2I=Im$<0qG q%}KQ@(gJcpNuXE^NPJ*sWMsU}zrH!!% zJzzqjWsTwJQ9a>BIe7BKv809KDu#oJ@rIEuXBulgf8!EX6`dOk2h$M?SfrtF5;L{#VHr&c3Q}IhVF`E-hi*^Hr>NuLe zpWvnU*RaPDjg>oRbqZY>5i)?)GdqyJVSe`#09i`ISzN=lY6M6-n4_pcED@oCNGFc0 ztYFfQgsE_MUAS>&5A9fL^uZy25&%~BpA$_!5I9oTXmE%l2OL>QH*sr`)sM~qkf?h< z1YovT^^Ab9Rn4`Cnm$m>l9Mk0Xa;>Cf`#oGL(OiiX+0uFzgpKKYhe9GRnD%+{ELLK zEq`&G(hzQsx-=Oz3%k`!i!9x63DT)}cr;YaSVm*bAeN_9dW(+~FNDrry(l*e;+zPh zcVS+p1el3KzR-0hmCwYuRAwy2&5O5TD#>NMF)m%Oqs7}$!t14hAkz77vxL8#P5I54vmAg;H|cmj$%f$l5o;5>}wL@2!^ z9#JH`kHn;I^0Iyqfh3y3JxL_9#XUV}rWX>6^p@FLv-#F-zLlm8Td-yxE1Sm_Lf?&T z&)tjDUr`vWnOy58*Q=QglecR0?Jzydu*x_;w_3KCj%WF&`DIImag>jZSDEqs;)#{e zhlzI+tI0J}B`{TGrW&Z773OH!71*>ffjtWJdR|*VV{ZVjJR7gPu-tSi&Bb#mc$yzZ dTjdK1?P%G>F%0_x4BKF68~FE#VXS@s&>wl>)IR_K diff --git a/core/server/__pycache__/server.cpython-314.pyc b/core/server/__pycache__/server.cpython-314.pyc index f84e151fdf6aa594b4846d64ab86a54b2ba9d3a0..a1d6105eb379470f7cfe73d8e649b1ce21dc51f1 100644 GIT binary patch delta 90 zcmaDX^H7FQn~#@^0SJ`UE@#c<*~mAYOGq5ZZD6>=!Fz#E+{ibbOGFaLZD6>=!Fz#E+U(PzkypeAa6C=mujZC_Xe3S1piE{|@aWgfre^8nHk0}cP DLn;lU delta 48 zcmaFC_JWO1n~#@^0SF|&UCIh!-N?6yiBV+oMkZZGwaNFH#5pvjxS1N*KiEwE$CL#C DH@Xdk diff --git a/plugins/rmass/listeners/__pycache__/synapselistener.cpython-314.pyc b/plugins/rmass/listeners/__pycache__/synapselistener.cpython-314.pyc index db393d2cfcc26fc3f26a5e3009858c6d93f2e8cc..2440a4afc0b6435df8d21dd23e1c2fca327a9f1b 100644 GIT binary patch delta 351 zcmaFIe3eyQn~#@^0SI(EE@yQxF)%y^abSQ0%J`fyQQg`oh%1OEh&PBYh+m&Mh&xCC z$P)zegupyuAWsCy6V+$dV=mzc5>sZ-6rY$@R?nJRmYP>`i!&`VrzEu~JGJr_M}9$S zQDRAc(JiLTyj$E5iL%6;($rg=#U+U)sqr9HY{jX0DXB$OOp3Nu;tn~LdCB=Xc~&|3 z6(t#|Ihpx+ddc~@w^&Ll3sS3?Y;CLfa`lSx^KcnhyXLy=OrH delta 114 zcmcc0`i@y$n~#@^0SG=QT+T9KWMFs<;=lkKl=0bWqPjJUGJ_`1#3^OM{Q0FNN%^ID zDY>b|#fj;uewrMUn;AnUKVS^u5&`M}n!-@*I@ylNj{gF$+y{0RUZy6_A|aqC0C1HU A`2YX_ diff --git a/plugins/rmass/listeners/synapselistener.py b/plugins/rmass/listeners/synapselistener.py index 69a7bd4..09c9a86 100644 --- a/plugins/rmass/listeners/synapselistener.py +++ b/plugins/rmass/listeners/synapselistener.py @@ -15,7 +15,24 @@ execute = rmassmessagepush recursive = { "source": "events", "reverse": False, - "label": "outboundmessage", + "label": "event", } +filters = [ + { + "filterkey": "event", + "operator": "in", + "filtervalue": "state_key", + }, + { + "filterkey": "sender", + "operator": "!=", + "filtervalue": "@lyncoln:loxthelion.com", + }, + { + "filterkey": "type", + "operator": "==", + "filtervalue": "m.room.message", + }, +] diff --git a/savedata/rmmanager.db b/savedata/rmmanager.db index c5cc505b80d3c12269a7bfb57378774248604b21..8b30ea3ac6b978a8ac4fcfed61696435f026d6c9 100644 GIT binary patch delta 704 zcmc)GO;3Vw0LSss+FIwfE~&kMRzrD64jx1xApal_BD9$yiXxz*APt&8go{Pz8Q@*K)@==luVzLZ+f_VvLpnVAubD!t}>%(-(o9H zdeX|wimP(t=z9+XO7Yk@)xyw9QP^Rl=|l_kpqfqO)wrrBk-bLzni-|HjM`ayM8LKf zoy+jVNt&deqB^}%6O6#&pyPqC70ON^wtJ*KxFiEBF5b&*MWCb<{Q71`Rr=8VPl^s- z5u;u=Xaj^ce7sI=Ty#KY9z7W*yqng=kPjmpTq^_!M20~oBodpNPDp69wo!YyOsnL= tr4~`0=Ft@KX;dH(hfsQvw*9&AqzpDvDzk23Zb+rfTqr7t6Z>wN$K delta 704 zcmc)GOHRU20EOYym>9<fF&)!m6(+pu29pr?7dWG-|drecdV1I?Mx0 zc1O*Yyv?PHC;Po&)Zn&{#dC!fo6|)!q^Lk00|wWSUCKwcS@1Ygp`GPKid8Sfmn&hc zqIp<>(qvR;*m%KHhT{(&21HN;Q%PG5Xq>>?x&jbAqnPbSx|-RS@9Teiv*R;e?CvL} zisuZb5(PN#T1Yb$cCZe4aY0TQcTSY!2qB|S#DWVAi=#1@^$E6G$ab2m wz6mF`UR$iLL(rR%Jq+s6)7kO!)#>gO+l9@bX+28K`Wg#Z8m diff --git a/savedata/tokens.json b/savedata/tokens.json index edbae19..4f64dc8 100644 --- a/savedata/tokens.json +++ b/savedata/tokens.json @@ -1 +1 @@ -{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyMjI5MjQsIm5iZiI6MTc5MjIyMjc0NCwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjIyMjgwNH0.ZAGwq0DlacX_VBfysDOu6pAlt1FzwccZe1zIlMZcozOs_C7jOiOhkC-o1BH4-UPxe_MniYKux3s5br6kwJHFqQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4MTQ4MDQsIm5iZiI6MTc5MjIyMjc0NCwianRpIjoiRmVoVGM1cVFwQUQvRWtjYW1aLy85YllLbVB2ZEhPSXYyUE9YM25aTlhPRT0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjIyMjgwNCwic3ViIjoiMjM4MzAyIn0.BOPpuwg88qWk5A0XciE2wi_4mC6V9jvnQzWms0vxIkWctsGMQnhLABzuD8Zjofdf1qK5pQXxf9010SYV5c9r8A"} \ No newline at end of file +{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyNDQyMTEsIm5iZiI6MTc5MjI0NDAzMSwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MX0.9dWUqLM3EYm68Dvk4_BzlEgbxJky8OtJtufM7S9MqOFF3gB3waVX9Q4usf4fbpy1BokDou8EJ4y3mR26PDrQnQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4MzYwOTEsIm5iZiI6MTc5MjI0NDAzMSwianRpIjoiUDNkY2JFeVRYRTBOc0tDTS9vNG5NMUtmRXVLdkdhNmlMRHBWS3AxSWQraz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MSwic3ViIjoiMjM4MzAyIn0.ttcy40iHuhgVqXq1zgRre1Xxufs3m2auyKFTPsl9qHCFXIz6xixABmy4XEvTx5960qPlMtCtRiqOLWBf_-Bqcw"} \ No newline at end of file