X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=bot_NeonServ.c;h=71f5942d20fd5376fbf9a5db4f8e5604b5b9859a;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=a2dfa45989a8b8204dbb2260540405310781dc01;hpb=2bbd5c2270a8a9df4daa900f1afb8ee5dbd7376e;p=NeonServV5.git

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index a2dfa45..71f5942 100644
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -18,6 +18,7 @@
 #include "timeq.h"
 #include "version.h"
 #include "EventLogger.h"
+#include "cmd_neonserv.h"
 
 #define BOTID 1
 
@@ -268,98 +269,22 @@ static const struct default_language_entry msgtab[] = {
     {NULL, NULL}
 };
 
-//define some useful functions :D
-static TIMEQ_CALLBACK(channel_ban_timeout);
-static struct ClientSocket *getBotForChannel(struct ChanNode *chan);
-
-/*
-INCLUDE ALL CMD's HERE
+/* TODO: 
+trim bans
+cmd_neonserv_open.c
+cmd_neonserv_info.c
+parse, check and set modelock
+cmd_neonserv_modcmd.c
+cmd_neonserv_allowregister.c
+cmd_neonserv_noregister.c
+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
 */
-//USER CMD's
-#include "cmd_neonserv_access.c"
-#include "cmd_neonserv_myaccess.c"
-#include "cmd_neonserv_adduser.c"
-#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"  /* 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_inviteme.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_resync.c"
-#include "cmd_neonserv_help.c"
-#include "cmd_neonserv_version.c"
-#include "cmd_neonserv_chanservsync.c"
-#include "cmd_neonserv_events.c"
-#include "cmd_neonserv_command.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_recover.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"
-#include "cmd_neonserv_reloadlang.c"
-#include "cmd_neonserv_oplog.c"
-//#include "cmd_neonserv_rename.c"
-#include "cmd_neonserv_setaccess.c"
-
-//HARDCODED FUN CMD's
-//#include "cmd_neonserv_iplocate.c"
-//#include "cmd_neonserv_calc.c"
-
 //EVENTS
 #include "event_neonserv_join.c"
 #include "event_neonserv_part.c"
@@ -371,7 +296,7 @@ INCLUDE ALL CMD's HERE
 #include "event_neonserv_invite.c"
 #include "event_neonserv_topic.c"
 
-static struct ClientSocket *getBotForChannel(struct ChanNode *chan) {
+struct ClientSocket *getBotForChannel(struct ChanNode *chan) {
     struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL;
     struct ChanUser *chanuser;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
@@ -465,7 +390,7 @@ static void start_bots() {
     }
 }
 
-static TIMEQ_CALLBACK(channel_ban_timeout) {
+TIMEQ_CALLBACK(channel_ban_timeout) {
     char *str_banid = data;
     MYSQL_RES *res;
     MYSQL_ROW row;