Changeset b1dc403 for irc_channel.c

Timestamp:

2015-05-04T21:58:50Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (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:

Catch up with master.

File:

• irc_channel.c (modified) (1 diff)

irc_channel.c

@@ -556 +556 @@
 }
 
+gboolean irc_channel_is_unused(irc_t *irc, char *name)
+{
+        char *type, *chat_type;
+        irc_channel_t *oic;
+
+        if (!irc_channel_name_ok(name)) {
+                return FALSE;
+        }
+
+        if (!(oic = irc_channel_by_name(irc, name))) {
+                return TRUE;
+        }
+
+        type = set_getstr(&oic->set, "type");
+        chat_type = set_getstr(&oic->set, "chat_type");
+
+        if (type && chat_type && oic->data == FALSE &&
+            strcmp(type, "chat") == 0 &&
+            strcmp(chat_type, "groupchat") == 0) {
+                /* There's a channel with this name already, but it looks
+                   like it's not in use yet. Most likely the IRC client
+                   rejoined the channel after a reconnect. Remove it so
+                   we can reuse its name. */
+                irc_channel_free(oic);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+char *irc_channel_name_gen(irc_t *irc, const char *hint)
+{
+        char name[MAX_NICK_LENGTH + 1] = { 0 };
+        char *translit_name;
+        gsize bytes_written;
+
+        translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+        if (bytes_written > MAX_NICK_LENGTH) {
+                translit_name[MAX_NICK_LENGTH] = '\0';
+        }
+
+        name[0] = '#';
+        strncpy(name + 1, translit_name, MAX_NICK_LENGTH - 1);
+        name[MAX_NICK_LENGTH] = '\0';
+
+        g_free(translit_name);
+
+        irc_channel_name_strip(name);
+
+        if (set_getbool(&irc->b->set, "lcnicks")) {
+                nick_lc(irc, name + 1);
+        }
+
+        while (!irc_channel_is_unused(irc, name)) {
+                underscore_dedupe(name);
+        }
+
+        return g_strdup(name);
+}
+
+gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name)
+{
+        irc_t *irc = ic->irc;
+        char *full_name;
+
+        /* Don't rename a channel if the user's in it already. */
+        if (ic->flags & IRC_CHANNEL_JOINED) {
+                return FALSE;
+        }
+
+        if (!(full_name = irc_channel_name_gen(irc, name))) {
+                return FALSE;
+        }
+
+        g_free(ic->name);
+        ic->name = full_name;
+
+        return TRUE;
+}
+
 static gint irc_channel_user_cmp(gconstpointer a_, gconstpointer b_)
 {