Annotations

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 98ed007d0ae2dc497e5fe3448461f20aab57ef66..4b62db699ad680c399c980cce1abff04d2b2f765 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,23 +17,26 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
 
+
+
 class cmd_swhois : public command_t
 {
-       Server* Srv;
+       
  public:
-       cmd_swhois(Server* server) : command_t("SWHOIS",'o',2)
+       cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
        {
-               this->Srv = server;
                this->source = "m_swhois.so";
+               syntax = "<nick> <swhois>";
        }
 
-       void Handle(char** parameters, int pcnt, userrec* user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec* user)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
                if(dest)
                {
                        std::string line;
@@ -45,50 +48,55 @@ class cmd_swhois : public command_t
                                line.append(parameters[i]);
                        }
                        
-                       std::string* text = (std::string*)dest->GetExt("swhois");
+                       std::string* text;
+                       dest->GetExt("swhois", text);
        
                        if(text)
                        {
                                // We already had it set...
                                
-                               if (!Srv->IsUlined(user->server))
+                               if (!ServerInstance->ULine(user->server))
                                        // Ulines set SWHOISes silently
-                                       WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+                                       ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                                
                                dest->Shrink("swhois");
                                DELETE(text);
                        }
-                       else if(!Srv->IsUlined(user->server))
+                       else if(!ServerInstance->ULine(user->server))
                        {
                                // Ulines set SWHOISes silently
-                               WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+                               ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
                        }
                        
                        text = new std::string(line);
-                       dest->Extend("swhois", (char*)text);
+                       dest->Extend("swhois", text);
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
 class ModuleSWhois : public Module
 {
        cmd_swhois* mycommand;
-       Server* Srv;
+       
        ConfigReader* Conf;
        
  public:
-       ModuleSWhois(Server* Me) : Module::Module(Me)
+       ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader();
-               mycommand = new cmd_swhois(Srv);
-               Srv->AddCommand(mycommand);
+               
+               Conf = new ConfigReader(ServerInstance);
+               mycommand = new cmd_swhois(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader();
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)
@@ -99,11 +107,11 @@ class ModuleSWhois : public Module
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
        virtual void OnWhois(userrec* source, userrec* dest)
        {
-               char* desc = dest->GetExt("swhois");
-               if (desc)
+               std::string* swhois;
+               dest->GetExt("swhois", swhois);
+               if (swhois)
                {
-                       std::string* swhois = (std::string*)desc;
-                       WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
+                       source->WriteServ("320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
                }
        }
 
@@ -118,11 +126,10 @@ class ModuleSWhois : public Module
                if (extname == "swhois")
                {
                        // check if this user has an swhois field to send
-                       char* field = user->GetExt("swhois");
-                       if (field)
+                       std::string* swhois;
+                       user->GetExt("swhois", swhois);
+                       if (swhois)
                        {
-                               // get our extdata out with a cast
-                               std::string* swhois = (std::string*)field;
                                // call this function in the linking module, let it format the data how it
                                // sees fit, and send it on its way. We dont need or want to know how.
                                proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois);
@@ -133,10 +140,10 @@ class ModuleSWhois : public Module
        // when a user quits, tidy up their metadata
        virtual void OnUserQuit(userrec* user, const std::string &message)
        {
-               char* field = user->GetExt("swhois");
-               if (field)
+               std::string* swhois;
+               user->GetExt("swhois", swhois);
+               if (swhois)
                {
-                       std::string* swhois = (std::string*)field;
                        user->Shrink("swhois");
                        DELETE(swhois);
                }
@@ -148,10 +155,10 @@ class ModuleSWhois : public Module
                if (target_type == TYPE_USER)
                {
                        userrec* user = (userrec*)item;
-                       char* field = user->GetExt("swhois");
-                       if (field)
+                       std::string* swhois;
+                       user->GetExt("swhois", swhois);
+                       if (swhois)
                        {
-                               std::string* swhois = (std::string*)field;
                                user->Shrink("swhois");
                                DELETE(swhois);
                        }
@@ -172,10 +179,11 @@ class ModuleSWhois : public Module
                {
                        userrec* dest = (userrec*)target;
                        // if they dont already have an swhois field, accept the remote server's
-                       if (!dest->GetExt("swhois"))
+                       std::string* text;
+                       if (!dest->GetExt("swhois", text))
                        {
                                std::string* text = new std::string(extdata);
-                               dest->Extend("swhois",(char*)text);
+                               dest->Extend("swhois",text);
                        }
                }
        }
@@ -192,14 +200,15 @@ class ModuleSWhois : public Module
                                
                                if(swhois.length())
                                {
-                                       if(std::string* old = (std::string*)user->GetExt("swhois"))
+                                       std::string* old;
+                                       if(user->GetExt("swhois", old))
                                        {
                                                user->Shrink("swhois");
                                                DELETE(old);
                                        }
                        
                                        std::string* text = new std::string(swhois);
-                                       user->Extend("swhois", (char*)text);
+                                       user->Extend("swhois", text);
                                        
                                        break;
                                }
@@ -230,7 +239,7 @@ class ModuleSWhoisFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSWhois(Me);
        }