From bd94ec403337464f616909b4e6e0e1f0fb321792 Mon Sep 17 00:00:00 2001 From: Ginger Date: Sun, 12 Apr 2026 12:23:43 -0400 Subject: [PATCH] refactor: Fix errors in `api/server/event_auth.rs` --- src/api/server/event_auth.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/api/server/event_auth.rs b/src/api/server/event_auth.rs index a9019e8e7..b99f7918f 100644 --- a/src/api/server/event_auth.rs +++ b/src/api/server/event_auth.rs @@ -1,12 +1,9 @@ use std::{borrow::Borrow, iter::once}; use axum::extract::State; -use conduwuit::{Err, Error, Result, info, utils::stream::ReadyExt}; +use conduwuit::{Err, Error, Result, err, info, utils::stream::ReadyExt}; use futures::StreamExt; -use ruma::{ - RoomId, - api::{client::error::ErrorKind, federation::authorization::get_event_authorization}, -}; +use ruma::{RoomId, api::federation::authorization::get_event_authorization}; use super::AccessCheck; use crate::Ruma; @@ -47,7 +44,7 @@ pub(crate) async fn get_event_authorization_route( .timeline .get_pdu_json(&body.event_id) .await - .map_err(|_| Error::BadRequest(ErrorKind::NotFound, "Event not found."))?; + .map_err(|_| err!(Request(NotFound("Event not found."))))?; let room_id_str = event .get("room_id") @@ -67,5 +64,5 @@ pub(crate) async fn get_event_authorization_route( .collect() .await; - Ok(get_event_authorization::v1::Response { auth_chain }) + Ok(get_event_authorization::v1::Response::new(auth_chain)) }