Changeset f7cc734

Timestamp:

2018-07-31T04:41:25Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

9767d03

Parents:

c82e4ca

git-author:

Philippe Daouadi <philippe@…> (15-03-17 17:06:52)

git-committer:

dequis <dx@…> (31-07-18 04:41:25)

Message:

irc: implement server-time capability

Files:

• dcc.c (modified) (1 diff)
• irc.h (modified) (3 diffs)
• irc_cap.c (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (3 diffs)
• irc_im.c (modified) (4 diffs)
• irc_send.c (modified) (6 diffs)
• irc_user.c (modified) (1 diff)
• irc_util.c (modified) (1 diff)

dcc.c

@@ -214 +214 @@
                               df->ft->file_name, ipaddr, port, df->ft->file_size);
 
-        irc_send_msg_raw(iu, "PRIVMSG", iu->irc->user->nick, cmd);
+        irc_send_msg_raw(iu, "PRIVMSG", iu->irc->user->nick, cmd, 0);
 
         g_free(cmd);

irc.h

@@ -76 +76 @@
         CAP_AWAY_NOTIFY = (1 << 3),
         CAP_USERHOST_IN_NAMES = (1 << 4),
+        CAP_SERVER_TIME = (1 << 5),
 } irc_cap_flag_t;
 
@@ -342 +343 @@
 void irc_send_whois(irc_user_t *iu);
 void irc_send_who(irc_t *irc, GSList *l, const char *channel);
-void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix);
-void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char *msg);
+void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, time_t ts);
+void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char* tags, const char *msg);
 void irc_send_msg_f(irc_user_t *iu, const char *type, const char *dst, const char *format, ...) G_GNUC_PRINTF(4, 5);
 void irc_send_nick(irc_user_t *iu, const char *new_nick);
@@ -364 +365 @@
 char *set_eval_timezone(struct set *set, char *value);
 char *irc_format_timestamp(irc_t *irc, time_t msg_ts);
+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_channel.c

@@ -500 +500 @@
         va_end(params);
 
-        irc_send_msg(ic->irc->root, "PRIVMSG", ic->name, text, NULL);
+        irc_send_msg(ic->irc->root, "PRIVMSG", ic->name, text, NULL, 0);
         g_free(text);
 }

irc_commands.c

@@ -524 +524 @@
            for lag checks, so try to support that. */
         if (nick_cmp(NULL, cmd[1], irc->user->nick) == 0) {
-                irc_send_msg(irc->user, "NOTICE", irc->user->nick, cmd[2], NULL);
+                irc_send_msg(irc->user, "NOTICE", irc->user->nick, cmd[2], NULL, 0);
         } else if ((iu = irc_user_by_name(irc, cmd[1]))) {
                 iu->f->privmsg(iu, cmd[2]);
@@ -825 +825 @@
         int i;
 
-        irc_send_msg_raw(irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK");
+        irc_send_msg_raw(irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK", 0);
 
         for (i = 0; root_commands[i].command; i++) {
@@ -839 +839 @@
         }
 
-        irc_send_msg_raw(irc->root, "NOTICE", irc->user->nick, "COMPLETIONS END");
+        irc_send_msg_raw(irc->root, "NOTICE", irc->user->nick, "COMPLETIONS END", 0);
 }
 

irc_im.c

@@ -305 +305 @@
 
         wrapped = word_wrap(msg, IRC_WORD_WRAP);
-        irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
+        irc_send_msg(src_iu, message_type, dst, wrapped, prefix, sent_at);
         g_free(wrapped);
 
@@ -347 +347 @@
         g_string_append_c(msg, '\001');
 
-        irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+        irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL, 0);
 
         g_string_free(msg, TRUE);
@@ -707 +707 @@
 
         wrapped = word_wrap(msg, IRC_WORD_WRAP);
-        irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts);
+        irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts, sent_at);
         g_free(ts);
         g_free(wrapped);
@@ -819 +819 @@
         irc_send_msg_f(iu, "PRIVMSG", irc->user->nick, "<< \002BitlBee\002 - Invitation to chatroom %s >>", name);
         if (msg) {
-                irc_send_msg(iu, "PRIVMSG", irc->user->nick, msg, NULL);
+                irc_send_msg(iu, "PRIVMSG", irc->user->nick, msg, NULL, 0);
         }
         if (chan) {

irc_send.c

@@ -136 +136 @@
 
         dst = irc_user_msgdest(iu);
-        irc_send_msg(iu, cmd, dst, text, NULL);
+        irc_send_msg(iu, cmd, dst, text, NULL, 0);
 }
 
@@ -363 +363 @@
 }
 
-void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix)
+void irc_send_msg(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 +384 @@
                 }
                 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 +391 @@
                                 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(iu, type, dst, tags, raw_msg);
                         } else {
                                 *raw_msg = '\0';
@@ -391 +398 @@
                                 }
                                 strncat(raw_msg, line, s - line);
-                                irc_send_msg_raw(iu, type, dst, raw_msg);
+                                irc_send_msg_raw(iu, type, dst, tags, raw_msg);
                         }
+                        if (ts)
+                                g_free(tags);
                         line = s + 1;
                 }
@@ -399 +408 @@
 }
 
-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 : " ");
+void irc_send_msg_raw(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_user.c

@@ -261 +261 @@
 static gboolean self_privmsg(irc_user_t *iu, const char *msg)
 {
-        irc_send_msg(iu, "PRIVMSG", iu->nick, msg, NULL);
+        irc_send_msg(iu, "PRIVMSG", iu->nick, msg, NULL, 0);
 
         return TRUE;

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)