Move core message handles to protocol/rfc1459

1 files changed, 26 insertions, 23 deletions

diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index d805e60cb..0f97da8ae 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -17,10 +17,13 @@
  * along with this program; if not, see see <http://www.gnu.org/licenses/>.
  */
 
+/* Dependencies: anope_protocol.rfc1459 */
+
 #include "module.h"
 #include "modules/chanserv/mode.h"
 #include "modules/sasl.h"
 #include "modules/operserv/stats.h"
+#include "modules/protocol/rfc1459.h"
 
 static Anope::string UplinkSID;
 
@@ -842,9 +845,9 @@ struct IRCDMessagePong : IRCDMessage
 	}
 };
 
-struct IRCDMessageProtoctl : Message::Capab
+struct IRCDMessageProtoctl : rfc1459::Capab
 {
-	IRCDMessageProtoctl(Module *creator) : Message::Capab(creator, "PROTOCTL") { }
+	IRCDMessageProtoctl(Module *creator) : rfc1459::Capab(creator, "PROTOCTL") { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override
 	{
@@ -858,7 +861,7 @@ struct IRCDMessageProtoctl : Message::Capab
 			}
 		}
 
-		Message::Capab::Run(source, params);
+		rfc1459::Capab::Run(source, params);
 	}
 };
 
@@ -983,7 +986,7 @@ struct IRCDMessageSJoin : IRCDMessage
 			modes.erase(modes.begin());
 
 		std::list<Anope::string> bans, excepts, invites;
-		std::list<Message::Join::SJoinUser> users;
+		std::list<rfc1459::Join::SJoinUser> users;
 
 		spacesepstream sep(params[params.size() - 1]);
 		Anope::string buf;
@@ -1009,7 +1012,7 @@ struct IRCDMessageSJoin : IRCDMessage
 			}
 			else
 			{
-				Message::Join::SJoinUser sju;
+				rfc1459::Join::SJoinUser sju;
 
 				/* Get prefixes from the nick */
 				for (char ch; (ch = ModeManager::GetStatusChar(buf[0]));)
@@ -1030,7 +1033,7 @@ struct IRCDMessageSJoin : IRCDMessage
 		}
 
 		time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : Anope::CurTime;
-		Message::Join::SJoin(source, params[1], ts, modes, users);
+		rfc1459::Join::SJoin(source, params[1], ts, modes, users);
 
 		if (!bans.empty() || !excepts.empty() || !invites.empty())
 		{
@@ -1179,23 +1182,23 @@ class ProtoUnreal : public Module
 	ServiceReference<ModeLocks> mlocks;
 
 	/* Core message handlers */
-	Message::Away message_away;
-	Message::Error message_error;
-	Message::Invite message_invite;
-	Message::Join message_join;
-	Message::Kick message_kick;
-	Message::Kill message_kill, message_svskill;
-	Message::MOTD message_motd;
-	Message::Notice message_notice;
-	Message::Part message_part;
-	Message::Ping message_ping;
-	Message::Privmsg message_privmsg;
-	Message::Quit message_quit;
-	Message::SQuit message_squit;
-	Message::Stats message_stats;
-	Message::Time message_time;
-	Message::Version message_version;
-	Message::Whois message_whois;
+	rfc1459::Away message_away;
+	rfc1459::Error message_error;
+	rfc1459::Invite message_invite;
+	rfc1459::Join message_join;
+	rfc1459::Kick message_kick;
+	rfc1459::Kill message_kill, message_svskill;
+	rfc1459::MOTD message_motd;
+	rfc1459::Notice message_notice;
+	rfc1459::Part message_part;
+	rfc1459::Ping message_ping;
+	rfc1459::Privmsg message_privmsg;
+	rfc1459::Quit message_quit;
+	rfc1459::SQuit message_squit;
+	rfc1459::Stats message_stats;
+	rfc1459::Time message_time;
+	rfc1459::Version message_version;
+	rfc1459::Whois message_whois;
 
 	/* Our message handlers */
 	IRCDMessageChgHost message_chghost;