magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

integrate ruma js_int errors into enum

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-08-10 19:18:22 +00:00
parent 5db816277b
commit 40d53563fc
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Cargo.lock generated
View file

@ -500,12 +500,13 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.1.10" version = "1.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
"shlex",
] ]
[[package]] [[package]]
@ -2979,7 +2980,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.10.1" version = "0.10.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -3001,7 +3002,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3013,7 +3014,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -3036,7 +3037,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@ -3066,7 +3067,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.28.1" version = "0.28.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap 2.4.0", "indexmap 2.4.0",
@ -3083,22 +3084,15 @@ dependencies = [
"thiserror", "thiserror",
"tracing", "tracing",
"url", "url",
"web-time 1.1.0",
"wildmatch", "wildmatch",
] ]
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"bytes",
"http",
"httparse",
"js_int", "js_int",
"memchr",
"mime",
"rand",
"ruma-common", "ruma-common",
"ruma-events", "ruma-events",
"serde", "serde",
@ -3108,7 +3102,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.5" version = "0.9.5"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror", "thiserror",
@ -3117,7 +3111,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identity-service-api" name = "ruma-identity-service-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3127,7 +3121,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"proc-macro-crate", "proc-macro-crate",
@ -3142,7 +3136,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3154,7 +3148,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-server-util" name = "ruma-server-util"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"headers", "headers",
"http", "http",
@ -3167,7 +3161,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.15.0" version = "0.15.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@ -3183,7 +3177,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=11cbd52af1039f3d4a0b96333acd1d1687ba01aa#11cbd52af1039f3d4a0b96333acd1d1687ba01aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=9508f16eb4150b276d1d744d68177db38ce70297#9508f16eb4150b276d1d744d68177db38ce70297"
dependencies = [ dependencies = [
"itertools 0.12.1", "itertools 0.12.1",
"js_int", "js_int",

2
Cargo.toml
View file

@ -307,7 +307,7 @@ version = "0.1.2"
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
git = "https://github.com/girlbossceo/ruwuma" git = "https://github.com/girlbossceo/ruwuma"
#branch = "conduwuit-changes" #branch = "conduwuit-changes"
rev = "11cbd52af1039f3d4a0b96333acd1d1687ba01aa" rev = "9508f16eb4150b276d1d744d68177db38ce70297"
features = [ features = [
"compat", "compat",
"rand", "rand",

4
src/core/error/mod.rs
View file

@ -54,6 +54,10 @@ pub enum Error {
#[error(transparent)] #[error(transparent)]
Json(#[from] serde_json::Error), Json(#[from] serde_json::Error),
#[error(transparent)] #[error(transparent)]
JsParseInt(#[from] ruma::JsParseIntError), // js_int re-export
#[error(transparent)]
JsTryFromInt(#[from] ruma::JsTryFromIntError), // js_int re-export
#[error(transparent)]
Path(#[from] axum::extract::rejection::PathRejection), Path(#[from] axum::extract::rejection::PathRejection),
#[error("Regex error: {0}")] #[error("Regex error: {0}")]
Regex(#[from] regex::Error), Regex(#[from] regex::Error),