From f5a85c69d225edaed4e11eb4c2b27d66ebc5195e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 19 Apr 2025 22:53:49 +0100 Subject: Remove time from the name of some variables where its obvious. --- modules/nickserv/nickserv.cpp | 2 +- modules/nickserv/ns_group.cpp | 4 ++-- modules/nickserv/ns_info.cpp | 4 ++-- modules/nickserv/ns_register.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/nickserv') diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index a78e73251..8c77019ab 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -625,7 +625,7 @@ public: else { time_t unconfirmed_expire = Config->GetModule("ns_register").Get("unconfirmedexpire", "1d"); - info[_("Expires")] = Anope::strftime(na->time_registered + unconfirmed_expire, source.GetAccount()); + info[_("Expires")] = Anope::strftime(na->registered + unconfirmed_expire, source.GetAccount()); } } }; diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index d84b8b703..6f6469396 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -51,7 +51,7 @@ public: } na = new NickAlias(nick, target->nc); - na->time_registered = na->last_seen = Anope::CurTime; + na->registered = na->last_seen = Anope::CurTime; if (u != NULL) { @@ -351,7 +351,7 @@ public: else if (!nickserv_expire || Anope::NoExpire) ; else if (na2->nc->HasExt("UNCONFIRMED") && unconfirmed_expire) - expires = Anope::strftime(na2->time_registered + unconfirmed_expire, source.GetAccount()); + expires = Anope::strftime(na2->registered + unconfirmed_expire, source.GetAccount()); else expires = Anope::strftime(na2->last_seen + nickserv_expire, source.GetAccount()); diff --git a/modules/nickserv/ns_info.cpp b/modules/nickserv/ns_info.cpp index 4637bb06e..254a928ac 100644 --- a/modules/nickserv/ns_info.cpp +++ b/modules/nickserv/ns_info.cpp @@ -116,8 +116,8 @@ public: info[_("Last seen address")] = na->last_realhost; } - info[_("Account registered")] = Anope::strftime(na->nc->time_registered, source.GetAccount()); - info[_("Nick registered")] = Anope::strftime(na->time_registered, source.GetAccount()); + info[_("Account registered")] = Anope::strftime(na->nc->registered, source.GetAccount()); + info[_("Nick registered")] = Anope::strftime(na->registered, source.GetAccount()); if (!nick_online) info[_("Last seen")] = Anope::strftime(na->last_seen, source.GetAccount()); diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 55f79772d..60444765f 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -413,10 +413,10 @@ public: else u->SendMessage(NickServ, _("Your email address is not confirmed. To confirm it, follow the instructions that were emailed to you.")); const NickAlias *this_na = u->AccountNick(); - time_t time_registered = Anope::CurTime - this_na->time_registered; + time_t registered = Anope::CurTime - this_na->registered; time_t unconfirmed_expire = Config->GetModule(this).Get("unconfirmedexpire", "1d"); - if (unconfirmed_expire > time_registered) - u->SendMessage(NickServ, _("Your account will expire, if not confirmed, in %s."), Anope::Duration(unconfirmed_expire - time_registered, u->Account()).c_str()); + if (unconfirmed_expire > registered) + u->SendMessage(NickServ, _("Your account will expire, if not confirmed, in %s."), Anope::Duration(unconfirmed_expire - registered, u->Account()).c_str()); } } @@ -425,7 +425,7 @@ public: if (unconfirmed.HasExt(na->nc)) { time_t unconfirmed_expire = Config->GetModule(this).Get("unconfirmedexpire", "1d"); - if (unconfirmed_expire && Anope::CurTime - na->time_registered >= unconfirmed_expire) + if (unconfirmed_expire && Anope::CurTime - na->registered >= unconfirmed_expire) expire = true; } } -- cgit