Added chanserv:require config option to set which modes must be on all registered channels. Prevents the core from always enforcing +r on every channel, even if chanserv is not loaded.

2 files changed, 20 insertions, 12 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index f3310b745..312b10dca 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -171,6 +171,26 @@ chanserv
 	 * This directive is optional.
 	 */
 	#opersonly = yes
+
+	/*
+	 * Default modes for mode lock, these are set on newly registered channels.
+	 *
+	 * If not set, the default is +nrt.
+	 */
+	mlock = "+nrt"
+
+	/*
+	 * Modes that will not be allowed to be locked. Oper only modes such as +O
+	 * are always restricted from regular users and are not affected by this.
+	 * Comment out for no restrictions.
+	 */
+	#nomlock = "P"
+
+	/*
+	 * Modes that are required to be set and only set on all registered channels.
+	 * These modes can not be locked or unlocked.
+	 */
+	require = "r"
 }
 
 /*
diff --git a/data/example.conf b/data/example.conf
index a746051c0..5744265f0 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -465,18 +465,6 @@ options
 	#ulineservers = "stats.your.network"
 
 	/*
-	 * Default modes for mode lock, these are set on newly registered channels.
-	 */
-	mlock = "+nrt"
-
-	/*
-	 * Modes that will not be allowed to be locked. Oper only modes such as +O
-	 * are always restricted from regular users and are not affected by this.
-	 * Comment out for no restrictions.
-	 */
-	nomlock = "z"
-
-	/*
 	 * Modes to set on service bots when they join channels, comment this out for no modes
 	 *
 	 * This directive is optional.