Changeset 7a9d968 for nick.c

Timestamp:

2018-03-10T11:30:39Z (6 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

File:

• nick.c (modified) (5 diffs)

nick.c

@@ -94 +94 @@
 
                 nick_strip(irc, nick);
-                if (set_getbool(&bu->bee->set, "lcnicks")) {
+                if (set_getbool(&bu->bee->set, "nick_lowercase")) {
                         nick_lc(irc, nick);
                 }
@@ -215 +215 @@
         if (ok && rets && *rets) {
                 nick_strip(irc, rets);
+
+                if (set_getbool(&bu->bee->set, "nick_lowercase")) {
+                        nick_lc(irc, rets);
+                }
+
                 truncate_utf8(rets, MAX_NICK_LENGTH);
                 return rets;
@@ -288 +293 @@
 {
         int len = 0;
+        gboolean nick_underscores = irc ? set_getbool(&irc->b->set, "nick_underscores") : FALSE;
 
         if (irc && (irc->status & IRC_UTF8_NICKS)) {
@@ -297 +303 @@
                         n = g_utf8_find_next_char(p, NULL);
 
-                        if ((c < 0x7f && !(strchr(nick_lc_chars, c) ||
-                                           strchr(nick_uc_chars, c))) ||
+                        if (nick_underscores && c == ' ') {
+                                *p = '_';
+                                p = n;
+                        } else if ((c < 0x7f && !(strchr(nick_lc_chars, c) ||
+                                                  strchr(nick_uc_chars, c))) ||
                             !g_unichar_isgraph(c)) {
                                 strcpy(tmp, n);
@@ -313 +322 @@
 
                 for (i = len = 0; nick[i] && len < MAX_NICK_LENGTH; i++) {
-                        if (strchr(nick_lc_chars, nick[i]) ||
+                        if (nick_underscores && nick[i] == ' ') {
+                                nick[len] = '_';
+                                len++;
+                        } else if (strchr(nick_lc_chars, nick[i]) ||
                             strchr(nick_uc_chars, nick[i])) {
                                 nick[len] = nick[i];