* Fix inspsocket to not include uio.h on windows.

[user/henk/code/inspircd.git] / src / commands / cmd_nick.cpp

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 33e0e80819f0df48d5b04432aa583e0e4a95b660..bdaff8723d62364ba66323762d44a155db613022 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -13,12 +13,26 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_nick.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /NICK. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandNick : public Command
 {
-       return new CommandNick(Instance);
-}
+ public:
+       /** Constructor for nick.
+        */
+       CommandNick ( Module* parent) : Command(parent,"NICK", 1, 1) { works_before_reg = true; syntax = "<newnick>"; Penalty = 3; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 /** Handle nick changes from users.
  * NOTE: If you are used to ircds based on ircd2.8, and are looking
@@ -38,17 +52,16 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
        if (((!ServerInstance->IsNick(parameters[0].c_str(), ServerInstance->Config->Limits.NickMax))) && (IS_LOCAL(user)))
        {
-               if (!allowinvalid)
+               if (!User::NICKForced.get(user))
                {
                        if (parameters[0] == "0")
                        {
                                // Special case, Fake a /nick UIDHERE. Useful for evading "ERR: NICK IN USE" on connect etc.
                                std::vector<std::string> p2;
-                               std::deque<classbase*> dummy;
                                p2.push_back(user->uuid);
-                               this->HandleInternal(1, dummy);
+                               User::NICKForced.set(user, 1);
                                this->Handle(p2, user);
-                               this->HandleInternal(0, dummy);
+                               User::NICKForced.set(user, 0);
                                return CMD_SUCCESS;
                        }
 
@@ -71,7 +84,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                 */
                oldnick.assign(user->nick, 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
                ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user,parameters[0]));
+               FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user,parameters[0]));
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
                if (user->registered == REG_ALL)
@@ -91,14 +104,14 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                 * Also don't check Q:Lines for remote nickchanges, they should have our Q:Lines anyway to enforce themselves.
                 *              -- w00t
                 */
-               if (!allowinvalid || !IS_LOCAL(user))
+               if (!IS_LOCAL(user))
                {
                        XLine* mq = ServerInstance->XLines->MatchesLine("Q",parameters[0]);
                        if (mq)
                        {
                                if (user->registered == REG_ALL)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s",
+                                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s!%s@%s: %s",
                                                parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason.c_str());
                                }
                                user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason.c_str());
@@ -109,8 +122,8 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        {
                                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                                {
-                                       Channel *chan = i->first;
-                                       if (chan->GetStatus(user) < STATUS_VOICE && chan->IsBanned(user))
+                                       Channel *chan = *i;
+                                       if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
                                        {
                                                user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
                                                return CMD_FAILURE;
@@ -152,7 +165,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
 
        ModResult MOD_RESULT;
-       FIRST_MOD_RESULT(ServerInstance, OnUserPreNick, MOD_RESULT, (user, parameters[0]));
+       FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (user, parameters[0]));
        if (MOD_RESULT == MOD_RES_DENY)
                // if a module returns true, the nick change is silently forbidden.
                return CMD_FAILURE;
@@ -172,22 +185,13 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        user->nick.assign(parameters[0], 0, IS_LOCAL(user) ? ServerInstance->Config->Limits.NickMax : MAXBUF);
        user->InvalidateCache();
 
-       /* Update display nicks */
-       for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-       {
-               CUList* ulist = v->first->GetUsers();
-               CUList::iterator i = ulist->find(user);
-               if (i != ulist->end())
-                       i->second = user->nick;
-       }
-
        if (user->registered < REG_NICKUSER)
        {
                user->registered = (user->registered | REG_NICK);
                if (user->registered == REG_NICKUSER)
                {
                        /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-                       FIRST_MOD_RESULT(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+                       FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
 
@@ -206,9 +210,5 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
 }
 
-CmdResult CommandNick::HandleInternal(const unsigned int id, const std::deque<classbase*>&)
-{
-       allowinvalid = (id != 0);
-       return CMD_SUCCESS;
-}
 
+COMMAND_INIT(CommandNick)