Changeset 345577b for protocols/bee_chat.c

Timestamp:

2015-10-30T10:27:20Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

fb2338d

Parents:

0db6618

git-author:

dequis <dx@…> (13-09-15 04:17:14)

git-committer:

dequis <dx@…> (30-10-15 10:27:20)

Message:

IRC self-message support (messages sent by yourself from other clients)

This adds an OPT_SELFMESSAGE flag that can be passed to imcb_buddy_msg()
or imcb_chat_msg() to indicate that the protocol knows that the message
being sent is a self message.

This needs to be explicit since the old behavior is to silently drop
these messages, which also removed server echoes.

This commit doesn't break API/ABI, the flags parameters that were added
are all internal (between protocols and UI code)

On the irc protocol side, the situation isn't very nice, since some
clients put these messages in the wrong window. Irssi, hexchat and mirc
get this wrong. Irssi 0.8.18 has a fix for it, and the others have
scripts to patch it.

But meanwhile, there's a "self_messages" global setting that lets users
disable this, or get them as normal messages / notices with a "->"
prefix, which loosely imitates the workaround used by the ZNC
"privmsg_prefix" module.

File:

• protocols/bee_chat.c (modified) (2 diffs)

protocols/bee_chat.c

@@ -95 +95 @@
 }
 
-void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at)
+void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, guint32 flags, time_t sent_at)
 {
         struct im_connection *ic = c->ic;
         bee_t *bee = ic->bee;
         bee_user_t *bu;
-        gboolean temp;
+        gboolean temp = FALSE;
         char *s;
 
-        /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if (handle_is_self(ic, who)) {
+        if (handle_is_self(ic, who) && !(flags & OPT_SELFMESSAGE)) {
                 return;
         }
@@ -122 +121 @@
 
         if (bee->ui->chat_msg) {
-                bee->ui->chat_msg(bee, c, bu, msg, sent_at);
+                bee->ui->chat_msg(bee, c, bu, msg, flags, sent_at);
         }