* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
return std::make_pair(true, channel->GetModeParameter('J'));
else
return std::make_pair(false, parameter);
- }
+ }
bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
{
/* When TS is equal, the alphabetically later one wins */
return (their_param < our_param);
}
-
+
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
if (!adding)
{
// Taking the mode off, we need to clean up.
delaylist* dl;
-
+
if (channel->GetExt("norejoinusers", dl))
{
delete dl;
channel->Shrink("norejoinusers");
}
-
+
if (!channel->IsModeSet('J'))
{
return MODEACTION_DENY;
}
else
{
- channel->SetMode('J', false);
+ channel->SetModeParam('J', "");
return MODEACTION_ALLOW;
}
}
if (!channel->IsModeSet('J'))
{
parameter = ConvToStr(atoi(parameter.c_str()));
- channel->SetModeParam('J', parameter.c_str(), adding);
- channel->SetMode('J', adding);
+ channel->SetModeParam('J', parameter);
return MODEACTION_ALLOW;
}
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);
+ channel->SetModeParam('J', parameter);
return MODEACTION_ALLOW;
}
else
class ModuleKickNoRejoin : public Module
{
-
+
KickRejoin* kr;
-
+
public:
-
+
ModuleKickNoRejoin(InspIRCd* Me)
: Module(Me)
{
-
+
kr = new KickRejoin(ServerInstance);
if (!ServerInstance->Modes->AddMode(kr))
throw ModuleException("Could not add new modes!");
if (chan->GetExt("norejoinusers", dl))
{
std::vector<User*> itemstoremove;
-
+
for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
{
- if (iter->second > time(NULL))
+ if (iter->second > ServerInstance->Time())
{
- if (iter->first == user)
+ if (iter->first == user)
{
- user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick.c_str(), chan->name);
+ user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter('J').c_str());
return 1;
}
}
itemstoremove.push_back(iter->first);
}
}
-
+
for (unsigned int i = 0; i < itemstoremove.size(); i++)
dl->erase(itemstoremove[i]);
-
+
if (!dl->size())
{
// Now it's empty..
}
return 0;
}
-
+
virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
{
if (chan->IsModeSet('J') && (source != user))
dl = new delaylist;
chan->Extend("norejoinusers", dl);
}
- (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
+ (*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J'));
}
}
-
+
virtual void OnChannelDelete(Channel* chan)
{
delaylist* dl;
-
+
if (chan->GetExt("norejoinusers", dl))
{
delete dl;
chan->Shrink("norejoinusers");
}
}
-
+
virtual void OnCleanup(int target_type, void* item)
{
if(target_type == TYPE_CHANNEL)
ServerInstance->Modes->DelMode(kr);
delete kr;
}
-
+
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};