Changeset a04705b

Timestamp:

2016-12-26T23:07:56Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1882b70

Parents:

d57484d

Message:

jabber: Workaround for servers (like slack) that send echoes without id

Just comparing the body of the last sent message. This isn't foolproof
and sending several messages quickly can make it fail, but it's less
annoying than before. The correct solution is still to fix the server.

In the case of slack I still recommend using the irc gateway instead.

Location:

protocols/jabber

Files:

• conference.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/conference.c

@@ -167 +167 @@
         jabber_buddy_remove_bare(c->ic, jc->name);
 
+        g_free(jc->last_sent_message);
         g_free(jc->my_full_jid);
         g_free(jc->name);
@@ -187 +188 @@
 
         jabber_cache_add(ic, node, jabber_chat_self_message);
+
+        g_free(jc->last_sent_message);
+        jc->last_sent_message = g_strdup(message);
 
         return !jabber_write_packet(ic, node);
@@ -494 +498 @@
                 imcb_chat_log(chat, "From conference server: %s", body->text);
                 return;
-        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
-                   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
-                /* Self message marked by this bitlbee, don't show it */
-                return;
+        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
+                if (jabber_cache_handle_packet(ic, node) == XT_ABORT) {
+                        /* Self message marked by this bitlbee, don't show it */
+                        return;
+                } else if (xt_find_attr(node, "id") == NULL &&
+                           g_strcmp0(body->text, jc->last_sent_message) == 0) {
+                        /* Some misbehaving servers (like slack) eat the ids and echo anyway.
+                         * Try to detect those cases by comparing against the last sent message. */
+                        return;
+                }
         }
 

protocols/jabber/jabber.h

@@ -161 +161 @@
         struct jabber_buddy *me;
         char *invite;
+        char *last_sent_message;
 };