mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-09-04 05:53:06 +00:00
Merge pull request #374 from TehPeGaSuS/fix/weechat-relay-pm-split
Fix private messages splitting into two windows over WeeChat's IRC relay
This commit is contained in:
@@ -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))
|
if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
|
||||||
goto generic;
|
goto generic;
|
||||||
|
|
||||||
inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
|
{
|
||||||
|
gboolean fromme = !serv->p_cmp (nick, serv->nick);
|
||||||
|
|
||||||
|
if (fromme && !is_channel (serv, to))
|
||||||
|
{
|
||||||
|
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, fromme, tags_data->identified, tags_data);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
|
|||||||
{
|
{
|
||||||
if (ignore_check (word[1], IG_PRIV))
|
if (ignore_check (word[1], IG_PRIV))
|
||||||
return;
|
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);
|
session *target_sess = find_dialog (serv, to);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user