Another year is about to end... So we have to update these damn copyright information :P

[NeonServV5.git] / src / ChanNode.c

diff --git a/src/ChanNode.c b/src/ChanNode.c
index af8a5bb892a6b4ef985825cec97e54bdeebecb47..9641df31f0d1083192502d36ad31d4952f0bc260 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,5 +1,5 @@
-/* ChanNode.c - NeonServ v5.1
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanNode.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
@@ -20,6 +20,8 @@
 #include "BanNode.h"
 #include "modcmd.h"
 #include "ModeNode.h"
+#include "bot_NeonSpam.h"
+#include "IRCEvents.h"
 
 static struct ChanNode **chanList;
 
@@ -47,9 +49,7 @@ void free_ChanNode() {
             next = chan->next;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
                 next_chanuser = getChannelUsers(chan, chanuser);
-                if(chanuser->spamnode)
-                    free(chanuser->spamnode);
-                free(chanuser);
+                freeChanUser(chanuser);
             }
             freeChanNode(chan);
         }
@@ -212,6 +212,7 @@ void delChannel(struct ChanNode* chan, int freeChan) {
 }
 
 void freeChanNode(struct ChanNode* chan) {
+    event_freechan(chan);
     if(chan->trigger) {
         struct trigger_cache *trigger, *next_trigger;
         for(trigger = chan->trigger; trigger; trigger = next_trigger) {
@@ -224,16 +225,16 @@ void freeChanNode(struct ChanNode* chan) {
     if(chan->bans)
         removeChannelBans(chan);
     if(chan->spam_settings)
-        free(chan->spam_settings);
+        freeNeonSpamSettings(chan->spam_settings);
     free(chan);
 }
 
-void checkChannelVisibility(struct ChanNode* chan) {
+int checkChannelVisibility(struct ChanNode* chan) {
     struct ChanUser *chanuser, *next;
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(chanuser->user->flags & USERFLAG_ISBOT) {
             chan->chanbot = chanuser->user;
-            return;
+            return 1;
         }
     }
     //free the channel...
@@ -245,10 +246,9 @@ void checkChannelVisibility(struct ChanNode* chan) {
             //free the user (no more channels)
             delUser(chanuser->user, 1);
         }
-        if(chanuser->spamnode)
-            free(chanuser->spamnode);
-        free(chanuser);
+        freeChanUser(chanuser);
     }
     chan->user = NULL;
     delChannel(chan, 1);
+    return 0;
 }