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 5f0b0a483ec53f807f926f9ea27ce9ee759eba3d..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";
@@ -27,18 +24,16 @@ class ModuleNamesX : public Module
        ModuleNamesX(InspIRCd* Me)
                : Module(Me)
        {
+               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       void Implements(char* List)
-       {
-               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)
+       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");
@@ -54,7 +49,7 @@ class ModuleNamesX : public Module
                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,
@@ -73,13 +68,13 @@ class ModuleNamesX : public Module
                return 0;
        }
 
-       virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+       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;
 
@@ -106,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;
@@ -124,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" DllExport void * init_module( void )
-{
-       return new ModuleNamesXFactory;
-}
-
+MODULE_INIT(ModuleNamesX)