X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=1077e65a720e293d0915f5675c729b60a117fdfc;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=8e839f54b3cce9fd45ad586a6de62ef64b1f6a11;hpb=192ae99685903cfb71bbf70edc450c4a6314621e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 8e839f54b..1077e65a7 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -2,23 +2,26 @@
  *       | 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
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 #include "inspircd.h"
+#include <stdarg.h>
 
 /* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
 
 class DelayJoinMode : public ModeHandler
 {
+	CUList empty;
+	Module* Creator;
  public:
-	DelayJoinMode(InspIRCd* Instance) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	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)
 	{
@@ -31,6 +34,16 @@ class DelayJoinMode : public ModeHandler
 			}
 			else
 			{
+				if (channel->IsModeSet('D'))
+				{
+					/* Make all delayed join users visible, or if an op removes +D
+					 * while users exist that havent spoken, they remain permenantly
+					 * invisible on this channel!
+					 */
+					CUList* names = channel->GetUsers();
+					for (CUListIter n = names->begin(); n != names->end(); ++n)
+						Creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty);
+				}
 				channel->SetMode('D', adding);
 				return MODEACTION_ALLOW;
 			}
@@ -51,21 +64,24 @@ class ModuleDelayJoin : public Module
 	ModuleDelayJoin(InspIRCd* Me)
 		: Module(Me)
 	{
-		djm = new DelayJoinMode(ServerInstance);
-		if (!ServerInstance->AddMode(djm))
+		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 };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 	
 	virtual ~ModuleDelayJoin()
 	{
 		ServerInstance->Modes->DelMode(djm);
-		DELETE(djm);
+		delete djm;
 	}
 
-	Priority Prioritize()
+	void Prioritize()
 	{
-		/* To ensure that we get priority over namesx for names list generation on +u channels */
-		return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
+		/* 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()
@@ -73,10 +89,6 @@ class ModuleDelayJoin : public Module
 		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;
-	}
 
 	virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
 	{
@@ -106,7 +118,7 @@ class ModuleDelayJoin : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		if (channel->IsModeSet('D'))
 		{
@@ -177,7 +189,11 @@ class ModuleDelayJoin : public Module
 			return;
 
 		/* Display the join to everyone else (the user who joined got it earlier) */
-		channel->WriteAllExcept(user, false, 0, exempt_list, "JOIN %s", channel->name);
+		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);
@@ -191,6 +207,34 @@ class ModuleDelayJoin : public Module
 
 		user->Shrink("delayjoin");
 	}
+
+	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+	{
+		va_list argsPtr;
+		char textbuffer[MAXBUF];
+		char tb[MAXBUF];
+
+		va_start(argsPtr, text);
+		vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+		va_end(argsPtr);
+		snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+
+		CUList *ulist = channel->GetUsers();
+
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+		{
+			/* User doesnt get a JOIN sent to themselves */
+			if (user == i->first)
+				continue;
+
+			/* Users with a visibility state that hides them dont appear */
+			if (user->Visibility && !user->Visibility->VisibleTo(i->first))
+				continue;
+
+			i->first->Write(std::string(tb));
+		}
+	}
+
 };
 
 MODULE_INIT(ModuleDelayJoin)