convert to new api

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9143 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 12 insertions, 32 deletions

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 0bf9595e4..056fafac4 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -67,7 +67,7 @@ class ModuleDelayJoin : public Module
 		djm = new DelayJoinMode(ServerInstance, this);
 		if (!ServerInstance->Modes->AddMode(djm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnText };
+		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 	
@@ -77,45 +77,25 @@ class ModuleDelayJoin : public Module
 		delete djm;
 	}
 
-	void Prioritize()
-	{
-		/* To ensure that we get priority over namesx for names list generation */
-		Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
-	}
-
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-
-	virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+	virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
 	{
-		CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
-
-		nl.clear();
+		if (!channel->IsModeSet('D'))
+			return;
 
-		/* For +D channels ... */
-		if (Ptr->IsModeSet('D'))
-		{
-			std::string key("delayjoin_");
-			key.append(Ptr->name);
+		if (nick.empty())
+			return;
 
-			/* Modify the names list, erasing users with the delay join metadata
-			 * for this channel (havent spoken yet)
-			 */
-			for (CUListIter n = newlist->begin(); n != newlist->end(); ++n)
-			{
-				if (!n->first->GetExt(key))
-					nl.insert(*n);
-			}
+		/* If the user is hidden by delayed join, hide them from the NAMES list */
+		std::string key("delayjoin_");
+		key.append(channel->name);
 
-			/* Always show self */
-			nl[user] = user->nick;
-			nameslist = &nl;
-		}
-		return 0;
+		if (user->GetExt(key))
+			nick.clear();
 	}
 
 	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)