From c53d79e28795e3c1f1438cbea85b9df244dc4937 Mon Sep 17 00:00:00 2001
From: Kurt Roeckx <kurt@roeckx.be>
Date: Sun, 29 Aug 2021 14:39:38 +0200
Subject: [PATCH] fixup! Get required keys in batch when joining a room
---
src/server_server.rs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/server_server.rs b/src/server_server.rs
index 2a3665f18..f34aed1e5 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -3437,7 +3437,9 @@ pub async fn fetch_join_signing_keys(
// TODO: Check signature
servers.remove(&k.server_name);
- let result = db.globals.add_signing_key(&k.server_name, k.clone())?
+ let result = db
+ .globals
+ .add_signing_key(&k.server_name, k.clone())?
.into_iter()
.map(|(k, v)| (k.to_string(), v.key))
.collect::<BTreeMap<_, _>>();
@@ -3459,7 +3461,8 @@ pub async fn fetch_join_signing_keys(
if let Ok(get_keys_response) = result {
// TODO: We should probably not trust the server_name in the response.
let server = &get_keys_response.server_key.server_name;
- let result = db.globals
+ let result = db
+ .globals
.add_signing_key(server, get_keys_response.server_key.clone())?
.into_iter()
.map(|(k, v)| (k.to_string(), v.key))
--
GitLab