Simplify mode checking on channels and users within a channel

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

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 5c12faf78022ac8929d239029a4e7d2e8ff2fe47..0d471512f6e024581e530344c108751bdbe96332 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -24,6 +24,7 @@
 #include "defines.h"
 #include "conn.h"
 #include "channel.h"
+#include "irc-macros.h"
 #include "irc-write.h"
 #include "lists.h"
 #include "log.h"
@@ -33,6 +34,7 @@
 #include "exp.h"
 #include "irc-op.h"
 
+/* Local functions */
 
 static bool
 try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
@@ -47,7 +49,15 @@ try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
        return true;
 }
 
+/* Global functions */
 
+/**
+ * Handler for the IRC command "KICK".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_KICK(CLIENT *Client, REQUEST *Req)
 {
@@ -60,9 +70,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if ((Req->argc < 2) || (Req->argc > 3))
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                       Client_ID(Client), Req->command);
+       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3)
+       _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        while (*itemList) {
                if (*itemList == ',') {
@@ -81,15 +90,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
                itemList++;
        }
 
-       if (Client_Type(Client) == CLIENT_SERVER)
-               from = Client_Search(Req->prefix);
-       else
-               from = Client;
-
-       if (!from)
-               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-                                       Client_ID(Client), Req->prefix);
-
        reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from);
        currentNick = Req->argv[1];
        currentChannel = Req->argv[0];
@@ -128,7 +128,13 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
        return true;
 } /* IRC_KICK */
 
-
+/**
+ * Handler for the IRC command "INVITE".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_INVITE(CLIENT *Client, REQUEST *Req)
 {
@@ -140,17 +146,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if (Req->argc != 2)
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                       Client_ID(Client), Req->command);
-
-       if (Client_Type(Client) == CLIENT_SERVER)
-               from = Client_Search(Req->prefix);
-       else
-               from = Client;
-       if (!from)
-               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-                                       Client_ID(Client), Req->prefix);
+       _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
+       _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        /* Search user */
        target = Client_Search(Req->argv[0]);
@@ -165,17 +162,17 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                        return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]);
 
                /* Is the channel "invite-disallow"? */
-               if (strchr(Channel_Modes(chan), 'V'))
+               if (Channel_HasMode(chan, 'V'))
                        return IRC_WriteStrClient(from, ERR_NOINVITE_MSG,
                                Client_ID(from), Channel_Name(chan));
 
                /* Is the channel "invite-only"? */
-               if (strchr(Channel_Modes(chan), 'i')) {
+               if (Channel_HasMode(chan, 'i')) {
                        /* Yes. The user must be channel owner/admin/operator/halfop! */
-                       if (!strchr(Channel_UserModes(chan, from), 'q') &&
-                           !strchr(Channel_UserModes(chan, from), 'a') &&
-                           !strchr(Channel_UserModes(chan, from), 'o') &&
-                           !strchr(Channel_UserModes(chan, from), 'h'))
+                       if (!Channel_UserHasMode(chan, from, 'q') &&
+                           !Channel_UserHasMode(chan, from, 'a') &&
+                           !Channel_UserHasMode(chan, from, 'o') &&
+                           !Channel_UserHasMode(chan, from, 'h'))
                                return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(from), Channel_Name(chan));
                        remember = true;
@@ -197,8 +194,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                }
        }
 
-       LogDebug("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]);
 
        /*
         * RFC 2812 says:
@@ -218,7 +215,7 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
                        Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
                        return DISCONNECTED;
 
-               if (strchr(Client_Modes(target), 'a') &&
+               if (Client_HasMode(target, 'a') &&
                        !IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from),
                                        Client_ID(target), Client_Away(target)))
                                return DISCONNECTED;
@@ -226,5 +223,4 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req)
        return CONNECTED;
 } /* IRC_INVITE */
 
-
 /* -eof- */