#include "inspircd.h"
-typedef std::map<std::string, time_t> delaylist;
-
class KickRejoinData
{
- mutable delaylist kicked;
+ struct KickedUser
+ {
+ std::string uuid;
+ time_t expire;
+
+ KickedUser(User* user, unsigned int Delay)
+ : uuid(user->uuid)
+ , expire(ServerInstance->Time() + Delay)
+ {
+ }
+ };
+
+ typedef std::vector<KickedUser> KickedList;
+
+ mutable KickedList kicked;
public:
const unsigned int delay;
bool canjoin(LocalUser* user) const
{
- for (delaylist::iterator i = kicked.begin(); i != kicked.end(); )
+ for (KickedList::iterator i = kicked.begin(); i != kicked.end(); )
{
- if (i->second > ServerInstance->Time())
+ KickedUser& rec = *i;
+ if (rec.expire > ServerInstance->Time())
{
- if (i->first == user->uuid)
+ if (rec.uuid == user->uuid)
return false;
++i;
}
else
{
// Expired record, remove.
- kicked.erase(i++);
+ stdalgo::vector::swaperase(kicked, i);
+ if (kicked.empty())
+ break;
}
}
return true;
void add(User* user)
{
- kicked[user->uuid] = ServerInstance->Time() + delay;
+ // One user can be in the list multiple times if the user gets kicked, force joins
+ // (skipping OnUserPreJoin) and gets kicked again, but that's okay because canjoin()
+ // works correctly in this case as well
+ kicked.push_back(KickedUser(user, delay));
}
};
*/
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)
{
}
{
out.append(ConvToStr(krd->delay));
}
+
+ std::string GetModuleSettings() const
+ {
+ return ConvToStr(max);
+ }
};
class ModuleKickNoRejoin : public Module
const KickRejoinData* data = kr.ext.get(chan);
if ((data) && (!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_DELAYREJOIN, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
return MOD_RES_DENY;
}
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
+ return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
}
};