pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 15:53:12 +02:00
Code Activity

irc: allow more than one nick in command /invite

Browse Source
This commit is contained in:
Sebastien Helleu
2012-03-26 13:45:41 +02:00
parent 7e1859ad5d
commit 0a08581f1b
17 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.8-dev, 2012-03-25
v0.3.8-dev, 2012-03-26
Version 0.3.8 (under dev!)
@@ -20,6 +20,7 @@ Version 0.3.8 (under dev!)
given to plugin API functions (warning displayed if debug for plugin is >= 1)
* api: add list "gui_buffer_last_displayed" in hdata "buffer"
* guile: add missing function "hook_process_hashtable" in API
* irc: allow more than one nick in command /invite
* irc: do not send command "MODE #channel" on manual /names (do it only when
names are received on join of channel) (bug #35930)
* irc: do not allow the creation of two servers with same name but different
doc/de/autogen/user/irc_commands.txt
+1 -1
View File
@@ -194,7 +194,7 @@ Ziel: Servername
[[command_irc_invite]]
[command]*`invite`* Jemanden in einen Channel einladen::
........................................
/invite <nick> <channel>
/invite <nick> [<nick>...] [<channel>]
nick: Nick welcher eingeladen werden soll
channel: Channel für den die Einladung gelten soll
doc/en/autogen/user/irc_commands.txt
+1 -1
View File
@@ -194,7 +194,7 @@ target: server name
[[command_irc_invite]]
[command]*`invite`* invite a nick on a channel::
........................................
/invite <nick> <channel>
/invite <nick> [<nick>...] [<channel>]
nick: nick to invite
channel: channel to invite
doc/fr/autogen/user/irc_commands.txt
+1 -1
View File
@@ -194,7 +194,7 @@ cible: nom du serveur
[[command_irc_invite]]
[command]*`invite`* inviter un pseudo sur un canal::
........................................
/invite <pseudo> <canal>
/invite <pseudo> [<pseudo>...] [<canal>]
pseudo: pseudo à inviter
canal: canal pour l'invitation
doc/it/autogen/user/irc_commands.txt
+1 -1
View File
@@ -194,7 +194,7 @@ destinazione: nome server
[[command_irc_invite]]
[command]*`invite`* invita un nick su un canale::
........................................
/invite <nick> <canale>
/invite <nick> [<nick>...] [<channel>]
nick: nick da invitare
canale: canale su cui invitare
po/cs.po
+7 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4426,8 +4426,9 @@ msgstr "získat informace popisující server"
msgid "invite a nick on a channel"
msgstr "pozvat přezdívku na kanál"
msgid "<nick> <channel>"
msgstr "<přezdívka> <kanál>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<přezdívka> [<přezdívka>...]"
msgid ""
" nick: nick to invite\n"
@@ -8326,5 +8327,8 @@ msgstr ""
msgid "Constants"
msgstr ""
#~ msgid "<nick> <channel>"
#~ msgstr "<přezdívka> <kanál>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "mechanismu pro SASL autentizaci"
po/de.po
+7 -3
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-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-03-13 16:36+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -4784,8 +4784,9 @@ msgstr "Information über den Server abfragen"
msgid "invite a nick on a channel"
msgstr "Jemanden in einen Channel einladen"
msgid "<nick> <channel>"
msgstr "<nick> <channel>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<nick> [<nick>...]"
msgid ""
" nick: nick to invite\n"
@@ -8855,5 +8856,8 @@ msgstr "Type"
msgid "Constants"
msgstr "Konstanten"
#~ msgid "<nick> <channel>"
#~ msgstr "<nick> <channel>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "Vorrichtung zur SASL Authentifizierung"
po/es.po
+7 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4613,8 +4613,9 @@ msgstr "obtener información describiendo al servidor"
msgid "invite a nick on a channel"
msgstr "invitar a un apodo a un canal"
msgid "<nick> <channel>"
msgstr "<apodo> <canal>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<apodo> [<apodo>...]"
msgid ""
" nick: nick to invite\n"
@@ -8590,5 +8591,8 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Constantes"
#~ msgid "<nick> <channel>"
#~ msgstr "<apodo> <canal>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "mecanismo para la autenticación SASL"
po/fr.po
+7 -4
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"PO-Revision-Date: 2012-03-24 12:21+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-03-26 09:16+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -4664,8 +4664,8 @@ msgstr "voir les informations décrivant le serveur"
msgid "invite a nick on a channel"
msgstr "inviter un pseudo sur un canal"
msgid "<nick> <channel>"
msgstr "<pseudo> <canal>"
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<pseudo> [<pseudo>...] [<canal>]"
msgid ""
" nick: nick to invite\n"
@@ -8657,6 +8657,9 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
#~ msgid "<nick> <channel>"
#~ msgstr "<pseudo> <canal>"
#~ msgid ""
#~ "delay (in seconds) to wait for control sequence ending a bracketed paste "
#~ "(\"ESC[201~\"); if the control sequence is not received and that delay is "
po/hu.po
+7 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4012,8 +4012,8 @@ msgid "invite a nick on a channel"
msgstr "felhasználó meghívása szobából"
#, fuzzy
msgid "<nick> <channel>"
msgstr "név szoba"
msgid "<nick> [<nick>...] [<channel>]"
msgstr "név [név...]"
#, fuzzy
msgid ""
@@ -7847,6 +7847,10 @@ msgstr ""
msgid "Constants"
msgstr ""
#, fuzzy
#~ msgid "<nick> <channel>"
#~ msgstr "név szoba"
#, fuzzy
#~ msgid "mechanism for SASL authentication"
#~ msgstr "SSL használata a a kapcsolathoz"
po/it.po
+7 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4606,8 +4606,9 @@ msgstr "ottieni informazioni sul server"
msgid "invite a nick on a channel"
msgstr "invita un nick su un canale"
msgid "<nick> <channel>"
msgstr "<nick> <canale>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<nick> [<nick>...]"
msgid ""
" nick: nick to invite\n"
@@ -8565,5 +8566,8 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Costanti"
#~ msgid "<nick> <channel>"
#~ msgstr "<nick> <canale>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "meccanismo per l'autenticazione SASL"
po/ja.po
+7 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: \"AYANOKOUZI, Ryuunosuke\" <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese\n"
@@ -4500,8 +4500,9 @@ msgstr "サーバに関する情報を入手"
msgid "invite a nick on a channel"
msgstr "チャンネルにニックネームを招待"
msgid "<nick> <channel>"
msgstr "<nick> <channel>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<nick> [<nick>...]"
msgid ""
" nick: nick to invite\n"
@@ -8366,5 +8367,8 @@ msgstr "タイプ"
msgid "Constants"
msgstr "定数"
#~ msgid "<nick> <channel>"
#~ msgstr "<nick> <channel>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "SASL 認証メカニズム"
po/pl.po
+7 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4591,8 +4591,9 @@ msgstr "pobiera informacje opisujące serwer"
msgid "invite a nick on a channel"
msgstr "zaprasza użytkownika na kanał"
msgid "<nick> <channel>"
msgstr "<nick> <kanał>"
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<nick> [<nick>...]"
msgid ""
" nick: nick to invite\n"
@@ -8500,5 +8501,8 @@ msgstr "Typ"
msgid "Constants"
msgstr "Stałe"
#~ msgid "<nick> <channel>"
#~ msgstr "<nick> <kanał>"
#~ msgid "mechanism for SASL authentication"
#~ msgstr "mechanizm uwierzytelniania SASL"
po/pt_BR.po
+4 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4370,8 +4370,9 @@ msgstr ""
msgid "invite a nick on a channel"
msgstr ""
msgid "<nick> <channel>"
msgstr ""
#, fuzzy
msgid "<nick> [<nick>...] [<channel>]"
msgstr "<apelido> [<apelido>...]"
msgid ""
" nick: nick to invite\n"
po/ru.po
+7 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+0200\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4042,8 +4042,8 @@ msgid "invite a nick on a channel"
msgstr "пригласить ник на канал"
#, fuzzy
msgid "<nick> <channel>"
msgstr "ник канал"
msgid "<nick> [<nick>...] [<channel>]"
msgstr "ник [ник ...]"
#, fuzzy
msgid ""
@@ -7866,6 +7866,10 @@ msgstr ""
msgid "Constants"
msgstr ""
#, fuzzy
#~ msgid "<nick> <channel>"
#~ msgstr "ник канал"
#, fuzzy
#~ msgid "mechanism for SASL authentication"
#~ msgstr "использовать SSL при связи с сервером"
po/weechat.pot
+2 -2
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-03-24 12:52+0100\n"
"POT-Creation-Date: 2012-03-26 13:41+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"
@@ -3560,7 +3560,7 @@ msgstr ""
msgid "invite a nick on a channel"
msgstr ""
msgid "<nick> <channel>"
msgid "<nick> [<nick>...] [<channel>]"
msgstr ""
msgid ""
src/plugins/irc/irc-command.c
+32 -12
View File
@@ -1750,6 +1750,9 @@ int
irc_command_invite (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int i, arg_last_nick;
char *ptr_channel_name;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
IRC_COMMAND_CHECK_SERVER("invite", 1);
@@ -1759,8 +1762,26 @@ irc_command_invite (void *data, struct t_gui_buffer *buffer, int argc,
if (argc > 2)
{
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"INVITE %s %s", argv[1], argv[2]);
if (irc_channel_is_channel (ptr_server, argv[argc - 1]))
{
arg_last_nick = argc - 2;
ptr_channel_name = argv[argc - 1];
}
else
{
if (ptr_channel && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL))
{
arg_last_nick = argc - 1;
ptr_channel_name = ptr_channel->name;
}
else
goto error;
}
for (i = 1; i <= arg_last_nick; i++)
{
irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"INVITE %s %s", argv[i], ptr_channel_name);
}
}
else
{
@@ -1771,17 +1792,16 @@ irc_command_invite (void *data, struct t_gui_buffer *buffer, int argc,
argv[1], ptr_channel->name);
}
else
{
weechat_printf (ptr_server->buffer,
_("%s%s: \"%s\" command can only be "
"executed in a channel buffer"),
weechat_prefix ("error"), IRC_PLUGIN_NAME,
"invite");
return WEECHAT_RC_OK;
}
goto error;
}
return WEECHAT_RC_OK;
error:
weechat_printf (ptr_server->buffer,
_("%s%s: \"%s\" command can only be "
"executed in a channel buffer"),
weechat_prefix ("error"), IRC_PLUGIN_NAME,
"invite");
return WEECHAT_RC_OK;
}
@@ -5024,7 +5044,7 @@ irc_command_init ()
NULL, &irc_command_info, NULL);
weechat_hook_command ("invite",
N_("invite a nick on a channel"),
N_("<nick> <channel>"),
N_("<nick> [<nick>...] [<channel>]"),
N_(" nick: nick to invite\n"
"channel: channel to invite"),
"%(nicks) %(irc_server_channels)", &irc_command_invite, NULL);