Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Don't send message markers to users not subscribed to our presence

JC Brand 7 months ago
parent
aafe85a58d
commit
2872180146
2 changed files with 18 additions and 8 deletions
Split View Show Diff Stats
  1. 11 2
      src/headless/shared/model-with-messages.js
  2. 7 6
      src/plugins/chatview/tests/markers.js

+ 11 - 2
src/headless/shared/model-with-messages.js
View File 

@@ -704,10 +704,19 @@ export default function ModelWithMessages(BaseModel) {
 
          * @param {Boolean} force - Whether a marker should be sent for the
 
          *  message, even if it didn't include a `markable` element.
 
          */
 
-        sendMarkerForMessage(msg, type = 'displayed', force = false) {
 
-            if (!msg || !api.settings.get('send_chat_markers').includes(type)) {
 
+        async sendMarkerForMessage(msg, type = 'displayed', force = false) {
 
+            if (!msg || msg?.get('type') === 'groupchat' || !api.settings.get('send_chat_markers').includes(type)) {
 
                 return;
 
             }
 
+
 
+            // Don't send chat markers to contacts that are not subscribed
 
+            // to our presence.
 
+            const contact = await api.contacts.get(this.get('jid'));
 
+            const subscription = contact?.get('subscription');
 
+            if (!contact || subscription === 'none' || subscription === 'to') {
 
+                return;
 
+            }
 
+
 
             if (msg?.get('is_markable') || force) {
 
                 const from_jid = Strophe.getBareJidFromJid(msg.get('from'));
 
                 sendMarker(from_jid, msg.get('msgid'), type, msg.get('type'));

+ 7 - 6
src/plugins/chatview/tests/markers.js
View File 

@@ -1,9 +1,8 @@
 
 /*global mock, converse */
 
-
 
-const Strophe = converse.env.Strophe;
 
-const u = converse.env.utils;
 
 // See: https://xmpp.org/rfcs/rfc3921.html
 
 
+const { Strophe, u, stx } = converse.env;
 
+
 
 
 describe("A XEP-0333 Chat Marker", function () {
 
 
@@ -41,14 +40,16 @@ describe("A XEP-0333 Chat Marker", function () {
 
         await mock.waitForRoster(_converse, 'current', 0);
 
         const contact_jid = 'someone@montague.lit';
 
         const msgid = u.getUniqueId();
 
-        const stanza = u.toStanza(`
 
-            <message from='${contact_jid}'
 
+        const stanza = stx`
 
+            <message
 
+                xmlns="jabber:client"
 
+                from='${contact_jid}'
 
                 id='${msgid}'
 
                 type="chat"
 
                 to='${_converse.jid}'>
 
               <body>My lord, dispatch; read o'er these articles.</body>
 
               <markable xmlns='urn:xmpp:chat-markers:0'/>
 
-            </message>`);
 
+            </message>`;
 
 
         const sent_stanzas = [];
 
         spyOn(_converse.api.connection.get(), 'send').and.callFake(s => sent_stanzas.push(s));