Changeset 3fbce97 for irc_channel.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 parson

File:

• irc_channel.c (modified) (4 diffs)

irc_channel.c

@@ -213 +213 @@
         }
 
+        /* Skip the free/init if nothing is being changed */
+        if (ic->f == new) {
+                return value;
+        }
+
         /* TODO: Return values. */
         if (ic->f && ic->f->_free) {
@@ -255 +260 @@
 
         if (!(icu = irc_channel_has_user(ic, iu))) {
+                if (iu == ic->irc->user && type == IRC_CDU_KICK) {
+                        /* an error happened before joining, inform the client with a numeric */
+                        irc_send_num(ic->irc, 403, "%s :Error joining channel (check control channel?)", ic->name);
+                }
                 return 0;
         }
@@ -427 +436 @@
                           changes);
         }
+}
+
+char irc_channel_user_get_prefix(irc_channel_user_t *icu)
+{
+        if (icu->flags & IRC_CHANNEL_USER_OP) {
+                return '@';
+        } else if (icu->flags & IRC_CHANNEL_USER_HALFOP) {
+                return '%';
+        } else if (icu->flags & IRC_CHANNEL_USER_VOICE) {
+                return '+';
+        }
+        return 0;
 }
 
@@ -593 +614 @@
 
         translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+
+        if (!translit_name) {
+                /* Same thing as in nick_gen() in nick.c, try again without //TRANSLIT */
+                translit_name = g_convert_with_fallback(hint, -1, "ASCII", "UTF-8", "", NULL, &bytes_written, NULL);
+        }
+
+        if (!translit_name) {
+                return NULL;
+        }
+
         if (bytes_written > MAX_NICK_LENGTH) {
                 translit_name[MAX_NICK_LENGTH] = '\0';