Combine all of the set modules now that having them split apart is almost completely pointless

42 files changed, 2848 insertions, 3863 deletions

diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 6f458bec0..7d880c659 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSSet : public Command
@@ -56,13 +54,375 @@ class CommandBSSet : public Command
 	}
 };
 
+class CommandBSSetDontKickOps : public Command
+{
+ public:
+	CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("To protect ops against bot kicks"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		ChannelInfo *ci = ChannelInfo::Find(params[0]);
+		if (ci == NULL)
+		{
+			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
+			return;
+		}
+
+		AccessGroup access = source.AccessFor(ci);
+		if (!source.HasPriv("botserv/administration") && !access.HasPriv("SET"))
+		{
+			source.Reply(ACCESS_DENIED);
+			return;
+		}
+
+		if (Anope::ReadOnly)
+		{
+			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
+			return;
+		}
+
+		if (params[1].equals_ci("ON"))
+		{
+			bool override = !access.HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickops"; 
+
+			ci->botflags.SetFlag(BS_DONTKICKOPS);
+			source.Reply(_("Bot \002won't kick ops\002 on channel %s."), ci->name.c_str());
+		}
+		else if (params[1].equals_ci("OFF"))
+		{
+			bool override = !access.HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickops"; 
+
+			ci->botflags.UnsetFlag(BS_DONTKICKOPS);
+			source.Reply(_("Bot \002will kick ops\002 on channel %s."), ci->name.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+				"Enables or disables \002ops protection\002 mode on a channel.\n"
+				"When it is enabled, ops won't be kicked by the bot\n"
+				"even if they don't match the NOKICK level."));
+		return true;
+	}
+};
+
+class CommandBSSetDontKickVoices : public Command
+{
+ public:
+	CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("To protect voices against bot kicks"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		ChannelInfo *ci = ChannelInfo::Find(params[0]);
+		if (ci == NULL)
+		{
+			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
+			return;
+		}
+
+		AccessGroup access = source.AccessFor(ci);
+		if (!source.HasPriv("botserv/administration") && !access.HasPriv("SET"))
+		{
+			source.Reply(ACCESS_DENIED);
+			return;
+		}
+
+		if (Anope::ReadOnly)
+		{
+			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
+			return;
+		}
+
+		if (params[1].equals_ci("ON"))
+		{
+			bool override = !access.HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickvoices"; 
+
+			ci->botflags.SetFlag(BS_DONTKICKVOICES);
+			source.Reply(_("Bot \002won't kick voices\002 on channel %s."), ci->name.c_str());
+		}
+		else if (params[1].equals_ci("OFF"))
+		{
+			bool override = !access.HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickvoices"; 
+
+			ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
+			source.Reply(_("Bot \002will kick voices\002 on channel %s."), ci->name.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+				"Enables or disables \002voices protection\002 mode on a channel.\n"
+				"When it is enabled, voices won't be kicked by the bot\n"
+				"even if they don't match the NOKICK level."));
+		return true;
+	}
+};
+
+class CommandBSSetFantasy : public Command
+{
+ public:
+	CommandBSSetFantasy(Module *creator, const Anope::string &sname = "botserv/set/fantasy") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("Enable fantaisist commands"));
+		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		ChannelInfo *ci = ChannelInfo::Find(params[0]);
+		const Anope::string &value = params[1];
+
+		if (ci == NULL)
+		{
+			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
+			return;
+		}
+
+		if (!source.HasPriv("botserv/administration") && !source.AccessFor(ci).HasPriv("SET"))
+		{
+			source.Reply(ACCESS_DENIED);
+			return;
+		}
+
+		if (Anope::ReadOnly)
+		{
+			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
+			return;
+		}
+
+		if (value.equals_ci("ON"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable fantasy"; 
+
+			ci->botflags.SetFlag(BS_FANTASY);
+			source.Reply(_("Fantasy mode is now \002on\002 on channel %s."), ci->name.c_str());
+		}
+		else if (value.equals_ci("OFF"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable fantasy"; 
+
+			ci->botflags.UnsetFlag(BS_FANTASY);
+			source.Reply(_("Fantasy mode is now \002off\002 on channel %s."), ci->name.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+				"Enables or disables \002fantasy\002 mode on a channel.\n"
+				"When it is enabled, users will be able to use\n"
+				"%s commands on a channel when prefixed\n"
+				"with one of the following fantasy characters: \002%s\002\n"
+				" \n"
+				"Note that users wanting to use fantaisist\n"
+				"commands MUST have enough level for both\n"
+				"the FANTASIA and another level depending\n"
+				"of the command if required (for example, to use \n"
+				"!op, user must have enough access for the OPDEOP\n"
+				"level)."), Config->ChanServ.c_str(), Config->BSFantasyCharacter.c_str());
+		return true;
+	}
+};
+
+class CommandBSSetGreet : public Command
+{
+ public:
+	CommandBSSetGreet(Module *creator, const Anope::string &sname = "botserv/set/greet") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("Enable greet messages"));
+		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		ChannelInfo *ci = ChannelInfo::Find(params[0]);
+		const Anope::string &value = params[1];
+
+		if (ci == NULL)
+		{
+			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
+			return;
+		}
+
+		if (!source.HasPriv("botserv/administration") && !source.AccessFor(ci).HasPriv("SET"))
+		{
+			source.Reply(ACCESS_DENIED);
+			return;
+		}
+
+		if (Anope::ReadOnly)
+		{
+			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
+			return;
+		}
+
+		if (value.equals_ci("ON"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable greets"; 
+
+			ci->botflags.SetFlag(BS_GREET);
+			source.Reply(_("Greet mode is now \002on\002 on channel %s."), ci->name.c_str());
+		}
+		else if (value.equals_ci("OFF"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable greets"; 
+
+			ci->botflags.UnsetFlag(BS_GREET);
+			source.Reply(_("Greet mode is now \002off\002 on channel %s."), ci->name.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+			"Enables or disables \002greet\002 mode on a channel.\n"
+			"When it is enabled, the bot will display greet\n"
+			"messages of users joining the channel, provided\n"
+			"they have enough access to the channel."));
+		return true;
+	}
+};
+
+class CommandBSSetNoBot : public Command
+{
+ public:
+	CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("Prevent a bot from being assigned to a channel"));
+		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		ChannelInfo *ci = ChannelInfo::Find(params[0]);
+		const Anope::string &value = params[1];
+
+		if (ci == NULL)
+		{
+			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
+			return;
+		}
+
+		if (value.equals_ci("ON"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_ADMIN : LOG_COMMAND, source, this, ci) << "to enable nobot"; 
+
+			ci->botflags.SetFlag(BS_NOBOT);
+			if (ci->bi)
+				ci->bi->UnAssign(source.GetUser(), ci);
+			source.Reply(_("No Bot mode is now \002on\002 on channel %s."), ci->name.c_str());
+		}
+		else if (value.equals_ci("OFF"))
+		{
+			bool override = !source.AccessFor(ci).HasPriv("SET");
+			Log(override ? LOG_ADMIN : LOG_COMMAND, source, this, ci) << "to disable nobot"; 
+
+			ci->botflags.UnsetFlag(BS_NOBOT);
+			source.Reply(_("No Bot mode is now \002off\002 on channel %s."), ci->name.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+				"This option makes a channel be unassignable. If a bot \n"
+				"is already assigned to the channel, it is unassigned\n"
+				"automatically when you enable the option."));
+		return true;
+	}
+};
+
+class CommandBSSetPrivate : public Command
+{
+ public:
+	CommandBSSetPrivate(Module *creator, const Anope::string &sname = "botserv/set/private") : Command(creator, sname, 2, 2)
+	{
+		this->SetDesc(_("Prevent a bot from being assigned by non IRC operators"));
+		this->SetSyntax(_("\037botname\037 {\037ON|OFF\037}"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	{
+		BotInfo *bi = BotInfo::Find(params[0], true);
+		const Anope::string &value = params[1];
+
+		if (bi == NULL)
+		{
+			source.Reply(BOT_DOES_NOT_EXIST, params[0].c_str());
+			return;
+		}
+
+		if (value.equals_ci("ON"))
+		{
+			bi->SetFlag(BI_PRIVATE);
+			source.Reply(_("Private mode of bot %s is now \002on\002."), bi->nick.c_str());
+		}
+		else if (value.equals_ci("OFF"))
+		{
+			bi->UnsetFlag(BI_PRIVATE);
+			source.Reply(_("Private mode of bot %s is now \002off\002."), bi->nick.c_str());
+		}
+		else
+			this->OnSyntaxError(source, source.command);
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
+	{
+		this->SendSyntax(source);
+		source.Reply(_(" \n"
+			"This option prevents a bot from being assigned to a\n"
+			"channel by users that aren't IRC operators."));
+		return true;
+	}
+};
+
 class BSSet : public Module
 {
 	CommandBSSet commandbsset;
+	CommandBSSetDontKickOps commandbssetdontkickops;
+	CommandBSSetDontKickVoices commandbssetdontkickvoices;
+	CommandBSSetFantasy commandbssetfantasy;
+	CommandBSSetNoBot commandbssetnobot;
+	CommandBSSetPrivate commandbssetprivate;
 
  public:
 	BSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbsset(this)
+		commandbsset(this), commandbssetdontkickops(this), commandbssetdontkickvoices(this),
+		commandbssetfantasy(this), commandbssetnobot(this), commandbssetprivate(this)
 	{
 		this->SetAuthor("Anope");
 
diff --git a/modules/commands/bs_set_dontkickops.cpp b/modules/commands/bs_set_dontkickops.cpp
deleted file mode 100644
index 5346074a6..000000000
--- a/modules/commands/bs_set_dontkickops.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSSetDontKickOps : public Command
-{
- public:
-	CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2)
-	{
-		this->SetDesc(_("To protect ops against bot kicks"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelInfo *ci = ChannelInfo::Find(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		AccessGroup access = source.AccessFor(ci);
-		if (!source.HasPriv("botserv/administration") && !access.HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (Anope::ReadOnly)
-		{
-			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickops"; 
-
-			ci->botflags.SetFlag(BS_DONTKICKOPS);
-			source.Reply(_("Bot \002won't kick ops\002 on channel %s."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickops"; 
-
-			ci->botflags.UnsetFlag(BS_DONTKICKOPS);
-			source.Reply(_("Bot \002will kick ops\002 on channel %s."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, source.command);
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(_(" \n"
-				"Enables or disables \002ops protection\002 mode on a channel.\n"
-				"When it is enabled, ops won't be kicked by the bot\n"
-				"even if they don't match the NOKICK level."));
-		return true;
-	}
-};
-
-class BSSetDontKickOps : public Module
-{
-	CommandBSSetDontKickOps commandbssetdontkickops;
-
- public:
-	BSSetDontKickOps(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbssetdontkickops(this)
-	{
-		this->SetAuthor("Anope");
-	}
-};
-
-MODULE_INIT(BSSetDontKickOps)
diff --git a/modules/commands/bs_set_dontkickvoices.cpp b/modules/commands/bs_set_dontkickvoices.cpp
deleted file mode 100644
index b4b0cd7ec..000000000
--- a/modules/commands/bs_set_dontkickvoices.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSSetDontKickVoices : public Command
-{
- public:
-	CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2)
-	{
-		this->SetDesc(_("To protect voices against bot kicks"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelInfo *ci = ChannelInfo::Find(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		AccessGroup access = source.AccessFor(ci);
-		if (!source.HasPriv("botserv/administration") && !access.HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (Anope::ReadOnly)
-		{
-			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickvoices"; 
-
-			ci->botflags.SetFlag(BS_DONTKICKVOICES);
-			source.Reply(_("Bot \002won't kick voices\002 on channel %s."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickvoices"; 
-
-			ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
-			source.Reply(_("Bot \002will kick voices\002 on channel %s."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, source.command);
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(_(" \n"
-				"Enables or disables \002voices protection\002 mode on a channel.\n"
-				"When it is enabled, voices won't be kicked by the bot\n"
-				"even if they don't match the NOKICK level."));
-		return true;
-	}
-};
-
-class BSSetDontKickVoices : public Module
-{
-	CommandBSSetDontKickVoices commandbssetdontkickvoices;
-
- public:
-	BSSetDontKickVoices(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbssetdontkickvoices(this)
-	{
-		this->SetAuthor("Anope");
-	}
-};
-
-MODULE_INIT(BSSetDontKickVoices)
diff --git a/modules/commands/bs_set_fantasy.cpp b/modules/commands/bs_set_fantasy.cpp
deleted file mode 100644
index 29c722026..000000000
--- a/modules/commands/bs_set_fantasy.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSSetFantasy : public Command
-{
- public:
-	CommandBSSetFantasy(Module *creator, const Anope::string &sname = "botserv/set/fantasy") : Command(creator, sname, 2, 2)
-	{
-		this->SetDesc(_("Enable fantaisist commands"));
-		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelInfo *ci = ChannelInfo::Find(params[0]);
-		const Anope::string &value = params[1];
-
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (!source.HasPriv("botserv/administration") && !source.AccessFor(ci).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (Anope::ReadOnly)
-		{
-			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
-			return;
-		}
-
-		if (value.equals_ci("ON"))
-		{
-			bool override = !source.AccessFor(ci).HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable fantasy"; 
-
-			ci->botflags.SetFlag(BS_FANTASY);
-			source.Reply(_("Fantasy mode is now \002on\002 on channel %s."), ci->name.c_str());
-		}
-		else if (value.equals_ci("OFF"))
-		{
-			bool override = !source.AccessFor(ci).HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable fantasy"; 
-
-			ci->botflags.UnsetFlag(BS_FANTASY);
-			source.Reply(_("Fantasy mode is now \002off\002 on channel %s."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, source.command);
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(_(" \n"
-				"Enables or disables \002fantasy\002 mode on a channel.\n"
-				"When it is enabled, users will be able to use\n"
-				"%s commands on a channel when prefixed\n"
-				"with one of the following fantasy characters: \002%s\002\n"
-				" \n"
-				"Note that users wanting to use fantaisist\n"
-				"commands MUST have enough level for both\n"
-				"the FANTASIA and another level depending\n"
-				"of the command if required (for example, to use \n"
-				"!op, user must have enough access for the OPDEOP\n"
-				"level)."), Config->ChanServ.c_str(), Config->BSFantasyCharacter.c_str());
-		return true;
-	}
-};
-
-class BSSetFantasy : public Module
-{
-	CommandBSSetFantasy commandbssetfantasy;
-
- public:
-	BSSetFantasy(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbssetfantasy(this)
-	{
-		this->SetAuthor("Anope");
-	}
-};
-
-MODULE_INIT(BSSetFantasy)
diff --git a/modules/commands/bs_set_greet.cpp b/modules/commands/bs_set_greet.cpp
deleted file mode 100644
index ad5220203..000000000
--- a/modules/commands/bs_set_greet.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSSetGreet : public Command
-{
- public:
-	CommandBSSetGreet(Module *creator, const Anope::string &sname = "botserv/set/greet") : Command(creator, sname, 2, 2)
-	{
-		this->SetDesc(_("Enable greet messages"));
-		this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelInfo *ci = ChannelInfo::Find(params[0]);
-		const Anope::string &value = params[1];
-
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (!source.HasPriv("botserv/administration") && !source.AccessFor(ci).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (Anope::ReadOnly)
-		{
-			source.Reply(_("Sorry, bot option setting is temporarily disabled."));
-			return;
-		}
-
-		if (value.equals_ci("ON"))
-		{
-			bool override = !source.AccessFor(ci).HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci)