From e0446181c5960a7760e94747a68e769a0556bfc8 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 11 Dec 2024 22:07:53 -0500 Subject: [PATCH] remove unnecessary args in pack_receipts Signed-off-by: strawberry --- src/api/client/sync/v4.rs | 10 +++++----- src/service/rooms/read_receipt/mod.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api/client/sync/v4.rs b/src/api/client/sync/v4.rs index 3480489d..fddb81bf 100644 --- a/src/api/client/sync/v4.rs +++ b/src/api/client/sync/v4.rs @@ -26,9 +26,10 @@ use ruma::{ directory::RoomTypeFilter, events::{ room::member::{MembershipState, RoomMemberEventContent}, - AnyRawAccountDataEvent, StateEventType, + AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType, TimelineEventType::{self, *}, }, + serde::Raw, state_res::Event, uint, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, UInt, UserId, }; @@ -503,21 +504,20 @@ pub(crate) async fn sync_events_v4_route( .private_read_get(room_id, sender_user) .await .ok() - .map(|read_event| (sender_user.to_owned(), 0_u64, read_event)) } else { None }; - let mut vector: Vec<_> = services + let mut vector: Vec> = services .rooms .read_receipt .readreceipts_since(room_id, *roomsince) - .filter_map(|(read_user, ts, v)| async move { + .filter_map(|(read_user, _ts, v)| async move { services .users .user_is_ignored(read_user, sender_user) .await - .or_some((read_user.to_owned(), ts, v)) + .or_some(v) }) .collect() .await; diff --git a/src/service/rooms/read_receipt/mod.rs b/src/service/rooms/read_receipt/mod.rs index 72f2e1ad..5cac535d 100644 --- a/src/service/rooms/read_receipt/mod.rs +++ b/src/service/rooms/read_receipt/mod.rs @@ -133,10 +133,10 @@ impl Service { #[must_use] pub fn pack_receipts(receipts: I) -> Raw> where - I: Iterator)>, + I: Iterator>, { let mut json = BTreeMap::new(); - for (_, _, value) in receipts { + for value in receipts { let receipt = serde_json::from_str::>(value.json().get()); if let Ok(value) = receipt { for (event, receipt) in value.content {