Changeset f7cc734 for irc_send.c

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

File:

• irc_send.c (modified) (6 diffs)

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 : " ");
 }