From 2d10180f08d7932a517e940fe7ea2a92d9e0fbb0 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Thu, 21 Apr 2022 20:44:28 +0100
Subject: [PATCH] chore: switch to latest quark revision

---
 Cargo.lock |  56 ++++++++++++++++++++++++++++++++++++++++++++---------
 Cargo.toml |   5 +----
 dump.rdb   | Bin 92 -> 0 bytes
 3 files changed, 48 insertions(+), 13 deletions(-)
 delete mode 100644 dump.rdb

diff --git a/Cargo.lock b/Cargo.lock
index 795609e8..e467dedc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -929,9 +929,9 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.16"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa"
+checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd"
 dependencies = [
  "serde",
 ]
@@ -1591,6 +1591,18 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
+[[package]]
+name = "iso8601-timestamp"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acc02e0ca75f26cafde38a8483b47b3f2474bc214e4f51e33d32896ef210c918"
+dependencies = [
+ "generic-array 0.14.4",
+ "schemars",
+ "serde",
+ "time 0.3.9",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1665,9 +1677,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.102"
+version = "0.2.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
+checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"
 
 [[package]]
 name = "linked-hash-map"
@@ -2124,6 +2136,15 @@ dependencies = [
  "syn 1.0.76",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.26.2"
@@ -3035,12 +3056,10 @@ dependencies = [
  "async-channel",
  "async-std",
  "async-tungstenite",
- "base64 0.13.0",
  "bitfield",
  "chrono",
  "ctrlc",
  "dashmap",
- "deadqueue",
  "dotenv",
  "env_logger",
  "futures",
@@ -3074,23 +3093,24 @@ dependencies = [
  "ulid 0.4.1",
  "url",
  "validator",
- "web-push",
 ]
 
 [[package]]
 name = "revolt-quark"
 version = "0.1.0"
-source = "git+https://github.com/revoltchat/quark?rev=6e9713186e8cfef0b067aa87af1e71a66bb44fd0#6e9713186e8cfef0b067aa87af1e71a66bb44fd0"
 dependencies = [
  "async-recursion",
  "async-std",
  "async-trait",
+ "base64 0.13.0",
  "bincode",
  "bitfield",
  "bson 2.1.0",
+ "deadqueue",
  "dotenv",
  "futures",
  "impl_ops",
+ "iso8601-timestamp",
  "lazy_static",
  "linkify 0.8.1",
  "log",
@@ -3112,6 +3132,7 @@ dependencies = [
  "serde_json",
  "ulid 0.5.0",
  "validator",
+ "web-push",
 ]
 
 [[package]]
@@ -3902,11 +3923,22 @@ dependencies = [
  "libc",
  "standback",
  "stdweb",
- "time-macros",
+ "time-macros 0.1.1",
  "version_check",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+dependencies = [
+ "libc",
+ "num_threads",
+ "time-macros 0.2.4",
+]
+
 [[package]]
 name = "time-macros"
 version = "0.1.1"
@@ -3917,6 +3949,12 @@ dependencies = [
  "time-macros-impl",
 ]
 
+[[package]]
+name = "time-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+
 [[package]]
 name = "time-macros-impl"
 version = "0.1.2"
diff --git a/Cargo.toml b/Cargo.toml
index de3c6f4e..36e42db6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ phf = { version = "0.9.0", features = ["macros"] }
 # ID / key generation
 ulid = "0.4.1"
 nanoid = "0.4.0"
-base64 = "0.13.0"
 
 # serde
 serde_json = "1.0.57"
@@ -43,13 +42,11 @@ rmp-serde = { git = "https://github.com/insertish/msgpack-rust", rev = "5bf2c242
 # async
 futures = "0.3.8"
 chrono = "0.4.15"
-deadqueue = "0.2.1"
 async-channel = "1.6.1"
 reqwest = { version = "0.11.4", features = ["json"] }
 async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
 
 # internal util
-web-push = "0.7.2"
 many-to-many = "0.1.2"
 lettre = "0.10.0-alpha.4"
 rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
@@ -72,5 +69,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 = "6e9713186e8cfef0b067aa87af1e71a66bb44fd0" }
+revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "b1bc7eb0bab9f3cb3458fb4c8da4cb985177d2b2" }
 # revolt-quark = { path = "../quark" }
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index 1fdff2cc111996f902759e4ef0daf1a42b162aca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmWG?b@2=~Ffg$E#aWb^l3A=<mRiJWre~yQ_=^i7kd#?ce8AxsYjR0uZt9_9t5}nM
tag-LPrs(FT<{lE*FUs(XCow-wx1cCBF*hkE^#H^FJ&G$f%P#!r2mmm(B+vi=