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

Merge pull request #193 from vector-im/bwindels/emote

Browse Source 
support emotes
This commit is contained in:
Bruno Windels 2020-11-10 14:29:04 +00:00 committed by GitHub
commit a16b0674ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,12 @@ export class RoomViewModel extends ViewModel {
async _sendMessage(message) {
if (message) {
try {
await this._room.sendEvent("m.room.message", {msgtype: "m.text", body: message});
let msgtype = "m.text";
if (message.startsWith("/me")) {
message = message.substr(3).trim();
msgtype = "m.emote";
}
await this._room.sendEvent("m.room.message", {msgtype, body: message});
} catch (err) {
console.error(`room.sendMessage(): ${err.message}:\n${err.stack}`);
this._sendError = err;

2
src/domain/session/room/timeline/tiles/TextTile.js
View File

@ -21,7 +21,7 @@ export class TextTile extends MessageTile {
const content = this._getContent();
const body = content && content.body;
if (content.msgtype === "m.emote") {
return `* ${this._entry.sender} ${body}`;
return `* ${this.displayName} ${body}`;
} else {
return body;
}