From 9f3d735d9d461e0cea042722ac1c6af98fe6560e Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 10 Oct 2011 14:16:59 -0400 Subject: Allow nickserv/suspend to take an expiry time --- modules/pseudoclients/nickserv.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'modules/pseudoclients') diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 4e6678250..595236bfa 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -105,22 +105,15 @@ class ExpireCallback : public CallBack if (na->nc->HasFlag(NI_UNCONFIRMED)) if (Config->NSUnconfirmedExpire && Anope::CurTime - na->time_registered >= Config->NSUnconfirmedExpire) expire = true; - if (na->nc->HasFlag(NI_SUSPENDED)) - { - if (Config->NSSuspendExpire && Anope::CurTime - na->last_seen >= Config->NSSuspendExpire) - expire = true; - } - else if (Config->NSExpire && Anope::CurTime - na->last_seen >= Config->NSExpire) + if (Config->NSExpire && Anope::CurTime - na->last_seen >= Config->NSExpire) expire = true; if (na->HasFlag(NS_NO_EXPIRE)) expire = false; + + FOREACH_MOD(I_OnPreNickExpire, OnPreNickExpire(na, expire)); if (expire) { - EventReturn MOD_RESULT; - FOREACH_RESULT(I_OnPreNickExpire, OnPreNickExpire(na)); - if (MOD_RESULT == EVENT_STOP) - continue; Anope::string extra; if (na->nc->HasFlag(NI_SUSPENDED)) extra = "suspended "; -- cgit