pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 11:25:41 +02:00
Code Activity

irc: unmask smart filtered join if nick speaks in channel some minutes after the join, new option irc.look.smart_filter_join_unmask (task #12405)

Browse Source 
The nick changes are tracked and will be unmasked with the join.
Events triggering the unmask of join are: a message (can be CTCP), a notice or
an update of topic.
This commit is contained in:
Sebastien Helleu
2013-02-17 13:27:36 +01:00
parent 6e3f6270d1
commit bc079b007d
29 changed files with 585 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -23,6 +23,8 @@ Version 0.4.1 (under dev!)
* aspell: add info "aspell_dict" (dictionaries used on a buffer)
* aspell: optimization on spellers to improve speed (save state by buffer)
* guile: fix compilation with guile 2.0
* irc: unmask smart filtered join if nick speaks in channel some minutes after
the join, new option irc.look.smart_filter_join_unmask (task #12405)
* irc: fix memory leak in purge of hashtables with joins (it was done only for
the first server in the list)
* irc: add color in output of /names when result is on server buffer (channel
doc/de/autogen/plugin_api/hdata.txt
+1
View File
@@ -42,6 +42,7 @@
'nicks_speaking' (pointer) +
'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'join_smart_filtered' (hashtable) +
'buffer' (pointer, hdata: "buffer") +
'buffer_as_string' (string) +
'prev_channel' (pointer, hdata: "irc_channel") +
doc/de/autogen/user/irc_options.txt
+6 -1
View File
@@ -303,8 +303,13 @@
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
** Beschreibung: `delay for unmasking a join message that was filtered with tag "irc_smart_filter" (in minutes): if a nick jas joined max N minutes ago and then says something on channel (message, notice or update on topic), the join is unmasked, as well as nick changes after this join (0 = disable: never unmask a join)`
** Typ: integer
** Werte: 0 .. 10080 (Standardwert: `30`)
* [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
** Beschreibung: `aktiviert einen intelligenten Filter für Nachrichten von einem "Nick"`
** Beschreibung: `enable smart filter for "nick" messages (nick changes)`
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
doc/en/autogen/plugin_api/hdata.txt
+1
View File
@@ -42,6 +42,7 @@
'nicks_speaking' (pointer) +
'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'join_smart_filtered' (hashtable) +
'buffer' (pointer, hdata: "buffer") +
'buffer_as_string' (string) +
'prev_channel' (pointer, hdata: "irc_channel") +
doc/en/autogen/user/irc_options.txt
+6 -1
View File
@@ -303,8 +303,13 @@
** type: boolean
** values: on, off (default value: `on`)
* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
** description: `delay for unmasking a join message that was filtered with tag "irc_smart_filter" (in minutes): if a nick jas joined max N minutes ago and then says something on channel (message, notice or update on topic), the join is unmasked, as well as nick changes after this join (0 = disable: never unmask a join)`
** type: integer
** values: 0 .. 10080 (default value: `30`)
* [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
** description: `enable smart filter for "nick" messages`
** description: `enable smart filter for "nick" messages (nick changes)`
** type: boolean
** values: on, off (default value: `on`)
doc/fr/autogen/plugin_api/hdata.txt
+1
View File
@@ -42,6 +42,7 @@
'nicks_speaking' (pointer) +
'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'join_smart_filtered' (hashtable) +
'buffer' (pointer, hdata: "buffer") +
'buffer_as_string' (string) +
'prev_channel' (pointer, hdata: "irc_channel") +
doc/fr/autogen/user/irc_options.txt
+6 -1
View File
@@ -303,8 +303,13 @@
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
** description: `délai pour démasquer un message "join" qui a été filtré avec l'étiquette "irc_smart_filter" (en minutes): si le pseudo a rejoint au maximum il y a N minutes et qu'il a dit quelque chose sur le canal (message, notice ou mise à jour du topic), le "join" est démasqué, tout comme les changements de pseudo après ce "join" (0 = désactiver: ne jamais démasquer un "join")`
** type: entier
** valeurs: 0 .. 10080 (valeur par défaut: `30`)
* [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
** description: `activer le filtre intelligent pour les messages "nick"`
** description: `activer le filtre intelligent pour les messages "nick" (changements de pseudo)`
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
doc/it/autogen/plugin_api/hdata.txt
+1
View File
@@ -42,6 +42,7 @@
'nicks_speaking' (pointer) +
'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'join_smart_filtered' (hashtable) +
'buffer' (pointer, hdata: "buffer") +
'buffer_as_string' (string) +
'prev_channel' (pointer, hdata: "irc_channel") +
doc/it/autogen/user/irc_options.txt
+6 -1
View File
@@ -303,8 +303,13 @@
** tipo: bool
** valori: on, off (valore predefinito: `on`)
* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
** descrizione: `delay for unmasking a join message that was filtered with tag "irc_smart_filter" (in minutes): if a nick jas joined max N minutes ago and then says something on channel (message, notice or update on topic), the join is unmasked, as well as nick changes after this join (0 = disable: never unmask a join)`
** tipo: intero
** valori: 0 .. 10080 (valore predefinito: `30`)
* [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
** descrizione: `abilita filtro smart per i messaggi "nick"`
** descrizione: `enable smart filter for "nick" messages (nick changes)`
** tipo: bool
** valori: on, off (valore predefinito: `on`)
doc/ja/autogen/plugin_api/hdata.txt
+1
View File
@@ -42,6 +42,7 @@
'nicks_speaking' (pointer) +
'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
'join_smart_filtered' (hashtable) +
'buffer' (pointer, hdata: "buffer") +
'buffer_as_string' (string) +
'prev_channel' (pointer, hdata: "irc_channel") +
doc/ja/autogen/user/irc_options.txt
+6 -1
View File
@@ -303,8 +303,13 @@
** タイプ: ブール
** 値: on, off (デフォルト値: `on`)
* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
** 説明: `delay for unmasking a join message that was filtered with tag "irc_smart_filter" (in minutes): if a nick jas joined max N minutes ago and then says something on channel (message, notice or update on topic), the join is unmasked, as well as nick changes after this join (0 = disable: never unmask a join)`
** タイプ: 整数
** 値: 0 .. 10080 (デフォルト値: `30`)
* [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
** 説明: `"nick" メッセージのスマートフィルタを有効化`
** 説明: `enable smart filter for "nick" messages (nick changes)`
** タイプ: ブール
** 値: on, off (デフォルト値: `on`)
po/cs.po
+11 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:07+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6066,12 +6066,21 @@ msgstr "zpoždění pro filtrování zpráv join/part/quit (v minutách)"
msgid "enable smart filter for \"join\" messages"
msgstr "povolit chytrý filter pro \"join\" zprávy"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr "povolit chytrý filter pro \"part\" a \"quit\" zprávy"
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "povolit chytrý filter pro \"nick\" zprávy"
msgid "strip colors in topic (used only when displaying buffer title)"
po/de.po
+11 -2
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:07+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -6692,13 +6692,22 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "aktiviert einen intelligenten Filter für \"join\" Nachrichten"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
"aktiviert einen intelligenten Filter für \"part\" und \"quit\" Nachrichten"
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr ""
"aktiviert einen intelligenten Filter für Nachrichten von einem \"Nick\""
po/es.po
+11 -2
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:07+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6312,12 +6312,21 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "habilitar el filtro inteligente para mensajes \"join\""
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr "habilitar el filtro inteligente para mensajes \"part\" y \"quit\""
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "habilitar el filtro inteligente para mensajes \"nick\""
msgid "strip colors in topic (used only when displaying buffer title)"
po/fr.po
+25 -7
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"PO-Revision-Date: 2013-02-14 20:41+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-02-17 12:18+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -1227,12 +1227,15 @@ msgstr ""
" set: définir le niveau de debug pour l'extension\n"
"extension: nom de l'extension (\"core\" pour le coeur de WeeChat)\n"
" niveau: niveau de debug pour l'extension\n"
" dump: afficher les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)\n"
" buffer: afficher le contenu du tampon en valeurs hexadécimales dans le fichier log\n"
" dump: afficher les variables mémoire WeeChat dans le fichier log (les "
"mêmes messages sont affichés lorsque WeeChat plante)\n"
" buffer: afficher le contenu du tampon en valeurs hexadécimales dans le "
"fichier log\n"
" color: afficher des infos sur les paires de couleur courantes\n"
" cursor: activer/désactiver le debug pour le mode curseur\n"
" dirs: afficher les répertoires\n"
" hdata: afficher des infos sur les hdata (avec free: supprimer tous les hdata en mémoire)\n"
" hdata: afficher des infos sur les hdata (avec free: supprimer tous les "
"hdata en mémoire)\n"
" hooks: afficher des infos sur les hooks\n"
"infolists: afficher des infos sur les infolists\n"
" memory: afficher des infos sur l'utilisation de la mémoire\n"
@@ -6504,13 +6507,28 @@ msgstr "délai pour filtrer les messages join/part/quit (en minutes)"
msgid "enable smart filter for \"join\" messages"
msgstr "activer le filtre intelligent pour les messages \"join\""
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
"délai pour démasquer un message \"join\" qui a été filtré avec l'étiquette "
"\"irc_smart_filter\" (en minutes): si le pseudo a rejoint au maximum il y a "
"N minutes et qu'il a dit quelque chose sur le canal (message, notice ou mise "
"à jour du topic), le \"join\" est démasqué, tout comme les changements de "
"pseudo après ce \"join\" (0 = désactiver: ne jamais démasquer un \"join\")"
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr "activer le filtre intelligent pour les messages \"part\" et \"quit\""
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
msgstr "activer le filtre intelligent pour les messages \"nick\""
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr ""
"activer le filtre intelligent pour les messages \"nick\" (changements de "
"pseudo)"
msgid "strip colors in topic (used only when displaying buffer title)"
msgstr ""
po/hu.po
+10 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:07+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5606,13 +5606,21 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "új üzenetet tartalmazó ablak színe"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
#. TRANSLATORS: please do not translate "nick"
#, fuzzy
msgid "enable smart filter for \"nick\" messages"
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "új üzenetet tartalmazó ablak színe"
msgid "strip colors in topic (used only when displaying buffer title)"
po/it.po
+11 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-02-03 12:13+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6328,6 +6328,14 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "abilita filtro smart per i messaggi \"join\" (entrata)"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
@@ -6335,7 +6343,8 @@ msgstr ""
"(disconnessione)"
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "abilita filtro smart per i messaggi \"nick\""
msgid "strip colors in topic (used only when displaying buffer title)"
po/ja.po
+11 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:07+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -6276,12 +6276,21 @@ msgstr "参加/退出/終了 メッセージのフィルタリングを遅らせ
msgid "enable smart filter for \"join\" messages"
msgstr "\"join\" メッセージのスマートフィルタを有効化"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr "\"part\" と \"quit\" メッセージのスマートフィルタを有効化"
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "\"nick\" メッセージのスマートフィルタを有効化"
msgid "strip colors in topic (used only when displaying buffer title)"
po/pl.po
+11 -2
View File
@@ -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: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:08+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6404,12 +6404,21 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "włącza mądre filtrowanie dla wiadomości \"join\""
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr "włącza inteligentne filtrowanie dla wiadomości \"part\" oraz \"quit\""
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
#, fuzzy
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "włącza mądre filtrowanie dla wiadomości \"nick\""
msgid "strip colors in topic (used only when displaying buffer title)"
po/pt_BR.po
+10 -2
View File
@@ -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: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:08+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5782,12 +5782,20 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr ""
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr ""
msgid "strip colors in topic (used only when displaying buffer title)"
po/ru.po
+10 -2
View File
@@ -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: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\n"
"PO-Revision-Date: 2013-01-20 12:08+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5625,13 +5625,21 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr "цвет текущего окна с сообщениями"
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
#. TRANSLATORS: please do not translate "nick"
#, fuzzy
msgid "enable smart filter for \"nick\" messages"
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr "цвет текущего окна с сообщениями"
msgid "strip colors in topic (used only when displaying buffer title)"
po/weechat.pot
+10 -2
View File
@@ -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: 2013-02-14 20:40+0100\n"
"POT-Creation-Date: 2013-02-17 12:17+0100\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"
@@ -4883,12 +4883,20 @@ msgstr ""
msgid "enable smart filter for \"join\" messages"
msgstr ""
msgid ""
"delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N minutes ago "
"and then says something on channel (message, notice or update on topic), the "
"join is unmasked, as well as nick changes after this join (0 = disable: "
"never unmask a join)"
msgstr ""
#. TRANSLATORS: please do not translate "part" and "quit"
msgid "enable smart filter for \"part\" and \"quit\" messages"
msgstr ""
#. TRANSLATORS: please do not translate "nick"
msgid "enable smart filter for \"nick\" messages"
msgid "enable smart filter for \"nick\" messages (nick changes)"
msgstr ""
msgid "strip colors in topic (used only when displaying buffer title)"
src/plugins/irc/irc-channel.c
+260
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-channel.h
+11
View File
@@ -67,6 +67,7 @@ struct t_irc_channel
struct t_irc_channel_speaking *nicks_speaking_time; /* for smart filter */
/* of join/part/quit messages */
struct t_irc_channel_speaking *last_nick_speaking_time;
struct t_hashtable *join_smart_filtered; /* smart filtered joins */
struct t_gui_buffer *buffer; /* buffer allocated for channel */
char *buffer_as_string; /* used to return buffer info */
struct t_irc_channel *prev_channel; /* link to previous channel */
@@ -118,6 +119,16 @@ extern void irc_channel_nick_speaking_time_rename (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *old_nick,
const char *new_nick);
extern void irc_channel_join_smart_filtered_add (struct t_irc_channel *channel,
const char *nick,
time_t join_time);
extern void irc_channel_join_smart_filtered_rename (struct t_irc_channel *channel,
const char *old_nick,
const char *new_nick);
extern void irc_channel_join_smart_filtered_remove (struct t_irc_channel *channel,
const char *nick);
extern void irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel,
const char *nick);
extern void irc_channel_rejoin (struct t_irc_server *server,
struct t_irc_channel *channel);
extern int irc_channel_autorejoin_cb (void *data, int remaining_calls);
src/plugins/irc/irc-config.c
+11 -1
View File
@@ -94,6 +94,7 @@ struct t_config_option *irc_config_look_raw_messages;
struct t_config_option *irc_config_look_smart_filter;
struct t_config_option *irc_config_look_smart_filter_delay;
struct t_config_option *irc_config_look_smart_filter_join;
struct t_config_option *irc_config_look_smart_filter_join_unmask;
struct t_config_option *irc_config_look_smart_filter_quit;
struct t_config_option *irc_config_look_smart_filter_nick;
struct t_config_option *irc_config_look_topic_strip_colors;
@@ -2309,6 +2310,15 @@ irc_config_init ()
/* TRANSLATORS: please do not translate "join" */
N_("enable smart filter for \"join\" messages"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_smart_filter_join_unmask = weechat_config_new_option (
irc_config_file, ptr_section,
"smart_filter_join_unmask", "integer",
N_("delay for unmasking a join message that was filtered with tag "
"\"irc_smart_filter\" (in minutes): if a nick jas joined max N "
"minutes ago and then says something on channel (message, notice or "
"update on topic), the join is unmasked, as well as nick changes "
"after this join (0 = disable: never unmask a join)"),
NULL, 0, 60*24*7, "30", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_smart_filter_quit = weechat_config_new_option (
irc_config_file, ptr_section,
"smart_filter_quit", "boolean",
@@ -2319,7 +2329,7 @@ irc_config_init ()
irc_config_file, ptr_section,
"smart_filter_nick", "boolean",
/* TRANSLATORS: please do not translate "nick" */
N_("enable smart filter for \"nick\" messages"),
N_("enable smart filter for \"nick\" messages (nick changes)"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_topic_strip_colors = weechat_config_new_option (
irc_config_file, ptr_section,
src/plugins/irc/irc-config.h
+1
View File
@@ -129,6 +129,7 @@ extern struct t_config_option *irc_config_look_raw_messages;
extern struct t_config_option *irc_config_look_smart_filter;
extern struct t_config_option *irc_config_look_smart_filter_delay;
extern struct t_config_option *irc_config_look_smart_filter_join;
extern struct t_config_option *irc_config_look_smart_filter_join_unmask;
extern struct t_config_option *irc_config_look_smart_filter_quit;
extern struct t_config_option *irc_config_look_smart_filter_nick;
extern struct t_config_option *irc_config_look_topic_strip_colors;
src/plugins/irc/irc-protocol.c
+56 -8
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-server.c
+42 -14
View File
@@ -2688,14 +2688,11 @@ void
irc_server_check_join_manual_cb (void *data, struct t_hashtable *hashtable,
const void *key, const void *value)
{
struct t_irc_server *server;
/* make C compiler happy */
(void) data;
server = (struct t_irc_server *)data;
if (server)
{
if (*((time_t *)value) + (60 * 10) < time (NULL))
weechat_hashtable_remove (hashtable, key);
}
if (*((time_t *)value) + (60 * 10) < time (NULL))
weechat_hashtable_remove (hashtable, key);
}
/*
@@ -2707,13 +2704,33 @@ void
irc_server_check_join_noswitch_cb (void *data, struct t_hashtable *hashtable,
const void *key, const void *value)
{
struct t_irc_server *server;
/* make C compiler happy */
(void) data;
server = (struct t_irc_server *)data;
if (server)
if (*((time_t *)value) + (60 * 10) < time (NULL))
weechat_hashtable_remove (hashtable, key);
}
/*
* Callback called for each smart filtered join of a channel: deletes old
* entries in the hashtable.
*/
void
irc_server_check_join_smart_filtered_cb (void *data,
struct t_hashtable *hashtable,
const void *key, const void *value)
{
int unmask_delay;
/* make C compiler happy */
(void) data;
unmask_delay = weechat_config_integer (irc_config_look_smart_filter_join_unmask);
if ((unmask_delay == 0)
|| (*((time_t *)value) < time (NULL) - (unmask_delay * 60)))
{
if (*((time_t *)value) + (60 * 10) < time (NULL))
weechat_hashtable_remove (hashtable, key);
weechat_hashtable_remove (hashtable, key);
}
}
@@ -2725,6 +2742,7 @@ int
irc_server_timer_cb (void *data, int remaining_calls)
{
struct t_irc_server *ptr_server;
struct t_irc_channel *ptr_channel;
struct t_irc_redirect *ptr_redirect, *ptr_next_redirect;
time_t current_time;
static struct timeval tv;
@@ -2835,10 +2853,20 @@ irc_server_timer_cb (void *data, int remaining_calls)
{
weechat_hashtable_map (ptr_server->join_manual,
&irc_server_check_join_manual_cb,
ptr_server);
NULL);
weechat_hashtable_map (ptr_server->join_noswitch,
&irc_server_check_join_noswitch_cb,
ptr_server);
NULL);
for (ptr_channel = ptr_server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->join_smart_filtered)
{
weechat_hashtable_map (ptr_channel->join_smart_filtered,
&irc_server_check_join_smart_filtered_cb,
NULL);
}
}
ptr_server->last_data_purge = current_time;
}
}
src/plugins/irc/irc-upgrade.c
+36 -2
View File
@@ -284,8 +284,10 @@ irc_upgrade_read_cb (void *data,
int object_id,
struct t_infolist *infolist)
{
int flags, sock, size, i, index;
char *buf, option_name[64];
int flags, sock, size, i, index, nicks_count;
long number;
time_t join_time;
char *buf, option_name[64], **nicks, *nick_join, *pos, *error;
const char *buffer_name, *str, *nick;
struct t_irc_nick *ptr_nick;
struct t_irc_redirect *ptr_redirect;
@@ -482,6 +484,38 @@ irc_upgrade_read_cb (void *data,
option_name));
index++;
}
str = weechat_infolist_string (infolist, "join_smart_filtered");
if (str)
{
nicks = weechat_string_split (str, ",", 0, 0,
&nicks_count);
if (nicks)
{
for (i = 0; i < nicks_count; i++)
{
pos = strchr (nicks[i], ':');
if (pos)
{
nick_join = weechat_strndup (nicks[i],
pos - nicks[i]);
if (nick_join)
{
error = NULL;
number = strtol (pos + 1, &error, 10);
if (error && !error[0])
{
join_time = (time_t)number;
irc_channel_join_smart_filtered_add (irc_upgrade_current_channel,
nick_join,
join_time);
}
free (nick_join);
}
}
}
weechat_string_free_split (nicks);
}
}
}
}
break;