Only valid targets for encap are now server ids

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 42b7f96e9ef9df79dacffc6f7f8ff441137eed31..9361b9a67f1c032df15fd7853f9c10a1d798ffdc 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,13 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -28,17 +21,18 @@
 // have one of these structures associated with their user record.
 typedef std::map<irc::string, time_t> silencelist;
 
-class cmd_silence : public command_t
+class CommandSilence : public Command
 {
        unsigned int& maxsilence;
  public:
-       cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
+       CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
        {
                this->source = "m_silence.so";
                syntax = "{[+|-]<mask>}";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                if (!pcnt)
                {
@@ -89,7 +83,7 @@ class cmd_silence : public command_t
                                                {
                                                        // tidy up -- if a user's list is empty, theres no use having it
                                                        // hanging around in the user record.
-                                                       DELETE(sl);
+                                                       delete sl;
                                                        user->Shrink("silence_list");
                                                }
                                        }
@@ -131,24 +125,22 @@ class cmd_silence : public command_t
 class ModuleSilence : public Module
 {
        
-       cmd_silence* mycommand;
+       CommandSilence* mycommand;
        unsigned int maxsilence;
  public:
  
        ModuleSilence(InspIRCd* Me)
-               : Module::Module(Me), maxsilence(32)
+               : Module(Me), maxsilence(32)
        {
                OnRehash(NULL, "");
-               mycommand = new cmd_silence(ServerInstance, maxsilence);
+               mycommand = new CommandSilence(ServerInstance, maxsilence);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
-       }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader Conf(ServerInstance);
                maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
@@ -156,7 +148,7 @@ class ModuleSilence : public Module
                        maxsilence = 32;
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+       virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
                // when the user quits tidy up any silence list they might have just to keep things tidy
                // and to prevent a HONKING BIG MEMORY LEAK!
@@ -164,7 +156,7 @@ class ModuleSilence : public Module
                user->GetExt("silence_list", sl);
                if (sl)
                {
-                       DELETE(sl);
+                       delete sl;
                        user->Shrink("silence_list");
                }
        }
@@ -175,7 +167,7 @@ class ModuleSilence : public Module
                output = output + " SILENCE=" + ConvToStr(maxsilence);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                // im not sure how unreal's silence operates but ours is sensible. It blocks notices and
                // privmsgs from people on the silence list, directed privately at the user.
@@ -183,7 +175,7 @@ class ModuleSilence : public Module
                // a channel when you've set an ignore on the two most talkative people?)
                if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
-                       userrec* u = (userrec*)dest;
+                       User* u = (User*)dest;
                        silencelist* sl;
                        u->GetExt("silence_list", sl);
                        if (sl)
@@ -200,7 +192,7 @@ class ModuleSilence : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
        }
@@ -211,32 +203,8 @@ class ModuleSilence : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleSilenceFactory : public ModuleFactory
-{
- public:
-       ModuleSilenceFactory()
-       {
-       }
-       
-       ~ModuleSilenceFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSilence(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSilenceFactory;
-}
-
+MODULE_INIT(ModuleSilence)