cmd_quit Display quit messages of remote users

[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 aec32e192774861d85f8b45463732f3712af322c..a5aba68df9a22e352f416d31ba7fd146409371ed 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -22,9 +22,61 @@
 
 #include "inspircd.h"
 
+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, ServerInstance->Time(), 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
 {
+       SimpleExtItem<JoinTimer> ext;
+       std::string defchans;
+       unsigned int defdelay;
+
  public:
+       ModuleConnJoin() : ext("join_timer", this)
+       {
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin");
+               defchans = tag->getString("channel");
+               defdelay = tag->getInt("delay", 0, 0, 60);
+       }
+
        void Prioritize()
        {
                ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
@@ -41,17 +93,21 @@ class ModuleConnJoin : public Module
                if (!localuser)
                        return;
 
-               std::string chanlist = ServerInstance->Config->ConfValue("autojoin")->getString("channel");
-               chanlist = localuser->GetClass()->config->getString("autojoin", chanlist);
-
-               irc::commasepstream chans(chanlist);
-               std::string chan;
+               std::string chanlist = localuser->GetClass()->config->getString("autojoin");
+               unsigned int chandelay = localuser->GetClass()->config->getInt("autojoindelay", 0, 0, 60);
 
-               while (chans.GetToken(chan))
+               if (chanlist.empty())
                {
-                       if (ServerInstance->IsChannel(chan))
-                               Channel::JoinUser(localuser, chan);
+                       if (defchans.empty())
+                               return;
+                       chanlist = defchans;
+                       chandelay = defdelay;
                }
+
+               if (!chandelay)
+                       JoinChannels(localuser, chanlist);
+               else
+                       ext.set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay));
        }
 };