X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=ef7d96f5adfe7d59221834dfdaa94eb5fae16321;hb=8fd2f620cef9d43a7271d05e82bdce6705b9af3b;hp=1b631033a2740fe3103c9b4f19e2c3753d030ffe;hpb=703ff062904cefd60420282cb5f25f22576b7932;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 1b631033a..ef7d96f5a 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -6,19 +6,22 @@
  * 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,7 +64,7 @@ class ModuleDelayJoin : public Module
 	ModuleDelayJoin(InspIRCd* Me)
 		: Module(Me)
 	{
-		djm = new DelayJoinMode(ServerInstance);
+		djm = new DelayJoinMode(ServerInstance, this);
 		if (!ServerInstance->AddMode(djm))
 			throw ModuleException("Could not add new modes!");
 	}
@@ -75,14 +88,14 @@ class ModuleDelayJoin : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		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)
 	{
-		if (!nameslist)
-			return 0;
+		CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
+
+		nl.clear();
 
 		/* For +D channels ... */
 		if (Ptr->IsModeSet('D'))
@@ -93,11 +106,13 @@ class ModuleDelayJoin : public Module
 			/* Modify the names list, erasing users with the delay join metadata
 			 * for this channel (havent spoken yet)
 			 */
-			for (CUListIter n = nameslist->begin(); n != nameslist->end(); ++n)
-			{				
+			for (CUListIter n = newlist->begin(); n != newlist->end(); ++n)
+			{
 				if (!n->first->GetExt(key))
 					nl.insert(*n);
 			}
+
+			/* Always show self */
 			nl[user] = user->nick;
 			nameslist = &nl;
 		}
@@ -164,18 +179,18 @@ class ModuleDelayJoin : public Module
 		}
 	}
 
-	int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type != TYPE_CHANNEL)
-			return 0;
+			return;
 
 		Channel* channel = (Channel*) dest;
 
 		if (!user->GetExt(std::string("delayjoin_")+channel->name))
-			return 0;
+			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);
 
 		/* Shrink off the neccessary metadata for a specific channel */
 		user->Shrink(std::string("delayjoin_")+channel->name);
@@ -185,17 +200,38 @@ class ModuleDelayJoin : public Module
 		 */
 		for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
 			if (f->first->IsModeSet('D'))
-				return 0;
+				return;
 
 		user->Shrink("delayjoin");
-
-		return 0;
 	}
 
-	int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
 	{
-		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
+		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)