*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_filter.h"
/* $ModDesc: An advanced spam filtering module */
{
}
- virtual FilterResult* FilterMatch(const std::string &text, int flags)
+ virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
{
for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
{
+
+ /* Skip ones that dont apply to us */
+ if (!FilterBase::AppliesToMe(user, index->second, flags))
+ continue;
+
if (ServerInstance->MatchText(text,index->first))
{
FilterResult* fr = index->second;
}
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ConfigReader* MyConf = new ConfigReader(ServerInstance);
std::string reason = MyConf->ReadValue("keyword","reason",index);
std::string do_action = MyConf->ReadValue("keyword","action",index);
std::string flags = MyConf->ReadValue("keyword","flags",index);
- long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str());
- if (do_action == "")
+ long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
+ if (do_action.empty())
do_action = "none";
+ if (flags.empty())
+ flags = "*";
FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
filters[pattern] = x;
}
DELETE(MyConf);
}
- virtual int OnStats(char symbol, userrec* user, string_list &results)
+ virtual int OnStats(char symbol, User* user, string_list &results)
{
if (symbol == 's')
{
std::string sn = ServerInstance->Config->ServerName;
for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
{
- results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+ results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->flags+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
}
}
return 0;
}
};
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleFilterFactory : public ModuleFactory
-{
- public:
- ModuleFilterFactory()
- {
- }
-
- ~ModuleFilterFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleFilter(Me);
- }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleFilterFactory;
-}
+MODULE_INIT(ModuleFilter)