diff --git a/ChangeLog b/ChangeLog index 0b3d232d1..8ebd292b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.1-dev, 2009-10-06 +v0.3.1-dev, 2009-10-10 Version 0.3.1 (under dev!) @@ -19,6 +19,7 @@ Version 0.3.1 (under dev!) * alias: allow use of wildcards for /alias list (patch #6925) * alias: allow /unalias to remove multiple aliases (patch #6926) * alias: fix bug with arguments (bug #27440) +* irc: add command /sajoin (task #9770) * irc: add options for CTCP, to block/customize CTCP reply (task #9693) * irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270) * irc: improve error management on socket error (recv/send) diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt index 0316cb7b8..6ac0d9fd7 100644 --- a/doc/en/autogen/user/irc_commands.txt +++ b/doc/en/autogen/user/irc_commands.txt @@ -397,6 +397,15 @@ tell the server to restart itself ........................................ +• *`/sajoin`* `nickname channel[,channel]`:: + +........................................ + forces a user to join channel(s) + + nickname: nickname + channel: channel name +........................................ + • *`/server`* `[list [servername]] | [listfull [servername]] | [add servername hostname[/port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername] | [deloutq] | [jump] | [raw]`:: ........................................ diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt index 50bc721b8..613cd0ac3 100644 --- a/doc/fr/autogen/user/irc_commands.txt +++ b/doc/fr/autogen/user/irc_commands.txt @@ -397,6 +397,15 @@ demander au serveur de redémarrer ........................................ +• *`/sajoin`* `pseudo canal[,canal]`:: + +........................................ + force un utilisateur à rejoindre un ou plusieurs canaux + + pseudo: pseudo + canal: canal +........................................ + • *`/server`* `[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]`:: ........................................ diff --git a/po/cs.po b/po/cs.po index 7d97acb78..8b6a59b9e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-09-14 10:56+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -3446,6 +3446,22 @@ msgstr "říct serveru, aby znovu načetl svůj konfigurační soubor" msgid "tell the server to restart itself" msgstr "říct serveru, aby se restartoval" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "násilně odebrat uživatele z kanálu" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "přezdívka kanál" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +"přezdívka: přezdívka, kterou pozvat\n" +" kanál: kanál na kterou ji pozvat" + msgid "register a new service" msgstr "zaregistrovat novou službu" diff --git a/po/de.po b/po/de.po index 079ec6b6a..84ec5e671 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-10-03 12:07+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -3286,6 +3286,22 @@ msgstr "den Server dazu bringen, seine Konfigurationsdatei neu zu laden" msgid "tell the server to restart itself" msgstr "den Server dazu bringen, sich selbst neu zu starten" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "einen User aus einem Channel herauskicken" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "Nickname Channel" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +"Nickname: Chatname des Einzuladenden\n" +"Channel: Channel, in den er eingeladen werden soll" + msgid "register a new service" msgstr "einen neuen Service eintragen" diff --git a/po/es.po b/po/es.po index acba88fd7..03aa0a1b2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -3255,6 +3255,22 @@ msgstr "pedir al servidor que recargue su archivo de configuración" msgid "tell the server to restart itself" msgstr "pedir al servidor que se reinicie" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "expulsar forzosamente a un usuario de un canal" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "apodo canal" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +"apodo: apodo a invitar\n" +"canal: canal para la invitación" + msgid "register a new service" msgstr "registrar un nuevo servicio" diff --git a/po/fr.po b/po/fr.po index b76510198..40982185a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" -"PO-Revision-Date: 2009-10-09 11:12+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" +"PO-Revision-Date: 2009-10-10 12:00+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -3522,6 +3522,19 @@ msgstr "demander au serveur de recharger son fichier de configuration" msgid "tell the server to restart itself" msgstr "demander au serveur de redémarrer" +msgid "forces a user to join channel(s)" +msgstr "force un utilisateur à rejoindre un ou plusieurs canaux" + +msgid "nickname channel[,channel]" +msgstr "pseudo canal[,canal]" + +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +"pseudo: pseudo\n" +" canal: canal" + msgid "register a new service" msgstr "enregister un nouveau service" diff --git a/po/hu.po b/po/hu.po index 21694e20f..30b2aa81b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-09-20 13:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -3369,6 +3369,22 @@ msgstr "szerver konfigurációs fájljának újraolvastatása" msgid "tell the server to restart itself" msgstr "szerver újraindítása" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "felhasználó erőszakos eltávolítása a szobából" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "név szoba" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +" név: meghívandó név\n" +"szoba: meghívandó szoba" + msgid "register a new service" msgstr "új szolgáltatás regisztrálása" diff --git a/po/pl.po b/po/pl.po index cc132b24b..f0c40ce8b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish\n" @@ -3484,6 +3484,22 @@ msgstr "mówi serwerowi, żeby przeładował pliki konfiguracyjne" msgid "tell the server to restart itself" msgstr "mówi serwerowi, aby się ponownie uruchomił" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "sułowo usuwa użytkownika z kanału" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "nick kanał" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +"nick: nick do zaproszenia\n" +" kanał: kanał na który zapraszamy" + msgid "register a new service" msgstr "rejestruje nową usługę" diff --git a/po/ru.po b/po/ru.po index e38851226..f20f24137 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: 2009-09-20 13:50+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -3377,6 +3377,22 @@ msgstr "перезагрузить конфигурационный файл с msgid "tell the server to restart itself" msgstr "перезагрузить сервер" +#, fuzzy +msgid "forces a user to join channel(s)" +msgstr "принудительно удалить пользователя с канала" + +#, fuzzy +msgid "nickname channel[,channel]" +msgstr "ник канал" + +#, fuzzy +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" +" ник: приглашаемый ник\n" +"канал: целевой канал" + msgid "register a new service" msgstr "зарегистрировать новый сервис" diff --git a/po/weechat.pot b/po/weechat.pot index 855810b33..830aa4522 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-10-03 12:06+0200\n" +"POT-Creation-Date: 2009-10-10 11:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2899,6 +2899,17 @@ msgstr "" msgid "tell the server to restart itself" msgstr "" +msgid "forces a user to join channel(s)" +msgstr "" + +msgid "nickname channel[,channel]" +msgstr "" + +msgid "" +"nickname: nickname\n" +" channel: channel name" +msgstr "" + msgid "register a new service" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index e5985a20e..f6532e9fd 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -2735,6 +2735,32 @@ irc_command_restart (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } +/* + * irc_command_sajoin: forces a user to join channel(s) + */ + +int +irc_command_sajoin (void *data, struct t_gui_buffer *buffer, int argc, + char **argv, char **argv_eol) +{ + IRC_GET_SERVER_CHANNEL(buffer); + IRC_COMMAND_CHECK_SERVER("sajoin", 1); + + /* make C compiler happy */ + (void) data; + + if (argc > 2) + { + irc_server_sendf (ptr_server, 0, "SAJOIN %s %s", argv[1], argv_eol[2]); + } + else + { + IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "sajoin"); + } + + return WEECHAT_RC_OK; +} + /* * irc_command_server: manage IRC servers */ @@ -4007,6 +4033,12 @@ irc_command_init () "", "", NULL, &irc_command_restart, NULL); + weechat_hook_command ("sajoin", + N_("forces a user to join channel(s)"), + N_("nickname channel[,channel]"), + N_("nickname: nickname\n" + " channel: channel name"), + "%(nicks) %(irc_channels)", &irc_command_sajoin, NULL); weechat_hook_command ("service", N_("register a new service"), N_("nickname reserved distribution type reserved "