X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_satopic.cpp;h=1d210e3ef53680ffde58fbe103d5caf0a5f7b1c2;hb=7ba36f5348a6cca1c0da820c60ae17063f3cdad5;hp=053f13789bd3e52c52b4c9f9f4d44f58ee5e8d4d;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 053f13789..1d210e3ef 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -1,7 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Oliver Lupton <om@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -26,27 +33,34 @@ class CommandSATopic : public Command
  public:
 	CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2)
 	{
-		flags_needed = 'o'; Penalty = 0; syntax = "<target> <topic>";
+		flags_needed = 'o';
+		syntax = "<channel> :<topic>";
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		/*
 		 * Handles a SATOPIC request. Notifies all +s users.
-	 	 */
+		 */
 		Channel* target = ServerInstance->FindChan(parameters[0]);
 
 		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(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
 			return CMD_FAILURE;
 		}
 	}
@@ -61,14 +75,9 @@ class ModuleSATopic : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides a SATOPIC command", VF_VENDOR);
+		return Version("Adds the /SATOPIC command which allows server operators to change the topic of a channel that they would not otherwise have the privileges to change.", VF_VENDOR);
 	}
 };