Store CommandInfo in CommandSource instead of just command/permission

49 files changed, 236 insertions, 212 deletions

diff --git a/include/commands.h b/include/commands.h
index 5431df7a5..d3aa180a2 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -35,8 +35,6 @@ struct CommandInfo
 {
 	typedef Anope::map<CommandInfo> map;
 
-	CommandInfo() : hide(false), prepend_channel(false) { }
-
 	/* Service name of the command */
 	Anope::string name;
 	/* User visible name */
@@ -46,9 +44,9 @@ struct CommandInfo
 	/* Group this command is in */
 	Anope::string group;
 	/* whether or not to hide this command in help output */
-	bool hide;
+	bool hide = false;
 	/* Only used with fantasy */
-	bool prepend_channel;
+	bool prepend_channel = false;
 };
 
 /* Where the replies from commands go to. User inheits from this and is the normal
@@ -67,6 +65,8 @@ class CoreExport CommandSource
 	Anope::string nick;
 	/* User executing the command, may be NULL */
 	Reference<User> u;
+	/* Command info being executed */
+	CommandInfo command;
  public:
 	/* The account executing the command */
 	Reference<NickServ::Account> nc;
@@ -76,10 +76,6 @@ class CoreExport CommandSource
 	Reference<Channel> c;
 	/* The service this command is on */
 	Reference<ServiceBot> 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, NickServ::Account *core, CommandReply *reply, ServiceBot *bi);
 
@@ -87,7 +83,14 @@ class CoreExport CommandSource
 	User *GetUser();
 	NickServ::Account *GetAccount();
 	Anope::string GetSource();
+
 	const Anope::string &GetCommand() const;
+	void SetCommand(const Anope::string &);
+
+	const Anope::string &GetPermission() const;
+
+	const CommandInfo &GetCommandInfo() const;
+	void SetCommandInfo(const CommandInfo &);
 
 	ChanServ::AccessGroup AccessFor(ChanServ::Channel *ci);
 	bool IsFounder(ChanServ::Channel *ci);
diff --git a/modules/botserv/assign.cpp b/modules/botserv/assign.cpp
index db368c75e..bb2d35879 100644
--- a/modules/botserv/assign.cpp
+++ b/modules/botserv/assign.cpp
@@ -96,7 +96,7 @@ class CommandBSAssign : public Command
 		               "Example:\n"
 			       "         {command} #anope Botox\n"
 			       "         Assigns the bot Botox to #anope.\n"),
-		               "ASSIGN", "command"_kw = source.command);
+		               "ASSIGN", "command"_kw = source.GetCommand());
 		return true;
 	}
 };
@@ -164,7 +164,7 @@ class CommandBSUnassign : public Command
 		               "Example:\n"
 			       "         {command} #anope\n"
 			       "         Unassigns the current bot from #anope.\n"),
-		               "ASSIGN", "command"_kw = source.command);
+		               "ASSIGN", "command"_kw = source.GetCommand());
 		return true;
 	}
 };
@@ -208,7 +208,7 @@ class CommandBSSetNoBot : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, source.command);
+			this->OnSyntaxError(source, source.GetCommand());
 		}
 	}
 
@@ -220,7 +220,7 @@ class CommandBSSetNoBot : public Command
 		               "Example:\n"
 			       "         {command} #anope on\n"
 			       "         Prevents a service bot from being assigned to #anope.\n"),
-		               "command"_kw = source.command);
+		               "command"_kw = source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/botserv/badwords.cpp b/modules/botserv/badwords.cpp
index 071414ac4..3de381d34 100644
--- a/modules/botserv/badwords.cpp
+++ b/modules/botserv/badwords.cpp
@@ -388,7 +388,7 @@ class CommandBSBadwords : public Command
 			               "Examples:\n"
 			               "         {command} #anope ADD raw SINGLE\n"
 			               "         Adds the bad word \"raw\" to the bad word list of #anope."),
-			               "command"_kw = source.command);
+			               "command"_kw = source.GetCommand());
 		}
 		else if (subcommand.equals_ci("DEL"))
 		{
@@ -400,7 +400,7 @@ class CommandBSBadwords : public Command
 			               "\n"
 			               "         {command} #anope DEL 2-5,7-9\n"
 			               "         Removes bad words entries numbered 2 through 5 and 7 through 9 on #anope."),
-			               "command"_kw = source.command);
+			               "command"_kw = source.GetCommand());
 
 		}
 		else if (subcommand.equals_ci("LIST"))
@@ -415,7 +415,7 @@ class CommandBSBadwords : public Command
 			               "\n"
 			               "         {command} #anope LIST 2-5,7-9\n"
 			               "         Lists bad words entries numbered 2 thorough 5 and 7 through 9 on #anope."),
-			               "command"_kw = source.command);
+			               "command"_kw = source.GetCommand());
 		}
 		else if (subcommand.equals_ci("CLEAR"))
 		{
@@ -425,7 +425,7 @@ class CommandBSBadwords : public Command
 			               "Example:\n"
 			               "         {command} #anope CLEAR\n"
 			               "         Clears the bad word list for #anope."),
-			               "command"_kw = source.command);
+			               "command"_kw = source.GetCommand());
 		}
 		else
 		{
@@ -448,7 +448,7 @@ class CommandBSBadwords : public Command
 				               "\n"
 				               "The \002LIST\002 and \002CLEAR\002 commands show and clear the bad words list, respectively.\n"
 				               "\002{msg}{service} {help} {command} LIST\002 and \002{msg}{service} {help} {command} CLEAR\002 for more information.\n"),
-				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "command"_kw = source.command, "help"_kw = help->cname);
+				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "command"_kw = source.GetCommand(), "help"_kw = help->cname);
 		}
 		return true;
 	}
diff --git a/modules/botserv/bot.cpp b/modules/botserv/bot.cpp
index 4eb5d2069..ab48dc82e 100644
--- a/modules/botserv/bot.cpp
+++ b/modules/botserv/bot.cpp
@@ -394,7 +394,7 @@ class CommandBSBot : public Command
 			               "Example:\n"
 			               "         {command} ADD Botox Botox services.anope.org Botox\n"
 			               "         Adds a service bot with nickname \"Botox\", username \"Botox\", hostname \"services.anope.org\", and realname \"Botox\" to the bot list."),
-			               "botserv/bot/add", "command"_kw = source.command);
+			               "botserv/bot/add", "command"_kw = source.GetCommand());
 		else if (subcommand.equals_ci("CHANGE"))
 			source.Reply(_("\002{command} CHANGE\002 allows changing the \037nickname\037, \037username\037, \037hostname\037 and \037realname\037 of bot \037oldnickname\037."
 			               " If a new username, hostname, or realname is specified, then the bot \037nickname\037 will quit and rejoin all of its channels using the new mask."
@@ -404,7 +404,7 @@ class CommandBSBot : public Command
 			               "Example:\n"
 			               "         {command} CHANGE Botox peer connection reset.by peer\n"
 			               "          Renames the bot \"Botox\" to \"peer\" with the given username, hostname, and realname."),
-			               "botserv/bot/change", "command"_kw = source.command);
+			               "botserv/bot/change", "command"_kw = source.GetCommand());
 		else if (subcommand.equals_ci("DEL"))
 			source.Reply(_("\002{command} DEL\002 removes the bot \037nickname\037 from the bot list. The bot will quit from any channels it is in, and will not be replaced."
 			               " This command requires the operator privilege for command \002{0}\002.\n"
@@ -412,7 +412,7 @@ class CommandBSBot : public Command
 			               "Example:\n"
 			               "         {command} DEL peer\n"
 			               "         Removes the bot \"peer\" from the bot list."),
-			               "botserv/bot/del", "command"_kw = source.command);
+			               "botserv/bot/del", "command"_kw = source.GetCommand());
 		else
 		{
 			source.Reply(_("Allows Services Operators to create, modify, and delete bots that users will be able to use on their channels."));
@@ -428,7 +428,7 @@ class CommandBSBot : public Command
 			                       "\n"
 			                       "The \002{command} DEL\002 removes the bot \037nickname\037 from the bot list.\n"
 			                       "\002{msg}{service} {help} {command} DEL\002 for more information."),
-			                       "msg"_kw = Config->StrictPrivmsg, "help"_kw = help->cname, "command"_kw = source.command);
+			                       "msg"_kw = Config->StrictPrivmsg, "help"_kw = help->cname, "command"_kw = source.GetCommand());
 		}
 		return true;
 	}
diff --git a/modules/botserv/botlist.cpp b/modules/botserv/botlist.cpp
index 6c12a2c59..e9ce213a6 100644
--- a/modules/botserv/botlist.cpp
+++ b/modules/botserv/botlist.cpp
@@ -80,7 +80,7 @@ class CommandBSBotList : public Command
 		source.Reply(_("\n"
 		               "Example:\n"
 		               "         {command} BOTLIST"),
-		               "command"_kw = source.command);
+		               "command"_kw = source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/botserv/control.cpp b/modules/botserv/control.cpp
index 1785e65e9..6a8edc200 100644
--- a/modules/botserv/control.cpp
+++ b/modules/botserv/control.cpp
@@ -155,7 +155,7 @@ class CommandBSAct : public Command
 		                "Example:\n"
 		                "         {command} #anope slaps Cronus\n"
 		                "         Shows the assigned service bot \"slapping\" Cronus."),
-		                "command"_kw = source.command);
+		                "command"_kw = source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/botserv/kick.cpp b/modules/botserv/kick.cpp
index 745525fa3..84939c963 100644
--- a/modules/botserv/kick.cpp
+++ b/modules/botserv/kick.cpp
@@ -533,7 +533,7 @@ class CommandBSKick : public Command
 		               "\n"
 		               "Available kickers:"));
 
-		Anope::string this_name = source.command;
+		Anope::string this_name = source.GetCommand();
 		for (CommandInfo::map::const_iterator it = source.service->commands.begin(), it_end = source.service->commands.end(); it != it_end; ++it)
 		{
 			const Anope::string &c_name = it->first;
@@ -544,7 +544,7 @@ class CommandBSKick : public Command
 				ServiceReference<Command> command(info.name);
 				if (command)
 				{
-					source.command = c_name;
+					source.SetCommand(c_name);
 					command->OnServHelp(source);
 				}
 			}
@@ -1114,7 +1114,7 @@ class CommandBSSetDontKickOps : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, source.command);
+			this->OnSyntaxError(source, source.GetCommand());
 		}
 	}
 
@@ -1180,7 +1180,7 @@ class CommandBSSetDontKickVoices : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, source.command);
+			this->OnSyntaxError(source, source.GetCommand());
 		}
 	}
 
diff --git a/modules/botserv/main/botserv.cpp b/modules/botserv/main/botserv.cpp
index 4b0309b31..522b55489 100644
--- a/modules/botserv/main/botserv.cpp
+++ b/modules/botserv/main/botserv.cpp
@@ -158,29 +158,29 @@ class BotServCore : public Module, public BotServ::BotServService
 
 		if (source.c)
 		{
-			source.Reply(_("\002%s\002 allows you to execute \"fantasy\" commands in the channel.\n"
+			source.Reply(_("\002{0}\002 allows you to execute \"fantasy\" commands in the channel.\n"
 					"Fantasy commands are commands that can be executed from messaging a\n"
 					"channel, and provide a more convenient way to execute commands. Commands that\n"
 					"require a channel as a parameter will automatically have that parameter\n"
-					"given.\n"), source.service->nick.c_str());
+					"given.\n"), source.service->nick);
 			const Anope::string &fantasycharacters = Config->GetModule("fantasy")->Get<Anope::string>("fantasycharacter", "!");
 			if (!fantasycharacters.empty())
 				source.Reply(_(" \n"
-						"Fantasy commands may be prefixed with one of the following characters: %s\n"), fantasycharacters.c_str());
+						"Fantasy commands may be prefixed with one of the following characters: {0}\n"), fantasycharacters);
 			source.Reply(_(" \n"
 					"Available commands are:"));
 		}
 		else if (*source.service == BotServ)
 		{
-			source.Reply(_("\002%s\002 allows you to have a bot on your own channel.\n"
+			source.Reply(_("\002{0}\002 allows you to have a bot on your own channel.\n"
 				"It has been created for users that can't host or\n"
 				"configure a bot, or for use on networks that don't\n"
 				"allow user bots. Available commands are listed\n"
-				"below; to use them, type \002%s%s \037command\037\002. For\n"
+				"below; to use them, type \002{1}{2} \037command\037\002. For\n"
 				"more information on a specific command, type\n"
-				"\002%s%s %s \037command\037\002.\n"),
-				BotServ->nick.c_str(), Config->StrictPrivmsg.c_str(), BotServ->nick.c_str(),
-				Config->StrictPrivmsg.c_str(), BotServ->nick.c_str(), source.command.c_str());
+				"\002{3}{4} {5} \037command\037\002.\n"),
+				BotServ->nick, Config->StrictPrivmsg, BotServ->nick,
+				Config->StrictPrivmsg, BotServ->nick, source.GetCommand());
 		}
 
 		return EVENT_CONTINUE;
diff --git a/modules/botserv/set.cpp b/modules/botserv/set.cpp
index 6845281cb..da3b42f92 100644
--- a/modules/botserv/set.cpp
+++ b/modules/botserv/set.cpp
@@ -41,7 +41,7 @@ class CommandBSSet : public Command
 			"Available options:"));
 		bool hide_privileged_commands = Config->GetBlock("options")->Get<bool>("hideprivilegedcommands"),
 		     hide_registered_commands = Config->GetBlock("options")->Get<bool>("hideregisteredcommands");
-		Anope::string this_name = source.command;
+		Anope::string this_name = source.GetCommand();
 		for (CommandInfo::map::const_iterator it = source.service->commands.begin(), it_end = source.service->commands.end(); it != it_end; ++it)
 		{
 			const Anope::string &c_name = it->first;
@@ -58,7 +58,7 @@ class CommandBSSet : public Command
 					if (hide_privileged_commands && !info.permission.empty() && !source.HasCommand(info.permission))
 						continue;
 
-					source.command = it->first;
+					source.SetCommand(it->first);
 					command->OnServHelp(source);
 				}
 			}
@@ -192,7 +192,7 @@ class CommandBSSetPrivate : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, source.command);
+			this->OnSyntaxError(source, source.GetCommand());
 		}
 	}
 
diff --git a/modules/chanserv/access.cpp b/modules/chanserv/access.cpp
index 6ad67733e..36307c52f 100644
--- a/modules/chanserv/access.cpp
+++ b/modules/chanserv/access.cpp
@@ -553,7 +553,7 @@ class CommandCSAccess : public Command
 			               " The \037level\037 may be a numerical level between \002{1}\002 and \002{2}\002 or the name of a privilege (eg. \002{3}\002)."
 			               " The privilege set granted to a given user is the union of the privileges of access entries that match the user."
 			               " Use of this command requires the \002{4}\002 privilege on \037channel\037."),
-			               source.command, ChanServ::ACCESS_INVALID + 1, ChanServ::ACCESS_FOUNDER - 1, "AUTOOP", "ACCESS_CHANGE");
+			               source.GetCommand(), ChanServ::ACCESS_INVALID + 1, ChanServ::ACCESS_FOUNDER - 1, "AUTOOP", "ACCESS_CHANGE");
 
 			if (!Config->GetModule("chanserv/main")->Get<bool>("disallow_channel_access"))
 				source.Reply(_("The given \037mask\037 may also be a channel, which will use the access list from the other channel up to the given \037level\037."));
@@ -577,7 +577,7 @@ class CommandCSAccess : public Command
 			               "Example:\n"
 			               "         {command} #anope del DukePyrolator\n"
 			               "         Removes the access of \"DukePyrolator\" from \"#anope\"."),
-			               source.command, "ACCESS_CHANGE");
+			               source.GetCommand(), "ACCESS_CHANGE");
 		else if (subcommand.equals_ci("LIST") || subcommand.equals_ci("VIEW"))
 			source.Reply(_("The \002{0} LIST\002 and \002{0} VIEW\002 command displays the access list of \037channel\037."
 			               " If a wildcard mask is given, only those entries matching the mask are displayed."
@@ -588,11 +588,11 @@ class CommandCSAccess : public Command
 			               "Example:\n"
 					"         {0} #anope LIST 2-5,7-9\n"
 					"         Lists access entries numbered 2 through 5 and 7 through 9 on #anope."),
-			                source.command, "ACCESS_LIST");
+			                source.GetCommand(), "ACCESS_LIST");
 		else if (subcommand.equals_ci("CLEAR"))
 			source.Reply(_("The \002{0} CLEAR\002 command clears the access list of \037channel\037."
 				       " Use of this command requires the \002{1}\002 privilege on \037channel\037."),
-			               source.command, "FOUNDER");
+			               source.GetCommand(), "FOUNDER");
 
 		else
 		{
@@ -624,7 +624,7 @@ class CommandCSAccess : public Command
 				               "The \002CLEAR\002 command clears the access list."
 				               "Use of this command requires the \002{founder}\002 privilege on \037channel\037.\n"
 				               "\002{msg}{service} {help} {command} CLEAR\002 for more information."),
-				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "command"_kw = source.command,
+				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "command"_kw = source.GetCommand(),
 				               "help"_kw = help->cname, "change"_kw = "ACCESS_CHANGE", "list"_kw = "ACCESS_LIST", "founder"_kw = "FOUNDER");
 		}
 
@@ -668,7 +668,7 @@ class CommandCSLevels : public Command
 			CommandInfo *help = source.service->FindCommand("generic/help");
 			if (help)
 				source.Reply(_("There is no such privilege \002{0}\002. See \002{0}{1} {2} {3}\002 for a list of valid settings."),
-						what, Config->StrictPrivmsg, source.service->nick, help->cname, source.command);
+						what, Config->StrictPrivmsg, source.service->nick, help->cname, source.GetCommand());
 		}
 		else
 		{
@@ -712,7 +712,7 @@ class CommandCSLevels : public Command
 		CommandInfo *help = source.service->FindCommand("generic/help");
 		if (help)
 			source.Reply(_("There is no such privilege \002{0}\002. See \002{0}{1} {2} {3}\002 for a list of valid settings."),
-			               what, Config->StrictPrivmsg, source.service->nick, help->cname, source.command);
+			               what, Config->StrictPrivmsg, source.service->nick, help->cname, source.GetCommand());
 	}
 
 	void DoList(CommandSource &source, ChanServ::Channel *ci)
@@ -878,7 +878,7 @@ class CommandCSLevels : public Command
 			               "\002{0} RESET\002 resets the levels to the default levels for newly registered channels.\n"
 			               "\n"
 			               "For the list of privileges and their descriptions, see \002{3} {4} DESC\002."),
-				       source.command, name, "FOUNDER", help->cname, source.command);
+				       source.GetCommand(), name, "FOUNDER", help->cname, source.GetCommand());
 		}
 		return true;
 	}
diff --git a/modules/chanserv/akick.cpp b/modules/chanserv/akick.cpp
index 35bca6818..60d6530e4 100644
--- a/modules/chanserv/akick.cpp
+++ b/modules/chanserv/akick.cpp
@@ -620,7 +620,7 @@ class CommandCSAKick : public Command
 			               "\n"
 			               "         {command} #anope ADD Guest*!*@*\n"
 			               "         Adds the mask \"Guest*!*@*\" to the auto kick list of \"#anope\"."),
-			               source.command);
+			               source.GetCommand());
 		else if (subcommand.equals_ci("DEL"))
 			source.Reply(_("The \002{0} DEL\002 command removes \037mask\037 from the auto kick list."
 			               " It does not, however, remove any bans placed by an auto kick; those must be removed manually.\n"
@@ -628,7 +628,7 @@ class CommandCSAKick : public Command
 			               "Example:\n"
 			               "         {command} #anope DEL Cronus!\n"
 			               "         Removes the auto kick for \"Cronus\" from the auto kick list of \"#anope\".\n"),
-			               source.command);
+			               source.GetCommand());
 		else if (subcommand.equals_ci("LIST") || subcommand.equals_ci("VIEW"))
 			source.Reply(_("The \002{0} LIST\002 and \002{0} VIEW\002 command displays the auto kick list of \037channel\037."
 			               " If a wildcard mask is given, only those entries matching the mask are displayed."
@@ -638,7 +638,7 @@ class CommandCSAKick : public Command
 			               "Example:\n"
 			               "         \002{0} #anope LIST 2-5,7-9\002\n"
 			               "         Lists auto kick entries numbered 2 through 5 and 7 through 9 on #anope."),
-			               source.command);
+			               source.GetCommand());
 		else if (subcommand.equals_ci("ENFORCE"))
 			source.Reply(_("The \002{0} ENFORCE\002 command enforces the auto kick list by forcibly removing users who match an entry on the auto kick list."
 			               "This can be useful if someone does not authenticate or change their host mask until after joining.\n"
@@ -646,14 +646,14 @@ class CommandCSAKick : public Command
 			               "Example:\n"
 			               "         \002{0} #anope ENFORCE\002\n"
 			               "         Enforces the auto kick list of #anope."),
-			               source.command);
+			               source.GetCommand());
 		else if (subcommand.equals_ci("CLEAR"))
 			source.Reply(_("The \002{0} CLEAR\002 command clears the auto kick list of \037channel\37. As with the \002DEL\002 command, existing bans placed by auto kick will not be removed.\n"
 			               "\n"
 			               "Example:\n"
 			               "         \002{0} #anope CLEAR\002\n"
 			               "         Clears the auto kick list of #anope."),
-			               source.command);
+			               source.GetCommand());
 		else
 		{
 			source.Reply(_("Maintains the auto kick list for \037channel\037."
@@ -678,7 +678,7 @@ class CommandCSAKick : public Command
 				               ""
 				               "The \002CLEAR\002 clears the auto kick list of \037channel\037."
 				               "\002{msg}{service} {help} {command} CLEAR\002 for more information.\n"),
-				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "help"_kw = help->cname, "command"_kw = source.command);
+				               "msg"_kw = Config->StrictPrivmsg, "service"_kw = source.service->nick, "help"_kw = help->cname, "command"_kw = source.GetCommand());
 		}
 
 		return true;
diff --git a/modules/chanserv/entrymsg.cpp b/modules/chanserv/entrymsg.cpp
index b2edbc56f..8867fe6ab 100644
--- a/modules/chanserv/entrymsg.cpp
+++ b/modules/chanserv/entrymsg.cpp
@@ -264,7 +264,7 @@ class CommandEntryMessage : public Command
 		               "The \002{0} CLEAR\002 command clears the entry message list.\n"
 		               "\n"
 		               "Use of this command requires the \002SET\002 privilege on \037channel\037."),
-		               source.command);
+		               source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/chanserv/flags.cpp b/modules/chanserv/flags.cpp
index d87863be0..d30d02b4a 100644
--- a/modules/chanserv/flags.cpp
+++ b/modules/chanserv/flags.cpp
@@ -471,7 +471,7 @@ class CommandCSFlags : public Command
 		               " If the mask has no more flags, then the mask is removed from the access list."
 		               " Additionally, you may use +* or -* to add or remove all flags, respectively."
 		               " You are only able to modify the access list if you have the \002{1}\002 privilege on the channel, and can only give privileges to up what you have."),
-		               source.command, "ACCESS_CHANGE");
+		               source.GetCommand(), "ACCESS_CHANGE");
 		source.Reply(" ");
 		source.Reply(_("The \002LIST\002 command allows you to list existing entries on the channel access list."
 		               " If \037mask\037 is given, the \037mask\037 is wildcard matched against all existing entries on the access list, and only those entries are returned."
diff --git a/modules/chanserv/list.cpp b/modules/chanserv/list.cpp
index cd855a0b3..4c6712b67 100644
--- a/modules/chanserv/list.cpp
+++ b/modules/chanserv/list.cpp
@@ -207,7 +207,7 @@ class CommandCSSetPrivate : public Command
 		if (MOD_RESULT == EVENT_STOP)
 			return;
 
-		if (MOD_RESULT != EVENT_ALLOW && !source.AccessFor(ci).HasPriv("SET") && source.permission.empty() && !source.HasPriv("chanserv/administration"))
+		if (MOD_RESULT != EVENT_ALLOW && !source.AccessFor(ci).HasPriv("SET") && source.GetPermission().empty() && !source.HasPriv("chanserv/administration"))
 		{
 			source.Reply(_("Access denied. You do not have privilege \002{0}\002 on \002{1}\002."), "SET", ci->GetName());
 			return;
diff --git a/modules/chanserv/log.cpp b/modules/chanserv/log.cpp
index 52724a57b..7e7fb084a 100644
--- a/modules/chanserv/log.cpp
+++ b/modules/chanserv/log.cpp
@@ -350,7 +350,7 @@ public:
 		               "Example:\n"
 		               "         {command} #anope chanserv/access MESSAGE @\n"
 		               "         Would message any channel operators of \"#anope\" whenever someone used the \"ACCESS\" command on ChanServ for \"#anope\"."),
-		               source.command, "SET");
+		               source.GetCommand(), "SET");
 		return true;