Fix channel ACTION routing after self-message handling

Merge pull request #374 from TehPeGaSuS/fix/weechat-relay-pm-split
Fix private messages splitting into two windows over WeeChat's IRC relay
2026-09-19 14:19:57 +00:00 · 2026-09-03 09:27:07 -06:00 · 2026-09-03 08:20:55 -07:00 · 2026-09-03 08:51:21 +02:00 · 2026-08-28 20:48:12 +02:00
2 changed files with 16 additions and 2 deletions
--- a/src/common/ctcp.c
+++ b/src/common/ctcp.c
@@ -126,7 +126,21 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 			goto generic;

-		inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
+		{
+			gboolean private_fromme = !serv->p_cmp (nick, serv->nick) && !is_channel (serv, to);
+
+			if (private_fromme)
+			{
+				session *target = find_dialog (serv, to);
+
+				if (target)
+					sess = target;
+				else if (serv->front_session)
+					sess = serv->front_session;
+			}
+
+			inbound_action (sess, to, nick, ip, msg + 7, private_fromme, tags_data->identified, tags_data);
+		}
 		return;
 	}

--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						{
 							if (ignore_check (word[1], IG_PRIV))
 								return;
-							if (serv->have_echo_message && !serv->p_cmp (nick, serv->nick))
+							if (!serv->p_cmp (nick, serv->nick))
 							{
 								session *target_sess = find_dialog (serv, to);
Author	SHA1	Message	Date
deepend-tildeclub	bb3893d36c	Fix channel ACTION routing after self-message handling	2026-09-03 09:27:07 -06:00
deepend-tildeclub	fe57449f6c	Merge pull request #374 from TehPeGaSuS/fix/weechat-relay-pm-split Fix private messages splitting into two windows over WeeChat's IRC relay	2026-09-03 08:20:55 -07:00
ThePeGaSuS	c725adaa09	Fix CTCP ACTION not rerouting self-sent /me to correct PM window Mirrors the PRIVMSG fix: replayed /me messages sent by our own nick via WeeChat relay backlog were always passed with fromme=FALSE, so they never got rerouted to the actual PM query window.	2026-09-03 08:51:21 +02:00
ThePeGaSuS	0ba523d071	Fix: private messages split into two windows over WeeChat's IRC relay When you send a private message, ZoiteChat sometimes gets the same message echoed back by the server so it can show it in the right window. Whether it recognizes that echo depended on the server first confirming a feature called "echo-message" during connection setup. WeeChat's relay doesn't seem to confirm that feature the way other servers (or ZNC) do, so ZoiteChat didn't recognize its own echoed messages and treated them as brand new incoming messages from yourself, opening a second, separate conversation window instead of using the one you were already typing in. This makes ZoiteChat recognize its own message by checking who sent it, instead of only trusting that feature confirmation. That way, sent and received messages always end up in the same conversation window, regardless of how well the server/relay announces its capabilities.	2026-08-28 20:48:12 +02:00