summaryrefslogtreecommitdiff
path: root/modules/pseudoclients
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-09-19 12:38:28 -0400
committerAdam <Adam@anope.org>2013-09-19 12:38:28 -0400
commit5ce90ba7d153f10b1cef876fd4201087be9964ff (patch)
tree9b7dbd8e96692eb66b047bc30612d26ae50b4af4 /modules/pseudoclients
parent98bae827e1ab608c39f84c671f611f555797b29c (diff)
Fix not updating last_seen on expire nick for nicks with secure off. Don't show Expires in /ns info if the nick is online currently as it confuses people
Diffstat (limited to 'modules/pseudoclients')
-rw-r--r--modules/pseudoclients/nickserv.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index c57039bee..9b9d8d513 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -497,7 +497,7 @@ class NickServCore : public Module, public NickServService
++it;
User *u = User::Find(na->nick);
- if (u && (na->nc->HasExt("NS_SECURE") ? u->IsIdentified(true) : u->IsRecognized()))
+ if (u && (u->IsIdentified(true) || u->IsRecognized()))
na->last_seen = Anope::CurTime;
bool expire = false;
@@ -521,7 +521,7 @@ class NickServCore : public Module, public NickServService
if (!na->nc->HasExt("UNCONFIRMED"))
{
time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire");
- if (!na->HasExt("NS_NO_EXPIRE") && nickserv_expire && !Anope::NoExpire)
+ if (!na->HasExt("NS_NO_EXPIRE") && nickserv_expire && !Anope::NoExpire && na->last_seen != Anope::CurTime)
info[_("Expires")] = Anope::strftime(na->last_seen + nickserv_expire);
}
else