Normalize databases by not allowing generic Object references

Remove redis database support

6 files changed, 12 insertions, 11 deletions

diff --git a/modules/hostserv/add.cpp b/modules/hostserv/add.cpp
index 37de7d2bb..9960f407c 100644
--- a/modules/hostserv/add.cpp
+++ b/modules/hostserv/add.cpp
@@ -110,7 +110,7 @@ class CommandHSAdd : public Command
 			return;
 		}
 
-		vhost->SetOwner(na->GetAccount());
+		vhost->SetAccount(na->GetAccount());
 		vhost->SetIdent(user);
 		vhost->SetHost(host);
 		vhost->SetCreator(source.GetNick());
diff --git a/modules/hostserv/main/vhost.cpp b/modules/hostserv/main/vhost.cpp
index 635e3a5b4..7c08fe838 100644
--- a/modules/hostserv/main/vhost.cpp
+++ b/modules/hostserv/main/vhost.cpp
@@ -18,15 +18,16 @@
  */
 
 #include "vhosttype.h"
+#include "modules/nickserv.h"
 
-Serialize::Object *VHostImpl::GetOwner()
+NickServ::Account *VHostImpl::GetAccount()
 {
-	return Get(&VHostType::owner);
+	return Get(&VHostType::account);
 }
 
-void VHostImpl::SetOwner(Serialize::Object *owner)
+void VHostImpl::SetAccount(NickServ::Account *acc)
 {
-	Set(&VHostType::owner, owner);
+	Set(&VHostType::account, acc);
 }
 
 Anope::string VHostImpl::GetIdent()
diff --git a/modules/hostserv/main/vhost.h b/modules/hostserv/main/vhost.h
index bdc6509d7..b96e20644 100644
--- a/modules/hostserv/main/vhost.h
+++ b/modules/hostserv/main/vhost.h
@@ -25,7 +25,7 @@ class VHostImpl : public HostServ::VHost
 {
 	friend class VHostType;
 
-	Serialize::Storage<Serialize::Object *> owner;
+	Serialize::Storage<NickServ::Account *> account;
 	Serialize::Storage<Anope::string> vident;
 	Serialize::Storage<Anope::string> vhost;
 	Serialize::Storage<Anope::string> creator;
@@ -35,8 +35,8 @@ class VHostImpl : public HostServ::VHost
  public:
 	using HostServ::VHost::VHost;
 
-	Serialize::Object *GetOwner() override;
-	void SetOwner(Serialize::Object *) override;
+	NickServ::Account *GetAccount() override;
+	void SetAccount(NickServ::Account *) override;
 
 	Anope::string GetIdent() override;
 	void SetIdent(const Anope::string &) override;
diff --git a/modules/hostserv/main/vhosttype.cpp b/modules/hostserv/main/vhosttype.cpp
index ee73840bf..76ac5476b 100644
--- a/modules/hostserv/main/vhosttype.cpp
+++ b/modules/hostserv/main/vhosttype.cpp
@@ -21,7 +21,7 @@
 #include "vhosttype.h"
 
 VHostType::VHostType(Module *me) : Serialize::Type<VHostImpl>(me)
-	, owner(this, "owner", &VHostImpl::owner, true)
+	, account(this, "account", &VHostImpl::account, true)
 	, vident(this, "vident", &VHostImpl::vident)
 	, vhost(this, "vhost", &VHostImpl::vhost)
 	, creator(this, "creator", &VHostImpl::creator)
diff --git a/modules/hostserv/main/vhosttype.h b/modules/hostserv/main/vhosttype.h
index 3be60f518..945110563 100644
--- a/modules/hostserv/main/vhosttype.h
+++ b/modules/hostserv/main/vhosttype.h
@@ -22,7 +22,7 @@
 class VHostType : public Serialize::Type<VHostImpl>
 {
  public:
-	Serialize::ObjectField<VHostImpl, Serialize::Object *> owner;
+	Serialize::ObjectField<VHostImpl, NickServ::Account *> account;
 	Serialize::Field<VHostImpl, Anope::string> vident;
 	Serialize::Field<VHostImpl, Anope::string> vhost;
 	Serialize::Field<VHostImpl, Anope::string> creator;
diff --git a/modules/hostserv/request.cpp b/modules/hostserv/request.cpp
index bef1f1548..a74dcacad 100644
--- a/modules/hostserv/request.cpp
+++ b/modules/hostserv/request.cpp
@@ -291,7 +291,7 @@ class CommandHSActivate : public Command
 			return;
 		}
 
-		vhost->SetOwner(na->GetAccount());
+		vhost->SetAccount(na->GetAccount());
 		vhost->SetIdent(req->GetIdent());
 		vhost->SetHost(req->GetHost());
 		vhost->SetCreator(source.GetNick());