Merge commit 'd51a1c47c70d44bfcc1af6fe58f244170513470c' into feature-clean

2025-03-07 23:18:50 +03:00
parent 80aa005992 d51a1c47c7
commit d494ab9d5c
97 changed files with 3312 additions and 1531 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -265,9 +265,9 @@ dependencies = [

 [[package]]
 name = "actix-web-prom"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76743e67d4e7efa9fc2ac7123de0dd7b2ca592668e19334f1d81a3b077afc6ac"
+checksum = "56a34f1825c3ae06567a9d632466809bbf34963c86002e8921b64f32d48d289d"
 dependencies = [
 "actix-web",
 "futures-core",
@@ -420,6 +420,21 @@ dependencies = [
 "password-hash 0.5.0",
 ]

+[[package]]
+name = "ariadne"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "either",
+ "rand 0.8.5",
+ "serde",
+ "serde_bytes",
+ "serde_cbor",
+ "serde_json",
+ "thiserror 1.0.64",
+ "uuid 1.12.0",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -1216,7 +1231,11 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
 dependencies = [
 "byteorder",
 "fnv",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -1303,7 +1322,11 @@ dependencies = [
 "time",
 "tokio 1.43.0",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -2007,7 +2030,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
 "serde",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -2537,7 +2564,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
 dependencies = [
 "bit_field",
+<<<<<<< HEAD
 "half",
+=======
+ "flume",
+ "half 2.4.1",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "lebe",
 "miniz_oxide",
 "rayon-core",
@@ -3286,6 +3318,12 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
 [[package]]
 name = "half"
 version = "2.4.1"
@@ -4297,6 +4335,7 @@ dependencies = [
 "actix-web-prom",
 "actix-ws",
 "argon2",
+ "ariadne",
 "async-stripe",
 "async-trait",
 "base64 0.21.7",
@@ -4310,6 +4349,7 @@ dependencies = [
 "deadpool-redis",
 "derive-new",
 "dotenvy",
+ "either",
 "env_logger",
 "flate2",
 "futures 0.3.31",
@@ -4342,6 +4382,8 @@ dependencies = [
 "sentry",
 "sentry-actix",
 "serde",
+ "serde_bytes",
+ "serde_cbor",
 "serde_json",
 "serde_with",
 "sha1 0.6.1",
@@ -4355,7 +4397,11 @@ dependencies = [
 "totp-rs",
 "url",
 "urlencoding",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "validator",
 "webp",
 "woothee",
@@ -4732,7 +4778,11 @@ dependencies = [
 "serde_json",
 "thiserror 1.0.69",
 "time",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "wasm-bindgen-futures",
 "web-sys",
 "yaup",
@@ -6862,7 +6912,11 @@ dependencies = [
 "rkyv_derive",
 "seahash",
 "tinyvec",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -7234,7 +7288,11 @@ dependencies = [
 "serde",
 "serde_json",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -7500,7 +7558,11 @@ dependencies = [
 "thiserror 1.0.69",
 "time",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -7535,6 +7597,25 @@ dependencies = [
 "xml-rs",
 ]

+[[package]]
+name = "serde_bytes"
+version = "0.11.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half 1.8.3",
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.217"
@@ -8650,7 +8731,11 @@ dependencies = [
 "thiserror 2.0.11",
 "time",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "walkdir",
 ]

@@ -8743,7 +8828,11 @@ dependencies = [
 "thiserror 2.0.11",
 "toml 0.8.20",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 ]

 [[package]]
@@ -8925,7 +9014,11 @@ dependencies = [
 "toml 0.8.20",
 "url",
 "urlpattern",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "walkdir",
 ]

@@ -8988,6 +9081,7 @@ dependencies = [
 name = "theseus"
 version = "0.9.3"
 dependencies = [
+ "ariadne",
 "async-recursion",
 "async-tungstenite",
 "async_zip",
@@ -9000,6 +9094,7 @@ dependencies = [
 "dirs 5.0.1",
 "discord-rich-presence",
 "dunce",
+ "either",
 "flate2",
 "futures 0.3.31",
 "indicatif",
@@ -9029,7 +9124,11 @@ dependencies = [
 "tracing-subscriber",
 "url",
 "urlencoding",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "whoami",
 "winreg 0.52.0",
 "zip 0.6.6",
@@ -9071,7 +9170,11 @@ dependencies = [
 "tracing",
 "tracing-error",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "window-shadows",
 ]

@@ -9090,7 +9193,11 @@ dependencies = [
 "tracing-error",
 "tracing-subscriber",
 "url",
+<<<<<<< HEAD
 "uuid 1.13.1",
+=======
+ "uuid 1.12.0",
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 "webbrowser",
 ]

@@ -9952,9 +10059,15 @@ dependencies = [

 [[package]]
 name = "uuid"
+<<<<<<< HEAD
 version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
+=======
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
+>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c
 dependencies = [
 "getrandom 0.3.1",
 "js-sys",