From 05eb51d70b6f57696fa61c714d2264057b64f98a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Jan 2026 01:07:15 +0000
Subject: [PATCH] matrix-conduit: 0.10.10 -> 0.10.11

---
 ...t_fields_for_invites_over_federation.patch | 91 -------------------
 pkgs/by-name/ma/matrix-conduit/package.nix    | 11 +--
 2 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 pkgs/by-name/ma/matrix-conduit/fix_validate_event_fields_for_invites_over_federation.patch

diff --git a/pkgs/by-name/ma/matrix-conduit/fix_validate_event_fields_for_invites_over_federation.patch b/pkgs/by-name/ma/matrix-conduit/fix_validate_event_fields_for_invites_over_federation.patch
deleted file mode 100644
index c7641fb16fd3..000000000000
--- a/pkgs/by-name/ma/matrix-conduit/fix_validate_event_fields_for_invites_over_federation.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From a0f57159572c81c8ae6f9c9440e5cd74315b8570 Mon Sep 17 00:00:00 2001
-From: Jason Volk <jason@zemos.net>
-Date: Sun, 21 Dec 2025 22:04:07 +0000
-Subject: [PATCH] fix: validate event fields for invites over federation.
-
----
- src/api/server_server.rs | 61 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/src/api/server_server.rs b/src/api/server_server.rs
-index adc764ff..d29f6031 100644
---- a/src/api/server_server.rs
-+++ b/src/api/server_server.rs
-@@ -2132,6 +2132,44 @@ pub async fn create_invite_route(
-         CanonicalJsonValue::String(event_id.to_string()),
-     );
- 
-+    let event_room_id: OwnedRoomId = serde_json::from_value(
-+        signed_event
-+            .get("room_id")
-+            .ok_or(Error::BadRequest(
-+                ErrorKind::InvalidParam,
-+                "Event had no room_id field.",
-+            ))?
-+            .clone()
-+            .into(),
-+    )
-+    .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "room_id is not a room id."))?;
-+
-+    if room_id != event_room_id {
-+        return Err(Error::BadRequest(
-+            ErrorKind::InvalidParam,
-+            "room_id parameter does not match event.",
-+        ));
-+    }
-+
-+    let event_type: StateEventType = serde_json::from_value(
-+        signed_event
-+            .get("type")
-+            .ok_or(Error::BadRequest(
-+                ErrorKind::InvalidParam,
-+                "Event had no type field.",
-+            ))?
-+            .clone()
-+            .into(),
-+    )
-+    .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "type is not an event type."))?;
-+
-+    if event_type != StateEventType::RoomMember {
-+        return Err(Error::BadRequest(
-+            ErrorKind::InvalidParam,
-+            "Invite event was not m.room.member type.",
-+        ));
-+    }
-+
-     let sender: OwnedUserId = serde_json::from_value(
-         signed_event
-             .get("sender")
-@@ -2144,6 +2182,29 @@ pub async fn create_invite_route(
-     )
-     .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "sender is not a user id."))?;
- 
-+    if sender.server_name() != sender_servername {
-+        return Err(Error::BadRequest(
-+            ErrorKind::InvalidParam,
-+            "Invite sender must match the origin server.",
-+        ));
-+    }
-+
-+    let event_content: RoomMemberEventContent = serde_json::from_value(
-+        signed_event
-+            .get("content")
-+            .ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "Missing event content."))?
-+            .clone()
-+            .into(),
-+    )
-+    .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid event content."))?;
-+
-+    if event_content.membership != MembershipState::Invite {
-+        return Err(Error::BadRequest(
-+            ErrorKind::InvalidParam,
-+            "Membership of invite event must be invite.",
-+        ));
-+    }
-+
-     let invited_user: Box<_> = serde_json::from_value(
-         signed_event
-             .get("state_key")
--- 
-GitLab
-
diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 2ebbe05c03fc..caa8fb5676c7 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -12,21 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-conduit";
-  version = "0.10.10";
+  version = "0.10.11";
 
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "conduit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n2k5SDzxafO+nqc0NhX/6GfSPsF9e/qO9aA7VWqSLuk=";
+    hash = "sha256-IJrDdmlyut8V2jJ7rUoREqoeriYO/15E+JiUCI4Pwlg=";
   };
 
-  patches = [
-    # https://gitlab.com/famedly/conduit/-/merge_requests/784
-    ./fix_validate_event_fields_for_invites_over_federation.patch
-  ];
-
-  cargoHash = "sha256-WprzCSm0O9Cav9WbikeNV5ZMqxlCY4qez03n0lu5KI8=";
+  cargoHash = "sha256-jSkoVA8Ib5S5NTzGtmT/40NwR+8HmKYjGlfbJGWghRA=";
 
   # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
   preBuild = ''