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.

4 files changed, 112 insertions, 93 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 1bd450123..299289416 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -100,13 +100,6 @@ module
 	#smartjoin = yes
 
 	/*
-	 * Defines the prefixes for fantasy commands in channels. One of these characters will have to be prepended
-	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
-	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
-	 */
-	#fantasycharacter = "!."
-
-	/*
 	 * Modes to set on service bots when they join channels, comment this out for no modes
 	 *
 	 * This directive is optional.
@@ -137,13 +130,17 @@ command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
 /*
  * bs_assign
  *
- * Provides the commands botserv/assign and botserv/unassign.
+ * Provides the commands:
+ *   botserv/assign - Used to assign BotServ bots to channels
+ *   botserv/unassign - Used to unassign BotServ bots
+ *   botserv/set/nobot - Used to prohibit channels from being assigned BotServ bots.
  *
  * Used for assigning and unassigning bots to channels.
  */
 module { name = "bs_assign" }
 command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign"; }
 command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign"; }
+command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"; permission = "botserv/set/nobot"; }
 
 /*
  * bs_autoassign
@@ -240,6 +237,8 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *   botserv/kick/repeat - Configures BotServ's repeat kicker.
  *   botserv/kick/reverses - Configures BotServ's reverse kicker.
  *   botserv/kick/underlines - Configures BotServ's reverse kicker.
+ *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
+ *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
  *
  * Used for configuring what bots should kick for.
  */
@@ -275,30 +274,71 @@ command { service = "BotServ"; name = "KICK REPEAT"; command = "botserv/kick/rep
 command { service = "BotServ"; name = "KICK REVERSES"; command = "botserv/kick/reverses"; }
 command { service = "BotServ"; name = "KICK UNDERLINES"; command = "botserv/kick/underlines"; }
 
+command { service = "BotServ"; name = "SET DONTKICKOPS"; command = "botserv/set/dontkickops"; }
+command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/set/dontkickvoices"; }
+
 /*
  * bs_set
  *
  * Provides the commands:
- *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
- *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
- *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasist commands.
- *   botserv/set/greet - Used for enabling or disabling BotServ's greet messages in a channel.
- *   botserv/set/nobot - Used to prohibit specific channels from being assigned BotServ bots.
  *   botserv/set/private - Used to prohibit specific BotServ bots from being assigned to channels.
- *
- * Used for setting options such as kickers and fantasy replies.
  */
 module { name = "bs_set" }
 command { service = "BotServ"; name = "SET"; command = "botserv/set"; }
 command { service = "BotServ"; name = "SET BANEXPIRE"; command = "botserv/set/banexpire"; }
-command { service = "BotServ"; name = "SET DONTKICKOPS"; command = "botserv/set/dontkickops"; }
-command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/set/dontkickvoices"; }
-command { service = "BotServ"; name = "SET FANTASY"; command = "botserv/set/fantasy"; }
-command { service = "BotServ"; name = "SET GREET"; command = "botserv/set/greet"; }
-command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"; permission = "botserv/set/nobot"; }
 command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/private"; permission = "botserv/set/private"; }
 
 /*
+ * greet
+ *
+ * Provides the commands:
+ *   botserv/set/greet - Used for enabling or disabling BotServ's greet messages in a channel.
+ *   nickserv/set/greet, nickserv/saset/greet - Used for changing a users greet message, which is displayed when they enter channels.
+ */
+module { name = "greet" }
+command { service = "BotServ"; name = "SET GREET"; command = "botserv/set/greet"; }
+command { service = "NickServ"; name = "SET GREET"; command = "nickserv/set/greet"; }
+command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet"; }
+
+/*
+ * GREET privilege.
+ *
+ * Used by 'greet'.
+ *
+ * Users with this privilege have their greet shown when they join channels.
+ */
+privilege
+{
+	name = "GREET"
+	rank = 40
+	level = 5
+	flag = "g"
+	xop = "AOP"
+}
+
+
+/*
+ * fantasy
+ *
+ * Allows 'fantaisist' commands to be used in channels.
+ *
+ * Provides the commands:
+ *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasist commands.
+ */
+module
+{
+	name = "fantasy"
+
+	/*
+	 * Defines the prefixes for fantasy commands in channels. One of these characters will have to be prepended
+	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
+	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
+	 */
+	#fantasycharacter = "!."
+}
+command { service = "BotServ"; name = "SET FANTASY"; command = "botserv/set/fantasy"; }
+
+/*
  * Fantasy commands
  *
  * Fantasy commands can be executed in channels that have a BotServ bot by prefixing the
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 6dc40991a..184c170fd 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -74,9 +74,9 @@ module
 	 * -     keeptopic: Retain topic when the channel is not in use
 	 * -         peace: Disallow users from kicking or removing modes from others who are of the same
 	 *                    access level or superior
-	 * -       private: Hide the channel from ChanServ's LIST command
+	 * -    cs_private: Hide the channel from ChanServ's LIST command
 	 * -    restricted: Kick/ban users who are restricted from the channel
-	 * -        secure: Enable channel security, requiring the user to be identified with NickServ in
+	 * -     cs_secure: Enable channel security, requiring the user to be identified with NickServ in
 	 *                    order to be considered for being on the access list of the channel
 	 * -     secureops: Only allow operator status to be given if the user is on the access list
 	 * - securefounder: Only allow the real founder of the channel to drop the channel, change it's
@@ -89,10 +89,10 @@ module
 	 * -      noautoop: Disables autoop on the channel
 	 * -          none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, secure, securefounder,
+	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
 	 * and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "keeptopic peace secure securefounder signkick"
+	defaults = "keeptopic peace cs_secure securefounder signkick"
 
 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
@@ -111,18 +111,6 @@ module
 	expire = 14d
 
 	/*
-	 * The default ban type for newly registered channels.
-	 *
-	 * defbantype can be:
-	 *
-	 * 0: ban in the form of *!user@host
-	 * 1: ban in the form of *!*user@host
-	 * 2: ban in the form of *!*@host
-	 * 3: ban in the form of *!*user@*.domain
-	 */
-	defbantype = 2
-
-	/*
 	 * The maximum number of entries on a channel's access list.
 	 */
 	accessmax = 1024
@@ -424,22 +412,6 @@ privilege
 }
 
 /*
- * GREET privilege.
- *
- * Used by botserv/main.
- *
- * Users with this permission get their greet shown on join.
- */
-privilege
-{
-	name = "GREET"
-	rank = 40
-	level = 5
-	flag = "g"
-	xop = "AOP"
-}
-
-/*
  * HALFOP privilege.
  *
  * Used by chanserv/mode, chanserv/halfop and chanserv/dehalfop.
@@ -983,9 +955,9 @@ command { service = "ChanServ"; name = "KICK"; command = "chanserv/kick"; }
 /*
  * cs_list
  *
- * Provides the command chanserv/list.
- *
- * Used for retrieving and searching the registered channel list.
+ * Provides the commands:
+ *   chanserv/list - Used for retrieving and searching the registered channel list.
+ *   chanserv/set/private - Used for setting whether channels should show up in chanserv/list.
  */
 module
 {
@@ -998,6 +970,7 @@ module
 }
 
 command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin"; }
+command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; }
 
 /*
  * cs_log
@@ -1057,10 +1030,8 @@ cs_seen
  *   chanserv/set/bantype - Used for controlling what format of bans are placed on channels.
  *   chanserv/set/description - Used for changing channels descriptions.
  *   chanserv/set/founder - Used for changing a channel's founder.
- *   chanserv/set/keeptopic -  Used for configuring if ChanServ is to restore the channel topic when a channel is created.
  *   chanserv/set/peace - Used for configuring if users are able to kick other users with higher access than them.
  *   chanserv/set/persist - Used for setting whether ChanServ should stay in channels after the last user leaves.
- *   chanserv/set/private - Used for setting whether channels should show up in chanserv/list.
  *   chanserv/set/restricted - Used for setting whether users not on a channel's access list can join.
  *   chanserv/set/secure - Used for setting whether users who are recognized for accounts should have their access in channels.
  *   chanserv/set/securefounder - Used for setting whether users with founder level access in channels have true founder or not.
@@ -1071,7 +1042,22 @@ cs_seen
  *
  * This is a dummy command to provide a help wrapper for the various SET commands.
  */
-module { name = "cs_set" }
+module
+{
+	name = "cs_set"
+
+	/*
+	 * The default ban type for newly registered channels.
+	 *
+	 * defbantype can be:
+	 *
+	 * 0: ban in the form of *!user@host
+	 * 1: ban in the form of *!*user@host
+	 * 2: ban in the form of *!*@host
+	 * 3: ban in the form of *!*user@*.domain
+	 */
+	defbantype = 2
+}
 
 command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management"; }
 command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
@@ -1079,10 +1065,8 @@ command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/ba
 command { service = "ChanServ"; name = "SET DESCRIPTION"; command = "chanserv/set/description"; }
 command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; }
 command { service = "ChanServ"; name = "SET FOUNDER"; command = "chanserv/set/founder"; }
-command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; }
 command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; }
 command { service = "ChanServ"; name = "SET PERSIST"; command = "chanserv/set/persist"; }
-command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; }
 command { service = "ChanServ"; name = "SET RESTRICTED"; command = "chanserv/set/restricted"; }
 command { service = "ChanServ"; name = "SET SECURE"; command = "chanserv/set/secure"; }
 command { service = "ChanServ"; name = "SET SECUREFOUNDER"; command = "chanserv/set/securefounder"; }
@@ -1149,12 +1133,14 @@ command { service = "ChanServ"; name = "SYNC"; command = "chanserv/sync"; group
 /*
  * cs_topic
  *
- * Provides the command chanserv/topic.
+ * Provides the commands:
+ *   chanserv/topic - Used for changing the channel topic. Useful in conjunction with chanserv/set/topiclock.
+ *   chanserv/set/keeptopic - Used for configuring if ChanServ is to restore the channel topic when a channel is created.
  *
- * Used for changing the channel topic. Useful in conjunction with chanserv/set/topiclock.
  */
 module { name = "cs_topic" }
 command { service = "ChanServ"; name = "TOPIC"; command = "chanserv/topic"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; }
 
 /*
  * cs_unban
diff --git a/data/example.conf b/data/example.conf
index b8ec96a9c..41a1a0163 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1109,6 +1109,7 @@ mail
  * [DEPRECATED] db_plain
  *
  * This is the flatfile database format from Anope-1.9.2 to Anope-1.9.5.
+ * This module only loads this database, and will NOT save it.
  * To convert from this format, load both this and db_flatfile. Be sure to name db_flatfile's
  * target database to something else. Start Anope then shut down so the new database will be written.
  * Then unload this and restart Anope, loading from the new database.
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"; }