Changeset 687ec88

Timestamp:

2015-10-08T05:25:56Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2f73692

Parents:

0b0bb4c

git-author:

dequis <dx@…> (12-09-15 08:25:33)

git-committer:

dequis <dx@…> (08-10-15 05:25:56)

Message:

IRCv3 multi-prefix... but mostly just adding prefixes to WHO

We can't actually have multiple prefixes internally, so the only thing
missing for multi-prefix compliance is actually having the prefix in the
WHO reply, which is a rfc1459 thing.

Note to future self: check irc logs for the implementation I threw away.
The one that actually handled multiple prefixes. I hope that's useful.

Files:

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

irc.h

@@ -67 +67 @@
 
 typedef enum {
-        CAP_FOO = (1 << 0),
-        CAP_BAR = (1 << 1),
+        CAP_MULTI_PREFIX = (1 << 1),
 } irc_cap_flag_t;
 
@@ -309 +308 @@
 gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
 void irc_channel_update_ops(irc_channel_t *ic, char *value);
+char irc_channel_user_get_prefix(irc_channel_user_t *icu);
 char *set_eval_irc_channel_ops(struct set *set, char *value);
 gboolean irc_channel_wants_user(irc_channel_t *ic, irc_user_t *iu);

irc_cap.c

@@ -38 +38 @@
 
 static const cap_info_t supported_caps[] = {
-        {"foo", CAP_FOO},
-        {"bar", CAP_BAR},
+        {"multi-prefix", CAP_MULTI_PREFIX},
         {NULL},
 };

irc_channel.c

@@ -427 +427 @@
                           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;
 }
 

irc_send.c

@@ -214 +214 @@
                 }
 
-                if (icu->flags & IRC_CHANNEL_USER_OP) {
-                        strcat(namelist, "@");
-                } else if (icu->flags & IRC_CHANNEL_USER_HALFOP) {
-                        strcat(namelist, "%");
-                } else if (icu->flags & IRC_CHANNEL_USER_VOICE) {
-                        strcat(namelist, "+");
-                }
+                namelist[strlen(namelist) + 1] = '\0';
+                namelist[strlen(namelist)] = irc_channel_user_get_prefix(icu);
 
                 strcat(namelist, iu->nick);
@@ -294 +289 @@
 
         while (l) {
-                irc_user_t *iu = l->data;
+                irc_user_t *iu;
+
+                /* Null terminated string with three chars, respectively:
+                 * { <H|G>, <@|%|+|\0>, \0 } */
+                char status_prefix[3] = {0};
+
+                /* rfc1459 doesn't mention this: G means gone, H means here */
+                status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+
                 if (is_channel) {
-                        iu = ((irc_channel_user_t *) iu)->iu;
-                }
-                /* TODO(wilmer): Restore away/channel information here */
-                irc_send_num(irc, 352, "%s %s %s %s %s %c :0 %s",
+                        irc_channel_user_t *icu = l->data;
+                        status_prefix[1] = irc_channel_user_get_prefix(icu);
+                        iu = icu->iu;
+                } else {
+                        iu = l->data;
+                }
+
+                irc_send_num(irc, 352, "%s %s %s %s %s %s :0 %s",
                              is_channel ? channel : "*", iu->user, iu->host, irc->root->host,
-                             iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
-                             iu->fullname);
+                             iu->nick, status_prefix, iu->fullname);
                 l = l->next;
         }