iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up finding correct context for messages/actions

Browse Source 
Don't ever print actions in the wrong tab
and warn if you can't find the correct one
This commit is contained in:
TingPing 2015-01-30 22:06:56 -05:00 committed by Patrick Griffis
parent c874a9525c
commit e3838a6e67
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/inbound.c
View File

@ -179,12 +179,12 @@ inbound_privmsg (server *serv, char *from, char *ip, char *text, int id,
if (!sess) if (!sess)
{ {
if (flood_check (from, ip, serv, current_sess, 1)) if (flood_check (from, ip, serv, current_sess, 1))
{
/* Create a dialog session */ /* Create a dialog session */
sess = inbound_open_dialog (serv, from, tags_data); sess = inbound_open_dialog (serv, from, tags_data);
}
else else
sess = serv->server_session; sess = serv->server_session;
if (!sess)
return; /* ?? */
} }
if (ip && ip[0]) if (ip && ip[0])
@ -193,7 +193,7 @@ inbound_privmsg (server *serv, char *from, char *ip, char *text, int id,
return; return;
} }
sess = find_session_from_nick (from, serv); sess = find_dialog (serv, destsess);
if (!sess) if (!sess)
{ {
sess = serv->front_session; sess = serv->front_session;
@ -331,7 +331,6 @@ void
inbound_action (session *sess, char *chan, char *from, char *ip, char *text, inbound_action (session *sess, char *chan, char *from, char *ip, char *text,
int fromme, int id, const message_tags_data *tags_data) int fromme, int id, const message_tags_data *tags_data)
{ {
session *def = sess;
server *serv = sess->server; server *serv = sess->server;
struct User *user; struct User *user;
char nickchar[2] = "\000"; char nickchar[2] = "\000";
@ -343,6 +342,11 @@ inbound_action (session *sess, char *chan, char *from, char *ip, char *text,
if (is_channel (serv, chan)) if (is_channel (serv, chan))
{ {
sess = find_channel (serv, chan); sess = find_channel (serv, chan);
if (!sess)
{
g_warning ("Got channel action for %s but found no channel session\n", chan);
return; /* There is no sane place to put this */
}
} else } else
{ {
/* it's a private action! */ /* it's a private action! */
@ -360,17 +364,11 @@ inbound_action (session *sess, char *chan, char *from, char *ip, char *text,
} }
if (!sess) if (!sess)
{ {
sess = find_session_from_nick (from, serv);
/* still not good? */
if (!sess)
sess = serv->front_session; sess = serv->front_session;
} }
} }
} }
if (!sess)
sess = def;
if (sess != current_tab) if (sess != current_tab)
{ {
if (fromme) if (fromme)
@ -437,8 +435,18 @@ inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
if (chan) if (chan)
{ {
sess = find_channel (serv, chan); sess = find_channel (serv, chan);
if (!sess && !is_channel (serv, chan)) if (!sess)
{
if (is_channel (serv, chan))
{
g_warning ("Got channel message to %s but found no channel session\n", chan);
return;
}
else
{
sess = find_dialog (serv, chan); sess = find_dialog (serv, chan);
}
}
} else } else
{ {
sess = find_dialog (serv, from); sess = find_dialog (serv, from);