MetaData rework

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 90c55e64826ed58ef2cf522608e8aee1ba1df9fa..377c9b1f003866b4d8e57dac04274ecbe06762dd 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,61 +1,54 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *     <brain@chatspike.net>
- *     <Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "commands.h"
 #include "inspircd.h"
-#include <vector>
-
-static const char* dummy = "ON";
+#include "m_cap.h"
 
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
  public:
-       
+
        ModuleNamesX(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
+               Implementation eventlist[] = { I_OnSyncUser, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       void Implements(char* List)
+
+       virtual ~ModuleNamesX()
        {
-               List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
        }
 
-       virtual ~ModuleNamesX()
+       void OnSyncUser(User* user, Module* proto,void* opaque)
        {
+               if (proto->ProtoTranslate(NULL) == "?" && user->GetExt("NAMESX"))
+                       proto->ProtoSendMetaData(opaque, user, "NAMESX", "Enabled");
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
-        virtual void On005Numeric(std::string &output)
+       virtual void On005Numeric(std::string &output)
        {
                output.append(" NAMESX");
        }
 
-        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
@@ -65,88 +58,31 @@ class ModuleNamesX : public Module
                 */
                if (c == "PROTOCTL")
                {
-                       if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
+                       if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               ServerInstance->Log(DEBUG,"Setting this user as NAMESX capable");
-                               user->Extend("NAMESX",dummy);
+                               user->Extend("NAMESX");
                                return 1;
                        }
                }
                return 0;
        }
 
-       virtual int OnUserList(userrec* user, chanrec* Ptr)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               ServerInstance->Log(DEBUG,"NAMESX called for %s %s",user->nick,Ptr->name);
-               if (user->GetExt("NAMESX"))
-               {
-                       ServerInstance->Log(DEBUG,"Using NAMESX user list code");
-                       char list[MAXBUF];
-                       size_t dlen, curlen;
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
-                       int numusers = 0;
-                       char* ptr = list + dlen;
-                       CUList *ulist= Ptr->GetUsers();
-                       bool has_user = Ptr->HasUser(user);
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
-                               {
-                                       continue;
-                               }
-                               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->second), i->second->nick);
-                               curlen += ptrlen;
-                               ptr += ptrlen;
-                               numusers++;
-                               if (curlen > (480-NICKMAX))
-                               {
-                                       /* list overflowed into multiple numerics */
-                                       ServerInstance->Log(DEBUG,"Send list 1");
-                                       user->WriteServ(list);
-                                       /* reset our lengths */
-                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
-                                       ptr = list + dlen;
-                                       ptrlen = 0;
-                                       numusers = 0;
-                               }
-                       }
-                       /* if whats left in the list isnt empty, send it */
-                       if (numusers)
-                       {
-                               ServerInstance->Log(DEBUG,"Send list 2");
-                               user->WriteServ(list);
-                       }
-                       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-                       ServerInstance->Log(DEBUG,"Returning 1");
-                       return 1;
-               }
-
-               ServerInstance->Log(DEBUG,"Returning 0");
-               return 0;               
-       }
-};
+               if (!issuer->GetExt("NAMESX"))
+                       return;
 
+               /* Some module hid this from being displayed, dont bother */
+               if (nick.empty())
+                       return;
 
-class ModuleNamesXFactory : public ModuleFactory
-{
- public:
-       ModuleNamesXFactory()
-       {
-       }
-
-       ~ModuleNamesXFactory()
-       {
+               prefixes = channel->GetAllPrefixChars(user);
        }
 
-               virtual Module * CreateModule(InspIRCd* Me)
+       virtual void OnEvent(Event *ev)
        {
-               return new ModuleNamesX(Me);
+               GenericCapHandler(ev, "NAMESX", "multi-prefix");
        }
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNamesXFactory;
-}
-
+MODULE_INIT(ModuleNamesX)