Split out channel and user mode +r into a separate module.

2 files changed, 94 insertions, 58 deletions

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
new file mode 100644
index 000000000..6e557334c
--- /dev/null
+++ b/src/modules/m_services.cpp
@@ -0,0 +1,94 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2022 Sadie Powell <sadie@witchery.services>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "modules/account.h"
+
+class RegisteredChannel final
+	: public SimpleChannelMode
+{
+public:
+	RegisteredChannel(Module* Creator)
+		: SimpleChannelMode(Creator, "c_registered", 'r')
+	{
+		if (ServerInstance->Config->ConfValue("services")->getBool("disablemodes"))
+			DisableAutoRegister();
+	}
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
+	{
+		if (IS_LOCAL(source))
+		{
+			source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r channel mode");
+			return MODEACTION_DENY;
+		}
+
+		return SimpleChannelMode::OnModeChange(source, dest, channel, change);
+	}
+};
+
+class RegisteredUser final
+	: public SimpleUserMode
+{
+
+public:
+	RegisteredUser(Module* Creator)
+		: SimpleUserMode(Creator, "u_registered", 'r')
+	{
+		if (ServerInstance->Config->ConfValue("services")->getBool("disablemodes"))
+			DisableAutoRegister();
+	}
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
+	{
+		if (IS_LOCAL(source))
+		{
+			source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r user mode");
+			return MODEACTION_DENY;
+		}
+
+		return SimpleUserMode::OnModeChange(source, dest, channel, change);
+	}
+};
+
+class ModuleServices final
+	: public Module
+{
+private:
+	Account::API accountapi;
+	RegisteredChannel chanmode;
+	RegisteredUser usermode;
+
+public:
+	ModuleServices()
+		: Module(VF_VENDOR, "Provides support for integrating with a services server.")
+		, accountapi(this)
+		, chanmode(this)
+		, usermode(this)
+	{
+	}
+
+	void OnUserPostNick(User* user, const std::string& oldnick) override
+	{
+		if (user->IsModeSet(usermode) && irc::equals(oldnick, user->nick))
+			usermode.RemoveMode(user);
+	}
+};
+
+MODULE_INIT(ModuleServices)
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 291f9f798..78b040755 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -45,53 +45,6 @@ enum
 	RPL_LOGGEDOUT = 901
 };
 
-/** Channel mode +r - mark a channel as identified
- */
-class RegisteredChannel final
-	: public SimpleChannelMode
-{
-public:
-	RegisteredChannel(Module* Creator)
-		: SimpleChannelMode(Creator, "c_registered", 'r')
-	{
-	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
-	{
-		if (IS_LOCAL(source))
-		{
-			source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r channel mode");
-			return MODEACTION_DENY;
-		}
-
-		return SimpleChannelMode::OnModeChange(source, dest, channel, change);
-	}
-};
-
-/** User mode +r - mark a user as identified
- */
-class RegisteredUser final
-	: public SimpleUserMode
-{
-
-public:
-	RegisteredUser(Module* Creator)
-		: SimpleUserMode(Creator, "u_registered", 'r')
-	{
-	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
-	{
-		if (IS_LOCAL(source))
-		{
-			source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r channel mode");
-			return MODEACTION_DENY;
-		}
-
-		return SimpleUserMode::OnModeChange(source, dest, channel, change);
-	}
-};
-
 class AccountExtItemImpl final
 	: public StringExtItem
 {
@@ -268,8 +221,6 @@ private:
 	SimpleChannelMode reginvitemode;
 	SimpleChannelMode regmoderatedmode;
 	SimpleUserMode regdeafmode;
-	RegisteredChannel chanregmode;
-	RegisteredUser userregmode;
 	AccountAPIImpl accountapi;
 	AccountExtBan accountextban;
 	UnauthedExtBan unauthedextban;
@@ -285,8 +236,6 @@ public:
 		, reginvitemode(this, "reginvite", 'R')
 		, regmoderatedmode(this, "regmoderated", 'M')
 		, regdeafmode(this, "regdeaf", 'R')
-		, chanregmode(this)
-		, userregmode(this)
 		, accountapi(this)
 		, accountextban(this, accountapi)
 		, unauthedextban(this, accountapi)
@@ -316,13 +265,6 @@ public:
 			whois.SendLine(RPL_WHOISREGNICK, "is a registered nick");
 	}
 
-	void OnUserPostNick(User* user, const std::string& oldnick) override
-	{
-		/* On nickchange, if they have +r, remove it */
-		if ((user->IsModeSet(userregmode)) && (ServerInstance->Users.FindNick(oldnick) != user))
-			userregmode.RemoveMode(user);
-	}
-
 	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
 		if (!IS_LOCAL(user))