From e5af59d307be58e15647caffd142b798069600cf Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Thu, 28 Apr 2022 19:56:12 +0100
Subject: [PATCH] chore: remove old dependencies

---
 Cargo.lock | 245 +++--------------------------------------------------
 Cargo.toml |   7 +-
 2 files changed, 15 insertions(+), 237 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef5d8703..019a9d13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -258,20 +258,6 @@ dependencies = [
  "syn 1.0.76",
 ]
 
-[[package]]
-name = "async-tungstenite"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39eca8dd578b18e557361e50ca767df55c5e62f690a5e53868c3c7a8123145b7"
-dependencies = [
- "async-std",
- "futures-io",
- "futures-util",
- "log",
- "pin-project",
- "tungstenite",
-]
-
 [[package]]
 name = "atomic"
 version = "0.5.0"
@@ -353,12 +339,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -645,15 +625,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc32fast"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.5"
@@ -985,18 +956,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "flate2"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
-dependencies = [
- "cfg-if 1.0.0",
- "crc32fast",
- "libc",
- "miniz_oxide",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1331,21 +1290,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hive_pubsub"
-version = "0.5.0"
-source = "git+https://gitlab.insrt.uk/insert/hive?rev=b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf#b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf"
-dependencies = [
- "futures",
- "many-to-many",
- "mobc",
- "mobc-redis",
- "redis 0.21.2",
- "serde",
- "serde_json",
- "ulid 0.4.1",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
@@ -1546,15 +1490,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3094308123a0e9fd59659ce45e22de9f53fc1d2ac6e1feb9fef988e4f76cad77"
 
-[[package]]
-name = "input_buffer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
-dependencies = [
- "bytes 0.5.6",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.10"
@@ -1756,12 +1691,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "many-to-many"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff2806c88ab7215e5077fbaaf21a9baaab9caa2abd7adf6c0f63b535ad747547"
-
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -2216,29 +2145,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ops"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84d3c0b53fdad4ac53b19afbf296402d4ba0c9e99ddc28cbb5201f37ecce217a"
-dependencies = [
- "futures-util",
- "hyper 0.14.12",
- "once_cell",
- "ops-core",
- "prometheus",
- "serde_json",
-]
-
-[[package]]
-name = "ops-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57465be38a13e24528c3c821514029e9b6171b8e86cb04cfa481c78bc7af57"
-dependencies = [
- "async-trait",
-]
-
 [[package]]
 name = "optional_struct"
 version = "0.2.0"
@@ -2312,6 +2218,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+
 [[package]]
 name = "pbkdf2"
 version = "0.8.0"
@@ -2393,50 +2305,6 @@ dependencies = [
  "sha-1 0.8.2",
 ]
 
-[[package]]
-name = "phf"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37"
-dependencies = [
- "phf_macros",
- "phf_shared",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082"
-dependencies = [
- "phf_shared",
- "rand 0.8.4",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro-hack",
- "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.76",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.0.8"
@@ -2572,36 +2440,6 @@ dependencies = [
  "yansi",
 ]
 
-[[package]]
-name = "procfs"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8809e0c18450a2db0f236d2a44ec0b4c1412d0eb936233579f0990faa5d5cd"
-dependencies = [
- "bitflags",
- "byteorder",
- "flate2",
- "hex",
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
-dependencies = [
- "cfg-if 1.0.0",
- "fnv",
- "lazy_static",
- "libc",
- "parking_lot 0.11.2",
- "procfs",
- "regex",
- "thiserror",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -2943,7 +2781,7 @@ dependencies = [
  "mobc",
  "mobc-redis",
  "redis 0.21.2",
- "rmp-serde 1.0.0",
+ "rmp-serde",
  "serde",
  "serde_json",
 ]
@@ -3055,7 +2893,6 @@ version = "0.0.0"
 dependencies = [
  "async-channel",
  "async-std",
- "async-tungstenite",
  "bitfield",
  "chrono",
  "ctrlc",
@@ -3063,27 +2900,23 @@ dependencies = [
  "dotenv",
  "env_logger",
  "futures",
- "hive_pubsub",
  "impl_ops",
  "lazy_static",
  "lettre",
  "linkify 0.6.0",
  "log",
  "lru",
- "many-to-many",
  "mobc",
  "mobc-redis",
  "mongodb 1.2.3",
  "nanoid",
  "num_enum",
  "once_cell",
- "phf",
  "rauth",
  "redis 0.21.2",
  "regex",
  "reqwest",
  "revolt-quark",
- "rmp-serde 0.15.5",
  "rocket",
  "rocket_cors",
  "rocket_okapi",
@@ -3098,7 +2931,7 @@ dependencies = [
 [[package]]
 name = "revolt-quark"
 version = "0.1.0"
-source = "git+https://github.com/revoltchat/quark?rev=dd3c1283a0398a4ee575a0a4c6e81c1f4aebcb46#dd3c1283a0398a4ee575a0a4c6e81c1f4aebcb46"
+source = "git+https://github.com/revoltchat/quark?rev=d645b746ad90b8517b492ca1ec250ac480a975e8#d645b746ad90b8517b492ca1ec250ac480a975e8"
 dependencies = [
  "async-recursion",
  "async-std",
@@ -3119,7 +2952,6 @@ dependencies = [
  "nanoid",
  "num_enum",
  "okapi",
- "ops",
  "optional_struct",
  "pretty_env_logger",
  "rauth",
@@ -3153,41 +2985,23 @@ dependencies = [
 
 [[package]]
 name = "rmp"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6"
-dependencies = [
- "byteorder",
- "num-traits",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.10"
-source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
+checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
 dependencies = [
  "byteorder",
  "num-traits",
+ "paste",
 ]
 
 [[package]]
 name = "rmp-serde"
-version = "0.15.5"
-source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
-dependencies = [
- "byteorder",
- "rmp 0.8.10 (git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814)",
- "serde",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3eedffbfcc6a428f230c04baf8f59bd73c1781361e4286111fe900849aaddaf"
+checksum = "25786b0d276110195fa3d6f3f31299900cf71dfbd6c28450f3f58a0e7f7a347e"
 dependencies = [
  "byteorder",
- "rmp 0.8.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rmp",
  "serde",
 ]
 
@@ -3650,12 +3464,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "siphasher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
-
 [[package]]
 name = "slab"
 version = "0.4.4"
@@ -4301,25 +4109,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
-[[package]]
-name = "tungstenite"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23"
-dependencies = [
- "base64 0.12.3",
- "byteorder",
- "bytes 0.5.6",
- "http",
- "httparse",
- "input_buffer",
- "log",
- "rand 0.7.3",
- "sha-1 0.9.8",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "twoway"
 version = "0.2.2"
@@ -4486,12 +4275,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "uuid"
 version = "0.8.2"
diff --git a/Cargo.toml b/Cargo.toml
index 17db4623..fcd40390 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,6 @@ regex = "1"
 num_enum = "0.5.1"
 impl_ops = "0.1.1"
 bitfield = "0.13.2"
-phf = { version = "0.9.0", features = ["macros"] }
 
 # ID / key generation
 ulid = "0.4.1"
@@ -37,7 +36,6 @@ nanoid = "0.4.0"
 serde_json = "1.0.57"
 serde = { version = "1.0.115", features = ["derive"] }
 validator = { version = "0.14", features = ["derive"] }
-rmp-serde = { git = "https://github.com/insertish/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
 
 # async
 futures = "0.3.8"
@@ -47,10 +45,8 @@ reqwest = { version = "0.11.4", features = ["json"] }
 async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
 
 # internal util
-many-to-many = "0.1.2"
 lettre = "0.10.0-alpha.4"
 rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
-hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf", features = ["redis-backend"] }
 
 # redis
 redis = { version = "0.21.2", features = ["async-std-comp"] }
@@ -58,7 +54,6 @@ mobc = { version = "0.7.3" }
 mobc-redis = { version = "0.7.0", default-features = false, features = ["async-std-comp"] }
 
 # web
-async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
 rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
 mongodb = { version = "1.2.2", features = ["async-std-runtime"], default-features = false }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
@@ -69,5 +64,5 @@ schemars = "0.8.8"
 rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "dcf0df115596ee07a587a7a543cddf3d7944645b", features = [ "swagger" ] }
 
 # quark
-revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "dd3c1283a0398a4ee575a0a4c6e81c1f4aebcb46" }
+revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "d645b746ad90b8517b492ca1ec250ac480a975e8" }
 # revolt-quark = { path = "../quark" }