A few more I missed.

[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 f1a089dd0535f4a8a80d7fec362b5e5326b20e42..d635654a524fd1229b02031dc35f95f05dc3d677 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
 
@@ -33,45 +33,54 @@ class cmd_swhois : public command_t
        CmdResult Handle(const char** parameters, int pcnt, userrec* user)
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
-               if(dest)
+               
+               if (!dest)
                {
-                       std::string line;
-                       for(int i = 1; i < pcnt; i++)
-                       {
-                               if (i != 1)
-                                       line.append(" ");
-                                       
-                               line.append(parameters[i]);
-                       }
-                       
-                       std::string* text;
-                       dest->GetExt("swhois", text);
-       
-                       if(text)
-                       {
-                               // We already had it set...
-                               
-                               if (!ServerInstance->ULine(user->server))
-                                       // Ulines set SWHOISes silently
-                                       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());
+                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
+               }
+
+               if (!*parameters[1])
+               {
+                       user->WriteServ("NOTICE %s :*** SWHOIS: Whois line must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               std::string line;
+               for (int i = 1; i < pcnt; i++)
+               {
+                       if (i != 1)
+                               line.append(" ");
                                
-                               dest->Shrink("swhois");
-                               DELETE(text);
-                       }
-                       else if(!ServerInstance->ULine(user->server))
-                       {
+                       line.append(parameters[i]);
+               }
+               
+               std::string* text;
+               dest->GetExt("swhois", text);
+
+               if (text)
+               {
+                       // We already had it set...
+                       
+                       if (!ServerInstance->ULine(user->server))
                                // Ulines set SWHOISes silently
-                               ServerInstance->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 from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                        
-                       text = new std::string(line);
-                       dest->Extend("swhois", text);
-
-                       return CMD_SUCCESS;
+                       dest->Shrink("swhois");
+                       DELETE(text);
                }
+               else if (!ServerInstance->ULine(user->server))
+               {
+                       // Ulines set SWHOISes silently
+                       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", text);
 
-               return CMD_FAILURE;
+               return CMD_SUCCESS;
        }
+
 };
 
 class ModuleSWhois : public Module
@@ -81,7 +90,7 @@ class ModuleSWhois : public Module
        ConfigReader* Conf;
        
  public:
-       ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
+       ModuleSWhois(InspIRCd* Me) : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
@@ -89,7 +98,7 @@ class ModuleSWhois : public Module
                ServerInstance->AddCommand(mycommand);
        }
 
-       void OnRehash(const std::string &parameter)
+       void OnRehash(userrec* user, const std::string &parameter)
        {
                DELETE(Conf);
                Conf = new ConfigReader(ServerInstance);
@@ -123,9 +132,8 @@ class ModuleSWhois : public Module
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
-               ServerInstance->Log(DEBUG,"Sync user metadata type '%s'", extname.c_str());
                // check if the linking module wants to know about OUR metadata
                if (extname == "swhois")
                {
@@ -138,15 +146,11 @@ class ModuleSWhois : public Module
                                // sees fit, and send it on its way. We dont need or want to know how.
                                proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois);
                        }
-                       else
-                       {
-                               ServerInstance->Log(DEBUG,"User has a null swhois string!");
-                       }
                }
        }
 
        // when a user quits, tidy up their metadata
-       virtual void OnUserQuit(userrec* user, const std::string &message)
+       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
        {
                std::string* swhois;
                user->GetExt("swhois", swhois);
@@ -185,7 +189,6 @@ class ModuleSWhois : public Module
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "swhois"))
                {
-                       ServerInstance->Log(DEBUG,"Extend with swhois");
                        userrec* dest = (userrec*)target;
                        // if they dont already have an swhois field, accept the remote server's
                        std::string* text;
@@ -193,7 +196,6 @@ class ModuleSWhois : public Module
                        {
                                std::string* text = new std::string(extdata);
                                dest->Extend("swhois",text);
-                               ServerInstance->Log(DEBUG,"extended: %s %s", dest->nick, text->c_str());
                        }
                }
        }
@@ -242,8 +244,15 @@ class ModuleSWhois : public Module
                
                std::string *text = new std::string(swhois);
                user->Extend("swhois", text);
+               std::deque<std::string>* metadata = new std::deque<std::string>;
+               metadata->push_back(user->nick);
+               metadata->push_back("swhois");          // The metadata id
+               metadata->push_back(*text);             // The value to send
+               Event event((char*)metadata,(Module*)this,"send_metadata");
+               event.Send(ServerInstance);
+               delete metadata;
        }
-       
+
        virtual ~ModuleSWhois()
        {
                DELETE(Conf);
@@ -255,28 +264,4 @@ class ModuleSWhois : public Module
        }
 };
 
-
-class ModuleSWhoisFactory : public ModuleFactory
-{
- public:
-       ModuleSWhoisFactory()
-       {
-       }
-       
-       ~ModuleSWhoisFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSWhois(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSWhoisFactory;
-}
-
+MODULE_INIT(ModuleSWhois)