Rework message handling.

- Move all message-related types to their own header to make moving
  them to a cross-module events easier.
- Rename OnUserMessage to OnUserPostMessage.
- Rename OnText to OnUserMessage.
- Replace the dest, target_type, and status parameters with the
  MessageTarget class.
- Replace the text, exempt_list, and msgtype parameters with the
  MessageDetails struct.
- Add echooriginal and originaltext to the MessageDetails struct
  to allow spam filtering to not be broken by cap echo-message.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 05cc2b416..6b5f5dacd 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -188,7 +188,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
 			m5.RemoveMode(user);
 	}
 
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
@@ -196,9 +196,9 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
 		std::string *account = accountname.get(user);
 		bool is_registered = account && !account->empty();
 
-		if (target_type == TYPE_CHANNEL)
+		if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			Channel* c = (Channel*)dest;
+			Channel* c = target.Get<Channel>();
 			ModResult res = CheckExemption::Call(exemptionprov, user, c, "regmoderated");
 
 			if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
@@ -208,9 +208,9 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
 				return MOD_RES_DENY;
 			}
 		}
-		else if (target_type == TYPE_USER)
+		else if (target.type == MessageTarget::TYPE_USER)
 		{
-			User* u = (User*)dest;
+			User* u = target.Get<User>();
 
 			if (u->IsModeSet(m3) && !is_registered)
 			{