dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improvement: show more info in public rooms list

This commit is contained in:
timokoesters 2020-05-25 20:10:46 +02:00
parent 63c62a4afa
commit 58683585cc
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/client_server.rs
View File

@ -1404,7 +1404,15 @@ pub async fn get_public_rooms_filtered_route(
directory::PublicRoomsChunk { directory::PublicRoomsChunk {
aliases: Vec::new(), aliases: Vec::new(),
canonical_alias: None, canonical_alias: state.get(&(EventType::RoomCanonicalAlias, "".to_owned())).and_then(|s| {
serde_json::from_value::<
EventJson<ruma_events::room::canonical_alias::CanonicalAliasEventContent>,
>(s.content.clone())
.unwrap()
.deserialize()
.unwrap()
.alias
}).map(|a| a.to_string()),
name: state.get(&(EventType::RoomName, "".to_owned())).map(|s| { name: state.get(&(EventType::RoomName, "".to_owned())).map(|s| {
serde_json::from_value::<EventJson<ruma_events::room::name::NameEventContent>>( serde_json::from_value::<EventJson<ruma_events::room::name::NameEventContent>>(
s.content.clone(), s.content.clone(),
@ -1427,9 +1435,33 @@ pub async fn get_public_rooms_filtered_route(
.unwrap() .unwrap()
.topic .topic
}), }),
world_readable: false, world_readable: state.get(&(EventType::RoomHistoryVisibility, "".to_owned())).map_or(false, |s| {
guest_can_join: true, serde_json::from_value::<
avatar_url: None, EventJson<ruma_events::room::history_visibility::HistoryVisibilityEventContent>,
>(s.content.clone())
.unwrap()
.deserialize()
.unwrap()
.history_visibility == history_visibility::HistoryVisibility::WorldReadable
}),
guest_can_join: state.get(&(EventType::RoomGuestAccess, "".to_owned())).map_or(false, |s| {
serde_json::from_value::<
EventJson<ruma_events::room::guest_access::GuestAccessEventContent>,
>(s.content.clone())
.unwrap()
.deserialize()
.unwrap()
.guest_access == guest_access::GuestAccess::CanJoin
}),
avatar_url: state.get(&(EventType::RoomAvatar, "".to_owned())).map(|s| {
serde_json::from_value::<
EventJson<ruma_events::room::avatar::AvatarEventContent>,
>(s.content.clone())
.unwrap()
.deserialize()
.unwrap()
.url
}),
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();