X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_channel%2Fcore_channel.cpp;h=aba4d97690ddb28d6270cc05357850b68e4300b3;hb=a124a3783d8e8136b63f188bbd292c391811df54;hp=ac590ebcc6fe7f7298cc72a1ae2694b532ebbf76;hpb=127fe6ed1076c294e01925e4fa8ab2bd64c1b0e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index ac590ebcc..aba4d9769 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -19,33 +19,97 @@
 
 #include "inspircd.h"
 #include "core_channel.h"
+#include "invite.h"
 
 class CoreModChannel : public Module
 {
+	Invite::APIImpl invapi;
 	CommandInvite cmdinvite;
 	CommandJoin cmdjoin;
 	CommandKick cmdkick;
 	CommandNames cmdnames;
 	CommandTopic cmdtopic;
 
+	ModResult IsInvited(User* user, Channel* chan)
+	{
+		LocalUser* localuser = IS_LOCAL(user);
+		if ((localuser) && (invapi.IsInvited(localuser, chan)))
+			return MOD_RES_ALLOW;
+		return MOD_RES_PASSTHRU;
+	}
+
  public:
 	CoreModChannel()
-		: cmdinvite(this), cmdjoin(this), cmdkick(this), cmdnames(this), cmdtopic(this)
+		: invapi(this)
+		, cmdinvite(this, invapi), cmdjoin(this), cmdkick(this), cmdnames(this), cmdtopic(this)
 	{
 	}
 
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* optionstag = ServerInstance->Config->ConfValue("options");
+		Implementation events[] = { I_OnCheckKey, I_OnCheckLimit, I_OnCheckChannelBan };
+		if (optionstag->getBool("invitebypassmodes", true))
+			ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation));
+		else
+		{
+			for (unsigned int i = 0; i < sizeof(events)/sizeof(Implementation); i++)
+				ServerInstance->Modules.Detach(events[i], this);
+		}
+	}
+
 	void OnPostJoin(Membership* memb) CXX11_OVERRIDE
 	{
 		Channel* const chan = memb->chan;
 		LocalUser* const localuser = IS_LOCAL(memb->user);
 		if (localuser)
 		{
+			// Remove existing invite, if any
+			invapi.Remove(localuser, chan);
+
 			if (chan->topicset)
 				Topic::ShowTopic(localuser, chan);
-			chan->UserList(localuser);
+
+			// Show all members of the channel, including invisible (+i) users
+			cmdnames.SendNames(localuser, chan, true);
 		}
 	}
 
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& keygiven) CXX11_OVERRIDE
+	{
+		// Hook only runs when being invited bypasses +bkl
+		return IsInvited(user, chan);
+	}
+
+	ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE
+	{
+		// Hook only runs when being invited bypasses +bkl
+		return IsInvited(user, chan);
+	}
+
+	ModResult OnCheckLimit(User* user, Channel* chan) CXX11_OVERRIDE
+	{
+		// Hook only runs when being invited bypasses +bkl
+		return IsInvited(user, chan);
+	}
+
+	ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE
+	{
+		// Hook always runs
+		return IsInvited(user, chan);
+	}
+
+	void OnUserDisconnect(LocalUser* user) CXX11_OVERRIDE
+	{
+		invapi.RemoveAll(user);
+	}
+
+	void OnChannelDelete(Channel* chan) CXX11_OVERRIDE
+	{
+		// Make sure the channel won't appear in invite lists from now on, don't wait for cull to unset the ext
+		invapi.RemoveAll(chan);
+	}
+
 	void Prioritize() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules.SetPriority(this, I_OnPostJoin, PRIORITY_FIRST);