From a3b8eea9b4885bccdfad7279f809c472ddd89a44 Mon Sep 17 00:00:00 2001
From: Val Lorentz <progval+git@progval.net>
Date: Fri, 1 Dec 2023 17:46:50 +0100
Subject: [PATCH] Move "redacts" key to "content" in redaction events in v11
 rooms

---
 src/service/rooms/timeline/mod.rs | 35 ++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index 4f3b0e59..4b06acb7 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -404,9 +404,38 @@ impl Service {
 
         match pdu.kind {
             TimelineEventType::RoomRedaction => {
-                if let Some(redact_id) = &pdu.redacts {
-                    self.redact_pdu(redact_id, pdu)?;
-                }
+                let room_version_id = self
+                    .get_room_version(&pdu.room_id)?
+                    .expect("Got RoomRedaction in a room of unknown version");
+                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) = &pdu.redacts {
+                            self.redact_pdu(redact_id, pdu)?;
+                        }
+                    }
+                    _ => {
+                        #[derive(Deserialize)]
+                        struct Redaction {
+                            redacts: Option<OwnedEventId>,
+                        }
+                        let content = serde_json::from_str::<Redaction>(pdu.content.get())
+                            .map_err(|_| {
+                                Error::bad_database("Invalid content in redaction pdu.")
+                            })?;
+                        if let Some(redact_id) = &content.redacts {
+                            self.redact_pdu(redact_id, pdu)?;
+                        }
+                    }
+                };
             }
             TimelineEventType::SpaceChild => {
                 if let Some(_state_key) = &pdu.state_key {