Changeset 29ff5c2 for protocols/jabber/message.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• protocols/jabber/message.c (modified) (2 diffs)

protocols/jabber/message.c

@@ -37 +37 @@
         if (!from) {
                 return XT_HANDLED; /* Consider this packet corrupted. */
+        }
 
-        }
-        if (request && id) {
+        if (request && id && g_strcmp0(type, "groupchat") != 0) {
                 /* Send a message receipt (XEP-0184), looking like this:
-                 * <message
-                 *  from='kingrichard@royalty.england.lit/throne'
-                 *  id='bi29sg183b4v'
-                 *  to='northumberland@shakespeare.lit/westminster'>
+                 * <message from='...' id='...' to='...'>
                  *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
-                 * </message> */
+                 * </message>
+                 *
+                 * MUC messages are excluded, since receipts aren't supposed to be sent over MUCs
+                 * (XEP-0184 section 5.3) and replying to those may result in 'forbidden' errors.
+                 */
                 struct xt_node *received, *receipt;
 
@@ -142 +143 @@
                         imcb_buddy_typing(ic, from, OPT_TYPING);
                 }
-                /* No need to send a "stopped typing" signal when there's a message. */
-                else if (xt_find_node(node->children, "active") && (body == NULL)) {
+                else if (xt_find_node(node->children, "active")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing(ic, from, 0);
+
+                        /* No need to send a "stopped typing" signal when there's a message. */
+                        if (body == NULL) {
+                                imcb_buddy_typing(ic, from, 0);
+                        }
                 } else if (xt_find_node(node->children, "paused")) {
                         bud->flags |= JBFLAG_DOES_XEP85;