Merge pull request #1184 from SaberUK/master+flood

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

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 4a6f855369276dba2b3fb6fd865571e0454a9713..f966d6a5ad16bb8f69f8f8976a578e2829146559 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -38,15 +38,21 @@ class CommandSATopic : public Command
 
                if(target)
                {
-                       const std::string& newTopic = parameters[1];
-                       target->SetTopic(user, newTopic);
+                       const std::string newTopic(parameters[1], 0, ServerInstance->Config->Limits.MaxTopic);
+                       if (target->topic == newTopic)
+                       {
+                               user->WriteNotice(InspIRCd::Format("The topic on %s is already what you are trying to change it to.", target->name.c_str()));
+                               return CMD_SUCCESS;
+                       }
+
+                       target->SetTopic(user, newTopic, ServerInstance->Time(), NULL);
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
                        return CMD_SUCCESS;
                }
                else
                {
-                       user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
+                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
                        return CMD_FAILURE;
                }
        }