Changeset 537d9b9 for protocols/jabber/jabber.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (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 master up to commit '9f03c47' into parson

File:

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

protocols/jabber/jabber.c

@@ -82 +82 @@
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
+        set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
         if (strcmp(acc->prpl->name, "hipchat") == 0) {
                 set_setstr(&acc->set, "server", "chat.hipchat.com");
         } else {
-                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
-
                 /* this reuses set_eval_oauth, which clears the password */
                 set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
@@ -321 +321 @@
         struct jabber_data *jd = ic->proto_data;
 
+        imcb_chat_list_free(ic);
+
         while (jd->filetransfers) {
                 imcb_file_canceled(ic, (( struct jabber_transfer *) jd->filetransfers->data)->ft, "Logging out");
@@ -397 +399 @@
         if (g_strcasecmp(who, JABBER_OAUTH_HANDLE) == 0 &&
             !(jd->flags & OPT_LOGGED_IN) && jd->fd == -1) {
-                if (sasl_oauth2_get_refresh_token(ic, message)) {
+
+                if (jd->flags & JFLAG_HIPCHAT) {
+                        sasl_oauth2_got_token(ic, message, NULL, NULL);
+                        return 1;
+                } else if (sasl_oauth2_get_refresh_token(ic, message)) {
                         return 1;
                 } else {
@@ -577 +583 @@
         } else {
                 /* jabber_chat_join without the underscore is the conference.c one */
-                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"));
+                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"),
+                                        set_getbool(sets, "always_use_nicks"));
         }
 
@@ -586 +593 @@
 {
         return jabber_chat_with(ic, who);
+}
+
+static void jabber_chat_list_(struct im_connection *ic, const char *server)
+{
+        struct jabber_data *jd = ic->proto_data;
+
+        if (server && *server) {
+                jabber_iq_disco_muc(ic, server);
+        } else if (jd->muc_host && *jd->muc_host) {
+                jabber_iq_disco_muc(ic, jd->muc_host);
+        } else {
+                /* throw an error here, don't query conference.[server] directly.
+                 * for things like jabber.org it gets you 18000 results of garbage */
+                imcb_error(ic, "Please specify a server name such as `conference.%s'", jd->server);
+        }
 }
 
@@ -686 +708 @@
 void jabber_chat_add_settings(account_t *acc, set_t **head)
 {
+        set_add(head, "always_use_nicks", "false", set_eval_bool, NULL);
+
         /* Meh. Stupid room passwords. Not trying to obfuscate/hide
            them from the user for now. */
@@ -693 +717 @@
 void jabber_chat_free_settings(account_t *acc, set_t **head)
 {
+        set_del(head, "always_use_nicks");
+
         set_del(head, "password");
 }
@@ -759 +785 @@
         ret->chat_join = jabber_chat_join_;
         ret->chat_with = jabber_chat_with_;
+        ret->chat_list = jabber_chat_list_;
         ret->chat_add_settings = jabber_chat_add_settings;
         ret->chat_free_settings = jabber_chat_free_settings;