Bugfix. Show message author in spoiler messages

cb0b99ac · JC Brand · f0ae8c44 · cb0b99ac · cb0b99ac · cb0b99ac
Commit cb0b99ac authored Mar 17, 2018 by JC Brand
Showing with 28 additions and 20 deletions

CHANGES.md CHANGES.md +4 -0

spec/spoilers.js spec/spoilers.js +20 -11

src/converse-chatview.js src/converse-chatview.js +2 -4

src/templates/spoiler_button.html src/templates/spoiler_button.html +2 -5

No files found.
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,10 @@ boxes can no longer be resized horizontally (or diagonally). Perhaps a solution
 for this can again be found, but time constraints meant that this feature had
 to be removed.

+### Bugfixes
+
+- Spoiler messages didn't include the message author's name.
+

 ## 3.3.4 (2018-03-05)


--- a/spec/spoilers.js
+++ b/spec/spoilers.js
@@ -44,6 +44,8 @@
            _converse.chatboxes.onMessage(msg);

            var view = _converse.chatboxviews.get(sender_jid);
+            expect(_.includes(view.el.querySelector('.chat-msg-author').textContent, 'Max Frankfurter')).toBeTruthy();
+
            var message_content = view.el.querySelector('.chat-msg-content');
            expect(message_content.textContent).toBe(spoiler);

@@ -78,6 +80,8 @@
            _converse.chatboxes.onMessage(msg);

            var view = _converse.chatboxviews.get(sender_jid);
+            expect(_.includes(view.el.querySelector('.chat-msg-author').textContent, 'Max Frankfurter')).toBeTruthy();
+
            var message_content = view.el.querySelector('.chat-msg-content');
            expect(message_content.textContent).toBe(spoiler);

@@ -124,17 +128,17 @@
                expect(view.onMessageSubmitted).toHaveBeenCalled();

                /* Test the XML stanza 
-                *
-                * <message from="dummy@localhost/resource"
-                *          to="max.frankfurter@localhost"
-                *          type="chat"
-                *          id="4547c38b-d98b-45a5-8f44-b4004dbc335e"
-                *          xmlns="jabber:client">
-                *    <body>This is the spoiler</body>
-                *    <active xmlns="http://jabber.org/protocol/chatstates"/>
-                *    <spoiler xmlns="urn:xmpp:spoiler:0"/>
-                * </message>"
-                */
+                 *
+                 * <message from="dummy@localhost/resource"
+                 *          to="max.frankfurter@localhost"
+                 *          type="chat"
+                 *          id="4547c38b-d98b-45a5-8f44-b4004dbc335e"
+                 *          xmlns="jabber:client">
+                 *    <body>This is the spoiler</body>
+                 *    <active xmlns="http://jabber.org/protocol/chatstates"/>
+                 *    <spoiler xmlns="urn:xmpp:spoiler:0"/>
+                 * </message>"
+                 */
                var stanza = _converse.connection.send.calls.argsFor(0)[0].tree();
                var spoiler_el = stanza.querySelector('spoiler[xmlns="urn:xmpp:spoiler:0"]');
                expect(_.isNull(spoiler_el)).toBeFalsy();
@@ -144,6 +148,8 @@
                expect(body_el.textContent).toBe('This is the spoiler');

                /* Test the HTML spoiler message */
+                expect(view.el.querySelector('.chat-msg-author').textContent.split(':')[1].trim().split(' ')[1]).toBe('me');
+
                var spoiler_msg_el = view.el.querySelector('.chat-msg-content.spoiler');
                expect(spoiler_msg_el.textContent).toBe('This is the spoiler');
                expect(_.includes(spoiler_msg_el.classList, 'collapsed')).toBeTruthy();
@@ -213,6 +219,7 @@
                */
                var stanza = _converse.connection.send.calls.argsFor(0)[0].tree();
                var spoiler_el = stanza.querySelector('spoiler[xmlns="urn:xmpp:spoiler:0"]');
+
                expect(_.isNull(spoiler_el)).toBeFalsy();
                expect(spoiler_el.textContent).toBe('This is the hint');

@@ -220,6 +227,8 @@
                expect(body_el.textContent).toBe('This is the spoiler');

                /* Test the HTML spoiler message */
+                expect(view.el.querySelector('.chat-msg-author').textContent.split(':')[1].trim().split(' ')[1]).toBe('me');
+
                var spoiler_msg_el = view.el.querySelector('.chat-msg-content.spoiler');
                expect(spoiler_msg_el.textContent).toBe('This is the spoiler');
                expect(_.includes(spoiler_msg_el.classList, 'collapsed')).toBeTruthy();

--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -611,11 +611,9 @@
                        } else {
                            username = attrs.fullname;
                        }
-                    } else if (attrs.is_spoiler) {
-                        template = tpl_spoiler_message;
-                    } else  {
-                        template = tpl_message;
+                    } else {
                        username = attrs.sender === 'me' && __('me') || fullname;
+                        template = attrs.is_spoiler ? tpl_spoiler_message : tpl_message;
                    }

                    const msg_time = moment(attrs.time) || moment;

--- a/src/templates/spoiler_button.html
+++ b/src/templates/spoiler_button.html
-<li class="toggle-compose-spoiler">
-    <a class="
-        {[ if (o.composing_spoiler)  { ]} icon-eye-blocked {[ } ]}
-        {[ if (!o.composing_spoiler)  { ]} icon-eye {[ } ]}"
-        title="{{ o.label_toggle_spoiler }}"></a>
+<li class="toggle-compose-spoiler fa {[ if (o.composing_spoiler)  { ]} fa-eye-slash {[ } ]} {[ if (!o.composing_spoiler)  { ]} fa-eye {[ } ]}"
+    title="{{ o.label_toggle_spoiler }}"></a>
 </li>