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

remove unnecessary loops/allocations in client /capabilities

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-08-31 12:18:21 -04:00
parent 14b9511d2e
commit 5dbb868936
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/api/client/capabilities.rs
View file

@ -1,8 +1,11 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use axum::extract::State; use axum::extract::State;
use ruma::api::client::discovery::get_capabilities::{ use ruma::{
self, Capabilities, RoomVersionStability, RoomVersionsCapability, ThirdPartyIdChangesCapability, api::client::discovery::get_capabilities::{
self, Capabilities, RoomVersionStability, RoomVersionsCapability, ThirdPartyIdChangesCapability,
},
RoomVersionId,
}; };
use crate::{Result, Ruma}; use crate::{Result, Ruma};
@ -14,13 +17,19 @@ use crate::{Result, Ruma};
pub(crate) async fn get_capabilities_route( pub(crate) async fn get_capabilities_route(
State(services): State<crate::State>, _body: Ruma<get_capabilities::v3::Request>, State(services): State<crate::State>, _body: Ruma<get_capabilities::v3::Request>,
) -> Result<get_capabilities::v3::Response> { ) -> Result<get_capabilities::v3::Response> {
let mut available = BTreeMap::new(); let available: BTreeMap<RoomVersionId, RoomVersionStability> = services
for room_version in &services.globals.unstable_room_versions { .globals
available.insert(room_version.clone(), RoomVersionStability::Unstable); .unstable_room_versions
} .iter()
for room_version in &services.globals.stable_room_versions { .map(|unstable_room_version| (unstable_room_version.clone(), RoomVersionStability::Unstable))
available.insert(room_version.clone(), RoomVersionStability::Stable); .chain(
} services
.globals
.stable_room_versions
.iter()
.map(|stable_room_version| (stable_room_version.clone(), RoomVersionStability::Stable)),
)
.collect();
let mut capabilities = Capabilities::default(); let mut capabilities = Capabilities::default();
capabilities.room_versions = RoomVersionsCapability { capabilities.room_versions = RoomVersionsCapability {
@ -28,7 +37,7 @@ pub(crate) async fn get_capabilities_route(
available, available,
}; };
// conduit does not implement 3PID stuff // we do not implement 3PID stuff
capabilities.thirdparty_id_changes = ThirdPartyIdChangesCapability { capabilities.thirdparty_id_changes = ThirdPartyIdChangesCapability {
enabled: false, enabled: false,
}; };