Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index ebe2d45c990176dc7941913229411de2ebb8ab62..ec5ac661e89c224463c251d9d2b6b20196231ab0 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -24,6 +24,14 @@
 
 
 #include "inspircd.h"
+#include "modules/invite.h"
+
+enum
+{
+       // From RFC 2182.
+       ERR_UNAVAILRESOURCE = 437
+};
+
 
 class KickRejoinData
 {
@@ -83,20 +91,24 @@ class KickRejoinData
  */
 class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
 {
-       static const unsigned int max = 60;
+       const unsigned int max;
  public:
        KickRejoin(Module* Creator)
                : ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >(Creator, "kicknorejoin", 'J')
+               , max(60)
        {
        }
 
-       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
-               int v = ConvToInt(parameter);
+               unsigned int v = ConvToNum<unsigned int>(parameter);
                if (v <= 0)
+               {
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
+               }
 
-               if ((IS_LOCAL(source) && ((unsigned int)v > max)))
+               if (IS_LOCAL(source) && v > max)
                        v = max;
 
                ext.set(channel, new KickRejoinData(v));
@@ -107,15 +119,22 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
        {
                out.append(ConvToStr(krd->delay));
        }
+
+       std::string GetModuleSettings() const
+       {
+               return ConvToStr(max);
+       }
 };
 
 class ModuleKickNoRejoin : public Module
 {
        KickRejoin kr;
+       Invite::API invapi;
 
 public:
        ModuleKickNoRejoin()
                : kr(this)
+               , invapi(this)
        {
        }
 
@@ -124,9 +143,9 @@ public:
                if (chan)
                {
                        const KickRejoinData* data = kr.ext.get(chan);
-                       if ((data) && (!data->canjoin(user)))
+                       if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user)))
                        {
-                               user->WriteNumeric(ERR_DELAYREJOIN, "%s :You must wait %u seconds after being kicked to rejoin (+J)", chan->name.c_str(), data->delay);
+                               user->WriteNumeric(ERR_UNAVAILRESOURCE, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay));
                                return MOD_RES_DENY;
                        }
                }
@@ -147,7 +166,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
+               return Version("Provides channel mode +J, delays rejoins after kicks", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
        }
 };