From ad8ed13b7468be23fb1e5074aef877534cf2e90b Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Wed, 22 Jun 2022 17:08:01 +0200
Subject: [PATCH] common: Simplify reply construction

---
 crates/ruma-common/src/events/room/message.rs | 50 ++++++-------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/crates/ruma-common/src/events/room/message.rs b/crates/ruma-common/src/events/room/message.rs
index 849aefa0..11c74f3d 100644
--- a/crates/ruma-common/src/events/room/message.rs
+++ b/crates/ruma-common/src/events/room/message.rs
@@ -196,32 +196,21 @@ impl RoomMessageEventContent {
         original_message: &OriginalRoomMessageEvent,
         forward_thread: ForwardThread,
     ) -> Self {
+        let make_reply = |body, formatted: Option<FormattedBody>| {
+            reply::plain_and_formatted_reply_body(body, formatted.map(|f| f.body), original_message)
+        };
+
         let msgtype = match message {
             MessageType::Text(TextMessageEventContent { body, formatted, .. }) => {
-                let (body, html_body) = reply::plain_and_formatted_reply_body(
-                    body,
-                    formatted.map(|f| f.body),
-                    original_message,
-                );
-
+                let (body, html_body) = make_reply(body, formatted);
                 MessageType::Text(TextMessageEventContent::html(body, html_body))
             }
             MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => {
-                let (body, html_body) = reply::plain_and_formatted_reply_body(
-                    body,
-                    formatted.map(|f| f.body),
-                    original_message,
-                );
-
+                let (body, html_body) = make_reply(body, formatted);
                 MessageType::Emote(EmoteMessageEventContent::html(body, html_body))
             }
             MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => {
-                let (body, html_body) = reply::plain_and_formatted_reply_body(
-                    body,
-                    formatted.map(|f| f.body),
-                    original_message,
-                );
-
+                let (body, html_body) = make_reply(body, formatted);
                 MessageType::Notice(NoticeMessageEventContent::html(body, html_body))
             }
             _ => message,
@@ -257,34 +246,23 @@ impl RoomMessageEventContent {
         previous_message: &OriginalRoomMessageEvent,
         is_reply: ReplyInThread,
     ) -> Self {
+        let make_reply = |body, formatted: Option<FormattedBody>| {
+            reply::plain_and_formatted_reply_body(body, formatted.map(|f| f.body), previous_message)
+        };
+
         let msgtype = if is_reply == ReplyInThread::Yes {
             // If this is a real reply, add the rich reply fallback.
             match message {
                 MessageType::Text(TextMessageEventContent { body, formatted, .. }) => {
-                    let (body, html_body) = reply::plain_and_formatted_reply_body(
-                        body,
-                        formatted.map(|f| f.body),
-                        previous_message,
-                    );
-
+                    let (body, html_body) = make_reply(body, formatted);
                     MessageType::Text(TextMessageEventContent::html(body, html_body))
                 }
                 MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => {
-                    let (body, html_body) = reply::plain_and_formatted_reply_body(
-                        body,
-                        formatted.map(|f| f.body),
-                        previous_message,
-                    );
-
+                    let (body, html_body) = make_reply(body, formatted);
                     MessageType::Emote(EmoteMessageEventContent::html(body, html_body))
                 }
                 MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => {
-                    let (body, html_body) = reply::plain_and_formatted_reply_body(
-                        body,
-                        formatted.map(|f| f.body),
-                        previous_message,
-                    );
-
+                    let (body, html_body) = make_reply(body, formatted);
                     MessageType::Notice(NoticeMessageEventContent::html(body, html_body))
                 }
                 _ => message,