moved invite/ban lists to channel structure

[ngircd-alex.git] / src / ngircd / irc-op.c

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 587c4c606b987c199098e3fd6e2d1ab2b4fcf8ac..ac477793c0ef1aad708607dce89dde74b3a93e47 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-op.c,v 1.15 2005/04/27 07:39:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc-op.c,v 1.17 2006/12/07 17:57:20 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -99,17 +99,17 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
                if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] );
 
                /* If the target user is banned on that channel: remember invite */
-               if( Lists_CheckBanned( target, chan )) remember = true;
+               if( Lists_Check(Channel_GetListBans(chan), target )) remember = true;
 
-               if( remember )
-               {
-                       /* We must memember this invite */
-                       if( ! Lists_AddInvited( Client_Mask( target ), chan, true)) return CONNECTED;
+               if (remember) {
+                       /* We must remember this invite */
+                       if( ! Channel_AddInvite(chan, Client_Mask( target ), true))
+                               return CONNECTED;
                }
        }
 
-       Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
-       
+       LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
+
        /* Inform target client */
        IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] );