Change extensible keys to require explicitly having a type defined for it. Completely modularize more features like bs_kick, entrymsg, log, mode, etc. Move fantasy to its own module. Move greet to its own module.

1 files changed, 23 insertions, 31 deletions

diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 36eec61e1..dab48996a 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -94,9 +94,9 @@ module
 	 * -   killprotect: Kill nick if not identified within 60 seconds
 	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
 	 *                   option and the above must be specified with this one
-	 * -        secure: Enable nickname security, requiring the nick's password before any operations
+	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
 	 *                   can be done on it
-	 * -       private: Hide the nick from NickServ's LIST command
+	 * -    ns_private: Hide the nick from NickServ's LIST command
 	 * -    hide_email: Hide's the nick's e-mail address from NickServ's INFO command
 	 * - hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command
 	 * -     hide_quit: Hide's the nick's last quit message
@@ -106,10 +106,10 @@ module
 	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
 	 *                   options:useprivmsg to be enabled as well
 	 *
-	 * This directive is optional, if left blank, the options will default to secure, memo_signon, and
+	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "secure private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
 
 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -125,14 +125,6 @@ module
 	expire = 21d
 
 	/*
-	 * The length of time a user using an unconfirmed account has
-	 * before the account will be released for general use again.
-	 *
-	 * This directive is only required if the e-mail registration option is enabled.
-	 */
-	#unconfirmedexpire = 1d
-
-	/*
 	 * Prevents the use of the ACCESS (excluding the LIST subcommand), DROP, FORBID, SUSPEND,
 	 * GETPASS and SET PASSWORD commands by services operators on other services operators.
 	 *
@@ -350,19 +342,24 @@ command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"
 /*
  * ns_info
  *
- * Provides the command nickserv/info.
+ * Provides the commands:
+ * nickserv/info. - Used for gathering information about an account.
+ * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publically shown in nickserv/info.
  *
- * Used for gathering information about an account.
  */
 module { name = "ns_info" }
 command { service = "NickServ"; name = "INFO"; command = "nickserv/info"; }
 
+command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
+command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; }
+
 /*
  * ns_list
  *
- * Provides the command nickserv/list.
+ * Provides the commands:
+ *   nickserv/list - Used for retrieving and searching the registered account list.
+ *   nickserv/set/private, nickserv/saset/private - Used for configuring whether or a users account shows up in nickserv/list.
  *
- * Used for retrieving and searching the registered account list.
  */
 module
 {
@@ -375,6 +372,9 @@ module
 }
 command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; group = "nickserv/admin"; }
 
+command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
+command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; }
+
 /*
  * ns_logout
  *
@@ -441,6 +441,12 @@ module
 	 * This directive is optional.
 	 */
 	#nickregdelay = 30s
+
+	/*
+	 * The length of time a user using an unconfirmed account has
+	 * before the account will be released for general use again.
+	 */
+	#unconfirmedexpire = 1d
 }
 
 command { service = "NickServ"; name = "CONFIRM"; command = "nickserv/confirm"; }
@@ -465,17 +471,12 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   nickserv/set/autoop, nickserv/saset/autoop - Determines whether or not modes are automatically set users when joining a channel.
  *   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/greet, nickserv/saset/greet - Used for changing a users greet message, which is displayed when they enter channels.
- *   nicksrev/set/hide, nickserv/saset/hide -  Used for configuring which options are publically shown in nickserv/info for users account.
  *   nickserv/set/kill, nickserv/saset/kill - Used for configuring nickname protection.
  *   nickserv/set/language, nickserv/saset/language - Used for configuring what language services use.
  *   nickserv/set/message, nickserv/saset/message - Used to configure how services send messages to you.
- *   nickserv/set/password, nickserv/saset/password  - Used for changing a users greet password.
- *   nickserv/set/private, nickserv/saset/private - Used for configuring whether or a users account shows up in nickserv/list.
+ *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
  *   nickserv/set/secure, nickserv/saset/secure - Used for configuring whether a user can identify by simply being recognized by nickserv/access.
  *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
- *
- * This is a dummy command to provide a help wrapper for the various SET and SASET commands.
  */
 module
 {
@@ -502,12 +503,6 @@ command { service = "NickServ"; name = "SASET DISPLAY"; command = "nickserv/sase
 command { service = "NickServ"; name = "SET EMAIL"; command = "nickserv/set/email"; }
 command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/email"; permission = "nickserv/saset/email"; }
 
-command { service = "NickServ"; name = "SET GREET"; command = "nickserv/set/greet"; }
-command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet"; }
-
-command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
-command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; }
-
 command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
 command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill"; }
 
@@ -520,9 +515,6 @@ command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/sase
 command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
 command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; }
 
-command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
-command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; }
-
 command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/secure"; }
 command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; }