X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=34d782c7718eeb7ed243b812e3ad6223a79a7c84;hb=9539fa9d7bcb19100bd5b7f67d6f792e48fff909;hp=cde9ed047f34d23690fc997b000be60643cda3b9;hpb=b868bb52c55fc902e0acab3c4a43576826817e85;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index cde9ed047..34d782c77 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Jens Voss <DukePyrolator@anope.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */
+
 #include "inspircd.h"
 #include <stdarg.h>
 
@@ -36,8 +47,8 @@ class ModuleDelayJoin : public Module
 	{
 		if (!ServerInstance->Modes->AddMode(&djm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
+		ServerInstance->Modules->Attach(eventlist, this, 7);
 	}
 	~ModuleDelayJoin();
 	Version GetVersion();
@@ -48,10 +59,9 @@ class ModuleDelayJoin : public Module
 	void OnUserKick(User* source, Membership*, const std::string &reason, CUList&);
 	void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception);
 	void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list);
+	ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string &param, bool adding, int pcnt);
 };
 
-/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
-
 ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* no change */
@@ -78,7 +88,7 @@ ModuleDelayJoin::~ModuleDelayJoin()
 
 Version ModuleDelayJoin::GetVersion()
 {
-	return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_COMMON | VF_VENDOR);
+	return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR);
 }
 
 void ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
@@ -145,7 +155,7 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std:
 	if (target_type != TYPE_CHANNEL)
 		return;
 
-	Channel* channel = (Channel*) dest;
+	Channel* channel = static_cast<Channel*>(dest);
 
 	Membership* memb = channel->GetUser(user);
 	if (!memb || !unjoined.set(memb, 0))
@@ -162,5 +172,25 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std:
 		channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), ms.c_str());
 }
 
-MODULE_INIT(ModuleDelayJoin)
+/* make the user visible if he receives any mode change */
+ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mode, const std::string &param, bool adding, int pcnt)
+{
+	if (!user || !channel || param.empty())
+		return MOD_RES_PASSTHRU;
+
+	User* dest;
+	if (IS_LOCAL(user))
+		dest = ServerInstance->FindNickOnly(param);
+	else
+		dest = ServerInstance->FindNick(param);
+
+	if (!dest)
+		return MOD_RES_PASSTHRU;
+
+	Membership* memb = channel->GetUser(dest);
+	if (memb && unjoined.set(memb, 0))
+		channel->WriteAllExceptSender(dest, false, 0, "JOIN %s", channel->name.c_str());
+	return MOD_RES_PASSTHRU;
+}
 
+MODULE_INIT(ModuleDelayJoin)