Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

[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 413218082aa246bccbae611371bc5f3ddf5e6d37..1490d90efad08a58a54e111b23795f3135d31b88 100644 (file)
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.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
@@ -12,33 +12,30 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.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 CommandTaxonomy : 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)
+       CommandTaxonomy (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;
-                       list.clear();
-                       user->GetExtList(list);
+                       dest->GetExtList(list);
                        user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY ITEMS " + std::string(dest->nick) + " " +ConvToStr(list.size()));
                        for (unsigned int j = 0; j < list.size(); j++)
                        {
@@ -51,13 +48,13 @@ class cmd_taxonomy : public command_t
                        }
                        user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY END");
                }
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
 class ModuleTaxonomy : public Module
 {
-       cmd_taxonomy* newcommand;
+       CommandTaxonomy* newcommand;
        bool claimed;
  public:
        ModuleTaxonomy(InspIRCd* Me)
@@ -65,22 +62,20 @@ class ModuleTaxonomy : public Module
        {
                
                // Create a new command
-               newcommand = new cmd_taxonomy(ServerInstance, this, claimed);
+               newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
                ServerInstance->AddCommand(newcommand);
+               Implementation eventlist[] = { I_ProtoSendMetaData };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_ProtoSendMetaData] = 1;
-       }
 
        void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* spool = (userrec*)opaque;
-                       std::string taxstr = "304 " + std::string(spool->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
-                       spool->WriteServ(taxstr);
+                       User* spoolto = (User*)target;
+                       std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
+                       spoolto->WriteServ(taxstr);
                        claimed = true;
                }
        }
@@ -95,28 +90,4 @@ class ModuleTaxonomy : public Module
        }
 };
 
-
-class ModuleTaxonomyFactory : public ModuleFactory
-{
- public:
-       ModuleTaxonomyFactory()
-       {
-       }
-       
-       ~ModuleTaxonomyFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTaxonomy(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleTaxonomyFactory;
-}
-
+MODULE_INIT(ModuleTaxonomy)