X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbots.c;h=076c0cb12a8be738fe98509b521dcd6cd1095d39;hb=88751acefe20e568fc945d7e5f5c11e0a9c7be60;hp=4875b5a5c987e97036c6084b704c2ddb58a58362;hpb=f844b726b55c5508e31579073121c38317ecd968;p=NeonServV5.git

diff --git a/src/bots.c b/src/bots.c
index 4875b5a..076c0cb 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,4 +1,4 @@
-/* bots.c - NeonServ v5.5
+/* bots.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include "modcmd.h"
 #include "DBHelper.h"
 #include "IRCEvents.h"
+#include "tools.h"
 
 struct cmd_bot_alias {
     int botid;
@@ -151,8 +152,8 @@ struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
     struct ChanUser *chanuser;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
         if(botid && bot->botid != botid) continue;
-        if((chanuser = getChanUser(bot->user, chan)) != NULL) {
-            if((chanuser->flags & CHANUSERFLAG_OPPED)) {
+        if(!chan || (chanuser = getChanUser(bot->user, chan)) != NULL) {
+            if(chan && (chanuser->flags & CHANUSERFLAG_OPPED)) {
                 use_bot = bot;
                 if(bot->flags & SOCKET_FLAG_PREFERRED) break;
             } else if(bot->flags & SOCKET_FLAG_PREFERRED)
@@ -190,7 +191,7 @@ void requestOp(struct UserNode *user, struct ChanNode *chan) {
 }
 
 void requestInvite(struct UserNode *user, struct ChanNode *chan) {
-    struct ClientSocket *bot, *userbot = NULL;
+    struct ClientSocket *bot;
     struct ChanUser *chanuser = getChanUser(user, chan);
     char invited = 0;
     if(chanuser) return;
@@ -199,9 +200,6 @@ void requestInvite(struct UserNode *user, struct ChanNode *chan) {
             invited = 1;
             putsock(bot, "INVITE %s %s", user->nick, chan->name);
         }
-        if(bot->user == user) {
-            userbot = bot;
-        }
     }
 }