Add CXX11_OVERRIDE to overridden members that lack it.

[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 6b13ab1aab8da7556d193cd8249b4e394c9ef391..bd8d89dc9b54365e895da7f7ad626b0e7778e8e9 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -22,45 +22,94 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Forces users to join the specified channel(s) on connect */
+static void JoinChannels(LocalUser* u, const std::string& chanlist)
+{
+       irc::commasepstream chans(chanlist);
+       std::string chan;
+
+       while (chans.GetToken(chan))
+       {
+               if (ServerInstance->IsChannel(chan))
+                       Channel::JoinUser(u, chan);
+       }
+}
+
+class JoinTimer : public Timer
+{
+ private:
+       LocalUser* const user;
+       const std::string channels;
+       SimpleExtItem<JoinTimer>& ext;
+
+ public:
+       JoinTimer(LocalUser* u, SimpleExtItem<JoinTimer>& ex, const std::string& chans, unsigned int delay)
+               : Timer(delay, false)
+               , user(u), channels(chans), ext(ex)
+       {
+               ServerInstance->Timers.AddTimer(this);
+       }
+
+       bool Tick(time_t time) CXX11_OVERRIDE
+       {
+               if (user->chans.empty())
+                       JoinChannels(user, channels);
+
+               ext.unset(user);
+               return false;
+       }
+};
 
 class ModuleConnJoin : public Module
 {
-       public:
-               void init()
-               {
-                       Implementation eventlist[] = { I_OnPostConnect };
-                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-               }
+       SimpleExtItem<JoinTimer> ext;
+       std::string defchans;
+       unsigned int defdelay;
 
-               void Prioritize()
-               {
-                       ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
-               }
+ public:
+       ModuleConnJoin()
+               : ext("join_timer", ExtensionItem::EXT_USER, this)
+       {
+       }
 
-               Version GetVersion()
-               {
-                       return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
-               }
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin");
+               defchans = tag->getString("channel");
+               defdelay = tag->getInt("delay", 0, 0, 60);
+       }
 
-               void OnPostConnect(User* user)
-               {
-                       if (!IS_LOCAL(user))
-                               return;
+       void Prioritize() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
+       }
 
-                       std::string chanlist = ServerInstance->Config->ConfValue("autojoin")->getString("channel");
-                       chanlist = user->GetClass()->config->getString("autojoin", chanlist);
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
+       }
 
-                       irc::commasepstream chans(chanlist);
-                       std::string chan;
+       void OnPostConnect(User* user) CXX11_OVERRIDE
+       {
+               LocalUser* localuser = IS_LOCAL(user);
+               if (!localuser)
+                       return;
 
-                       while (chans.GetToken(chan))
-                       {
-                               if (ServerInstance->IsChannel(chan.c_str(), ServerInstance->Config->Limits.ChanMax))
-                                       Channel::JoinUser(user, chan.c_str(), false, "", false, ServerInstance->Time());
-                       }
+               std::string chanlist = localuser->GetClass()->config->getString("autojoin");
+               unsigned int chandelay = localuser->GetClass()->config->getInt("autojoindelay", 0, 0, 60);
+
+               if (chanlist.empty())
+               {
+                       if (defchans.empty())
+                               return;
+                       chanlist = defchans;
+                       chandelay = defdelay;
                }
-};
 
+               if (!chandelay)
+                       JoinChannels(localuser, chanlist);
+               else
+                       ext.set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay));
+       }
+};
 
 MODULE_INIT(ModuleConnJoin)