magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unnecessary args in pack_receipts

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-11 22:07:53 -05:00
parent a26b1c5722
commit e0446181c5
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/client/sync/v4.rs
View file

@ -26,9 +26,10 @@ use ruma::{
directory::RoomTypeFilter, directory::RoomTypeFilter,
events::{ events::{
room::member::{MembershipState, RoomMemberEventContent}, room::member::{MembershipState, RoomMemberEventContent},
AnyRawAccountDataEvent, StateEventType, AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType,
TimelineEventType::{self, *}, TimelineEventType::{self, *},
}, },
serde::Raw,
state_res::Event, state_res::Event,
uint, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, UInt, UserId, 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) .private_read_get(room_id, sender_user)
.await .await
.ok() .ok()
.map(|read_event| (sender_user.to_owned(), 0_u64, read_event))
} else { } else {
None None
}; };
let mut vector: Vec<_> = services let mut vector: Vec<Raw<AnySyncEphemeralRoomEvent>> = services
.rooms .rooms
.read_receipt .read_receipt
.readreceipts_since(room_id, *roomsince) .readreceipts_since(room_id, *roomsince)
.filter_map(|(read_user, ts, v)| async move { .filter_map(|(read_user, _ts, v)| async move {
services services
.users .users
.user_is_ignored(read_user, sender_user) .user_is_ignored(read_user, sender_user)
.await .await
.or_some((read_user.to_owned(), ts, v)) .or_some(v)
}) })
.collect() .collect()
.await; .await;

4
src/service/rooms/read_receipt/mod.rs
View file

@ -133,10 +133,10 @@ impl Service {
#[must_use] #[must_use]
pub fn pack_receipts<I>(receipts: I) -> Raw<SyncEphemeralRoomEvent<ReceiptEventContent>> pub fn pack_receipts<I>(receipts: I) -> Raw<SyncEphemeralRoomEvent<ReceiptEventContent>>
where where
I: Iterator<Item = (OwnedUserId, u64, Raw<AnySyncEphemeralRoomEvent>)>, I: Iterator<Item = Raw<AnySyncEphemeralRoomEvent>>,
{ {
let mut json = BTreeMap::new(); let mut json = BTreeMap::new();
for (_, _, value) in receipts { for value in receipts {
let receipt = serde_json::from_str::<SyncEphemeralRoomEvent<ReceiptEventContent>>(value.json().get()); let receipt = serde_json::from_str::<SyncEphemeralRoomEvent<ReceiptEventContent>>(value.json().get());
if let Ok(value) = receipt { if let Ok(value) = receipt {
for (event, receipt) in value.content { for (event, receipt) in value.content {