MetaData rework

[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..83ee05749211f4a0a6f8bb11982ca6c6da353636 100644 (file)
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,77 +12,53 @@
  */
 
 #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) : Command(Instance,"TAXONOMY", "o", 1), Creator(maker)
        {
                this->source = "m_taxonomy.so";
+               syntax = "<nickname>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, 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);
-                       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++)
-                       {
-                               claimed = false;
-                               FOREACH_MOD(I_OnSyncUserMetaData, OnSyncUserMetaData(user, Creator, dest, list[j], true));
-                               if (!claimed)
-                               {
-                                       user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY METADATA " + list[j] + " = <unknown>");
-                               }
-                       }
-                       user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY END");
+                       dest->GetExtList(list);
+                       user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY ITEMS " + std::string(dest->nick) + " " +ConvToStr(list.size()));
+                       FOREACH_MOD(I_OnSyncUser, OnSyncUser(dest, Creator, user));
+                       user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY END");
                }
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
 class ModuleTaxonomy : public Module
 {
-       cmd_taxonomy* newcommand;
-       bool claimed;
+       CommandTaxonomy cmd;
  public:
        ModuleTaxonomy(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this)
        {
-               
-               // Create a new command
-               newcommand = new cmd_taxonomy(ServerInstance, this, claimed);
-               ServerInstance->AddCommand(newcommand);
+               ServerInstance->AddCommand(&cmd);
        }
 
-       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)
+       void ProtoSendMetaData(void* opaque, Extensible* 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);
-                       claimed = true;
-               }
+               User* spoolto = (User*)opaque;
+               std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
+               spoolto->WriteServ(taxstr);
        }
 
        virtual ~ModuleTaxonomy()
@@ -91,32 +67,19 @@ class ModuleTaxonomy : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-};
-
 
-class ModuleTaxonomyFactory : public ModuleFactory
-{
- public:
-       ModuleTaxonomyFactory()
+       virtual std::string ProtoTranslate(Extensible* item)
        {
+               User* u = dynamic_cast<User*>(item);
+               Channel* c = dynamic_cast<Channel*>(item);
+               if (u)
+                       return u->nick;
+               if (c)
+                       return c->name;
+               return "?";
        }
-       
-       ~ModuleTaxonomyFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTaxonomy(Me);
-       }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleTaxonomyFactory;
-}
-
+MODULE_INIT(ModuleTaxonomy)