Changes in / [921ea8b:3b0c1c3]

Files:

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

irc.h

@@ -76 +76 @@
         CAP_AWAY_NOTIFY = (1 << 3),
         CAP_USERHOST_IN_NAMES = (1 << 4),
+        CAP_SERVER_TIME = (1 << 5),
 } irc_cap_flag_t;
 
@@ -352 +353 @@
 void irc_send_away_notify(irc_user_t *iu);
 
+G_GNUC_INTERNAL void irc_send_msg_ts(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, time_t ts);
+G_GNUC_INTERNAL void irc_send_msg_raw_tags(irc_user_t *iu, const char *type, const char *dst, const char* tags, const char *msg);
+
 /* irc_user.c */
 irc_user_t *irc_user_new(irc_t *irc, const char *nick);
@@ -364 +368 @@
 char *set_eval_timezone(struct set *set, char *value);
 char *irc_format_timestamp(irc_t *irc, time_t msg_ts);
+G_GNUC_INTERNAL char *irc_format_servertime(irc_t *irc, time_t msg_ts);
 char *set_eval_self_messages(struct set *set, char *value);
 

irc_cap.c

@@ -43 +43 @@
         {"away-notify", CAP_AWAY_NOTIFY},
         {"userhost-in-names", CAP_USERHOST_IN_NAMES},
+        {"server-time", CAP_SERVER_TIME},
         {NULL},
 };

irc_im.c

@@ -232 +232 @@
         GSList *l;
 
-        if (sent_at > 0 && set_getbool(&irc->b->set, "display_timestamps")) {
+        if (sent_at > 0 &&
+            !(irc->caps & CAP_SERVER_TIME) &&
+            set_getbool(&irc->b->set, "display_timestamps")) {
                 ts = irc_format_timestamp(irc, sent_at);
         }
@@ -305 +307 @@
 
         wrapped = word_wrap(msg, IRC_WORD_WRAP);
-        irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
+        irc_send_msg_ts(src_iu, message_type, dst, wrapped, prefix, sent_at);
         g_free(wrapped);
 
@@ -702 +704 @@
         }
 
-        if (sent_at > 0 && set_getbool(&bee->set, "display_timestamps")) {
+        if (sent_at > 0 &&
+            !(irc->caps & CAP_SERVER_TIME) &&
+            set_getbool(&bee->set, "display_timestamps")) {
                 ts = irc_format_timestamp(irc, sent_at);
         }
 
         wrapped = word_wrap(msg, IRC_WORD_WRAP);
-        irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts);
+        irc_send_msg_ts(iu, "PRIVMSG", ic->name, wrapped, ts, sent_at);
         g_free(ts);
         g_free(wrapped);

irc_send.c

@@ -365 +365 @@
 void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix)
 {
+        irc_send_msg_ts(iu, type, dst, msg, prefix, 0);
+}
+
+void irc_send_msg_ts(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, time_t ts)
+{
         char last = 0;
         const char *s = msg, *line = msg;
+        char *tags = NULL;
         char raw_msg[strlen(msg) + 1024];
+
+        if (!(iu->irc->caps & CAP_SERVER_TIME)) {
+                ts = 0;
+        }
 
         while (!last) {
@@ -379 +389 @@
                 }
                 if (*s == 0 || *s == '\n') {
+                        if (ts) {
+                                tags = irc_format_servertime(iu->irc, ts);
+                        }
                         if (g_strncasecmp(line, "/me ", 4) == 0 && (!prefix || !*prefix) &&
                             g_strcasecmp(type, "PRIVMSG") == 0) {
@@ -384 +397 @@
                                 strncat(raw_msg, line + 4, s - line - 4);
                                 strcat(raw_msg, "\001");
-                                irc_send_msg_raw(iu, type, dst, raw_msg);
+                                irc_send_msg_raw_tags(iu, type, dst, tags, raw_msg);
                         } else {
                                 *raw_msg = '\0';
@@ -391 +404 @@
                                 }
                                 strncat(raw_msg, line, s - line);
-                                irc_send_msg_raw(iu, type, dst, raw_msg);
+                                irc_send_msg_raw_tags(iu, type, dst, tags, raw_msg);
+                        }
+                        if (ts) {
+                                g_free(tags);
                         }
                         line = s + 1;
@@ -401 +417 @@
 void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char *msg)
 {
-        irc_write(iu->irc, ":%s!%s@%s %s %s :%s",
-                  iu->nick, iu->user, iu->host, type, dst, msg && *msg ? msg : " ");
+        irc_send_msg_raw_tags(iu, type, dst, NULL, msg);
+}
+
+void irc_send_msg_raw_tags(irc_user_t *iu, const char *type, const char *dst, const char* tags, const char *msg)
+{
+        irc_write(iu->irc, "%s%s:%s!%s@%s %s %s :%s",
+                  tags ? tags : "", tags ? " " : "", iu->nick, iu->user, iu->host, type, dst, msg && *msg ? msg : " ");
 }
 

irc_util.c

@@ -120 +120 @@
 }
 
+char *irc_format_servertime(irc_t *irc, time_t msg_ts)
+{
+        struct tm msg;
+
+        if (msg_ts <= 0) {
+                return NULL;
+        }
+
+        gmtime_r(&msg_ts, &msg);
+
+        return g_strdup_printf("@time=%04d-%02d-%02dT"
+                               "%02d:%02d:%02d.000Z",
+                               msg.tm_year + 1900, msg.tm_mon + 1, msg.tm_mday,
+                               msg.tm_hour, msg.tm_min, msg.tm_sec);
+}
 
 char *set_eval_self_messages(set_t *set, char *value)