From 62b2142b866d4501827c00ddedd8015f6c237896 Mon Sep 17 00:00:00 2001
From: Jordan Doyle <jordan@doyle.la>
Date: Sat, 7 Jan 2023 23:45:10 +0000
Subject: [PATCH] Implement MOTD command

---
 src/client.rs   | 20 ++++++++++++++++++--
 src/messages.rs |  7 +++++++
 src/server.rs   | 12 +++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index 14924fe..7fc1927 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -16,7 +16,7 @@ use crate::{
     messages::{
         Broadcast, ChannelFetchTopic, ChannelInvite, ChannelJoin, ChannelKickUser, ChannelList,
         ChannelMemberList, ChannelMessage, ChannelPart, ChannelUpdateTopic, FetchClientDetails,
-        ServerDisconnect, UserKickedFromChannel, UserNickChange,
+        ServerDisconnect, ServerFetchMotd, UserKickedFromChannel, UserNickChange,
     },
     server::Server,
     SERVER_NAME,
@@ -438,7 +438,23 @@ impl StreamHandler<Result<irc_proto::Message, ProtocolError>> for Client {
                 }
             }
             Command::NOTICE(_, _) => {}
-            Command::MOTD(_) => {}
+            Command::MOTD(_) => {
+                let span = Span::current();
+                let fut = self
+                    .server
+                    .send(ServerFetchMotd { span })
+                    .into_actor(self)
+                    .map(|result, this, _ctx| {
+                        for message in result
+                            .unwrap()
+                            .into_messages(this.connection.nick.to_string())
+                        {
+                            this.writer.write(message);
+                        }
+                    });
+
+                ctx.spawn(fut);
+            }
             Command::LUSERS(_, _) => {}
             Command::VERSION(_) => {
                 self.writer.write(Message {
diff --git a/src/messages.rs b/src/messages.rs
index 9c4a8aa..94344cc 100644
--- a/src/messages.rs
+++ b/src/messages.rs
@@ -83,6 +83,13 @@ pub struct ChannelKickUser {
     pub reason: Option<String>,
 }
 
+/// Fetch the message of the day from the server.
+#[derive(Message)]
+#[rtype(result = "super::server::response::Motd")]
+pub struct ServerFetchMotd {
+    pub span: Span,
+}
+
 /// Sent from channels to users when a user is removed from the channel.
 #[derive(Message)]
 #[rtype(result = "()")]
diff --git a/src/server.rs b/src/server.rs
index 2222d9e..8346421 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -15,7 +15,7 @@ use crate::{
     connection::InitiatedConnection,
     messages::{
         Broadcast, ChannelFetchTopic, ChannelJoin, ChannelList, ChannelMemberList,
-        FetchClientByNick, ServerDisconnect, UserConnected, UserNickChange,
+        FetchClientByNick, ServerDisconnect, ServerFetchMotd, UserConnected, UserNickChange,
     },
     server::response::Motd,
     SERVER_NAME,
@@ -88,6 +88,16 @@ impl Handler<UserConnected> for Server {
     }
 }
 
+/// Returns the MOTD when requested.
+impl Handler<ServerFetchMotd> for Server {
+    type Result = MessageResult<ServerFetchMotd>;
+
+    #[instrument(parent = &msg.span, skip_all)]
+    fn handle(&mut self, msg: ServerFetchMotd, _ctx: &mut Self::Context) -> Self::Result {
+        MessageResult(Motd::new(self))
+    }
+}
+
 /// Received when a client disconnects from the server
 impl Handler<ServerDisconnect> for Server {
     type Result = ();
--
libgit2 1.7.2