X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcmd_topic.cpp;h=ab60f54f5afe452c195ea02603cdc3f8204a15c5;hb=d38595e7e14e7509e744d33df657d50d00cc201f;hp=835ac82ed3eea9297a7616408a4a644e4e3360d0;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp
index 835ac82ed..ab60f54f5 100644
--- a/src/coremods/core_channel/cmd_topic.cpp
+++ b/src/coremods/core_channel/cmd_topic.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@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
@@ -29,24 +34,24 @@ CommandTopic::CommandTopic(Module* parent)
 	, secretmode(parent, "secret")
 	, topiclockmode(parent, "topiclock")
 {
-	syntax = "<channel> [<topic>]";
+	syntax = "<channel> [:<topic>]";
 	Penalty = 2;
 }
 
-CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 {
 	Channel* c = ServerInstance->FindChan(parameters[0]);
 	if (!c)
 	{
-		user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+		user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
 		return CMD_FAILURE;
 	}
 
 	if (parameters.size() == 1)
 	{
-		if ((c->IsModeSet(secretmode)) && (!c->HasUser(user)))
+		if ((c->IsModeSet(secretmode)) && (!c->HasUser(user) && !user->HasPrivPermission("channels/auspex")))
 		{
-			user->WriteNumeric(Numerics::NoSuchNick(c->name));
+			user->WriteNumeric(Numerics::NoSuchChannel(c->name));
 			return CMD_FAILURE;
 		}