Changeset 3fbce97 for irc_im.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_im.c (modified) (14 diffs)

irc_im.c

@@ -84 +84 @@
         }
 
-        while ((s = strchr(iu->user, ' '))) {
-                *s = '_';
-        }
+        /* Sanitize */
+        str_reject_chars(iu->user, " ", '_');
+        str_reject_chars(iu->host, " ", '_');
 
         if (bu->flags & BEE_USER_LOCAL) {
@@ -118 +118 @@
         if (bu->flags & BEE_USER_AWAY || !(bu->flags & BEE_USER_ONLINE)) {
                 iu->flags |= IRC_USER_AWAY;
+        }
+
+        if ((irc->caps & CAP_AWAY_NOTIFY) &&
+            ((bu->flags & BEE_USER_AWAY) != (old->flags & BEE_USER_AWAY) ||
+             (bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE))) {
+                irc_send_away_notify(iu);
         }
 
@@ -201 +207 @@
 }
 
-static gboolean bee_irc_user_msg(bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at)
+static gboolean bee_irc_user_msg(bee_t *bee, bee_user_t *bu, const char *msg_, guint32 flags, time_t sent_at)
 {
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
+        irc_user_t *src_iu = iu;
+        irc_user_t *dst_iu = irc->user;
         const char *dst;
         char *prefix = NULL;
         char *wrapped, *ts = NULL;
         char *msg = g_strdup(msg_);
+        char *message_type = "PRIVMSG";
         GSList *l;
 
@@ -216 +225 @@
 
         dst = irc_user_msgdest(iu);
-        if (dst != irc->user->nick) {
-                /* if not messaging directly, call user by name */
-                prefix = g_strdup_printf("%s%s%s", irc->user->nick, set_getstr(&bee->set, "to_char"), ts ? : "");
+
+        if (flags & OPT_SELFMESSAGE) {
+                char *setting = set_getstr(&irc->b->set, "self_messages");
+
+                if (is_bool(setting)) {
+                        if (bool2int(setting)) {
+                                /* set to true, send it with src/dst flipped */
+                                
+                                dst_iu = iu;
+                                src_iu = irc->user;
+
+                                if (dst == irc->user->nick) {
+                                        dst = dst_iu->nick;
+                                }
+                        } else {
+                                /* set to false, skip the message completely */
+                                goto cleanup;
+                        }
+                } else if (g_strncasecmp(setting, "prefix", 6) == 0) {
+                        /* third state, prefix, loosely imitates the znc privmsg_prefix module */
+
+                        g_free(msg);
+                        if (g_strncasecmp(msg_, "/me ", 4) == 0) {
+                                msg = g_strdup_printf("/me -> %s", msg_ + 4);
+                        } else {
+                                msg = g_strdup_printf("-> %s", msg_);
+                        }
+
+                        if (g_strcasecmp(setting, "prefix_notice") == 0) {
+                                message_type = "NOTICE";
+                        }
+                }
+
+        }
+
+        if (dst != dst_iu->nick) {
+                /* if not messaging directly (control channel), call user by name */
+                prefix = g_strdup_printf("%s%s%s", dst_iu->nick, set_getstr(&bee->set, "to_char"), ts ? : "");
         } else {
                 prefix = ts;
@@ -249 +293 @@
 
         wrapped = word_wrap(msg, 425);
-        irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
+        irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
         g_free(wrapped);
 
@@ -260 +304 @@
 }
 
-static gboolean bee_irc_user_typing(bee_t *bee, bee_user_t *bu, uint32_t flags)
+static gboolean bee_irc_user_typing(bee_t *bee, bee_user_t *bu, guint32 flags)
 {
         irc_t *irc = (irc_t *) bee->ui_data;
@@ -617 +661 @@
 }
 
-static gboolean bee_irc_chat_msg(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, time_t sent_at)
+static gboolean bee_irc_chat_msg(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, guint32 flags, time_t sent_at)
 {
         irc_t *irc = bee->ui_data;
-        irc_user_t *iu = bu->ui_data;
+        irc_user_t *iu = flags & OPT_SELFMESSAGE ? irc->user : bu->ui_data;
         irc_channel_t *ic = c->ui_data;
         char *wrapped, *ts = NULL;
@@ -654 +698 @@
 }
 
-static gboolean bee_irc_chat_remove_user(bee_t *bee, struct groupchat *c, bee_user_t *bu)
+static gboolean bee_irc_chat_remove_user(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *reason)
 {
         irc_t *irc = bee->ui_data;
@@ -666 +710 @@
            using imcb_chat_free() and the channel was IRC_CHANNEL_TEMP, we get into
            a broken state around here. */
-        irc_channel_del_user(ic, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, NULL);
+        irc_channel_del_user(ic, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, reason);
 
         return TRUE;
@@ -839 +883 @@
             acc->prpl->chat_join) {
                 char *nick;
+                struct groupchat *gc;
 
                 if (!(nick = set_getstr(&ic->set, "nick"))) {
@@ -845 +890 @@
 
                 ic->flags |= IRC_CHANNEL_CHAT_PICKME;
-                acc->prpl->chat_join(acc->ic, room, nick, NULL, &ic->set);
+                gc = acc->prpl->chat_join(acc->ic, room, nick, NULL, &ic->set);
                 ic->flags &= ~IRC_CHANNEL_CHAT_PICKME;
+
+                if (!gc) {
+                        irc_send_num(ic->irc, 403, "%s :Error joining channel (check control channel?)", ic->name);
+                }
 
                 return FALSE;
@@ -863 +912 @@
         }
 
-        /* Remove the reference. We don't need it anymore. */
-        ic->data = NULL;
+        if (!(ic->flags & IRC_CHANNEL_TEMP)) {
+                /* Remove the reference.
+                 * We only need it for temp channels that are being freed */
+                ic->data = NULL;
+        }
 
         return TRUE;
@@ -1055 +1107 @@
                 df->proto_finished = TRUE;
         }
+}
+
+static void bee_irc_log(bee_t *bee, const char *tag, const char *msg)
+{
+        irc_t *irc = (irc_t *) bee->ui_data;
+
+        irc_rootmsg(irc, "%s - %s", tag, msg);
 }
 
@@ -1085 +1144 @@
         bee_irc_ft_close,
         bee_irc_ft_finished,
+
+        bee_irc_log,
 };