From 61d2ff7183f5dd23615199530dd31b4773d4f353 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 10 Aug 2025 14:53:38 -0700
Subject: [PATCH] care less about room versions prior to 3

---
 src/service/rooms/event_handler.rs  |  2 --
 src/service/rooms/state_accessor.rs | 13 ++-----------
 src/service/rooms/timeline.rs       |  4 ----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs
index 90711296..6ea2005c 100644
--- a/src/service/rooms/event_handler.rs
+++ b/src/service/rooms/event_handler.rs
@@ -939,7 +939,6 @@ impl Service {
                         redact_id,
                         &incoming_pdu.sender,
                         &incoming_pdu.room_id,
-                        true,
                     )?
                 } else {
                     false
@@ -949,7 +948,6 @@ impl Service {
                     redact_id,
                     &incoming_pdu.sender,
                     &incoming_pdu.room_id,
-                    true,
                 )?
             } else {
                 false
diff --git a/src/service/rooms/state_accessor.rs b/src/service/rooms/state_accessor.rs
index 78af94ed..1ab91a5e 100644
--- a/src/service/rooms/state_accessor.rs
+++ b/src/service/rooms/state_accessor.rs
@@ -536,17 +536,12 @@ impl Service {
     }
 
     /// Checks if a given user can redact a given event
-    ///
-    /// If `federation` is `true`, it allows redaction events from any user of
-    /// the same server as the original event sender, [as required by room
-    /// versions >= v3](https://spec.matrix.org/v1.10/rooms/v11/#handling-redactions)
     #[tracing::instrument(skip(self))]
     pub(crate) fn user_can_redact(
         &self,
         redacts: &EventId,
         sender: &UserId,
         room_id: &RoomId,
-        federation: bool,
     ) -> Result<bool> {
         self.room_state_get(room_id, &StateEventType::RoomPowerLevels, "")?
             .map_or_else(
@@ -583,12 +578,8 @@ impl Service {
                                         .timeline
                                         .get_pdu(redacts)
                                     {
-                                        if federation {
-                                            pdu.sender().server_name()
-                                                == sender.server_name()
-                                        } else {
-                                            pdu.sender == sender
-                                        }
+                                        pdu.sender().server_name()
+                                            == sender.server_name()
                                     } else {
                                         false
                                     }
diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs
index 1c12fbb6..53797af8 100644
--- a/src/service/rooms/timeline.rs
+++ b/src/service/rooms/timeline.rs
@@ -484,7 +484,6 @@ impl Service {
                             redact_id,
                             &pdu.sender,
                             &pdu.room_id,
-                            false,
                         )? {
                             self.redact_pdu(redact_id, pdu, shortroomid)?;
                         }
@@ -494,7 +493,6 @@ impl Service {
                         redact_id,
                         &pdu.sender,
                         &pdu.room_id,
-                        false,
                     )? {
                         self.redact_pdu(redact_id, pdu, shortroomid)?;
                     }
@@ -1078,7 +1076,6 @@ impl Service {
                         redact_id,
                         &pdu.sender,
                         &pdu.room_id,
-                        false,
                     )? {
                         return Err(Error::BadRequest(
                             ErrorKind::forbidden(),
@@ -1091,7 +1088,6 @@ impl Service {
                     redact_id,
                     &pdu.sender,
                     &pdu.room_id,
-                    false,
                 )? {
                     return Err(Error::BadRequest(
                         ErrorKind::forbidden(),