X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_satopic.cpp;h=4a6f855369276dba2b3fb6fd865571e0454a9713;hb=9d72ec55ae98960bf996dd3d92c29598a5e3c825;hp=a0e3319af25d95d44e7df7e1143748b07823c1af;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index a0e3319af..4a6f85536 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -17,8 +17,6 @@
  */
 
 
-/* $ModDesc: Provides a SATOPIC command */
-
 #include "inspircd.h"
 
 /** Handle /SATOPIC
@@ -40,17 +38,15 @@ class CommandSATopic : public Command
 
 		if(target)
 		{
-			std::string newTopic = parameters[1];
-
-			// 3rd parameter overrides access checks
-			target->SetTopic(user, newTopic, true);
+			const std::string& newTopic = parameters[1];
+			target->SetTopic(user, newTopic);
 			ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
 			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 	}
@@ -62,15 +58,10 @@ class ModuleSATopic : public Module
  public:
 	ModuleSATopic()
 	: cmd(this)
-	{
-		ServerInstance->AddCommand(&cmd);
-	}
-
-	virtual ~ModuleSATopic()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides a SATOPIC command", VF_VENDOR);
 	}