diff options
-rw-r--r-- | ChangeLog.asciidoc | 2 | ||||
-rw-r--r-- | doc/de/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | doc/en/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | doc/fr/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | doc/it/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | doc/ja/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | doc/pl/autogen/user/irc_options.txt | 2 | ||||
-rw-r--r-- | po/cs.po | 8 | ||||
-rw-r--r-- | po/de.po | 9 | ||||
-rw-r--r-- | po/es.po | 8 | ||||
-rw-r--r-- | po/fr.po | 15 | ||||
-rw-r--r-- | po/hu.po | 8 | ||||
-rw-r--r-- | po/it.po | 8 | ||||
-rw-r--r-- | po/ja.po | 9 | ||||
-rw-r--r-- | po/pl.po | 9 | ||||
-rw-r--r-- | po/pt_BR.po | 8 | ||||
-rw-r--r-- | po/ru.po | 8 | ||||
-rw-r--r-- | po/tr.po | 8 | ||||
-rw-r--r-- | po/weechat.pot | 8 | ||||
-rw-r--r-- | src/plugins/irc/irc-config.c | 7 | ||||
-rw-r--r-- | src/plugins/irc/irc-protocol.c | 40 |
21 files changed, 92 insertions, 75 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 8fc8b03ac..9fa8166cd 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -99,6 +99,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * alias: change default command for alias /beep to "/print -beep" * exec: add exec plugin: new command /exec and file exec.conf * guile: fix module used after unload of a script +* irc: add support of message 324 (channel modes) in option + irc.look.display_join_message (closes #75) * irc: add option irc.look.join_auto_add_chantype (closes #65) * irc: add alias "whois" for target buffer of messages 401/402 (closes #54) * irc: add tag with host ("host_xxx") in IRC messages displayed (task #12018) diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 2b8228f33..1acf2d942 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** Werte: on, off (Standardwert: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** Beschreibung: `durch Kommata getrennte Liste von Nachrichten die beim Betreten eines Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = Topic, 333 = Nick/Datum für Topic, 353 = genutzte Namen im Channel, 366 = Anzahl der Nicks im Channel` +** Beschreibung: `comma-separated list of messages to display after joining a channel: 324 = channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333,366"`) diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 1177dd409..384ce856b 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** values: on, off (default value: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` +** description: `comma-separated list of messages to display after joining a channel: 324 = channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** type: string ** values: any string (default value: `"329,332,333,366"`) diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 900d3f625..a8383fdb3 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** valeurs: on, off (valeur par défaut: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** description: `liste de messages (séparés par des virgules) à afficher après avoir rejoint un canal : 329 = date de création du canal, 332 = titre, 333 = pseudo/date pour le titre, 353 = noms sur le canal, 366 = décompte des noms` +** description: `liste de messages (séparés par des virgules) à afficher après avoir rejoint un canal : 324 = modes du canal, 329 = date de création du canal, 332 = titre, 333 = pseudo/date pour le titre, 353 = noms sur le canal, 366 = décompte des noms` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"329,332,333,366"`) diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index df3ce3a16..9826eace0 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** valori: on, off (valore predefinito: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** descrizione: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` +** descrizione: `comma-separated list of messages to display after joining a channel: 324 = channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"329,332,333,366"`) diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index 7713fc296..e896fe326 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** 値: on, off (デフォルト値: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** 説明: `チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャンネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、353 = チャンネル参加者リスト、366 = 参加人数` +** 説明: `comma-separated list of messages to display after joining a channel: 324 = channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `"329,332,333,366"`) diff --git a/doc/pl/autogen/user/irc_options.txt b/doc/pl/autogen/user/irc_options.txt index 93e6f2ba1..6672b460b 100644 --- a/doc/pl/autogen/user/irc_options.txt +++ b/doc/pl/autogen/user/irc_options.txt @@ -139,7 +139,7 @@ ** wartości: on, off (domyślna wartość: `on`) * [[option_irc.look.display_join_message]] *irc.look.display_join_message* -** opis: `oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: 329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 353 = osoby na kanale, 366 = ilość osób na kanale` +** opis: `comma-separated list of messages to display after joining a channel: 324 = channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count` ** typ: ciąg ** wartości: dowolny ciąg (domyślna wartość: `"329,332,333,366"`) @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6752,9 +6752,9 @@ msgid "display host in part/quit messages" msgstr "zobrazovat hosta ve zprávách o odchodu/ukončení" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-05-06 22:10+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -7690,10 +7690,11 @@ msgstr "Zeigt den Host in join Nachrichten des lokalen Client an" msgid "display host in part/quit messages" msgstr "Zeigt den Host in einer part/quit Nachricht an" +#, fuzzy msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" "durch Kommata getrennte Liste von Nachrichten die beim Betreten eines " "Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6998,9 +6998,9 @@ msgid "display host in part/quit messages" msgstr "muestra el host en mensajes de salida/abandono" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" -"PO-Revision-Date: 2014-05-08 10:59+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" +"PO-Revision-Date: 2014-05-08 11:23+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -7519,13 +7519,14 @@ msgid "display host in part/quit messages" msgstr "afficher le nom d'hôte dans les messages part/quit" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" "liste de messages (séparés par des virgules) à afficher après avoir rejoint " -"un canal : 329 = date de création du canal, 332 = titre, 333 = pseudo/date " -"pour le titre, 353 = noms sur le canal, 366 = décompte des noms" +"un canal : 324 = modes du canal, 329 = date de création du canal, 332 = " +"titre, 333 = pseudo/date pour le titre, 353 = noms sur le canal, 366 = " +"décompte des noms" msgid "display old topic when channel topic is changed" msgstr "afficher l'ancien titre lorsque le titre du canal est changé" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6247,9 +6247,9 @@ msgid "display host in part/quit messages" msgstr "alapértelmezett kilépő üzenet" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7146,9 +7146,9 @@ msgstr "visualizza host nei messaggi di uscita/abbandono" #, fuzzy msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" "elenco separato da virgole di messaggi da mostrare dopo l'ingresso in un " "canale: 329 = data di creazione del canale, 332 = argomento, 333 = nick/data " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-21 00:44+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -7220,10 +7220,11 @@ msgstr "ローカルクライアントからの参加メッセージにホスト msgid "display host in part/quit messages" msgstr "退出/終了 メッセージにホスト名を表示" +#, fuzzy msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" "チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャン" "ネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-19 13:08+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7302,10 +7302,11 @@ msgstr "wyświetlaj host podczas wchodzenia na kanał" msgid "display host in part/quit messages" msgstr "pokazuj host w wiadomościach o opuszczeniu kanału/wyjściu z IRC" +#, fuzzy msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" "oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: " "329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 353 = osoby na " diff --git a/po/pt_BR.po b/po/pt_BR.po index 4225cd8b7..2077435ba 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: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6495,9 +6495,9 @@ msgid "display host in part/quit messages" msgstr "" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-04-05 16:12+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6269,9 +6269,9 @@ msgid "display host in part/quit messages" msgstr "сообщение о выходе по-умолчанию" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2014-03-24 14:23+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5564,9 +5564,9 @@ msgid "display host in part/quit messages" msgstr "" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/po/weechat.pot b/po/weechat.pot index 03c77f4e4..04a594ad2 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-05-08 10:58+0200\n" +"POT-Creation-Date: 2014-05-08 11:17+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5510,9 +5510,9 @@ msgid "display host in part/quit messages" msgstr "" msgid "" -"comma-separated list of messages to display after joining a channel: 329 = " -"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names " -"on channel, 366 = names count" +"comma-separated list of messages to display after joining a channel: 324 = " +"channel modes, 329 = channel creation date, 332 = topic, 333 = nick/date for " +"topic, 353 = names on channel, 366 = names count" msgstr "" msgid "display old topic when channel topic is changed" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 1d7ad9cfd..fe13a7671 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -2346,9 +2346,10 @@ irc_config_init () irc_config_look_display_join_message = weechat_config_new_option ( irc_config_file, ptr_section, "display_join_message", "string", - N_("comma-separated list of messages to display after joining a channel: " - "329 = channel creation date, 332 = topic, 333 = nick/date for topic, " - "353 = names on channel, 366 = names count"), + N_("comma-separated list of messages to display after joining a " + "channel: 324 = channel modes, 329 = channel creation date, " + "332 = topic, 333 = nick/date for topic, 353 = names on channel, " + "366 = names count"), NULL, 0, 0, "329,332,333,366", NULL, 0, NULL, NULL, &irc_config_change_look_display_join_message, NULL, NULL, NULL); irc_config_look_display_old_topic = weechat_config_new_option ( diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index f4243c39a..2b0f817f0 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3048,21 +3048,31 @@ IRC_PROTOCOL_CALLBACK(324) ptr_channel->modes); } } - weechat_printf_date_tags (irc_msgbuffer_get_target_buffer (server, NULL, - command, NULL, - (ptr_channel) ? ptr_channel->buffer : NULL), - date, - irc_protocol_tags (command, "irc_numeric", NULL, - address), - _("%sMode %s%s %s[%s%s%s]"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_CHANNEL, - argv[3], - IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_RESET, - (argc > 4) ? - ((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : "", - IRC_COLOR_CHAT_DELIMITERS); + if (!ptr_channel + || (weechat_hashtable_has_key (ptr_channel->join_msg_received, command) + || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, command))) + { + weechat_printf_date_tags ( + irc_msgbuffer_get_target_buffer ( + server, NULL, + command, NULL, + (ptr_channel) ? ptr_channel->buffer : NULL), + date, + irc_protocol_tags (command, "irc_numeric", NULL, + address), + _("%sMode %s%s %s[%s%s%s]"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + (argc > 4) ? + ((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : "", + IRC_COLOR_CHAT_DELIMITERS); + } + + if (ptr_channel) + weechat_hashtable_set (ptr_channel->join_msg_received, command, "1"); return WEECHAT_RC_OK; } |