Changeset c54bb11

Timestamp:

2015-12-06T02:34:12Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

459dec8

Parents:

f4396c4

Message:

IRCv3 userhost-in-names capability

Easiest part of ircv3.2

Files:

• irc.h (modified) (1 diff)
• irc_cap.c (modified) (1 diff)
• irc_send.c (modified) (3 diffs)

irc.h

@@ -72 +72 @@
         CAP_EXTENDED_JOIN = (1 << 2),
         CAP_AWAY_NOTIFY = (1 << 3),
+        CAP_USERHOST_IN_NAMES = (1 << 4),
 } irc_cap_flag_t;
 

irc_cap.c

@@ -42 +42 @@
         {"extended-join", CAP_EXTENDED_JOIN},
         {"away-notify", CAP_AWAY_NOTIFY},
+        {"userhost-in-names", CAP_USERHOST_IN_NAMES},
         {NULL},
 };

irc_send.c

@@ -208 +208 @@
         GSList *l;
         GString *namelist = g_string_sized_new(IRC_NAMES_LEN);
+        gboolean uhnames = (ic->irc->caps & CAP_USERHOST_IN_NAMES);
 
         /* RFCs say there is no error reply allowed on NAMES, so when the
@@ -217 +218 @@
                 char prefix;
 
+                if (uhnames) {
+                        extra_len += strlen(iu->user) + strlen(iu->host) + 2;
+                }
+
                 if (namelist->len + extra_len > IRC_NAMES_LEN - 4) {
                         irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist->str);
@@ -226 +231 @@
                 }
 
-                g_string_append(namelist, iu->nick);
-                g_string_append_c(namelist, ' ');
+                if (uhnames) {
+                        g_string_append_printf(namelist, "%s!%s@%s ", iu->nick, iu->user, iu->host);
+                } else {
+                        g_string_append(namelist, iu->nick);
+                        g_string_append_c(namelist, ' ');
+                }
         }