Implement feature in bug #395 reported by stealth, and tidy up a bit

[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 267c8f468fbcc789388d28e92a455d8391c1ef82..c45d777f857c2cba161005b7bf6bf386e0f60818 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,25 +1,20 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 static const char* dummy = "ON";
 
@@ -30,30 +25,36 @@ class ModuleNamesX : public Module
  public:
        
        ModuleNamesX(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
        }
 
        void Implements(char* List)
        {
-               List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
+               List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
        }
 
        virtual ~ModuleNamesX()
        {
        }
 
+       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       {
+               if ((displayable) && (extname == "NAMESX"))
+                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+       }
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,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(const std::string &command, const char** parameters, int pcnt, userrec *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,7 +66,6 @@ class ModuleNamesX : public Module
                {
                        if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
                        {
-                               ServerInstance->Log(DEBUG,"Setting this user as NAMESX capable");
                                user->Extend("NAMESX",dummy);
                                return 1;
                        }
@@ -73,34 +73,38 @@ class ModuleNamesX : public Module
                return 0;
        }
 
-       virtual int OnUserList(userrec* user, chanrec* Ptr)
+       virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
        {
-               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();
+
+                       if (!ulist)
+                               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]))
-                               {
+                               if ((!has_user) && (i->first->IsModeSet('i')))
                                        continue;
-                               }
-                               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->second), i->second->nick);
+
+                               if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
+                                       continue;
+
+                               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 */
-                                       ServerInstance->Log(DEBUG,"Send list 1");
-                                       user->WriteServ(list);
+                                       user->WriteServ(std::string(list));
                                        /* reset our lengths */
                                        dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
                                        ptr = list + dlen;
@@ -111,40 +115,13 @@ class ModuleNamesX : public Module
                        /* if whats left in the list isnt empty, send it */
                        if (numusers)
                        {
-                               ServerInstance->Log(DEBUG,"Send list 2");
-                               user->WriteServ(list);
+                               user->WriteServ(std::string(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;               
        }
 };
 
-
-class ModuleNamesXFactory : public ModuleFactory
-{
- public:
-       ModuleNamesXFactory()
-       {
-       }
-
-       ~ModuleNamesXFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNamesX(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNamesXFactory;
-}
-
+MODULE_INIT(ModuleNamesX)