We were already sending FMODE +nt after each channel creation to keep services happy...

[user/henk/code/inspircd.git] / src / modules / m_filter.cpp

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index a9ea3ba5e830e7935514475022d1d1113c8ce676..36073db3b8036c3ebb71951bf567a1838edaaafa 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "m_filter.h"
 
 /* $ModDesc: An advanced spam filtering module */
@@ -31,7 +29,7 @@ class ModuleFilter : public FilterBase
 
  public:
        ModuleFilter(InspIRCd* Me)
-       : FilterBase::FilterBase(Me, "m_filter.so")
+       : FilterBase(Me, "m_filter.so")
        {
                OnRehash(NULL,"");
        }
@@ -42,12 +40,18 @@ class ModuleFilter : public FilterBase
 
        virtual FilterResult* FilterMatch(const std::string &text)
        {
-               std::string text2 = text+" ";
                for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
                {
-                       if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
+                       if (ServerInstance->MatchText(text,index->first))
                        {
-                               return index->second;
+                               FilterResult* fr = index->second;
+                               if (index != filters.begin())
+                               {
+                                       std::string pat = index->first;
+                                       filters.erase(index);
+                                       filters.insert(filters.begin(), std::make_pair(pat,fr));
+                               }
+                               return fr;
                        }
                }
                return NULL;
@@ -148,7 +152,7 @@ class ModuleFilterFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleFilterFactory;
 }