feat: initialise Discord bridge crate

2023-04-21 22:29:17 +01:00
169 changed files with 2111 additions and 9757 deletions
@@ -2,6 +2,7 @@ name: Rust build, test, and generate specification

 on:
  push:
+    branches: [master]
  pull_request:
    branches: [master]

@@ -26,40 +27,34 @@ jobs:
        with:
          command: build

-      - name: Run services in background
-        run: |
-          docker-compose -f docker-compose.db.yml up -d
-
      - name: Run cargo test
        uses: actions-rs/cargo@v1
        with:
          command: test

-      - name: Run cargo test (with MongoDB)
-        uses: actions-rs/cargo@v1
-        env:
-          MONGODB: mongodb://localhost
-        with:
-          command: test
-
      - name: Copy .env.example
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        run: |
          cp .env.example .env

+      - name: Run services in background
+        if: github.event_name != 'pull_request'
+        run: |
+          docker-compose -f docker-compose.db.yml up -d
+
      - name: Start API in background
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        run: |
          cargo run --bin revolt-delta &

      - name: Wait for API to go up
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        uses: nev7n/wait_for_response@v1
        with:
          url: "http://localhost:8000/"

      - name: Checkout API repository
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        uses: actions/checkout@v3
        with:
          repository: revoltchat/api
@@ -67,11 +62,11 @@ jobs:
          token: ${{ secrets.PAT }}

      - name: Download OpenAPI specification
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        run: curl http://localhost:8000/openapi.json -o api/OpenAPI.json

      - name: Commit changes
-        if: github.event_name != 'pull_request' && github.ref_name == 'master'
+        if: github.event_name != 'pull_request'
        uses: EndBug/add-and-commit@v4
        with:
          cwd: "api"
@@ -105,7 +105,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -199,20 +199,20 @@ dependencies = [

 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.18",
+ "syn 1.0.107",
 ]

 [[package]]
 name = "async-std"
-version = "1.12.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c"
 dependencies = [
 "async-attributes",
 "async-channel",
@@ -229,6 +229,7 @@ dependencies = [
 "kv-log-macro",
 "log",
 "memchr",
+ "num_cpus",
 "once_cell",
 "pin-project-lite 0.2.9",
 "pin-utils",
@@ -268,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -285,7 +286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -342,7 +343,7 @@ dependencies = [
 "chrono",
 "futures",
 "handlebars",
- "iso8601-timestamp 0.1.10",
+ "iso8601-timestamp",
 "lazy_static",
 "lettre",
 "log",
@@ -363,12 +364,6 @@ dependencies = [
 "validator 0.15.0",
 ]

-[[package]]
-name = "auto_ops"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59"
-
 [[package]]
 name = "autocfg"
 version = "0.1.8"
@@ -720,7 +715,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -752,7 +747,7 @@ dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "strsim",
 "syn 1.0.107",
 ]
@@ -764,7 +759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
 "darling_core",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -813,7 +808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -834,7 +829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
 dependencies = [
 "devise_core",
- "quote 1.0.26",
+ "quote 1.0.18",
 ]

 [[package]]
@@ -846,7 +841,7 @@ dependencies = [
 "bitflags",
 "proc-macro2",
 "proc-macro2-diagnostics",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -914,7 +909,7 @@ checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
 "heck",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -934,7 +929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -1118,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -1209,7 +1204,7 @@ checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
 dependencies = [
 "proc-macro-error",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -1605,17 +1600,6 @@ dependencies = [
 "time 0.3.17",
 ]

-[[package]]
-name = "iso8601-timestamp"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368d05885f276773b79b4578869a60ab91e880415d17fb2a8d193aea74188a29"
-dependencies = [
- "generic-array 0.14.5",
- "serde",
- "time 0.3.17",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1858,7 +1842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2115,16 +2099,7 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
 dependencies = [
- "num_enum_derive 0.5.7",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive",
 ]

 [[package]]
@@ -2135,22 +2110,10 @@ checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
-]
-
 [[package]]
 name = "object"
 version = "0.28.4"
@@ -2200,7 +2163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2223,6 +2186,15 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "optional_struct"
+version = "0.2.0"
+source = "git+https://github.com/insertish/OptionalStruct?rev=ee56427cee1f007839825d93d07fffd5a5e038c7#ee56427cee1f007839825d93d07fffd5a5e038c7"
+dependencies = [
+ "quote 0.3.15",
+ "syn 0.11.11",
+]
+
 [[package]]
 name = "os_info"
 version = "3.4.0"
@@ -2296,7 +2268,7 @@ checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
 dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2334,7 +2306,7 @@ dependencies = [
 "pest",
 "pest_meta",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2365,7 +2337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2452,7 +2424,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 "version_check",
 ]
@@ -2464,15 +2436,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "version_check",
 ]

 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
 "unicode-ident",
 ]
@@ -2484,7 +2456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 "version_check",
 "yansi",
@@ -2510,9 +2482,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"

 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
 "proc-macro2",
 ]
@@ -2672,7 +2644,7 @@ dependencies = [
 [[package]]
 name = "redis"
 version = "0.22.3"
-source = "git+https://github.com/insertish/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
+source = "git+https://github.com/insertish/redis-rs?rev=6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7#6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7"
 dependencies = [
 "async-std",
 "async-trait",
@@ -2750,7 +2722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -2837,7 +2809,7 @@ dependencies = [

 [[package]]
 name = "revolt-bonfire"
-version = "0.6.0-rc.1"
+version = "0.5.19"
 dependencies = [
 "async-std",
 "async-tungstenite",
@@ -2845,44 +2817,15 @@ dependencies = [
 "log",
 "once_cell",
 "querystring",
- "revolt-presence",
 "revolt-quark",
 "rmp-serde",
 "serde",
 "serde_json",
 ]

-[[package]]
-name = "revolt-database"
-version = "0.6.0-rc.1"
-dependencies = [
- "async-recursion",
- "async-std",
- "async-trait",
- "authifier",
- "bson",
- "futures",
- "iso8601-timestamp 0.2.10",
- "log",
- "mongodb",
- "nanoid",
- "once_cell",
- "redis-kiss",
- "revolt-models",
- "revolt-permissions",
- "revolt-presence",
- "revolt-result",
- "revolt_optional_struct",
- "rocket",
- "schemars",
- "serde",
- "serde_json",
- "ulid 1.0.0",
-]
-
 [[package]]
 name = "revolt-delta"
-version = "0.6.0-rc.1"
+version = "0.5.19"
 dependencies = [
 "async-channel",
 "async-std",
@@ -2898,14 +2841,11 @@ dependencies = [
 "log",
 "lru",
 "nanoid",
- "num_enum 0.5.7",
+ "num_enum",
 "once_cell",
 "regex",
 "reqwest",
- "revolt-database",
- "revolt-models",
 "revolt-quark",
- "revolt-result",
 "revolt_rocket_okapi",
 "rocket",
 "rocket_authifier",
@@ -2915,47 +2855,13 @@ dependencies = [
 "serde_json",
 "ulid 0.4.1",
 "url",
- "validator 0.16.0",
+ "validator 0.14.0",
 "vergen",
 ]

-[[package]]
-name = "revolt-models"
-version = "0.6.0-rc.1"
-dependencies = [
- "revolt_optional_struct",
- "schemars",
- "serde",
- "validator 0.16.0",
-]
-
-[[package]]
-name = "revolt-permissions"
-version = "0.6.0-rc.1"
-dependencies = [
- "async-std",
- "async-trait",
- "auto_ops",
- "num_enum 0.6.1",
- "once_cell",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "revolt-presence"
-version = "0.6.0-rc.1"
-dependencies = [
- "async-std",
- "log",
- "once_cell",
- "rand 0.8.5",
- "redis-kiss",
-]
-
 [[package]]
 name = "revolt-quark"
-version = "0.6.0-rc.1"
+version = "0.5.19"
 dependencies = [
 "async-lock",
 "async-recursion",
@@ -2972,24 +2878,21 @@ dependencies = [
 "futures",
 "impl_ops",
 "indexmap",
- "iso8601-timestamp 0.1.10",
+ "iso8601-timestamp",
 "linkify 0.8.1",
 "log",
 "lru",
 "mongodb",
 "nanoid",
- "num_enum 0.5.7",
+ "num_enum",
 "once_cell",
+ "optional_struct",
 "pretty_env_logger",
 "rand 0.8.5",
 "redis-kiss",
 "regex",
 "reqwest",
- "revolt-models",
- "revolt-presence",
- "revolt-result",
 "revolt_okapi",
- "revolt_optional_struct",
 "revolt_rocket_okapi",
 "rocket",
 "rocket_cors",
@@ -3000,22 +2903,10 @@ dependencies = [
 "serde",
 "serde_json",
 "ulid 0.5.0",
- "validator 0.16.0",
+ "validator 0.14.0",
 "web-push",
 ]

-[[package]]
-name = "revolt-result"
-version = "0.6.0-rc.1"
-dependencies = [
- "revolt_okapi",
- "revolt_rocket_okapi",
- "rocket",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "revolt_okapi"
 version = "0.9.1"
@@ -3028,16 +2919,6 @@ dependencies = [
 "serde_json",
 ]

-[[package]]
-name = "revolt_optional_struct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d342739658623fe9d72b42f7a36ba19094d1d9bf9b423c3e337ab203c15d53e"
-dependencies = [
- "quote 0.3.15",
- "syn 0.11.11",
-]
-
 [[package]]
 name = "revolt_rocket_okapi"
 version = "0.9.1"
@@ -3062,7 +2943,7 @@ checksum = "cc6620569d8ac8f0a1690fcca13f488503807a60e96ebf729749b59aca1dbef9"
 dependencies = [
 "darling",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "rocket_http",
 "syn 1.0.107",
 ]
@@ -3150,7 +3031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4554a81937341d8c3cd3e43431ac2d23624444dc3a88e7ffd3ff66593779293"
 dependencies = [
 "authifier",
- "iso8601-timestamp 0.1.10",
+ "iso8601-timestamp",
 "revolt_okapi",
 "revolt_rocket_okapi",
 "rocket",
@@ -3169,7 +3050,7 @@ dependencies = [
 "glob",
 "indexmap",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "rocket_http",
 "syn 1.0.107",
 "unicode-xid 0.2.3",
@@ -3344,7 +3225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "serde_derive_internals",
 "syn 1.0.107",
 ]
@@ -3497,9 +3378,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
 "serde_derive",
 ]
@@ -3515,13 +3396,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.18",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3531,15 +3412,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
 "indexmap",
 "itoa 1.0.2",
@@ -3577,7 +3458,7 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
 "darling",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -3752,18 +3633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
-dependencies = [
- "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "unicode-ident",
 ]

@@ -3835,7 +3705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -3944,7 +3814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -4080,7 +3950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -4210,7 +4080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 ]

@@ -4256,15 +4126,6 @@ dependencies = [
 "rand 0.8.5",
 ]

-[[package]]
-name = "ulid"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "uname"
 version = "0.1.1"
@@ -4387,6 +4248,23 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "validator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e"
+dependencies = [
+ "idna",
+ "lazy_static",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "url",
+ "validator_derive",
+ "validator_types",
+]
+
 [[package]]
 name = "validator"
 version = "0.15.0"
@@ -4402,33 +4280,17 @@ dependencies = [
 "url",
 ]

-[[package]]
-name = "validator"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591"
-dependencies = [
- "idna",
- "lazy_static",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "url",
- "validator_derive",
-]
-
 [[package]]
 name = "validator_derive"
-version = "0.16.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af"
+checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee"
 dependencies = [
 "if_chain",
 "lazy_static",
 "proc-macro-error",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "regex",
 "syn 1.0.107",
 "validator_types",
@@ -4436,9 +4298,9 @@ dependencies = [

 [[package]]
 name = "validator_types"
-version = "0.16.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
+checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
 dependencies = [
 "proc-macro2",
 "syn 1.0.107",
@@ -4538,7 +4400,7 @@ dependencies = [
 "lazy_static",
 "log",
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 "wasm-bindgen-shared",
 ]
@@ -4561,7 +4423,7 @@ version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
- "quote 1.0.26",
+ "quote 1.0.18",
 "wasm-bindgen-macro-support",
 ]

@@ -4572,7 +4434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.18",
 "syn 1.0.107",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
@@ -1,6 +1,7 @@
 [workspace]
-members = ["crates/delta", "crates/bonfire", "crates/quark", "crates/core/*"]
+members = ["crates/*", "crates/bridges/*"]
+exclude = ["crates/bridges"]

 [patch.crates-io]
 # mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" }
-redis = { git = "https://github.com/insertish/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
+redis = { git = "https://github.com/insertish/redis-rs", rev = "6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7" }
@@ -1,5 +1,5 @@
 # Build Stage
-FROM --platform="${BUILDPLATFORM}" rust:slim
+FROM --platform="${BUILDPLATFORM}" rustlang/rust:nightly-slim
 USER 0:0
 WORKDIR /home/rust/src

@@ -20,11 +20,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY crates/bonfire/Cargo.toml ./crates/bonfire/
 COPY crates/delta/Cargo.toml ./crates/delta/
 COPY crates/quark/Cargo.toml ./crates/quark/
-COPY crates/core/database/Cargo.toml ./crates/core/database/
-COPY crates/core/models/Cargo.toml ./crates/core/models/
-COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
-COPY crates/core/presence/Cargo.toml ./crates/core/presence/
-COPY crates/core/result/Cargo.toml ./crates/core/result/
 RUN sh /tmp/build-image-layer.sh deps

 # Build all apps
@@ -1,67 +0,0 @@
-# Code Style Guide
-
-Beyond using Cargo format and Clippy, there are some specific code style guidelines laid out in this document for different parts of the project.
-
-## `core/database` crate
-
-w.r.t. `model.rs` files
-
- All struct definitions must be commented.
-  ```rust
-  /// Server
-  pub struct Server {
-    /// Name of the server
-    pub name: String,
-  ```
- Struct definitions should not include derives unless necessary (if additional traits such as Hash are required) and instead use `auto_derived!` and `auto_derived_partial!`.
-  ```rust
-  auto_derived_partial!(
-    /// Server
-    pub struct Server { .. },
-    "PartialServer"
-  );
-  ```
- `auto_derived!` macro accepts multiple entries and should be used as such:
-  ```rust
-  auto_derived!(
-    /// Optional fields on server object
-    pub enum FieldsServer { .. }
-
-    /// Optional fields on server object
-    pub enum FieldsRole { .. }
-  );
-  ```
- If special serialisation conditions are required, such as checking if a boolean is false, use the existing definitions for these functions from the crate root:
-  ```rust
-  #[serde(skip_serializing_if = "crate::if_false", default)]
-  ```
- `impl` blocks may be defined below the struct definitions and should be ordered in the same order of definition. Methods in the block must follow the same guidelines as traits where-in: methods are ordered in terms of CRUD, there are empty line breaks, and methods are commented.
-
-w.r.t. `ops` module for models
-
- All traits must use a the name format `AbstractPlural` where Plural is the plural form of the collection. e.g. Servers
- Traits defined must follow these guidelines:
-
-  - Methods are ordered in terms of CRUD, create-read-update-delete ordering.
-
-    ```rust
-    #[async_trait]
-    pub trait AbstractServerMembers: Sync + Send {
-      /// Insert a new server member into the database
-      async fn insert_member(&self, member: &Member) -> Result<()>;
-
-      /// Fetch a server member by their id
-      async fn fetch_member(&self, server_id: &str, user_id: &str) -> Result<Member>;
-
-      /// Update information for a server member
-      async fn update_member(&self, .. ) -> Result<()>;
-
-      /// Delete a server member by their id
-      async fn delete_member(&self, id: &MemberCompositeKey) -> Result<()>;
-    }
-    ```
-
-  - There should be an empty line break between each method declaration.
-  - All methods must have an appropriate comment.
-
- When implementing the trait defined in `ops.rs` with each driver, the method declaration style should be the same for ease of searching: same ordering, same comments, same line breaks.
@@ -1,15 +0,0 @@
-disallowed-methods = [
-    # Shouldn't need to access these directly
-    "revolt_database::models::bots::model::Bot::remove_field",
-
-    # Prefer to use Object::create()
-    "revolt_database::models::safety_strikes::ops::AbstractAccountStrikes::insert_account_strike",
-
-    # Prefer to use Object::update(&self)
-    "revolt_database::models::bots::ops::AbstractBots::update_bot",
-    "revolt_database::models::safety_strikes::ops::AbstractAccountStrikes::update_account_strike",
-
-    # Prefer to use Object::delete(&self)
-    "revolt_database::models::bots::ops::AbstractBots::delete_bot",
-    "revolt_database::models::safety_strikes::ops::AbstractAccountStrikes::delete_account_strike",
-]
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.6.0-rc.1"
+version = "0.5.19"
 license = "AGPL-3.0-or-later"
 edition = "2021"

@@ -26,6 +26,3 @@ serde = "1.0.136"
 futures = "0.3.21"
 async-tungstenite = { version = "0.17.0", features = ["async-std-runtime"] }
 async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
-
-# core
-revolt-presence = { path = "../core/presence", features = [ "redis-is-patched" ] }
@@ -1,7 +1,7 @@
 use std::env;

 use async_std::net::TcpListener;
-use revolt_presence::clear_region;
+use revolt_quark::presence::presence_clear_region;

 #[macro_use]
 extern crate log;
@@ -18,7 +18,7 @@ async fn main() {
    database::connect().await;

    // Clean up the current region information.
-    clear_region(None).await;
+    presence_clear_region(None).await;

    // Setup a TCP listener to accept WebSocket connections on.
    // By default, we bind to port 9000 on all interfaces.
@@ -1,7 +1,6 @@
 use std::net::SocketAddr;

 use futures::{channel::oneshot, pin_mut, select, FutureExt, SinkExt, StreamExt, TryStreamExt};
-use revolt_presence::{create_session, delete_session};
 use revolt_quark::{
    events::{
        client::EventV1,
@@ -9,6 +8,7 @@ use revolt_quark::{
        state::{State, SubscriptionStateChange},
    },
    models::{user::UserHint, User},
+    presence::{presence_create_session, presence_delete_session},
    redis_kiss, Database,
 };

@@ -69,7 +69,8 @@ pub fn spawn_client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
                            let user_id = state.cache.user_id.clone();

                            // Create presence session.
-                            let (first_session, session_id) = create_session(&user_id, 0).await;
+                            let (first_session, session_id) =
+                                presence_create_session(&user_id, 0).await;

                            // Notify socket we have authenticated.
                            write
@@ -224,7 +225,7 @@ pub fn spawn_client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
                            }

                            // Clean up presence session.
-                            let last_session = delete_session(&user_id, session_id).await;
+                            let last_session = presence_delete_session(&user_id, session_id).await;

                            // If this was the last session, notify other users that we just went offline.
                            if last_session {
@@ -0,0 +1,10 @@
+[package]
+name = "revolt-discord-bridge"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
+tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
@@ -0,0 +1,45 @@
+use std::env;
+
+use serenity::async_trait;
+use serenity::model::channel::Message;
+use serenity::model::channel::Channel;
+use serenity::model::gateway::{GatewayIntents, Ready};
+use serenity::prelude::*;
+
+struct Handler;
+
+#[async_trait]
+impl EventHandler for Handler {
+    async fn message(&self, ctx: Context, msg: Message) {
+        println!("Received message: {}", msg.content);
+
+        if msg.content == "deez" {
+            if let Ok(Channel::Guild(channel)) = msg.channel(&ctx).await {
+                channel.send_message(&ctx, |m| {
+                    m.content("this is where a message would usually go")
+                }).await.unwrap();
+            }
+        }
+    }
+
+    async fn ready(&self, _: Context, ready: Ready) {
+        println!("{} is connected!", ready.user.name);
+    }
+}
+
+#[tokio::main]
+async fn main() {
+    let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
+
+    let intents =
+        GatewayIntents::GUILDS | GatewayIntents::GUILD_MESSAGES | GatewayIntents::MESSAGE_CONTENT;
+    
+    let mut client = Client::builder(token, intents)
+        .event_handler(Handler)
+        .await
+        .expect("Error creating client");
+
+    if let Err(why) = client.start().await {
+        println!("Client error: {:?}", why);
+    }
+}
@@ -1,62 +0,0 @@
-[package]
-name = "revolt-database"
-version = "0.6.0-rc.1"
-edition = "2021"
-license = "AGPL-3.0-or-later"
-authors = [ "Paul Makles <me@insrt.uk>" ]
-description = "Revolt Backend: Database Implementation"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-# Databases
-mongodb = [ "dep:mongodb", "bson" ]
-
-# ... Other
-async-std-runtime = [ "async-std" ]
-rocket-impl = [ "rocket", "schemars" ]
-redis-is-patched = [ "revolt-presence/redis-is-patched" ]
-
-# Default Features
-default = [ "mongodb", "async-std-runtime" ]
-
-[dependencies]
-# Core
-revolt-result = { version = "0.6.0-rc.1", path = "../result" }
-revolt-models = { version = "0.6.0-rc.1", path = "../models" }
-revolt-presence = { version = "0.6.0-rc.1", path = "../presence" }
-revolt-permissions = { version = "0.6.0-rc.1", path = "../permissions", features = [ "serde" ] }
-
-# Utility
-log = "0.4"
-ulid = "1.0.0"
-nanoid = "0.4.0"
-once_cell = "1.17"
-
-# Serialisation
-serde_json = "1"
-revolt_optional_struct = "0.2.0"
-serde = { version = "1", features = ["derive"] }
-iso8601-timestamp = { version = "0.2.10", features = ["serde", "bson"] }
-
-# Events
-redis-kiss = { version = "0.1.4" }
-
-# Database
-bson = { optional = true, version = "2.1.0" }
-mongodb = { optional = true, version = "2.1.0", default-features = false }
-
-# Async Language Features
-futures = "0.3.19"
-async-trait = "0.1.51"
-async-recursion = "1.0.4"
-
-# Async
-async-std = { version = "1.8.0", features = ["attributes"], optional = true }
-
-# Rocket Impl
-schemars = { version = "0.8.8", optional = true }
-rocket = { version = "0.5.0-rc.2", default-features = false, features = ["json"], optional = true }
-
-# Authifier
-authifier = { version = "1.0" }
@@ -1,67 +0,0 @@
-mod mongodb;
-mod reference;
-
-pub use self::mongodb::*;
-pub use self::reference::*;
-
-/// Database information to use to create a client
-pub enum DatabaseInfo {
-    /// Auto-detect the database in use
-    Auto,
-    /// Auto-detect the database in use and create an empty testing database
-    Test(String),
-    /// Use the mock database
-    Reference,
-    /// Connect to MongoDB
-    MongoDb { uri: String, database_name: String },
-    /// Use existing MongoDB connection
-    MongoDbFromClient(::mongodb::Client, String),
-}
-
-/// Database
-#[derive(Clone)]
-pub enum Database {
-    /// Mock database
-    Reference(ReferenceDb),
-    /// MongoDB database
-    MongoDb(MongoDb),
-}
-
-impl DatabaseInfo {
-    /// Create a database client from the given database information
-    #[async_recursion]
-    pub async fn connect(self) -> Result<Database, String> {
-        Ok(match self {
-            DatabaseInfo::Auto => {
-                if let Ok(uri) = std::env::var("MONGODB") {
-                    return DatabaseInfo::MongoDb {
-                        uri,
-                        database_name: "revolt".to_string(),
-                    }
-                    .connect()
-                    .await;
-                }
-
-                DatabaseInfo::Reference.connect().await?
-            }
-            DatabaseInfo::Test(database_name) => {
-                if let Ok(uri) = std::env::var("MONGODB") {
-                    return DatabaseInfo::MongoDb { uri, database_name }.connect().await;
-                }
-
-                DatabaseInfo::Reference.connect().await?
-            }
-            DatabaseInfo::Reference => Database::Reference(Default::default()),
-            DatabaseInfo::MongoDb { uri, database_name } => {
-                let client = ::mongodb::Client::with_uri_str(uri)
-                    .await
-                    .map_err(|_| "Failed to init db connection.".to_string())?;
-
-                Database::MongoDb(MongoDb(client, database_name))
-            }
-            DatabaseInfo::MongoDbFromClient(client, database_name) => {
-                Database::MongoDb(MongoDb(client, database_name))
-            }
-        })
-    }
-}
@@ -1,243 +0,0 @@
-use std::collections::HashMap;
-use std::ops::Deref;
-
-use futures::StreamExt;
-use mongodb::bson::{doc, to_document, Document};
-use mongodb::error::Result;
-use mongodb::options::{FindOneOptions, FindOptions};
-use mongodb::results::{DeleteResult, InsertOneResult, UpdateResult};
-use serde::de::DeserializeOwned;
-use serde::Serialize;
-
-database_derived!(
-    #[cfg(feature = "mongodb")]
-    /// MongoDB implementation
-    pub struct MongoDb(pub ::mongodb::Client, pub String);
-);
-
-impl Deref for MongoDb {
-    type Target = mongodb::Client;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[allow(dead_code)]
-impl MongoDb {
-    /// Get the Revolt database
-    pub fn db(&self) -> mongodb::Database {
-        self.database(&self.1)
-    }
-
-    /// Get a collection by its name
-    pub fn col<T>(&self, collection: &str) -> mongodb::Collection<T> {
-        self.db().collection(collection)
-    }
-
-    /// Insert one document into a collection
-    pub async fn insert_one<T: Serialize>(
-        &self,
-        collection: &'static str,
-        document: T,
-    ) -> Result<InsertOneResult> {
-        self.col::<T>(collection).insert_one(document, None).await
-    }
-
-    /// Count documents by projection
-    pub async fn count_documents(
-        &self,
-        collection: &'static str,
-        projection: Document,
-    ) -> Result<u64> {
-        self.col::<Document>(collection)
-            .count_documents(projection, None)
-            .await
-    }
-
-    /// Find multiple documents in a collection with options
-    pub async fn find_with_options<O, T: DeserializeOwned + Unpin + Send + Sync>(
-        &self,
-        collection: &'static str,
-        projection: Document,
-        options: O,
-    ) -> Result<Vec<T>>
-    where
-        O: Into<Option<FindOptions>>,
-    {
-        Ok(self
-            .col::<T>(collection)
-            .find(projection, options)
-            .await?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    // Hard fail on invalid documents
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect::<Vec<T>>()
-            .await)
-    }
-
-    /// Find multiple documents in a collection
-    pub async fn find<T: DeserializeOwned + Unpin + Send + Sync>(
-        &self,
-        collection: &'static str,
-        projection: Document,
-    ) -> Result<Vec<T>> {
-        self.find_with_options(collection, projection, None).await
-    }
-
-    /// Find one document with options
-    pub async fn find_one_with_options<O, T: DeserializeOwned + Unpin + Send + Sync>(
-        &self,
-        collection: &'static str,
-        projection: Document,
-        options: O,
-    ) -> Result<Option<T>>
-    where
-        O: Into<Option<FindOneOptions>>,
-    {
-        self.col::<T>(collection)
-            .find_one(projection, options)
-            .await
-    }
-
-    /// Find one document
-    pub async fn find_one<T: DeserializeOwned + Unpin + Send + Sync>(
-        &self,
-        collection: &'static str,
-        projection: Document,
-    ) -> Result<Option<T>> {
-        self.find_one_with_options(collection, projection, None)
-            .await
-    }
-
-    /// Find one document by its ID
-    pub async fn find_one_by_id<T: DeserializeOwned + Unpin + Send + Sync>(
-        &self,
-        collection: &'static str,
-        id: &str,
-    ) -> Result<Option<T>> {
-        self.find_one(
-            collection,
-            doc! {
-                "_id": id
-            },
-        )
-        .await
-    }
-
-    /// Update one document given a projection, partial document, and list of paths to unset
-    pub async fn update_one<P, T: Serialize>(
-        &self,
-        collection: &'static str,
-        projection: Document,
-        partial: T,
-        remove: Vec<&dyn IntoDocumentPath>,
-        prefix: P,
-    ) -> Result<UpdateResult>
-    where
-        P: Into<Option<String>>,
-    {
-        let prefix = prefix.into();
-
-        let mut unset = doc! {};
-        for field in remove {
-            if let Some(path) = field.as_path() {
-                if let Some(prefix) = &prefix {
-                    unset.insert(prefix.to_owned() + path, 1_i32);
-                } else {
-                    unset.insert(path, 1_i32);
-                }
-            }
-        }
-
-        let query = doc! {
-            "$unset": unset,
-            "$set": if let Some(prefix) = &prefix {
-                to_document(&prefix_keys(&partial, prefix))
-            } else {
-                to_document(&partial)
-            }?
-        };
-
-        self.col::<Document>(collection)
-            .update_one(projection, query, None)
-            .await
-    }
-
-    /// Update one document given an ID, partial document, and list of paths to unset
-    pub async fn update_one_by_id<P, T: Serialize>(
-        &self,
-        collection: &'static str,
-        id: &str,
-        partial: T,
-        remove: Vec<&dyn IntoDocumentPath>,
-        prefix: P,
-    ) -> Result<UpdateResult>
-    where
-        P: Into<Option<String>>,
-    {
-        self.update_one(
-            collection,
-            doc! {
-                "_id": id
-            },
-            partial,
-            remove,
-            prefix,
-        )
-        .await
-    }
-
-    /// Delete one document by the given projection
-    pub async fn delete_one(
-        &self,
-        collection: &'static str,
-        projection: Document,
-    ) -> Result<DeleteResult> {
-        self.col::<Document>(collection)
-            .delete_one(projection, None)
-            .await
-    }
-
-    /// Delete one document by the given ID
-    pub async fn delete_one_by_id(
-        &self,
-        collection: &'static str,
-        id: &str,
-    ) -> Result<DeleteResult> {
-        self.delete_one(
-            collection,
-            doc! {
-                "_id": id
-            },
-        )
-        .await
-    }
-}
-
-/// Just a string ID struct
-#[derive(Deserialize)]
-pub struct DocumentId {
-    #[serde(rename = "_id")]
-    pub id: String,
-}
-
-pub trait IntoDocumentPath: Send + Sync {
-    /// Create JSON key path
-    fn as_path(&self) -> Option<&'static str>;
-}
-
-/// Prefix keys on an arbitrary object
-pub fn prefix_keys<T: Serialize>(t: &T, prefix: &str) -> HashMap<String, serde_json::Value> {
-    let v: String = serde_json::to_string(t).unwrap();
-    let v: HashMap<String, serde_json::Value> = serde_json::from_str(&v).unwrap();
-    v.into_iter()
-        .filter(|(_k, v)| !v.is_null())
-        .map(|(k, v)| (prefix.to_owned() + &k, v))
-        .collect()
-}
@@ -1,31 +0,0 @@
-use std::{collections::HashMap, sync::Arc};
-
-use futures::lock::Mutex;
-
-use crate::{
-    AccountStrike, Bot, File, Member, MemberCompositeKey, Server, User, UserSettings, Webhook,
-};
-
-database_derived!(
-    /// Reference implementation
-    #[derive(Default)]
-    pub struct ReferenceDb {
-        pub account_strikes: Arc<Mutex<HashMap<String, AccountStrike>>>,
-        pub bots: Arc<Mutex<HashMap<String, Bot>>>,
-        pub channel_webhooks: Arc<Mutex<HashMap<String, Webhook>>>,
-        pub user_settings: Arc<Mutex<HashMap<String, UserSettings>>>,
-        pub users: Arc<Mutex<HashMap<String, User>>>,
-        pub server_members: Arc<Mutex<HashMap<MemberCompositeKey, Member>>>,
-        pub servers: Arc<Mutex<HashMap<String, Server>>>,
-        pub files: Arc<Mutex<HashMap<String, File>>>,
-
-        pub server_bans: Arc<Mutex<HashMap<String, ()>>>,
-        pub safety_reports: Arc<Mutex<HashMap<String, ()>>>,
-        pub safety_snapshots: Arc<Mutex<HashMap<String, ()>>>,
-        pub emoji: Arc<Mutex<HashMap<String, ()>>>,
-        pub messages: Arc<Mutex<HashMap<String, ()>>>,
-        pub channels: Arc<Mutex<HashMap<String, ()>>>,
-        pub channel_invites: Arc<Mutex<HashMap<String, ()>>>,
-        pub channel_unreads: Arc<Mutex<HashMap<String, ()>>>,
-    }
-);
@@ -1,267 +0,0 @@
-use authifier::AuthifierEvent;
-use serde::{Deserialize, Serialize};
-
-use revolt_models::v0::{FieldsWebhook, PartialWebhook, Webhook};
-use revolt_result::Error;
-
-use crate::Database;
-
-/// WebSocket Client Errors
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "error")]
-pub enum WebSocketError {
-    LabelMe,
-    InternalError { at: String },
-    InvalidSession,
-    OnboardingNotFinished,
-    AlreadyAuthenticated,
-    MalformedData { msg: String },
-}
-
-/// Ping Packet
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum Ping {
-    Binary(Vec<u8>),
-    Number(usize),
-}
-
-/// Untagged Error
-#[derive(Serialize)]
-#[serde(untagged)]
-pub enum ErrorEvent {
-    Error(WebSocketError),
-    APIError(Error),
-}
-
-/// Protocol Events
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum EventV1 {
-    /// Multiple events
-    Bulk { v: Vec<EventV1> },
-
-    /// Successfully authenticated
-    Authenticated,
-    /* /// Basic data to cache
-    Ready {
-        users: Vec<User>,
-        servers: Vec<Server>,
-        channels: Vec<Channel>,
-        members: Vec<Member>,
-        emojis: Option<Vec<Emoji>>,
-    },
-
-    /// Ping response
-    Pong { data: Ping },
-
-    /// New message
-    Message(Message),
-
-    /// Update existing message
-    MessageUpdate {
-        id: String,
-        channel: String,
-        data: PartialMessage,
-    },
-
-    /// Append information to existing message
-    MessageAppend {
-        id: String,
-        channel: String,
-        append: AppendMessage,
-    },
-
-    /// Delete message
-    MessageDelete { id: String, channel: String },
-
-    /// New reaction to a message
-    MessageReact {
-        id: String,
-        channel_id: String,
-        user_id: String,
-        emoji_id: String,
-    },
-
-    /// Remove user's reaction from message
-    MessageUnreact {
-        id: String,
-        channel_id: String,
-        user_id: String,
-        emoji_id: String,
-    },
-
-    /// Remove a reaction from message
-    MessageRemoveReaction {
-        id: String,
-        channel_id: String,
-        emoji_id: String,
-    },
-
-    /// Bulk delete messages
-    BulkMessageDelete { channel: String, ids: Vec<String> },
-
-    /// New channel
-    ChannelCreate(Channel),
-
-    /// Update existing channel
-    ChannelUpdate {
-        id: String,
-        data: PartialChannel,
-        clear: Vec<FieldsChannel>,
-    },
-
-    /// Delete channel
-    ChannelDelete { id: String },
-
-    /// User joins a group
-    ChannelGroupJoin { id: String, user: String },
-
-    /// User leaves a group
-    ChannelGroupLeave { id: String, user: String },
-
-    /// User started typing in a channel
-    ChannelStartTyping { id: String, user: String },
-
-    /// User stopped typing in a channel
-    ChannelStopTyping { id: String, user: String },
-
-    /// User acknowledged message in channel
-    ChannelAck {
-        id: String,
-        user: String,
-        message_id: String,
-    },
-
-    /// New server
-    ServerCreate {
-        id: String,
-        server: Server,
-        channels: Vec<Channel>,
-    },
-
-    /// Update existing server
-    ServerUpdate {
-        id: String,
-        data: PartialServer,
-        clear: Vec<FieldsServer>,
-    },
-
-    /// Delete server
-    ServerDelete { id: String },
-
-    /// Update existing server member
-    ServerMemberUpdate {
-        id: MemberCompositeKey,
-        data: PartialMember,
-        clear: Vec<FieldsMember>,
-    },
-
-    /// User joins server
-    ServerMemberJoin { id: String, user: String },
-
-    /// User left server
-    ServerMemberLeave { id: String, user: String },
-
-    /// Server role created or updated
-    ServerRoleUpdate {
-        id: String,
-        role_id: String,
-        data: PartialRole,
-        clear: Vec<FieldsRole>,
-    },
-
-    /// Server role deleted
-    ServerRoleDelete { id: String, role_id: String },
-
-    /// Update existing user
-    UserUpdate {
-        id: String,
-        data: PartialUser,
-        clear: Vec<FieldsUser>,
-        event_id: Option<String>,
-    },
-
-    /// Relationship with another user changed
-    UserRelationship {
-        id: String,
-        user: User,
-        // ! this field can be deprecated
-        status: RelationshipStatus,
-    },
-
-    /// Settings updated remotely
-    UserSettingsUpdate { id: String, update: UserSettings },
-
-    /// User has been platform banned or deleted their account
-    ///
-    /// Clients should remove the following associated data:
-    /// - Messages
-    /// - DM Channels
-    /// - Relationships
-    /// - Server Memberships
-    ///
-    /// User flags are specified to explain why a wipe is occurring though not all reasons will necessarily ever appear.
-    UserPlatformWipe { user_id: String, flags: i32 },
-
-    /// New emoji
-    EmojiCreate(Emoji),
-
-    /// Delete emoji
-    EmojiDelete { id: String },
-
-    /// New report
-    ReportCreate(Report), */
-    /// New webhook
-    WebhookCreate(Webhook),
-
-    /// Update existing webhook
-    WebhookUpdate {
-        id: String,
-        data: PartialWebhook,
-        remove: Vec<FieldsWebhook>,
-    },
-
-    /// Delete webhook
-    WebhookDelete { id: String },
-
-    /// Auth events
-    Auth(AuthifierEvent),
-}
-
-impl EventV1 {
-    /// Publish helper wrapper
-    pub async fn p(self, channel: String) {
-        #[cfg(not(debug_assertions))]
-        redis_kiss::p(channel, self).await;
-
-        #[cfg(debug_assertions)]
-        info!("Publishing event to {channel}: {self:?}");
-
-        #[cfg(debug_assertions)]
-        redis_kiss::publish(channel, self).await.unwrap();
-    }
-
-    /// Publish user event
-    pub async fn p_user(self, id: String, db: &Database) {
-        self.clone().p(id.clone()).await;
-
-        // ! FIXME: this should be captured by member list in the future
-        // ! and not immediately fanned out to users
-        if let Ok(members) = db.fetch_all_memberships(&id).await {
-            for member in members {
-                self.clone().p(member.id.server).await;
-            }
-        }
-    }
-
-    /// Publish private event
-    pub async fn private(self, id: String) {
-        self.p(format!("{id}!")).await;
-    }
-
-    /// Publish internal global event
-    pub async fn global(self) {
-        self.p("global".to_string()).await;
-    }
-}
@@ -1 +0,0 @@
-pub mod client;
@@ -1,88 +0,0 @@
-#[macro_use]
-extern crate serde;
-
-#[macro_use]
-extern crate async_recursion;
-
-#[macro_use]
-extern crate async_trait;
-
-#[macro_use]
-extern crate log;
-
-#[macro_use]
-extern crate revolt_optional_struct;
-
-#[macro_use]
-extern crate revolt_result;
-
-#[cfg(feature = "mongodb")]
-pub use mongodb;
-
-#[cfg(feature = "mongodb")]
-#[macro_use]
-extern crate bson;
-
-macro_rules! database_derived {
-    ( $( $item:item )+ ) => {
-        $(
-            #[derive(Clone)]
-            $item
-        )+
-    };
-}
-
-macro_rules! auto_derived {
-    ( $( $item:item )+ ) => {
-        $(
-            #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
-            $item
-        )+
-    };
-}
-
-macro_rules! auto_derived_partial {
-    ( $item:item, $name:expr ) => {
-        #[derive(OptionalStruct, Serialize, Deserialize, Debug, Clone, Default, Eq, PartialEq)]
-        #[optional_derive(Serialize, Deserialize, Debug, Clone, Default, Eq, PartialEq)]
-        #[optional_name = $name]
-        #[opt_skip_serializing_none]
-        #[opt_some_priority]
-        $item
-    };
-}
-
-mod drivers;
-pub use drivers::*;
-
-#[cfg(test)]
-macro_rules! database_test {
-    ( | $db: ident | $test:expr ) => {
-        let db = $crate::DatabaseInfo::Test(format!(
-            "{}:{}",
-            file!().replace('/', "_").replace(".rs", ""),
-            line!()
-        ))
-        .connect()
-        .await
-        .expect("Database connection failed.");
-
-        db.drop_database().await;
-
-        #[allow(clippy::redundant_closure_call)]
-        (|$db: $crate::Database| $test)(db.clone()).await;
-
-        db.drop_database().await
-    };
-}
-
-mod models;
-pub mod util;
-pub use models::*;
-
-pub mod events;
-
-/// Utility function to check if a boolean value is false
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,24 +0,0 @@
-auto_derived!(
-    /// Document representing migration information
-    pub struct MigrationInfo {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: i32,
-        /// Current database revision
-        pub revision: i32,
-    }
-);
-
-#[cfg(test)]
-mod tests {
-    #[async_std::test]
-    async fn migrate() {
-        database_test!(|db| async move {
-            // Initialise the database
-            db.migrate_database().await.unwrap();
-
-            // Migrate the existing database
-            db.migrate_database().await.unwrap()
-        });
-    }
-}
@@ -1,12 +0,0 @@
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractMigrations: Sync + Send {
-    #[cfg(test)]
-    /// Drop the database
-    async fn drop_database(&self);
-
-    /// Migrate the database
-    async fn migrate_database(&self) -> Result<(), ()>;
-}
@@ -1,16 +0,0 @@
-use crate::ReferenceDb;
-
-use super::AbstractMigrations;
-
-#[async_trait]
-impl AbstractMigrations for ReferenceDb {
-    #[cfg(test)]
-    /// Drop the database
-    async fn drop_database(&self) {}
-
-    /// Migrate the database
-    async fn migrate_database(&self) -> Result<(), ()> {
-        // Here you would do your typical migrations if this was a real database.
-        Ok(())
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,154 +0,0 @@
-use revolt_result::Result;
-
-use crate::Database;
-
-auto_derived_partial!(
-    /// Bot
-    pub struct Bot {
-        /// Bot Id
-        ///
-        /// This equals the associated bot user's id.
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// User Id of the bot owner
-        pub owner: String,
-        /// Token used to authenticate requests for this bot
-        pub token: String,
-        /// Whether the bot is public
-        /// (may be invited by anyone)
-        pub public: bool,
-
-        /// Whether to enable analytics
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub analytics: bool,
-        /// Whether this bot should be publicly discoverable
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub discoverable: bool,
-        /// Reserved; URL for handling interactions
-        #[serde(skip_serializing_if = "String::is_empty", default)]
-        pub interactions_url: String,
-        /// URL for terms of service
-        #[serde(skip_serializing_if = "String::is_empty", default)]
-        pub terms_of_service_url: String,
-        /// URL for privacy policy
-        #[serde(skip_serializing_if = "String::is_empty", default)]
-        pub privacy_policy_url: String,
-
-        /// Enum of bot flags
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub flags: Option<i32>,
-    },
-    "PartialBot"
-);
-
-auto_derived!(
-    /// Optional fields on bot object
-    pub enum FieldsBot {
-        Token,
-        InteractionsURL,
-    }
-);
-
-#[allow(clippy::disallowed_methods)]
-impl Bot {
-    /// Remove a field from this object
-    pub fn remove_field(&mut self, field: &FieldsBot) {
-        match field {
-            FieldsBot::Token => self.token = nanoid::nanoid!(64),
-            FieldsBot::InteractionsURL => {
-                self.interactions_url = String::new();
-            }
-        }
-    }
-
-    /// Update this bot
-    pub async fn update(
-        &mut self,
-        db: &Database,
-        mut partial: PartialBot,
-        remove: Vec<FieldsBot>,
-    ) -> Result<()> {
-        if remove.contains(&FieldsBot::Token) {
-            partial.token = Some(nanoid::nanoid!(64));
-        }
-
-        for field in &remove {
-            self.remove_field(field);
-        }
-
-        db.update_bot(&self.id, &partial, remove).await?;
-
-        self.apply_options(partial);
-        Ok(())
-    }
-
-    /// Delete this bot
-    pub async fn delete(&self, db: &Database) -> Result<()> {
-        db.fetch_user(&self.id).await?.mark_deleted(db).await?;
-        db.delete_bot(&self.id).await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{Bot, FieldsBot, PartialBot, User};
-
-    #[async_std::test]
-    async fn crud() {
-        database_test!(|db| async move {
-            let bot_id = "bot";
-            let user_id = "user";
-            let token = "my_token";
-
-            let user = User {
-                id: bot_id.to_string(),
-                username: "Bot Name".to_string(),
-                ..Default::default()
-            };
-
-            db.insert_user(&user).await.unwrap();
-
-            let bot = Bot {
-                id: bot_id.to_string(),
-                owner: user_id.to_string(),
-                token: token.to_string(),
-                interactions_url: "some url".to_string(),
-                ..Default::default()
-            };
-
-            db.insert_bot(&bot).await.unwrap();
-
-            let mut updated_bot = bot.clone();
-            updated_bot
-                .update(
-                    &db,
-                    PartialBot {
-                        public: Some(true),
-                        ..Default::default()
-                    },
-                    vec![FieldsBot::Token, FieldsBot::InteractionsURL],
-                )
-                .await
-                .unwrap();
-
-            let fetched_bot1 = db.fetch_bot(bot_id).await.unwrap();
-            let fetched_bot2 = db.fetch_bot_by_token(&fetched_bot1.token).await.unwrap();
-            let fetched_bots = db.fetch_bots_by_user(user_id).await.unwrap();
-
-            assert!(!bot.public);
-            assert!(fetched_bot1.public);
-            assert!(!bot.interactions_url.is_empty());
-            assert!(fetched_bot1.interactions_url.is_empty());
-            assert_ne!(bot.token, fetched_bot1.token);
-            assert_eq!(updated_bot, fetched_bot1);
-            assert_eq!(fetched_bot1, fetched_bot2);
-            assert_eq!(fetched_bot1, fetched_bots[0]);
-            assert_eq!(1, db.get_number_of_bots_by_user(user_id).await.unwrap());
-
-            bot.delete(&db).await.unwrap();
-            assert!(db.fetch_bot(bot_id).await.is_err());
-            assert_eq!(0, db.get_number_of_bots_by_user(user_id).await.unwrap());
-            assert_eq!(db.fetch_user(bot_id).await.unwrap().flags, Some(2))
-        });
-    }
-}
@@ -1,35 +0,0 @@
-use revolt_result::Result;
-
-use crate::{Bot, FieldsBot, PartialBot};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractBots: Sync + Send {
-    /// Insert new bot into the database
-    async fn insert_bot(&self, bot: &Bot) -> Result<()>;
-
-    /// Fetch a bot by its id
-    async fn fetch_bot(&self, id: &str) -> Result<Bot>;
-
-    /// Fetch a bot by its token
-    async fn fetch_bot_by_token(&self, token: &str) -> Result<Bot>;
-
-    /// Fetch bots owned by a user
-    async fn fetch_bots_by_user(&self, user_id: &str) -> Result<Vec<Bot>>;
-
-    /// Get the number of bots owned by a user
-    async fn get_number_of_bots_by_user(&self, user_id: &str) -> Result<usize>;
-
-    /// Update bot with new information
-    async fn update_bot(
-        &self,
-        id: &str,
-        partial: &PartialBot,
-        remove: Vec<FieldsBot>,
-    ) -> Result<()>;
-
-    /// Delete a bot from the database
-    async fn delete_bot(&self, id: &str) -> Result<()>;
-}
@@ -1,92 +0,0 @@
-use revolt_result::Result;
-
-use crate::{Bot, FieldsBot, PartialBot};
-use crate::{IntoDocumentPath, MongoDb};
-
-use super::AbstractBots;
-
-static COL: &str = "bots";
-
-#[async_trait]
-impl AbstractBots for MongoDb {
-    /// Insert new bot into the database
-    async fn insert_bot(&self, bot: &Bot) -> Result<()> {
-        query!(self, insert_one, COL, &bot).map(|_| ())
-    }
-
-    /// Fetch a bot by its id
-    async fn fetch_bot(&self, id: &str) -> Result<Bot> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a bot by its token
-    async fn fetch_bot_by_token(&self, token: &str) -> Result<Bot> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "token": token
-            }
-        )?
-        .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch bots owned by a user
-    async fn fetch_bots_by_user(&self, user_id: &str) -> Result<Vec<Bot>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "owner": user_id
-            }
-        )
-    }
-
-    /// Get the number of bots owned by a user
-    async fn get_number_of_bots_by_user(&self, user_id: &str) -> Result<usize> {
-        query!(
-            self,
-            count_documents,
-            COL,
-            doc! {
-                "owner": user_id
-            }
-        )
-        .map(|v| v as usize)
-    }
-
-    /// Update bot with new information
-    async fn update_bot(
-        &self,
-        id: &str,
-        partial: &PartialBot,
-        remove: Vec<FieldsBot>,
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
-    }
-
-    /// Delete a bot from the database
-    async fn delete_bot(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-}
-
-impl IntoDocumentPath for FieldsBot {
-    fn as_path(&self) -> Option<&'static str> {
-        match self {
-            FieldsBot::InteractionsURL => Some("interactions_url"),
-            FieldsBot::Token => None,
-        }
-    }
-}
@@ -1,82 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{Bot, FieldsBot, PartialBot};
-
-use super::AbstractBots;
-
-#[async_trait]
-impl AbstractBots for ReferenceDb {
-    /// Insert new bot into the database
-    async fn insert_bot(&self, bot: &Bot) -> Result<()> {
-        let mut bots = self.bots.lock().await;
-        if bots.contains_key(&bot.id) {
-            Err(create_database_error!("insert", "bot"))
-        } else {
-            bots.insert(bot.id.to_string(), bot.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch a bot by its id
-    async fn fetch_bot(&self, id: &str) -> Result<Bot> {
-        let bots = self.bots.lock().await;
-        bots.get(id).cloned().ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a bot by its token
-    async fn fetch_bot_by_token(&self, token: &str) -> Result<Bot> {
-        let bots = self.bots.lock().await;
-        bots.values()
-            .find(|bot| bot.token == token)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch bots owned by a user
-    async fn fetch_bots_by_user(&self, user_id: &str) -> Result<Vec<Bot>> {
-        let bots = self.bots.lock().await;
-        Ok(bots
-            .values()
-            .filter(|bot| bot.owner == user_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Get the number of bots owned by a user
-    async fn get_number_of_bots_by_user(&self, user_id: &str) -> Result<usize> {
-        let bots = self.bots.lock().await;
-        Ok(bots.values().filter(|bot| bot.owner == user_id).count())
-    }
-
-    /// Update bot with new information
-    async fn update_bot(
-        &self,
-        id: &str,
-        partial: &PartialBot,
-        remove: Vec<FieldsBot>,
-    ) -> Result<()> {
-        let mut bots = self.bots.lock().await;
-        if let Some(bot) = bots.get_mut(id) {
-            for field in remove {
-                #[allow(clippy::disallowed_methods)]
-                bot.remove_field(&field);
-            }
-
-            bot.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete a bot from the database
-    async fn delete_bot(&self, id: &str) -> Result<()> {
-        let mut bots = self.bots.lock().await;
-        if bots.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,158 +0,0 @@
-use revolt_result::Result;
-
-use crate::events::client::EventV1;
-use crate::{Database, File};
-
-auto_derived_partial!(
-    /// Webhook
-    pub struct Webhook {
-        /// Webhook Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// The name of the webhook
-        pub name: String,
-
-        /// The avatar of the webhook
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub avatar: Option<File>,
-
-        /// The channel this webhook belongs to
-        pub channel_id: String,
-
-        /// The private token for the webhook
-        pub token: Option<String>,
-    },
-    "PartialWebhook"
-);
-
-auto_derived!(
-    /// Optional fields on webhook object
-    pub enum FieldsWebhook {
-        Avatar,
-    }
-);
-
-#[allow(clippy::disallowed_methods)]
-impl Webhook {
-    pub async fn create(&self, db: &Database) -> Result<()> {
-        db.insert_webhook(self).await?;
-
-        // Avoid leaking the token to people who receive the event
-        let mut webhook = self.clone();
-        webhook.token = None;
-
-        EventV1::WebhookCreate(webhook.into())
-            .p(self.channel_id.clone())
-            .await;
-
-        Ok(())
-    }
-
-    pub fn assert_token(&self, token: &str) -> Result<()> {
-        if self.token.as_deref() == Some(token) {
-            Ok(())
-        } else {
-            Err(create_error!(InvalidCredentials))
-        }
-    }
-
-    pub async fn update(
-        &mut self,
-        db: &Database,
-        mut partial: PartialWebhook,
-        remove: Vec<FieldsWebhook>,
-    ) -> Result<()> {
-        for field in &remove {
-            self.remove_field(field)
-        }
-
-        self.apply_options(partial.clone());
-
-        db.update_webhook(&self.id, &partial, &remove).await?;
-
-        partial.token = None; // Avoid leaking the token to people who receive the event
-
-        EventV1::WebhookUpdate {
-            id: self.id.clone(),
-            data: partial.into(),
-            remove: remove.into_iter().map(|v| v.into()).collect(),
-        }
-        .p(self.channel_id.clone())
-        .await;
-
-        Ok(())
-    }
-
-    pub fn remove_field(&mut self, field: &FieldsWebhook) {
-        match field {
-            FieldsWebhook::Avatar => self.avatar = None,
-        }
-    }
-
-    pub async fn delete(&self, db: &Database) -> Result<()> {
-        db.delete_webhook(&self.id).await?;
-
-        EventV1::WebhookDelete {
-            id: self.id.clone(),
-        }
-        .p(self.channel_id.clone())
-        .await;
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{FieldsWebhook, PartialWebhook, Webhook};
-
-    #[async_std::test]
-    async fn crud() {
-        database_test!(|db| async move {
-            let webhook_id = "webhook";
-            let channel_id = "channel";
-
-            let webhook = Webhook {
-                id: webhook_id.to_string(),
-                name: "Webhook Name".to_string(),
-                channel_id: channel_id.to_string(),
-                avatar: Some(Default::default()),
-                ..Default::default()
-            };
-
-            db.insert_webhook(&webhook).await.unwrap();
-
-            let mut updated_webhook = webhook.clone();
-            updated_webhook
-                .update(
-                    &db,
-                    PartialWebhook {
-                        name: Some("New Name".to_string()),
-                        ..Default::default()
-                    },
-                    vec![FieldsWebhook::Avatar],
-                )
-                .await
-                .unwrap();
-
-            let fetched_webhook = db.fetch_webhook(webhook_id).await.unwrap();
-            let fetched_webhooks = db.fetch_webhooks_for_channel(channel_id).await.unwrap();
-
-            assert_eq!(updated_webhook, fetched_webhook);
-            assert_ne!(webhook, fetched_webhook);
-            assert_eq!(1, fetched_webhooks.len());
-            assert_eq!(fetched_webhook, fetched_webhooks[0]);
-
-            webhook.delete(&db).await.unwrap();
-            assert!(db.fetch_webhook(webhook_id).await.is_err());
-            assert_eq!(
-                0,
-                db.fetch_webhooks_for_channel(channel_id)
-                    .await
-                    .unwrap()
-                    .len()
-            )
-        });
-    }
-}
@@ -1,29 +0,0 @@
-use revolt_result::Result;
-
-use crate::{FieldsWebhook, PartialWebhook, Webhook};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractWebhooks: Sync + Send {
-    /// Insert new webhook into the database
-    async fn insert_webhook(&self, webhook: &Webhook) -> Result<()>;
-
-    /// Fetch webhook by id
-    async fn fetch_webhook(&self, webhook_id: &str) -> Result<Webhook>;
-
-    /// Fetch webhooks for channel
-    async fn fetch_webhooks_for_channel(&self, channel_id: &str) -> Result<Vec<Webhook>>;
-
-    /// Update webhook with new information
-    async fn update_webhook(
-        &self,
-        webhook_id: &str,
-        partial: &PartialWebhook,
-        remove: &[FieldsWebhook],
-    ) -> Result<()>;
-
-    /// Delete webhook by id
-    async fn delete_webhook(&self, webhook_id: &str) -> Result<()>;
-}
@@ -1,77 +0,0 @@
-use futures::StreamExt;
-use revolt_result::Result;
-
-use crate::{FieldsWebhook, PartialWebhook, Webhook};
-use crate::{IntoDocumentPath, MongoDb};
-
-use super::AbstractWebhooks;
-
-static COL: &str = "channel_webhooks";
-
-#[async_trait]
-impl AbstractWebhooks for MongoDb {
-    /// Insert new webhook into the database
-    async fn insert_webhook(&self, webhook: &Webhook) -> Result<()> {
-        query!(self, insert_one, COL, &webhook).map(|_| ())
-    }
-
-    /// Fetch webhook by id
-    async fn fetch_webhook(&self, webhook_id: &str) -> Result<Webhook> {
-        query!(self, find_one_by_id, COL, webhook_id)?.ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch webhooks for channel
-    async fn fetch_webhooks_for_channel(&self, channel_id: &str) -> Result<Vec<Webhook>> {
-        Ok(self
-            .col::<Webhook>(COL)
-            .find(
-                doc! {
-                    "channel_id": channel_id,
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Update webhook with new information
-    async fn update_webhook(
-        &self,
-        webhook_id: &str,
-        partial: &PartialWebhook,
-        remove: &[FieldsWebhook],
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            webhook_id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
-    }
-
-    /// Delete webhook by id
-    async fn delete_webhook(&self, webhook_id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, webhook_id).map(|_| ())
-    }
-}
-
-impl IntoDocumentPath for FieldsWebhook {
-    fn as_path(&self) -> Option<&'static str> {
-        Some(match self {
-            FieldsWebhook::Avatar => "avatar",
-        })
-    }
-}
@@ -1,70 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{FieldsWebhook, PartialWebhook, Webhook};
-
-use super::AbstractWebhooks;
-
-#[async_trait]
-impl AbstractWebhooks for ReferenceDb {
-    /// Insert new webhook into the database
-    async fn insert_webhook(&self, webhook: &Webhook) -> Result<()> {
-        let mut webhooks = self.channel_webhooks.lock().await;
-        if webhooks.contains_key(&webhook.id) {
-            Err(create_database_error!("insert", "webhook"))
-        } else {
-            webhooks.insert(webhook.id.to_string(), webhook.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch webhook by id
-    async fn fetch_webhook(&self, webhook_id: &str) -> Result<Webhook> {
-        let webhooks = self.channel_webhooks.lock().await;
-        webhooks
-            .get(webhook_id)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch webhooks for channel
-    async fn fetch_webhooks_for_channel(&self, channel_id: &str) -> Result<Vec<Webhook>> {
-        let webhooks = self.channel_webhooks.lock().await;
-        Ok(webhooks
-            .values()
-            .filter(|webhook| webhook.channel_id == channel_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Update webhook with new information
-    async fn update_webhook(
-        &self,
-        webhook_id: &str,
-        partial: &PartialWebhook,
-        remove: &[FieldsWebhook],
-    ) -> Result<()> {
-        let mut webhooks = self.channel_webhooks.lock().await;
-        if let Some(webhook) = webhooks.get_mut(webhook_id) {
-            for field in remove {
-                #[allow(clippy::disallowed_methods)]
-                webhook.remove_field(field);
-            }
-
-            webhook.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete webhook by id
-    async fn delete_webhook(&self, webhook_id: &str) -> Result<()> {
-        let mut webhooks = self.channel_webhooks.lock().await;
-        if webhooks.remove(webhook_id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,107 +0,0 @@
-use crate::Database;
-
-use revolt_result::Result;
-
-auto_derived_partial!(
-    /// File
-    pub struct File {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Tag / bucket this file was uploaded to
-        pub tag: String,
-        /// Original filename
-        pub filename: String,
-        /// Parsed metadata of this file
-        pub metadata: Metadata,
-        /// Raw content type of this file
-        pub content_type: String,
-        /// Size of this file (in bytes)
-        pub size: isize,
-
-        /// Whether this file was deleted
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub deleted: Option<bool>,
-        /// Whether this file was reported
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub reported: Option<bool>,
-
-        // TODO: migrate this mess to having:
-        // - author_id
-        // - parent: Parent { Message(id), User(id), etc }
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub message_id: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_id: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub server_id: Option<String>,
-
-        /// Id of the object this file is associated with
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub object_id: Option<String>,
-    },
-    "PartialFile"
-);
-
-auto_derived!(
-    /// Metadata associated with a file
-    #[serde(tag = "type")]
-    #[derive(Default)]
-    pub enum Metadata {
-        /// File is just a generic uncategorised file
-        #[default]
-        File,
-        /// File contains textual data and should be displayed as such
-        Text,
-        /// File is an image with specific dimensions
-        Image { width: isize, height: isize },
-        /// File is a video with specific dimensions
-        Video { width: isize, height: isize },
-        /// File is audio
-        Audio,
-    }
-);
-
-impl File {
-    /// Use a file for a message attachment
-    pub async fn use_attachment(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "attachments", "message", parent)
-            .await
-    }
-
-    /// Use a file for a user profile background
-    pub async fn use_background(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "backgrounds", "user", parent)
-            .await
-    }
-
-    /// Use a file for a user avatar
-    pub async fn use_avatar(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "avatars", "user", parent)
-            .await
-    }
-
-    /// Use a file for an icon
-    pub async fn use_icon(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "icons", "object", parent)
-            .await
-    }
-
-    /// Use a file for a server icon
-    pub async fn use_server_icon(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "icons", "object", parent)
-            .await
-    }
-
-    /// Use a file for a server banner
-    pub async fn use_banner(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "banners", "server", parent)
-            .await
-    }
-
-    /// Use a file for an emoji
-    pub async fn use_emoji(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "emojis", "object", parent)
-            .await
-    }
-}
@@ -1,30 +0,0 @@
-use revolt_result::Result;
-
-use crate::File;
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAttachments: Sync + Send {
-    /// Insert attachment into database.
-    async fn insert_attachment(&self, attachment: &File) -> Result<()>;
-
-    /// Find an attachment by its details and mark it as used by a given parent.
-    async fn find_and_use_attachment(
-        &self,
-        id: &str,
-        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
-    ) -> Result<File>;
-
-    /// Mark an attachment as having been reported.
-    async fn mark_attachment_as_reported(&self, id: &str) -> Result<()>;
-
-    /// Mark an attachment as having been deleted.
-    async fn mark_attachment_as_deleted(&self, id: &str) -> Result<()>;
-
-    /// Mark multiple attachments as having been deleted.
-    async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()>;
-}
@@ -1,117 +0,0 @@
-use bson::Document;
-use revolt_result::Result;
-
-use crate::File;
-use crate::MongoDb;
-
-use super::AbstractAttachments;
-
-static COL: &str = "bots";
-
-#[async_trait]
-impl AbstractAttachments for MongoDb {
-    /// Insert attachment into database.
-    async fn insert_attachment(&self, attachment: &File) -> Result<()> {
-        query!(self, insert_one, COL, &attachment).map(|_| ())
-    }
-
-    /// Find an attachment by its details and mark it as used by a given parent.
-    async fn find_and_use_attachment(
-        &self,
-        id: &str,
-        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
-    ) -> Result<File> {
-        let key = format!("{parent_type}_id");
-        let file = query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "_id": id,
-                "tag": tag,
-                &key: {
-                    "$exists": false
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(NotFound))?;
-
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": id
-                },
-                doc! {
-                    "$set": {
-                        key: parent_id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("update_one", COL))?;
-
-        Ok(file)
-    }
-
-    /// Mark an attachment as having been reported.
-    async fn mark_attachment_as_reported(&self, id: &str) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": id
-                },
-                doc! {
-                    "$set": {
-                        "reported": true
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
-    /// Mark an attachment as having been deleted.
-    async fn mark_attachment_as_deleted(&self, id: &str) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": id
-                },
-                doc! {
-                    "$set": {
-                        "deleted": true
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
-    /// Mark multiple attachments as having been deleted.
-    async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                doc! {
-                    "$set": {
-                        "deleted": true
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-}
@@ -1,79 +0,0 @@
-use revolt_result::Result;
-
-use crate::File;
-use crate::ReferenceDb;
-
-use super::AbstractAttachments;
-
-#[async_trait]
-impl AbstractAttachments for ReferenceDb {
-    /// Insert attachment into database.
-    async fn insert_attachment(&self, attachment: &File) -> Result<()> {
-        let mut attachments = self.files.lock().await;
-        if attachments.contains_key(&attachment.id) {
-            Err(create_database_error!("insert", "attachment"))
-        } else {
-            attachments.insert(attachment.id.to_string(), attachment.clone());
-            Ok(())
-        }
-    }
-
-    /// Find an attachment by its details and mark it as used by a given parent.
-    async fn find_and_use_attachment(
-        &self,
-        id: &str,
-        _tag: &str,
-        _parent_type: &str,
-        _parent_id: &str,
-    ) -> Result<File> {
-        let mut files = self.files.lock().await;
-        if let Some(file) = files.get_mut(id) {
-            // TODO: check tag
-            // TODO: set parent ID
-            Ok(file.clone())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Mark an attachment as having been reported.
-    async fn mark_attachment_as_reported(&self, id: &str) -> Result<()> {
-        let mut files = self.files.lock().await;
-        if let Some(file) = files.get_mut(id) {
-            file.reported = Some(true);
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Mark an attachment as having been deleted.
-    async fn mark_attachment_as_deleted(&self, id: &str) -> Result<()> {
-        let mut files = self.files.lock().await;
-        if let Some(file) = files.get_mut(id) {
-            file.deleted = Some(true);
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Mark multiple attachments as having been deleted.
-    async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()> {
-        let mut files = self.files.lock().await;
-
-        for id in ids {
-            if !files.contains_key(id) {
-                return Err(create_error!(NotFound));
-            }
-        }
-
-        for id in ids {
-            if let Some(file) = files.get_mut(id) {
-                file.reported = Some(true);
-            }
-        }
-
-        Ok(())
-    }
-}
@@ -1,50 +0,0 @@
-mod admin_migrations;
-mod bots;
-mod channel_webhooks;
-mod files;
-mod safety_strikes;
-mod server_members;
-mod servers;
-mod user_settings;
-mod users;
-
-pub use admin_migrations::*;
-pub use bots::*;
-pub use channel_webhooks::*;
-pub use files::*;
-pub use safety_strikes::*;
-pub use server_members::*;
-pub use servers::*;
-pub use user_settings::*;
-pub use users::*;
-
-use crate::{Database, MongoDb, ReferenceDb};
-
-pub trait AbstractDatabase:
-    Sync
-    + Send
-    + admin_migrations::AbstractMigrations
-    + bots::AbstractBots
-    + files::AbstractAttachments
-    + safety_strikes::AbstractAccountStrikes
-    + server_members::AbstractServerMembers
-    + servers::AbstractServers
-    + user_settings::AbstractUserSettings
-    + users::AbstractUsers
-    + channel_webhooks::AbstractWebhooks
-{
-}
-
-impl AbstractDatabase for ReferenceDb {}
-impl AbstractDatabase for MongoDb {}
-
-impl std::ops::Deref for Database {
-    type Target = dyn AbstractDatabase;
-
-    fn deref(&self) -> &Self::Target {
-        match &self {
-            Database::Reference(dummy) => dummy,
-            Database::MongoDb(mongo) => mongo,
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,124 +0,0 @@
-use revolt_result::Result;
-
-use crate::Database;
-
-auto_derived_partial!(
-    /// Account Strike
-    pub struct AccountStrike {
-        /// Strike Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Id of reported user
-        pub user_id: String,
-        /// Id of moderator
-        pub moderator_id: String,
-
-        /// Attached reason
-        pub reason: String,
-    },
-    "PartialAccountStrike"
-);
-
-#[allow(clippy::disallowed_methods)]
-impl AccountStrike {
-    pub async fn create(
-        db: &Database,
-        user_id: String,
-        reason: String,
-        moderator_id: String,
-    ) -> Result<AccountStrike> {
-        let strike = AccountStrike {
-            id: ulid::Ulid::new().to_string(),
-            user_id,
-            moderator_id,
-            reason,
-        };
-
-        db.insert_account_strike(&strike).await?;
-        Ok(strike)
-    }
-
-    /// Update this strike
-    pub async fn update(&mut self, db: &Database, partial: PartialAccountStrike) -> Result<()> {
-        db.update_account_strike(&self.id, &partial).await?;
-        self.apply_options(partial);
-        Ok(())
-    }
-
-    /// Delete this strike
-    pub async fn delete(&self, db: &Database) -> Result<()> {
-        db.delete_account_strike(&self.id).await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-
-    use crate::{AccountStrike, PartialAccountStrike};
-
-    #[async_std::test]
-    async fn crud() {
-        database_test!(|db| async move {
-            let user_id = "user";
-
-            let strike = AccountStrike::create(
-                &db,
-                user_id.to_string(),
-                "reason 1".to_string(),
-                "moderator_id".to_string(),
-            )
-            .await
-            .unwrap();
-
-            let mut updated_strike = strike.clone();
-            updated_strike
-                .update(
-                    &db,
-                    PartialAccountStrike {
-                        reason: Some("new reason".to_string()),
-                        ..Default::default()
-                    },
-                )
-                .await
-                .unwrap();
-
-            let strike2 = AccountStrike::create(
-                &db,
-                user_id.to_string(),
-                "reason 2".to_string(),
-                "moderator_id".to_string(),
-            )
-            .await
-            .unwrap();
-
-            let strikes = db.fetch_account_strikes_by_user(user_id).await.unwrap();
-
-            let ids = strikes
-                .iter()
-                .cloned()
-                .map(|strike| strike.id)
-                .collect::<HashSet<String>>();
-
-            assert!(ids.contains(&strike.id));
-            assert!(ids.contains(&strike2.id));
-
-            let fetched_strike = strikes
-                .into_iter()
-                .find(|strike| strike.id == strike.id)
-                .unwrap();
-
-            assert_eq!(fetched_strike, updated_strike);
-            assert_ne!(fetched_strike, strike);
-
-            strike.delete(&db).await.unwrap();
-            assert_eq!(
-                1,
-                db.fetch_account_strikes_by_user(user_id)
-                    .await
-                    .unwrap()
-                    .len()
-            )
-        });
-    }
-}
@@ -1,24 +0,0 @@
-use revolt_result::Result;
-
-use crate::{AccountStrike, PartialAccountStrike};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAccountStrikes: Sync + Send {
-    /// Insert new strike into the database
-    async fn insert_account_strike(&self, strike: &AccountStrike) -> Result<()>;
-
-    /// Fetch strike by id
-    async fn fetch_account_strike(&self, id: &str) -> Result<AccountStrike>;
-
-    /// Fetch strikes by user id
-    async fn fetch_account_strikes_by_user(&self, user_id: &str) -> Result<Vec<AccountStrike>>;
-
-    /// Update strike with new information
-    async fn update_account_strike(&self, id: &str, partial: &PartialAccountStrike) -> Result<()>;
-
-    /// Delete a strike from the database
-    async fn delete_account_strike(&self, id: &str) -> Result<()>;
-}
@@ -1,55 +0,0 @@
-use futures::StreamExt;
-use revolt_result::Result;
-
-use crate::MongoDb;
-use crate::{AccountStrike, PartialAccountStrike};
-
-use super::AbstractAccountStrikes;
-
-static COL: &str = "safety_strikes";
-
-#[async_trait]
-impl AbstractAccountStrikes for MongoDb {
-    /// Insert new strike into the database
-    async fn insert_account_strike(&self, strike: &AccountStrike) -> Result<()> {
-        query!(self, insert_one, COL, &strike).map(|_| ())
-    }
-
-    /// Fetch strike by id
-    async fn fetch_account_strike(&self, id: &str) -> Result<AccountStrike> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch strikes by user id
-    async fn fetch_account_strikes_by_user(&self, user_id: &str) -> Result<Vec<AccountStrike>> {
-        Ok(self
-            .col::<AccountStrike>(COL)
-            .find(
-                doc! {
-                    "user_id": user_id,
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Update strike with new information
-    async fn update_account_strike(&self, id: &str, partial: &PartialAccountStrike) -> Result<()> {
-        query!(self, update_one_by_id, COL, id, partial, vec![], None).map(|_| ())
-    }
-
-    /// Delete a strike from the database
-    async fn delete_account_strike(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-}
@@ -1,60 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{AccountStrike, PartialAccountStrike};
-
-use super::AbstractAccountStrikes;
-
-#[async_trait]
-impl AbstractAccountStrikes for ReferenceDb {
-    /// Insert new strike into the database
-    async fn insert_account_strike(&self, strike: &AccountStrike) -> Result<()> {
-        let mut strikes = self.account_strikes.lock().await;
-        if strikes.contains_key(&strike.id) {
-            Err(create_database_error!("insert", "strike"))
-        } else {
-            strikes.insert(strike.id.to_string(), strike.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch strike by id
-    async fn fetch_account_strike(&self, id: &str) -> Result<AccountStrike> {
-        let strikes = self.account_strikes.lock().await;
-        strikes
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch strikes by user id
-    async fn fetch_account_strikes_by_user(&self, user_id: &str) -> Result<Vec<AccountStrike>> {
-        let strikes = self.account_strikes.lock().await;
-        Ok(strikes
-            .values()
-            .filter(|strike| strike.user_id == user_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Update strike with new information
-    async fn update_account_strike(&self, id: &str, partial: &PartialAccountStrike) -> Result<()> {
-        let mut strikes = self.account_strikes.lock().await;
-        if let Some(strike) = strikes.get_mut(id) {
-            strike.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete a strike from the database
-    async fn delete_account_strike(&self, id: &str) -> Result<()> {
-        let mut strikes = self.account_strikes.lock().await;
-        if strikes.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,118 +0,0 @@
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-use crate::{Database, File, Server};
-
-auto_derived_partial!(
-    /// Server Member
-    pub struct Member {
-        /// Unique member id
-        #[serde(rename = "_id")]
-        pub id: MemberCompositeKey,
-
-        /// Time at which this user joined the server
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub joined_at: Option<Timestamp>,
-
-        /// Member's nickname
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub nickname: Option<String>,
-        /// Avatar attachment
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub avatar: Option<File>,
-
-        /// Member's roles
-        #[serde(skip_serializing_if = "Vec::is_empty", default)]
-        pub roles: Vec<String>,
-        /// Timestamp this member is timed out until
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub timeout: Option<Timestamp>,
-    },
-    "PartialMember"
-);
-
-auto_derived!(
-    /// Composite primary key consisting of server and user id
-    #[derive(Hash, Default)]
-    pub struct MemberCompositeKey {
-        /// Server Id
-        pub server: String,
-        /// User Id
-        pub user: String,
-    }
-
-    /// Optional fields on server member object
-    pub enum FieldsMember {
-        Nickname,
-        Avatar,
-        Roles,
-        Timeout,
-    }
-
-    /// Member removal intention
-    pub enum RemovalIntention {
-        Leave,
-        Kick,
-        Ban,
-    }
-);
-
-impl Member {
-    /// Update member data
-    pub async fn update<'a>(
-        &mut self,
-        db: &Database,
-        partial: PartialMember,
-        remove: Vec<FieldsMember>,
-    ) -> Result<()> {
-        for field in &remove {
-            self.remove_field(field);
-        }
-
-        self.apply_options(partial.clone());
-
-        db.update_member(&self.id, &partial, remove.clone()).await?;
-
-        /* // TODO: EventV1::ServerMemberUpdate {
-            id: self.id.clone(),
-            data: partial,
-            clear: remove,
-        }
-        .p(self.id.server.clone())
-        .await; */
-
-        Ok(())
-    }
-
-    pub fn remove_field(&mut self, field: &FieldsMember) {
-        match field {
-            FieldsMember::Avatar => self.avatar = None,
-            FieldsMember::Nickname => self.nickname = None,
-            FieldsMember::Roles => self.roles.clear(),
-            FieldsMember::Timeout => self.timeout = None,
-        }
-    }
-
-    /// Get this user's current ranking
-    pub fn get_ranking(&self, server: &Server) -> i64 {
-        let mut value = i64::MAX;
-        for role in &self.roles {
-            if let Some(role) = server.roles.get(role) {
-                if role.rank < value {
-                    value = role.rank;
-                }
-            }
-        }
-
-        value
-    }
-
-    /// Check whether this member is in timeout
-    pub fn in_timeout(&self) -> bool {
-        if let Some(timeout) = self.timeout {
-            *timeout > *Timestamp::now_utc()
-        } else {
-            false
-        }
-    }
-}
@@ -1,41 +0,0 @@
-use revolt_result::Result;
-
-use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractServerMembers: Sync + Send {
-    /// Insert a new server member into the database
-    async fn insert_member(&self, member: &Member) -> Result<()>;
-
-    /// Fetch a server member by their id
-    async fn fetch_member(&self, server_id: &str, user_id: &str) -> Result<Member>;
-
-    /// Fetch all members in a server
-    async fn fetch_all_members<'a>(&self, server_id: &str) -> Result<Vec<Member>>;
-
-    /// Fetch all memberships for a user
-    async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>>;
-
-    /// Fetch multiple members by their ids
-    async fn fetch_members<'a>(&self, server_id: &str, ids: &'a [String]) -> Result<Vec<Member>>;
-
-    /// Fetch member count of a server
-    async fn fetch_member_count(&self, server_id: &str) -> Result<usize>;
-
-    /// Fetch server count of a user
-    async fn fetch_server_count(&self, user_id: &str) -> Result<usize>;
-
-    /// Update information for a server member
-    async fn update_member(
-        &self,
-        id: &MemberCompositeKey,
-        partial: &PartialMember,
-        remove: Vec<FieldsMember>,
-    ) -> Result<()>;
-
-    /// Delete a server member by their id
-    async fn delete_member(&self, id: &MemberCompositeKey) -> Result<()>;
-}
@@ -1,178 +0,0 @@
-use futures::StreamExt;
-use revolt_result::Result;
-
-use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
-use crate::{IntoDocumentPath, MongoDb};
-
-use super::AbstractServerMembers;
-
-static COL: &str = "server_members";
-
-#[async_trait]
-impl AbstractServerMembers for MongoDb {
-    /// Insert a new server member into the database
-    async fn insert_member(&self, member: &Member) -> Result<()> {
-        query!(self, insert_one, COL, &member).map(|_| ())
-    }
-
-    /// Fetch a server member by their id
-    async fn fetch_member(&self, server_id: &str, user_id: &str) -> Result<Member> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "_id.server": server_id,
-                "_id.user": user_id
-            }
-        )?
-        .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch all members in a server
-    async fn fetch_all_members<'a>(&self, server_id: &str) -> Result<Vec<Member>> {
-        Ok(self
-            .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.server": server_id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Fetch all memberships for a user
-    async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>> {
-        Ok(self
-            .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.user": user_id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Fetch multiple members by their ids
-    async fn fetch_members<'a>(&self, server_id: &str, ids: &'a [String]) -> Result<Vec<Member>> {
-        Ok(self
-            .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.server": server_id,
-                    "_id.user": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Fetch member count of a server
-    async fn fetch_member_count(&self, server_id: &str) -> Result<usize> {
-        self.col::<Member>(COL)
-            .count_documents(
-                doc! {
-                    "_id.server": server_id
-                },
-                None,
-            )
-            .await
-            .map(|c| c as usize)
-            .map_err(|_| create_database_error!("count_documents", COL))
-    }
-
-    /// Fetch server count of a user
-    async fn fetch_server_count(&self, user_id: &str) -> Result<usize> {
-        self.col::<Member>(COL)
-            .count_documents(
-                doc! {
-                    "_id.user": user_id
-                },
-                None,
-            )
-            .await
-            .map(|c| c as usize)
-            .map_err(|_| create_database_error!("count_documents", COL))
-    }
-
-    /// Update information for a server member
-    async fn update_member(
-        &self,
-        id: &MemberCompositeKey,
-        partial: &PartialMember,
-        remove: Vec<FieldsMember>,
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one,
-            COL,
-            doc! {
-                "_id.server": &id.server,
-                "_id.user": &id.user
-            },
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
-    }
-
-    /// Delete a server member by their id
-    async fn delete_member(&self, id: &MemberCompositeKey) -> Result<()> {
-        query!(
-            self,
-            delete_one,
-            COL,
-            doc! {
-                "_id.server": &id.server,
-                "_id.user": &id.user
-            }
-        )
-        .map(|_| ())
-    }
-}
-
-impl IntoDocumentPath for FieldsMember {
-    fn as_path(&self) -> Option<&'static str> {
-        Some(match self {
-            FieldsMember::Avatar => "avatar",
-            FieldsMember::Nickname => "nickname",
-            FieldsMember::Roles => "roles",
-            FieldsMember::Timeout => "timeout",
-        })
-    }
-}
@@ -1,117 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
-
-use super::AbstractServerMembers;
-
-#[async_trait]
-impl AbstractServerMembers for ReferenceDb {
-    /// Insert a new server member into the database
-    async fn insert_member(&self, member: &Member) -> Result<()> {
-        let mut server_members = self.server_members.lock().await;
-        if server_members.contains_key(&member.id) {
-            Err(create_database_error!("insert", "member"))
-        } else {
-            server_members.insert(member.id.clone(), member.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch a server member by their id
-    async fn fetch_member(&self, server_id: &str, user_id: &str) -> Result<Member> {
-        let server_members = self.server_members.lock().await;
-        server_members
-            .get(&MemberCompositeKey {
-                server: server_id.to_string(),
-                user: user_id.to_string(),
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch all members in a server
-    async fn fetch_all_members<'a>(&self, server_id: &str) -> Result<Vec<Member>> {
-        let server_members = self.server_members.lock().await;
-        Ok(server_members
-            .values()
-            .filter(|member| member.id.server == server_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Fetch all memberships for a user
-    async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>> {
-        let server_members = self.server_members.lock().await;
-        Ok(server_members
-            .values()
-            .filter(|member| member.id.user == user_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Fetch multiple members by their ids
-    async fn fetch_members<'a>(&self, server_id: &str, ids: &'a [String]) -> Result<Vec<Member>> {
-        let server_members = self.server_members.lock().await;
-        ids.iter()
-            .map(|id| {
-                server_members
-                    .get(&MemberCompositeKey {
-                        server: server_id.to_string(),
-                        user: id.to_string(),
-                    })
-                    .cloned()
-                    .ok_or_else(|| create_error!(NotFound))
-            })
-            .collect()
-    }
-
-    /// Fetch member count of a server
-    async fn fetch_member_count(&self, server_id: &str) -> Result<usize> {
-        let server_members = self.server_members.lock().await;
-        Ok(server_members
-            .values()
-            .filter(|member| member.id.server == server_id)
-            .count())
-    }
-
-    /// Fetch server count of a user
-    async fn fetch_server_count(&self, user_id: &str) -> Result<usize> {
-        let server_members = self.server_members.lock().await;
-        Ok(server_members
-            .values()
-            .filter(|member| member.id.user == user_id)
-            .count())
-    }
-
-    /// Update information for a server member
-    async fn update_member(
-        &self,
-        id: &MemberCompositeKey,
-        partial: &PartialMember,
-        remove: Vec<FieldsMember>,
-    ) -> Result<()> {
-        let mut server_members = self.server_members.lock().await;
-        if let Some(member) = server_members.get_mut(id) {
-            for field in remove {
-                #[allow(clippy::disallowed_methods)]
-                member.remove_field(&field);
-            }
-
-            member.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete a server member by their id
-    async fn delete_member(&self, id: &MemberCompositeKey) -> Result<()> {
-        let mut server_members = self.server_members.lock().await;
-        if server_members.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,451 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-use revolt_permissions::OverrideField;
-use revolt_result::Result;
-use ulid::Ulid;
-
-use crate::{Database, File};
-
-auto_derived_partial!(
-    /// Server
-    pub struct Server {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// User id of the owner
-        pub owner: String,
-
-        /// Name of the server
-        pub name: String,
-        /// Description for the server
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub description: Option<String>,
-
-        /// Channels within this server
-        // ! FIXME: this may be redundant
-        pub channels: Vec<String>,
-        /// Categories for this server
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub categories: Option<Vec<Category>>,
-        /// Configuration for sending system event messages
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub system_messages: Option<SystemMessageChannels>,
-
-        /// Roles for this server
-        #[serde(
-            default = "HashMap::<String, Role>::new",
-            skip_serializing_if = "HashMap::<String, Role>::is_empty"
-        )]
-        pub roles: HashMap<String, Role>,
-        /// Default set of server and channel permissions
-        pub default_permissions: i64,
-
-        /// Icon attachment
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub icon: Option<File>,
-        /// Banner attachment
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub banner: Option<File>,
-
-        /// Bitfield of server flags
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub flags: Option<i32>,
-
-        /// Whether this server is flagged as not safe for work
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub nsfw: bool,
-        /// Whether to enable analytics
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub analytics: bool,
-        /// Whether this server should be publicly discoverable
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub discoverable: bool,
-    },
-    "PartialServer"
-);
-
-auto_derived_partial!(
-    /// Role
-    pub struct Role {
-        /// Role name
-        pub name: String,
-        /// Permissions available to this role
-        pub permissions: OverrideField,
-        /// Colour used for this role
-        ///
-        /// This can be any valid CSS colour
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub colour: Option<String>,
-        /// Whether this role should be shown separately on the member sidebar
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub hoist: bool,
-        /// Ranking of this role
-        #[serde(default)]
-        pub rank: i64,
-    },
-    "PartialRole"
-);
-
-auto_derived!(
-    /// Channel category
-    pub struct Category {
-        /// Unique ID for this category
-        pub id: String,
-        /// Title for this category
-        pub title: String,
-        /// Channels in this category
-        pub channels: Vec<String>,
-    }
-
-    /// System message channel assignments
-    pub struct SystemMessageChannels {
-        /// ID of channel to send user join messages in
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_joined: Option<String>,
-        /// ID of channel to send user left messages in
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_left: Option<String>,
-        /// ID of channel to send user kicked messages in
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_kicked: Option<String>,
-        /// ID of channel to send user banned messages in
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_banned: Option<String>,
-    }
-
-    /// Optional fields on server object
-    pub enum FieldsServer {
-        Description,
-        Categories,
-        SystemMessages,
-        Icon,
-        Banner,
-    }
-
-    /// Optional fields on server object
-    pub enum FieldsRole {
-        Colour,
-    }
-);
-
-impl Server {
-    /// Create a server
-    pub async fn create(&self, db: &Database) -> Result<()> {
-        db.insert_server(self).await
-    }
-
-    /// Update server data
-    pub async fn update<'a>(
-        &mut self,
-        db: &Database,
-        partial: PartialServer,
-        remove: Vec<FieldsServer>,
-    ) -> Result<()> {
-        for field in &remove {
-            self.remove_field(field);
-        }
-
-        self.apply_options(partial.clone());
-
-        db.update_server(&self.id, &partial, remove.clone()).await?;
-
-        /* // TODO: EventV1::ServerUpdate {
-            id: self.id.clone(),
-            data: partial,
-            clear: remove,
-        }
-        .p(self.id.clone())
-        .await; */
-
-        Ok(())
-    }
-
-    /// Delete a server
-    pub async fn delete(self, db: &Database) -> Result<()> {
-        /* // TODO: EventV1::ServerDelete {
-            id: self.id.clone(),
-        }
-        .p(self.id.clone())
-        .await; */
-
-        db.delete_server(&self.id).await
-    }
-
-    /// Remove a field from Server
-    pub fn remove_field(&mut self, field: &FieldsServer) {
-        match field {
-            FieldsServer::Description => self.description = None,
-            FieldsServer::Categories => self.categories = None,
-            FieldsServer::SystemMessages => self.system_messages = None,
-            FieldsServer::Icon => self.icon = None,
-            FieldsServer::Banner => self.banner = None,
-        }
-    }
-
-    /// Set role permission on a server
-    pub async fn set_role_permission(
-        &mut self,
-        db: &Database,
-        role_id: &str,
-        permissions: OverrideField,
-    ) -> Result<()> {
-        if let Some(role) = self.roles.get_mut(role_id) {
-            role.update(
-                db,
-                &self.id,
-                role_id,
-                PartialRole {
-                    permissions: Some(permissions),
-                    ..Default::default()
-                },
-                vec![],
-            )
-            .await?;
-
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /* /// Create a new member in a server
-    pub async fn create_member(
-        &self,
-        db: &Database,
-        user: User,
-        channels: Option<Vec<Channel>>,
-    ) -> Result<Vec<Channel>> {
-        if db.fetch_ban(&self.id, &user.id).await.is_ok() {
-            return Err(Error::Banned);
-        }
-
-        let member = Member {
-            id: MemberCompositeKey {
-                server: self.id.clone(),
-                user: user.id.clone(),
-            },
-            joined_at: Timestamp::now_utc(),
-            nickname: None,
-            avatar: None,
-            roles: vec![],
-            timeout: None,
-        };
-
-        db.insert_member(&member).await?;
-
-        let should_fetch = channels.is_none();
-        let mut channels = channels.unwrap_or_default();
-
-        if should_fetch {
-            let perm = perms(&user).server(self).member(&member);
-            let existing_channels = db.fetch_channels(&self.channels).await?;
-            for channel in existing_channels {
-                if perm
-                    .clone()
-                    .channel(&channel)
-                    .has_permission(db, Permission::ViewChannel)
-                    .await?
-                {
-                    channels.push(channel);
-                }
-            }
-        }
-
-        /* // TODO: EventV1::ServerMemberJoin {
-            id: self.id.clone(),
-            user: user.id.clone(),
-        }
-        .p(self.id.clone())
-        .await;
-
-        EventV1::ServerCreate {
-            id: self.id.clone(),
-            server: self.clone(),
-            channels: channels.clone(),
-        }
-        .private(user.id.clone())
-        .await; */
-
-        if let Some(id) = self
-            .system_messages
-            .as_ref()
-            .and_then(|x| x.user_joined.as_ref())
-        {
-            SystemMessage::UserJoined {
-                id: user.id.clone(),
-            }
-            .into_message(id.to_string())
-            .create_no_web_push(db, id, false)
-            .await
-            .ok();
-        }
-
-        Ok(channels)
-    }
-
-    /// Remove a member from a server
-    pub async fn remove_member(
-        &self,
-        db: &Database,
-        member: Member,
-        intention: RemovalIntention,
-        silent: bool,
-    ) -> Result<()> {
-        db.delete_member(&member.id).await?;
-
-        /* // TODO: EventV1::ServerMemberLeave {
-            id: self.id.to_string(),
-            user: member.id.user.clone(),
-        }
-        .p(member.id.server)
-        .await; */
-
-        if !silent {
-            if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
-                RemovalIntention::Leave => x.user_left.as_ref(),
-                RemovalIntention::Kick => x.user_kicked.as_ref(),
-                RemovalIntention::Ban => x.user_banned.as_ref(),
-            }) {
-                match intention {
-                    RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
-                    RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
-                    RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
-                }
-                .into_message(id.to_string())
-                .create_no_web_push(db, id, false)
-                .await
-                .ok();
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Create ban
-    pub async fn ban_user(
-        self,
-        db: &Database,
-        id: MemberCompositeKey,
-        reason: Option<String>,
-    ) -> Result<ServerBan> {
-        let ban = ServerBan { id, reason };
-        db.insert_ban(&ban).await?;
-        Ok(ban)
-    }
-
-    /// Ban a member from a server
-    pub async fn ban_member(
-        self,
-        db: &Database,
-        member: Member,
-        reason: Option<String>,
-    ) -> Result<ServerBan> {
-        self.remove_member(db, member.clone(), RemovalIntention::Ban, false)
-            .await?;
-
-        self.ban_user(db, member.id, reason).await
-    } */
-}
-
-impl Role {
-    /// Into optional struct
-    pub fn into_optional(self) -> PartialRole {
-        PartialRole {
-            name: Some(self.name),
-            permissions: Some(self.permissions),
-            colour: self.colour,
-            hoist: Some(self.hoist),
-            rank: Some(self.rank),
-        }
-    }
-
-    /// Create a role
-    pub async fn create(&self, db: &Database, server_id: &str) -> Result<String> {
-        let role_id = Ulid::new().to_string();
-        db.insert_role(server_id, &role_id, self).await?;
-
-        /* // TODO: EventV1::ServerRoleUpdate {
-            id: server_id.to_string(),
-            role_id: role_id.to_string(),
-            data: self.clone().into_optional(),
-            clear: vec![],
-        }
-        .p(server_id.to_string())
-        .await; */
-
-        Ok(role_id)
-    }
-
-    /// Update server data
-    pub async fn update<'a>(
-        &mut self,
-        db: &Database,
-        server_id: &str,
-        role_id: &str,
-        partial: PartialRole,
-        remove: Vec<FieldsRole>,
-    ) -> Result<()> {
-        for field in &remove {
-            self.remove_field(field);
-        }
-
-        self.apply_options(partial.clone());
-
-        db.update_role(server_id, role_id, &partial, remove.clone())
-            .await?;
-
-        /* // TODO: EventV1::ServerRoleUpdate {
-            id: server_id.to_string(),
-            role_id: role_id.to_string(),
-            data: partial,
-            clear: vec![],
-        }
-        .p(server_id.to_string())
-        .await; */
-
-        Ok(())
-    }
-
-    /// Remove field from Role
-    pub fn remove_field(&mut self, field: &FieldsRole) {
-        match field {
-            FieldsRole::Colour => self.colour = None,
-        }
-    }
-
-    /// Delete a role
-    pub async fn delete(self, db: &Database, server_id: &str, role_id: &str) -> Result<()> {
-        /* // TODO: EventV1::ServerRoleDelete {
-            id: server_id.to_string(),
-            role_id: role_id.to_string(),
-        }
-        .p(server_id.to_string())
-        .await; */
-
-        db.delete_role(server_id, role_id).await
-    }
-}
-
-impl SystemMessageChannels {
-    pub fn into_channel_ids(self) -> HashSet<String> {
-        let mut ids = HashSet::new();
-
-        if let Some(id) = self.user_joined {
-            ids.insert(id);
-        }
-
-        if let Some(id) = self.user_left {
-            ids.insert(id);
-        }
-
-        if let Some(id) = self.user_kicked {
-            ids.insert(id);
-        }
-
-        if let Some(id) = self.user_banned {
-            ids.insert(id);
-        }
-
-        ids
-    }
-}
@@ -1,46 +0,0 @@
-use revolt_result::Result;
-
-use crate::{FieldsRole, FieldsServer, PartialRole, PartialServer, Role, Server};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractServers: Sync + Send {
-    /// Insert a new server into database
-    async fn insert_server(&self, server: &Server) -> Result<()>;
-
-    /// Fetch a server by its id
-    async fn fetch_server(&self, id: &str) -> Result<Server>;
-
-    /// Fetch a servers by their ids
-    async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>>;
-
-    /// Update a server with new information
-    async fn update_server(
-        &self,
-        id: &str,
-        partial: &PartialServer,
-        remove: Vec<FieldsServer>,
-    ) -> Result<()>;
-
-    /// Delete a server by its id
-    async fn delete_server(&self, id: &str) -> Result<()>;
-
-    /// Insert a new role into server object
-    async fn insert_role(&self, server_id: &str, role_id: &str, role: &Role) -> Result<()>;
-
-    /// Update an existing role on a server
-    async fn update_role(
-        &self,
-        server_id: &str,
-        role_id: &str,
-        partial: &PartialRole,
-        remove: Vec<FieldsRole>,
-    ) -> Result<()>;
-
-    /// Delete a role from a server
-    ///
-    /// Also updates channels and members.
-    async fn delete_role(&self, server_id: &str, role_id: &str) -> Result<()>;
-}
@@ -1,183 +0,0 @@
-use bson::{to_document, Document};
-use futures::StreamExt;
-use revolt_result::Result;
-
-use crate::{FieldsRole, FieldsServer, PartialRole, PartialServer, Role, Server};
-use crate::{IntoDocumentPath, MongoDb};
-
-use super::AbstractServers;
-
-static COL: &str = "servers";
-
-#[async_trait]
-impl AbstractServers for MongoDb {
-    /// Insert a new server into database
-    async fn insert_server(&self, server: &Server) -> Result<()> {
-        query!(self, insert_one, COL, &server).map(|_| ())
-    }
-
-    /// Fetch a server by its id
-    async fn fetch_server(&self, id: &str) -> Result<Server> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a servers by their ids
-    async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>> {
-        Ok(self
-            .col::<Server>(COL)
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", "servers"))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Update a server with new information
-    async fn update_server(
-        &self,
-        id: &str,
-        partial: &PartialServer,
-        remove: Vec<FieldsServer>,
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
-    }
-
-    /// Delete a server by its id
-    async fn delete_server(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-
-    /// Insert a new role into server object
-    async fn insert_role(&self, server_id: &str, role_id: &str, role: &Role) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": server_id
-                },
-                doc! {
-                    "$set": {
-                        "roles.".to_owned() + role_id: to_document(role)
-                            .map_err(|_| create_database_error!("to_document", "role"))?
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", "server"))
-    }
-
-    /// Update an existing role on a server
-    async fn update_role(
-        &self,
-        server_id: &str,
-        role_id: &str,
-        partial: &PartialRole,
-        remove: Vec<FieldsRole>,
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            server_id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            "roles.".to_owned() + role_id + "."
-        )
-        .map(|_| ())
-    }
-
-    /// Delete a role from a server
-    ///
-    /// Also updates channels and members.
-    async fn delete_role(&self, server_id: &str, role_id: &str) -> Result<()> {
-        self.col::<Document>("server_members")
-            .update_many(
-                doc! {
-                    "_id.server": server_id
-                },
-                doc! {
-                    "$pull": {
-                        "roles": &role_id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("update_many", "server_members"))?;
-
-        self.col::<Document>("channels")
-            .update_one(
-                doc! {
-                    "server": server_id
-                },
-                doc! {
-                    "$unset": {
-                        "role_permissions.".to_owned() + role_id: 1_i32
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("update_one", "channels"))?;
-
-        self.col::<Document>("servers")
-            .update_one(
-                doc! {
-                    "_id": server_id
-                },
-                doc! {
-                    "$unset": {
-                        "roles.".to_owned() + role_id: 1_i32
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", "servers"))
-    }
-}
-
-impl IntoDocumentPath for FieldsServer {
-    fn as_path(&self) -> Option<&'static str> {
-        Some(match self {
-            FieldsServer::Banner => "banner",
-            FieldsServer::Categories => "categories",
-            FieldsServer::Description => "description",
-            FieldsServer::Icon => "icon",
-            FieldsServer::SystemMessages => "system_messages",
-        })
-    }
-}
-
-impl IntoDocumentPath for FieldsRole {
-    fn as_path(&self) -> Option<&'static str> {
-        Some(match self {
-            FieldsRole::Colour => "colour",
-        })
-    }
-}
@@ -1,126 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{FieldsRole, FieldsServer, PartialRole, PartialServer, Role, Server};
-
-use super::AbstractServers;
-
-#[async_trait]
-impl AbstractServers for ReferenceDb {
-    /// Insert a new server into database
-    async fn insert_server(&self, server: &Server) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if servers.contains_key(&server.id) {
-            Err(create_database_error!("insert", "server"))
-        } else {
-            servers.insert(server.id.to_string(), server.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch a server by its id
-    async fn fetch_server(&self, id: &str) -> Result<Server> {
-        let servers = self.servers.lock().await;
-        servers
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a servers by their ids
-    async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>> {
-        let servers = self.servers.lock().await;
-        ids.iter()
-            .map(|id| {
-                servers
-                    .get(id)
-                    .cloned()
-                    .ok_or_else(|| create_error!(NotFound))
-            })
-            .collect()
-    }
-
-    /// Update a server with new information
-    async fn update_server(
-        &self,
-        id: &str,
-        partial: &PartialServer,
-        remove: Vec<FieldsServer>,
-    ) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if let Some(server) = servers.get_mut(id) {
-            for field in remove {
-                #[allow(clippy::disallowed_methods)]
-                server.remove_field(&field);
-            }
-
-            server.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete a server by its id
-    async fn delete_server(&self, id: &str) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if servers.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Insert a new role into server object
-    async fn insert_role(&self, server_id: &str, role_id: &str, role: &Role) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if let Some(server) = servers.get_mut(server_id) {
-            server.roles.insert(role_id.to_string(), role.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Update an existing role on a server
-    async fn update_role(
-        &self,
-        server_id: &str,
-        role_id: &str,
-        partial: &PartialRole,
-        remove: Vec<FieldsRole>,
-    ) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if let Some(server) = servers.get_mut(server_id) {
-            if let Some(role) = server.roles.get_mut(role_id) {
-                for field in remove {
-                    #[allow(clippy::disallowed_methods)]
-                    role.remove_field(&field);
-                }
-
-                role.apply_options(partial.clone());
-                Ok(())
-            } else {
-                Err(create_error!(NotFound))
-            }
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Delete a role from a server
-    ///
-    /// Also updates channels and members.
-    async fn delete_role(&self, server_id: &str, role_id: &str) -> Result<()> {
-        let mut servers = self.servers.lock().await;
-        if let Some(server) = servers.get_mut(server_id) {
-            if server.roles.remove(role_id).is_some() {
-                Ok(())
-            } else {
-                Err(create_error!(NotFound))
-            }
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
@@ -1,28 +0,0 @@
-use std::collections::HashMap;
-
-use crate::Database;
-
-use revolt_result::Result;
-
-pub type UserSettings = HashMap<String, (i64, String)>;
-
-#[async_trait]
-pub trait UserSettingsImpl {
-    async fn set(self, db: &Database, user: &str) -> Result<()>;
-}
-
-#[async_trait]
-impl UserSettingsImpl for UserSettings {
-    async fn set(self, db: &Database, user: &str) -> Result<()> {
-        db.set_user_settings(user, &self).await?;
-
-        /* // TODO: EventV1::UserSettingsUpdate {
-            id: user.to_string(),
-            update: self,
-        }
-        .private(user.to_string())
-        .await; */
-
-        Ok(())
-    }
-}
@@ -1,18 +0,0 @@
-use revolt_result::Result;
-
-use crate::UserSettings;
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractUserSettings: Sync + Send {
-    /// Fetch a subset of user settings
-    async fn fetch_user_settings(&'_ self, id: &str, filter: &'_ [String]) -> Result<UserSettings>;
-
-    /// Update a subset of user settings
-    async fn set_user_settings(&self, id: &str, settings: &UserSettings) -> Result<()>;
-
-    /// Delete all user settings
-    async fn delete_user_settings(&self, id: &str) -> Result<()>;
-}
@@ -1,67 +0,0 @@
-use ::mongodb::options::FindOneOptions;
-use bson::to_bson;
-use bson::Document;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-
-use crate::MongoDb;
-use crate::UserSettings;
-
-use super::AbstractUserSettings;
-
-static COL: &str = "user_settings";
-
-#[async_trait]
-impl AbstractUserSettings for MongoDb {
-    /// Fetch a subset of user settings
-    async fn fetch_user_settings(&'_ self, id: &str, filter: &'_ [String]) -> Result<UserSettings> {
-        let mut projection = doc! {
-            "_id": 0,
-        };
-
-        for key in filter {
-            projection.insert(key, 1);
-        }
-
-        Ok(query!(
-            self,
-            find_one_with_options,
-            COL,
-            doc! {
-                "_id": id
-            },
-            FindOneOptions::builder().projection(projection).build()
-        )?
-        .unwrap_or_default())
-    }
-
-    /// Update a subset of user settings
-    async fn set_user_settings(&self, id: &str, settings: &UserSettings) -> Result<()> {
-        let mut set = doc! {};
-        for (key, data) in settings {
-            set.insert(
-                key,
-                vec![to_bson(&data.0).unwrap(), to_bson(&data.1).unwrap()],
-            );
-        }
-
-        self.col::<Document>(COL)
-            .update_one(
-                doc! {
-                    "_id": id
-                },
-                doc! {
-                    "$set": set
-                },
-                UpdateOptions::builder().upsert(true).build(),
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", "user_settings"))
-    }
-
-    /// Delete all user settings
-    async fn delete_user_settings(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-}
@@ -1,46 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::UserSettings;
-
-use super::AbstractUserSettings;
-
-#[async_trait]
-impl AbstractUserSettings for ReferenceDb {
-    /// Fetch a subset of user settings
-    async fn fetch_user_settings(&'_ self, id: &str, filter: &'_ [String]) -> Result<UserSettings> {
-        let user_settings = self.user_settings.lock().await;
-        user_settings
-            .get(id)
-            .cloned()
-            .map(|settings| {
-                settings
-                    .into_iter()
-                    .filter(|(key, _)| filter.contains(key))
-                    .collect()
-            })
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Update a subset of user settings
-    async fn set_user_settings(&self, id: &str, settings: &UserSettings) -> Result<()> {
-        let mut user_settings = self.user_settings.lock().await;
-        if let Some(settings) = user_settings.get_mut(id) {
-            settings.extend(settings.clone());
-        } else {
-            user_settings.insert(id.to_string(), settings.clone());
-        }
-
-        Ok(())
-    }
-
-    /// Delete all user settings
-    async fn delete_user_settings(&self, id: &str) -> Result<()> {
-        let mut user_settings = self.user_settings.lock().await;
-        if user_settings.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,9 +0,0 @@
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-
-#[cfg(feature = "rocket-impl")]
-pub use self::rocket::*;
-pub use model::*;
-pub use ops::*;
@@ -1,197 +0,0 @@
-use crate::{Database, File};
-
-use revolt_result::{Error, ErrorType, Result};
-
-auto_derived_partial!(
-    /// # User
-    pub struct User {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Username
-        pub username: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        /// Avatar attachment
-        pub avatar: Option<File>,
-        /// Relationships with other users
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub relations: Option<Vec<Relationship>>,
-
-        /// Bitfield of user badges
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub badges: Option<i32>,
-        /// User's current status
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub status: Option<UserStatus>,
-        /// User's profile page
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub profile: Option<UserProfile>,
-
-        /// Enum of user flags
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub flags: Option<i32>,
-        /// Whether this user is privileged
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub privileged: bool,
-        /// Bot information
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub bot: Option<BotInformation>,
-    },
-    "PartialUser"
-);
-
-auto_derived!(
-    /// User's relationship with another user (or themselves)
-    pub enum RelationshipStatus {
-        None,
-        User,
-        Friend,
-        Outgoing,
-        Incoming,
-        Blocked,
-        BlockedOther,
-    }
-
-    /// Relationship entry indicating current status with other user
-    pub struct Relationship {
-        #[serde(rename = "_id")]
-        pub id: String,
-        pub status: RelationshipStatus,
-    }
-
-    /// Presence status
-    pub enum Presence {
-        /// User is online
-        Online,
-        /// User is not currently available
-        Idle,
-        /// User is focusing / will only receive mentions
-        Focus,
-        /// User is busy / will not receive any notifications
-        Busy,
-        /// User appears to be offline
-        Invisible,
-    }
-
-    /// User's active status
-    pub struct UserStatus {
-        /// Custom status text
-        #[serde(skip_serializing_if = "String::is_empty", default)]
-        pub text: String,
-        /// Current presence option
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub presence: Option<Presence>,
-    }
-
-    /// User's profile
-    pub struct UserProfile {
-        /// Text content on user's profile
-        #[serde(skip_serializing_if = "String::is_empty", default)]
-        pub content: String,
-        /// Background visible on user's profile
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub background: Option<File>,
-    }
-
-    /// Bot information for if the user is a bot
-    pub struct BotInformation {
-        /// Id of the owner of this bot
-        pub owner: String,
-    }
-
-    /// Optional fields on user object
-    pub enum FieldsUser {
-        Avatar,
-        StatusText,
-        StatusPresence,
-        ProfileContent,
-        ProfileBackground,
-    }
-);
-
-impl User {
-    /// Check whether a username is already in use by another user
-    #[allow(dead_code)]
-    async fn is_username_taken(db: &Database, username: &str) -> Result<bool> {
-        match db.fetch_user_by_username(username).await {
-            Ok(_) => Ok(true),
-            Err(Error {
-                error_type: ErrorType::NotFound,
-                ..
-            }) => Ok(false),
-            Err(error) => Err(error),
-        }
-    }
-
-    /// Update user data
-    pub async fn update<'a>(
-        &mut self,
-        db: &Database,
-        partial: PartialUser,
-        remove: Vec<FieldsUser>,
-    ) -> Result<()> {
-        for field in &remove {
-            self.remove_field(field);
-        }
-
-        self.apply_options(partial.clone());
-        db.update_user(&self.id, &partial, remove.clone()).await?;
-
-        /* // TODO: EventV1::UserUpdate {
-            id: self.id.clone(),
-            data: partial,
-            clear: remove,
-        }
-        .p_user(self.id.clone(), db)
-        .await; */
-
-        Ok(())
-    }
-
-    /// Remove a field from User object
-    pub fn remove_field(&mut self, field: &FieldsUser) {
-        match field {
-            FieldsUser::Avatar => self.avatar = None,
-            FieldsUser::StatusText => {
-                if let Some(x) = self.status.as_mut() {
-                    x.text = String::new();
-                }
-            }
-            FieldsUser::StatusPresence => {
-                if let Some(x) = self.status.as_mut() {
-                    x.presence = None;
-                }
-            }
-            FieldsUser::ProfileContent => {
-                if let Some(x) = self.profile.as_mut() {
-                    x.content = String::new();
-                }
-            }
-            FieldsUser::ProfileBackground => {
-                if let Some(x) = self.profile.as_mut() {
-                    x.background = None;
-                }
-            }
-        }
-    }
-
-    /// Mark as deleted
-    pub async fn mark_deleted(&mut self, db: &Database) -> Result<()> {
-        self.update(
-            db,
-            PartialUser {
-                username: Some(format!("Deleted User {}", self.id)),
-                flags: Some(2),
-                ..Default::default()
-            },
-            vec![
-                FieldsUser::Avatar,
-                FieldsUser::StatusText,
-                FieldsUser::StatusPresence,
-                FieldsUser::ProfileContent,
-                FieldsUser::ProfileBackground,
-            ],
-        )
-        .await
-    }
-}
@@ -1,57 +0,0 @@
-use revolt_result::Result;
-
-use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
-
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractUsers: Sync + Send {
-    /// Insert a new user into the database
-    async fn insert_user(&self, user: &User) -> Result<()>;
-
-    /// Fetch a user from the database
-    async fn fetch_user(&self, id: &str) -> Result<User>;
-
-    /// Fetch a user from the database by their username
-    async fn fetch_user_by_username(&self, username: &str) -> Result<User>;
-
-    /// Fetch a user from the database by their session token
-    async fn fetch_user_by_token(&self, token: &str) -> Result<User>;
-
-    /// Fetch multiple users by their ids
-    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>>;
-
-    /// Fetch ids of users that both users are friends with
-    async fn fetch_mutual_user_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>>;
-
-    /// Fetch ids of channels that both users are in
-    async fn fetch_mutual_channel_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>>;
-
-    /// Fetch ids of servers that both users share
-    async fn fetch_mutual_server_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>>;
-
-    /// Update a user by their id given some data
-    async fn update_user(
-        &self,
-        id: &str,
-        user: &PartialUser,
-        remove: Vec<FieldsUser>,
-    ) -> Result<()>;
-
-    /// Set relationship with another user
-    ///
-    /// This should use pull_relationship if relationship is None.
-    async fn set_relationship(
-        &self,
-        user_id: &str,
-        target_id: &str,
-        relationship: &RelationshipStatus,
-    ) -> Result<()>;
-
-    /// Remove relationship with another user
-    async fn pull_relationship(&self, user_id: &str, target_id: &str) -> Result<()>;
-
-    /// Delete a user by their id
-    async fn delete_user(&self, id: &str) -> Result<()>;
-}
@@ -1,300 +0,0 @@
-use ::mongodb::options::{Collation, CollationStrength, FindOneOptions, FindOptions};
-use authifier::models::Session;
-use futures::StreamExt;
-use revolt_result::Result;
-
-use crate::DocumentId;
-use crate::IntoDocumentPath;
-use crate::MongoDb;
-use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
-
-use super::AbstractUsers;
-
-static COL: &str = "users";
-
-#[async_trait]
-impl AbstractUsers for MongoDb {
-    /// Insert a new user into the database
-    async fn insert_user(&self, user: &User) -> Result<()> {
-        query!(self, insert_one, COL, &user).map(|_| ())
-    }
-
-    /// Fetch a user from the database
-    async fn fetch_user(&self, id: &str) -> Result<User> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a user from the database by their username
-    async fn fetch_user_by_username(&self, username: &str) -> Result<User> {
-        query!(
-            self,
-            find_one_with_options,
-            COL,
-            doc! {
-                "username": username
-            },
-            FindOneOptions::builder()
-                .collation(
-                    Collation::builder()
-                        .locale("en")
-                        .strength(CollationStrength::Secondary)
-                        .build(),
-                )
-                .build()
-        )?
-        .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a user from the database by their session token
-    async fn fetch_user_by_token(&self, token: &str) -> Result<User> {
-        let session = self
-            .col::<Session>("sessions")
-            .find_one(
-                doc! {
-                    "token": token
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find_one", "sessions"))?
-            .ok_or_else(|| create_error!(InvalidSession))?;
-
-        self.fetch_user(&session.id).await
-    }
-
-    /// Fetch multiple users by their ids
-    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
-        Ok(self
-            .col::<User>(COL)
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async {
-                if cfg!(debug_assertions) {
-                    Some(s.unwrap())
-                } else {
-                    s.ok()
-                }
-            })
-            .collect()
-            .await)
-    }
-
-    /// Fetch ids of users that both users are friends with
-    async fn fetch_mutual_user_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
-        Ok(self
-            .col::<DocumentId>(COL)
-            .find(
-                doc! {
-                    "$and": [
-                        { "relations": { "$elemMatch": { "_id": &user_a, "status": "Friend" } } },
-                        { "relations": { "$elemMatch": { "_id": &user_b, "status": "Friend" } } }
-                    ]
-                },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
-            .await
-            .map_err(|_| create_database_error!("find", COL))?
-            .filter_map(|s| async { s.ok() })
-            .map(|user| user.id)
-            .collect()
-            .await)
-    }
-
-    /// Fetch ids of channels that both users are in
-    async fn fetch_mutual_channel_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
-        Ok(self
-            .col::<DocumentId>("channels")
-            .find(
-                doc! {
-                    "channel_type": {
-                        "$in": ["Group", "DirectMessage"]
-                    },
-                    "recipients": {
-                        "$all": [ user_a, user_b ]
-                    }
-                },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
-            .await
-            .map_err(|_| create_database_error!("find", "channels"))?
-            .filter_map(|s| async { s.ok() })
-            .map(|user| user.id)
-            .collect()
-            .await)
-    }
-
-    /// Fetch ids of servers that both users share
-    async fn fetch_mutual_server_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
-        Ok(self
-            .col::<DocumentId>("server_members")
-            .aggregate(
-                vec![
-                    doc! {
-                        "$match": {
-                            "_id.user": user_a
-                        }
-                    },
-                    doc! {
-                        "$lookup": {
-                            "from": "server_members",
-                            "as": "members",
-                            "let": {
-                                "server": "$_id.server"
-                            },
-                            "pipeline": [
-                                {
-                                    "$match": {
-                                        "$expr": {
-                                            "$and": [
-                                                { "$eq": [ "$_id.user", user_b ] },
-                                                { "$eq": [ "$_id.server", "$$server" ] }
-                                            ]
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    doc! {
-                        "$match": {
-                            "members": {
-                                "$size": 1_i32
-                            }
-                        }
-                    },
-                    doc! {
-                        "$project": {
-                            "_id": "$_id.server"
-                        }
-                    },
-                ],
-                None,
-            )
-            .await
-            .map_err(|_| create_database_error!("aggregate", "server_members"))?
-            .filter_map(|s| async { s.ok() })
-            .filter_map(|doc| async move { doc.get_str("_id").map(|id| id.to_string()).ok() })
-            .collect()
-            .await)
-    }
-
-    /// Update a user by their id given some data
-    async fn update_user(
-        &self,
-        id: &str,
-        partial: &PartialUser,
-        remove: Vec<FieldsUser>,
-    ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
-    }
-
-    /// Set relationship with another user
-    ///
-    /// This should use pull_relationship if relationship is None.
-    async fn set_relationship(
-        &self,
-        user_id: &str,
-        target_id: &str,
-        relationship: &RelationshipStatus,
-    ) -> Result<()> {
-        if let RelationshipStatus::None = relationship {
-            return self.pull_relationship(user_id, target_id).await;
-        }
-
-        self.col::<User>(COL)
-            .update_one(
-                doc! {
-                    "_id": user_id
-                },
-                vec![doc! {
-                    "$set": {
-                        "relations": {
-                            "$concatArrays": [
-                                {
-                                    "$ifNull": [
-                                        {
-                                            "$filter": {
-                                                "input": "$relations",
-                                                "cond": {
-                                                    "$ne": [
-                                                        "$$this._id",
-                                                        target_id
-                                                    ]
-                                                }
-                                            }
-                                        },
-                                        []
-                                    ]
-                                },
-                                [
-                                    {
-                                        "_id": target_id,
-                                        "status": format!("{relationship:?}")
-                                    }
-                                ]
-                            ]
-                        }
-                    }
-                }],
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", "user"))
-    }
-
-    /// Remove relationship with another user
-    async fn pull_relationship(&self, user_id: &str, target_id: &str) -> Result<()> {
-        self.col::<User>(COL)
-            .update_one(
-                doc! {
-                    "_id": user_id
-                },
-                doc! {
-                    "$pull": {
-                        "relations": {
-                            "_id": target_id
-                        }
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
-    /// Delete a user by their id
-    async fn delete_user(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-}
-
-impl IntoDocumentPath for FieldsUser {
-    fn as_path(&self) -> Option<&'static str> {
-        Some(match self {
-            FieldsUser::Avatar => "avatar",
-            FieldsUser::ProfileBackground => "profile.background",
-            FieldsUser::ProfileContent => "profile.content",
-            FieldsUser::StatusPresence => "status.presence",
-            FieldsUser::StatusText => "status.text",
-        })
-    }
-}
@@ -1,121 +0,0 @@
-use revolt_result::Result;
-
-use crate::ReferenceDb;
-use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
-
-use super::AbstractUsers;
-
-#[async_trait]
-impl AbstractUsers for ReferenceDb {
-    /// Insert a new user into the database
-    async fn insert_user(&self, user: &User) -> Result<()> {
-        let mut users = self.users.lock().await;
-        if users.contains_key(&user.id) {
-            Err(create_database_error!("insert", "user"))
-        } else {
-            users.insert(user.id.to_string(), user.clone());
-            Ok(())
-        }
-    }
-
-    /// Fetch a user from the database
-    async fn fetch_user(&self, id: &str) -> Result<User> {
-        let users = self.users.lock().await;
-        users
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a user from the database by their username
-    async fn fetch_user_by_username(&self, username: &str) -> Result<User> {
-        let users = self.users.lock().await;
-        let lowercase = username.to_lowercase();
-        users
-            .values()
-            .find(|user| user.username.to_lowercase() == lowercase)
-            .cloned()
-            .ok_or_else(|| create_error!(NotFound))
-    }
-
-    /// Fetch a user from the database by their session token
-    async fn fetch_user_by_token(&self, _token: &str) -> Result<User> {
-        todo!()
-    }
-
-    /// Fetch multiple users by their ids
-    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
-        let users = self.users.lock().await;
-        ids.iter()
-            .map(|id| {
-                users
-                    .get(id)
-                    .cloned()
-                    .ok_or_else(|| create_error!(NotFound))
-            })
-            .collect()
-    }
-
-    /// Fetch ids of users that both users are friends with
-    async fn fetch_mutual_user_ids(&self, _user_a: &str, _user_b: &str) -> Result<Vec<String>> {
-        todo!()
-    }
-
-    /// Fetch ids of channels that both users are in
-    async fn fetch_mutual_channel_ids(&self, _user_a: &str, _user_b: &str) -> Result<Vec<String>> {
-        todo!()
-    }
-
-    /// Fetch ids of servers that both users share
-    async fn fetch_mutual_server_ids(&self, _user_a: &str, _user_b: &str) -> Result<Vec<String>> {
-        todo!()
-    }
-
-    /// Update a user by their id given some data
-    async fn update_user(
-        &self,
-        id: &str,
-        partial: &PartialUser,
-        remove: Vec<FieldsUser>,
-    ) -> Result<()> {
-        let mut users = self.users.lock().await;
-        if let Some(user) = users.get_mut(id) {
-            for field in remove {
-                #[allow(clippy::disallowed_methods)]
-                user.remove_field(&field);
-            }
-
-            user.apply_options(partial.clone());
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
-    /// Set relationship with another user
-    ///
-    /// This should use pull_relationship if relationship is None.
-    async fn set_relationship(
-        &self,
-        _user_id: &str,
-        _target_id: &str,
-        _relationship: &RelationshipStatus,
-    ) -> Result<()> {
-        todo!()
-    }
-
-    /// Remove relationship with another user
-    async fn pull_relationship(&self, _user_id: &str, _target_id: &str) -> Result<()> {
-        todo!()
-    }
-
-    /// Delete a user by their id
-    async fn delete_user(&self, id: &str) -> Result<()> {
-        let mut users = self.users.lock().await;
-        if users.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-}
@@ -1,44 +0,0 @@
-use authifier::models::Session;
-use rocket::http::Status;
-use rocket::request::{self, FromRequest, Outcome, Request};
-
-use crate::{Database, User};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for User {
-    type Error = authifier::Error;
-
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let user: &Option<User> = request
-            .local_cache_async(async {
-                let db = request.rocket().state::<Database>().expect("`Database`");
-
-                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(user) = User::from_token(db, &bot_token, UserHint::Bot).await {
-                        return Some(user);
-                    }
-                } else */
-                if let Outcome::Success(session) = request.guard::<Session>().await {
-                    // This uses a guard so can't really easily be refactored into from_token at this stage.
-                    if let Ok(user) = db.fetch_user(&session.user_id).await {
-                        return Some(user);
-                    }
-                }
-
-                None
-            })
-            .await;
-
-        if let Some(user) = user {
-            Outcome::Success(user.clone())
-        } else {
-            Outcome::Failure((Status::Unauthorized, authifier::Error::InvalidSession))
-        }
-    }
-}
@@ -1 +0,0 @@
-pub mod v0;
@@ -1,217 +0,0 @@
-use revolt_models::v0::*;
-
-impl From<crate::AccountStrike> for AccountStrike {
-    fn from(value: crate::AccountStrike) -> Self {
-        AccountStrike {
-            id: value.id,
-            user_id: value.user_id,
-            reason: value.reason,
-        }
-    }
-}
-
-impl crate::Bot {
-    pub fn into_public_bot(self, user: crate::User) -> PublicBot {
-        #[cfg(debug_assertions)]
-        assert_eq!(self.id, user.id);
-
-        PublicBot {
-            id: self.id,
-            username: user.username,
-            avatar: user.avatar.map(|x| x.id).unwrap_or_default(),
-            description: user
-                .profile
-                .map(|profile| profile.content)
-                .unwrap_or_default(),
-        }
-    }
-}
-
-impl From<crate::Bot> for Bot {
-    fn from(value: crate::Bot) -> Self {
-        Bot {
-            id: value.id,
-            owner_id: value.owner,
-            token: value.token,
-            public: value.public,
-            analytics: value.analytics,
-            discoverable: value.discoverable,
-            interactions_url: value.interactions_url,
-            terms_of_service_url: value.terms_of_service_url,
-            privacy_policy_url: value.privacy_policy_url,
-            flags: value.flags.unwrap_or_default() as u32,
-        }
-    }
-}
-
-impl From<crate::Webhook> for Webhook {
-    fn from(value: crate::Webhook) -> Self {
-        Webhook {
-            id: value.id,
-            name: value.name,
-            avatar: value.avatar.map(|file| file.into()),
-            channel_id: value.channel_id,
-            token: value.token,
-        }
-    }
-}
-
-impl From<crate::PartialWebhook> for PartialWebhook {
-    fn from(value: crate::PartialWebhook) -> Self {
-        PartialWebhook {
-            id: value.id,
-            name: value.name,
-            avatar: value.avatar.map(|file| file.into()),
-            channel_id: value.channel_id,
-            token: value.token,
-        }
-    }
-}
-
-impl From<FieldsWebhook> for crate::FieldsWebhook {
-    fn from(_value: FieldsWebhook) -> Self {
-        Self::Avatar
-    }
-}
-
-impl From<crate::FieldsWebhook> for FieldsWebhook {
-    fn from(_value: crate::FieldsWebhook) -> Self {
-        Self::Avatar
-    }
-}
-
-impl From<crate::File> for File {
-    fn from(value: crate::File) -> Self {
-        File {
-            id: value.id,
-            tag: value.tag,
-            filename: value.filename,
-            metadata: value.metadata.into(),
-            content_type: value.content_type,
-            size: value.size,
-            deleted: value.deleted,
-            reported: value.reported,
-            message_id: value.message_id,
-            user_id: value.user_id,
-            server_id: value.server_id,
-            object_id: value.object_id,
-        }
-    }
-}
-
-impl From<crate::Metadata> for Metadata {
-    fn from(value: crate::Metadata) -> Self {
-        match value {
-            crate::Metadata::File => Metadata::File,
-            crate::Metadata::Text => Metadata::Text,
-            crate::Metadata::Image { width, height } => Metadata::Image {
-                width: width as usize,
-                height: height as usize,
-            },
-            crate::Metadata::Video { width, height } => Metadata::Video {
-                width: width as usize,
-                height: height as usize,
-            },
-            crate::Metadata::Audio => Metadata::Audio,
-        }
-    }
-}
-
-impl crate::User {
-    pub async fn into<P>(self, perspective: P) -> User
-    where
-        P: Into<Option<crate::User>>,
-    {
-        let relationship = if let Some(perspective) = perspective.into() {
-            perspective
-                .relations
-                .unwrap_or_default()
-                .into_iter()
-                .find(|relationship| relationship.id == self.id)
-                .map(|relationship| relationship.status.into())
-                .unwrap_or_default()
-        } else {
-            RelationshipStatus::None
-        };
-
-        // do permission stuff here
-        // TODO: implement permissions =)
-        let can_see_profile = false;
-
-        User {
-            username: self.username,
-            avatar: self.avatar.map(|file| file.into()),
-            relations: vec![],
-            badges: self.badges.unwrap_or_default() as u32,
-            status: None,
-            profile: None,
-            flags: self.flags.unwrap_or_default() as u32,
-            privileged: self.privileged,
-            bot: self.bot.map(|bot| bot.into()),
-            relationship,
-            online: can_see_profile && revolt_presence::is_online(&self.id).await,
-            id: self.id,
-        }
-    }
-}
-
-impl From<crate::RelationshipStatus> for RelationshipStatus {
-    fn from(value: crate::RelationshipStatus) -> Self {
-        match value {
-            crate::RelationshipStatus::None => RelationshipStatus::None,
-            crate::RelationshipStatus::User => RelationshipStatus::User,
-            crate::RelationshipStatus::Friend => RelationshipStatus::Friend,
-            crate::RelationshipStatus::Outgoing => RelationshipStatus::Outgoing,
-            crate::RelationshipStatus::Incoming => RelationshipStatus::Incoming,
-            crate::RelationshipStatus::Blocked => RelationshipStatus::Blocked,
-            crate::RelationshipStatus::BlockedOther => RelationshipStatus::BlockedOther,
-        }
-    }
-}
-
-impl From<crate::Relationship> for Relationship {
-    fn from(value: crate::Relationship) -> Self {
-        Self {
-            user_id: value.id,
-            status: value.status.into(),
-        }
-    }
-}
-
-impl From<crate::Presence> for Presence {
-    fn from(value: crate::Presence) -> Self {
-        match value {
-            crate::Presence::Online => Presence::Online,
-            crate::Presence::Idle => Presence::Idle,
-            crate::Presence::Focus => Presence::Focus,
-            crate::Presence::Busy => Presence::Busy,
-            crate::Presence::Invisible => Presence::Invisible,
-        }
-    }
-}
-
-impl From<crate::UserStatus> for UserStatus {
-    fn from(value: crate::UserStatus) -> Self {
-        UserStatus {
-            text: value.text,
-            presence: value.presence.map(|presence| presence.into()),
-        }
-    }
-}
-
-impl From<crate::UserProfile> for UserProfile {
-    fn from(value: crate::UserProfile) -> Self {
-        UserProfile {
-            content: value.content,
-            background: value.background.map(|file| file.into()),
-        }
-    }
-}
-
-impl From<crate::BotInformation> for BotInformation {
-    fn from(value: crate::BotInformation) -> Self {
-        BotInformation {
-            owner_id: value.owner,
-        }
-    }
-}
@@ -1,3 +0,0 @@
-pub mod bridge;
-pub mod permissions;
-pub mod reference;
@@ -1,206 +0,0 @@
-use std::borrow::Cow;
-
-use revolt_permissions::{
-    calculate_user_permissions, ChannelType, Override, PermissionQuery, RelationshipStatus,
-};
-
-use crate::{Database, User};
-
-/// Permissions calculator
-pub struct PermissionCalculator<'a> {
-    #[allow(dead_code)]
-    database: &'a Database,
-
-    perspective: &'a User,
-    user: Option<Cow<'a, User>>,
-    // pub channel: Cow<'a, Channel>,
-    // pub server: Cow<'a, Server>,
-    // pub member: Cow<'a, Member>,
-
-    // flag_known_relationship: Option<&'a RelationshipStatus>,
-    cached_user_permission: Option<u32>,
-    cached_permission: Option<u64>,
-}
-
-#[async_trait]
-impl PermissionQuery for PermissionCalculator<'_> {
-    // * For calculating user permission
-
-    /// Is our perspective user privileged?
-    async fn are_we_privileged(&mut self) -> bool {
-        self.perspective.privileged
-    }
-
-    /// Is our perspective user a bot?
-    async fn are_we_a_bot(&mut self) -> bool {
-        self.perspective.bot.is_some()
-    }
-
-    /// Is our perspective user and the currently selected user the same?
-    async fn are_the_users_same(&mut self) -> bool {
-        if let Some(other_user) = &self.user {
-            self.perspective.id == other_user.id
-        } else {
-            false
-        }
-    }
-
-    /// Get the relationship with have with the currently selected user
-    async fn user_relationship(&mut self) -> RelationshipStatus {
-        if let Some(other_user) = &self.user {
-            if let Some(relations) = &self.perspective.relations {
-                for entry in relations {
-                    if entry.id == other_user.id {
-                        return match entry.status {
-                            crate::RelationshipStatus::None => RelationshipStatus::None,
-                            crate::RelationshipStatus::User => RelationshipStatus::User,
-                            crate::RelationshipStatus::Friend => RelationshipStatus::Friend,
-                            crate::RelationshipStatus::Outgoing => RelationshipStatus::Outgoing,
-                            crate::RelationshipStatus::Incoming => RelationshipStatus::Incoming,
-                            crate::RelationshipStatus::Blocked => RelationshipStatus::Blocked,
-                            crate::RelationshipStatus::BlockedOther => {
-                                RelationshipStatus::BlockedOther
-                            }
-                        };
-                    }
-                }
-            }
-        }
-
-        RelationshipStatus::None
-    }
-
-    /// Whether the currently selected user is a bot
-    async fn user_is_bot(&mut self) -> bool {
-        if let Some(other_user) = &self.user {
-            other_user.bot.is_some()
-        } else {
-            false
-        }
-    }
-
-    /// Do we have a mutual connection with the currently selected user?
-    async fn have_mutual_connection(&mut self) -> bool {
-        // TODO: User::has_mutual_connection
-        false
-    }
-
-    // * For calculating server permission
-
-    /// Is our perspective user the server's owner?
-    async fn are_we_server_owner(&mut self) -> bool {
-        todo!()
-    }
-
-    /// Is our perspective user a member of the server?
-    async fn are_we_a_member(&mut self) -> bool {
-        todo!()
-    }
-
-    /// Get default server permission
-    async fn get_default_server_permissions(&mut self) -> u64 {
-        todo!()
-    }
-
-    /// Get the ordered role overrides (from lowest to highest) for this member in this server
-    async fn get_our_server_role_overrides(&mut self) -> Vec<Override> {
-        todo!()
-    }
-
-    /// Is our perspective user timed out on this server?
-    async fn are_we_timed_out(&mut self) -> bool {
-        todo!()
-    }
-
-    // * For calculating channel permission
-
-    /// Get the type of the channel
-    async fn get_channel_type(&mut self) -> ChannelType {
-        todo!()
-    }
-
-    /// Get the default channel permissions
-    /// Group channel defaults should be mapped to an allow-only override
-    async fn get_default_channel_permissions(&mut self) -> Override {
-        todo!()
-    }
-
-    /// Get the ordered role overrides (from lowest to highest) for this member in this channel
-    async fn get_our_channel_role_overrides(&mut self) -> Vec<Override> {
-        todo!()
-    }
-
-    /// Do we own this group or saved messages channel if it is one of those?
-    async fn do_we_own_the_channel(&mut self) -> bool {
-        todo!()
-    }
-
-    /// Are we a recipient of this channel?
-    async fn are_we_part_of_the_channel(&mut self) -> bool {
-        todo!()
-    }
-
-    /// Set the current user as the recipient of this channel
-    /// (this will only ever be called for DirectMessage channels, use unimplemented!() for other code paths)
-    async fn set_recipient_as_user(&mut self) {
-        todo!()
-    }
-
-    /// Set the current server as the server owning this channel
-    /// (this will only ever be called for server channels, use unimplemented!() for other code paths)
-    async fn set_server_from_channel(&mut self) {
-        todo!()
-    }
-}
-
-impl<'a> PermissionCalculator<'a> {
-    /// Create a new permission calculator
-    pub fn new(database: &'a Database, perspective: &'a User) -> PermissionCalculator<'a> {
-        PermissionCalculator {
-            database,
-            perspective,
-            user: None,
-
-            cached_user_permission: None,
-            cached_permission: None,
-        }
-    }
-
-    /// Calculate the user permission value
-    pub async fn calc_user(mut self) -> PermissionCalculator<'a> {
-        if self.cached_user_permission.is_some() {
-            return self;
-        }
-
-        if self.user.is_none() {
-            panic!("Expected `PermissionCalculator.user to exist.");
-        }
-
-        PermissionCalculator {
-            cached_user_permission: Some(calculate_user_permissions(&mut self).await),
-            ..self
-        }
-    }
-
-    /// Calculate the permission value
-    pub async fn calc(self) -> PermissionCalculator<'a> {
-        if self.cached_permission.is_some() {
-            return self;
-        }
-
-        self
-    }
-
-    /// Use user
-    pub fn user(self, user: Cow<'a, User>) -> PermissionCalculator {
-        PermissionCalculator {
-            user: Some(user),
-            ..self
-        }
-    }
-}
-
-/// Short-hand for creating a permission calculator
-pub fn perms<'a>(database: &'a Database, perspective: &'a User) -> PermissionCalculator<'a> {
-    PermissionCalculator::new(database, perspective)
-}
@@ -1,52 +0,0 @@
-use revolt_result::Result;
-#[cfg(feature = "rocket-impl")]
-use rocket::request::FromParam;
-#[cfg(feature = "rocket-impl")]
-use schemars::{
-    schema::{InstanceType, Schema, SchemaObject, SingleOrVec},
-    JsonSchema,
-};
-
-use crate::{Bot, Database};
-
-/// Reference to some object in the database
-#[derive(Serialize, Deserialize)]
-pub struct Reference {
-    /// Id of object
-    pub id: String,
-}
-
-impl Reference {
-    /// Create a Ref from an unchecked string
-    pub fn from_unchecked(id: String) -> Reference {
-        Reference { id }
-    }
-
-    /// Fetch bot from Ref
-    pub async fn as_bot(&self, db: &Database) -> Result<Bot> {
-        db.fetch_bot(&self.id).await
-    }
-}
-
-#[cfg(feature = "rocket-impl")]
-impl<'r> FromParam<'r> for Reference {
-    type Error = &'r str;
-
-    fn from_param(param: &'r str) -> Result<Self, Self::Error> {
-        Ok(Reference::from_unchecked(param.into()))
-    }
-}
-
-#[cfg(feature = "rocket-impl")]
-impl JsonSchema for Reference {
-    fn schema_name() -> String {
-        "Id".to_string()
-    }
-
-    fn json_schema(_gen: &mut schemars::gen::SchemaGenerator) -> Schema {
-        Schema::Object(SchemaObject {
-            instance_type: Some(SingleOrVec::Single(Box::new(InstanceType::String))),
-            ..Default::default()
-        })
-    }
-}
@@ -1,28 +0,0 @@
-[package]
-name = "revolt-models"
-version = "0.6.0-rc.1"
-edition = "2021"
-license = "AGPL-3.0-or-later"
-authors = [ "Paul Makles <me@insrt.uk>" ]
-description = "Revolt Backend: API Models"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-serde = [ "dep:serde" ]
-schemas = [ "dep:schemars" ]
-validator = [ "dep:validator" ]
-partials = [ "dep:revolt_optional_struct", "serde", "schemas" ]
-
-default = [ "serde", "partials" ]
-
-[dependencies]
-# Serialisation
-revolt_optional_struct = { version = "0.2.0", optional = true }
-serde = { version = "1", features = ["derive"], optional = true }
-
-# Spec Generation
-schemars = { version = "0.8.8", optional = true }
-
-# Validation
-validator = { version = "0.16.0", optional = true, features = ["derive"] }
@@ -1,59 +0,0 @@
-#[cfg(feature = "serde")]
-#[macro_use]
-extern crate serde;
-
-#[cfg(feature = "schemas")]
-#[macro_use]
-extern crate schemars;
-
-#[cfg(feature = "partials")]
-#[macro_use]
-extern crate revolt_optional_struct;
-
-#[cfg(feature = "validator")]
-pub use validator;
-
-macro_rules! auto_derived {
-    ( $( $item:item )+ ) => {
-        $(
-            #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-            #[cfg_attr(feature = "schemas", derive(JsonSchema))]
-            #[derive(Debug, Clone, Eq, PartialEq)]
-            $item
-        )+
-    };
-}
-
-#[cfg(feature = "partials")]
-macro_rules! auto_derived_partial {
-    ( $item:item, $name:expr ) => {
-        #[derive(
-            OptionalStruct, Debug, Clone, Eq, PartialEq, Serialize, Deserialize, JsonSchema,
-        )]
-        #[optional_derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
-        #[optional_name = $name]
-        #[opt_skip_serializing_none]
-        #[opt_some_priority]
-        $item
-    };
-}
-
-#[cfg(not(feature = "partials"))]
-macro_rules! auto_derived_partial {
-    ( $item:item, $name:expr ) => {
-        #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
-        $item
-    };
-}
-
-pub mod v0;
-
-/// Utility function to check if a boolean value is false
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
-
-/// Utility function to check if an u32 is zero
-pub fn if_zero_u32(t: &u32) -> bool {
-    t == &0
-}
@@ -1,28 +0,0 @@
-auto_derived!(
-    /// Account Strike
-    pub struct AccountStrike {
-        /// Strike Id
-        #[cfg_attr(feature = "serde", serde(rename = "_id"))]
-        pub id: String,
-        /// Id of reported user
-        pub user_id: String,
-
-        /// Attached reason
-        pub reason: String,
-    }
-
-    /// New strike information
-    pub struct DataCreateStrike {
-        /// Id of reported user
-        pub user_id: String,
-
-        /// Attached reason
-        pub reason: String,
-    }
-
-    /// New strike information
-    pub struct DataEditAccountStrike {
-        /// New attached reason
-        pub reason: String,
-    }
-);
@@ -1,88 +0,0 @@
-use super::User;
-
-auto_derived!(
-    /// Bot
-    pub struct Bot {
-        /// Bot Id
-        #[cfg_attr(feature = "serde", serde(rename = "_id"))]
-        pub id: String,
-
-        /// User Id of the bot owner
-        #[cfg_attr(feature = "serde", serde(rename = "owner"))]
-        pub owner_id: String,
-        /// Token used to authenticate requests for this bot
-        pub token: String,
-        /// Whether the bot is public
-        /// (may be invited by anyone)
-        pub public: bool,
-
-        /// Whether to enable analytics
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "crate::if_false", default)
-        )]
-        pub analytics: bool,
-        /// Whether this bot should be publicly discoverable
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "crate::if_false", default)
-        )]
-        pub discoverable: bool,
-        /// Reserved; URL for handling interactions
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "String::is_empty", default)
-        )]
-        pub interactions_url: String,
-        /// URL for terms of service
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "String::is_empty", default)
-        )]
-        pub terms_of_service_url: String,
-        /// URL for privacy policy
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "String::is_empty", default)
-        )]
-        pub privacy_policy_url: String,
-
-        /// Enum of bot flags
-        #[cfg_attr(
-            feature = "serde",
-            serde(skip_serializing_if = "crate::if_zero_u32", default)
-        )]
-        pub flags: u32,
-    }
-
-    /// Flags that may be attributed to a bot
-    #[repr(u32)]
-    pub enum BotFlags {
-        Verified = 1,
-        Official = 2,
-    }
-
-    /// Public Bot
-    pub struct PublicBot {
-        /// Bot Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// Bot Username
-        pub username: String,
-        /// Profile Avatar
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub avatar: String,
-        /// Profile Description
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub description: String,
-    }
-
-    /// Bot Response
-    pub struct FetchBotResponse {
-        /// Bot object
-        pub bot: Bot,
-        /// User object
-        pub user: User,
-    }
-);
@@ -1,90 +0,0 @@
-use super::File;
-
-auto_derived_partial!(
-    /// Webhook
-    pub struct Webhook {
-        /// Webhook Id
-        pub id: String,
-
-        /// The name of the webhook
-        pub name: String,
-
-        /// The avatar of the webhook
-        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
-        pub avatar: Option<File>,
-
-        /// The channel this webhook belongs to
-        pub channel_id: String,
-
-        /// The private token for the webhook
-        pub token: Option<String>,
-    },
-    "PartialWebhook"
-);
-
-auto_derived!(
-    /// Information about the webhook bundled with Message
-    pub struct MessageWebhook {
-        // The name of the webhook - 1 to 32 chars
-        pub name: String,
-
-        // The id of the avatar of the webhook, if it has one
-        pub avatar: Option<String>,
-    }
-
-    /// New webhook information
-    #[cfg_attr(feature = "validator", derive(validator::Validate))]
-    pub struct DataEditWebhook {
-        /// Webhook name
-        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 32)))]
-        pub name: Option<String>,
-
-        /// Avatar ID
-        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 128)))]
-        pub avatar: Option<String>,
-
-        /// Fields to remove from webhook
-        #[cfg_attr(feature = "serde", serde(default))]
-        pub remove: Vec<FieldsWebhook>,
-    }
-
-    /// Webhook information
-    pub struct ResponseWebhook {
-        /// Webhook Id
-        pub id: String,
-
-        /// Webhook name
-        pub name: String,
-
-        /// Avatar ID
-        pub avatar: Option<String>,
-
-        /// The channel this webhook belongs to
-        pub channel_id: String,
-    }
-
-    /// Optional fields on webhook object
-    pub enum FieldsWebhook {
-        Avatar,
-    }
-);
-
-impl From<Webhook> for MessageWebhook {
-    fn from(value: Webhook) -> Self {
-        MessageWebhook {
-            name: value.name,
-            avatar: value.avatar.map(|file| file.id),
-        }
-    }
-}
-
-impl From<Webhook> for ResponseWebhook {
-    fn from(value: Webhook) -> Self {
-        ResponseWebhook {
-            id: value.id,
-            name: value.name,
-            avatar: value.avatar.map(|file| file.id),
-            channel_id: value.channel_id,
-        }
-    }
-}
@@ -1,56 +0,0 @@
-auto_derived!(
-    /// File
-    pub struct File {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Tag / bucket this file was uploaded to
-        pub tag: String,
-        /// Original filename
-        pub filename: String,
-        /// Parsed metadata of this file
-        pub metadata: Metadata,
-        /// Raw content type of this file
-        pub content_type: String,
-        /// Size of this file (in bytes)
-        pub size: isize,
-
-        /// Whether this file was deleted
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub deleted: Option<bool>,
-        /// Whether this file was reported
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub reported: Option<bool>,
-
-        // TODO: migrate this mess to having:
-        // - author_id
-        // - parent: Parent { Message(id), User(id), etc }
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub message_id: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub user_id: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub server_id: Option<String>,
-
-        /// Id of the object this file is associated with
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub object_id: Option<String>,
-    }
-
-    /// Metadata associated with a file
-    #[serde(tag = "type")]
-    #[derive(Default)]
-    pub enum Metadata {
-        /// File is just a generic uncategorised file
-        #[default]
-        File,
-        /// File contains textual data and should be displayed as such
-        Text,
-        /// File is an image with specific dimensions
-        Image { width: usize, height: usize },
-        /// File is a video with specific dimensions
-        Video { width: usize, height: usize },
-        /// File is audio
-        Audio,
-    }
-);
@@ -1,11 +0,0 @@
-mod account_strikes;
-mod bots;
-mod channel_webhooks;
-mod files;
-mod users;
-
-pub use account_strikes::*;
-pub use bots::*;
-pub use channel_webhooks::*;
-pub use files::*;
-pub use users::*;
@@ -1,160 +0,0 @@
-use super::File;
-
-auto_derived!(
-    /// User
-    pub struct User {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Username
-        pub username: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        /// Avatar attachment
-        pub avatar: Option<File>,
-        /// Relationships with other users
-        #[serde(skip_serializing_if = "Vec::is_empty", default)]
-        pub relations: Vec<Relationship>,
-
-        /// Bitfield of user badges
-        #[serde(skip_serializing_if = "crate::if_zero_u32", default)]
-        pub badges: u32,
-        /// User's current status
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub status: Option<UserStatus>,
-        /// User's profile page
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub profile: Option<UserProfile>,
-
-        /// Enum of user flags
-        #[serde(skip_serializing_if = "crate::if_zero_u32", default)]
-        pub flags: u32,
-        /// Whether this user is privileged
-        #[serde(skip_serializing_if = "crate::if_false", default)]
-        pub privileged: bool,
-        /// Bot information
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub bot: Option<BotInformation>,
-
-        /// Current session user's relationship with this user
-        pub relationship: RelationshipStatus,
-        /// Whether this user is currently online
-        pub online: bool,
-    }
-
-    /// User's relationship with another user (or themselves)
-    #[derive(Default)]
-    pub enum RelationshipStatus {
-        #[default]
-        None,
-        User,
-        Friend,
-        Outgoing,
-        Incoming,
-        Blocked,
-        BlockedOther,
-    }
-
-    /// Relationship entry indicating current status with other user
-    pub struct Relationship {
-        #[serde(rename = "_id")]
-        pub user_id: String,
-        pub status: RelationshipStatus,
-    }
-
-    /// Presence status
-    pub enum Presence {
-        /// User is online
-        Online,
-        /// User is not currently available
-        Idle,
-        /// User is focusing / will only receive mentions
-        Focus,
-        /// User is busy / will not receive any notifications
-        Busy,
-        /// User appears to be offline
-        Invisible,
-    }
-
-    /// User's active status
-    pub struct UserStatus {
-        /// Custom status text
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub text: String,
-        /// Current presence option
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub presence: Option<Presence>,
-    }
-
-    /// User's profile
-    pub struct UserProfile {
-        /// Text content on user's profile
-        #[serde(skip_serializing_if = "String::is_empty")]
-        pub content: String,
-        /// Background visible on user's profile
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub background: Option<File>,
-    }
-
-    /// User badge bitfield
-    #[repr(u32)]
-    pub enum UserBadges {
-        /// Revolt Developer
-        Developer = 1,
-        /// Helped translate Revolt
-        Translator = 2,
-        /// Monetarily supported Revolt
-        Supporter = 4,
-        /// Responsibly disclosed a security issue
-        ResponsibleDisclosure = 8,
-        /// Revolt Founder
-        Founder = 16,
-        /// Platform moderator
-        PlatformModeration = 32,
-        /// Active monetary supporter
-        ActiveSupporter = 64,
-        /// 🦊🦝
-        Paw = 128,
-        /// Joined as one of the first 1000 users in 2021
-        EarlyAdopter = 256,
-        /// Amogus
-        ReservedRelevantJokeBadge1 = 512,
-        /// Low resolution troll face
-        ReservedRelevantJokeBadge2 = 1024,
-    }
-
-    /// User flag enum
-    #[repr(u32)]
-    pub enum UserFlags {
-        /// User has been suspended from the platform
-        Suspended = 1,
-        /// User has deleted their account
-        Deleted = 2,
-        /// User was banned off the platform
-        Banned = 4,
-        /// User was marked as spam and removed from platform
-        Spam = 8,
-    }
-
-    /// Bot information for if the user is a bot
-    pub struct BotInformation {
-        /// Id of the owner of this bot
-        #[serde(rename = "owner")]
-        pub owner_id: String,
-    }
-);
-
-pub trait CheckRelationship {
-    fn with(&self, user: &str) -> RelationshipStatus;
-}
-
-impl CheckRelationship for Vec<Relationship> {
-    fn with(&self, user: &str) -> RelationshipStatus {
-        for entry in self {
-            if entry.user_id == user {
-                return entry.status.clone();
-            }
-        }
-
-        RelationshipStatus::None
-    }
-}
@@ -1,33 +0,0 @@
-[package]
-name = "revolt-permissions"
-version = "0.6.0-rc.1"
-edition = "2021"
-license = "AGPL-3.0-or-later"
-authors = [ "Paul Makles <me@insrt.uk>" ]
-description = "Revolt Backend: Permission Logic"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-serde = [ "dep:serde" ]
-schemas = [ "dep:schemars" ]
-try-from-primitive = [ "dep:num_enum" ]
-
-[dev-dependencies]
-# Async
-async-std = { version = "1.8.0", features = ["attributes"] }
-
-[dependencies]
-# Utility
-auto_ops = "0.3.0"
-once_cell = "1.17"
-num_enum = { version = "0.6.1", optional = true }
-
-# Async
-async-trait = "0.1.51"
-
-# Serialisation
-serde = { version = "1", features = ["derive"], optional = true }
-
-# Spec Generation
-schemars = { version = "0.8.8", optional = true }
@@ -1,128 +0,0 @@
-use crate::{
-    ChannelPermission, ChannelType, PermissionQuery, PermissionValue, RelationshipStatus,
-    UserPermission, ALLOW_IN_TIMEOUT, DEFAULT_PERMISSION_DIRECT_MESSAGE,
-    DEFAULT_PERMISSION_SAVED_MESSAGES, DEFAULT_PERMISSION_VIEW_ONLY,
-};
-
-/// Calculate permissions against a user
-pub async fn calculate_user_permissions<P: PermissionQuery>(query: &mut P) -> u32 {
-    if query.are_we_privileged().await {
-        return u32::MAX;
-    }
-
-    if query.are_the_users_same().await {
-        return u32::MAX;
-    }
-
-    let mut permissions = 0_u32;
-    match query.user_relationship().await {
-        RelationshipStatus::Friend => return u32::MAX,
-        RelationshipStatus::Blocked | RelationshipStatus::BlockedOther => {
-            return UserPermission::Access as u32
-        }
-        RelationshipStatus::Incoming | RelationshipStatus::Outgoing => {
-            permissions = UserPermission::Access as u32;
-        }
-        _ => {}
-    }
-
-    if query.have_mutual_connection().await {
-        permissions = UserPermission::Access + UserPermission::ViewProfile;
-
-        if query.user_is_bot().await || query.are_we_a_bot().await {
-            permissions += UserPermission::SendMessage as u32;
-        }
-
-        permissions
-    } else {
-        permissions
-    }
-}
-
-/// Calculate permissions against a server
-pub async fn calculate_server_permissions<P: PermissionQuery>(query: &mut P) -> PermissionValue {
-    if query.are_we_privileged().await || query.are_we_server_owner().await {
-        return ChannelPermission::GrantAllSafe.into();
-    }
-
-    if !query.are_we_a_member().await {
-        return 0_u64.into();
-    }
-
-    let mut permissions: PermissionValue = query.get_default_server_permissions().await.into();
-
-    for role_override in query.get_our_server_role_overrides().await {
-        permissions.apply(role_override);
-    }
-
-    if query.are_we_timed_out().await {
-        permissions.restrict(*ALLOW_IN_TIMEOUT);
-    }
-
-    permissions
-}
-
-/// Calculate permissions against a channel
-pub async fn calculate_channel_permissions<P: PermissionQuery>(query: &mut P) -> PermissionValue {
-    if query.are_we_privileged().await {
-        return ChannelPermission::GrantAllSafe.into();
-    }
-
-    match query.get_channel_type().await {
-        ChannelType::SavedMessages => {
-            if query.do_we_own_the_channel().await {
-                DEFAULT_PERMISSION_SAVED_MESSAGES.into()
-            } else {
-                0_u64.into()
-            }
-        }
-        ChannelType::DirectMessage => {
-            if query.are_we_part_of_the_channel().await {
-                query.set_recipient_as_user().await;
-
-                let permissions = calculate_user_permissions(query).await;
-                if (permissions & UserPermission::SendMessage as u32)
-                    == UserPermission::SendMessage as u32
-                {
-                    (*DEFAULT_PERMISSION_DIRECT_MESSAGE).into()
-                } else {
-                    (*DEFAULT_PERMISSION_VIEW_ONLY).into()
-                }
-            } else {
-                0_u64.into()
-            }
-        }
-        ChannelType::Group => {
-            if query.do_we_own_the_channel().await {
-                ChannelPermission::GrantAllSafe.into()
-            } else if query.are_we_part_of_the_channel().await {
-                (*DEFAULT_PERMISSION_VIEW_ONLY
-                    | query.get_default_channel_permissions().await.allow)
-                    .into()
-            } else {
-                0_u64.into()
-            }
-        }
-        ChannelType::ServerChannel => {
-            query.set_server_from_channel().await;
-
-            if query.are_we_a_member().await {
-                let mut permissions = calculate_server_permissions(query).await;
-                permissions.apply(query.get_default_channel_permissions().await);
-
-                for role_override in query.get_our_channel_role_overrides().await {
-                    permissions.apply(role_override);
-                }
-
-                if query.are_we_timed_out().await {
-                    permissions.restrict(*ALLOW_IN_TIMEOUT);
-                }
-
-                permissions
-            } else {
-                0_u64.into()
-            }
-        }
-        ChannelType::Unknown => 0_u64.into(),
-    }
-}
@@ -1,16 +0,0 @@
-#[macro_use]
-extern crate auto_ops;
-
-#[macro_use]
-extern crate async_trait;
-
-mod r#impl;
-mod models;
-mod r#trait;
-
-pub use models::*;
-pub use r#impl::*;
-pub use r#trait::*;
-
-#[cfg(test)]
-mod test;
@@ -1,137 +0,0 @@
-use once_cell::sync::Lazy;
-use std::ops::Add;
-
-/// Abstract channel type
-pub enum ChannelType {
-    SavedMessages,
-    DirectMessage,
-    Group,
-    ServerChannel,
-    Unknown,
-}
-
-/// Permission value on Revolt
-///
-/// This should be restricted to the lower 52 bits to prevent any
-/// potential issues with Javascript. Also leave empty spaces for
-/// future permission flags to be added.
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "try-from-primitive", derive(num_enum::TryFromPrimitive))]
-#[repr(u64)]
-pub enum ChannelPermission {
-    // * Generic permissions
-    /// Manage the channel or channels on the server
-    ManageChannel = 1 << 0,
-    /// Manage the server
-    ManageServer = 1 << 1,
-    /// Manage permissions on servers or channels
-    ManagePermissions = 1 << 2,
-    /// Manage roles on server
-    ManageRole = 1 << 3,
-    /// Manage server customisation (includes emoji)
-    ManageCustomisation = 1 << 4,
-
-    // % 1 bit reserved
-
-    // * Member permissions
-    /// Kick other members below their ranking
-    KickMembers = 1 << 6,
-    /// Ban other members below their ranking
-    BanMembers = 1 << 7,
-    /// Timeout other members below their ranking
-    TimeoutMembers = 1 << 8,
-    /// Assign roles to members below their ranking
-    AssignRoles = 1 << 9,
-    /// Change own nickname
-    ChangeNickname = 1 << 10,
-    /// Change or remove other's nicknames below their ranking
-    ManageNicknames = 1 << 11,
-    /// Change own avatar
-    ChangeAvatar = 1 << 12,
-    /// Remove other's avatars below their ranking
-    RemoveAvatars = 1 << 13,
-
-    // % 7 bits reserved
-
-    // * Channel permissions
-    /// View a channel
-    ViewChannel = 1 << 20,
-    /// Read a channel's past message history
-    ReadMessageHistory = 1 << 21,
-    /// Send a message in a channel
-    SendMessage = 1 << 22,
-    /// Delete messages in a channel
-    ManageMessages = 1 << 23,
-    /// Manage webhook entries on a channel
-    ManageWebhooks = 1 << 24,
-    /// Create invites to this channel
-    InviteOthers = 1 << 25,
-    /// Send embedded content in this channel
-    SendEmbeds = 1 << 26,
-    /// Send attachments and media in this channel
-    UploadFiles = 1 << 27,
-    /// Masquerade messages using custom nickname and avatar
-    Masquerade = 1 << 28,
-    /// React to messages with emojis
-    React = 1 << 29,
-
-    // * Voice permissions
-    /// Connect to a voice channel
-    Connect = 1 << 30,
-    /// Speak in a voice call
-    Speak = 1 << 31,
-    /// Share video in a voice call
-    Video = 1 << 32,
-    /// Mute other members with lower ranking in a voice call
-    MuteMembers = 1 << 33,
-    /// Deafen other members with lower ranking in a voice call
-    DeafenMembers = 1 << 34,
-    /// Move members between voice channels
-    MoveMembers = 1 << 35,
-
-    // * Misc. permissions
-    // % Bits 36 to 52: free area
-    // % Bits 53 to 64: do not use
-
-    // * Grant all permissions
-    /// Safely grant all permissions
-    GrantAllSafe = 0x000F_FFFF_FFFF_FFFF,
-
-    /// Grant all permissions
-    GrantAll = u64::MAX,
-}
-
-impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u64 { *a as u64 | *b as u64 });
-impl_op_ex_commutative!(+ |a: &u64, b: &ChannelPermission| -> u64 { *a | *b as u64 });
-
-pub static ALLOW_IN_TIMEOUT: Lazy<u64> =
-    Lazy::new(|| ChannelPermission::ViewChannel + ChannelPermission::ReadMessageHistory);
-
-pub static DEFAULT_PERMISSION_VIEW_ONLY: Lazy<u64> =
-    Lazy::new(|| ChannelPermission::ViewChannel + ChannelPermission::ReadMessageHistory);
-
-pub static DEFAULT_PERMISSION: Lazy<u64> = Lazy::new(|| {
-    DEFAULT_PERMISSION_VIEW_ONLY.add(
-        ChannelPermission::SendMessage
-            + ChannelPermission::InviteOthers
-            + ChannelPermission::SendEmbeds
-            + ChannelPermission::UploadFiles
-            + ChannelPermission::Connect
-            + ChannelPermission::Speak,
-    )
-});
-
-pub static DEFAULT_PERMISSION_SAVED_MESSAGES: u64 = ChannelPermission::GrantAllSafe as u64;
-
-pub static DEFAULT_PERMISSION_DIRECT_MESSAGE: Lazy<u64> = Lazy::new(|| {
-    DEFAULT_PERMISSION.add(ChannelPermission::ManageChannel + ChannelPermission::React)
-});
-
-pub static DEFAULT_PERMISSION_SERVER: Lazy<u64> = Lazy::new(|| {
-    DEFAULT_PERMISSION.add(
-        ChannelPermission::React
-            + ChannelPermission::ChangeNickname
-            + ChannelPermission::ChangeAvatar,
-    )
-});
@@ -1,58 +0,0 @@
-mod channel;
-mod server;
-mod user;
-
-pub use channel::*;
-pub use server::*;
-pub use user::*;
-
-/// Holds a permission value to manipulate.
-#[derive(Debug)]
-pub struct PermissionValue(u64);
-
-impl PermissionValue {
-    /// Apply a given override to this value
-    pub fn apply(&mut self, v: Override) {
-        self.allow(v.allow);
-        self.revoke(v.deny);
-    }
-
-    /// Allow given permissions
-    pub fn allow(&mut self, v: u64) {
-        self.0 |= v;
-    }
-
-    /// Revoke given permissions
-    pub fn revoke(&mut self, v: u64) {
-        self.0 &= !v;
-    }
-
-    /// Restrict to given permissions
-    pub fn restrict(&mut self, v: u64) {
-        self.0 &= v;
-    }
-}
-
-impl From<i64> for PermissionValue {
-    fn from(v: i64) -> Self {
-        Self(v as u64)
-    }
-}
-
-impl From<u64> for PermissionValue {
-    fn from(v: u64) -> Self {
-        Self(v)
-    }
-}
-
-impl From<PermissionValue> for u64 {
-    fn from(v: PermissionValue) -> Self {
-        v.0
-    }
-}
-
-impl From<ChannelPermission> for PermissionValue {
-    fn from(v: ChannelPermission) -> Self {
-        (v as u64).into()
-    }
-}
@@ -1,56 +0,0 @@
-/// Representation of a single permission override
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct Override {
-    /// Allow bit flags
-    pub allow: u64,
-    /// Disallow bit flags
-    pub deny: u64,
-}
-
-/// Representation of a single permission override
-/// as it appears on models and in the database
-#[derive(/*JsonSchema, */ Debug, Clone, Copy, Default, Eq, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct OverrideField {
-    /// Allow bit flags
-    a: i64,
-    /// Disallow bit flags
-    d: i64,
-}
-
-impl Override {
-    /// Into allows
-    pub fn allows(&self) -> u64 {
-        self.allow
-    }
-
-    /// Into denies
-    pub fn denies(&self) -> u64 {
-        self.deny
-    }
-}
-
-impl From<Override> for OverrideField {
-    fn from(v: Override) -> Self {
-        Self {
-            a: v.allow as i64,
-            d: v.deny as i64,
-        }
-    }
-}
-
-impl From<OverrideField> for Override {
-    fn from(v: OverrideField) -> Self {
-        Self {
-            allow: v.a as u64,
-            deny: v.d as u64,
-        }
-    }
-}
-
-/*impl From<OverrideField> for Bson {
-    fn from(v: OverrideField) -> Self {
-        Self::Document(bson::to_document(&v).unwrap())
-    }
-}*/
@@ -1,25 +0,0 @@
-/// User's relationship with another user (or themselves)
-pub enum RelationshipStatus {
-    None,
-    User,
-    Friend,
-    Outgoing,
-    Incoming,
-    Blocked,
-    BlockedOther,
-}
-
-/// User permission definitions
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "try-from-primitive", derive(num_enum::TryFromPrimitive))]
-#[repr(u32)]
-pub enum UserPermission {
-    Access = 1 << 0,
-    ViewProfile = 1 << 1,
-    SendMessage = 1 << 2,
-    Invite = 1 << 3,
-}
-
-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 });
@@ -1,377 +0,0 @@
-use crate::{
-    calculate_channel_permissions, calculate_user_permissions, ChannelPermission, ChannelType,
-    Override, PermissionQuery, RelationshipStatus, DEFAULT_PERMISSION_DIRECT_MESSAGE,
-    DEFAULT_PERMISSION_SERVER, DEFAULT_PERMISSION_VIEW_ONLY,
-};
-
-#[async_std::test]
-async fn validate_user_permissions() {
-    /// Scenario in which we are friends with a user
-    /// and we have a DM channel open with them
-    struct Scenario {}
-    let mut query = Scenario {};
-
-    let perms = calculate_user_permissions(&mut query).await;
-    assert_eq!(perms, u32::MAX);
-
-    let perms = calculate_channel_permissions(&mut query).await;
-    let value: u64 = perms.into();
-    assert_eq!(value, *DEFAULT_PERMISSION_DIRECT_MESSAGE);
-
-    #[async_trait]
-    impl PermissionQuery for Scenario {
-        async fn are_we_privileged(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_bot(&mut self) -> bool {
-            false
-        }
-
-        async fn are_the_users_same(&mut self) -> bool {
-            false
-        }
-
-        async fn user_relationship(&mut self) -> RelationshipStatus {
-            RelationshipStatus::Friend
-        }
-
-        async fn user_is_bot(&mut self) -> bool {
-            false
-        }
-
-        async fn have_mutual_connection(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_server_owner(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_a_member(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn get_default_server_permissions(&mut self) -> u64 {
-            unreachable!()
-        }
-
-        async fn get_our_server_role_overrides(&mut self) -> Vec<Override> {
-            unreachable!()
-        }
-
-        async fn are_we_timed_out(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn get_channel_type(&mut self) -> ChannelType {
-            ChannelType::DirectMessage
-        }
-
-        async fn get_default_channel_permissions(&mut self) -> Override {
-            unreachable!()
-        }
-
-        async fn get_our_channel_role_overrides(&mut self) -> Vec<Override> {
-            unreachable!()
-        }
-
-        async fn do_we_own_the_channel(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_part_of_the_channel(&mut self) -> bool {
-            true
-        }
-
-        async fn set_recipient_as_user(&mut self) {
-            // no-op
-        }
-
-        async fn set_server_from_channel(&mut self) {
-            unreachable!()
-        }
-    }
-}
-
-#[async_std::test]
-async fn validate_group_permissions() {
-    /// Scenario in which we are in a group channel with only talking permission
-    struct Scenario {}
-    let mut query = Scenario {};
-
-    let perms = calculate_channel_permissions(&mut query).await;
-    let value: u64 = perms.into();
-    assert_eq!(
-        value,
-        *DEFAULT_PERMISSION_VIEW_ONLY | ChannelPermission::SendMessage as u64
-    );
-
-    #[async_trait]
-    impl PermissionQuery for Scenario {
-        async fn are_we_privileged(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_the_users_same(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn user_relationship(&mut self) -> RelationshipStatus {
-            unreachable!()
-        }
-
-        async fn user_is_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn have_mutual_connection(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_server_owner(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_a_member(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn get_default_server_permissions(&mut self) -> u64 {
-            unreachable!()
-        }
-
-        async fn get_our_server_role_overrides(&mut self) -> Vec<Override> {
-            unreachable!()
-        }
-
-        async fn are_we_timed_out(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn get_channel_type(&mut self) -> ChannelType {
-            ChannelType::Group
-        }
-
-        async fn get_default_channel_permissions(&mut self) -> Override {
-            Override {
-                allow: ChannelPermission::SendMessage as u64,
-                deny: 0,
-            }
-        }
-
-        async fn get_our_channel_role_overrides(&mut self) -> Vec<Override> {
-            unreachable!()
-        }
-
-        async fn do_we_own_the_channel(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_part_of_the_channel(&mut self) -> bool {
-            true
-        }
-
-        async fn set_recipient_as_user(&mut self) {
-            unreachable!()
-        }
-
-        async fn set_server_from_channel(&mut self) {
-            unreachable!()
-        }
-    }
-}
-
-#[async_std::test]
-async fn validate_server_permissions() {
-    /// Scenario in which we are in a server channel where:
-    /// - the server grants reading history and sending messages by default
-    /// - we have a role that allows us to upload files and react but denies reading history
-    /// - however the channel disallows sending messages
-    /// - and removes our role specific react permission
-    struct Scenario {}
-    let mut query = Scenario {};
-
-    let perms = calculate_channel_permissions(&mut query).await;
-    let value: u64 = perms.into();
-    assert_eq!(
-        value,
-        ChannelPermission::ViewChannel as u64 | ChannelPermission::UploadFiles as u64
-    );
-
-    #[async_trait]
-    impl PermissionQuery for Scenario {
-        async fn are_we_privileged(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_the_users_same(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn user_relationship(&mut self) -> RelationshipStatus {
-            unreachable!()
-        }
-
-        async fn user_is_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn have_mutual_connection(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_server_owner(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_member(&mut self) -> bool {
-            true
-        }
-
-        async fn get_default_server_permissions(&mut self) -> u64 {
-            ChannelPermission::ViewChannel as u64
-                | ChannelPermission::SendMessage as u64
-                | ChannelPermission::ReadMessageHistory as u64
-        }
-
-        async fn get_our_server_role_overrides(&mut self) -> Vec<Override> {
-            vec![Override {
-                allow: ChannelPermission::UploadFiles as u64 | ChannelPermission::React as u64,
-                deny: ChannelPermission::ReadMessageHistory as u64,
-            }]
-        }
-
-        async fn are_we_timed_out(&mut self) -> bool {
-            false
-        }
-
-        async fn get_channel_type(&mut self) -> ChannelType {
-            ChannelType::ServerChannel
-        }
-
-        async fn get_default_channel_permissions(&mut self) -> Override {
-            Override {
-                allow: 0,
-                deny: ChannelPermission::SendMessage as u64,
-            }
-        }
-
-        async fn get_our_channel_role_overrides(&mut self) -> Vec<Override> {
-            vec![Override {
-                allow: 0,
-                deny: ChannelPermission::React as u64,
-            }]
-        }
-
-        async fn do_we_own_the_channel(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_part_of_the_channel(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn set_recipient_as_user(&mut self) {
-            unreachable!()
-        }
-
-        async fn set_server_from_channel(&mut self) {
-            // no-op
-        }
-    }
-}
-
-#[async_std::test]
-async fn validate_timed_out_member() {
-    /// Scenario in which we are in a server that we have been timed out from
-    struct Scenario {}
-    let mut query = Scenario {};
-
-    let perms = calculate_channel_permissions(&mut query).await;
-    let value: u64 = perms.into();
-    assert_eq!(value, *DEFAULT_PERMISSION_VIEW_ONLY);
-
-    #[async_trait]
-    impl PermissionQuery for Scenario {
-        async fn are_we_privileged(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_the_users_same(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn user_relationship(&mut self) -> RelationshipStatus {
-            unreachable!()
-        }
-
-        async fn user_is_bot(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn have_mutual_connection(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_server_owner(&mut self) -> bool {
-            false
-        }
-
-        async fn are_we_a_member(&mut self) -> bool {
-            true
-        }
-
-        async fn get_default_server_permissions(&mut self) -> u64 {
-            *DEFAULT_PERMISSION_SERVER
-        }
-
-        async fn get_our_server_role_overrides(&mut self) -> Vec<Override> {
-            vec![]
-        }
-
-        async fn are_we_timed_out(&mut self) -> bool {
-            true
-        }
-
-        async fn get_channel_type(&mut self) -> ChannelType {
-            ChannelType::ServerChannel
-        }
-
-        async fn get_default_channel_permissions(&mut self) -> Override {
-            Override { allow: 0, deny: 0 }
-        }
-
-        async fn get_our_channel_role_overrides(&mut self) -> Vec<Override> {
-            vec![]
-        }
-
-        async fn do_we_own_the_channel(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn are_we_part_of_the_channel(&mut self) -> bool {
-            unreachable!()
-        }
-
-        async fn set_recipient_as_user(&mut self) {
-            unreachable!()
-        }
-
-        async fn set_server_from_channel(&mut self) {
-            // no-op
-        }
-    }
-}
@@ -1,67 +0,0 @@
-use crate::{ChannelType, Override, RelationshipStatus};
-
-#[async_trait]
-pub trait PermissionQuery {
-    // * For calculating user permission
-
-    /// Is our perspective user privileged?
-    async fn are_we_privileged(&mut self) -> bool;
-
-    /// Is our perspective user a bot?
-    async fn are_we_a_bot(&mut self) -> bool;
-
-    /// Is our perspective user and the currently selected user the same?
-    async fn are_the_users_same(&mut self) -> bool;
-
-    /// Get the relationship with have with the currently selected user
-    async fn user_relationship(&mut self) -> RelationshipStatus;
-
-    /// Whether the currently selected user is a bot
-    async fn user_is_bot(&mut self) -> bool;
-
-    /// Do we have a mutual connection with the currently selected user?
-    async fn have_mutual_connection(&mut self) -> bool;
-
-    // * For calculating server permission
-
-    /// Is our perspective user the server's owner?
-    async fn are_we_server_owner(&mut self) -> bool;
-
-    /// Is our perspective user a member of the server?
-    async fn are_we_a_member(&mut self) -> bool;
-
-    /// Get default server permission
-    async fn get_default_server_permissions(&mut self) -> u64;
-
-    /// Get the ordered role overrides (from lowest to highest) for this member in this server
-    async fn get_our_server_role_overrides(&mut self) -> Vec<Override>;
-
-    /// Is our perspective user timed out on this server?
-    async fn are_we_timed_out(&mut self) -> bool;
-
-    // * For calculating channel permission
-
-    /// Get the type of the channel
-    async fn get_channel_type(&mut self) -> ChannelType;
-
-    /// Get the default channel permissions
-    /// Group channel defaults should be mapped to an allow-only override
-    async fn get_default_channel_permissions(&mut self) -> Override;
-
-    /// Get the ordered role overrides (from lowest to highest) for this member in this channel
-    async fn get_our_channel_role_overrides(&mut self) -> Vec<Override>;
-
-    /// Do we own this group or saved messages channel if it is one of those?
-    async fn do_we_own_the_channel(&mut self) -> bool;
-
-    /// Are we a recipient of this channel?
-    async fn are_we_part_of_the_channel(&mut self) -> bool;
-
-    /// Set the current user as the recipient of this channel
-    /// (this will only ever be called for DirectMessage channels, use unimplemented!() for other code paths)
-    async fn set_recipient_as_user(&mut self);
-
-    /// Set the current server as the server owning this channel
-    /// (this will only ever be called for server channels, use unimplemented!() for other code paths)
-    async fn set_server_from_channel(&mut self);
-}
@@ -1,25 +0,0 @@
-[package]
-name = "revolt-presence"
-version = "0.6.0-rc.1"
-edition = "2021"
-license = "AGPL-3.0-or-later"
-authors = [ "Paul Makles <me@insrt.uk>" ]
-description = "Revolt Backend: User Presence"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-redis-is-patched = []
-
-[dev-dependencies]
-# Async
-async-std = { version = "1.8.0", features = ["attributes"] }
-
-[dependencies]
-# Utility
-log = "0.4.17"
-rand = "0.8.5"
-once_cell = "1.17.1"
-
-# Redis
-redis-kiss = "0.1.4"
@@ -1,30 +0,0 @@
-[package]
-name = "revolt-result"
-version = "0.6.0-rc.1"
-edition = "2021"
-license = "AGPL-3.0-or-later"
-authors = [ "Paul Makles <me@insrt.uk>" ]
-description = "Revolt Backend: Result and Error types"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-serde = [ "dep:serde" ]
-schemas = [ "dep:schemars" ]
-rocket = [ "dep:rocket", "dep:serde_json" ]
-okapi = [ "dep:revolt_rocket_okapi", "dep:revolt_okapi" ]
-
-default = [ "serde" ]
-
-[dependencies]
-# Serialisation
-serde_json = { version = "1", optional = true }
-serde = { version = "1", features = ["derive"], optional = true }
-
-# Spec Generation
-schemars = { version = "0.8.8", optional = true }
-
-# Rocket
-rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
-revolt_rocket_okapi = { version = "0.9.1", optional = true }
-revolt_okapi = { version = "0.9.1", optional = true }
@@ -1,184 +0,0 @@
-#[cfg(feature = "serde")]
-#[macro_use]
-extern crate serde;
-
-#[cfg(feature = "schemas")]
-#[macro_use]
-extern crate schemars;
-
-#[cfg(feature = "rocket")]
-pub mod rocket;
-
-#[cfg(feature = "okapi")]
-pub mod okapi;
-
-/// Result type with custom Error
-pub type Result<T, E = Error> = std::result::Result<T, E>;
-
-/// Error information
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "schemas", derive(JsonSchema))]
-#[derive(Debug, Clone)]
-pub struct Error {
-    /// Type of error and additional information
-    #[cfg_attr(feature = "serde", serde(flatten))]
-    pub error_type: ErrorType,
-
-    /// Where this error occurred
-    pub location: String,
-}
-
-/// Possible error types
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(tag = "type"))]
-#[cfg_attr(feature = "schemas", derive(JsonSchema))]
-#[derive(Debug, Clone)]
-pub enum ErrorType {
-    /// This error was not labeled :(
-    LabelMe,
-
-    // ? Onboarding related errors
-    AlreadyOnboarded,
-
-    // ? User related errors
-    UsernameTaken,
-    InvalidUsername,
-    UnknownUser,
-    AlreadyFriends,
-    AlreadySentRequest,
-    Blocked,
-    BlockedByOther,
-    NotFriends,
-
-    // ? Channel related errors
-    UnknownChannel,
-    UnknownAttachment,
-    UnknownMessage,
-    CannotEditMessage,
-    CannotJoinCall,
-    TooManyAttachments {
-        max: usize,
-    },
-    TooManyReplies {
-        max: usize,
-    },
-    TooManyChannels {
-        max: usize,
-    },
-    EmptyMessage,
-    PayloadTooLarge,
-    CannotRemoveYourself,
-    GroupTooLarge {
-        max: usize,
-    },
-    AlreadyInGroup,
-    NotInGroup,
-
-    // ? Server related errors
-    UnknownServer,
-    InvalidRole,
-    Banned,
-    TooManyServers {
-        max: usize,
-    },
-    TooManyEmoji {
-        max: usize,
-    },
-    TooManyRoles {
-        max: usize,
-    },
-
-    // ? Bot related errors
-    ReachedMaximumBots,
-    IsBot,
-    BotIsPrivate,
-
-    // ? User safety related errors
-    CannotReportYourself,
-
-    // ? Permission errors
-    MissingPermission {
-        permission: String,
-    },
-    MissingUserPermission {
-        permission: String,
-    },
-    NotElevated,
-    NotPrivileged,
-    CannotGiveMissingPermissions,
-    NotOwner,
-
-    // ? General errors
-    DatabaseError {
-        operation: String,
-        collection: String,
-    },
-    InternalError,
-    InvalidOperation,
-    InvalidCredentials,
-    InvalidProperty,
-    InvalidSession,
-    DuplicateNonce,
-    NotFound,
-    NoEffect,
-    FailedValidation {
-        error: String,
-    },
-
-    // ? Legacy errors
-    VosoUnavailable,
-}
-
-#[macro_export]
-macro_rules! create_error {
-    ( $error: ident $( $tt:tt )? ) => {
-        $crate::Error {
-            error_type: $crate::ErrorType::$error $( $tt )?,
-            location: format!("{}:{}:{}", file!(), line!(), column!()),
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! create_database_error {
-    ( $operation: expr, $collection: expr ) => {
-        create_error!(DatabaseError {
-            operation: $operation.to_string(),
-            collection: $collection.to_string()
-        })
-    };
-}
-
-#[macro_export]
-#[cfg(debug_assertions)]
-macro_rules! query {
-    ( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
-        Ok($self.$type($collection, $($rest),+).await.unwrap())
-    };
-}
-
-#[macro_export]
-#[cfg(not(debug_assertions))]
-macro_rules! query {
-    ( $self: ident, $type: ident, $collection: expr, $($rest:expr),+ ) => {
-        $self.$type($collection, $($rest),+).await
-            .map_err(|_| create_database_error!(stringify!($type), $collection))
-    };
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::ErrorType;
-
-    #[test]
-    fn use_macro_to_construct_error() {
-        let error = create_error!(LabelMe);
-        assert!(matches!(error.error_type, ErrorType::LabelMe));
-    }
-
-    #[test]
-    fn use_macro_to_construct_complex_error() {
-        let error = create_error!(LabelMe);
-        assert!(matches!(error.error_type, ErrorType::LabelMe));
-    }
-}
@@ -1,49 +0,0 @@
-use revolt_okapi::openapi3::SchemaObject;
-use revolt_rocket_okapi::revolt_okapi::openapi3;
-use schemars::schema::Schema;
-
-use crate::Error;
-
-impl revolt_rocket_okapi::response::OpenApiResponderInner for Error {
-    fn responses(
-        gen: &mut revolt_rocket_okapi::gen::OpenApiGenerator,
-    ) -> std::result::Result<openapi3::Responses, revolt_rocket_okapi::OpenApiError> {
-        let mut content = revolt_okapi::Map::new();
-
-        let settings = schemars::gen::SchemaSettings::default().with(|s| {
-            s.option_nullable = true;
-            s.option_add_null_type = false;
-            s.definitions_path = "#/components/schemas/".to_string();
-        });
-
-        let mut schema_generator = settings.into_generator();
-        let schema = schema_generator.root_schema_for::<Error>();
-
-        let definitions = gen.schema_generator().definitions_mut();
-        for (key, value) in schema.definitions {
-            definitions.insert(key, value);
-        }
-
-        definitions.insert("Error".to_string(), Schema::Object(schema.schema));
-
-        content.insert(
-            "application/json".to_string(),
-            openapi3::MediaType {
-                schema: Some(SchemaObject {
-                    reference: Some("#/components/schemas/Error".to_string()),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-        );
-
-        Ok(openapi3::Responses {
-            default: Some(openapi3::RefOr::Object(openapi3::Response {
-                content,
-                description: "An error occurred.".to_string(),
-                ..Default::default()
-            })),
-            ..Default::default()
-        })
-    }
-}
@@ -1,87 +0,0 @@
-use std::io::Cursor;
-
-use rocket::{
-    http::{ContentType, Status},
-    response::{self, Responder},
-    Request, Response,
-};
-
-use crate::{Error, ErrorType};
-
-/// 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_type {
-            ErrorType::LabelMe => Status::InternalServerError,
-
-            ErrorType::AlreadyOnboarded => Status::Forbidden,
-
-            ErrorType::UnknownUser => Status::NotFound,
-            ErrorType::InvalidUsername => Status::BadRequest,
-            ErrorType::UsernameTaken => Status::Conflict,
-            ErrorType::AlreadyFriends => Status::Conflict,
-            ErrorType::AlreadySentRequest => Status::Conflict,
-            ErrorType::Blocked => Status::Conflict,
-            ErrorType::BlockedByOther => Status::Forbidden,
-            ErrorType::NotFriends => Status::Forbidden,
-
-            ErrorType::UnknownChannel => Status::NotFound,
-            ErrorType::UnknownMessage => Status::NotFound,
-            ErrorType::UnknownAttachment => Status::BadRequest,
-            ErrorType::CannotEditMessage => Status::Forbidden,
-            ErrorType::CannotJoinCall => Status::BadRequest,
-            ErrorType::TooManyAttachments { .. } => Status::BadRequest,
-            ErrorType::TooManyReplies { .. } => Status::BadRequest,
-            ErrorType::EmptyMessage => Status::UnprocessableEntity,
-            ErrorType::PayloadTooLarge => Status::UnprocessableEntity,
-            ErrorType::CannotRemoveYourself => Status::BadRequest,
-            ErrorType::GroupTooLarge { .. } => Status::Forbidden,
-            ErrorType::AlreadyInGroup => Status::Conflict,
-            ErrorType::NotInGroup => Status::NotFound,
-
-            ErrorType::UnknownServer => Status::NotFound,
-            ErrorType::InvalidRole => Status::NotFound,
-            ErrorType::Banned => Status::Forbidden,
-
-            ErrorType::TooManyServers { .. } => Status::BadRequest,
-            ErrorType::TooManyEmoji { .. } => Status::BadRequest,
-            ErrorType::TooManyChannels { .. } => Status::BadRequest,
-            ErrorType::TooManyRoles { .. } => Status::BadRequest,
-
-            ErrorType::ReachedMaximumBots => Status::BadRequest,
-            ErrorType::IsBot => Status::BadRequest,
-            ErrorType::BotIsPrivate => Status::Forbidden,
-
-            ErrorType::CannotReportYourself => Status::BadRequest,
-
-            ErrorType::MissingPermission { .. } => Status::Forbidden,
-            ErrorType::MissingUserPermission { .. } => Status::Forbidden,
-            ErrorType::NotElevated => Status::Forbidden,
-            ErrorType::NotPrivileged => Status::Forbidden,
-            ErrorType::CannotGiveMissingPermissions => Status::Forbidden,
-            ErrorType::NotOwner => Status::Forbidden,
-
-            ErrorType::DatabaseError { .. } => Status::InternalServerError,
-            ErrorType::InternalError => Status::InternalServerError,
-            ErrorType::InvalidOperation => Status::BadRequest,
-            ErrorType::InvalidCredentials => Status::Unauthorized,
-            ErrorType::InvalidProperty => Status::BadRequest,
-            ErrorType::InvalidSession => Status::Unauthorized,
-            ErrorType::DuplicateNonce => Status::Conflict,
-            ErrorType::VosoUnavailable => Status::BadRequest,
-            ErrorType::NotFound => Status::NotFound,
-            ErrorType::NoEffect => Status::Ok,
-            ErrorType::FailedValidation { .. } => Status::BadRequest,
-        };
-
-        // Serialize the error data structure into JSON.
-        let string = serde_json::to_string(&self).unwrap();
-
-        // Build and send the request.
-        Response::build()
-            .sized_body(string.len(), Cursor::new(string))
-            .header(ContentType::new("application", "json"))
-            .status(status)
-            .ok()
-    }
-}
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.6.0-rc.1"
+version = "0.5.19"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -31,7 +31,7 @@ nanoid = "0.4.0"
 # serde
 serde_json = "1.0.57"
 serde = { version = "1.0.115", features = ["derive"] }
-validator = { version = "0.16", features = ["derive"] }
+validator = { version = "0.14", features = ["derive"] }

 # async
 futures = "0.3.8"
@@ -55,10 +55,5 @@ revolt_rocket_okapi = { version = "0.9.1", features = [ "swagger" ] }
 # quark
 revolt-quark = { path = "../quark" }

-# core
-revolt-database = { path = "../core/database", features = [ "rocket-impl", "redis-is-patched" ] }
-revolt-models = { path = "../core/models", features = [ "schemas", "validator" ] }
-revolt-result = { path = "../core/result", features = [ "rocket", "okapi" ] }
-
 [build-dependencies]
 vergen = "7.5.0"
@@ -12,7 +12,6 @@ use async_std::channel::unbounded;
 use revolt_quark::authifier::{Authifier, AuthifierEvent};
 use revolt_quark::events::client::EventV1;
 use revolt_quark::DatabaseInfo;
-use rocket::data::ToByteUnit;

 #[launch]
 async fn rocket() -> _ {
@@ -23,18 +22,15 @@ async fn rocket() -> _ {
    revolt_quark::variables::delta::preflight_checks();

    // Setup database
-    let db = revolt_database::DatabaseInfo::Auto.connect().await.unwrap();
+    let db = DatabaseInfo::Auto.connect().await.unwrap();
    db.migrate_database().await.unwrap();

-    // Legacy database setup from quark
-    let legacy_db = DatabaseInfo::Auto.connect().await.unwrap();
-
    // Setup Authifier event channel
    let (sender, receiver) = unbounded();

    // Setup Authifier
    let authifier = Authifier {
-        database: legacy_db.clone().into(),
+        database: db.clone().into(),
        config: revolt_quark::util::authifier::config(),
        event_channel: Some(sender),
    };
@@ -56,7 +52,7 @@ async fn rocket() -> _ {
    });

    // Launch background task workers
-    async_std::task::spawn(revolt_quark::tasks::start_workers(legacy_db.clone()));
+    async_std::task::spawn(revolt_quark::tasks::start_workers(db.clone()));

    // Configure CORS
    let cors = revolt_quark::web::cors::new();
@@ -69,13 +65,7 @@ async fn rocket() -> _ {
        .mount("/swagger/", revolt_quark::web::swagger::routes())
        .manage(authifier)
        .manage(db)
-        .manage(legacy_db)
        .manage(cors.clone())
        .attach(revolt_quark::web::ratelimiter::RatelimitFairing)
        .attach(cors)
-        .configure(rocket::Config {
-            limits: rocket::data::Limits::default()
-                .limit("string", 5.megabytes()),
-            ..Default::default()
-        })
 }
@@ -1,34 +1,36 @@
-use revolt_database::{util::reference::Reference, Database};
-use revolt_models::v0::FetchBotResponse;
-use revolt_quark::{models::User, Error, Result};
-use rocket::{serde::json::Json, State};
+use revolt_quark::{
+    models::{Bot, User},
+    Db, Error, Ref, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
+
+/// # 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("/<bot>")]
-pub async fn fetch_bot(
-    db: &State<Database>,
-    user: User,
-    bot: Reference,
-) -> Result<Json<FetchBotResponse>> {
+#[get("/<target>")]
+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 = bot.as_bot(db).await.map_err(Error::from_core)?;
+    let bot = target.as_bot(db).await?;
    if bot.owner != user.id {
        return Err(Error::NotFound);
    }

-    Ok(Json(FetchBotResponse {
-        user: db
-            .fetch_user(&bot.id)
-            .await
-            .map_err(Error::from_core)?
-            .into(None)
-            .await,
-        bot: bot.into(),
+    Ok(Json(BotResponse {
+        user: db.fetch_user(&bot.id).await?.foreign(),
+        bot,
    }))
 }
@@ -1,25 +1,44 @@
-use revolt_database::Database;
-use revolt_models::v0::PublicBot;
-use revolt_quark::{models::User, Error, Ref, Result};
+use revolt_quark::{
+    models::{File, User},
+    Db, Error, Ref, Result,
+};

 use rocket::serde::json::Json;
-use rocket::State;
+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(
-    db: &State<Database>,
-    user: Option<User>,
-    target: Ref,
-) -> Result<Json<PublicBot>> {
-    let bot = db.fetch_bot(&target.id).await.map_err(Error::from_core)?;
+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 = db.fetch_user(&bot.id).await.map_err(Error::from_core)?;
-    Ok(Json(bot.into_public_bot(user)))
+    let user = db.fetch_user(&bot.id).await?;
+
+    Ok(Json(PublicBot {
+        id: bot.id,
+        username: user.username,
+        avatar: user.avatar,
+        description: user.profile.and_then(|p| p.content),
+    }))
 }
@@ -11,6 +11,10 @@ use rocket::serde::json::Json;
 #[openapi(tag = "Groups")]
 #[get("/<target>/members")]
 pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
    let channel = target.as_channel(db).await?;
    perms(&user)
        .channel(&channel)
@@ -44,6 +44,8 @@ pub async fn req(
        .throw_permission_and_view_channel(db, Permission::SendMessage)
        .await?;

+    Message::validate_sum(&edit.content, &edit.embeds)?;
+
    let mut message = msg.as_message(db).await?;
    if message.channel != channel.id() {
        return Err(Error::NotFound);
@@ -53,12 +55,6 @@ pub async fn req(
        return Err(Error::CannotEditMessage);
    }

-    if let Some(new_embeds) = &edit.embeds {
-        Message::validate_sum(&edit.content, new_embeds)?;
-    } else {
-        Message::validate_sum(&edit.content, &vec![])?;
-    }
-
    message.edited = Some(Timestamp::now_utc());
    let mut partial = PartialMessage {
        edited: message.edited,
@@ -1,13 +1,51 @@
+use std::collections::HashSet;
+
 use revolt_quark::{
-    models::{message::DataMessageSend, Message, User},
+    models::{
+        message::{Interactions, Masquerade, Reply, SendableEmbed},
+        Message, User,
+    },
    perms,
-    types::push::MessageAuthor,
    web::idempotency::IdempotencyKey,
-    Db, Error, Permission, Ref, Result,
+    Db, Error, Permission, Ref, Result, variables::delta::{MAX_ATTACHMENT_COUNT, MAX_REPLY_COUNT},
 };

+use regex::Regex;
 use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
+use ulid::Ulid;
 use validator::Validate;
+use once_cell::sync::Lazy;
+
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataMessageSend {
+    /// Unique token to prevent duplicate message sending
+    ///
+    /// **This is deprecated and replaced by `Idempotency-Key`!**
+    #[validate(length(min = 1, max = 64))]
+    nonce: Option<String>,
+
+    /// Message content to send
+    #[validate(length(min = 0, max = 2000))]
+    content: Option<String>,
+    /// Attachments to include in message
+    #[validate(length(min = 1, max = 128))]
+    attachments: Option<Vec<String>>,
+    /// Messages to reply to
+    replies: Option<Vec<Reply>>,
+    /// Embeds to include in message
+    ///
+    /// Text embed content contributes to the content length cap
+    #[validate(length(min = 1, max = 10))]
+    embeds: Option<Vec<SendableEmbed>>,
+    /// Masquerade to apply to this message
+    #[validate]
+    masquerade: Option<Masquerade>,
+    /// Information about how this message should be interacted with
+    interactions: Option<Interactions>,
+}
+
+static RE_MENTION: Lazy<Regex> = Lazy::new(|| Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap());

 /// # Send Message
 ///
@@ -19,22 +57,71 @@ pub async fn message_send(
    user: User,
    target: Ref,
    data: Json<DataMessageSend>,
-    idempotency: IdempotencyKey,
+    mut idempotency: IdempotencyKey,
 ) -> Result<Json<Message>> {
    let data = data.into_inner();
    data.validate()
        .map_err(|error| Error::FailedValidation { error })?;

+    // Validate Message is within reasonable length limits
+    Message::validate_sum(&data.content, &data.embeds)?;
+
+    // Ensure the request is unique
+    idempotency.consume_nonce(data.nonce).await?;
+
    // Ensure we have permissions to send a message
    let channel = target.as_channel(db).await?;
-
    let mut permissions = perms(&user).channel(&channel);
    permissions
        .throw_permission_and_view_channel(db, Permission::SendMessage)
        .await?;

-    // Verify permissions for masquerade
-    if let Some(masq) = &data.masquerade {
+    // Check the message is not empty
+    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);
+    }
+
+    // Ensure restrict_reactions is not specified without reactions list
+    if let Some(interactions) = &data.interactions {
+        if interactions.restrict_reactions {
+            let disallowed = if let Some(list) = &interactions.reactions {
+                list.is_empty()
+            } else {
+                true
+            };
+
+            if disallowed {
+                return Err(Error::InvalidProperty);
+            }
+        }
+    }
+
+    // Start constructing the message
+    let message_id = Ulid::new().to_string();
+    let mut message = Message {
+        id: message_id.clone(),
+        channel: channel.id().to_string(),
+        author: user.id.clone(),
+        masquerade: data.masquerade,
+        interactions: data.interactions.unwrap_or_default(),
+        ..Default::default()
+    };
+
+    // 1. Parse mentions in message.
+    let mut mentions = HashSet::new();
+    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());
+            }
+        }
+    }
+
+    // 2. Verify permissions for masquerade.
+    if let Some(masq) = &message.masquerade {
        permissions
            .throw_permission(db, Permission::Masquerade)
            .await?;
@@ -46,37 +133,97 @@ pub async fn message_send(
        }
    }

-    // Check permissions for embeds
-    if !data.embeds.is_empty() {
-        permissions
-            .throw_permission(db, Permission::SendEmbeds)
-            .await?;
+    // 3. Ensure interactions information is correct
+    message.interactions.validate(db, &mut permissions).await?;
+
+    // 4. Verify replies are valid.
+    let mut replies = HashSet::new();
+    if let Some(entries) = data.replies {
+        if entries.len() > *MAX_REPLY_COUNT {
+            return Err(Error::TooManyReplies { max: *MAX_REPLY_COUNT });
+        }
+
+        for Reply { id, mention } in entries {
+            let message = Ref::from_unchecked(id).as_message(db).await?;
+
+            replies.insert(message.id);
+
+            if mention {
+                mentions.insert(message.author);
+            }
+        }
    }

-    // Check permissions for files
-    if !data.attachments.is_empty() {
-        permissions
-            .throw_permission(db, Permission::UploadFiles)
-            .await?;
+    if !mentions.is_empty() {
+        message.mentions.replace(
+            mentions
+                .into_iter()
+                .filter(|id| !user.has_blocked(id))
+                .collect::<Vec<String>>(),
+        );
    }

-    // Ensure interactions information is correct
-    if let Some(interactions) = &data.interactions {
-        interactions.validate(db, &mut permissions).await?;
+    if !replies.is_empty() {
+        message
+            .replies
+            .replace(replies.into_iter().collect::<Vec<String>>());
    }

-    // Create the message
-    let message = channel
-        .send_message(
-            db,
-            data,
-            MessageAuthor::User(&user),
-            idempotency,
+    // 5. Process included embeds.
+    let mut embeds = vec![];
+    if let Some(sendable_embeds) = data.embeds {
+        for sendable_embed in sendable_embeds {
+            embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?)
+        }
+    }
+
+    if !embeds.is_empty() {
+        message.embeds.replace(embeds);
+    }
+
+    // 6. Add attachments to message.
+    let mut attachments = vec![];
+    if let Some(ids) = &data.attachments {
+        if !ids.is_empty() {
            permissions
-                .has_permission(db, Permission::SendEmbeds)
-                .await?,
+                .throw_permission(db, Permission::UploadFiles)
+                .await?;
+        }
+
+        // ! FIXME: move this to app config
+        if ids.len() > *MAX_ATTACHMENT_COUNT {
+            return Err(Error::TooManyAttachments { max: *MAX_ATTACHMENT_COUNT} );
+        }
+
+        for attachment_id in ids {
+            attachments.push(
+                db.find_and_use_attachment(attachment_id, "attachments", "message", &message_id)
+                    .await?,
+            );
+        }
+    }
+
+    if !attachments.is_empty() {
+        message.attachments.replace(attachments);
+    }
+
+    // 7. Set content
+    message.content = data.content;
+
+    // 8. 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?;
+        .await;
+    }

    Ok(Json(message))
 }
@@ -24,8 +24,6 @@ mod message_unreact;
 mod permissions_set;
 mod permissions_set_default;
 mod voice_join;
-mod webhook_create;
-mod webhook_fetch_all;

 pub fn routes() -> (Vec<Route>, OpenApi) {
    openapi_get_routes_spec![
@@ -51,8 +49,6 @@ pub fn routes() -> (Vec<Route>, OpenApi) {
        permissions_set_default::req,
        message_react::react_message,
        message_unreact::unreact_message,
-        message_clear_reactions::clear_reactions,
-        webhook_create::req,
-        webhook_fetch_all::req,
+        message_clear_reactions::clear_reactions
    ]
 }
--- a/Show More
+++ b/Show More