X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=25321536afc2fc66f151a3238e4dd6b7c6d57c8f;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=4f6ebf22a834cccd43e32c386427c8be84bed283;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 4f6ebf22a..25321536a 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -25,7 +25,7 @@
 class ChanFilter : public ListModeBase
 {
  public:
-	ChanFilter(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+	ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
 	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
@@ -62,39 +62,36 @@ class ModuleChanFilter : public Module
 
  public:
 
-	ModuleChanFilter(InspIRCd* Me)
-		: Module(Me), cf(Me, this)
+	ModuleChanFilter()
+		: cf(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&cf))
 			throw ModuleException("Could not add new modes!");
 
 		cf.DoImplements(this);
-		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 
 		OnRehash(NULL);
 		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 	}
 
-	virtual void OnChannelDelete(Channel* chan)
-	{
-		cf.DoChannelDelete(chan);
-	}
-
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
 		cf.DoRehash();
 	}
 
 	virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
-		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
+		ModResult res;
+		FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter"));
+
+		if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
-		modelist* list;
-		chan->GetExt(cf.GetInfoKey(), list);
+		modelist* list = cf.extItem.get(chan);
 
 		if (list)
 		{
@@ -128,11 +125,6 @@ class ModuleChanFilter : public Module
 		cf.DoCleanup(target_type, item);
 	}
 
-	virtual const char* OnRequest(Request* request)
-	{
-		return cf.DoOnRequest(request);
-	}
-
 	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
@@ -145,12 +137,11 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual ~ModuleChanFilter()
 	{
-		ServerInstance->Modes->DelMode(&cf);
 		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };