X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fbuiltinmodes.h;h=62ccaf62d18dd95fd9c2b42983fffdc09892722a;hb=5801272a4ab462cf3258e02ddf612ed573aa5b34;hp=ba34a3da9d720e5f6e25c7b0e894525c368df6e4;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/builtinmodes.h b/include/builtinmodes.h
index ba34a3da9..62ccaf62d 100644
--- a/include/builtinmodes.h
+++ b/include/builtinmodes.h
@@ -35,125 +35,75 @@ class ModeChannelBan : public ListModeBase
 	}
 };
 
-/** Channel mode +i
- */
-class ModeChannelInviteOnly : public SimpleChannelModeHandler
-{
- public:
-	ModeChannelInviteOnly() : SimpleChannelModeHandler(NULL, "inviteonly", 'i')
-	{
-	}
-};
-
 /** Channel mode +k
  */
-class ModeChannelKey : public ModeHandler
+class ModeChannelKey : public ParamMode<ModeChannelKey, LocalStringExt>
 {
+	static const std::string::size_type maxkeylen = 32;
  public:
 	ModeChannelKey();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	void SerializeParam(Channel* chan, const std::string* key, std::string& out);
+	ModeAction OnSet(User* source, Channel* chan, std::string& param);
 };
 
 /** Channel mode +l
  */
-class ModeChannelLimit : public ParamChannelModeHandler
+class ModeChannelLimit : public ParamMode<ModeChannelLimit, LocalIntExt>
 {
  public:
 	ModeChannelLimit();
-	bool ParamValidate(std::string& parameter);
 	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
-};
-
-/** Channel mode +m
- */
-class ModeChannelModerated : public SimpleChannelModeHandler
-{
- public:
-	ModeChannelModerated() : SimpleChannelModeHandler(NULL, "moderated", 'm')
-	{
-	}
-};
-
-/** Channel mode +n
- */
-class ModeChannelNoExternal : public SimpleChannelModeHandler
-{
- public:
-	ModeChannelNoExternal() : SimpleChannelModeHandler(NULL, "noextmsg", 'n')
-	{
-	}
+	void SerializeParam(Channel* chan, intptr_t n, std::string& out);
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter);
 };
 
 /** Channel mode +o
  */
-class ModeChannelOp : public ModeHandler
-{
- private:
- public:
-	ModeChannelOp();
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
-	unsigned int GetPrefixRank();
-};
-
-/** Channel mode +p
- */
-class ModeChannelPrivate : public SimpleChannelModeHandler
-{
- public:
-	ModeChannelPrivate() : SimpleChannelModeHandler(NULL, "private", 'p')
-	{
-	}
-};
-
-/** Channel mode +s
- */
-class ModeChannelSecret : public SimpleChannelModeHandler
-{
- public:
-	ModeChannelSecret() : SimpleChannelModeHandler(NULL, "secret", 's')
-	{
-	}
-};
-
-/** Channel mode +t
- */
-class ModeChannelTopicOps : public SimpleChannelModeHandler
+class ModeChannelOp : public PrefixMode
 {
  public:
-	ModeChannelTopicOps() : SimpleChannelModeHandler(NULL, "topiclock", 't')
+	ModeChannelOp()
+		: PrefixMode(NULL, "op", 'o', OP_VALUE, '@')
 	{
+		levelrequired = OP_VALUE;
 	}
 };
 
 /** Channel mode +v
  */
-class ModeChannelVoice : public ModeHandler
-{
- private:
- public:
-	ModeChannelVoice();
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
-	unsigned int GetPrefixRank();
-};
-
-/** User mode +i
- */
-class ModeUserInvisible : public SimpleUserModeHandler
+class ModeChannelVoice : public PrefixMode
 {
  public:
-	ModeUserInvisible() : SimpleUserModeHandler(NULL, "invisible", 'i')
+	ModeChannelVoice()
+		: PrefixMode(NULL, "voice", 'v', VOICE_VALUE, '+')
 	{
+		levelrequired = HALFOP_VALUE;
 	}
 };
 
-/** User mode +n
+/** User mode +s
  */
 class ModeUserServerNoticeMask : public ModeHandler
 {
+	/** Process a snomask modifier string, e.g. +abc-de
+	 * @param user The target user
+	 * @param input A sequence of notice mask characters
+	 * @return The cleaned mode sequence which can be output,
+	 * e.g. in the above example if masks c and e are not
+	 * valid, this function will return +ab-d
+	 */
+	std::string ProcessNoticeMasks(User* user, const std::string& input);
+
  public:
 	ModeUserServerNoticeMask();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	void OnParameterMissing(User* user, User* dest, Channel* channel);
+
+	/** Create a displayable mode string of the snomasks set on a given user
+	 * @param user The user whose notice masks to format
+	 * @return The notice mask character sequence
+	 */
 	std::string GetUserParameter(User* user);
 };
 
@@ -165,13 +115,3 @@ class ModeUserOperator : public ModeHandler
 	ModeUserOperator();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
-
-/** User mode +w
- */
-class ModeUserWallops : public SimpleUserModeHandler
-{
- public:
-	ModeUserWallops() : SimpleUserModeHandler(NULL, "wallops", 'w')
-	{
-	}
-};