ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_kicknorejoin Minor improvements

Browse Source 
- Ignore remote users
- Remove expired items in one pass
This commit is contained in:
attilamolnar 2012-12-02 17:54:23 +01:00
parent 45ec564b05
commit e3939559e4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/m_kicknorejoin.cpp
View File

@ -81,9 +81,7 @@ public:
delaylist* dl = kr.ext.get(chan);
if (dl)
{
std::vector<User*> itemstoremove;
for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
for (delaylist::iterator iter = dl->begin(); iter != dl->end(); )
{
if (iter->second > ServerInstance->Time())
{
@ -94,17 +92,15 @@ public:
user->nick.c_str(), chan->name.c_str(), modeparam.c_str());
return MOD_RES_DENY;
}
++iter;
}
else
{
// Expired record, remove.
itemstoremove.push_back(iter->first);
dl->erase(iter++);
}
}
for (unsigned int i = 0; i < itemstoremove.size(); i++)
dl->erase(itemstoremove[i]);
if (!dl->size())
kr.ext.unset(chan);
}
@ -114,7 +110,7 @@ public:
void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
{
if (memb->chan->IsModeSet(&kr) && (source != memb->user))
if (memb->chan->IsModeSet(&kr) && (IS_LOCAL(memb->user)) && (source != memb->user))
{
delaylist* dl = kr.ext.get(memb->chan);
if (!dl)