chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Simplify reply construction

Browse Source
This commit is contained in:
Jonas Platte 2022-06-22 17:08:01 +02:00
parent 8fc6a55877
commit ad8ed13b74
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
crates/ruma-common/src/events/room/message.rs
View File

@ -196,32 +196,21 @@ impl RoomMessageEventContent {
original_message: &OriginalRoomMessageEvent, original_message: &OriginalRoomMessageEvent,
forward_thread: ForwardThread, forward_thread: ForwardThread,
) -> Self { ) -> 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 { let msgtype = match message {
MessageType::Text(TextMessageEventContent { body, formatted, .. }) => { MessageType::Text(TextMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
original_message,
);
MessageType::Text(TextMessageEventContent::html(body, html_body)) MessageType::Text(TextMessageEventContent::html(body, html_body))
} }
MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => { MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
original_message,
);
MessageType::Emote(EmoteMessageEventContent::html(body, html_body)) MessageType::Emote(EmoteMessageEventContent::html(body, html_body))
} }
MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => { MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
original_message,
);
MessageType::Notice(NoticeMessageEventContent::html(body, html_body)) MessageType::Notice(NoticeMessageEventContent::html(body, html_body))
} }
_ => message, _ => message,
@ -257,34 +246,23 @@ impl RoomMessageEventContent {
previous_message: &OriginalRoomMessageEvent, previous_message: &OriginalRoomMessageEvent,
is_reply: ReplyInThread, is_reply: ReplyInThread,
) -> Self { ) -> 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 { let msgtype = if is_reply == ReplyInThread::Yes {
// If this is a real reply, add the rich reply fallback. // If this is a real reply, add the rich reply fallback.
match message { match message {
MessageType::Text(TextMessageEventContent { body, formatted, .. }) => { MessageType::Text(TextMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
previous_message,
);
MessageType::Text(TextMessageEventContent::html(body, html_body)) MessageType::Text(TextMessageEventContent::html(body, html_body))
} }
MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => { MessageType::Emote(EmoteMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
previous_message,
);
MessageType::Emote(EmoteMessageEventContent::html(body, html_body)) MessageType::Emote(EmoteMessageEventContent::html(body, html_body))
} }
MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => { MessageType::Notice(NoticeMessageEventContent { body, formatted, .. }) => {
let (body, html_body) = reply::plain_and_formatted_reply_body( let (body, html_body) = make_reply(body, formatted);
body,
formatted.map(|f| f.body),
previous_message,
);
MessageType::Notice(NoticeMessageEventContent::html(body, html_body)) MessageType::Notice(NoticeMessageEventContent::html(body, html_body))
} }
_ => message, _ => message,