X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcmd_topic.cpp;h=ab60f54f5afe452c195ea02603cdc3f8204a15c5;hb=cbe5b993142c218e09ae972bdce91681cc0ba485;hp=fe913225e0bc6de95e34dabd20e7aa6b4df6fafe;hpb=35b70631f0532a5828b04a8e0c02092a285f331a;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 fe913225e..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,11 +34,11 @@ 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)
@@ -44,7 +49,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
 
 	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::NoSuchChannel(c->name));
 			return CMD_FAILURE;