Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 48 insertions, 38 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index b0cc513ae..8f67c4be2 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -56,17 +56,14 @@ service
  *
  * Provides essential functionality for BotServ.
  */
-module { name = "botserv" }
-
-/*
- * Configuration for BotServ provided by bs_main.
- */
-botserv
+module
 {
+	name = "botserv"
+
 	/*
 	 * The name of the client that should be BotServ.
 	 */
-	name = "BotServ"
+	client = "BotServ"
 
 	/*
 	 * The default bot options for newly registered channels. Note that changing these options
@@ -92,19 +89,6 @@ botserv
 	minusers = 1
 
 	/*
-	 * The maximum number of entries a single bad words list can have. Setting it too high can
-	 * reduce performance slightly.
-	 */
-	badwordsmax = 32
-
-	/*
-	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
-	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
-	 * resources will be slightly affected.
-	 */
-	keepdata = 10m
-
-	/*
 	 * The bots are currently not affected by any modes or bans when they try to join a channel.
 	 * But some people may want to make it act like a real bot, that is, for example, remove all
 	 * the bans affecting the bot before joining the channel, remove a ban that affects the bot
@@ -116,26 +100,18 @@ botserv
 	#smartjoin = yes
 
 	/*
-	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
-	 * This is especially useful if you have young people on your network.
-	 *
-	 * This directive is optional.
+	 * 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 "!".
 	 */
-	gentlebadwordreason = yes
+	#fantasycharacter = "!."
 
 	/*
-	 * If set, BotServ will use case sensitive checking for badwords.
+	 * Modes to set on service bots when they join channels, comment this out for no modes
 	 *
 	 * This directive is optional.
 	 */
-	#casesensitive = 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 = "!."
+	botmodes = "ao"
 }
 
 /*
@@ -184,7 +160,22 @@ bs_autoassign
  *
  * Used for controlling the channel badword list.
  */
-module { name = "bs_badwords" }
+module
+{
+	name = "bs_badwords"
+
+	/*
+	 * The maximum number of entries a single bad words list can have.
+	 */
+	badwordsmax = 32
+
+	/*
+	 * If set, BotServ will use case sensitive checking for badwords.
+	 *
+	 * This directive is optional.
+	 */
+	#casesensitive = yes
+}
 command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords"; }
 
 /*
@@ -246,7 +237,26 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *
  * Used for configuring what bots should kick for.
  */
-module { name = "bs_kick" }
+module
+{
+	name = "bs_kick"
+
+	/*
+	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
+	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
+	 * resources will be slightly affected.
+	 */
+	keepdata = 10m
+
+	/*
+	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
+	 * This is especially useful if you have young people on your network.
+	 *
+	 * This directive is optional.
+	 */
+	gentlebadwordreason = yes
+}
+
 command { service = "BotServ"; name = "KICK"; command = "botserv/kick"; }
 command { service = "BotServ"; name = "KICK AMSG"; command = "botserv/kick/amsg"; }
 command { service = "BotServ"; name = "KICK BADWORDS"; command = "botserv/kick/badwords"; }
@@ -285,7 +295,8 @@ command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/priv
 /* Fantasy commands
  *
  * Fantasy commands can be executed in channels that have a BotServ bot by prefixing the
- * command with one of the fantasy characters configured in botserv:fantasycharacter.
+ * command with one of the fantasy characters configured in botserv's fantasycharacter
+ * directive.
  *
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
@@ -321,7 +332,6 @@ fantasy { name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chan
 fantasy { name = "UP"; command = "chanserv/up"; }
 fantasy { name = "VOP"; command = "chanserv/vop"; }
 
-
 /* Use m_rewrite to rewrite the op, deop, etc. fantasy commands (see chanserv.conf). */
 fantasy { name = "OWNER"; command = "rewrite"; }
 fantasy { name = "DEOWNER"; command = "rewrite"; }