X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonSpam.mod%2Fbot_NeonSpam.c;h=3e714accdc849cea253737604073fe54e484e452;hb=78e040af3fcc36ab684611c0f98b4381ff420878;hp=b4db7243f8bae67f2cff0309542c98d51dcfbc53;hpb=923d68b1cf61c22ac4bd61cd55f4ac305def1ea3;p=NeonServV5.git

diff --git a/src/modules/NeonSpam.mod/bot_NeonSpam.c b/src/modules/NeonSpam.mod/bot_NeonSpam.c
index b4db724..3e714ac 100644
--- a/src/modules/NeonSpam.mod/bot_NeonSpam.c
+++ b/src/modules/NeonSpam.mod/bot_NeonSpam.c
@@ -1,4 +1,4 @@
-/* bot_NeonSpam.c - NeonServ v5.4
+/* bot_NeonSpam.c - NeonServ v5.5
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -103,32 +103,9 @@ static struct NeonSpamJoinNode *getNeonSpamJoinNode(struct ChanUser *chanuser);
 #include "event_neonspam_join.c"
 #include "event_neonspam_chanmsg.c"
 
-static void neonspam_event_kick(struct UserNode *user, struct ChanUser *target, char *reason) {
-    struct ChanNode *chan = target->chan;
-    if(isBot(target->user)) {
-        struct ClientSocket *client = getChannelBot(chan, 0);
-        struct ClientSocket *bot = client;
-        for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
-            if(client->user == target->user) {
-                break;
-            }
-        }
-        if(!client) return;
-        if(bot && bot != client && (isModeSet(chan->modes, 'i') || isModeSet(chan->modes, 'a') || isModeSet(chan->modes, 'l'))) {
-            struct ChanUser *chanuser = getChanUser(bot->user, chan);
-            if(chanuser && chanuser->flags & CHANUSERFLAG_OPPED)
-                putsock(bot, "INVITE %s %s", target->user->nick, chan->name);
-        }
-        char *key = "";
-        if(isModeSet(chan->modes, 'k')) {
-            key = getModeValue(chan->modes, 'k');
-        }
-        putsock(client, "JOIN %s %s", chan->name, key);
-        return;
-    }
-}
-
 static void neonspam_bot_ready(struct ClientSocket *client) {
+    if(client->botid != BOTID)
+        return;
     MYSQL_RES *res;
     MYSQL_ROW row;
     
@@ -183,6 +160,7 @@ 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 |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
             client->clientid = atoi(row[7]);
             connect_socket(client);
@@ -373,6 +351,36 @@ static int neonspam_event_freechan(struct ChanNode *chan) {
     return 1;
 }
 
+static void neonspam_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_NeonSpam(int type) {
     
     set_bot_alias(BOTID, BOTALIAS);
@@ -385,9 +393,9 @@ void init_NeonSpam(int type) {
     bind_join(neonspam_event_join, module_id);
     bind_chanmsg(neonspam_event_chanmsg, module_id);
     bind_privctcp(general_event_privctcp, module_id);
-    bind_kick(neonspam_event_kick, module_id);
     bind_freechan(neonspam_event_freechan, module_id);
-    
+    bind_invite(neonspam_event_invite, module_id);
+	
     set_trigger_callback(BOTID, module_id, neonspam_trigger_callback);
     
     register_default_language_table(msgtab);