From 07b86a33a10fa02b2557e79aa5ffeb88c8ef5029 Mon Sep 17 00:00:00 2001
From: Jochen Friedrich <jochen@scram.de>
Date: Thu, 27 Feb 2020 11:52:06 +0000
Subject: [PATCH] GUI improvements: - Add help texts. - Fix dialogs - Fix room
 selection

---
 icons/matrix.png | Bin 255 -> 3672 bytes
 matrix.html      | 149 ++++++++++++++++++++++++++++++++++-------------
 matrix.js        |   6 +-
 package.json     |   2 +-
 4 files changed, 113 insertions(+), 44 deletions(-)

diff --git a/icons/matrix.png b/icons/matrix.png
index ecec1cce98f986973b63dedc39827bea8db89c44..2e5a9d3deda1d134e8e2f46387897591943650ae 100644
GIT binary patch
literal 3672
zcmV-e4yW;nP)<h;3K|Lk000e1NJLTq000yK0015c1ONa4h8y<a000amdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+TEC0k|Vthgx`4zAAvi-<8Y1e4SalmV5zs+{+Sp*
zxfQLFY5_qYkx0nx|NQ&7fAN=EQJ0HoZMAy-a?34tKB#~G+I<f`-}mQBeq9S+&%3Z+
z7b2$;$Mk%a{<^<&zI;6Jwni9V&pUlxiTX11y6|Q&*~*a*>$8)bkI(rx4_$kCRGZ3Y
zS4Vt~^KC2o@t@?Hem7#@-RBcoh|((Dm15i}B!A!Y<3W1<`#pC4h5LMJ_l!6W35$;>
z1mw&1-j3dX4$zk%_g5_4x6yz9^iA+%f1OX?#In8_sz1IE%8!G8L;Pvs^!nsD{pA85
z_jlWQ{hzb+oc-*s=SoED3sK&^MaQ1u#(}AHAFI5C|H5avuf|J#_mku-KmFh}Lkp3t
z92as}p@$RpJ<c$3F~=RrNsMvEbk8X{YH^YuvS_bxqL8tbl>E)O9XZP>zWWmHy6vtv
zgR=4p+!_PM0+0Ok<$iVXPhRevX(0+;pE!XF{ECKL+_22qJ9m+Va9(*UH^6VNSNi=Y
z{1{X-w^^8#4R${s6QhI=Y^9s$#C?V1Qx(C<dKn-@tX*&>Br@P@NF~(ZB}NH>I4TM1
zcpg)ZgA9aH;=;+8Q>xKP)M#t-jD&k{EU`vA4L6a9l4=riLrsyaoD2AotYD~@RB|b$
z7J=AGE4`+gYpJzLHInO+BukMhA}UR~Ce2#3s;Fwy-eOB|U}?2U)7Dz=(RCK;*y`Nh
zIWyu&BabrbkfEcEK7r57v&=eW>TI*GxYB|qR$a1mwbgfU8>ZNKmtD7P-EH>+)=oP4
zlv9r!J?-@Otc6$Ee*5}^tc6$B;?0!ZC+}I~tP^=N5sXfX<&2EQ9LTs>1^{%loOum7
zN6Vb$%(qBUl!%kXa^qI8jFG~;Lo6q}=k6nOzm+#v^tbXB|0#3MQun{eoFjGL=j{hs
zTgJ`vX6&g#i>XgkAJ?~b7qwec>wkOvKQweikBS`UOPWatIDAma&n{=}-A7ntMA{e&
za;V8`s<Ur}Zf4CVm$3HeatO9op>`afmnYTpoMESFCC6HBw{)m2`P{xkBlF>2%^@yH
zXWQqQ?t67zKdk<ZQTN&E-xzg2bM;S+y5HIV?-+G|8q}W|b$^qoK6dplSh*kKY^+Jo
zIjik-Mm;mFUTa@>(Uwn3r|yxpZ<+n<dDa>(Az$kn?Ie%8ZC3Q)m}!q~&qX=2rFr}k
zBu(t=dYWly>|pzL{N#=ZI$iL9*r&bPsq>6@TC*r(Y_JX@NX{57>8yK7*}$D9nu`g~
zFGu(7iH~D}l%9x~T0tM@bvK7zMQyE7PBxoY5tQKUF@G2Na+EcYX8ArCrR@N>4PQ#X
zNl^IosK#gi-Xh?>3&9fr$v^cp|HIZ~{%V)?q9>65+&0q-{!aQ3(d@C+u@UV33<6IA
zPRs{NDfS5PAO>fJJO~2ut!cqLU2<KiawolEjCmqPPZ&+6qx0xgM1S-(b+pO|Wv8@L
zA6;uYp_S9q*umOTLk1pJTU9-MX63Xa!HOeyH)vMz2*Hcwx~v^!&%rPdtd#<hgR=3H
z)_MI-Y(!64tWA+vJ?wUI?&z)LnV}7^Mw(t(DB!WPtkz@%Y9bYyXJakjv&ms<OavXA
zZ|X|{4ME8o`zK0sEg5z1ZA}W@OMI+bBb%uKRy_dKwiR>V*8}B&NpMmfiJ}{hjgW_W
z2*5g1>7~-8OqT2by|1*Xs$;nCYG^+VgxOGJI9FNI623$nB@iS{LsAObmyrS*J?<UT
z24so@As?ZY@3UhQRQIeAE|{CfPKDLw@y3l5wj3~AJ5?<+wXUTvtsQAIgz6x=H8LFS
z1;nQk8!B#uj(7C?QL19AJ2tu{(`lF+25H=ckaV?3NF(!U+Pd(mryWj5J}grM#Hb$&
zBm}0~188v>w%LunSn=RBta9K3*x}|gcB0k_JM(wgz;Zytr6u@MYS4<?4T0pisrGmZ
z(L3V?j#db2=$iqRgZpD4poqt=1znRnLrNz0r77~In(0`QcWfe2td-ILyb1#+Vpu`+
zR*aF`MZ8yzi@#BcJ_@~1O&LPA>Yo*Sz>tGV=!hTS4wzC>T|s7Rz7}oNaf2&f_4ZKA
zLqFfKkNbvx-pL0g`_Ruf<nuG~buaQM+uzE$lMuMg`xKPi*_5i;$|gJd@n-Tq8q=!%
zVTuWv;8C;)>pY6>&3tkVQZFwqL?)u_1)&0dTLny@td%*phS|Xw`j^3WJBpahqEYf7
zY<I2DS#-nw#+R{n*Z>wmx$6)s`NE<Qnl~3nuo{Af>pKtYAMwChnbbicAhk>s>JhMF
z<L(9k$kb&uXPeo~#m0Q_%%u4VqSqm%!nowNfz6?Sb_1?r1Qu@h7_52*5QIwD+3om-
zTtgV1uW%c*BYw@ei=->iwZ;gRwAr8lpmcO_yXFX4V?@t;#%-O<{@dz~bwd~(<huon
z@9QvIz7&6HJzB1oc5s`dAg6~Rfa!df%FqdH*)*kBM{XGH3Bf*ET!q<UWk8Wvt94MP
zeG}j&5c|$HWf-YTq~BACY1&wH;DZ&IQ;)^L*|ZPfLa;KPou*_3ipD1|{c4W`0*nSG
zt;1TxXkEZ9FrHT0jJcg|MT~Y{n1KqQj;stlW0HQuolN@yZZ~UHw3kb<eLsP?&zHrX
z0fu&{mXtGVY`wSTdXc`;AGb~S<G%TuZBw)e<aFCn3oz6NUND5rT6Ih)J6eUR@wI^_
zUK0%yJE6dC#WiCMu)eo5F9Lmyrs}D_oy)LYcjFlpVu+*=xSPdV!$Y!i{ae2Ery^}j
z?!>r@!4xJj?D)GRgM_!*XC6K0mNy#{czQ$lh5KNuy9>Fa9C&u5#sa`Jc~`j`XnSb*
z`~-vKz1owlVkW^dV<NzQgR=V$%Ot;z_Z#I`nBS;|P;J*EIk}$rhlTu&GJVh+Y3MOg
zeVz37d(<GNZAU1iF_$9@x3M5Cd67N(TE0eFh^d4pdxqB(OuEp(GjhC9T+h};^0Op~
ze*%324~{DJLb3)#W$CqLbLiLK0!`UX!v-_B5?s*SuYV^d2K!+oXZzu@(^-s95achl
ze)Q)9<0tX?Z3l2ye6qiP)QN1ggCXuSu>cP?W90Qz;0mq|Q{lyA58?_DVnlCWxTSS=
zM?0mOOQoj<WeLQRHMc;7j{!IhZzyz6PHwkYFy1RCJZ*6c)@Z!-R4_^pM;Iz|fX@i5
z9p*C5wBHnZ9uD?WWfe-S7%{P<49hC9!!w(gt$jnbC5DkRW=}Vw9n<EbEi{<hd)%Da
z7~I<6TxH8T&=)A0w)y&G1+_C4fd-%pc`WElx;#>W3Kg22BGnv0YqQX^p@xi<0xvWQ
zyhBKnCB7t^;Co-RMg%Iz3KWn{Q3<-c;iBZSgXZ*B7jY9Sou}*1W}vL7Cc!^21c06{
zk9EBjMt#@^8V;o^PH181CO9Bit|suLC&h+1t|=3o+8Z$|Q<KJ$y>-AaWmtqrPJZAS
zx3k7P@$x)9fK?tIh-BomNZ<=?h{jmLB>K9mu9$J5l$C>L%J#`XBpFbl{(aSm4rs%p
zZUhkNF2jE9vY*CK37I+L!M~hr>f6tCnaLTd-<t~Zc3Iui*0P~&KVvWn;v#aJkwtT-
zV^X@FSTWUhiG5Oxj^fuur`!ekPTOW7<ZvN6aoyj=Td*Irk%uFC#udpC?o?wqXzruc
zxL@{~9~K@Se%ET)+IzQo^%^U{{6#eW-qC%W_=(E=%^BA{I&*>KhNQ>gZb+(V_6Yef
z&V<%I7#F2PQf)D`46N9G_ibkN264Q1)}Tp3k;?*pgE0oBFTZe2AzNh1eqcOVQA(6`
z<)Ogj*%F~(esdf0v+(I}ACC=g>@6WWgVD@d{>mD2!q6j^?PdSN4|MnhhQKOx6@irv
zR1l5}OYQg8VyYKC1Wc1rkEGF7n~1C{$S5wzl3YWhXlXoB6d(R9iuOVR8ZpjXmbE=^
zJ0kyt)r1!E)zrD{2&Q&2qWaDfw_jWCd}ry+4iR}-A|clnzWvx5w%p^`-}~iWoBV6P
z+~<J(jbH9_!2Z~;f`)q4ko%Lu{MGUQ&X9H4)!csp3&bWa0x2|H0003bX+uL$Nkc;*
zaB^>EX>4Tx0C=38kiSa9P!z_0sZxvRq&TQU21g4nc5?9#28TjTD;S;9n-+^n3`t7y
z4SW-Qm=1#A6ZixQ&VDyKIGDu?hwsPXobS8$Lc@(sQY`L4l9svW9|o7fmAmvtgDqM#
z*$qvRb^E6SYR~5@j@6g8^{Suy^E9JTVWe|aYO=fp=Rn+<m6>G~>$d~{So|P%qa=;Q
zPvV^@i7eY)KZ&R2$J5?sWt3j@ZC|yG#~EFExD1&xA*Q4)P1QM}!@krbC*+<2BaIoU
zH`7eXji`{5$B}3t(rs$;HmkgzQik%F$jc_&k;v2LVgL7g?c==KbT;N$n1@wsLDd+K
z;r$U-16X^8<?EWP*6+8~%yg=mf4=bx?k`Yia!>ma00002VoOIv09emG`t$$*010qN
zS#tmY3ljhU3ljkVnw%H_000McNliru<N_NA2QjQww~qh-0EtONK~y-)?UAt!!axuN
z2fq+PMg~Cv(16Qu0VZ`oKuir3KpS*O2zbZ{(A)0>$$=-m)!nQPCX$H5W+v7E+0dhZ
z4PISY8eG^|n7Ow@_av@8Iuk1o;>F*p0-VL0uyiim#oEr+etjN5h&#T4Cm=1*0<U;*
qOJD=!<Um1S7cVpV&)9D`k>CTiuQmgk0^ErJ0000<MNUMnLSTY~q80W4

delta 236
zcmca1^Pf?_Gr-TCmrII^fq{Y7)59eQNDF{42Mdtg`pf(kkYY;mc6VX;-`;;_|KxsN
zx%vlO(tL`{90me@K*<T7E{-7@=l4!D<a2anaJm0ZNbnOU`va!FhYVY|T5n0p95B5T
zaPq(Z#`!-wd!3SIX+9I3JhLI;!Qv)?(}jLY@n5VNy5`92HnJ>8Pc2#4k-+`tXlHcu
zjxtTTw+!qb*YLd67B9TalrLK|br;jh=uK>S4aO!8%y*&}OwV;o;_6w^*mdO3PPJ*%
jTOP<y>-l-*(_Q|*qV6BcTs*XZj$`n2^>bP0l+XkK*P&UP

diff --git a/matrix.html b/matrix.html
index f6dffae..4620049 100644
--- a/matrix.html
+++ b/matrix.html
@@ -40,38 +40,61 @@
 
 <script type="text/x-red" data-template-name="matrix-server">
     <div class="form-row">
-        <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-config-input-name">
     </div>
     <div class="form-row">
-        <label for="node-config-input-server"><i class="icon-bookmark"></i> Server</label>
+        <label for="node-config-input-server"><i class="fa fa-globe"></i> Server</label>
         <input type="text" id="node-config-input-server">
     </div>
+    <hr align="middle">
     <div class="form-row">
-        <label for="node-config-input-user"><i class="icon-bookmark"></i> Username</label>
+        <i class="fa fa-wrench"></i> Generate Token
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
         <input type="text" id="node-config-input-user">
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-pass"><i class="icon-bookmark"></i> Password</label>
+        <label for="node-config-input-pass"><i class="fa fa-lock"></i> Password</label>
         <input type="text" id="node-config-input-pass">
+        <button type="button" id="node-config-input-generate" class="red-ui-button"><i class='fa fa-refresh'></i></button>
     </div>
+    <hr align="middle">
     <div class="form-row">
-        <label for="node-config-input-userid"><i class="icon-bookmark"></i> UserId</label>
+        <label for="node-config-input-userid"><i class="fa fa-user"></i> UserId</label>
         <input type="text" id="node-config-input-userid">
     </div>
     <div class="form-row">
-        <label for="node-config-input-token"><i class="icon-bookmark"></i> Token</label>
-        <span>
-            <input type="text" id="node-config-input-token">
-            <button type="button" id="node-config-input-generate" class="red-ui-button"><i class='fa fa-refresh'></i></button>
-        </span>
+        <label for="node-config-input-token"><i class="fa fa-tag"></i> Token</label>
+        <input type="text" id="node-config-input-token">
     </div>
     <div class="form-row">
-        <label for="node-config-input-room"><i class="icon-bookmark"></i> Default Room</label>
+        <label for="node-config-input-room"><i class="fa fa-tag"></i> Default Room</label>
         <input type="text" id="node-config-input-room">
     </div>
 </script>
 
+<script type="text/x-red" data-help-name="matrix-server">
+    <h2>Matrix server configuration</h2>
+    <h3>The configuration of your matrix homeserver</h3>
+    <p>The configuration needs a server URL, a userid and an access token:</p>
+    <dl class="message-properties">
+       <dt>server<span class="property-type">string</span></dt>
+       <dd>the matrix server URL to connect to.</dd>
+       <dt>userid<span class="property-type">string</span></dt>
+       <dd>the matrix id of the user. Usually @user:server.</dd>
+       <dt>token<span class="property-type">string</span></dt>
+       <dd>the access token.</dd>
+    </dl>
+    <p>If your server supports logging in useing userid and password, you can fill in
+       server, user and password and press the generate button. This will make your browser
+       log in to your matrix account and pull matrix id and access token automatically.</p>
+    <p>Optionally, a default room might be specified:</p>
+    <dl class="message-properties">
+       <dt>room<span class="property-type">string</span></dt>
+       <dd>default matrix room to use.</dd>
+    </dl>
+</script>
+
 <!-- INPUT Node "matrix-input" -->
 
 <script type="text/javascript">
@@ -95,25 +118,34 @@
 
 <script type="text/x-red" data-template-name="matrix-input">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-tag"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
         <input type="text" id="node-input-server" placeholder="Server">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-room"><i class="icon-tag"></i> Room</label>
+        <label for="node-input-room"><i class="fa fa-tag"></i> Room</label>
         <input type="text" id="node-input-room" placeholder="Room">
     </div>
-    <div class="form-row">
-        <label for="node-input-filterself"><i class="icon-tag"></i> Filter events sent by self</label>
-        <input type="checkbox" id="node-input-filterself" placeholder="Filterself">
-    </div>
+    <input type="checkbox" id="node-input-filterself" placeholder="Filterself">&nbsp;&nbsp;Filter events sent by self
 </script>
 
 <script type="text/x-red" data-help-name="matrix-input">
-    <p>Matrix input node</p>
+    <h2>Matrix input node</h2>
+    <h3>This node receives matrix events of type org.nodered.msg and emits the content as a node-red msg.</h3>
+    <p>The configuration has there parameters:</p>
+    <dl class="message-properties">
+       <dt>server<span class="property-type">matrix server configuration</span></dt>
+       <dd>the matrix server URL to connect to.</dd>
+       <dt>name<span class="property-type">string</span></dt>
+       <dd>the name of the node.</dd>
+       <dt>room<span class="property-type">string</span></dt>
+       <dd>the room to receive messages from. If empty, all rooms are used the matrix user has joined.</dd>
+       <dt>Events sent by self<span class="property-type">boolean</span></dt>
+       <dd>If uncheked, the node will receive its own messages.</dd>
+    </dl>
 </script>
 
 <!-- INPUT Node "matrix-recvtext" -->
@@ -139,25 +171,34 @@
 
 <script type="text/x-red" data-template-name="matrix-recvtext">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-tag"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
         <input type="text" id="node-input-server" placeholder="Server">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-room"><i class="icon-tag"></i> Room</label>
+        <label for="node-input-room"><i class="fa fa-tag"></i> Room</label>
         <input type="text" id="node-input-room" placeholder="Room">
     </div>
-    <div class="form-row">
-        <label for="node-input-filterself"><i class="icon-tag"></i> Filter events sent by self</label>
-        <input type="checkbox" id="node-input-filterself" placeholder="Filterself">
-    </div>
+    <input type="checkbox" id="node-input-filterself" placeholder="Filterself">&nbsp;&nbsp;Filter events sent by self
 </script>
 
 <script type="text/x-red" data-help-name="matrix-recvtext">
-    <p>Matrix receive text node</p>
+    <h2>Matrix receive text node</h2>
+    <h3>This node receives messages of type m.text and emits the content is a node-red msg.payload</h3>
+    <p>The configuration has there parameters:</p>
+    <dl class="message-properties">
+       <dt>server<span class="property-type">matrix server configuration</span></dt>
+       <dd>the matrix server URL to connect to.</dd>
+       <dt>name<span class="property-type">string</span></dt>
+       <dd>the name of the node.</dd>
+       <dt>room<span class="property-type">string</span></dt>
+       <dd>the room to receive messages from. If empty, all rooms are used the matrix user has joined.</dd>
+       <dt>Events sent by self<span class="property-type">boolean</span></dt>
+       <dd>If uncheked, the node will receive its own messages.</dd>
+    </dl>
 </script>
 
 <!-- OUTPUT Node "matrix-output" -->
@@ -182,21 +223,31 @@
 
 <script type="text/x-red" data-template-name="matrix-output">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-tag"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
         <input type="text" id="node-input-server" placeholder="Server">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-room"><i class="icon-tag"></i> Room</label>
+        <label for="node-input-room"><i class="fa fa-tag"></i> Room</label>
         <input type="text" id="node-input-room" placeholder="Room">
     </div>
 </script>
 
 <script type="text/x-red" data-help-name="matrix-output">
-    <p>Matrix output node</p>
+    <h2>Matrix output node</h2>
+    <h3>This node sends node-red msg messages to matrix as content of org.nodered.msg matrix events.</h3>
+    <p>The configuration has there parameters:</p>
+    <dl class="message-properties">
+       <dt>server<span class="property-type">matrix server configuration</span></dt>
+       <dd>the matrix server URL to connect to.</dd>
+       <dt>name<span class="property-type">string</span></dt>
+       <dd>the name of the node.</dd>
+       <dt>room<span class="property-type">string</span></dt>
+       <dd>the room to send messages to. If empty, the default room will be used. If this is empty, too, the message won't be sent.</dd>
+    </dl>
 </script>
 
 <!-- OUTPUT Node "matrix-sendtext" -->
@@ -222,24 +273,40 @@
 
 <script type="text/x-red" data-template-name="matrix-sendtext">
     <div class="form-row">
-        <label for="node-input-server"><i class="icon-tag"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
         <input type="text" id="node-input-server" placeholder="Server">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-room"><i class="icon-tag"></i> Room</label>
+        <label for="node-input-room"><i class="fa fa-tag"></i> Room</label>
         <input type="text" id="node-input-room" placeholder="Room">
     </div>
-    <div class="form-row">
-        <label for="node-input-notice"><i class="icon-tag"></i> Send Text as m.notice (silent)</label>
-        <input type="checkbox" id="node-input-notice" placeholder="Notice">
-    </div>
+    <input type="checkbox" id="node-input-notice" placeholder="Notice">&nbsp;&nbsp; Send Text as m.notice (silent)
 </script>
 
 <script type="text/x-red" data-help-name="matrix-sendtext">
-    <p>Matrix send text node</p>
+    <h2>Matrix send text node</h2>
+    <h3>This node sends messages to matrix as m.text matrix events.</h3>
+    <p>The configuration has there parameters:</p>
+    <dl class="message-properties">
+       <dt>server<span class="property-type">matrix server configuration</span></dt>
+       <dd>the matrix server URL to connect to.</dd>
+       <dt>name<span class="property-type">string</span></dt>
+       <dd>the name of the node.</dd>
+       <dt>room<span class="property-type">string</span></dt>
+       <dd>the room to send messages to. The order to choose the room to send message to is:
+         <ul>
+           <dd>msg.roomId</dd>
+           <dd>The room specified here</dd>
+           <dd>The default room specified in the server</dd>
+         </ul>
+         If no room can be found, the message won't be sent.
+       </dd>
+       <dt>send text as m.notice<span class="property-type">boolean</span></dt>
+       <dd>Use m.notice sub type to send messages silent</dd>
+    </dl>
 </script>
 
diff --git a/matrix.js b/matrix.js
index c893041..8a84916 100644
--- a/matrix.js
+++ b/matrix.js
@@ -162,7 +162,7 @@ module.exports = function(RED) {
                 var msg = {
                     payload: event.getContent().body,
                     sender:  event.getSender(),
-                    room:  room.roomId
+                    roomId:  room.roomId
                 };
 
                 node.send(msg);
@@ -254,7 +254,9 @@ module.exports = function(RED) {
             }
 
             var destRoom = "";
-            if (node.room) {
+            if (msg.roomId) {
+                destRoom = msg.roomId;
+            } else if (node.room) {
                 destRoom = node.room;
             } else if (node.configNode.room) {
                 destRoom = node.configNode.room;
diff --git a/package.json b/package.json
index 52e3f0f..f71bd15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-matrix",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Node-RED Module for Matrix",
   "main": "matrix.js",
   "dependencies": {