Changeset 3fbce97 for protocols/jabber/jabber.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 parson

File:

• protocols/jabber/jabber.c (modified) (14 diffs)

protocols/jabber/jabber.c

@@ -114 +114 @@
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
+        s = set_add(&acc->set, "carbons", "true", set_eval_bool, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
                       ACC_FLAG_HANDLE_DOMAINS;
@@ -148 +151 @@
         }
 
+        if (strstr(jd->server, ".facebook.com")) {
+                imcb_error(ic, "Facebook's XMPP service is gone. Try this instead: https://wiki.bitlbee.org/HowtoFacebookMQTT");
+                imc_logout(ic, FALSE);
+                return;
+        }
+
         if ((s = strchr(jd->server, '/'))) {
                 *s = 0;
@@ -167 +176 @@
                 jd->fd = jd->r_inpa = jd->w_inpa = -1;
 
-                if (strstr(jd->server, ".facebook.com")) {
-                        jd->oauth2_service = &oauth2_service_facebook;
-                } else {
-                        jd->oauth2_service = &oauth2_service_google;
-                }
+                /* There are no other options atm, so assume google for everything 
+                   Facebook and MSN XMPP used to be here. RIP. */
+                jd->oauth2_service = &oauth2_service_google;
 
                 oauth_params_parse(&p_in, ic->acc->pass);
@@ -197 +204 @@
         } else {
                 jabber_connect(ic);
+        }
+}
+
+static void jabber_xmlconsole_enable(struct im_connection *ic)
+{
+        struct jabber_data *jd = ic->proto_data;
+        const char *handle = JABBER_XMLCONSOLE_HANDLE;
+        bee_user_t *bu;
+        
+        jd->flags |= JFLAG_XMLCONSOLE;
+
+        if (!(bu = bee_user_by_handle(ic->bee, ic, handle))) {
+                bu = bee_user_new(ic->bee, ic, handle, 0);
+                bu->flags |= BEE_USER_NOOTR;
         }
 }
@@ -266 +287 @@
 
         if (set_getbool(&acc->set, "xmlconsole")) {
-                jd->flags |= JFLAG_XMLCONSOLE;
-                /* Shouldn't really do this at this stage already, maybe. But
-                   I think this shouldn't break anything. */
-                imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
+                jabber_xmlconsole_enable(ic);
         }
 
@@ -334 +352 @@
         }
         if (jd->fd >= 0) {
-                closesocket(jd->fd);
+                proxy_disconnect(jd->fd);
         }
 
@@ -345 +363 @@
         }
 
-        jabber_buddy_remove_all(ic);
+        if (jd->buddies) {
+                jabber_buddy_remove_all(ic);
+        }
 
         xt_free(jd->xt);
@@ -355 +375 @@
         g_free(jd->internal_jid);
         g_free(jd->gmail_tid);
+        g_free(jd->muc_host);
         g_free(jd->username);
         g_free(jd->me);
@@ -413 +434 @@
         }
 
+        /* XEP-0364 suggests we add message processing hints (XEP-0334) to OTR messages,
+           mostly to avoid carbons (XEP-0280) and server-side message archiving.
+           OTR messages are roughly like this: /^\?OTR(.*\?| Error:|:)/
+           But I'm going to simplify it to messages starting with "?OTR". */
+        if (g_str_has_prefix(message, "?OTR")) {
+                int i;
+                char *hints[] = {
+                        "no-copy", XMLNS_HINTS,
+                        "no-permanent-store", XMLNS_HINTS,
+                        "private", XMLNS_CARBONS,
+                        NULL
+                };
+                        
+                for (i = 0; hints[i]; i += 2) {
+                        struct xt_node *hint;
+                        hint = xt_new_node(hints[i], NULL, NULL);
+                        xt_add_attr(hint, "xmlns", hints[i + 1]);
+                        xt_add_child(node, hint);
+                }
+        }
+
         st = jabber_write_packet(ic, node);
         xt_free_node(node);
@@ -472 +514 @@
 static void jabber_add_buddy(struct im_connection *ic, char *who, char *group)
 {
-        struct jabber_data *jd = ic->proto_data;
-
         if (g_strcasecmp(who, JABBER_XMLCONSOLE_HANDLE) == 0) {
-                jd->flags |= JFLAG_XMLCONSOLE;
-                imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
+                jabber_xmlconsole_enable(ic);
                 return;
         }
@@ -520 +559 @@
         }
 
+        if (jd->flags & JFLAG_HIPCHAT && jd->muc_host && !g_str_has_suffix(room, jd->muc_host)) {
+                char *guessed_name = hipchat_guess_channel_name(ic, room);
+                if (guessed_name) {
+                        set_setstr(sets, "room", guessed_name);
+                        g_free(guessed_name);
+
+                        /* call this same function again with the fixed name */
+                        return jabber_chat_join_(ic, set_getstr(sets, "room"), nick, password, sets);
+                }
+        }
+
         if (strchr(room, '@') == NULL) {
                 imcb_error(ic, "%s is not a valid Jabber room name. Maybe you mean %s@conference.%s?",
@@ -526 +576 @@
                 imcb_error(ic, "Already present in chat `%s'", room);
         } else {
+                /* jabber_chat_join without the underscore is the conference.c one */
                 return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"));
         }
@@ -590 +641 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud;
+        struct jabber_buddy *bud, *bare;
 
         /* Enable typing notification related code from now. */
         jd->flags |= JFLAG_WANT_TYPING;
 
-        if ((bud = jabber_buddy_by_jid(ic, who, 0)) == NULL) {
+        if ((bud = jabber_buddy_by_jid(ic, who, 0)) == NULL ||
+            (bare = jabber_buddy_by_jid(ic, who, GET_BUDDY_BARE)) == NULL) {
                 /* Sending typing notifications to unknown buddies is
                    unsupported for now. Shouldn't be a problem, I think. */
@@ -601 +653 @@
         }
 
-        if (bud->flags & JBFLAG_DOES_XEP85) {
+
+        if (bud->flags & JBFLAG_DOES_XEP85 || bare->flags & JBFLAG_DOES_XEP85) {
                 /* We're only allowed to send this stuff if we know the other
-                   side supports it. */
+                   side supports it. If the bare JID has the flag, all other
+                   resources get it, too (That is the case in gtalk) */
 
                 struct xt_node *node;