Changeset 7a9d968 for protocols

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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 HEAD

Location:

protocols

Files:

• Makefile (modified) (3 diffs)
• account.c (modified) (1 diff)
• bee_user.c (modified) (2 diffs)
• jabber/Makefile (modified) (1 diff)
• jabber/conference.c (modified) (5 diffs)
• jabber/jabber.h (modified) (1 diff)
• jabber/s5bytestream.c (modified) (4 diffs)
• msn/Makefile (modified) (1 diff)
• msn/msn_util.c (modified) (1 diff)
• msn/soap.c (modified) (1 diff)
• nogaim.c (modified) (6 diffs)
• oscar/Makefile (modified) (1 diff)
• oscar/rxhandlers.c (modified) (1 diff)
• purple/Makefile (modified) (1 diff)
• purple/bpurple.h (modified) (2 diffs)
• purple/ft.c (modified) (1 diff)
• purple/purple.c (modified) (24 diffs)
• twitter/Makefile (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (8 diffs)

protocols/Makefile

@@ -43 +43 @@
 
 $(subdirs):
-        @$(MAKE) -C $@ $(MAKECMDGOALS)
+        $(MAKE) -C $@ $(MAKECMDGOALS)
 
 ### MAIN PROGRAM
@@ -49 +49 @@
 protocols.o: $(objects) $(subdirs)
         @echo '*' Linking protocols.o
-        @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
 
 $(objects): ../Makefile.settings Makefile
@@ -55 +55 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 -include .depend/*.d

protocols/account.c

@@ -55 +55 @@
 
         s = set_add(&a->set, "auto_reconnect", "true", set_eval_bool, a);
+
+        s = set_add(&a->set, "handle_unknown", NULL, NULL, a);
+        s->flags |= SET_NULL_OK;
 
         s = set_add(&a->set, "nick_format", NULL, NULL, a);

protocols/bee_user.c

@@ -170 +170 @@
 
         if (!(bu = bee_user_by_handle(bee, ic, handle))) {
-                if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "add") == 0) {
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
+
+                if (g_strncasecmp(h, "add", 3) == 0) {
                         bu = bee_user_new(bee, ic, handle, BEE_USER_LOCAL);
                 } else {
-                        if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "ignore") != 0) {
+                        if (g_strcasecmp(h, "ignore") != 0) {
                                 imcb_log(ic, "imcb_buddy_status() for unknown handle %s:\n"
                                          "flags = %d, state = %s, message = %s", handle, flags,
@@ -255 +258 @@
 
         if (!bu && !(ic->flags & OPT_LOGGING_OUT)) {
-                char *h = set_getstr(&bee->set, "handle_unknown");
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
 
                 if (g_strcasecmp(h, "ignore") == 0) {

protocols/jabber/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 jabber_mod.o: $(objects)
         @echo '*' Linking jabber_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
 
 -include .depend/*.d

protocols/jabber/conference.c

@@ -167 +167 @@
         jabber_buddy_remove_bare(c->ic, jc->name);
 
+        g_free(jc->last_sent_message);
         g_free(jc->my_full_jid);
         g_free(jc->name);
@@ -187 +188 @@
 
         jabber_cache_add(ic, node, jabber_chat_self_message);
+
+        g_free(jc->last_sent_message);
+        jc->last_sent_message = g_strdup(message);
 
         return !jabber_write_packet(ic, node);
@@ -325 +329 @@
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;
+                } else if (bud == jc->me) {
+                        g_free(bud->ext_jid);
+                        bud->ext_jid = g_strdup(jd->me);
                 }
 
@@ -347 +354 @@
                 }
 
+                imcb_chat_add_buddy(chat, bud->ext_jid);
+
                 if (bud != jc->me && (jc->flags & JCFLAG_ALWAYS_USE_NICKS) && !(bud->flags & JBFLAG_IS_ANONYMOUS)) {
                         imcb_buddy_nick_change(ic, bud->ext_jid, bud->resource);
                 }
 
-                imcb_chat_add_buddy(chat, bud->ext_jid);
                 if (s) {
                         *s = '/';
@@ -494 +502 @@
                 imcb_chat_log(chat, "From conference server: %s", body->text);
                 return;
-        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
-                   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
-                /* Self message marked by this bitlbee, don't show it */
-                return;
+        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
+                if (jabber_cache_handle_packet(ic, node) == XT_ABORT) {
+                        /* Self message marked by this bitlbee, don't show it */
+                        return;
+                } else if (xt_find_attr(node, "id") == NULL &&
+                           g_strcmp0(body->text, jc->last_sent_message) == 0) {
+                        /* Some misbehaving servers (like slack) eat the ids and echo anyway.
+                         * Try to detect those cases by comparing against the last sent message. */
+                        return;
+                }
         }
 

protocols/jabber/jabber.h

@@ -161 +161 @@
         struct jabber_buddy *me;
         char *invite;
+        char *last_sent_message;
 };
 

protocols/jabber/s5bytestream.c

@@ -500 +500 @@
         case BS_PHASE_REPLY:
         {
-                struct socks5_message socks5_reply;
+                struct socks5_message socks5_reply = {0};
                 int ret;
 
@@ -888 +888 @@
         char *proxy, *next, *errmsg = NULL;
         char port[6];
-        char host[HOST_NAME_MAX + 1];
+        char host[NI_MAXHOST + 1];
         jabber_streamhost_t *sh, *sh2;
         GSList *streamhosts = jd->streamhosts;
@@ -1046 +1046 @@
                         unsigned char nmethods;
                         unsigned char method;
-                } socks5_hello;
+                } socks5_hello = {0};
 
                 if (!(ret = jabber_bs_peek(bt, &socks5_hello, sizeof(socks5_hello)))) {
@@ -1091 +1091 @@
         case BS_PHASE_REQUEST:
         {
-                struct socks5_message socks5_connect;
+                struct socks5_message socks5_connect = {0};
                 int msgsize = sizeof(struct socks5_message);
                 int ret;

protocols/msn/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 msn_mod.o: $(objects)
         @echo '*' Linking msn_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
 
 -include .depend/*.d

protocols/msn/msn_util.c

@@ -180 +180 @@
         if (getenv("BITLBEE_DEBUG")) {
                 fprintf(stderr, "\n\x1b[92m<<< ");
-                write(2, bytes , st);
+                fwrite(bytes, st, 1, stderr);
                 fprintf(stderr, "\x1b[97m");
         }

protocols/msn/soap.c

@@ -213 +213 @@
         if (headers) {
                 if ((s = strstr(headers, "\r\n\r\n"))) {
-                        write(2, headers, s - headers + 4);
+                        fwrite(headers, s - headers + 4, 1, stderr);
                 } else {
-                        write(2, headers, strlen(headers));
+                        fwrite(headers, strlen(headers), 1, stderr);
                 }
         }

protocols/nogaim.c

@@ -50 +50 @@
 }
 
+/* semi-private */
+gboolean plugin_info_validate(struct plugin_info *info, const char *path)
+{
+        GList *l;
+        gboolean loaded = FALSE;
+
+        if (!path) {
+                path = "(null)";
+        }
+
+        if (info->abiver != BITLBEE_ABI_VERSION_CODE) {
+                log_message(LOGLVL_ERROR,
+                            "`%s' uses ABI %u but %u is required\n",
+                            path, info->abiver,
+                            BITLBEE_ABI_VERSION_CODE);
+                return FALSE;
+        }
+
+        if (!info->name || !info->version) {
+                log_message(LOGLVL_ERROR,
+                            "Name or version missing from the "
+                            "plugin info in `%s'\n", path);
+                return FALSE;
+        }
+
+        for (l = plugins; l; l = l->next) {
+                struct plugin_info *i = l->data;
+
+                if (g_strcasecmp(i->name, info->name) == 0) {
+                        loaded = TRUE;
+                        break;
+                }
+        }
+
+        if (loaded) {
+                log_message(LOGLVL_WARNING,
+                            "%s plugin already loaded\n",
+                            info->name);
+                return FALSE;
+        }
+
+        return TRUE;
+}
+
+/* semi-private */
+gboolean plugin_info_add(struct plugin_info *info)
+{
+        plugins = g_list_insert_sorted_with_data(plugins, info, pluginscmp, NULL);
+        return TRUE;
+}
+
 gboolean load_plugin(char *path)
 {
-        GList *l;
-        struct plugin_info *i;
-        struct plugin_info *info;
+        struct plugin_info *info = NULL;
         struct plugin_info * (*info_function) (void) = NULL;
         void (*init_function) (void);
 
         GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
-        gboolean loaded = FALSE;
 
         if (!mod) {
@@ -69 +117 @@
                 info = info_function();
 
-                if (info->abiver != BITLBEE_ABI_VERSION_CODE) {
-                        log_message(LOGLVL_ERROR,
-                                    "`%s' uses ABI %u but %u is required\n",
-                                    path, info->abiver,
-                                    BITLBEE_ABI_VERSION_CODE);
-                        g_module_close(mod);
-                        return FALSE;
-                }
-
-                if (!info->name || !info->version) {
-                        log_message(LOGLVL_ERROR,
-                                    "Name or version missing from the "
-                                    "plugin info in `%s'\n", path);
-                        g_module_close(mod);
-                        return FALSE;
-                }
-
-                for (l = plugins; l; l = l->next) {
-                        i = l->data;
-
-                        if (g_strcasecmp(i->name, info->name) == 0) {
-                                loaded = TRUE;
-                                break;
-                        }
-                }
-
-                if (loaded) {
-                        log_message(LOGLVL_WARNING,
-                                    "%s plugin already loaded\n",
-                                    info->name);
+                if (!plugin_info_validate(info, path)) {
                         g_module_close(mod);
                         return FALSE;
@@ -113 +132 @@
 
         if (info_function) {
-                plugins = g_list_insert_sorted_with_data(plugins, info,
-                                                         pluginscmp, NULL);
+                plugin_info_add(info);
         }
 
@@ -797 +815 @@
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
                 away = imc_away_state_find(m, away, &msg) ? :
-                       (imc_away_state_find(m, "away", &msg) ? : m->data);
+                       (imc_away_state_find(m, "away", NULL) ? : m->data);
         } else if (ic->acc->flags & ACC_FLAG_STATUS_MESSAGE) {
                 away = NULL;
@@ -831 +849 @@
                            contains no data unless it adds something to what
                            we have in state already. */
-                        if (strlen(m->data) == strlen(away)) {
+                        if (message && strlen(m->data) == strlen(away)) {
                                 *message = NULL;
                         }
@@ -857 +875 @@
                         for (m = gcm; m; m = m->next) {
                                 if (g_strcasecmp(imc_away_alias_list[i][j], m->data) == 0) {
-                                        if (!keep_message) {
+                                        if (!keep_message && message) {
                                                 *message = NULL;
                                         }

protocols/oscar/Makefile

@@ -39 +39 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 oscar_mod.o: $(objects)
         @echo '*' Linking oscar_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
 
 -include .depend/*.d

protocols/oscar/rxhandlers.c

@@ -235 +235 @@
         struct aim_rxcblist_s *newcb;
 
-        if (!conn) {
-                return -1;
-        }
-
-        if (checkdisallowed(family, type)) {
-                g_assert(0);
-                return -1;
-        }
+        g_return_val_if_fail(conn, -1);
+        g_return_val_if_fail(!checkdisallowed(family, type), -1);
 
         if (!(newcb = (struct aim_rxcblist_s *) g_new0(struct aim_rxcblist_s, 1))) {

protocols/purple/Makefile

@@ -39 +39 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 purple_mod.o: $(objects)
         @echo '*' Linking purple_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o purple_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
 
 -include .depend/*.d

protocols/purple/bpurple.h

@@ -6 +6 @@
 
 #define PURPLE_REQUEST_HANDLE "purple_request"
+
+#define PURPLE_OPT_SHOULD_SET_NICK 1
 
 struct purple_data
@@ -15 +17 @@
     char *chat_list_server;
     GSList *filetransfers;
+
+    int flags;
 };
 

protocols/purple/ft.c

@@ -146 +146 @@
            remove the evil cast below. */
         px->ft = imcb_file_send_start(ic, (char *) who, xfer->filename, xfer->size);
+
+        if (!px->ft) {
+                return FALSE;
+        }
         px->ft->data = px;
 

protocols/purple/purple.c

@@ -114 +114 @@
 }
 
+static gboolean purple_account_should_set_nick(account_t *acc)
+{
+        /* whitelist of protocols that tend to have numeric or meaningless usernames, and should
+         * always offer the 'alias' as a nick.  this is just so that users don't have to do
+         * 'account whatever set nick_format %full_name'
+         */
+        char *whitelist[] = {
+                "prpl-hangouts",
+                "prpl-eionrobb-funyahoo-plusplus",
+                "prpl-icq",
+                "prpl-line",
+                NULL,
+        };
+        char **p;
+
+        for (p = whitelist; *p; p++) {
+                if (g_strcmp0(acc->prpl->data, *p) == 0) {
+                        return TRUE;
+                }
+        }
+
+        return FALSE;
+}
+
 static void purple_init(account_t *acc)
 {
@@ -281 +305 @@
         }
 
+        if (g_strcmp0(prpl->info->id, "prpl-line") == 0) {
+                s = set_add(&acc->set, "line-auth-token", NULL, NULL, acc);
+                s->flags |= SET_HIDDEN;
+        }
+
         /* Go through all away states to figure out if away/status messages
            are possible. */
@@ -344 +373 @@
                 purple_account_set_check_mail(pa, set_getbool(&acc->set, "mail_notifications"));
         }
+
+        if (g_strcmp0(prpl->info->id, "prpl-line") == 0) {
+                const char *name = "line-auth-token";
+                purple_account_set_string(pa, name, set_getstr(&acc->set, name));
+        }
 }
 
@@ -372 +406 @@
         purple_account_set_password(pd->account, acc->pass);
         purple_sync_settings(acc, pd->account);
+
+        if (purple_account_should_set_nick(acc)) {
+                pd->flags = PURPLE_OPT_SHOULD_SET_NICK;
+        }
 
         purple_account_set_enabled(pd->account, "BitlBee", TRUE);
@@ -741 +779 @@
         struct groupchat *gc;
         GList *info, *l;
+        GString *missing_settings = NULL;
 
         if (!pi->chat_info || !pi->chat_info_defaults ||
@@ -766 +805 @@
                 } else if (strcmp(pce->identifier, "passwd") == 0) {
                         g_hash_table_replace(chat_hash, "passwd", g_strdup(password));
+                } else {
+                        char *key, *value;
+
+                        key = g_strdup_printf("purple_%s", pce->identifier);
+                        str_reject_chars(key, " -", '_');
+
+                        if ((value = set_getstr(sets, key))) {
+                                /* sync from bitlbee to the prpl */
+                                g_hash_table_replace(chat_hash, (char *) pce->identifier, g_strdup(value));
+                        } else if ((value = g_hash_table_lookup(chat_hash, pce->identifier))) {
+                                /* if the bitlbee one was empty, sync from prpl to bitlbee */
+                                set_setstr(sets, key, value);
+                        }
+
+                        g_free(key);
+                }
+
+                if (pce->required && !g_hash_table_lookup(chat_hash, pce->identifier)) {
+                        if (!missing_settings) {
+                                missing_settings = g_string_sized_new(32);
+                        }
+                        g_string_append_printf(missing_settings, "%s, ", pce->identifier);
                 }
 
@@ -772 +833 @@
 
         g_list_free(info);
+
+        if (missing_settings) {
+                /* remove the ", " from the end */
+                g_string_truncate(missing_settings, missing_settings->len - 2);
+
+                imcb_error(ic, "Can't join %s. The following settings are required: %s", room, missing_settings->str);
+
+                g_string_free(missing_settings, TRUE);
+                g_hash_table_destroy(chat_hash);
+                return NULL;
+        }
 
         /* do this before serv_join_chat to handle cases where prplcb_conv_new is called immediately (not async) */
@@ -806 +878 @@
                 purple_roomlist_ref(list);
         }
+}
+
+/* handles either prpl->chat_(add|free)_settings depending on the value of 'add' */
+static void purple_chat_update_settings(account_t *acc, set_t **head, gboolean add)
+{
+        PurplePlugin *prpl = purple_plugins_find_with_id((char *) acc->prpl->data);
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+        GList *info, *l;
+
+        if (!pi->chat_info || !pi->chat_info_defaults) {
+                return;
+        }
+
+        /* hack / leap of faith: pass a NULL here because we don't have a connection yet.
+         * i reviewed all the built-in prpls and a bunch of third-party ones and none
+         * of them seem to need this parameter at all, so... i hope it never crashes */
+        info = pi->chat_info(NULL);
+
+        for (l = info; l; l = l->next) {
+                struct proto_chat_entry *pce = l->data;
+                char *key;
+
+                if (strcmp(pce->identifier, "handle") == 0 ||
+                    strcmp(pce->identifier, "password") == 0 ||
+                    strcmp(pce->identifier, "passwd") == 0) {
+                        /* skip these, they are handled above */
+                        g_free(pce);
+                        continue;
+                }
+
+                key = g_strdup_printf("purple_%s", pce->identifier);
+                str_reject_chars(key, " -", '_');
+
+                if (add) {
+                        set_add(head, key, NULL, NULL, NULL);
+                } else {
+                        set_del(head, key);
+                }
+
+                g_free(key);
+                g_free(pce);
+        }
+
+        g_list_free(NULL);
+        g_list_free(info);
+}
+
+static void purple_chat_add_settings(account_t *acc, set_t **head)
+{
+        purple_chat_update_settings(acc, head, TRUE);
+}
+
+static void purple_chat_free_settings(account_t *acc, set_t **head)
+{
+        purple_chat_update_settings(acc, head, FALSE);
 }
 
@@ -844 +971 @@
 {
         struct im_connection *ic = purple_ic_by_gc(gc);
-        const char *dn;
+        struct purple_data *pd = ic->proto_data;
+        const char *dn, *token;
         set_t *s;
 
@@ -857 +985 @@
         // user list needs to be requested for Gadu-Gadu
         purple_gg_buddylist_import(gc);
+
+        /* more awful hacks, because clearly we didn't have enough of those */
+        if ((s = set_find(&ic->acc->set, "line-auth-token")) &&
+            (token = purple_account_get_string(pd->account, "line-auth-token", NULL))) {
+                g_free(s->value);
+                s->value = g_strdup(token);
+        }
 
         ic->flags |= OPT_DOES_HTML;
@@ -908 +1043 @@
                 PurpleGroup *group = purple_buddy_get_group(bud);
                 struct im_connection *ic = purple_ic_by_pa(bud->account);
+                struct purple_data *pd = ic->proto_data;
                 PurpleStatus *as;
                 int flags = 0;
+                char *alias = NULL;
 
                 if (ic == NULL) {
@@ -915 +1052 @@
                 }
 
-                if (bud->server_alias) {
-                        imcb_rename_buddy(ic, bud->name, bud->server_alias);
-                } else if (bud->alias) {
-                        imcb_rename_buddy(ic, bud->name, bud->alias);
+                alias = bud->server_alias ? : bud->alias;
+
+                if (alias) {
+                        imcb_rename_buddy(ic, bud->name, alias);
+                        if (pd->flags & PURPLE_OPT_SHOULD_SET_NICK) {
+                                imcb_buddy_nick_change(ic, bud->name, alias);
+                        }
                 }
 
@@ -1062 +1202 @@
 }
 
-/* Handles write_im and write_chat. Removes echoes of locally sent messages */
+/* Handles write_im and write_chat. Removes echoes of locally sent messages.
+ *
+ * PURPLE_MESSAGE_DELAYED is used for chat backlogs - if a message has both
+ * that flag and _SEND, it's a self-message from before joining the channel.
+ * Those are safe to display. The rest (with just _SEND) may be echoes. */
 static void prplcb_conv_msg(PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime)
 {
-        if (!(flags & PURPLE_MESSAGE_SEND)) {
-                handle_conv_msg(conv, who, message, 0, mtime);
+        if ((!(flags & PURPLE_MESSAGE_SEND)) || (flags & PURPLE_MESSAGE_DELAYED)) {
+                handle_conv_msg(conv, who, message, (flags & PURPLE_MESSAGE_SEND) ? OPT_SELFMESSAGE : 0, mtime);
         }
 }
@@ -1392 +1536 @@
 }
 
+static char *prplcb_roomlist_get_room_name(PurpleRoomlist *list, PurpleRoomlistRoom *room)
+{
+        struct im_connection *ic = purple_ic_by_pa(list->account);
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+
+        if (pi && pi->roomlist_room_serialize) {
+                return pi->roomlist_room_serialize(room);
+        } else {
+                return g_strdup(purple_roomlist_room_get_name(room));
+        }
+}
+
 static void prplcb_roomlist_add_room(PurpleRoomlist *list, PurpleRoomlistRoom *room)
 {
         bee_chat_info_t *ci;
-        const char *title;
+        char *title;
         const char *topic;
         GList *fields;
@@ -1401 +1559 @@
 
         fields = purple_roomlist_room_get_fields(room);
-        title = purple_roomlist_room_get_name(room);
+        title = prplcb_roomlist_get_room_name(list, room);
 
         if (rld->topic >= 0) {
@@ -1410 +1568 @@
 
         ci = g_new(bee_chat_info_t, 1);
-        ci->title = g_strdup(title);
+        ci->title = title;
         ci->topic = g_strdup(topic);
         rld->chats = g_slist_prepend(rld->chats, ci);
@@ -1632 +1790 @@
 }
 
+/* borrowing this semi-private function
+ * TODO: figure out a better interface later (famous last words) */
+gboolean plugin_info_add(struct plugin_info *info);
+
 void purple_initmodule()
 {
@@ -1638 +1800 @@
         GString *help;
         char *dir;
+        gboolean debug_enabled = !!getenv("BITLBEE_DEBUG");
 
         if (purple_get_core() != NULL) {
@@ -1645 +1808 @@
         }
 
-        g_assert((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
-        g_assert((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
+        g_return_if_fail((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
+        g_return_if_fail((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
 
         dir = g_strdup_printf("%s/purple", global.conf->configdir);
@@ -1656 +1819 @@
         g_free(dir);
 
-        purple_debug_set_enabled(FALSE);
+        purple_debug_set_enabled(debug_enabled);
         purple_core_set_ui_ops(&bee_core_uiops);
         purple_eventloop_set_ui_ops(&glib_eventloops);
@@ -1664 +1827 @@
                 abort();
         }
+        purple_debug_set_enabled(FALSE);
 
         if (proxytype != PROXY_NONE) {
@@ -1722 +1886 @@
         funcs.chat_join = purple_chat_join;
         funcs.chat_list = purple_chat_list;
+        funcs.chat_add_settings = purple_chat_add_settings;
+        funcs.chat_free_settings = purple_chat_free_settings;
         funcs.transfer_request = purple_transfer_request;
 
@@ -1732 +1898 @@
                 PurplePluginProtocolInfo *pi = prot->info->extra_info;
                 struct prpl *ret;
+                struct plugin_info *info;
 
                 /* If we already have this one (as a native module), don't
@@ -1766 +1933 @@
                         register_protocol(ret);
                 }
+
+                info = g_new0(struct plugin_info, 1);
+                info->abiver = BITLBEE_ABI_VERSION_CODE;
+                info->name = ret->name;
+                info->version = prot->info->version;
+                info->description = prot->info->description;
+                info->author = prot->info->author;
+                info->url = prot->info->homepage;
+
+                plugin_info_add(info);
         }
 

protocols/twitter/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 twitter_mod.o: $(objects)
         @echo '*' Linking twitter_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
         
 -include .depend/*.d

protocols/twitter/twitter.c

@@ -576 +576 @@
         s->flags |= SET_HIDDEN | SET_NOSAVE;
 
+        s = set_add(&acc->set, "in_korea", "false", set_eval_bool, acc);
+        s->flags |= SET_HIDDEN;
+
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -239 +239 @@
         if ((ret = json_parse_string(req->reply_body)) == NULL) {
                 imcb_error(ic, "Could not retrieve %s: %s",
-                           path, "XML parse error");
+                           path, "JSON parse error");
         }
         return ret;
@@ -310 +310 @@
 
                 txl->list = g_slist_prepend(txl->list,
-                                            g_strdup_printf("%lld", id));
+                                            g_strdup_printf("%" PRIu64, id);
         }
 
@@ -443 +443 @@
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->noretweets_ids;
-        
+
         // Process the retweet ids
         txl->type = TXL_ID;
@@ -452 +452 @@
                         jint id = json_array_get_integer(arr, i);
                         txl->list = g_slist_prepend(txl->list,
-                                                    g_strdup_printf("%lld", id));
+                                                    g_strdup_printf("%" PRId64, id));
                 }
         }
@@ -713 +713 @@
                 return;
         if ((quoted = json_object_get_object(node, "quoted_status"))) {
-                /* New "retweets with comments" feature. Note that this info
-                 * seems to be included in the streaming API only! Grab the
+                /* New "retweets with comments" feature. Grab the
                  * full message and try to insert it when we run into the
                  * Tweet entity. */
@@ -755 +754 @@
                         char *pos, *new;
 
-                        if (!kort || !disp || !(pos = strstr(*text, kort))) {
+                        /* Skip if a required field is missing, if the t.co URL is not in fact
+                           in the Tweet at all, or if the full-ish one *is* in it already
+                           (dupes appear, especially in streaming API). */
+                        if (!kort || !disp || !(pos = strstr(*text, kort)) || strstr(*text, disp)) {
                                 continue;
                         }
@@ -980 +982 @@
                 return;
         }
-        
+
         /* Check this is not a tweet that should be muted */
         uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid);
@@ -1691 +1693 @@
         };
 
+        if (set_getbool(&ic->acc->set, "in_korea") && !in_reply_to) {
+                g_free(args[3]);
+                args[2] = "place_id";
+                args[3] = g_strdup("c999e6a453e9ef72");
+                in_reply_to = 1;
+        }
+
         twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1,
                      args, in_reply_to ? 4 : 2);