mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from bwindels/bwindels/catchsenderror

Browse Source 
Catch errors while persisting a new message
This commit is contained in:
Bruno Windels 2020-03-30 19:33:53 +00:00 committed by GitHub
commit 3a6a2e1e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/domain/session/room/RoomViewModel.js
View File

@ -11,6 +11,7 @@ export default class RoomViewModel extends EventEmitter {
this._timelineVM = null;
this._onRoomChange = this._onRoomChange.bind(this);
this._timelineError = null;
this._sendError = null;
this._closeCallback = closeCallback;
}
@ -57,6 +58,9 @@ export default class RoomViewModel extends EventEmitter {
if (this._timelineError) {
return `Something went wrong loading the timeline: ${this._timelineError.message}`;
}
if (this._sendError) {
return `Something went wrong sending your message: ${this._sendError.message}`;
}
return "";
}
@ -64,13 +68,14 @@ export default class RoomViewModel extends EventEmitter {
return avatarInitials(this._room.name);
}
sendMessage(message) {
async sendMessage(message) {
if (message) {
try {
this._room.sendEvent("m.room.message", {msgtype: "m.text", body: message});
await this._room.sendEvent("m.room.message", {msgtype: "m.text", body: message});
} catch (err) {
console.error(`room.sendMessage(): ${err.message}:\n${err.stack}`);
this._timelineError = err;
this._sendError = err;
this._timelineError = null;
this.emit("change", "error");
return false;
}

2
src/matrix/room/room.js
View File

@ -56,7 +56,7 @@ export default class Room extends EventEmitter {
}
sendEvent(eventType, content) {
this._sendQueue.enqueueEvent(eventType, content);
return this._sendQueue.enqueueEvent(eventType, content);
}