X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=5249a088ccd190778319f1938423865d29119c3a;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=6280280e3bb3d6602c6ae3765bfde700fab59276;hpb=a85c986c041de4c9a9eb4ad63bc819be3d5425b9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 6280280e3..5249a088c 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -25,126 +25,124 @@ 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) { if ((word.length() > 35) || (word.empty())) { - user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,word.c_str(), (word.empty() ? "short" : "long")); + user->WriteNumeric(935, "%s %s %s :word is too %s for censor list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long")); return false; } - + return true; } - + virtual bool TellListTooLong(User* user, Channel* chan, std::string &word) { - user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str()); + user->WriteNumeric(939, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str()); return true; } - + virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word) { - user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str()); + user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str()); } - + virtual void TellNotSet(User* user, Channel* chan, std::string &word) { - user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name); + user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str()); } }; 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->AddMode(cf)) + if (!ServerInstance->Modes->AddMode(&cf)) throw ModuleException("Could not add new modes!"); - } - void Implements(char* List) - { - cf->DoImplements(List); - List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1; - } + cf.DoImplements(this); + Implementation eventlist[] = { I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel }; + ServerInstance->Modules->Attach(eventlist, this, 5); - virtual void OnChannelDelete(Channel* chan) - { - cf->DoChannelDelete(chan); + OnRehash(NULL); + ServerInstance->Modules->PublishInterface("ChannelBanList", this); } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { - cf->DoRehash(); + ConfigReader Conf; + hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0); + cf.DoRehash(); } - virtual int ProcessMessages(User* user,Channel* chan,std::string &text) + virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text) { - if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP) - return 0; + ModResult res; + FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter")); - // Create a copy of the string in irc::string - irc::string line = text.c_str(); + 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) { for (modelist::iterator i = list->begin(); i != list->end(); i++) { - if (line.find(i->mask.c_str()) != std::string::npos) + if (InspIRCd::Match(text, i->mask)) { - user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, 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); } - else return 0; + return MOD_RES_PASSTHRU; } virtual void OnCleanup(int target_type, void* item) { - cf->DoCleanup(target_type, item); + 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(1, 1, 0, 0, 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); } - + virtual ~ModuleChanFilter() { - ServerInstance->Modes->DelMode(cf); - DELETE(cf); + ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); } };