MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 13:14:28 +01:00
Code Issues Releases Activity

Merge branch 'unregister-fail-id-not-found' into 'next'

Browse source 
fix: return error when trying to unregister unknown appservice id

See merge request famedly/conduit!610
This commit is contained in:
Timo Kösters 2024-03-31 21:26:31 +00:00
commit cf1e7bc1ed
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/service/appservice/mod.rs
View file

@ -143,7 +143,8 @@ impl Service {
.registration_info .registration_info
.write() .write()
.await .await
.remove(service_name); .remove(service_name)
.ok_or_else(|| crate::Error::AdminCommand("Appservice not found"))?;
self.db.unregister_appservice(service_name) self.db.unregister_appservice(service_name)
} }

2
src/utils/error.rs
View file

@ -85,6 +85,8 @@ pub enum Error {
#[cfg(feature = "conduit_bin")] #[cfg(feature = "conduit_bin")]
#[error("{0}")] #[error("{0}")]
PathError(#[from] axum::extract::rejection::PathRejection), PathError(#[from] axum::extract::rejection::PathRejection),
#[error("{0}")]
AdminCommand(&'static str),
} }
impl Error { impl Error {