Changeset 246b98b for protocols/jabber

Timestamp:

2018-03-31T03:05:46Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

896bea2, 8c4af56e

Parents:

a39ede7

Message:

jabber: try to join anyway after "Already present in chat"

Most of the time that error meant a confusion on bitlbee's side, often a
server for which we sent a join request and never got a reply for.

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -579 +579 @@
                 imcb_error(ic, "%s is not a valid Jabber room name. Maybe you mean %s@conference.%s?",
                            room, room, jd->server);
-        } else if (jabber_chat_by_jid(ic, room)) {
-                imcb_error(ic, "Already present in chat `%s'", room);
         } else {
+                struct groupchat *old;
+
+                if ((old = jabber_chat_by_jid(ic, room))) {
+                        imcb_log(ic, "Warning: Already present in chat `%s' - trying to join anyway", room);
+                        jabber_chat_free(old);
+                }
+
                 /* jabber_chat_join without the underscore is the conference.c one */
                 return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"),