Move the oper and snomask modes to core_oper.

6 files changed, 37 insertions, 38 deletions

diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp
index 2f6abea29..ad0309500 100644
--- a/src/coremods/core_oper/core_oper.cpp
+++ b/src/coremods/core_oper/core_oper.cpp
@@ -24,11 +24,14 @@
 
 class CoreModOper : public Module
 {
+ private:
 	CommandDie cmddie;
 	CommandKill cmdkill;
 	CommandOper cmdoper;
 	CommandRehash cmdrehash;
 	CommandRestart cmdrestart;
+	ModeUserOperator operatormode;
+	ModeUserServerNoticeMask snomaskmode;
 
  public:
 	CoreModOper()
@@ -38,6 +41,8 @@ class CoreModOper : public Module
 		, cmdoper(this)
 		, cmdrehash(this)
 		, cmdrestart(this)
+		, operatormode(this)
+		, snomaskmode(this)
 	{
 	}
 
diff --git a/src/coremods/core_oper/core_oper.h b/src/coremods/core_oper/core_oper.h
index a89dce7ed..b0df7e738 100644
--- a/src/coremods/core_oper/core_oper.h
+++ b/src/coremods/core_oper/core_oper.h
@@ -129,3 +129,33 @@ class CommandRestart : public Command
 	 */
 	CmdResult Handle(User* user, const Params& parameters) override;
 };
+
+class ModeUserServerNoticeMask : public ModeHandler
+{
+ private:
+	/** 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(Module* Creator);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override;
+
+	/** 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(const User* user) const override;
+};
+
+class ModeUserOperator : public ModeHandler
+{
+ public:
+	ModeUserOperator(Module* Creator);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding) override;
+};
diff --git a/src/coremods/core_user/umode_o.cpp b/src/coremods/core_oper/umode_o.cpp
index 47e11fbce..d9d2a6e1c 100644
--- a/src/coremods/core_user/umode_o.cpp
+++ b/src/coremods/core_oper/umode_o.cpp
@@ -24,7 +24,7 @@
 
 
 #include "inspircd.h"
-#include "core_user.h"
+#include "core_oper.h"
 
 ModeUserOperator::ModeUserOperator(Module* Creator)
 	: ModeHandler(Creator, "oper", 'o', PARAM_NONE, MODETYPE_USER)
diff --git a/src/coremods/core_user/umode_s.cpp b/src/coremods/core_oper/umode_s.cpp
index 8d59bde86..e00f3bb7b 100644
--- a/src/coremods/core_user/umode_s.cpp
+++ b/src/coremods/core_oper/umode_s.cpp
@@ -24,7 +24,7 @@
 
 
 #include "inspircd.h"
-#include "core_user.h"
+#include "core_oper.h"
 
 ModeUserServerNoticeMask::ModeUserServerNoticeMask(Module* Creator)
 	: ModeHandler(Creator, "snomask", 's', PARAM_SETONLY, MODETYPE_USER)
diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp
index db2d34915..7ca461052 100644
--- a/src/coremods/core_user/core_user.cpp
+++ b/src/coremods/core_user/core_user.cpp
@@ -151,8 +151,6 @@ class CoreModUser : public Module
 	CommandIson cmdison;
 	CommandUserhost cmduserhost;
 	SimpleUserModeHandler invisiblemode;
-	ModeUserOperator operatormode;
-	ModeUserServerNoticeMask snomaskmode;
 
  public:
 	CoreModUser()
@@ -168,8 +166,6 @@ class CoreModUser : public Module
 		, cmdison(this)
 		, cmduserhost(this)
 		, invisiblemode(this, "invisible", 'i')
-		, operatormode(this)
-		, snomaskmode(this)
 	{
 	}
 
diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h
index 9f0fe5b4a..ef7e4d79e 100644
--- a/src/coremods/core_user/core_user.h
+++ b/src/coremods/core_user/core_user.h
@@ -201,35 +201,3 @@ class CommandUserhost : public Command
 	CmdResult Handle(User* user, const Params& parameters) override;
 };
 
-/** 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(Module* Creator);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override;
-
-	/** 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(const User* user) const override;
-};
-
-/** User mode +o
- */
-class ModeUserOperator : public ModeHandler
-{
- public:
-	ModeUserOperator(Module* Creator);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding) override;
-};