Fix fantasy !help & give it its own help header, not ChanServ's

3 files changed, 5 insertions, 7 deletions

diff --git a/include/bots.h b/include/bots.h
index fa3053b57..19f921dbb 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -43,8 +43,7 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Se
  public:
 	time_t created;			/* Birth date ;) */
 	time_t lastmsg;			/* Last time we said something */
-	typedef Anope::insensitive_map<CommandInfo> command_map;
-	command_map commands; /* Commands, actual name to service name */
+	CommandInfo::map commands; /* Commands, actual name to service name */
 	Anope::string botmodes;		/* Modes the bot should have as configured in service:modes */
 	std::vector<Anope::string> botchannels;	/* Channels the bot should be in as configured in service:channels */
 	bool introduced;		/* Whether or not this bot is introduced */
diff --git a/include/commands.h b/include/commands.h
index 45b122247..59e8f5f1c 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -29,6 +29,8 @@ const Anope::string CommandFlagStrings[] = {
 
 struct CommandInfo
 {
+	typedef Anope::insensitive_map<CommandInfo> map;
+
 	Anope::string name;
 	Anope::string permission;
 };
@@ -53,15 +55,13 @@ class CoreExport CommandSource
 	/* Channel the command was executed on (fantasy) */
 	dynamic_reference<Channel> c;
 	/* The service this command is on */
-	dynamic_reference<BotInfo> owner;
-	/* The service the reply should come from, *not* necessarily the service the command is on */
 	dynamic_reference<BotInfo> service;
 	/* The actual name of the command being executed */
 	Anope::string command;
 	/* The permission of the command being executed */
 	Anope::string permission;
 
-	CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *reply);
+	CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *reply, BotInfo *bi);
 
 	const Anope::string &GetNick() const;
 	User *GetUser();
diff --git a/include/config.h b/include/config.h
index f4f164b37..554959e38 100644
--- a/include/config.h
+++ b/include/config.h
@@ -690,8 +690,7 @@ class CoreExport ServerConfig
 	std::vector<Oper *> Opers;
 
 	/* Map of fantasy commands */
-	typedef Anope::insensitive_map<CommandInfo> fantasy_map;
-	fantasy_map Fantasy;
+	CommandInfo::map Fantasy;
 };
 
 /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.