diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 85592cf9f..5c7fd508c 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -27,6 +27,7 @@ New features:: * fset: add variable `allowed_values` in options, add options fset.color.allowed_values and fset.color.allowed_values_selected * fset: allow long type name in type filter * irc: add count for all nick modes in output of `/names` (issue #97) + * irc: add count and mode filter in command `/names` (issue #98) * irc: compute color in case insensitive way, reintroduce infos "irc_nick_color" and "irc_nick_color_name", add support of server name (issue #194) * irc: add buffer for /list reply, add options irc.color.list_buffer_line_selected, irc.color.list_buffer_line_selected_bg, irc.look.list_buffer_sort, irc.look.list_buffer_scroll_horizontal, irc.look.new_list_position, irc.look.list_buffer_topic_strip_colors (issue #1972) * irc: display commands 716/717 in private buffer (if present) (issue #146) diff --git a/po/cs.po b/po/cs.po index 213fdbeba..a499001ce 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -7974,11 +7974,17 @@ msgstr "poslat zprávu přezdívce nebo kanálu" msgid "list nicks on channels" msgstr "vypsat přezdívky na kanálech" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "kanál: jméno kanálu" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "změnit aktuální přezdívku" @@ -8580,6 +8586,11 @@ msgstr "soukromé rozhovory na aktuálním IRC serveru" msgid "nicks on all channels of current IRC server" msgstr "přezdívky na všech kanálech aktuálního IRC serveru" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "IRC servery (vnitřní jména)" @@ -10348,8 +10359,14 @@ msgstr[0] "voiců" msgstr[1] "voice" msgstr[2] "voiců" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtr" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sPřezdívka %s%s%s: %s[%s%s]" #, fuzzy, c-format @@ -14411,6 +14428,9 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)" +#~ msgid "channel: channel name" +#~ msgstr "kanál: jméno kanálu" + #~ msgid "nickname" #~ msgstr "přezdívka" diff --git a/po/de.po b/po/de.po index 7117aa1f9..2d8a8c9e1 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-08-27 00:11+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -10130,11 +10130,17 @@ msgstr "Nachricht an Nick/Kanal verschicken" msgid "list nicks on channels" msgstr "Nicknamen des Kanals auflisten" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "channel: Name des Kanals" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "derzeitigen Nicknamen ändern" @@ -10814,6 +10820,11 @@ msgstr "Privat auf aktuellem IRC Server" msgid "nicks on all channels of current IRC server" msgstr "Nicks für alle Kanäle auf dem aktuellen IRC-Server" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "IRC-Server (interne Namen)" @@ -12831,8 +12842,14 @@ msgid_plural "voiced" msgstr[0] "Stimme" msgstr[1] "Stimmen" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "Filter" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sNicks %s%s%s: %s[%s%s]" #, c-format @@ -17385,6 +17402,9 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" +#~ msgid "channel: channel name" +#~ msgstr "channel: Name des Kanals" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/es.po b/po/es.po index 48fdb946e..74cfd649e 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -8630,11 +8630,17 @@ msgstr "envía mensaje a un usuario o canal" msgid "list nicks on channels" msgstr "listar apodos en los canales" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "canal: nombre del canal" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "cambiar el apodo actual" @@ -9249,6 +9255,11 @@ msgstr "conversaciones privadas en el servidor IRC actual" msgid "nicks on all channels of current IRC server" msgstr "apodos en todos los canales del servidor IRC actual" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "servidores IRC (nombres internos)" @@ -11085,8 +11096,14 @@ msgid_plural "voiced" msgstr[0] "voz" msgstr[1] "voces" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtro" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sApodos %s%s%s: %s[%s%s]" # dunno what reop means @@ -15093,6 +15110,9 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: no es posible conectarse: error (%d)" +#~ msgid "channel: channel name" +#~ msgstr "canal: nombre del canal" + #~ msgid "nickname" #~ msgstr "apodo" diff --git a/po/fr.po b/po/fr.po index 25cdb2331..6aea3c18b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" -"PO-Revision-Date: 2023-08-27 09:59+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" +"PO-Revision-Date: 2023-08-27 11:28+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -9892,11 +9892,20 @@ msgstr "envoyer un message à un pseudo ou canal" msgid "list nicks on channels" msgstr "lister les pseudos sur des canaux" -msgid "[[,...]]" -msgstr "[[,...]]" +msgid "[-count | -x] [[,...]]" +msgstr "[-count | -x] [[,...]]" -msgid "channel: channel name" -msgstr "canal : nom du canal" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" +"-count : afficher seulement le nombre d'utilisateurs\n" +" -x : afficher seulement les utilisateurs avec ce mode : -o pour les ops, " +"-h pour les halfops, -v pour ceux avec la voix, etc. et -* pour les " +"utilisateurs réguliers\n" +" canal : nom de canal" msgid "change current nick" msgstr "changer le pseudo courant" @@ -10571,6 +10580,13 @@ msgstr "privés sur le serveur IRC courant" msgid "nicks on all channels of current IRC server" msgstr "pseudos sur tous les canaux du serveur IRC courant" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" +"paramètres pour filtrer par préfixe de mode (par exemple : \"-o\", \"-h\", " +"\"-v\", \"-*\")" + msgid "IRC servers (internal names)" msgstr "serveurs IRC (noms internes)" @@ -12517,9 +12533,12 @@ msgid_plural "voiced" msgstr[0] "avec voix" msgstr[1] "avec voix" +msgid "filter:" +msgstr "filtre :" + #, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" -msgstr "%sPseudos %s%s%s : %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" +msgstr "%sPseudos %s%s%s%s : %s[%s%s]" #, c-format msgid "%sChannel %s%s%s: %s%d%s %s %s(%s%s)" @@ -17008,6 +17027,9 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" +#~ msgid "channel: channel name" +#~ msgstr "canal : nom du canal" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/hu.po b/po/hu.po index 734395e1e..2edd8afd3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -7424,11 +7424,15 @@ msgid "list nicks on channels" msgstr "felhasználók listája egy szobában" #, fuzzy -msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[szoba[,szoba]]" -msgid "channel: channel name" -msgstr "szoba: szoba neve" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" #, fuzzy msgid "change current nick" @@ -8099,6 +8103,11 @@ msgstr "szobák listája ahová be akarunk lépni csatlakozás után" msgid "nicks on all channels of current IRC server" msgstr "szobák listája ahová be akarunk lépni csatlakozás után" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "" @@ -9781,8 +9790,11 @@ msgid_plural "voiced" msgstr[0] "voice" msgstr[1] "voice" +msgid "filter:" +msgstr "" + #, fuzzy, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%s Szerver: %s%s %s[%s%s%s]\n" #, fuzzy, c-format @@ -13658,6 +13670,9 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" +#~ msgid "channel: channel name" +#~ msgstr "szoba: szoba neve" + #, fuzzy #~ msgid "nickname" #~ msgstr "[-all] név" diff --git a/po/it.po b/po/it.po index c1fa459f3..fe6dda152 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -8332,11 +8332,17 @@ msgstr "invia un messaggio ad un nick o a un canale" msgid "list nicks on channels" msgstr "elenca i nick sul canale" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "canale: nome canale" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "cambia il nick corrente" @@ -8951,6 +8957,11 @@ msgstr "privati sul server IRC corrente" msgid "nicks on all channels of current IRC server" msgstr "nick su tutti i canali del server IRC corrente" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "server IRC (nomi interni)" @@ -10813,8 +10824,14 @@ msgid_plural "voiced" msgstr[0] "voice" msgstr[1] "voice" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtro" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sNick %s%s%s: %s[%s%s]" #, c-format @@ -14862,6 +14879,9 @@ msgstr "%s%s: timeout per \"%s\" con %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: impossibile connettersi al mittente" +#~ msgid "channel: channel name" +#~ msgstr "canale: nome canale" + #~ msgid "nickname" #~ msgstr "nick" diff --git a/po/ja.po b/po/ja.po index f51c756ff..5b102c189 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-08-08 07:13+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese [,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "channel: チャンネル名" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "現在のニックネームを変更" @@ -10120,6 +10126,11 @@ msgstr "現在の IRC サーバにあるプライベートチャンネル" msgid "nicks on all channels of current IRC server" msgstr "現在の IRC サーバの全てのチャンネルにいるニックネーム" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "IRC サーバ (内部名)" @@ -12050,8 +12061,14 @@ msgid "voiced" msgid_plural "voiced" msgstr[0] "発言" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "フィルタ" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sニックネーム %s%s%s: %s[%s%s]" #, c-format @@ -16383,6 +16400,9 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" +#~ msgid "channel: channel name" +#~ msgstr "channel: チャンネル名" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/pl.po b/po/pl.po index 6bcb64be3..bdc2c8bd5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-08-08 07:13+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish \n" @@ -10569,11 +10569,17 @@ msgstr "wysyła wiadomość do użytkownika albo kanału" msgid "list nicks on channels" msgstr "wyświetla nazwy użytkowników na kanałach" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "kanał: nazwa kanału" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "zmienia obecną nazwę użytkownika" @@ -11294,6 +11300,11 @@ msgstr "rozmowy prywatne na obecnym serwerze IRC" msgid "nicks on all channels of current IRC server" msgstr "użytkownicy na wszystkich kanałach obecnego serwera IRC" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "Serwery IRC (nazwy wewnętrzne)" @@ -13268,8 +13279,14 @@ msgstr[0] "voice" msgstr[1] "voice" msgstr[2] "voice" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtr" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sNicki %s%s%s: %s[%s%s]" #, c-format @@ -17973,6 +17990,9 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" +#~ msgid "channel: channel name" +#~ msgstr "kanał: nazwa kanału" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/pt.po b/po/pt.po index 2a29e0738..619072f3d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -9176,11 +9176,17 @@ msgstr "enviar mensagem para um nick ou canal" msgid "list nicks on channels" msgstr "listar nicks em canais" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "canal: nome do canal" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "mudar o nick atual" @@ -9846,6 +9852,11 @@ msgstr "privados no servidor IRC atual" msgid "nicks on all channels of current IRC server" msgstr "nicks em todos os canais do servidor IRC atual" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "servidores IRC (nomes internos)" @@ -11767,8 +11778,14 @@ msgid_plural "voiced" msgstr[0] "voz" msgstr[1] "vozes" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtro" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sNicks %s%s%s: %s[%s%s]" #, c-format @@ -16089,6 +16106,9 @@ msgstr "%s%s: tempo limite de \"%s\" com %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar: erro inesperado (%d)" +#~ msgid "channel: channel name" +#~ msgstr "canal: nome do canal" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3ec7f65ba..c568c0fb2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -8094,10 +8094,16 @@ msgstr "" msgid "list nicks on channels" msgstr "" -msgid "[[,...]]" -msgstr "" +#, fuzzy +#| msgid " [,...]" +msgid "[-count | -x] [[,...]]" +msgstr " [,...]" -msgid "channel: channel name" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" msgstr "" msgid "change current nick" @@ -8639,6 +8645,11 @@ msgstr "" msgid "nicks on all channels of current IRC server" msgstr "apelidos em todos os canais do servidor IRC atual" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "servidor IRC (nomes internos)" @@ -10348,8 +10359,14 @@ msgid_plural "voiced" msgstr[0] "" msgstr[1] "" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "filtro" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sApelidos %s%s%s: %s[%s%s]" #, fuzzy, c-format diff --git a/po/ru.po b/po/ru.po index 552a9ddf5..9f9ddaac2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -7464,11 +7464,15 @@ msgid "list nicks on channels" msgstr "перечислить ники на канале" #, fuzzy -msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[канал[,канал]]" -msgid "channel: channel name" -msgstr "канал: название канала" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" #, fuzzy msgid "change current nick" @@ -8131,6 +8135,11 @@ msgstr "Список каналов, на которые заходить при msgid "nicks on all channels of current IRC server" msgstr "Список каналов, на которые заходить при соединении с сервером" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "" @@ -9825,8 +9834,13 @@ msgstr[0] "войс" msgstr[1] "войс" msgstr[2] "войс" +#, fuzzy +#| msgid "Message filters:" +msgid "filter:" +msgstr "Фильтры сообщения:" + #, fuzzy, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sСервер: %s%s %s[%s%s%s]\n" #, fuzzy, c-format @@ -13694,6 +13708,9 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" +#~ msgid "channel: channel name" +#~ msgstr "канал: название канала" + #, fuzzy #~ msgid "nickname" #~ msgstr "[-all] ник" diff --git a/po/sr.po b/po/sr.po index 79faffb22..4c033337f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-08-08 07:14+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -9845,11 +9845,17 @@ msgstr "слање поруке надимку или каналу" msgid "list nicks on channels" msgstr "листа надимака на каналима" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[<канал>[,<канал>...]]" -msgid "channel: channel name" -msgstr "канал: име канала" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "измена текућег надимка" @@ -10514,6 +10520,11 @@ msgstr "приватни разговори на текућем IRC сервер msgid "nicks on all channels of current IRC server" msgstr "надимци на свим каналима текућег IRC сервера" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "IRC сервери (интерна имена)" @@ -12408,8 +12419,14 @@ msgstr[0] "говори" msgstr[1] "говоре" msgstr[2] "говори" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "филтер" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sНадимци %s%s%s: %s[%s%s]" #, c-format @@ -16870,6 +16887,9 @@ msgstr "%s%s: тајмаут за „%s” са %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)" +#~ msgid "channel: channel name" +#~ msgstr "канал: име канала" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/tr.po b/po/tr.po index 625f751a2..d2925bfe5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2023-08-08 07:14+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -10078,11 +10078,17 @@ msgstr "bir takma ada veya kanala ileti gönder" msgid "list nicks on channels" msgstr "kanaldaki takma adları listele" -msgid "[[,...]]" +#, fuzzy +#| msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "[[,...]]" -msgid "channel: channel name" -msgstr "kanal: kanal adı" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" +msgstr "" msgid "change current nick" msgstr "geçerli takma adı değiştir" @@ -10794,6 +10800,11 @@ msgstr "geçerli IRC sunucusundaki gizliler" msgid "nicks on all channels of current IRC server" msgstr "geçerli IRC sunucusunun tüm kanallarındaki takma adlar" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "IRC sunucuları (dahili adlar)" @@ -12749,8 +12760,14 @@ msgid_plural "voiced" msgstr[0] "yardımcı" msgstr[1] "yardımcı" -#, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +#, fuzzy +#| msgid "filter" +msgid "filter:" +msgstr "süzgeç" + +#, fuzzy, c-format +#| msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "%sTakma adlar %s%s%s: %s[%s%s]" #, c-format @@ -17275,6 +17292,9 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)" +#~ msgid "channel: channel name" +#~ msgstr "kanal: kanal adı" + #~ msgid "" #~ "get nick color code (*deprecated* since version 1.5, replaced by " #~ "\"nick_color\")" diff --git a/po/weechat.pot b/po/weechat.pot index 4d7b97efc..6946f283d 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-27 09:58+0200\n" +"POT-Creation-Date: 2023-08-27 11:25+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -6787,10 +6787,14 @@ msgstr "" msgid "list nicks on channels" msgstr "" -msgid "[[,...]]" +msgid "[-count | -x] [[,...]]" msgstr "" -msgid "channel: channel name" +msgid "" +" -count: display only number of users\n" +" -x: display only users with this mode: -o for ops, -h for halfops, -v " +"for voiced, etc. and -* for regular users\n" +"channel: channel name" msgstr "" msgid "change current nick" @@ -7292,6 +7296,11 @@ msgstr "" msgid "nicks on all channels of current IRC server" msgstr "" +msgid "" +"arguments to filter by prefix mode (for example: \"-o\", \"-h\", \"-v\", \"-" +"*\")" +msgstr "" + msgid "IRC servers (internal names)" msgstr "" @@ -8815,8 +8824,11 @@ msgid_plural "voiced" msgstr[0] "" msgstr[1] "" +msgid "filter:" +msgstr "" + #, c-format -msgid "%sNicks %s%s%s: %s[%s%s]" +msgid "%sNicks %s%s%s%s: %s[%s%s]" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 9e8c37dbe..3b6b91929 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -3895,6 +3895,10 @@ IRC_COMMAND_CALLBACK(msg) IRC_COMMAND_CALLBACK(names) { + int i, arg_channels; + char filter[2], **channels, *channel_name_lower; + int num_channels; + IRC_BUFFER_GET_SERVER_CHANNEL(buffer); IRC_COMMAND_CHECK_SERVER("names", 1, 1); @@ -3903,26 +3907,64 @@ IRC_COMMAND_CALLBACK(names) (void) data; (void) argv; - if (argc > 1) + arg_channels = argc; + filter[0] = '\0'; + filter[1] = '\0'; + + for (i = 1; i < argc; i++) { - irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, - "NAMES %s", argv_eol[1]); - } - else - { - if (!ptr_channel || (ptr_channel->type != IRC_CHANNEL_TYPE_CHANNEL)) + if (argv[i][0] == '-') { - weechat_printf ( - ptr_server->buffer, - _("%s%s: \"%s\" command can only be executed in a channel " - "buffer"), - weechat_prefix ("error"), IRC_PLUGIN_NAME, "names"); - return WEECHAT_RC_OK; + if (weechat_strcmp (argv[i], "-count") == 0) + filter[0] = '#'; + else if (argv[i][1]) + filter[0] = argv[i][1]; + } + else + { + arg_channels = i; + break; } - irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, - "NAMES %s", ptr_channel->name); } + if ((arg_channels >= argc) + && (!ptr_channel || (ptr_channel->type != IRC_CHANNEL_TYPE_CHANNEL))) + { + weechat_printf ( + ptr_server->buffer, + _("%s%s: \"%s\" command can only be executed in a channel " + "buffer"), + weechat_prefix ("error"), IRC_PLUGIN_NAME, "names"); + return WEECHAT_RC_OK; + } + + if (filter[0]) + { + channels = weechat_string_split ( + (arg_channels < argc) ? argv_eol[arg_channels] : ptr_channel->name, + ",", NULL, 0, 0, &num_channels); + if (channels) + { + for (i = 0; i < num_channels; i++) + { + channel_name_lower = weechat_string_tolower (channels[i]); + if (channel_name_lower) + { + weechat_hashtable_set (ptr_server->names_channel_filter, + channel_name_lower, + filter); + free (channel_name_lower); + } + } + weechat_string_free_split (channels); + } + } + + irc_server_sendf ( + ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, + "NAMES %s", + (arg_channels < argc) ? argv_eol[arg_channels] : ptr_channel->name); + return WEECHAT_RC_OK; } @@ -7432,9 +7474,13 @@ irc_command_init () weechat_hook_command ( "names", N_("list nicks on channels"), - N_("[[,...]]"), - N_("channel: channel name"), - "%(irc_channels)", &irc_command_names, NULL, NULL); + N_("[-count | -x] [[,...]]"), + N_(" -count: display only number of users\n" + " -x: display only users with this mode: -o for ops, " + "-h for halfops, -v for voiced, etc. and -* for regular users\n" + "channel: channel name"), + "-count|%(irc_server_prefix_modes_filter) %(irc_channels)" + " || %(irc_channels)", &irc_command_names, NULL, NULL); weechat_hook_command ( "nick", N_("change current nick"), diff --git a/src/plugins/irc/irc-completion.c b/src/plugins/irc/irc-completion.c index 1df549157..4848d54d2 100644 --- a/src/plugins/irc/irc-completion.c +++ b/src/plugins/irc/irc-completion.c @@ -211,6 +211,45 @@ irc_completion_server_nicks_cb (const void *pointer, void *data, return WEECHAT_RC_OK; } +/* + * Adds prefix modes filters to completion list. + */ + +int +irc_completion_server_prefix_modes_filter_cb (const void *pointer, void *data, + const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion) +{ + const char *ptr_prefix_modes; + char str_filter[16]; + int i; + + IRC_BUFFER_GET_SERVER_CHANNEL(buffer); + + /* make C compiler happy */ + (void) pointer; + (void) data; + (void) completion_item; + + ptr_prefix_modes = irc_server_get_prefix_modes (ptr_server); + if (!ptr_prefix_modes) + return WEECHAT_RC_OK; + + for (i = 0; ptr_prefix_modes[i]; i++) + { + snprintf (str_filter, sizeof (str_filter), "-%c", ptr_prefix_modes[i]); + weechat_completion_list_add (completion, str_filter, + 1, WEECHAT_LIST_POS_END); + } + + /* add filter on regular users at the end */ + weechat_completion_list_add (completion, "-*", + 1, WEECHAT_LIST_POS_END); + + return WEECHAT_RC_OK; +} + /* * Adds servers to completion list. */ @@ -938,6 +977,10 @@ irc_completion_init () weechat_hook_completion ("irc_server_nicks", N_("nicks on all channels of current IRC server"), &irc_completion_server_nicks_cb, NULL, NULL); + weechat_hook_completion ("irc_server_prefix_modes_filter", + N_("arguments to filter by prefix mode " + "(for example: \"-o\", \"-h\", \"-v\", \"-*\")"), + &irc_completion_server_prefix_modes_filter_cb, NULL, NULL); weechat_hook_completion ("irc_servers", N_("IRC servers (internal names)"), &irc_completion_servers_cb, NULL, NULL); diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 5fff17b35..44b2e95a9 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -6478,17 +6478,34 @@ IRC_PROTOCOL_CALLBACK(354) /* * Returns a string with the list of nicks on a channel. * + * If filter is NULL, all nicks are displayed. + * Otherwise first char of filter is a mode: + * o: ops + * h: halfops + * v: voiced + * ... + * *: regular + * * Note: result must be freed after use. */ char * irc_protocol_get_string_channel_nicks (struct t_irc_server *server, - struct t_irc_channel *channel) + struct t_irc_channel *channel, + const char *filter) { struct t_infolist *infolist; struct t_config_option *ptr_option; - const char *prefix, *prefix_color, *nickname; + const char *prefix, *prefix_color, *nickname, *ptr_prefix_modes; char **str_nicks, *color; + int index_mode, filter_ok; + + /* + * filter "#" means display only nicks count, so the list of nicks is not + * displayed at all + */ + if (filter && (filter[0] == '#')) + return NULL; str_nicks = weechat_string_dyn_alloc (1024); if (!str_nicks) @@ -6501,10 +6518,30 @@ irc_protocol_get_string_channel_nicks (struct t_irc_server *server, return NULL; } + ptr_prefix_modes = irc_server_get_prefix_modes (server); + while (weechat_infolist_next (infolist)) { if (strcmp (weechat_infolist_string (infolist, "type"), "nick") == 0) { + prefix = weechat_infolist_string (infolist, "prefix"); + index_mode = (prefix[0] && (prefix[0] != ' ')) ? + irc_server_get_prefix_char_index (server, prefix[0]) : -1; + + /* check filter */ + if (filter && ptr_prefix_modes) + { + filter_ok = (((filter[0] == '*') && (index_mode < 0)) + || ((filter[0] != '*') && (index_mode >= 0) + && (filter[0] == ptr_prefix_modes[index_mode]))); + } + else + { + filter_ok = 1; + } + if (!filter_ok) + continue; + if (*str_nicks[0]) { weechat_string_dyn_concat (str_nicks, @@ -6512,7 +6549,6 @@ irc_protocol_get_string_channel_nicks (struct t_irc_server *server, -1); weechat_string_dyn_concat (str_nicks, " ", -1); } - prefix = weechat_infolist_string (infolist, "prefix"); if (prefix[0] && (prefix[0] != ' ')) { prefix_color = weechat_infolist_string (infolist, @@ -6653,7 +6689,8 @@ irc_protocol_get_string_channel_nicks_count (struct t_irc_server *server, IRC_PROTOCOL_CALLBACK(366) { struct t_irc_channel *ptr_channel; - char *str_params, *string; + const char *ptr_filter; + char *str_params, *string, *channel_name_lower, str_filter[256]; IRC_PROTOCOL_MIN_PARAMS(3); @@ -6661,23 +6698,44 @@ IRC_PROTOCOL_CALLBACK(366) if (ptr_channel && ptr_channel->nicks) { - /* display the list of users on channel */ - if (weechat_hashtable_has_key (ptr_channel->join_msg_received, "353") - || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "353")) + /* check if a filter was given to /names command */ + ptr_filter = NULL; + channel_name_lower = weechat_string_tolower (ptr_channel->name); + if (channel_name_lower) { - string = irc_protocol_get_string_channel_nicks (server, ptr_channel); + ptr_filter = weechat_hashtable_get (server->names_channel_filter, + channel_name_lower); + } + + /* display the list of users on channel */ + if ((!ptr_filter || (ptr_filter[0] != '#')) + && (weechat_hashtable_has_key (ptr_channel->join_msg_received, "353") + || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "353"))) + { + string = irc_protocol_get_string_channel_nicks (server, ptr_channel, + ptr_filter); if (string) { + if (ptr_filter) + { + snprintf (str_filter, sizeof (str_filter), + " (%s %s)", _("filter:"), ptr_filter); + } + else + { + str_filter[0] = '\0'; + } weechat_printf_date_tags ( irc_msgbuffer_get_target_buffer ( server, NULL, command, "names", ptr_channel->buffer), date, irc_protocol_tags (server, command, tags, NULL, NULL, NULL), - _("%sNicks %s%s%s: %s[%s%s]"), + _("%sNicks %s%s%s%s: %s[%s%s]"), weechat_prefix ("network"), IRC_COLOR_CHAT_CHANNEL, ptr_channel->name, IRC_COLOR_RESET, + str_filter, IRC_COLOR_CHAT_DELIMITERS, string, IRC_COLOR_CHAT_DELIMITERS); @@ -6714,6 +6772,14 @@ IRC_PROTOCOL_CALLBACK(366) } } + if (channel_name_lower) + { + /* remove filter */ + weechat_hashtable_remove (server->names_channel_filter, + channel_name_lower); + free (channel_name_lower); + } + if (!weechat_hashtable_has_key (ptr_channel->join_msg_received, command)) { irc_command_mode_server (server, "MODE", ptr_channel, NULL, diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 2cd37d1ff..2fa848792 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -1782,6 +1782,11 @@ irc_server_alloc (const char *name) WEECHAT_HASHTABLE_STRING, WEECHAT_HASHTABLE_TIME, NULL, NULL); + new_server->names_channel_filter = weechat_hashtable_new ( + 32, + WEECHAT_HASHTABLE_STRING, + WEECHAT_HASHTABLE_STRING, + NULL, NULL); new_server->batches = NULL; new_server->last_batch = NULL; new_server->buffer = NULL; @@ -2269,6 +2274,7 @@ irc_server_free_data (struct t_irc_server *server) weechat_hashtable_free (server->join_channel_key); weechat_hashtable_free (server->join_noswitch); weechat_hashtable_free (server->echo_msg_recv); + weechat_hashtable_free (server->names_channel_filter); /* free server data */ for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++) @@ -4218,6 +4224,9 @@ irc_server_close_connection (struct t_irc_server *server) /* remove all messages stored (with capability echo-message) */ weechat_hashtable_remove_all (server->echo_msg_recv); + /* remove all /names filters */ + weechat_hashtable_remove_all (server->names_channel_filter); + /* remove all batched events pending */ irc_batch_free_all (server); @@ -6478,6 +6487,7 @@ irc_server_hdata_server_cb (const void *pointer, void *data, WEECHAT_HDATA_VAR(struct t_irc_server, join_channel_key, HASHTABLE, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, join_noswitch, HASHTABLE, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, echo_msg_recv, HASHTABLE, 0, NULL, NULL); + WEECHAT_HDATA_VAR(struct t_irc_server, names_channel_filter, HASHTABLE, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, batches, POINTER, 0, NULL, "irc_batch"); WEECHAT_HDATA_VAR(struct t_irc_server, last_batch, POINTER, 0, NULL, "irc_batch"); WEECHAT_HDATA_VAR(struct t_irc_server, buffer, POINTER, 0, NULL, "buffer"); @@ -7277,6 +7287,9 @@ irc_server_print_log () weechat_log_printf (" echo_msg_recv . . . . . . : 0x%lx (hashtable: '%s')", ptr_server->echo_msg_recv, weechat_hashtable_get_string (ptr_server->echo_msg_recv, "keys_values")); + weechat_log_printf (" names_channel_filter. . . : 0x%lx (hashtable: '%s')", + ptr_server->names_channel_filter, + weechat_hashtable_get_string (ptr_server->names_channel_filter, "keys_values")); weechat_log_printf (" batches . . . . . . . . . : 0x%lx", ptr_server->batches); weechat_log_printf (" last_batch. . . . . . . . : 0x%lx", ptr_server->last_batch); weechat_log_printf (" buffer. . . . . . . . . . : 0x%lx", ptr_server->buffer); diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 054516a8f..cd2637ccf 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -298,6 +298,7 @@ struct t_irc_server struct t_hashtable *join_channel_key; /* keys pending for joins */ struct t_hashtable *join_noswitch; /* joins w/o switch to buffer */ struct t_hashtable *echo_msg_recv; /* msg received with echo-message */ + struct t_hashtable *names_channel_filter; /* filter for /names on channel*/ struct t_irc_batch *batches; /* batched events (cap "batch") */ struct t_irc_batch *last_batch; /* last batch */ struct t_gui_buffer *buffer; /* GUI buffer allocated for server */