studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Additional json/jsint Error cases for ErrorKind and StatusCode.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-11-25 23:22:13 +00:00
parent 442a5aafeb
commit 347298d7d6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/error/mod.rs
View File

@@ -172,13 +172,14 @@ impl Error {
/// Returns the Matrix error code / error kind /// Returns the Matrix error code / error kind
#[inline] #[inline]
pub fn kind(&self) -> ruma::api::client::error::ErrorKind { pub fn kind(&self) -> ruma::api::client::error::ErrorKind {
use ruma::api::client::error::ErrorKind::{FeatureDisabled, Unknown}; use ruma::api::client::error::ErrorKind::{FeatureDisabled, NotJson, Unknown};
match self { match self {
| Self::FeatureDisabled(..) => FeatureDisabled,
| Self::CanonicalJson(..) | Self::Json(..) => NotJson,
| Self::BadRequest(kind, ..) | Self::Request(kind, ..) => kind.clone(),
| Self::Federation(_, error) | Self::Ruma(error) => | Self::Federation(_, error) | Self::Ruma(error) =>
response::ruma_error_kind(error).clone(), response::ruma_error_kind(error).clone(),
| Self::BadRequest(kind, ..) | Self::Request(kind, ..) => kind.clone(),
| Self::FeatureDisabled(..) => FeatureDisabled,
| _ => Unknown, | _ => Unknown,
} }
} }
@@ -189,15 +190,19 @@ impl Error {
use http::StatusCode; use http::StatusCode;
match self { match self {
| Self::Conflict(_) => StatusCode::CONFLICT, // room alias exists
| Self::Federation(_, error) | Self::Ruma(error) => error.status_code, | Self::Federation(_, error) | Self::Ruma(error) => error.status_code,
| Self::Request(kind, _, code) => response::status_code(kind, *code), | Self::FeatureDisabled(..)
| Self::CanonicalJson(..)
| Self::Json(..)
| Self::JsParseInt(..)
| Self::JsTryFromInt(..) => response::bad_request_code(&self.kind()),
| Self::BadRequest(kind, ..) => response::bad_request_code(kind), | Self::BadRequest(kind, ..) => response::bad_request_code(kind),
| Self::FeatureDisabled(..) => response::bad_request_code(&self.kind()), | Self::Request(kind, _, code) => response::status_code(kind, *code),
| Self::Io(error) => response::io_error_code(error.kind()),
| Self::Reqwest(error) => error | Self::Reqwest(error) => error
.status() .status()
.unwrap_or(StatusCode::INTERNAL_SERVER_ERROR), .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR),
| Self::Conflict(_) => StatusCode::CONFLICT,
| Self::Io(error) => response::io_error_code(error.kind()),
| _ => StatusCode::INTERNAL_SERVER_ERROR, | _ => StatusCode::INTERNAL_SERVER_ERROR,
} }
} }