Promote PopulateInfoMap to core, it is moderately useful

6 files changed, 11 insertions, 23 deletions

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 2a7498cef..a4126ed81 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -78,7 +78,7 @@ class ModuleDeaf : public Module
 		{
 			Channel* chan = (Channel*)dest;
 			if (chan)
-				this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
+				this->BuildDeafList(chan, user, status, text, exempt_list);
 		}
 
 		return MOD_RES_PASSTHRU;
@@ -90,13 +90,13 @@ class ModuleDeaf : public Module
 		{
 			Channel* chan = (Channel*)dest;
 			if (chan)
-				this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
+				this->BuildDeafList(chan, user, status, text, exempt_list);
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
+	virtual void BuildDeafList(Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
 	{
 		const UserMembList *ulist = chan->GetUsers();
 		bool is_a_uline;
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index b56043ef0..08cdaada0 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -299,9 +299,9 @@ class ModuleSilence : public Module
 		output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence);
 	}
 
-	void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
+	void OnBuildExemptList(bool is_msg, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
 	{
-		int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
+		int public_silence = (is_msg ? SILENCE_CHANNEL : SILENCE_CNOTICE);
 		const UserMembList *ulist = chan->GetUsers();
 
 		for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
@@ -327,7 +327,7 @@ class ModuleSilence : public Module
 			Channel* chan = (Channel*)dest;
 			if (chan)
 			{
-				this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list, "");
+				this->OnBuildExemptList(silence_type == SILENCE_PRIVATE, chan, user, status, exempt_list, "");
 			}
 		}
 		return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index c13a10bb6..0b4aa0832 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -137,7 +137,7 @@ class ModuleSQLAuth : public Module
 		pendingExt.set(user, AUTH_STATE_BUSY);
 
 		ParamM userinfo;
-		PopulateUserInfo(user, userinfo);
+		user->PopulateInfoMap(userinfo);
 		userinfo["pass"] = user->password;
 
 		HashProvider* md5 = ServerInstance->Modules->FindDataService<HashProvider>("hash/md5");
diff --git a/src/modules/m_sqlcommand.cpp b/src/modules/m_sqlcommand.cpp
index c27ec560e..faf1b4846 100644
--- a/src/modules/m_sqlcommand.cpp
+++ b/src/modules/m_sqlcommand.cpp
@@ -55,7 +55,7 @@ class UserQuery : public SQLQuery
 		int rows = res.Rows();
 		std::string format = tag->getString("rowformat");
 		std::map<std::string, std::string> items;
-		PopulateUserInfo(user, items);
+		user->PopulateInfoMap(items);
 		if (!format.empty())
 		{
 			SQLEntries result;
@@ -91,7 +91,7 @@ class UserQuery : public SQLQuery
 		if (!format.empty())
 		{
 			std::map<std::string, std::string> items;
-			PopulateUserInfo(user, items);
+			user->PopulateInfoMap(items);
 			items.insert(std::make_pair("msg", error.str));
 			user->SendText(FormatSubst(format, items));
 		}
@@ -119,7 +119,7 @@ class SQLCommand : public Command
 			return CMD_FAILURE;
 
 		ParamM userinfo;
-		PopulateUserInfo(user, userinfo);
+		user->PopulateInfoMap(userinfo);
 		for(unsigned int i=0; i < parameters.size(); i++)
 			userinfo.insert(std::make_pair(ConvToStr(i + 1), parameters[i]));
 		std::string fmt = tag->getString("queryformat");
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index f0ee9eadf..7e097e61c 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -178,7 +178,7 @@ public:
 		HashProvider* hash = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + hashtype);
 
 		ParamM userinfo;
-		PopulateUserInfo(user, userinfo);
+		user->PopulateInfoMap(userinfo);
 		userinfo["username"] = username;
 		userinfo["password"] = hash ? hash->hexsum(password) : password;
 
diff --git a/src/modules/sql.h b/src/modules/sql.h
index 557fc13f3..1d210dd0f 100644
--- a/src/modules/sql.h
+++ b/src/modules/sql.h
@@ -166,16 +166,4 @@ class SQLProvider : public DataProvider
 	virtual void submit(SQLQuery* callback, const std::string& format, const ParamM& p) = 0;
 };
 
-/** Convenience function to prepare a map from a User* */
-inline void PopulateUserInfo(User* user, ParamM& userinfo)
-{
-	userinfo["nick"] = user->nick;
-	userinfo["host"] = user->host;
-	userinfo["ip"] = user->GetIPString();
-	userinfo["gecos"] = user->fullname;
-	userinfo["ident"] = user->ident;
-	userinfo["server"] = user->server;
-	userinfo["uuid"] = user->uuid;
-}
-
 #endif