diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..81ec293f
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,79 @@
+# MongoDB URI
+MONGODB=mongodb://localhost
+
+# URL to where the Revolt app is publicly accessible
+REVOLT_APP_URL=http://local.revolt.chat:5000
+
+# URL to where the API is publicly accessible
+REVOLT_PUBLIC_URL=http://local.revolt.chat:8000
+VITE_API_URL=http://local.revolt.chat:8000
+
+# URL to where the WebSocket server is publicly accessible
+REVOLT_EXTERNAL_WS_URL=ws://local.revolt.chat:9000
+
+# URL to where Autumn is publicly available
+AUTUMN_PUBLIC_URL=http://local.revolt.chat:3000
+
+# URL to where January is publicly available
+JANUARY_PUBLIC_URL=http://local.revolt.chat:7000
+
+# URL to where Vortex is publicly available
+# VOSO_PUBLIC_URL=https://voso.revolt.chat
+
+
+##
+## hCaptcha Settings
+##
+
+# If you are sure that you don't want to use hCaptcha, set to 1.
+REVOLT_UNSAFE_NO_CAPTCHA=1
+
+# hCaptcha API key
+# REVOLT_HCAPTCHA_KEY=0x0000000000000000000000000000000000000000
+
+# hCaptcha site key
+# REVOLT_HCAPTCHA_SITEKEY=10000000-ffff-ffff-ffff-000000000001
+
+
+##
+## Email Settings
+##
+
+# If you are sure that you don't want to use email verification, set to 1.
+REVOLT_UNSAFE_NO_EMAIL=1
+
+# SMTP host
+# REVOLT_SMTP_HOST=smtp.example.com
+
+# SMTP username
+# REVOLT_SMTP_USERNAME=noreply@example.com
+
+# SMTP password
+# REVOLT_SMTP_PASSWORD=CHANGEME
+
+# SMTP From header
+# REVOLT_SMTP_FROM=Revolt <noreply@example.com>
+
+
+##
+## Application Settings
+##
+
+# Whether to only allow users to sign up if they have an invite code
+REVOLT_INVITE_ONLY=0
+
+# Maximum number of people that can be in a group chat
+REVOLT_MAX_GROUP_SIZE=150
+
+# VAPID keys for push notifications
+# Generate using this guide: https://gitlab.insrt.uk/revolt/delta/-/wikis/vapid
+# --> Please replace these keys before going into production! <--
+REVOLT_VAPID_PRIVATE_KEY=LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUJSUWpyTWxLRnBiVWhsUHpUbERvcEliYk1yeVNrNXpKYzVYVzIxSjJDS3hvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFWnkrQkg2TGJQZ2hEa3pEempXOG0rUXVPM3pCajRXT1phdkR6ZU00c0pqbmFwd1psTFE0WAp1ZDh2TzVodU94QWhMQlU3WWRldVovWHlBdFpWZmNyQi9BPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
+REVOLT_VAPID_PUBLIC_KEY=BGcvgR-i2z4IQ5Mw841vJvkLjt8wY-FjmWrw83jOLCY52qcGZS0OF7nfLzuYbjsQISwVO2HXrmf18gLWVX3Kwfw=
+
+
+##
+## Vortex configuration
+##
+
+# VOSO_MANAGE_TOKEN=CHANGEME
diff --git a/.gitignore b/.gitignore
index 187298ef..1e079469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ Rocket.toml
 /target_backup
 **/*.rs.bk
 .mongo
+.data
 .env
 avatar.png
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 7960cd0a..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-stages:
-  - build
-
-# Rocket does not currently compile on stable Rust.
-# Once it does, we can uncomment this, and instead
-# put `allow-failure: true` on the nightly build.
-#
-# rust-latest:
-#   stage: build
-#   image: rust:latest
-#   script:
-#     - cargo build --verbose
-#     - cargo test --verbose
-
-rust-nightly:
-  stage: build
-  image: rustlang/rust:nightly
-  script:
-    - cargo build --verbose
-    - cargo test --verbose
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..b4455fd0
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,34 @@
+{
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/revolt",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [{
+                "name": "ROCKET_ADDRESS",
+                "value": "0.0.0.0"
+            }, {
+                "name": "MONGODB",
+                "value": "mongodb://localhost"
+            }],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description":  "Set Disassembly Flavor to Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b458b995..94d7924a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-    "rust-analyzer.diagnostics.disabled": [
-        "unresolved-macro-call"
-    ]
+    "editor.formatOnSave": true,
+    "rust-analyzer.checkOnSave.command": "clippy"
 }
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 4ca2d84f..63ed8d8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
  "gimli",
 ]
@@ -33,7 +33,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.6",
  "once_cell",
  "version_check",
 ]
@@ -47,6 +47,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -65,8 +74,8 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -96,9 +105,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "2.0.2"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6"
+checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -109,7 +118,7 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "tokio 0.2.25",
- "tokio 1.11.0",
+ "tokio 1.18.0",
 ]
 
 [[package]]
@@ -126,16 +135,16 @@ dependencies = [
  "parking",
  "polling",
  "slab",
- "socket2 0.4.2",
+ "socket2 0.4.4",
  "waker-fn",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
 dependencies = [
  "event-listener",
 ]
@@ -151,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692"
+checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6"
 dependencies = [
  "async-io",
  "blocking",
@@ -167,10 +176,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-std"
-version = "1.10.0"
+name = "async-recursion"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952"
+checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "async-std"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c"
 dependencies = [
  "async-attributes",
  "async-channel",
@@ -189,17 +209,32 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
-name = "async-stream"
-version = "0.3.2"
+name = "async-std-resolver"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625"
+checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "futures-io",
+ "futures-util",
+ "pin-utils",
+ "socket2 0.4.4",
+ "trust-dns-resolver 0.21.2",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -207,53 +242,39 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
+checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.0.3"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
 
 [[package]]
 name = "async-trait"
-version = "0.1.51"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
+checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
-]
-
-[[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",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "atomic"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281"
+checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -275,21 +296,24 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
+dependencies = [
+ "autocfg 1.1.0",
+]
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.61"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
+checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
 dependencies = [
  "addr2line",
  "cc",
@@ -302,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "base-x"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74"
 
 [[package]]
 name = "base32"
@@ -328,12 +352,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"
@@ -346,6 +364,15 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitfield"
 version = "0.13.2"
@@ -358,18 +385,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitvec"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "blake2b_simd"
 version = "0.5.11"
@@ -399,7 +414,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -413,9 +437,9 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.0.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9"
+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
 dependencies = [
  "async-channel",
  "async-task",
@@ -427,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "1.2.3"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903a4f4c7aa97921f1703acac1fd524e9e082b3228edd34dde07758c0c92c672"
+checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1"
 dependencies = [
  "base64 0.13.0",
  "chrono",
@@ -443,10 +467,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "bumpalo"
-version = "3.7.0"
+name = "bson"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "f60a2c7c80a7850b56df4b8e98e8e4932c34877b8add4f13e8350499cc1e4572"
+dependencies = [
+ "ahash",
+ "base64 0.13.0",
+ "chrono",
+ "hex",
+ "indexmap",
+ "lazy_static",
+ "rand 0.8.5",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "uuid",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "byte-tools"
@@ -474,15 +517,15 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "cache-padded"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
 name = "cc"
-version = "1.0.70"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
 [[package]]
 name = "cfg-if"
@@ -523,16 +566,16 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a909e4d93292cd8e9c42e189f61681eff9d67b6541f96b8a1a737f23737bd001"
+checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
 dependencies = [
  "bytes 1.1.0",
  "futures-core",
  "memchr",
- "pin-project-lite 0.2.7",
- "tokio 1.11.0",
- "tokio-util 0.6.8",
+ "pin-project-lite 0.2.9",
+ "tokio 1.18.0",
+ "tokio-util 0.7.1",
 ]
 
 [[package]]
@@ -546,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
 
 [[package]]
 name = "constant_time_eq"
@@ -569,9 +612,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -579,54 +622,74 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.5"
+name = "crossbeam-queue"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
 dependencies = [
  "cfg-if 1.0.0",
  "lazy_static",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array 0.14.5",
+ "typenum",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle",
 ]
 
 [[package]]
 name = "ctor"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
+checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "ctrlc"
-version = "3.2.0"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377c9b002a72a0b2c1a18c62e2f3864bdfea4a015e3683a96e24aa45dd6c02d1"
+checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865"
 dependencies = [
  "nix",
  "winapi 0.3.9",
@@ -644,12 +707,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.13.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
 dependencies = [
- "darling_core 0.13.0",
- "darling_macro 0.13.0",
+ "darling_core 0.13.4",
+ "darling_macro 0.13.4",
 ]
 
 [[package]]
@@ -661,23 +724,23 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "strsim 0.9.3",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.13.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "strsim 0.10.0",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -687,19 +750,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core 0.10.2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.13.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
- "darling_core 0.13.0",
- "quote",
- "syn",
+ "darling_core 0.13.4",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "num_cpus",
+ "parking_lot 0.12.0",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+
+[[package]]
+name = "deadqueue"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f13842c4b01ed03514527b625ae001f43b74158c7b0402a5369010cc38c3c8cf"
+dependencies = [
+ "crossbeam-queue",
+ "tokio 1.18.0",
 ]
 
 [[package]]
@@ -709,8 +799,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -730,7 +820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
 dependencies = [
  "devise_core",
- "quote",
+ "quote 1.0.18",
 ]
 
 [[package]]
@@ -742,8 +832,8 @@ dependencies = [
  "bitflags",
  "proc-macro2",
  "proc-macro2-diagnostics",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -761,7 +851,18 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -782,6 +883,12 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+
 [[package]]
 name = "either"
 version = "1.6.1"
@@ -789,24 +896,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
-name = "encoding_rs"
-version = "0.8.28"
+name = "email-encoding"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "6690291166824e467790ac08ba42f241791567e8337bbf00c5a6e87889629f98"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
 dependencies = [
  "heck",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "enum-as-inner"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -824,9 +952,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",
 ]
@@ -839,17 +967,17 @@ checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "rustversion",
- "syn",
+ "syn 1.0.91",
  "synstructure",
 ]
 
 [[package]]
 name = "event-listener"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
 
 [[package]]
 name = "fake-simd"
@@ -859,9 +987,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "fastrand"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
 dependencies = [
  "instant",
 ]
@@ -933,17 +1061,11 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
 [[package]]
 name = "futures"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -956,9 +1078,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -966,15 +1088,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -983,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-lite"
@@ -998,34 +1120,32 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
- "autocfg 1.0.1",
- "proc-macro-hack",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-timer"
@@ -1035,11 +1155,10 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.17"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "autocfg 1.0.1",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -1047,10 +1166,8 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -1078,9 +1195,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
  "version_check",
@@ -1099,9 +1216,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1110,9 +1227,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "glob"
@@ -1122,15 +1239,14 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f"
+checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
 dependencies = [
  "futures-channel",
  "futures-core",
  "js-sys",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
@@ -1155,9 +1271,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.4"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -1167,8 +1283,8 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio 1.11.0",
- "tokio-util 0.6.8",
+ "tokio 1.18.0",
+ "tokio-util 0.7.1",
  "tracing",
 ]
 
@@ -1197,12 +1313,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -1219,21 +1332,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",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
@@ -1244,6 +1342,15 @@ dependencies = [
  "digest 0.9.0",
 ]
 
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "hostname"
 version = "0.3.1"
@@ -1257,13 +1364,13 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
@@ -1278,20 +1385,20 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes 1.1.0",
  "http",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.5.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
 
 [[package]]
 name = "httpdate"
@@ -1301,9 +1408,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
 [[package]]
 name = "httpdate"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "humantime"
@@ -1329,7 +1436,7 @@ dependencies = [
  "http-body 0.3.1",
  "httparse",
  "httpdate 0.3.2",
- "itoa",
+ "itoa 0.4.8",
  "pin-project",
  "socket2 0.3.19",
  "tokio 0.2.25",
@@ -1340,44 +1447,28 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.12"
+version = "0.14.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"
+checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
 dependencies = [
  "bytes 1.1.0",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.4",
+ "h2 0.3.13",
  "http",
- "http-body 0.4.3",
+ "http-body 0.4.4",
  "httparse",
- "httpdate 1.0.1",
- "itoa",
- "pin-project-lite 0.2.7",
- "socket2 0.4.2",
- "tokio 1.11.0",
+ "httpdate 1.0.2",
+ "itoa 1.0.1",
+ "pin-project-lite 0.2.9",
+ "socket2 0.4.4",
+ "tokio 1.18.0",
  "tower-service",
  "tracing",
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
-dependencies = [
- "bytes 0.5.6",
- "futures-util",
- "hyper 0.13.10",
- "log",
- "rustls 0.18.1",
- "tokio 0.2.25",
- "tokio-rustls 0.14.1",
- "webpki",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.4.3"
@@ -1398,9 +1489,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes 1.1.0",
- "hyper 0.14.12",
+ "hyper 0.14.18",
  "native-tls",
- "tokio 1.11.0",
+ "tokio 1.18.0",
  "tokio-native-tls",
 ]
 
@@ -1435,35 +1526,26 @@ checksum = "90f97a5f38dd3ccfbe7aa80f4a0c00930f21b922c74195be0201c51028f22dcf"
 
 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "hashbrown",
  "serde",
 ]
 
 [[package]]
 name = "inlinable_string"
-version = "0.1.14"
+version = "0.1.15"
 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",
-]
+checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1484,16 +1566,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
 dependencies = [
  "socket2 0.3.19",
- "widestring",
+ "widestring 0.4.3",
  "winapi 0.3.9",
  "winreg 0.6.2",
 ]
 
 [[package]]
-name = "ipnet"
-version = "2.3.1"
+name = "ipconfig"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
+checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
+dependencies = [
+ "socket2 0.4.4",
+ "widestring 0.5.1",
+ "winapi 0.3.9",
+ "winreg 0.7.0",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+
+[[package]]
+name = "iso8601-timestamp"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b415c6f5289fa0f0fcaaf15653931eaf947e584a9a58c1d15756e8bcbb7dd19a"
+dependencies = [
+ "generic-array 0.14.5",
+ "schemars",
+ "serde",
+ "time 0.3.9",
+]
 
 [[package]]
 name = "itoa"
@@ -1502,10 +1608,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
-name = "js-sys"
-version = "0.3.55"
+name = "itoa"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+
+[[package]]
+name = "js-sys"
+version = "0.3.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1543,29 +1655,30 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lettre"
-version = "0.10.0-rc.3"
+version = "0.10.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8697ded52353bdd6fec234b3135972433397e86d0493d9fc38fbf407b7c106a"
+checksum = "5144148f337be14dabfc0f0d85b691a68ac6c77ef22a5c47c5504b70a7c9fcf3"
 dependencies = [
  "base64 0.13.0",
+ "email-encoding",
  "fastrand",
+ "futures-util",
  "hostname",
- "httpdate 1.0.1",
+ "httpdate 1.0.2",
  "idna",
  "mime",
  "native-tls",
  "nom",
  "once_cell",
  "quoted_printable",
- "r2d2",
  "regex",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.102"
+version = "0.2.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
 
 [[package]]
 name = "linked-hash-map"
@@ -1583,19 +1696,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "lock_api"
-version = "0.4.5"
+name = "linkify"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "28d9967eb7d0bc31c39c6f52e8fce42991c0cd1f7a2078326f0b7a399a584c8d"
 dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+dependencies = [
+ "autocfg 1.1.0",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
 dependencies = [
  "cfg-if 1.0.0",
  "value-bag",
@@ -1603,22 +1726,24 @@ dependencies = [
 
 [[package]]
 name = "loom"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2111607c723d7857e0d8299d5ce7a0bf4b844d3e44f8de136b13da513eaf8fc4"
+checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
 dependencies = [
  "cfg-if 1.0.0",
  "generator",
  "scoped-tls",
  "serde",
  "serde_json",
+ "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
 name = "lru"
-version = "0.7.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803"
+checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889"
 dependencies = [
  "hashbrown",
 ]
@@ -1632,12 +1757,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"
@@ -1650,6 +1769,15 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -1667,21 +1795,21 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "md-5"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582"
+dependencies = [
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "memchr"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
-[[package]]
-name = "memoffset"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
-dependencies = [
- "autocfg 1.0.1",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -1689,23 +1817,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
-name = "mime_guess"
-version = "2.0.3"
+name = "minimal-lexical"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-dependencies = [
- "mime",
- "unicase",
-]
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
 dependencies = [
  "adler",
- "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -1729,14 +1852,15 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
 dependencies = [
  "libc",
  "log",
  "miow 0.3.7",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
@@ -1774,7 +1898,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "log",
- "tokio 1.11.0",
+ "tokio 1.18.0",
 ]
 
 [[package]]
@@ -1789,33 +1913,33 @@ dependencies = [
 
 [[package]]
 name = "mongodb"
-version = "1.2.3"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2a1cb6fd58c27e51ee650dca3b6924c4ce533dc0384f05b3219709ea1f1eb6"
+checksum = "88543485b334691ccd284ea2d6033a5d9b0e5e77db6a0aa7a2da4caaa458f4f9"
 dependencies = [
+ "async-std",
  "async-trait",
  "base64 0.11.0",
  "bitflags",
- "bson",
+ "bson 1.2.4",
  "chrono",
  "derivative",
  "err-derive",
  "futures",
  "hex",
- "hmac",
+ "hmac 0.11.0",
  "lazy_static",
- "md-5",
+ "md-5 0.9.1",
  "os_info",
- "pbkdf2",
+ "pbkdf2 0.8.0",
  "percent-encoding",
  "rand 0.7.3",
- "reqwest 0.10.10",
  "rustls 0.17.0",
+ "rustls-pemfile 0.2.1",
  "serde",
- "serde_bytes",
  "serde_with",
  "sha-1 0.9.8",
- "sha2",
+ "sha2 0.9.9",
  "socket2 0.3.19",
  "stringprep",
  "strsim 0.10.0",
@@ -1823,20 +1947,68 @@ dependencies = [
  "time 0.1.44",
  "tokio 0.2.25",
  "tokio-rustls 0.13.1",
- "trust-dns-proto",
- "trust-dns-resolver",
- "typed-builder",
+ "trust-dns-proto 0.19.7",
+ "trust-dns-resolver 0.19.7",
+ "typed-builder 0.4.1",
  "uuid",
  "version_check",
- "webpki",
+ "webpki 0.21.4",
  "webpki-roots 0.21.1",
 ]
 
 [[package]]
-name = "multer"
-version = "2.0.1"
+name = "mongodb"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408327e2999b839cd1af003fc01b2019a6c10a1361769542203f6fedc5179680"
+checksum = "49a2fe500edae1ffc8e4bbc731e54a44638e5ec59fbff967f1cb8306867f5b53"
+dependencies = [
+ "async-std",
+ "async-std-resolver",
+ "async-trait",
+ "base64 0.13.0",
+ "bitflags",
+ "bson 2.2.0",
+ "chrono",
+ "derivative",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hmac 0.12.1",
+ "lazy_static",
+ "md-5 0.10.1",
+ "os_info",
+ "pbkdf2 0.10.1",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rustc_version_runtime",
+ "rustls 0.20.4",
+ "rustls-pemfile 0.3.0",
+ "serde",
+ "serde_with",
+ "sha-1 0.10.0",
+ "sha2 0.10.2",
+ "socket2 0.4.4",
+ "stringprep",
+ "strsim 0.10.0",
+ "take_mut",
+ "thiserror",
+ "tokio 1.18.0",
+ "tokio-rustls 0.23.3",
+ "tokio-util 0.7.1",
+ "trust-dns-proto 0.21.2",
+ "trust-dns-resolver 0.21.2",
+ "typed-builder 0.10.0",
+ "uuid",
+ "webpki-roots 0.22.3",
+]
+
+[[package]]
+name = "multer"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836"
 dependencies = [
  "bytes 1.1.0",
  "encoding_rs",
@@ -1844,11 +2016,11 @@ dependencies = [
  "http",
  "httparse",
  "log",
+ "memchr",
  "mime",
- "spin 0.9.2",
- "tokio 1.11.0",
- "tokio-util 0.6.8",
- "twoway",
+ "spin 0.9.3",
+ "tokio 1.18.0",
+ "tokio-util 0.6.9",
  "version_check",
 ]
 
@@ -1858,14 +2030,14 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
 dependencies = [
- "rand 0.8.4",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
 dependencies = [
  "lazy_static",
  "libc",
@@ -1892,34 +2064,30 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.22.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
+checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
 dependencies = [
  "bitflags",
- "cc",
  "cfg-if 1.0.0",
  "libc",
- "memoffset",
 ]
 
 [[package]]
 name = "nom"
-version = "6.1.2"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
 dependencies = [
- "bitvec",
- "funty",
  "memchr",
- "version_check",
+ "minimal-lexical",
 ]
 
 [[package]]
 name = "ntapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -1930,7 +2098,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "num-traits",
 ]
 
@@ -1940,14 +2108,14 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -1955,40 +2123,59 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
+checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
 dependencies = [
- "derivative",
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
+checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[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"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
+checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "okapi"
+version = "0.7.0-rc.1"
+source = "git+https://github.com/insertish/okapi?rev=dcf0df115596ee07a587a7a543cddf3d7944645b#dcf0df115596ee07a587a7a543cddf3d7944645b"
+dependencies = [
+ "log",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "opaque-debug"
@@ -2004,9 +2191,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.36"
+version = "0.10.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -2018,28 +2205,37 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.66"
+version = "0.9.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "cc",
  "libc",
  "pkg-config",
  "vcpkg",
 ]
 
+[[package]]
+name = "optional_struct"
+version = "0.2.0"
+source = "git+https://github.com/insertish/OptionalStruct?rev=e275d2726595474632485934aa0887fa52281f70#e275d2726595474632485934aa0887fa52281f70"
+dependencies = [
+ "quote 0.3.15",
+ "syn 0.11.11",
+]
+
 [[package]]
 name = "os_info"
-version = "3.0.7"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac91020bfed8cc3f8aa450d4c3b5fa1d3373fc091c8a92009f3b27749d5a227"
+checksum = "023df84d545ef479cf67fd2f4459a613585c9db4852c2fad12ab70587859d340"
 dependencies = [
  "log",
  "winapi 0.3.9",
@@ -2059,7 +2255,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.2",
 ]
 
 [[package]]
@@ -2076,6 +2282,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "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"
@@ -2085,6 +2310,15 @@ dependencies = [
  "crypto-mac",
 ]
 
+[[package]]
+name = "pbkdf2"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+dependencies = [
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "pear"
 version = "0.2.3"
@@ -2104,8 +2338,8 @@ checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
 dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -2142,8 +2376,8 @@ dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -2157,68 +2391,24 @@ 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",
- "syn",
-]
-
-[[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"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -2229,9 +2419,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -2241,15 +2431,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "polling"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -2260,15 +2450,25 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+
+[[package]]
+name = "pretty_env_logger"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
+dependencies = [
+ "env_logger",
+ "log",
+]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
  "thiserror",
  "toml",
@@ -2282,8 +2482,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
  "version_check",
 ]
 
@@ -2294,7 +2494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "version_check",
 ]
 
@@ -2304,19 +2504,13 @@ version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.29"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
- "unicode-xid",
+ "unicode-xid 0.2.2",
 ]
 
 [[package]]
@@ -2326,8 +2520,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
  "version_check",
  "yansi",
 ]
@@ -2346,35 +2540,24 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+
+[[package]]
+name = "quote"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "quoted_printable"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1238256b09923649ec89b08104c4dfe9f6cb2fea734a5db5384e44916d59e9c5"
-
-[[package]]
-name = "r2d2"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
-dependencies = [
- "log",
- "parking_lot",
- "scheduled-thread-pool",
-]
-
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+checksum = "3fee2dce59f7a43418e3382c766554c614e06a552d53a8f07ef499ea4b332c0f"
 
 [[package]]
 name = "rand"
@@ -2382,7 +2565,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "libc",
  "rand_chacha 0.1.1",
  "rand_core 0.4.2",
@@ -2411,14 +2594,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -2427,7 +2609,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "rand_core 0.3.1",
 ]
 
@@ -2481,7 +2663,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.6",
 ]
 
 [[package]]
@@ -2502,15 +2684,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -2552,7 +2725,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "rand_core 0.4.2",
 ]
 
@@ -2577,7 +2750,7 @@ dependencies = [
 [[package]]
 name = "rauth"
 version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=157263ffcbd6cb1073e288b215db227634c4c29a#157263ffcbd6cb1073e288b215db227634c4c29a"
+source = "git+https://github.com/insertish/rauth?rev=611b11baa9e199bcefd0ca5bd3302f9d6904a2c6#611b11baa9e199bcefd0ca5bd3302f9d6904a2c6"
 dependencies = [
  "async-std",
  "base32",
@@ -2587,18 +2760,21 @@ dependencies = [
  "json",
  "lazy_static",
  "lettre",
- "mongodb",
+ "mongodb 1.2.5",
  "nanoid",
- "rand 0.8.4",
+ "okapi",
+ "rand 0.8.5",
  "regex",
- "reqwest 0.11.4",
+ "reqwest",
  "rocket",
+ "rocket_okapi",
  "rust-argon2",
+ "schemars",
  "serde",
  "serde_json",
  "totp-lite",
- "ulid",
- "validator 0.14.0",
+ "ulid 0.4.1",
+ "validator",
  "wither",
 ]
 
@@ -2623,20 +2799,20 @@ dependencies = [
  "combine",
  "dtoa",
  "futures-util",
- "itoa",
+ "itoa 0.4.8",
  "percent-encoding",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "sha1",
- "tokio 1.11.0",
- "tokio-util 0.6.8",
+ "tokio 1.18.0",
+ "tokio-util 0.6.9",
  "url",
 ]
 
 [[package]]
 name = "redis"
-version = "0.21.2"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202c5bf92cad3d57605c366e644a7fbf305a83f19754fc66678c6265dcc9b8b4"
+checksum = "1a80b5f38d7f5a020856a0e16e40a9cfabf88ae8f0e4c2dcd8a3114c1e470852"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2644,55 +2820,80 @@ dependencies = [
  "combine",
  "dtoa",
  "futures-util",
- "itoa",
+ "itoa 0.4.8",
  "percent-encoding",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "sha1",
- "tokio 1.11.0",
- "tokio-util 0.6.8",
+ "tokio 1.18.0",
+ "tokio-util 0.6.9",
  "url",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.2.10"
+name = "redis-kiss"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "0d4f2f48fb776a308331c4a1ecb3a7b7b99f4d46c6beb2fc03db2da0f63fcad6"
+dependencies = [
+ "bincode",
+ "lazy_static",
+ "mobc",
+ "mobc-redis",
+ "redis 0.21.5",
+ "rmp-serde",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
+checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
+checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.25"
@@ -2710,55 +2911,19 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.10.10"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
-dependencies = [
- "base64 0.13.0",
- "bytes 0.5.6",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "http",
- "http-body 0.3.1",
- "hyper 0.13.10",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite 0.2.7",
- "rustls 0.18.1",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio 0.2.25",
- "tokio-rustls 0.14.1",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.20.0",
- "winreg 0.7.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.1.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
+ "h2 0.3.13",
  "http",
- "http-body 0.4.3",
- "hyper 0.14.12",
+ "http-body 0.4.4",
+ "hyper 0.14.18",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -2767,17 +2932,17 @@ dependencies = [
  "mime",
  "native-tls",
  "percent-encoding",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.11.0",
+ "tokio 1.18.0",
  "tokio-native-tls",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.7.0",
+ "winreg 0.10.1",
 ]
 
 [[package]]
@@ -2796,41 +2961,78 @@ version = "0.0.0"
 dependencies = [
  "async-channel",
  "async-std",
- "async-tungstenite",
- "base64 0.13.0",
  "bitfield",
  "chrono",
  "ctrlc",
+ "dashmap",
  "dotenv",
  "env_logger",
  "futures",
- "hive_pubsub",
  "impl_ops",
  "lazy_static",
  "lettre",
- "linkify",
+ "linkify 0.6.0",
  "log",
  "lru",
- "many-to-many",
  "mobc",
  "mobc-redis",
- "mongodb",
+ "mongodb 1.2.5",
  "nanoid",
  "num_enum",
  "once_cell",
- "phf",
  "rauth",
- "redis 0.21.2",
+ "redis 0.21.5",
  "regex",
- "reqwest 0.11.4",
- "rmp-serde",
+ "reqwest",
+ "revolt-quark",
  "rocket",
  "rocket_cors",
+ "rocket_okapi",
+ "schemars",
  "serde",
  "serde_json",
- "ulid",
+ "ulid 0.4.1",
  "url",
- "validator 0.11.0",
+ "validator",
+]
+
+[[package]]
+name = "revolt-quark"
+version = "0.1.0"
+source = "git+https://github.com/revoltchat/quark?rev=eafefbcb3c612c8fdc3f052d05ddd9b1a4c5ec1b#eafefbcb3c612c8fdc3f052d05ddd9b1a4c5ec1b"
+dependencies = [
+ "async-recursion",
+ "async-std",
+ "async-trait",
+ "base64 0.13.0",
+ "bincode",
+ "bitfield",
+ "bson 2.2.0",
+ "deadqueue",
+ "dotenv",
+ "futures",
+ "impl_ops",
+ "iso8601-timestamp",
+ "lazy_static",
+ "linkify 0.8.1",
+ "log",
+ "mongodb 2.2.1",
+ "nanoid",
+ "num_enum",
+ "okapi",
+ "optional_struct",
+ "pretty_env_logger",
+ "rauth",
+ "redis-kiss",
+ "regex",
+ "reqwest",
+ "rocket",
+ "rocket_okapi",
+ "schemars",
+ "serde",
+ "serde_json",
+ "ulid 0.5.0",
+ "validator",
  "web-push",
 ]
 
@@ -2851,17 +3053,20 @@ dependencies = [
 
 [[package]]
 name = "rmp"
-version = "0.8.10"
-source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25786b0d276110195fa3d6f3f31299900cf71dfbd6c28450f3f58a0e7f7a347e"
 dependencies = [
  "byteorder",
  "rmp",
@@ -2888,9 +3093,9 @@ dependencies = [
  "memchr",
  "multer",
  "num_cpus",
- "parking_lot",
- "pin-project-lite 0.2.7",
- "rand 0.8.4",
+ "parking_lot 0.11.2",
+ "pin-project-lite 0.2.9",
+ "rand 0.8.5",
  "ref-cast",
  "rocket_codegen",
  "rocket_http",
@@ -2899,9 +3104,9 @@ dependencies = [
  "state",
  "tempfile",
  "time 0.2.27",
- "tokio 1.11.0",
+ "tokio 1.18.0",
  "tokio-stream",
- "tokio-util 0.6.8",
+ "tokio-util 0.6.9",
  "ubyte",
  "version_check",
  "yansi",
@@ -2917,10 +3122,10 @@ dependencies = [
  "glob",
  "indexmap",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "rocket_http",
- "syn",
- "unicode-xid",
+ "syn 1.0.91",
+ "unicode-xid 0.2.2",
 ]
 
 [[package]]
@@ -2947,25 +3152,52 @@ dependencies = [
  "cookie",
  "either",
  "http",
- "hyper 0.14.12",
+ "hyper 0.14.18",
  "indexmap",
  "log",
  "memchr",
  "mime",
- "parking_lot",
+ "parking_lot 0.11.2",
  "pear",
  "percent-encoding",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "ref-cast",
  "serde",
  "smallvec",
  "stable-pattern",
  "state",
  "time 0.2.27",
- "tokio 1.11.0",
+ "tokio 1.18.0",
  "uncased",
 ]
 
+[[package]]
+name = "rocket_okapi"
+version = "0.8.0-rc.1"
+source = "git+https://github.com/insertish/okapi?rev=dcf0df115596ee07a587a7a543cddf3d7944645b#dcf0df115596ee07a587a7a543cddf3d7944645b"
+dependencies = [
+ "either",
+ "log",
+ "okapi",
+ "rocket",
+ "rocket_okapi_codegen",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rocket_okapi_codegen"
+version = "0.8.0-rc.1"
+source = "git+https://github.com/insertish/okapi?rev=dcf0df115596ee07a587a7a543cddf3d7944645b#dcf0df115596ee07a587a7a543cddf3d7944645b"
+dependencies = [
+ "darling 0.13.4",
+ "proc-macro2",
+ "quote 1.0.18",
+ "rocket_http",
+ "syn 1.0.91",
+]
+
 [[package]]
 name = "rust-argon2"
 version = "0.8.3"
@@ -2993,6 +3225,16 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustc_version_runtime"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
+dependencies = [
+ "rustc_version",
+ "semver",
+]
+
 [[package]]
 name = "rustls"
 version = "0.17.0"
@@ -3002,34 +3244,51 @@ dependencies = [
  "base64 0.11.0",
  "log",
  "ring",
- "sct",
- "webpki",
+ "sct 0.6.1",
+ "webpki 0.21.4",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.18.1"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
+checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
 dependencies = [
- "base64 0.12.3",
  "log",
  "ring",
- "sct",
- "webpki",
+ "sct 0.7.0",
+ "webpki 0.22.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
+dependencies = [
+ "base64 0.13.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
 [[package]]
 name = "safemem"
@@ -3048,12 +3307,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "scheduled-thread-pool"
-version = "0.2.5"
+name = "schemars"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
+checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3"
 dependencies = [
- "parking_lot",
+ "dyn-clone",
+ "indexmap",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "serde_derive_internals",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -3079,10 +3354,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "security-framework"
-version = "2.4.2"
+name = "sct"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -3093,9 +3378,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.4.2"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3118,9 +3403,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
@@ -3136,44 +3421,55 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.68"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
  "indexmap",
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_with"
-version = "1.10.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062b87e45d8f26714eacfaef0ed9a583e2bfd50ebd96bdd3c200733bd5758e2c"
+checksum = "b827f2113224f3f19a665136f006709194bdfdcb1fdc1e4b2b5cbac8e0cced54"
 dependencies = [
  "rustversion",
  "serde",
@@ -3182,14 +3478,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c1fcca18d55d1763e1c16873c4bde0ac3ef75179a28c7b372917e0494625be"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
- "darling 0.13.0",
+ "darling 0.13.4",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -3218,16 +3514,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha1"
-version = "0.6.0"
+name = "sha-1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
@@ -3237,10 +3553,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "signal-hook"
-version = "0.3.10"
+name = "sha2"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -3255,23 +3591,17 @@ 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"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
@@ -3286,9 +3616,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -3302,9 +3632,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
+checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
 
 [[package]]
 name = "stable-pattern"
@@ -3354,10 +3684,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "serde",
  "serde_derive",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -3368,12 +3698,12 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -3412,25 +3742,45 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.76"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
+checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+dependencies = [
+ "quote 0.3.15",
+ "synom",
+ "unicode-xid 0.0.4",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
  "proc-macro2",
- "quote",
- "unicode-xid",
+ "quote 1.0.18",
+ "unicode-xid 0.2.2",
+]
+
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+dependencies = [
+ "unicode-xid 0.0.4",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.12.5"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
+ "quote 1.0.18",
+ "syn 1.0.91",
+ "unicode-xid 0.2.2",
 ]
 
 [[package]]
@@ -3439,21 +3789,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.8.4",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -3461,31 +3805,40 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+dependencies = [
+ "once_cell",
 ]
 
 [[package]]
@@ -3509,11 +3862,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"
@@ -3524,6 +3888,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"
@@ -3532,16 +3902,16 @@ checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "standback",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3565,7 +3935,6 @@ dependencies = [
  "lazy_static",
  "memchr",
  "mio 0.6.23",
- "num_cpus",
  "pin-project-lite 0.1.12",
  "slab",
  "tokio-macros 0.2.6",
@@ -3573,20 +3942,20 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.11.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
+checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b"
 dependencies = [
- "autocfg 1.0.1",
  "bytes 1.1.0",
  "libc",
  "memchr",
- "mio 0.7.13",
+ "mio 0.8.2",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
  "signal-hook-registry",
- "tokio-macros 1.3.0",
+ "socket2 0.4.4",
+ "tokio-macros 1.7.0",
  "winapi 0.3.9",
 ]
 
@@ -3597,19 +3966,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -3619,7 +3988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.11.0",
+ "tokio 1.18.0",
 ]
 
 [[package]]
@@ -3631,30 +4000,29 @@ dependencies = [
  "futures-core",
  "rustls 0.17.0",
  "tokio 0.2.25",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.14.1"
+version = "0.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
+checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e"
 dependencies = [
- "futures-core",
- "rustls 0.18.1",
- "tokio 0.2.25",
- "webpki",
+ "rustls 0.20.4",
+ "tokio 1.18.0",
+ "webpki 0.22.0",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "pin-project-lite 0.2.9",
+ "tokio 1.18.0",
 ]
 
 [[package]]
@@ -3683,23 +4051,38 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
  "bytes 1.1.0",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "pin-project-lite 0.2.9",
+ "tokio 1.18.0",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+dependencies = [
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "pin-project-lite 0.2.9",
+ "tokio 1.18.0",
+ "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
  "serde",
 ]
@@ -3711,9 +4094,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b18009e8be74bfb2e2cc59a63d078d95c042858a1ca1128a294e1f9ce225148b"
 dependencies = [
  "digest 0.9.0",
- "hmac",
+ "hmac 0.11.0",
  "sha-1 0.9.8",
- "sha2",
+ "sha2 0.9.9",
 ]
 
 [[package]]
@@ -3724,23 +4107,36 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.27"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ba9ab62b7d6497a8638dfda5e5c4fb3b2d5a7fca4118f2b96151c8ef1a437e"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.9",
+ "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
-name = "tracing-core"
-version = "0.1.20"
+name = "tracing-attributes"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf"
+checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
+ "valuable",
 ]
 
 [[package]]
@@ -3753,6 +4149,35 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+dependencies = [
+ "ansi_term",
+ "lazy_static",
+ "matchers",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.19.7"
@@ -3762,7 +4187,7 @@ dependencies = [
  "async-trait",
  "backtrace",
  "cfg-if 1.0.0",
- "enum-as-inner",
+ "enum-as-inner 0.3.4",
  "futures",
  "idna",
  "lazy_static",
@@ -3774,6 +4199,31 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "trust-dns-proto"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+dependencies = [
+ "async-trait",
+ "cfg-if 1.0.0",
+ "data-encoding",
+ "enum-as-inner 0.4.0",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "lazy_static",
+ "log",
+ "rand 0.8.5",
+ "smallvec",
+ "thiserror",
+ "tinyvec",
+ "tokio 1.18.0",
+ "url",
+]
+
 [[package]]
 name = "trust-dns-resolver"
 version = "0.19.7"
@@ -3782,7 +4232,7 @@ checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb"
 dependencies = [
  "cfg-if 0.1.10",
  "futures",
- "ipconfig",
+ "ipconfig 0.2.2",
  "lazy_static",
  "log",
  "lru-cache",
@@ -3790,7 +4240,27 @@ dependencies = [
  "smallvec",
  "thiserror",
  "tokio 0.2.25",
- "trust-dns-proto",
+ "trust-dns-proto 0.19.7",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+dependencies = [
+ "cfg-if 1.0.0",
+ "futures-util",
+ "ipconfig 0.3.0",
+ "lazy_static",
+ "log",
+ "lru-cache",
+ "parking_lot 0.12.0",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tokio 1.18.0",
+ "trust-dns-proto 0.21.2",
 ]
 
 [[package]]
@@ -3799,35 +4269,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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47"
-dependencies = [
- "memchr",
- "unchecked-index",
-]
-
 [[package]]
 name = "typed-builder"
 version = "0.4.1"
@@ -3835,15 +4276,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc955f27acc7a547f328f52f4a5a568986a31efec2fc6de865279f3995787b9"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
+]
+
+[[package]]
+name = "typed-builder"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.91",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "ubyte"
@@ -3871,6 +4323,16 @@ dependencies = [
  "rand 0.6.5",
 ]
 
+[[package]]
+name = "ulid"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "220b18413e1fe5e85a5580b22f44241f82404a66c792c9f3c9eda74c52d9a22e"
+dependencies = [
+ "chrono",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "uncased"
 version = "0.9.6"
@@ -3881,12 +4343,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "unchecked-index"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
-
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -3908,9 +4364,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-normalization"
@@ -3922,10 +4378,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
+name = "unicode-xid"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 
 [[package]]
 name = "unicode-xid"
@@ -3957,36 +4413,14 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.3",
-]
-
-[[package]]
-name = "validator"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4effc922f18d14f3daf201b1d13c61e5ef62f5975e7d18df381f67badd76cfcd"
-dependencies = [
- "idna",
- "lazy_static",
- "regex",
+ "getrandom 0.2.6",
  "serde",
- "serde_derive",
- "serde_json",
- "url",
- "validator_derive",
- "validator_types 0.11.0",
 ]
 
 [[package]]
@@ -4002,31 +4436,26 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "url",
- "validator_types 0.14.0",
+ "validator_derive",
+ "validator_types",
 ]
 
 [[package]]
 name = "validator_derive"
-version = "0.11.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15529099583e8ce2b070ab6a637454a1b42c7146e6daee4a6817a82bee33bd41"
+checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee"
 dependencies = [
  "if_chain",
  "lazy_static",
  "proc-macro-error",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "regex",
- "syn",
- "validator_types 0.11.0",
+ "syn 1.0.91",
+ "validator_types",
 ]
 
-[[package]]
-name = "validator_types"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add324da7950ac1f76b1c16ce8b5406147953d5d6a2ac1c5da93785f2cfc738b"
-
 [[package]]
 name = "validator_types"
 version = "0.14.0"
@@ -4034,14 +4463,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
 dependencies = [
  "proc-macro2",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
-name = "value-bag"
-version = "1.0.0-alpha.7"
+name = "valuable"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f"
 dependencies = [
  "ctor",
  "version_check",
@@ -4055,9 +4490,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
@@ -4088,37 +4523,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.78"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
 dependencies = [
  "bumpalo",
  "lazy_static",
  "log",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -4128,32 +4567,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
- "quote",
+ "quote 1.0.18",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.18",
+ "syn 1.0.91",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "web-push"
@@ -4182,9 +4621,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4201,12 +4640,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.20.0"
+name = "webpki"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
 dependencies = [
- "webpki",
+ "ring",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -4215,7 +4655,16 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+dependencies = [
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -4233,6 +4682,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -4276,6 +4731,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
+
 [[package]]
 name = "winreg"
 version = "0.6.2"
@@ -4294,35 +4792,44 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "wither"
 version = "0.9.0"
-source = "git+https://github.com/insertish/wither?branch=master#25226946ff9a2cafac390968b317df83eaafe31f"
+source = "git+https://github.com/insertish/wither?rev=25226946ff9a2cafac390968b317df83eaafe31f#25226946ff9a2cafac390968b317df83eaafe31f"
 dependencies = [
  "async-trait",
  "chrono",
  "futures",
  "log",
- "mongodb",
+ "mongodb 1.2.5",
  "serde",
  "thiserror",
- "ulid",
+ "ulid 0.4.1",
  "wither_derive",
 ]
 
 [[package]]
 name = "wither_derive"
 version = "0.9.0"
-source = "git+https://github.com/insertish/wither?branch=master#25226946ff9a2cafac390968b317df83eaafe31f"
+source = "git+https://github.com/insertish/wither?rev=25226946ff9a2cafac390968b317df83eaafe31f#25226946ff9a2cafac390968b317df83eaafe31f"
 dependencies = [
  "Inflector",
  "async-trait",
  "darling 0.10.2",
  "proc-macro-error",
  "proc-macro2",
- "quote",
+ "quote 1.0.18",
  "serde",
- "syn",
+ "syn 1.0.91",
 ]
 
 [[package]]
@@ -4335,14 +4842,8 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
-
 [[package]]
 name = "yansi"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
diff --git a/Cargo.toml b/Cargo.toml
index 749a9b82..0be529ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ lru = "0.7.0"
 url = "2.2.2"
 log = "0.4.11"
 dotenv = "0.15.0"
+dashmap = "5.2.0"
 linkify = "0.6.0"
 once_cell = "1.4.1"
 env_logger = "0.7.1"
@@ -26,18 +27,15 @@ 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"
 nanoid = "0.4.0"
-base64 = "0.13.0"
 
 # serde
 serde_json = "1.0.57"
 serde = { version = "1.0.115", features = ["derive"] }
-validator = { version = "0.11", features = ["derive"] }
-rmp-serde = { git = "https://github.com/insertish/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
+validator = { version = "0.14", features = ["derive"] }
 
 # async
 futures = "0.3.8"
@@ -47,11 +45,8 @@ 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 = "157263ffcbd6cb1073e288b215db227634c4c29a" }
-hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf", features = ["redis-backend"] }
+rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
 
 # redis
 redis = { version = "0.21.2", features = ["async-std-comp"] }
@@ -59,7 +54,15 @@ 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 = ["tokio-runtime"], default-features = false }
+mongodb = { version = "1.2.2", features = ["async-std-runtime"], default-features = false }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
+
+# spec generation
+schemars = "0.8.8"
+# rocket_okapi = "0.8.0-rc.1"
+rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "dcf0df115596ee07a587a7a543cddf3d7944645b", features = [ "swagger" ] }
+
+# quark
+revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "eafefbcb3c612c8fdc3f052d05ddd9b1a4c5ec1b" }
+# revolt-quark = { path = "../quark" }
diff --git a/Dockerfile b/Dockerfile
index fb133234..1db63a9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,10 @@ WORKDIR /home/rust/src
 
 RUN USER=root cargo new --bin revolt
 WORKDIR /home/rust/src/revolt
-COPY Cargo.toml Cargo.lock ./
-COPY src/bin/dummy.rs ./src/bin/dummy.rs
-RUN apt-get update && apt-get install -y libssl-dev pkg-config && cargo build --release --bin dummy
+RUN apt-get update && apt-get install -y libssl-dev pkg-config
 
-COPY assets/templates ./assets/templates
+COPY Cargo.toml Cargo.lock ./
+COPY assets ./assets
 COPY src ./src
 RUN cargo install --locked --path .
 
@@ -17,9 +16,7 @@ RUN cargo install --locked --path .
 FROM debian:buster-slim
 RUN apt-get update && apt-get install -y ca-certificates
 COPY --from=builder /usr/local/cargo/bin/revolt ./
-COPY assets ./assets
 EXPOSE 8000
-EXPOSE 9000
 ENV ROCKET_ADDRESS 0.0.0.0
 ENV ROCKET_PORT 8000
 CMD ["./revolt"]
diff --git a/LICENSE b/LICENSE
index ad4d11ee..8bd70cb8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,178 +1,178 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
+The GNU Affero General Public License is a free, copyleft license for
 software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
 our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
+Developers that use our General Public Licenses protect your rights
 with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
 
-  A secondary benefit of defending all users' freedom is that
+A secondary benefit of defending all users' freedom is that
 improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
 
-  The GNU Affero General Public License is designed specifically to
+The GNU Affero General Public License is designed specifically to
 ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
+to the community. It requires the operator of a network server to
 provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
+users of that server. Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
 a different license, not a version of the Affero GPL, but Affero has
 released a new version of the Affero GPL which permits relicensing under
 this license.
 
-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.
 
                        TERMS AND CONDITIONS
 
-  0. Definitions.
+0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+"This License" refers to version 3 of the GNU Affero General Public License.
 
-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
 
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.
 
-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
 
-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.
 
-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
 
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
 
-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
 
-  1. Source Code.
+1. Source Code.
 
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
 form of a work.
 
-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
 
-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
 
-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
 
-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
 
-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.
 
-  2. Basic Permissions.
+2. Basic Permissions.
 
-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
 
-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
 
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.
 
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
 
-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@@ -180,9 +180,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
 
-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.
 
-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@@ -190,12 +190,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
 
-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
 
-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.
 
-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
 
@@ -220,19 +220,19 @@ terms of section 4, provided that you also meet all of these conditions:
     interfaces that do not display Appropriate Legal Notices, your
     work need not make them do so.
 
-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
 
-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.
 
-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@@ -278,75 +278,75 @@ in one of these ways:
     Source of the work are being offered to the general public at no
     charge under subsection 6d.
 
-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
 
-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
 
-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
 
-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
 
-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
 
-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
 
-  7. Additional Terms.
+7. Additional Terms.
 
-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
 
-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
 
-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
 
@@ -373,74 +373,74 @@ that material) supplement the terms of this License with terms:
     any liability that these contractual assumptions directly impose on
     those licensors and authors.
 
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
 
-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
 
-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
 
-  8. Termination.
+8. Termination.
 
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
 
-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
 
-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
 
-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
 
-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.
 
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
 
-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.
 
-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.
 
-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@@ -448,43 +448,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
 
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
 
-  11. Patents.
+11. Patents.
 
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".
 
-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
 
-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
 
-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@@ -492,13 +492,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
 
-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@@ -506,10 +506,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
 
-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@@ -521,83 +521,83 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
 
-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
 
-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.
 
-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
+13. Remote Network Interaction; Use with the GNU General Public License.
 
-  Notwithstanding any other provision of this License, if you modify the
+Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
+means of facilitating copying of software. This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
 
-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the work with which it is combined will remain governed by version
 3 of the GNU General Public License.
 
-  14. Revised Versions of this License.
+14. Revised Versions of this License.
 
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
 will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
 
-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.
 
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-  16. Limitation of Liability.
+16. Limitation of Liability.
 
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@@ -607,9 +607,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
 
-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.
 
-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@@ -620,17 +620,17 @@ copy of the Program in return for a fee.
 
             How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Server
-    Copyright (C) 2021  REVOLT
+    Revolt Delta
+    Copyright (C) 2022 Pawel Makles
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published
@@ -647,15 +647,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
+If your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
+get its source. For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
+of the code. There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
 
-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
index 249a2c39..d6e2cbdb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-Delta is a blazing fast API server built with Rust for Revolt.
+Delta is the API server for the Revolt platform.
 
 **Features:**
 
diff --git a/assets/user/1.png b/assets/user/1.png
new file mode 100644
index 00000000..88d2e28b
Binary files /dev/null and b/assets/user/1.png differ
diff --git a/assets/user/2.png b/assets/user/2.png
new file mode 100644
index 00000000..dd0d2967
Binary files /dev/null and b/assets/user/2.png differ
diff --git a/assets/user/3.png b/assets/user/3.png
new file mode 100644
index 00000000..c40c1291
Binary files /dev/null and b/assets/user/3.png differ
diff --git a/assets/user/4.png b/assets/user/4.png
new file mode 100644
index 00000000..6db7af60
Binary files /dev/null and b/assets/user/4.png differ
diff --git a/assets/user/5.png b/assets/user/5.png
new file mode 100644
index 00000000..9f32511c
Binary files /dev/null and b/assets/user/5.png differ
diff --git a/assets/user/6.png b/assets/user/6.png
new file mode 100644
index 00000000..533f920d
Binary files /dev/null and b/assets/user/6.png differ
diff --git a/assets/user/7.png b/assets/user/7.png
new file mode 100644
index 00000000..7d9ffd0e
Binary files /dev/null and b/assets/user/7.png differ
diff --git a/assets/user_blue.png b/assets/user_blue.png
deleted file mode 100644
index 2806b7d2..00000000
Binary files a/assets/user_blue.png and /dev/null differ
diff --git a/assets/user_green.png b/assets/user_green.png
deleted file mode 100644
index 0e531e07..00000000
Binary files a/assets/user_green.png and /dev/null differ
diff --git a/assets/user_red.png b/assets/user_red.png
deleted file mode 100644
index 46e62cce..00000000
Binary files a/assets/user_red.png and /dev/null differ
diff --git a/assets/user_yellow.png b/assets/user_yellow.png
deleted file mode 100644
index 7b8daaab..00000000
Binary files a/assets/user_yellow.png and /dev/null differ
diff --git a/deny.toml b/deny.toml
new file mode 100644
index 00000000..3bfd2858
--- /dev/null
+++ b/deny.toml
@@ -0,0 +1,210 @@
+# This template contains all of the possible sections and their default values
+
+# Note that all fields that take a lint level have these possible values:
+# * deny - An error will be produced and the check will fail
+# * warn - A warning will be produced, but the check will not fail
+# * allow - No warning or error will be produced, though in some cases a note
+# will be
+
+# The values provided in this template are the default values that will be used
+# when any section or field is not specified in your own configuration
+
+# If 1 or more target triples (and optionally, target_features) are specified,
+# only the specified targets will be checked when running `cargo deny check`.
+# This means, if a particular package is only ever used as a target specific
+# dependency, such as, for example, the `nix` crate only being used via the
+# `target_family = "unix"` configuration, that only having windows targets in
+# this list would mean the nix crate, as well as any of its exclusive
+# dependencies not shared by any other crates, would be ignored, as the target
+# list here is effectively saying which targets you are building for.
+targets = [
+    # The triple can be any string, but only the target triples built in to
+    # rustc (as of 1.40) can be checked against actual config expressions
+    #{ triple = "x86_64-unknown-linux-musl" },
+    # You can also specify which target_features you promise are enabled for a
+    # particular target. target_features are currently not validated against
+    # the actual valid features supported by the target architecture.
+    #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
+]
+
+# This section is considered when running `cargo deny check advisories`
+# More documentation for the advisories section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
+[advisories]
+# The path where the advisory database is cloned/fetched into
+db-path = "~/.cargo/advisory-db"
+# The url(s) of the advisory databases to use
+db-urls = ["https://github.com/rustsec/advisory-db"]
+# The lint level for security vulnerabilities
+vulnerability = "deny"
+# The lint level for unmaintained crates
+unmaintained = "warn"
+# The lint level for crates that have been yanked from their source registry
+yanked = "warn"
+# The lint level for crates with security notices. Note that as of
+# 2019-12-17 there are no security notice advisories in
+# https://github.com/rustsec/advisory-db
+notice = "warn"
+# A list of advisory IDs to ignore. Note that ignored advisories will still
+# output a note when they are encountered.
+ignore = [
+    #"RUSTSEC-0000-0000",
+]
+# Threshold for security vulnerabilities, any vulnerability with a CVSS score
+# lower than the range specified will be ignored. Note that ignored advisories
+# will still output a note when they are encountered.
+# * None - CVSS Score 0.0
+# * Low - CVSS Score 0.1 - 3.9
+# * Medium - CVSS Score 4.0 - 6.9
+# * High - CVSS Score 7.0 - 8.9
+# * Critical - CVSS Score 9.0 - 10.0
+#severity-threshold =
+
+# This section is considered when running `cargo deny check licenses`
+# More documentation for the licenses section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
+[licenses]
+# The lint level for crates which do not have a detectable license
+unlicensed = "warn"
+# List of explicitly allowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+allow = [
+    "MIT",
+    "ISC",
+    "0BSD",
+    "CC0-1.0",
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    #"Apache-2.0 WITH LLVM-exception",
+]
+# List of explicitly disallowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+deny = [
+    #"Nokia",
+]
+# Lint level for licenses considered copyleft
+copyleft = "warn"
+# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
+# * both - The license will be approved if it is both OSI-approved *AND* FSF
+# * either - The license will be approved if it is either OSI-approved *OR* FSF
+# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
+# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
+# * neither - This predicate is ignored and the default lint level is used
+allow-osi-fsf-free = "neither"
+# Lint level used when no other predicates are matched
+# 1. License isn't in the allow or deny lists
+# 2. License isn't copyleft
+# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
+default = "deny"
+# The confidence threshold for detecting a license from license text.
+# The higher the value, the more closely the license text must be to the
+# canonical license text of a valid SPDX license file.
+# [possible values: any between 0.0 and 1.0].
+confidence-threshold = 0.8
+# Allow 1 or more licenses on a per-crate basis, so that particular licenses
+# aren't accepted for every possible crate as with the normal allow list
+exceptions = [
+    # Each entry is the crate and version constraint, and its specific allow
+    # list
+    #{ allow = ["Zlib"], name = "adler32", version = "*" },
+]
+
+# Some crates don't have (easily) machine readable licensing information,
+# adding a clarification entry for it allows you to manually specify the
+# licensing information
+#[[licenses.clarify]]
+# The name of the crate the clarification applies to
+#name = "ring"
+# The optional version constraint for the crate
+#version = "*"
+# The SPDX expression for the license requirements of the crate
+#expression = "MIT AND ISC AND OpenSSL"
+# One or more files in the crate's source used as the "source of truth" for
+# the license expression. If the contents match, the clarification will be used
+# when running the license check, otherwise the clarification will be ignored
+# and the crate will be checked normally, which may produce warnings or errors
+# depending on the rest of your configuration
+#license-files = [
+    # Each entry is a crate relative path, and the (opaque) hash of its contents
+    #{ path = "LICENSE", hash = 0xbd0eed23 }
+#]
+
+[licenses.private]
+# If true, ignores workspace crates that aren't published, or are only
+# published to private registries.
+# To see how to mark a crate as unpublished (to the official registry),
+# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
+ignore = false
+# One or more private registries that you might publish crates to, if a crate
+# is only published to private registries, and ignore is true, the crate will
+# not have its license(s) checked
+registries = [
+    #"https://sekretz.com/registry
+]
+
+# This section is considered when running `cargo deny check bans`.
+# More documentation about the 'bans' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
+[bans]
+# Lint level for when multiple versions of the same crate are detected
+multiple-versions = "warn"
+# Lint level for when a crate version requirement is `*`
+wildcards = "allow"
+# The graph highlighting used when creating dotgraphs for crates
+# with multiple versions
+# * lowest-version - The path to the lowest versioned duplicate is highlighted
+# * simplest-path - The path to the version with the fewest edges is highlighted
+# * all - Both lowest-version and simplest-path are used
+highlight = "all"
+# List of crates that are allowed. Use with care!
+allow = [
+    #{ name = "ansi_term", version = "=0.11.0" },
+]
+# List of crates to deny
+deny = [
+    # Each entry the name of a crate and a version range. If version is
+    # not specified, all versions will be matched.
+    #{ name = "ansi_term", version = "=0.11.0" },
+    #
+    # Wrapper crates can optionally be specified to allow the crate when it
+    # is a direct dependency of the otherwise banned crate
+    #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+]
+# Certain crates/versions that will be skipped when doing duplicate detection.
+skip = [
+    #{ name = "ansi_term", version = "=0.11.0" },
+]
+# Similarly to `skip` allows you to skip certain crates during duplicate
+# detection. Unlike skip, it also includes the entire tree of transitive
+# dependencies starting at the specified crate, up to a certain depth, which is
+# by default infinite
+skip-tree = [
+    #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
+]
+
+# This section is considered when running `cargo deny check sources`.
+# More documentation about the 'sources' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
+[sources]
+# Lint level for what to happen when a crate from a crate registry that is not
+# in the allow list is encountered
+unknown-registry = "warn"
+# Lint level for what to happen when a crate from a git repository that is not
+# in the allow list is encountered
+unknown-git = "warn"
+# List of URLs for allowed crate registries. Defaults to the crates.io index
+# if not specified. If it is specified but empty, no registries are allowed.
+allow-registry = ["https://github.com/rust-lang/crates.io-index"]
+# List of URLs for allowed Git repositories
+allow-git = ["https://gitlab.insrt.uk/insert/hive"]
+
+[sources.allow-org]
+# 1 or more github.com organizations to allow git sources for
+github = ["insertish"]
+# 1 or more gitlab.com organizations to allow git sources for
+gitlab = []
+# 1 or more bitbucket.org organizations to allow git sources for
+bitbucket = [""]
diff --git a/docker-compose.yml b/docker-compose.yml
index 499db3c7..f2b9fcf4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,5 +14,4 @@ services:
       - REVOLT_UNSAFE_NO_CAPTCHA=1
     ports:
       - "8000:8000"
-      - "9000:9000"
     restart: unless-stopped
diff --git a/set_version.sh b/set_version.sh
index df2f4415..fad28050 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.3-alpha.16
+export version=0.5.3
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/bin/dummy.rs b/src/bin/dummy.rs
deleted file mode 100644
index f328e4d9..00000000
--- a/src/bin/dummy.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() {}
diff --git a/src/database/entities/bots.rs b/src/database/entities/bots.rs
deleted file mode 100644
index d507615a..00000000
--- a/src/database/entities/bots.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use serde::{Serialize, Deserialize};
-
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Bot {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub owner: String,
-    pub token: String,
-    pub public: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub analytics: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub discoverable: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub interactions_url: Option<String>,
-}
diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs
deleted file mode 100644
index b44659f3..00000000
--- a/src/database/entities/channel.rs
+++ /dev/null
@@ -1,392 +0,0 @@
-use std::collections::HashMap;
-
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_GROUP_SIZE;
-use futures::StreamExt;
-use mongodb::bson::Bson;
-use mongodb::{
-    bson::{doc, to_document, Document},
-    options::FindOptions,
-};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "channel_type")]
-pub enum Channel {
-    SavedMessages {
-        #[serde(rename = "_id")]
-        id: String,
-        user: String,
-    },
-    DirectMessage {
-        #[serde(rename = "_id")]
-        id: String,
-
-        active: bool,
-        recipients: Vec<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-    },
-    Group {
-        #[serde(rename = "_id")]
-        id: String,
-
-        name: String,
-        owner: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-        recipients: Vec<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        permissions: Option<i32>,
-
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-   },
-    TextChannel {
-        #[serde(rename = "_id")]
-        id: String,
-        server: String,
-
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        default_permissions: Option<i32>,
-        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-        role_permissions: HashMap<String, i32>,
-        
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-    },
-    VoiceChannel {
-        #[serde(rename = "_id")]
-        id: String,
-        server: String,
-
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        default_permissions: Option<i32>,
-        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-        role_permissions: HashMap<String, i32>,
-
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-    },
-}
-
-impl Channel {
-    pub fn id(&self) -> &str {
-        match self {
-            Channel::SavedMessages { id, .. }
-            | Channel::DirectMessage { id, .. }
-            | Channel::Group { id, .. }
-            | Channel::TextChannel { id, .. }
-            | Channel::VoiceChannel { id, .. } => id,
-        }
-    }
-    pub fn has_messaging(&self) -> Result<()> {
-        match self {
-            Channel::SavedMessages { .. }
-            | Channel::DirectMessage { .. }
-            | Channel::Group { .. }
-            | Channel::TextChannel { .. } => Ok(()),
-            Channel::VoiceChannel { .. } => Err(Error::InvalidOperation)
-        }
-    }
-
-    pub async fn publish(self) -> Result<()> {
-        get_collection("channels")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "channel",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "channel",
-            })?;
-
-        let channel_id = self.id().to_string();
-        ClientboundNotification::ChannelCreate(self).publish(channel_id);
-
-        Ok(())
-    }
-
-    pub async fn publish_update(&self, data: Value) -> Result<()> {
-        let id = self.id().to_string();
-        ClientboundNotification::ChannelUpdate {
-            id: id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(id);
-
-        Ok(())
-    }
-
-    pub async fn delete_associated_objects(id: Bson) -> Result<()> {
-        get_collection("channel_invites")
-            .delete_many(
-                doc! {
-                    "channel": id
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channel_invites",
-            })
-    }
-
-    pub async fn delete_messages(id: Bson) -> Result<()> {
-        let messages = get_collection("messages");
-
-        // Delete any unreads.
-        get_collection("channel_unreads")
-            .delete_many(
-                doc! {
-                    "_id.channel": &id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channel_unreads",
-            })?;
-
-        // Check if there are any attachments we need to delete.
-        let message_ids = messages
-            .find(
-                doc! {
-                    "channel": &id,
-                    "attachment": {
-                        "$exists": 1
-                    }
-                },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "fetch_many",
-                with: "messages",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| x.get_str("_id").ok().map(|x| x.to_string()))
-            .collect::<Vec<String>>();
-
-        // If we found any, mark them as deleted.
-        if message_ids.len() > 0 {
-            get_collection("attachments")
-                .update_many(
-                    doc! {
-                        "message_id": {
-                            "$in": message_ids
-                        }
-                    },
-                    doc! {
-                        "$set": {
-                            "deleted": true
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_many",
-                    with: "attachments",
-                })?;
-        }
-
-        // And then delete said messages.
-        messages
-            .delete_many(
-                doc! {
-                    "channel": id
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "messages",
-            })
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        let id = self.id();
-
-        // Delete any invites.
-        Channel::delete_associated_objects(Bson::String(id.to_string())).await?;
-
-        // Delete messages.
-        match &self {
-            Channel::VoiceChannel { .. } => {},
-            _ => {
-                Channel::delete_messages(Bson::String(id.to_string())).await?;
-            }
-        }
-
-        // Remove from server object.
-        match &self {
-            Channel::TextChannel { server, .. }
-            | Channel::VoiceChannel { server, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-                let mut update = doc! {
-                    "$pull": {
-                        "channels": id
-                    }
-                };
-
-                if let Some(sys) = &server.system_messages {
-                    let mut unset = doc! {};
-
-                    if let Some(cid) = &sys.user_joined {
-                        if id == cid {
-                            unset.insert("system_messages.user_joined", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_left {
-                        if id == cid {
-                            unset.insert("system_messages.user_left", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_kicked {
-                        if id == cid {
-                            unset.insert("system_messages.user_kicked", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_banned {
-                        if id == cid {
-                            unset.insert("system_messages.user_banned", 1);
-                        }
-                    }
-
-                    if unset.len() > 0 {
-                        update.insert("$unset", unset);
-                    }
-                }
-
-                get_collection("servers")
-                    .update_one(
-                        doc! {
-                            "_id": server.id
-                        },
-                        update,
-                        None,
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "servers",
-                    })?;
-            },
-            _ => {}
-        }
-
-        // Finally, delete the channel object.
-        get_collection("channels")
-            .delete_one(
-                doc! {
-                    "_id": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelDelete { id: id.to_string() }.publish(id.to_string());
-
-        if let Channel::Group { icon, .. } = self {
-            if let Some(attachment) = icon {
-                attachment.delete().await?;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn add_to_group(&self, member: String, by_user: String) -> Result<()> {
-        if let Channel::Group { id, recipients, .. } = &self {
-            if recipients.len() >= *MAX_GROUP_SIZE {
-                Err(Error::GroupTooLarge {
-                    max: *MAX_GROUP_SIZE,
-                })?
-            }
-
-            if recipients.iter().find(|x| *x == &member).is_some() {
-                Err(Error::AlreadyInGroup)?
-            }
-
-            get_collection("channels")
-                .update_one(
-                    doc! {
-                        "_id": &id
-                    },
-                    doc! {
-                        "$push": {
-                            "recipients": &member
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "channel",
-                })?;
-
-            ClientboundNotification::ChannelGroupJoin {
-                id: id.clone(),
-                user: member.clone(),
-            }
-            .publish(id.clone());
-
-            Content::SystemMessage(SystemMessage::UserAdded {
-                id: member,
-                by: by_user,
-            })
-            .send_as_system(&self)
-            .await
-            .ok();
-            Ok(())
-        } else {
-            Err(Error::InvalidOperation)
-        }
-    }
-}
diff --git a/src/database/entities/invites.rs b/src/database/entities/invites.rs
deleted file mode 100644
index 9d3cfecb..00000000
--- a/src/database/entities/invites.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use mongodb::bson::doc;
-use mongodb::bson::from_document;
-use mongodb::bson::to_document;
-use serde::{Deserialize, Serialize};
-
-use crate::database::get_collection;
-use crate::util::result::Error;
-use crate::util::result::Result;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Invite {
-    Server {
-        #[serde(rename = "_id")]
-        code: String,
-        server: String,
-        creator: String,
-        channel: String,
-    },
-    Group {
-        #[serde(rename = "_id")]
-        code: String,
-        creator: String,
-        channel: String,
-    }, /* User {
-           code: String,
-           user: String
-       } */
-}
-
-impl Invite {
-    pub fn code(&self) -> &String {
-        match &self {
-            Invite::Server { code, .. } => code,
-            Invite::Group { code, .. } => code,
-        }
-    }
-
-    pub fn creator(&self) -> &String {
-        match &self {
-            Invite::Server { creator, .. } => creator,
-            Invite::Group { creator, .. } => creator,
-        }
-    }
-
-    pub async fn get(code: &str) -> Result<Invite> {
-        let doc = get_collection("channel_invites")
-            .find_one(doc! { "_id": code }, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "invite",
-            })?
-            .ok_or_else(|| Error::UnknownServer)?;
-
-        from_document::<Invite>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: "invite",
-        })
-    }
-
-    pub async fn save(self) -> Result<()> {
-        get_collection("channel_invites")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "invite",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "invite",
-            })?;
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        get_collection("channel_invites")
-            .delete_one(
-                doc! {
-                    "_id": self.code()
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "invite",
-            })?;
-
-        Ok(())
-    }
-}
diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs
deleted file mode 100644
index 74a2585a..00000000
--- a/src/database/entities/message.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-use crate::util::variables::{USE_JANUARY, PUBLIC_URL, APP_URL};
-use crate::{
-    database::*,
-    notifications::{events::ClientboundNotification, websocket::is_online},
-    util::result::{Error, Result},
-};
-
-use mongodb::bson::{doc, to_bson, DateTime};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
-use validator::Validate;
-use std::collections::HashSet;
-use std::time::SystemTime;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct PushNotification {
-    pub author: String,
-    pub icon: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub image: Option<String>,
-    pub body: String,
-    pub tag: String,
-    pub timestamp: u64,
-    pub url: String,
-}
-
-impl PushNotification {
-    pub async fn new(msg: Message, channel: &Channel) -> Self {
-        let author = Ref::from_unchecked(msg.author.clone())
-            .fetch_user()
-            .await;
-
-        let (author, avatar) = if let Ok(author) = author {
-            (Some(author.username), author.avatar)
-        } else {
-            (None, None)
-        };
-
-        let icon = if let Some(avatar) = avatar {
-            avatar.get_autumn_url()
-        } else {
-            format!("{}/users/{}/default_avatar", PUBLIC_URL.as_str(), msg.author)
-        };
-
-        let image = msg.attachments.map_or(None, |attachments| {
-            attachments
-                .first()
-                .map_or(None, |v| Some(v.get_autumn_url()))
-        });
-
-        let body = match msg.content {
-            Content::Text(body) => body,
-            Content::SystemMessage(sys_msg) => sys_msg.into()
-        };
-
-        let timestamp = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .expect("system time should be valid")
-            .as_secs();
-
-        Self {
-            author: author.unwrap_or_else(|| "Unknown".into()),
-            icon,
-            image,
-            body,
-            tag: channel.id().to_string(),
-            timestamp,
-            url: format!("{}/channel/{}/{}", *APP_URL, channel.id(), msg.id),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum SystemMessage {
-    #[serde(rename = "text")]
-    Text { content: String },
-    #[serde(rename = "user_added")]
-    UserAdded { id: String, by: String },
-    #[serde(rename = "user_remove")]
-    UserRemove { id: String, by: String },
-    #[serde(rename = "user_joined")]
-    UserJoined { id: String },
-    #[serde(rename = "user_left")]
-    UserLeft { id: String },
-    #[serde(rename = "user_kicked")]
-    UserKicked { id: String },
-    #[serde(rename = "user_banned")]
-    UserBanned { id: String },
-    #[serde(rename = "channel_renamed")]
-    ChannelRenamed { name: String, by: String },
-    #[serde(rename = "channel_description_changed")]
-    ChannelDescriptionChanged { by: String },
-    #[serde(rename = "channel_icon_changed")]
-    ChannelIconChanged { by: String },
-}
-
-impl Into<String> for SystemMessage {
-    fn into(self) -> String {
-        match self {
-            SystemMessage::Text { content } => content,
-            SystemMessage::UserAdded { .. } => "User added to the channel.".to_string(),
-            SystemMessage::UserRemove { .. } => "User removed from the channel.".to_string(),
-            SystemMessage::UserJoined { .. } => "User joined the channel.".to_string(),
-            SystemMessage::UserLeft { .. } => "User left the channel.".to_string(),
-            SystemMessage::UserKicked { .. } => "User kicked from the channel.".to_string(),
-            SystemMessage::UserBanned { .. } => "User banned from the channel.".to_string(),
-            SystemMessage::ChannelRenamed { .. } => "Channel renamed.".to_string(),
-            SystemMessage::ChannelDescriptionChanged { .. } => "Channel description changed.".to_string(),
-            SystemMessage::ChannelIconChanged { .. } => "Channel icon changed.".to_string()
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum Content {
-    Text(String),
-    SystemMessage(SystemMessage),
-}
-
-impl Content {
-    pub async fn send_as_system(self, target: &Channel) -> Result<()> {
-        Message::create(
-            "00000000000000000000000000".to_string(),
-            target.id().to_string(),
-            self,
-            None,
-            None,
-            None
-        )
-        .publish(&target, false)
-        .await
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Validate)]
-pub struct Masquerade {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 32))]
-    name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 128))]
-    avatar: Option<String>
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Message {
-    #[serde(rename = "_id")]
-    pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nonce: Option<String>,
-    pub channel: String,
-    pub author: String,
-
-    pub content: Content,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attachments: Option<Vec<File>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub edited: Option<DateTime>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub embeds: Option<Vec<Embed>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mentions: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub replies: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub masquerade: Option<Masquerade>
-}
-
-impl Message {
-    pub fn create(
-        author: String,
-        channel: String,
-        content: Content,
-        mentions: Option<Vec<String>>,
-        replies: Option<Vec<String>>,
-        masquerade: Option<Masquerade>,
-    ) -> Message {
-        Message {
-            id: Ulid::new().to_string(),
-            nonce: None,
-            channel,
-            author,
-            content,
-            attachments: None,
-            edited: None,
-            embeds: None,
-            mentions,
-            replies,
-            masquerade
-        }
-    }
-
-    pub async fn publish(self, channel: &Channel, process_embeds: bool) -> Result<()> {
-        // Publish message event
-        ClientboundNotification::Message(self.clone())
-            .publish(channel.id().to_string());
-
-        // Commit message to database
-        get_collection("messages")
-            .insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "message",
-            })?;
-
-        // spawn task_queue ( process embeds )
-        if process_embeds {
-            self.process_embed().await;
-        }
-
-        // spawn task_queue ( update last_message_id )
-        match channel {
-            Channel::DirectMessage { id, .. } =>
-                crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), true).await,
-            Channel::Group { id, .. } | Channel::TextChannel { id, .. } =>
-                crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), false).await,
-            _ => {}
-        }
-
-        // if mentions {
-        //  spawn task_queue ( update channel_unreads )
-        // }
-        if let Some(mentions) = &self.mentions {
-            for user in mentions {
-                crate::task_queue::task_ack::queue(
-                    channel.id().into(),
-                    user.clone(),
-                    crate::task_queue::task_ack::AckEvent::AddMention {
-                        ids: vec![ self.id.clone() ]
-                    }
-                ).await;
-            }
-        }
-
-        // if (channel => DM | Group) | mentions {
-        //  spawn task_queue ( web push )
-        // }
-        let mut target_ids = vec![];
-        match &channel {
-            Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
-                for recipient in recipients {
-                    if !is_online(recipient) {
-                        target_ids.push(recipient.clone());
-                    }
-                }
-            }
-            Channel::TextChannel { .. } => {
-                if let Some(mentions) = &self.mentions {
-                    target_ids.append(&mut mentions.clone());
-                }
-            }
-            _ => {}
-        }
-
-        if target_ids.len() > 0 {
-            if let Ok(payload) = serde_json::to_string(&PushNotification::new(self, &channel).await) {
-                crate::task_queue::task_web_push::queue(target_ids, payload).await;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn publish_update(self, data: Value) -> Result<()> {
-        let channel = self.channel.clone();
-        ClientboundNotification::MessageUpdate {
-            id: self.id.clone(),
-            channel: self.channel.clone(),
-            data,
-        }
-        .publish(channel);
-
-        self.process_embed().await;
-        Ok(())
-    }
-
-    pub async fn process_embed(&self) {
-        if !*USE_JANUARY {
-            return;
-        }
-
-        if let Content::Text(text) = &self.content {
-            crate::task_queue::task_process_embeds::queue(self.channel.clone(), self.id.clone(), text.clone()).await;
-        }
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        if let Some(attachments) = &self.attachments {
-            for attachment in attachments {
-                attachment.delete().await?;
-            }
-        }
-
-        get_collection("messages")
-            .delete_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "message",
-            })?;
-
-        let channel = self.channel.clone();
-        ClientboundNotification::MessageDelete {
-            id: self.id.clone(),
-            channel: self.channel.clone(),
-        }
-        .publish(channel);
-
-        if let Some(attachments) = &self.attachments {
-            let attachment_ids: Vec<String> =
-                attachments.iter().map(|f| f.id.to_string()).collect();
-            get_collection("attachments")
-                .update_many(
-                    doc! {
-                        "_id": {
-                            "$in": attachment_ids
-                        }
-                    },
-                    doc! {
-                        "$set": {
-                            "deleted": true
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_many",
-                    with: "attachment",
-                })?;
-        }
-
-        Ok(())
-    }
-
-    pub fn add_associated_user_ids(&self, ids: &mut HashSet<String>) {
-        ids.insert(self.author.clone());
-
-        if let Content::SystemMessage(sys) = &self.content {
-            match sys {
-                SystemMessage::Text { .. } => {},
-                SystemMessage::UserAdded { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
-                SystemMessage::UserRemove { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
-                SystemMessage::UserJoined { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserLeft { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserKicked { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserBanned { id } => { ids.insert(id.clone()); },
-                SystemMessage::ChannelRenamed { by, .. } => { ids.insert(by.clone()); },
-                SystemMessage::ChannelDescriptionChanged { by } => { ids.insert(by.clone()); },
-                SystemMessage::ChannelIconChanged { by } => { ids.insert(by.clone()); }
-            }
-        }
-    }
-}
diff --git a/src/database/entities/microservice/autumn.rs b/src/database/entities/microservice/autumn.rs
deleted file mode 100644
index dc360b1d..00000000
--- a/src/database/entities/microservice/autumn.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use mongodb::bson::{doc, from_document};
-use serde::{Deserialize, Serialize};
-
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::AUTUMN_URL;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-enum Metadata {
-    File,
-    Text,
-    Image { width: isize, height: isize },
-    Video { width: isize, height: isize },
-    Audio,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct File {
-    #[serde(rename = "_id")]
-    pub id: String,
-    tag: String,
-    filename: String,
-    metadata: Metadata,
-    content_type: String,
-    size: isize,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    deleted: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    reported: Option<bool>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    message_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    user_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    server_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    object_id: Option<String>,
-}
-
-impl File {
-    pub async fn find_and_use(
-        attachment_id: &str,
-        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
-    ) -> Result<File> {
-        let attachments = get_collection("attachments");
-        let key = format!("{}_id", parent_type);
-        if let Some(doc) = attachments
-            .find_one(
-                doc! {
-                    "_id": attachment_id,
-                    "tag": &tag,
-                    key.clone(): {
-                        "$exists": false
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "attachment",
-            })?
-        {
-            let attachment = from_document::<File>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "attachment",
-            })?;
-
-            attachments
-                .update_one(
-                    doc! {
-                        "_id": &attachment.id
-                    },
-                    doc! {
-                        "$set": {
-                            key: &parent_id
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "attachment",
-                })?;
-
-            Ok(attachment)
-        } else {
-            Err(Error::UnknownAttachment)
-        }
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        get_collection("attachments")
-            .update_one(
-                doc! {
-                    "_id": &self.id
-                },
-                doc! {
-                    "$set": {
-                        "deleted": true
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "attachment",
-            })
-    }
-
-    pub fn get_autumn_url(&self) -> String {
-        format!("{}/{}/{}", AUTUMN_URL.as_str(), self.tag, self.id)
-    }
-}
diff --git a/src/database/entities/microservice/january.rs b/src/database/entities/microservice/january.rs
deleted file mode 100644
index 862ce88b..00000000
--- a/src/database/entities/microservice/january.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use crate::util::{
-    result::{Error, Result},
-    variables::JANUARY_URL,
-    variables::MAX_EMBED_COUNT,
-};
-use crate::database::entities::microservice::autumn::File;
-use linkify::{LinkFinder, LinkKind};
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum ImageSize {
-    Large,
-    Preview,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Image {
-    pub url: String,
-    pub width: isize,
-    pub height: isize,
-    pub size: ImageSize,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Video {
-    pub url: String,
-    pub width: isize,
-    pub height: isize,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum TwitchType {
-    Channel,
-    Video,
-    Clip,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum BandcampType {
-    Album,
-    Track,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Special {
-    None,
-    YouTube {
-        id: String,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        timestamp: Option<String>,
-    },
-    Twitch {
-        content_type: TwitchType,
-        id: String,
-    },
-    Spotify {
-        content_type: String,
-        id: String,
-    },
-    Soundcloud,
-    Bandcamp {
-        content_type: BandcampType,
-        id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Metadata {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    special: Option<Special>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    title: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    image: Option<Image>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    video: Option<Video>,
-
-    // #[serde(skip_serializing_if = "Option::is_none")]
-    // opengraph_type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    site_name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    icon_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    colour: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Text {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub media: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-	pub colour: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Embed {
-    Website(Metadata),
-    Image(Image),
-    Text(Text),
-    None,
-}
-
-impl Embed {
-    pub async fn generate(content: String) -> Result<Vec<Embed>> {
-        lazy_static! {
-            static ref RE_CODE: Regex = Regex::new("```(?:.|\n)+?```|`(?:.|\n)+?`").unwrap();
-            static ref RE_IGNORED: Regex = Regex::new("(<http.+>)").unwrap();
-        }
-
-        // Ignore code blocks.
-        let content = RE_CODE.replace_all(&content, "");
-
-        // Ignore all content between angle brackets starting with http.
-        let content = RE_IGNORED.replace_all(&content, "");
-
-        let content = content
-            // Ignore quoted lines.
-            .split("\n")
-            .map(|v| {
-                if let Some(c) = v.chars().next() {
-                    if c == '>' {
-                        return "";
-                    }
-                }
-
-                v
-            })
-            .collect::<Vec<&str>>()
-            .join("\n");
-
-        let mut finder = LinkFinder::new();
-        finder.kinds(&[LinkKind::Url]);
-        let links: Vec<_> = finder.links(&content).take(*MAX_EMBED_COUNT).collect();
-
-        if links.len() == 0 {
-            return Err(Error::LabelMe);
-        }
-
-        let mut embeds: Vec<Embed> = Vec::new();
-
-        let mut link_index = 0;
-
-        // ! FIXME: batch request to january?
-        while link_index < links.len() {
-            let link = &links[link_index];
-
-            // Check if we already processed this link.
-            if link_index != 0 && links.iter().take(link_index).any(|x| x.as_str() == link.as_str()) {
-                link_index = link_index + 1;
-                continue;
-            }
-
-            let client = reqwest::Client::new();
-            let result = client
-                .get(&format!("{}/embed", *JANUARY_URL))
-                .query(&[("url", link.as_str())])
-                .send()
-                .await;
-
-            if result.is_err() {
-                link_index = link_index + 1;
-                continue;
-            }
-
-            let response = result.unwrap();
-            if response.status().is_success() {
-                let res: Embed = response.json().await.map_err(|_| Error::InvalidOperation)?;
-
-                embeds.push(res);
-            }
-
-            link_index = link_index + 1;
-        }
-
-        // Prevent database update when no embeds are found.
-        if embeds.len() > 0 {
-            Ok(embeds)
-        } else {
-            Err(Error::LabelMe)
-        }
-    }
-}
diff --git a/src/database/entities/microservice/mod.rs b/src/database/entities/microservice/mod.rs
deleted file mode 100644
index da3f42a0..00000000
--- a/src/database/entities/microservice/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod autumn;
-pub mod january;
diff --git a/src/database/entities/mod.rs b/src/database/entities/mod.rs
deleted file mode 100644
index dd3a7d7e..00000000
--- a/src/database/entities/mod.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-mod channel;
-mod invites;
-mod message;
-mod microservice;
-mod server;
-mod sync;
-mod user;
-mod bots;
-
-use microservice::*;
-
-pub use autumn::*;
-pub use channel::*;
-pub use invites::*;
-pub use january::*;
-pub use message::*;
-pub use server::*;
-pub use sync::*;
-pub use user::*;
-pub use bots::*;
diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs
deleted file mode 100644
index c92b370f..00000000
--- a/src/database/entities/server.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-use std::collections::HashMap;
-
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use futures::StreamExt;
-use mongodb::bson::{Bson, doc};
-use mongodb::bson::from_document;
-use mongodb::bson::to_document;
-use mongodb::bson::Document;
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct MemberCompositeKey {
-    pub server: String,
-    pub user: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Member {
-    #[serde(rename = "_id")]
-    pub id: MemberCompositeKey,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nickname: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar: Option<File>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub roles: Option<Vec<String>>
-}
-
-pub type PermissionTuple = (
-    i32, // server permission
-    i32  // channel permission
-);
-
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Role {
-    pub name: String,
-    pub permissions: PermissionTuple,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub colour: Option<String>,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub hoist: bool,
-    #[serde(default)]
-    pub rank: i64,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Category {
-    pub id: String,
-    pub title: String,
-    pub channels: Vec<String>
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Ban {
-    #[serde(rename = "_id")]
-    pub id: MemberCompositeKey,
-    pub reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SystemMessageChannels {
-    pub user_joined: Option<String>,
-    pub user_left: Option<String>,
-    pub user_kicked: Option<String>,
-    pub user_banned: Option<String>,
-}
-
-pub enum RemoveMember {
-    Leave,
-    Kick,
-    Ban,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Server {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub owner: String,
-
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-
-    pub channels: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub categories: Option<Vec<Category>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub system_messages: Option<SystemMessageChannels>,
-
-    #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-    pub roles: HashMap<String, Role>,
-    pub default_permissions: PermissionTuple,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub banner: Option<File>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub flags: Option<i32>,
-
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub nsfw: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub analytics: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub discoverable: bool
-}
-
-impl Server {
-    pub async fn create(self) -> Result<()> {
-        get_collection("servers")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "channel",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "server",
-            })?;
-
-        Ok(())
-    }
-
-    pub async fn publish_update(&self, data: Value) -> Result<()> {
-        ClientboundNotification::ServerUpdate {
-            id: self.id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(self.id.clone());
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        // Check if there are any attachments we need to delete.
-        Channel::delete_messages(Bson::Document(doc! { "$in": &self.channels })).await?;
-
-        // Delete all channels.
-        get_collection("channels")
-            .delete_many(
-                doc! {
-                    "server": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channels",
-            })?;
-
-        // Delete any associated objects, e.g. unreads and invites.
-        Channel::delete_associated_objects(Bson::Document(doc! { "$in": &self.channels })).await?;
-
-        // Delete members and bans.
-        for with in &["server_members", "server_bans"] {
-            get_collection(with)
-                .delete_many(
-                    doc! {
-                        "_id.server": &self.id
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "delete_many",
-                    with,
-                })?;
-        }
-
-        // Delete server icon / banner.
-        if let Some(attachment) = &self.icon {
-            attachment.delete().await?;
-        }
-
-        if let Some(attachment) = &self.banner {
-            attachment.delete().await?;
-        }
-
-        // Delete the server
-        get_collection("servers")
-            .delete_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "server",
-            })?;
-
-        ClientboundNotification::ServerDelete {
-            id: self.id.clone(),
-        }
-        .publish(self.id.clone());
-
-        Ok(())
-    }
-
-    pub async fn fetch_members(id: &str) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| from_document(x).ok())
-            .collect::<Vec<Member>>())
-    }
-
-    pub async fn fetch_members_with_ids(id: &str, ids: &Vec<String>) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id,
-                    "_id.user": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| from_document(x).ok())
-            .collect::<Vec<Member>>())
-    }
-
-    pub async fn fetch_member_ids(id: &str) -> Result<Vec<String>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                x.get_document("_id")
-                    .ok()
-                    .map(|i| i.get_str("user").ok().map(|x| x.to_string()))
-            })
-            .flatten()
-            .collect::<Vec<String>>())
-    }
-
-    pub async fn mark_as_read(&self, id: &str) -> Result<()> {
-        let current_time = Ulid::new().to_string();
-        let unreads = get_collection("channel_unreads");
-
-        unreads.delete_many(
-            doc! {
-                "_id.channel": {
-                    "$in": &self.channels
-                },
-                "_id.user": &id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "delete_many",
-            with: "channel_unreads",
-        })?;
-
-        unreads.insert_many(
-        self.channels
-                .iter()
-                .map(|channel| doc! {
-                    "_id": {
-                        "channel": channel,
-                        "user": &id
-                    },
-                    "last_id": &current_time
-                })
-                .collect::<Vec<Document>>(),
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_many",
-            with: "channel_unreads",
-        })
-        .map(|_| ())
-    }
-
-    pub async fn join_member(&self, id: &str) -> Result<()> {
-        // Check if user is banned.
-        if get_collection("server_bans")
-            .find_one(
-                doc! {
-                    "_id.server": &self.id,
-                    "_id.user": &id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_bans",
-            })?
-            .is_some()
-        {
-            return Err(Error::Banned);
-        }
-
-        // Add user to server.
-        get_collection("server_members")
-            .insert_one(
-                doc! {
-                    "_id": {
-                        "server": &self.id,
-                        "user": &id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "server_members",
-            })?;
-
-        // Announce that user joined server.
-        ClientboundNotification::ServerMemberJoin {
-            id: self.id.clone(),
-            user: id.to_string(),
-        }
-        .publish(self.id.clone());
-
-        // Broadcast join message.
-        if let Some(channels) = &self.system_messages {
-            if let Some(cid) = &channels.user_joined {
-                let channel = Ref::from_unchecked(cid.clone()).fetch_channel().await?;
-                Content::SystemMessage(SystemMessage::UserJoined { id: id.to_string() })
-                    .send_as_system(&channel)
-                    .await?;
-            }
-        }
-
-        // Mark entire server as read.
-        self.mark_as_read(&id).await?;
-
-        Ok(())
-    }
-
-    pub async fn remove_member(&self, id: &str, removal: RemoveMember) -> Result<()> {
-        let result = get_collection("server_members")
-            .delete_one(
-                doc! {
-                    "_id": {
-                        "server": &self.id,
-                        "user": &id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "server_members",
-            })?;
-
-        if result.deleted_count > 0 {
-            ClientboundNotification::ServerMemberLeave {
-                id: self.id.clone(),
-                user: id.to_string(),
-            }
-            .publish(self.id.clone());
-
-            if let Some(channels) = &self.system_messages {
-                let message = match removal {
-                    RemoveMember::Leave => {
-                        if let Some(cid) = &channels.user_left {
-                            Some((cid.clone(), SystemMessage::UserLeft { id: id.to_string() }))
-                        } else {
-                            None
-                        }
-                    }
-                    RemoveMember::Kick => {
-                        if let Some(cid) = &channels.user_kicked {
-                            Some((
-                                cid.clone(),
-                                SystemMessage::UserKicked { id: id.to_string() },
-                            ))
-                        } else {
-                            None
-                        }
-                    }
-                    RemoveMember::Ban => {
-                        if let Some(cid) = &channels.user_banned {
-                            Some((
-                                cid.clone(),
-                                SystemMessage::UserBanned { id: id.to_string() },
-                            ))
-                        } else {
-                            None
-                        }
-                    }
-                };
-
-                if let Some((cid, message)) = message {
-                    let channel = Ref::from_unchecked(cid).fetch_channel().await?;
-                    Content::SystemMessage(message)
-                        .send_as_system(&channel)
-                        .await?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn get_member_count(id: &str) -> Result<i64> {
-        Ok(get_collection("server_members")
-            .count_documents(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "count_documents",
-                with: "server_members",
-            })?)
-    }
-}
diff --git a/src/database/entities/sync.rs b/src/database/entities/sync.rs
deleted file mode 100644
index c4883d8c..00000000
--- a/src/database/entities/sync.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-pub type UserSettings = HashMap<String, (i64, String)>;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ChannelCompositeKey {
-    pub channel: String,
-    pub user: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ChannelUnread {
-    #[serde(rename = "_id")]
-    pub id: ChannelCompositeKey,
-
-    pub last_id: Option<String>,
-    pub mentions: Option<Vec<String>>,
-}
diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs
deleted file mode 100644
index 1841de36..00000000
--- a/src/database/entities/user.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-use futures::StreamExt;
-use mongodb::bson::Document;
-use mongodb::options::{Collation, FindOneOptions};
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
-};
-use num_enum::TryFromPrimitive;
-use serde::{Deserialize, Serialize};
-use std::ops;
-use ulid::Ulid;
-use validator::Validate;
-
-use crate::database::permissions::user::UserPermissions;
-use crate::database::*;
-use crate::notifications::websocket::is_online;
-use crate::util::result::{Error, Result};
-use crate::util::variables::EARLY_ADOPTER_BADGE;
-use crate::util::variables::MAX_SERVER_COUNT;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum RelationshipStatus {
-    None,
-    User,
-    Friend,
-    Outgoing,
-    Incoming,
-    Blocked,
-    BlockedOther,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Relationship {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub status: RelationshipStatus,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum Presence {
-    Online,
-    Idle,
-    Busy,
-    Invisible,
-}
-
-#[derive(Validate, Serialize, Deserialize, Debug, Clone)]
-pub struct UserStatus {
-    #[validate(length(min = 1, max = 128))]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub text: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub presence: Option<Presence>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct UserProfile {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub content: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub background: Option<File>,
-}
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(i32)]
-pub enum Badges {
-    Developer = 1,
-    Translator = 2,
-    Supporter = 4,
-    ResponsibleDisclosure = 8,
-    Founder = 16,
-    PlatformModeration = 32,
-    ActiveSupporter = 64,
-    Paw = 128,
-    EarlyAdopter = 256,
-    ReservedRelevantJokeBadge1 = 512
-}
-
-impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct BotInformation {
-    owner: String
-}
-
-// When changing this struct, update notifications/payload.rs#113
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct User {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub username: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub relations: Option<Vec<Relationship>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub badges: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<UserStatus>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub profile: Option<UserProfile>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub flags: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bot: Option<BotInformation>,
-
-    // ? This should never be pushed to the collection.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub relationship: Option<RelationshipStatus>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub online: Option<bool>,
-}
-
-impl User {
-    /// Mutate the user object to include relationship as seen by user.
-    pub fn from(mut self, user: &User) -> User {
-        self.relationship = Some(RelationshipStatus::None);
-
-        if self.id == user.id {
-            self.relationship = Some(RelationshipStatus::User);
-            return self;
-        }
-
-        self.relations = None;
-        if let Some(relations) = &user.relations {
-            if let Some(relationship) = relations.iter().find(|x| self.id == x.id) {
-                self.relationship = Some(relationship.status.clone());
-                return self;
-            }
-        }
-
-        self
-    }
-
-    /// Apply any relevant badges.
-    pub fn apply_badges(mut self) -> User {
-        let mut badges = self.badges.unwrap_or_else(|| 0);
-        if let Ok(id) = Ulid::from_string(&self.id) {
-            if id.datetime().timestamp_millis() < *EARLY_ADOPTER_BADGE {
-                badges = badges + Badges::EarlyAdopter;
-            }
-        }
-
-        self.badges = Some(badges);
-        self
-    }
-
-    /// Mutate the user object to appear as seen by user.
-    pub fn with(self, permissions: UserPermissions<[u32; 1]>) -> User {
-        let mut user = self.apply_badges();
-
-        if permissions.get_view_profile() {
-            user.online = Some(is_online(&user.id));
-        } else {
-            user.status = None;
-        }
-
-        // If the user's status is `Presence::Invisible`, return it as `Presence::Offline`
-        if let Some(status) = &user.status {
-            if let Some(presence) = &status.presence {
-                if presence == &Presence::Invisible {
-                    user.status = None;
-                    user.online = Some(false);
-                }
-            }
-        }
-
-        user.profile = None;
-        user
-    }
-
-    /// Mutate the user object to appear as seen by user.
-    /// Also overrides the relationship status.
-    pub async fn from_override(
-        mut self,
-        user: &User,
-        relationship: RelationshipStatus,
-    ) -> Result<User> {
-        let permissions = PermissionCalculator::new(&user)
-            .with_relationship(&relationship)
-            .for_user(&self.id)
-            .await?;
-
-        self.relations = None;
-        self.relationship = Some(relationship);
-        Ok(self.with(permissions))
-    }
-
-    /// Utility function for checking claimed usernames.
-    pub async fn is_username_taken(username: &str) -> Result<bool> {
-        if username.to_lowercase() == "revolt" || username.to_lowercase() == "admin" || username.to_lowercase() == "system" {
-            return Ok(true);
-        }
-
-        if get_collection("users")
-            .find_one(
-                doc! {
-                    "username": username
-                },
-                FindOneOptions::builder()
-                    .collation(Collation::builder().locale("en").strength(2).build())
-                    .build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "user",
-            })?
-            .is_some()
-        {
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    /// Utility function for fetching multiple users from the perspective of one.
-    /// Assumes user has a mutual connection with others.
-    pub async fn fetch_multiple_users(&self, user_ids: &Vec<String>) -> Result<Vec<User>> {
-        let mut users = vec![];
-        let mut cursor = get_collection("users")
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": user_ids
-                    }
-                },
-                FindOptions::builder()
-                    .projection(
-                        doc! { "_id": 1, "username": 1, "avatar": 1, "badges": 1, "status": 1, "flags": 1, "bot": 1 },
-                    )
-                    .build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "users",
-            })?;
-
-        while let Some(result) = cursor.next().await {
-            if let Ok(doc) = result {
-                let other: User = from_document(doc).map_err(|_| Error::DatabaseError {
-                    operation: "from_document",
-                    with: "user",
-                })?;
-
-                let permissions = PermissionCalculator::new(&self)
-                    .with_mutual_connection()
-                    .with_user(&other)
-                    .for_user_given()
-                    .await?;
-
-                users.push(other.from(&self).with(permissions));
-            }
-        }
-
-        Ok(users)
-    }
-
-    /// Utility function to get all of a user's memberships.
-    pub async fn fetch_memberships(id: &str) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                from_document(x).ok()
-            })
-            .collect::<Vec<Member>>())
-    }
-
-    /// Utility function to get all the server IDs the user is in.
-    pub async fn fetch_server_ids(id: &str) -> Result<Vec<String>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                x.get_document("_id")
-                    .ok()
-                    .map(|i| i.get_str("server").ok().map(|x| x.to_string()))
-            })
-            .flatten()
-            .collect::<Vec<String>>())
-    }
-
-    /// Utility function to fetch unread objects for user.
-    pub async fn fetch_unreads(id: &str) -> Result<Vec<Document>> {
-        Ok(get_collection("channel_unreads")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "user_settings",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await)
-    }
-
-    /// Check if this user can acquire another server.
-    pub async fn can_acquire_server(id: &str) -> Result<bool> {
-        let server_ids = User::fetch_server_ids(&id).await?;
-        Ok(server_ids.len() < *MAX_SERVER_COUNT)
-    }
-}
diff --git a/src/database/guards/mod.rs b/src/database/guards/mod.rs
deleted file mode 100644
index cf046ce5..00000000
--- a/src/database/guards/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod reference;
-pub mod user;
-
-pub use reference::Ref;
diff --git a/src/database/guards/reference.rs b/src/database/guards/reference.rs
deleted file mode 100644
index 687dac30..00000000
--- a/src/database/guards/reference.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use mongodb::bson::{doc, from_document};
-use rocket::request::FromParam;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use validator::Validate;
-
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Ref {
-    #[validate(length(min = 1, max = 26))]
-    pub id: String,
-}
-
-impl Ref {
-    pub fn from_unchecked(id: String) -> Ref {
-        Ref { id }
-    }
-
-    pub fn from(id: String) -> Result<Ref> {
-        let r = Ref { id };
-        r.validate()
-            .map_err(|error| Error::FailedValidation { error })?;
-        Ok(r)
-    }
-
-    async fn fetch<T: DeserializeOwned>(&self, collection: &'static str) -> Result<T> {
-        let doc = get_collection(&collection)
-            .find_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: &collection,
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(from_document::<T>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: &collection,
-        })?)
-    }
-
-    pub async fn fetch_user(&self) -> Result<User> {
-        self.fetch("users").await
-    }
-
-    pub async fn fetch_channel(&self) -> Result<Channel> {
-        self.fetch("channels").await
-    }
-
-    pub async fn fetch_server(&self) -> Result<Server> {
-        self.fetch("servers").await
-    }
-
-    pub async fn fetch_invite(&self) -> Result<Invite> {
-        match self.fetch("channel_invites").await {
-            Ok(invite) => Ok(invite),
-            Err(err) => {
-                if let Ok(server) = self.fetch::<Server>("servers").await {
-                    if server.discoverable {
-                        return Ok(
-                            Invite::Server {
-                                code: server.id.clone(),
-                                server: server.id,
-                                creator: server.owner,
-                                channel: server.channels[0].clone(),
-                            }
-                        )
-                    }
-                }
-
-                Err(err)
-            }
-        }
-    }
-
-    pub async fn fetch_bot(&self) -> Result<Bot> {
-        self.fetch("bots").await
-    }
-
-    pub async fn fetch_member(&self, server: &str) -> Result<Member> {
-        let doc = get_collection("server_members")
-            .find_one(
-                doc! {
-                    "_id.user": &self.id,
-                    "_id.server": server
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_member",
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(
-            from_document::<Member>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "server_member",
-            })?,
-        )
-    }
-
-    pub async fn fetch_ban(&self, server: &str) -> Result<Ban> {
-        let doc = get_collection("server_bans")
-            .find_one(
-                doc! {
-                    "_id.user": &self.id,
-                    "_id.server": server
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_ban",
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(from_document::<Ban>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: "server_ban",
-        })?)
-    }
-
-    pub async fn fetch_message(&self, channel: &Channel) -> Result<Message> {
-        let message: Message = self.fetch("messages").await?;
-        if &message.channel != channel.id() {
-            Err(Error::InvalidOperation)
-        } else {
-            Ok(message)
-        }
-    }
-}
-
-impl User {
-    pub fn as_ref(&self) -> Ref {
-        Ref {
-            id: self.id.to_string(),
-        }
-    }
-}
-
-impl<'r> FromParam<'r> for Ref {
-    type Error = &'r str;
-
-    fn from_param(param: &'r str) -> Result<Self, Self::Error> {
-        if let Ok(result) = Ref::from(param.to_string()) {
-            if result.validate().is_ok() {
-                return Ok(result);
-            }
-        }
-
-        Err(param)
-    }
-}
diff --git a/src/database/guards/user.rs b/src/database/guards/user.rs
deleted file mode 100644
index b8ddae91..00000000
--- a/src/database/guards/user.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::database::*;
-
-use mongodb::bson::{doc, from_document};
-use rauth::entities::Session;
-use rocket::http::Status;
-use rocket::request::{self, FromRequest, Outcome, Request};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for User {
-    type Error = rauth::util::Error;
-
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let user: &Option<User> = request.local_cache_async(async {
-            let header_bot_token = request
-                .headers()
-                .get("x-bot-token")
-                .next()
-                .map(|x| x.to_string());
-
-            if let Some(bot_token) = header_bot_token {
-                if let Ok(result) = get_collection("bots")
-                    .find_one(
-                        doc! {
-                            "token": bot_token
-                        },
-                        None,
-                    )
-                    .await
-                {
-                    if let Some(doc) = result {
-                        let id = doc.get_str("_id").unwrap();
-                        if let Ok(result) = get_collection("users")
-                            .find_one(
-                                doc! {
-                                    "_id": &id
-                                },
-                                None,
-                            )
-                            .await
-                        {
-                            if let Some(doc) = result {
-                                if let Ok(user) = from_document(doc) {
-                                    return Some(user)
-                                }
-                            }
-                        }
-                    }
-                }
-            } else {
-                if let Outcome::Success(session) = request.guard::<Session>().await {
-                    if let Ok(result) = get_collection("users")
-                        .find_one(
-                            doc! {
-                                "_id": &session.user_id
-                            },
-                            None,
-                        )
-                        .await
-                    {
-                        if let Some(doc) = result {
-                            if let Ok(user) = from_document(doc) {
-                                return Some(user)
-                            }
-                        }
-                    }
-                }
-            }
-
-            None
-        }).await;
-
-        if let Some(user) = user {
-            Outcome::Success(user.clone())
-        } else {
-            Outcome::Failure((
-                Status::Forbidden,
-                rauth::util::Error::InvalidSession,
-            ))
-        }
-    }
-}
diff --git a/src/database/migrations/init.rs b/src/database/migrations/init.rs
deleted file mode 100644
index 0570c8f8..00000000
--- a/src/database/migrations/init.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use super::super::get_db;
-use super::scripts::LATEST_REVISION;
-
-use log::info;
-use mongodb::bson::doc;
-use mongodb::options::CreateCollectionOptions;
-
-pub async fn create_database() {
-    info!("Creating database.");
-    let db = get_db();
-
-    db.create_collection("accounts", None)
-        .await
-        .expect("Failed to create accounts collection.");
-
-    db.create_collection("users", None)
-        .await
-        .expect("Failed to create users collection.");
-
-    db.create_collection("channels", None)
-        .await
-        .expect("Failed to create channels collection.");
-
-    db.create_collection("messages", None)
-        .await
-        .expect("Failed to create messages collection.");
-
-    db.create_collection("servers", None)
-        .await
-        .expect("Failed to create servers collection.");
-
-    db.create_collection("server_members", None)
-        .await
-        .expect("Failed to create server_members collection.");
-
-    db.create_collection("server_bans", None)
-        .await
-        .expect("Failed to create server_bans collection.");
-
-    db.create_collection("channel_invites", None)
-        .await
-        .expect("Failed to create channel_invites collection.");
-
-    db.create_collection("channel_unreads", None)
-        .await
-        .expect("Failed to create channel_unreads collection.");
-
-    db.create_collection("migrations", None)
-        .await
-        .expect("Failed to create migrations collection.");
-
-    db.create_collection("attachments", None)
-        .await
-        .expect("Failed to create attachments collection.");
-
-    db.create_collection("user_settings", None)
-        .await
-        .expect("Failed to create user_settings collection.");
-
-    db.create_collection("bots", None)
-        .await
-        .expect("Failed to create bots collection.");
-
-    db.create_collection(
-        "pubsub",
-        CreateCollectionOptions::builder()
-            .capped(true)
-            .size(1_000_000)
-            .build(),
-    )
-    .await
-    .expect("Failed to create pubsub collection.");
-
-    db.run_command(
-        doc! {
-            "createIndexes": "users",
-            "indexes": [
-                {
-                    "key": {
-                        "username": 1
-                    },
-                    "name": "username",
-                    "unique": true,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2
-                    }
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create username index.");
-
-    db.run_command(
-        doc! {
-            "createIndexes": "messages",
-            "indexes": [
-                {
-                    "key": {
-                        "content": "text"
-                    },
-                    "name": "content"
-                },
-                {
-                    "key": {
-                        "channel": 1
-                    },
-                    "name": "channel"
-                },
-                {
-                    "key": {
-                        "channel": 1,
-                        "_id": 1
-                    },
-                    "name": "channel_id_compound"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create message index.");
-
-    get_db()
-    .run_command(
-        doc! {
-            "createIndexes": "channel_unreads",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.channel": 1,
-                        "_id.user": 1,
-                    },
-                    "name": "compound_id"
-                },
-                {
-                    "key": {
-                        "_id.user": 1,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create channel_unreads index.");
-
-    get_db()
-    .run_command(
-        doc! {
-            "createIndexes": "server_members",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.server": 1,
-                        "_id.user": 1,
-                    },
-                    "name": "compound_id"
-                },
-                {
-                    "key": {
-                        "_id.user": 1,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create server_members index.");
-
-    db.collection("migrations")
-        .insert_one(
-            doc! {
-                "_id": 0,
-                "revision": LATEST_REVISION
-            },
-            None,
-        )
-        .await
-        .expect("Failed to save migration info.");
-
-    info!("Created database.");
-}
diff --git a/src/database/migrations/mod.rs b/src/database/migrations/mod.rs
deleted file mode 100644
index 8470444d..00000000
--- a/src/database/migrations/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use super::get_connection;
-
-pub mod init;
-pub mod scripts;
-
-pub async fn run_migrations() {
-    let client = get_connection();
-
-    let list = client
-        .list_database_names(None, None)
-        .await
-        .expect("Failed to fetch database names.");
-    
-    if list.iter().position(|x| x == "revolt").is_none() {
-        init::create_database().await;
-    } else {
-        scripts::migrate_database().await;
-    }
-    
-    // panic!("https://pbs.twimg.com/media/EDTpB5JWwAUvyxd.jpg");
-    rauth::entities::sync_models(&super::get_db()).await;
-}
diff --git a/src/database/migrations/scripts.rs b/src/database/migrations/scripts.rs
deleted file mode 100644
index bae05bfd..00000000
--- a/src/database/migrations/scripts.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-use crate::database::{permissions, get_collection, get_db, PermissionTuple};
-
-use futures::StreamExt;
-use log::info;
-use mongodb::{bson::{Document, doc, from_bson, from_document, to_document}, options::FindOptions};
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-struct MigrationInfo {
-    _id: i32,
-    revision: i32,
-}
-
-pub const LATEST_REVISION: i32 = 13;
-
-pub async fn migrate_database() {
-    let migrations = get_collection("migrations");
-    let data = migrations
-        .find_one(None, None)
-        .await
-        .expect("Failed to fetch migration data.");
-
-    if let Some(doc) = data {
-        let info: MigrationInfo =
-            from_document(doc).expect("Failed to read migration information.");
-
-        let revision = run_migrations(info.revision).await;
-
-        migrations
-            .update_one(
-                doc! {
-                    "_id": info._id
-                },
-                doc! {
-                    "$set": {
-                        "revision": revision
-                    }
-                },
-                None,
-            )
-            .await
-            .expect("Failed to commit migration information.");
-
-        info!("Migration complete. Currently at revision {}.", revision);
-    } else {
-        panic!("Database was configured incorrectly, possibly because initalization failed.")
-    }
-}
-
-pub async fn run_migrations(revision: i32) -> i32 {
-    info!("Starting database migration.");
-
-    if revision <= 0 {
-        info!("Running migration [revision 0]: Test migration system.");
-    }
-
-    if revision <= 1 {
-        info!("Running migration [revision 1 / 2021-04-24]: Migrate to Autumn v1.0.0.");
-
-        let messages = get_collection("messages");
-        let attachments = get_collection("attachments");
-
-        messages
-            .update_many(
-                doc! { "attachment": { "$exists": 1 } },
-                doc! { "$set": { "attachment.tag": "attachments", "attachment.size": 0 } },
-                None,
-            )
-            .await
-            .expect("Failed to update messages.");
-
-        attachments
-            .update_many(
-                doc! {},
-                doc! { "$set": { "tag": "attachments", "size": 0 } },
-                None,
-            )
-            .await
-            .expect("Failed to update attachments.");
-    }
-
-    if revision <= 2 {
-        info!("Running migration [revision 2 / 2021-05-08]: Add servers collection.");
-
-        get_db()
-            .create_collection("servers", None)
-            .await
-            .expect("Failed to create servers collection.");
-    }
-
-    if revision <= 3 {
-        info!("Running migration [revision 3 / 2021-05-25]: Support multiple file uploads, add channel_unreads and user_settings.");
-
-        let messages = get_collection("messages");
-        let mut cursor = messages
-            .find(
-                doc! {
-                    "attachment": {
-                        "$exists": 1
-                    }
-                },
-                FindOptions::builder()
-                    .projection(doc! {
-                        "_id": 1,
-                        "attachments": [ "$attachment" ]
-                    })
-                    .build(),
-            )
-            .await
-            .expect("Failed to fetch messages.");
-
-        while let Some(result) = cursor.next().await {
-            let doc = result.unwrap();
-            let id = doc.get_str("_id").unwrap();
-            let attachments = doc.get_array("attachments").unwrap();
-
-            messages
-                .update_one(
-                    doc! { "_id": id },
-                    doc! { "$unset": { "attachment": 1 }, "$set": { "attachments": attachments } },
-                    None,
-                )
-                .await
-                .unwrap();
-        }
-
-        get_db()
-            .create_collection("channel_unreads", None)
-            .await
-            .expect("Failed to create channel_unreads collection.");
-
-        get_db()
-            .create_collection("user_settings", None)
-            .await
-            .expect("Failed to create user_settings collection.");
-    }
-
-    if revision <= 4 {
-        info!("Running migration [revision 4 / 2021-06-01]: Add more server collections.");
-
-        get_db()
-            .create_collection("server_members", None)
-            .await
-            .expect("Failed to create server_members collection.");
-
-        get_db()
-            .create_collection("server_bans", None)
-            .await
-            .expect("Failed to create server_bans collection.");
-
-        get_db()
-            .create_collection("channel_invites", None)
-            .await
-            .expect("Failed to create channel_invites collection.");
-    }
-
-    if revision <= 5 {
-        info!("Running migration [revision 5 / 2021-06-26]: Add permissions.");
-
-        #[derive(Serialize)]
-        struct Server {
-            pub default_permissions: PermissionTuple,
-        }
-
-        let server = Server {
-            default_permissions: (
-                *permissions::server::DEFAULT_PERMISSION as i32,
-                *permissions::channel::DEFAULT_PERMISSION_SERVER as i32
-            )
-        };
-
-        get_collection("servers")
-            .update_many(
-                doc! { },
-                doc! {
-                    "$set": to_document(&server).unwrap()
-                },
-                None
-            )
-            .await
-            .expect("Failed to migrate servers.");
-    }
-
-    if revision <= 6 {
-        info!("Running migration [revision 6 / 2021-07-09]: Add message text index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "content": "text"
-                        },
-                        "name": "content"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-    }
-
-    if revision <= 7 {
-        info!("Running migration [revision 7 / 2021-08-11]: Add message text index.");
-
-        get_db()
-            .create_collection("bots", None)
-            .await
-            .expect("Failed to create bots collection.");
-    }
-
-    if revision <= 8 {
-        info!("Running migration [revision 8 / 2021-09-10]: Update to rAuth version 1.");
-
-        get_db()
-            .run_command(
-                doc! {
-                    "dropIndexes": "accounts",
-                    "index": ["email", "email_normalised"]
-                },
-                None,
-            )
-            .await
-            .expect("Failed to delete legacy account indexes.");
-
-        let col = get_collection("sessions");
-        let mut cursor = get_collection("accounts")
-            .find(doc! { }, None)
-            .await
-            .unwrap();
-        
-        while let Some(doc) = cursor.next().await {
-            if let Ok(account) = doc {
-                let id = account.get_str("_id").unwrap();
-                if let Some(sessions) = account.get("sessions") {
-                    #[derive(Deserialize)]
-                    struct Session {
-                        id: String,
-                        token: String,
-                        friendly_name: String,
-                        subscription: Option<Document>,
-                    }
-
-                    let sessions = from_bson::<Vec<Session>>(sessions.clone()).unwrap();
-                    for session in sessions {
-                        info!("Converting session {} to new format.", &session.id);
-
-                        let mut doc = doc! {
-                            "_id": session.id,
-                            "token": session.token,
-                            "user_id": id.clone(),
-                            "name": session.friendly_name,
-                        };
-
-                        if let Some(sub) = session.subscription {
-                            doc.insert("subscription", sub);
-                        }
-
-                        col.insert_one(doc, None).await.ok();
-                    }
-                } else {
-                    info!("Account doesn't have any sessions!");
-                }
-            }
-        }
-
-        get_collection("accounts")
-            .update_many(
-                doc! { },
-                doc! {
-                    "$unset": {
-                        "sessions": 1,
-                    },
-                    "$set": {
-                        "mfa": {
-                            "recovery_codes": []
-                        }
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-    }
-
-    if revision <= 9 {
-        info!("Running migration [revision 9 / 2021-09-14]: Switch from last_message to last_message_id.");
-
-        let mut cursor = get_collection("channels")
-            .find(doc! { }, None)
-            .await
-            .unwrap();
-        
-        while let Some(doc) = cursor.next().await {
-            if let Ok(channel) = doc {
-                let channel_id = channel.get_str("_id").unwrap();
-                if let Some(last_message) = channel.get("last_message") {
-                    #[derive(Serialize, Deserialize, Debug, Clone)]
-                    pub struct Obj {
-                        #[serde(rename = "_id")]
-                        id: String,
-                    }
-
-                    #[derive(Serialize, Deserialize, Debug, Clone)]
-                    #[serde(untagged)]
-                    pub enum LastMessage {
-                        Obj(Obj),
-                        Id(String)
-                    }
-
-                    let lm = from_bson::<LastMessage>(last_message.clone()).unwrap();
-                    let id = match lm {
-                        LastMessage::Obj(Obj { id }) => id,
-                        LastMessage::Id(id) => id
-                    };
-
-                    info!("Converting session {} to new format.", &channel_id);
-                    get_collection("channels")
-                        .update_one(
-                            doc! {
-                                "_id": channel_id
-                            },
-                            doc! {
-                                "$set": {
-                                    "last_message_id": id
-                                },
-                                "$unset": {
-                                    "last_message": 1,
-                                }
-                            },
-                            None
-                        )
-                        .await
-                        .unwrap();
-                } else {
-                    info!("{} has no last_message.", &channel_id);
-                }
-            }
-        }
-    }
-
-    if revision <= 10 {
-        info!("Running migration [revision 10 / 2021-11-01]: Remove nonce values on channels and servers.");
-
-        get_collection("servers")
-            .update_many(
-                doc! {},
-                doc! {
-                    "$unset": {
-                        "nonce": 1,
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-
-        get_collection("channels")
-            .update_many(
-                doc! {},
-                doc! {
-                    "$unset": {
-                        "nonce": 1,
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-    }
-
-    if revision <= 11 {
-        info!("Running migration [revision 11 / 2021-11-14]: Add indexes to database.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "channel": 1
-                        },
-                        "name": "channel"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "channel_unreads",
-                "indexes": [
-                    {
-                        "key": {
-                            "_id.channel": 1,
-                            "_id.user": 1,
-                        },
-                        "name": "compound_id"
-                    },
-                    {
-                        "key": {
-                            "_id.user": 1,
-                        },
-                        "name": "user_id"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create channel_unreads index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "server_members",
-                "indexes": [
-                    {
-                        "key": {
-                            "_id.server": 1,
-                            "_id.user": 1,
-                        },
-                        "name": "compound_id"
-                    },
-                    {
-                        "key": {
-                            "_id.user": 1,
-                        },
-                        "name": "user_id"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create server_members index.");
-    }
-
-    if revision <= 12 {
-        info!("Running migration [revision 12 / 2021-11-21]: Add indexes to database.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "channel": 1,
-                            "_id": 1
-                        },
-                        "name": "channel_id_compound"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-    }
-
-    // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
-
-    // Reminder to update LATEST_REVISION when adding new migrations.
-    LATEST_REVISION
-}
diff --git a/src/database/mod.rs b/src/database/mod.rs
deleted file mode 100644
index b3368fb5..00000000
--- a/src/database/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::util::variables::MONGO_URI;
-
-use mongodb::{Client, Collection, Database};
-use once_cell::sync::OnceCell;
-
-static DBCONN: OnceCell<Client> = OnceCell::new();
-
-pub async fn connect() {
-    let client = Client::with_uri_str(&MONGO_URI)
-        .await
-        .expect("Failed to init db connection.");
-
-    DBCONN.set(client).unwrap();
-    migrations::run_migrations().await;
-}
-
-pub fn get_connection() -> &'static Client {
-    DBCONN.get().unwrap()
-}
-
-pub fn get_db() -> Database {
-    get_connection().database("revolt")
-}
-
-pub fn get_collection(collection: &str) -> Collection {
-    get_db().collection(collection)
-}
-
-pub mod entities;
-pub mod guards;
-pub mod migrations;
-pub mod permissions;
-
-pub use entities::*;
-pub use guards::*;
-pub use permissions::*;
diff --git a/src/database/permissions/channel.rs b/src/database/permissions/channel.rs
deleted file mode 100644
index 6427d741..00000000
--- a/src/database/permissions/channel.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum ChannelPermission {
-    View = 0b00000000000000000000000000000001,           // 1
-    SendMessage = 0b00000000000000000000000000000010,    // 2
-    ManageMessages = 0b00000000000000000000000000000100, // 4
-    ManageChannel = 0b00000000000000000000000000001000,  // 8
-    VoiceCall = 0b00000000000000000000000000010000,      // 16
-    InviteOthers = 0b00000000000000000000000000100000,   // 32
-    EmbedLinks = 0b00000000000000000000000001000000,     // 64
-    UploadFiles = 0b00000000000000000000000010000000,   // 128
-    Masquerade = 0b00000000000000000000000100000000,   // 256
-}
-
-lazy_static! {
-    pub static ref DEFAULT_PERMISSION_DM: u32 =
-        ChannelPermission::View
-        + ChannelPermission::SendMessage
-        + ChannelPermission::ManageChannel
-        + ChannelPermission::VoiceCall
-        + ChannelPermission::InviteOthers
-        + ChannelPermission::EmbedLinks
-        + ChannelPermission::UploadFiles
-        + ChannelPermission::Masquerade;
-
-    pub static ref DEFAULT_PERMISSION_SERVER: u32 =
-        ChannelPermission::View
-        + ChannelPermission::SendMessage
-        + ChannelPermission::VoiceCall
-        + ChannelPermission::InviteOthers
-        + ChannelPermission::EmbedLinks
-        + ChannelPermission::UploadFiles;
-}
-
-impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &ChannelPermission| -> u32 { *a | *b as u32 });
-
-bitfield! {
-    pub struct ChannelPermissions(MSB0 [u32]);
-    u32;
-    pub get_view, _: 31;
-    pub get_send_message, _: 30;
-    pub get_manage_messages, _: 29;
-    pub get_manage_channel, _: 28;
-    pub get_voice_call, _: 27;
-    pub get_invite_others, _: 26;
-    pub get_embed_links, _: 25;
-    pub get_upload_files, _: 24;
-    pub get_masquerade, _: 23;
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_channel(self) -> Result<u32> {
-        let channel = if let Some(channel) = self.channel {
-            channel
-        } else {
-            unreachable!()
-        };
-
-        match channel {
-            Channel::SavedMessages { user: owner, .. } => {
-                if &self.perspective.id == owner {
-                    Ok(u32::MAX)
-                } else {
-                    Ok(0)
-                }
-            }
-            Channel::DirectMessage { recipients, .. } => {
-                if recipients
-                    .iter()
-                    .find(|x| *x == &self.perspective.id)
-                    .is_some()
-                {
-                    if let Some(recipient) = recipients.iter().find(|x| *x != &self.perspective.id)
-                    {
-                        let perms = self.for_user(recipient).await?;
-
-                        if perms.get_send_message() {
-                            return Ok(*DEFAULT_PERMISSION_DM);
-                        }
-
-                        return Ok(ChannelPermission::View as u32);
-                    }
-                }
-
-                Ok(0)
-            }
-            Channel::Group { recipients, permissions, owner, .. } => {
-                if &self.perspective.id == owner {
-                    return Ok(*DEFAULT_PERMISSION_DM)
-                }
-
-                if recipients
-                    .iter()
-                    .find(|x| *x == &self.perspective.id)
-                    .is_some()
-                {
-                    if let Some(permissions) = permissions {
-                        Ok(permissions.clone() as u32)
-                    } else {
-                        Ok(*DEFAULT_PERMISSION_DM)
-                    }
-                } else {
-                    Ok(0)
-                }
-            }
-            Channel::TextChannel { server, default_permissions, role_permissions, .. }
-            | Channel::VoiceChannel { server, default_permissions, role_permissions, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-
-                if self.perspective.id == server.owner {
-                    Ok(u32::MAX)
-                } else {
-                    match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
-                        Ok(member) => {
-                            let mut perm = if let Some(permission) = default_permissions {
-                                *permission as u32
-                            } else {
-                                server.default_permissions.1 as u32
-                            };
-
-                            if let Some(roles) = member.roles {
-                                for role in roles {
-                                    if let Some(permission) = role_permissions.get(&role) {
-                                        perm |= *permission as u32;
-                                    }
-
-                                    if let Some(server_role) = server.roles.get(&role) {
-                                        perm |= server_role.permissions.1 as u32;
-                                    }
-                                }
-                            }
-
-                            Ok(perm)
-                        }
-                        Err(error) => {
-                            match &error {
-                                Error::NotFound => Ok(0),
-                                _ => Err(error)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub async fn for_channel(self) -> Result<ChannelPermissions<[u32; 1]>> {
-        Ok(ChannelPermissions([self.calculate_channel().await?]))
-    }
-}
diff --git a/src/database/permissions/mod.rs b/src/database/permissions/mod.rs
deleted file mode 100644
index d41e3a05..00000000
--- a/src/database/permissions/mod.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-pub use crate::database::*;
-
-pub mod channel;
-pub mod server;
-pub mod user;
-
-pub use user::get_relationship;
-
-pub struct PermissionCalculator<'a> {
-    perspective: &'a User,
-
-    user: Option<&'a User>,
-    relationship: Option<&'a RelationshipStatus>,
-    channel: Option<&'a Channel>,
-    server: Option<&'a Server>,
-    // member: Option<&'a Member>,
-
-    has_mutual_connection: bool,
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub fn new(perspective: &'a User) -> PermissionCalculator {
-        PermissionCalculator {
-            perspective,
-
-            user: None,
-            relationship: None,
-            channel: None,
-            server: None,
-            // member: None,
-
-            has_mutual_connection: false,
-        }
-    }
-
-    pub fn with_user(self, user: &'a User) -> PermissionCalculator {
-        PermissionCalculator {
-            user: Some(&user),
-            ..self
-        }
-    }
-
-    pub fn with_relationship(self, relationship: &'a RelationshipStatus) -> PermissionCalculator {
-        PermissionCalculator {
-            relationship: Some(&relationship),
-            ..self
-        }
-    }
-
-    pub fn with_channel(self, channel: &'a Channel) -> PermissionCalculator {
-        PermissionCalculator {
-            channel: Some(&channel),
-            ..self
-        }
-    }
-
-    pub fn with_server(self, server: &'a Server) -> PermissionCalculator {
-        PermissionCalculator {
-            server: Some(&server),
-            ..self
-        }
-    }
-
-    /* pub fn with_member(self, member: &'a Member) -> PermissionCalculator {
-        PermissionCalculator {
-            member: Some(&member),
-            ..self
-        }
-    } */
-
-    pub fn with_mutual_connection(self) -> PermissionCalculator<'a> {
-        PermissionCalculator {
-            has_mutual_connection: true,
-            ..self
-        }
-    }
-}
diff --git a/src/database/permissions/server.rs b/src/database/permissions/server.rs
deleted file mode 100644
index 2681b802..00000000
--- a/src/database/permissions/server.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-use super::Ref;
-
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum ServerPermission {
-    View = 0b00000000000000000000000000000001,           // 1
-    ManageRoles = 0b00000000000000000000000000000010,    // 2
-    ManageChannels = 0b00000000000000000000000000000100, // 4
-    ManageServer = 0b00000000000000000000000000001000,   // 8
-    KickMembers = 0b00000000000000000000000000010000,    // 16
-    BanMembers = 0b00000000000000000000000000100000,     // 32
-    // 6 bits of space
-    ChangeNickname = 0b00000000000000000001000000000000, // 4096
-    ManageNicknames = 0b00000000000000000010000000000000, // 8192
-    ChangeAvatar = 0b00000000000000000100000000000000,   // 16382
-    RemoveAvatars = 0b00000000000000001000000000000000,  // 32768
-                                                         // 16 bits of space
-}
-
-lazy_static! {
-    pub static ref DEFAULT_PERMISSION: u32 =
-        ServerPermission::View
-        + ServerPermission::ChangeNickname
-        + ServerPermission::ChangeAvatar;
-}
-
-impl_op_ex!(+ |a: &ServerPermission, b: &ServerPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &ServerPermission| -> u32 { *a | *b as u32 });
-
-bitfield! {
-    pub struct ServerPermissions(MSB0 [u32]);
-    u32;
-    pub get_view, _: 31;
-    pub get_manage_roles, _: 30;
-    pub get_manage_channels, _: 29;
-    pub get_manage_server, _: 28;
-    pub get_kick_members, _: 27;
-    pub get_ban_members, _: 26;
-
-    pub get_change_nickname, _: 19;
-    pub get_manage_nicknames, _: 18;
-    pub get_change_avatar, _: 17;
-    pub get_remove_avatars, _: 16;
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_server(self) -> Result<u32> {
-        let server = if let Some(server) = self.server {
-            server
-        } else {
-            unreachable!()
-        };
-
-        if self.perspective.id == server.owner {
-            Ok(u32::MAX)
-        } else {
-            match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
-                Ok(member) => {
-                    let mut perm = server.default_permissions.0 as u32;
-                    if let Some(roles) = member.roles {
-                        for role in roles {
-                            if let Some(server_role) = server.roles.get(&role) {
-                                perm |= server_role.permissions.0 as u32;
-                            }
-                        }
-                    }
-
-                    Ok(perm)
-                }
-                Err(error) => {
-                    match &error {
-                        Error::NotFound => Ok(0),
-                        _ => Err(error)
-                    }
-                }
-            }
-        }
-    }
-
-    pub async fn for_server(self) -> Result<ServerPermissions<[u32; 1]>> {
-        Ok(ServerPermissions([self.calculate_server().await?]))
-    }
-}
diff --git a/src/database/permissions/user.rs b/src/database/permissions/user.rs
deleted file mode 100644
index a37118e3..00000000
--- a/src/database/permissions/user.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-
-use mongodb::bson::doc;
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum UserPermission {
-    Access = 0b00000000000000000000000000000001,      // 1
-    ViewProfile = 0b00000000000000000000000000000010, // 2
-    SendMessage = 0b00000000000000000000000000000100, // 4
-    Invite = 0b00000000000000000000000000001000,      // 8
-}
-
-bitfield! {
-    pub struct UserPermissions(MSB0 [u32]);
-    u32;
-    pub get_access, _: 31;
-    pub get_view_profile, _: 30;
-    pub get_send_message, _: 29;
-    pub get_invite, _: 28;
-}
-
-impl_op_ex!(+ |a: &UserPermission, b: &UserPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &UserPermission| -> u32 { *a | *b as u32 });
-
-pub fn get_relationship(a: &User, b: &str) -> RelationshipStatus {
-    if a.id == b {
-        return RelationshipStatus::User;
-    }
-
-    if let Some(relations) = &a.relations {
-        if let Some(relationship) = relations.iter().find(|x| x.id == b) {
-            return relationship.status.clone();
-        }
-    }
-
-    RelationshipStatus::None
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_user(self, target: &str) -> Result<u32> {
-        if &self.perspective.id == target {
-            return Ok(u32::MAX);
-        }
-
-        let mut permissions: u32 = 0;
-        match self
-            .relationship
-            .clone()
-            .map(|v| v.to_owned())
-            .unwrap_or_else(|| get_relationship(&self.perspective, &target))
-        {
-            RelationshipStatus::Friend | RelationshipStatus::User => return Ok(u32::MAX),
-            RelationshipStatus::Blocked | RelationshipStatus::BlockedOther => {
-                return Ok(UserPermission::Access as u32)
-            }
-            RelationshipStatus::Incoming | RelationshipStatus::Outgoing => {
-                permissions = UserPermission::Access as u32;
-                // ! INFO: if we add boolean switch for permission to
-                // ! message people who have mutual, we need to get
-                // ! rid of this return statement.
-                // return Ok(permissions);
-            }
-            _ => {}
-        }
-
-        let check_server_overlap = async || {
-            let server_ids = User::fetch_server_ids(&self.perspective.id).await?;
-
-            Ok(
-                get_collection("server_members")
-                    .find_one(
-                        doc! {
-                            "_id.user": &target,
-                            "_id.server": {
-                                "$in": server_ids
-                            }
-                        },
-                        None
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "find_one",
-                        with: "server_members",
-                    })?
-                    .is_some()
-            )
-        };
-
-        if self.has_mutual_connection
-            || check_server_overlap().await?
-            || get_collection("channels")
-                .find_one(
-                    doc! {
-                        "channel_type": {
-                            "$in": ["Group", "DirectMessage"]
-                        },
-                        "recipients": {
-                            "$all": [ &self.perspective.id, target ]
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "find_one",
-                    with: "channels",
-                })?
-                .is_some()
-        {
-            // ! FIXME: add privacy settings
-            return Ok(UserPermission::Access + UserPermission::ViewProfile);
-        }
-
-        Ok(permissions)
-    }
-
-    pub async fn for_user(self, target: &str) -> Result<UserPermissions<[u32; 1]>> {
-        Ok(UserPermissions([self.calculate_user(&target).await?]))
-    }
-
-    pub async fn for_user_given(self) -> Result<UserPermissions<[u32; 1]>> {
-        let id = &self.user.unwrap().id;
-        Ok(UserPermissions([self.calculate_user(&id).await?]))
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 00c616c6..678ad385 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,41 +1,29 @@
-#![feature(proc_macro_hygiene, decl_macro)]
-#![feature(async_closure)]
-#![feature(const_option)]
-
 #[macro_use]
 extern crate rocket;
 #[macro_use]
+extern crate rocket_okapi;
+#[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate lazy_static;
-#[macro_use]
-extern crate impl_ops;
-#[macro_use]
-extern crate bitfield;
 extern crate ctrlc;
 
-pub mod database;
-pub mod notifications;
 pub mod routes;
-pub mod redis;
 pub mod util;
 pub mod version;
-pub mod task_queue;
 
-use async_std::task;
-use futures::join;
 use log::info;
 use rauth::{
     config::{Captcha, Config, EmailVerification, SMTPSettings, Template, Templates},
     logic::Auth,
 };
-use std::str::FromStr;
-use rocket_cors::AllowedOrigins;
-use util::variables::{
+use revolt_quark::variables::delta::{
     APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME,
     USE_EMAIL, USE_HCAPTCHA,
 };
-use crate::util::ratelimit::RatelimitState;
+use revolt_quark::DatabaseInfo;
+use rocket_cors::AllowedOrigins;
+use std::str::FromStr;
 
 #[async_std::main]
 async fn main() {
@@ -43,33 +31,19 @@ async fn main() {
     env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "info"));
 
     info!(
-        "Starting REVOLT server [version {}].",
+        "Starting Revolt server [version {}].",
         crate::version::VERSION
     );
 
-    util::variables::preflight_checks();
-    database::connect().await;
-    redis::connect().await;
-    notifications::hive::init_hive().await;
-    task_queue::start_queues().await;
+    revolt_quark::variables::delta::preflight_checks();
 
+    #[cfg(debug_assertions)]
     ctrlc::set_handler(move || {
         // Force ungraceful exit to avoid hang.
         std::process::exit(0);
     })
     .expect("Error setting Ctrl-C handler");
 
-    let web_task = task::spawn(launch_web());
-    let hive_task = task::spawn_local(notifications::hive::listen());
-
-    join!(
-        web_task,
-        hive_task,
-        notifications::websocket::launch_server()
-    );
-}
-
-async fn launch_web() {
     let cors = rocket_cors::CorsOptions {
         allowed_origins: AllowedOrigins::All,
         allowed_methods: [
@@ -99,13 +73,13 @@ async fn launch_web() {
                 templates: Templates {
                     verify: Template {
                         title: "Verify your Revolt account.".into(),
-                        text: include_str!("../assets/templates/verify.txt").into(),
+                        text: include_str!(crate::asset!("templates/verify.txt")).into(),
                         url: format!("{}/login/verify/", *APP_URL),
                         html: None,
                     },
                     reset: Template {
                         title: "Reset your Revolt password.".into(),
-                        text: include_str!("../assets/templates/reset.txt").into(),
+                        text: include_str!(crate::asset!("templates/reset.txt")).into(),
                         url: format!("{}/login/reset/", *APP_URL),
                         html: None,
                     },
@@ -128,17 +102,49 @@ async fn launch_web() {
         };
     }
 
-    let auth = Auth::new(database::get_db(), config);
+    let db = DatabaseInfo::Auto.connect().await.unwrap();
+    db.migrate_database().await.unwrap();
+
+    // This is entirely temporary code until rauth is migrated to quark.
+    // (and / or otherwise gets updated to MongoDB v2 driver)
+    let mongo_db = mongodb::Client::with_uri_str(
+        &std::env::var("MONGODB").unwrap_or_else(|_| "mongodb://localhost".to_string()),
+    )
+    .await
+    .expect("Failed to init db connection.");
+
+    rauth::entities::sync_models(&mongo_db.database("revolt")).await;
+
+    // Launch background task workers.
+    async_std::task::spawn(revolt_quark::tasks::start_workers(db.clone()));
+
+    let auth = Auth::new(mongo_db.database("revolt"), config);
     let rocket = rocket::build();
     routes::mount(rocket)
         .mount("/", rocket_cors::catch_all_options_routes())
-        .mount("/auth/account", rauth::web::account::routes())
-        .mount("/auth/session", rauth::web::session::routes())
+        .mount("/", util::ratelimiter::routes())
+        .mount(
+            "/swagger/",
+            rocket_okapi::swagger_ui::make_swagger_ui(&rocket_okapi::swagger_ui::SwaggerUIConfig {
+                url: "../openapi.json".to_owned(),
+                ..Default::default()
+            }),
+        )
         .manage(auth)
+        .manage(db)
         .manage(cors.clone())
-        .manage(RatelimitState::new())
+        .attach(util::ratelimiter::RatelimitFairing)
         .attach(cors)
         .launch()
         .await
         .unwrap();
 }
+
+/// Resolve asset
+macro_rules! asset {
+    ($path:literal) => {
+        concat!(env!("CARGO_MANIFEST_DIR"), "/assets/", $path)
+    };
+}
+
+pub(crate) use asset;
diff --git a/src/notifications/events.rs b/src/notifications/events.rs
deleted file mode 100644
index 6660ebaf..00000000
--- a/src/notifications/events.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use hive_pubsub::PubSub;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-use super::hive::{get_hive, subscribe_if_exists};
-use crate::{database::*, util::result::Result};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "error")]
-pub enum WebSocketError {
-    LabelMe,
-    InternalError { at: String },
-    InvalidSession,
-    OnboardingNotFinished,
-    AlreadyAuthenticated,
-    MalformedData { msg: String },
-}
-
-#[derive(Deserialize, Debug)]
-pub struct Auth {
-    pub token: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum Ping {
-    Binary(Vec<u8>),
-    Number(usize)
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type")]
-pub enum ServerboundNotification {
-    Authenticate(Auth),
-    BeginTyping { channel: String },
-    EndTyping { channel: String },
-    Ping { data: Ping, responded: Option<()> },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveUserField {
-    ProfileContent,
-    ProfileBackground,
-    StatusText,
-    Avatar,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveChannelField {
-    Icon,
-    Description,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveServerField {
-    Icon,
-    Banner,
-    Description,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveRoleField {
-    Colour,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveMemberField {
-    Nickname,
-    Avatar,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveBotField {
-    InteractionsURL,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum ClientboundNotification {
-    Error(WebSocketError),
-    Authenticated,
-    Ready {
-        users: Vec<User>,
-        servers: Vec<Server>,
-        channels: Vec<Channel>,
-        members: Vec<Member>,
-    },
-    Pong { data: Ping },
-
-    Message(Message),
-    MessageUpdate {
-        id: String,
-        channel: String,
-        data: Value,
-    },
-    MessageDelete {
-        id: String,
-        channel: String,
-    },
-
-    ChannelCreate(Channel),
-    ChannelUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveChannelField>,
-    },
-    ChannelDelete {
-        id: String,
-    },
-    ChannelGroupJoin {
-        id: String,
-        user: String,
-    },
-    ChannelGroupLeave {
-        id: String,
-        user: String,
-    },
-    ChannelStartTyping {
-        id: String,
-        user: String,
-    },
-    ChannelStopTyping {
-        id: String,
-        user: String,
-    },
-    ChannelAck {
-        id: String,
-        user: String,
-        message_id: String,
-    },
-
-    ServerUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveServerField>,
-    },
-    ServerDelete {
-        id: String,
-    },
-    ServerMemberUpdate {
-        id: MemberCompositeKey,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveMemberField>,
-    },
-    ServerMemberJoin {
-        id: String,
-        user: String,
-    },
-    ServerMemberLeave {
-        id: String,
-        user: String,
-    },
-    ServerRoleUpdate {
-        id: String,
-        role_id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveRoleField>,
-    },
-    ServerRoleDelete {
-        id: String,
-        role_id: String,
-    },
-
-    UserUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveUserField>,
-    },
-    UserRelationship {
-        id: String,
-        user: User,
-        status: RelationshipStatus,
-    },
-    UserSettingsUpdate {
-        id: String,
-        update: Value,
-    },
-}
-
-impl ClientboundNotification {
-    pub fn publish(self, topic: String) {
-        async_std::task::spawn(async move {
-            prehandle_hook(&self).await.ok(); // ! FIXME: this should be moved to pubsub
-            hive_pubsub::backend::redis::publish(get_hive(), topic, self)
-                .await
-                .ok();
-        });
-    }
-
-    pub fn publish_as_user(self, user: String) {
-        self.clone().publish(user.clone());
-
-        async_std::task::spawn(async move {
-            if let Ok(server_ids) = User::fetch_server_ids(&user).await {
-                for server in server_ids {
-                    self.clone().publish(server.clone());
-                }
-            }
-        });
-    }
-}
-
-pub async fn prehandle_hook(notification: &ClientboundNotification) -> Result<()> {
-    match &notification {
-        ClientboundNotification::ChannelGroupJoin { id, user } => {
-            subscribe_if_exists(user.clone(), id.clone()).ok();
-        }
-        ClientboundNotification::ChannelCreate(channel) => {
-            let channel_id = channel.id();
-            match &channel {
-                Channel::SavedMessages { user, .. } => {
-                    subscribe_if_exists(user.clone(), channel_id.to_string()).ok();
-                }
-                Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
-                    for recipient in recipients {
-                        subscribe_if_exists(recipient.clone(), channel_id.to_string()).ok();
-                    }
-                }
-                Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
-                    // ! FIXME: write a better algorithm?
-                    let members = Server::fetch_member_ids(server).await?;
-                    for member in members {
-                        subscribe_if_exists(member.clone(), channel_id.to_string()).ok();
-                    }
-                }
-            }
-        }
-        ClientboundNotification::ServerMemberJoin { id, user } => {
-            let server = Ref::from_unchecked(id.clone()).fetch_server().await?;
-
-            subscribe_if_exists(user.clone(), id.clone()).ok();
-
-            for channel in server.channels {
-                subscribe_if_exists(user.clone(), channel).ok();
-            }
-        }
-        ClientboundNotification::UserRelationship { id, user, status } => {
-            if status != &RelationshipStatus::None {
-                subscribe_if_exists(id.clone(), user.id.clone()).ok();
-            }
-        }
-        _ => {}
-    }
-
-    Ok(())
-}
-
-pub async fn posthandle_hook(notification: &ClientboundNotification) {
-    match &notification {
-        ClientboundNotification::ChannelDelete { id } => {
-            get_hive().hive.drop_topic(&id).ok();
-        }
-        ClientboundNotification::ChannelGroupLeave { id, user } => {
-            get_hive().hive.unsubscribe(user, id).ok();
-        }
-        ClientboundNotification::ServerDelete { id } => {
-            get_hive().hive.drop_topic(&id).ok();
-        }
-        ClientboundNotification::ServerMemberLeave { id, user } => {
-            get_hive().hive.unsubscribe(user, id).ok();
-
-            if let Ok(server) = Ref::from_unchecked(id.clone()).fetch_server().await {
-                for channel in server.channels {
-                    get_hive().hive.unsubscribe(user, &channel).ok();
-                }
-            }
-        }
-        ClientboundNotification::UserRelationship { id, user, status } => {
-            if status == &RelationshipStatus::None {
-                get_hive().hive.unsubscribe(id, &user.id).ok();
-            }
-        }
-        _ => {}
-    }
-}
diff --git a/src/notifications/hive.rs b/src/notifications/hive.rs
deleted file mode 100644
index 80652a83..00000000
--- a/src/notifications/hive.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use super::{events::ClientboundNotification, websocket};
-use crate::redis::get_pool;
-use crate::util::variables::REDIS_URI;
-
-use futures::FutureExt;
-use hive_pubsub::backend::redis::RedisPubSub;
-use hive_pubsub::PubSub;
-use log::{debug, error};
-use once_cell::sync::OnceCell;
-use serde_json::to_string;
-
-type Hive<'a> = RedisPubSub<'a, String, String, ClientboundNotification>;
-static HIVE: OnceCell<Hive<'static>> = OnceCell::new();
-
-pub async fn init_hive() {
-    let pubsub_con = redis::Client::open(REDIS_URI.to_string()).unwrap().get_async_connection().await.unwrap().into_pubsub();
-
-    let hive = RedisPubSub::new(
-        |ids, notification: ClientboundNotification| {
-            let notif = notification.clone();
-            async_std::task::spawn(async move {
-                super::events::posthandle_hook(&notif).await;
-            });
-
-            if let Ok(data) = to_string(&notification) {
-                debug!("Pushing out notification. {}", data);
-                websocket::publish(ids, notification);
-            } else {
-                error!("Failed to serialise notification.");
-            }
-        },
-        get_pool(),
-        Arc::new(Mutex::new(pubsub_con))
-    );
-
-    if HIVE.set(hive).is_err() {
-        panic!("Failed to set global pubsub instance.");
-    }
-}
-
-pub async fn listen() {
-    HIVE.get()
-        .unwrap()
-        .clone()
-        .listen()
-        .fuse()
-        .await
-        .expect("Hive hit an error");
-}
-
-pub fn subscribe_multiple(user: String, topics: Vec<String>) -> Result<(), String> {
-    let hive = HIVE.get().unwrap();
-    for topic in topics {
-        hive.subscribe(user.clone(), topic)?;
-    }
-
-    Ok(())
-}
-
-pub fn subscribe_if_exists(user: String, topic: String) -> Result<(), String> {
-    let hive = HIVE.get().unwrap();
-    if hive.hive.map.lock().unwrap().get_left(&user).is_some() {
-        hive.subscribe(user, topic)?;
-    }
-
-    Ok(())
-}
-
-pub fn get_hive() -> &'static Hive<'static> {
-    HIVE.get().unwrap()
-}
diff --git a/src/notifications/mod.rs b/src/notifications/mod.rs
deleted file mode 100644
index 577bb11a..00000000
--- a/src/notifications/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod events;
-pub mod hive;
-pub mod payload;
-pub mod subscriptions;
-pub mod websocket;
diff --git a/src/notifications/payload.rs b/src/notifications/payload.rs
deleted file mode 100644
index 4a5704aa..00000000
--- a/src/notifications/payload.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use std::collections::HashSet;
-
-use crate::{database::*, notifications::events::ClientboundNotification};
-use crate::{
-    database::{entities::User, get_collection},
-    util::result::{Error, Result},
-};
-use futures::StreamExt;
-use mongodb::bson::{doc, from_document};
-
-pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
-    let mut user_ids: HashSet<String> = HashSet::new();
-
-    if let Some(relationships) = &user.relations {
-        user_ids.extend(
-            relationships
-                .iter()
-                .map(|relationship| relationship.id.clone()),
-        );
-    }
-
-    let members = User::fetch_memberships(&user.id).await?;
-    let server_ids: Vec<String> = members.iter()
-        .map(|x| x.id.server.clone())
-        .collect();
-    
-    let mut cursor = get_collection("servers")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": server_ids
-                }
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "servers",
-        })?;
-
-    let mut servers = vec![];
-    let mut channel_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let server: Server = from_document(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "server",
-            })?;
-
-            channel_ids.extend(server.channels.iter().cloned());
-            servers.push(server);
-        }
-    }
-
-    let mut cursor = get_collection("channels")
-        .find(
-            doc! {
-                "$or": [
-                    {
-                        "_id": {
-                            "$in": channel_ids
-                        }
-                    },
-                    {
-                        "channel_type": "SavedMessages",
-                        "user": &user.id
-                    },
-                    {
-                        "channel_type": "DirectMessage",
-                        "recipients": &user.id
-                    },
-                    {
-                        "channel_type": "Group",
-                        "recipients": &user.id
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "channels",
-        })?;
-
-    let mut channels = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let channel = from_document(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "channel",
-            })?;
-
-            if let Channel::Group { recipients, .. } = &channel {
-                user_ids.extend(recipients.iter().cloned());
-            } else if let Channel::DirectMessage { recipients, .. } = &channel {
-                user_ids.extend(recipients.iter().cloned());
-            }
-
-            channels.push(channel);
-        }
-    }
-
-    user_ids.remove(&user.id);
-    let mut users = if user_ids.len() > 0 {
-        user.fetch_multiple_users(&user_ids.into_iter().collect::<Vec<String>>())
-            .await?
-    } else {
-        vec![]
-    };
-
-    user.relationship = Some(RelationshipStatus::User);
-    user.online = Some(true);
-    
-    users.push(user.apply_badges());
-
-    Ok(ClientboundNotification::Ready {
-        users,
-        servers,
-        channels,
-        members
-    })
-}
diff --git a/src/notifications/subscriptions.rs b/src/notifications/subscriptions.rs
deleted file mode 100644
index ba56057b..00000000
--- a/src/notifications/subscriptions.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use crate::database::*;
-
-use super::hive::get_hive;
-use futures::StreamExt;
-use hive_pubsub::PubSub;
-use mongodb::bson::doc;
-use mongodb::bson::Document;
-use mongodb::options::FindOptions;
-
-pub async fn generate_subscriptions(user: &User) -> Result<(), String> {
-    let hive = get_hive();
-    hive.subscribe(user.id.clone(), user.id.clone())?;
-
-    if let Some(relations) = &user.relations {
-        for relation in relations {
-            hive.subscribe(user.id.clone(), relation.id.clone())?;
-        }
-    }
-
-    let server_ids = User::fetch_server_ids(&user.id)
-        .await
-        .map_err(|_| "Failed to fetch memberships.".to_string())?;
-
-    let channel_ids = get_collection("servers")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": &server_ids
-                }
-            },
-            None,
-        )
-        .await
-        .map_err(|_| "Failed to fetch servers.".to_string())?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| {
-            x.get_array("channels").ok().map(|v| {
-                v.into_iter()
-                    .filter_map(|x| x.as_str().map(|x| x.to_string()))
-                    .collect::<Vec<String>>()
-            })
-        })
-        .flatten()
-        .collect::<Vec<String>>();
-
-    for id in server_ids {
-        hive.subscribe(user.id.clone(), id)?;
-    }
-
-    for id in channel_ids {
-        hive.subscribe(user.id.clone(), id)?;
-    }
-
-    let mut cursor = get_collection("channels")
-        .find(
-            doc! {
-                "$or": [
-                    {
-                        "channel_type": "SavedMessages",
-                        "user": &user.id
-                    },
-                    {
-                        "channel_type": "DirectMessage",
-                        "recipients": &user.id
-                    },
-                    {
-                        "channel_type": "Group",
-                        "recipients": &user.id
-                    }
-                ]
-            },
-            FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-        )
-        .await
-        .map_err(|_| "Failed to fetch channels.".to_string())?;
-
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            hive.subscribe(user.id.clone(), doc.get_str("_id").unwrap().to_string())?;
-        }
-    }
-
-    Ok(())
-}
diff --git a/src/notifications/websocket.rs b/src/notifications/websocket.rs
deleted file mode 100644
index 322d699e..00000000
--- a/src/notifications/websocket.rs
+++ /dev/null
@@ -1,393 +0,0 @@
-use crate::database::*;
-use crate::notifications::events::Ping;
-use crate::util::variables::WS_HOST;
-
-use super::subscriptions;
-
-use async_std::net::{TcpListener, TcpStream};
-use async_std::task;
-use async_tungstenite::tungstenite::{handshake::server, Message};
-use futures::channel::{
-    mpsc::{unbounded, UnboundedSender},
-    oneshot,
-};
-use futures::stream::TryStreamExt;
-use futures::{pin_mut, prelude::*};
-use hive_pubsub::PubSub;
-use log::{debug, info};
-use many_to_many::ManyToMany;
-use mongodb::bson::doc;
-use rauth::entities::{Model, Session};
-use rmp_serde;
-use std::collections::HashMap;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex, RwLock};
-use url::Url;
-
-use super::{
-    events::{ClientboundNotification, ServerboundNotification, WebSocketError},
-    hive::get_hive,
-};
-
-type Tx = UnboundedSender<Message>;
-type PeerMap = Arc<Mutex<HashMap<SocketAddr, (Tx, MSGFormat)>>>;
-
-lazy_static! {
-    static ref CONNECTIONS: PeerMap = Arc::new(Mutex::new(HashMap::new()));
-    static ref USERS: Arc<RwLock<ManyToMany<String, SocketAddr>>> =
-        Arc::new(RwLock::new(ManyToMany::new()));
-}
-
-pub async fn launch_server() {
-    let try_socket = TcpListener::bind(WS_HOST.to_string()).await;
-    let listener = try_socket.expect("Failed to bind");
-    info!("Listening on: {}", *WS_HOST);
-
-    while let Ok((stream, _)) = listener.accept().await {
-        task::spawn(accept(stream));
-    }
-}
-
-#[derive(Debug, Clone)]
-enum MSGFormat {
-    JSON,
-    MSGPACK,
-}
-
-struct HeaderCallback {
-    sender: oneshot::Sender<MSGFormat>,
-}
-
-impl server::Callback for HeaderCallback {
-    fn on_request(
-        self,
-        request: &server::Request,
-        response: server::Response,
-    ) -> Result<server::Response, server::ErrorResponse> {
-        // we dont get some of the data sometimes so im generating a fake url with the only data we actually need
-        let url = format!(
-            "ws://example.com?{}",
-            request.uri().query().unwrap_or("?format=json")
-        );
-        let mut query: HashMap<_, _> = url
-            .parse::<Url>()
-            .unwrap()
-            .query_pairs()
-            .into_owned()
-            .collect(); // should be safe to use unwrap here as we just made the url ourself
-        let format_query: Option<String> = query.remove("format");
-
-        let format = match format_query.as_deref().unwrap_or("json") {
-            "msgpack" => MSGFormat::MSGPACK,
-            "json" => MSGFormat::JSON,
-            _ => MSGFormat::JSON, // Fallback to JSON.
-        };
-
-        if self.sender.send(format).is_ok() {
-            Ok(response)
-        } else {
-            Err(server::ErrorResponse::new(None))
-        }
-    }
-}
-
-async fn accept(stream: TcpStream) {
-    let addr = stream
-        .peer_addr()
-        .expect("Connected streams should have a peer address.");
-    let (sender, receiver) = oneshot::channel::<MSGFormat>();
-
-    let ws_stream =
-        async_tungstenite::accept_hdr_async_with_config(stream, HeaderCallback { sender }, None)
-            .await
-            .expect("Error during websocket handshake.");
-
-    let msg_format = receiver.await.unwrap(); // TODO: not use unwrap
-
-    info!("User established WebSocket connection from {}.", &addr);
-
-    let (write, read) = ws_stream.split();
-    let (tx, rx) = unbounded();
-    CONNECTIONS.lock().unwrap().insert(addr, (tx.clone(), msg_format.clone()));
-
-    let send = |notification: ClientboundNotification| {
-        let res = match msg_format {
-            MSGFormat::JSON => match serde_json::to_string(&notification) {
-                Ok(s) => Message::Text(s),
-                Err(_) => return
-            }
-            MSGFormat::MSGPACK => match rmp_serde::to_vec_named(&notification) {
-                Ok(v) => Message::Binary(v),
-                Err(_) => return,
-            },
-        };
-
-        if let Err(_) = tx.unbounded_send(res) {
-            debug!("Failed unbounded_send to websocket stream.");
-        }
-    };
-
-    let user_id: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
-    let mutex_generator = || user_id.clone();
-    let fwd = rx.map(Ok).forward(write);
-    let incoming = read.try_for_each(async move |msg| {
-        let mutex = mutex_generator();
-
-        let maybe_decoded = match msg {
-            Message::Text(text) => {
-                serde_json::from_str::<ServerboundNotification>(&text).map_err(|e| e.to_string())
-            }
-            Message::Binary(vec) => {
-                rmp_serde::decode::from_read::<&[u8], ServerboundNotification>(vec.as_slice())
-                    .map_err(|e| e.to_string())
-            }
-            Message::Ping(vec) => Ok(ServerboundNotification::Ping { data: Ping::Binary(vec), responded: Some(()) }),
-            _ => return Ok(()),
-        };
-
-        let notification = match maybe_decoded {
-            Err(why) => {
-                send(ClientboundNotification::Error(
-                    WebSocketError::MalformedData {
-                        msg: why.to_string(),
-                    },
-                ));
-                return Ok(());
-            }
-            Ok(n) => n,
-        };
-
-        match notification {
-            ServerboundNotification::Authenticate(auth) => {
-                {
-                    if mutex.lock().unwrap().is_some() {
-                        send(ClientboundNotification::Error(
-                            WebSocketError::AlreadyAuthenticated,
-                        ));
-
-                        return Ok(());
-                    }
-                }
-
-                let id = if let Ok(Some(session)) =
-                    Session::find_one(&get_db(), doc! { "token": &auth.token }, None).await
-                {
-                    Some(session.user_id)
-                } else if let Ok(Some(bot)) = get_collection("bots")
-                    .find_one(doc! { "token": auth.token }, None)
-                    .await
-                {
-                    Some(bot.get_str("_id").unwrap().to_string())
-                } else {
-                    None
-                };
-
-                if let Some(id) = id {
-                    if let Ok(user) = (Ref { id: id.clone() }).fetch_user().await {
-                        let is_invisible = if let Some(status) = &user.status {
-                            if let Some(presence) = &status.presence {
-                                presence == &Presence::Invisible
-                            } else {
-                                false
-                            }
-                        } else {
-                            false
-                        };
-
-                        let was_online = is_online(&id);
-
-                        {
-                            match USERS.write() {
-                                Ok(mut map) => {
-                                    map.insert(id.clone(), addr);
-                                }
-                                Err(_) => {
-                                    send(ClientboundNotification::Error(
-                                        WebSocketError::InternalError {
-                                            at: "Writing users map.".to_string(),
-                                        },
-                                    ));
-
-                                    return Ok(());
-                                }
-                            }
-                        }
-
-                        *mutex.lock().unwrap() = Some(id.clone());
-
-                        if let Err(_) = subscriptions::generate_subscriptions(&user).await {
-                            send(ClientboundNotification::Error(
-                                WebSocketError::InternalError {
-                                    at: "Generating subscriptions.".to_string(),
-                                },
-                            ));
-
-                            return Ok(());
-                        }
-
-                        send(ClientboundNotification::Authenticated);
-
-                        match super::payload::generate_ready(user).await {
-                            Ok(payload) => {
-                                send(payload);
-
-                                if !was_online && !is_invisible {
-                                    ClientboundNotification::UserUpdate {
-                                        id: id.clone(),
-                                        data: json!({
-                                            "online": true
-                                        }),
-                                        clear: None,
-                                    }
-                                    .publish_as_user(id);
-                                }
-                            }
-                            Err(_) => {
-                                send(ClientboundNotification::Error(
-                                    WebSocketError::InternalError {
-                                        at: "Generating payload.".to_string(),
-                                    },
-                                ));
-
-                                return Ok(());
-                            }
-                        }
-                    } else {
-                        send(ClientboundNotification::Error(
-                            WebSocketError::OnboardingNotFinished,
-                        ));
-                    }
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::InvalidSession,
-                    ));
-                }
-            }
-            // ! TEMP: verify user part of channel
-            // ! Could just run permission check here.
-            ServerboundNotification::BeginTyping { channel } => {
-                if mutex.lock().unwrap().is_some() {
-                    let user = {
-                        let mutex = mutex.lock().unwrap();
-                        mutex.as_ref().unwrap().clone()
-                    };
-
-                    ClientboundNotification::ChannelStartTyping {
-                        id: channel.clone(),
-                        user,
-                    }
-                    .publish(channel);
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::AlreadyAuthenticated,
-                    ));
-
-                    return Ok(());
-                }
-            }
-            ServerboundNotification::EndTyping { channel } => {
-                if mutex.lock().unwrap().is_some() {
-                    let user = {
-                        let mutex = mutex.lock().unwrap();
-                        mutex.as_ref().unwrap().clone()
-                    };
-
-                    ClientboundNotification::ChannelStopTyping {
-                        id: channel.clone(),
-                        user,
-                    }
-                    .publish(channel);
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::AlreadyAuthenticated,
-                    ));
-
-                    return Ok(());
-                }
-            }
-            ServerboundNotification::Ping { data, responded } => {
-                debug!("Ping received from connection {}. Payload: {:?}", &addr, data);
-
-                if responded.is_none() {
-                    send(ClientboundNotification::Pong { data });
-                }
-            }
-        }
-        Ok(())
-    });
-
-    pin_mut!(fwd, incoming);
-    future::select(fwd, incoming).await;
-
-    info!("User {} disconnected.", &addr);
-    CONNECTIONS.lock().unwrap().remove(&addr);
-
-    let mut offline = None;
-    {
-        let user_id = user_id.lock().unwrap();
-        if let Some(user_id) = user_id.as_ref() {
-            let mut users = USERS.write().unwrap();
-            users.remove(&user_id, &addr);
-            if users.get_left(&user_id).is_none() {
-                get_hive().drop_client(&user_id).unwrap();
-                offline = Some(user_id.clone());
-            }
-        }
-    }
-
-    if let Some(id) = offline {
-        ClientboundNotification::UserUpdate {
-            id: id.clone(),
-            data: json!({
-                "online": false
-            }),
-            clear: None,
-        }
-        .publish_as_user(id);
-    }
-}
-
-pub fn publish(ids: Vec<String>, notification: ClientboundNotification) {
-    let mut targets = vec![];
-    {
-        let users = USERS.read().unwrap();
-        for id in ids {
-            // Block certain notifications from reaching users that aren't meant to see them.
-            match &notification {
-                ClientboundNotification::UserRelationship { id: user_id, .. }
-                | ClientboundNotification::UserSettingsUpdate { id: user_id, .. }
-                | ClientboundNotification::ChannelAck { user: user_id, .. } => {
-                    if &id != user_id {
-                        continue;
-                    }
-                }
-                _ => {}
-            }
-
-            if let Some(mut arr) = users.get_left(&id) {
-                targets.append(&mut arr);
-            }
-        }
-    }
-
-    let json_msg = Message::Text(serde_json::to_string(&notification).unwrap());
-    let msgpack_msg = Message::Binary(rmp_serde::to_vec_named(&notification).unwrap());
-
-    let connections = CONNECTIONS.lock().unwrap();
-    for target in targets {
-        if let Some((conn, msg_format)) = connections.get(&target) {
-            let msg = match msg_format {
-                MSGFormat::JSON => json_msg.clone(),
-                MSGFormat::MSGPACK => msgpack_msg.clone()
-            };
-
-            if let Err(_) = conn.unbounded_send(msg) {
-                debug!("Failed unbounded_send.");
-            }
-        }
-    }
-}
-
-pub fn is_online(user: &String) -> bool {
-    USERS.read().unwrap().get_left(&user).is_some()
-}
diff --git a/src/redis/mod.rs b/src/redis/mod.rs
deleted file mode 100644
index 912d3500..00000000
--- a/src/redis/mod.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::util::variables::REDIS_URI;
-
-use mobc::Pool;
-use mobc_redis::RedisConnectionManager;
-use once_cell::sync::OnceCell;
-
-static REDISPOOL: OnceCell<Pool<RedisConnectionManager>> = OnceCell::new();
-
-pub async fn connect() {
-    let client = mobc_redis::redis::Client::open(REDIS_URI.to_string()).unwrap();
-    let manager = mobc_redis::RedisConnectionManager::new(client);
-    let pool = mobc::Pool::builder().max_open(100).build(manager);
-    REDISPOOL.set(pool).ok().unwrap();
-}
-
-pub fn get_pool() -> &'static Pool<RedisConnectionManager> {
-    REDISPOOL.get().unwrap()
-}
diff --git a/src/routes/bots/create.rs b/src/routes/bots/create.rs
index 4192a17f..3583502a 100644
--- a/src/routes/bots/create.rs
+++ b/src/routes/bots/create.rs
@@ -1,89 +1,65 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_BOT_COUNT;
 use crate::util::regex::RE_USERNAME;
 
-use mongodb::bson::{doc, to_document};
-use rocket::serde::json::{Json, Value};
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
 use nanoid::nanoid;
+use revolt_quark::{
+    models::{user::BotInformation, Bot, User},
+    variables::delta::MAX_BOT_COUNT,
+    Db, Error, Result,
+};
+
+use rocket::serde::json::Json;
+use serde::Deserialize;
+use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Bot Details
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateBot {
+    /// Bot username
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     name: String,
 }
 
+/// # Create Bot
+///
+/// Create a new Revolt bot.
+#[openapi(tag = "Bots")]
 #[post("/create", data = "<info>")]
-pub async fn create_bot(user: User, info: Json<Data>) -> Result<Value> {
+pub async fn create_bot(db: &Db, user: User, info: Json<DataCreateBot>) -> Result<Json<Bot>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
+
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if get_collection("bots")
-        .count_documents(
-            doc! {
-                "owner": &user.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "count_documents",
-            with: "bots",
-        })? as usize >= *MAX_BOT_COUNT {
-        return Err(Error::ReachedMaximumBots)
+    if db.get_number_of_bots_by_user(&user.id).await? >= *MAX_BOT_COUNT {
+        return Err(Error::ReachedMaximumBots);
     }
 
-    let id = Ulid::new().to_string();
-    let token = nanoid!(64);
-    let bot = Bot {
-        id: id.clone(),
-        owner: user.id.clone(),
-        token,
-        public: false,
-        analytics: false,
-        discoverable: false,
-        interactions_url: None
-    };
-
-    if User::is_username_taken(&info.name).await? {
+    if db.is_username_taken(&info.name).await? {
         return Err(Error::UsernameTaken);
     }
 
-    get_collection("users")
-        .insert_one(
-            doc! {
-                "_id": &id,
-                "username": &info.name,
-                "bot": {
-                    "owner": &user.id
-                }
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
+    let id = Ulid::new().to_string();
+    let bot_user = User {
+        id: id.clone(),
+        username: info.name,
+        bot: Some(BotInformation {
+            owner: user.id.clone(),
+        }),
+        ..Default::default()
+    };
 
-    get_collection("bots")
-        .insert_one(
-            to_document(&bot).map_err(|_| Error::DatabaseError { with: "bot", operation: "to_document" })?,
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
+    let bot = Bot {
+        id,
+        owner: user.id,
+        token: nanoid!(64),
+        ..Default::default()
+    };
 
-    Ok(json!(bot))
+    db.insert_user(&bot_user).await?;
+    db.insert_bot(&bot).await?;
+    Ok(Json(bot))
 }
diff --git a/src/routes/bots/delete.rs b/src/routes/bots/delete.rs
index c374fe4d..445deaa6 100644
--- a/src/routes/bots/delete.rs
+++ b/src/routes/bots/delete.rs
@@ -1,67 +1,19 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, EmptyResponse, Result};
-
-use mongodb::bson::doc;
+use revolt_quark::{models::User, Db, EmptyResponse, Error, Ref, Result};
 
+/// # Delete Bot
+///
+/// Delete a bot by its id.
+#[openapi(tag = "Bots")]
 #[delete("/<target>")]
-pub async fn delete_bot(user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn delete_bot(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
-    let bot = target.fetch_bot().await?;
+
+    let bot = target.as_bot(db).await?;
     if bot.owner != user.id {
-        return Err(Error::MissingPermission);
+        return Err(Error::NotFound);
     }
 
-    let username = format!("Deleted User {}", &bot.id);
-    get_collection("users")
-        .update_one(
-            doc! {
-                "_id": &bot.id
-            },
-            doc! {
-                "$set": {
-                    "username": &username,
-                    "flags": 2
-                },
-                "$unset": {
-                    "avatar": 1,
-                    "status": 1,
-                    "profile": 1
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "user",
-            operation: "update_one"
-        })?;
-
-    ClientboundNotification::UserUpdate {
-        id: target.id.clone(),
-        data: json!({
-            "username": username,
-            "flags": 2
-        }),
-        clear: None,
-    }
-    .publish_as_user(target.id.clone());
-
-    get_collection("bots")
-        .delete_one(
-            doc! {
-                "_id": &bot.id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "bot",
-            operation: "delete_one"
-        })?;
-
-    Ok(EmptyResponse {})
+    bot.delete(db).await.map(|_| EmptyResponse)
 }
diff --git a/src/routes/bots/edit.rs b/src/routes/bots/edit.rs
index c562a28a..0395744f 100644
--- a/src/routes/bots/edit.rs
+++ b/src/routes/bots/edit.rs
@@ -1,120 +1,107 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveBotField};
 use crate::util::regex::RE_USERNAME;
 
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{
+        bot::{FieldsBot, PartialBot},
+        Bot, User,
+    },
+    Db, Error, Ref, Result,
+};
+
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Bot Details
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditBot {
+    /// Bot username
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
+    /// Whether the bot can be added by anyone
     public: Option<bool>,
+    /// Whether analytics should be gathered for this bot
+    ///
+    /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
     analytics: Option<bool>,
+    /// Interactions URL
+    #[validate(length(min = 1, max = 2048))]
     interactions_url: Option<String>,
-    remove: Option<RemoveBotField>,
+    /// Fields to remove from bot object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsBot>>,
 }
 
+/// # Edit Bot
+///
+/// Edit bot details by its id.
+#[openapi(tag = "Bots")]
 #[patch("/<target>", data = "<data>")]
-pub async fn edit_bot(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn edit_bot(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataEditBot>,
+) -> Result<Json<Bot>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
+
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.name.is_none()
-        && data.public.is_none()
+    let mut bot = target.as_bot(db).await?;
+    if bot.owner != user.id {
+        return Err(Error::NotFound);
+    }
+
+    if let Some(name) = data.name {
+        if db.is_username_taken(&name).await? {
+            return Err(Error::UsernameTaken);
+        }
+
+        let mut user = db.fetch_user(&bot.id).await?;
+        user.update_username(db, name).await?;
+    }
+
+    if data.public.is_none()
         && data.analytics.is_none()
         && data.interactions_url.is_none()
         && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(bot));
     }
 
-    let bot = target.fetch_bot().await?;
-    if bot.owner != user.id {
-        return Err(Error::MissingPermission);
-    }
+    let DataEditBot {
+        public,
+        analytics,
+        interactions_url,
+        remove,
+        ..
+    } = data;
 
-    if let Some(name) = &data.name {
-        if User::is_username_taken(&name).await? {
-            return Err(Error::UsernameTaken);
+    let mut partial = PartialBot {
+        public,
+        analytics,
+        interactions_url,
+        ..Default::default()
+    };
+
+    if let Some(remove) = &remove {
+        for field in remove {
+            bot.remove(field);
         }
 
-        get_collection("users")
-            .update_one(
-                doc! { "_id": &target.id },
-                doc! {
-                    "$set": {
-                        "username": name
-                    }
-                },
-                None
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "user",
-            })?;
-
-        ClientboundNotification::UserUpdate {
-            id: target.id.clone(),
-            data: json!({
-                "username": name
-            }),
-            clear: None,
-        }
-        .publish_as_user(target.id.clone());
-    }
-
-    let mut set = doc! {};
-    let mut unset = doc! {};
-
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveBotField::InteractionsURL => {
-                unset.insert("interactions_url", 1);
-            }
+        if remove.iter().any(|x| x == &FieldsBot::Token) {
+            partial.token = Some(bot.token.clone());
         }
     }
 
-    if let Some(public) = &data.public {
-        set.insert("public", public);
-    }
+    db.update_bot(&bot.id, &partial, remove.unwrap_or_default())
+        .await?;
 
-    if let Some(analytics) = &data.analytics {
-        set.insert("analytics", analytics);
-    }
-
-    if let Some(interactions_url) = &data.interactions_url {
-        set.insert("interactions_url", interactions_url);
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("bots")
-            .update_one(doc! { "_id": &target.id }, operations, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "bot",
-            })?;
-    }
-
-    Ok(EmptyResponse {})
+    bot.apply_options(partial);
+    Ok(Json(bot))
 }
diff --git a/src/routes/bots/fetch.rs b/src/routes/bots/fetch.rs
index b3b20491..a6f94a4f 100644
--- a/src/routes/bots/fetch.rs
+++ b/src/routes/bots/fetch.rs
@@ -1,26 +1,36 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Bot, User},
+    Db, Error, Ref, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-use serde_json::Value;
+/// # Bot Response
+#[derive(Serialize, JsonSchema)]
+pub struct BotResponse {
+    /// Bot object
+    bot: Bot,
+    /// User object
+    user: User,
+}
 
+/// # Fetch Bot
+///
+/// Fetch details of a bot you own by its id.
+#[openapi(tag = "Bots")]
 #[get("/<target>")]
-pub async fn fetch_bot(user: User, target: Ref) -> Result<Value> {
+pub async fn fetch_bot(db: &Db, user: User, target: Ref) -> Result<Json<BotResponse>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    let bot = target.fetch_bot().await?;
-
-    if !bot.public {
-        if bot.owner != user.id {
-            return Err(Error::BotIsPrivate);
-        }
+        return Err(Error::IsBot);
     }
 
-    let user = Ref::from_unchecked(bot.id.clone()).fetch_user().await?;
-    
-    Ok(json!({
-        "bot": bot,
-        "user": user
+    let bot = target.as_bot(db).await?;
+    if bot.owner != user.id {
+        return Err(Error::NotFound);
+    }
+
+    Ok(Json(BotResponse {
+        user: db.fetch_user(&bot.id).await?.foreign(),
+        bot,
     }))
 }
diff --git a/src/routes/bots/fetch_owned.rs b/src/routes/bots/fetch_owned.rs
index d9deb731..f437fb7a 100644
--- a/src/routes/bots/fetch_owned.rs
+++ b/src/routes/bots/fetch_owned.rs
@@ -1,56 +1,42 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Bot, User},
+    Db, Error, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-use futures::StreamExt;
-use mongodb::bson::{Document, doc, from_document};
-use serde_json::Value;
-
-#[get("/@me")]
-pub async fn fetch_owned_bots(user: User) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    let bots = get_collection("bots")
-        .find(
-            doc! {
-                "owner": &user.id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "bots",
-            operation: "find"
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| from_document(x).ok())
-        .collect::<Vec<Bot>>();
-    
-    let users = get_collection("users")
-        .find(
-            doc! {
-                "bot.owner": &user.id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "users",
-            operation: "find"
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| from_document(x).ok())
-        .collect::<Vec<User>>();
-    
-    Ok(json!({
-        "bots": bots,
-        "users": users
-    }))
+/// # Owned Bots Response
+///
+/// Both lists are sorted by their IDs.
+#[derive(Serialize, JsonSchema)]
+pub struct OwnedBotsResponse {
+    /// Bot objects
+    bots: Vec<Bot>,
+    /// User objects
+    users: Vec<User>,
+}
+
+/// # Fetch Owned Bots
+///
+/// Fetch all of the bots that you have control over.
+#[openapi(tag = "Bots")]
+#[get("/@me")]
+pub async fn fetch_owned_bots(db: &Db, user: User) -> Result<Json<OwnedBotsResponse>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    let mut bots = db.fetch_bots_by_user(&user.id).await?;
+    let user_ids = bots
+        .iter()
+        .map(|x| x.id.to_owned())
+        .collect::<Vec<String>>();
+
+    let mut users = db.fetch_users(&user_ids).await?;
+
+    // Ensure the lists match up exactly.
+    bots.sort_by(|a, b| a.id.cmp(&b.id));
+    users.sort_by(|a, b| a.id.cmp(&b.id));
+
+    Ok(Json(OwnedBotsResponse { users, bots }))
 }
diff --git a/src/routes/bots/fetch_public.rs b/src/routes/bots/fetch_public.rs
index 181bb391..03e80a65 100644
--- a/src/routes/bots/fetch_public.rs
+++ b/src/routes/bots/fetch_public.rs
@@ -1,28 +1,44 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{File, User},
+    Db, Error, Ref, Result,
+};
 
-use serde_json::Value;
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
 
+/// # Public Bot
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct PublicBot {
+    /// Bot Id
+    #[serde(rename = "_id")]
+    id: String,
+    /// Bot Username
+    username: String,
+    /// Profile Avatar
+    #[serde(skip_serializing_if = "Option::is_none")]
+    avatar: Option<File>,
+    /// Profile Description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    description: Option<String>,
+}
+
+/// # Fetch Public Bot
+///
+/// Fetch details of a public (or owned) bot by its id.
+#[openapi(tag = "Bots")]
 #[get("/<target>/invite")]
-pub async fn fetch_public_bot(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    let bot = target.fetch_bot().await?;
-
-    if !bot.public {
-        if bot.owner != user.id {
-            return Err(Error::BotIsPrivate);
-        }
+pub async fn fetch_public_bot(db: &Db, user: Option<User>, target: Ref) -> Result<Json<PublicBot>> {
+    let bot = target.as_bot(db).await?;
+    if !bot.public && user.map_or(true, |x| x.id != bot.owner) {
+        return Err(Error::NotFound);
     }
 
-    let user = Ref::from_unchecked(bot.id.clone()).fetch_user().await?;
+    let user = db.fetch_user(&bot.id).await?;
 
-    Ok(json!({
-        "_id": bot.id,
-        "username": user.username,
-        "avatar": user.avatar,
-        "description": user.profile.map(|p| p.content)
+    Ok(Json(PublicBot {
+        id: bot.id,
+        username: user.username,
+        avatar: user.avatar,
+        description: user.profile.and_then(|p| p.content),
     }))
 }
diff --git a/src/routes/bots/invite.rs b/src/routes/bots/invite.rs
index eb24b5f7..8cd61051 100644
--- a/src/routes/bots/invite.rs
+++ b/src/routes/bots/invite.rs
@@ -1,70 +1,71 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
 
 use rocket::serde::json::Json;
 use serde::Deserialize;
 
-#[derive(Deserialize)]
-pub struct ServerId {
-    server: String
-}
-
-#[derive(Deserialize)]
-pub struct GroupId {
-    group: String
-}
-
-#[derive(Deserialize)]
+/// # Invite Destination
+#[derive(Deserialize, JsonSchema)]
 #[serde(untagged)]
-pub enum Destination {
-    Server(ServerId),
-    Group(GroupId)
+pub enum InviteBotDestination {
+    /// Invite to a server
+    Server {
+        /// Server Id
+        server: String,
+    },
+    /// Invite to a group
+    Group {
+        /// Group Id
+        group: String,
+    },
 }
 
+/// # Invite Bot
+///
+/// Invite a bot to a server or group by its id.`
+#[openapi(tag = "Bots")]
 #[post("/<target>/invite", data = "<dest>")]
-pub async fn invite_bot(user: User, target: Ref, dest: Json<Destination>) -> Result<EmptyResponse> {
+pub async fn invite_bot(
+    db: &Db,
+    user: User,
+    target: Ref,
+    dest: Json<InviteBotDestination>,
+) -> Result<EmptyResponse> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
-    let bot = target.fetch_bot().await?;
 
-    if !bot.public {
-        if bot.owner != user.id {
-            return Err(Error::BotIsPrivate);
-        }
+    let bot = target.as_bot(db).await?;
+    if !bot.public && bot.owner != user.id {
+        return Err(Error::BotIsPrivate);
     }
 
     match dest.into_inner() {
-        Destination::Server(ServerId { server }) => {
-            let server = Ref::from(server)?.fetch_server().await?;
+        InviteBotDestination::Server { server } => {
+            let server = db.fetch_server(&server).await?;
 
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_server(&server)
-                .for_server()
+            perms(&user)
+                .server(&server)
+                .throw_permission(db, Permission::ManageServer)
                 .await?;
 
-            if !perm.get_manage_server() {
-                Err(Error::MissingPermission)?
-            }
-
-            server.join_member(&bot.id).await?;
-            Ok(EmptyResponse {})
+            let user = db.fetch_user(&bot.id).await?;
+            server
+                .create_member(db, user, None)
+                .await
+                .map(|_| EmptyResponse)
         }
-        Destination::Group(GroupId { group }) => {
-            let channel = Ref::from(group)?.fetch_channel().await?;
+        InviteBotDestination::Group { group } => {
+            let mut channel = db.fetch_channel(&group).await?;
 
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_channel(&channel)
-                .for_channel()
+            perms(&user)
+                .channel(&channel)
+                .throw_permission_and_view_channel(db, Permission::InviteOthers)
                 .await?;
 
-            if !perm.get_invite_others() {
-                Err(Error::MissingPermission)?
-            }
-
-            channel.add_to_group(bot.id, user.id).await?;
-            Ok(EmptyResponse {})
+            channel
+                .add_user_to_group(db, &bot.id, &user.id)
+                .await
+                .map(|_| EmptyResponse)
         }
     }
 }
diff --git a/src/routes/bots/mod.rs b/src/routes/bots/mod.rs
index 4b91b3bb..c29b90e5 100644
--- a/src/routes/bots/mod.rs
+++ b/src/routes/bots/mod.rs
@@ -1,15 +1,16 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod create;
-mod invite;
-mod fetch_public;
+mod delete;
+mod edit;
 mod fetch;
 mod fetch_owned;
-mod edit;
-mod delete;
+mod fetch_public;
+mod invite;
 
-pub fn routes() -> Vec<Route> {
-    routes![
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
         create::create_bot,
         invite::invite_bot,
         fetch_public::fetch_public_bot,
diff --git a/src/routes/channels/channel_ack.rs b/src/routes/channels/channel_ack.rs
index 45e24467..8c55ee2b 100644
--- a/src/routes/channels/channel_ack.rs
+++ b/src/routes/channels/channel_ack.rs
@@ -1,38 +1,19 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
 
+/// # Acknowledge Message
+///
+/// Lets the server and all other clients know that we've seen this message id in this channel.
+#[openapi(tag = "Messaging")]
 #[put("/<target>/ack/<message>")]
-pub async fn req(user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
         .await?;
 
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    crate::task_queue::task_ack::queue(
-        target.id().into(),
-        user.id.clone(),
-        crate::task_queue::task_ack::AckEvent::AckMessage {
-            id: message.id.clone()
-        }
-    ).await;
-
-    ClientboundNotification::ChannelAck {
-        id: target.id().into(),
-        user: user.id.clone(),
-        message_id: message.id,
-    }
-    .publish(user.id);
-
-    Ok(EmptyResponse {})
+    channel
+        .ack(&user.id, &message.id)
+        .await
+        .map(|_| EmptyResponse)
 }
diff --git a/src/routes/channels/channel_delete.rs b/src/routes/channels/channel_delete.rs
index a08a732a..a31eeb0c 100644
--- a/src/routes/channels/channel_delete.rs
+++ b/src/routes/channels/channel_delete.rs
@@ -1,119 +1,41 @@
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::ClientboundNotification};
-
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{channel::PartialChannel, Channel, User},
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
+};
 
+/// # Close Channel
+///
+/// Deletes a server channel, leaves a group or closes a group.
+#[openapi(tag = "Channel Information")]
 #[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
-    let target = target.fetch_channel().await?;
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    let mut channel = target.as_channel(db).await?;
+    let mut perms = perms(&user).channel(&channel);
+    perms.throw_permission(db, Permission::ViewChannel).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    match &target {
+    match &channel {
         Channel::SavedMessages { .. } => Err(Error::NoEffect),
-        Channel::DirectMessage { .. } => {
-            get_collection("channels")
-                .update_one(
-                    doc! {
-                        "_id": target.id()
-                    },
-                    doc! {
-                        "$set": {
-                            "active": false
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "channel",
-                })?;
+        Channel::DirectMessage { .. } => channel
+            .update(
+                db,
+                PartialChannel {
+                    active: Some(false),
+                    ..Default::default()
+                },
+                vec![],
+            )
+            .await
+            .map(|_| EmptyResponse),
+        Channel::Group { .. } => channel
+            .remove_user_from_group(db, &user.id, None)
+            .await
+            .map(|_| EmptyResponse),
+        Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
+            perms
+                .throw_permission(db, Permission::ManageChannel)
+                .await?;
 
-            Ok(EmptyResponse {})
-        }
-        Channel::Group {
-            id,
-            owner,
-            recipients,
-            ..
-        } => {
-            if &user.id == owner {
-                if let Some(new_owner) = recipients.iter().find(|x| *x != &user.id) {
-                    get_collection("channels")
-                        .update_one(
-                            doc! {
-                                "_id": &id
-                            },
-                            doc! {
-                                "$set": {
-                                    "owner": new_owner
-                                },
-                                "$pull": {
-                                    "recipients": &user.id
-                                }
-                            },
-                            None,
-                        )
-                        .await
-                        .map_err(|_| Error::DatabaseError {
-                            operation: "update_one",
-                            with: "channel",
-                        })?;
-
-                    target.publish_update(json!({ "owner": new_owner })).await?;
-                } else {
-                    target.delete().await?;
-                    return Ok(EmptyResponse {});
-                }
-            } else {
-                get_collection("channels")
-                    .update_one(
-                        doc! {
-                            "_id": &id
-                        },
-                        doc! {
-                            "$pull": {
-                                "recipients": &user.id
-                            }
-                        },
-                        None,
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel",
-                    })?;
-            }
-
-            ClientboundNotification::ChannelGroupLeave {
-                id: id.clone(),
-                user: user.id.clone(),
-            }
-            .publish(id.clone());
-
-            Content::SystemMessage(SystemMessage::UserLeft { id: user.id })
-                .send_as_system(&target)
-                .await
-                .ok();
-
-            Ok(EmptyResponse {})
-        }
-        Channel::TextChannel { .. } |
-        Channel::VoiceChannel { .. } => {
-            if perm.get_manage_channel() {
-                target.delete().await?;
-                Ok(EmptyResponse {})
-            } else {
-                Err(Error::MissingPermission)
-            }
+            channel.delete(db).await.map(|_| EmptyResponse)
         }
     }
 }
diff --git a/src/routes/channels/channel_edit.rs b/src/routes/channels/channel_edit.rs
index a5b9e17d..45febe1c 100644
--- a/src/routes/channels/channel_edit.rs
+++ b/src/routes/channels/channel_edit.rs
@@ -1,160 +1,173 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveChannelField};
+use revolt_quark::{
+    models::{
+        channel::{Channel, FieldsChannel, PartialChannel},
+        message::SystemMessage,
+        File, User,
+    },
+    perms, Database, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::{doc, to_document};
-use rocket::serde::json::Json;
+use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Channel Details
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditChannel {
+    /// Channel name
     #[validate(length(min = 1, max = 32))]
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
+    /// Channel description
     #[validate(length(min = 0, max = 1024))]
     #[serde(skip_serializing_if = "Option::is_none")]
     description: Option<String>,
+    /// Icon
+    ///
+    /// Provide an Autumn attachment Id.
     #[validate(length(min = 1, max = 128))]
     icon: Option<String>,
-    remove: Option<RemoveChannelField>,
+    /// Whether this channel is age-restricted
     #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsChannel>>,
 }
 
+/// # Edit Channel
+///
+/// Edit a channel object by its id.
+#[openapi(tag = "Channel Information")]
 #[patch("/<target>", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &State<Database>,
+    user: User,
+    target: Ref,
+    data: Json<DataEditChannel>,
+) -> Result<Json<Channel>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
+    let mut channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ManageChannel)
+        .await?;
+
     if data.name.is_none()
         && data.description.is_none()
         && data.icon.is_none()
-        && data.remove.is_none()
         && data.nsfw.is_none()
+        && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(channel));
     }
 
-    let target = target.fetch_channel().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_manage_channel() {
-        Err(Error::MissingPermission)?
-    }
-
-    match &target {
-        Channel::Group { id, icon, .. }
-        | Channel::TextChannel { id, icon, .. }
-        | Channel::VoiceChannel { id, icon, .. } => {
-            let mut set = doc! {};
-            let mut unset = doc! {};
-
-            let mut remove_icon = false;
-            if let Some(remove) = &data.remove {
-                match remove {
-                    RemoveChannelField::Icon => {
-                        unset.insert("icon", 1);
-                        remove_icon = true;
+    let mut partial: PartialChannel = Default::default();
+    match &mut channel {
+        Channel::Group {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::TextChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::VoiceChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        } => {
+            if let Some(fields) = &data.remove {
+                if fields.contains(&FieldsChannel::Icon) {
+                    if let Some(icon) = &icon {
+                        db.mark_attachment_as_deleted(&icon.id).await?;
                     }
-                    RemoveChannelField::Description => {
-                        unset.insert("description", 1);
+                }
+
+                for field in fields {
+                    match field {
+                        FieldsChannel::Description => {
+                            description.take();
+                        }
+                        FieldsChannel::Icon => {
+                            icon.take();
+                        }
+                        _ => {}
                     }
                 }
             }
 
-            if let Some(name) = &data.name {
-                set.insert("name", name);
+            if let Some(icon_id) = data.icon {
+                partial.icon = Some(File::use_icon(db, &icon_id, id).await?);
+                *icon = partial.icon.clone();
             }
 
-            if let Some(description) = &data.description {
-                set.insert("description", description);
+            if let Some(new_name) = data.name {
+                *name = new_name.clone();
+                partial.name = Some(new_name);
             }
 
-            if let Some(attachment_id) = &data.icon {
-                let attachment =
-                    File::find_and_use(&attachment_id, "icons", "object", target.id()).await?;
-                set.insert(
-                    "icon",
-                    to_document(&attachment).map_err(|_| Error::DatabaseError {
-                        operation: "to_document",
-                        with: "attachment",
-                    })?,
-                );
-
-                remove_icon = true;
+            if let Some(new_description) = data.description {
+                partial.description = Some(new_description);
+                *description = partial.description.clone();
             }
 
-            if let Some(nsfw) = &data.nsfw {
-                set.insert("nsfw", nsfw);
-            }
-            
-            let mut operations = doc! {};
-            if set.len() > 0 {
-                operations.insert("$set", &set);
+            if let Some(new_nsfw) = data.nsfw {
+                *nsfw = new_nsfw;
+                partial.nsfw = Some(new_nsfw);
             }
 
-            if unset.len() > 0 {
-                operations.insert("$unset", unset);
-            }
-
-            if operations.len() > 0 {
-                get_collection("channels")
-                    .update_one(doc! { "_id": &id }, operations, None)
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel",
-                    })?;
-            }
-
-            ClientboundNotification::ChannelUpdate {
-                id: id.clone(),
-                data: json!(set),
-                clear: data.remove,
-            }
-            .publish(id.clone());
-
-            if let Channel::Group { .. } = &target {
-                if let Some(name) = data.name {
-                    Content::SystemMessage(SystemMessage::ChannelRenamed {
-                        name,
+            // Send out mutation system messages.
+            if let Channel::Group { .. } = &channel {
+                if let Some(name) = &partial.name {
+                    SystemMessage::ChannelRenamed {
+                        name: name.to_string(),
                         by: user.id.clone(),
-                    })
-                    .send_as_system(&target)
+                    }
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
                     .await
                     .ok();
                 }
 
-                if let Some(_) = data.description {
-                    Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
+                if partial.description.is_some() {
+                    SystemMessage::ChannelDescriptionChanged {
                         by: user.id.clone(),
-                    })
-                    .send_as_system(&target)
+                    }
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
                     .await
                     .ok();
                 }
 
-                if let Some(_) = data.icon {
-                    Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id })
-                        .send_as_system(&target)
+                if partial.icon.is_some() {
+                    SystemMessage::ChannelIconChanged { by: user.id }
+                        .into_message(channel.id().to_string())
+                        .create(db, &channel, None)
                         .await
                         .ok();
                 }
             }
 
-            if remove_icon {
-                if let Some(old_icon) = icon {
-                    old_icon.delete().await?;
-                }
-            }
-
-            Ok(EmptyResponse {})
+            channel
+                .update(db, partial, data.remove.unwrap_or_default())
+                .await?;
         }
-        _ => Err(Error::InvalidOperation),
-    }
+        _ => return Err(Error::InvalidOperation),
+    };
+
+    Ok(Json(channel))
 }
diff --git a/src/routes/channels/channel_fetch.rs b/src/routes/channels/channel_fetch.rs
index bda94df8..da762a87 100644
--- a/src/routes/channels/channel_fetch.rs
+++ b/src/routes/channels/channel_fetch.rs
@@ -1,20 +1,21 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Database, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 
+/// # Fetch Channel
+///
+/// Fetch channel by its id.
+#[openapi(tag = "Channel Information")]
 #[get("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<Channel>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
         .await?;
 
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    Ok(json!(target))
+    Ok(Json(channel))
 }
diff --git a/src/routes/channels/group_add_member.rs b/src/routes/channels/group_add_member.rs
index 4b21ea9a..f516e34a 100644
--- a/src/routes/channels/group_add_member.rs
+++ b/src/routes/channels/group_add_member.rs
@@ -1,24 +1,28 @@
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::database::*;
-
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
+};
 
+/// # Add Member to Group
+///
+/// Adds another user to the group.
+#[openapi(tag = "Groups")]
 #[put("/<target>/recipients/<member>")]
-pub async fn req(user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
-    if get_relationship(&user, &member.id) != RelationshipStatus::Friend {
-        Err(Error::NotFriends)?
-    }
-
-    let channel = target.fetch_channel().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
+    let mut channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::InviteOthers)
         .await?;
 
-    if !perm.get_invite_others() {
-        Err(Error::MissingPermission)?
+    match &channel {
+        Channel::Group { .. } => {
+            let member = member.as_user(db).await?;
+            channel
+                .add_user_to_group(db, &member.id, &user.id)
+                .await
+                .map(|_| EmptyResponse)
+        }
+        _ => Err(Error::InvalidOperation),
     }
-
-    channel.add_to_group(member.id, user.id).await?;
-    Ok(EmptyResponse {})
 }
diff --git a/src/routes/channels/group_create.rs b/src/routes/channels/group_create.rs
index 5fd96489..19e166aa 100644
--- a/src/routes/channels/group_create.rs
+++ b/src/routes/channels/group_create.rs
@@ -1,44 +1,53 @@
-use crate::database::*;
-use crate::util::idempotency::IdempotencyKey;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_GROUP_SIZE;
+use std::{collections::HashSet, iter::FromIterator};
 
-use mongodb::bson::doc;
-use rocket::serde::json::{Json, Value};
+use revolt_quark::{
+    get_relationship,
+    models::{user::RelationshipStatus, Channel, User},
+    variables::delta::MAX_GROUP_SIZE,
+    Db, Error, Result,
+};
+
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
-use std::iter::FromIterator;
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Group Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataCreateGroup {
+    /// Group name
     #[validate(length(min = 1, max = 32))]
     name: String,
+    /// Group description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+    /// Array of user IDs to add to the group
+    ///
+    /// Must be friends with these users.
+    #[validate(length(min = 0, max = 49))]
     users: Vec<String>,
+    /// Whether this group is age-restricted
     #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
 }
 
+/// # Create Group
+///
+/// Create a new group channel.
+#[openapi(tag = "Groups")]
 #[post("/create", data = "<info>")]
-pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
+pub async fn req(db: &Db, user: User, info: Json<DataCreateGroup>) -> Result<Json<Channel>> {
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let mut set: HashSet<String> = HashSet::from_iter(info.users.iter().cloned());
+    let mut set: HashSet<String> = HashSet::from_iter(info.users.into_iter());
     set.insert(user.id.clone());
 
     if set.len() > *MAX_GROUP_SIZE {
-        Err(Error::GroupTooLarge {
+        return Err(Error::GroupTooLarge {
             max: *MAX_GROUP_SIZE,
-        })?
+        });
     }
 
     for target in &set {
@@ -50,20 +59,22 @@ pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) ->
         }
     }
 
-    let id = Ulid::new().to_string();
-    let channel = Channel::Group {
-        id,
+    let group = Channel::Group {
+        id: Ulid::new().to_string(),
+
         name: info.name,
-        description: info.description,
         owner: user.id,
+        description: info.description,
         recipients: set.into_iter().collect::<Vec<String>>(),
+
         icon: None,
         last_message_id: None,
+
         permissions: None,
-        nsfw: info.nsfw.unwrap_or_default()
+
+        nsfw: info.nsfw.unwrap_or(false),
     };
 
-    channel.clone().publish().await?;
-
-    Ok(json!(channel))
+    group.create(db).await?;
+    Ok(Json(group))
 }
diff --git a/src/routes/channels/group_remove_member.rs b/src/routes/channels/group_remove_member.rs
index 83e0e5ee..c3a67b14 100644
--- a/src/routes/channels/group_remove_member.rs
+++ b/src/routes/channels/group_remove_member.rs
@@ -1,66 +1,38 @@
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::ClientboundNotification};
-
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{Channel, User},
+    Db, EmptyResponse, Error, Permission, Ref, Result,
+};
 
+/// # Remove Member from Group
+///
+/// Removes a user from the group.
+#[openapi(tag = "Groups")]
 #[delete("/<target>/recipients/<member>")]
-pub async fn req(user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
-    if &user.id == &member.id {
-        Err(Error::CannotRemoveYourself)?
-    }
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
+    let channel = target.as_channel(db).await?;
 
-    let channel = target.fetch_channel().await?;
+    match &channel {
+        Channel::Group {
+            owner, recipients, ..
+        } => {
+            if &user.id != owner {
+                return Error::from_permission(Permission::ManageChannel);
+            }
 
-    if let Channel::Group {
-        id,
-        owner,
-        recipients,
-        ..
-    } = &channel
-    {
-        if &user.id != owner {
-            // figure out if we want to use perm system here
-            Err(Error::MissingPermission)?
+            let member = member.as_user(db).await?;
+            if user.id == member.id {
+                return Err(Error::CannotRemoveYourself);
+            }
+
+            if !recipients.iter().any(|x| *x == member.id) {
+                return Err(Error::NotInGroup);
+            }
+
+            channel
+                .remove_user_from_group(db, &member.id, Some(&user.id))
+                .await
+                .map(|_| EmptyResponse)
         }
-
-        if recipients.iter().find(|x| *x == &member.id).is_none() {
-            Err(Error::NotInGroup)?
-        }
-
-        get_collection("channels")
-            .update_one(
-                doc! {
-                    "_id": &id
-                },
-                doc! {
-                    "$pull": {
-                        "recipients": &member.id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelGroupLeave {
-            id: id.clone(),
-            user: member.id.clone(),
-        }
-        .publish(id.clone());
-
-        Content::SystemMessage(SystemMessage::UserRemove {
-            id: member.id,
-            by: user.id,
-        })
-        .send_as_system(&channel)
-        .await
-        .ok();
-
-        Ok(EmptyResponse {})
-    } else {
-        Err(Error::InvalidOperation)
+        _ => Err(Error::InvalidOperation),
     }
 }
diff --git a/src/routes/channels/invite_create.rs b/src/routes/channels/invite_create.rs
index 7413af64..c27bf4de 100644
--- a/src/routes/channels/invite_create.rs
+++ b/src/routes/channels/invite_create.rs
@@ -1,48 +1,23 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Invite, User},
+    perms, Db, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
-use nanoid::nanoid;
-use rocket::serde::json::Value;
-
-lazy_static! {
-    static ref ALPHABET: [char; 54] = [
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-        'J', 'K', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-        'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'
-    ];
-}
+use rocket::serde::json::Json;
 
+/// # Create Invite
+///
+/// Creates an invite to this channel.
+///
+/// Channel must be a `TextChannel`.
+#[openapi(tag = "Channel Invites")]
 #[post("/<target>/invites")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_channel().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Invite>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::InviteOthers)
         .await?;
 
-    if !perm.get_invite_others() {
-        return Err(Error::MissingPermission);
-    }
-
-    let code = nanoid!(8, &*ALPHABET);
-    match &target {
-        Channel::Group { .. } => {
-            unimplemented!()
-        }
-        Channel::TextChannel { id, server, .. }
-        | Channel::VoiceChannel { id, server, .. } => {
-            Invite::Server {
-                code: code.clone(),
-                creator: user.id,
-                server: server.clone(),
-                channel: id.clone(),
-            }
-            .save()
-            .await?;
-
-            Ok(json!({ "code": code }))
-        }
-        _ => Err(Error::InvalidOperation),
-    }
+    Invite::create(db, &user, &channel).await.map(Json)
 }
diff --git a/src/routes/channels/members_fetch.rs b/src/routes/channels/members_fetch.rs
index 4e4bc0d6..51510bd2 100644
--- a/src/routes/channels/members_fetch.rs
+++ b/src/routes/channels/members_fetch.rs
@@ -1,22 +1,30 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 
+/// # Fetch Group Members
+///
+/// Retrieves all users who are part of this group.
+#[openapi(tag = "Groups")]
 #[get("/<target>/members")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    if let Channel::Group { recipients, .. } = target {
-        Ok(json!(user.fetch_multiple_users(&recipients).await?))
+    if let Channel::Group { recipients, .. } = channel {
+        Ok(Json(
+            db.fetch_users(&recipients)
+                .await?
+                .into_iter()
+                .map(|x| x.with_relationship(&user))
+                .collect::<Vec<User>>(),
+        ))
     } else {
         Err(Error::InvalidOperation)
     }
diff --git a/src/routes/channels/message_delete.rs b/src/routes/channels/message_delete.rs
index 90586d6f..98aae099 100644
--- a/src/routes/channels/message_delete.rs
+++ b/src/routes/channels/message_delete.rs
@@ -1,29 +1,22 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
 
+/// # Delete Message
+///
+/// Delete a message you've sent or one you have permission to delete.
+#[openapi(tag = "Messaging")]
 #[delete("/<target>/messages/<msg>")]
-pub async fn req(user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
-    let channel = target.fetch_channel().await?;
-    channel.has_messaging()?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
+pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
+    let message = msg.as_message(db).await?;
+    if message.channel != target.id {
+        return Err(Error::NotFound);
     }
 
-    let message = msg.fetch_message(&channel).await?;
-    if message.author != user.id && !perm.get_manage_messages() {
-        match channel {
-            Channel::SavedMessages { .. } => unreachable!(),
-            _ => Err(Error::CannotEditMessage)?,
-        }
+    if message.author != user.id {
+        perms(&user)
+            .channel(&target.as_channel(db).await?)
+            .throw_permission(db, Permission::ManageMessages)
+            .await?;
     }
 
-    message.delete().await?;
-    Ok(EmptyResponse {})
+    message.delete(db).await.map(|_| EmptyResponse)
 }
diff --git a/src/routes/channels/message_edit.rs b/src/routes/channels/message_edit.rs
index f84687fa..e02b5dc8 100644
--- a/src/routes/channels/message_edit.rs
+++ b/src/routes/channels/message_edit.rs
@@ -1,106 +1,93 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::routes::channels::message_send::SendableEmbed;
+use revolt_quark::{
+    models::message::{PartialMessage, SendableEmbed},
+    models::{Message, User},
+    types::january::Embed,
+    Db, Error, Ref, Result, Timestamp,
+};
 
-use chrono::Utc;
-use mongodb::bson::{Bson, Document, doc, to_document};
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Message Details
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditMessage {
+    /// New message content
     #[validate(length(min = 1, max = 2000))]
     content: Option<String>,
+    /// Embeds to include in the message
     #[validate(length(min = 0, max = 10))]
-    embeds: Option<Vec<SendableEmbed>>
+    embeds: Option<Vec<SendableEmbed>>,
 }
 
+/// # Edit Message
+///
+/// Edits a message that you've previously sent.
+#[openapi(tag = "Messaging")]
 #[patch("/<target>/messages/<msg>", data = "<edit>")]
-pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: String,
+    msg: Ref,
+    edit: Json<DataEditMessage>,
+) -> Result<Json<Message>> {
+    let edit = edit.into_inner();
     edit.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let channel = target.fetch_channel().await?;
-    channel.has_messaging()?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
+    let mut message = msg.as_message(db).await?;
+    if message.channel != target {
+        return Err(Error::NotFound);
     }
 
-    let mut message = msg.fetch_message(&channel).await?;
     if message.author != user.id {
-        Err(Error::CannotEditMessage)?
+        return Err(Error::CannotEditMessage);
     }
 
-    let edited = Utc::now();
-    let mut set = doc! { "edited": Bson::DateTime(edited) };
-    let mut unset = doc! {};
-    let mut update = json!({ "edited": Bson::DateTime(edited) });
+    message.edited = Some(Timestamp::now_utc());
+    let mut partial = PartialMessage {
+        edited: message.edited,
+        ..Default::default()
+    };
 
-    if let Some(new_content) = &edit.content {
-        set.insert("content", new_content.clone());
-        update.as_object_mut().unwrap().insert("content".to_string(), json!(new_content.clone()));
-        message.content = Content::Text(new_content.clone());
+    // 1. Handle content update
+    if let Some(content) = &edit.content {
+        partial.content = Some(content.clone());
     }
 
+    // 2. Clear any auto generated embeds
     let mut new_embeds: Vec<Embed> = vec![];
-
     if let Some(embeds) = &message.embeds {
         for embed in embeds {
-            match embed {
-                Embed::Text(embed) => new_embeds.push(Embed::Text(embed.clone())),
-                _ => {}
+            if let Embed::Text(embed) = embed {
+                new_embeds.push(Embed::Text(embed.clone()))
             }
         }
     }
 
-    if let Some(edited_embeds) = &edit.embeds {
+    // 3. Replace if we are given new embeds
+    if let Some(embeds) = edit.embeds {
         new_embeds.clear();
 
-        for embed in edited_embeds {
-            new_embeds.push(embed.clone().into_embed(message.id.clone()).await?);
+        for embed in embeds {
+            new_embeds.push(embed.clone().into_embed(db, message.id.clone()).await?);
         }
     }
 
-    if new_embeds.len() > 0 {
-        let embed_docs: Vec<Document> = new_embeds
-            .clone()
-            .into_iter()
-            .map(|embed| to_document(&embed).unwrap())
-            .collect();
+    partial.embeds = Some(new_embeds);
 
-        let obj = update.as_object_mut().unwrap();
-        obj.insert("embeds".to_string(), json!(embed_docs));
-        set.insert("embeds", embed_docs);
-        message.embeds = Some(new_embeds)
-    } else if edit.embeds.is_some() {
-        let obj = update.as_object_mut().unwrap();
-        obj.insert("embeds".to_string(), json!([]));
-        unset.insert("embeds", 1 as u32);
+    message.update(db, partial).await?;
+
+    // Queue up a task for processing embeds
+    if let Some(content) = edit.content {
+        revolt_quark::tasks::process_embeds::queue(
+            message.channel.to_string(),
+            message.id.to_string(),
+            content,
+        )
+        .await;
     }
 
-    get_collection("messages")
-        .update_one(
-            doc! {
-                "_id": &message.id
-            },
-            doc! {
-                "$set": set,
-                "$unset": unset
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "message",
-        })?;
-
-    message.publish_update(update).await?;
-    Ok(EmptyResponse {})
+    Ok(Json(message))
 }
diff --git a/src/routes/channels/message_fetch.rs b/src/routes/channels/message_fetch.rs
index 72edecff..3fcba734 100644
--- a/src/routes/channels/message_fetch.rs
+++ b/src/routes/channels/message_fetch.rs
@@ -1,21 +1,26 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Message, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 
+/// # Fetch Message
+///
+/// Retrieves a message by its id.
+#[openapi(tag = "Messaging")]
 #[get("/<target>/messages/<msg>")]
-pub async fn req(user: User, target: Ref, msg: Ref) -> Result<Value> {
-    let channel = target.fetch_channel().await?;
-    channel.has_messaging()?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
+pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<Json<Message>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
+
+    let message = msg.as_message(db).await?;
+    if message.channel != channel.as_id() {
+        return Err(Error::NotFound);
     }
 
-    let message = msg.fetch_message(&channel).await?;
-    Ok(json!(message))
+    Ok(Json(message))
 }
diff --git a/src/routes/channels/message_query.rs b/src/routes/channels/message_query.rs
index f9f83e2b..a6dfe267 100644
--- a/src/routes/channels/message_query.rs
+++ b/src/routes/channels/message_query.rs
@@ -1,186 +1,81 @@
-use std::collections::HashSet;
-
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use futures::{StreamExt, try_join};
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
+use revolt_quark::{
+    models::{
+        message::{BulkMessageResponse, MessageSort},
+        User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
 };
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Serialize, Deserialize, FromFormField)]
-pub enum Sort {
-    Latest,
-    Oldest,
-}
-
-#[derive(Validate, Serialize, Deserialize, FromForm)]
-pub struct Options {
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsQueryMessages {
+    /// Maximum number of messages to fetch
+    ///
+    /// For fetching nearby messages, this is \`(limit + 1)\`.
     #[validate(range(min = 1, max = 100))]
     limit: Option<i64>,
+    /// Message id before which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     before: Option<String>,
+    /// Message id after which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     after: Option<String>,
-    sort: Option<Sort>,
-    // Specifying 'nearby' ignores 'before', 'after' and 'sort'.
-    // It will also take half of limit rounded as the limits to each side.
-    // It also fetches the message ID specified.
+    /// Message sort direction
+    sort: Option<MessageSort>,
+    /// Message id to search around
+    ///
+    /// Specifying 'nearby' ignores 'before', 'after' and 'sort'.
+    /// It will also take half of limit rounded as the limits to each side.
+    /// It also fetches the message ID specified.
     #[validate(length(min = 26, max = 26))]
     nearby: Option<String>,
+    /// Whether to include user (and member, if server channel) objects
     include_users: Option<bool>,
 }
 
+/// # Fetch Messages
+///
+/// Fetch multiple messages.
+#[openapi(tag = "Messaging")]
 #[get("/<target>/messages?<options..>")]
-pub async fn req(user: User, target: Ref, options: Options) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsQueryMessages,
+) -> Result<Json<BulkMessageResponse>> {
     options
         .validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_channel().await?;
-    target.has_messaging()?;
+    if let Some(MessageSort::Relevance) = options.sort {
+        return Err(Error::InvalidOperation);
+    }
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    let mut messages = vec![];
+    let OptionsQueryMessages {
+        limit,
+        before,
+        after,
+        sort,
+        nearby,
+        include_users,
+        ..
+    } = options;
 
-    let collection = get_collection("messages");
-    let limit = options.limit.unwrap_or(50);
-    let channel = target.id();
-    if let Some(nearby) = &options.nearby {
-        let mut cursors = try_join!(
-            collection.find(
-                doc! {
-                    "channel": channel,
-                    "_id": {
-                        "$gte": &nearby
-                    }
-                },
-                FindOptions::builder()
-                    .limit(limit / 2 + 1)
-                    .sort(doc! {
-                        "_id": 1
-                    })
-                    .build(),
-            ),
-            collection.find(
-                doc! {
-                    "channel": channel,
-                    "_id": {
-                        "$lt": &nearby
-                    }
-                },
-                FindOptions::builder()
-                    .limit(limit / 2)
-                    .sort(doc! {
-                        "_id": -1
-                    })
-                    .build(),
-            )
-        )
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "messages",
-        })?;
+    let messages = db
+        .fetch_messages(channel.id(), limit, before, after, sort, nearby)
+        .await?;
 
-        while let Some(result) = cursors.0.next().await {
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-
-        while let Some(result) = cursors.1.next().await {
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-    } else {
-        let mut query = doc! { "channel": target.id() };
-        if let Some(before) = &options.before {
-            query.insert("_id", doc! { "$lt": before });
-        }
-
-        if let Some(after) = &options.after {
-            query.insert("_id", doc! { "$gt": after });
-        }
-
-        let sort: i32 = if let Sort::Latest = options.sort.as_ref().unwrap_or_else(|| &Sort::Latest) {
-            -1
-        } else {
-            1
-        };
-
-        let mut cursor = collection
-            .find(
-                query,
-                FindOptions::builder()
-                    .limit(limit)
-                    .sort(doc! {
-                        "_id": sort
-                    })
-                    .build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "messages",
-            })?;
-
-        while let Some(result) = cursor.next().await {
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-    }
-
-    if options.include_users.unwrap_or_else(|| false) {
-        let mut ids = HashSet::new();
-        for message in &messages {
-            message.add_associated_user_ids(&mut ids);
-        }
-
-        ids.remove(&user.id);
-        let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(&user_ids).await?;
-
-        if let Channel::TextChannel { server, .. } = target {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
-            }))
-        } else {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-            }))
-        }
-    } else {
-        Ok(json!(messages))
-    }
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
+        .await
+        .map(Json)
 }
diff --git a/src/routes/channels/message_query_stale.rs b/src/routes/channels/message_query_stale.rs
index 0802a0e2..015b6ad3 100644
--- a/src/routes/channels/message_query_stale.rs
+++ b/src/routes/channels/message_query_stale.rs
@@ -1,74 +1,26 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{models::User, Ref, Result};
 
-use futures::StreamExt;
-use mongodb::bson::{doc, from_document};
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
+use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
-pub struct Options {
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct OptionsQueryStale {
+    /// Array of message IDs
+    #[validate(length(min = 0, max = 150))]
     ids: Vec<String>,
 }
 
-#[post("/<target>/messages/stale", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Options>) -> Result<Value> {
-    if data.ids.len() > 150 {
-        return Err(Error::TooManyIds);
-    }
-
-    let target = target.fetch_channel().await?;
-    target.has_messaging()?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    let mut cursor = get_collection("messages")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": &data.ids
-                },
-                "channel": target.id()
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "messages",
-        })?;
-
-    let mut updated = vec![];
-    let mut found_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let msg = from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "message",
-            })?;
-
-            found_ids.push(msg.id.clone());
-            if msg.edited.is_some() {
-                updated.push(msg);
-            }
-        }
-    }
-
-    let mut deleted = vec![];
-    for id in &data.ids {
-        if found_ids.iter().find(|x| *x == id).is_none() {
-            deleted.push(id);
-        }
-    }
-
-    Ok(json!({
-        "updated": updated,
-        "deleted": deleted
-    }))
+/// # Poll Message Changes
+///
+/// This route returns any changed message objects and tells you if any have been deleted.
+///
+/// Don't actually poll this route, instead use this to update your local database.
+///
+/// **DEPRECATED**
+#[openapi(tag = "Messaging")]
+#[post("/<_target>/messages/stale", data = "<_data>")]
+pub async fn req(_user: User, _target: Ref, _data: Json<OptionsQueryStale>) -> Result<()> {
+    Ok(())
 }
diff --git a/src/routes/channels/message_search.rs b/src/routes/channels/message_search.rs
index e0df6b68..81c1d023 100644
--- a/src/routes/channels/message_search.rs
+++ b/src/routes/channels/message_search.rs
@@ -1,162 +1,78 @@
-use std::collections::HashSet;
-
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use futures::StreamExt;
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
+use revolt_quark::{
+    models::{
+        message::{BulkMessageResponse, MessageSort},
+        User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
 };
-use rocket::serde::json::{Json, Value};
+
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Serialize, Deserialize, FromFormField)]
-pub enum Sort {
-    Relevance,
-    Latest,
-    Oldest,
-}
-
-impl Default for Sort {
-    fn default() -> Sort {
-        Sort::Relevance
-    }
-}
-
-#[derive(Validate, Serialize, Deserialize, FromForm)]
-pub struct Options {
+/// # Search Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsMessageSearch {
+    /// Full-text search query
+    ///
+    /// See [MongoDB documentation](https://docs.mongodb.com/manual/text-search/#-text-operator) for more information.
     #[validate(length(min = 1, max = 64))]
     query: String,
 
+    /// Maximum number of messages to fetch
     #[validate(range(min = 1, max = 100))]
     limit: Option<i64>,
+    /// Message id before which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     before: Option<String>,
+    /// Message id after which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     after: Option<String>,
-    #[serde(default = "Sort::default")]
-    sort: Sort,
+    /// Message sort direction
+    ///
+    /// By default, it will be sorted by relevance.
+    #[serde(default = "MessageSort::default")]
+    sort: MessageSort,
+    /// Whether to include user (and member, if server channel) objects
     include_users: Option<bool>,
 }
 
+/// # Search for Messages
+///
+/// This route searches for messages within the given parameters.
+#[openapi(tag = "Messaging")]
 #[post("/<target>/search", data = "<options>")]
-pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: Json<OptionsMessageSearch>,
+) -> Result<Json<BulkMessageResponse>> {
+    let options = options.into_inner();
     options
         .validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_channel().await?;
-    target.has_messaging()?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    let mut messages = vec![];
-    let limit = options.limit.unwrap_or(50);
+    let OptionsMessageSearch {
+        query,
+        limit,
+        before,
+        after,
+        sort,
+        include_users,
+    } = options;
 
-    let mut filter = doc! {
-        "channel": target.id(),
-        "$text": {
-            "$search": &options.query
-        }
-    };
+    let messages = db
+        .search_messages(channel.id(), &query, limit, before, after, sort)
+        .await?;
 
-    if let Some(doc) = match (&options.before, &options.after) {
-        (Some(before), Some(after)) => Some(doc! {
-            "lt": before,
-            "gt": after
-        }),
-        (Some(before), _) => Some(doc! {
-            "lt": before
-        }),
-        (_, Some(after)) => Some(doc! {
-            "gt": after
-        }),
-        _ => None
-    } {
-        filter.insert("_id", doc);
-    }
-
-    let mut cursor = get_collection("messages")
-        .find(
-            filter,
-            FindOptions::builder()
-                .projection(
-                    if let Sort::Relevance = &options.sort {
-                        doc! {
-                            "score": {
-                                "$meta": "textScore"
-                            }
-                        }
-                    } else {
-                        doc! {}
-                    }
-                )
-                .limit(limit)
-                .sort(
-                    match &options.sort {
-                        Sort::Relevance => doc! {
-                            "score": {
-                                "$meta": "textScore"
-                            }
-                        },
-                        Sort::Latest => doc! {
-                            "_id": -1 as i32
-                        },
-                        Sort::Oldest => doc! {
-                            "_id": 1 as i32
-                        }
-                    }
-                )
-                .build(),
-        )
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
         .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "messages",
-        })?;
-    
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            messages.push(
-                from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                    operation: "from_document",
-                    with: "message",
-                })?,
-            );
-        }
-    }
-
-    if options.include_users.unwrap_or_else(|| false) {
-        let mut ids = HashSet::new();
-        for message in &messages {
-            message.add_associated_user_ids(&mut ids);
-        }
-
-        ids.remove(&user.id);
-        let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(&user_ids).await?;
-
-        if let Channel::TextChannel { server, .. } = target {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
-            }))
-        } else {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-            }))
-        }
-    } else {
-        Ok(json!(messages))
-    }
+        .map(Json)
 }
diff --git a/src/routes/channels/message_send.rs b/src/routes/channels/message_send.rs
index afa2cce9..f5f6f8e6 100644
--- a/src/routes/channels/message_send.rs
+++ b/src/routes/channels/message_send.rs
@@ -1,64 +1,42 @@
 use std::collections::HashSet;
 
-use crate::database::*;
-use crate::util::idempotency::IdempotencyKey;
-use crate::util::ratelimit::{Ratelimiter, RatelimitResponse};
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{
+        message::{Masquerade, Reply, SendableEmbed},
+        Message, User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
 use regex::Regex;
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
-pub struct Reply {
-    id: String,
-    mention: bool
-}
+use crate::util::idempotency::IdempotencyKey;
 
-#[derive(Validate, Serialize, Deserialize, Clone, Debug)]
-pub struct SendableEmbed {
-    icon_url: Option<String>,
-    url: Option<String>,
-    #[validate(length(min = 1, max = 100))]
-    title: Option<String>,
-    #[validate(length(min = 1, max = 2000))]
-    description: Option<String>,
-    media: Option<String>,
-	colour: Option<String>,
-}
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataMessageSend {
+    /// Unique token to prevent duplicate message sending
+    ///
+    /// **This is deprecated and replaced by `Idempotency-Key`!**
+    nonce: Option<String>,
 
-impl SendableEmbed {
-    pub async fn into_embed(self, message_id: String) -> Result<Embed> {
-        let media = if let Some(id) = self.media {
-            Some(File::find_and_use(&id, "attachments", "message", &message_id).await?)
-        } else { None };
-
-        Ok(Embed::Text(Text {
-            icon_url: self.icon_url,
-            url: self.url,
-            title: self.title,
-            description: self.description,
-            media,
-            colour: self.colour
-        }))
-    }
-}
-
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+    /// Message content to send
     #[validate(length(min = 0, max = 2000))]
-    content: String,
+    content: Option<String>,
+    /// Attachments to include in message
     #[validate(length(min = 1, max = 128))]
     attachments: Option<Vec<String>>,
-    nonce: Option<String>,
+    /// Messages to reply to
     replies: Option<Vec<Reply>>,
+    /// Embeds to include in message
+    #[validate(length(min = 1, max = 10))]
+    embeds: Option<Vec<SendableEmbed>>,
+    /// Masquerade to apply to this message
     #[validate]
     masquerade: Option<Masquerade>,
-    #[validate(length(min = 1, max = 10))]
-    embeds: Option<Vec<SendableEmbed>>
 }
 
 lazy_static! {
@@ -66,116 +44,150 @@ lazy_static! {
     static ref RE_MENTION: Regex = Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap();
 }
 
-#[post("/<target>/messages", data = "<message>")]
-pub async fn message_send(user: User, _r: Ratelimiter, mut idempotency: IdempotencyKey, target: Ref, message: Json<Data>) -> Result<RatelimitResponse<Value>> {
-    let message = message.into_inner();
-    idempotency.consume_nonce(message.nonce.clone());
-
-    message
-        .validate()
+/// # Send Message
+///
+/// Sends a message to the given channel.
+#[openapi(tag = "Messaging")]
+#[post("/<target>/messages", data = "<data>")]
+pub async fn message_send(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataMessageSend>,
+    mut idempotency: IdempotencyKey,
+) -> Result<Json<Message>> {
+    let data = data.into_inner();
+    data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if message.content.len() == 0
-        && (message.attachments.is_none() || message.attachments.as_ref().unwrap().len() == 0)
+    idempotency.consume_nonce(data.nonce).await?;
+
+    let channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+    permissions
+        .throw_permission_and_view_channel(db, Permission::SendMessage)
+        .await?;
+
+    if (data.content.as_ref().map_or(true, |v| v.is_empty()))
+        && (data.attachments.as_ref().map_or(true, |v| v.is_empty()))
+        && (data.embeds.as_ref().map_or(true, |v| v.is_empty()))
     {
         return Err(Error::EmptyMessage);
     }
 
-    let target = target.fetch_channel().await?;
-    target.has_messaging()?;
-    
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_send_message() {
-        return Err(Error::MissingPermission)
-    }
+    let message_id = Ulid::new().to_string();
+    let mut message = Message {
+        id: message_id.clone(),
+        channel: channel.id().to_string(),
+        author: user.id.clone(),
+        ..Default::default()
+    };
 
+    // 1. Parse mentions in message.
     let mut mentions = HashSet::new();
-    for capture in RE_MENTION.captures_iter(&message.content) {
-        if let Some(mention) = capture.get(1) {
-            mentions.insert(mention.as_str().to_string());
+    if let Some(content) = &data.content {
+        for capture in RE_MENTION.captures_iter(content) {
+            if let Some(mention) = capture.get(1) {
+                mentions.insert(mention.as_str().to_string());
+            }
         }
     }
 
-    if let Some(_) = &message.masquerade {
-        if !perm.get_masquerade() {
-            return Err(Error::MissingPermission)
-        }
+    // 2. Verify permissions for masquerade.
+    if data.masquerade.is_some() {
+        permissions
+            .throw_permission(db, Permission::Masquerade)
+            .await?;
     }
 
+    // 3. Verify replies are valid.
     let mut replies = HashSet::new();
-    if let Some(entries) = message.replies {
-        // ! FIXME: move this to app config
+    if let Some(entries) = data.replies {
         if entries.len() > 5 {
-            return Err(Error::TooManyReplies)
+            return Err(Error::TooManyReplies);
         }
 
         for Reply { id, mention } in entries {
-            let message = Ref::from_unchecked(id)
-                .fetch_message(&target)
-                .await?;
-            
+            let message = Ref::from_unchecked(id).as_message(db).await?;
+
             replies.insert(message.id);
-            
+
             if mention {
                 mentions.insert(message.author);
             }
         }
     }
 
-    let id = Ulid::new().to_string();
-    let mut attachments = vec![];
+    if !mentions.is_empty() {
+        message.mentions.replace(
+            mentions
+                .into_iter()
+                .filter(|id| !user.has_blocked(id))
+                .collect::<Vec<String>>(),
+        );
+    }
 
-    if let Some(ids) = &message.attachments {
-        if ids.len() > 0 && !perm.get_upload_files() {
-            return Err(Error::MissingPermission)
+    if !replies.is_empty() {
+        message
+            .replies
+            .replace(replies.into_iter().collect::<Vec<String>>());
+    }
+
+    // 4. Add attachments to message.
+    let mut attachments = vec![];
+    if let Some(ids) = &data.attachments {
+        if !ids.is_empty() {
+            permissions
+                .throw_permission(db, Permission::UploadFiles)
+                .await?;
         }
 
         // ! FIXME: move this to app config
         if ids.len() > 5 {
-            return Err(Error::TooManyAttachments)
+            return Err(Error::TooManyAttachments);
         }
 
         for attachment_id in ids {
-            attachments
-                .push(File::find_and_use(attachment_id, "attachments", "message", &id).await?);
+            attachments.push(
+                db.find_and_use_attachment(attachment_id, "attachments", "message", &message_id)
+                    .await?,
+            );
         }
     }
 
+    if !attachments.is_empty() {
+        message.attachments.replace(attachments);
+    }
+
+    // 5. Process included embeds.
     let mut embeds = vec![];
-
-    if let Some(sendable_embeds) = message.embeds {
+    if let Some(sendable_embeds) = data.embeds {
         for sendable_embed in sendable_embeds {
-            embeds.push(sendable_embed.into_embed(id.clone()).await?)
+            embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?)
         }
     }
 
-    let msg = Message {
-        id,
-        channel: target.id().to_string(),
-        author: user.id,
+    if !embeds.is_empty() {
+        message.embeds.replace(embeds);
+    }
 
-        content: Content::Text(message.content.clone()),
-        nonce: Some(idempotency.key),
-        edited: None,
-        embeds: if embeds.len() > 0 { Some(embeds) } else { None },
-        attachments: if attachments.len() > 0 { Some(attachments) } else { None },
-        mentions: if mentions.len() > 0 {
-            Some(mentions.into_iter().collect::<Vec<String>>())
-        } else {
-            None
-        },
-        replies: if replies.len() > 0 {
-            Some(replies.into_iter().collect::<Vec<String>>())
-        } else {
-            None
-        },
-        masquerade: message.masquerade
-    };
+    // 6. Set content
+    message.content = data.content;
 
-    msg.clone().publish(&target, perm.get_embed_links()).await?;
-    Ok(RatelimitResponse(json!(msg)))
+    // 7. Pass-through nonce value for clients
+    message.nonce = Some(idempotency.into_key());
+
+    message.create(db, &channel, Some(&user)).await?;
+
+    // Queue up a task for processing embeds
+    if let Some(content) = &message.content {
+        revolt_quark::tasks::process_embeds::queue(
+            channel.id().to_string(),
+            message.id.to_string(),
+            content.clone(),
+        )
+        .await;
+    }
+
+    Ok(Json(message))
 }
diff --git a/src/routes/channels/mod.rs b/src/routes/channels/mod.rs
index 84918219..95f8ec45 100644
--- a/src/routes/channels/mod.rs
+++ b/src/routes/channels/mod.rs
@@ -1,27 +1,28 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod channel_ack;
 mod channel_delete;
 mod channel_edit;
 mod channel_fetch;
-mod members_fetch;
 mod group_add_member;
 mod group_create;
 mod group_remove_member;
 mod invite_create;
-mod voice_join;
+mod members_fetch;
 mod message_delete;
 mod message_edit;
 mod message_fetch;
 mod message_query;
-mod message_search;
 mod message_query_stale;
+mod message_search;
 mod message_send;
 mod permissions_set;
 mod permissions_set_default;
+mod voice_join;
 
-pub fn routes() -> Vec<Route> {
-    routes![
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
         channel_ack::req,
         channel_fetch::req,
         members_fetch::req,
diff --git a/src/routes/channels/permissions_set.rs b/src/routes/channels/permissions_set.rs
index a9e6cf9d..7705fbce 100644
--- a/src/routes/channels/permissions_set.rs
+++ b/src/routes/channels/permissions_set.rs
@@ -1,68 +1,59 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
-use validator::Contains;
+use serde::Deserialize;
 
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::notifications::events::ClientboundNotification;
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
 
-#[derive(Serialize, Deserialize)]
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
 pub struct Data {
-    permissions: u32
+    /// Allow / deny values to set for this role
+    permissions: Override,
 }
 
-#[put("/<target>/permissions/<role>", data = "<data>", rank = 2)]
-pub async fn req(user: User, target: Ref, role: String, data: Json<Data>) -> Result<EmptyResponse> {
-    let target = target.fetch_channel().await?;
+/// # Set Role Permission
+///
+/// Sets permissions for the specified role in this channel.
+///
+/// Channel must be a `TextChannel` or `VoiceChannel`.
+#[openapi(tag = "Channel Permissions")]
+#[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    role_id: String,
+    data: Json<Data>,
+) -> Result<Json<Channel>> {
+    let mut channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
 
-    match target {
-        Channel::TextChannel { id, server, mut role_permissions, .. }
-        | Channel::VoiceChannel { id, server, mut role_permissions, .. } => {
-            let target = Ref::from_unchecked(server).fetch_server().await?;
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_server(&target)
-                .for_server()
+    permissions
+        .throw_permission_and_view_channel(db, Permission::ManagePermissions)
+        .await?;
+
+    if let Some(server) = permissions.server.get() {
+        if let Some(role) = server.roles.get(&role_id) {
+            if role.rank <= permissions.get_member_rank().unwrap_or(i64::MIN) {
+                return Err(Error::NotElevated);
+            }
+
+            let current_value: Override = role.permissions.into();
+            permissions
+                .throw_permission_override(db, current_value, data.permissions)
                 .await?;
 
-            if !perm.get_manage_roles() {
-                return Err(Error::MissingPermission);
-            }
+            channel
+                .set_role_permission(db, &role_id, data.permissions.into())
+                .await?;
 
-            if !target.roles.has_element(&role) {
-                return Err(Error::NotFound);
-            }
-
-            let permissions: u32 = data.permissions;
-
-            get_collection("channels")
-            .update_one(
-                doc! { "_id": &id },
-                doc! {
-                    "$set": {
-                        "role_permissions.".to_owned() + &role: permissions as i32
-                    }
-                },
-                None
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "channel"
-            })?;
-
-            role_permissions.insert(role, permissions as i32);
-            ClientboundNotification::ChannelUpdate {
-                id: id.clone(),
-                data: json!({
-                    "role_permissions": role_permissions
-                }),
-                clear: None
-            }
-            .publish(id);
-
-            Ok(EmptyResponse {})
+            Ok(Json(channel))
+        } else {
+            Err(Error::NotFound)
         }
-        _ => Err(Error::InvalidOperation)
+    } else {
+        Err(Error::InvalidOperation)
     }
 }
diff --git a/src/routes/channels/permissions_set_default.rs b/src/routes/channels/permissions_set_default.rs
index 7890681f..befccff4 100644
--- a/src/routes/channels/permissions_set_default.rs
+++ b/src/routes/channels/permissions_set_default.rs
@@ -1,97 +1,95 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::Deserialize;
 
-use crate::database::*;
-use crate::database::permissions::channel::{ ChannelPermission, DEFAULT_PERMISSION_DM };
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
+    models::{channel::PartialChannel, Channel, User},
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
 
-#[derive(Serialize, Deserialize)]
-pub struct Data {
-    permissions: u32
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum DataDefaultChannelPermissions {
+    Value {
+        /// Permission values to set for members in a `Group`
+        permissions: u64,
+    },
+    Field {
+        /// Allow / deny values to set for members in this `TextChannel` or `VoiceChannel`
+        permissions: Override,
+    },
 }
 
+/// # Set Default Permission
+///
+/// Sets permissions for the default role in this channel.
+///
+/// Channel must be a `Group`, `TextChannel` or `VoiceChannel`.
+#[openapi(tag = "Channel Permissions")]
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
-    let target = target.fetch_channel().await?;
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataDefaultChannelPermissions>,
+) -> Result<Json<Channel>> {
+    let data = data.into_inner();
 
-    match target {
-        Channel::Group { id, owner, .. } => {
-            if user.id == owner {
-                let permissions: u32 = ChannelPermission::View as u32 | (data.permissions & *DEFAULT_PERMISSION_DM);
+    let mut channel = target.as_channel(db).await?;
+    let mut perm = perms(&user).channel(&channel);
 
-                get_collection("channels")
-                    .update_one(
-                        doc! { "_id": &id },
-                        doc! {
-                            "$set": {
-                                "permissions": permissions as i32
-                            }
+    perm.throw_permission_and_view_channel(db, Permission::ManagePermissions)
+        .await?;
+
+    match &channel {
+        Channel::Group { .. } => {
+            if let DataDefaultChannelPermissions::Value { permissions } = data {
+                channel
+                    .update(
+                        db,
+                        PartialChannel {
+                            permissions: Some(permissions as i64),
+                            ..Default::default()
                         },
-                        None
+                        vec![],
                     )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel"
-                    })?;
-
-                ClientboundNotification::ChannelUpdate {
-                    id: id.clone(),
-                    data: json!({
-                        "permissions": permissions as i32
-                    }),
-                    clear: None
-                }
-                .publish(id);
-
-                Ok(EmptyResponse {})
+                    .await?;
             } else {
-                Err(Error::MissingPermission)
+                return Err(Error::InvalidOperation);
             }
         }
-        Channel::TextChannel { id, server, .. }
-        | Channel::VoiceChannel { id, server, .. } => {
-            let target = Ref::from_unchecked(server).fetch_server().await?;
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_server(&target)
-                .for_server()
+        Channel::TextChannel {
+            default_permissions,
+            ..
+        }
+        | Channel::VoiceChannel {
+            default_permissions,
+            ..
+        } => {
+            if let DataDefaultChannelPermissions::Field { permissions } = data {
+                perm.throw_permission_override(
+                    db,
+                    default_permissions.map(|x| x.into()),
+                    permissions,
+                )
                 .await?;
 
-            if !perm.get_manage_roles() {
-                return Err(Error::MissingPermission);
+                channel
+                    .update(
+                        db,
+                        PartialChannel {
+                            default_permissions: Some(permissions.into()),
+                            ..Default::default()
+                        },
+                        vec![],
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
             }
-
-            let permissions: u32 = data.permissions;
-
-            get_collection("channels")
-                .update_one(
-                    doc! { "_id": &id },
-                    doc! {
-                        "$set": {
-                            "default_permissions": permissions as i32
-                        }
-                    },
-                    None
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "channel"
-                })?;
-
-            ClientboundNotification::ChannelUpdate {
-                id: id.clone(),
-                data: json!({
-                    "default_permissions": permissions as i32
-                }),
-                clear: None
-            }
-            .publish(id);
-
-            Ok(EmptyResponse {})
         }
-        _ => Err(Error::InvalidOperation)
+        _ => return Err(Error::InvalidOperation),
     }
+
+    Ok(Json(channel))
 }
diff --git a/src/routes/channels/voice_join.rs b/src/routes/channels/voice_join.rs
index 98fdabec..5ceb2273 100644
--- a/src/routes/channels/voice_join.rs
+++ b/src/routes/channels/voice_join.rs
@@ -1,44 +1,50 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::{USE_VOSO, VOSO_MANAGE_TOKEN, VOSO_URL};
+use revolt_quark::{
+    models::{Channel, User},
+    perms,
+    variables::delta::{USE_VOSO, VOSO_MANAGE_TOKEN, VOSO_URL},
+    Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize)]
-struct CreateUserResponse {
+/// # Voice Server Token Response
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct CreateVoiceUserResponse {
+    /// Token for authenticating with the voice server
     token: String,
 }
 
+/// # Join Call
+///
+/// Asks the voice server for a token to join the call.
+#[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<CreateVoiceUserResponse>> {
+    let channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+
+    permissions
+        .throw_permission_and_view_channel(db, Permission::Connect)
+        .await?;
+
     if !*USE_VOSO {
         return Err(Error::VosoUnavailable);
     }
 
-    let target = target.fetch_channel().await?;
-    match target {
+    match channel {
         Channel::SavedMessages { .. } | Channel::TextChannel { .. } => {
             return Err(Error::CannotJoinCall)
         }
         _ => {}
     }
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_voice_call() {
-        return Err(Error::MissingPermission);
-    }
-
     // To join a call:
     // - Check if the room exists.
     // - If not, create it.
     let client = reqwest::Client::new();
     let result = client
-        .get(&format!("{}/room/{}", *VOSO_URL, target.id()))
+        .get(&format!("{}/room/{}", *VOSO_URL, channel.id()))
         .header(
             reqwest::header::AUTHORIZATION,
             VOSO_MANAGE_TOKEN.to_string(),
@@ -51,14 +57,15 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         Ok(result) => match result.status() {
             reqwest::StatusCode::OK => (),
             reqwest::StatusCode::NOT_FOUND => {
-                if let Err(_) = client
-                    .post(&format!("{}/room/{}", *VOSO_URL, target.id()))
+                if (client
+                    .post(&format!("{}/room/{}", *VOSO_URL, channel.id()))
                     .header(
                         reqwest::header::AUTHORIZATION,
                         VOSO_MANAGE_TOKEN.to_string(),
                     )
                     .send()
-                    .await
+                    .await)
+                    .is_err()
                 {
                     return Err(Error::VosoUnavailable);
                 }
@@ -72,7 +79,7 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         .post(&format!(
             "{}/room/{}/user/{}",
             *VOSO_URL,
-            target.id(),
+            channel.id(),
             user.id
         ))
         .header(
@@ -82,9 +89,11 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         .send()
         .await
     {
-        let res: CreateUserResponse = response.json().await.map_err(|_| Error::InvalidOperation)?;
-
-        Ok(json!(res))
+        response
+            .json()
+            .await
+            .map_err(|_| Error::InvalidOperation)
+            .map(Json)
     } else {
         Err(Error::VosoUnavailable)
     }
diff --git a/src/routes/invites/invite_delete.rs b/src/routes/invites/invite_delete.rs
index 7d129f6f..c2b15c10 100644
--- a/src/routes/invites/invite_delete.rs
+++ b/src/routes/invites/invite_delete.rs
@@ -1,30 +1,31 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
+    models::{Invite, User},
+    perms, Db, EmptyResponse, Permission, Ref, Result,
+};
 
+/// # Delete Invite
+///
+/// Delete an invite by its id.
+#[openapi(tag = "Invites")]
 #[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
-    let target = target.fetch_invite().await?;
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    let invite = target.as_invite(db).await?;
 
-    if target.creator() == &user.id {
-        target.delete().await?;
+    if user.id == invite.creator() {
+        db.delete_invite(invite.code()).await
     } else {
-        match &target {
-            Invite::Server { server, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-                let perm = permissions::PermissionCalculator::new(&user)
-                    .with_server(&server)
-                    .for_server()
+        match invite {
+            Invite::Server { code, server, .. } => {
+                let server = db.fetch_server(&server).await?;
+                perms(&user)
+                    .server(&server)
+                    .throw_permission(db, Permission::ManageServer)
                     .await?;
 
-                if !perm.get_manage_server() {
-                    return Err(Error::MissingPermission);
-                }
-
-                target.delete().await?;
+                db.delete_invite(&code).await
             }
             _ => unreachable!(),
         }
     }
-
-    Ok(EmptyResponse {})
+    .map(|_| EmptyResponse)
 }
diff --git a/src/routes/invites/invite_fetch.rs b/src/routes/invites/invite_fetch.rs
index 521e124e..e931b66d 100644
--- a/src/routes/invites/invite_fetch.rs
+++ b/src/routes/invites/invite_fetch.rs
@@ -1,48 +1,95 @@
-use crate::database::*;
-use crate::util::result::Result;
+use revolt_quark::models::{Channel, File, Invite};
+use revolt_quark::{Db, Ref, Result};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::Serialize;
 
-#[derive(Serialize, Debug, Clone)]
+/// # Invite
+#[allow(clippy::large_enum_variant)]
+#[derive(Serialize, Debug, Clone, JsonSchema)]
 #[serde(tag = "type")]
 pub enum InviteResponse {
+    /// Server channel invite
     Server {
+        /// Invite code
+        code: String,
+        /// Id of the server
         server_id: String,
+        /// Name of the server
         server_name: String,
+        /// Attachment for server icon
         #[serde(skip_serializing_if = "Option::is_none")]
         server_icon: Option<File>,
+        /// Attachment for server banner
         #[serde(skip_serializing_if = "Option::is_none")]
         server_banner: Option<File>,
+        /// Id of server channel
         channel_id: String,
+        /// Name of server channel
         channel_name: String,
+        /// Description of server channel
         #[serde(skip_serializing_if = "Option::is_none")]
         channel_description: Option<String>,
+        /// Name of user who created the invite
         user_name: String,
+        /// Avatar of the user who created the invite
         #[serde(skip_serializing_if = "Option::is_none")]
         user_avatar: Option<File>,
+        /// Number of members in this server
         member_count: i64,
     },
+    /// Group channel invite
+    Group {
+        /// Invite code
+        code: String,
+        /// Id of group channel
+        channel_id: String,
+        /// Name of group channel
+        channel_name: String,
+        /// Description of group channel
+        #[serde(skip_serializing_if = "Option::is_none")]
+        channel_description: Option<String>,
+        /// Name of user who created the invite
+        user_name: String,
+        /// Avatar of the user who created the invite
+        #[serde(skip_serializing_if = "Option::is_none")]
+        user_avatar: Option<File>,
+    },
 }
 
+/// # Fetch Invite
+///
+/// Fetch an invite by its id.
+#[openapi(tag = "Invites")]
 #[get("/<target>")]
-pub async fn req(target: Ref) -> Result<Value> {
-    let target = target.fetch_invite().await?;
-
-    match target {
+pub async fn req(db: &Db, target: Ref) -> Result<Json<InviteResponse>> {
+    Ok(Json(match target.as_invite(db).await? {
         Invite::Server {
             channel, creator, ..
         } => {
-            let channel = Ref::from_unchecked(channel).fetch_channel().await?;
-            let creator = Ref::from_unchecked(creator).fetch_user().await?;
+            let channel = db.fetch_channel(&channel).await?;
+            let user = db.fetch_user(&creator).await?;
 
             match channel {
-                Channel::TextChannel { id, server, name, description, .. }
-                | Channel::VoiceChannel { id, server, name, description, .. } => {
-                    let server = Ref::from_unchecked(server).fetch_server().await?;
-    
-                    Ok(json!(InviteResponse::Server {
-                        member_count: Server::get_member_count(&server.id).await?,
+                Channel::TextChannel {
+                    id,
+                    server,
+                    name,
+                    description,
+                    ..
+                }
+                | Channel::VoiceChannel {
+                    id,
+                    server,
+                    name,
+                    description,
+                    ..
+                } => {
+                    let server = db.fetch_server(&server).await?;
+
+                    InviteResponse::Server {
+                        code: target.id,
+                        member_count: db.fetch_member_count(&server.id).await? as i64,
                         server_id: server.id,
                         server_name: server.name,
                         server_icon: server.icon,
@@ -50,13 +97,35 @@ pub async fn req(target: Ref) -> Result<Value> {
                         channel_id: id,
                         channel_name: name,
                         channel_description: description,
-                        user_name: creator.username,
-                        user_avatar: creator.avatar
-                    }))
+                        user_name: user.username,
+                        user_avatar: user.avatar,
+                    }
                 }
-                _ => unreachable!()
+                _ => unreachable!(),
             }
         }
-        _ => unreachable!(),
-    }
+        Invite::Group {
+            channel, creator, ..
+        } => {
+            let channel = db.fetch_channel(&channel).await?;
+            let user = db.fetch_user(&creator).await?;
+
+            match channel {
+                Channel::Group {
+                    id,
+                    name,
+                    description,
+                    ..
+                } => InviteResponse::Group {
+                    code: target.id,
+                    channel_id: id,
+                    channel_name: name,
+                    channel_description: description,
+                    user_name: user.username,
+                    user_avatar: user.avatar,
+                },
+                _ => unreachable!(),
+            }
+        }
+    }))
 }
diff --git a/src/routes/invites/invite_join.rs b/src/routes/invites/invite_join.rs
index df80030a..36e4886a 100644
--- a/src/routes/invites/invite_join.rs
+++ b/src/routes/invites/invite_join.rs
@@ -1,41 +1,46 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_SERVER_COUNT;
+use revolt_quark::{
+    models::{Channel, Invite, Server, User},
+    variables::delta::MAX_SERVER_COUNT,
+    Db, Error, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use serde::Serialize;
 
+/// # Join Response
+#[derive(Serialize, JsonSchema)]
+#[serde(tag = "type")]
+pub enum InviteJoinResponse {
+    Server {
+        /// Channels in the server
+        channels: Vec<Channel>,
+        /// Server we are joining
+        server: Server,
+    },
+}
+
+/// # Join Invite
+///
+/// Join an invite by its ID.
+#[openapi(tag = "Invites")]
 #[post("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<InviteJoinResponse>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
-    if !User::can_acquire_server(&user.id).await? {
-        Err(Error::TooManyServers {
+    if !user.can_acquire_server(db).await? {
+        return Err(Error::TooManyServers {
             max: *MAX_SERVER_COUNT,
-        })?
+        });
     }
-    
-    let target = target.fetch_invite().await?;
 
-    match target {
-        Invite::Server { channel, .. } => {
-            let channel = Ref::from_unchecked(channel).fetch_channel().await?;
-            let server = match &channel {
-                Channel::TextChannel { server, .. }
-                | Channel::VoiceChannel { server, .. } => {
-                    Ref::from_unchecked(server.clone()).fetch_server().await?
-                }
-                _ => unreachable!()
-            };
-
-            server.join_member(&user.id).await?;
-
-            Ok(json!({
-                "type": "Server",
-                "channel": channel,
-                "server": server
-            }))
+    let invite = target.as_invite(db).await?;
+    match &invite {
+        Invite::Server { server, .. } => {
+            let server = db.fetch_server(server).await?;
+            let channels = server.create_member(db, user, None).await?;
+            Ok(Json(InviteJoinResponse::Server { channels, server }))
         }
         _ => unreachable!(),
     }
diff --git a/src/routes/invites/mod.rs b/src/routes/invites/mod.rs
index 69843215..059b6d94 100644
--- a/src/routes/invites/mod.rs
+++ b/src/routes/invites/mod.rs
@@ -1,9 +1,10 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod invite_delete;
 mod invite_fetch;
 mod invite_join;
 
-pub fn routes() -> Vec<Route> {
-    routes![invite_fetch::req, invite_join::req, invite_delete::req]
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![invite_fetch::req, invite_join::req, invite_delete::req]
 }
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 03a2902b..fc8aad7b 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -1,6 +1,7 @@
 pub use rocket::http::Status;
 pub use rocket::response::Redirect;
 use rocket::{Build, Rocket};
+use rocket_okapi::{okapi::openapi3::OpenApi, settings::OpenApiSettings};
 
 mod bots;
 mod channels;
@@ -12,15 +13,255 @@ mod servers;
 mod sync;
 mod users;
 
-pub fn mount(rocket: Rocket<Build>) -> Rocket<Build> {
+pub fn mount(mut rocket: Rocket<Build>) -> Rocket<Build> {
+    let settings = OpenApiSettings::default();
+
+    mount_endpoints_and_merged_docs! {
+        rocket, "/".to_owned(), settings,
+        "/" => (vec![], custom_openapi_spec()),
+        "" => openapi_get_routes_spec![root::root, root::ping],
+        "/users" => users::routes(),
+        "/bots" => bots::routes(),
+        "/channels" => channels::routes(),
+        "/servers" => servers::routes(),
+        "/invites" => invites::routes(),
+        "/auth/account" => rauth::web::account::routes(),
+        "/auth/session" => rauth::web::session::routes(),
+        "/onboard" => onboard::routes(),
+        "/push" => push::routes(),
+        "/sync" => sync::routes(),
+    };
+
     rocket
-        .mount("/", routes![root::root, root::ping])
-        .mount("/onboard", onboard::routes())
-        .mount("/users", users::routes())
-        .mount("/channels", channels::routes())
-        .mount("/servers", servers::routes())
-        .mount("/bots", bots::routes())
-        .mount("/invites", invites::routes())
-        .mount("/push", push::routes())
-        .mount("/sync", sync::routes())
+}
+
+fn custom_openapi_spec() -> OpenApi {
+    use rocket_okapi::okapi::openapi3::*;
+
+    let mut extensions = schemars::Map::new();
+    extensions.insert(
+        "x-logo".to_owned(),
+        json!({
+            "url": "https://revolt.chat/header.png",
+            "altText": "Revolt Header"
+        }),
+    );
+
+    extensions.insert(
+        "x-tagGroups".to_owned(),
+        json!([
+          {
+            "name": "Revolt",
+            "tags": [
+              "Core"
+            ]
+          },
+          {
+            "name": "Users",
+            "tags": [
+              "User Information",
+              "Direct Messaging",
+              "Relationships"
+            ]
+          },
+          {
+            "name": "Bots",
+            "tags": [
+              "Bots"
+            ]
+          },
+          {
+            "name": "Channels",
+            "tags": [
+              "Channel Information",
+              "Channel Invites",
+              "Channel Permissions",
+              "Messaging",
+              "Groups",
+              "Voice"
+            ]
+          },
+          {
+            "name": "Servers",
+            "tags": [
+              "Server Information",
+              "Server Members",
+              "Server Permissions"
+            ]
+          },
+          {
+            "name": "Invites",
+            "tags": [
+              "Invites"
+            ]
+          },
+          {
+            "name": "Authentication",
+            "tags": [
+              "Account",
+              "Session",
+              "Onboarding"
+            ]
+          },
+          {
+            "name": "Miscellaneous",
+            "tags": [
+              "Sync",
+              "Web Push"
+            ]
+          }
+        ]),
+    );
+
+    OpenApi {
+        openapi: OpenApi::default_version(),
+        info: Info {
+            title: "Revolt API".to_owned(),
+            description: Some("User-first privacy focused chat platform.".to_owned()),
+            terms_of_service: Some("https://revolt.chat/terms".to_owned()),
+            contact: Some(Contact {
+                name: Some("Revolt Support".to_owned()),
+                url: Some("https://revolt.chat".to_owned()),
+                email: Some("contact@revolt.chat".to_owned()),
+                ..Default::default()
+            }),
+            license: Some(License {
+                name: "AGPLv3".to_owned(),
+                url: Some("https://github.com/revoltchat/delta/blob/master/LICENSE".to_owned()),
+                ..Default::default()
+            }),
+            version: "0.5.3-rc.1".to_owned(),
+            ..Default::default()
+        },
+        servers: vec![
+            Server {
+                url: "https://api.revolt.chat".to_owned(),
+                description: Some("Revolt API".to_owned()),
+                ..Default::default()
+            },
+            Server {
+                url: "http://local.revolt.chat:8000".to_owned(),
+                description: Some("Local Revolt Environment".to_owned()),
+                ..Default::default()
+            },
+        ],
+        external_docs: Some(ExternalDocs {
+            url: "https://developers.revolt.chat".to_owned(),
+            description: Some("Revolt Developer Documentation".to_owned()),
+            ..Default::default()
+        }),
+        extensions,
+        tags: vec![
+            Tag {
+                name: "Core".to_owned(),
+                description: Some(
+                    "Use in your applications to determine information about the Revolt node"
+                        .to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "User Information".to_owned(),
+                description: Some("Query and fetch users on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Direct Messaging".to_owned(),
+                description: Some("Direct message other users on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Relationships".to_owned(),
+                description: Some(
+                    "Manage your friendships and block list on the platform".to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "Bots".to_owned(),
+                description: Some("Create and edit bots".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Information".to_owned(),
+                description: Some("Query and fetch channels on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Invites".to_owned(),
+                description: Some("Create and manage invites for channels".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Permissions".to_owned(),
+                description: Some("Manage permissions for channels".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Messaging".to_owned(),
+                description: Some("Send and manipulate messages".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Groups".to_owned(),
+                description: Some("Create, invite users and manipulate groups".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Voice".to_owned(),
+                description: Some("Join and talk with other users".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Information".to_owned(),
+                description: Some("Query and fetch servers on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Members".to_owned(),
+                description: Some("Find and edit server members".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Permissions".to_owned(),
+                description: Some("Manage permissions for servers".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Invites".to_owned(),
+                description: Some("View, join and delete invites".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Account".to_owned(),
+                description: Some("Manage your account".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Session".to_owned(),
+                description: Some("Create and manage sessions".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Onboarding".to_owned(),
+                description: Some(
+                    "After signing up to Revolt, users must pick a unique username".to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "Sync".to_owned(),
+                description: Some("Upload and retrieve any JSON data between clients".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Web Push".to_owned(),
+                description: Some(
+                    "Subscribe to and receive Revolt push notifications while offline".to_owned(),
+                ),
+                ..Default::default()
+            },
+        ],
+        ..Default::default()
+    }
 }
diff --git a/src/routes/onboard/complete.rs b/src/routes/onboard/complete.rs
index b2249d3f..97d31a28 100644
--- a/src/routes/onboard/complete.rs
+++ b/src/routes/onboard/complete.rs
@@ -1,45 +1,47 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
 use crate::util::regex::RE_USERNAME;
+use revolt_quark::{models::User, Database, EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
 use rauth::entities::Session;
-use rocket::serde::json::Json;
+use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # New User Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataOnboard {
+    /// New username which will be used to identify the user on the platform
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     username: String,
 }
 
+/// # Complete Onboarding
+///
+/// This sets a new username, completes onboarding and allows a user to start using Revolt.
+#[openapi(tag = "Onboarding")]
 #[post("/complete", data = "<data>")]
-pub async fn req(session: Session, user: Option<User>, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &State<Database>,
+    session: Session,
+    user: Option<User>,
+    data: Json<DataOnboard>,
+) -> Result<EmptyResponse> {
     if user.is_some() {
-        Err(Error::AlreadyOnboarded)?
+        return Err(Error::AlreadyOnboarded);
     }
 
+    let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if User::is_username_taken(&data.username).await? {
+    if db.is_username_taken(&data.username).await? {
         return Err(Error::UsernameTaken);
     }
 
-    get_collection("users")
-        .insert_one(
-            doc! {
-                "_id": session.user_id,
-                "username": &data.username
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
+    let user = User {
+        id: session.user_id,
+        username: data.username,
+        ..Default::default()
+    };
 
-    Ok(EmptyResponse {})
+    db.insert_user(&user).await.map(|_| EmptyResponse)
 }
diff --git a/src/routes/onboard/hello.rs b/src/routes/onboard/hello.rs
index ca4f1ca8..d1651338 100644
--- a/src/routes/onboard/hello.rs
+++ b/src/routes/onboard/hello.rs
@@ -1,11 +1,22 @@
-use crate::database::*;
-
 use rauth::entities::Session;
-use rocket::serde::json::Value;
+use revolt_quark::models::User;
+use rocket::serde::json::Json;
+use serde::Serialize;
 
+/// # Onboarding Status
+#[derive(Serialize, JsonSchema)]
+pub struct DataHello {
+    /// Whether onboarding is required
+    onboarding: bool,
+}
+
+/// # Check Onboarding Status
+///
+/// This will tell you whether the current account requires onboarding or whether you can continue to send requests as usual. You may skip calling this if you're restoring an existing session.
+#[openapi(tag = "Onboarding")]
 #[get("/hello")]
-pub async fn req(_session: Session, user: Option<User>) -> Value {
-    json!({
-        "onboarding": user.is_none()
+pub async fn req(_session: Session, user: Option<User>) -> Json<DataHello> {
+    Json(DataHello {
+        onboarding: user.is_none(),
     })
 }
diff --git a/src/routes/onboard/mod.rs b/src/routes/onboard/mod.rs
index 727886dd..16ec2708 100644
--- a/src/routes/onboard/mod.rs
+++ b/src/routes/onboard/mod.rs
@@ -1,8 +1,9 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod complete;
 mod hello;
 
-pub fn routes() -> Vec<Route> {
-    routes![hello::req, complete::req]
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![hello::req, complete::req]
 }
diff --git a/src/routes/push/mod.rs b/src/routes/push/mod.rs
index ff0a14cd..e5d5d151 100644
--- a/src/routes/push/mod.rs
+++ b/src/routes/push/mod.rs
@@ -1,8 +1,9 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod subscribe;
 mod unsubscribe;
 
-pub fn routes() -> Vec<Route> {
-    routes![subscribe::req, unsubscribe::req]
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![subscribe::req, unsubscribe::req]
 }
diff --git a/src/routes/push/subscribe.rs b/src/routes/push/subscribe.rs
index 343e953c..f5125f82 100644
--- a/src/routes/push/subscribe.rs
+++ b/src/routes/push/subscribe.rs
@@ -1,15 +1,26 @@
-use crate::database::*;
-use crate::util::result::{EmptyResponse, Error, Result};
+use revolt_quark::{EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
-use rauth::entities::{Model, Session, WebPushSubscription};
-use rocket::serde::json::Json;
+use rauth::{
+    entities::{Model, Session, WebPushSubscription},
+    logic::Auth,
+};
+use rocket::{serde::json::Json, State};
 
+/// # Push Subscribe
+///
+/// Create a new Web Push subscription.
+///
+/// If an existing subscription exists on this session, it will be removed.
+#[openapi(tag = "Web Push")]
 #[post("/subscribe", data = "<data>")]
-pub async fn req(mut session: Session, data: Json<WebPushSubscription>) -> Result<EmptyResponse> {
+pub async fn req(
+    auth: &State<Auth>,
+    mut session: Session,
+    data: Json<WebPushSubscription>,
+) -> Result<EmptyResponse> {
     session.subscription = Some(data.into_inner());
     session
-        .save(&get_db(), None)
+        .save(&auth.db, None)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {
diff --git a/src/routes/push/unsubscribe.rs b/src/routes/push/unsubscribe.rs
index 68521171..141e72a7 100644
--- a/src/routes/push/unsubscribe.rs
+++ b/src/routes/push/unsubscribe.rs
@@ -1,14 +1,20 @@
-use crate::database::*;
-use crate::util::result::{EmptyResponse, Error, Result};
+use revolt_quark::{EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
-use rauth::entities::{Model, Session};
+use rauth::{
+    entities::{Model, Session},
+    logic::Auth,
+};
+use rocket::State;
 
+/// # Unsubscribe
+///
+/// Remove the Web Push subscription associated with the current session.
+#[openapi(tag = "Web Push")]
 #[post("/unsubscribe")]
-pub async fn req(mut session: Session) -> Result<EmptyResponse> {
+pub async fn req(auth: &State<Auth>, mut session: Session) -> Result<EmptyResponse> {
     session.subscription = None;
     session
-        .save(&get_db(), None)
+        .save(&auth.db, None)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {
diff --git a/src/routes/root.rs b/src/routes/root.rs
index c15536f1..6393ff5c 100644
--- a/src/routes/root.rs
+++ b/src/routes/root.rs
@@ -1,43 +1,112 @@
-use crate::util::{ratelimit::Ratelimiter, variables::{
+use revolt_quark::variables::delta::{
     APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, JANUARY_URL, USE_AUTUMN,
     USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
-}};
+};
+use revolt_quark::Result;
 
-use mongodb::bson::doc;
-use rocket::{http::Status, serde::json::Value};
+use rocket::http::Status;
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-#[get("/")]
-pub async fn root() -> Value {
-    json!({
-        "revolt": crate::version::VERSION,
-        "features": {
-            "captcha": {
-                "enabled": *USE_HCAPTCHA,
-                "key": HCAPTCHA_SITEKEY.to_string()
-            },
-            "email": *USE_EMAIL,
-            "invite_only": *INVITE_ONLY,
-            "autumn": {
-                "enabled": *USE_AUTUMN,
-                "url": *AUTUMN_URL
-            },
-            "january": {
-                "enabled": *USE_JANUARY,
-                "url": *JANUARY_URL
-            },
-            "voso": {
-                "enabled": *USE_VOSO,
-                "url": *VOSO_URL,
-                "ws": *VOSO_WS_HOST
-            }
-        },
-        "ws": *EXTERNAL_WS_URL,
-        "app": *APP_URL,
-        "vapid": *VAPID_PUBLIC_KEY
-    })
+/// # hCaptcha Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct CaptchaFeature {
+    /// Whether captcha is enabled
+    pub enabled: bool,
+    /// Client key used for solving captcha
+    pub key: String,
 }
 
+/// # Generic Service Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct Feature {
+    /// Whether the service is enabled
+    pub enabled: bool,
+    /// URL pointing to the service
+    pub url: String,
+}
+
+/// # Voice Server Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct VoiceFeature {
+    /// Whether voice is enabled
+    pub enabled: bool,
+    /// URL pointing to the voice API
+    pub url: String,
+    /// URL pointing to the voice WebSocket server
+    pub ws: String,
+}
+
+/// # Feature Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct RevoltFeatures {
+    /// hCaptcha configuration
+    pub captcha: CaptchaFeature,
+    /// Whether email verification is enabled
+    pub email: bool,
+    /// Whether this server is invite only
+    pub invite_only: bool,
+    /// File server service configuration
+    pub autumn: Feature,
+    /// Proxy service configuration
+    pub january: Feature,
+    /// Voice server configuration
+    pub voso: VoiceFeature,
+}
+
+/// # Server Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct RevoltConfig {
+    /// Revolt API Version
+    pub revolt: String,
+    /// Features enabled on this Revolt node
+    pub features: RevoltFeatures,
+    /// WebSocket URL
+    pub ws: String,
+    /// URL pointing to the client serving this node
+    pub app: String,
+    /// Web Push VAPID public key
+    pub vapid: String,
+}
+
+/// # Query Node
+///
+/// Fetch the server configuration for this Revolt instance.
+#[openapi(tag = "Core")]
+#[get("/")]
+pub async fn root() -> Result<Json<RevoltConfig>> {
+    Ok(Json(RevoltConfig {
+        revolt: crate::version::VERSION.to_string(),
+        features: RevoltFeatures {
+            captcha: CaptchaFeature {
+                enabled: *USE_HCAPTCHA,
+                key: HCAPTCHA_SITEKEY.to_string(),
+            },
+            email: *USE_EMAIL,
+            invite_only: *INVITE_ONLY,
+            autumn: Feature {
+                enabled: *USE_AUTUMN,
+                url: AUTUMN_URL.to_string(),
+            },
+            january: Feature {
+                enabled: *USE_JANUARY,
+                url: JANUARY_URL.to_string(),
+            },
+            voso: VoiceFeature {
+                enabled: *USE_VOSO,
+                url: VOSO_URL.to_string(),
+                ws: VOSO_WS_HOST.to_string(),
+            },
+        },
+        ws: EXTERNAL_WS_URL.to_string(),
+        app: APP_URL.to_string(),
+        vapid: VAPID_PUBLIC_KEY.to_string(),
+    }))
+}
+
+/// Example endpoint.
+#[openapi(skip)]
 #[get("/ping")]
-pub async fn ping(_limitguard: Ratelimiter) -> Status {
+pub async fn ping(/*_limitguard: Ratelimiter*/) -> Status {
     Status::Ok
 }
diff --git a/src/routes/servers/ban_create.rs b/src/routes/servers/ban_create.rs
index 51490f71..9664dfc6 100644
--- a/src/routes/servers/ban_create.rs
+++ b/src/routes/servers/ban_create.rs
@@ -1,62 +1,59 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
+    models::{ServerBan, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Ban Information
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataBanCreate {
+    /// Ban reason
     #[validate(length(min = 1, max = 1024))]
     reason: Option<String>,
 }
 
+/// # Ban User
+///
+/// Ban a user by their id.
+#[openapi(tag = "Server Members")]
 #[put("/<server>/bans/<target>", data = "<data>")]
-pub async fn req(user: User, server: Ref, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    server: Ref,
+    target: Ref,
+    data: Json<DataBanCreate>,
+) -> Result<Json<ServerBan>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let server = server.fetch_server().await?;
+    let server = server.as_server(db).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&server)
-        .for_server()
-        .await?;
-
-    if !perm.get_ban_members() {
-        Err(Error::MissingPermission)?
-    }
-
-    let target = target.fetch_user().await?;
     if target.id == user.id {
-        return Err(Error::InvalidOperation);
+        return Err(Error::CannotRemoveYourself);
     }
 
     if target.id == server.owner {
-        return Err(Error::MissingPermission);
+        return Err(Error::InvalidOperation);
     }
 
-    let mut document = doc! {
-        "_id": {
-            "server": &server.id,
-            "user": &target.id
-        }
-    };
+    let mut permissions = perms(&user).server(&server);
 
-    if let Some(reason) = data.reason {
-        document.insert("reason", reason);
+    permissions
+        .throw_permission(db, Permission::BanMembers)
+        .await?;
+
+    let member = target.as_member(db, &server.id).await?;
+
+    if member.get_ranking(permissions.server.get().unwrap())
+        <= permissions.get_member_rank().unwrap_or(i64::MIN)
+    {
+        return Err(Error::NotElevated);
     }
 
-    get_collection("server_bans")
-        .insert_one(document, None)
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "server_ban",
-        })?;
-
-    server.remove_member(&target.id, RemoveMember::Ban).await?;
-    Ok(EmptyResponse {})
+    server.ban_member(db, member, data.reason).await.map(Json)
 }
diff --git a/src/routes/servers/ban_list.rs b/src/routes/servers/ban_list.rs
index 141c4a9b..d66bca01 100644
--- a/src/routes/servers/ban_list.rs
+++ b/src/routes/servers/ban_list.rs
@@ -1,87 +1,67 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::{File, ServerBan, User};
+use revolt_quark::{perms, Db, Permission, Ref, Result};
 
-use futures::StreamExt;
-use mongodb::options::FindOptions;
-use serde::{Serialize, Deserialize};
-use rocket::serde::json::Value;
-use mongodb::bson::{doc, from_document};
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize)]
+/// # Banned User
+///
+/// Just enoguh user information to list bans.
+#[derive(Serialize, Deserialize, JsonSchema)]
 struct BannedUser {
-    _id: String,
-    username: String,
-    avatar: Option<File>
+    /// Id of the banned user
+    #[serde(rename = "_id")]
+    pub id: String,
+    /// Username of the banned user
+    pub username: String,
+    /// Avatar of the banned user
+    pub avatar: Option<File>,
 }
 
-#[get("/<target>/bans")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_server().await?;
+/// # Ban List Result
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct BanListResult {
+    /// Users objects
+    users: Vec<BannedUser>,
+    /// Ban objects
+    bans: Vec<ServerBan>,
+}
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+impl From<User> for BannedUser {
+    fn from(user: User) -> Self {
+        BannedUser {
+            id: user.id,
+            username: user.username,
+            avatar: user.avatar,
+        }
+    }
+}
+
+/// # Fetch Bans
+///
+/// Fetch all bans on a server.
+#[openapi(tag = "Server Members")]
+#[get("/<target>/bans")]
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<BanListResult>> {
+    let server = target.as_server(db).await?;
+    perms(&user)
+        .server(&server)
+        .throw_permission(db, Permission::BanMembers)
         .await?;
 
-    if !perm.get_ban_members() {
-        return Err(Error::MissingPermission);
-    }
-
-    let mut cursor = get_collection("server_bans")
-        .find(
-            doc! {
-                "_id.server": target.id
-            },
-            None,
+    let bans = db.fetch_bans(&server.id).await?;
+    let users = db
+        .fetch_users(
+            &bans
+                .iter()
+                .map(|x| &x.id.user)
+                .cloned()
+                .collect::<Vec<String>>(),
         )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "server_bans",
-        })?;
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
-    let mut bans = vec![];
-    let mut user_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(ban) = from_document::<Ban>(doc) {
-                user_ids.push(ban.id.user.clone());
-                bans.push(ban);
-            }
-        }
-    }
-
-    let mut cursor = get_collection("users")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": user_ids
-                }
-            },
-            FindOptions::builder()
-                .projection(doc! {
-                    "username": 1,
-                    "avatar": 1
-                })
-                .build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "users",
-        })?;
-
-    let mut users = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(user) = from_document::<BannedUser>(doc) {
-                users.push(user);
-            }
-        }
-    }
-
-    Ok(json!({
-        "users": users,
-        "bans": bans
-    }))
+    Ok(Json(BanListResult { users, bans }))
 }
diff --git a/src/routes/servers/ban_remove.rs b/src/routes/servers/ban_remove.rs
index a4f1d6db..3486ce45 100644
--- a/src/routes/servers/ban_remove.rs
+++ b/src/routes/servers/ban_remove.rs
@@ -1,43 +1,17 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
 
+/// # Unban user
+///
+/// Remove a user's ban.
+#[openapi(tag = "Server Members")]
 #[delete("/<server>/bans/<target>")]
-pub async fn req(user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
-    let server = server.fetch_server().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&server)
-        .for_server()
+pub async fn req(db: &Db, user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
+    let server = server.as_server(db).await?;
+    perms(&user)
+        .server(&server)
+        .throw_permission(db, Permission::BanMembers)
         .await?;
 
-    if !perm.get_ban_members() {
-        Err(Error::MissingPermission)?
-    }
-
-    if target.id == user.id {
-        return Err(Error::InvalidOperation);
-    }
-
-    if target.id == server.owner {
-        return Err(Error::MissingPermission);
-    }
-
-    let target = target.fetch_ban(&server.id).await?;
-    get_collection("server_bans")
-        .delete_one(
-            doc! {
-                "_id.server": &server.id,
-                "_id.user": &target.id.user
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "delete_one",
-            with: "server_ban",
-        })?;
-
-    Ok(EmptyResponse {})
+    let ban = target.as_ban(db, &server.id).await?;
+    db.delete_ban(&ban.id).await.map(|_| EmptyResponse)
 }
diff --git a/src/routes/servers/channel_create.rs b/src/routes/servers/channel_create.rs
index 56a1f082..aff4f964 100644
--- a/src/routes/servers/channel_create.rs
+++ b/src/routes/servers/channel_create.rs
@@ -1,19 +1,22 @@
 use std::collections::HashMap;
 
-use crate::database::*;
-use crate::util::idempotency::IdempotencyKey;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{server::PartialServer, Channel, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
+/// # Channel Type
+#[derive(Serialize, Deserialize, JsonSchema)]
 enum ChannelType {
+    /// Text Channel
     Text,
-    Voice
+    /// Voice Channel
+    Voice,
 }
 
 impl Default for ChannelType {
@@ -22,83 +25,96 @@ impl Default for ChannelType {
     }
 }
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Channel Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataCreateChannel {
+    /// Channel type
     #[serde(rename = "type", default = "ChannelType::default")]
     channel_type: ChannelType,
+    /// Channel name
     #[validate(length(min = 1, max = 32))]
     name: String,
+    /// Channel description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+    /// Whether this channel is age restricted
     #[serde(skip_serializing_if = "Option::is_none")]
     nsfw: Option<bool>,
 }
 
+/// # Create Channel
+///
+/// Create a new Text or Voice channel.
+#[openapi(tag = "Server Information")]
 #[post("/<target>/channels", data = "<info>")]
-pub async fn req(_idempotency: IdempotencyKey, user: User, target: Ref, info: Json<Data>) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    info: Json<DataCreateChannel>,
+) -> Result<Json<Channel>> {
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_server().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    let mut server = target.as_server(db).await?;
+    perms(&user)
+        .server(&server)
+        .throw_permission(db, Permission::ManageChannel)
         .await?;
 
-    if !perm.get_manage_channels() {
-        Err(Error::MissingPermission)?
-    }
-
     let id = Ulid::new().to_string();
-    let channel = match info.channel_type {
-        ChannelType::Text => Channel::TextChannel {
-            id: id.clone(),
-            server: target.id.clone(),
+    let mut channels = server.channels.clone();
+    channels.push(id.clone());
+
+    let DataCreateChannel {
+        name,
+        description,
+        nsfw,
+        channel_type,
+    } = info;
+    let channel = match channel_type {
+        ChannelType::Text => Channel::TextChannel {
+            id,
+            server: server.id.clone(),
+
+            name,
+            description,
 
-            name: info.name,
-            description: info.description,
             icon: None,
             last_message_id: None,
 
             default_permissions: None,
             role_permissions: HashMap::new(),
-            
-            nsfw: info.nsfw.unwrap_or_default(),
+
+            nsfw: nsfw.unwrap_or(false),
         },
         ChannelType::Voice => Channel::VoiceChannel {
-            id: id.clone(),
-            server: target.id.clone(),
+            id,
+            server: server.id.clone(),
 
-            name: info.name,
-            description: info.description,
+            name,
+            description,
             icon: None,
 
             default_permissions: None,
             role_permissions: HashMap::new(),
 
-            nsfw: info.nsfw.unwrap_or_default()
-        }
+            nsfw: nsfw.unwrap_or(false),
+        },
     };
 
-    channel.clone().publish().await?;
-    get_collection("servers")
-        .update_one(
-            doc! {
-                "_id": target.id
+    channel.create(db).await?;
+    server
+        .update(
+            db,
+            PartialServer {
+                channels: Some(channels),
+                ..Default::default()
             },
-            doc! {
-                "$addToSet": {
-                    "channels": id
-                }
-            },
-            None,
+            vec![],
         )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "server",
-        })?;
+        .await?;
 
-    Ok(json!(channel))
+    Ok(Json(channel))
 }
diff --git a/src/routes/servers/invites_fetch.rs b/src/routes/servers/invites_fetch.rs
index f6b48dc3..b5a77bf9 100644
--- a/src/routes/servers/invites_fetch.rs
+++ b/src/routes/servers/invites_fetch.rs
@@ -1,53 +1,21 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Invite, User},
+    perms, Db, Permission, Ref, Result,
+};
 
-use futures::StreamExt;
-use mongodb::bson::{doc, from_document};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ServerInvite {
-    #[serde(rename = "_id")]
-    code: String,
-    creator: String,
-    channel: String,
-}
+use rocket::serde::json::Json;
 
+/// # Fetch Invites
+///
+/// Fetch all server invites.
+#[openapi(tag = "Server Members")]
 #[get("/<target>/invites")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_server().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<Invite>>> {
+    let server = target.as_server(db).await?;
+    perms(&user)
+        .server(&server)
+        .throw_permission(db, Permission::ManageServer)
         .await?;
 
-    if !perm.get_manage_server() {
-        Err(Error::MissingPermission)?
-    }
-
-    let mut cursor = get_collection("channel_invites")
-        .find(
-            doc! {
-                "server": target.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "channel_invites",
-        })?;
-
-    let mut invites = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(invite) = from_document::<Invite>(doc) {
-                invites.push(invite);
-            }
-        }
-    }
-
-    Ok(json!(invites))
+    db.fetch_invites_for_server(&server.id).await.map(Json)
 }
diff --git a/src/routes/servers/member_edit.rs b/src/routes/servers/member_edit.rs
index 0f7d3e28..93a75603 100644
--- a/src/routes/servers/member_edit.rs
+++ b/src/routes/servers/member_edit.rs
@@ -1,158 +1,84 @@
-use std::collections::HashSet;
+use revolt_quark::{
+    models::{
+        server_member::{FieldsMember, PartialMember},
+        File, Member, User,
+    },
+    perms, Db, Error, Ref, Result,
+};
 
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveMemberField};
-
-use mongodb::bson::{doc, to_document};
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Member Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataMemberEdit {
+    /// Member nickname
     #[validate(length(min = 1, max = 32))]
     nickname: Option<String>,
+    /// Attachment Id to set for avatar
     avatar: Option<String>,
+    /// Array of role ids
     roles: Option<Vec<String>>,
-    remove: Option<RemoveMemberField>,
+    /// Fields to remove from channel object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsMember>>,
 }
 
+/// # Edit Member
+///
+/// Edit a member by their id.
+#[openapi(tag = "Server Members")]
 #[patch("/<server>/members/<target>", data = "<data>")]
-pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    server: Ref,
+    target: Ref,
+    data: Json<DataMemberEdit>,
+) -> Result<Json<Member>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.nickname.is_none() && data.avatar.is_none() && data.roles.is_none() && data.remove.is_none() {
-        return Ok(EmptyResponse {});
+    let server = server.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
+
+    let mut member = target.as_member(db, &server.id).await?;
+
+    let DataMemberEdit {
+        nickname,
+        avatar,
+        roles,
+        remove,
+    } = data;
+
+    let mut partial = PartialMember {
+        nickname,
+        roles,
+        ..Default::default()
+    };
+
+    // ! FIXME: calculate permission against member
+    // ! FIXME: also check roles exist lol
+
+    // 1. Remove fields from object
+    if let Some(fields) = &remove {
+        if fields.contains(&FieldsMember::Avatar) {
+            if let Some(avatar) = &member.avatar {
+                db.mark_attachment_as_deleted(&avatar.id).await?;
+            }
+        }
     }
 
-    let server = server.fetch_server().await?;
-    let target = Ref::from(target)?.fetch_member(&server.id).await?;
+    // 2. Apply new avatar
+    if let Some(avatar) = avatar {
+        partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
+    }
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&server)
-        .for_server()
+    member
+        .update(db, partial, remove.unwrap_or_default())
         .await?;
 
-    if data.roles.is_some() && !perm.get_manage_roles() {
-        return Err(Error::MissingPermission);
-    }
-
-    if target.id.user == user.id {
-        if (data.nickname.is_some() && !perm.get_change_nickname())
-            || (data.avatar.is_some() && !perm.get_change_avatar())
-        {
-            return Err(Error::MissingPermission);
-        }
-
-        if let Some(remove) = &data.remove {
-            if match remove {
-                RemoveMemberField::Avatar => !perm.get_change_avatar(),
-                RemoveMemberField::Nickname => !perm.get_change_nickname(),
-            } {
-                return Err(Error::MissingPermission);
-            }
-        }
-    } else {
-        if data.avatar.is_some() || (data.nickname.is_some() && !perm.get_manage_nicknames()) {
-            return Err(Error::MissingPermission);
-        }
-
-        if let Some(remove) = &data.remove {
-            if match remove {
-                RemoveMemberField::Avatar => !perm.get_remove_avatars(),
-                RemoveMemberField::Nickname => !perm.get_manage_nicknames(),
-            } {
-                return Err(Error::MissingPermission);
-            }
-        }
-    }
-
-    let mut set = doc! {};
-    let mut unset = doc! {};
-
-    let mut remove_avatar = false;
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveMemberField::Avatar => {
-                unset.insert("avatar", 1);
-                remove_avatar = true;
-            }
-            RemoveMemberField::Nickname => {
-                unset.insert("nickname", 1);
-            }
-        }
-    }
-
-    if let Some(name) = &data.nickname {
-        set.insert("nickname", name);
-    }
-
-    if let Some(attachment_id) = &data.avatar {
-        let attachment =
-            File::find_and_use(&attachment_id, "avatars", "user", &target.id.user).await?;
-        set.insert(
-            "avatar",
-            to_document(&attachment).map_err(|_| Error::DatabaseError {
-                operation: "to_document",
-                with: "attachment",
-            })?,
-        );
-
-        remove_avatar = true;
-    }
-
-    if let Some(role_ids) = &data.roles {
-        let mut ids = HashSet::new();
-
-        for role in role_ids {
-            if server.roles.contains_key(role) {
-                ids.insert(role.clone());
-            }
-        }
-
-        set.insert("roles", ids.into_iter().collect::<Vec<String>>());
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("server_members")
-            .update_one(
-                doc! { "_id.server": &server.id, "_id.user": &target.id.user },
-                operations,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "server_member",
-            })?;
-    }
-
-    ClientboundNotification::ServerMemberUpdate {
-        id: target.id.clone(),
-        data: json!(set),
-        clear: data.remove,
-    }
-    .publish(server.id.clone());
-
-    let Member { avatar, .. } = target;
-
-    if remove_avatar {
-        if let Some(old_avatar) = avatar {
-            old_avatar.delete().await?;
-        }
-    }
-
-    Ok(EmptyResponse {})
+    Ok(Json(member))
 }
diff --git a/src/routes/servers/member_fetch.rs b/src/routes/servers/member_fetch.rs
index 0b786a32..47b254f0 100644
--- a/src/routes/servers/member_fetch.rs
+++ b/src/routes/servers/member_fetch.rs
@@ -1,21 +1,17 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use revolt_quark::{
+    models::{Member, User},
+    perms, Db, Ref, Result,
+};
+use rocket::serde::json::Json;
 
+/// # Fetch Member
+///
+/// Retrieve a member.
+#[openapi(tag = "Server Members")]
 #[get("/<target>/members/<member>")]
-pub async fn req(user: User, target: Ref, member: String) -> Result<Value> {
-    let target = target.fetch_server().await?;
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<Json<Member>> {
+    let server = target.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
-
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    Ok(json!(Ref::from(member)?.fetch_member(&target.id).await?))
+    member.as_member(db, &server.id).await.map(Json)
 }
diff --git a/src/routes/servers/member_fetch_all.rs b/src/routes/servers/member_fetch_all.rs
index f32ca705..aa397a13 100644
--- a/src/routes/servers/member_fetch_all.rs
+++ b/src/routes/servers/member_fetch_all.rs
@@ -1,51 +1,73 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Member, User},
+    perms,
+    presence::presence_filter_online,
+    Db, Ref, Result,
+};
 
-use futures::StreamExt;
-use mongodb::bson::{doc, from_document, Document};
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
 
-// ! FIXME: this is a temporary route while permissions are being worked on.
+/// # Query Parameters
+#[derive(Deserialize, JsonSchema, FromForm)]
+pub struct OptionsFetchAllMembers {
+    /// Whether to exclude offline users
+    exclude_offline: Option<bool>,
+}
 
-#[get("/<target>/members")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_server().await?;
+/// # Member List
+///
+/// Both lists are sorted by ID.
+#[derive(Serialize, JsonSchema)]
+pub struct AllMemberResponse {
+    /// List of members
+    members: Vec<Member>,
+    /// List of users
+    users: Vec<User>,
+}
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
+/// # Fetch Members
+///
+/// Fetch all server members.
+#[openapi(tag = "Server Members")]
+#[get("/<target>/members?<options..>")]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsFetchAllMembers,
+) -> Result<Json<AllMemberResponse>> {
+    let server = target.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
 
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
+    let mut members = db.fetch_all_members(&server.id).await?;
+
+    let mut user_ids = vec![];
+    for member in &members {
+        user_ids.push(member.id.user.clone());
     }
 
-    let members = get_collection("server_members")
-        .find(
-            doc! {
-                "_id.server": target.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "server_members",
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
+    let online_ids = presence_filter_online(&user_ids).await;
+    let mut users = db
+        .fetch_users(&user_ids)
+        .await?
         .into_iter()
-        .filter_map(|x| from_document(x).ok())
-        .collect::<Vec<Member>>();
+        .map(|mut user| {
+            user.online = Some(online_ids.contains(&user.id));
+            user.foreign()
+        })
+        .collect::<Vec<User>>();
 
-    let member_ids = members
-        .iter()
-        .map(|m| m.id.user.clone())
-        .collect::<Vec<String>>();
+    // Ensure the lists match up exactly.
+    members.sort_by(|a, b| a.id.user.cmp(&b.id.user));
+    users.sort_by(|a, b| a.id.cmp(&b.id));
 
-    Ok(json!({
-        "members": members,
-        "users": user.fetch_multiple_users(&member_ids).await?
-    }))
+    // Optionally, remove all offline user entries.
+    if let Some(true) = options.exclude_offline {
+        let mut iter = users.iter();
+        members.retain(|_| iter.next().unwrap().online.unwrap_or(false));
+        users.retain(|user| user.online.unwrap_or(false));
+    }
+
+    Ok(Json(AllMemberResponse { members, users }))
 }
diff --git a/src/routes/servers/member_remove.rs b/src/routes/servers/member_remove.rs
index cfa78702..96015c07 100644
--- a/src/routes/servers/member_remove.rs
+++ b/src/routes/servers/member_remove.rs
@@ -1,33 +1,40 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{server_member::RemovalIntention, User},
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
+};
 
+/// # Kick Member
+///
+/// Removes a member from the server.
+#[openapi(tag = "Server Members")]
 #[delete("/<target>/members/<member>")]
-pub async fn req(user: User, target: Ref, member: String) -> Result<EmptyResponse> {
-    let target = target.fetch_server().await?;
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
+    let server = target.as_server(db).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
-
-    if !perm.get_kick_members() {
-        return Err(Error::MissingPermission);
+    if member.id == user.id {
+        return Err(Error::CannotRemoveYourself);
     }
 
-    let member = Ref::from(member)?.fetch_member(&target.id).await?;
-    if member.id.user == user.id {
+    if member.id == server.owner {
         return Err(Error::InvalidOperation);
     }
 
-    if member.id.user == target.owner {
-        return Err(Error::MissingPermission);
-    }
+    let mut permissions = perms(&user).server(&server);
 
-    target
-        .remove_member(&member.id.user, RemoveMember::Kick)
+    permissions
+        .throw_permission(db, Permission::KickMembers)
         .await?;
 
-    Ok(EmptyResponse {})
+    let member = member.as_member(db, &server.id).await?;
+
+    if member.get_ranking(permissions.server.get().unwrap())
+        <= permissions.get_member_rank().unwrap_or(i64::MIN)
+    {
+        return Err(Error::NotElevated);
+    }
+
+    server
+        .remove_member(db, member, RemovalIntention::Kick)
+        .await
+        .map(|_| EmptyResponse)
 }
diff --git a/src/routes/servers/mod.rs b/src/routes/servers/mod.rs
index 4c455d9f..91c24752 100644
--- a/src/routes/servers/mod.rs
+++ b/src/routes/servers/mod.rs
@@ -1,10 +1,11 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
+mod server_ack;
 mod server_create;
 mod server_delete;
 mod server_edit;
 mod server_fetch;
-mod server_ack;
 
 mod channel_create;
 
@@ -19,14 +20,14 @@ mod ban_remove;
 
 mod invites_fetch;
 
-mod roles_create;
-mod roles_edit;
-mod roles_delete;
 mod permissions_set;
 mod permissions_set_default;
+mod roles_create;
+mod roles_delete;
+mod roles_edit;
 
-pub fn routes() -> Vec<Route> {
-    routes![
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
         server_create::req,
         server_delete::req,
         server_fetch::req,
diff --git a/src/routes/servers/permissions_set.rs b/src/routes/servers/permissions_set.rs
index 99072432..3b6128e4 100644
--- a/src/routes/servers/permissions_set.rs
+++ b/src/routes/servers/permissions_set.rs
@@ -1,73 +1,56 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::Deserialize;
 
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
+    models::{Server, User},
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
 
-#[derive(Serialize, Deserialize)]
-pub struct Values {
-    server: u32,
-    channel: u32
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Data {
-    permissions: Values
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
+pub struct DataSetServerRolePermission {
+    /// Allow / deny values for the role in this server.
+    permissions: Override,
 }
 
+/// # Set Role Permission
+///
+/// Sets permissions for the specified role in the server.
+#[openapi(tag = "Server Permissions")]
 #[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
-pub async fn req(user: User, target: Ref, role_id: String, data: Json<Data>) -> Result<EmptyResponse> {
-    let target = target.fetch_server().await?;
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    role_id: String,
+    data: Json<DataSetServerRolePermission>,
+) -> Result<Json<Server>> {
+    let data = data.into_inner();
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
+    let mut server = target.as_server(db).await?;
+    if let Some((current_value, rank)) = server.roles.get(&role_id).map(|x| (x.permissions, x.rank))
+    {
+        let mut permissions = perms(&user).server(&server);
 
-    if !perm.get_manage_roles() {
-        return Err(Error::MissingPermission);
+        permissions
+            .throw_permission(db, Permission::ManagePermissions)
+            .await?;
+
+        if rank <= permissions.get_member_rank().unwrap_or(i64::MIN) {
+            return Err(Error::NotElevated);
+        }
+
+        let current_value: Override = current_value.into();
+        permissions
+            .throw_permission_override(db, current_value, data.permissions)
+            .await?;
+
+        server
+            .set_role_permission(db, &role_id, data.permissions.into())
+            .await?;
+
+        Ok(Json(server))
+    } else {
+        Err(Error::NotFound)
     }
-
-    if !target.roles.contains_key(&role_id) {
-        return Err(Error::NotFound);
-    }
-
-    let server_permissions: u32 = data.permissions.server;
-    let channel_permissions: u32 = data.permissions.channel;
-
-    get_collection("servers")
-        .update_one(
-            doc! { "_id": &target.id },
-            doc! {
-                "$set": {
-                    "roles.".to_owned() + &role_id + &".permissions": [
-                        server_permissions as i32,
-                        channel_permissions as i32
-                    ]
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "server"
-        })?;
-
-    ClientboundNotification::ServerRoleUpdate {
-        id: target.id.clone(),
-        role_id,
-        data: json!({
-            "permissions": [
-                server_permissions as i32,
-                channel_permissions as i32
-            ]
-        }),
-        clear: None
-    }
-    .publish(target.id);
-
-    Ok(EmptyResponse)
 }
diff --git a/src/routes/servers/permissions_set_default.rs b/src/routes/servers/permissions_set_default.rs
index 0e52918b..cd651387 100644
--- a/src/routes/servers/permissions_set_default.rs
+++ b/src/routes/servers/permissions_set_default.rs
@@ -1,68 +1,52 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::Deserialize;
 
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
+    models::{server::PartialServer, Server, User},
+    perms, Db, Permission, Ref, Result,
+};
 
-#[derive(Serialize, Deserialize)]
-pub struct Values {
-    server: u32,
-    channel: u32
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Data {
-    permissions: Values
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
+pub struct DataSetServerDefaultPermission {
+    /// Default member permission value
+    permissions: u64,
 }
 
+/// # Set Default Permission
+///
+/// Sets permissions for the default role in this server.
+#[openapi(tag = "Server Permissions")]
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
-    let target = target.fetch_server().await?;
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataSetServerDefaultPermission>,
+) -> Result<Json<Server>> {
+    let data = data.into_inner();
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    let mut server = target.as_server(db).await?;
+    let mut permissions = perms(&user).server(&server);
+
+    permissions
+        .throw_permission(db, Permission::ManagePermissions)
         .await?;
 
-    if !perm.get_manage_roles() {
-        return Err(Error::MissingPermission);
-    }
+    permissions
+        .throw_permission_value(db, data.permissions)
+        .await?;
 
-    let server_permissions: u32 = data.permissions.server;
-    let channel_permissions: u32 = data.permissions.channel;
-
-    get_collection("servers")
-        .update_one(
-            doc! { "_id": &target.id },
-            doc! {
-                "$set": {
-                    "default_permissions": [
-                        server_permissions as i32,
-                        channel_permissions as i32
-                    ]
-                }
+    server
+        .update(
+            db,
+            PartialServer {
+                default_permissions: Some(data.permissions as i64),
+                ..Default::default()
             },
-            None
+            vec![],
         )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "server"
-        })?;
+        .await?;
 
-    ClientboundNotification::ServerUpdate {
-        id: target.id.clone(),
-        data: json!({
-            "default_permissions": [
-                server_permissions as i32,
-                channel_permissions as i32
-            ]
-        }),
-        clear: None
-    }
-    .publish(target.id);
-
-    Ok(EmptyResponse {})
+    Ok(Json(server))
 }
diff --git a/src/routes/servers/roles_create.rs b/src/routes/servers/roles_create.rs
index 4410b69c..c620b6c7 100644
--- a/src/routes/servers/roles_create.rs
+++ b/src/routes/servers/roles_create.rs
@@ -1,76 +1,74 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{server::Role, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use ulid::Ulid;
-use mongodb::bson::doc;
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
 use validator::Validate;
-use serde::{Serialize, Deserialize};
-use rocket::serde::json::{Json, Value};
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Role Data
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateRole {
+    /// Role name
     #[validate(length(min = 1, max = 32))]
-    name: String
+    name: String,
+    /// Ranking position
+    ///
+    /// Smaller values take priority.
+    rank: Option<i64>,
 }
 
+/// # New Role Response
+#[derive(Serialize, JsonSchema)]
+pub struct NewRoleResponse {
+    /// Id of the role
+    id: String,
+    /// New role
+    role: Role,
+}
+
+/// # Create Role
+///
+/// Creates a new server role.
+#[openapi(tag = "Server Permissions")]
 #[post("/<target>/roles", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataCreateRole>,
+) -> Result<Json<NewRoleResponse>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
-    
-    let target = target.fetch_server().await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    let server = target.as_server(db).await?;
+    let mut permissions = perms(&user).server(&server);
+
+    permissions
+        .throw_permission(db, Permission::ManageRole)
         .await?;
 
-    if !perm.get_manage_roles() {
-        Err(Error::MissingPermission)?
-    }
+    let member_rank = permissions.get_member_rank();
+    let rank = if let Some(given_rank) = data.rank {
+        if given_rank <= member_rank.unwrap_or(i64::MIN) {
+            return Err(Error::NotElevated);
+        }
 
-    let id = Ulid::new().to_string();
-    let perm_tuple = (
-        *permissions::server::DEFAULT_PERMISSION as i32,
-        *permissions::channel::DEFAULT_PERMISSION_SERVER as i32
-    );
+        given_rank
+    } else {
+        member_rank.unwrap_or(0).saturating_add(1)
+    };
 
-    get_collection("servers")
-        .update_one(
-            doc! {
-                "_id": &target.id
-            },
-            doc! {
-                "$set": {
-                    "roles.".to_owned() + &id: {
-                        "name": &data.name,
-                        "permissions": [
-                            &perm_tuple.0,
-                            &perm_tuple.1
-                        ]
-                    } 
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "servers"
-        })?;
-    
-    ClientboundNotification::ServerRoleUpdate {
-        id: target.id.clone(),
-        role_id: id.clone(),
-        data: json!({
-            "name": data.name,
-            "permissions": &perm_tuple
-        }),
-        clear: None
-    }
-    .publish(target.id);
+    let role = Role {
+        name: data.name,
+        rank,
+        ..Default::default()
+    };
 
-    Ok(json!({ "id": id, "permissions": perm_tuple }))
+    Ok(Json(NewRoleResponse {
+        id: role.create(db, &server.id).await?,
+        role,
+    }))
 }
diff --git a/src/routes/servers/roles_delete.rs b/src/routes/servers/roles_delete.rs
index 6b2dc33d..1e3bec70 100644
--- a/src/routes/servers/roles_delete.rs
+++ b/src/routes/servers/roles_delete.rs
@@ -1,81 +1,29 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
 
+/// # Delete Role
+///
+/// Delete a server role by its id.
+#[openapi(tag = "Server Permissions")]
 #[delete("/<target>/roles/<role_id>")]
-pub async fn req(user: User, target: Ref, role_id: String) -> Result<EmptyResponse> {
-    let target = target.fetch_server().await?;
+pub async fn req(db: &Db, user: User, target: Ref, role_id: String) -> Result<EmptyResponse> {
+    let mut server = target.as_server(db).await?;
+    let mut permissions = perms(&user).server(&server);
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    permissions
+        .throw_permission(db, Permission::ManageRole)
         .await?;
 
-    if !perm.get_manage_roles() {
-        Err(Error::MissingPermission)?
+    let member_rank = permissions.get_member_rank().unwrap_or(0);
+
+    if let Some(role) = server.roles.remove(&role_id) {
+        if role.rank <= member_rank {
+            return Err(Error::NotElevated);
+        }
+
+        role.delete(db, &server.id, &role_id)
+            .await
+            .map(|_| EmptyResponse)
+    } else {
+        Err(Error::NotFound)
     }
-
-    get_collection("servers")
-        .update_one(
-            doc! {
-                "_id": &target.id
-            },
-            doc! {
-                "$unset": {
-                    "roles.".to_owned() + &role_id: 1
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "servers"
-        })?;
-
-    get_collection("channels")
-        .update_one(
-            doc! {
-                "server": &target.id
-            },
-            doc! {
-                "$unset": {
-                    "role_permissions.".to_owned() + &role_id: 1
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "channels"
-        })?;
-
-    get_collection("server_members")
-        .update_many(
-            doc! {
-                "_id.server": &target.id
-            },
-            doc! {
-                "$pull": {
-                    "roles": &role_id
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_many",
-            with: "server_members"
-        })?;
-
-    ClientboundNotification::ServerRoleDelete {
-        id: target.id.clone(),
-        role_id
-    }
-    .publish(target.id);
-
-    Ok(EmptyResponse {})
 }
diff --git a/src/routes/servers/roles_edit.rs b/src/routes/servers/roles_edit.rs
index 6fa4d10b..39422e86 100644
--- a/src/routes/servers/roles_edit.rs
+++ b/src/routes/servers/roles_edit.rs
@@ -1,110 +1,94 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveRoleField};
+use revolt_quark::{
+    models::{
+        server::{FieldsRole, PartialRole, Role},
+        User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Role Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditRole {
+    /// Role name
     #[validate(length(min = 1, max = 32))]
     name: Option<String>,
+    /// Role colour
     #[validate(length(min = 1, max = 32))]
     colour: Option<String>,
+    /// Whether this role should be displayed separately
     hoist: Option<bool>,
+    /// Ranking position
+    ///
+    /// Smaller values take priority.
     rank: Option<i64>,
-    remove: Option<RemoveRoleField>,
+    /// Fields to remove from role object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsRole>>,
 }
 
+/// # Edit Role
+///
+/// Edit a role by its id.
+#[openapi(tag = "Server Permissions")]
 #[patch("/<target>/roles/<role_id>", data = "<data>")]
-pub async fn req(user: User, target: Ref, role_id: String, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    role_id: String,
+    data: Json<DataEditRole>,
+) -> Result<Json<Role>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.name.is_none() && data.colour.is_none() && data.hoist.is_none() && data.rank.is_none() && data.remove.is_none()
-    {
-        return Ok(EmptyResponse {});
-    }
+    let mut server = target.as_server(db).await?;
+    let mut permissions = perms(&user).server(&server);
 
-    let target = target.fetch_server().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    permissions
+        .throw_permission(db, Permission::ManageRole)
         .await?;
 
-    if !perm.get_manage_roles() {
-        return Err(Error::MissingPermission)
-    }
+    let member_rank = permissions.get_member_rank().unwrap_or(i64::MIN);
 
-    if !target.roles.contains_key(&role_id) {
-        return Err(Error::InvalidRole)
-    }
+    if let Some(mut role) = server.roles.remove(&role_id) {
+        let DataEditRole {
+            name,
+            colour,
+            hoist,
+            rank,
+            remove,
+        } = data;
 
-    let mut set = doc! {};
-    let mut unset = doc! {};
-
-    // ! FIXME: we should probably just require clients to support basic MQL incl. $set / $unset
-    let mut set_update = doc! {};
-
-    let role_key = "roles.".to_owned() + &role_id;
-
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveRoleField::Colour => {
-                unset.insert(role_key.clone() + ".colour", 1);
+        if let Some(rank) = &rank {
+            if rank <= &member_rank {
+                return Err(Error::NotElevated);
             }
         }
-    }
 
-    if let Some(name) = &data.name {
-        set.insert(role_key.clone() + ".name", name);
-        set_update.insert("name", name);
-    }
+        let partial = PartialRole {
+            name,
+            colour,
+            hoist,
+            rank,
+            ..Default::default()
+        };
 
-    if let Some(colour) = &data.colour {
-        set.insert(role_key.clone() + ".colour", colour);
-        set_update.insert("colour", colour);
-    }
+        role.update(
+            db,
+            &server.id,
+            &role_id,
+            partial,
+            remove.unwrap_or_default(),
+        )
+        .await?;
 
-    if let Some(hoist) = &data.hoist {
-        set.insert(role_key.clone() + ".hoist", hoist);
-        set_update.insert("hoist", hoist);
+        Ok(Json(role))
+    } else {
+        Err(Error::NotFound)
     }
-
-    if let Some(rank) = &data.rank {
-        set.insert(role_key.clone() + ".rank", rank);
-        set_update.insert("rank", rank);
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("servers")
-            .update_one(doc! { "_id": &target.id }, operations, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "server",
-            })?;
-    }
-
-    ClientboundNotification::ServerRoleUpdate {
-        id: target.id.clone(),
-        role_id,
-        data: json!(set_update),
-        clear: data.remove,
-    }
-    .publish(target.id.clone());
-
-    Ok(EmptyResponse {})
 }
diff --git a/src/routes/servers/server_ack.rs b/src/routes/servers/server_ack.rs
index 5d2b22b9..dc30134a 100644
--- a/src/routes/servers/server_ack.rs
+++ b/src/routes/servers/server_ack.rs
@@ -1,23 +1,15 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Ref, Result};
 
+/// # Mark Server As Read
+///
+/// Mark all channels in a server as read.
+#[openapi(tag = "Server Information")]
 #[put("/<target>/ack")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    let server = target.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
 
-    let target = target.fetch_server().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
-
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    target.mark_as_read(&user.id).await?;
-    Ok(EmptyResponse {})
+    db.acknowledge_channels(&user.id, &server.channels)
+        .await
+        .map(|_| EmptyResponse)
 }
diff --git a/src/routes/servers/server_create.rs b/src/routes/servers/server_create.rs
index 0aceb9db..85ba1e21 100644
--- a/src/routes/servers/server_create.rs
+++ b/src/routes/servers/server_create.rs
@@ -1,80 +1,73 @@
 use std::collections::HashMap;
 
-use crate::database::*;
-use crate::util::idempotency::IdempotencyKey;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_SERVER_COUNT;
+use revolt_quark::{
+    models::{Channel, Server, User},
+    variables::delta::MAX_SERVER_COUNT,
+    Db, Error, Result, DEFAULT_PERMISSION_SERVER,
+};
 
-use mongodb::bson::doc;
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Server Data
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateServer {
+    /// Server name
     #[validate(length(min = 1, max = 32))]
     name: String,
+    /// Server description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+    /// Whether this server is age-restricted
     #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
 }
 
-#[post("/create", data = "<info>")]
-pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
+/// # Create Server Response
+#[derive(Validate, Serialize, JsonSchema)]
+pub struct CreateServerResponse {
+    /// Server object
+    server: Server,
+    /// Default channels
+    channels: Vec<Channel>,
+}
 
-    if !User::can_acquire_server(&user.id).await? {
-        Err(Error::TooManyServers {
-            max: *MAX_SERVER_COUNT,
-        })?
-    }
-    
+/// # Create Server
+///
+/// Create a new server.
+#[openapi(tag = "Server Information")]
+#[post("/create", data = "<info>")]
+pub async fn req(
+    db: &Db,
+    user: User,
+    info: Json<DataCreateServer>,
+) -> Result<Json<CreateServerResponse>> {
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let id = Ulid::new().to_string();
-    let cid = Ulid::new().to_string();
+    if !user.can_acquire_server(db).await? {
+        return Err(Error::TooManyServers {
+            max: *MAX_SERVER_COUNT,
+        });
+    }
 
-    let server = Server {
-        id: id.clone(),
-        owner: user.id.clone(),
+    let DataCreateServer {
+        name,
+        description,
+        nsfw,
+    } = info;
 
-        name: info.name,
-        description: info.description,
+    let channel_id = Ulid::new().to_string();
+    let server_id = Ulid::new().to_string();
 
-        channels: vec![cid.clone()],
-        categories: None,
-        system_messages: Some(SystemMessageChannels {
-            user_joined: Some(cid.clone()),
-            user_left: Some(cid.clone()),
-            user_kicked: Some(cid.clone()),
-            user_banned: Some(cid.clone()),
-        }),
+    let channel = Channel::TextChannel {
+        id: channel_id.clone(),
+        server: server_id.clone(),
 
-        roles: HashMap::new(),
-        default_permissions: (
-            *permissions::server::DEFAULT_PERMISSION as i32,
-            *permissions::channel::DEFAULT_PERMISSION_SERVER as i32
-        ),
-
-        icon: None,
-        banner: None,
-
-        flags: None,
-        nsfw: info.nsfw.unwrap_or_default(),
-        analytics: false,
-        discoverable: false,
-    };
-
-    Channel::TextChannel {
-        id: cid,
-        server: id,
-        name: "general".to_string(),
+        name: "General".into(),
         description: None,
 
         icon: None,
@@ -82,13 +75,24 @@ pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) ->
 
         default_permissions: None,
         role_permissions: HashMap::new(),
-        nsfw: false
-    }
-    .publish()
-    .await?;
 
-    server.clone().create().await?;
-    server.join_member(&user.id).await?;
+        nsfw: nsfw.unwrap_or(false),
+    };
 
-    Ok(json!(server))
+    db.insert_channel(&channel).await?;
+
+    let server = Server {
+        id: server_id.clone(),
+        owner: user.id.clone(),
+        name,
+        description,
+        channels: vec![channel_id],
+        nsfw: nsfw.unwrap_or(false),
+        default_permissions: *DEFAULT_PERMISSION_SERVER as i64,
+        ..Default::default()
+    };
+
+    server.create(db).await?;
+    let channels = server.create_member(db, user, Some(vec![channel])).await?;
+    Ok(Json(CreateServerResponse { server, channels }))
 }
diff --git a/src/routes/servers/server_delete.rs b/src/routes/servers/server_delete.rs
index 2f21f124..3a68d711 100644
--- a/src/routes/servers/server_delete.rs
+++ b/src/routes/servers/server_delete.rs
@@ -1,25 +1,23 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{server_member::RemovalIntention, User},
+    Db, EmptyResponse, Ref, Result,
+};
 
+/// # Delete / Leave Server
+///
+/// Deletes a server if owner otherwise leaves.
+#[openapi(tag = "Server Information")]
 #[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
-    let target = target.fetch_server().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    let server = target.as_server(db).await?;
+    let member = db.fetch_member(&target.id, &user.id).await?;
 
-    if !perm.get_view() {
-        return Err(Error::MissingPermission);
-    }
-
-    if user.id == target.owner {
-        target.delete().await?;
+    if server.owner == user.id {
+        server.delete(db).await
     } else {
-        target.remove_member(&user.id, RemoveMember::Leave).await?;
+        server
+            .remove_member(db, member, RemovalIntention::Leave)
+            .await
     }
-
-    Ok(EmptyResponse {})
+    .map(|_| EmptyResponse)
 }
diff --git a/src/routes/servers/server_edit.rs b/src/routes/servers/server_edit.rs
index be1f8bea..25fd9d0f 100644
--- a/src/routes/servers/server_edit.rs
+++ b/src/routes/servers/server_edit.rs
@@ -1,159 +1,162 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveServerField};
+use revolt_quark::{
+    models::{
+        server::{Category, FieldsServer, PartialServer, SystemMessageChannels},
+        File, Server, User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::{doc, to_bson, to_document};
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Server Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditServer {
+    /// Server name
     #[validate(length(min = 1, max = 32))]
     name: Option<String>,
+    /// Server description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+
+    /// Attachment Id for icon
     icon: Option<String>,
+    /// Attachment Id for banner
     banner: Option<String>,
+
+    /// Category structure for server
+    #[validate]
     categories: Option<Vec<Category>>,
+    /// System message configuration
     system_messages: Option<SystemMessageChannels>,
-    remove: Option<RemoveServerField>,
-    nsfw: Option<bool>,
+
+    // Whether this server is age-restricted
+    // nsfw: Option<bool>,
+    /// Whether analytics should be collected for this server
+    ///
+    /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
     analytics: Option<bool>,
+
+    /// Fields to remove from server object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsServer>>,
 }
 
+/// # Edit Server
+///
+/// Edit a server by its id.
+#[openapi(tag = "Server Information")]
 #[patch("/<target>", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataEditServer>,
+) -> Result<Json<Server>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.name.is_none() && data.description.is_none() && data.icon.is_none() && data.banner.is_none() && data.remove.is_none() && data.categories.is_none() && data.system_messages.is_none() && data.nsfw.is_none() && data.analytics.is_none()
+    let mut server = target.as_server(db).await?;
+    let mut permissions = perms(&user).server(&server);
+    permissions.calc(db).await?;
+
+    // Check permissions
+    if data.name.is_none()
+        && data.description.is_none()
+        && data.icon.is_none()
+        && data.banner.is_none()
+        && data.system_messages.is_none()
+        && data.categories.is_none()
+        // && data.nsfw.is_none()
+        && data.analytics.is_none()
+        && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(server));
+    } else if data.name.is_some()
+        || data.description.is_some()
+        || data.icon.is_some()
+        || data.banner.is_some()
+        || data.system_messages.is_some()
+        // || data.nsfw.is_some()
+        || data.analytics.is_some()
+        || data.remove.is_some()
+    {
+        permissions
+            .throw_permission(db, Permission::ManageServer)
+            .await?;
     }
 
-    let target = target.fetch_server().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
+    if data.categories.is_some() {
+        permissions
+            .throw_permission(db, Permission::ManageChannel)
+            .await?;
+    }
+
+    let DataEditServer {
+        name,
+        description,
+        icon,
+        banner,
+        categories,
+        system_messages,
+        // nsfw,
+        analytics,
+        remove,
+    } = data;
+
+    let mut partial = PartialServer {
+        name,
+        description,
+        categories,
+        system_messages,
+        // nsfw,
+        analytics,
+        ..Default::default()
+    };
+
+    // 1. Remove fields from object
+    if let Some(fields) = &remove {
+        if fields.contains(&FieldsServer::Banner) {
+            if let Some(banner) = &server.banner {
+                db.mark_attachment_as_deleted(&banner.id).await?;
+            }
+        }
+
+        if fields.contains(&FieldsServer::Icon) {
+            if let Some(icon) = &server.icon {
+                db.mark_attachment_as_deleted(&icon.id).await?;
+            }
+        }
+    }
+
+    // 2. Apply new icon
+    if let Some(icon) = icon {
+        partial.icon = Some(File::use_server_icon(db, &icon, &server.id).await?);
+        server.icon = partial.icon.clone();
+    }
+
+    // 3. Apply new banner
+    if let Some(banner) = banner {
+        partial.banner = Some(File::use_server_icon(db, &banner, &server.id).await?);
+        server.banner = partial.banner.clone();
+    }
+
+    // 4. Validate changes
+    if let Some(system_messages) = &partial.system_messages {
+        let channels = system_messages.clone().into_channel_ids();
+        if !db
+            .check_channels_exist(&channels.into_iter().collect())
+            .await?
+        {
+            return Err(Error::NotFound);
+        }
+    }
+
+    server
+        .update(db, partial, remove.unwrap_or_default())
         .await?;
 
-    if !perm.get_manage_server() {
-        Err(Error::MissingPermission)?
-    }
-
-    let mut set = doc! {};
-    let mut unset = doc! {};
-
-    let mut remove_icon = false;
-    let mut remove_banner = false;
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveServerField::Icon => {
-                unset.insert("icon", 1);
-                remove_icon = true;
-            }
-            RemoveServerField::Banner => {
-                unset.insert("banner", 1);
-                remove_banner = true;
-            }
-            RemoveServerField::Description => {
-                unset.insert("description", 1);
-            }
-        }
-    }
-
-    if let Some(name) = &data.name {
-        set.insert("name", name);
-    }
-
-    if let Some(description) = &data.description {
-        set.insert("description", description);
-    }
-
-    if let Some(attachment_id) = &data.icon {
-        let attachment = File::find_and_use(&attachment_id, "icons", "object", &target.id).await?;
-        set.insert(
-            "icon",
-            to_document(&attachment).map_err(|_| Error::DatabaseError {
-                operation: "to_document",
-                with: "attachment",
-            })?,
-        );
-
-        remove_icon = true;
-    }
-
-    if let Some(attachment_id) = &data.banner {
-        let attachment =
-            File::find_and_use(&attachment_id, "banners", "server", &target.id).await?;
-        set.insert(
-            "banner",
-            to_document(&attachment).map_err(|_| Error::DatabaseError {
-                operation: "to_document",
-                with: "attachment",
-            })?,
-        );
-
-        remove_banner = true;
-    }
-
-    if let Some(categories) = &data.categories {
-        set.insert("categories", to_bson(&categories).map_err(|_| Error::DatabaseError { operation: "to_document", with: "categories" })?);
-    }
-
-    if let Some(system_messages) = &data.system_messages {
-        set.insert("system_messages", to_bson(&system_messages).map_err(|_| Error::DatabaseError { operation: "to_document", with: "system_messages" })?);
-    }
-
-    if let Some(nsfw) = &data.nsfw {
-        set.insert("nsfw", nsfw);
-    }
-
-    if let Some(analytics) = &data.analytics {
-        set.insert("analytics", analytics);
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("servers")
-            .update_one(doc! { "_id": &target.id }, operations, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "server",
-            })?;
-    }
-
-    ClientboundNotification::ServerUpdate {
-        id: target.id.clone(),
-        data: json!(set),
-        clear: data.remove,
-    }
-    .publish(target.id.clone());
-
-    let Server { icon, banner, .. } = target;
-
-    if remove_icon {
-        if let Some(old_icon) = icon {
-            old_icon.delete().await?;
-        }
-    }
-
-    if remove_banner {
-        if let Some(old_banner) = banner {
-            old_banner.delete().await?;
-        }
-    }
-
-    Ok(EmptyResponse {})
+    Ok(Json(server))
 }
diff --git a/src/routes/servers/server_fetch.rs b/src/routes/servers/server_fetch.rs
index a46b4fda..db17fd05 100644
--- a/src/routes/servers/server_fetch.rs
+++ b/src/routes/servers/server_fetch.rs
@@ -1,20 +1,17 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use rocket::serde::json::Value;
+use revolt_quark::{
+    models::{Server, User},
+    perms, Db, Ref, Result,
+};
+use rocket::serde::json::Json;
 
+/// # Fetch Server
+///
+/// Fetch a server by its id.
+#[openapi(tag = "Server Information")]
 #[get("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_server().await?;
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Server>> {
+    let server = target.as_server(db).await?;
+    perms(&user).server(&server).calc(db).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&target)
-        .for_server()
-        .await?;
-
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    Ok(json!(target))
+    Ok(Json(server))
 }
diff --git a/src/routes/sync/get_settings.rs b/src/routes/sync/get_settings.rs
index bcdc8d80..3c40d3be 100644
--- a/src/routes/sync/get_settings.rs
+++ b/src/routes/sync/get_settings.rs
@@ -1,46 +1,31 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{User, UserSettings},
+    Db, Result,
+};
 
-use mongodb::bson::doc;
-use mongodb::options::FindOneOptions;
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize)]
-pub struct Options {
+/// # Fetch Options
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct OptionsFetchSettings {
+    /// Keys to fetch
     keys: Vec<String>,
 }
 
+/// # Fetch Settings
+///
+/// Fetch settings from server filtered by keys.
+///
+/// This will return an object with the requested keys, each value is a tuple of `(timestamp, value)`, the value is the previously uploaded data.
+#[openapi(tag = "Sync")]
 #[post("/settings/fetch", data = "<options>")]
-pub async fn req(user: User, options: Json<Options>) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot);
-    }
-
-    let options = options.into_inner();
-    let mut projection = doc! {
-        "_id": 0,
-    };
-
-    for key in options.keys {
-        projection.insert(key, 1);
-    }
-
-    if let Some(doc) = get_collection("user_settings")
-        .find_one(
-            doc! {
-                "_id": user.id
-            },
-            FindOneOptions::builder().projection(projection).build(),
-        )
+pub async fn req(
+    db: &Db,
+    user: User,
+    options: Json<OptionsFetchSettings>,
+) -> Result<Json<UserSettings>> {
+    db.fetch_user_settings(&user.id, &options.into_inner().keys)
         .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "user_settings",
-        })?
-    {
-        Ok(json!(doc))
-    } else {
-        Ok(json!({}))
-    }
+        .map(Json)
 }
diff --git a/src/routes/sync/get_unreads.rs b/src/routes/sync/get_unreads.rs
index efd41202..94faefe7 100644
--- a/src/routes/sync/get_unreads.rs
+++ b/src/routes/sync/get_unreads.rs
@@ -1,14 +1,15 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{ChannelUnread, User},
+    Db, Result,
+};
 
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 
+/// # Fetch Unreads
+///
+/// Fetch information about unread state on channels.
+#[openapi(tag = "Sync")]
 #[get("/unreads")]
-pub async fn req(user: User) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot);
-    }
-
-    Ok(json!(User::fetch_unreads(&user.id).await?))
+pub async fn req(db: &Db, user: User) -> Result<Json<Vec<ChannelUnread>>> {
+    db.fetch_unreads(&user.id).await.map(Json)
 }
diff --git a/src/routes/sync/mod.rs b/src/routes/sync/mod.rs
index d9efc4ef..4083bd44 100644
--- a/src/routes/sync/mod.rs
+++ b/src/routes/sync/mod.rs
@@ -1,9 +1,10 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod get_settings;
 mod get_unreads;
 mod set_settings;
 
-pub fn routes() -> Vec<Route> {
-    routes![get_settings::req, set_settings::req, get_unreads::req]
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![get_settings::req, set_settings::req, get_unreads::req]
 }
diff --git a/src/routes/sync/set_settings.rs b/src/routes/sync/set_settings.rs
index a4f42d1d..d4795c9b 100644
--- a/src/routes/sync/set_settings.rs
+++ b/src/routes/sync/set_settings.rs
@@ -1,28 +1,34 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{EmptyResponse, Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::r#impl::generic::users::user_settings::UserSettingsImpl;
+use revolt_quark::{Db, EmptyResponse, Result};
 
 use chrono::prelude::*;
-use mongodb::bson::{doc, to_bson};
-use mongodb::options::UpdateOptions;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::collections::HashMap;
 
 type Data = HashMap<String, String>;
 
-#[derive(FromForm, Serialize, Deserialize)]
-pub struct Options {
+/// # Set Options
+#[derive(FromForm, Serialize, Deserialize, JsonSchema)]
+pub struct OptionsSetSettings {
+    /// Timestamp of settings change.
+    ///
+    /// Used to avoid feedback loops.
     timestamp: Option<i64>,
 }
 
+/// # Set Settings
+///
+/// Upload data to save to settings.
+#[openapi(tag = "Sync")]
 #[post("/settings/set?<options..>", data = "<data>")]
-pub async fn req(user: User, data: Json<Data>, options: Options) -> Result<EmptyResponse> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot);
-    }
-
+pub async fn req(
+    db: &Db,
+    user: User,
+    data: Json<Data>,
+    options: OptionsSetSettings,
+) -> Result<EmptyResponse> {
     let data = data.into_inner();
     let current_time = Utc::now().timestamp_millis();
     let timestamp = if let Some(timestamp) = options.timestamp {
@@ -35,40 +41,10 @@ pub async fn req(user: User, data: Json<Data>, options: Options) -> Result<Empty
         current_time
     };
 
-    let mut set = doc! {};
-    for (key, data) in &data {
-        set.insert(
-            key.clone(),
-            vec![
-                to_bson(&timestamp).unwrap(),
-                to_bson(&data.clone()).unwrap(),
-            ],
-        );
+    let mut settings = HashMap::new();
+    for (key, data) in data {
+        settings.insert(key, (timestamp, data));
     }
 
-    if set.len() > 0 {
-        get_collection("user_settings")
-            .update_one(
-                doc! {
-                    "_id": &user.id
-                },
-                doc! {
-                    "$set": &set
-                },
-                UpdateOptions::builder().upsert(true).build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "user_settings",
-            })?;
-    }
-
-    ClientboundNotification::UserSettingsUpdate {
-        id: user.id.clone(),
-        update: json!(set),
-    }
-    .publish(user.id);
-
-    Ok(EmptyResponse {})
+    settings.set(db, &user.id).await.map(|_| EmptyResponse)
 }
diff --git a/src/routes/users/add_friend.rs b/src/routes/users/add_friend.rs
index 40e0d024..2b66eca1 100644
--- a/src/routes/users/add_friend.rs
+++ b/src/routes/users/add_friend.rs
@@ -1,168 +1,16 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::{Database, Result};
 
-use futures::try_join;
-use mongodb::bson::doc;
-use mongodb::options::{Collation, FindOneOptions};
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use rocket::State;
 
+/// # Send Friend Request / Accept Request
+///
+/// Send a friend request to another user or accept another user's friend request.
+#[openapi(tag = "Relationships")]
 #[put("/<username>/friend")]
-pub async fn req(user: User, username: String) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    let col = get_collection("users");
-    let doc = col
-        .find_one(
-            doc! {
-                "username": username
-            },
-            FindOneOptions::builder()
-                .collation(Collation::builder().locale("en").strength(2).build())
-                .build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "user",
-        })?
-        .ok_or_else(|| Error::UnknownUser)?;
-
-    let target_id = doc.get_str("_id").map_err(|_| Error::DatabaseError {
-        operation: "get_str(_id)",
-        with: "user",
-    })?;
-
-    let target_user = Ref::from(target_id.to_string())?.fetch_user().await?;
-    if target_user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    match get_relationship(&user, &target_id) {
-        RelationshipStatus::User => return Err(Error::NoEffect),
-        RelationshipStatus::Friend => return Err(Error::AlreadyFriends),
-        RelationshipStatus::Outgoing => return Err(Error::AlreadySentRequest),
-        RelationshipStatus::Blocked => return Err(Error::Blocked),
-        RelationshipStatus::BlockedOther => return Err(Error::BlockedByOther),
-        RelationshipStatus::Incoming => {
-            match try_join!(
-                col.update_one(
-                    doc! {
-                        "_id": &user.id,
-                        "relations._id": target_id
-                    },
-                    doc! {
-                        "$set": {
-                            "relations.$.status": "Friend"
-                        }
-                    },
-                    None
-                ),
-                col.update_one(
-                    doc! {
-                        "_id": target_id,
-                        "relations._id": &user.id
-                    },
-                    doc! {
-                        "$set": {
-                            "relations.$.status": "Friend"
-                        }
-                    },
-                    None
-                )
-            ) {
-                Ok(_) => {
-                    let target_user = target_user
-                        .from_override(&user, RelationshipStatus::Friend)
-                        .await?;
-                    let user = user
-                        .from_override(&target_user, RelationshipStatus::Friend)
-                        .await?;
-
-                    ClientboundNotification::UserRelationship {
-                        id: user.id.clone(),
-                        user: target_user,
-                        status: RelationshipStatus::Friend,
-                    }
-                    .publish(user.id.clone());
-
-                    ClientboundNotification::UserRelationship {
-                        id: target_id.to_string(),
-                        user,
-                        status: RelationshipStatus::Friend,
-                    }
-                    .publish(target_id.to_string());
-
-                    Ok(json!({ "status": "Friend" }))
-                }
-                Err(_) => Err(Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                }),
-            }
-        }
-        RelationshipStatus::None => {
-            match try_join!(
-                col.update_one(
-                    doc! {
-                        "_id": &user.id
-                    },
-                    doc! {
-                        "$push": {
-                            "relations": {
-                                "_id": target_id,
-                                "status": "Outgoing"
-                            }
-                        }
-                    },
-                    None
-                ),
-                col.update_one(
-                    doc! {
-                        "_id": target_id
-                    },
-                    doc! {
-                        "$push": {
-                            "relations": {
-                                "_id": &user.id,
-                                "status": "Incoming"
-                            }
-                        }
-                    },
-                    None
-                )
-            ) {
-                Ok(_) => {
-                    let target_user = target_user
-                        .from_override(&user, RelationshipStatus::Outgoing)
-                        .await?;
-                    let user = user
-                        .from_override(&target_user, RelationshipStatus::Incoming)
-                        .await?;
-
-                    ClientboundNotification::UserRelationship {
-                        id: user.id.clone(),
-                        user: target_user,
-                        status: RelationshipStatus::Outgoing,
-                    }
-                    .publish(user.id.clone());
-
-                    ClientboundNotification::UserRelationship {
-                        id: target_id.to_string(),
-                        user,
-                        status: RelationshipStatus::Incoming,
-                    }
-                    .publish(target_id.to_string());
-
-                    Ok(json!({ "status": "Outgoing" }))
-                }
-                Err(_) => Err(Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                }),
-            }
-        }
-    }
+pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {
+    let mut target = db.fetch_user_by_username(&username).await?;
+    user.add_friend(db, &mut target).await?;
+    Ok(Json(target.with_auto_perspective(db, &user).await))
 }
diff --git a/src/routes/users/block_user.rs b/src/routes/users/block_user.rs
index a6e3cbf0..dd171fd7 100644
--- a/src/routes/users/block_user.rs
+++ b/src/routes/users/block_user.rs
@@ -1,171 +1,16 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::{Database, Result};
 
-use futures::try_join;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use rocket::State;
 
+/// # Block User
+///
+/// Block another user by their id.
+#[openapi(tag = "Relationships")]
 #[put("/<target>/block")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    let col = get_collection("users");
-    let target = target.fetch_user().await?;
-
-    match get_relationship(&user, &target.id) {
-        RelationshipStatus::User | RelationshipStatus::Blocked => Err(Error::NoEffect),
-        RelationshipStatus::BlockedOther => {
-            col.update_one(
-                doc! {
-                    "_id": &user.id,
-                    "relations._id": &target.id
-                },
-                doc! {
-                    "$set": {
-                        "relations.$.status": "Blocked"
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "user",
-            })?;
-
-            ClientboundNotification::UserRelationship {
-                id: user.id.clone(),
-                user: target,
-                status: RelationshipStatus::Blocked,
-            }
-            .publish(user.id.clone());
-
-            Ok(json!({ "status": "Blocked" }))
-        }
-        RelationshipStatus::None => {
-            match try_join!(
-                col.update_one(
-                    doc! {
-                        "_id": &user.id
-                    },
-                    doc! {
-                        "$push": {
-                            "relations": {
-                                "_id": &target.id,
-                                "status": "Blocked"
-                            }
-                        }
-                    },
-                    None
-                ),
-                col.update_one(
-                    doc! {
-                        "_id": &target.id
-                    },
-                    doc! {
-                        "$push": {
-                            "relations": {
-                                "_id": &user.id,
-                                "status": "BlockedOther"
-                            }
-                        }
-                    },
-                    None
-                )
-            ) {
-                Ok(_) => {
-                    let target = target
-                        .from_override(&user, RelationshipStatus::Blocked)
-                        .await?;
-                    let user = user
-                        .from_override(&target, RelationshipStatus::BlockedOther)
-                        .await?;
-                    let target_id = target.id.clone();
-
-                    ClientboundNotification::UserRelationship {
-                        id: user.id.clone(),
-                        user: target,
-                        status: RelationshipStatus::Blocked,
-                    }
-                    .publish(user.id.clone());
-
-                    ClientboundNotification::UserRelationship {
-                        id: target_id.clone(),
-                        user,
-                        status: RelationshipStatus::BlockedOther,
-                    }
-                    .publish(target_id);
-
-                    Ok(json!({ "status": "Blocked" }))
-                }
-                Err(_) => Err(Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                }),
-            }
-        }
-        RelationshipStatus::Friend
-        | RelationshipStatus::Incoming
-        | RelationshipStatus::Outgoing => {
-            match try_join!(
-                col.update_one(
-                    doc! {
-                        "_id": &user.id,
-                        "relations._id": &target.id
-                    },
-                    doc! {
-                        "$set": {
-                            "relations.$.status": "Blocked"
-                        }
-                    },
-                    None
-                ),
-                col.update_one(
-                    doc! {
-                        "_id": &target.id,
-                        "relations._id": &user.id
-                    },
-                    doc! {
-                        "$set": {
-                            "relations.$.status": "BlockedOther"
-                        }
-                    },
-                    None
-                )
-            ) {
-                Ok(_) => {
-                    let target = target
-                        .from_override(&user, RelationshipStatus::Blocked)
-                        .await?;
-                    let user = user
-                        .from_override(&target, RelationshipStatus::BlockedOther)
-                        .await?;
-                    let target_id = target.id.clone();
-
-                    ClientboundNotification::UserRelationship {
-                        id: user.id.clone(),
-                        user: target,
-                        status: RelationshipStatus::Blocked,
-                    }
-                    .publish(user.id.clone());
-
-                    ClientboundNotification::UserRelationship {
-                        id: target_id.clone(),
-                        user,
-                        status: RelationshipStatus::BlockedOther,
-                    }
-                    .publish(target_id);
-
-                    Ok(json!({ "status": "Blocked" }))
-                }
-                Err(_) => Err(Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                }),
-            }
-        }
-    }
+pub async fn req(db: &State<Database>, user: User, target: String) -> Result<Json<User>> {
+    let mut target = db.fetch_user(&target).await?;
+    user.block_user(db, &mut target).await?;
+    Ok(Json(target.with_auto_perspective(db, &user).await))
 }
diff --git a/src/routes/users/change_username.rs b/src/routes/users/change_username.rs
index 765d9f75..9e534110 100644
--- a/src/routes/users/change_username.rs
+++ b/src/routes/users/change_username.rs
@@ -1,63 +1,37 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
 use crate::util::regex::RE_USERNAME;
-use mongodb::bson::doc;
 use rauth::entities::Account;
-use rocket::serde::json::Json;
+use revolt_quark::{models::User, Database, Error, Result};
+use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # Username Information
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataChangeUsername {
+    /// New username
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
-    username: Option<String>,
+    username: String,
+    /// Current account password
     #[validate(length(min = 8, max = 1024))]
     password: String,
 }
 
-#[patch("/<_ignore_id>/username", data = "<data>")]
+/// # Change Username
+///
+/// Change your username.
+#[openapi(tag = "User Information")]
+#[patch("/@me/username", data = "<data>")]
 pub async fn req(
+    db: &State<Database>,
     account: Account,
-    user: User,
-    data: Json<Data>,
-    _ignore_id: String,
-) -> Result<EmptyResponse> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    data.validate()
-        .map_err(|error| Error::FailedValidation { error })?;
-
-    account.verify_password(&data.password)
+    mut user: User,
+    data: Json<DataChangeUsername>,
+) -> Result<Json<User>> {
+    let data = data.into_inner();
+    account
+        .verify_password(&data.password)
         .map_err(|_| Error::InvalidCredentials)?;
 
-    let mut set = doc! {};
-    if let Some(username) = &data.username {
-        if (username.to_lowercase() != user.username.to_lowercase()) && User::is_username_taken(&username).await? {
-            return Err(Error::UsernameTaken);
-        }
-
-        set.insert("username", username.clone());
-    }
-
-    get_collection("users")
-        .update_one(doc! { "_id": &user.id }, doc! { "$set": set }, None)
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "user",
-        })?;
-
-    ClientboundNotification::UserUpdate {
-        id: user.id.clone(),
-        data: json!({
-            "username": data.username
-        }),
-        clear: None,
-    }
-    .publish_as_user(user.id.clone());
-
-    Ok(EmptyResponse {})
+    user.update_username(db, data.username).await?;
+    Ok(Json(user.foreign()))
 }
diff --git a/src/routes/users/edit_user.rs b/src/routes/users/edit_user.rs
index d943ccb1..40788c96 100644
--- a/src/routes/users/edit_user.rs
+++ b/src/routes/users/edit_user.rs
@@ -1,37 +1,56 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveUserField};
+use revolt_quark::models::user::{FieldsUser, PartialUser, User};
+use revolt_quark::models::File;
+use revolt_quark::{Database, Error, Result};
 
-use mongodb::bson::{doc, to_document};
+use revolt_quark::models::user::UserStatus;
 use rocket::serde::json::Json;
+use rocket::State;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize, Debug)]
+/// # Profile Data
+#[derive(Validate, Serialize, Deserialize, Debug, JsonSchema)]
 pub struct UserProfileData {
+    /// Text to set as user profile description
     #[validate(length(min = 0, max = 2000))]
     #[serde(skip_serializing_if = "Option::is_none")]
     content: Option<String>,
+    /// Attachment Id for background
     #[serde(skip_serializing_if = "Option::is_none")]
     #[validate(length(min = 1, max = 128))]
     background: Option<String>,
 }
 
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
+/// # User Data
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditUser {
+    /// New user status
     #[validate]
     status: Option<UserStatus>,
+    /// New user profile data
+    ///
+    /// This is applied as a partial.
     #[validate]
     profile: Option<UserProfileData>,
+    /// Attachment Id for avatar
     #[validate(length(min = 1, max = 128))]
     avatar: Option<String>,
-    remove: Option<RemoveUserField>,
+    /// Fields to remove from user object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsUser>>,
 }
 
-#[patch("/<_ignore_id>", data = "<data>")]
-pub async fn req(user: User, data: Json<Data>, _ignore_id: String) -> Result<EmptyResponse> {
-    let mut data = data.into_inner();
-
+/// # Edit User
+///
+/// Edit currently authenticated user.
+#[openapi(tag = "User Information")]
+#[patch("/@me", data = "<data>")]
+pub async fn req(
+    db: &State<Database>,
+    mut user: User,
+    data: Json<DataEditUser>,
+) -> Result<Json<User>> {
+    let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
@@ -40,117 +59,67 @@ pub async fn req(user: User, data: Json<Data>, _ignore_id: String) -> Result<Emp
         && data.avatar.is_none()
         && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(user));
     }
 
-    let mut unset = doc! {};
-    let mut set = doc! {};
+    // 1. Remove fields from object
+    if let Some(fields) = &data.remove {
+        if fields.contains(&FieldsUser::Avatar) {
+            if let Some(avatar) = &user.avatar {
+                db.mark_attachment_as_deleted(&avatar.id).await?;
+            }
+        }
 
-    let mut remove_background = false;
-    let mut remove_avatar = false;
+        if fields.contains(&FieldsUser::ProfileBackground) {
+            if let Some(profile) = &user.profile {
+                if let Some(background) = &profile.background {
+                    db.mark_attachment_as_deleted(&background.id).await?;
+                }
+            }
+        }
 
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveUserField::ProfileContent => {
-                unset.insert("profile.content", 1);
-            }
-            RemoveUserField::ProfileBackground => {
-                unset.insert("profile.background", 1);
-                remove_background = true;
-            }
-            RemoveUserField::StatusText => {
-                unset.insert("status.text", 1);
-            }
-            RemoveUserField::Avatar => {
-                unset.insert("avatar", 1);
-                remove_avatar = true;
-            }
+        for field in fields {
+            user.remove(field);
         }
     }
 
-    if let Some(status) = &data.status {
-        set.insert(
-            "status",
-            to_document(&status).map_err(|_| Error::DatabaseError {
-                operation: "to_document",
-                with: "status",
-            })?,
-        );
+    let mut partial: PartialUser = Default::default();
+
+    // 2. Apply new avatar
+    if let Some(avatar) = data.avatar {
+        partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
     }
 
+    // 3. Apply new status
+    if let Some(status) = data.status {
+        let mut new_status = user.status.take().unwrap_or_default();
+        if let Some(text) = status.text {
+            new_status.text = Some(text);
+        }
+
+        if let Some(presence) = status.presence {
+            new_status.presence = Some(presence);
+        }
+
+        partial.status = Some(new_status);
+    }
+
+    // 4. Apply new profile
     if let Some(profile) = data.profile {
+        let mut new_profile = user.profile.take().unwrap_or_default();
         if let Some(content) = profile.content {
-            set.insert("profile.content", content);
+            new_profile.content = Some(content);
         }
 
-        if let Some(attachment_id) = profile.background {
-            let attachment =
-                File::find_and_use(&attachment_id, "backgrounds", "user", &user.id).await?;
-            set.insert(
-                "profile.background",
-                to_document(&attachment).map_err(|_| Error::DatabaseError {
-                    operation: "to_document",
-                    with: "attachment",
-                })?,
-            );
-
-            remove_background = true;
+        if let Some(background) = profile.background {
+            new_profile.background = Some(File::use_background(db, &background, &user.id).await?);
         }
+
+        partial.profile = Some(new_profile);
     }
 
-    let avatar = std::mem::replace(&mut data.avatar, None);
-    if let Some(attachment_id) = avatar {
-        let attachment = File::find_and_use(&attachment_id, "avatars", "user", &user.id).await?;
-        set.insert(
-            "avatar",
-            to_document(&attachment).map_err(|_| Error::DatabaseError {
-                operation: "to_document",
-                with: "attachment",
-            })?,
-        );
+    user.update(db, partial, data.remove.unwrap_or_default())
+        .await?;
 
-        remove_avatar = true;
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("users")
-            .update_one(doc! { "_id": &user.id }, operations, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "user",
-            })?;
-    }
-
-    ClientboundNotification::UserUpdate {
-        id: user.id.clone(),
-        data: json!(set),
-        clear: data.remove,
-    }
-    .publish_as_user(user.id.clone());
-
-    if remove_avatar {
-        if let Some(old_avatar) = user.avatar {
-            old_avatar.delete().await?;
-        }
-    }
-
-    if remove_background {
-        if let Some(profile) = user.profile {
-            if let Some(old_background) = profile.background {
-                old_background.delete().await?;
-            }
-        }
-    }
-
-    Ok(EmptyResponse {})
+    Ok(Json(user.foreign()))
 }
diff --git a/src/routes/users/fetch_dms.rs b/src/routes/users/fetch_dms.rs
index ec7630fb..2f11de44 100644
--- a/src/routes/users/fetch_dms.rs
+++ b/src/routes/users/fetch_dms.rs
@@ -1,40 +1,15 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Channel, User},
+    Database, Result,
+};
 
-use futures::StreamExt;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 
+/// # Fetch Direct Message Channels
+///
+/// This fetches your direct messages, including any DM and group DM conversations.
+#[openapi(tag = "Direct Messaging")]
 #[get("/dms")]
-pub async fn req(user: User) -> Result<Value> {
-    let mut cursor = get_collection("channels")
-        .find(
-            doc! {
-                "$or": [
-                    {
-                        "channel_type": "DirectMessage",
-                        "active": true
-                    },
-                    {
-                        "channel_type": "Group"
-                    }
-                ],
-                "recipients": user.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "channels",
-        })?;
-
-    let mut channels = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            channels.push(doc);
-        }
-    }
-
-    Ok(json!(channels))
+pub async fn req(db: &State<Database>, user: User) -> Result<Json<Vec<Channel>>> {
+    db.find_direct_messages(&user.id).await.map(Json)
 }
diff --git a/src/routes/users/fetch_profile.rs b/src/routes/users/fetch_profile.rs
index 44457d8b..cdd44ffa 100644
--- a/src/routes/users/fetch_profile.rs
+++ b/src/routes/users/fetch_profile.rs
@@ -1,24 +1,28 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{user::UserProfile, User},
+    perms, Database, Error, Ref, Result,
+};
 
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 
+/// # Fetch User Profile
+///
+/// Retrieve a user's profile data.
+///
+/// Will fail if you do not have permission to access the other user's profile.
+#[openapi(tag = "User Information")]
 #[get("/<target>/profile")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_user().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_user(&target)
-        .for_user_given()
-        .await?;
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<UserProfile>> {
+    let target = target.as_user(db).await?;
 
-    if !perm.get_view_profile() {
-        Err(Error::MissingPermission)?
-    }
-
-    if target.profile.is_some() {
-        Ok(json!(target.profile))
+    if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_view_profile()
+    {
+        Ok(Json(target.profile.unwrap_or_default()))
     } else {
-        Ok(json!({}))
+        Err(Error::NotFound)
     }
 }
diff --git a/src/routes/users/fetch_relationship.rs b/src/routes/users/fetch_relationship.rs
deleted file mode 100644
index 9234eec1..00000000
--- a/src/routes/users/fetch_relationship.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use rocket::serde::json::Value;
-
-#[get("/<target>/relationship")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    Ok(json!({ "status": get_relationship(&user, &target.id) }))
-}
diff --git a/src/routes/users/fetch_relationships.rs b/src/routes/users/fetch_relationships.rs
deleted file mode 100644
index 8eb1ed9b..00000000
--- a/src/routes/users/fetch_relationships.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use rocket::serde::json::Value;
-
-#[get("/relationships")]
-pub async fn req(user: User) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    Ok(if let Some(vec) = user.relations {
-        json!(vec)
-    } else {
-        json!([])
-    })
-}
diff --git a/src/routes/users/fetch_self.rs b/src/routes/users/fetch_self.rs
index 12ba8141..818b3243 100755
--- a/src/routes/users/fetch_self.rs
+++ b/src/routes/users/fetch_self.rs
@@ -1,9 +1,13 @@
-use crate::database::*;
-use crate::util::result::{Result};
-
-use rocket::serde::json::Value;
-
-#[get("/@me")]
-pub async fn req(user: User) -> Result<Value> {
-    Ok(json!(user))
-}
+use revolt_quark::models::User;
+use revolt_quark::Result;
+
+use rocket::serde::json::Json;
+
+/// # Fetch Self
+///
+/// Retrieve your user information.
+#[openapi(tag = "User Information")]
+#[get("/@me")]
+pub async fn req(user: User) -> Result<Json<User>> {
+    Ok(Json(user.foreign()))
+}
diff --git a/src/routes/users/fetch_user.rs b/src/routes/users/fetch_user.rs
index 831735f3..ccfcbf94 100644
--- a/src/routes/users/fetch_user.rs
+++ b/src/routes/users/fetch_user.rs
@@ -1,20 +1,23 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{models::User, perms, Database, Error, Ref, Result};
 
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 
+/// # Fetch User
+///
+/// Retrieve a user's information.
+#[openapi(tag = "User Information")]
 #[get("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let target = target.fetch_user().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_user(&target)
-        .for_user_given()
-        .await?;
-
-    if !perm.get_access() {
-        Err(Error::MissingPermission)?
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<User>> {
+    if target.id == user.id {
+        return Ok(Json(user));
     }
 
-    Ok(json!(target.from(&user).with(perm)))
+    let target = target.as_user(db).await?;
+
+    let permissions = perms(&user).user(&target).calc_user(db).await;
+    if permissions.get_access() {
+        Ok(Json(target.with_perspective(&user, &permissions)))
+    } else {
+        Err(Error::NotFound)
+    }
 }
diff --git a/src/routes/users/find_mutual.rs b/src/routes/users/find_mutual.rs
index 5cb3ae09..7e5bfaac 100644
--- a/src/routes/users/find_mutual.rs
+++ b/src/routes/users/find_mutual.rs
@@ -1,62 +1,42 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::{perms, Database, Error, Ref, Result};
 
-use futures::StreamExt;
-use mongodb::bson::{doc, Document};
-use mongodb::options::FindOptions;
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use rocket::State;
+use serde::Serialize;
 
-#[get("/<target>/mutual")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let users = get_collection("users")
-        .find(
-            doc! {
-                "$and": [
-                    { "relations": { "$elemMatch": { "_id": &user.id, "status": "Friend" } } },
-                    { "relations": { "$elemMatch": { "_id": &target.id, "status": "Friend" } } }
-                ]
-            },
-            FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "users",
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| x.get_str("_id").ok().map(|x| x.to_string()))
-        .collect::<Vec<String>>();
-    
-    let server_ids = User::fetch_server_ids(&user.id).await?;
-    let servers = get_collection("server_members")
-        .find(
-            doc! {
-                "_id.user": &target.id,
-                "_id.server": {
-                    "$in": server_ids
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "server_members",
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| {
-            x.get_document("_id")
-                .ok()
-                .map(|i| i.get_str("server").ok().map(|x| x.to_string()))
-        })
-        .flatten()
-        .collect::<Vec<String>>();
-
-    Ok(json!({ "users": users, "servers": servers }))
+/// # Mutual Friends and Servers Response
+#[derive(Serialize, JsonSchema)]
+pub struct MutualResponse {
+    /// Array of mutual user IDs that both users are friends with
+    users: Vec<String>,
+    /// Array of mutual server IDs that both users are in
+    servers: Vec<String>,
+}
+
+/// # Fetch Mutual Friends And Servers
+///
+/// Retrieve a list of mutual friends and servers with another user.
+#[openapi(tag = "Relationships")]
+#[get("/<target>/mutual")]
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<MutualResponse>> {
+    if target.id == user.id {
+        return Err(Error::InvalidOperation);
+    }
+
+    let target = target.as_user(db).await?;
+
+    if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_view_profile()
+    {
+        Ok(Json(MutualResponse {
+            users: db.fetch_mutual_user_ids(&user.id, &target.id).await?,
+            servers: db.fetch_mutual_server_ids(&user.id, &target.id).await?,
+        }))
+    } else {
+        Err(Error::NotFound)
+    }
 }
diff --git a/src/routes/users/get_default_avatar.rs b/src/routes/users/get_default_avatar.rs
index 86b06927..0ac63108 100644
--- a/src/routes/users/get_default_avatar.rs
+++ b/src/routes/users/get_default_avatar.rs
@@ -1,43 +1,76 @@
-use rocket::{Request, Response};
+use rocket::http::ContentType;
 use rocket::response::{self, Responder};
-use rocket::fs::NamedFile;
-use std::path::Path;
+use rocket::{Request, Response};
+use rocket_okapi::okapi::openapi3::{self, MediaType, RefOr};
+use schemars::schema::{InstanceType, SchemaObject, SingleOrVec};
 
-use crate::database::Ref;
+pub struct CachedFile((ContentType, Vec<u8>));
 
-pub struct CachedFile(NamedFile);
-
-pub static CACHE_CONTROL: &'static str = "public, max-age=31536000, immutable";
+pub static CACHE_CONTROL: &str = "public, max-age=31536000, immutable";
 
 impl<'r> Responder<'r, 'static> for CachedFile {
     fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> {
         Response::build_from(self.0.respond_to(req)?)
-            .raw_header("Cache-control", CACHE_CONTROL)
+            .raw_header("Cache-Control", CACHE_CONTROL)
             .ok()
     }
 }
 
-#[get("/<target>/default_avatar")]
-pub async fn req(target: Ref) -> Option<CachedFile> {
-    match target.id.chars().nth(25).unwrap() {
-        '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => {
-            NamedFile::open(Path::new("assets/user_red.png")).await.ok().map(|n| CachedFile(n))
-        }
-        '8' | '9' | 'A' | 'C' | 'B' | 'D' | 'E' | 'F' => {
-            NamedFile::open(Path::new("assets/user_green.png"))
-                .await
-                .ok().map(|n| CachedFile(n))
-        }
-        'G' | 'H' | 'J' | 'K' | 'M' | 'N' | 'P' | 'Q' => {
-            NamedFile::open(Path::new("assets/user_blue.png"))
-                .await
-                .ok().map(|n| CachedFile(n))
-        }
-        'R' | 'S' | 'T' | 'V' | 'W' | 'X' | 'Y' | 'Z' => {
-            NamedFile::open(Path::new("assets/user_yellow.png"))
-                .await
-                .ok().map(|n| CachedFile(n))
-        }
-        _ => unreachable!(),
+impl rocket_okapi::response::OpenApiResponderInner for CachedFile {
+    fn responses(
+        _gen: &mut rocket_okapi::gen::OpenApiGenerator,
+    ) -> std::result::Result<openapi3::Responses, rocket_okapi::OpenApiError> {
+        let mut responses = schemars::Map::new();
+        let mut content = schemars::Map::new();
+
+        content.insert(
+            "image/png".to_owned(),
+            MediaType {
+                schema: Some(SchemaObject {
+                    instance_type: Some(SingleOrVec::Single(Box::new(InstanceType::String))),
+                    format: Some("binary".to_owned()),
+                    ..Default::default()
+                }),
+                ..Default::default()
+            },
+        );
+
+        responses.insert(
+            "200".to_string(),
+            RefOr::Object(openapi3::Response {
+                description: "Default Avatar Picture".to_string(),
+                content,
+                ..Default::default()
+            }),
+        );
+
+        Ok(openapi3::Responses {
+            responses,
+            ..Default::default()
+        })
     }
 }
+
+/// # Fetch Default Avatar
+///
+/// This returns a default avatar based on the given id.
+#[openapi(tag = "User Information")]
+#[get("/<target>/default_avatar")]
+pub async fn req(target: String) -> CachedFile {
+    CachedFile((
+        ContentType::PNG,
+        match target.chars().last().unwrap() {
+            // 0123456789ABCDEFGHJKMNPQRSTVWXYZ
+            '0' | '1' | '2' | '3' | 'S' | 'Z' => {
+                include_bytes!(crate::asset!("user/2.png")).to_vec()
+            }
+            '4' | '5' | '6' | '7' | 'T' => include_bytes!(crate::asset!("user/3.png")).to_vec(),
+            '8' | '9' | 'A' | 'B' => include_bytes!(crate::asset!("user/4.png")).to_vec(),
+            'C' | 'D' | 'E' | 'F' | 'V' => include_bytes!(crate::asset!("user/5.png")).to_vec(),
+            'G' | 'H' | 'J' | 'K' | 'W' => include_bytes!(crate::asset!("user/6.png")).to_vec(),
+            'M' | 'N' | 'P' | 'Q' | 'X' => include_bytes!(crate::asset!("user/7.png")).to_vec(),
+            /*'0' | '1' | '2' | '3' | 'R' | 'Y'*/
+            _ => include_bytes!(crate::asset!("user/1.png")).to_vec(),
+        },
+    ))
+}
diff --git a/src/routes/users/mod.rs b/src/routes/users/mod.rs
index a28b649b..60b92e94 100644
--- a/src/routes/users/mod.rs
+++ b/src/routes/users/mod.rs
@@ -1,4 +1,5 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod add_friend;
 mod block_user;
@@ -6,18 +7,16 @@ mod change_username;
 mod edit_user;
 mod fetch_dms;
 mod fetch_profile;
-mod fetch_relationship;
-mod fetch_relationships;
+mod fetch_self;
 mod fetch_user;
 mod find_mutual;
 mod get_default_avatar;
 mod open_dm;
 mod remove_friend;
 mod unblock_user;
-mod fetch_self;
 
-pub fn routes() -> Vec<Route> {
-    routes![
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
         // User Information
         fetch_self::req,
         fetch_user::req,
@@ -30,8 +29,6 @@ pub fn routes() -> Vec<Route> {
         open_dm::req,
         // Relationships
         find_mutual::req,
-        fetch_relationships::req,
-        fetch_relationship::req,
         add_friend::req,
         remove_friend::req,
         block_user::req,
diff --git a/src/routes/users/open_dm.rs b/src/routes/users/open_dm.rs
index 18072ab1..938f5e5d 100644
--- a/src/routes/users/open_dm.rs
+++ b/src/routes/users/open_dm.rs
@@ -1,50 +1,55 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Database, Error, Ref, Result, UserPermission,
+};
 
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 use ulid::Ulid;
 
+/// # Open Direct Message
+///
+/// Open a DM with another user.
+///
+/// If the target is oneself, a saved messages channel is returned.
+#[openapi(tag = "Direct Messaging")]
 #[get("/<target>/dm")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    let query = if user.id == target.id {
-        doc! {
-            "channel_type": "SavedMessages",
-            "user": &user.id
-        }
-    } else {
-        doc! {
-            "channel_type": "DirectMessage",
-            "recipients": {
-                "$all": [ &user.id, &target.id ]
-            }
-        }
-    };
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<Channel>> {
+    let target = target.as_user(db).await?;
 
-    let existing_channel = get_collection("channels")
-        .find_one(query, None)
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "channel",
-        })?;
-
-    if let Some(doc) = existing_channel {
-        Ok(json!(doc))
-    } else {
-        let id = Ulid::new().to_string();
-        let channel = if user.id == target.id {
-            Channel::SavedMessages { id, user: user.id }
+    // If the target is oneself, open saved messages.
+    if target.id == user.id {
+        return if let Ok(channel) = db.find_direct_message_channel(&user.id, &target.id).await {
+            Ok(Json(channel))
         } else {
-            Channel::DirectMessage {
-                id,
-                active: false,
-                recipients: vec![user.id, target.id],
-                last_message_id: None,
-            }
+            let new_channel = Channel::SavedMessages {
+                id: Ulid::new().to_string(),
+                user: user.id,
+            };
+
+            new_channel.create(db).await?;
+            Ok(Json(new_channel))
+        };
+    }
+
+    // Otherwise try to find or create a DM.
+    if let Ok(channel) = db.find_direct_message_channel(&user.id, &target.id).await {
+        Ok(Json(channel))
+    } else if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_send_message()
+    {
+        let new_channel = Channel::DirectMessage {
+            id: Ulid::new().to_string(),
+            active: false,
+            recipients: vec![user.id, target.id],
+            last_message_id: None,
         };
 
-        channel.clone().publish().await?;
-        Ok(json!(channel))
+        new_channel.create(db).await?;
+        Ok(Json(new_channel))
+    } else {
+        Error::from_user_permission(UserPermission::SendMessage)
     }
 }
diff --git a/src/routes/users/remove_friend.rs b/src/routes/users/remove_friend.rs
index 9f28c7bf..5d6c3734 100644
--- a/src/routes/users/remove_friend.rs
+++ b/src/routes/users/remove_friend.rs
@@ -1,83 +1,16 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::{Database, Result};
 
-use futures::try_join;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use rocket::State;
 
+/// # Deny Friend Request / Remove Friend
+///
+/// Denies another user's friend request or removes an existing friend.
+#[openapi(tag = "Relationships")]
 #[delete("/<target>/friend")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    let col = get_collection("users");
-    let target = target.fetch_user().await?;
-
-    match get_relationship(&user, &target.id) {
-        RelationshipStatus::Friend
-        | RelationshipStatus::Outgoing
-        | RelationshipStatus::Incoming => {
-            match try_join!(
-                col.update_one(
-                    doc! {
-                        "_id": &user.id
-                    },
-                    doc! {
-                        "$pull": {
-                            "relations": {
-                                "_id": &target.id
-                            }
-                        }
-                    },
-                    None
-                ),
-                col.update_one(
-                    doc! {
-                        "_id": &target.id
-                    },
-                    doc! {
-                        "$pull": {
-                            "relations": {
-                                "_id": &user.id
-                            }
-                        }
-                    },
-                    None
-                )
-            ) {
-                Ok(_) => {
-                    let target = target
-                        .from_override(&user, RelationshipStatus::None)
-                        .await?;
-                    let user = user
-                        .from_override(&target, RelationshipStatus::None)
-                        .await?;
-                    let target_id = target.id.clone();
-
-                    ClientboundNotification::UserRelationship {
-                        id: user.id.clone(),
-                        user: target,
-                        status: RelationshipStatus::None,
-                    }
-                    .publish(user.id.clone());
-
-                    ClientboundNotification::UserRelationship {
-                        id: target_id.clone(),
-                        user,
-                        status: RelationshipStatus::None,
-                    }
-                    .publish(target_id);
-
-                    Ok(json!({ "status": "None" }))
-                }
-                Err(_) => Err(Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                }),
-            }
-        }
-        _ => Err(Error::NoEffect),
-    }
+pub async fn req(db: &State<Database>, user: User, target: String) -> Result<Json<User>> {
+    let mut target = db.fetch_user(&target).await?;
+    user.remove_friend(db, &mut target).await?;
+    Ok(Json(target.with_auto_perspective(db, &user).await))
 }
diff --git a/src/routes/users/unblock_user.rs b/src/routes/users/unblock_user.rs
index 45a0c6cd..e7733191 100644
--- a/src/routes/users/unblock_user.rs
+++ b/src/routes/users/unblock_user.rs
@@ -1,115 +1,16 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
+use revolt_quark::models::User;
+use revolt_quark::{Database, Result};
 
-use futures::try_join;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
+use rocket::State;
 
+/// # Unblock User
+///
+/// Unblock another user by their id.
+#[openapi(tag = "Relationships")]
 #[delete("/<target>/block")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
-    let col = get_collection("users");
-    let target = target.fetch_user().await?;
-
-    match get_relationship(&user, &target.id) {
-        RelationshipStatus::Blocked => match get_relationship(&target, &user.id) {
-            RelationshipStatus::Blocked => {
-                col.update_one(
-                    doc! {
-                        "_id": &user.id,
-                        "relations._id": &target.id
-                    },
-                    doc! {
-                        "$set": {
-                            "relations.$.status": "BlockedOther"
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "user",
-                })?;
-
-                let target = target
-                    .from_override(&user, RelationshipStatus::BlockedOther)
-                    .await?;
-                ClientboundNotification::UserRelationship {
-                    id: user.id.clone(),
-                    user: target,
-                    status: RelationshipStatus::BlockedOther,
-                }
-                .publish(user.id.clone());
-
-                Ok(json!({ "status": "BlockedOther" }))
-            }
-            RelationshipStatus::BlockedOther => {
-                match try_join!(
-                    col.update_one(
-                        doc! {
-                            "_id": &user.id
-                        },
-                        doc! {
-                            "$pull": {
-                                "relations": {
-                                    "_id": &target.id
-                                }
-                            }
-                        },
-                        None
-                    ),
-                    col.update_one(
-                        doc! {
-                            "_id": &target.id
-                        },
-                        doc! {
-                            "$pull": {
-                                "relations": {
-                                    "_id": &user.id
-                                }
-                            }
-                        },
-                        None
-                    )
-                ) {
-                    Ok(_) => {
-                        let target = target
-                            .from_override(&user, RelationshipStatus::None)
-                            .await?;
-                        let user = user
-                            .from_override(&target, RelationshipStatus::None)
-                            .await?;
-                        let target_id = target.id.clone();
-
-                        ClientboundNotification::UserRelationship {
-                            id: user.id.clone(),
-                            user: target,
-                            status: RelationshipStatus::None,
-                        }
-                        .publish(user.id.clone());
-
-                        ClientboundNotification::UserRelationship {
-                            id: target_id.clone(),
-                            user: user,
-                            status: RelationshipStatus::None,
-                        }
-                        .publish(target_id);
-
-                        Ok(json!({ "status": "None" }))
-                    }
-                    Err(_) => Err(Error::DatabaseError {
-                        operation: "update_one",
-                        with: "user",
-                    }),
-                }
-            }
-            _ => Err(Error::InternalError),
-        },
-        _ => Err(Error::NoEffect),
-    }
+pub async fn req(db: &State<Database>, user: User, target: String) -> Result<Json<User>> {
+    let mut target = db.fetch_user(&target).await?;
+    user.unblock_user(db, &mut target).await?;
+    Ok(Json(target.with_auto_perspective(db, &user).await))
 }
diff --git a/src/task_queue/mod.rs b/src/task_queue/mod.rs
deleted file mode 100644
index ff995ceb..00000000
--- a/src/task_queue/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod task_last_message_id;
-pub mod task_process_embeds;
-pub mod task_web_push;
-pub mod task_ack;
-
-pub async fn start_queues() {
-    async_std::task::spawn(task_last_message_id::run());
-    async_std::task::spawn(task_process_embeds::run());
-    async_std::task::spawn(task_web_push::run());
-    async_std::task::spawn(task_ack::run());
-}
diff --git a/src/task_queue/task_ack.rs b/src/task_queue/task_ack.rs
deleted file mode 100644
index 0fb5844a..00000000
--- a/src/task_queue/task_ack.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-// Queue Type: Debounced
-// TODO: Group similar events together with $in.
-
-use std::{collections::HashMap, time::{Duration, Instant}};
-
-use async_channel::{ Sender, Receiver, bounded };
-use log::info;
-use mongodb::{bson::doc, options::UpdateOptions};
-
-use crate::database::*;
-
-// Commit to database every 30 seconds if the task is particularly active.
-static EXPIRE_CONSTANT: u64 = 30;
-
-// Otherwise, commit to database after 5 seconds.
-static SAVE_CONSTANT: u64 = 5;
-
-struct Message {
-    channel: String,
-    user: String,
-    event: AckEvent,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum AckEvent {
-    AddMention { ids: Vec<String> },
-    AckMessage { id: String }
-}
-
-#[derive(Debug)]
-struct Task {
-    event: AckEvent,
-    last_updated: Instant,
-    first_seen: Instant,
-}
-
-lazy_static! {
-    static ref CHANNEL: (Sender<Message>, Receiver<Message>) = bounded(100);
-}
-
-pub async fn queue(channel: String, user: String, event: AckEvent) {
-    CHANNEL.0.send(Message { channel, user, event }).await.ok();
-}
-
-pub async fn run() {
-    let unreads = get_collection("channel_unreads");
-    let mut tasks = HashMap::<(String, String), Task>::new();
-    let mut keys = vec![];
-
-    loop {
-        // Find due tasks.
-        for (key, Task { first_seen, last_updated, .. }) in &tasks {
-            if first_seen.elapsed().as_secs() > EXPIRE_CONSTANT ||
-                last_updated.elapsed().as_secs() > SAVE_CONSTANT {
-                keys.push(key.clone());
-            }
-        }
-
-        // Commit any due tasks to the database.
-        for key in &keys {
-            if let Some(Task { event, .. }) = tasks.remove(key) {
-                let (user, channel) = key;
-
-                match event {
-                    AckEvent::AddMention { ids } => {
-                        unreads.update_one(
-                            doc! {
-                                "_id.channel": channel,
-                                "_id.user": user,
-                            },
-                            doc! {
-                                "$push": {
-                                    "mentions": {
-                                        "$each": ids
-                                    }
-                                }
-                            },
-                            UpdateOptions::builder().upsert(true).build(),
-                        )
-                        .await
-                        .ok();
-
-                        info!("Added mentions for {} in {}.", user, channel);
-                    },
-                    AckEvent::AckMessage { id } => {
-                        unreads.update_one(
-                            doc! {
-                                "_id.channel": channel,
-                                "_id.user": user,
-                            },
-                            doc! {
-                                "$unset": {
-                                    "mentions": 1
-                                },
-                                "$set": {
-                                    "last_id": id
-                                }
-                            },
-                            UpdateOptions::builder().upsert(true).build(),
-                        )
-                        .await
-                        .ok();
-
-                        info!("User {} acknowledged {}.", user, channel);
-                    }
-                }
-            }
-        }
-
-        // Clear keys
-        keys.clear();
-
-        // Queue incoming tasks.
-        while let Ok(Message { channel, user, mut event }) = CHANNEL.1.try_recv() {
-            let key = (user, channel);
-            if let Some(mut existing_task) = tasks.get_mut(&key) {
-                existing_task.last_updated = Instant::now();
-
-                match &mut event {
-                    AckEvent::AddMention { ids } => {
-                        if let AckEvent::AddMention { ids: existing } = &mut existing_task.event {
-                            existing.append(ids);
-                        } else {
-                            existing_task.event = event;
-                        }
-                    }
-                    AckEvent::AckMessage { .. } => {
-                        existing_task.event = event;
-                    }
-                }
-            } else {
-                tasks.insert(key, Task {
-                    event,
-                    last_updated: Instant::now(),
-                    first_seen: Instant::now()
-                });
-            }
-        }
-
-        // Sleep for an arbitrary amount of time.
-        async_std::task::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/src/task_queue/task_last_message_id.rs b/src/task_queue/task_last_message_id.rs
deleted file mode 100644
index de7146de..00000000
--- a/src/task_queue/task_last_message_id.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Queue Type: Debounced
-use std::{collections::HashMap, time::{Duration, Instant}};
-
-use async_channel::{ Sender, Receiver, bounded };
-use log::info;
-use mongodb::bson::doc;
-
-use crate::database::*;
-
-// Commit to database every 30 seconds if the task is particularly active.
-static EXPIRE_CONSTANT: u64 = 30;
-
-// Otherwise, commit to database after 5 seconds.
-static SAVE_CONSTANT: u64 = 5;
-
-struct Message {
-    channel: String,
-    id: String,
-    is_dm: bool
-}
-
-#[derive(Debug)]
-struct Task {
-    id: String,
-    is_dm: bool,
-    last_updated: Instant,
-    first_seen: Instant,
-}
-
-lazy_static! {
-    static ref CHANNEL: (Sender<Message>, Receiver<Message>) = bounded(100);
-}
-
-pub async fn queue(channel: String, id: String, is_dm: bool) {
-    CHANNEL.0.send(Message { channel, id, is_dm }).await.ok();
-}
-
-pub async fn run() {
-    let channels = get_collection("channels");
-    let mut tasks = HashMap::<String, Task>::new();
-    let mut keys = vec![];
-
-    loop {
-        // Find due tasks.
-        for (key, Task { first_seen, last_updated, .. }) in &tasks {
-            if first_seen.elapsed().as_secs() > EXPIRE_CONSTANT ||
-                last_updated.elapsed().as_secs() > SAVE_CONSTANT {
-                keys.push(key.clone());
-            }
-        }
-
-        // Commit any due tasks to the database.
-        for key in &keys {
-            if let Some(Task { id, is_dm, .. }) = tasks.remove(key) {
-                let mut set = doc! { "last_message_id": &id };
-
-                if is_dm {
-                    set.insert("active", true);
-                }
-
-                channels
-                    .update_one(
-                        doc! { "_id": key },
-                        doc! { "$set": set },
-                        None,
-                    )
-                    .await
-                    .ok();
-
-                info!("Updated last_message_id for {} to {}.", key, id);
-            }
-        }
-
-        // Clear keys
-        keys.clear();
-
-        // Queue incoming tasks.
-        while let Ok(Message { channel, id, is_dm }) = CHANNEL.1.try_recv() {
-            if let Some(mut existing_task) = tasks.get_mut(&channel) {
-                existing_task.id = id;
-                existing_task.last_updated = Instant::now();
-            } else {
-                tasks.insert(channel, Task {
-                    id,
-                    is_dm,
-                    last_updated: Instant::now(),
-                    first_seen: Instant::now()
-                });
-            }
-        }
-
-        // Sleep for an arbitrary amount of time.
-        async_std::task::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/src/task_queue/task_process_embeds.rs b/src/task_queue/task_process_embeds.rs
deleted file mode 100644
index 112a0eea..00000000
--- a/src/task_queue/task_process_embeds.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Queue Type: Linear
-use async_channel::{ Sender, Receiver, bounded };
-use log::info;
-use mongodb::bson::{doc, to_bson};
-
-use crate::{database::*, notifications::events::ClientboundNotification};
-
-struct Message {
-    channel: String,
-    id: String,
-    content: String
-}
-
-lazy_static! {
-    static ref CHANNEL: (Sender<Message>, Receiver<Message>) = bounded(100);
-}
-
-pub async fn queue(channel: String, id: String, content: String) {
-    CHANNEL.0.send(Message { channel, id, content }).await.ok();
-}
-
-pub async fn run() {
-    let messages = get_collection("messages");
-
-    while let Ok(Message { channel, id, content }) = CHANNEL.1.recv().await {
-        if let Ok(embeds) = Embed::generate(content).await {
-            if let Ok(bson) = to_bson(&embeds) {
-                if let Ok(_) = messages
-                    .update_one(
-                        doc! {
-                            "_id": &id
-                        },
-                        doc! {
-                            "$push": {
-                                "embeds": {
-                                    "$each": bson
-                                }
-                            }
-                        },
-                        None,
-                    )
-                    .await
-                {
-                    info!("Generated embeds for {}.", &id);
-                    ClientboundNotification::MessageUpdate {
-                        id,
-                        channel: channel.clone(),
-                        data: json!({ "embeds": embeds }),
-                    }
-                    .publish(channel);
-                }
-            }
-        }
-    }
-}
diff --git a/src/task_queue/task_web_push.rs b/src/task_queue/task_web_push.rs
deleted file mode 100644
index d2b9eb2f..00000000
--- a/src/task_queue/task_web_push.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Queue Type: Linear
-use async_channel::{ Sender, Receiver, bounded };
-use mongodb::bson::{doc};
-use web_push::{ContentEncoding, SubscriptionInfo, SubscriptionKeys, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder};
-use rauth::entities::{Model, Session};
-use futures::StreamExt;
-
-use crate::util::variables::VAPID_PRIVATE_KEY;
-use crate::database::*;
-
-struct Message {
-    recipients: Vec<String>,
-    payload: String
-}
-
-lazy_static! {
-    static ref CHANNEL: (Sender<Message>, Receiver<Message>) = bounded(100);
-}
-
-pub async fn queue(recipients: Vec<String>, payload: String) {
-    CHANNEL.0.send(Message { recipients, payload }).await.ok();
-}
-
-pub async fn run() {
-    let client = WebPushClient::new();
-    let key = base64::decode_config(VAPID_PRIVATE_KEY.clone(), base64::URL_SAFE)
-        .expect("valid `VAPID_PRIVATE_KEY`");
-
-    while let Ok(Message { recipients, payload }) = CHANNEL.1.recv().await {
-        if let Ok(mut cursor) = Session::find(
-            &get_db(),
-            doc! {
-                "user_id": {
-                    "$in": recipients
-                },
-                "subscription": {
-                    "$exists": true
-                }
-            },
-            None
-        )
-        .await {
-            while let Some(Ok(session)) = cursor.next().await {
-                if let Some(sub) = session.subscription {
-                    let subscription = SubscriptionInfo {
-                        endpoint: sub.endpoint,
-                        keys: SubscriptionKeys {
-                            auth: sub.auth,
-                            p256dh: sub.p256dh
-                        }
-                    };
-
-                    let mut builder = WebPushMessageBuilder::new(&subscription).unwrap();
-                    let sig_builder = VapidSignatureBuilder::from_pem(
-                        std::io::Cursor::new(&key),
-                        &subscription,
-                    )
-                    .unwrap();
-
-                    let signature = sig_builder.build().unwrap();
-                    builder.set_vapid_signature(signature);
-                    builder.set_payload(ContentEncoding::AesGcm, payload.as_bytes());
-
-                    let msg = builder.build().unwrap();
-                    client.send(msg).await.ok();
-
-                    info!("Sent Web Push notification to {:?}.", session.id);
-                }
-            }
-        }
-    }
-}
diff --git a/src/util/idempotency.rs b/src/util/idempotency.rs
index 3304b668..74dfeb40 100644
--- a/src/util/idempotency.rs
+++ b/src/util/idempotency.rs
@@ -1,29 +1,74 @@
-use crate::util::result::Error;
-
+use async_std::sync::Mutex;
 use mongodb::bson::doc;
+use revolt_quark::{Error, Result};
 use rocket::http::Status;
 use rocket::request::{FromRequest, Outcome};
+use rocket_okapi::gen::OpenApiGenerator;
+use rocket_okapi::okapi::openapi3::{Parameter, ParameterValue};
+use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
+use schemars::schema::{InstanceType, SchemaObject, SingleOrVec};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 #[derive(Validate, Serialize, Deserialize)]
 pub struct IdempotencyKey {
     #[validate(length(min = 1, max = 64))]
-    pub key: String,
+    key: String,
+}
+
+lazy_static! {
+    static ref TOKEN_CACHE: Mutex<lru::LruCache<String, ()>> = Mutex::new(lru::LruCache::new(100));
 }
 
 impl IdempotencyKey {
     // Backwards compatibility.
     // Issue #109
-    pub fn consume_nonce(&mut self, v: Option<String>) {
+    pub async fn consume_nonce(&mut self, v: Option<String>) -> Result<()> {
         if let Some(v) = v {
+            let mut cache = TOKEN_CACHE.lock().await;
+            if cache.get(&v).is_some() {
+                return Err(Error::DuplicateNonce);
+            }
+
+            cache.put(v.clone(), ());
             self.key = v;
         }
+
+        Ok(())
+    }
+
+    pub fn into_key(self) -> String {
+        self.key
     }
 }
 
-lazy_static! {
-    static ref TOKEN_CACHE: std::sync::Mutex<lru::LruCache<String, ()>> = std::sync::Mutex::new(lru::LruCache::new(100));
+impl<'r> OpenApiFromRequest<'r> for IdempotencyKey {
+    fn from_request_input(
+        _gen: &mut OpenApiGenerator,
+        _name: String,
+        _required: bool,
+    ) -> rocket_okapi::Result<RequestHeaderInput> {
+        Ok(RequestHeaderInput::Parameter(Parameter {
+            name: "Idempotency-Key".to_string(),
+            description: Some("Unique key to prevent duplicate requests".to_string()),
+            allow_empty_value: false,
+            required: false,
+            deprecated: false,
+            extensions: schemars::Map::new(),
+            location: "header".to_string(),
+            value: ParameterValue::Schema {
+                allow_reserved: false,
+                example: None,
+                examples: None,
+                explode: None,
+                style: None,
+                schema: SchemaObject {
+                    instance_type: Some(SingleOrVec::Single(Box::new(InstanceType::String))),
+                    ..Default::default()
+                },
+            },
+        }))
+    }
 }
 
 #[async_trait]
@@ -35,22 +80,24 @@ impl<'r> FromRequest<'r> for IdempotencyKey {
             .headers()
             .get("Idempotency-Key")
             .next()
-            .map(|k| k.to_string()) {
+            .map(|k| k.to_string())
+        {
             let idempotency = IdempotencyKey { key };
             if let Err(error) = idempotency.validate() {
                 return Outcome::Failure((Status::BadRequest, Error::FailedValidation { error }));
             }
 
-            if let Ok(mut cache) = TOKEN_CACHE.lock() {
-                if cache.get(&idempotency.key).is_some() {
-                    return Outcome::Failure((Status::Conflict, Error::DuplicateNonce));
-                }
-        
-                cache.put(idempotency.key.clone(), ());
-                return Outcome::Success(idempotency);
+            let mut cache = TOKEN_CACHE.lock().await;
+            if cache.get(&idempotency.key).is_some() {
+                return Outcome::Failure((Status::Conflict, Error::DuplicateNonce));
             }
+
+            cache.put(idempotency.key.clone(), ());
+            return Outcome::Success(idempotency);
         }
-        
-        Outcome::Success(IdempotencyKey { key: ulid::Ulid::new().to_string() })
+
+        Outcome::Success(IdempotencyKey {
+            key: ulid::Ulid::new().to_string(),
+        })
     }
 }
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 98deb6e8..35fadd41 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,5 +1,3 @@
-pub mod result;
-pub mod variables;
-pub mod ratelimit;
+pub mod idempotency;
+pub mod ratelimiter;
 pub mod regex;
-pub mod idempotency;
\ No newline at end of file
diff --git a/src/util/ratelimit.rs b/src/util/ratelimit.rs
deleted file mode 100644
index a7881d6d..00000000
--- a/src/util/ratelimit.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-use rocket::{async_trait, http::Status, request::{Outcome, FromRequest}, response};
-use std::{collections::{HashMap, hash_map::DefaultHasher}, time};
-use crate::{database::User, util::result::Error};
-use std::hash::{Hash, Hasher};
-use std::sync::{Arc, Mutex};
-
-#[inline]
-fn now() -> f64 {
-    // will this ever actually panic?
-    time::SystemTime::now().duration_since(time::SystemTime::UNIX_EPOCH).unwrap().as_secs_f64()
-}
-
-struct Ratelimit {
-    pub rate: u8,
-    pub per: u8,
-    window: f64,
-    tokens: u8,
-    pub last: f64,
-}
-
-impl Ratelimit {
-    pub fn new(rate: u8, per: u8) -> Self {
-        Self {
-            rate,
-            per,
-            window: 0f64,
-            tokens: rate,
-            last: 0.0
-        }
-    }
-
-    fn get_tokens(&self, current: Option<f64>) -> u8 {
-        let current = current.unwrap_or(now());
-        if current > (self.window + self.per as f64) {
-            self.rate
-        } else {
-            self.tokens
-        }
-    }
-
-    fn update_ratelimit(&mut self) -> Option<f64> {
-        let current = now();
-        self.last = current;
-
-        self.tokens = self.get_tokens(Some(current));
-
-        if self.tokens == self.rate {
-            self.window = current
-        }
-
-        if self.tokens == 0 {
-            return Some(self.per as f64 - (current - self.window))
-        }
-
-        self.tokens -= 1;
-
-        if self.tokens == 0 {
-            self.window = current
-        }
-
-        None
-    }
-}
-
-impl Clone for Ratelimit {
-    fn clone(&self) -> Ratelimit {
-        Ratelimit::new(self.rate, self.per)
-    }
-}
-
-#[derive(Clone)]
-struct RatelimitMapping {
-    cache: HashMap<u64, Ratelimit>,
-    cooldown: Ratelimit
-}
-
-impl RatelimitMapping {
-    pub fn new(rate: u8, per: u8) -> Self {
-        RatelimitMapping {
-            cache: HashMap::new(),
-            cooldown: Ratelimit::new(rate, per)
-        }
-    }
-
-    fn verify_cache(&mut self) {
-        let current = now();
-        self.cache.retain(|_, v| current < v.last + v.per as f64);
-    }
-
-    pub fn get_bucket(&mut self, key: u64) -> &mut Ratelimit {
-        self.verify_cache();
-        self.cache.entry(key).or_insert(self.cooldown.clone())
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct Ratelimiter {
-    bucket: u64,
-    limit: u8,
-    remaining: u8,
-    reset: f64
-}
-
-pub struct RatelimitState(Arc<Mutex<HashMap<&'static str, RatelimitMapping>>>);
-
-impl RatelimitState {
-    pub fn new() -> Self {
-        let mut hashmap = HashMap::new();
-        hashmap.insert("message_send", RatelimitMapping::new(10, 10));
-        let arc = Arc::new(Mutex::new(hashmap));
-        RatelimitState(arc)
-    }
-}
-
-#[async_trait]
-impl<'r> FromRequest<'r> for Ratelimiter {
-    type Error = Error;
-
-    async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
-        let res = request.local_cache_async(async {
-            if let Some(route) = request.route() {
-                if let Some(route_name) = &route.name {
-                    let user = request.guard::<User>().await.unwrap();
-
-                    let state = request.guard::<&rocket::State<RatelimitState>>().await.unwrap().inner();
-                    let arc = Arc::clone(&state.0);
-                    let mut mutex = arc.lock().unwrap();
-                    let mapping = mutex.get_mut(route_name.as_ref()).unwrap();
-
-                    // create a unique key tied to the user id and route they use
-                    let key = format!("{}:{}:{}", user.id, route.method.as_str(), route.uri.as_str());
-                    let mut hasher = DefaultHasher::new();
-
-                    key.hash(&mut hasher);
-                    let hashed = hasher.finish();
-
-                    let bucket = mapping.get_bucket(hashed);
-                    let ret = bucket.update_ratelimit();
-
-                    if let Some(retry_after) = ret {
-                        Err(Error::TooManyRequests { retry_after })
-                    } else {
-                        Ok(Ratelimiter {
-                            bucket: hashed,
-                            limit: bucket.rate,
-                            remaining: bucket.get_tokens(None),
-                            reset: bucket.window + (bucket.per as f64)
-                        })
-                    }
-                } else {
-                    unreachable!()
-                }
-            } else {
-                unreachable!()
-            }
-        }).await;
-
-        match res {
-            Ok(rl) => Outcome::Success(*rl),
-            Err(e) => Outcome::Failure((Status::TooManyRequests, e.clone()))
-        }
-    }
-}
-
-pub struct RatelimitResponse<R>(pub R);
-
-impl<'r, 'o: 'r, R: response::Responder<'r, 'o>> response::Responder<'r, 'o> for RatelimitResponse<R> {
-    fn respond_to(self, request: &'r rocket::Request<'_>) -> response::Result<'o> {
-        let res: &Result<Ratelimiter, Error> = request.local_cache(|| unreachable!());
-        let ratelimiter = res.as_ref().unwrap();
-
-        Ok(response::Builder::new(rocket::Response::new())
-            .raw_header("x-ratelimit-bucket", ratelimiter.bucket.to_string())
-            .raw_header("x-ratelimit-limit", ratelimiter.limit.to_string())
-            .raw_header("x-ratelimit-remaining", ratelimiter.remaining.to_string())
-            .raw_header("x-ratelimit-reset", ratelimiter.reset.to_string())
-            .merge(self.0.respond_to(request)?)
-            .finalize())
-    }
-}
diff --git a/src/util/ratelimiter.rs b/src/util/ratelimiter.rs
new file mode 100644
index 00000000..4b9852d9
--- /dev/null
+++ b/src/util/ratelimiter.rs
@@ -0,0 +1,314 @@
+//! Pulled from lightspeed-tv/backend.
+//!
+//! This will be replaced again in the near future since
+//! I don't want duplication between two different projects.
+
+use std::collections::hash_map::DefaultHasher;
+use std::hash::Hasher;
+use std::ops::Add;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use rocket::fairing::{Fairing, Info, Kind};
+use rocket::http::uri::Origin;
+use rocket::http::{Method, Status};
+use rocket::request::{FromRequest, Outcome};
+use rocket::serde::json::Json;
+use rocket::{Data, Request, Response};
+
+use rocket_okapi::gen::OpenApiGenerator;
+use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
+
+use serde::Serialize;
+
+use dashmap::DashMap;
+
+use log::info;
+
+/// Ratelimit Bucket
+#[derive(Clone, Copy)]
+struct Entry {
+    used: u8,
+    reset: u128,
+}
+
+lazy_static! {
+    static ref MAP: DashMap<u64, Entry> = DashMap::new();
+}
+
+/// Get the current time from Unix Epoch as a Duration
+fn now() -> Duration {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .expect("Time went backwards...")
+}
+
+impl Entry {
+    /// Find bucket by its key
+    pub fn from(key: u64) -> Entry {
+        MAP.get(&key).map(|x| *x).unwrap_or_else(|| Entry {
+            used: 0,
+            reset: now().add(Duration::from_secs(10)).as_millis(),
+        })
+    }
+
+    /// Deduct one unit from the bucket and save
+    pub fn deduct(mut self, key: u64) {
+        let current_time = now().as_millis();
+        if current_time > self.reset {
+            self.used = 1;
+            self.reset = now().add(Duration::from_secs(10)).as_millis();
+        } else {
+            self.used += 1;
+        }
+
+        MAP.insert(key, self);
+    }
+
+    /// Get remaining units in the bucket
+    pub fn get_remaining(&self, limit: u8) -> u8 {
+        if now().as_millis() > self.reset {
+            limit
+        } else {
+            limit - self.used
+        }
+    }
+
+    /// Get how long bucket has until reset
+    pub fn left_until_reset(&self) -> u128 {
+        let current_time = now().as_millis();
+        if current_time > self.reset {
+            0
+        } else {
+            self.reset - current_time
+        }
+    }
+}
+
+/// Ratelimit Guard
+#[derive(Serialize, Clone, Copy, Debug)]
+#[allow(dead_code)]
+pub struct Ratelimiter {
+    key: u64,
+    limit: u8,
+    remaining: u8,
+    reset: u128,
+}
+
+/// Find bucket from given request
+///
+/// Optionally, include a resource id to hash against.
+fn resolve_bucket<'r>(request: &'r rocket::Request<'_>) -> (&'r str, Option<&'r str>) {
+    if let Some(segment) = request.routed_segment(0) {
+        let resource = request.routed_segment(1);
+        match (segment, resource) {
+            ("users", _) => ("users", None),
+            ("bots", _) => ("bots", None),
+            ("channels", Some(id)) => {
+                if request.method() == Method::Post {
+                    if let Some("messages") = request.routed_segment(2) {
+                        return ("messaging", Some(id));
+                    }
+                }
+
+                ("channels", Some(id))
+            }
+            ("servers", Some(id)) => ("servers", Some(id)),
+            ("auth", _) => {
+                if request.method() == Method::Delete {
+                    ("auth_delete", None)
+                } else {
+                    ("auth", None)
+                }
+            }
+            ("swagger", _) => ("swagger", None),
+            _ => ("any", None),
+        }
+    } else {
+        ("any", None)
+    }
+}
+
+/// Resolve per-bucket limits
+fn resolve_bucket_limit(bucket: &str) -> u8 {
+    match bucket {
+        "users" => 20,
+        "bots" => 10,
+        "messaging" => 10,
+        "channels" => 15,
+        "servers" => 5,
+        "auth" => 3,
+        "auth_delete" => 255,
+        "swagger" => 100,
+        _ => 20,
+    }
+}
+
+/// Find the remote IP of the client
+fn to_ip(request: &'_ rocket::Request<'_>) -> String {
+    request
+        .remote()
+        .map(|x| x.ip().to_string())
+        .unwrap_or_default()
+}
+
+/// Find the actual IP of the client
+fn to_real_ip(request: &'_ rocket::Request<'_>) -> String {
+    if let Ok(true) = std::env::var("TRUST_CLOUDFLARE").map(|x| x == "1") {
+        request
+            .headers()
+            .get_one("CF-Connecting-IP")
+            .map(|x| x.to_string())
+            .unwrap_or_else(|| to_ip(request))
+    } else {
+        to_ip(request)
+    }
+}
+
+impl Ratelimiter {
+    /// Generate guard from identifier and target bucket
+    pub fn from(
+        identifier: &str,
+        (bucket, resource): (&str, Option<&str>),
+    ) -> Result<Ratelimiter, u128> {
+        let mut key = DefaultHasher::new();
+        key.write(identifier.as_bytes());
+        key.write(bucket.as_bytes());
+
+        if let Some(id) = resource {
+            key.write(id.as_bytes());
+        }
+
+        let key = key.finish();
+        let limit = resolve_bucket_limit(bucket);
+        let entry = Entry::from(key);
+
+        let remaining = entry.get_remaining(limit);
+        let reset = entry.left_until_reset();
+
+        if remaining > 0 {
+            entry.deduct(key);
+            Ok(Ratelimiter {
+                key,
+                limit,
+                remaining: remaining - 1,
+                reset,
+            })
+        } else {
+            Err(reset)
+        }
+    }
+}
+
+#[async_trait]
+impl<'r> FromRequest<'r> for Ratelimiter {
+    type Error = u128;
+
+    async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
+        let ratelimiter = request
+            .local_cache_async(async {
+                use rocket::outcome::Outcome;
+                let identifier = if let Outcome::Success(session) =
+                    request.guard::<rauth::entities::Session>().await
+                {
+                    session.id.expect("`id` on User")
+                } else {
+                    to_real_ip(request)
+                };
+
+                Ratelimiter::from(&identifier, resolve_bucket(request))
+            })
+            .await;
+
+        match ratelimiter {
+            Ok(ratelimiter) => Outcome::Success(*ratelimiter),
+            Err(retry_after) => Outcome::Failure((Status::TooManyRequests, *retry_after)),
+        }
+    }
+}
+
+impl<'r> OpenApiFromRequest<'r> for Ratelimiter {
+    fn from_request_input(
+        _gen: &mut OpenApiGenerator,
+        _name: String,
+        _required: bool,
+    ) -> rocket_okapi::Result<RequestHeaderInput> {
+        Ok(RequestHeaderInput::None)
+    }
+}
+
+/// Attach ratelimiter to the Rocket application
+pub struct RatelimitFairing;
+
+#[rocket::async_trait]
+impl Fairing for RatelimitFairing {
+    fn info(&self) -> Info {
+        Info {
+            name: "Ratelimiter",
+            kind: Kind::Request | Kind::Response,
+        }
+    }
+
+    async fn on_request(&self, request: &mut Request<'_>, _: &mut Data<'_>) {
+        use rocket::outcome::Outcome;
+        if let Outcome::Failure(_) = request.guard::<Ratelimiter>().await {
+            info!(
+                "User rate-limited on route {}! (IP = {:?})",
+                request.uri(),
+                to_real_ip(request)
+            );
+
+            request.set_method(Method::Get);
+            request.set_uri(Origin::parse("/ratelimit").unwrap())
+        }
+    }
+
+    async fn on_response<'r>(&self, request: &'r Request<'_>, response: &mut Response<'r>) {
+        use rocket::outcome::Outcome;
+        match request.guard::<Ratelimiter>().await {
+            Outcome::Success(ratelimiter) => {
+                let Ratelimiter {
+                    key,
+                    limit,
+                    remaining,
+                    reset,
+                } = ratelimiter;
+
+                response.set_raw_header("X-RateLimit-Limit", limit.to_string());
+                response.set_raw_header("X-RateLimit-Bucket", key.to_string());
+                response.set_raw_header("X-RateLimit-Remaining", remaining.to_string());
+                response.set_raw_header("X-RateLimit-Reset-After", reset.to_string());
+            }
+            Outcome::Failure(_) => response.set_status(Status::TooManyRequests),
+            Outcome::Forward(_) => unreachable!(),
+        }
+    }
+}
+
+#[derive(Serialize)]
+#[serde(untagged)]
+pub enum RatelimitInformation {
+    Success(Ratelimiter),
+    Failure { retry_after: u128 },
+}
+
+#[async_trait]
+impl<'r> FromRequest<'r> for RatelimitInformation {
+    type Error = u128;
+
+    async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
+        Outcome::Success(match request.guard::<Ratelimiter>().await {
+            Outcome::Success(ratelimiter) => RatelimitInformation::Success(ratelimiter),
+            Outcome::Failure((_, retry_after)) => RatelimitInformation::Failure { retry_after },
+            _ => unreachable!(),
+        })
+    }
+}
+
+#[get("/ratelimit")]
+fn ratelimit_info(info: RatelimitInformation) -> Json<RatelimitInformation> {
+    Json(info)
+}
+
+pub fn routes() -> Vec<rocket::Route> {
+    routes![ratelimit_info]
+}
diff --git a/src/util/result.rs b/src/util/result.rs
deleted file mode 100644
index 60b93e0e..00000000
--- a/src/util/result.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use json;
-use rocket::http::{ContentType, Status};
-use rocket::request::Request;
-use rocket::response::{self, Responder, Response};
-use serde::Serialize;
-use std::io::Cursor;
-use validator::ValidationErrors;
-
-#[derive(Serialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Error {
-    LabelMe,
-
-    // ? Onboarding related errors.
-    AlreadyOnboarded,
-
-    // ? User related errors.
-    UsernameTaken,
-    UnknownUser,
-    AlreadyFriends,
-    AlreadySentRequest,
-    Blocked,
-    BlockedByOther,
-    NotFriends,
-
-    // ? Channel related errors.
-    UnknownChannel,
-    UnknownAttachment,
-    UnknownMessage,
-    CannotEditMessage,
-    CannotJoinCall,
-    TooManyAttachments,
-    TooManyReplies,
-    EmptyMessage,
-    CannotRemoveYourself,
-    GroupTooLarge {
-        max: usize,
-    },
-    AlreadyInGroup,
-    NotInGroup,
-
-    // ? Server related errors.
-    UnknownServer,
-    InvalidRole,
-    Banned,
-    TooManyServers{
-        max: usize,
-    },
-
-    // ? Bot related errors.
-    ReachedMaximumBots,
-    IsBot,
-    BotIsPrivate,
-
-    // ? General errors.
-    TooManyIds,
-    FailedValidation {
-        error: ValidationErrors,
-    },
-    DatabaseError {
-        operation: &'static str,
-        with: &'static str,
-    },
-    InternalError,
-    MissingPermission,
-    InvalidOperation,
-    InvalidCredentials,
-    DuplicateNonce,
-    VosoUnavailable,
-    NotFound,
-    NoEffect,
-    TooManyRequests {
-        retry_after: f64
-    }
-}
-
-pub struct EmptyResponse;
-pub type Result<T, E = Error> = std::result::Result<T, E>;
-
-impl<'r> Responder<'r, 'static> for EmptyResponse {
-    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
-        Response::build()
-            .status(rocket::http::Status { code: 204 })
-            .ok()
-    }
-}
-
-/// HTTP response builder for Error enum
-impl<'r> Responder<'r, 'static> for Error {
-    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
-        let status = match self {
-            Error::LabelMe => Status::InternalServerError,
-
-            Error::AlreadyOnboarded => Status::Forbidden,
-
-            Error::UnknownUser => Status::NotFound,
-            Error::UsernameTaken => Status::Conflict,
-            Error::AlreadyFriends => Status::Conflict,
-            Error::AlreadySentRequest => Status::Conflict,
-            Error::Blocked => Status::Conflict,
-            Error::BlockedByOther => Status::Forbidden,
-            Error::NotFriends => Status::Forbidden,
-
-            Error::UnknownChannel => Status::NotFound,
-            Error::UnknownMessage => Status::NotFound,
-            Error::UnknownAttachment => Status::BadRequest,
-            Error::CannotEditMessage => Status::Forbidden,
-            Error::CannotJoinCall => Status::BadRequest,
-            Error::TooManyAttachments => Status::BadRequest,
-            Error::TooManyReplies => Status::BadRequest,
-            Error::EmptyMessage => Status::UnprocessableEntity,
-            Error::CannotRemoveYourself => Status::BadRequest,
-            Error::GroupTooLarge { .. } => Status::Forbidden,
-            Error::AlreadyInGroup => Status::Conflict,
-            Error::NotInGroup => Status::NotFound,
-
-            Error::UnknownServer => Status::NotFound,
-            Error::InvalidRole => Status::NotFound,
-            Error::Banned => Status::Forbidden,
-            Error::TooManyServers { .. } => Status::Forbidden,
-
-            Error::ReachedMaximumBots => Status::BadRequest,
-            Error::IsBot => Status::BadRequest,
-            Error::BotIsPrivate => Status::Forbidden,
-
-            Error::FailedValidation { .. } => Status::UnprocessableEntity,
-            Error::DatabaseError { .. } => Status::InternalServerError,
-            Error::InternalError => Status::InternalServerError,
-            Error::MissingPermission => Status::Forbidden,
-            Error::InvalidOperation => Status::BadRequest,
-            Error::TooManyIds => Status::BadRequest,
-            Error::InvalidCredentials => Status::Forbidden,
-            Error::DuplicateNonce => Status::Conflict,
-            Error::VosoUnavailable => Status::BadRequest,
-            Error::NotFound => Status::NotFound,
-            Error::NoEffect => Status::Ok,
-            Error::TooManyRequests { .. } => Status::TooManyRequests,
-        };
-
-        // Serialize the error data structure into JSON.
-        let string = json!(self).to_string();
-
-        // Build and send the request.
-        Response::build()
-            .sized_body(string.len(), Cursor::new(string))
-            .header(ContentType::new("application", "json"))
-            .status(status)
-            .ok()
-    }
-}
diff --git a/src/util/variables.rs b/src/util/variables.rs
deleted file mode 100644
index 278afa7d..00000000
--- a/src/util/variables.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use std::env;
-
-#[cfg(debug_assertions)]
-use log::warn;
-
-lazy_static! {
-    // Application Settings
-    pub static ref MONGO_URI: String =
-        env::var("REVOLT_MONGO_URI").expect("Missing REVOLT_MONGO_URI environment variable.");
-    pub static ref REDIS_URI: String =
-        env::var("REVOLT_REDIS_URI").expect("Missing REVOLT_REDIS_URI environment variable.");
-    pub static ref WS_HOST: String =
-        env::var("REVOLT_WS_HOST").unwrap_or_else(|_| "0.0.0.0:9000".to_string());
-    pub static ref PUBLIC_URL: String =
-        env::var("REVOLT_PUBLIC_URL").expect("Missing REVOLT_PUBLIC_URL environment variable.");
-    pub static ref APP_URL: String =
-        env::var("REVOLT_APP_URL").expect("Missing REVOLT_APP_URL environment variable.");
-    pub static ref EXTERNAL_WS_URL: String =
-        env::var("REVOLT_EXTERNAL_WS_URL").expect("Missing REVOLT_EXTERNAL_WS_URL environment variable.");
-
-    pub static ref AUTUMN_URL: String =
-        env::var("AUTUMN_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
-    pub static ref JANUARY_URL: String =
-        env::var("JANUARY_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
-    pub static ref VOSO_URL: String =
-        env::var("VOSO_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
-    pub static ref VOSO_WS_HOST: String =
-        env::var("VOSO_WS_HOST").unwrap_or_else(|_| "wss://example.com".to_string());
-    pub static ref VOSO_MANAGE_TOKEN: String =
-        env::var("VOSO_MANAGE_TOKEN").unwrap_or_else(|_| "0".to_string());
-
-    pub static ref HCAPTCHA_KEY: String =
-        env::var("REVOLT_HCAPTCHA_KEY").unwrap_or_else(|_| "0x0000000000000000000000000000000000000000".to_string());
-    pub static ref HCAPTCHA_SITEKEY: String =
-        env::var("REVOLT_HCAPTCHA_SITEKEY").unwrap_or_else(|_| "10000000-ffff-ffff-ffff-000000000001".to_string());
-    pub static ref VAPID_PRIVATE_KEY: String =
-        env::var("REVOLT_VAPID_PRIVATE_KEY").expect("Missing REVOLT_VAPID_PRIVATE_KEY environment variable.");
-    pub static ref VAPID_PUBLIC_KEY: String =
-        env::var("REVOLT_VAPID_PUBLIC_KEY").expect("Missing REVOLT_VAPID_PUBLIC_KEY environment variable.");
-
-    // Application Flags
-    pub static ref INVITE_ONLY: bool = env::var("REVOLT_INVITE_ONLY").map_or(false, |v| v == "1");
-    pub static ref USE_EMAIL: bool = env::var("REVOLT_USE_EMAIL_VERIFICATION").map_or(
-        env::var("REVOLT_SMTP_HOST").is_ok()
-            && env::var("REVOLT_SMTP_USERNAME").is_ok()
-            && env::var("REVOLT_SMTP_PASSWORD").is_ok()
-            && env::var("REVOLT_SMTP_FROM").is_ok(),
-        |v| v == *"1"
-    );
-    pub static ref USE_HCAPTCHA: bool = env::var("REVOLT_HCAPTCHA_KEY").is_ok();
-    pub static ref USE_AUTUMN: bool = env::var("AUTUMN_PUBLIC_URL").is_ok();
-    pub static ref USE_JANUARY: bool = env::var("JANUARY_PUBLIC_URL").is_ok();
-    pub static ref USE_VOSO: bool = env::var("VOSO_PUBLIC_URL").is_ok() && env::var("VOSO_MANAGE_TOKEN").is_ok();
-
-    // SMTP Settings
-    pub static ref SMTP_HOST: String =
-        env::var("REVOLT_SMTP_HOST").unwrap_or_else(|_| "".to_string());
-    pub static ref SMTP_USERNAME: String =
-        env::var("REVOLT_SMTP_USERNAME").unwrap_or_else(|_| "".to_string());
-    pub static ref SMTP_PASSWORD: String =
-        env::var("REVOLT_SMTP_PASSWORD").unwrap_or_else(|_| "".to_string());
-    pub static ref SMTP_FROM: String = env::var("REVOLT_SMTP_FROM").unwrap_or_else(|_| "".to_string());
-
-    // Application Logic Settings
-    pub static ref MAX_GROUP_SIZE: usize =
-        env::var("REVOLT_MAX_GROUP_SIZE").unwrap_or_else(|_| "50".to_string()).parse().unwrap();
-    pub static ref MAX_BOT_COUNT: usize =
-        env::var("REVOLT_MAX_BOT_COUNT").unwrap_or_else(|_| "5".to_string()).parse().unwrap();
-    pub static ref MAX_EMBED_COUNT: usize =
-        env::var("REVOLT_MAX_EMBED_COUNT").unwrap_or_else(|_| "5".to_string()).parse().unwrap();
-    pub static ref MAX_SERVER_COUNT: usize =
-        env::var("REVOLT_MAX_SERVER_COUNT").unwrap_or_else(|_| "100".to_string()).parse().unwrap();
-    pub static ref EARLY_ADOPTER_BADGE: i64 =
-        env::var("REVOLT_EARLY_ADOPTER_BADGE").unwrap_or_else(|_| "0".to_string()).parse().unwrap();
-}
-
-pub fn preflight_checks() {
-    format!("{}", *APP_URL);
-    format!("{}", *MONGO_URI);
-    format!("{}", *PUBLIC_URL);
-    format!("{}", *EXTERNAL_WS_URL);
-
-    format!("{}", *VAPID_PRIVATE_KEY);
-    format!("{}", *VAPID_PUBLIC_KEY);
-
-    if *USE_EMAIL == false {
-        #[cfg(not(debug_assertions))]
-        if !env::var("REVOLT_UNSAFE_NO_EMAIL").map_or(false, |v| v == *"1") {
-            panic!("Running in production without email is not recommended, set REVOLT_UNSAFE_NO_EMAIL=1 to override.");
-        }
-
-        #[cfg(debug_assertions)]
-        warn!("No SMTP settings specified! Remember to configure email.");
-    }
-
-    if *USE_HCAPTCHA == false {
-        #[cfg(not(debug_assertions))]
-        if !env::var("REVOLT_UNSAFE_NO_CAPTCHA").map_or(false, |v| v == *"1") {
-            panic!("Running in production without CAPTCHA is not recommended, set REVOLT_UNSAFE_NO_CAPTCHA=1 to override.");
-        }
-
-        #[cfg(debug_assertions)]
-        warn!("No Captcha key specified! Remember to add hCaptcha key.");
-    }
-}
diff --git a/src/version.rs b/src/version.rs
index 842167f1..b6b78bba 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.3-alpha.16";
+pub const VERSION: &str = "0.5.3";