X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcore_channel.cpp;h=3af809645e8fbb4fa8110d4b4aa218ae18a0c27b;hb=dcd3438011d59aa4de4df64abf06bca1cbf36859;hp=9febdf1e75c6fb65bb3b9bf188fe4dcf3b3b64ce;hpb=a6b53dbc3629eb329b5b77d81e81ced837d4dc66;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 9febdf1e7..3af809645 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -19,26 +19,36 @@
 
 #include "inspircd.h"
 #include "core_channel.h"
+#include "invite.h"
+#include "listmode.h"
 
-class CoreModChannel : public Module
+class CoreModChannel : public Module, public CheckExemption::EventListener
 {
+	Invite::APIImpl invapi;
 	CommandInvite cmdinvite;
 	CommandJoin cmdjoin;
 	CommandKick cmdkick;
 	CommandNames cmdnames;
 	CommandTopic cmdtopic;
+	insp::flat_map<std::string, char> exemptions;
 
 	ModResult IsInvited(User* user, Channel* chan)
 	{
 		LocalUser* localuser = IS_LOCAL(user);
-		if ((localuser) && (localuser->IsInvited(chan)))
+		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)
+		: CheckExemption::EventListener(this)
+		, invapi(this)
+		, cmdinvite(this, invapi)
+		, cmdjoin(this)
+		, cmdkick(this)
+		, cmdnames(this)
+		, cmdtopic(this)
 	{
 	}
 
@@ -53,6 +63,47 @@ class CoreModChannel : public Module
 			for (unsigned int i = 0; i < sizeof(events)/sizeof(Implementation); i++)
 				ServerInstance->Modules.Detach(events[i], this);
 		}
+
+		std::string current;
+		irc::spacesepstream defaultstream(optionstag->getString("exemptchanops"));
+		insp::flat_map<std::string, char> exempts;
+		while (defaultstream.GetToken(current))
+		{
+			std::string::size_type pos = current.find(':');
+			if (pos == std::string::npos || (pos + 2) > current.size())
+				throw ModuleException("Invalid exemptchanops value '" + current + "' at " + optionstag->getTagLocation());
+
+			const std::string restriction = current.substr(0, pos);
+			const char prefix = current[pos + 1];
+
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Exempting prefix %c from %s", prefix, restriction.c_str());
+			exempts[restriction] = prefix;
+		}
+		exemptions.swap(exempts);
+	}
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		// Build a map of limits to their mode character.
+		insp::flat_map<int, std::string> limits;
+		const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+		for (ModeParser::ListModeList::const_iterator iter = listmodes.begin(); iter != listmodes.end(); ++iter)
+		{
+			const unsigned int limit = (*iter)->GetLowerLimit();
+			limits[limit].push_back((*iter)->GetModeChar());
+		}
+
+		// Generate the MAXLIST token from the limits map.
+		std::string& buffer = tokens["MAXLIST"];
+		for (insp::flat_map<int, std::string>::const_iterator iter = limits.begin(); iter != limits.end(); ++iter)
+		{
+			if (!buffer.empty())
+				buffer.push_back(',');
+
+			buffer.append(iter->second);
+			buffer.push_back(':');
+			buffer.append(ConvToStr(iter->first));
+		}
 	}
 
 	void OnPostJoin(Membership* memb) CXX11_OVERRIDE
@@ -62,7 +113,7 @@ class CoreModChannel : public Module
 		if (localuser)
 		{
 			// Remove existing invite, if any
-			localuser->RemoveInvite(chan);
+			invapi.Remove(localuser, chan);
 
 			if (chan->topicset)
 				Topic::ShowTopic(localuser, chan);
@@ -96,6 +147,33 @@ class CoreModChannel : public Module
 		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);
+	}
+
+	ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE
+	{
+		if (!exemptions.count(restriction))
+			return MOD_RES_PASSTHRU;
+
+		unsigned int mypfx = chan->GetPrefixValue(user);
+		char minmode = exemptions[restriction];
+
+		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(minmode);
+		if (mh && mypfx >= mh->GetPrefixRank())
+			return MOD_RES_ALLOW;
+		if (mh || minmode == '*')
+			return MOD_RES_DENY;
+		return MOD_RES_PASSTHRU;
+	}
+
 	void Prioritize() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules.SetPriority(this, I_OnPostJoin, PRIORITY_FIRST);