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

refactor guest_can_join into 1 single function

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-06-08 20:45:17 -04:00
parent 016270b33b
commit 4b4c0952a2
3 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/client/directory.rs
View file

@ -13,7 +13,6 @@ use ruma::{
avatar::RoomAvatarEventContent,
canonical_alias::RoomCanonicalAliasEventContent,
create::RoomCreateEventContent,
guest_access::{GuestAccess, RoomGuestAccessEventContent},
join_rules::{JoinRule, RoomJoinRulesEventContent},
topic::RoomTopicEventContent,
},
@ -264,12 +263,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
guest_can_join: services()
.rooms
.state_accessor
.room_state_get(&room_id, &StateEventType::RoomGuestAccess, "")?
.map_or(Ok(false), |s| {
serde_json::from_str(s.content.get())
.map(|c: RoomGuestAccessEventContent| c.guest_access == GuestAccess::CanJoin)
.map_err(|_| Error::bad_database("Invalid room guest access event in database."))
})?,
.guest_can_join(&room_id)?,
avatar_url: services()
.rooms
.state_accessor