Store CommandInfo in CommandSource instead of just command/permission

5 files changed, 6 insertions, 6 deletions

diff --git a/modules/memoserv/del.cpp b/modules/memoserv/del.cpp
index fbefe180e..ffd7656b7 100644
--- a/modules/memoserv/del.cpp
+++ b/modules/memoserv/del.cpp
@@ -135,7 +135,7 @@ class CommandMSDel : public Command
 		               "\n"
 		               "         {0} 2-5,7-9\n"
 		               "         Deletes memos numbered 2 through 5 and 7 through 9."),
-		               source.command);
+		               source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/memoserv/info.cpp b/modules/memoserv/info.cpp
index 045e4cb6d..533664d91 100644
--- a/modules/memoserv/info.cpp
+++ b/modules/memoserv/info.cpp
@@ -214,7 +214,7 @@ class CommandMSInfo : public Command
 		               " With a parameter, displays the same information for the given \037user\037 or \037channel\037, if you have the appropriate privilege.\n"
 			       "\n"
 			       "Use of this command on a channel requires the \002{0}\002 privilege on \037channel\037."),
-		               source.command);
+		               source.GetCommand());
 
 		return true;
 	}
diff --git a/modules/memoserv/read.cpp b/modules/memoserv/read.cpp
index c875c8db9..706682a32 100644
--- a/modules/memoserv/read.cpp
+++ b/modules/memoserv/read.cpp
@@ -198,7 +198,7 @@ class CommandMSRead : public Command
 		               "\n"
 		               "         {0} 2-5,7-9\n"
 		               "         Displays memos numbered 2 through 5 and 7 through 9."),
-		               source.command);
+		               source.GetCommand());
 		return true;
 	}
 };
diff --git a/modules/memoserv/send.cpp b/modules/memoserv/send.cpp
index fdde189f9..31dfc4e66 100644
--- a/modules/memoserv/send.cpp
+++ b/modules/memoserv/send.cpp
@@ -61,7 +61,7 @@ class CommandMSSend : public Command
 		}
 		else if (result == MemoServ::MemoServService::MEMO_TOO_FAST)
 		{
-			source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv/main")->Get<time_t>("senddelay"), source.command);
+			source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv/main")->Get<time_t>("senddelay"), source.GetCommand());
 		}
 		else if (result == MemoServ::MemoServService::MEMO_TARGET_FULL)
 		{
diff --git a/modules/memoserv/set.cpp b/modules/memoserv/set.cpp
index 12f5e5b8d..6ae0e1ba0 100644
--- a/modules/memoserv/set.cpp
+++ b/modules/memoserv/set.cpp
@@ -253,7 +253,7 @@ class CommandMSSet : public Command
 			               "                receive\n"
 			               "\n"
 			               "Type \002{0}{1} {2} {3} \037option\037\002 for more information on a specific option."),
-			               Config->StrictPrivmsg, source.service->nick, help->cname, source.command);
+			               Config->StrictPrivmsg, source.service->nick, help->cname, source.GetCommand());
 		}
 		else if (subcommand.equals_ci("NOTIFY"))
 		{
@@ -295,7 +295,7 @@ class CommandMSSet : public Command
 				               " \n"
 				               "This use of the \002{0} LIMIT\002 command is limited to \002Services Operators\002."
 				               " Other users may only enter a limit for themselves or a channel on which they have the \002MEMO\002 privilege on, may not remove their limit, may not set a limit above {1}, and may not set a hard limit."),
-				               source.command, max_memos);
+				               source.GetCommand(), max_memos);
 			else
 				source.Reply(_("Syntax: \002LIMIT [\037channel\037] \037limit\037\002\n"
 				               "\n"