X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=60bdd258277ab325751c29079a5eb5e0693b764d;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=502a9fb9f1e29f215b0d504790cb3e8c943bba8b;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 502a9fb9f..60bdd2582 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -85,19 +85,16 @@ class ModuleAuditorium : public Module
 		return false;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
+	ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		// Some module already hid this from being displayed, don't bother
-		if (nick.empty())
-			return;
-
 		if (IsVisible(memb))
-			return;
+			return MOD_RES_PASSTHRU;
 
 		if (CanSee(issuer, memb))
-			return;
+			return MOD_RES_PASSTHRU;
 
-		nick.clear();
+		// Don't display this user in the NAMES list
+		return MOD_RES_DENY;
 	}
 
 	/** Build CUList for showing this join/part/kick */
@@ -129,19 +126,21 @@ class ModuleAuditorium : public Module
 		BuildExcept(memb, excepts);
 	}
 
-	void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception) CXX11_OVERRIDE
+	void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE
 	{
-		UCListIter i = include.begin();
-		while (i != include.end())
+		for (IncludeChanList::iterator i = include.begin(); i != include.end(); )
 		{
-			Channel* c = *i++;
-			Membership* memb = c->GetUser(source);
-			if (!memb || IsVisible(memb))
+			Membership* memb = *i;
+			if (IsVisible(memb))
+			{
+				++i;
 				continue;
+			}
+
 			// this channel should not be considered when listing my neighbors
-			include.erase(c);
+			i = include.erase(i);
 			// however, that might hide me from ops that can see me...
-			const UserMembList* users = c->GetUsers();
+			const UserMembList* users = memb->chan->GetUsers();
 			for(UserMembCIter j = users->begin(); j != users->end(); j++)
 			{
 				if (IS_LOCAL(j->first) && CanSee(j->first, memb))
@@ -150,12 +149,10 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line) CXX11_OVERRIDE
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
-		Channel* channel = ServerInstance->FindChan(params[0]);
-		if (!channel)
+		if (!memb)
 			return;
-		Membership* memb = channel->GetUser(user);
 		if (IsVisible(memb))
 			return;
 		if (CanSee(source, memb))