diff options
| author | Adam <adam@sigterm.info> | 2019-11-11 21:20:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 21:20:55 -0500 |
| commit | 91dde90ad2fd6ed21df5f02f97a9bbce3ac31b39 (patch) | |
| tree | 1ec64834af148ac38567aeff1fd2a6fa3e1a891e | |
| parent | ae7706ae55e107c86f1ef0e26c3fc2ac4bc05757 (diff) | |
| parent | 661b320d2359e36cc172c2417a6f0cf19b4b4e73 (diff) | |
Merge pull request #246 from genius3000/2.0+unconfimed_info
Fix NickServ INFO and GLIST showing an incorrect unconfirmed expiry.
| -rw-r--r-- | modules/commands/ns_group.cpp | 2 | ||||
| -rw-r--r-- | modules/pseudoclients/nickserv.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index 28faa96ca..da4fb91b0 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -326,7 +326,7 @@ class CommandNSGList : public Command ListFormatter list(source.GetAccount()); list.AddColumn(_("Nick")).AddColumn(_("Expires")); time_t nickserv_expire = Config->GetModule("nickserv")->Get<time_t>("expire", "21d"), - unconfirmed_expire = Config->GetModule("nickserv")->Get<time_t>("unconfirmedexpire", "1d"); + unconfirmed_expire = Config->GetModule("ns_register")->Get<time_t>("unconfirmedexpire", "1d"); for (unsigned i = 0; i < nc->aliases->size(); ++i) { const NickAlias *na2 = nc->aliases->at(i); diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 4d6c91c24..5ae9a97c5 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -558,7 +558,7 @@ class NickServCore : public Module, public NickServService } else { - time_t unconfirmed_expire = Config->GetModule(this)->Get<time_t>("unconfirmedexpire", "1d"); + time_t unconfirmed_expire = Config->GetModule("ns_register")->Get<time_t>("unconfirmedexpire", "1d"); info[_("Expires")] = Anope::strftime(na->time_registered + unconfirmed_expire, source.GetAccount()); } } |