MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-16 16:20:50 +01:00
Code Issues Releases Activity

style: appease rustfmt

Browse source
This commit is contained in:
Matthias Ahouansou 2024-02-16 21:19:40 +00:00
parent 4c06f329c4
commit 976a73a0e5
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/client_server/sync.rs
View file

@ -1614,11 +1614,7 @@ pub async fn sync_events_v4_route(
rooms.insert( rooms.insert(
room_id.clone(), room_id.clone(),
sync_events::v4::SlidingSyncRoom { sync_events::v4::SlidingSyncRoom {
name: services() name: services().rooms.state_accessor.get_name(room_id)?.or(name),
.rooms
.state_accessor
.get_name(room_id)?
.or(name),
avatar: if let Some(avatar) = avatar { avatar: if let Some(avatar) = avatar {
ruma::JsOption::Some(avatar) ruma::JsOption::Some(avatar)
} else { } else {

3
src/service/rooms/spaces/mod.rs
View file

@ -133,7 +133,8 @@ impl Service {
.ok_or_else(|| Error::bad_database("Event in space state not found"))?; .ok_or_else(|| Error::bad_database("Event in space state not found"))?;
if serde_json::from_str::<SpaceChildEventContent>(pdu.content.get()) if serde_json::from_str::<SpaceChildEventContent>(pdu.content.get())
.ok().map(|c| c.via) .ok()
.map(|c| c.via)
.map_or(true, |v| v.is_empty()) .map_or(true, |v| v.is_empty())
{ {
continue; continue;