From 6c461025e507635cc8634eb2fca479dd703cd738 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 30 Jun 2024 23:26:36 -0400
Subject: [PATCH] use proper redacts field

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/service/rooms/event_handler/mod.rs | 54 ++++++++++++++++++++------
 src/service/rooms/timeline/mod.rs      | 46 ++++++++++++++++++----
 2 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index ca9c9c14..0468ab38 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -19,7 +19,9 @@ use ruma::{
 		federation::event::{get_event, get_room_state_ids},
 	},
 	events::{
-		room::{create::RoomCreateEventContent, server_acl::RoomServerAclEventContent},
+		room::{
+			create::RoomCreateEventContent, redaction::RoomRedactionEventContent, server_acl::RoomServerAclEventContent,
+		},
 		StateEventType, TimelineEventType,
 	},
 	int,
@@ -531,17 +533,45 @@ impl Service {
 			auth_events.get(&(k.clone(), s.to_owned()))
 		})
 		.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
-			};
+			|| incoming_pdu.kind == TimelineEventType::RoomRedaction
+				&& match room_version_id {
+					RoomVersionId::V1
+					| RoomVersionId::V2
+					| RoomVersionId::V3
+					| RoomVersionId::V4
+					| RoomVersionId::V5
+					| RoomVersionId::V6
+					| RoomVersionId::V7
+					| RoomVersionId::V8
+					| RoomVersionId::V9
+					| RoomVersionId::V10 => {
+						if let Some(redact_id) = &incoming_pdu.redacts {
+							!services().rooms.state_accessor.user_can_redact(
+								redact_id,
+								&incoming_pdu.sender,
+								&incoming_pdu.room_id,
+								true,
+							)?
+						} else {
+							false
+						}
+					},
+					_ => {
+						let content = serde_json::from_str::<RoomRedactionEventContent>(incoming_pdu.content.get())
+							.map_err(|_| Error::bad_database("Invalid content in redaction pdu."))?;
+
+						if let Some(redact_id) = &content.redacts {
+							!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
 
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index 2680c7f4..d18c76ef 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -860,14 +860,44 @@ impl Service {
 		}
 
 		// If redaction event is not authorized, do not append it to the timeline
-		if let Some(redact_id) = &pdu.redacts {
-			if pdu.kind == TimelineEventType::RoomRedaction
-				&& !services()
-					.rooms
-					.state_accessor
-					.user_can_redact(redact_id, &pdu.sender, &pdu.room_id, false)?
-			{
-				return Err(Error::BadRequest(ErrorKind::forbidden(), "User cannot redact this event"));
+		if pdu.kind == TimelineEventType::RoomRedaction {
+			match services().rooms.state.get_room_version(&pdu.room_id)? {
+				RoomVersionId::V1
+				| RoomVersionId::V2
+				| RoomVersionId::V3
+				| RoomVersionId::V4
+				| RoomVersionId::V5
+				| RoomVersionId::V6
+				| RoomVersionId::V7
+				| RoomVersionId::V8
+				| RoomVersionId::V9
+				| RoomVersionId::V10 => {
+					if let Some(redact_id) = &pdu.redacts {
+						if !services().rooms.state_accessor.user_can_redact(
+							redact_id,
+							&pdu.sender,
+							&pdu.room_id,
+							false,
+						)? {
+							return Err(Error::BadRequest(ErrorKind::forbidden(), "User cannot redact this event."));
+						}
+					};
+				},
+				_ => {
+					let content = serde_json::from_str::<RoomRedactionEventContent>(pdu.content.get())
+						.map_err(|_| Error::bad_database("Invalid content in redaction pdu."))?;
+
+					if let Some(redact_id) = &content.redacts {
+						if !services().rooms.state_accessor.user_can_redact(
+							redact_id,
+							&pdu.sender,
+							&pdu.room_id,
+							false,
+						)? {
+							return Err(Error::BadRequest(ErrorKind::forbidden(), "User cannot redact this event."));
+						}
+					}
+				},
 			}
 		};