From 3efe3fb337b3c51e03f6934359d0a45ce398a015 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Wed, 15 May 2024 15:43:56 -0700 Subject: [PATCH] remove comments about filtering buggy items --- src/api/client_server/context.rs | 4 ++-- src/api/client_server/device.rs | 2 +- src/api/client_server/directory.rs | 2 +- src/api/client_server/message.rs | 4 ++-- src/api/client_server/sync.rs | 6 ++---- src/api/client_server/user_directory.rs | 1 - src/database/key_value/rooms/timeline.rs | 1 - src/service/rooms/pdu_metadata.rs | 4 ++-- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/api/client_server/context.rs b/src/api/client_server/context.rs index a063a2ec..7642ebe3 100644 --- a/src/api/client_server/context.rs +++ b/src/api/client_server/context.rs @@ -82,7 +82,7 @@ pub(crate) async fn get_context_route( .timeline .pdus_until(sender_user, &room_id, base_token)? .take(half_limit) - .filter_map(Result::ok) // Remove buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms @@ -118,7 +118,7 @@ pub(crate) async fn get_context_route( .timeline .pdus_after(sender_user, &room_id, base_token)? .take(half_limit) - .filter_map(Result::ok) // Remove buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms diff --git a/src/api/client_server/device.rs b/src/api/client_server/device.rs index 50ad47c1..0db1e833 100644 --- a/src/api/client_server/device.rs +++ b/src/api/client_server/device.rs @@ -18,7 +18,7 @@ pub(crate) async fn get_devices_route( let devices: Vec = services() .users .all_devices_metadata(sender_user) - .filter_map(Result::ok) // Filter out buggy devices + .filter_map(Result::ok) .collect(); Ok(get_devices::v3::Response { devices }) diff --git a/src/api/client_server/directory.rs b/src/api/client_server/directory.rs index 7736f88b..3da2ca55 100644 --- a/src/api/client_server/directory.rs +++ b/src/api/client_server/directory.rs @@ -305,7 +305,7 @@ pub(crate) async fn get_public_rooms_filtered_helper( }; Ok(chunk) }) - .filter_map(Result::<_>::ok) // Filter out buggy rooms + .filter_map(Result::<_>::ok) .filter(|chunk| { if let Some(query) = filter .generic_search_term diff --git a/src/api/client_server/message.rs b/src/api/client_server/message.rs index 76b367c8..a0c7bca5 100644 --- a/src/api/client_server/message.rs +++ b/src/api/client_server/message.rs @@ -157,7 +157,7 @@ pub(crate) async fn get_message_events_route( .timeline .pdus_after(sender_user, &body.room_id, from)? .take(limit) - .filter_map(Result::ok) // Filter out buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms @@ -206,7 +206,7 @@ pub(crate) async fn get_message_events_route( .timeline .pdus_until(sender_user, &body.room_id, from)? .take(limit) - .filter_map(Result::ok) // Filter out buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs index 7655c66d..d787769c 100644 --- a/src/api/client_server/sync.rs +++ b/src/api/client_server/sync.rs @@ -640,7 +640,7 @@ async fn load_joined_room( .rooms .timeline .all_pdus(sender_user, room_id)? - .filter_map(Result::ok) // Ignore all broken pdus + .filter_map(Result::ok) .filter(|(_, pdu)| pdu.kind == TimelineEventType::RoomMember) .map(|(_, pdu)| { let content: RoomMemberEventContent = @@ -674,7 +674,6 @@ async fn load_joined_room( Ok(None) } }) - // Filter out buggy users .filter_map(Result::ok) // Filter for possible heroes .flatten() @@ -1019,7 +1018,7 @@ async fn load_joined_room( .edus .read_receipt .readreceipts_since(room_id, since) - .filter_map(Result::ok) // Filter out buggy events + .filter_map(Result::ok) .map(|(_, _, v)| v) .collect(); @@ -1104,7 +1103,6 @@ fn load_timeline( .timeline .pdus_until(sender_user, room_id, PduCount::MAX)? .filter_map(|r| { - // Filter out buggy events if r.is_err() { error!("Bad pdu in pdus_since: {:?}", r); } diff --git a/src/api/client_server/user_directory.rs b/src/api/client_server/user_directory.rs index 560b0441..66f40a86 100644 --- a/src/api/client_server/user_directory.rs +++ b/src/api/client_server/user_directory.rs @@ -20,7 +20,6 @@ pub(crate) async fn search_users_route( let limit = body.limit.try_into().unwrap_or(usize::MAX); let mut users = services().users.iter().filter_map(|user_id| { - // Filter out buggy users (they should not exist, but you never know...) let user_id = user_id.ok()?; let user = search_users::v3::User { diff --git a/src/database/key_value/rooms/timeline.rs b/src/database/key_value/rooms/timeline.rs index 438e57e6..468d8a1f 100644 --- a/src/database/key_value/rooms/timeline.rs +++ b/src/database/key_value/rooms/timeline.rs @@ -21,7 +21,6 @@ impl service::rooms::timeline::Data for KeyValueDatabase { if let Some(last_count) = self .pdus_until(sender_user, room_id, PduCount::MAX)? .find_map(|r| { - // Filter out buggy events if r.is_err() { error!("Bad pdu in pdus_since: {:?}", r); } diff --git a/src/service/rooms/pdu_metadata.rs b/src/service/rooms/pdu_metadata.rs index 13f29663..61128e5e 100644 --- a/src/service/rooms/pdu_metadata.rs +++ b/src/service/rooms/pdu_metadata.rs @@ -82,7 +82,7 @@ impl Service { }) }) .take(limit) - .filter_map(Result::ok) // Filter out buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms @@ -129,7 +129,7 @@ impl Service { }) }) .take(limit) - .filter_map(Result::ok) // Filter out buggy events + .filter_map(Result::ok) .filter(|(_, pdu)| { services() .rooms