Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix errors in api/server/key.rs

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:52 -04:00
parent 7f5f4df64e
commit c7489fd008
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/server/key.rs
+4 -6
View File
@@ -6,11 +6,12 @@ use std::{
use axum::{Json, extract::State, response::IntoResponse}; use axum::{Json, extract::State, response::IntoResponse};
use conduwuit::{Result, utils::timepoint_from_now}; use conduwuit::{Result, utils::timepoint_from_now};
use ruma::{ use ruma::{
MilliSecondsSinceUnixEpoch, Signatures, MilliSecondsSinceUnixEpoch,
api::{ api::{
OutgoingResponse, OutgoingResponse,
federation::discovery::{OldVerifyKey, ServerSigningKeys, get_server_keys}, federation::discovery::{OldVerifyKey, ServerSigningKeys, get_server_keys},
}, },
assign,
serde::Raw, serde::Raw,
}; };
@@ -38,13 +39,10 @@ pub(crate) async fn get_server_keys_route(
.map(|(id, key)| (id, OldVerifyKey::new(expires_ts(), key.key))) .map(|(id, key)| (id, OldVerifyKey::new(expires_ts(), key.key)))
.collect(); .collect();
let server_key = ServerSigningKeys { let server_key = assign!(ServerSigningKeys::new(server_name.to_owned(), valid_until_ts()), {
verify_keys: [verify_keys].into(), verify_keys: [verify_keys].into(),
old_verify_keys, old_verify_keys,
server_name: server_name.to_owned(), });
valid_until_ts: valid_until_ts(),
signatures: Signatures::new(),
};
let server_key = Raw::new(&server_key)?; let server_key = Raw::new(&server_key)?;
let mut response = get_server_keys::v2::Response::new(server_key) let mut response = get_server_keys::v2::Response::new(server_key)