pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-06 18:23:12 +02:00
Code Activity

Fixed os_ignore to check against users real IPs, not to match against opers, and check for expired ignores on /os ignore list

Browse Source
This commit is contained in:
Adam
2012-01-24 16:35:54 -05:00
parent fc20bd7b22
commit d06cdaab29
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/os_ignore.cpp
+17 -3
View File
@@ -92,7 +92,7 @@ class OSIgnoreService : public IgnoreService
for (; ign != ign_end; ++ign)
{
Entry ignore_mask(CMODE_BEGIN, ign->mask);
if (ignore_mask.Matches(u))
if (ignore_mask.Matches(u, true))
break;
}
}
@@ -183,7 +183,21 @@ class CommandOSIgnore : public Command
if (!ignore_service)
return;
const std::list<IgnoreData> &ignores = ignore_service->GetIgnores();
std::list<IgnoreData> &ignores = ignore_service->GetIgnores();
for (std::list<IgnoreData>::iterator it = ignores.begin(), next_it; it != ignores.end(); it = next_it)
{
IgnoreData &id = *it;
next_it = it;
++next_it;
if (id.time && id.time <= Anope::CurTime)
{
Log(LOG_DEBUG) << "Expiring ignore entry " << id.mask;
ignores.erase(it);
}
}
if (ignores.empty())
source.Reply(_("Ignore list is empty."));
else
@@ -306,7 +320,7 @@ class OSIgnore : public Module
EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message)
{
if (this->osignoreservice.Find(u->nick))
if (!u->HasMode(UMODE_OPER) && this->osignoreservice.Find(u->nick))
return EVENT_STOP;
return EVENT_CONTINUE;