Changeset 90254d0

Timestamp:

2016-12-26T00:18:55Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

df291a6

Parents:

0483e1e

git-author:

dequis <dx@…> (24-12-16 04:56:45)

git-committer:

dequis <dx@…> (26-12-16 00:18:55)

Message:

Add nick_lowercase and nick_underscores settings

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• irc.c (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• nick.c (modified) (5 diffs)

doc/user-guide/commands.xml

@@ -1037 +1037 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="lcnicks" type="boolean" scope="global">
-                <default>true</default>
-
-                <description>
-                        <para>
-                                Hereby you can change whether you want all lower case nick names or leave the case as it intended by your peer.
-                        </para>
-                </description>
-
-        </bitlbee-setting>
-
         <bitlbee-setting name="local_display_name" type="boolean" scope="account">
                 <default>false</default>
@@ -1212 +1201 @@
                         </para>
                 </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="nick_lowercase" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                If enabled, all nicknames are turned into lower case.
+                        </para>
+
+                        <para>
+                                See also the <emphasis>nick_underscores</emphasis> setting. This setting was previously known as <emphasis>lcnicks</emphasis>.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="nick_underscores" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                If enabled, spaces in nicknames are turned into underscores instead of being stripped.
+                        </para>
+
+                        <para>
+                                See also the <emphasis>nick_lowercase</emphasis> setting.
+                        </para>
+                </description>
+
         </bitlbee-setting>
 

irc.c

@@ -113 +113 @@
         s = set_add(&b->set, "last_version", "0", NULL, irc);
         s->flags |= SET_HIDDEN;
-        s = set_add(&b->set, "lcnicks", "true", set_eval_bool, irc);
         s = set_add(&b->set, "nick_format", "%-@nick", NULL, irc);
+        s = set_add(&b->set, "nick_lowercase", "false", set_eval_bool, irc);
+        s = set_add(&b->set, "nick_underscores", "false", set_eval_bool, irc);
         s = set_add(&b->set, "offline_user_quits", "true", set_eval_bool, irc);
         s = set_add(&b->set, "ops", "both", set_eval_irc_channel_ops, irc);

irc_channel.c

@@ -638 +638 @@
         irc_channel_name_strip(name);
 
-        if (set_getbool(&irc->b->set, "lcnicks")) {
+        if (set_getbool(&irc->b->set, "nick_lowercase")) {
                 nick_lc(irc, name + 1);
         }

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 = set_getbool(&irc->b->set, "nick_underscores");
 
         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];