Some more to fix still, modules probably wont load correctly atm

[user/henk/code/inspircd.git] / src / modules / m_conn_join.cpp

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 524c236f7f310823e2716f5865e70ba477bc2510..f9c9423756c75ee239416ab4aead1516cf1406db 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
 
@@ -49,11 +46,13 @@ class ModuleConnJoin : public Module
                        : Module(Me)
                {
                        OnRehash(NULL, "");
+               Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               Priority Prioritize()
+               void Prioritize()
                {
-                       return PRIORITY_LAST;
+                       ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_LAST);
                }
 
                void Implements(char* List)
@@ -61,7 +60,7 @@ class ModuleConnJoin : public Module
                        List[I_OnPostConnect] = List[I_OnRehash] = 1;
                }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
                        ConfigReader* conf = new ConfigReader(ServerInstance);
                        JoinChan = conf->ReadValue("autojoin", "channel", 0);
@@ -80,36 +79,17 @@ class ModuleConnJoin : public Module
                        return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostConnect(userrec* user)
+               virtual void OnPostConnect(User* user)
                {
                        if (!IS_LOCAL(user))
                                return;
 
                        for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
                                if (ServerInstance->IsChannel(it->c_str()))
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
                }
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-       public:
-               ModuleConnJoinFactory()
-               {
-               }
-
-               ~ModuleConnJoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleConnJoin(Me);
-               }
-};
 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin)