From 4345a6471592cb31985fcbd653f43c754ac0ed2d Mon Sep 17 00:00:00 2001
From: Ginger <ginger@gingershaped.computer>
Date: Fri, 10 Apr 2026 12:55:08 -0400
Subject: [PATCH] refactor: Resolve remaining errors in threepid.rs

---
 Cargo.lock                         | 22 +++++++++++-----------
 Cargo.toml                         |  2 +-
 src/api/client/account/threepid.rs |  8 ++------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b5d825f0..d2d0bb5a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4561,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.14.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "assign",
  "js_int",
@@ -4580,7 +4580,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.14.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -4592,7 +4592,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.22.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "as_variant",
  "assign",
@@ -4614,7 +4614,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.17.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "as_variant",
  "base64 0.22.1",
@@ -4647,7 +4647,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.32.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "as_variant",
  "indexmap",
@@ -4668,7 +4668,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.13.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "bytes",
  "headers",
@@ -4691,7 +4691,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.12.0"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "js_int",
  "thiserror 2.0.18",
@@ -4700,7 +4700,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.17.1"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "as_variant",
  "cfg-if",
@@ -4716,7 +4716,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.13.0"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -4728,7 +4728,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.19.0"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "base64 0.22.1",
  "ed25519-dalek",
@@ -4744,7 +4744,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.15.0"
-source = "git+https://github.com/ruma/ruma.git?rev=e2e5fece57800a2559ab028fd775a7978f3725e9#e2e5fece57800a2559ab028fd775a7978f3725e9"
+source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 dependencies = [
  "js_int",
  "ruma-common",
diff --git a/Cargo.toml b/Cargo.toml
index 38ea7d9c7..bfd1ec64a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -347,7 +347,7 @@ version = "1.1.1"
 [workspace.dependencies.ruma]
 # version = "0.14.1"
 git = "https://github.com/ruma/ruma.git"
-rev = "e2e5fece57800a2559ab028fd775a7978f3725e9"
+rev = "3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
 features = [
     "appservice-api-c",
     "client-api",
diff --git a/src/api/client/account/threepid.rs b/src/api/client/account/threepid.rs
index b08f8246c..368a3557d 100644
--- a/src/api/client/account/threepid.rs
+++ b/src/api/client/account/threepid.rs
@@ -133,9 +133,7 @@ pub(crate) async fn delete_3pid_route(
 	let sender_user = body.sender_user();
 
 	if body.medium != Medium::Email {
-		return Ok(delete_3pid::v3::Response {
-			id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
-		});
+		return Ok(delete_3pid::v3::Response::new(ThirdPartyIdRemovalStatus::NoSupport));
 	}
 
 	if services
@@ -147,7 +145,5 @@ pub(crate) async fn delete_3pid_route(
 		return Err!(Request(ThreepidNotFound("Your account has no associated email.")));
 	}
 
-	Ok(delete_3pid::v3::Response {
-		id_server_unbind_result: ThirdPartyIdRemovalStatus::Success,
-	})
+	Ok(delete_3pid::v3::Response::new(ThirdPartyIdRemovalStatus::Success))
 }