X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcore_channel.h;h=26b23c3ea5a5c2c93fed9e02a54ba97e40bcc762;hb=fe67c13ddf8f546bed95a9904679b3f32c708cd9;hp=59a41779055e1ade7df7d2546dcfab8995976b3b;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h
index 59a417790..26b23c3ea 100644
--- a/src/coremods/core_channel/core_channel.h
+++ b/src/coremods/core_channel/core_channel.h
@@ -1,10 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -52,6 +50,14 @@ namespace Invite
 	};
 }
 
+enum
+{
+	// From RFC 1459.
+	RPL_BANLIST = 367,
+	RPL_ENDOFBANLIST = 368,
+	ERR_KEYSET = 467
+};
+
 /** Handle /INVITE.
  */
 class CommandInvite : public Command
@@ -116,9 +122,11 @@ class CommandTopic : public SplitCommand
  */
 class CommandNames : public SplitCommand
 {
+ private:
 	ChanModeReference secretmode;
 	ChanModeReference privatemode;
 	UserModeReference invisiblemode;
+	Events::ModuleEventProvider namesevprov;
 
  public:
 	/** Constructor for names.
@@ -164,8 +172,9 @@ class ModeChannelBan : public ListModeBase
 {
  public:
 	ModeChannelBan(Module* Creator)
-		: ListModeBase(Creator, "ban", 'b', "End of channel ban list", 367, 368, true, "maxbans")
+		: ListModeBase(Creator, "ban", 'b', "End of channel ban list", RPL_BANLIST, RPL_ENDOFBANLIST, true)
 	{
+		syntax = "<mask>";
 	}
 };
 
@@ -179,6 +188,7 @@ class ModeChannelKey : public ParamMode<ModeChannelKey, LocalStringExt>
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
 	void SerializeParam(Channel* chan, const std::string* key, std::string& out)	;
 	ModeAction OnSet(User* source, Channel* chan, std::string& param) CXX11_OVERRIDE;
+	bool IsParameterSecret() CXX11_OVERRIDE;
 };
 
 /** Channel mode +l