Argh, i give up

[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 8aa15f965e297f8481ee6e6f60068ebdd0124c17..980cc0ee07286da8b58191f7c9554a1d2b554735 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 static const char* dummy = "ON";
@@ -25,17 +22,21 @@ class ModuleNamesX : public Module
  public:
        
        ModuleNamesX(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
+               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       void Implements(char* List)
+
+       virtual ~ModuleNamesX()
        {
-               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)
        {
+               if ((displayable) && (extname == "NAMESX"))
+                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
        }
 
        virtual Version GetVersion()
@@ -43,12 +44,12 @@ class ModuleNamesX : public Module
                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, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, 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,
@@ -67,24 +68,31 @@ class ModuleNamesX : public Module
                return 0;
        }
 
-       virtual int OnUserList(userrec* user, chanrec* Ptr)
+       virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
        {
                if (user->GetExt("NAMESX"))
                {
                        char list[MAXBUF];
                        size_t dlen, curlen;
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
+                       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;
-                       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++;
@@ -93,7 +101,7 @@ class ModuleNamesX : public Module
                                        /* list overflowed into multiple numerics */
                                        user->WriteServ(std::string(list));
                                        /* reset our lengths */
-                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name);
+                                       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;
@@ -111,27 +119,4 @@ class ModuleNamesX : public Module
        }
 };
 
-
-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)