X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbots.c;h=7ada74312aac2d40f3dfa190f0d0f7cca9f9494f;hb=4929b3cfa489f3fc5868bf768479f30fff18a272;hp=c9b06164a0caf974d992324dd92fff1e69ff82e5;hpb=2d79644bbe6aa91b3082456abea966f6d8683566;p=NeonServV5.git

diff --git a/src/bots.c b/src/bots.c
index c9b0616..7ada743 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,4 +1,4 @@
-/* bots.c - NeonServ v5.3
+/* bots.c - NeonServ v5.4
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -26,11 +26,6 @@
 #include "modcmd.h"
 #include "DBHelper.h"
 
-#include "bot_NeonServ.h"
-#include "bot_NeonSpam.h"
-#include "bot_DummyServ.h"
-#include "bot_NeonHelp.h"
-
 struct cmd_bot_alias {
     int botid;
     char *alias;
@@ -98,14 +93,9 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
 }
 
 void init_bots() {
-    init_NeonServ();
-    init_NeonSpam();
-    init_DummyServ();
-    init_NeonHelp();
-    
     set_bot_alias(0, "0");
     start_zero_bots();
-    set_trigger_callback(0, zero_bots_trigger_callback);
+    set_trigger_callback(0, 0, zero_bots_trigger_callback);
     
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -116,7 +106,7 @@ void init_bots() {
     while ((row = mysql_fetch_row(res)) != NULL) {
         if(atol(row[1]) - time(0) > 0) {
             sprintf(nameBuf, "ban_%s", row[0]);
-            timeq_add_name(nameBuf, atol(row[1]) - time(0), channel_ban_timeout, strdup(row[0]));
+            timeq_add_name(nameBuf, atol(row[1]) - time(0), 0, channel_ban_timeout, strdup(row[0]));
         } else {
             //timed out
             printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[0]);
@@ -124,20 +114,6 @@ void init_bots() {
     }
 }
 
-void loop_bots() {
-    loop_NeonServ();
-    loop_NeonSpam();
-    loop_DummyServ();
-    loop_NeonHelp();
-}
-
-void free_bots() {
-    free_NeonServ();
-    free_NeonSpam();
-    free_DummyServ();
-    free_NeonHelp();
-}
-
 struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
     struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL;
     struct ChanUser *chanuser;
@@ -159,20 +135,25 @@ struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
 }
 
 void requestOp(struct UserNode *user, struct ChanNode *chan) {
-    struct ClientSocket *bot;
+    struct ClientSocket *bot, *userbot = NULL;
     struct ChanUser *chanuser = getChanUser(user, chan);
     char opped = 0;
     if(!chanuser) return;
     if((chanuser->flags & CHANUSERFLAG_OPPED)) return;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
-        if((chanuser = getChanUser(bot->user, chan)) != NULL && (chanuser->flags & CHANUSERFLAG_OPPED)) {
+        if(!opped && (chanuser = getChanUser(bot->user, chan)) != NULL && (chanuser->flags & CHANUSERFLAG_OPPED)) {
             opped = 1;
             putsock(bot, "MODE %s +o %s", chan->name, user->nick);
-            break;
+        }
+        if(bot->user == user) {
+            userbot = bot;
         }
     }
     if(!opped) {
-        //self op?
+        if(userbot && (isUserModeSet(user, 'o') || isUserModeSet(user, 'O') || isUserModeSet(user, 'k') || isUserModeSet(user, 'X'))) {
+            putsock(userbot, "MODE %s +o %s", chan->name, user->nick);
+            putsock(userbot, "OPMODE %s +o %s", chan->name, user->nick);
+        }
     }
 }