typedef std::map<userrec*, time_t> delaylist;
+/** Handles channel mode +J
+ */
class KickRejoin : public ModeHandler
{
public:
}
if ((!adding) || (atoi(parameter.c_str()) > 0))
{
- parameter = ConvToStr(atoi(parameter.c_str()));
- channel->SetModeParam('J', parameter.c_str(), adding);
- channel->SetMode('J', adding);
- return MODEACTION_ALLOW;
+ ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
+
+ if (!channel->IsModeSet('J'))
+ {
+ parameter = ConvToStr(atoi(parameter.c_str()));
+ channel->SetModeParam('J', parameter.c_str(), adding);
+ channel->SetMode('J', adding);
+ return MODEACTION_ALLOW;
+ }
+ else
+ {
+ if (!adding)
+ {
+ channel->SetModeParam('J', parameter.c_str(), adding);
+ return MODEACTION_ALLOW;
+ }
+
+ std::string cur_param = channel->GetModeParameter('J');
+ if (cur_param == parameter)
+ {
+ // mode params match, don't change mode
+ return MODEACTION_DENY;
+ }
+ else
+ {
+ // new mode param, replace old with new
+ parameter = ConvToStr(atoi(parameter.c_str()));
+ cur_param = ConvToStr(atoi(cur_param.c_str()));
+ if (parameter != "0")
+ {
+ channel->SetModeParam('J', cur_param.c_str(), false);
+ channel->SetModeParam('J', parameter.c_str(), adding);
+ return MODEACTION_ALLOW;
+ }
+ else
+ {
+ /* Fix to jamie's fix, dont allow +J 0 on the new value! */
+ return MODEACTION_DENY;
+ }
+ }
+ }
}
else
{
ServerInstance->AddMode(kr, 'J');
}
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+ virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
{
if (chan)
{
if (!dl->size())
{
// Now it's empty..
- DELETE(dl);
- chan->Shrink("norejoinusers");
+ DELETE(dl);
+ chan->Shrink("norejoinusers");
}
}
}
virtual ~ModuleKickNoRejoin()
{
+ ServerInstance->Modes->DelMode(kr);
DELETE(kr);
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+ return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
};