From faa8cae532ee9899542808e667ee533a078cb270 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Thu, 21 Jul 2022 13:55:23 +0200
Subject: [PATCH 01/21] Added the possibility to join a room using /join (also
 added the global commands uses, and some others commands like /shrug .)

---
 src/domain/session/room/RoomViewModel.js      | 80 ++++++++++++++++---
 .../web/ui/css/themes/element/theme.css       | 12 +++
 2 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 94c78286..dfda5767 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -197,18 +197,80 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
+    async _getMessageInformations (message) {
+        let msgtype = "m.text";
+        if (message.startsWith("/")) {
+            let command=message.substring(1).split(" ");
+            switch (command[0]) {
+                case "me":
+                   message = message.substring(4).trim();
+                   msgtype = "m.emote";
+                   break;
+               case "join":
+                   if (command.length==2) {
+                       let roomname = message.substring(5).trim();
+                       try {
+                           await this._options.client.session.joinRoom(roomname);
+                       } catch (exc) {
+                           if (exc.statusCode??exc.status==400) {
+                               this._sendError=new Error("/join : '"+roomname+"' was not legal room ID or room alias");
+                           } else if ((exc.statusCode??exc.status==502) || (exc.message="Internal Server Error")) {
+                               this._sendError=new Error("/join : room not found");
+                           } else {
+                               this._sendError=new Error("join syntax: /join <room-id>");
+                           }
+                           this._timelineError = null;
+                           this.emitChange("error");
+                       }
+                   } else {
+                       this._sendError=new Error("join syntax: /join <room-id>");
+                       this._timelineError = null;
+                       this.emitChange("error");
+                   }
+                   msgtype=undefined;
+                   message=undefined;
+                   break;
+               case "shrug":
+                   message="¯\\_(ツ)_/¯ "+message.substring(7);
+                   break;
+               case "tableflip":
+                    message="(╯°□°）╯︵ ┻━┻ "+message.substring(11);
+                    break;
+                case "unflip":
+                    message="┬──┬ ノ( ゜-゜ノ) "+message.substring(8);
+                    break;
+                case "lenny":
+                    message="( ͡° ͜ʖ ͡°) "+message.substring(7);
+                    break;
+                default:
+                    if (command[0][0]=="/") {
+                        message = message.substring(1).trim();
+                        break;
+                    } else {
+                        this._sendError=new Error("no command name '"+command[0]+"'");
+                        this._timelineError = null;
+                        this.emitChange("error");
+                        msgtype=undefined;
+                        message=undefined;
+                   }
+           }
+       }
+       return [msgtype, message];
+   }
+    
     async _sendMessage(message, replyingTo) {
         if (!this._room.isArchived && message) {
+            let messinfo = await this._getMessageInformations(message);
             try {
-                let msgtype = "m.text";
-                if (message.startsWith("/me ")) {
-                    message = message.substr(4).trim();
-                    msgtype = "m.emote";
-                }
-                if (replyingTo) {
-                    await replyingTo.reply(msgtype, message);
-                } else {
-                    await this._room.sendEvent("m.room.message", {msgtype, body: message});
+               let msgtype = messinfo[0];
+               let message = messinfo[1];
+               console.log("messinfo :",messinfo);
+               if (msgtype && message) {
+                   if (replyingTo) {
+                           await replyingTo.reply(msgtype, message);
+                   } else {
+                           await this._room.sendEvent("m.room.message", {msgtype, body: message});
+                   }
                 }
             } catch (err) {
                 console.error(`room.sendMessage(): ${err.message}:\n${err.stack}`);
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index 632d5bc5..16dfea12 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -521,6 +521,18 @@ a {
 
 .RoomView_error {
     color: var(--error-color);
+    background : #efefef;
+    padding-right : 20px;
+    padding-left : 20px;
+    overflow : hidden;
+    height : 0px;
+    transition : 0.25s all ease-out;
+}
+
+.RoomView_error:not(:empty) {
+   height : auto;
+    padding-top : 20px;
+    padding-bottom : 20px;
 }
 
 .MessageComposer_replyPreview .Timeline_message {

From fb58d9c9efd9a3efa70dd2ddfa988daffd078036 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:08:53 +0200
Subject: [PATCH 02/21] Corrected some syntax dismiss

---
 src/domain/session/room/RoomViewModel.js | 51 ++++++++++++------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index dfda5767..5ded5108 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -200,71 +200,72 @@ export class RoomViewModel extends ViewModel {
     async _getMessageInformations (message) {
         let msgtype = "m.text";
         if (message.startsWith("/")) {
-            let command=message.substring(1).split(" ");
-            switch (command[0]) {
+            const [commandName, ...args] = message.substring(1).split(" ");
+            switch (commandName) {
                 case "me":
                    message = message.substring(4).trim();
                    msgtype = "m.emote";
                    break;
                case "join":
-                   if (command.length==2) {
-                       let roomname = message.substring(5).trim();
+                   if (args.length == 1) {
+                       let roomName = args[0];
                        try {
-                           await this._options.client.session.joinRoom(roomname);
+                           await this._options.client.session.joinRoom(roomName);
+                           const internalId = await this._options.client.session.joinRoom(roomName);
+                           this.navigation.push("room", internalId);
                        } catch (exc) {
-                           if (exc.statusCode??exc.status==400) {
-                               this._sendError=new Error("/join : '"+roomname+"' was not legal room ID or room alias");
-                           } else if ((exc.statusCode??exc.status==502) || (exc.message="Internal Server Error")) {
-                               this._sendError=new Error("/join : room not found");
+                           if (exc.statusCode ?? exc.status === 400) {
+                               this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
+                           } else if ((exc.statusCode ?? exc.status === 404) || (exc.statusCode ?? exc.status === 502) || (exc.message == "Internal Server Error")) {
+                               this._sendError = new Error(`/join : room '${roomName}' not found`);
                            } else {
-                               this._sendError=new Error("join syntax: /join <room-id>");
+                               this._sendError = new Error("join syntax: /join <room-id>");
                            }
                            this._timelineError = null;
                            this.emitChange("error");
                        }
                    } else {
-                       this._sendError=new Error("join syntax: /join <room-id>");
+                       this._sendError = new Error("join syntax: /join <room-id>");
                        this._timelineError = null;
                        this.emitChange("error");
                    }
-                   msgtype=undefined;
-                   message=undefined;
+                   msgtype = undefined;
+                   message = undefined;
                    break;
                case "shrug":
-                   message="¯\\_(ツ)_/¯ "+message.substring(7);
+                   message = "¯\\_(ツ)_/¯ " + message.substring(7);
                    break;
                case "tableflip":
-                    message="(╯°□°）╯︵ ┻━┻ "+message.substring(11);
+                    message="(╯°□°）╯︵ ┻━┻ " + message.substring(11);
                     break;
                 case "unflip":
-                    message="┬──┬ ノ( ゜-゜ノ) "+message.substring(8);
+                    message="┬──┬ ノ( ゜-゜ノ) " + message.substring(8);
                     break;
                 case "lenny":
-                    message="( ͡° ͜ʖ ͡°) "+message.substring(7);
+                    message="( ͡° ͜ʖ ͡°) " + message.substring(7);
                     break;
                 default:
-                    if (command[0][0]=="/") {
+                    if (commandName[0] == "/") {
                         message = message.substring(1).trim();
                         break;
                     } else {
-                        this._sendError=new Error("no command name '"+command[0]+"'");
+                        this._sendError = new Error(`no command name "${commandName}". To send the message instead of executing, please type "/${message}"`);
                         this._timelineError = null;
                         this.emitChange("error");
-                        msgtype=undefined;
-                        message=undefined;
+                        msgtype = undefined;
+                        message = undefined;
                    }
            }
        }
-       return [msgtype, message];
+       return {type: msgtype, message: message};
    }
     
     async _sendMessage(message, replyingTo) {
         if (!this._room.isArchived && message) {
             let messinfo = await this._getMessageInformations(message);
             try {
-               let msgtype = messinfo[0];
-               let message = messinfo[1];
-               console.log("messinfo :",messinfo);
+               let msgtype = messinfo.type;
+               let message = messinfo.message;
                if (msgtype && message) {
                    if (replyingTo) {
                            await replyingTo.reply(msgtype, message);

From 8b393464094f0c2d0b734e6511621440735fa950 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:34:52 +0200
Subject: [PATCH 03/21] The error message can now be closed

---
 src/domain/session/room/RoomViewModel.js      |  5 ++
 .../web/ui/css/themes/element/theme.css       | 49 ++++++++++++++++++-
 src/platform/web/ui/session/room/RoomView.js  | 10 +++-
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 5ded5108..5415d6dd 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -416,6 +416,11 @@ export class RoomViewModel extends ViewModel {
             this._composerVM.setReplyingTo(entry);
         }
     }
+    
+    dismissError(evt) {
+        this._sendError = null;
+        this.emitChange("error");
+    }
 }
 
 function videoToInfo(video) {
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index 16dfea12..f14100b2 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -526,15 +526,62 @@ a {
     padding-left : 20px;
     overflow : hidden;
     height : 0px;
+    font-weight : bold;
     transition : 0.25s all ease-out;
+    position : relative;
+    display : flex;
 }
 
 .RoomView_error:not(:empty) {
-   height : auto;
+    height : 40px;
+    align-items : center;
     padding-top : 20px;
     padding-bottom : 20px;
 }
 
+.RoomView_error p {
+	position : relative;
+	display : block;
+    width : 100%;
+    height : auto;
+    margin : 0;
+}
+
+.RoomView_error button {
+    width : 40px;
+    padding-top : 20px;
+    padding-bottom : 20px;
+    background : none;
+    border : none;
+    position : relative;
+}
+
+.RoomView_error button:hover {
+	background : #cfcfcf;
+}
+
+.RoomView_error button:after {
+	content:"";
+	position : absolute;
+	top : 10px;
+	right: 16px;
+	background : red;
+	width : 5px;
+	height : 20px;
+	transform: rotate(45deg);
+}
+
+.RoomView_error button:before {
+	content:"";
+	position : absolute;
+	top : 17px;
+	left: 10px;
+	background : red;
+	width : 20px;
+	height : 5px;
+	transform: rotate(45deg);
+}
+
 .MessageComposer_replyPreview .Timeline_message {
     margin: 0;
     margin-top: 5px;
diff --git a/src/platform/web/ui/session/room/RoomView.js b/src/platform/web/ui/session/room/RoomView.js
index d36466dd..7cfd7d85 100644
--- a/src/platform/web/ui/session/room/RoomView.js
+++ b/src/platform/web/ui/session/room/RoomView.js
@@ -46,7 +46,13 @@ export class RoomView extends TemplateView {
                 })
             ]),
             t.div({className: "RoomView_body"}, [
-                t.div({className: "RoomView_error"}, vm => vm.error),
+                t.div({className: "RoomView_error"}, [
+					t.if(vm => vm.error, t => t.p({}, vm => vm.error)),
+					t.if(vm => vm.error, t => t.button({
+						className: "RoomView_error_closerButton",
+						onClick: evt => vm.dismissError(evt)
+					}))
+                ]),
                 t.mapView(vm => vm.timelineViewModel, timelineViewModel => {
                     return timelineViewModel ?
                         new TimelineView(timelineViewModel, this._viewClassForTile) :
@@ -64,7 +70,7 @@ export class RoomView extends TemplateView {
             ])
         ]);
     }
-
+    
     _toggleOptionsMenu(evt) {
         if (this._optionsPopup && this._optionsPopup.isOpen) {
             this._optionsPopup.close();

From be8962cec29aa23ea56515ec3cc8a8232b940bd6 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:59:48 +0200
Subject: [PATCH 04/21] Fixed priority operations when checking request status

---
 src/domain/session/room/RoomViewModel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 5415d6dd..1786741e 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -214,9 +214,9 @@ export class RoomViewModel extends ViewModel {
                            const internalId = await this._options.client.session.joinRoom(roomName);
                            this.navigation.push("room", internalId);
                        } catch (exc) {
-                           if (exc.statusCode ?? exc.status === 400) {
+                           if ((exc.statusCode ?? exc.status) === 400) {
                                this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                           } else if ((exc.statusCode ?? exc.status === 404) || (exc.statusCode ?? exc.status === 502) || (exc.message == "Internal Server Error")) {
+                           } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
                                this._sendError = new Error(`/join : room '${roomName}' not found`);
                            } else {
                                this._sendError = new Error("join syntax: /join <room-id>");

From e345d0b33e1247833c873382f976dd2b81df8f24 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:06:09 +0200
Subject: [PATCH 05/21] Added the 403 status when joining an unknown room

---
 src/domain/session/room/RoomViewModel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 1786741e..66f936ea 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -216,7 +216,7 @@ export class RoomViewModel extends ViewModel {
                        } catch (exc) {
                            if ((exc.statusCode ?? exc.status) === 400) {
                                this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                           } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                           } else if ((exc.statusCode ?? exc.status) === 403 || (exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
                                this._sendError = new Error(`/join : room '${roomName}' not found`);
                            } else {
                                this._sendError = new Error("join syntax: /join <room-id>");

From 66a59e6f4d626f04dbc90cf934e6fe8abb8ab354 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:09:43 +0200
Subject: [PATCH 06/21] Error of interpretation of the 403 status at the last
 update. Fixed

---
 src/domain/session/room/RoomViewModel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 66f936ea..1ad92dd5 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -216,8 +216,10 @@ export class RoomViewModel extends ViewModel {
                        } catch (exc) {
                            if ((exc.statusCode ?? exc.status) === 400) {
                                this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                           } else if ((exc.statusCode ?? exc.status) === 403 || (exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                           } else if (exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
                                this._sendError = new Error(`/join : room '${roomName}' not found`);
+                           } else if (exc.statusCode ?? exc.status) === 403) {
+                               this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
                            } else {
                                this._sendError = new Error("join syntax: /join <room-id>");
                            }

From b7fd22c7f949783cda851c9bc10711f9c3029011 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:10:29 +0200
Subject: [PATCH 07/21] SyntaxError fixed

---
 src/domain/session/room/RoomViewModel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 1ad92dd5..b3fc703c 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -216,9 +216,9 @@ export class RoomViewModel extends ViewModel {
                        } catch (exc) {
                            if ((exc.statusCode ?? exc.status) === 400) {
                                this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                           } else if (exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                           } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
                                this._sendError = new Error(`/join : room '${roomName}' not found`);
-                           } else if (exc.statusCode ?? exc.status) === 403) {
+                           } else if ((exc.statusCode ?? exc.status) === 403) {
                                this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
                            } else {
                                this._sendError = new Error("join syntax: /join <room-id>");

From 0bf021ea87f24ea029a6c86ea9c8859214aa0a33 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Mon, 25 Jul 2022 13:37:03 +0200
Subject: [PATCH 08/21] The room is now joined after having actualised the
 rooms list, to avoid the synchronisations waits that can sometimes disable to
 enter the room (message "You're not into this room" or simply "You're not in
 this room yet. *Join the room*")

---
 src/domain/session/room/RoomViewModel.js |  2 +-
 src/matrix/Session.js                    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index b3fc703c..a15447b8 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -210,8 +210,8 @@ export class RoomViewModel extends ViewModel {
                    if (args.length == 1) {
                        let roomName = args[0];
                        try {
-                           await this._options.client.session.joinRoom(roomName);
                            const internalId = await this._options.client.session.joinRoom(roomName);
+                           await this._options.client.session.waitForRoomFromSync(internalId);
                            this.navigation.push("room", internalId);
                        } catch (exc) {
                            if ((exc.statusCode ?? exc.status) === 400) {
diff --git a/src/matrix/Session.js b/src/matrix/Session.js
index ae1dea61..f45cb5b3 100644
--- a/src/matrix/Session.js
+++ b/src/matrix/Session.js
@@ -948,6 +948,23 @@ export class Session {
             return body.room_id;
         });
     }
+
+    waitForRoomFromSync(roomId) {
+        let resolve;
+        const promise = new Promise(r => { resolve = r; })
+        const subscription = {
+            onAdd: (_, value) => {
+                if (value.id === roomId) {
+                    this._session.rooms.unsubscribe(subscription);
+                    resolve();
+                }
+            },
+            onUpdate: () => undefined,
+            onRemove: () => undefined,
+        };
+        this._session.rooms.subscribe(subscription);
+        return promise;
+    }
 }
 
 export function tests() {

From 1e5179f8356ecf16221bb9ca1ddc2057702a60f6 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Mon, 25 Jul 2022 15:22:06 +0200
Subject: [PATCH 09/21] =?UTF-8?q?=20-=20Application=20des=20diff=C3=A9rent?=
 =?UTF-8?q?s=20commentaires=20du=20Pull=20Request=20(#809)=20=20-=20Correc?=
 =?UTF-8?q?tion=20des=20erreurs=20d'indentations.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/domain/session/room/RoomViewModel.js      | 124 +++++++++---------
 src/matrix/Session.js                         |  17 ---
 src/matrix/common.js                          |  18 +--
 .../web/ui/css/themes/element/theme.css       |  51 +++----
 src/platform/web/ui/session/room/RoomView.js  |  12 +-
 5 files changed, 105 insertions(+), 117 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index a15447b8..9b6aa966 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -197,77 +197,77 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
-    async _getMessageInformations (message) {
-        let msgtype = "m.text";
-        if (message.startsWith("/")) {
-            const [commandName, ...args] = message.substring(1).split(" ");
-            switch (commandName) {
-                case "me":
-                   message = message.substring(4).trim();
-                   msgtype = "m.emote";
-                   break;
-               case "join":
-                   if (args.length == 1) {
-                       let roomName = args[0];
-                       try {
-                           const internalId = await this._options.client.session.joinRoom(roomName);
-                           await this._options.client.session.waitForRoomFromSync(internalId);
-                           this.navigation.push("room", internalId);
-                       } catch (exc) {
-                           if ((exc.statusCode ?? exc.status) === 400) {
-                               this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                           } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                               this._sendError = new Error(`/join : room '${roomName}' not found`);
-                           } else if ((exc.statusCode ?? exc.status) === 403) {
-                               this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
-                           } else {
-                               this._sendError = new Error("join syntax: /join <room-id>");
-                           }
-                           this._timelineError = null;
-                           this.emitChange("error");
-                       }
-                   } else {
-                       this._sendError = new Error("join syntax: /join <room-id>");
-                       this._timelineError = null;
-                       this.emitChange("error");
-                   }
-                   msgtype = undefined;
-                   message = undefined;
-                   break;
-               case "shrug":
-                   message = "¯\\_(ツ)_/¯ " + message.substring(7);
-                   break;
-               case "tableflip":
-                    message="(╯°□°）╯︵ ┻━┻ " + message.substring(11);
-                    break;
-                case "unflip":
-                    message="┬──┬ ノ( ゜-゜ノ) " + message.substring(8);
-                    break;
-                case "lenny":
-                    message="( ͡° ͜ʖ ͡°) " + message.substring(7);
-                    break;
-                default:
-                    if (commandName[0] == "/") {
-                        message = message.substring(1).trim();
-                        break;
-                    } else {
-                        this._sendError = new Error(`no command name "${commandName}". To send the message instead of executing, please type "/${message}"`);
+    async _processCommand (message) {
+        let msgtype = undefined;
+        const [commandName, ...args] = message.substring(1).split(" ");
+        switch (commandName) {
+            case "me":
+                message = message.substring(4).trim();
+                msgtype = "m.emote";
+                break;
+            case "join":
+                if (args.length == 1) {
+                    let roomName = args[0];
+                    try {
+                        const roomId = await this._options.client.session.joinRoom(roomName);
+                        await session.observeRoomStatus(roomId).waitFor(status === RoomStatus.Joined);
+                        this.navigation.push("room", roomId);
+                    } catch (exc) {
+                        if ((exc.statusCode ?? exc.status) === 400) {
+                            this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
+                        } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                            this._sendError = new Error(`/join : room '${roomName}' not found`);
+                        } else if ((exc.statusCode ?? exc.status) === 403) {
+                            this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
+                        } else {
+                            this._sendError = new Error("join syntax: /join <room-id>");
+                        }
                         this._timelineError = null;
                         this.emitChange("error");
-                        msgtype = undefined;
-                        message = undefined;
-                   }
-           }
+                    }
+                } else {
+                    this._sendError = new Error("join syntax: /join <room-id>");
+                    this._timelineError = null;
+                    this.emitChange("error");
+                }
+                break;
+            case "shrug":
+                message = "¯\\_(ツ)_/¯ " + message.substring(7);
+                msgtype = "m.text";
+                break;
+            case "tableflip":
+                message="(╯°□°）╯︵ ┻━┻ " + message.substring(11);
+                msgtype = "m.text";
+                break;
+            case "unflip":
+                message="┬──┬ ノ( ゜-゜ノ) " + message.substring(8);
+                msgtype = "m.text";
+                break;
+            case "lenny":
+                message="( ͡° ͜ʖ ͡°) " + message.substring(7);
+                msgtype = "m.text";
+                break;
+            default:
+                this._sendError = new Error(`no command name "${commandName}". To send the message instead of executing, please type "/${message}"`);
+                this._timelineError = null;
+                this.emitChange("error");
+                msgtype = undefined;
+                message = undefined;
        }
        return {type: msgtype, message: message};
    }
     
     async _sendMessage(message, replyingTo) {
         if (!this._room.isArchived && message) {
-            let messinfo = await this._getMessageInformations(message);
+            let messinfo = {msgtype : "m.text", message : message};
+            if (message.startsWith("//")) {
+                messinfo.message = message.substring(1).trim();
+            } else if (message.startsWith("/")) {
+                messinfo = await this._processCommand(message);
+            }
             try {
-               let msgtype = messinfo.type;
-               let message = messinfo.message;
+               const msgtype = messinfo.type;
+               const message = messinfo.message;
                if (msgtype && message) {
                    if (replyingTo) {
                            await replyingTo.reply(msgtype, message);
diff --git a/src/matrix/Session.js b/src/matrix/Session.js
index f45cb5b3..ae1dea61 100644
--- a/src/matrix/Session.js
+++ b/src/matrix/Session.js
@@ -948,23 +948,6 @@ export class Session {
             return body.room_id;
         });
     }
-
-    waitForRoomFromSync(roomId) {
-        let resolve;
-        const promise = new Promise(r => { resolve = r; })
-        const subscription = {
-            onAdd: (_, value) => {
-                if (value.id === roomId) {
-                    this._session.rooms.unsubscribe(subscription);
-                    resolve();
-                }
-            },
-            onUpdate: () => undefined,
-            onRemove: () => undefined,
-        };
-        this._session.rooms.subscribe(subscription);
-        return promise;
-    }
 }
 
 export function tests() {
diff --git a/src/matrix/common.js b/src/matrix/common.js
index ba7876ed..abd74a57 100644
--- a/src/matrix/common.js
+++ b/src/matrix/common.js
@@ -22,16 +22,16 @@ export function makeTxnId() {
 }
 
 export function isTxnId(txnId) {
-	return txnId.startsWith("t") && txnId.length === 15;
+    return txnId.startsWith("t") && txnId.length === 15;
 }
 
 export function tests() {
-	return {
-		"isTxnId succeeds on result of makeTxnId": assert => {
-			assert(isTxnId(makeTxnId()));
-		},
-		"isTxnId fails on event id": assert => {
-			assert(!isTxnId("$yS_n5n3cIO2aTtek0_2ZSlv-7g4YYR2zKrk2mFCW_rm"));
-		},
-	}
+    return {
+        "isTxnId succeeds on result of makeTxnId": assert => {
+            assert(isTxnId(makeTxnId()));
+        },
+        "isTxnId fails on event id": assert => {
+            assert(!isTxnId("$yS_n5n3cIO2aTtek0_2ZSlv-7g4YYR2zKrk2mFCW_rm"));
+        },
+    }
 }
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index f14100b2..f611c767 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -522,26 +522,31 @@ a {
 .RoomView_error {
     color: var(--error-color);
     background : #efefef;
-    padding-right : 20px;
-    padding-left : 20px;
-    overflow : hidden;
     height : 0px;
     font-weight : bold;
     transition : 0.25s all ease-out;
+    padding-right : 20px;
+    padding-left : 20px;
+}
+
+.RoomView_error div{
+    overflow : hidden;
+    height: 100%;
+    width: 100%;
     position : relative;
     display : flex;
+    align-items : center;
 }
 
 .RoomView_error:not(:empty) {
     height : 40px;
-    align-items : center;
     padding-top : 20px;
     padding-bottom : 20px;
 }
 
 .RoomView_error p {
-	position : relative;
-	display : block;
+    position : relative;
+    display : block;
     width : 100%;
     height : auto;
     margin : 0;
@@ -557,29 +562,29 @@ a {
 }
 
 .RoomView_error button:hover {
-	background : #cfcfcf;
+    background : #cfcfcf;
 }
 
 .RoomView_error button:after {
-	content:"";
-	position : absolute;
-	top : 10px;
-	right: 16px;
-	background : red;
-	width : 5px;
-	height : 20px;
-	transform: rotate(45deg);
+    content:"";
+    position : absolute;
+    top : 10px;
+    right: 16px;
+    background : red;
+    width : 5px;
+    height : 20px;
+    transform: rotate(45deg);
 }
 
 .RoomView_error button:before {
-	content:"";
-	position : absolute;
-	top : 17px;
-	left: 10px;
-	background : red;
-	width : 20px;
-	height : 5px;
-	transform: rotate(45deg);
+    content:"";
+    position : absolute;
+    top : 17px;
+    left: 10px;
+    background : red;
+    width : 20px;
+    height : 5px;
+    transform: rotate(45deg);
 }
 
 .MessageComposer_replyPreview .Timeline_message {
diff --git a/src/platform/web/ui/session/room/RoomView.js b/src/platform/web/ui/session/room/RoomView.js
index 7cfd7d85..e3eb0587 100644
--- a/src/platform/web/ui/session/room/RoomView.js
+++ b/src/platform/web/ui/session/room/RoomView.js
@@ -47,12 +47,12 @@ export class RoomView extends TemplateView {
             ]),
             t.div({className: "RoomView_body"}, [
                 t.div({className: "RoomView_error"}, [
-					t.if(vm => vm.error, t => t.p({}, vm => vm.error)),
-					t.if(vm => vm.error, t => t.button({
-						className: "RoomView_error_closerButton",
-						onClick: evt => vm.dismissError(evt)
-					}))
-                ]),
+                    t.if(vm => vm.error, t => t.div( 
+                        [
+                            t.p({}, vm => vm.error),
+                            t.button({ className: "RoomView_error_closerButton", onClick: evt => vm.dismissError(evt) })
+                        ])
+                )]),
                 t.mapView(vm => vm.timelineViewModel, timelineViewModel => {
                     return timelineViewModel ?
                         new TimelineView(timelineViewModel, this._viewClassForTile) :

From 09fd1a5113963079a6fe2f30d225af3bd3736bc0 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Tue, 26 Jul 2022 10:37:05 +0200
Subject: [PATCH 10/21] Use "args.join" instead of "message.substring" into
 RoomViewModel._processCommands

---
 src/domain/session/room/RoomViewModel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 9b6aa966..a1939f75 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -202,7 +202,7 @@ export class RoomViewModel extends ViewModel {
         const [commandName, ...args] = message.substring(1).split(" ");
         switch (commandName) {
             case "me":
-                message = message.substring(4).trim();
+                message = args.join(" ");
                 msgtype = "m.emote";
                 break;
             case "join":
@@ -232,19 +232,19 @@ export class RoomViewModel extends ViewModel {
                 }
                 break;
             case "shrug":
-                message = "¯\\_(ツ)_/¯ " + message.substring(7);
+                message = "¯\\_(ツ)_/¯ " + args.join(" ");
                 msgtype = "m.text";
                 break;
             case "tableflip":
-                message="(╯°□°）╯︵ ┻━┻ " + message.substring(11);
+                message="(╯°□°）╯︵ ┻━┻ " + args.join(" ");
                 msgtype = "m.text";
                 break;
             case "unflip":
-                message="┬──┬ ノ( ゜-゜ノ) " + message.substring(8);
+                message="┬──┬ ノ( ゜-゜ノ) " + args.join(" ");
                 msgtype = "m.text";
                 break;
             case "lenny":
-                message="( ͡° ͜ʖ ͡°) " + message.substring(7);
+                message="( ͡° ͜ʖ ͡°) " + args.join(" ");
                 msgtype = "m.text";
                 break;
             default:

From f9f49b76403482ef657d7e2638660c4d3c48ca8e Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:48:03 +0200
Subject: [PATCH 11/21] Fixed an error and improving css If the /join command
 success, an error was thrown, because of a copy-pasted command not well
 integrated The button of the error on "theme.css" contains now an unicode
 cross. The :after/:before cross was disformed when opening the room
 informations.

---
 src/domain/session/room/RoomViewModel.js      |  5 ++--
 .../web/ui/css/themes/element/theme.css       | 24 +++++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index a1939f75..039996cd 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -23,6 +23,7 @@ import {imageToInfo} from "../common.js";
 // TODO: remove fallback so default isn't included in bundle for SDK users that have their custom tileClassForEntry
 // this is a breaking SDK change though to make this option mandatory
 import {tileClassForEntry as defaultTileClassForEntry} from "./timeline/tiles/index";
+import {RoomStatus} from "../../../matrix/room/common";
 
 export class RoomViewModel extends ViewModel {
     constructor(options) {
@@ -210,7 +211,7 @@ export class RoomViewModel extends ViewModel {
                     let roomName = args[0];
                     try {
                         const roomId = await this._options.client.session.joinRoom(roomName);
-                        await session.observeRoomStatus(roomId).waitFor(status === RoomStatus.Joined);
+                        await (await this._options.client.session.observeRoomStatus(roomId)).waitFor(status => status === RoomStatus.Joined);
                         this.navigation.push("room", roomId);
                     } catch (exc) {
                         if ((exc.statusCode ?? exc.status) === 400) {
@@ -220,7 +221,7 @@ export class RoomViewModel extends ViewModel {
                         } else if ((exc.statusCode ?? exc.status) === 403) {
                             this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
                         } else {
-                            this._sendError = new Error("join syntax: /join <room-id>");
+                            this._sendError = exc;
                         }
                         this._timelineError = null;
                         this.emitChange("error");
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index f611c767..0f40bdf3 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -559,32 +559,24 @@ a {
     background : none;
     border : none;
     position : relative;
+    border-radius : 5px;
+    transition: 0.1s all ease-out;
+    cursor: pointer;
 }
 
 .RoomView_error button:hover {
     background : #cfcfcf;
 }
 
-.RoomView_error button:after {
-    content:"";
-    position : absolute;
-    top : 10px;
-    right: 16px;
-    background : red;
-    width : 5px;
-    height : 20px;
-    transform: rotate(45deg);
-}
-
 .RoomView_error button:before {
-    content:"";
+    content:"\274c";
     position : absolute;
-    top : 17px;
+    top : 15px;
     left: 10px;
-    background : red;
     width : 20px;
-    height : 5px;
-    transform: rotate(45deg);
+    height : 10px;
+    font-size : 10px;
+    align-self : middle;
 }
 
 .MessageComposer_replyPreview .Timeline_message {

From 550b9db4dc365c3f361e046141119e94fb932562 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:21:00 +0200
Subject: [PATCH 12/21] Separated the join instructions into a
 executeJoinCommand method

---
 src/domain/session/room/RoomViewModel.js | 52 +++++++++++++-----------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 039996cd..82fcc785 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -198,6 +198,33 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
+    async executeJoinCommand(args) {
+        if (args.length == 1) {
+            let roomName = args[0];
+            try {
+                const roomId = await this._options.client.session.joinRoom(roomName);
+                await (await this._options.client.session.observeRoomStatus(roomId)).waitFor(status => status === RoomStatus.Joined);
+                this.navigation.push("room", roomId);
+            } catch (exc) {
+                if ((exc.statusCode ?? exc.status) === 400) {
+                    this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
+                } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                    this._sendError = new Error(`/join : room '${roomName}' not found`);
+                } else if ((exc.statusCode ?? exc.status) === 403) {
+                    this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
+                } else {
+                    this._sendError = exc;
+                }
+                this._timelineError = null;
+                this.emitChange("error");
+            }
+        } else {
+            this._sendError = new Error("join syntax: /join <room-id>");
+            this._timelineError = null;
+            this.emitChange("error");
+        }
+    }
+    
     async _processCommand (message) {
         let msgtype = undefined;
         const [commandName, ...args] = message.substring(1).split(" ");
@@ -207,30 +234,7 @@ export class RoomViewModel extends ViewModel {
                 msgtype = "m.emote";
                 break;
             case "join":
-                if (args.length == 1) {
-                    let roomName = args[0];
-                    try {
-                        const roomId = await this._options.client.session.joinRoom(roomName);
-                        await (await this._options.client.session.observeRoomStatus(roomId)).waitFor(status => status === RoomStatus.Joined);
-                        this.navigation.push("room", roomId);
-                    } catch (exc) {
-                        if ((exc.statusCode ?? exc.status) === 400) {
-                            this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                        } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                            this._sendError = new Error(`/join : room '${roomName}' not found`);
-                        } else if ((exc.statusCode ?? exc.status) === 403) {
-                            this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
-                        } else {
-                            this._sendError = exc;
-                        }
-                        this._timelineError = null;
-                        this.emitChange("error");
-                    }
-                } else {
-                    this._sendError = new Error("join syntax: /join <room-id>");
-                    this._timelineError = null;
-                    this.emitChange("error");
-                }
+                await this.executeJoinCommand(args);
                 break;
             case "shrug":
                 message = "¯\\_(ツ)_/¯ " + args.join(" ");

From ab64ce02b22d8002ee4874751ecdec9fb2c8424d Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Wed, 27 Jul 2022 15:18:32 +0200
Subject: [PATCH 13/21] Separated the _processCommand and the joinRoom command 
 - renamed executeJoinCommand as joinRoom;  - separated the joinRoom process
 and the parse and result process

---
 src/domain/session/room/RoomViewModel.js | 57 ++++++++++++++----------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 82fcc785..b66545c6 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -198,30 +198,23 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
-    async executeJoinCommand(args) {
-        if (args.length == 1) {
-            let roomName = args[0];
-            try {
-                const roomId = await this._options.client.session.joinRoom(roomName);
-                await (await this._options.client.session.observeRoomStatus(roomId)).waitFor(status => status === RoomStatus.Joined);
-                this.navigation.push("room", roomId);
-            } catch (exc) {
-                if ((exc.statusCode ?? exc.status) === 400) {
-                    this._sendError = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-                } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                    this._sendError = new Error(`/join : room '${roomName}' not found`);
-                } else if ((exc.statusCode ?? exc.status) === 403) {
-                    this._sendError = new Error(`/join : you're not invited to join '${roomName}'`);
-                } else {
-                    this._sendError = exc;
-                }
-                this._timelineError = null;
-                this.emitChange("error");
+    async joinRoom(roomName) {
+        try {
+            const roomId = await this._options.client.session.joinRoom(roomName);
+            const roomStatusObserver = await this._options.client.session.observeRoomStatus(roomId);
+            await roomStatusObserver.waitFor(status => status === RoomStatus.Joined);
+            this.navigation.push("room", roomId);
+            return true;
+        } catch (exc) {
+            if ((exc.statusCode ?? exc.status) === 400) {
+                return `'${roomName}' was not legal room ID or room alias`;
+            } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
+                return `room '${roomName}' not found`;
+            } else if ((exc.statusCode ?? exc.status) === 403) {
+                return `you're not invited to join '${roomName}'`;
+            } else {
+                return exc;
             }
-        } else {
-            this._sendError = new Error("join syntax: /join <room-id>");
-            this._timelineError = null;
-            this.emitChange("error");
         }
     }
     
@@ -234,7 +227,23 @@ export class RoomViewModel extends ViewModel {
                 msgtype = "m.emote";
                 break;
             case "join":
-                await this.executeJoinCommand(args);
+                if (args.length == 1) {
+                    const roomName = args[0];
+                    const exc = await this.joinRoom(roomName);
+                    if (exc!==true) {
+                        if (exc && exc.stack && exc.message) {
+                            this._sendError = exc;
+                        } else {
+                            this._sendError = new Error("/join : " + exc);
+                        }
+                        this._timelineError = null;
+                        this.emitChange("error");
+                    }
+                } else {
+                    this._sendError = new Error("join syntax: /join <room-id>");
+                    this._timelineError = null;
+                    this.emitChange("error");
+                }
                 break;
             case "shrug":
                 message = "¯\\_(ツ)_/¯ " + args.join(" ");

From a40bb59dc0461caf39cc1b066978f36da4c3ecf4 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:36:58 +0200
Subject: [PATCH 14/21] Some fixes :  - fixed a pretty syntax miss (a !== b); 
 - fixed a type error : replaced "msgtype" by "type" when instantied the
 "messinfo" variable;  - some indentation fixes

---
 src/domain/session/room/RoomViewModel.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index b66545c6..a6db142b 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -230,7 +230,7 @@ export class RoomViewModel extends ViewModel {
                 if (args.length == 1) {
                     const roomName = args[0];
                     const exc = await this.joinRoom(roomName);
-                    if (exc!==true) {
+                    if (exc !== true) {
                         if (exc && exc.stack && exc.message) {
                             this._sendError = exc;
                         } else {
@@ -273,21 +273,21 @@ export class RoomViewModel extends ViewModel {
     
     async _sendMessage(message, replyingTo) {
         if (!this._room.isArchived && message) {
-            let messinfo = {msgtype : "m.text", message : message};
+            let messinfo = {type : "m.text", message : message};
             if (message.startsWith("//")) {
                 messinfo.message = message.substring(1).trim();
             } else if (message.startsWith("/")) {
                 messinfo = await this._processCommand(message);
             }
             try {
-               const msgtype = messinfo.type;
-               const message = messinfo.message;
-               if (msgtype && message) {
-                   if (replyingTo) {
-                           await replyingTo.reply(msgtype, message);
-                   } else {
-                           await this._room.sendEvent("m.room.message", {msgtype, body: message});
-                   }
+                const msgtype = messinfo.type;
+                const message = messinfo.message;
+                if (msgtype && message) {
+                    if (replyingTo) {
+                        await replyingTo.reply(msgtype, message);
+                    } else {
+                        await this._room.sendEvent("m.room.message", {msgtype, body: message});
+                    }
                 }
             } catch (err) {
                 console.error(`room.sendMessage(): ${err.message}:\n${err.stack}`);

From 176caf340fb1ddf53ec411a38f33c5e009bf6b76 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:42:44 +0200
Subject: [PATCH 15/21] Placed the join command outside of the processCommand
 method

---
 src/domain/session/room/RoomViewModel.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index a6db142b..74cb3d05 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -218,6 +218,19 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
+    async _processCommandJoin(roomName) {
+        const exc = await this.joinRoom(roomName);
+        if (exc !== true) {
+            if (exc && exc.stack && exc.message) {
+                this._sendError = exc;
+            } else {
+                this._sendError = new Error("/join : " + exc);
+            }
+            this._timelineError = null;
+            this.emitChange("error");
+        }
+    } 
+
     async _processCommand (message) {
         let msgtype = undefined;
         const [commandName, ...args] = message.substring(1).split(" ");
@@ -229,16 +242,7 @@ export class RoomViewModel extends ViewModel {
             case "join":
                 if (args.length == 1) {
                     const roomName = args[0];
-                    const exc = await this.joinRoom(roomName);
-                    if (exc !== true) {
-                        if (exc && exc.stack && exc.message) {
-                            this._sendError = exc;
-                        } else {
-                            this._sendError = new Error("/join : " + exc);
-                        }
-                        this._timelineError = null;
-                        this.emitChange("error");
-                    }
+                    await this._processCommandJoin(roomName);
                 } else {
                     this._sendError = new Error("join syntax: /join <room-id>");
                     this._timelineError = null;

From 3c64f7d49b31564bb4e27dd91aab7108d9554372 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Thu, 28 Jul 2022 09:23:30 +0200
Subject: [PATCH 16/21] Finals checks about
 https://github.com/vector-im/hydrogen-web/pull/809#pullrequestreview-1053501341
  - joined the processJoinRoom and joinRoom methods;  - fixed some precisions
 miss;  - removed some useless code;  - change the error message height from
 absolute (40px) to relative (auto)

---
 src/domain/session/room/RoomViewModel.js      | 27 ++++++-------------
 .../web/ui/css/themes/element/theme.css       |  4 +--
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 74cb3d05..47d8c628 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -199,40 +199,30 @@ export class RoomViewModel extends ViewModel {
     }
     
     async joinRoom(roomName) {
+    }
+    
+    async _processCommandJoin(roomName) {
         try {
             const roomId = await this._options.client.session.joinRoom(roomName);
             const roomStatusObserver = await this._options.client.session.observeRoomStatus(roomId);
             await roomStatusObserver.waitFor(status => status === RoomStatus.Joined);
             this.navigation.push("room", roomId);
-            return true;
         } catch (exc) {
             if ((exc.statusCode ?? exc.status) === 400) {
-                return `'${roomName}' was not legal room ID or room alias`;
+                exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
             } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                return `room '${roomName}' not found`;
+                exc = new Error(`/join : room '${roomName}' not found`);
             } else if ((exc.statusCode ?? exc.status) === 403) {
-                return `you're not invited to join '${roomName}'`;
-            } else {
-                return exc;
-            }
-        }
-    }
-    
-    async _processCommandJoin(roomName) {
-        const exc = await this.joinRoom(roomName);
-        if (exc !== true) {
-            if (exc && exc.stack && exc.message) {
-                this._sendError = exc;
-            } else {
-                this._sendError = new Error("/join : " + exc);
+                exc = new Error(`/join : you're not invited to join '${roomName}'`);
             }
+            this._sendError = exc;
             this._timelineError = null;
             this.emitChange("error");
         }
     } 
 
     async _processCommand (message) {
-        let msgtype = undefined;
+        let msgtype;
         const [commandName, ...args] = message.substring(1).split(" ");
         switch (commandName) {
             case "me":
@@ -269,7 +259,6 @@ export class RoomViewModel extends ViewModel {
                 this._sendError = new Error(`no command name "${commandName}". To send the message instead of executing, please type "/${message}"`);
                 this._timelineError = null;
                 this.emitChange("error");
-                msgtype = undefined;
                 message = undefined;
        }
        return {type: msgtype, message: message};
diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css
index 0f40bdf3..05681cbb 100644
--- a/src/platform/web/ui/css/themes/element/theme.css
+++ b/src/platform/web/ui/css/themes/element/theme.css
@@ -539,7 +539,7 @@ a {
 }
 
 .RoomView_error:not(:empty) {
-    height : 40px;
+    height : auto;
     padding-top : 20px;
     padding-bottom : 20px;
 }
@@ -572,7 +572,7 @@ a {
     content:"\274c";
     position : absolute;
     top : 15px;
-    left: 10px;
+    left: 9px;
     width : 20px;
     height : 10px;
     font-size : 10px;

From fb7932674702fe4bbd35ef186cbb95b70a77b34f Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Thu, 28 Jul 2022 09:26:08 +0200
Subject: [PATCH 17/21] Forgot one change

---
 src/domain/session/room/RoomViewModel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 47d8c628..124f6e9c 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -230,7 +230,7 @@ export class RoomViewModel extends ViewModel {
                 msgtype = "m.emote";
                 break;
             case "join":
-                if (args.length == 1) {
+                if (args.length === 1) {
                     const roomName = args[0];
                     await this._processCommandJoin(roomName);
                 } else {

From 302131c447d30300ae7411b6e7df31f5acb120c7 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Thu, 28 Jul 2022 10:14:21 +0200
Subject: [PATCH 18/21] Review last checks

---
 src/domain/session/room/RoomViewModel.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 124f6e9c..cecbb27f 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -198,22 +198,21 @@ export class RoomViewModel extends ViewModel {
         }
     }
     
-    async joinRoom(roomName) {
-    }
-    
     async _processCommandJoin(roomName) {
         try {
             const roomId = await this._options.client.session.joinRoom(roomName);
             const roomStatusObserver = await this._options.client.session.observeRoomStatus(roomId);
             await roomStatusObserver.waitFor(status => status === RoomStatus.Joined);
             this.navigation.push("room", roomId);
-        } catch (exc) {
+        } catch (err) {
             if ((exc.statusCode ?? exc.status) === 400) {
-                exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
+                const exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
             } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                exc = new Error(`/join : room '${roomName}' not found`);
+                const exc = new Error(`/join : room '${roomName}' not found`);
             } else if ((exc.statusCode ?? exc.status) === 403) {
-                exc = new Error(`/join : you're not invited to join '${roomName}'`);
+                const exc = new Error(`/join : you're not invited to join '${roomName}'`);
+            } else {
+                const exc = err;
             }
             this._sendError = exc;
             this._timelineError = null;

From f5dacb4e42bd3daf6b6633cebb0613d362494b61 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Thu, 28 Jul 2022 10:26:59 +0200
Subject: [PATCH 19/21] Fixed last check

---
 src/domain/session/room/RoomViewModel.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index cecbb27f..249d04f0 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -205,14 +205,15 @@ export class RoomViewModel extends ViewModel {
             await roomStatusObserver.waitFor(status => status === RoomStatus.Joined);
             this.navigation.push("room", roomId);
         } catch (err) {
-            if ((exc.statusCode ?? exc.status) === 400) {
-                const exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-            } else if ((exc.statusCode ?? exc.status) === 404 || (exc.statusCode ?? exc.status) === 502 || exc.message == "Internal Server Error") {
-                const exc = new Error(`/join : room '${roomName}' not found`);
-            } else if ((exc.statusCode ?? exc.status) === 403) {
-                const exc = new Error(`/join : you're not invited to join '${roomName}'`);
+            let exc;
+            if ((err.statusCode ?? err.status) === 400) {
+                exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
+            } else if ((err.statusCode ?? err.status) === 404 || (err.statusCode ?? err.status) === 502 || err.message == "Internal Server Error") {
+                exc = new Error(`/join : room '${roomName}' not found`);
+            } else if ((err.statusCode ?? err.status) === 403) {
+                exc = new Error(`/join : you're not invited to join '${roomName}'`);
             } else {
-                const exc = err;
+                exc = err;
             }
             this._sendError = exc;
             this._timelineError = null;

From 58a2d1f34c3d6216e7effdbdfe56a85594d65f35 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:44:23 +0200
Subject: [PATCH 20/21] Restored the common.js indentation

---
 src/matrix/common.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/matrix/common.js b/src/matrix/common.js
index abd74a57..ba7876ed 100644
--- a/src/matrix/common.js
+++ b/src/matrix/common.js
@@ -22,16 +22,16 @@ export function makeTxnId() {
 }
 
 export function isTxnId(txnId) {
-    return txnId.startsWith("t") && txnId.length === 15;
+	return txnId.startsWith("t") && txnId.length === 15;
 }
 
 export function tests() {
-    return {
-        "isTxnId succeeds on result of makeTxnId": assert => {
-            assert(isTxnId(makeTxnId()));
-        },
-        "isTxnId fails on event id": assert => {
-            assert(!isTxnId("$yS_n5n3cIO2aTtek0_2ZSlv-7g4YYR2zKrk2mFCW_rm"));
-        },
-    }
+	return {
+		"isTxnId succeeds on result of makeTxnId": assert => {
+			assert(isTxnId(makeTxnId()));
+		},
+		"isTxnId fails on event id": assert => {
+			assert(!isTxnId("$yS_n5n3cIO2aTtek0_2ZSlv-7g4YYR2zKrk2mFCW_rm"));
+		},
+	}
 }

From f512bfcfc169928e24831948b228f856317adaa5 Mon Sep 17 00:00:00 2001
From: Kaki In <91763754+Kaki-In@users.noreply.github.com>
Date: Fri, 29 Jul 2022 11:47:47 +0200
Subject: [PATCH 21/21] Pretty syntaxed the RoomViewModel

---
 src/domain/session/room/RoomViewModel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
index 249d04f0..fcda95fc 100644
--- a/src/domain/session/room/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -244,15 +244,15 @@ export class RoomViewModel extends ViewModel {
                 msgtype = "m.text";
                 break;
             case "tableflip":
-                message="(╯°□°）╯︵ ┻━┻ " + args.join(" ");
+                message = "(╯°□°）╯︵ ┻━┻ " + args.join(" ");
                 msgtype = "m.text";
                 break;
             case "unflip":
-                message="┬──┬ ノ( ゜-゜ノ) " + args.join(" ");
+                message = "┬──┬ ノ( ゜-゜ノ) " + args.join(" ");
                 msgtype = "m.text";
                 break;
             case "lenny":
-                message="( ͡° ͜ʖ ͡°) " + args.join(" ");
+                message = "( ͡° ͜ʖ ͡°) " + args.join(" ");
                 msgtype = "m.text";
                 break;
             default: