scratchpatd

spec/muc.js

@@ -1,16 +1,16 @@
 /*global mock */
 
-const _ = converse.env._,
-      $pres = converse.env.$pres,
-      $iq = converse.env.$iq,
-      $msg = converse.env.$msg,
-      Model = converse.env.Model,
-      Strophe = converse.env.Strophe,
-      Promise = converse.env.Promise,
-      sizzle = converse.env.sizzle,
-      u = converse.env.utils;
-
-describe("Groupchats", function () {
+const _ = converse.env._;
+const $pres = converse.env.$pres;
+const $iq = converse.env.$iq;
+const $msg = converse.env.$msg;
+const Model = converse.env.Model;
+const Strophe = converse.env.Strophe;
+const Promise = converse.env.Promise;
+const sizzle = converse.env.sizzle;
+const u = converse.env.utils;
+
+fdescribe("Groupchats", function () {
 
     describe("The \"rooms\" API", function () {
 
@@ -3438,7 +3438,7 @@ describe("Groupchats", function () {
         }));
 
 
-        it("takes a /kick command to kick a user",
+        fit("takes a /kick command to kick a user",
             mock.initConverse(
                 ['rosterGroupsFetched'], {},
                 async function (done, _converse) {
@@ -3520,6 +3520,7 @@ describe("Groupchats", function () {
                     }).c('actor', {'nick': 'romeo'}).up()
                       .c('reason').t("You're annoying").up().up()
                     .c('status', {'code': '307'});
+
             _converse.connection._dataRecv(mock.createRequest(presence));
 
             await u.waitUntil(() => view.el.querySelectorAll('.chat-info').length === 2);

src/components/message.js

@@ -7,7 +7,6 @@ import { _converse, api, converse } from  "@converse/headless/converse-core";
 import { html } from 'lit-element';
 import { renderAvatar } from './../templates/directives/avatar';
 import { renderRetractionLink } from './../templates/directives/retraction';
-import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
 
 const { Strophe } = converse.env;
 const u = converse.env.utils;
@@ -73,12 +72,12 @@ class Message extends CustomElement {
         const isodate = dayjs(this.model.get('time')).toISOString();
         const i18n_retry = __('Retry');
         return html`
-            <div class="message chat-info ${this.message_type}"
+            <div class="message chat-info chat-${this.message_type}"
                 data-isodate="${isodate}"
                 data-type="${this.data_name}"
                 data-value="${this.data_value}">
 
-                ${ this.render_message ? unsafeHTML(this.message) : this.message }
+                ${this.model.getMessageText()}
                 ${ this.retry ? html`<a class="retry" @click=${this.onRetryClicked}>${i18n_retry}</a>` : '' }
             </div>
         `;