backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable redundant_closure_for_method_calls lint

Browse source
This commit is contained in:
Charles Hall 2024-05-14 18:59:24 -07:00
parent a636405bed
commit 96e1877639
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
37 changed files with 85 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/client_server/account.rs
View file

@ -353,7 +353,7 @@ pub(crate) async fn change_password_route(
for id in services()
.users
.all_device_ids(sender_user)
.filter_map(|id| id.ok())
.filter_map(Result::ok)
.filter(|id| id != sender_device)
{
services().users.remove_device(sender_user, &id)?;

4
src/api/client_server/context.rs
View file

@ -81,7 +81,7 @@ pub(crate) async fn get_context_route(
.timeline
.pdus_until(sender_user, &room_id, base_token)?
.take(half_limit)
.filter_map(|r| r.ok()) // Remove buggy events
.filter_map(Result::ok) // Remove buggy events
.filter(|(_, pdu)| {
services()
.rooms
@ -117,7 +117,7 @@ pub(crate) async fn get_context_route(
.timeline
.pdus_after(sender_user, &room_id, base_token)?
.take(half_limit)
.filter_map(|r| r.ok()) // Remove buggy events
.filter_map(Result::ok) // Remove buggy events
.filter(|(_, pdu)| {
services()
.rooms

2
src/api/client_server/device.rs
View file

@ -18,7 +18,7 @@ pub(crate) async fn get_devices_route(
let devices: Vec<device::Device> = services()
.users
.all_devices_metadata(sender_user)
.filter_map(|r| r.ok()) // Filter out buggy devices
.filter_map(Result::ok) // Filter out buggy devices
.collect();
Ok(get_devices::v3::Response { devices })

6
src/api/client_server/keys.rs
View file

@ -226,14 +226,14 @@ pub(crate) async fn get_key_changes_route(
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?,
),
)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
for room_id in services()
.rooms
.state_cache
.rooms_joined(sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
{
device_list_updates.extend(
services()
@ -247,7 +247,7 @@ pub(crate) async fn get_key_changes_route(
Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`.")
})?),
)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
}
Ok(get_key_changes::v3::Response {

12
src/api/client_server/membership.rs
View file

@ -59,7 +59,7 @@ pub(crate) async fn join_room_by_id_route(
.iter()
.filter_map(|event| serde_json::from_str(event.json().get()).ok())
.filter_map(|event: serde_json::Value| event.get("sender").cloned())
.filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
.filter_map(|sender| sender.as_str().map(ToOwned::to_owned))
.filter_map(|sender| UserId::parse(sender).ok())
.map(|user| user.server_name().to_owned()),
);
@ -105,7 +105,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
.iter()
.filter_map(|event| serde_json::from_str(event.json().get()).ok())
.filter_map(|event: serde_json::Value| event.get("sender").cloned())
.filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
.filter_map(|sender| sender.as_str().map(ToOwned::to_owned))
.filter_map(|sender| UserId::parse(sender).ok())
.map(|user| user.server_name().to_owned()),
);
@ -435,7 +435,7 @@ pub(crate) async fn joined_rooms_route(
.rooms
.state_cache
.rooms_joined(sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.collect(),
})
}
@ -501,7 +501,7 @@ pub(crate) async fn joined_members_route(
.rooms
.state_cache
.room_members(&body.room_id)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
{
let display_name = services().users.displayname(&user_id)?;
let avatar_url = services().users.avatar_url(&user_id)?;
@ -1308,7 +1308,7 @@ pub(crate) async fn invite_helper(
.rooms
.state_cache
.room_servers(room_id)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter(|server| &**server != services().globals.server_name());
services().sending.send_pdu(servers, &pdu_id)?;
@ -1512,7 +1512,7 @@ async fn remote_leave_room(user_id: &UserId, room_id: &RoomId) -> Result<()> {
.iter()
.filter_map(|event| serde_json::from_str(event.json().get()).ok())
.filter_map(|event: serde_json::Value| event.get("sender").cloned())
.filter_map(|sender| sender.as_str().map(|s| s.to_owned()))
.filter_map(|sender| sender.as_str().map(ToOwned::to_owned))
.filter_map(|sender| UserId::parse(sender).ok())
.map(|user| user.server_name().to_owned())
.collect();

4
src/api/client_server/message.rs
View file

@ -156,7 +156,7 @@ pub(crate) async fn get_message_events_route(
.timeline
.pdus_after(sender_user, &body.room_id, from)?
.take(limit)
.filter_map(|r| r.ok()) // Filter out buggy events
.filter_map(Result::ok) // Filter out buggy events
.filter(|(_, pdu)| {
services()
.rooms
@ -205,7 +205,7 @@ pub(crate) async fn get_message_events_route(
.timeline
.pdus_until(sender_user, &body.room_id, from)?
.take(limit)
.filter_map(|r| r.ok()) // Filter out buggy events
.filter_map(Result::ok) // Filter out buggy events
.filter(|(_, pdu)| {
services()
.rooms

8
src/api/client_server/profile.rs
View file

@ -34,7 +34,7 @@ pub(crate) async fn set_displayname_route(
.rooms
.state_cache
.rooms_joined(sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.map(|room_id| {
Ok::<_, Error>((
PduBuilder {
@ -70,7 +70,7 @@ pub(crate) async fn set_displayname_route(
room_id,
))
})
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.collect();
for (pdu_builder, room_id) in all_rooms_joined {
@ -151,7 +151,7 @@ pub(crate) async fn set_avatar_url_route(
.rooms
.state_cache
.rooms_joined(sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.map(|room_id| {
Ok::<_, Error>((
PduBuilder {
@ -187,7 +187,7 @@ pub(crate) async fn set_avatar_url_route(
room_id,
))
})
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.collect();
for (pdu_builder, room_id) in all_joined_rooms {

4
src/api/client_server/push.rs
View file

@ -9,7 +9,7 @@ use ruma::{
},
},
events::{push_rules::PushRulesEvent, GlobalAccountDataEventType},
push::{InsertPushRuleError, RemovePushRuleError},
push::{AnyPushRuleRef, InsertPushRuleError, RemovePushRuleError},
};
/// # `GET /_matrix/client/r0/pushrules`
@ -281,7 +281,7 @@ pub(crate) async fn get_pushrule_enabled_route(
let global = account_data.content.global;
let enabled = global
.get(body.kind.clone(), &body.rule_id)
.map(|r| r.enabled())
.map(AnyPushRuleRef::enabled)
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"Push rule not found.",

4
src/api/client_server/room.rs
View file

@ -565,7 +565,7 @@ pub(crate) async fn get_room_aliases_route(
.rooms
.alias
.local_aliases_for_room(&body.room_id)
.filter_map(|a| a.ok())
.filter_map(Result::ok)
.collect(),
})
}
@ -814,7 +814,7 @@ pub(crate) async fn upgrade_room_route(
.rooms
.alias
.local_aliases_for_room(&body.room_id)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
{
services()
.rooms

4
src/api/client_server/search.rs
View file

@ -30,7 +30,7 @@ pub(crate) async fn search_events_route(
.rooms
.state_cache
.rooms_joined(sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.collect()
});
@ -118,7 +118,7 @@ pub(crate) async fn search_events_route(
result: Some(result),
})
})
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.skip(skip)
.take(limit)
.collect();

24
src/api/client_server/sync.rs
View file

@ -217,7 +217,7 @@ async fn sync_helper(
services()
.users
.keys_changed(sender_user.as_ref(), since, None)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
let all_joined_rooms = services()
@ -461,7 +461,7 @@ async fn sync_helper(
.rooms
.user
.get_shared_rooms(vec![sender_user.clone(), user_id.clone()])?
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter_map(|other_room_id| {
Some(
services()
@ -639,7 +639,7 @@ async fn load_joined_room(
.rooms
.timeline
.all_pdus(sender_user, room_id)?
.filter_map(|pdu| pdu.ok()) // Ignore all broken pdus
.filter_map(Result::ok) // Ignore all broken pdus
.filter(|(_, pdu)| pdu.kind == TimelineEventType::RoomMember)
.map(|(_, pdu)| {
let content: RoomMemberEventContent =
@ -674,7 +674,7 @@ async fn load_joined_room(
}
})
// Filter out buggy users
.filter_map(|u| u.ok())
.filter_map(Result::ok)
// Filter for possible heroes
.flatten()
{
@ -978,7 +978,7 @@ async fn load_joined_room(
services()
.users
.keys_changed(room_id.as_ref(), since, None)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
let notification_count = send_notification_counts
@ -1018,7 +1018,7 @@ async fn load_joined_room(
.edus
.read_receipt
.readreceipts_since(room_id, since)
.filter_map(|r| r.ok()) // Filter out buggy events
.filter_map(Result::ok) // Filter out buggy events
.map(|(_, _, v)| v)
.collect();
@ -1139,7 +1139,7 @@ fn share_encrypted_room(
.rooms
.user
.get_shared_rooms(vec![sender_user.to_owned(), user_id.to_owned()])?
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter(|room_id| room_id != ignore_room)
.filter_map(|other_room_id| {
Some(
@ -1192,7 +1192,7 @@ pub(crate) async fn sync_events_v4_route(
.rooms
.state_cache
.rooms_joined(&sender_user)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.collect::<Vec<_>>();
if body.extensions.to_device.enabled.unwrap_or(false) {
@ -1211,7 +1211,7 @@ pub(crate) async fn sync_events_v4_route(
services()
.users
.keys_changed(sender_user.as_ref(), globalsince, None)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
for room_id in &all_joined_rooms {
@ -1352,7 +1352,7 @@ pub(crate) async fn sync_events_v4_route(
services()
.users
.keys_changed(room_id.as_ref(), globalsince, None)
.filter_map(|r| r.ok()),
.filter_map(Result::ok),
);
}
for user_id in left_encrypted_users {
@ -1360,7 +1360,7 @@ pub(crate) async fn sync_events_v4_route(
.rooms
.user
.get_shared_rooms(vec![sender_user.clone(), user_id.clone()])?
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter_map(|other_room_id| {
Some(
services()
@ -1552,7 +1552,7 @@ pub(crate) async fn sync_events_v4_route(
.rooms
.state_cache
.room_members(room_id)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter(|member| member != &sender_user)
.filter_map(|member| {
services()

2
src/api/client_server/threads.rs
View file

@ -27,7 +27,7 @@ pub(crate) async fn get_threads_route(
.threads
.threads_until(sender_user, &body.room_id, from, &body.include)?
.take(limit)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.filter(|(_, pdu)| {
services()
.rooms

2
src/api/client_server/user_directory.rs
View file

@ -55,7 +55,7 @@ pub(crate) async fn search_users_route(
.rooms
.state_cache
.rooms_joined(&user_id)
.filter_map(|r| r.ok())
.filter_map(Result::ok)
.any(|room| {
services()
.rooms