Changeset 830864d for nick.c

Timestamp:

2015-03-15T09:31:18Z (9 years ago)

Author:

dequis <dx@…>

Children:

ac6855b3

Parents:

c0e4c22

git-author:

dequis <dx@…> (05-03-15 10:31:24)

git-committer:

dequis <dx@…> (15-03-15 09:31:18)

Message:

WIP placeholder channels with hipchat implementation

i was going to clean this up and split in two commits but uhhh...
maybe some other day, i'm tired now

not very tested and i'm not 100% happy about the design, but sucks way
less than what i had in the hip-cat branch

feedback still appreciated.

this adds channels to the channel list without creating groupchats for
them, allowing users to /join them. what the hip-cat branch did before
but with proper api and hopefully less dumb behavior

it still 'leaks' them intentionally, just like it did before, but now it
prevents saving them to the xml so yay

also slightly improved channel name generation, refactored
bee_irc_chat_name_hint into three or four functions, and so on

File:

• nick.c (modified) (2 diffs)

nick.c

@@ -214 +214 @@
 }
 
+/* Used for nicks and channel names too! */
+void underscore_dedupe(char nick[MAX_NICK_LENGTH + 1])
+{
+        if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
+                nick[strlen(nick) + 1] = 0;
+                nick[strlen(nick)] = '_';
+        } else {
+                /* We've got no more space for underscores,
+                   so truncate it and replace the last three
+                   chars with a random "_XX" suffix */
+                int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
+                nick[len] = '_';
+                g_snprintf(nick + len + 1, 3, "%2x", rand());
+        }
+}
+
 void nick_dedupe(bee_user_t *bu, char nick[MAX_NICK_LENGTH + 1])
 {
@@ -224 +240 @@
         while (!nick_ok(irc, nick) ||
                ((iu = irc_user_by_name(irc, nick)) && iu->bu != bu)) {
-                if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
-                        nick[strlen(nick) + 1] = 0;
-                        nick[strlen(nick)] = '_';
-                } else {
-                        /* We've got no more space for underscores,
-                           so truncate it and replace the last three
-                           chars with a random "_XX" suffix */
-                        int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
-                        nick[len] = '_';
-                        g_snprintf(nick + len + 1, 3, "%2x", rand());
-                }
+
+                underscore_dedupe(nick);
 
                 if (inf_protection-- == 0) {