diff options
| author | Max Teufel <max@teufelsnetz.com> | 2014-09-22 18:58:27 +0200 |
|---|---|---|
| committer | Max Teufel <max@teufelsnetz.com> | 2014-11-01 14:05:46 +0100 |
| commit | aa2934c3d9bff4ebec089a6bfc61d4b995591184 (patch) | |
| tree | fdf04279c4e38b7789298329732ee463de86d442 | |
| parent | 886dd7d452934604e8dbd869a18f5946c3f63384 (diff) | |
| download | weechat-aa2934c3d9bff4ebec089a6bfc61d4b995591184.zip | |
irc: add support for CAP extended-join
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 82 |
1 files changed, 59 insertions, 23 deletions
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 98a0f704a..9caddb5b6 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -628,7 +628,7 @@ IRC_PROTOCOL_CALLBACK(join) struct t_irc_channel *ptr_channel; struct t_irc_nick *ptr_nick; struct t_irc_channel_speaking *ptr_nick_speaking; - char *pos_channel; + char *pos_channel, *pos_realname; int local_join, display_host, smart_filter; IRC_PROTOCOL_MIN_ARGS(3); @@ -637,6 +637,8 @@ IRC_PROTOCOL_CALLBACK(join) local_join = (irc_server_strcasecmp (server, nick, server->nick) == 0); pos_channel = (argv[2][0] == ':') ? argv[2] + 1 : argv[2]; + pos_realname = (argc > 4) ? + ((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : NULL; ptr_channel = irc_channel_search (server, pos_channel); if (ptr_channel) @@ -711,28 +713,62 @@ IRC_PROTOCOL_CALLBACK(join) && !ptr_nick_speaking); /* display the join */ - weechat_printf_date_tags (irc_msgbuffer_get_target_buffer (server, NULL, - command, NULL, - ptr_channel->buffer), - date, - irc_protocol_tags (command, - smart_filter ? "irc_smart_filter" : NULL, - nick, address), - _("%s%s%s%s%s%s%s%s%s%s has joined %s%s%s"), - weechat_prefix ("join"), - irc_nick_color_for_msg (server, 1, ptr_nick, - nick), - nick, - IRC_COLOR_CHAT_DELIMITERS, - (display_host) ? " (" : "", - IRC_COLOR_CHAT_HOST, - (display_host) ? address : "", - IRC_COLOR_CHAT_DELIMITERS, - (display_host) ? ")" : "", - IRC_COLOR_MESSAGE_JOIN, - IRC_COLOR_CHAT_CHANNEL, - pos_channel, - IRC_COLOR_MESSAGE_JOIN); + if (argc >= 4) + { + weechat_printf_date_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, NULL, + ptr_channel->buffer), + date, + irc_protocol_tags (command, + smart_filter ? "irc_smart_filter" : NULL, + nick, address), + _("%s%s%s%s%s%s%s%s%s%s%s%s)%s%s%s%s%s%s has joined %s%s%s"), + weechat_prefix ("join"), + irc_nick_color_for_msg (server, 1, ptr_nick, nick), + nick, + (strcmp(argv[3], "*") != 0) ? IRC_COLOR_CHAT_DELIMITERS : "", + (strcmp(argv[3], "*") != 0) ? " [" : "", + (strcmp(argv[3], "*") != 0) ? IRC_COLOR_CHAT_HOST : "", + (strcmp(argv[3], "*") != 0) ? argv[3] : "", + IRC_COLOR_CHAT_DELIMITERS, + (strcmp(argv[3], "*") != 0) ? "] (" : " (", + IRC_COLOR_CHAT_HOST, + pos_realname, + IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", + IRC_COLOR_CHAT_HOST, + (display_host) ? address : "", + IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", + IRC_COLOR_MESSAGE_JOIN, + IRC_COLOR_CHAT_CHANNEL, + pos_channel, + IRC_COLOR_MESSAGE_JOIN); + } + else + { + weechat_printf_date_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, NULL, + ptr_channel->buffer), + date, + irc_protocol_tags (command, + smart_filter ? "irc_smart_filter" : NULL, + nick, address), + _("%s%s%s%s%s%s%s%s%s%s has joined %s%s%s"), + weechat_prefix ("join"), + irc_nick_color_for_msg (server, 1, ptr_nick, nick), + nick, + IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", + IRC_COLOR_CHAT_HOST, + (display_host) ? address : "", + IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", + IRC_COLOR_MESSAGE_JOIN, + IRC_COLOR_CHAT_CHANNEL, + pos_channel, + IRC_COLOR_MESSAGE_JOIN); + } /* * if join is smart filtered, save the nick in hashtable, and if nick |