mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-05 06:28:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

sdk: Use new_content of edits instead of content

Browse Source 
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
This commit is contained in:
Kévin Commaille
2023-04-27 16:00:21 +02:00
parent cbfa134087
commit d54b4a1d5a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/matrix-sdk/src/room/timeline/event_handler.rs
View File

@@ -26,7 +26,7 @@ use ruma::{
room::{
encrypted::RoomEncryptedEventContent,
member::{Change, RoomMemberEventContent},
message::{self, MessageType, RoomMessageEventContent, SyncRoomMessageEvent},
message::{self, MessageType, Relation, RoomMessageEventContent, SyncRoomMessageEvent},
redaction::{
OriginalSyncRoomRedactionEvent, RoomRedactionEventContent, SyncRoomRedactionEvent,
},
@@ -946,7 +946,16 @@ impl NewEventTimelineItem {
) -> Self {
let edited = relations.has_replacement();
let edit = relations.replace.and_then(|r| match *r {
AnySyncMessageLikeEvent::RoomMessage(SyncRoomMessageEvent::Original(ev)) => Some(ev),
AnySyncMessageLikeEvent::RoomMessage(SyncRoomMessageEvent::Original(ev)) => match ev
.content
.relates_to
{
Some(Relation::Replacement(re)) => Some(re),
_ => {
error!("got m.room.message event with an edit without a valid m.relate relation");
None
}
},
AnySyncMessageLikeEvent::RoomMessage(SyncRoomMessageEvent::Redacted(_)) => None,
_ => {
error!("got m.room.message event with an edit of a different event type");
@@ -955,7 +964,7 @@ impl NewEventTimelineItem {
});
let content = TimelineItemContent::Message(Message {
msgtype: edit.map_or(c.msgtype, |e| e.content.msgtype),
msgtype: edit.map_or(c.msgtype, |e| e.new_content),
in_reply_to: c.relates_to.and_then(InReplyToDetails::from_relation),
edited,
});