X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_taxonomy.cpp;h=83ee05749211f4a0a6f8bb11982ca6c6da353636;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=bcb0a906d2bdfbb3628180cf012638119c843139;hpb=8096138d9a5d809f064090a82783d424be3d64b1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index bcb0a906d..83ee05749 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -20,10 +20,9 @@
 class CommandTaxonomy : public Command
 {
 	Module* Creator;
-	bool& claimed;
  public:
 	/* Command 'taxonomy', takes no parameters and needs no special modes */
-	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(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>";
@@ -37,15 +36,7 @@ class CommandTaxonomy : public Command
 			std::deque<std::string> list;
 			dest->GetExtList(list);
 			user->WriteNumeric(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(dest, Creator, user, list[j], true));
-				if (!claimed)
-				{
-					user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY METADATA " + list[j] + " = <unknown>");
-				}
-			}
+			FOREACH_MOD(I_OnSyncUser, OnSyncUser(dest, Creator, user));
 			user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY END");
 		}
 		return CMD_LOCALONLY;
@@ -54,30 +45,20 @@ class CommandTaxonomy : public Command
 
 class ModuleTaxonomy : public Module
 {
-	CommandTaxonomy* newcommand;
-	bool claimed;
+	CommandTaxonomy cmd;
  public:
 	ModuleTaxonomy(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me, this)
 	{
-
-		// Create a new command
-		newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
-		ServerInstance->AddCommand(newcommand);
-		Implementation eventlist[] = { I_ProtoSendMetaData };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->AddCommand(&cmd);
 	}
 
 
-	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)
-		{
-			User* spoolto = (User*)target;
-			std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
-			spoolto->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()
@@ -86,7 +67,18 @@ class ModuleTaxonomy : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
+	}
+
+	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 "?";
 	}
 };