summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlethality <lethality@anope.org>2010-08-02 03:35:12 +0100
committerlethality <lethality@anope.org>2010-08-02 03:35:12 +0100
commit94371e69a9bf623442feb16cebe21b2ad71e6c2a (patch)
treeeb834f14d8f7ee0c29e448d14f597d186abe188e
parentf887b37453ae55a4a61e0e7c6ee774f38dddfc2e (diff)
Added Italics support to the BotSev kickers
-rw-r--r--docs/Changes1
-rw-r--r--docs/Changes.lang7
-rw-r--r--include/services.h3
-rw-r--r--lang/cat.l24
-rw-r--r--lang/de.l24
-rw-r--r--lang/en_us.l24
-rw-r--r--lang/es.l24
-rw-r--r--lang/fr.l25
-rw-r--r--lang/gr.l24
-rw-r--r--lang/hun.l24
-rw-r--r--lang/it.l24
-rw-r--r--lang/nl.l24
-rw-r--r--lang/pl.l30
-rw-r--r--lang/pt.l24
-rw-r--r--lang/ru.l24
-rw-r--r--lang/tr.l24
-rw-r--r--modules/core/bs_info.cpp11
-rw-r--r--modules/core/bs_kick.cpp32
-rw-r--r--modules/core/db_plain.cpp5
-rw-r--r--modules/extra/mysql/db_mysql.h1
-rw-r--r--src/botserv.cpp11
21 files changed, 388 insertions, 2 deletions
diff --git a/docs/Changes b/docs/Changes
index c296d382a..46b123fbd 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -1,5 +1,6 @@
Anope Version 1.9.3
--------------------
+A Added italics BotServ kicks support
A Tell users when their nicks expire in /ns glist and /ns info
A Added SSL support
A Added official support for InspIRCd 2.0
diff --git a/docs/Changes.lang b/docs/Changes.lang
index 1f75bae03..718d083f1 100644
--- a/docs/Changes.lang
+++ b/docs/Changes.lang
@@ -1,6 +1,12 @@
Anope Version 1.9.3
--------------------
*** New Strings:
+ BOT_REASON_ITALIC
+ BOT_INFO_CHAN_KICK_ITALICS
+ BOT_INFO_CHAN_KICK_ITALICS_BAN
+ BOT_KICK_ITALICS_ON
+ BOT_KICK_ITALICS_ON_BAN
+ BOT_KICK_ITALICS_OFF
NICK_GLIST_REPLY_NOEXPIRE
NICK_SERVADMIN_HELP_INFO
NICK_UNGROUP_ONE_NICK
@@ -54,6 +60,7 @@ Anope Version 1.9.3
CHAN_HELP_CMD_SASET_HEAD
*** Mod Strings:
+ BOT_HELP_KICK
NICK_GLIST_REPLY
NICK_RESETPASS_MESSAGE
diff --git a/include/services.h b/include/services.h
index 8ed87b8f3..1a81d6e96 100644
--- a/include/services.h
+++ b/include/services.h
@@ -696,6 +696,8 @@ enum BotServFlag
BS_KICK_FLOOD,
/* BotServ kicks for repeating */
BS_KICK_REPEAT,
+ /* BotServ kicks for italics */
+ BS_KICK_ITALICS,
BS_END
};
@@ -710,6 +712,7 @@ enum
TTB_CAPS,
TTB_FLOOD,
TTB_REPEAT,
+ TTB_ITALICS,
TTB_SIZE
};
diff --git a/lang/cat.l b/lang/cat.l
index e3fa1aa71..014e65d1e 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2009,6 +2009,8 @@ BOT_REASON_REVERSE
No utilitzis reversos en aquest canal!
BOT_REASON_UNDERLINE
No utilitzis subratllats en aquest canal!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2138,6 +2140,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Kicker per subrallats : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kicker per subratllats : %s (%d kick(s) per a ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
Activada
BOT_INFO_INACTIVE
@@ -2297,6 +2303,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kicks al mateix usuari.
BOT_KICK_UNDERLINES_OFF
El bot ja no kickejara subratllats.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after
+ %d kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6119,6 +6132,7 @@ BOT_HELP_KICK
que repeteixen com l'allioli
REVERSES Estableix si el bot kickejara reversos
UNDERLINES Estableix si el bot kickejara subratllats
+ ITALICS Sets if the bot kicks italics
Escriu %R%S HELP KICK Opció per més
informació sobre una opció especifica.
@@ -6225,6 +6239,16 @@ BOT_HELP_KICK_BADWORDS
abans de ser banejat. No cal especificar ttb per a deshabilitar
el sistema de ban un cop activat.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Sintàxi: BADWORDS canal ADD paraula [SINGLE | START | END]
BADWORDS canal DEL {paraula | nom | llista}
diff --git a/lang/de.l b/lang/de.l
index aec919427..c9037a074 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2099,6 +2099,8 @@ BOT_REASON_REVERSE
Nicht invertiert schreiben!
BOT_REASON_UNDERLINE
Keine Unterstreichungen in diesem Channel benutzen!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2228,6 +2230,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Underlines kicker : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Underlines kicker : %s (%d Kick(s) bis zum Ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
aktiv
BOT_INFO_INACTIVE
@@ -2387,6 +2393,13 @@ BOT_KICK_UNDERLINES_ON_BAN
nach %d Kicks.
BOT_KICK_UNDERLINES_OFF
Bot wird jetzt unterstrichenen Text ignorieren und nicht kicken.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after
+ %d kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6256,6 +6269,7 @@ BOT_HELP_KICK
REPEAT Bot kickt User, die sich wiederholen.
REVERSES Bot kickt bei invertiertem Schriftstil
UNDERLINES Bot kickt bei Unterstreichungen
+ ITALICS Sets if the bot kicks italics
%R%S HELP KICK Option um weitere
Informationen über einen bestimmten Befehl
@@ -6365,6 +6379,16 @@ BOT_HELP_KICK_BADWORDS
ttb beschreibt wie oft der User gekickt wird, bevor
er einen Ban bekommt. Wenn keine ttb angegeben
wird, wird er nie gebannt.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Syntax: BADWORDS Channel ADD Wort [SINGLE | START | END]
diff --git a/lang/en_us.l b/lang/en_us.l
index c6352de49..1c6381bc8 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2054,6 +2054,8 @@ BOT_REASON_REVERSE
Don't use reverses on this channel!
BOT_REASON_UNDERLINE
Don't use underlines on this channel!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2183,6 +2185,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Underlines kicker : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Underlines kicker : %s (%d kick(s) to ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
enabled
BOT_INFO_INACTIVE
@@ -2342,6 +2348,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kicks for the same user.
BOT_KICK_UNDERLINES_OFF
Bot won't kick underlines anymore.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after
+ %d kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -5940,6 +5953,7 @@ BOT_HELP_KICK
themselves
REVERSES Sets if the bot kicks reverses
UNDERLINES Sets if the bot kicks underlines
+ ITALICS Sets if the bot kicks italics
Type %R%S HELP KICK option for more information
on a specific option.
@@ -6041,6 +6055,16 @@ BOT_HELP_KICK_BADWORDS
ttb is the number of times a user can be kicked
before it get banned. Don't give ttb to disable
the ban system once activated.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Syntax: BADWORDS channel ADD word [SINGLE | START | END]
diff --git a/lang/es.l b/lang/es.l
index 78d52c566..d5f6fcb6b 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2090,6 +2090,8 @@ BOT_REASON_REVERSE
No uses reversos en este canal!
BOT_REASON_UNDERLINE
No uses subrayados en este canal!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2219,6 +2221,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Kicker por subrayados : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kicker por subrayados : %s (%d kick(s) para ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
Activada
BOT_INFO_INACTIVE
@@ -2378,6 +2384,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kicks al mismo usuario.
BOT_KICK_UNDERLINES_OFF
El bot ya no kickeara subrayados.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6207,6 +6220,7 @@ BOT_HELP_KICK
que repiten
REVERSES Setea si el bot kickea reversos
UNDERLINES Setea si el bot kickea subrayados
+ ITALICS Sets if the bot kicks italics
Tipea %R%S HELP KICK opcion para mayor
informacion sobre una opcion especifica.
@@ -6314,6 +6328,16 @@ BOT_HELP_KICK_BADWORDS
antes de ser baneado. No des ttb para desabilitar
el sistema de ban una vez activado.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Sintaxis: BADWORDS canal ADD palabra [SINGLE | START | END]
BADWORDS canal DEL {palabra | numero | lista}
diff --git a/lang/fr.l b/lang/fr.l
index 25915a5e1..a8544976d 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2126,6 +2126,8 @@ BOT_REASON_REVERSE
N'utilisez pas de caractères inversés sur ce canal!
BOT_REASON_UNDERLINE
N'utilisez pas de caractères soulignés sur ce canal!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2255,6 +2257,11 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Kicker de car. soulignés : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kicker de car. soulignés : %s (%d kick(s) pour un ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
+
BOT_INFO_ACTIVE
actif
BOT_INFO_INACTIVE
@@ -2421,6 +2428,13 @@ BOT_KICK_UNDERLINES_ON_BAN
utilisateur.
BOT_KICK_UNDERLINES_OFF
Le bot ne kickera plus les caractères soulignés.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6235,6 +6249,7 @@ BOT_HELP_KICK
REVERSES Détermine si le bot kicke les reverses
UNDERLINES Détermine si le bot kicke les caractères
soulignés
+ ITALICS Sets if the bot kicks italics
Tapez %R%S HELP KICK option pour plus d'informations
sur une option en particulier.
@@ -6355,6 +6370,16 @@ BOT_HELP_KICK_BADWORDS
pas ttb ou mettez le à 0 pour désactiver le système
de ban une fois activé.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Syntaxe: BADWORDS canal ADD mot [SINGLE | START | END]
BADWORDS canal DEL {mot | entry-num | liste}
diff --git a/lang/gr.l b/lang/gr.l
index a2c068a45..eb52cea25 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2121,6 +2121,8 @@ BOT_REASON_REVERSE
Ìçí åßóáé áíôßèåôïò ìÝóá óôï êáíÜëé!
BOT_REASON_UNDERLINE
Ìçí ÷ñçóéìïðïéåßò ÷áñáêôÞñåò õðïãñÜììéóçò óôï êáíÜëé!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2250,6 +2252,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
ÕðïãñÜììéóç ìå kick : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
ÕðïãñÜììéóç ìå kick : %s (%d kick(s) to ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
åíåñãïðïéçìÝíï
BOT_INFO_INACTIVE
@@ -2409,6 +2415,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kicks ãéá ôïí ßäéï ÷ñÞóôç.
BOT_KICK_UNDERLINES_OFF
Ôï Bot äåí èá êÜíåé kick ãéá õðïãñáììéóìÝíïõò ÷áñáêôÞñåò ðëÝïí.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6141,6 +6154,7 @@ BOT_HELP_KICK
åßíáé áíôßèåôïé(ð÷ áëëÜæïõí ôá modes)
UNDERLINES Ñõèìßæåé ôï bot áí èá êÜíåé kick áõôïýò ðïõ
ãñÜöïõí ìå õðïãñáììéóìÝíïõò ÷áñáêôÞñåò
+ ITALICS Sets if the bot kicks italics
ÃñÜøå %R%S HELP KICK åðéëïãÞ ãéá ðåñéóóüôåñåò ðëçñïöïñßåò
óå óõãêåêñéìÝíåò åíôïëÝò.
@@ -6244,6 +6258,16 @@ BOT_HELP_KICK_BADWORDS
Ôï ttb åßíáé ôï íïýìåñï ìå ôï ïðïßï èá ãßíåôáé ï ÷ñÞóôçò áñ÷éêÜ kick
êáé ìåôÜ ban. Ìçí ðñïóðáèÞóåôå íá áðåíåñãïðïéÞóåôå ôï ttb
ãéáôß ôï óýóôçìá èá ôï åíåñãïðïéÞóåé îáíÜ.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Óýíôáîç: BADWORDS êáíÜëé ADD ëÝîç [SINGLE | START | END]
diff --git a/lang/hun.l b/lang/hun.l
index 59a0428c2..14821d3b2 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2095,6 +2095,8 @@ BOT_REASON_REVERSE
Nem írj visszafelé ezen a csatornán!
BOT_REASON_UNDERLINE
Nem használj aláhúzásokat ezen a csatornán!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen válaszok
BOT_SEEN_BOT
@@ -2224,6 +2226,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Aláhúzásért kirúgás: %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Aláhúzásért kirúgás: %s (%d kirúgás után kitiltás)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
engedélyezve
BOT_INFO_INACTIVE
@@ -2382,6 +2388,13 @@ BOT_KICK_UNDERLINES_ON_BAN
%d kirúgás után a usert.
BOT_KICK_UNDERLINES_OFF
Bot nem fog kirúgni aláhúzásos írás miatt.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS üzenetek
BOT_BADWORDS_SYNTAX
@@ -6040,6 +6053,7 @@ BOT_HELP_KICK
ismétlõket.
REVERSES A bot kirúgja visszafelé írókat
UNDERLINES A bot kirúgja aláhúzással írókat
+ ITALICS Sets if the bot kicks italics
Írd be %R%S HELP KICK opció az adott opcióval
kapcsolatos bõvebb információkért.
@@ -6140,6 +6154,16 @@ BOT_HELP_KICK_BADWORDS
A ttb a banolás elotti kickek száma.
Ha nem adod meg, akkor csak kirúgást eszközöl a bot.
Ha megadod a ttb-t, akkor x kirúgás után banol a bot.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Syntax:BADWORDS #szoba ADD szó [SINGLE | START | END]
diff --git a/lang/it.l b/lang/it.l
index 1c1dd8ac3..ce770a18c 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2059,6 +2059,8 @@ BOT_REASON_REVERSE
Non usare il reverse su questo canale!
BOT_REASON_UNDERLINE
Non usare il sottolineato su questo canale!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2188,6 +2190,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Kick in caso di sottolineato: %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kick in caso di sottolineato: %s (%d portano al ban ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
attivato
BOT_INFO_INACTIVE
@@ -2347,6 +2353,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kick nei confronti dello stesso utente.
BOT_KICK_UNDERLINES_OFF
Il bot non kickerà più chi usa il sottolineato.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6035,6 +6048,7 @@ BOT_HELP_KICK
REPEAT Imposta se il bot kicka chi ripete la stessa cosa
REVERSES Imposta se il bot kicka chi usa il reverse
UNDERLINES Imposta se il bot kicka chi usa il sottolineato
+ ITALICS Sets if the bot kicks italics
Digita %R%S HELP KICK opzione per avere maggiori
informazioni su una opzione specifica.
@@ -6131,6 +6145,16 @@ BOT_HELP_KICK_BADWORDS
kick-prima-del-ban è il numero di volte che un utente può
essere kickato prima di venire bannato. Se il parametro
non è specificato, l'utente non verrà bannato.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Sintassi: BADWORDS canale ADD parola [SINGLE | START | END]
diff --git a/lang/nl.l b/lang/nl.l
index d1f7a5ca9..5450e9796 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2105,6 +2105,8 @@ BOT_REASON_REVERSE
Gebruik geen inverteringen in dit kanaal!
BOT_REASON_UNDERLINE
Gebruik geen onderstrepingen in dit kanaal!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2234,6 +2236,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Onderstrepings kicker: %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Onderstrepings kicker: %s (%d kick(s) om bannen)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
ingeschakeld
BOT_INFO_INACTIVE
@@ -2393,6 +2399,13 @@ BOT_KICK_UNDERLINES_ON_BAN
%d kicks voor dezelfde gebruiker.
BOT_KICK_UNDERLINES_OFF
Bot zal niet meer kicken op onderstrepingen.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6107,6 +6120,7 @@ BOT_HELP_KICK
zichzelf herhalen
REVERSES Stelt in of de bot kickt op inverteringen
UNDERLINES Stelt in of de bot kickt op onderstrepingen
+ ITALICS Sets if the bot kicks italics
Type %R%S HELP KICK optie voor meer informatie over
een specifieke optie.
@@ -6209,6 +6223,16 @@ BOT_HELP_KICK_BADWORDS
worden voordat deze gebanned wordt. Geef geen ttb op om het
ban system uit te schakelen als deze kicker geactiveerd is.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Gebruik: BADWORDS kanaal ADD woord [SINGLE | START | END]
BADWORDS kanaal DEL {woord | entry-nr | lijst}
diff --git a/lang/pl.l b/lang/pl.l
index 666816515..9f9065b69 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -2700,6 +2700,9 @@ BOT_REASON_REVERSE
BOT_REASON_UNDERLINE
Nie u¿ywaj podkre¶leñ na tym kanale!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
+
# !seen replies
BOT_SEEN_BOT
Tak! Jestem tutaj %s!
@@ -2878,6 +2881,12 @@ BOT_INFO_CHAN_KICK_UNDERLINES
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kopanie za podkre¶lenia: %s (%d kop(y) do bana)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
+
BOT_INFO_ACTIVE
w³±czone
@@ -3090,6 +3099,16 @@ BOT_KICK_UNDERLINES_ON_BAN
BOT_KICK_UNDERLINES_OFF
Bot nie bêdzie kopa³ za podkre¶lenia.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
+
# BADWORDS messages
BOT_BADWORDS_SYNTAX
BADWORDS kana³ {ADD|DEL|LIST|CLEAR} [s³owo | pozycja] [SINGLE|START|END]
@@ -7078,6 +7097,7 @@ BOT_HELP_KICK
REPEAT Kopanie za wielokrotne powtarzanie
REVERSES Kopanie za odwracanie kolorów
UNDERLINES Kopanie za u¿ywanie podkre¶leñ
+ ITALICS Sets if the bot kicks italics
Aby uzyskaæ wiêcej informacji wpisz:
%R%S HELP KICK opcja
@@ -7171,6 +7191,16 @@ BOT_HELP_KICK_BADWORDS
zostanie wykopany zanim bot za³o¿y bana.
Pominiêcie parametru ttb wy³±cza banowanie.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Sk³adnia: BADWORDS kana³ ADD s³owo [SINGLE | START | END]
BADWORDS kana³ DEL {s³owo | numer-wpisu | lista}
diff --git a/lang/pt.l b/lang/pt.l
index cd7dde9cb..250fed2ea 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2076,6 +2076,8 @@ BOT_REASON_REVERSE
Por favor não use reversos no canal!
BOT_REASON_UNDERLINE
Não use sublinhados neste canal!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2206,6 +2208,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Kick por sublinhado: %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Kick por sublinhado: %s (%d kick(s) para banir)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
ativado
BOT_INFO_INACTIVE
@@ -2365,6 +2371,13 @@ BOT_KICK_UNDERLINES_ON_BAN
kicks no mesmo usuário.
BOT_KICK_UNDERLINES_OFF
O bot não irá mais kickar por sublinhados.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -5965,6 +5978,7 @@ BOT_HELP_KICK
REPEAT Selecione para o bot kickar por repetição
REVERSES Selecione para o bot kickar por reversos
UNDERLINES Selecione para o bot kickar por sublinhado
+ ITALICS Sets if the bot kicks italics
Digite %R%S HELP KICK opção para maiores informações
sobre uma opção específica.
@@ -6066,6 +6080,16 @@ BOT_HELP_KICK_BADWORDS
ttb é o número de vezes que o usuário será kickado
antes de ser banido. Não forneça ttb para desabilitar
o sistema de ban que foi uma vez ativado.
+
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
BOT_HELP_BADWORDS
Sintaxe: BADWORDS canal ADD palavra [SINGLE | START | END]
diff --git a/lang/ru.l b/lang/ru.l
index ed5523572..a4e1ec86a 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2053,6 +2053,8 @@ BOT_REASON_REVERSE
Èñïîëüçîâàíèå èíâåðñèè ó íàñ òóò íå ïðèâåòñòâóåòñÿ!
BOT_REASON_UNDERLINE
Èñïîëüçîâàíèå ïîä÷åðêèâàíèé ó íàñ òóò íå ïðèâåòñòâóåòñÿ!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2182,6 +2184,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Öåíçîð ïîä÷åðêèâàíèé.: %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Öåíçîð ïîä÷åðêèâàíèé.: %s (%d êèêîâ äî áàíà)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
âêëþ÷åí
BOT_INFO_INACTIVE
@@ -2343,6 +2349,13 @@ BOT_KICK_UNDERLINES_ON_BAN
Äîïîëíèòåëüíî, ïîñëå %d ïðåäóïðåæäàþùèõ êèêîâ, áîò çàáàíèò íàðóøèòåëÿ.
BOT_KICK_UNDERLINES_OFF
Ðåæèì êèêà çà èñïîëüçîâàíèå ïîä÷åðêíóòîãî òåêñòà îòêëþ÷åí.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6172,6 +6185,7 @@ BOT_HELP_KICK
èíâåðñíîãî òåêñòà
UNDERLINES íàñòðîéêà óñëîâèÿ êèêà çà ÷ðåçìåðíîå èñïîëüçîâàíèå
ïîä÷åðêèâàíèé
+ ITALICS Sets if the bot kicks italics
Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè î êîíêðåòíîé îïöèè âîñïîëüçóéòåñü
êîìàíäîé %R%S HELP KICK îïöèÿ.
@@ -6268,6 +6282,16 @@ BOT_HELP_KICK_FLOOD
ïîñòàâèò áàí. Óêàæèòå âìåñòî ïîëîæèòåëüíîãî ÷èñëà çíà÷åíèå "0" èëè
"-" åñëè íå õîòèòå ÷òîáû áîò áàíèë íàðóøèòåëÿ.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_KICK_REPEAT
Ñèíòàêñèñ: KICK #êàíàë REPEAT {ON|OFF} [ttb [÷èñëî_ïîâòîðîâ]]
diff --git a/lang/tr.l b/lang/tr.l
index bc27676ae..992649ee5 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2115,6 +2115,8 @@ BOT_REASON_REVERSE
Lütfen bu kanalda Ctrl+R ile yazýlmýþ yazý kullanmayýn!
BOT_REASON_UNDERLINE
Lütfen bu kanalda altý çizili yazý kullanmayýn!
+BOT_REASON_ITALIC
+ Don't use italics on this channel!
# !seen replies
BOT_SEEN_BOT
@@ -2244,6 +2246,10 @@ BOT_INFO_CHAN_KICK_UNDERLINES
Altýçizili yazýda atma : %s
BOT_INFO_CHAN_KICK_UNDERLINES_BAN
Altýçizili yazýda atma : %s (%d tanede ban)
+BOT_INFO_CHAN_KICK_ITALICS
+ Italics kicker : %s
+BOT_INFO_CHAN_KICK_ITALICS_BAN
+ Italics kicker : %s (%d kick(s) to ban)
BOT_INFO_ACTIVE
Aktif
BOT_INFO_INACTIVE
@@ -2402,6 +2408,13 @@ BOT_KICK_UNDERLINES_ON_BAN
sonrasýnda ayný kullanýcýyý banlayacak.
BOT_KICK_UNDERLINES_OFF
Bot artýk altýçizili yazýda atmayacak.
+BOT_KICK_ITALICS_ON
+ Bot will now kick italics.
+BOT_KICK_ITALICS_ON_BAN
+ Bot will now kick italics, and will place a ban after %d
+ kicks for the same user.
+BOT_KICK_ITALICS_OFF
+ Bot won't kick italics anymore.
# BADWORDS messages
BOT_BADWORDS_SYNTAX
@@ -6082,6 +6095,7 @@ BOT_HELP_KICK
REPEAT Kendini tekrar edenleri atar
REVERSES Ctrl+r nin kullanýlmasýnda atar
UNDERLINES Altýçizgili yazýda atar
+ ITALICS Sets if the bot kicks italics
Belirli bir özellik hakkýnda daha fazla bilgi için
%R%S HELP KICK özellik yazýn.
@@ -6177,6 +6191,16 @@ BOT_HELP_KICK_BADWORDS
böas banlamadan önce kiþinin kaç kez atýlacaðýný
belirler. Kaldýrmak için komutta böas ý belirtmeyin.
+BOT_HELP_KICK_ITALICS
+ Syntax: KICK channel ITALICS {ON|OFF} [ttb]
+
+ Sets the italics kicker on or off. When enabled, this
+ option tells the bot to kick users who use italics.
+
+ ttb is the number of times a user can be kicked
+ before it get banned. Don't give ttb to disable
+ the ban system once activated.
+
BOT_HELP_BADWORDS
Kullanýmý: BADWORDS kanaladý ADD kelime [SINGLE | START | END]
BADWORDS kanaladý DEL {kelime | kayýt-no | liste}
diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp
index 2f1dafb81..e03768759 100644
--- a/modules/core/bs_info.cpp
+++ b/modules/core/bs_info.cpp
@@ -157,7 +157,16 @@ class CommandBSInfo : public Command
}
else
notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_INACTIVE));
-
+ if (ci->botflags.HasFlag(BS_KICK_ITALICS))
+ {
+ if (ci->ttb[TTB_ITALICS])
+ notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_ITALICS]);
+ else
+ notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS, getstring(u, BOT_INFO_ACTIVE));
+ }
+ else
+ notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS, getstring(u, BOT_INFO_INACTIVE));
+
end = buf;
*end = 0;
if (ci->botflags.HasFlag(BS_DONTKICKOPS))
diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp
index cb0253874..6a4528b7e 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/core/bs_kick.cpp
@@ -331,6 +331,36 @@ class CommandBSKick : public Command
notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_OFF);
}
}
+ else if (option.equals_ci("ITALICS"))
+ {
+ if (value.equals_ci("ON"))
+ {
+ if (!ttb.empty())
+ {
+ Anope::string error;
+ ci->ttb[TTB_ITALICS] = convertTo<int16>(ttb, error, false);
+ if (!error.empty() || ci->ttb[TTB_ITALICS] < 0)
+ {
+ Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS];
+ ci->ttb[TTB_ITALICS] = 0;
+ notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str());
+ return MOD_CONT;
+ }
+ }
+ else
+ ci->ttb[TTB_ITALICS] = 0;
+ ci->botflags.SetFlag(BS_KICK_ITALICS);
+ if (ci->ttb[TTB_ITALICS])
+ notice_lang(Config.s_BotServ, u, BOT_KICK_ITALICS_ON_BAN, ci->ttb[TTB_ITALICS]);
+ else
+ notice_lang(Config.s_BotServ, u, BOT_KICK_ITALICS_ON);
+ }
+ else
+ {
+ ci->botflags.UnsetFlag(BS_KICK_ITALICS);
+ notice_lang(Config.s_BotServ, u, BOT_KICK_ITALICS_OFF);
+ }
+ }
else
notice_help(Config.s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str());
}
@@ -357,6 +387,8 @@ class CommandBSKick : public Command
notice_help(Config.s_BotServ, u, BOT_HELP_KICK_REVERSES);
else if (subcommand.equals_ci("UNDERLINES"))
notice_help(Config.s_BotServ, u, BOT_HELP_KICK_UNDERLINES);
+ else if (subcommand.equals_ci("ITALICS"))
+ notice_help(Config.s_BotServ, u, BOT_HELP_KICK_ITALICS);
else
return false;
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index 84e569f9a..87653ba59 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -329,6 +329,7 @@ BotFlagInfo BotFlags[] = {
{"KICK_CAPS", BS_KICK_CAPS},
{"KICK_FLOOD", BS_KICK_FLOOD},
{"KICK_REPEAT", BS_KICK_REPEAT},
+ {"KICK_ITALICS", BS_KICK_ITALICS},
{"", static_cast<BotServFlag>(-1)}
};
@@ -830,6 +831,8 @@ class DBPlain : public Module
ci->ttb[6] = params[j + 1].is_number_only() ? convertTo<int16>(params[j + 1]) : 0;
else if (params[j].equals_ci("REPEAT"))
ci->ttb[7] = params[j + 1].is_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+ else if (params[j].equals_ci("ITALICS"))
+ ci->ttb[8] = params[j + 1].is_number_only() ? convertTo<int16>(params[j + 1]) : 0;
}
}
else if (params[0].equals_ci("CAPSMIN"))
@@ -1078,7 +1081,7 @@ class DBPlain : public Module
db << " " << BotFlags[j].Name;
db << endl;
}
- db << "MD BI TTB BOLDS " << ci->ttb[0] << " COLORS " << ci->ttb[1] << " REVERSES " << ci->ttb[2] << " UNDERLINES " << ci->ttb[3] << " BADWORDS " << ci->ttb[4] << " CAPS " << ci->ttb[5] << " FLOOD " << ci->ttb[6] << " REPEAT " << ci->ttb[7] << endl;
+ db << "MD BI TTB BOLDS " << ci->ttb[0] << " COLORS " << ci->ttb[1] << " REVERSES " << ci->ttb[2] << " UNDERLINES " << ci->ttb[3] << " BADWORDS " << ci->ttb[4] << " CAPS " << ci->ttb[5] << " FLOOD " << ci->ttb[6] << " REPEAT " << ci->ttb[7] << " ITALICS " << ci->ttb[8] << endl;
if (ci->capsmin)
db << "MD BI CAPSMIN " << ci->capsmin << endl;
if (ci->capspercent)
diff --git a/modules/extra/mysql/db_mysql.h b/modules/extra/mysql/db_mysql.h
index fcad2f24c..011c2647d 100644
--- a/modules/extra/mysql/db_mysql.h
+++ b/modules/extra/mysql/db_mysql.h
@@ -63,6 +63,7 @@ BotFlagInfo BotFlags[] = {
{"KICK_CAPS", BS_KICK_CAPS},
{"KICK_FLOOD", BS_KICK_FLOOD},
{"KICK_REPEAT", BS_KICK_REPEAT},
+ {"KICK_ITALICS", BS_KICK_ITALICS},
{"", static_cast<BotServFlag>(-1)}
};
diff --git a/src/botserv.cpp b/src/botserv.cpp
index ae62e7e69..321060f29 100644
--- a/src/botserv.cpp
+++ b/src/botserv.cpp
@@ -163,6 +163,14 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
bot_kick(ci, u, BOT_REASON_REVERSE);
return;
}
+
+ /* Italics kicker */
+ if (ci->botflags.HasFlag(BS_KICK_ITALICS) && realbuf.find(29) != Anope::string::npos)
+ {
+ check_ban(ci, u, TTB_ITALICS);
+ bot_kick(ci, u, BOT_REASON_ITALIC);
+ return;
+ }
/* Underlines kicker */
if (ci->botflags.HasFlag(BS_KICK_UNDERLINES) && realbuf.find(31) != Anope::string::npos)
@@ -695,6 +703,9 @@ Anope::string normalizeBuffer(const Anope::string &buf)
/* Underline ctrl char */
case 31:
break;
+ /* Italic ctrl char */
+ case 29:
+ break;
/* A valid char gets copied into the new buffer */
default:
newbuf += buf[i];