Use !empty instead of size when checking if containers are empty.

[user/henk/code/inspircd.git] / src / modules / m_sanick.cpp

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 8689778a2d9df2dff4bec7f6b162ed93177a1d39..31813bedf93e41579ab2d01fdc676da15008eebf 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
@@ -33,7 +33,8 @@ class CommandSanick : public Command
        CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; syntax = "<nick> <newnick>";
+               flags_needed = 'o';
+               syntax = "<nick> <newnick>";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
@@ -66,15 +67,15 @@ class CommandSanick : public Command
                /* Have we hit target's server yet? */
                if (target && IS_LOCAL(target))
                {
-                       std::string oldnick = user->nick;
-                       std::string newnick = target->nick;
-                       if (target->ChangeNick(parameters[1]))
+                       const std::string oldnick = target->nick;
+                       const std::string newnick = parameters[1];
+                       if (!ServerInstance->FindNickOnly(newnick) && target->ChangeNick(newnick))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SANICK to change " + oldnick + " to " + newnick);
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteGlobalSno('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick + " failed SANICK (from " + oldnick + " to " + newnick + ")");
                        }
                }
 
@@ -99,7 +100,7 @@ class ModuleSanick : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the SANICK command, allows opers to change the nicknames of users", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Adds the /SANICK command which allows server operators to change the nickname of a user.", VF_OPTCOMMON | VF_VENDOR);
        }
 };