mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-11-04 17:29:14 +01:00
Merge branch 'nyaaori/implement-report' into 'next'
Implement the report feature Closes #13 See merge request famedly/conduit!218
This commit is contained in:
commit
2a749c1e99
3 changed files with 86 additions and 0 deletions
|
@ -16,6 +16,7 @@ mod profile;
|
||||||
mod push;
|
mod push;
|
||||||
mod read_marker;
|
mod read_marker;
|
||||||
mod redact;
|
mod redact;
|
||||||
|
mod report;
|
||||||
mod room;
|
mod room;
|
||||||
mod search;
|
mod search;
|
||||||
mod session;
|
mod session;
|
||||||
|
@ -47,6 +48,7 @@ pub use profile::*;
|
||||||
pub use push::*;
|
pub use push::*;
|
||||||
pub use read_marker::*;
|
pub use read_marker::*;
|
||||||
pub use redact::*;
|
pub use redact::*;
|
||||||
|
pub use report::*;
|
||||||
pub use room::*;
|
pub use room::*;
|
||||||
pub use search::*;
|
pub use search::*;
|
||||||
pub use session::*;
|
pub use session::*;
|
||||||
|
|
83
src/client_server/report.rs
Normal file
83
src/client_server/report.rs
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
use crate::{database::admin::AdminCommand, database::DatabaseGuard, ConduitResult, Error, Ruma};
|
||||||
|
use ruma::{
|
||||||
|
api::client::{error::ErrorKind, r0::room::report_content},
|
||||||
|
events::room::message,
|
||||||
|
Int,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[cfg(feature = "conduit_bin")]
|
||||||
|
use rocket::{http::RawStr, post};
|
||||||
|
|
||||||
|
/// # `POST /_matrix/client/r0/rooms/{roomId}/report/{eventId}`
|
||||||
|
///
|
||||||
|
/// Reports an inappropriate event to homeserver admins
|
||||||
|
///
|
||||||
|
#[cfg_attr(
|
||||||
|
feature = "conduit_bin",
|
||||||
|
post("/_matrix/client/r0/rooms/<_>/report/<_>", data = "<body>")
|
||||||
|
)]
|
||||||
|
#[tracing::instrument(skip(db, body))]
|
||||||
|
pub async fn report_event_route(
|
||||||
|
db: DatabaseGuard,
|
||||||
|
body: Ruma<report_content::Request<'_>>,
|
||||||
|
) -> ConduitResult<report_content::Response> {
|
||||||
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||||
|
|
||||||
|
let pdu = match db.rooms.get_pdu(&body.event_id)? {
|
||||||
|
Some(pdu) => pdu,
|
||||||
|
_ => {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::InvalidParam,
|
||||||
|
"Invalid Event ID",
|
||||||
|
))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if body.score > Int::from(0) || body.score < Int::from(-100) {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::InvalidParam,
|
||||||
|
"Invalid score, must be within 0 to -100",
|
||||||
|
));
|
||||||
|
};
|
||||||
|
|
||||||
|
if body.reason.chars().count() > 250 {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::InvalidParam,
|
||||||
|
"Reason too long, should be 250 characters or fewer",
|
||||||
|
));
|
||||||
|
};
|
||||||
|
|
||||||
|
db.admin.send(AdminCommand::SendMessage(
|
||||||
|
message::RoomMessageEventContent::text_html(
|
||||||
|
format!(
|
||||||
|
"Report received from: {}\n\n\
|
||||||
|
Event ID: {}\n\
|
||||||
|
Room ID: {}\n\
|
||||||
|
Sent By: {}\n\n\
|
||||||
|
Report Score: {}\n\
|
||||||
|
Report Reason: {}",
|
||||||
|
sender_user, pdu.event_id, pdu.room_id, pdu.sender, body.score, body.reason
|
||||||
|
)
|
||||||
|
.to_owned(),
|
||||||
|
format!(
|
||||||
|
"<details><summary>Report received from: <a href=\"https://matrix.to/#/{0}\">{0}\
|
||||||
|
</a></summary><ul><li>Event Info<ul><li>Event ID: <code>{1}</code>\
|
||||||
|
<a href=\"https://matrix.to/#/{2}/{1}\">🔗</a></li><li>Room ID: <code>{2}</code>\
|
||||||
|
</li><li>Sent By: <a href=\"https://matrix.to/#/{3}\">{3}</a></li></ul></li><li>\
|
||||||
|
Report Info<ul><li>Report Score: {4}</li><li>Report Reason: {5}</li></ul></li>\
|
||||||
|
</ul></details>",
|
||||||
|
sender_user,
|
||||||
|
pdu.event_id,
|
||||||
|
pdu.room_id,
|
||||||
|
pdu.sender,
|
||||||
|
body.score,
|
||||||
|
RawStr::new(&body.reason).html_escape()
|
||||||
|
)
|
||||||
|
.to_owned(),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
db.flush()?;
|
||||||
|
|
||||||
|
Ok(report_content::Response {}.into())
|
||||||
|
}
|
|
@ -101,6 +101,7 @@ fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<
|
||||||
client_server::create_typing_event_route,
|
client_server::create_typing_event_route,
|
||||||
client_server::create_room_route,
|
client_server::create_room_route,
|
||||||
client_server::redact_event_route,
|
client_server::redact_event_route,
|
||||||
|
client_server::report_event_route,
|
||||||
client_server::create_alias_route,
|
client_server::create_alias_route,
|
||||||
client_server::delete_alias_route,
|
client_server::delete_alias_route,
|
||||||
client_server::get_alias_route,
|
client_server::get_alias_route,
|
||||||
|
|
Loading…
Reference in a new issue