Store the source message identifier in CommandSource.

2 files changed, 13 insertions, 3 deletions

diff --git a/src/bots.cpp b/src/bots.cpp
index f468ff59f..7417db6e7 100644
--- a/src/bots.cpp
+++ b/src/bots.cpp
@@ -228,7 +228,12 @@ void BotInfo::OnMessage(User *u, const Anope::string &message, const Anope::map<
 	if (this->commands.empty())
 		return;
 
-	CommandSource source(u->nick, u, u->Account(), u, this);
+	Anope::string msgid;
+	auto iter = tags.find("msgid");
+	if (iter != tags.end())
+		msgid = iter->second;
+
+	CommandSource source(u->nick, u, u->Account(), u, this, msgid);
 	Command::Run(source, message);
 }
 
diff --git a/src/command.cpp b/src/command.cpp
index 7925e8bbd..2ac6cb7d7 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -17,8 +17,13 @@
 #include "regchannel.h"
 #include "channels.h"
 
-CommandSource::CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *r, BotInfo *bi) : nick(n), u(user), nc(core), reply(r),
-	c(NULL), service(bi)
+CommandSource::CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *r, BotInfo *bi, const Anope::string &m)
+	: nick(n)
+	, u(user)
+	, nc(core)
+	, reply(r)
+	, service(bi)
+	, msgid(m)
 {
 }