Add ProtocolInterface::Introduce() to prevent confusion over event ordering, and...

[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 ca7f0c0684f599eb91d6174e041bc3c110f5ffb2..606794d10818c687c96c19863f05ef841ff591d6 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Forces users to join the specified channel(s) on connect */
@@ -22,17 +19,17 @@ class ModuleConnJoin : public Module
 {
        private:
                std::string JoinChan;
-               ConfigReader* conf;
+               std::vector<std::string> Joinchans;
                
 
-               int tokenize(const string &str, std::vector<std::string> &tokens)
+               int tokenize(const std::string &str, std::vector<std::string> &tokens)
                {
                        // skip delimiters at beginning.
-                       string::size_type lastPos = str.find_first_not_of(",", 0);
+                       std::string::size_type lastPos = str.find_first_not_of(",", 0);
                        // find first "non-delimiter".
-                       string::size_type pos = str.find_first_of(",", lastPos);
+                       std::string::size_type pos = str.find_first_of(",", lastPos);
 
-                       while (string::npos != pos || string::npos != lastPos)
+                       while (std::string::npos != pos || std::string::npos != lastPos)
                        {
                                // found a token, add it to the vector.
                                tokens.push_back(str.substr(lastPos, pos - lastPos));
@@ -46,65 +43,49 @@ class ModuleConnJoin : public Module
 
        public:
                ModuleConnJoin(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
-                       conf = new ConfigReader(ServerInstance);
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       OnRehash(NULL, "");
+                       Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               void Implements(char* List)
+               void Prioritize()
                {
-                       List[I_OnPostConnect] = List[I_OnRehash] = 1;
+                       ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIO_LAST);
                }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
-                       DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
+                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       Joinchans.clear();
+                       if (!JoinChan.empty())
+                               tokenize(JoinChan,Joinchans);
+                       delete conf;
                }
 
                virtual ~ModuleConnJoin()
                {
-                       DELETE(conf);
                }
 
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+                       return Version(1,2,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostConnect(userrec* user)
+               virtual void OnPostConnect(User* user)
                {
-                       if (!JoinChan.empty())
-                       {
-                               std::vector<std::string> Joinchans;
-                               tokenize(JoinChan,Joinchans);
-                               for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
-                       }
+                       if (!IS_LOCAL(user))
+                               return;
 
+                       for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
+                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time());
                }
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-       public:
-               ModuleConnJoinFactory()
-               {
-               }
-
-               ~ModuleConnJoinFactory()
-               {
-               }
 
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleConnJoin(Me);
-               }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin)