#include "inspircd.h"
-/* $ModDesc: Provides channel mode +j (join flood protection) */
-
/** Holds settings and state associated with channel mode +j
*/
class joinfloodsettings
std::string::size_type colon = parameter.find(':');
if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
{
- source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+ source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
return MODEACTION_DENY;
}
unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
if ((njoins<1) || (nsecs<1))
{
- source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+ source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
return MODEACTION_DENY;
}
if (!channel->IsModeSet(this))
return MODEACTION_DENY;
- joinfloodsettings* f = ext.get(channel);
- if (f)
- {
- ext.unset(channel);
- return MODEACTION_ALLOW;
- }
+ ext.unset(channel);
+ return MODEACTION_ALLOW;
}
return MODEACTION_DENY;
}
{
}
- void init() CXX11_OVERRIDE
- {
- ServerInstance->Modules->AddService(jf);
- ServerInstance->Modules->AddService(jf.ext);
- Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- }
-
ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
if (chan)
joinfloodsettings *f = jf.ext.get(chan);
if (f && f->islocked())
{
- user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+ user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str());
return MOD_RES_DENY;
}
}
joinfloodsettings *f = jf.ext.get(memb->chan);
/* But all others are OK */
- if (f)
+ if ((f) && (!f->islocked()))
{
f->addjoin();
if (f->shouldlock())