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

timeline: rename extract_edit_content to extract_room_msg_edit_content

Browse Source
This commit is contained in:
Benjamin Bouvier
2024-10-02 18:33:09 +02:00
parent f8e65f53cd
commit d789983eff
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/matrix-sdk-ui/src/timeline/event_handler.rs
View File

@@ -52,9 +52,9 @@ use super::{
controller::{PendingEditKind, TimelineMetadata, TimelineStateTransaction},
day_dividers::DayDividerAdjuster,
event_item::{
extract_edit_content, AnyOtherFullStateEventContent, EventSendState, EventTimelineItemKind,
LocalEventTimelineItem, PollState, Profile, ReactionsByKeyBySender, RemoteEventOrigin,
RemoteEventTimelineItem, TimelineEventItemId,
extract_room_msg_edit_content, AnyOtherFullStateEventContent, EventSendState,
EventTimelineItemKind, LocalEventTimelineItem, PollState, Profile, ReactionsByKeyBySender,
RemoteEventOrigin, RemoteEventTimelineItem, TimelineEventItemId,
},
reactions::FullReactionKey,
util::{rfind_event_by_id, rfind_event_item},
@@ -346,7 +346,7 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
_ => None,
});
let (edit_json, edit_content) = extract_edit_content(relations)
let (edit_json, edit_content) = extract_room_msg_edit_content(relations)
.map(|content| {
let edit_json = as_variant!(&self.ctx.flow, Flow::Remote { raw_event, ..} => raw_event).and_then(|raw| {
// Kids, don't do this at home. We're extracting the edit event

4
crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs
View File

@@ -164,7 +164,7 @@ impl From<Message> for RoomMessageEventContent {
/// Extracts a replacement for a room message, if present in the bundled
/// relations.
pub(crate) fn extract_edit_content(
pub(crate) fn extract_room_msg_edit_content(
relations: BundledMessageLikeRelations<AnySyncMessageLikeEvent>,
) -> Option<RoomMessageEventContentWithoutRelation> {
match *relations.replace? {
@@ -320,7 +320,7 @@ impl RepliedToEvent {
let content = TimelineItemContent::Message(Message::from_event(
c,
extract_edit_content(event.relations()),
extract_room_msg_edit_content(event.relations()),
&vector![],
));
let sender = event.sender().to_owned();

2
crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs
View File

@@ -66,7 +66,7 @@ mod polls;
pub use pinned_events::RoomPinnedEventsChange;
pub(in crate::timeline) use self::{message::extract_edit_content, polls::ResponseData};
pub(in crate::timeline) use self::{message::extract_room_msg_edit_content, polls::ResponseData};
pub use self::{
message::{InReplyToDetails, Message, RepliedToEvent},
polls::{PollResult, PollState},

2
crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
View File

@@ -42,7 +42,7 @@ mod local;
mod remote;
pub(super) use self::{
content::{extract_edit_content, ResponseData},
content::{extract_room_msg_edit_content, ResponseData},
local::LocalEventTimelineItem,
remote::{RemoteEventOrigin, RemoteEventTimelineItem},
};