mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-09-12 04:19:30 +02:00
fix: redacts can't error anymore
This commit is contained in:
parent
9cfef51af3
commit
6602f6114c
2 changed files with 10 additions and 8 deletions
|
@ -2147,13 +2147,9 @@ impl Rooms {
|
|||
.ok_or_else(|| Error::bad_database("PDU ID points to invalid PDU."))?;
|
||||
pdu.redact(reason)?;
|
||||
self.replace_pdu(&pdu_id, &pdu)?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::BadRequest(
|
||||
ErrorKind::NotFound,
|
||||
"Event ID does not exist.",
|
||||
))
|
||||
}
|
||||
// If event does not exist, just noop
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Update current membership data.
|
||||
|
|
|
@ -1593,7 +1593,10 @@ async fn upgrade_outlier_to_timeline_pdu(
|
|||
soft_fail,
|
||||
&state_lock,
|
||||
)
|
||||
.map_err(|_| "Failed to add pdu to db.".to_owned())?;
|
||||
.map_err(|e| {
|
||||
warn!("Failed to add pdu to db: {}", e);
|
||||
"Failed to add pdu to db.".to_owned()
|
||||
})?;
|
||||
|
||||
// Soft fail, we keep the event as an outlier but don't add it to the timeline
|
||||
warn!("Event was soft failed: {:?}", incoming_pdu);
|
||||
|
@ -1759,7 +1762,10 @@ async fn upgrade_outlier_to_timeline_pdu(
|
|||
soft_fail,
|
||||
&state_lock,
|
||||
)
|
||||
.map_err(|_| "Failed to add pdu to db.".to_owned())?;
|
||||
.map_err(|e| {
|
||||
warn!("Failed to add pdu to db: {}", e);
|
||||
"Failed to add pdu to db.".to_owned()
|
||||
})?;
|
||||
|
||||
debug!("Appended incoming pdu.");
|
||||
|
||||
|
|
Loading…
Reference in a new issue