magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

redaction fixes

Browse source
This commit is contained in:
strawberry 2024-06-22 21:21:16 +00:00 • committed by Jason Volk
parent cbb97b4fdf
commit 5f46623371
3 changed files with 97 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/service/rooms/event_handler/mod.rs
View file

@ -19,7 +19,7 @@ use ruma::{
},
events::{
room::{create::RoomCreateEventContent, server_acl::RoomServerAclEventContent},
StateEventType,
StateEventType, TimelineEventType,
},
int,
serde::Base64,
@ -525,7 +525,18 @@ impl Service {
let soft_fail = !state_res::event_auth::auth_check(&room_version, &incoming_pdu, None::<PduEvent>, |k, s| {
auth_events.get(&(k.clone(), s.to_owned()))
})
.map_err(|_e| Error::BadRequest(ErrorKind::forbidden(), "Auth check failed."))?;
.map_err(|_e| Error::BadRequest(ErrorKind::forbidden(), "Auth check failed."))?
|| if let Some(redact_id) = &incoming_pdu.redacts {
incoming_pdu.kind == TimelineEventType::RoomRedaction
&& !services().rooms.state_accessor.user_can_redact(
redact_id,
&incoming_pdu.sender,
&incoming_pdu.room_id,
true,
)?
} else {
false
};
// 13. Use state resolution to find new room state