Return ModResult from the OnSendWhoLine hook

5 files changed, 19 insertions, 17 deletions

diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 1bc03c78e..6cccb3634 100644
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -225,9 +225,9 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
 
 	wholine.append(" :0 " + u->fullname);
 
-	FOREACH_MOD(OnSendWhoLine, (user, parms, u, memb, wholine));
-
-	if (!wholine.empty())
+	ModResult res;
+	FIRST_MOD_RESULT(OnSendWhoLine, res, (user, parms, u, memb, wholine));
+	if (res != MOD_RES_DENY)
 		whoresults.push_back(wholine);
 }
 
diff --git a/src/modules.cpp b/src/modules.cpp
index b107a4b43..b9151b590 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -137,7 +137,7 @@ void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { De
 ModResult	Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnNumeric(User*, const Numeric::Numeric&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
-void		Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, std::string&) { DetachEvent(I_OnSendWhoLine); }
+ModResult	Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, std::string&) { DetachEvent(I_OnSendWhoLine); return MOD_RES_PASSTHRU; }
 void		Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
 
 #ifdef INSPIRCD_ENABLE_TESTSUITE
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 7ad7ba1a3..6185d6d95 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -149,15 +149,15 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
 		if (!memb)
-			return;
+			return MOD_RES_PASSTHRU;
 		if (IsVisible(memb))
-			return;
+			return MOD_RES_PASSTHRU;
 		if (CanSee(source, memb))
-			return;
-		line.clear();
+			return MOD_RES_PASSTHRU;
+		return MOD_RES_DENY;
 	}
 };
 
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 0fa5206ea..51b00de92 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -104,22 +104,23 @@ class ModuleHideOper : public Module, public Whois::LineEventListener
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
 		if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex"))
 		{
 			// hide the "*" that marks the user as an oper from the /WHO line
 			std::string::size_type spcolon = line.find(" :");
 			if (spcolon == std::string::npos)
-				return; // Another module hid the user completely
+				return MOD_RES_PASSTHRU;
 			std::string::size_type sp = line.rfind(' ', spcolon-1);
 			std::string::size_type pos = line.find('*', sp);
 			if (pos != std::string::npos)
 				line.erase(pos, 1);
 			// hide the line completely if doing a "/who * o" query
 			if (params.size() > 1 && params[1].find('o') != std::string::npos)
-				line.clear();
+				return MOD_RES_DENY;
 		}
+		return MOD_RES_PASSTHRU;
 	}
 
 	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index c906322bf..14f89807f 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -67,21 +67,21 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
 		if ((!memb) || (!cap.get(source)))
-			return;
+			return MOD_RES_PASSTHRU;
 
 		// Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
 		// only ever valid after whitespace, so... find the actual delimiter first!
 		// Thanks to FxChiP for pointing this out.
 		std::string::size_type pos = line.find(" :");
 		if (pos == std::string::npos || pos == 0)
-			return;
+			return MOD_RES_PASSTHRU;
 		pos--;
 		// Don't do anything if the user has no prefixes
 		if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
-			return;
+			return MOD_RES_PASSTHRU;
 
 		// 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
 		//                                                            pos
@@ -89,10 +89,11 @@ class ModuleNamesX : public Module
 		// Don't do anything if the user has only one prefix
 		std::string prefixes = memb->GetAllPrefixChars();
 		if (prefixes.length() <= 1)
-			return;
+			return MOD_RES_PASSTHRU;
 
 		line.erase(pos, 1);
 		line.insert(pos, prefixes);
+		return MOD_RES_PASSTHRU;
 	}
 };