diff options
| author | Adam <Adam@anope.org> | 2016-10-15 16:25:57 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2016-10-15 16:25:57 -0400 |
| commit | 1ba242179fee46583098f48421af39ce9a8985a1 (patch) | |
| tree | a276cd7bd53e7270c86ab3744bd6a568a016501b /modules/nickserv/main/nickserv.cpp | |
| parent | 696239e93391f3dfd6459857fb02a6006048093a (diff) | |
Various improvements/bugfixes to extdb stuff
Diffstat (limited to 'modules/nickserv/main/nickserv.cpp')
| -rw-r--r-- | modules/nickserv/main/nickserv.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp index 2e766a9e2..461925927 100644 --- a/modules/nickserv/main/nickserv.cpp +++ b/modules/nickserv/main/nickserv.cpp @@ -219,7 +219,7 @@ class NickServCore : public Module, public NickServ::NickServService /* On shutdown, restart, or mod unload, remove all of our holds for nicks (svshold or qlines) * because some IRCds do not allow us to have these automatically expire */ - for (NickServ::Nick *na : nick_type.List<NickServ::Nick *>()) + for (NickServ::Nick *na : Serialize::GetObjects<NickServ::Nick *>()) this->Release(na); } @@ -362,7 +362,7 @@ class NickServCore : public Module, public NickServ::NickServService std::vector<NickServ::Nick *> GetNickList() override { - return nick_type.List<NickServ::Nick *>(); + return Serialize::GetObjects<NickServ::Nick *>(); } NickServ::nickalias_map& GetNickMap() override @@ -372,7 +372,7 @@ class NickServCore : public Module, public NickServ::NickServService std::vector<NickServ::Account *> GetAccountList() override { - return account_type.List<NickServ::Account *>(); + return Serialize::GetObjects<NickServ::Account *>(); } NickServ::nickcore_map& GetAccountMap() override @@ -532,6 +532,7 @@ class NickServCore : public Module, public NickServ::NickServService { if (u->HasMode("REGISTERED") && !u->IsIdentified(true)) u->RemoveMode(NickServ, "REGISTERED"); + if (!u->IsIdentified()) this->Validate(u); } @@ -640,7 +641,7 @@ class NickServCore : public Module, public NickServ::NickServService time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire", "21d"); - for (NickServ::Nick *na : nick_type.List<NickServ::Nick *>()) + for (NickServ::Nick *na : Serialize::GetObjects<NickServ::Nick *>()) { User *u = User::Find(na->GetNick(), true); if (u && (u->IsIdentified(true) || u->IsRecognized())) |
