Move the set option to its own module.

This is the first step of rewriting nickname protection.

1 files changed, 24 insertions, 16 deletions

diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 001137feb..a62379053 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -521,22 +521,11 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   nickserv/set/display, nickserv/saset/display - Used for setting a users display name.
  *   nickserv/set/email, nickserv/saset/email - Used for setting a users email address.
  *   nickserv/set/keepmodes, nickserv/saset/keepmodes - Configure whether or not services should retain a user's modes across sessions.
- *   nickserv/set/kill, nickserv/saset/kill - Used for configuring nickname protection.
  *   nickserv/set/neverop, nickserv/saset/neverop - Used to configure whether a user can be added to access lists
  *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
  *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
  */
-module
-{
-	name = "ns_set"
-
-	/*
-	 * Allow the use of the IMMED option in the NickServ SET KILL command.
-	 *
-	 * This directive is optional.
-	 */
-	#allowkillimmed = yes
-}
+module { name = "ns_set" }
 
 command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
 command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin"; }
@@ -553,9 +542,6 @@ command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/
 command { service = "NickServ"; name = "SET KEEPMODES"; command = "nickserv/set/keepmodes"; }
 command { service = "NickServ"; name = "SASET KEEPMODES"; command = "nickserv/saset/keepmodes"; permission = "nickserv/saset/keepmodes"; }
 
-command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
-command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill"; }
-
 command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
 command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; }
 
@@ -565,6 +551,28 @@ command { service = "NickServ"; name = "SASET NEVEROP"; command = "nickserv/sase
 command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }
 
 /*
+ * ns_set_kill
+ *
+ * Provides the commands nickserv/set/kill and kickserv/saset/kill.
+ *
+ * Used for configuring nickname protection.
+ */
+module
+{
+	name = "ns_set_kill"
+
+	/*
+	 * Allow the use of the IMMED option in the NickServ SET KILL command.
+	 *
+	 * This directive is optional.
+	 */
+	#allowkillimmed = yes
+}
+
+command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
+command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill"; }
+
+/*
  * ns_set_language
  *
  * Provides the command nickserv/set/language and nickserv/saset/language.
@@ -578,7 +586,7 @@ command { service = "NickServ"; name = "SASET LANGUAGE"; command = "nickserv/sas
 /*
  * ns_set_message
  *
- * Provides the command nickserv/set/message and nickserv/saset/message.
+ * Provides the commands nickserv/set/message and nickserv/saset/message.
  *
  * Allows users to let services send them PRIVMSGs instead of NOTICEs.
  *