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

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 1a3764eee..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) : ListModeBase(Instance, '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)
 	{
@@ -57,42 +57,41 @@ class ChanFilter : public ListModeBase
 
 class ModuleChanFilter : public Module
 {
-
-	ChanFilter* cf;
+	ChanFilter cf;
+	bool hidemask;
 
  public:
 
-	ModuleChanFilter(InspIRCd* Me)
-		: Module(Me)
+	ModuleChanFilter()
+		: cf(this)
 	{
-		cf = new ChanFilter(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(cf))
+		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);
+		cf.DoImplements(this);
+		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)
+	virtual void OnRehash(User* user)
 	{
-		cf->DoChannelDelete(chan);
+		ConfigReader Conf;
+		hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
+		cf.DoRehash();
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
-		cf->DoRehash();
-	}
+		ModResult res;
+		FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter"));
 
-	virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
-	{
-		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
-			return 0;
+		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)
 		{
@@ -100,53 +99,49 @@ class ModuleChanFilter : public Module
 			{
 				if (InspIRCd::Match(text, i->mask))
 				{
-					user->WriteNumeric(936, "%s %s %s :Your message contained a censored word, and was blocked",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
-					return 1;
+					if (hidemask)
+						user->WriteNumeric(404, "%s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str());
+					else
+						user->WriteNumeric(404, "%s %s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
+					return MOD_RES_DENY;
 				}
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			return ProcessMessages(user,(Channel*)dest,text);
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual void OnCleanup(int target_type, void* item)
 	{
-		cf->DoCleanup(target_type, item);
-	}
-
-	virtual const char* OnRequest(Request* request)
-	{
-		return cf->DoOnRequest(request);
+		cf.DoCleanup(target_type, item);
 	}
 
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	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);
 	}
 
 	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		cf->DoSyncChannel(chan, proto, opaque);
+		cf.DoSyncChannel(chan, proto, opaque);
 	}
 
 	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);
-		delete cf;
 		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };