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

various cleanup tweaks/fixes

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-01 02:47:39 +00:00 • committed by strawberry
parent 96fcf7f94d
commit 26dcab272d
18 changed files with 86 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/client/membership.rs
View file

@ -167,12 +167,12 @@ pub(crate) async fn join_room_by_id_route(
.await?;
// There is no body.server_name for /roomId/join
let mut servers = services
let mut servers: Vec<_> = services
.rooms
.state_cache
.servers_invite_via(&body.room_id)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.collect()
.await;
servers.extend(
@ -641,12 +641,13 @@ pub(crate) async fn joined_members_route(
.rooms
.state_cache
.room_members(&body.room_id)
.map(ToOwned::to_owned)
.then(|user| async move {
(
user.to_owned(),
user.clone(),
RoomMember {
display_name: services.users.displayname(user).await.ok(),
avatar_url: services.users.avatar_url(user).await.ok(),
display_name: services.users.displayname(&user).await.ok(),
avatar_url: services.users.avatar_url(&user).await.ok(),
},
)
})
@ -1575,7 +1576,7 @@ pub(crate) async fn invite_helper(
// Make a user leave all their joined rooms, forgets all rooms, and ignores
// errors
pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
let all_rooms = services
let all_rooms: Vec<_> = services
.rooms
.state_cache
.rooms_joined(user_id)
@ -1587,7 +1588,7 @@ pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
.rooms_invited(user_id)
.map(|(r, _)| r),
)
.collect::<Vec<_>>()
.collect()
.await;
for room_id in all_rooms {