Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Placed the join command outside of the processCommand method

Browse source
This commit is contained in:
Kaki In 2022-07-27 16:42:44 +02:00
parent a40bb59dc0
commit 176caf340f
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/domain/session/room/RoomViewModel.js
View file

@ -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) { async _processCommand (message) {
let msgtype = undefined; let msgtype = undefined;
const [commandName, ...args] = message.substring(1).split(" "); const [commandName, ...args] = message.substring(1).split(" ");
@ -229,16 +242,7 @@ export class RoomViewModel extends ViewModel {
case "join": case "join":
if (args.length == 1) { if (args.length == 1) {
const roomName = args[0]; const roomName = args[0];
const exc = await this.joinRoom(roomName); await this._processCommandJoin(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 { } else {
this._sendError = new Error("join syntax: /join <room-id>"); this._sendError = new Error("join syntax: /join <room-id>");
this._timelineError = null; this._timelineError = null;