From 297212ca4d928b18a3b620cd637d995df90465d7 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Fri, 30 Dec 2022 15:45:07 +0000
Subject: [PATCH] Switch to the IRCv3 standard-replies cap.

Nothing is using this so far so I'm not counting it as a breaking
change.
---
 docs/conf/modules.conf.example  | 5 ++++-
 include/modules/ircv3_replies.h | 4 ++--
 src/modules/m_cap.cpp           | 2 --
 src/modules/m_ircv3.cpp         | 3 +++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index d02d2fbe2..18386146b 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1225,7 +1225,10 @@
 # The following block can be used to control which extensions are
 # enabled. Note that extended-join can be incompatible with delayjoin
 # and host cycling.
-#<ircv3 accountnotify="yes" awaynotify="yes" extendedjoin="yes">
+#<ircv3 accountnotify="yes"
+#       awaynotify="yes"
+#       extendedjoin="yes"
+#       standardreplies="yes">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # IRCv3 account-tag module. Adds the 'account' tag which contains the
diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h
index 3bceb5964..d4b1ae2c5 100644
--- a/include/modules/ircv3_replies.h
+++ b/include/modules/ircv3_replies.h
@@ -33,13 +33,13 @@ namespace IRCv3
 	}
 }
 
-/** Reference to the inspircd.org/standard-replies cap. */
+/** Reference to the standard-replies cap. */
 class IRCv3::Replies::CapReference
 	: public Cap::Reference
 {
  public:
 	CapReference(Module* mod)
-		: Cap::Reference(mod, "inspircd.org/standard-replies")
+		: Cap::Reference(mod, "standard-replies")
 	{
 	}
 };
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 130c57426..1ef000f64 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -490,13 +490,11 @@ class ModuleCap : public Module
  private:
 	CommandCap cmd;
 	PoisonCap poisoncap;
-	Cap::Capability stdrplcap;
 
  public:
 	ModuleCap()
 		: cmd(this)
 		, poisoncap(this)
-		, stdrplcap(this, "inspircd.org/standard-replies")
 	{
 	}
 
diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index f4a3fae95..ef3270467 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -123,6 +123,7 @@ class ModuleIRCv3
 
 	ClientProtocol::EventProvider accountprotoev;
 	Monitor::API monitorapi;
+	Cap::Capability stdrplcap;
 
  public:
 	ModuleIRCv3()
@@ -132,6 +133,7 @@ class ModuleIRCv3
 		, joinhook(this)
 		, accountprotoev(this, "ACCOUNT")
 		, monitorapi(this)
+		, stdrplcap(this, "standard-replies")
 	{
 	}
 
@@ -141,6 +143,7 @@ class ModuleIRCv3
 		cap_accountnotify.SetActive(conf->getBool("accountnotify", true));
 		joinhook.awaycap.SetActive(conf->getBool("awaynotify", true));
 		joinhook.extendedjoincap.SetActive(conf->getBool("extendedjoin", true));
+		stdrplcap.SetActive(conf->getBool("standardreplies", true));
 	}
 
 	void OnAccountChange(User* user, const std::string& newaccount) CXX11_OVERRIDE