From 4fcbbbe4fbc137841b47c8e2372477b85649270a Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 17 Dec 2016 21:44:22 -0500
Subject: Split ircdproto send functions out into separate services

This makes it easier to see which send functions a protocol module
implements as they are all explicitly registered by the module, and
avoids the problem of subtly breaking other protocol modules when
using inheritance.

Also split the old "core" send implementations out into a module, and
the TS6 ID generator
---
 modules/hostserv/main/hostserv.cpp | 6 +++---
 modules/hostserv/off.cpp           | 2 +-
 modules/hostserv/on.cpp            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/hostserv')

diff --git a/modules/hostserv/main/hostserv.cpp b/modules/hostserv/main/hostserv.cpp
index 4ff348f2b..f7ba03418 100644
--- a/modules/hostserv/main/hostserv.cpp
+++ b/modules/hostserv/main/hostserv.cpp
@@ -76,7 +76,7 @@ class HostServCore : public Module
 
 		if (u->vhost.empty() || !u->vhost.equals_cs(vhost->GetHost()) || (!vhost->GetIdent().empty() && !u->GetVIdent().equals_cs(vhost->GetIdent())))
 		{
-			IRCD->SendVhost(u, vhost->GetIdent(), vhost->GetHost());
+			IRCD->Send<messages::VhostSet>(u, vhost->GetIdent(), vhost->GetHost());
 
 			u->vhost = vhost->GetHost();
 			u->UpdateHost();
@@ -124,7 +124,7 @@ class HostServCore : public Module
 				if (vhost == nullptr)
 					return;
 
-				IRCD->SendVhost(u, vhost->GetIdent(), vhost->GetHost());
+				IRCD->Send<messages::VhostSet>(u, vhost->GetIdent(), vhost->GetHost());
 
 				u->vhost = vhost->GetHost();
 				u->UpdateHost();
@@ -150,7 +150,7 @@ class HostServCore : public Module
 			User *u = User::Find(na->GetNick());
 
 			if (u && u->Account() == na->GetAccount())
-				IRCD->SendVhostDel(u);
+				IRCD->Send<messages::VhostDel>(u);
 		}
 	}
 
diff --git a/modules/hostserv/off.cpp b/modules/hostserv/off.cpp
index 1d7d91876..e1af7def4 100644
--- a/modules/hostserv/off.cpp
+++ b/modules/hostserv/off.cpp
@@ -42,7 +42,7 @@ class CommandHSOff : public Command
 
 		// XXX vident?
 		u->vhost.clear();
-		IRCD->SendVhostDel(u);
+		IRCD->Send<messages::VhostDel>(u);
 		Log(LOG_COMMAND, source, this) << "to disable their vhost";
 		source.Reply(_("Your vhost was removed and the normal cloaking restored."));
 	}
diff --git a/modules/hostserv/on.cpp b/modules/hostserv/on.cpp
index c8f4211de..3041f65a5 100644
--- a/modules/hostserv/on.cpp
+++ b/modules/hostserv/on.cpp
@@ -60,7 +60,7 @@ class CommandHSOn : public Command
 		source.Reply(_("Your vhost of \002{0}\002 is now activated."), vhost->Mask());
 		
 		Log(LOG_COMMAND, source, this) << "to enable their vhost of " << vhost->Mask();
-		IRCD->SendVhost(u, vhost->GetIdent(), vhost->GetHost());
+		IRCD->Send<messages::VhostSet>(u, vhost->GetIdent(), vhost->GetHost());
 		u->vhost = vhost->GetHost();
 		if (IRCD->CanSetVIdent && !vhost->GetIdent().empty())
 			u->SetVIdent(vhost->GetIdent());
-- 
cgit