X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=056fafac4eecde7b447355d29698dcd4b3260d0f;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=d978921a14335c7bce35e92bc481ae3132905310;hpb=f6bd92ab87208b104baba2eaa99236d0b03d8552;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index d978921a1..056fafac4 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,7 +23,7 @@ class DelayJoinMode : public ModeHandler
  public:
 	DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false), Creator(Parent) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (channel->IsModeSet('D') != adding)
 		{
@@ -65,62 +65,40 @@ class ModuleDelayJoin : public Module
 		: Module(Me)
 	{
 		djm = new DelayJoinMode(ServerInstance, this);
-		if (!ServerInstance->AddMode(djm))
+		if (!ServerInstance->Modes->AddMode(djm))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 	
 	virtual ~ModuleDelayJoin()
 	{
 		ServerInstance->Modes->DelMode(djm);
-		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);
+		delete djm;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
-	}
-
-	void Implements(char* List)
-	{
-		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnText] = 1;
+		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 &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		if (channel->IsModeSet('D'))
 		{
@@ -193,6 +171,10 @@ class ModuleDelayJoin : public Module
 		/* Display the join to everyone else (the user who joined got it earlier) */
 		this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
 
+		std::string n = this->ServerInstance->Modes->ModeString(user, channel);
+		if (n.length() > 0)
+			this->WriteCommonFrom(user, channel, "MODE %s +%s", channel->name, n.c_str());
+
 		/* Shrink off the neccessary metadata for a specific channel */
 		user->Shrink(std::string("delayjoin_")+channel->name);