Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Resolve remaining errors in threepid.rs

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:51 -04:00
parent a2f6141f4b
commit 01e403f05f
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+11 -11
View File
@@ -4653,7 +4653,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.14.1" 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 = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@@ -4672,7 +4672,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.14.1" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4684,7 +4684,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.22.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@@ -4706,7 +4706,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.17.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@@ -4739,7 +4739,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.32.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@@ -4760,7 +4760,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.13.1" 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 = [ dependencies = [
"bytes", "bytes",
"headers", "headers",
@@ -4783,7 +4783,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.12.0" 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 = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.18", "thiserror 2.0.18",
@@ -4792,7 +4792,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.17.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"cfg-if", "cfg-if",
@@ -4808,7 +4808,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.13.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4820,7 +4820,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.19.0" 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 = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@@ -4836,7 +4836,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.15.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
Cargo.toml
+1 -1
View File
@@ -349,7 +349,7 @@ version = "1.1.1"
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
# version = "0.14.1" # version = "0.14.1"
git = "https://github.com/ruma/ruma.git" git = "https://github.com/ruma/ruma.git"
rev = "e2e5fece57800a2559ab028fd775a7978f3725e9" rev = "3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
features = [ features = [
"appservice-api-c", "appservice-api-c",
"client-api", "client-api",
src/api/client/account/threepid.rs
+2 -6
View File
@@ -141,9 +141,7 @@ pub(crate) async fn delete_3pid_route(
let sender_user = body.sender_user(); let sender_user = body.sender_user();
if body.medium != Medium::Email { if body.medium != Medium::Email {
return Ok(delete_3pid::v3::Response { return Ok(delete_3pid::v3::Response::new(ThirdPartyIdRemovalStatus::NoSupport));
id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
});
} }
if !services.threepid.email_requirement().may_remove() { if !services.threepid.email_requirement().may_remove() {
@@ -159,7 +157,5 @@ pub(crate) async fn delete_3pid_route(
return Err!(Request(ThreepidNotFound("Your account has no associated email."))); return Err!(Request(ThreepidNotFound("Your account has no associated email.")));
} }
Ok(delete_3pid::v3::Response { Ok(delete_3pid::v3::Response::new(ThirdPartyIdRemovalStatus::Success))
id_server_unbind_result: ThirdPartyIdRemovalStatus::Success,
})
} }