Changeset 3fbce97 for irc_send.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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 parson

File:

• irc_send.c (modified) (8 diffs)

irc_send.c

@@ -172 +172 @@
         irc_t *irc = ic->irc;
 
-        irc_write(irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name);
+        if (irc->caps & CAP_EXTENDED_JOIN) {
+                irc_write(irc, ":%s!%s@%s JOIN %s * :%s", iu->nick, iu->user, iu->host, ic->name, iu->fullname);
+        } else {
+                irc_write(irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name);
+        }
 
         if (iu == irc->user) {
@@ -198 +202 @@
 }
 
+#define IRC_NAMES_LEN 385
+
 void irc_send_names(irc_channel_t *ic)
 {
         GSList *l;
-        char namelist[385] = "";
+        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
@@ -208 +215 @@
                 irc_channel_user_t *icu = l->data;
                 irc_user_t *iu = icu->iu;
-
-                if (strlen(namelist) + strlen(iu->nick) > sizeof(namelist) - 4) {
-                        irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist);
-                        *namelist = 0;
-                }
-
-                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, "+");
-                }
-
-                strcat(namelist, iu->nick);
-                strcat(namelist, " ");
-        }
-
-        if (*namelist) {
-                irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist);
+                size_t extra_len = strlen(iu->nick);
+                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);
+                        g_string_truncate(namelist, 0);
+                }
+
+                if ((prefix = irc_channel_user_get_prefix(icu))) {
+                        g_string_append_c(namelist, prefix);
+                }
+
+                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, ' ');
+                }
+        }
+
+        if (namelist->len) {
+                irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist->str);
         }
 
         irc_send_num(ic->irc, 366, "%s :End of /NAMES list", ic->name);
+
+        g_string_free(namelist, TRUE);
 }
 
@@ -249 +264 @@
 }
 
+/* msg1 and msg2 are output parameters. If msg2 is non-null, msg1 is guaranteed to be non-null too.
+   The idea is to defer the formatting of "$msg1 ($msg2)" to later calls to avoid a g_strdup_printf() here. */
+static void get_status_message(bee_user_t *bu, char **msg1, char **msg2)
+{
+        *msg1 = NULL;
+        *msg2 = NULL;
+
+        if (!(bu->flags & BEE_USER_ONLINE)) {
+                *msg1 = "User is offline";
+
+        } else if ((bu->status && *bu->status) ||
+                   (bu->status_msg && *bu->status_msg)) {
+
+                if (bu->status && bu->status_msg) {
+                        *msg1 = bu->status;
+                        *msg2 = bu->status_msg;
+                } else {
+                        *msg1 = bu->status ? : bu->status_msg;
+                }
+        }
+
+        if (*msg1 && !**msg1) {
+                *msg1 = (bu->flags & BEE_USER_AWAY) ? "Away" : NULL;
+        }
+}
+
 void irc_send_whois(irc_user_t *iu)
 {
@@ -258 +299 @@
         if (iu->bu) {
                 bee_user_t *bu = iu->bu;
+                char *msg1, *msg2;
+                int num;
 
                 irc_send_num(irc, 312, "%s %s.%s :%s network", iu->nick, bu->ic->acc->user,
@@ -263 +306 @@
                              bu->ic->acc->prpl->name);
 
-                if ((bu->status && *bu->status) ||
-                    (bu->status_msg && *bu->status_msg)) {
-                        int num = bu->flags & BEE_USER_AWAY ? 301 : 320;
-
-                        if (bu->status && bu->status_msg) {
-                                irc_send_num(irc, num, "%s :%s (%s)", iu->nick, bu->status, bu->status_msg);
-                        } else {
-                                irc_send_num(irc, num, "%s :%s", iu->nick, bu->status ? : bu->status_msg);
-                        }
-                } else if (!(bu->flags & BEE_USER_ONLINE)) {
-                        irc_send_num(irc, 301, "%s :%s", iu->nick, "User is offline");
+                num = (bu->flags & BEE_USER_AWAY || !(bu->flags & BEE_USER_ONLINE)) ? 301 : 320;
+
+                get_status_message(bu, &msg1, &msg2);
+
+                if (msg1 && msg2) {
+                        irc_send_num(irc, num, "%s :%s (%s)", iu->nick, msg1, msg2);
+                } else if (msg1) {
+                        irc_send_num(irc, num, "%s :%s", iu->nick, msg1);
                 }
 
@@ -294 +334 @@
 
         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};
+
                 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;
+                }
+
+                /* rfc1459 doesn't mention this: G means gone, H means here */
+                status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+
+                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;
         }
@@ -428 +479 @@
                   iu->nick, iu->user, iu->host, irc->user->nick, ic->name);
 }
+
+void irc_send_cap(irc_t *irc, char *subcommand, char *body)
+{
+        char *nick = irc->user->nick ? : "*";
+
+        irc_write(irc, ":%s CAP %s %s :%s", irc->root->host, nick, subcommand, body);
+}
+
+void irc_send_away_notify(irc_user_t *iu)
+{
+        bee_user_t *bu = iu->bu;
+
+        if (!bu) {
+                return;
+        }
+
+        if (bu->flags & BEE_USER_AWAY || !(bu->flags & BEE_USER_ONLINE)) {
+                char *msg1, *msg2;
+
+                get_status_message(bu, &msg1, &msg2);
+
+                if (msg2) {
+                        irc_write(iu->irc, ":%s!%s@%s AWAY :%s (%s)", iu->nick, iu->user, iu->host, msg1, msg2);
+                } else {
+                        irc_write(iu->irc, ":%s!%s@%s AWAY :%s", iu->nick, iu->user, iu->host, msg1);
+                }
+        } else {
+                irc_write(iu->irc, ":%s!%s@%s AWAY", iu->nick, iu->user, iu->host);
+        }
+}
+