feat: parse emoticons in last message

jsxc · Jan 24, 2019 · 7066d8f · 7066d8f
1 parent 04bf5d5
commit 7066d8f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/Message.interface.ts b/src/Message.interface.ts
@@ -73,6 +73,8 @@ export interface IMessage {
 
    getEncryptedPlaintextMessage(): string
 
+   getPlaintextEmoticonMessage(): string
+
    getSender(): { name: string, jid?: JID }
 
    received();

diff --git a/src/Message.ts b/src/Message.ts
@@ -252,6 +252,15 @@ export default class Message implements Identifiable, IMessage {
       return `<p>${body}</p>`;
    }
 
+   public getPlaintextEmoticonMessage(): string {
+      let body = this.getPlaintextMessage();
+
+      body = Utils.escapeHTML(body);
+      body = Emoticons.toImage(body);
+
+      return body;
+   }
+
    public setErrorMessage(error: string) {
       return this.data.set('errorMessage', error);
    }

diff --git a/src/ui/RosterItem.ts b/src/ui/RosterItem.ts
@@ -103,12 +103,12 @@ export default class RosterItem {
 
          let message = this.contact.getTranscript().getMessage(firstMessageId);
 
-         this.element.find('.jsxc-bar__caption__secondary').text(message.getPlaintextMessage());
+         this.element.find('.jsxc-bar__caption__secondary').html(message.getPlaintextEmoticonMessage());
       });
 
       let message = this.contact.getTranscript().getFirstMessage();
       if (message) {
-         this.element.find('.jsxc-bar__caption__secondary').text(message.getPlaintextMessage());
+         this.element.find('.jsxc-bar__caption__secondary').html(message.getPlaintextEmoticonMessage());
       }
 
       let updateUnreadMessage = () => {