CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
{
list.clear();
- exempt.clear();
}
void CullList::AddItem(User* user)
{
- if (exempt.find(user) == exempt.end())
+ if (user->quitting)
{
- list.push_back(user);
- exempt[user] = user;
+ ServerInstance->Log(DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
+ return;
}
+
+ user->quitting = true;
+ list.push_back(user);
}
void CullList::MakeSilent(User* user)
std::vector<User *>::iterator a = list.begin();
User *u = (*a);
- user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
- std::map<User*, User*>::iterator exemptiter = exempt.find(u);
+ user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
const char* preset_reason = u->GetOperQuit();
std::string reason = u->operquitmsg;
std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
oper_reason.resize(MAXQUIT - 1);
if (u->registered != REG_ALL)
- if (ServerInstance->unregistered_count)
- ServerInstance->unregistered_count--;
+ if (ServerInstance->Users->unregistered_count)
+ ServerInstance->Users->unregistered_count--;
if (IS_LOCAL(u))
{
u->AddToWhoWas();
}
- if (iter != ServerInstance->clientlist->end())
+ if (iter != ServerInstance->Users->clientlist->end())
{
if (IS_LOCAL(u))
{
- std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u);
- if (x != ServerInstance->local_users.end())
- ServerInstance->local_users.erase(x);
+ std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+ if (x != ServerInstance->Users->local_users.end())
+ ServerInstance->Users->local_users.erase(x);
}
- ServerInstance->clientlist->erase(iter);
+ ServerInstance->Users->clientlist->erase(iter);
}
delete u;
list.erase(list.begin());
- exempt.erase(exemptiter);
}
return n;