Changeset 9c8dbc7

Timestamp:

2015-11-23T17:49:09Z (9 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.

Files:

• protocols/jabber/hipchat.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (2 diffs)
• tests/check_jabber_util.c (modified) (2 diffs)

protocols/jabber/hipchat.c

@@ -42 +42 @@
                 *sep = '/';
         }
+
+        jd->muc_host = g_strdup(xt_find_attr(node, "muc_host"));
 
         /* Hipchat's auth doesn't expect a restart here */
@@ -92 +94 @@
 
 }
+
+/* Returns a newly allocated string that tries to match the "slug" part of the JID using an
+ * approximation of the method used by the server. This might fail in some rare conditions
+ * (old JIDs generated a different way, locale settings unicode, etc) */
+char *hipchat_make_channel_slug(const char *name)
+{
+        char *lower;
+        char *new = g_malloc(strlen(name) + 1);
+        int i = 0;
+
+        do {
+                if (*name == ' ') {
+                        new[i++] = '_';
+                } else if (*name && !strchr("\"&'/:<>@", *name)) {
+                        new[i++] = *name;
+                }
+        } while (*(name++));
+
+        new[i] = '\0';
+
+        lower = g_utf8_strdown(new, -1);
+        g_free(new);
+
+        return lower;
+}
+
+char *hipchat_guess_channel_name(struct im_connection *ic, const char *name)
+{
+        struct jabber_data *jd = ic->proto_data;
+        char *slug, *retval, *underscore;
+        
+        if (!(underscore = strchr(jd->username, '_')) || !jd->muc_host) {
+                return NULL;
+        }
+
+        slug = hipchat_make_channel_slug(name);
+
+        /* Get the organization ID from the username, before the underscore */
+        *underscore = '\0';
+
+        retval = g_strdup_printf("%s_%s@%s", jd->username, slug, jd->muc_host);
+
+        *underscore = '_';
+
+        g_free(slug);
+
+        return retval;
+}

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"));
         }

protocols/jabber/jabber.h

@@ -113 +113 @@
         GSList *streamhosts;
         int have_streamhosts;
+
+        char *muc_host;
 };
 
@@ -358 +360 @@
 xt_status jabber_parse_hipchat_profile(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 xt_status hipchat_handle_success(struct im_connection *ic, struct xt_node *node);
+char *hipchat_make_channel_slug(const char *name);
+char *hipchat_guess_channel_name(struct im_connection *ic, const char *name);
 
 #endif

tests/check_jabber_util.c

@@ -105 +105 @@
 }
 
+static void check_hipchat_slug(int l)
+{
+        int i;
+
+        const char *tests[] = {
+                "test !\"#$%&\'()*+,-./0123456789:;<=>?@ABC", "test_!#$%\()*+,-.0123456789;=?abc",
+                "test XYZ[\\]^_`abc", "test_xyz[\\]^_`abc",
+                "test {|}~¡¢£¤¥¦§¨©ª«¬\xad®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆ", "test_{|}~¡¢£¤¥¦§¨©ª«¬\xad®¯°±²³´µ¶·¸¹º»¼½¾¿àáâãäåæ",
+                "test IJ ij I ı I ı", "test_ij_ij_i_ı_i_ı",
+                NULL,
+        };
+
+        for (i = 0; tests[i]; i += 2) {
+                char *new = hipchat_make_channel_slug(tests[i]);
+                fail_unless(!strcmp(tests[i + 1], new));
+                g_free(new);
+        }
+}
+
 Suite *jabber_util_suite(void)
 {
@@ -121 +140 @@
         tcase_add_test(tc_core, check_buddy_add);
         tcase_add_test(tc_core, check_compareJID);
+        tcase_add_test(tc_core, check_hipchat_slug);
         return s;
 }