X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=f81228eb0735933e771b72131b99b1c7bd1d51e9;hb=4276c6c55cd57154d8a2c680e88fdea81a8c6e58;hp=e5c2ed1ae4b73e7f49321b0033e7479fe266d14c;hpb=95fed4deda0319bee515e44ceec0c77061a2c04e;p=NeonServV5.git

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index e5c2ed1..f81228e 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -1,4 +1,4 @@
-/* bot_NeonServ.c - NeonServ v5.0
+/* bot_NeonServ.c - NeonServ v5.1
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -105,6 +105,7 @@ static const struct default_language_entry msgtab[] = {
     {"NS_MDELUSER_DONE", "Deleted $b%d$b account(s) matching $b%s$b with access from $b%d$b to $b%d$b from the %s user list."}, /* {ARGS: 10, "Test*", 1, 200, "#TestChan"} */
     {"NS_TRIM_DURATION_TOO_SHORT", "You must include a minimum inactivity duration of at least %d seconds to trim."},
     {"NS_TRIM_DONE", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s."}, /* {ARGS: 10, 1, 100, "#TestChan", "10 days"} */
+    {"NS_TRIM_BAN_DONE", "Trimmed $b%d bans$b from the %s ban list who were banned 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 $b%s$b to someone else."}, /* {ARGS: "5 hours", "#TestChan"} */
     {"NS_GIVEOWNER_CONFIRM", "To really give ownership to $b%1$s$b, you must use 'giveownership *%1$s %2$s'."}, /* {ARGS: "TestUser", "abc123"} */
@@ -129,6 +130,7 @@ static const struct default_language_entry msgtab[] = {
     {"NS_BAN_DONE", "$b%d$b masks added to the %s ban list. (matching %d users)"}, /* {ARGS: 5, "#TestChan", 15} */
     {"NS_BAN_FAIL", "$b%s$b could not ban some of the nicks you provided."}, /* {ARGS: "NeonServ"} */
     {"NS_LAME_MASK", "$b%s$b is a little too general. Try making it more specific."}, /* {ARGS: "*!*@*"} */
+    {"NS_LAME_MASK_WARNING", "$k4WARNING$k: $b%s$b is very general. (matches %d users)"},
     {"NS_SET_HEADER", "Channel Settings for %s:"}, /* {ARGS: "#TestChan"} */
     {"NS_SET_ON", "on"},
     {"NS_SET_OFF", "off"},
@@ -295,14 +297,26 @@ static const struct default_language_entry msgtab[] = {
     {"NS_SETRANK_UNKNOWN_SETTING", "$b%s$b is an unknown support rank setting."},  /* {ARGS: "moep"} */
     {"NS_SETRANK_ORDER_INVALID", "%d is an invalid numeric value. (valid: 1-99)"},  /* {ARGS: 100} */
     {"NS_ASSIGNRANK_DONE", "$b%s$b is now ranked as '$b%s$b'."},  /* {ARGS: "TestUser", "Supporter"} */
+    {"NS_INFO_HEADER", "$b%s$b Information:"},
+    {"NS_INFO_DEFAULTTOPIC", "Default Topic:"},
+    {"NS_INFO_MODELOCK", "Mode Lock:"},
+    {"NS_INFO_RECORD", "Record Visitors:"},
+    {"NS_INFO_OWNER", "Owner:"},
+    {"NS_INFO_USERS", "Total User Count:"},
+    {"NS_INFO_BANS", "Ban Count:"},
+    {"NS_INFO_VISITED", "Visited:"},
+    {"NS_INFO_REGISTERED", "Registered:"},
+    {"NS_INFO_REGISTRAR", "Registered by:"},
+    {"NS_INFO_OWNERLOG", "Ownership transfer history for $b%s$b:"},
+    {"NS_INFO_OWNERCHANGE", " from %s to %s on %s"},
+    {"NS_RENAME_DONE", "Renamed $b%s$b to $b%s$b."},
+    {"NS_RENAME_FAIL", "Failed renaming $b%s$b."},
     {NULL, NULL}
 };
 
-/* TODO: 
-trim bans
+/* TODO:
 cmd_neonserv_open.c
-cmd_neonserv_info.c
-parse, check and set modelock
+set modelock
 cmd_neonserv_modcmd.c
 cmd_neonserv_allowregister.c
 cmd_neonserv_noregister.c
@@ -310,7 +324,6 @@ cmd_neonserv_expire.c
 cmd_neonserv_unvisited.c
 cmd_neonserv_merge.c
 cmd_neonserv_dnrsearch.c
-cmd_neonserv_rename.c
 cmd_neonserv_iplocate.c
 cmd_neonserv_calc.c
 */
@@ -318,8 +331,8 @@ cmd_neonserv_calc.c
 #include "event_neonserv_join.c"
 #include "event_neonserv_part.c"
 #include "event_neonserv_quit.c"
-//#include "event_neonserv_kick.c"
-//#include "event_neonserv_mode.c"
+#include "event_neonserv_kick.c"
+#include "event_neonserv_mode.c"
 #include "event_neonserv_ctcp.c"
 #include "event_neonserv_notice.c"
 #include "event_neonserv_invite.c"
@@ -364,7 +377,13 @@ static void neonserv_bot_ready(struct ClientSocket *client) {
 }
 
 static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
-    strcpy(trigger, "+");
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    loadChannelSettings(chan);
+    printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
+    res = mysql_use();
+    row = mysql_fetch_row(res);
+    strcpy(trigger, (strlen(row[0]) ? row[0] : "+"));
 }
 
 static void start_bots() {
@@ -489,6 +508,7 @@ void init_NeonServ() {
     USER_COMMAND("help",         neonserv_cmd_help,      0, NULL,                   0);
     USER_COMMAND("events",       neonserv_cmd_events,    0, "1",                    CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
     USER_COMMAND("command",      neonserv_cmd_command,   1, NULL,                   0);
+    USER_COMMAND("info",         neonserv_cmd_info,      0, NULL,                   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN);
     #undef USER_COMMAND
     
     #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(BOTID, NAME, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS)
@@ -515,7 +535,9 @@ void init_NeonServ() {
     OPER_COMMAND("delrank",      neonserv_cmd_delrank,   1,     1000, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     OPER_COMMAND("setrank",      neonserv_cmd_setrank,   1,     1000, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     OPER_COMMAND("assignrank",   neonserv_cmd_assignrank,2,     1000, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
-    OPER_COMMAND("listrank",     neonserv_cmd_listrank,  0,     1000, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
+    OPER_COMMAND("listrank",     neonserv_cmd_listrank,  0,     1,    CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
+    OPER_COMMAND("rename",       neonserv_cmd_rename,    2,     300,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
+    OPER_COMMAND("unvisited",    neonserv_cmd_unvisited, 0,     400,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     #undef OPER_COMMAND
     
     start_bots();
@@ -530,6 +552,8 @@ void init_NeonServ() {
     bind_channotice(neonserv_event_channotice);
     bind_topic(neonserv_event_topic);
     bind_invite(neonserv_event_invite);
+    bind_mode(neonserv_event_mode);
+    bind_kick(neonserv_event_kick);
     
     set_trigger_callback(BOTID, neonserv_trigger_callback);