Socket engine tweaks to fix a glitch, and improvements to new m_ident

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

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index c573e77610d03e1505f62d857f1c84f53280f886..bf77c5812cd7eb398f522d6d0c380af6aa105cbd 100644 (file)
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -11,30 +11,27 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides the /TAXONOMY command, used to view all metadata attached to a user */
 
-/** Handle /WOOT
+/** Handle /TAXONOMY
  */
-class cmd_taxonomy : public command_t
+class cmd_taxonomy : public Command
 {
        Module* Creator;
        bool& claimed;
  public:
        /* Command 'taxonomy', takes no parameters and needs no special modes */
-       cmd_taxonomy (InspIRCd* Instance, Module* maker, bool &claim) : command_t(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
+       cmd_taxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
        {
                this->source = "m_taxonomy.so";
+               syntax = "<nickname>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
                        std::deque<std::string> list;
@@ -52,7 +49,7 @@ class cmd_taxonomy : public command_t
                        }
                        user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY END");
                }
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
@@ -62,7 +59,7 @@ class ModuleTaxonomy : public Module
        bool claimed;
  public:
        ModuleTaxonomy(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                // Create a new command
@@ -79,7 +76,7 @@ class ModuleTaxonomy : public Module
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* spool = (userrec*)opaque;
+                       User* spool = (User*)opaque;
                        std::string taxstr = "304 " + std::string(spool->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
                        spool->WriteServ(taxstr);
                        claimed = true;
@@ -96,28 +93,4 @@ class ModuleTaxonomy : public Module
        }
 };
 
-
-class ModuleTaxonomyFactory : public ModuleFactory
-{
- public:
-       ModuleTaxonomyFactory()
-       {
-       }
-       
-       ~ModuleTaxonomyFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTaxonomy(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTaxonomyFactory;
-}
-
+MODULE_INIT(ModuleTaxonomy)