added bans & kicks to cmd_addban

[NeonServV5.git] / bot_NeonServ.c

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index 54fae6ff4d396246d8e08bb23243268397d29832..5920dc239655bcd9a407e59495ad9bc07c7bdc33 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -13,6 +13,7 @@
 #include "WHOHandler.h"
 #include "DBHelper.h"
 #include "tools.h"
+#include "timeq.h"
 
 #define BOTID 1
 
@@ -36,6 +37,7 @@ static const struct default_language_entry msgtab[] = {
     {"NS_USER_PROTECTED", "Sorry, \002%s\002 is protected."},
     {"NS_SERVICE_IMMUNE", "\002%s\002 may not be kicked, killed, banned, or deopped."},
     {"NS_TABLE_NONE", "   None"},
+    {"NS_BAN_ALREADY_ADDED", "\002%s\002 is already banned in %s."},
     {"NS_INVALID_ACCESS_RANGE", "Invalid access range; minimum (%d) must be lower than maximum (%d)."},
     {"NS_CLVL_DONE", "%s now has access \002%d\002 in %s."},
     {"NS_A_LACKS_ACCESS_BUT_GOD_NICK", "%s lacks access to %s but has \002security override\002 enabled."},
@@ -101,7 +103,25 @@ static const struct default_language_entry msgtab[] = {
     {"NS_KICK_FAIL", "\002%s\002 could not kick some of the nicks you provided."},
     {"NS_KICKBAN_DONE", "KickBanned \002%d\002 users from %s"},
     {"NS_KICKBAN_FAIL", "\002%s\002 could not kickban some of the nicks you provided."},
+    {"NS_BAN_DONE", "\002%d\002 masks added to the %s ban list. (matching %d users)"},
+    {"NS_BAN_FAIL", "\002%s\002 could not kickban some of the nicks you provided."},
     {"NS_LAME_MASK", "\002%s\002 is a little too general. Try making it more specific."},
+    {"NS_SET_HEADER", "Channel Settings for %s:"},
+    {"NS_SET_ON", "on"},
+    {"NS_SET_OFF", "off"},
+    {"NS_SET_UNKNOWN_SETTING", "\002%s\002 is an unknown channel setting."},
+    {"NS_SET_CANNOT_SET", "That setting is above your current level, so you cannot change it."},
+    {"NS_SET_BADLEVEL", "You cannot change any setting to above your level."},
+    {"NS_SET_INVALID_OPTION", "\002%s\002 is not a valid choice.  Choose one:"},
+    {"NS_SET_INVALID_BOOLEAN", "\002%s\002 is an invalid binary value."},
+    {"NS_SET_DEFAULTS_OWNER", "You must have access 500 in %s to reset it to the default options."},
+    {"NS_SET_DEFAULTS_CODE", "To reset %s's settings to the defaults, you must use 'set defaults %s'."},
+    {"NS_SET_DEFAULTS_DONE", "All settings for %s have been reset to default values."},
+    {"NS_SET_TRIGGER_OWNER", "You must have access 500 in %s to change the channel trigger."},
+    {"NS_WIPEINFO_DONE", "Removed \002%s\002's infoline in \002%s\002."},
+    {"NS_TRACE_HEADER", "The following users were found:"},
+    {"NS_TRACE_FOUND", "Found \002%d\002 matches."},
+    {"NS_ADDBAN_DONE", "\002%s\002 permantly added to the %s ban list. (matching %d users)"},
     {NULL, NULL}
 };
 
@@ -134,14 +154,14 @@ INCLUDE ALL CMD's HERE
 //#include "cmd_neonserv_uset.c"
 #include "cmd_neonserv_kick.c"
 #include "cmd_neonserv_kickban.c"
-//#include "cmd_neonserv_ban.c"
+#include "cmd_neonserv_ban.c"
 //#include "cmd_neonserv_unban.c"
 //#include "cmd_neonserv_unbanall.c"
 //#include "cmd_neonserv_unbanme.c"
 #include "cmd_neonserv_suspend.c"
 #include "cmd_neonserv_unsuspend.c"
-//#include "cmd_neonserv_wipeinfo.c"
-//#include "cmd_neonserv_addban.c"
+#include "cmd_neonserv_wipeinfo.c"
+#include "cmd_neonserv_addban.c"
 //#include "cmd_neonserv_addtimeban.c"
 //#include "cmd_neonserv_delban.c"
 //#include "cmd_neonserv_banlist.c"
@@ -152,7 +172,7 @@ INCLUDE ALL CMD's HERE
 //#include "cmd_neonserv_info.c"
 //#include "cmd_neonserv_netinfo.c"
 //#include "cmd_neonserv_peek.c"
-#include "cmd_neonserv_set.c"
+#include "cmd_neonserv_set.c" /* TODO: parse, check and set modelock */
 //#include "cmd_neonserv_events.c"
 //#include "cmd_neonserv_resync.c"
 //#include "cmd_neonserv_help.c"
@@ -175,7 +195,7 @@ INCLUDE ALL CMD's HERE
 //#include "cmd_neonserv_move.c"
 //#include "cmd_neonserv_dnrsearch.c"
 //#include "cmd_neonserv_search.c"
-//#include "cmd_neonserv_trace.c"
+#include "cmd_neonserv_trace.c"
 //#include "cmd_neonserv_say.c"
 //#include "cmd_neonserv_emote.c"
 //#include "cmd_neonserv_notice.c"
@@ -281,6 +301,12 @@ void init_NeonServ() {
     register_command(BOTID, "set",          neonserv_cmd_set,       0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_setters",     0);
     register_command(BOTID, "kick",         neonserv_cmd_kick,      1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_cankick",     0);
     register_command(BOTID, "kickban",      neonserv_cmd_kickban,   1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_cankick,#channel_canban", 0);
+    register_command(BOTID, "ban",          neonserv_cmd_ban,       1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canban",      0);
+    register_command(BOTID, "wipeinfo",     neonserv_cmd_wipeinfo,  1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_wipeinfo",    0);
+    register_command(BOTID, "addban",       neonserv_cmd_addban,    1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_staticban",   0);
+    
+    register_command(BOTID, "trace",        neonserv_cmd_trace,     1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   400);
+    
     
     start_bots();
     bind_bot_ready(neonserv_bot_ready);