Changeset 9c8dbc7 for protocols/jabber/jabber.c

Timestamp:

2015-11-23T17:49:09Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

ad9ac5d

Parents:

c34247d

Message:

hipchat: 'chat add hipchat "channel name"' now tries to guess the JID

It's basically prepending the organization id, appending the default MUC
host from the success packet, and generating a slug based on the name
for the middle part, which is replacing a few characters with
underscores and doing a unicode aware lowercasing.

Includes tests, which are useless other than validating the initial
implementation with the test vectors that i already tested manually.
Guaranteed to detect zero breakages in the future. Good test code.

File:

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

protocols/jabber/jabber.c

@@ -371 +371 @@
         g_free(jd->internal_jid);
         g_free(jd->gmail_tid);
+        g_free(jd->muc_host);
         g_free(jd->username);
         g_free(jd->me);
@@ -533 +534 @@
         }
 
+        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?",
@@ -539 +551 @@
                 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"));
         }