- delaylist* dl;
- 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->first == user)
- {
- user->WriteServ( "495 %s %s :You must wait %d seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str());
- return 1;
- }
- }
- else
- {
- // Expired record, remove.
- 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..
- delete dl;
- chan->Shrink("norejoinusers");
- }
- }
- }
- return 0;
- }
-
- virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
- {
- if (chan->IsModeSet('J') && (source != user))
- {
- delaylist* dl;
- if (!chan->GetExt("norejoinusers", dl))
+ const KickRejoinData* data = kr.ext.get(chan);
+ if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user)))