This will royally fuck 1.2's linking right now, but..

[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 a96ff19912a858543a3d1f7a7ed07674294ad161..c45d777f857c2cba161005b7bf6bf386e0f60818 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 static const char* dummy = "ON";
 
@@ -25,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,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, 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,
@@ -90,6 +96,7 @@ class ModuleNamesX : public Module
                                        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;
@@ -117,27 +124,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)