added some code & compiler information to cmd_netinfo
[NeonServV5.git] / bot_NeonServ.c
index feb16168bd36386698c12d3aa7156055336a136f..27c9d6c16683a3ac0978c910f7af0a5079cdb9f0 100644 (file)
@@ -13,6 +13,8 @@
 #include "WHOHandler.h"
 #include "DBHelper.h"
 #include "tools.h"
+#include "timeq.h"
+#include "version.h"
 
 #define BOTID 1
 
@@ -25,10 +27,20 @@ static const struct default_language_entry msgtab[] = {
     {"NS_ADDUSER_ALREADY_ADDED", "%s is already on the \002%s\002 user list (with access %d)."},
     {"NS_ADDUSER_DONE", "Added %s to the %s user list with access %d."},
     {"NS_NOT_ON_USERLIST", "%s lacks access to \002%s\002."},
+    {"NS_NOT_ON_USERLIST_YOU", "You lack access to \002%s\002."},
+    {"NS_NOT_ON_CHANNEL", "%s isn't currently in \002%s\002."},
+    {"NS_NOT_ON_CHANNEL_YOU", "You aren't currently in \002%s\002."},
     {"NS_DELUSER_DONE", "Deleted %s (with access %d) from the %s user list."},
     {"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_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_TABLE_COUNT", "Found \002%d\002 matches."},
+    {"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."},
     {"NS_A_LACKS_ACCESS_BUT_GOD_AUTH", "%s (%s) lacks access to %s but has \002security override\002 enabled."},
@@ -37,19 +49,187 @@ static const struct default_language_entry msgtab[] = {
     {"NS_A_ACCESS_NICK_GOD", "%s has access \002%d\002 in %s and has \002security override\002 enabled."},
     {"NS_A_ACCESS_AUTH_GOD", "%s (%s) has access \002%d\002 in %s and has \002security override\002 enabled."},
     {"NS_A_SUSPENDED", "\002%s\002's access to %s has been suspended."},
-    {"NS_A_IS_IRCOP", "%s is an \002IRC operator\002." },
+    {"NS_A_IS_IRCOP", "%s is an \002IRC operator\002."},
+    {"NS_USERS_HEADER", "%s users from level %d to %d:"},
+    {"NS_USERS_HEADER_MATCH", "%s users from level %d to %d matching %s:"},
+    {"NS_USERS_HEADER_ACCESS", "Access"},
+    {"NS_USERS_HEADER_ACCOUNT", "Accout"},
+    {"NS_USERS_HEADER_SEEN", "Last Seen"},
+    {"NS_USERS_HEADER_STATE", "Status"},
+    {"NS_USERS_COUNT", "There are \002%d\002 users in %s."},
+    {"NS_USERS_COUNT_1", "There is \002%d\002 user in %s."},
+    {"NS_USERS_COUNT_MATCH", "There are \002%d\002 users in %s. (\002%d\002 matching your request)"},
+    {"NS_USERS_COUNT_MATCH_1", "There is \002%d\002 user in %s. (\002%d\002 matching your request)"},
+    {"NS_USERS_SEEN_HERE", "Here"},
+    {"NS_USERS_SEEN_NEVER", "Never"},
+    {"NS_USERS_STATE_SUSPENDED", "Suspended"},
+    {"NS_USERS_STATE_NORMAL", "Normal"},
+    {"NS_SUSPEND_ALREADY", "\002%s\002 is already suspended." },
+    {"NS_SUSPEND_NOT", "\002%s\002 is not suspended." },
+    {"NS_SUSPEND_DONE", "\002%s\002's access to \002%s\002 has been suspended." },
+    {"NS_SUSPEND_RESTORED", "\002%s\002's access to \002%s\002 has been restored." },
+    {"NS_DELME_KEY", "To really remove yourself, you must use 'deleteme %s'."},
+    {"NS_DELME_DONE", "Your \002%d\002 access has been deleted from \002%s\002."},
+    {"NS_MYACCESS_HEADER", "Showing all channel entries for account \002%s\002:"},
+    {"NS_MYACCESS_HEADER_MATCH", "Showing all channel entries for account \002%s\002 matching %s:"},
+    {"NS_MYACCESS_HEADER_NAME", "Name"},
+    {"NS_MYACCESS_HEADER_ACCESS", "Access"},
+    {"NS_MYACCESS_HEADER_FLAGS", "Flags"},
+    {"NS_MYACCESS_HEADER_INFO", "Info"},
+    {"NS_MYACCESS_COUNT", "%s has access in \002%d\002 channel(s) and is owner of \002%d\002 channel(s)."},
+    {"NS_MYACCESS_COUNT_MATCH", "%s has access in \002%d\002 channel(s) and is owner of \002%d\002 channel(s) (\002%d\002 channels matching your request)."},
+    {"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."},
+    {"NS_OP_FAIL", "\002%s\002 could not op some of the nicks you provided."},
+    {"NS_OP_DONE", "Opped users in \002%s\002."},
+    {"NS_VOICE_FAIL", "\002%s\002 could not voice some of the nicks you provided."},
+    {"NS_VOICE_DONE", "Voiced users in \002%s\002."},
+    {"NS_DEOP_FAIL", "\002%s\002 could not deop some of the nicks you provided."},
+    {"NS_DEOP_DONE", "Deopped users in \002%s\002."},
+    {"NS_DEVOICE_FAIL", "\002%s\002 could not devoice some of the nicks you provided."},
+    {"NS_DEVOICE_DONE", "Devoiced users in \002%s\002."},
+    {"NS_OPALL_SECURITY", "\002WARNING\002: Opping all users on a channel is very insecure! If you still want do op all users on %s use: '\002opall FORCE\002 [nick mask]'"},
+    {"NS_OPALL_DONE", "Opped \002%d\002 users in %s."},
+    {"NS_VOICEALL_DONE", "Voiced \002%d\002 users in %s."},
+    {"NS_DEOPALL_DONE", "Deopped \002%d\002 users in %s."},
+    {"NS_DEVOICEALL_DONE", "Devoiced \002%d\002 users in %s."},
+    {"NS_KICK_DONE", "Kicked \002%d\002 users from %s"},
+    {"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_ADDBAN_DONE", "\002%s\002 permantly added to the %s ban list. (matching %d users)"},
+    {"NS_BANS_HEADER_MASK", "Mask"},
+    {"NS_BANS_HEADER_SETBY", "Set By"},
+    {"NS_BANS_HEADER_TRIGGERED", "Triggered"},
+    {"NS_BANS_HEADER_EXPIRES", "Expires"},
+    {"NS_BANS_HEADER_REASON", "Reason"},
+    {"NS_DELBAN_BANNED_BY", "%s is banned by %s."},
+    {"NS_DELBAN_FAIL", "Sorry, no ban found for \002%s\002."},
+    {"NS_DELBAN_DONE", "Removed \002%s\002 from the %s ban list."},
+    {"NS_NETINFO_HEADER", "\002Network information\002"},
+    {"NS_NETINFO_BOTS", "Bots:"},
+    {"NS_NETINFO_UPTIME", "Uptime:"},
+    {"NS_NETINFO_TRAFFIC", "Traffic:"},
+    {"NS_NETINFO_CACHE", "Cache:"},
+    {"NS_NETINFO_CHANNEL", "  Channel:"},
+    {"NS_NETINFO_USER", "  User:"},
+    {"NS_NETINFO_CHANUSER", "  Channel-User:"},
+    {"NS_NETINFO_VERSION", "Version:"},
+    {"NS_NETINFO_CODE", "Code:"},
+    {"NS_NETINFO_CODE_VALUE", "%s lines c code (view it at http://git.pk910.de/?p=NeonServV5.git;a=summary)"},
+    {"NS_NETINFO_COMPILER", "Compiler:"},
+    {"NS_NETINFO_COMPILER_VALUE", "%s  (%s)"},
+    
     {NULL, NULL}
 };
 
 /*
 INCLUDE ALL CMD's HERE
 */
-#include "cmd_neonserv_users.c"
-#include "cmd_neonserv_modes.c"
+//USER CMD's
+#include "cmd_neonserv_a.c"
+#include "cmd_neonserv_myaccess.c"
 #include "cmd_neonserv_adduser.c"
-#include "cmd_neonserv_deluser.c"
 #include "cmd_neonserv_clvl.c"
-#include "cmd_neonserv_a.c"
+#include "cmd_neonserv_deluser.c"
+#include "cmd_neonserv_delme.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_op.c"
+#include "cmd_neonserv_opall.c"
+#include "cmd_neonserv_deop.c"
+#include "cmd_neonserv_deopall.c"
+#include "cmd_neonserv_voice.c"
+#include "cmd_neonserv_voiceall.c"
+#include "cmd_neonserv_devoice.c"
+#include "cmd_neonserv_devoiceall.c"
+//#include "cmd_neonserv_uset.c"
+#include "cmd_neonserv_kick.c"
+#include "cmd_neonserv_kickban.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_addtimeban.c"
+#include "cmd_neonserv_delban.c"
+#include "cmd_neonserv_bans.c"
+//#include "cmd_neonserv_open.c"
+//#include "cmd_neonserv_topic.c"
+//#include "cmd_neonserv_mode.c"
+//#include "cmd_neonserv_invite.c"
+//#include "cmd_neonserv_info.c"
+#include "cmd_neonserv_netinfo.c"
+//#include "cmd_neonserv_peek.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"
+//#include "cmd_neonserv_version.c"
+
+//OPER CMD's
+//#include "cmd_neonserv_bind.c"
+//#include "cmd_neonserv_unbind.c"
+//#include "cmd_neonserv_modcmd.c"
+//#include "cmd_neonserv_register.c"
+//#include "cmd_neonserv_unregister.c"
+//#include "cmd_neonserv_allowregister.c"
+//#include "cmd_neonserv_noregister.c"
+//#include "cmd_neonserv_god.c"
+//#include "cmd_neonserv_expire.c"
+//#include "cmd_neonserv_csuspend.c"
+//#include "cmd_neonserv_cunsuspend.c"
+//#include "cmd_neonserv_unvisited.c"
+//#include "cmd_neonserv_merge.c"
+//#include "cmd_neonserv_move.c"
+//#include "cmd_neonserv_dnrsearch.c"
+//#include "cmd_neonserv_search.c"
+#include "cmd_neonserv_trace.c"
+//#include "cmd_neonserv_say.c"
+//#include "cmd_neonserv_emote.c"
+//#include "cmd_neonserv_notice.c"
+//#include "cmd_neonserv_raw.c"
+
+//HARDCODED FUN CMD's
+//#include "cmd_neonserv_iplocate.c"
+//#include "cmd_neonserv_calc.c"
+
+//DEBUG
+#include "cmd_neonserv_modes.c"
 
 static void neonserv_bot_ready(struct ClientSocket *client) {
     MYSQL_RES *res;
@@ -71,7 +251,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() {
@@ -94,15 +274,18 @@ static void start_bots() {
         client->botid = BOTID;
         client->clientid = atoi(row[7]);
         connect_socket(client);
-        printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access` FROM `bot_binds` WHERE `botid` = '%d'", client->clientid);
+        printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botid` = '%d'", client->clientid);
         res2 = mysql_use();
         while ((row = mysql_fetch_row(res2)) != NULL) {
             if(bind_cmd_to_command(BOTID, row[0], row[1])) {
                 if(row[2] && strcmp(row[2], "")) {
                     bind_set_parameters(BOTID, row[0], row[2]);
                 }
-                if(atoi(row[3]) > 0) {
-                    bind_set_gaccess(BOTID, row[0], atoi(row[3]));
+                if(row[3]) {
+                    bind_set_global_access(BOTID, row[0], atoi(row[3]));
+                }
+                if(row[4]) {
+                    bind_set_channel_access(BOTID, row[0], row[4]);
                 }
             }
         }
@@ -112,13 +295,44 @@ static void start_bots() {
 void init_NeonServ() {
     check_mysql();
     
-    register_command(BOTID, "users", neonserv_cmd_users, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REQUIRE_AUTH);
-    register_command(BOTID, "modes", neonserv_cmd_modes, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
+    register_command(BOTID, "modes", neonserv_cmd_modes, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, NULL, 0);
+    
+    register_command(BOTID, "adduser",      neonserv_cmd_adduser,   2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canadd",      0);
+    register_command(BOTID, "deluser",      neonserv_cmd_deluser,   1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_candel",      0);
+    register_command(BOTID, "clvl",         neonserv_cmd_clvl,      2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canclvl",     0);
+    register_command(BOTID, "a",            neonserv_cmd_a,         0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN,                                              NULL,                   0);
+    register_command(BOTID, "users",        neonserv_cmd_users,     0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN,                                              NULL,                   0);
+    register_command(BOTID, "suspend",      neonserv_cmd_suspend,   1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_cansuspend",  0);
+    register_command(BOTID, "unsuspend",    neonserv_cmd_unsuspend, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_cansuspend",  0);
+    register_command(BOTID, "delme",        neonserv_cmd_delme,     0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "1",                    0);
+    register_command(BOTID, "myaccess",     neonserv_cmd_myaccess,  0, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   0);
+    register_command(BOTID, "up",           neonserv_cmd_up,        0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_CHECK_AUTH,                         "#channel_getop",       0);
+    register_command(BOTID, "down",         neonserv_cmd_down,      0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN,                                              NULL,                   0);
+    register_command(BOTID, "upall",        neonserv_cmd_upall,     0, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   0);
+    register_command(BOTID, "downall",      neonserv_cmd_downall,   0, 0,                                                                                           NULL,                   0);
+    register_command(BOTID, "mdeluser",     neonserv_cmd_mdeluser,  2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_candel",      0);
+    register_command(BOTID, "trim",         neonserv_cmd_trim,      2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  NULL,                   0);
+    register_command(BOTID, "giveowner",    neonserv_cmd_giveowner, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "500",                  0);
+    register_command(BOTID, "op",           neonserv_cmd_op,        1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canop",       0);
+    register_command(BOTID, "deop",         neonserv_cmd_deop,      1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canop",       0);
+    register_command(BOTID, "voice",        neonserv_cmd_voice,     1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canvoice",    0);
+    register_command(BOTID, "devoice",      neonserv_cmd_devoice,   1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canvoice",    0);
+    register_command(BOTID, "opall",        neonserv_cmd_opall,     0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canop",       0);
+    register_command(BOTID, "deopall",      neonserv_cmd_deopall,   0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canop",       0);
+    register_command(BOTID, "voiceall",     neonserv_cmd_voiceall,  0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canvoice",    0);
+    register_command(BOTID, "devoiceall",   neonserv_cmd_devoiceall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_canvoice",    0);
+    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, "bans",         neonserv_cmd_bans,      0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "1",                    0);
+    register_command(BOTID, "delban",       neonserv_cmd_delban,    1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_staticban",   0);
+    register_command(BOTID, "netinfo",      neonserv_cmd_netinfo,   0, 0,                                                                                           NULL,                   0);
+    
+    register_command(BOTID, "trace",        neonserv_cmd_trace,     1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   400);
     
-    register_command(BOTID, "adduser", neonserv_cmd_adduser, 2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
-    register_command(BOTID, "deluser", neonserv_cmd_deluser, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
-    register_command(BOTID, "clvl",    neonserv_cmd_clvl,    2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
-    register_command(BOTID, "a",       neonserv_cmd_a,       0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN);
     
     start_bots();
     bind_bot_ready(neonserv_bot_ready);
@@ -127,6 +341,10 @@ void init_NeonServ() {
     register_default_language_table(msgtab);
 }
 
+void loop_NeonServ() {
+    
+}
+
 void free_NeonServ() {
     
 }