fixed last commit

[NeonServV5.git] / bot_NeonServ.c

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index e640f0f148fc239bf54d56c9b9dd03ea73364970..e74a890d3b14b4d94311538b16b026462fecce50 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -32,7 +32,9 @@ static const struct default_language_entry msgtab[] = {
     {"NS_ACCESS_OUTRANKED", "You cannot give users access greater than or equal to your own."},
     {"NS_USER_OUTRANKED", "\002%s\002 outranks you (command has no effect)."},
     {"NS_ACCESS_DENIED", "Access denied."},
+    {"NS_NO_ACCESS", "You lack sufficient access to use this command."},
     {"NS_TABLE_NONE", "   None"},
+    {"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."},
     {"NS_A_LACKS_ACCESS_BUT_GOD_AUTH", "%s (%s) lacks access to %s but has \002security override\002 enabled."},
@@ -73,6 +75,13 @@ static const struct default_language_entry msgtab[] = {
     {"NS_UP_ALREADY_OP", "You are already opped in \002%s\002."},
     {"NS_UP_ALREADY_VOICE", "You are already voiced in \002%s\002."},
     {"NS_DOWN_ALREADY", "You are not opped or voiced in \002%s\002."},
+    {"NS_MDELUSER_DONE", "Deleted \002%d\002 account(s) matching \002%s\002 with access from \002%d\002 to \002%d\002 from the %s user list."},
+    {"NS_TRIM_DURATION_TOO_SHORT", "You must include a minimum inactivity duration of at least %d seconds to trim."},
+    {"NS_TRIM_DONE", "Trimmed \002%d users\002 with access from %d to %d from the %s user list who were inactive for at least %s."},
+    {"NS_GIVEOWNER_SELF", "You cannot give ownership to your own account."},
+    {"NS_GIVEOWNER_TIMEOUT", "You must wait %s before you can give ownership of \002%s\002 to someone else."},
+    {"NS_GIVEOWNER_CONFIRM", "To really give ownership to \002%1$s\002, you must use 'giveownership *%1$s %2$s'."},
+    {"NS_GIVEOWNER_DONE", "Ownership of \002%s\002 has been transferred to account \002%s\002."},
     {NULL, NULL}
 };
 
@@ -86,14 +95,14 @@ INCLUDE ALL CMD's HERE
 #include "cmd_neonserv_clvl.c"
 #include "cmd_neonserv_deluser.c"
 #include "cmd_neonserv_delme.c"
-//#include "cmd_neonserv_mdeluser.c"
-//#include "cmd_neonserv_trim.c"
-//#include "cmd_neonserv_giveownership.c"
+#include "cmd_neonserv_mdeluser.c"
+#include "cmd_neonserv_trim.c"  /* TODO: trim bans */
+#include "cmd_neonserv_giveowner.c"
 #include "cmd_neonserv_users.c"
 #include "cmd_neonserv_up.c"
 #include "cmd_neonserv_down.c"
-//#include "cmd_neonserv_upall.c"
-//#include "cmd_neonserv_downall.c"
+#include "cmd_neonserv_upall.c"
+#include "cmd_neonserv_downall.c"
 //#include "cmd_neonserv_op.c"
 //#include "cmd_neonserv_opall.c"
 //#include "cmd_neonserv_deop.c"
@@ -179,7 +188,7 @@ static void neonserv_bot_ready(struct ClientSocket *client) {
 }
 
 static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
-    strcpy(trigger, "!");
+    strcpy(trigger, "+");
 }
 
 static void start_bots() {
@@ -233,6 +242,11 @@ void init_NeonServ() {
     register_command(BOTID, "myaccess",     neonserv_cmd_myaccess,  0, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
     register_command(BOTID, "up",           neonserv_cmd_up,        0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN);
     register_command(BOTID, "down",         neonserv_cmd_down,      0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN);
+    register_command(BOTID, "upall",        neonserv_cmd_upall,     0, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
+    register_command(BOTID, "downall",      neonserv_cmd_downall,   0, 0);
+    register_command(BOTID, "mdeluser",     neonserv_cmd_mdeluser,  2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
+    register_command(BOTID, "trim",         neonserv_cmd_trim,      2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
+    register_command(BOTID, "giveowner",    neonserv_cmd_giveowner, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
     
     start_bots();
     bind_bot_ready(neonserv_bot_ready);