Refactor admin code to always defer command processing
This commit is contained in:
parent
7505548b94
commit
677f044d13
3 changed files with 155 additions and 169 deletions
|
@ -1,7 +1,4 @@
|
|||
use crate::{
|
||||
database::{admin::AdminCommand, DatabaseGuard},
|
||||
ConduitResult, Error, Ruma,
|
||||
};
|
||||
use crate::{database::DatabaseGuard, ConduitResult, Error, Ruma};
|
||||
use ruma::{
|
||||
api::client::{error::ErrorKind, r0::room::report_content},
|
||||
events::room::message,
|
||||
|
@ -50,8 +47,8 @@ pub async fn report_event_route(
|
|||
));
|
||||
};
|
||||
|
||||
db.admin.send(AdminCommand::SendMessage(
|
||||
message::RoomMessageEventContent::text_html(
|
||||
db.admin
|
||||
.send_message(message::RoomMessageEventContent::text_html(
|
||||
format!(
|
||||
"Report received from: {}\n\n\
|
||||
Event ID: {}\n\
|
||||
|
@ -75,8 +72,7 @@ pub async fn report_event_route(
|
|||
body.score,
|
||||
RawStr::new(&body.reason).html_escape()
|
||||
),
|
||||
),
|
||||
));
|
||||
));
|
||||
|
||||
db.flush()?;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue