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

bump ruma, add wrong room keys error code, tiny logging change

Browse source 
can't update ruma to very latest commit because of the weird JsOption thing for syncv4 that i can't wrap my head around how to use, not important anyways

Signed-off-by: strawberry <strawberry@pupbrain.dev>
This commit is contained in:
strawberry 2023-11-25 12:42:05 -05:00
parent e9cd8caaed
commit 0c4604b482
8 changed files with 56 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ impl Service {
if serde_json::from_str::<SpaceChildEventContent>(pdu.content.get())
.ok()
.and_then(|c| c.via)
.and_then(|c| Some(c.via))
.map_or(true, |v| v.is_empty())
{
continue;
@ -185,7 +185,7 @@ impl Service {
stack.push(children_ids);
}
} else {
let server = current_room.server_name();
let server = current_room.server_name().unwrap();
if server == services().globals.server_name() {
continue;
}
@ -193,7 +193,7 @@ impl Service {
// Early return so the client can see some data already
break;
}
warn!("Asking {server} for /hierarchy");
debug!("Asking {server} for /hierarchy");
if let Ok(response) = services()
.sending
.send_federation_request(