pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-30 23:06:38 +02:00
Code Activity

irc: fix parsing of message 346 when no nick/time are given (bug #37266)

Browse Source
This commit is contained in:
Sebastien Helleu
2012-09-04 13:25:43 +02:00
parent 33bb4399b8
commit 09c274be28
13 changed files with 117 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -66,6 +66,7 @@ Version 0.3.9 (under dev!)
* fifo: ignore read failing with error EAGAIN (bug #37019)
* guile: fix crash when unloading a script without pointer to interpreter
* guile: fix path of guile include dirs in cmake build (patch #7790)
* irc: fix parsing of message 346 when no nick/time are given (bug #37266)
* irc: switch to next address after a timeout when connecting to server
(bug #37216)
* irc: fix bug when changing server option "addresses" with less addresses
po/cs.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6493,6 +6493,10 @@ msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)%s v %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/de.po
+5 -1
View File
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -7022,6 +7022,10 @@ msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s)%s eingeladen am %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s) eingeladen"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s) eingeladen"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/es.po
+5 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6755,6 +6755,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)%s el %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/fr.po
+6 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"PO-Revision-Date: 2012-09-04 12:24+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-09-04 13:15+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -6827,6 +6827,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invité par %s%s %s(%s%s%s)%s le %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s invité par %s%s %s(%s%s%s)"
#, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s invité"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/hu.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6056,6 +6056,10 @@ msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s[%s%s%s] %s%s%s-t kitiltotta "
#. TRANSLATORS: "%s" after "on" is a date
#, fuzzy, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/it.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6749,6 +6749,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)%s il %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/ja.po
+5 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -6585,6 +6585,10 @@ msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s)%s によって %s に招待さ
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s) によって招待されました"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s) によって招待されました"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/pl.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6712,6 +6712,10 @@ msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez %s%s %s(%s%s%s)%s na %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez przez %s%s %s(%s%s%s)"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez przez %s%s %s(%s%s%s)"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/pt_BR.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6202,6 +6202,10 @@ msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)%s em %s"
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)"
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)"
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/ru.po
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: 2012-08-20 15:20+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6081,6 +6081,10 @@ msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
#, fuzzy, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr "%s[%s%s%s] %s%s%s забанен пользователем "
#. TRANSLATORS: "%s" after "on" is a date
#, fuzzy, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
po/weechat.pot
+5 -1
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-09-04 12:56+0200\n"
"POT-Creation-Date: 2012-09-04 13:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5271,6 +5271,10 @@ msgstr ""
msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)"
msgstr ""
#, c-format
msgid "%s%s[%s%s%s] %s%s%s invited"
msgstr ""
#. TRANSLATORS: "%s" after "on" is a date
#, c-format
msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s"
src/plugins/irc/irc-protocol.c
+60 -39
View File
@@ -3340,42 +3340,71 @@ IRC_PROTOCOL_CALLBACK(346)
/*
* 346 message looks like:
* :server 346 mynick #channel invitemask nick!user@host 1205590879
* or:
* :server 346 mynick #channel invitemask
*/
IRC_PROTOCOL_MIN_ARGS(6);
IRC_PROTOCOL_MIN_ARGS(5);
ptr_channel = irc_channel_search (server, argv[3]);
ptr_buffer = (ptr_channel && ptr_channel->nicks) ?
ptr_channel->buffer : server->buffer;
invite_nick = irc_message_get_nick_from_host (argv[5]);
invite_address = irc_message_get_address_from_host (argv[5]);
if (argc >= 7)
if (argc >= 6)
{
datetime = (time_t)(atol (argv[6]));
weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL,
command, "invitelist",
ptr_buffer),
irc_protocol_tags (command, "irc_numeric", NULL),
/* TRANSLATORS: "%s" after "on" is a date */
_("%s%s[%s%s%s] %s%s%s invited by "
"%s%s %s(%s%s%s)%s on %s"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
IRC_COLOR_RESET,
irc_nick_color_for_server_message (server, NULL,
invite_nick),
invite_nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
invite_address,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
invite_nick = irc_message_get_nick_from_host (argv[5]);
invite_address = irc_message_get_address_from_host (argv[5]);
if (argc >= 7)
{
datetime = (time_t)(atol (argv[6]));
weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL,
command, "invitelist",
ptr_buffer),
irc_protocol_tags (command, "irc_numeric", NULL),
/* TRANSLATORS: "%s" after "on" is a date */
_("%s%s[%s%s%s] %s%s%s invited by "
"%s%s %s(%s%s%s)%s on %s"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
IRC_COLOR_RESET,
irc_nick_color_for_server_message (server, NULL,
invite_nick),
invite_nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
invite_address,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
{
weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL,
command, "invitelist",
ptr_buffer),
irc_protocol_tags (command, "irc_numeric", NULL),
_("%s%s[%s%s%s] %s%s%s invited by "
"%s%s %s(%s%s%s)"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
IRC_COLOR_RESET,
irc_nick_color_for_server_message (server, NULL,
invite_nick),
invite_nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
invite_address,
IRC_COLOR_CHAT_DELIMITERS);
}
}
else
{
@@ -3383,8 +3412,7 @@ IRC_PROTOCOL_CALLBACK(346)
command, "invitelist",
ptr_buffer),
irc_protocol_tags (command, "irc_numeric", NULL),
_("%s%s[%s%s%s] %s%s%s invited by "
"%s%s %s(%s%s%s)"),
_("%s%s[%s%s%s] %s%s%s invited"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
@@ -3392,14 +3420,7 @@ IRC_PROTOCOL_CALLBACK(346)
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
IRC_COLOR_RESET,
irc_nick_color_for_server_message (server, NULL,
invite_nick),
invite_nick,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
invite_address,
IRC_COLOR_CHAT_DELIMITERS);
IRC_COLOR_RESET);
}
return WEECHAT_RC_OK;