added "nowho" parameter to debug userlist and fixed memory leak in DBHelper.c

[NeonServV5.git] / src / event_neonserv_kick.c

diff --git a/src/event_neonserv_kick.c b/src/event_neonserv_kick.c
index d4783bbcbf25757c1af41885ce8dc3dc29e9a33e..8e32d02a4dab680b87302f0a5f2d4310ede83131 100644 (file)
--- a/src/event_neonserv_kick.c
+++ b/src/event_neonserv_kick.c
@@ -1,5 +1,5 @@
-/* event_neonserv_kick.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* event_neonserv_kick.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,16 +18,40 @@
 struct neonserv_event_kick_cache {
     struct ClientSocket *client;
     struct UserNode *user;
-    struct ChanUser *target;
+    struct UserNode *target;
+    struct ChanNode *chan;
     int userauth_pending;
 };
 
 static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup);
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache);
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target);
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan);
 
 static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target, char *reason) {
-    struct ClientSocket *client = getBotForChannel(chan);
+    struct ChanNode *chan = target->chan;
+    struct ClientSocket *client;
+    if(isBot(target->user)) {
+        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;
+    }
+    client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
     if(isNetworkService(user)) return; 
     loadChannelSettings(chan);
@@ -39,14 +63,15 @@ static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target,
     }
     cache->client = client;
     cache->user = user;
-    cache->target = target;
-    cache->userauth_pending++;
+    cache->target = target->user;
+    cache->chan = target->chan;
+    cache->userauth_pending = 0;
     if(!(user->flags & USERFLAG_ISAUTHED)) {
         get_userauth(user, neonserv_event_kick_nick_lookup, cache);
         cache->userauth_pending++;
     }
-    if(!(chanuser->user->flags & USERFLAG_ISAUTHED)) {
-        get_userauth(chanuser->user, neonserv_event_kick_nick_lookup, cache);
+    if(!(target->user->flags & USERFLAG_ISAUTHED)) {
+        get_userauth(target->user, neonserv_event_kick_nick_lookup, cache);
         cache->userauth_pending++;
     }
     neonserv_event_kick_async1(cache);
@@ -60,15 +85,15 @@ static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup) {
 
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache) {
     if(cache->userauth_pending == 0) {
-        neonserv_event_kick_async2(cache->client, cache->user, cache->chanuser);
+        neonserv_event_kick_async2(cache->client, cache->user, cache->target, cache->chan);
         free(cache);
     }
 }
 
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target) {
-    if(isUserProtected(target->chan, target->user, user)) {
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan) {
+    if(isUserProtected(chan, target, user)) {
         char buf[MAXLEN];
-        putsock(client, "KICK %s %s :%s", target->chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->user->nick));
-        putsock(client, "INVITE %s %s", target->user->nick, target->chan->name);
+        putsock(client, "KICK %s %s :%s", chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->nick));
+        putsock(client, "INVITE %s %s", target->nick, chan->name);
     }
 }