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 e5ebf6909223ff64db33cc63fb51cbf631a43df8..377c9b1f003866b4d8e57dac04274ecbe06762dd 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.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,40 +12,35 @@
  */
 
 #include "inspircd.h"
+#include "m_cap.h"
 
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
  public:
-       
+
        ModuleNamesX(InspIRCd* Me)
                : Module(Me)
        {
-               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnSyncUser, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
-       }
 
        virtual ~ModuleNamesX()
        {
        }
 
-       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       void OnSyncUser(User* user, Module* proto,void* opaque)
        {
-               if ((displayable) && (extname == "NAMESX"))
-                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+               if (proto->ProtoTranslate(NULL) == "?" && user->GetExt("NAMESX"))
+                       proto->ProtoSendMetaData(opaque, user, "NAMESX", "Enabled");
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
        virtual void On005Numeric(std::string &output)
@@ -53,7 +48,7 @@ class ModuleNamesX : public Module
                output.append(" NAMESX");
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       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,
@@ -63,64 +58,31 @@ class ModuleNamesX : public Module
                 */
                if (c == "PROTOCTL")
                {
-                       if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
+                       if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               user->Extend("NAMESX",dummy);
+                               user->Extend("NAMESX");
                                return 1;
                        }
                }
                return 0;
        }
 
-       virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               if (user->GetExt("NAMESX"))
-               {
-                       char list[MAXBUF];
-                       size_t dlen, curlen;
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
-                       int numusers = 0;
-                       char* ptr = list + dlen;
-
-                       if (!ulist)
-                               ulist = Ptr->GetUsers();
+               if (!issuer->GetExt("NAMESX"))
+                       return;
 
-                       bool has_user = Ptr->HasUser(user);
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((!has_user) && (i->first->IsModeSet('i')))
-                                       continue;
+               /* Some module hid this from being displayed, dont bother */
+               if (nick.empty())
+                       return;
 
-                               if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
-                                       continue;
+               prefixes = channel->GetAllPrefixChars(user);
+       }
 
-                               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str());
-                               /* OnUserList can change this - reset it back to normal */
-                               i->second = i->first->nick;
-                               curlen += ptrlen;
-                               ptr += ptrlen;
-                               numusers++;
-                               if (curlen > (480-NICKMAX))
-                               {
-                                       /* list overflowed into multiple numerics */
-                                       user->WriteServ(std::string(list));
-                                       /* reset our lengths */
-                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
-                                       ptr = list + dlen;
-                                       ptrlen = 0;
-                                       numusers = 0;
-                               }
-                       }
-                       /* if whats left in the list isnt empty, send it */
-                       if (numusers)
-                       {
-                               user->WriteServ(std::string(list));
-                       }
-                       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-                       return 1;
-               }
-               return 0;               
-       }
+       virtual void OnEvent(Event *ev)
+       {
+               GenericCapHandler(ev, "NAMESX", "multi-prefix");
+       }
 };
 
 MODULE_INIT(ModuleNamesX)