blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irc: fix parsing of TAGMSG message when there is a colon before the channel

Browse Source 
This fixes the display of typing notifications on some IRC servers like
inspircd.
This commit is contained in:
Sébastien Helleu 2021-09-21 20:41:18 +02:00
parent a6826af796
commit edd1971ae8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.adoc
View File

@ -22,6 +22,10 @@ New features::
* api: add user variables in evaluation of expressions with "define:name,value" * api: add user variables in evaluation of expressions with "define:name,value"
Bug fixes::
* irc: fix parsing of TAGMSG message when there is a colon before the channel
[[v3.3]] [[v3.3]]
== Version 3.3 (2021-09-19) == Version 3.3 (2021-09-19)

10
src/plugins/irc/irc-protocol.c
View File

@ -2978,12 +2978,14 @@ IRC_PROTOCOL_CALLBACK(setname)
* *
* Message looks like: * Message looks like:
* @msgid=6gqz7dxd22v7r3x9pvu;+typing=active :nick!user@host TAGMSG #channel * @msgid=6gqz7dxd22v7r3x9pvu;+typing=active :nick!user@host TAGMSG #channel
* @msgid=6gqz7dxd22v7r3x9pvu;+typing=active :nick!user@host TAGMSG :#channel
*/ */
IRC_PROTOCOL_CALLBACK(tagmsg) IRC_PROTOCOL_CALLBACK(tagmsg)
{ {
struct t_irc_channel *ptr_channel; struct t_irc_channel *ptr_channel;
const char *ptr_typing_value; const char *ptr_typing_value;
char *pos_channel;
int state; int state;
IRC_PROTOCOL_MIN_ARGS(3); IRC_PROTOCOL_MIN_ARGS(3);
@ -2994,10 +2996,12 @@ IRC_PROTOCOL_CALLBACK(tagmsg)
if (!tags) if (!tags)
return WEECHAT_RC_OK; return WEECHAT_RC_OK;
pos_channel = (argv[2][0] == ':') ? argv[2] + 1 : argv[2];
ptr_channel = NULL; ptr_channel = NULL;
if (irc_channel_is_channel (server, argv[2])) if (irc_channel_is_channel (server, pos_channel))
ptr_channel = irc_channel_search (server, argv[2]); ptr_channel = irc_channel_search (server, pos_channel);
else if (irc_server_strcasecmp (server, argv[2], server->nick) == 0) else if (irc_server_strcasecmp (server, pos_channel, server->nick) == 0)
ptr_channel = irc_channel_search (server, nick); ptr_channel = irc_channel_search (server, nick);
if (!ptr_channel) if (!ptr_channel)
return WEECHAT_RC_OK; return WEECHAT_RC_OK;