From b5e6d4eaea03c160d1f7a641b90ed2cf8262f384 Mon Sep 17 00:00:00 2001 From: Lyncoln Date: Thu, 15 Oct 2026 14:37:17 -0400 Subject: [PATCH] Fixed HTML message formatting, Extended resolver for get, construct and transform functions, Added entire message history with aliasing for personal matrix account --- .../action/__pycache__/action.cpython-314.pyc | Bin 1174 -> 1174 bytes core/execution/action/action.py | 4 +- .../__pycache__/resolver.cpython-314.pyc | Bin 564 -> 1404 bytes core/runtime/resolver.py | 20 ++++++++- .../server/__pycache__/server.cpython-314.pyc | Bin 2889 -> 3481 bytes core/server/server.py | 25 +++++++++-- .../__pycache__/getmessage.cpython-314.pyc | Bin 734 -> 736 bytes .../refresh_tokens.cpython-314.pyc | Bin 873 -> 873 bytes .../synapseassignspace.cpython-314.pyc | Bin 870 -> 887 bytes .../synapseassignusername.cpython-314.pyc | Bin 895 -> 960 bytes .../synapsecreatedmroom.cpython-314.pyc | Bin 1082 -> 1203 bytes .../synapsecreatespace.cpython-314.pyc | Bin 1149 -> 1157 bytes .../synapsegetroomid.cpython-314.pyc | Bin 692 -> 776 bytes .../synapsegetspaceid.cpython-314.pyc | Bin 749 -> 787 bytes .../synapsepushmessages.cpython-314.pyc | Bin 1084 -> 1396 bytes .../synapseregister.cpython-314.pyc | Bin 854 -> 871 bytes plugins/rmass/actions/getmessage.py | 13 +++--- plugins/rmass/actions/refresh_tokens.py | 2 - plugins/rmass/actions/synapseassignspace.py | 11 +++-- .../rmass/actions/synapseassignusername.py | 23 +++++++--- plugins/rmass/actions/synapsecreatedmroom.py | 26 ++++++++--- plugins/rmass/actions/synapsecreatespace.py | 27 ++++++----- plugins/rmass/actions/synapsegetroomid.py | 16 +++++-- plugins/rmass/actions/synapsegetspaceid.py | 17 ++++--- plugins/rmass/actions/synapsepushmessages.py | 42 ++++++++++++++---- plugins/rmass/actions/synapseregister.py | 6 ++- savedata/tokens.json | 1 + tokens.json | 2 +- 28 files changed, 169 insertions(+), 66 deletions(-) create mode 100644 savedata/tokens.json diff --git a/core/execution/action/__pycache__/action.cpython-314.pyc b/core/execution/action/__pycache__/action.cpython-314.pyc index de70e626124df482097b18809af0eaaf1f4f1d4d..de9cf09f042dd7245d4f6df1e1f55827236c54e6 100644 GIT binary patch delta 72 zcmbQnIgOK7n~#@^0SKB{FJ|4^$Q#YX!CsVFmReMtI=PTZmg^P=l$SDjGLt525hqaT V?Ig{S2oDo^{sXB9t6ych1bYedn8_iS~HA z0A>E)zaG8e0QSvITZp9`cB4{(6bPV0iVVYqEn{mt;mYHOv2gf1o>m|Zs%@zq3lhdn zTi#<R-rpV;ymWs=5#|OQwOyZC;Qzo7;T;TPr!KB!uTY`scy-I7;hp*vgB;{ zBatOnTmP7=Y^a5ToKOS%Yw_?X9qB}-lH{qQP9^seGIJynnYQj{664yUx|53*OY4%e z#nL^CCHpZfrH^6B-ihUe4$fH}{3&&x;5qod*Jx*ciNEv>z%ovvACi3l>7OM}s|%ba z^X`*V785p{U1Xp71hW&gi*Pk=ac@=CW#JnIkXXSMtpMSXtE=uglad z%HfXjEz5c4P;&}q^SlS5VAP77FDs1KN@a>RSD~!SW_r!Mw$ahx2Vt@J!%{(sXXTY# zHckr#xhO9yG@dC@B~HslJ%>gM4UMU*%wui7LY&lx>CB1H#_?YPu;SsYb({& zhEv>giiS^oHn%zVe5B?(+wfi3^gcHp(ACeAj*`CW0oE-pOvR(T^3ta|qS zVs+uIAZ~?U+8e@|zlAeKB=$$-Mda1w=8cUj#&Gnv%Req)k?2J%(jWYFYD@oRrq(yP zo;>it7a^<_j&BU?^#%|6A(SA^f&bMGM|Kvs7hiu_3tw)86T9I=J$!AqH;BbUk)7Cf ztR6c5^hWiHAq>@ovFB5DA!bC+ZVl`WjvqQ;cna%|Tqn&g=v{x1M%lY3=;#?m{P1K%P~q#c4L&Ec+g%W zj7gb6lkpaNQEG91PFboZ^DXv_#Nxz~lAon4?M zs?4qGp{meGReFhf$g#IxdM=Q*m&&LpsVr3GP^q^T6{J=@_02Ae4SlP9^XC1`do$mg z`LXrOc%&~9RuE9vOy$1e-;BiY_U47nu?3|1u9F$j7H1?|N}v{$LaINCRQX+LMBo7k z*$rwSitI*J0sfMT&!cp3bK79eVml7AK{1Xa?5-Fu6Yzx)`S4p1Hc$@pU`{F;IhGSB zi!#T{x;B?D{BX)cthc$cidEl;&y}53{AYdGA2?Ko<>j*mgfhYZ>r|nZQYEk_alIvT z`_5dFY9FjQrmt#+_0XF}$<|7C|J+BWw%(XG&7!`Pw{@d5c;7NgRwFF_u-mfp z_R8B<_vK`_@qYKmx6)EoG^t*)t6@tk6&9&xnc%EdgU<9lEnm=RHONh_Y*odzWxc4u zKy_PV--}avtLhdrlP?vD8XYJYi@e4NWVEgW+d%trxDx5vlY3vtq33e@uH61;cu!9J z!e_BvIrgZllD@JhPn;(IrF%)Elr#-$CvT-i%A2lA z_|)AS?+A_zge)!_RD;Mgu1b!ATD)D8l%E8^W#_5wu1(K_CJMiGdk{FBemMFl{-jWe z^?kkYb9iE7`Zp4&gnFJ7zRFgVi+iO11yP=p*e;1ZBkj(SojNVv=e)4P;y07{DlW%S z9A$l(bD%mywQe;@mRvZt-UDy5dkVBce>ICZe$>>96HfGh?>jgl delta 1115 zcma)5%}*0i5TCc(ZMVDI4}rGSwssLh1#BUaC<%m*#G;9y%|Z$$O|&U1si|#wyI^cg z@J2Ky+PsS%{13cw^hh9TJa8}`8vGwfAkmw?x69Icb2d9O`5d``DMTf5h*T zfXbVm!^c5))8C8UHB(JR^F+W5Xs92C#O85L5@-rf-;-Cnd%_GF3_%}gd;~OCp^KF> z8D|Mp>aG~XAkXDO&9^<<+V9#iL4aIIop5g0>B&iWg$Vow=HaCC+|I{CsArir>t!|+Ny2T@n~DgX`AbJ(6-e) zPSmkUxbqsoMVpNfRZMt(0;o_3lT|TJK8um1%WMX9xnm0Avh3_3**P6=d&vZ7QeB>r z7Zz<>Mul?@xhv$Wm`cc<*$cP~lY9coNQGsK2^Y^g(2&ybjAg8+5na;pmX6g**)a8L zxw@{_s%pK4O|=o4E0y%R$*@wbTGdNtxmGoZhEga>8Yni|Zn z1*rPHLrZ^g$TxZnRN)I0!)#S@--}V0eDe+jTP`-GmfId2R>&W3M8Nb20trhGy-Le% zSd%5sr9Qzf{vh2*D>Omv5NxrLJ9dXBXbNL*tP&(|1x{U@cl3MW+9^$=79 zLqW{06CNNRm13G*5sL$6H{9O4MN*u4Qd`@s=+k(P2H1Z!Cdf_Sb?MYKjFML3Uz&r~ Ang9R* diff --git a/core/server/server.py b/core/server/server.py index 6bad3b3..a2f7e6e 100644 --- a/core/server/server.py +++ b/core/server/server.py @@ -8,7 +8,28 @@ from .createresponse import buildResponse port = int(os.environ.get("SERVER_PORT", 19001)) +from http.server import HTTPServer, BaseHTTPRequestHandler + +class RequestHandler(BaseHTTPRequestHandler): + def do_POST(self): + print("POST request received") + + self.send_response(200) + self.send_header("Content-Type", "application/json") + self.end_headers() + + self.wfile.write(b'{"status": "ok"}') + def startServer(): + server = HTTPServer(("127.0.0.1", port), RequestHandler) + + print(f"Server listening on port {port}") + + server.serve_forever() + + + +def startServer2(): server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server.bind(("0.0.0.0", port)) @@ -22,10 +43,6 @@ def startServer(): print("Accepting connections") connection.settimeout(30) - class RequestHandler(BaseHTTPRequestHandler): - def do_POST(self): - print("POST request received") - try: while True: data = connection.recv(4096) diff --git a/plugins/rmass/actions/__pycache__/getmessage.cpython-314.pyc b/plugins/rmass/actions/__pycache__/getmessage.cpython-314.pyc index aa244986f0ae51242a7aa2105dced7dc325a9999..48de30d75c994d18e529ca144c2d217ff81056d2 100644 GIT binary patch delta 293 zcmWMgJ5Iwu6x@$@?Ku91#7SrX(SQ(M3a)_Mfi&U*5waqX2vWQaG+3MM4?YCuKv2Gq6wGp8@tp5L=#X=!88Nc91a8|+?*+@ zsCM9C1fgiow1AH>0)&W^y=sZrPJ&c1?P6l}0j8KC!(1^eFjWMZA~wslhvg|bKYR;{ zQXfB;Rkh02Wwn>92mSc6x!?2R#?rdf&3D%}^pcA9hgNrAwxi*c(%zlb&fvzD!nF2> zQB+Ig5#je<)TJk%*IjaEI18lV&Y0D%Nr=dM5%03jSs1}RRy!tWU)k+^+k5eDV!cF~ M(D&Jg+#cCC|8FBlqyPW_ delta 254 zcmWlUKT5JJ^|9%A3)|SiF4COPcRX-BbicxC>>aVw{dsg= z*wJlKmRHwBxvD?o`g@VAbXnX@irK~FX8kT$^UTLwHebBtAI+FXCt+(2-fSBkcY;Ey p{4QcDTdL$GZRMa-T2m#vw7I9t{(Pxj-6_%YIuiu+=*V-___@+6=wo;D7*lB zLgX3JM~IPFfvsbLg0cjS6xuQjT9%x2%2TI iCyO|FG_(Gw)>(N}9yDp(PMS!yc&eJB`r#`%2;*Obm^Wnr delta 245 zcmXwzy-EX76ok(?d-v{NcHP9^M2Ui|8ic#gp%%hCfW5Y!!bVJKxw0TWLRz0d@&-Yh z^n!K3!qyu|28Q{j7??l%W1r58JSDH{Y<4#lqVHu{D_+6xgNHHQ5cqaIz3+osWVnj}mAaz_DHOSCGj>0!_tRXhkqC^+AX7o^Xk$Bj2p+?xkHg>R!y;{)6 zpcak6$22;4nVh_TT``yKp}eL?{tSEHPudR|R{3W!nwz2-G@WJi-!5n6>D=T^_WZa= Q!c4}|qHNRP)(rjV9|rC)u>b%7 diff --git a/plugins/rmass/actions/__pycache__/synapseassignusername.cpython-314.pyc b/plugins/rmass/actions/__pycache__/synapseassignusername.cpython-314.pyc index 97dcfa82594fbb7ae00fdf4f217e1c5c8617192a..0f656dfd077183fdbf4e6b596b25460dbd8f7b8d 100644 GIT binary patch delta 421 zcmXv~Jxjw-6wS-mdri|e*49?rN~uE;H9=fNkm}~9Ty)T-)b^>7v?<9`w39zU$>QiJ zIJ^4?#NZUN`Ue930DVDw;BxP|oO=%3AN38lSMoVc;0S-h%RNaDzEUy;{vW=dAKJSP zU{iqFJ^}(6Af{-Epg|UN$N{zxq>v!lvxJK zFb4`$pvt}GVS!(3fR=>i`or7CiF8g`ton2`pk7R_eCmyQLmK0;=bqUPjWd0Bw#bU0ZLI%vHz zDO&^EA3MF1sj*#fV5L(#uh<@>mV^R-`u)ELXHdQj2Pm)wALqPMU!sEjKnJrEp&l<;6&@O~)jo Q5b;hc7n?7R@Ka>{GV=dtf5)2XwVhs`w647T0 z5)Bdq>gNh#RA$hWn0Uo_G7qElckx*(wbft8t?se%0i&*TthO$GZKto#!s fF0e@5U@=56ML%$}aWFNod=Q#Ei&=?97HAd#APH7= diff --git a/plugins/rmass/actions/__pycache__/synapsecreatedmroom.cpython-314.pyc b/plugins/rmass/actions/__pycache__/synapsecreatedmroom.cpython-314.pyc index 8e3f619cada1d3dbd5da208f21fcb3b6a482ab11..9f71236042a8e93fd65fc3c64c9831323c70b718 100644 GIT binary patch delta 592 zcmXw$O^ee&7{@b{WRgsqGni z_T+g>4vHtggEueUJg*)ksYMy)- zZYI5u06mtN1ehU^83u*PpaO9u*xE;+fexC3T?__LC_x#Bi@n1K3Eqa4g|q&-nsD_+eo?4~`}7=X3aKo@RiQ39;-EvA3YQsymbi+#$iYm5HE6>X zxC++nm)9}iQOjQXsgk;jr?GD`hqs@+c_ zFHL)ep7?1Tj{U*3ayN`8?AQ;3cAh@QZXeQIw|`b|uTyT)D&Zx&gl8J>W<9xMQZ8drsH#f1m3@#O lwQqHFJX81qlBhi+oJi^el&h7~)|t}gYW7FIqjbf?{sM`fpxOWc delta 420 zcmXAl&q~8U5XN^myW2F{v|9Ve`llA9t%wO8L=X>xpy)-J2e1|!vD!3}EK0Z*A_oB#j- diff --git a/plugins/rmass/actions/__pycache__/synapsecreatespace.cpython-314.pyc b/plugins/rmass/actions/__pycache__/synapsecreatespace.cpython-314.pyc index a6a7e334d3a3063acc5376af5bf3985c17c69f9b..1ebc72ebc46472e33ccd44f629f3357176bbe996 100644 GIT binary patch delta 438 zcmXw#xlY4C5Qgowy;&RQ;LHUELc%H8Akos$5m8M=XIa4@BPWj53rYtK4}exk(D4#H z1PyXQ5xJ$L*%tt@iD0DB{NJxRr1>WIrn6TnT8fOXpX}-cE6V2t{)0R??OVW50OBGr zWwl)7A(#OhickX6Qzfe&Vmg$e0<+S?6P7eLCHs%&B`r+-MX8pc`sddq)m=H^8q9zO z!_ah9R)A$#0S8uL%_|~Uhn74+U<29@@B0nyGGw_OC%u40$zTxl!@Mx0$wd_Nj=Fhh z_L4!$=yi|fm43izG)jj-FAU-+NOPO^gEaN0j-L}6rb&Dgp7XBStdwbz^!;g{KiSG3 z)en;6Aq_905s%Ojv1nbshL-sodbW0?RAr{iJl33JOJK#UKGk2kSaiEU01^|2jx_py_M6dYFU<$q={t2x!TQmgpEM0c`MVJR%e?Ar zox2Kb9jahJ6%3aEMKlpD#F|SyE!Dt=IykTb)Kfizs!=KnohLl(;FYVURd@|=po8;oy*hyn*z`zB;T?3Z?)G;K$>R|hIh{x@Vixhd zIu^-s5c1p(lOaokBt|=1SGNcBD?dwv6rZ#*xzML9oba3qE|c(-kMb3fB$3a;fJwg$ z8DqhZgKxPlA||CT$85;`>_+{aoso~-N=_p#CHumqAox=`UEXsr+O+sj;yozQF22#l)3#=Sswta&aw4TYS+L+7YB1XX(-qMDcIv z52>y~wl3Wa_y-(C4;=W;;c&UH_8q(3tX4c^w2Iy?uLwdPKjB}_AAFq~Q0N2!K0p!y zkr=2XU`Yx#umnNl5T_U%;NXG>%&?!(6sJU5Afycy)AAH2L^7yC05zC_FeMPpLfwoU zh+r9rH;-b=cYEH#UA(pjcMV_WC kWZLz8q8uF~FHpbh-NFv;gS0vj6}9 delta 238 zcmeBR+rnC}&Bx2d00hk%7qV_KGB7*_abSQI%J>`tWHd0uF$6JsGL$d`F_ka|F_$m} zv6L_evFb4d3HvkZGnTLfv6Zj}u?KMkvFbAhaq2Obumy1iaR>1P@dokfGX?Pn3FtGG zum=eS2?14e1TiWzXfldSoTAFdR-Brbl3H|&+1)jy%4ISSqs7EKT9aKF>lryFA7z}* zB?Yt|=r)GpvdL*oayq=1_%uH-GjTIDuz%oS;Nov!`@qJ)>dknAm4AZ71s16rEaD&7 USvZ&)SU&JgzQSa{A_3G30OwaRfB*mh diff --git a/plugins/rmass/actions/__pycache__/synapsegetspaceid.cpython-314.pyc b/plugins/rmass/actions/__pycache__/synapsegetspaceid.cpython-314.pyc index 0ab50f15c9db4b0ee8eb49b1aaa52bfe0c712ecb..67d205f473865c3bfa35d724a3fb6c29142b1bf3 100644 GIT binary patch delta 349 zcmXwzJ4*vW9K`o=yZ745B{5GSrZ7lE%wd<#LPP|sKb9iI5Y&JVk`*L{xiV$KHK{~D zgr7j{W4CBwz*<=F3%C)TV))H4#eA`Z4>wYQhm4N+Yxj;I^tlNCvj5=w%s`Be5#W6! z5fF)iN&=Roz<`4dPJ=`kT=2jL0o-uVpb?IUv>+uJgr@Z(+#r%e8ZwZDCCEht@_8tj zkqt#CMOZq3SJ8TTGFr3fX-7_;YGt>5b=jA_o3?!OFIuv9e%rrpwL60_DdJ5|_jV5l z&B;eI*}*5&?FGp*ejMJLyP9H*-;q1FE3q}VLt{ZE_B2P#Q%+%8emIzwwlpPzFS@jH z@=8=xP@JyJL|uuhwylzB6HcL#y*l8*cR`Z{8Sy#I`UR`1xa2s!byxgGyM4B4fxnGJ#A&iZGByl_9JyKo&H}K^`JH16K%#=T&sB z!J5wC=BNM#Scf8P=qy&7Smhy($x3aZ+Wu4R{PPJGIw>;eHD2i0LuXQ>R#cBtH#EuZn+QJ=bm=}hIWIkKrW?$V`Vbf`5r8QXnp z5lGV4(;hTPM65k)1C-k^K9GD~0HI1cAt6@YYs=3f~EA@oiSxyT+QgviDp_yT7l2ffyWcbn{UX48GgzK_)LUorUEhm3oVyFFEWDdDsh6)&~xOBv_wqUUKLEGpJocrO<9_5eZpBve5lSyp3j|IO0|gx~vxAneYV#OQ$SQ## hU{cg1_KXke?pLm;#(g2~ta<#p&nqs=-{A?q>^CK3y~F?j delta 365 zcmXxfzfZzY5C`zS=PR_77AT1PP*Fe;kam)Rgy`gA;&6!zi9sVxgzzJw)ff{ZBV)~5 z9EpjmgR}pDTgUGH10*`R=$YsxFQ4z-aF_QPdX-95O$`ZHZw0ScVS@1f+x(aE7e1cv zOS^Y6C`1Tyn~;YB6micMY@1YaWFQ5hT;d6G!iVIHAJM8TjV*iBzqUI3 zi5};p`&YI#Zg)G)gYn?pw%fPyMt^kUTw49^XlPuF2K<}0NS3#j9+e9Ij^MMu1Ri92 zb#*p*=y_V%XHmB~FM4{(XS#bjKlBn+pQ)}goA@l^*5+9+R$C|mg-(MDoxiZMq$m=d bvPFhR#9TP(ixD^Fv5e2sydl=v4j%ad5*$}i diff --git a/plugins/rmass/actions/__pycache__/synapseregister.cpython-314.pyc b/plugins/rmass/actions/__pycache__/synapseregister.cpython-314.pyc index 7696ee527bb6c771f858425a44cfad82dd7fa122..a07fcce34d91c793cc5129924ba2a47ba5456a67 100644 GIT binary patch delta 232 zcmWlTu}T9$5QcYW_jWIv-1h>ui+}e!qV0U@D(Ja zki3A{9{2*83=I79{~tf|e9uiWP`83==FHByg3& z$+d<@3SUvAsM(@}fG&EGM0rttIAj<|dT?@aY^2I?f+0H;>@mU^6Jd^oIL0&*r?V7&@wu@H#v+8k-cLxajc`7|53u!?f?N0jhBOv_f{lfRU!hn8 zK_Tf<30qoNWCrGN=FB<6Y~9L*StxRndi#C9{!@!k-QCL6&=rBtDG^j+=%iqhhOG(1 zONN7ot5sCVpo0uKx={&p!g{bM5Ta~F>5F2bs&%p`lfxi+>|q}V;yDz@5su|b2NkNw zDFdHrnw~74XD>e^=5qPZPxDiGh^22{1zOF_-;{0qxG@{w7bpfz-a4|yXPADO@GyM5 U_$Vi>)m_#2wzpiXdoz;g4%YxQ{r~^~ diff --git a/plugins/rmass/actions/getmessage.py b/plugins/rmass/actions/getmessage.py index 821855c..23dad36 100644 --- a/plugins/rmass/actions/getmessage.py +++ b/plugins/rmass/actions/getmessage.py @@ -8,18 +8,15 @@ method = "GET" #Used to resolve path for recursive handling. Path location must match the location of the recursiveset data from pullmessage operation resolve = { - "path": ["messageheaders", "id"], + "get": { + "path": ["messageheaders", "id"], + } } #To add resolution suffix, second item must be a dictionary. References the "path" library under resolved path = [ "https://rentmasseur.com/api/v1/mailbox/", {"resolved": "path"}, - #{ - # "output": "id", - # #"keys": [0, "id"] - # "keys": "id" - #} ] headers = { @@ -41,8 +38,8 @@ select = { "value": False, }, "exclude": { - "key": "senderId", - "value": 238302, + "key": {}, + "value": {}, } } diff --git a/plugins/rmass/actions/refresh_tokens.py b/plugins/rmass/actions/refresh_tokens.py index 8158305..7b4bddd 100644 --- a/plugins/rmass/actions/refresh_tokens.py +++ b/plugins/rmass/actions/refresh_tokens.py @@ -18,8 +18,6 @@ headers = { }, } -#domainname="rentmasseur.com" - cookies = { "accessToken": { "output": "access_token", diff --git a/plugins/rmass/actions/synapseassignspace.py b/plugins/rmass/actions/synapseassignspace.py index 8013476..20171a0 100644 --- a/plugins/rmass/actions/synapseassignspace.py +++ b/plugins/rmass/actions/synapseassignspace.py @@ -7,11 +7,14 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], - "space_id": ["space_id"], - "username": ["profile", "username"], - "room_id": ["dmroom_id"], + "get": { + "sender": ["messages", 0, "senderId"], + "space_id": ["space_id"], + "username": ["profile", "username"], + "room_id": ["dmroom_id"], + }, } + keys = [ { "keytitle": "via", diff --git a/plugins/rmass/actions/synapseassignusername.py b/plugins/rmass/actions/synapseassignusername.py index 09871cc..166831e 100644 --- a/plugins/rmass/actions/synapseassignusername.py +++ b/plugins/rmass/actions/synapseassignusername.py @@ -9,9 +9,19 @@ showstatus = True astoken = os.environ["AS_TOKEN"] resolve = { - "sender": ["messages", 0, "senderId"], - "username": ["profile", "username"], + "get": { + "sender": ["messages", 0, "senderId"], + "username": ["profile", "username"], + }, + "construct": { + "matrixuser": [ + "@rmass_", + {"resolved": "sender"}, + ":loxthelion.com", + ], + }, } + keys = [ { "keytitle": "displayname", @@ -24,11 +34,10 @@ keys = [ method = "PUT" path = [ - "https://loxthelion.com/_matrix/client/v3/profile/@rmass_", - {"resolved": "sender"}, - ":loxthelion.com/displayname?user_id=@rmass_", - {"resolved": "sender"}, - ":loxthelion.com" + "https://loxthelion.com/_matrix/client/v3/profile/", + {"resolved": "matrixuser"}, + "/displayname?user_id=", + {"resolved": "matrixuser"}, ] headers = { diff --git a/plugins/rmass/actions/synapsecreatedmroom.py b/plugins/rmass/actions/synapsecreatedmroom.py index 8383983..ccb912a 100644 --- a/plugins/rmass/actions/synapsecreatedmroom.py +++ b/plugins/rmass/actions/synapsecreatedmroom.py @@ -7,8 +7,21 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], - "username": ["profile", "username"], + "get": { + "sender": ["messages", 0, "senderId"], + "username": ["profile", "username"], + }, + "construct": { + "matrixuser": [ + "@rmass_", + {"resolved": "sender"}, + ":loxthelion.com", + ], + "matrixdm": [ + "rmass_dm_", + {"resolved": "sender"}, + ], + }, } keys = [ @@ -21,8 +34,7 @@ keys = [ { "keytitle": "room_alias_name", "keyvalue": { - "resolved": "sender", - "prefix": "rmass_dm_", + "resolved": "matrixdm", }, }, { @@ -55,9 +67,9 @@ keys = [ method = "POST" path = [ - "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_", - {"resolved": "sender"}, - ":loxthelion.com", + "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=", + {"resolved": "matrixuser"}, + #":loxthelion.com", ] headers = { diff --git a/plugins/rmass/actions/synapsecreatespace.py b/plugins/rmass/actions/synapsecreatespace.py index a37aa4b..06cd1de 100644 --- a/plugins/rmass/actions/synapsecreatespace.py +++ b/plugins/rmass/actions/synapsecreatespace.py @@ -7,11 +7,19 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], - #"messageid": ["message", "id"], - "username": ["profile", "username"], - "locationname": ["profile", "location"], - "locationcode": ["profile", "searchCity"], + "get": { + #"sender": ["messages", 0, "senderId"], + #"username": ["profile", "username"], + "locationname": ["profile", "location"], + "locationcode": ["profile", "searchCity"], + }, + "construct": { + "matrixspacealias": [ + "rmass_space_", + {"resolved": "locationcode"}, + #"%3Aloxthelion.com", + ], + }, } keys = [ { @@ -23,8 +31,8 @@ keys = [ { "keytitle": "room_alias_name", "keyvalue": { - "resolved": "locationcode", - "prefix": "rmass_space_", + "resolved": "matrixspacealias", + #"prefix": "rmass_space_", }, }, { @@ -46,7 +54,7 @@ keys = [ #"keyvalue": { #"users": { #"@lyncoln:loxthelion.com": 100, - #"@rmass_:loxthelion.com": 100, + #"@rmass_*:loxthelion.com": 100, #}, #}, #} @@ -55,9 +63,6 @@ keys = [ method = "POST" path = [ - #"https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_", - #{"resolved": "sender"}, - #":loxthelion.com", "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_bridge:loxthelion.com" ] diff --git a/plugins/rmass/actions/synapsegetroomid.py b/plugins/rmass/actions/synapsegetroomid.py index 49e0ada..7c31735 100644 --- a/plugins/rmass/actions/synapsegetroomid.py +++ b/plugins/rmass/actions/synapsegetroomid.py @@ -7,15 +7,23 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], + "get": { + "sender": ["messages", 0, "senderId"], + }, + "construct": { + "matrixdm": [ + "%23rmass_dm_", + {"resolved": "sender"}, + "%3Aloxthelion.com", + ], + }, } method = "GET" path = [ - "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_dm_", - {"resolved": "sender"}, - "%3Aloxthelion.com", + "https://loxthelion.com/_matrix/client/v3/directory/room/", + {"resolved": "matrixdm"}, ] headers = { diff --git a/plugins/rmass/actions/synapsegetspaceid.py b/plugins/rmass/actions/synapsegetspaceid.py index e47dd63..fd86620 100644 --- a/plugins/rmass/actions/synapsegetspaceid.py +++ b/plugins/rmass/actions/synapsegetspaceid.py @@ -7,16 +7,23 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], - "locationcode": ["profile", "searchCity"], + "get": { + "locationcode": ["profile", "searchCity"], + }, + "construct": { + "matrixspace": [ + "%23rmass_space_", + {"resolved": "locationcode"}, + "%3Aloxthelion.com", + ], + }, } method = "GET" path = [ - "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_space_", - {"resolved": "locationcode"}, - "%3Aloxthelion.com", + "https://loxthelion.com/_matrix/client/v3/directory/room/", + {"resolved": "matrixspace"}, ] headers = { diff --git a/plugins/rmass/actions/synapsepushmessages.py b/plugins/rmass/actions/synapsepushmessages.py index 15679f1..d9041a9 100644 --- a/plugins/rmass/actions/synapsepushmessages.py +++ b/plugins/rmass/actions/synapsepushmessages.py @@ -13,12 +13,27 @@ recursive = { } resolve = { - "sender": ["messageitem", "senderId"], - "message_id": ["messageitem", "id"], - "message_body": ["messageitem", "text"], - "room_id": ["dmroom_id"], - "timestamp": ["messageitem", "createdAt"], + "get": { + "sender": ["messageitem", "senderId"], + "message_id": ["messageitem", "id"], + "message_body": ["messageitem", "text"], + "room_id": ["dmroom_id"], + "timestamp": ["messageitem", "createdAt"], + }, + "construct": { + "matrixuser": [ + "@rmass_", + {"resolved": "sender"}, + ":loxthelion.com", + ], + }, + "transform": { + "matrixuser": { + "@rmass_238302:loxthelion.com": "@lyncoln:loxthelion.com", + }, + }, } + keys = [ { "keytitle": "msgtype", @@ -30,6 +45,17 @@ keys = [ "resolved": "message_body", }, }, + { + "keytitle": "format", + "keyvalue": "org.matrix.custom.html", + }, + { + "keytitle": "formatted_body", + "keyvalue": { + "resolved": "message_body", + }, + }, + ] method = "PUT" @@ -39,9 +65,9 @@ path = [ {"resolved": "room_id"}, "/send/m.room.message/", {"resolved": "message_id"}, - "?user_id=@rmass_", - {"resolved": "sender"}, - ":loxthelion.com&ts=", + "?user_id=", + {"resolved": "matrixuser"}, + "&ts=", {"resolved": "timestamp"}, "000" ] diff --git a/plugins/rmass/actions/synapseregister.py b/plugins/rmass/actions/synapseregister.py index bb52524..da80e8f 100644 --- a/plugins/rmass/actions/synapseregister.py +++ b/plugins/rmass/actions/synapseregister.py @@ -7,8 +7,10 @@ kind = "action" showstatus = True resolve = { - "sender": ["messages", 0, "senderId"], - "username": ["profile", "username"], + "get": { + "sender": ["messages", 0, "senderId"], + "username": ["profile", "username"], + } } keys = [ { diff --git a/savedata/tokens.json b/savedata/tokens.json new file mode 100644 index 0000000..71096e7 --- /dev/null +++ b/savedata/tokens.json @@ -0,0 +1 @@ +{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwNDA4ODgsIm5iZiI6MTc5MjA0MDcwOCwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA0MDc2OH0.8twTKQb2OG-OfT_C2eAwD2OpV__X7S-MWnpVXdLeLvBzfZcW6ZJLesvSqgYXeO56yn-_UblIUEwfy_B8EuDTSw", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MzI3NjgsIm5iZiI6MTc5MjA0MDcwOCwianRpIjoiUXRjRXE2TWtGdWhHNjdiTHdLak1kdzJXazIzMlFtVkp4K2J3aGs2RTlCZz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA0MDc2OCwic3ViIjoiMjM4MzAyIn0.zmQ9S08NHgr2q0g3VloTgY3xBjATxXk2mdg6MbeHjuQ47OZ24E8bBNyRaqDJYJ0OnCkF5CvepJ5ISlnvkqTPRA"} \ No newline at end of file diff --git a/tokens.json b/tokens.json index 9f4e941..6ad53b0 100644 --- a/tokens.json +++ b/tokens.json @@ -1 +1 @@ -{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwMzI4ODYsIm5iZiI6MTc5MjAzMjcwNiwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Nn0.ChWvtapeudX4p0aEXxxMB0FWjDbLSCqgzevyi8UlhXj34l397o70_Owtns60TGh4JbC2l4EBInTggujF3bYREg", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MjQ3NjYsIm5iZiI6MTc5MjAzMjcwNiwianRpIjoibzNZYXMrNU5YNkRSc3pSa05kOTBQa3BMMTJ5VXkwWWx6ZTVNUUZMbFovcz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Niwic3ViIjoiMjM4MzAyIn0.tXWt8Jgc9jW006ZKSPMsueWNUNWaaenlkDc9-TphAkLDtWWRY5_2zz8Bdt8qgl_s0NJ_WDXnv6WwU5on054BZA"} \ No newline at end of file +{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwODQ2MDksIm5iZiI6MTc5MjA4NDQyOSwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA4NDQ4OX0.CcXQrFvFl5LraO3VWoe3CZ4u-jAHVuMt6Fag2_v5QJ79ekRsPMnOFSMjLycaZoc0hTZRiJnpUIqBWKmTsg2juA", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2NzY0ODksIm5iZiI6MTc5MjA4NDQyOSwianRpIjoiQjIrSmxQWVdvYjYvOVBYTjZ3VnFrZzhmZHFrY05nQVZjbHF5YVluclJUdz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA4NDQ4OSwic3ViIjoiMjM4MzAyIn0.RSOQP-lQv7N7Ut_YOkwF58-k-kGoFYCsGqYISJiUxajJ2YuDWz6vMQoWCN82NYUPJvfFDnGgiiugAnrhWS-OoQ"} \ No newline at end of file