X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonFun.mod%2Fbot_NeonFun.c;h=c1593221e28b44c5766042b193b35ee91d41fde7;hb=4b9de3472bf8bb35214bd3c31289b7c601304686;hp=ebb0cc58dc4ac17d7d2cdffcb060d41b468a874f;hpb=eb2aab55a1f97b329c0409d32d35d1f112facedb;p=NeonServV5.git

diff --git a/src/modules/NeonFun.mod/bot_NeonFun.c b/src/modules/NeonFun.mod/bot_NeonFun.c
index ebb0cc5..c159322 100644
--- a/src/modules/NeonFun.mod/bot_NeonFun.c
+++ b/src/modules/NeonFun.mod/bot_NeonFun.c
@@ -1,4 +1,4 @@
-/* bot_NeonFun.c - NeonServ v5.4
+/* bot_NeonFun.c - NeonServ v5.5
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -44,12 +44,17 @@
 #define BOTALIAS "NeonFun"
 
 static void neonfun_bot_ready(struct ClientSocket *client) {
+    if(client->botid != BOTID)
+        return;
     MYSQL_RES *res;
     MYSQL_ROW row;
     
-    printf_mysql_query("SELECT `automodes` FROM `bots` WHERE `id` = '%d'", client->clientid);
+    printf_mysql_query("SELECT `automodes`, `oper_user`, `oper_pass` FROM `bots` WHERE `id` = '%d'", client->clientid);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) != NULL) {
+        if(row[1] && row[2]) {
+            putsock(client, "OPER %s %s", row[1], row[2]);
+        }
         putsock(client, "MODE %s +%s", client->user->nick, row[0]);
     }
     
@@ -87,7 +92,7 @@ static void start_bots(int type) {
     MYSQL_ROW row;
     
     if(type == MODSTATE_STARTSTOP) {
-        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind`, `secret` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
         res = mysql_use();
         
         while ((row = mysql_fetch_row(res)) != NULL) {
@@ -95,7 +100,9 @@ static void start_bots(int type) {
             client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
             client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
             client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0);
+            client->flags |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0);
             client->flags |= SOCKET_FLAG_SILENT;
+            client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
             client->clientid = atoi(row[7]);
             connect_socket(client);
@@ -122,22 +129,47 @@ static void start_bots(int type) {
     bind_unbound_required_functions(BOTID);
 }
 
-static void neonfun_parted(struct ChanUser *chanuser, char *reason) {
+static void neonfun_parted(struct ChanUser *chanuser, int quit, char *reason) {
     uno_event_part(chanuser);
     fourwins_event_part(chanuser);
 }
 
-static void neonfun_quitted(struct UserNode *user, char *reason) {
-    uno_event_quit(user);
-    fourwins_event_quit(user);
-}
-
 static int neonfun_freechan(struct ChanNode *chan) {
     uno_event_freechan(chan);
     fourwins_event_freechan(chan);
     return 0;
 }
 
+static void neonfun_event_invite(struct ClientSocket *client, struct UserNode *user, char *channel) {
+	if(client->botid != BOTID)
+		return;
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` LEFT JOIN `channels` ON `chanid` = `channel_id` WHERE `channel_name` = '%s' AND `botclass` = '%d'", escape_string(channel), client->botid);
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) == NULL) {
+        reply(client, user, "NS_INVITE_FAIL", channel, client->user->nick);
+        return;
+    }
+    if(!strcmp(row[2], "1")) {
+        reply(client, user, "MODCMD_CHAN_SUSPENDED");
+        return;
+    }
+    int botid = atoi(row[0]);
+    struct ClientSocket *bot;
+    for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+        if(bot->clientid == botid)
+            break;
+    }
+    if(bot) {
+        struct ChanNode *chan = getChanByName(channel);
+        if(chan && isUserOnChan(bot->user, chan)) {
+            reply(client, user, "NS_INVITE_ON_CHAN", bot->user->nick, chan->name);
+        } else
+            putsock(bot, "JOIN %s", channel);
+    }
+}
+
 void init_NeonFun(int type) {
     set_bot_alias(BOTID, BOTALIAS);
     start_bots(type);
@@ -147,16 +179,12 @@ void init_NeonFun(int type) {
     //register events
     bind_bot_ready(neonfun_bot_ready, module_id);
     bind_part(neonfun_parted, module_id);
-    bind_quit(neonfun_quitted, module_id);
     bind_freechan(neonfun_freechan, module_id);
-    
+    bind_invite(neonfun_event_invite, module_id);
+	
     set_trigger_callback(BOTID, module_id, neonfun_trigger_callback);
 }
 
-void loop_NeonFun() {
-    
-}
-
 void free_NeonFun(int type) {
     unbind_allcmd(BOTID);
     if(type == MODSTATE_STARTSTOP) {