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

resolve some pedantic lints, reduce some allocations

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-08 11:48:52 -05:00 • committed by June
parent 507baf20fa
commit 496a9c7af8
12 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/service/admin/mod.rs
View file

@ -1030,7 +1030,7 @@ impl Service {
for room_id in services().rooms.state_cache.rooms_joined(&user_id) {
let room_id = room_id?;
rooms.push(Self::get_room_info(room_id));
rooms.push(Self::get_room_info(&room_id));
}
if rooms.is_empty() {
@ -1510,7 +1510,7 @@ impl Service {
.metadata
.iter_ids()
.filter_map(std::result::Result::ok)
.map(Self::get_room_info)
.map(|id: OwnedRoomId| Self::get_room_info(&id))
.collect::<Vec<_>>();
rooms.sort_by_key(|r| r.1);
rooms.reverse();
@ -1713,7 +1713,7 @@ impl Service {
.directory
.public_rooms()
.filter_map(std::result::Result::ok)
.map(Self::get_room_info)
.map(|id: OwnedRoomId| Self::get_room_info(&id))
.collect::<Vec<_>>();
rooms.sort_by_key(|r| r.1);
rooms.reverse();
@ -1955,11 +1955,11 @@ impl Service {
Ok(reply_message_content)
}
fn get_room_info(id: OwnedRoomId) -> (OwnedRoomId, u64, String) {
fn get_room_info(id: &OwnedRoomId) -> (OwnedRoomId, u64, String) {
(
id.clone(),
services().rooms.state_cache.room_joined_count(&id).ok().flatten().unwrap_or(0),
services().rooms.state_accessor.get_name(&id).ok().flatten().unwrap_or_else(|| id.to_string()),
services().rooms.state_cache.room_joined_count(id).ok().flatten().unwrap_or(0),
services().rooms.state_accessor.get_name(id).ok().flatten().unwrap_or_else(|| id.to_string()),
)
}