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

default to shared room history visibility if invalid (per spec)

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-16 18:03:51 -04:00 • committed by June
parent eebdd30ed7
commit c5c8934db7
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/api/client_server/directory.rs
View file

@ -254,8 +254,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
.map_or(Ok(None), |s| {
serde_json::from_str(s.content.get())
.map(|c: RoomTopicEventContent| Some(c.topic))
.map_err(|_| {
error!("Invalid room topic event in database for room {}", room_id);
.map_err(|e| {
error!("Invalid room topic event in database for room {room_id}: {e}");
Error::bad_database("Invalid room topic event in database.")
})
})
@ -271,11 +271,10 @@ pub(crate) async fn get_public_rooms_filtered_helper(
})
.map_err(|e| {
error!(
"Invalid room history visibility event in database for room {}: {e}",
&room_id
"Invalid room history visibility event in database for room {room_id}, assuming is \"shared\": {e}",
);
Error::bad_database("Invalid room history visibility event in database.")
})})?,
})}).unwrap_or(false),
guest_can_join: services()
.rooms
.state_accessor