Merge remote-tracking branch 'upstream/master' into correct-sendtxn

2021-03-04 08:39:16 -05:00 · 2021-03-04 08:39:16 -05:00 · d0df8b495c
commit d0df8b495c
parent e239014fa3 bd6507eafb
49 changed files with 747 additions and 281 deletions
--- a/src/client_server/redact.rs
+++ b/src/client_server/redact.rs
@ -12,6 +12,7 @@ use rocket::put;
    feature = "conduit_bin",
    put("/_matrix/client/r0/rooms/<_>/redact/<_>/<_>", data = "<body>")
 )]
+#[tracing::instrument(skip(db, body))]
 pub async fn redact_event_route(
    db: State<'_, Database>,
    body: Ruma<redact_event::Request<'_>>,