Página inicial Explorar Ajuda
Registrar Entrar
im-changing.ru
/
converse.js
mirror de https://github.com/conversejs/converse.js.git
2
0
Fork 0
Arquivos Issues 0 Wiki
Ver código fonte

regression of #1317: Don't show errors for CSI messages (#2276)

* regression of #1317: Don't show errors for CSI messages
* fix failing tests
ChaosKid42 4 anos atrás
pai
af4fd3b0c2
commit
c9ba42d0a0
3 arquivos alterados com 7 adições e 4 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 5 2
      spec/messages.js
  2. 1 1
      src/headless/converse-chat.js
  3. 1 1
      src/headless/converse-emoji.js

+ 5 - 2
spec/messages.js
Ver arquivo 

@@ -1589,9 +1589,9 @@ describe("A Chat Message", function () {
 
                     .c('text', { 'xmlns': "urn:ietf:params:xml:ns:xmpp-stanzas" })
 
                     .c('text', { 'xmlns': "urn:ietf:params:xml:ns:xmpp-stanzas" })
 
                         .t('Something else went wrong as well');
 
                         .t('Something else went wrong as well');
 
                 _converse.connection._dataRecv(mock.createRequest(stanza));
 
                 _converse.connection._dataRecv(mock.createRequest(stanza));
 
-                await u.waitUntil(() => view.model.messages.length > 3);
 
+                await u.waitUntil(() => view.model.messages.length > 2);
 
                 await new Promise(resolve => view.model.messages.once('rendered', resolve));
 
                 await new Promise(resolve => view.model.messages.once('rendered', resolve));
 
-                expect(view.content.querySelectorAll('.chat-error').length).toEqual(1);
 
+                expect(view.content.querySelectorAll('.chat-msg__error').length).toEqual(3);
 
 
 
                 // Ensure messages with error are not editable
 
                 // Ensure messages with error are not editable
 
                 document.querySelectorAll('.chat-msg__actions').forEach(elem => {
 
                 document.querySelectorAll('.chat-msg__actions').forEach(elem => {
 
@@ -1637,6 +1637,9 @@ describe("A Chat Message", function () {
 
                             .t('User session not found')
 
                             .t('User session not found')
 
                 _converse.connection._dataRecv(mock.createRequest(stanza));
 
                 _converse.connection._dataRecv(mock.createRequest(stanza));
 
                 const view = _converse.chatboxviews.get(contact_jid);
 
                 const view = _converse.chatboxviews.get(contact_jid);
 
+                const msg_text = 'This message will show!';
 
+                await view.model.sendMessage(msg_text);
 
+                await new Promise(resolve => view.model.messages.once('rendered', resolve));
 
                 expect(view.content.querySelectorAll('.chat-error').length).toEqual(0);
 
                 expect(view.content.querySelectorAll('.chat-error').length).toEqual(0);
 
                 done();
 
                 done();
 
             }));
 
             }));

+ 1 - 1
src/headless/converse-chat.js
Ver arquivo 

@@ -635,7 +635,7 @@ converse.plugins.add('converse-chat', {
 
              */
 
              */
 
             shouldShowErrorMessage (attrs) {
 
             shouldShowErrorMessage (attrs) {
 
                 const msg = this.getMessageReferencedByError(attrs);
 
                 const msg = this.getMessageReferencedByError(attrs);
 
-                if (!msg && attrs.body === null) {
 
+                if (!msg && !attrs.body) {
 
                     // If the error refers to a message not included in our store,
 
                     // If the error refers to a message not included in our store,
 
                     // and it doesn't have a <body> tag, we assume that this was a
 
                     // and it doesn't have a <body> tag, we assume that this was a
 
                     // CSI message (which we don't store).
 
                     // CSI message (which we don't store).

+ 1 - 1
src/headless/converse-emoji.js
Ver arquivo 

@@ -154,7 +154,7 @@ export function getShortnameReferences (text) {
 
             'To avoid this problem, first await the converse.emojis.initilaized_promise.'
 
             'To avoid this problem, first await the converse.emojis.initilaized_promise.'
 
         );
 
         );
 
     }
 
     }
 
-    const references = [...text.matchAll(shortnames_regex)];
 
+    const references = [...text.matchAll(shortnames_regex)].filter(ref => ref[0].length > 0);
 
     return references.map(ref => {
 
     return references.map(ref => {
 
         const cp = converse.emojis.by_sn[ref[0]].cp;
 
         const cp = converse.emojis.by_sn[ref[0]].cp;
 
         return {
 
         return {