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, 60 insertions, 20 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