Also synchronise the prefix rank between servers.

[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 ad8bfdcb6d1c60b283f8f604d8c341cb0f288907..4d911e78b9c78e741bb028edc343491a5cb9dba8 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
 {
@@ -91,11 +99,14 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
        {
        }
 
-       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
                int v = ConvToInt(parameter);
                if (v <= 0)
+               {
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
+               }
 
                if ((IS_LOCAL(source) && ((unsigned int)v > max)))
                        v = max;
@@ -118,10 +129,12 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
 class ModuleKickNoRejoin : public Module
 {
        KickRejoin kr;
+       Invite::API invapi;
 
 public:
        ModuleKickNoRejoin()
                : kr(this)
+               , invapi(this)
        {
        }
 
@@ -130,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, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
+                               user->WriteNumeric(ERR_UNAVAILRESOURCE, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
                                return MOD_RES_DENY;
                        }
                }