chore: add additional sanitisation

feat: add remove "displayname" field
fix: actually update the display name
2026-07-06 03:06:04 +00:00 · 2023-06-11 12:26:18 +01:00 · 2023-06-11 12:05:08 +01:00 · 2023-06-11 11:50:21 +01:00 · 2023-06-11 10:56:03 +01:00 · 2023-06-11 10:49:51 +01:00
185 changed files with 11852 additions and 1078 deletions
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -2,7 +2,6 @@ name: Rust build, test, and generate specification

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

@@ -27,34 +26,40 @@ 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'
+        if: github.event_name != 'pull_request' && github.ref_name == 'master'
        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'
+        if: github.event_name != 'pull_request' && github.ref_name == 'master'
        run: |
          cargo run --bin revolt-delta &

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

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

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

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

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

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

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

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

@@ -343,7 +342,7 @@ dependencies = [
 "chrono",
 "futures",
 "handlebars",
- "iso8601-timestamp",
+ "iso8601-timestamp 0.1.10",
 "lazy_static",
 "lettre",
 "log",
@@ -364,6 +363,12 @@ 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"
@@ -715,7 +720,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

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

@@ -801,6 +806,12 @@ dependencies = [
 "uuid",
 ]

+[[package]]
+name = "decancer"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808127a7de612079ec37bfc1abc48ed77a6015a971a8bd7d4178d79147cbc839"
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -808,7 +819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

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

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

@@ -871,12 +882,6 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"

-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.5"
@@ -915,7 +920,7 @@ checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
 "heck",
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

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

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

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

@@ -1606,6 +1611,17 @@ 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"
@@ -1831,6 +1847,27 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

+[[package]]
+name = "metrics"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834"
+dependencies = [
+ "ahash",
+ "metrics-macros",
+]
+
+[[package]]
+name = "metrics-macros"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.26",
+ "syn 1.0.107",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -1897,9 +1934,9 @@ dependencies = [

 [[package]]
 name = "mobc"
-version = "0.7.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f76d2f2e2dcbb00a8d3b2b09f026a74a82693ea52cd071647aa6cfa7f1ff37e"
+checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f"
 dependencies = [
 "async-std",
 "async-trait",
@@ -1908,17 +1945,21 @@ dependencies = [
 "futures-timer",
 "futures-util",
 "log",
+ "metrics",
+ "thiserror",
 "tokio 1.18.2",
+ "tracing",
+ "tracing-subscriber",
 ]

 [[package]]
 name = "mobc-redis"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b5db77b37c9224d5b9949b214041ea3e1c15b6b1e5dd24a5acb8e73975d6d6"
+checksum = "7bd8e2fd6bf7e35263b86662e663a9496a0352ceddd413b6c33313c36d5068fd"
 dependencies = [
 "mobc",
- "redis 0.19.0",
+ "redis 0.22.3",
 ]

 [[package]]
@@ -2080,7 +2121,16 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
 dependencies = [
- "num_enum_derive",
+ "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",
 ]

 [[package]]
@@ -2091,10 +2141,22 @@ checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "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"
@@ -2144,7 +2206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

@@ -2167,15 +2229,6 @@ 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"
@@ -2249,7 +2302,7 @@ checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
 dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

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

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

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

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

 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
 "proc-macro2",
 ]
@@ -2624,57 +2677,55 @@ dependencies = [

 [[package]]
 name = "redis"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a6ddfecac9391fed21cce10e83c65fa4abafd77df05c98b1c647c65374ce9b3"
+version = "0.22.3"
+source = "git+https://github.com/insertish/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
 dependencies = [
 "async-std",
 "async-trait",
 "bytes 1.1.0",
 "combine",
- "dtoa",
 "futures-util",
- "itoa 0.4.8",
+ "itoa 1.0.2",
 "percent-encoding",
 "pin-project-lite 0.2.9",
- "sha1",
+ "ryu",
+ "sha1_smol",
 "tokio 1.18.2",
- "tokio-util 0.6.10",
+ "tokio-util 0.7.2",
 "url",
 ]

 [[package]]
 name = "redis"
-version = "0.21.5"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a80b5f38d7f5a020856a0e16e40a9cfabf88ae8f0e4c2dcd8a3114c1e470852"
+checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f"
 dependencies = [
 "async-std",
 "async-trait",
 "bytes 1.1.0",
 "combine",
- "dtoa",
 "futures-util",
- "itoa 0.4.8",
+ "itoa 1.0.2",
 "percent-encoding",
 "pin-project-lite 0.2.9",
- "sha1",
+ "ryu",
 "tokio 1.18.2",
- "tokio-util 0.6.10",
+ "tokio-util 0.7.2",
 "url",
 ]

 [[package]]
 name = "redis-kiss"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4f2f48fb776a308331c4a1ecb3a7b7b99f4d46c6beb2fc03db2da0f63fcad6"
+checksum = "58605cfd83a2146161de13bb253f24db25eef6919b35403fc90f508ef89bec92"
 dependencies = [
 "bincode",
 "lazy_static",
 "mobc",
 "mobc-redis",
- "redis 0.21.5",
+ "redis 0.23.0",
 "rmp-serde",
 "serde",
 "serde_json",
@@ -2705,7 +2756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 ]

@@ -2792,7 +2843,7 @@ dependencies = [

 [[package]]
 name = "revolt-bonfire"
-version = "0.5.18"
+version = "0.6.1"
 dependencies = [
 "async-std",
 "async-tungstenite",
@@ -2800,15 +2851,47 @@ dependencies = [
 "log",
 "once_cell",
 "querystring",
+ "revolt-presence",
 "revolt-quark",
 "rmp-serde",
 "serde",
 "serde_json",
 ]

+[[package]]
+name = "revolt-database"
+version = "0.6.1"
+dependencies = [
+ "async-recursion",
+ "async-std",
+ "async-trait",
+ "authifier",
+ "bson",
+ "futures",
+ "iso8601-timestamp 0.2.10",
+ "log",
+ "mongodb",
+ "nanoid",
+ "once_cell",
+ "rand 0.8.5",
+ "redis-kiss",
+ "regex",
+ "revolt-models",
+ "revolt-permissions",
+ "revolt-presence",
+ "revolt-result",
+ "revolt_optional_struct",
+ "rocket",
+ "schemars",
+ "serde",
+ "serde_json",
+ "ulid 1.0.0",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "revolt-delta"
-version = "0.5.18"
+version = "0.6.1"
 dependencies = [
 "async-channel",
 "async-std",
@@ -2823,15 +2906,16 @@ dependencies = [
 "linkify 0.6.0",
 "log",
 "lru",
- "mobc",
- "mobc-redis",
 "nanoid",
- "num_enum",
+ "num_enum 0.5.7",
 "once_cell",
- "redis 0.21.5",
 "regex",
 "reqwest",
+ "revolt-database",
+ "revolt-models",
+ "revolt-permissions",
 "revolt-quark",
+ "revolt-result",
 "revolt_rocket_okapi",
 "rocket",
 "rocket_authifier",
@@ -2841,13 +2925,49 @@ dependencies = [
 "serde_json",
 "ulid 0.4.1",
 "url",
- "validator 0.14.0",
+ "validator 0.16.0",
 "vergen",
 ]

+[[package]]
+name = "revolt-models"
+version = "0.6.1"
+dependencies = [
+ "revolt-permissions",
+ "revolt_optional_struct",
+ "schemars",
+ "serde",
+ "validator 0.16.0",
+]
+
+[[package]]
+name = "revolt-permissions"
+version = "0.6.1"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "auto_ops",
+ "bson",
+ "num_enum 0.6.1",
+ "once_cell",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "revolt-presence"
+version = "0.6.1"
+dependencies = [
+ "async-std",
+ "log",
+ "once_cell",
+ "rand 0.8.5",
+ "redis-kiss",
+]
+
 [[package]]
 name = "revolt-quark"
-version = "0.5.18"
+version = "0.6.1"
 dependencies = [
 "async-lock",
 "async-recursion",
@@ -2860,25 +2980,29 @@ dependencies = [
 "bson",
 "dashmap",
 "deadqueue",
+ "decancer",
 "dotenv",
 "futures",
 "impl_ops",
 "indexmap",
- "iso8601-timestamp",
+ "iso8601-timestamp 0.1.10",
 "linkify 0.8.1",
 "log",
 "lru",
 "mongodb",
 "nanoid",
- "num_enum",
+ "num_enum 0.5.7",
 "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",
@@ -2889,10 +3013,22 @@ dependencies = [
 "serde",
 "serde_json",
 "ulid 0.5.0",
- "validator 0.14.0",
+ "validator 0.16.0",
 "web-push",
 ]

+[[package]]
+name = "revolt-result"
+version = "0.6.1"
+dependencies = [
+ "revolt_okapi",
+ "revolt_rocket_okapi",
+ "rocket",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "revolt_okapi"
 version = "0.9.1"
@@ -2905,6 +3041,16 @@ 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"
@@ -2929,7 +3075,7 @@ checksum = "cc6620569d8ac8f0a1690fcca13f488503807a60e96ebf729749b59aca1dbef9"
 dependencies = [
 "darling",
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "rocket_http",
 "syn 1.0.107",
 ]
@@ -3017,7 +3163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4554a81937341d8c3cd3e43431ac2d23624444dc3a88e7ffd3ff66593779293"
 dependencies = [
 "authifier",
- "iso8601-timestamp",
+ "iso8601-timestamp 0.1.10",
 "revolt_okapi",
 "revolt_rocket_okapi",
 "rocket",
@@ -3036,7 +3182,7 @@ dependencies = [
 "glob",
 "indexmap",
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "rocket_http",
 "syn 1.0.107",
 "unicode-xid 0.2.3",
@@ -3211,7 +3357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "serde_derive_internals",
 "syn 1.0.107",
 ]
@@ -3364,9 +3510,9 @@ dependencies = [

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

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

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

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

@@ -3471,15 +3617,6 @@ dependencies = [
 "digest 0.10.3",
 ]

-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
 [[package]]
 name = "sha1_smol"
 version = "1.0.0"
@@ -3628,7 +3765,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "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",
 "unicode-ident",
 ]

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

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

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

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

@@ -4121,6 +4269,15 @@ 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"
@@ -4180,6 +4337,12 @@ dependencies = [
 "tinyvec",
 ]

+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
 [[package]]
 name = "unicode-xid"
 version = "0.0.4"
@@ -4243,23 +4406,6 @@ 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"
@@ -4276,16 +4422,32 @@ dependencies = [
 ]

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

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

@@ -4429,7 +4591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.18",
+ "quote 1.0.26",
 "syn 1.0.107",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,6 @@
 [workspace]
-members = ["crates/*"]
+members = ["crates/delta", "crates/bonfire", "crates/quark", "crates/core/*"]
+
+[patch.crates-io]
+# mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" }
+redis = { git = "https://github.com/insertish/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
--- a/7
+++ b/7
@@ -1,5 +1,5 @@
 # Build Stage
-FROM --platform="${BUILDPLATFORM}" rustlang/rust:nightly-slim
+FROM --platform="${BUILDPLATFORM}" rust:1.70.0-slim
 USER 0:0
 WORKDIR /home/rust/src

@@ -20,6 +20,11 @@ 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
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -0,0 +1,67 @@
+# 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.
--- a/clippy.toml
+++ b/clippy.toml
@@ -0,0 +1,15 @@
+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",
+]
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.5.18"
+version = "0.6.1"
 license = "AGPL-3.0-or-later"
 edition = "2021"

@@ -26,3 +26,6 @@ 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" ] }
--- a/crates/bonfire/src/main.rs
+++ b/crates/bonfire/src/main.rs
@@ -1,7 +1,7 @@
 use std::env;

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

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

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

    // Setup a TCP listener to accept WebSocket connections on.
    // By default, we bind to port 9000 on all interfaces.
--- a/crates/bonfire/src/websocket.rs
+++ b/crates/bonfire/src/websocket.rs
@@ -1,6 +1,7 @@
 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,
@@ -8,7 +9,6 @@ use revolt_quark::{
        state::{State, SubscriptionStateChange},
    },
    models::{user::UserHint, User},
-    presence::{presence_create_session, presence_delete_session},
    redis_kiss, Database,
 };

@@ -69,8 +69,7 @@ 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) =
-                                presence_create_session(&user_id, 0).await;
+                            let (first_session, session_id) = create_session(&user_id, 0).await;

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

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

                            // If this was the last session, notify other users that we just went offline.
                            if last_session {
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -0,0 +1,67 @@
+[package]
+name = "revolt-database"
+version = "0.6.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.1", path = "../result" }
+revolt-models = { version = "0.6.1", path = "../models" }
+revolt-presence = { version = "0.6.1", path = "../presence" }
+revolt-permissions = { version = "0.6.1", path = "../permissions", features = [ "serde", "bson" ] }
+
+# Utility
+log = "0.4"
+rand = "0.8.5"
+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 }
+
+# Database Migration
+unicode-segmentation = "1.10.1"
+regex = "1"
+
+# 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" }
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -0,0 +1,67 @@
+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))
+            }
+        })
+    }
+}
--- a/crates/core/database/src/drivers/mongodb.rs
+++ b/crates/core/database/src/drivers/mongodb.rs
@@ -0,0 +1,243 @@
+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()
+}
--- a/crates/core/database/src/drivers/reference.rs
+++ b/crates/core/database/src/drivers/reference.rs
@@ -0,0 +1,31 @@
+use std::{collections::HashMap, sync::Arc};
+
+use futures::lock::Mutex;
+
+use crate::{
+    AccountStrike, Bot, Channel, 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, Channel>>>,
+        pub channel_invites: Arc<Mutex<HashMap<String, ()>>>,
+        pub channel_unreads: Arc<Mutex<HashMap<String, ()>>>,
+    }
+);
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -0,0 +1,269 @@
+use authifier::AuthifierEvent;
+use serde::{Deserialize, Serialize};
+
+use revolt_models::v0::{
+    Channel, FieldsChannel, FieldsWebhook, PartialChannel, 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 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 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 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;
+    }
+}
--- a/crates/core/database/src/events/mod.rs
+++ b/crates/core/database/src/events/mod.rs
@@ -0,0 +1 @@
+pub mod client;
--- a/crates/core/database/src/lib.rs
+++ b/crates/core/database/src/lib.rs
@@ -0,0 +1,88 @@
+#[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
+}
--- a/crates/core/database/src/models/admin_migrations/mod.rs
+++ b/crates/core/database/src/models/admin_migrations/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/admin_migrations/model.rs
+++ b/crates/core/database/src/models/admin_migrations/model.rs
@@ -0,0 +1,24 @@
+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()
+        });
+    }
+}
--- a/crates/core/database/src/models/admin_migrations/ops.rs
+++ b/crates/core/database/src/models/admin_migrations/ops.rs
@@ -0,0 +1,12 @@
+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<(), ()>;
+}
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb.rs
@@ -1,13 +1,20 @@
-use crate::{AbstractMigrations, Result};
+use crate::MongoDb;

-use super::super::MongoDb;
+use super::AbstractMigrations;

 mod init;
 mod scripts;

 #[async_trait]
 impl AbstractMigrations for MongoDb {
-    async fn migrate_database(&self) -> Result<()> {
+    #[cfg(test)]
+    /// Drop the database
+    async fn drop_database(&self) {
+        self.db().drop(None).await.ok();
+    }
+
+    /// Migrate the database
+    async fn migrate_database(&self) -> Result<(), ()> {
        info!("Migrating the database.");

        let list = self
@@ -15,7 +22,7 @@ impl AbstractMigrations for MongoDb {
            .await
            .expect("Failed to fetch database names.");

-        if list.iter().any(|x| x == "revolt") {
+        if list.iter().any(|x| x == &self.1) {
            scripts::migrate_database(self).await;
        } else {
            init::create_database(self).await;
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
@@ -1,9 +1,8 @@
-use crate::r#impl::mongo::MongoDb;
-
 use super::scripts::LATEST_REVISION;

-use mongodb::bson::doc;
-use mongodb::options::CreateCollectionOptions;
+use crate::mongodb::bson::doc;
+use crate::mongodb::options::CreateCollectionOptions;
+use crate::MongoDb;

 pub async fn create_database(db: &MongoDb) {
    info!("Creating database.");
@@ -45,6 +44,10 @@ pub async fn create_database(db: &MongoDb) {
        .await
        .expect("Failed to create channel_unreads collection.");

+    db.create_collection("channel_webhooks", None)
+        .await
+        .expect("Failed to create channel_webhooks collection.");
+
    db.create_collection("migrations", None)
        .await
        .expect("Failed to create migrations collection.");
@@ -65,6 +68,10 @@ pub async fn create_database(db: &MongoDb) {
        .await
        .expect("Failed to create safety_snapshots collection.");

+    db.create_collection("safety_strikes", None)
+        .await
+        .expect("Failed to create safety_strikes collection.");
+
    db.create_collection("bots", None)
        .await
        .expect("Failed to create bots collection.");
@@ -88,6 +95,18 @@ pub async fn create_database(db: &MongoDb) {
                        "username": 1_i32
                    },
                    "name": "username",
+                    "unique": false,
+                    "collation": {
+                        "locale": "en",
+                        "strength": 2_i32
+                    }
+                },
+                {
+                    "key": {
+                        "username": 1_i32,
+                        "discriminator": 1_i32
+                    },
+                    "name": "username_discriminator",
                    "unique": true,
                    "collation": {
                        "locale": "en",
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -1,14 +1,16 @@
-use std::{time::Duration, ops::BitXor};
+use std::{collections::HashSet, ops::BitXor, time::Duration};

-use bson::{Bson, DateTime};
-use futures::StreamExt;
-use mongodb::{
-    bson::{doc, from_bson, from_document, to_document, Document},
-    options::FindOptions,
+use crate::{
+    mongodb::{
+        bson::{doc, from_bson, from_document, to_document, Bson, DateTime, Document},
+        options::FindOptions,
+    },
+    MongoDb, DISCRIMINATOR_SEARCH_SPACE,
 };
+use futures::StreamExt;
+use rand::seq::SliceRandom;
 use serde::{Deserialize, Serialize};
-
-use crate::{r#impl::mongo::MongoDb, Permission, DEFAULT_PERMISSION_SERVER};
+use unicode_segmentation::UnicodeSegmentation;

 #[derive(Serialize, Deserialize)]
 struct MigrationInfo {
@@ -16,7 +18,7 @@ struct MigrationInfo {
    revision: i32,
 }

-pub const LATEST_REVISION: i32 = 21;
+pub const LATEST_REVISION: i32 = 25;

 pub async fn migrate_database(db: &MongoDb) {
    let migrations = db.col::<Document>("migrations");
@@ -504,7 +506,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            update.insert(
                "default_permissions",
                // Remove Send Message permission if it wasn't originally granted
-                DEFAULT_PERMISSION_SERVER.bitxor(if has_send { 0 } else { Permission::SendMessage as u64}) as i64,
+                (4000323584).bitxor(if has_send { 0 } else { (1 << 22) as u64 }) as i64,
            );

            if let Some(Bson::Document(mut roles)) = document.remove("roles") {
@@ -563,7 +565,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                    doc! {
                        "default_permissions": {
                            "a": 0_i64,
-                            "d": Permission::SendMessage as i64
+                            "d": (1 << 22) as i64
                        }
                    },
                );
@@ -696,26 +698,15 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
    if revision <= 19 {
        info!("Running migration [revision 19 / 27-02-2023]: Create report / snapshot collections, migrate to new model if applicable.");

-        // TODO: make these fail once production is migrated
-        if db
-            .db()
+        db.db()
            .create_collection("safety_reports", None)
            .await
-            .is_err()
-        {
-            info!("Failed to create safety_reports collection but this is expected in production.");
-        }
+            .unwrap();

-        if db
-            .db()
+        db.db()
            .create_collection("safety_snapshots", None)
            .await
-            .is_err()
-        {
-            info!(
-                "Failed to create safety_snapshots collection but this is expected in production."
-            );
-        }
+            .unwrap();

        db.col::<Document>("safety_reports")
            .update_many(
@@ -753,6 +744,209 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            .expect("Failed to create safety snapshot index.");
    }

+    if revision <= 21 {
+        info!("Running migration [revision 21 / 31-05-2023]: Add collection `safety_strikes`.");
+
+        db.db()
+            .create_collection("safety_strikes", None)
+            .await
+            .unwrap();
+    }
+
+    if revision <= 22 {
+        info!("Running migration [revision 22 / 31-05-2023]: Add moderator_id to account strikes.");
+
+        db.col::<Document>("safety_strikes")
+            .update_many(
+                doc! {},
+                doc! {
+                    "$set": {
+                        "moderator_id": "01EX2NCWQ0CHS3QJF0FEQS1GR4"
+                    }
+                },
+                None,
+            )
+            .await
+            .expect("Failed to update server members.");
+    }
+
+    if revision <= 23 {
+        info!("Running migration [revision 23 / 10-06-2023]: Generate discriminators for users.");
+
+        db.db()
+            .run_command(
+                doc! {
+                    "dropIndexes": "users",
+                    "index": "username"
+                },
+                None,
+            )
+            .await
+            .expect("Failed to drop existing username index.");
+
+        #[derive(Serialize, Deserialize)]
+        struct UserInformation {
+            #[serde(rename = "_id")]
+            id: String,
+            username: String,
+        }
+
+        let re_username = regex::Regex::new(r"^(\p{L}|[\d_.-])+$").unwrap();
+
+        let users: Vec<UserInformation> = db
+            .col::<UserInformation>("users")
+            .find(doc! {}, None)
+            .await
+            .unwrap()
+            .map(|doc| doc.expect("id and username"))
+            .collect()
+            .await;
+
+        let search_space: Vec<String> = DISCRIMINATOR_SEARCH_SPACE.iter().cloned().collect();
+        let mut claimed: HashSet<String> = HashSet::new();
+
+        for i in 0..users.len() {
+            let info = &users[i];
+            let mut discriminator = {
+                let mut rng = rand::thread_rng();
+                search_space.choose(&mut rng).unwrap()
+            };
+
+            if re_username.is_match(&info.username) {
+                while claimed.contains(&format!("{}#{}", info.username, discriminator)) {
+                    let new_discriminator = {
+                        let mut rng = rand::thread_rng();
+                        search_space.choose(&mut rng).unwrap()
+                    };
+
+                    info!(
+                        "Re-rolled {} to {new_discriminator} from {discriminator}",
+                        info.username
+                    );
+
+                    discriminator = new_discriminator;
+                }
+
+                claimed.insert(format!("{}#{}", info.username, discriminator));
+
+                info!(
+                    "({}/{}) Migrating user \"{}\" to #{} - compliant",
+                    i + 1,
+                    users.len(),
+                    info.username,
+                    discriminator
+                );
+
+                db.col::<UserInformation>("users")
+                    .update_one(
+                        doc! {
+                            "_id": &info.id
+                        },
+                        doc! {
+                            "$set": {
+                                "discriminator": discriminator
+                            }
+                        },
+                        None,
+                    )
+                    .await
+                    .unwrap();
+            } else {
+                let mut sanitised = info
+                    .username
+                    .graphemes(true)
+                    .filter(|s| re_username.is_match(s))
+                    .collect::<String>();
+
+                while sanitised.len() < 2 {
+                    sanitised += "_";
+                }
+
+                while claimed.contains(&format!("{}#{}", sanitised, discriminator)) {
+                    let new_discriminator = {
+                        let mut rng = rand::thread_rng();
+                        search_space.choose(&mut rng).unwrap()
+                    };
+
+                    info!("Re-rolled {sanitised} to {new_discriminator} from {discriminator}");
+                    discriminator = new_discriminator;
+                }
+
+                claimed.insert(format!("{}#{}", sanitised, discriminator));
+
+                info!(
+                    "({}/{}) Migrating user \"{}\" to #{} - sanitised: \"{}\"",
+                    i + 1,
+                    users.len(),
+                    info.username,
+                    discriminator,
+                    sanitised
+                );
+
+                db.col::<UserInformation>("users")
+                    .update_one(
+                        doc! {
+                            "_id": &info.id
+                        },
+                        doc! {
+                            "$set": {
+                                "username": sanitised,
+                                "discriminator": discriminator,
+                                "display_name": &info.username
+                            }
+                        },
+                        None,
+                    )
+                    .await
+                    .unwrap();
+            }
+        }
+    }
+
+    if revision <= 24 {
+        info!("Running migration [revision 24 / 09-06-2023]: Add collection `channel_webhooks` if not exists, update users index.");
+
+        db.db()
+            .create_collection("channel_webhooks", None)
+            .await
+            .ok();
+
+        db.db()
+            .run_command(
+                doc! {
+                    "createIndexes": "users",
+                    "indexes": [
+                        {
+                            "key": {
+                                "username": 1_i32
+                            },
+                            "name": "username",
+                            "unique": false,
+                            "collation": {
+                                "locale": "en",
+                                "strength": 2_i32
+                            }
+                        },
+                        {
+                            "key": {
+                                "username": 1_i32,
+                                "discriminator": 1_i32
+                            },
+                            "name": "username_discriminator",
+                            "unique": true,
+                            "collation": {
+                                "locale": "en",
+                                "strength": 2_i32
+                            }
+                        }
+                    ]
+                },
+                None,
+            )
+            .await
+            .expect("Failed to create username index.");
+    }
+
    // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.

    // Reminder to update LATEST_REVISION when adding new migrations.
--- a/crates/core/database/src/models/admin_migrations/ops/reference.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/reference.rs
@@ -0,0 +1,16 @@
+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(())
+    }
+}
--- a/crates/core/database/src/models/bots/mod.rs
+++ b/crates/core/database/src/models/bots/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/bots/model.rs
+++ b/crates/core/database/src/models/bots/model.rs
@@ -0,0 +1,154 @@
+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))
+        });
+    }
+}
--- a/crates/core/database/src/models/bots/ops.rs
+++ b/crates/core/database/src/models/bots/ops.rs
@@ -0,0 +1,35 @@
+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<()>;
+}
--- a/crates/core/database/src/models/bots/ops/mongodb.rs
+++ b/crates/core/database/src/models/bots/ops/mongodb.rs
@@ -0,0 +1,92 @@
+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,
+        }
+    }
+}
--- a/crates/core/database/src/models/bots/ops/reference.rs
+++ b/crates/core/database/src/models/bots/ops/reference.rs
@@ -0,0 +1,82 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/channel_webhooks/mod.rs
+++ b/crates/core/database/src/models/channel_webhooks/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/channel_webhooks/model.rs
+++ b/crates/core/database/src/models/channel_webhooks/model.rs
@@ -0,0 +1,158 @@
+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()
+            )
+        });
+    }
+}
--- a/crates/core/database/src/models/channel_webhooks/ops.rs
+++ b/crates/core/database/src/models/channel_webhooks/ops.rs
@@ -0,0 +1,29 @@
+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<()>;
+}
--- a/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs
+++ b/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs
@@ -0,0 +1,77 @@
+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",
+        })
+    }
+}
--- a/crates/core/database/src/models/channel_webhooks/ops/reference.rs
+++ b/crates/core/database/src/models/channel_webhooks/ops/reference.rs
@@ -0,0 +1,70 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/channels/mod.rs
+++ b/crates/core/database/src/models/channels/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -0,0 +1,529 @@
+use std::collections::HashMap;
+
+use revolt_permissions::OverrideField;
+use revolt_result::Result;
+use serde::{Deserialize, Serialize};
+
+use crate::{events::client::EventV1, Database, File, IntoDocumentPath};
+
+auto_derived!(
+    pub enum Channel {
+        /// Personal "Saved Notes" channel which allows users to save messages
+        SavedMessages {
+            /// Unique Id
+            #[serde(rename = "_id")]
+            id: String,
+            /// Id of the user this channel belongs to
+            user: String,
+        },
+        /// Direct message channel between two users
+        DirectMessage {
+            /// Unique Id
+            #[serde(rename = "_id")]
+            id: String,
+
+            /// Whether this direct message channel is currently open on both sides
+            active: bool,
+            /// 2-tuple of user ids participating in direct message
+            recipients: Vec<String>,
+            /// Id of the last message sent in this channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            last_message_id: Option<String>,
+        },
+        /// Group channel between 1 or more participants
+        Group {
+            /// Unique Id
+            #[serde(rename = "_id")]
+            id: String,
+
+            /// Display name of the channel
+            name: String,
+            /// User id of the owner of the group
+            owner: String,
+            /// Channel description
+            #[serde(skip_serializing_if = "Option::is_none")]
+            description: Option<String>,
+            /// Array of user ids participating in channel
+            recipients: Vec<String>,
+
+            /// Custom icon attachment
+            #[serde(skip_serializing_if = "Option::is_none")]
+            icon: Option<File>,
+            /// Id of the last message sent in this channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            last_message_id: Option<String>,
+
+            /// Permissions assigned to members of this group
+            /// (does not apply to the owner of the group)
+            #[serde(skip_serializing_if = "Option::is_none")]
+            permissions: Option<i64>,
+
+            /// Whether this group is marked as not safe for work
+            #[serde(skip_serializing_if = "crate::if_false", default)]
+            nsfw: bool,
+        },
+        /// Text channel belonging to a server
+        TextChannel {
+            /// Unique Id
+            #[serde(rename = "_id")]
+            id: String,
+            /// Id of the server this channel belongs to
+            server: String,
+
+            /// Display name of the channel
+            name: String,
+            /// Channel description
+            #[serde(skip_serializing_if = "Option::is_none")]
+            description: Option<String>,
+
+            /// Custom icon attachment
+            #[serde(skip_serializing_if = "Option::is_none")]
+            icon: Option<File>,
+            /// Id of the last message sent in this channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            last_message_id: Option<String>,
+
+            /// Default permissions assigned to users in this channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            default_permissions: Option<OverrideField>,
+            /// Permissions assigned based on role to this channel
+            #[serde(
+                default = "HashMap::<String, OverrideField>::new",
+                skip_serializing_if = "HashMap::<String, OverrideField>::is_empty"
+            )]
+            role_permissions: HashMap<String, OverrideField>,
+
+            /// Whether this channel is marked as not safe for work
+            #[serde(skip_serializing_if = "crate::if_false", default)]
+            nsfw: bool,
+        },
+        /// Voice channel belonging to a server
+        VoiceChannel {
+            /// Unique Id
+            #[serde(rename = "_id")]
+            id: String,
+            /// Id of the server this channel belongs to
+            server: String,
+
+            /// Display name of the channel
+            name: String,
+            #[serde(skip_serializing_if = "Option::is_none")]
+            /// Channel description
+            description: Option<String>,
+            /// Custom icon attachment
+            #[serde(skip_serializing_if = "Option::is_none")]
+            icon: Option<File>,
+
+            /// Default permissions assigned to users in this channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            default_permissions: Option<OverrideField>,
+            /// Permissions assigned based on role to this channel
+            #[serde(
+                default = "HashMap::<String, OverrideField>::new",
+                skip_serializing_if = "HashMap::<String, OverrideField>::is_empty"
+            )]
+            role_permissions: HashMap<String, OverrideField>,
+
+            /// Whether this channel is marked as not safe for work
+            #[serde(skip_serializing_if = "crate::if_false", default)]
+            nsfw: bool,
+        },
+    }
+);
+
+auto_derived!(
+    #[derive(Default)]
+    pub struct PartialChannel {
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub name: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub owner: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub description: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub icon: Option<File>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub nsfw: Option<bool>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub active: Option<bool>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub permissions: Option<i64>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub role_permissions: Option<HashMap<String, OverrideField>>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub default_permissions: Option<OverrideField>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub last_message_id: Option<String>,
+    }
+
+    /// Optional fields on channel object
+    pub enum FieldsChannel {
+        Description,
+        Icon,
+        DefaultPermissions,
+    }
+);
+
+impl Channel {
+    /// Create a channel
+    pub async fn create(&self, db: &Database) -> Result<()> {
+        db.insert_channel(self).await?;
+
+        Ok(())
+    }
+
+    /// Add user to a group
+    pub async fn add_user_to_group(
+        &mut self,
+        db: &Database,
+        user_id: &str,
+        _by_id: &str,
+    ) -> Result<()> {
+        if let Channel::Group { recipients, .. } = self {
+            if recipients.contains(&String::from(user_id)) {
+                return Err(create_error!(AlreadyInGroup));
+            }
+
+            recipients.push(String::from(user_id));
+        }
+
+        match &self {
+            Channel::Group { id, .. } => {
+                db.add_user_to_group(id, user_id).await?;
+
+                EventV1::ChannelGroupJoin {
+                    id: id.to_string(),
+                    user: user_id.to_string(),
+                }
+                .p(id.to_string())
+                .await;
+
+                EventV1::ChannelCreate(self.clone().into())
+                    .private(user_id.to_string())
+                    .await;
+
+                /* TODO: SystemMessage::UserAdded {
+                    id: user.to_string(),
+                    by: by.to_string(),
+                }
+                .into_message(id.to_string())
+                .create(db, self, None)
+                .await
+                .ok(); */
+
+                Ok(())
+            }
+            _ => Err(create_error!(InvalidOperation)),
+        }
+    }
+
+    /// Map out whether it is a direct DM
+    pub fn is_direct_dm(&self) -> bool {
+        matches!(self, Channel::DirectMessage { .. })
+    }
+
+    /// Check whether has a user as a recipient
+    pub fn contains_user(&self, user_id: &str) -> bool {
+        match self {
+            Channel::Group { recipients, .. } => recipients.contains(&String::from(user_id)),
+            _ => false,
+        }
+    }
+
+    /// Get list of recipients
+    pub fn users(&self) -> Result<Vec<String>> {
+        match self {
+            Channel::Group { recipients, .. } => Ok(recipients.to_owned()),
+            _ => Err(create_error!(NotFound)),
+        }
+    }
+
+    /// Get a reference to this channel's id
+    pub fn id(&self) -> String {
+        match self {
+            Channel::DirectMessage { id, .. }
+            | Channel::Group { id, .. }
+            | Channel::SavedMessages { id, .. }
+            | Channel::TextChannel { id, .. }
+            | Channel::VoiceChannel { id, .. } => id.clone(),
+        }
+    }
+
+    /// Set role permission on a channel
+    pub async fn set_role_permission(
+        &mut self,
+        db: &Database,
+        role_id: &str,
+        permissions: OverrideField,
+    ) -> Result<()> {
+        match self {
+            Channel::TextChannel {
+                id,
+                server,
+                role_permissions,
+                ..
+            }
+            | Channel::VoiceChannel {
+                id,
+                server,
+                role_permissions,
+                ..
+            } => {
+                db.set_channel_role_permission(id, role_id, permissions)
+                    .await?;
+
+                role_permissions.insert(role_id.to_string(), permissions);
+
+                EventV1::ChannelUpdate {
+                    id: id.clone(),
+                    data: PartialChannel {
+                        role_permissions: Some(role_permissions.clone()),
+                        ..Default::default()
+                    }
+                    .into(),
+                    clear: vec![],
+                }
+                .p(server.clone())
+                .await;
+
+                Ok(())
+            }
+            _ => Err(create_error!(InvalidOperation)),
+        }
+    }
+
+    /// Update channel data
+    pub async fn update<'a>(
+        &mut self,
+        db: &Database,
+        partial: PartialChannel,
+        remove: Vec<FieldsChannel>,
+    ) -> Result<()> {
+        for field in &remove {
+            self.remove_field(field);
+        }
+
+        self.apply_options(partial.clone());
+
+        db.update_channel(&self.id(), &partial, remove.clone())
+            .await?;
+
+        Ok(())
+    }
+
+    /// Remove a field from Channel object
+    pub fn remove_field(&mut self, field: &FieldsChannel) {
+        match field {
+            FieldsChannel::Description => match self {
+                Self::Group { description, .. }
+                | Self::TextChannel { description, .. }
+                | Self::VoiceChannel { description, .. } => {
+                    description.take();
+                }
+                _ => {}
+            },
+            FieldsChannel::Icon => match self {
+                Self::Group { icon, .. }
+                | Self::TextChannel { icon, .. }
+                | Self::VoiceChannel { icon, .. } => {
+                    icon.take();
+                }
+                _ => {}
+            },
+            FieldsChannel::DefaultPermissions => match self {
+                Self::TextChannel {
+                    default_permissions,
+                    ..
+                }
+                | Self::VoiceChannel {
+                    default_permissions,
+                    ..
+                } => {
+                    default_permissions.take();
+                }
+                _ => {}
+            },
+        }
+    }
+
+    /// Remove multiple fields from Channel object
+    pub fn remove_fields(&mut self, partial: Vec<FieldsChannel>) {
+        for field in partial {
+            self.remove_field(&field)
+        }
+    }
+
+    /// Apply partial channel to channel
+    pub fn apply_options(&mut self, partial: PartialChannel) {
+        match self {
+            Self::SavedMessages { .. } => {}
+            Self::DirectMessage { active, .. } => {
+                if let Some(v) = partial.active {
+                    *active = v;
+                }
+            }
+            Self::Group {
+                name,
+                owner,
+                description,
+                icon,
+                nsfw,
+                permissions,
+                ..
+            } => {
+                if let Some(v) = partial.name {
+                    *name = v;
+                }
+
+                if let Some(v) = partial.owner {
+                    *owner = v;
+                }
+
+                if let Some(v) = partial.description {
+                    description.replace(v);
+                }
+
+                if let Some(v) = partial.icon {
+                    icon.replace(v);
+                }
+
+                if let Some(v) = partial.nsfw {
+                    *nsfw = v;
+                }
+
+                if let Some(v) = partial.permissions {
+                    permissions.replace(v);
+                }
+            }
+            Self::TextChannel {
+                name,
+                description,
+                icon,
+                nsfw,
+                default_permissions,
+                role_permissions,
+                ..
+            }
+            | Self::VoiceChannel {
+                name,
+                description,
+                icon,
+                nsfw,
+                default_permissions,
+                role_permissions,
+                ..
+            } => {
+                if let Some(v) = partial.name {
+                    *name = v;
+                }
+
+                if let Some(v) = partial.description {
+                    description.replace(v);
+                }
+
+                if let Some(v) = partial.icon {
+                    icon.replace(v);
+                }
+
+                if let Some(v) = partial.nsfw {
+                    *nsfw = v;
+                }
+
+                if let Some(v) = partial.role_permissions {
+                    *role_permissions = v;
+                }
+
+                if let Some(v) = partial.default_permissions {
+                    default_permissions.replace(v);
+                }
+            }
+        }
+    }
+
+    /// Remove user from a group
+    pub async fn remove_user_from_group(
+        &self,
+        db: &Database,
+        user_id: &str,
+        _by_id: Option<&str>,
+        silent: bool,
+    ) -> Result<()> {
+        match &self {
+            Channel::Group {
+                id,
+                owner,
+                recipients,
+                ..
+            } => {
+                if user_id == owner {
+                    if let Some(new_owner) = recipients.iter().find(|x| *x != user_id) {
+                        db.update_channel(
+                            id,
+                            &PartialChannel {
+                                owner: Some(new_owner.into()),
+                                ..Default::default()
+                            },
+                            vec![],
+                        )
+                        .await?;
+
+                        /* TODO: SystemMessage::ChannelOwnershipChanged {
+                            from: owner.to_string(),
+                            to: new_owner.into(),
+                        }
+                        .into_message(id.to_string())
+                        .create(db, self, None)
+                        .await
+                        .ok(); */
+                    } else {
+                        db.delete_channel(self).await?;
+                        return Ok(());
+                    }
+                }
+
+                EventV1::ChannelGroupLeave {
+                    id: id.to_string(),
+                    user: user_id.to_string(),
+                }
+                .p(id.to_string())
+                .await;
+
+                if !silent {
+                    /* TODO: if let Some(_by) = by_id {
+                        SystemMessage::UserRemove {
+                            id: user_id.to_string(),
+                            by: by.to_string(),
+                        }
+                    } else {
+                        SystemMessage::UserLeft {
+                            id: user_id.to_string(),
+                        }
+                    }
+                    .into_message(id.to_string())
+                    .create(db, self, None)
+                    .await
+                    .ok(); */
+                }
+
+                Ok(())
+            }
+
+            _ => Err(create_error!(InvalidOperation)),
+        }
+    }
+
+    /// Delete a channel
+    pub async fn delete(&self, db: &Database) -> Result<()> {
+        db.delete_channel(self).await
+    }
+}
+
+impl IntoDocumentPath for FieldsChannel {
+    fn as_path(&self) -> Option<&'static str> {
+        Some(match self {
+            FieldsChannel::Description => "description",
+            FieldsChannel::Icon => "icon",
+            FieldsChannel::DefaultPermissions => "default_permissions",
+        })
+    }
+}
--- a/crates/core/database/src/models/channels/ops.rs
+++ b/crates/core/database/src/models/channels/ops.rs
@@ -0,0 +1,50 @@
+use crate::{revolt_result::Result, Channel, FieldsChannel, PartialChannel};
+use revolt_permissions::OverrideField;
+mod mongodb;
+mod reference;
+
+#[async_trait]
+pub trait AbstractChannels: Sync + Send {
+    /// Insert a new channel in the database
+    async fn insert_channel(&self, channel: &Channel) -> Result<()>;
+
+    /// Fetch a channel from the database
+    async fn fetch_channel(&self, channel_id: &str) -> Result<Channel>;
+
+    /// Fetch all channels from the database
+    async fn fetch_channels<'a>(&self, ids: &'a [String]) -> Result<Vec<Channel>>;
+
+    /// Fetch all direct messages for a user
+    async fn find_direct_messages(&self, user_id: &str) -> Result<Vec<Channel>>;
+
+    // Fetch saved messages channel
+    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel>;
+
+    // Fetch direct message channel (DM or Saved Messages)
+    async fn find_direct_message_channel(&self, user_a: &str, user_b: &str) -> Result<Channel>;
+
+    /// Insert a user to a group
+    async fn add_user_to_group(&self, channel_id: &str, user_id: &str) -> Result<()>;
+
+    /// Insert channel role permissions
+    async fn set_channel_role_permission(
+        &self,
+        channel_id: &str,
+        role_id: &str,
+        permissions: OverrideField,
+    ) -> Result<()>;
+
+    // Update channel
+    async fn update_channel(
+        &self,
+        id: &str,
+        channel_id: &PartialChannel,
+        remove: Vec<FieldsChannel>,
+    ) -> Result<()>;
+
+    // Remove a user from a group
+    async fn remove_user_from_group(&self, channel_id: &str, user_id: &str) -> Result<()>;
+
+    // Delete a channel
+    async fn delete_channel(&self, channel_id: &Channel) -> Result<()>;
+}
--- a/crates/core/database/src/models/channels/ops/mongodb.rs
+++ b/crates/core/database/src/models/channels/ops/mongodb.rs
@@ -0,0 +1,193 @@
+use super::AbstractChannels;
+use crate::{Channel, FieldsChannel, IntoDocumentPath, MongoDb, PartialChannel};
+use bson::Document;
+use futures::StreamExt;
+use revolt_permissions::OverrideField;
+use revolt_result::Result;
+
+static COL: &str = "channels";
+
+#[async_trait]
+impl AbstractChannels for MongoDb {
+    /// Insert a new channel in the database
+    async fn insert_channel(&self, channel: &Channel) -> Result<()> {
+        query!(self, insert_one, COL, &channel).map(|_| ())
+    }
+
+    /// Fetch a channel from the database
+    async fn fetch_channel(&self, channel_id: &str) -> Result<Channel> {
+        query!(self, find_one_by_id, COL, channel_id)?.ok_or_else(|| create_error!(NotFound))
+    }
+
+    /// Fetch all channels from the database
+    async fn fetch_channels<'a>(&self, ids: &'a [String]) -> Result<Vec<Channel>> {
+        Ok(self
+            .col::<Channel>(COL)
+            .find(
+                doc! {
+                    "_id": {
+                        "$in": ids
+                    }
+                },
+                None,
+            )
+            .await
+            .map_err(|_| create_database_error!("fetch", "channels"))?
+            .filter_map(|s| async {
+                if cfg!(debug_assertions) {
+                    Some(s.unwrap())
+                } else {
+                    s.ok()
+                }
+            })
+            .collect()
+            .await)
+    }
+
+    /// Fetch all direct messages for a user
+    async fn find_direct_messages(&self, user_id: &str) -> Result<Vec<Channel>> {
+        query!(
+            self,
+            find,
+            COL,
+            doc! {
+                "$or": [
+                    {
+                        "$or": [
+                            {
+                                "channel_type": "DirectMessage"
+                            },
+                            {
+                                "channel_type": "Group"
+                            }
+                        ],
+                        "recipients": user_id
+                    },
+                    {
+                        "channel_type": "SavedMessages",
+                        "user": user_id
+                    }
+                ]
+            }
+        )
+    }
+
+    // Fetch saved messages channel
+    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
+        query!(
+            self,
+            find_one,
+            COL,
+            doc! {
+                "channel_type": "SavedMessages",
+                "user": user_id
+            }
+        )?
+        .ok_or_else(|| create_error!(InternalError))
+    }
+
+    // Fetch direct message channel (DM or Saved Messages)
+    async fn find_direct_message_channel(&self, user_a: &str, user_b: &str) -> Result<Channel> {
+        let doc = match (user_a, user_b) {
+            self_user if self_user.0 == self_user.1 => {
+                doc! {
+                    "channel_type": "SavedMessages",
+                    "user": self_user.0
+                }
+            }
+            users => {
+                doc! {
+                    "channel_type": "DirectMessage",
+                    "recipients": {
+                        "$all": [ users.0, users.1 ]
+                    }
+                }
+            }
+        };
+        query!(self, find_one, COL, doc)?.ok_or_else(|| create_error!(NotFound))
+    }
+
+    /// Insert a user to a group
+    async fn add_user_to_group(&self, channel: &str, user: &str) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": channel
+                },
+                doc! {
+                    "$push": {
+                        "recipients": user
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "channel"))
+    }
+
+    /// Insert channel role permissions
+    async fn set_channel_role_permission(
+        &self,
+        channel: &str,
+        role: &str,
+        permissions: OverrideField,
+    ) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! { "_id": channel },
+                doc! {
+                "$set": {
+                    "role_permissions.".to_owned() + role: permissions
+                }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "channel"))
+    }
+
+    // Update channel
+    async fn update_channel(
+        &self,
+        id: &str,
+        channel: &PartialChannel,
+        remove: Vec<FieldsChannel>,
+    ) -> Result<()> {
+        query!(
+            self,
+            update_one_by_id,
+            COL,
+            id,
+            channel,
+            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
+            None
+        )
+        .map(|_| ())
+    }
+
+    // Remove a user from a group
+    async fn remove_user_from_group(&self, channel: &str, user: &str) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_one(
+                doc! {
+                    "_id": channel
+                },
+                doc! {
+                    "$pull": {
+                        "recipients": user
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "channels"))
+    }
+
+    // Delete a channel
+    async fn delete_channel(&self, channel: &Channel) -> Result<()> {
+        query!(self, delete_one_by_id, COL, &channel.id()).map(|_| ())
+    }
+}
--- a/crates/core/database/src/models/channels/ops/reference.rs
+++ b/crates/core/database/src/models/channels/ops/reference.rs
@@ -0,0 +1,157 @@
+use std::collections::hash_map::Entry;
+
+use super::AbstractChannels;
+use crate::ReferenceDb;
+use crate::{Channel, FieldsChannel, PartialChannel};
+use revolt_permissions::OverrideField;
+use revolt_result::Result;
+
+#[async_trait]
+impl AbstractChannels for ReferenceDb {
+    /// Insert a new channel in the database
+    async fn insert_channel(&self, channel: &Channel) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+        if let Entry::Vacant(entry) = channels.entry(channel.id()) {
+            entry.insert(channel.clone());
+            Ok(())
+        } else {
+            Err(create_database_error!("insert", "channel"))
+        }
+    }
+
+    /// Fetch a channel from the database
+    async fn fetch_channel(&self, channel_id: &str) -> Result<Channel> {
+        let channels = self.channels.lock().await;
+        channels
+            .get(channel_id)
+            .cloned()
+            .ok_or_else(|| create_error!(NotFound))
+    }
+
+    /// Fetch all channels from the database
+    async fn fetch_channels<'a>(&self, ids: &'a [String]) -> Result<Vec<Channel>> {
+        let channels = self.channels.lock().await;
+        ids.iter()
+            .map(|id| {
+                channels
+                    .get(id)
+                    .cloned()
+                    .ok_or_else(|| create_error!(NotFound))
+            })
+            .collect()
+    }
+
+    /// Fetch all direct messages for a user
+    async fn find_direct_messages(&self, user_id: &str) -> Result<Vec<Channel>> {
+        let channels = self.channels.lock().await;
+        Ok(channels
+            .values()
+            .filter(|channel| channel.contains_user(user_id))
+            .cloned()
+            .collect())
+    }
+
+    // Fetch saved messages channel
+    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
+        let channels = self.channels.lock().await;
+        channels
+            .get(user_id)
+            .cloned()
+            .ok_or_else(|| create_database_error!("fetch", "channel"))
+    }
+
+    // Fetch direct message channel (DM or Saved Messages)
+    async fn find_direct_message_channel(&self, user_a: &str, user_b: &str) -> Result<Channel> {
+        let channels = self.channels.lock().await;
+        for (_, data) in channels.iter() {
+            if data.contains_user(user_a) && data.contains_user(user_b) {
+                return Ok(data.to_owned());
+            }
+        }
+        Err(create_error!(NotFound))
+    }
+    /// Insert a user to a group
+    async fn add_user_to_group(&self, channel_id: &str, user_id: &str) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+
+        if let Some(Channel::Group { recipients, .. }) = channels.get_mut(channel_id) {
+            recipients.push(String::from(user_id));
+            Ok(())
+        } else {
+            Err(create_error!(InvalidOperation))
+        }
+    }
+    /// Insert channel role permissions
+    async fn set_channel_role_permission(
+        &self,
+        channel_id: &str,
+        role_id: &str,
+        permissions: OverrideField,
+    ) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+
+        if let Some(mut channel) = channels.get_mut(channel_id) {
+            match &mut channel {
+                Channel::TextChannel {
+                    role_permissions, ..
+                }
+                | Channel::VoiceChannel {
+                    role_permissions, ..
+                } => {
+                    if role_permissions.get(role_id).is_some() {
+                        role_permissions.remove(role_id);
+                        role_permissions.insert(String::from(role_id), permissions);
+
+                        Ok(())
+                    } else {
+                        Err(create_error!(NotFound))
+                    }
+                }
+                _ => Err(create_error!(NotFound)),
+            }
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
+
+    // Update channel
+    async fn update_channel(
+        &self,
+        id: &str,
+        channel: &PartialChannel,
+        remove: Vec<FieldsChannel>,
+    ) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+        if let Some(channel_data) = channels.get_mut(id) {
+            channel_data.apply_options(channel.to_owned());
+            channel_data.remove_fields(remove);
+            Ok(())
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
+
+    // Remove a user from a group
+    async fn remove_user_from_group(&self, channel: &str, user: &str) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+        if let Some(channel_data) = channels.get_mut(channel) {
+            if channel_data.users()?.contains(&String::from(user)) {
+                channel_data.users()?.retain(|x| x != user);
+                return Ok(());
+            } else {
+                return Err(create_error!(NotFound));
+            }
+        }
+        Err(create_error!(NotFound))
+    }
+
+    // Delete a channel
+    async fn delete_channel(&self, channel: &Channel) -> Result<()> {
+        let mut channels = self.channels.lock().await;
+        if channels.remove(&channel.id()).is_some() {
+            Ok(())
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
+}
--- a/crates/core/database/src/models/files/mod.rs
+++ b/crates/core/database/src/models/files/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/files/model.rs
+++ b/crates/core/database/src/models/files/model.rs
@@ -0,0 +1,107 @@
+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
+    }
+}
--- a/crates/core/database/src/models/files/ops.rs
+++ b/crates/core/database/src/models/files/ops.rs
@@ -0,0 +1,30 @@
+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<()>;
+}
--- a/crates/core/database/src/models/files/ops/mongodb.rs
+++ b/crates/core/database/src/models/files/ops/mongodb.rs
@@ -0,0 +1,117 @@
+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))
+    }
+}
--- a/crates/core/database/src/models/files/ops/reference.rs
+++ b/crates/core/database/src/models/files/ops/reference.rs
@@ -0,0 +1,79 @@
+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(())
+    }
+}
--- a/crates/core/database/src/models/mod.rs
+++ b/crates/core/database/src/models/mod.rs
@@ -0,0 +1,53 @@
+mod admin_migrations;
+mod bots;
+mod channel_webhooks;
+mod channels;
+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 channels::*;
+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
+    + channels::AbstractChannels
+    + channel_webhooks::AbstractWebhooks
+    + files::AbstractAttachments
+    + safety_strikes::AbstractAccountStrikes
+    + server_members::AbstractServerMembers
+    + servers::AbstractServers
+    + user_settings::AbstractUserSettings
+    + users::AbstractUsers
+{
+}
+
+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,
+        }
+    }
+}
--- a/crates/core/database/src/models/relations.drawio
+++ b/crates/core/database/src/models/relations.drawio
@@ -1,6 +1,6 @@
 <mxfile host="65bd71144e">
    <diagram id="9BKyaxnbqnTkbfLuLd1z" name="Page-1">
-        <mxGraphModel dx="1033" dy="710" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+        <mxGraphModel dx="2466" dy="650" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
            <root>
                <mxCell id="0"/>
                <mxCell id="1" parent="0"/>
@@ -35,18 +35,12 @@
                <mxCell id="2" value="Attachment" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                    <mxGeometry x="220" y="490" width="80" height="30" as="geometry"/>
                </mxCell>
-                <mxCell id="49" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" parent="1" source="3" target="5" edge="1">
-                    <mxGeometry relative="1" as="geometry">
-                        <Array as="points">
-                            <mxPoint x="195" y="340"/>
-                            <mxPoint x="245" y="340"/>
-                        </Array>
-                    </mxGeometry>
-                </mxCell>
                <mxCell id="51" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;" parent="1" source="3" target="12" edge="1">
                    <mxGeometry relative="1" as="geometry">
                        <mxPoint x="290" y="160" as="targetPoint"/>
                        <Array as="points">
+                            <mxPoint x="95" y="340"/>
+                            <mxPoint x="195" y="340"/>
                            <mxPoint x="195" y="260"/>
                            <mxPoint x="260" y="260"/>
                            <mxPoint x="260" y="220"/>
@@ -54,11 +48,19 @@
                        </Array>
                    </mxGeometry>
                </mxCell>
+                <mxCell id="68" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;" edge="1" parent="1" source="3" target="5">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="95" y="340"/>
+                            <mxPoint x="245" y="340"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
                <mxCell id="3" value="Channel Invite" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="150" y="400" width="90" height="30" as="geometry"/>
+                    <mxGeometry x="50" y="400" width="90" height="30" as="geometry"/>
                </mxCell>
                <mxCell id="4" value="Channel Unread" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="40" y="400" width="100" height="30" as="geometry"/>
+                    <mxGeometry x="-70" y="400" width="100" height="30" as="geometry"/>
                </mxCell>
                <mxCell id="43" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;dashed=1;" parent="1" source="5" target="12" edge="1">
                    <mxGeometry relative="1" as="geometry"/>
@@ -66,6 +68,14 @@
                <mxCell id="60" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;startArrow=none;startFill=0;endArrow=diamondThin;endFill=1;strokeColor=#FFFFFF;" parent="1" source="5" target="9" edge="1">
                    <mxGeometry relative="1" as="geometry"/>
                </mxCell>
+                <mxCell id="67" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;startArrow=diamondThin;startFill=1;" edge="1" parent="1" source="5" target="66">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="245" y="370"/>
+                            <mxPoint x="195" y="370"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
                <mxCell id="5" value="Channel" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                    <mxGeometry x="230" y="280" width="60" height="30" as="geometry"/>
                </mxCell>
@@ -161,8 +171,8 @@
                        <mxPoint x="290" y="160" as="targetPoint"/>
                        <mxPoint x="200" y="400" as="sourcePoint"/>
                        <Array as="points">
-                            <mxPoint x="90" y="370"/>
-                            <mxPoint x="195" y="370"/>
+                            <mxPoint x="-20" y="340"/>
+                            <mxPoint x="195" y="340"/>
                            <mxPoint x="195" y="260"/>
                            <mxPoint x="260" y="260"/>
                            <mxPoint x="260" y="220"/>
@@ -199,6 +209,9 @@
                        <mxPoint x="320" y="440" as="targetPoint"/>
                    </mxGeometry>
                </mxCell>
+                <mxCell id="66" value="Webhook" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="160" y="400" width="70" height="30" as="geometry"/>
+                </mxCell>
            </root>
        </mxGraphModel>
    </diagram>
--- a/crates/core/database/src/models/safety_strikes/mod.rs
+++ b/crates/core/database/src/models/safety_strikes/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/safety_strikes/model.rs
+++ b/crates/core/database/src/models/safety_strikes/model.rs
@@ -0,0 +1,124 @@
+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(|entry| entry.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()
+            )
+        });
+    }
+}
--- a/crates/core/database/src/models/safety_strikes/ops.rs
+++ b/crates/core/database/src/models/safety_strikes/ops.rs
@@ -0,0 +1,24 @@
+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<()>;
+}
--- a/crates/core/database/src/models/safety_strikes/ops/mongodb.rs
+++ b/crates/core/database/src/models/safety_strikes/ops/mongodb.rs
@@ -0,0 +1,55 @@
+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(|_| ())
+    }
+}
--- a/crates/core/database/src/models/safety_strikes/ops/reference.rs
+++ b/crates/core/database/src/models/safety_strikes/ops/reference.rs
@@ -0,0 +1,60 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/server_members/mod.rs
+++ b/crates/core/database/src/models/server_members/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -0,0 +1,118 @@
+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
+        }
+    }
+}
--- a/crates/core/database/src/models/server_members/ops.rs
+++ b/crates/core/database/src/models/server_members/ops.rs
@@ -0,0 +1,41 @@
+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<()>;
+}
--- a/crates/core/database/src/models/server_members/ops/mongodb.rs
+++ b/crates/core/database/src/models/server_members/ops/mongodb.rs
@@ -0,0 +1,178 @@
+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",
+        })
+    }
+}
--- a/crates/core/database/src/models/server_members/ops/reference.rs
+++ b/crates/core/database/src/models/server_members/ops/reference.rs
@@ -0,0 +1,117 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/servers/mod.rs
+++ b/crates/core/database/src/models/servers/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/servers/model.rs
+++ b/crates/core/database/src/models/servers/model.rs
@@ -0,0 +1,451 @@
+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
+    }
+}
--- a/crates/core/database/src/models/servers/ops.rs
+++ b/crates/core/database/src/models/servers/ops.rs
@@ -0,0 +1,46 @@
+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<()>;
+}
--- a/crates/core/database/src/models/servers/ops/mongodb.rs
+++ b/crates/core/database/src/models/servers/ops/mongodb.rs
@@ -0,0 +1,183 @@
+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",
+        })
+    }
+}
--- a/crates/core/database/src/models/servers/ops/reference.rs
+++ b/crates/core/database/src/models/servers/ops/reference.rs
@@ -0,0 +1,126 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/user_settings/mod.rs
+++ b/crates/core/database/src/models/user_settings/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/user_settings/model.rs
+++ b/crates/core/database/src/models/user_settings/model.rs
@@ -0,0 +1,28 @@
+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(())
+    }
+}
--- a/crates/core/database/src/models/user_settings/ops.rs
+++ b/crates/core/database/src/models/user_settings/ops.rs
@@ -0,0 +1,18 @@
+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<()>;
+}
--- a/crates/core/database/src/models/user_settings/ops/mongodb.rs
+++ b/crates/core/database/src/models/user_settings/ops/mongodb.rs
@@ -0,0 +1,67 @@
+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(|_| ())
+    }
+}
--- a/crates/core/database/src/models/user_settings/ops/reference.rs
+++ b/crates/core/database/src/models/user_settings/ops/reference.rs
@@ -0,0 +1,46 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/users/mod.rs
+++ b/crates/core/database/src/models/users/mod.rs
@@ -0,0 +1,9 @@
+mod model;
+mod ops;
+#[cfg(feature = "rocket-impl")]
+mod rocket;
+
+#[cfg(feature = "rocket-impl")]
+pub use self::rocket::*;
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -0,0 +1,219 @@
+use std::collections::HashSet;
+
+use crate::{Database, File};
+
+use once_cell::sync::Lazy;
+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,
+        /// Discriminator
+        pub discriminator: String,
+        /// Display name
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub display_name: Option<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
+    }
+}
+
+pub static DISCRIMINATOR_SEARCH_SPACE: Lazy<HashSet<String>> = Lazy::new(|| {
+    let mut set = (2..9999)
+        .map(|v| format!("{:0>4}", v))
+        .collect::<HashSet<String>>();
+
+    for discrim in [
+        123, 1234, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999,
+    ] {
+        set.remove(&format!("{:0>4}", discrim));
+    }
+
+    set.into_iter().collect()
+});
--- a/crates/core/database/src/models/users/ops.rs
+++ b/crates/core/database/src/models/users/ops.rs
@@ -0,0 +1,57 @@
+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<()>;
+}
--- a/crates/core/database/src/models/users/ops/mongodb.rs
+++ b/crates/core/database/src/models/users/ops/mongodb.rs
@@ -0,0 +1,300 @@
+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",
+        })
+    }
+}
--- a/crates/core/database/src/models/users/ops/reference.rs
+++ b/crates/core/database/src/models/users/ops/reference.rs
@@ -0,0 +1,121 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/models/users/rocket.rs
+++ b/crates/core/database/src/models/users/rocket.rs
@@ -0,0 +1,44 @@
+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))
+        }
+    }
+}
--- a/crates/core/database/src/util/bridge/mod.rs
+++ b/crates/core/database/src/util/bridge/mod.rs
@@ -0,0 +1 @@
+pub mod v0;
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -0,0 +1,336 @@
+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::Channel> for Channel {
+    fn from(value: crate::Channel) -> Self {
+        match value {
+            crate::Channel::SavedMessages { id, user } => Channel::SavedMessages { id, user },
+            crate::Channel::DirectMessage {
+                id,
+                active,
+                recipients,
+                last_message_id,
+            } => Channel::DirectMessage {
+                id,
+                active,
+                recipients,
+                last_message_id,
+            },
+            crate::Channel::Group {
+                id,
+                name,
+                owner,
+                description,
+                recipients,
+                icon,
+                last_message_id,
+                permissions,
+                nsfw,
+            } => Channel::Group {
+                id,
+                name,
+                owner,
+                description,
+                recipients,
+                icon: icon.map(|file| file.into()),
+                last_message_id,
+                permissions,
+                nsfw,
+            },
+            crate::Channel::TextChannel {
+                id,
+                server,
+                name,
+                description,
+                icon,
+                last_message_id,
+                default_permissions,
+                role_permissions,
+                nsfw,
+            } => Channel::TextChannel {
+                id,
+                server,
+                name,
+                description,
+                icon: icon.map(|file| file.into()),
+                last_message_id,
+                default_permissions,
+                role_permissions,
+                nsfw,
+            },
+            crate::Channel::VoiceChannel {
+                id,
+                server,
+                name,
+                description,
+                icon,
+                default_permissions,
+                role_permissions,
+                nsfw,
+            } => Channel::VoiceChannel {
+                id,
+                server,
+                name,
+                description,
+                icon: icon.map(|file| file.into()),
+                default_permissions,
+                role_permissions,
+                nsfw,
+            },
+        }
+    }
+}
+
+impl From<crate::PartialChannel> for PartialChannel {
+    fn from(value: crate::PartialChannel) -> Self {
+        PartialChannel {
+            name: value.name,
+            owner: value.owner,
+            description: value.description,
+            icon: value.icon.map(|file| file.into()),
+            nsfw: value.nsfw,
+            active: value.active,
+            permissions: value.permissions,
+            role_permissions: value.role_permissions,
+            default_permissions: value.default_permissions,
+            last_message_id: value.last_message_id,
+        }
+    }
+}
+
+impl From<FieldsChannel> for crate::FieldsChannel {
+    fn from(value: FieldsChannel) -> Self {
+        match value {
+            FieldsChannel::Description => crate::FieldsChannel::Description,
+            FieldsChannel::Icon => crate::FieldsChannel::Icon,
+            FieldsChannel::DefaultPermissions => crate::FieldsChannel::DefaultPermissions,
+        }
+    }
+}
+
+impl From<crate::FieldsChannel> for FieldsChannel {
+    fn from(value: crate::FieldsChannel) -> Self {
+        match value {
+            crate::FieldsChannel::Description => FieldsChannel::Description,
+            crate::FieldsChannel::Icon => FieldsChannel::Icon,
+            crate::FieldsChannel::DefaultPermissions => FieldsChannel::DefaultPermissions,
+        }
+    }
+}
+
+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,
+            discriminator: self.discriminator,
+            display_name: self.display_name,
+            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,
+        }
+    }
+}
--- a/crates/core/database/src/util/mod.rs
+++ b/crates/core/database/src/util/mod.rs
@@ -0,0 +1,3 @@
+pub mod bridge;
+pub mod permissions;
+pub mod reference;
--- a/crates/core/database/src/util/permissions.rs
+++ b/crates/core/database/src/util/permissions.rs
@@ -0,0 +1,206 @@
+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)
+}
--- a/crates/core/database/src/util/reference.rs
+++ b/crates/core/database/src/util/reference.rs
@@ -0,0 +1,57 @@
+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, Webhook};
+
+/// 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
+    }
+
+    /// Fetch webhook from Ref
+    pub async fn as_webhook(&self, db: &Database) -> Result<Webhook> {
+        db.fetch_webhook(&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()
+        })
+    }
+}
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "revolt-models"
+version = "0.6.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", "revolt-permissions/serde" ]
+schemas = [ "dep:schemars", "revolt-permissions/schemas" ]
+validator = [ "dep:validator" ]
+partials = [ "dep:revolt_optional_struct", "serde", "schemas" ]
+
+default = [ "serde", "partials" ]
+
+[dependencies]
+# Core
+revolt-permissions = { version = "0.6.1", path = "../permissions" }
+
+# 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"] }
--- a/crates/core/models/src/lib.rs
+++ b/crates/core/models/src/lib.rs
@@ -0,0 +1,59 @@
+#[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
+}
--- a/crates/core/models/src/v0/account_strikes.rs
+++ b/crates/core/models/src/v0/account_strikes.rs
@@ -0,0 +1,28 @@
+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,
+    }
+);
--- a/crates/core/models/src/v0/bots.rs
+++ b/crates/core/models/src/v0/bots.rs
@@ -0,0 +1,88 @@
+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,
+    }
+);
--- a/crates/core/models/src/v0/channel_webhooks.rs
+++ b/crates/core/models/src/v0/channel_webhooks.rs
@@ -0,0 +1,90 @@
+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,
+        }
+    }
+}
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -0,0 +1,208 @@
+use super::File;
+
+use revolt_permissions::OverrideField;
+use std::collections::HashMap;
+
+auto_derived!(
+    /// Channel
+    pub enum Channel {
+        /// Personal "Saved Notes" channel which allows users to save messages
+        SavedMessages {
+            /// Unique Id
+            #[cfg_attr(feature = "serde", serde(rename = "_id"))]
+            id: String,
+            /// Id of the user this channel belongs to
+            user: String,
+        },
+        /// Direct message channel between two users
+        DirectMessage {
+            /// Unique Id
+            #[cfg_attr(feature = "serde", serde(rename = "_id"))]
+            id: String,
+
+            /// Whether this direct message channel is currently open on both sides
+            active: bool,
+            /// 2-tuple of user ids participating in direct message
+            recipients: Vec<String>,
+            /// Id of the last message sent in this channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            last_message_id: Option<String>,
+        },
+        /// Group channel between 1 or more participants
+        Group {
+            /// Unique Id
+            #[cfg_attr(feature = "serde", serde(rename = "_id"))]
+            id: String,
+
+            /// Display name of the channel
+            name: String,
+            /// User id of the owner of the group
+            owner: String,
+            /// Channel description
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            description: Option<String>,
+            /// Array of user ids participating in channel
+            recipients: Vec<String>,
+
+            /// Custom icon attachment
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            icon: Option<File>,
+            /// Id of the last message sent in this channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            last_message_id: Option<String>,
+
+            /// Permissions assigned to members of this group
+            /// (does not apply to the owner of the group)
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            permissions: Option<i64>,
+
+            /// Whether this group is marked as not safe for work
+            #[cfg_attr(
+                feature = "serde",
+                serde(skip_serializing_if = "crate::if_false", default)
+            )]
+            nsfw: bool,
+        },
+        /// Text channel belonging to a server
+        TextChannel {
+            /// Unique Id
+            #[cfg_attr(feature = "serde", serde(rename = "_id"))]
+            id: String,
+            /// Id of the server this channel belongs to
+            server: String,
+
+            /// Display name of the channel
+            name: String,
+            /// Channel description
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            description: Option<String>,
+
+            /// Custom icon attachment
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            icon: Option<File>,
+            /// Id of the last message sent in this channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            last_message_id: Option<String>,
+
+            /// Default permissions assigned to users in this channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            default_permissions: Option<OverrideField>,
+            /// Permissions assigned based on role to this channel
+            #[cfg_attr(
+                feature = "serde",
+                serde(
+                    default = "HashMap::<String, OverrideField>::new",
+                    skip_serializing_if = "HashMap::<String, OverrideField>::is_empty"
+                )
+            )]
+            role_permissions: HashMap<String, OverrideField>,
+
+            /// Whether this channel is marked as not safe for work
+            #[cfg_attr(
+                feature = "serde",
+                serde(skip_serializing_if = "crate::if_false", default)
+            )]
+            nsfw: bool,
+        },
+        /// Voice channel belonging to a server
+        VoiceChannel {
+            /// Unique Id
+            #[cfg_attr(feature = "serde", serde(rename = "_id"))]
+            id: String,
+            /// Id of the server this channel belongs to
+            server: String,
+
+            /// Display name of the channel
+            name: String,
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            /// Channel description
+            description: Option<String>,
+            /// Custom icon attachment
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            icon: Option<File>,
+
+            /// Default permissions assigned to users in this channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            default_permissions: Option<OverrideField>,
+            /// Permissions assigned based on role to this channel
+            #[cfg_attr(
+                feature = "serde",
+                serde(
+                    default = "HashMap::<String, OverrideField>::new",
+                    skip_serializing_if = "HashMap::<String, OverrideField>::is_empty"
+                )
+            )]
+            role_permissions: HashMap<String, OverrideField>,
+
+            /// Whether this channel is marked as not safe for work
+            #[cfg_attr(
+                feature = "serde",
+                serde(skip_serializing_if = "crate::if_false", default)
+            )]
+            nsfw: bool,
+        },
+    }
+
+    /// Partial representation of a channel
+    #[derive(Default)]
+    pub struct PartialChannel {
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub name: Option<String>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub owner: Option<String>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub description: Option<String>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub icon: Option<File>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub nsfw: Option<bool>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub active: Option<bool>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub permissions: Option<i64>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub role_permissions: Option<HashMap<String, OverrideField>>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub default_permissions: Option<OverrideField>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub last_message_id: Option<String>,
+    }
+
+    /// Optional fields on channel object
+    pub enum FieldsChannel {
+        Description,
+        Icon,
+        DefaultPermissions,
+    }
+
+    /// New webhook information
+    #[cfg_attr(feature = "validator", derive(validator::Validate))]
+    pub struct DataEditChannel {
+        /// Channel name
+        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 32)))]
+        pub name: Option<String>,
+
+        /// Channel description
+        #[cfg_attr(feature = "validator", validate(length(min = 0, max = 1024)))]
+        pub description: Option<String>,
+
+        /// Group owner
+        pub owner: Option<String>,
+
+        /// Icon
+        ///
+        /// Provide an Autumn attachment Id.
+        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 128)))]
+        pub icon: Option<String>,
+
+        /// Whether this channel is age-restricted
+        pub nsfw: Option<bool>,
+
+        /// Whether this channel is archived
+        pub archived: Option<bool>,
+
+        /// Fields to remove from channel
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Option<Vec<FieldsChannel>>,
+    }
+);
--- a/crates/core/models/src/v0/files.rs
+++ b/crates/core/models/src/v0/files.rs
@@ -0,0 +1,56 @@
+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,
+    }
+);
--- a/crates/core/models/src/v0/mod.rs
+++ b/crates/core/models/src/v0/mod.rs
@@ -0,0 +1,13 @@
+mod account_strikes;
+mod bots;
+mod channel_webhooks;
+mod channels;
+mod files;
+mod users;
+
+pub use account_strikes::*;
+pub use bots::*;
+pub use channel_webhooks::*;
+pub use channels::*;
+pub use files::*;
+pub use users::*;
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -0,0 +1,165 @@
+use super::File;
+
+auto_derived!(
+    /// User
+    pub struct User {
+        /// Unique Id
+        #[serde(rename = "_id")]
+        pub id: String,
+        /// Username
+        pub username: String,
+        /// Discriminator
+        pub discriminator: String,
+        /// Display name
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub display_name: Option<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
+    }
+}
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "revolt-permissions"
+version = "0.6.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]
+bson = ["dep:bson"]
+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 }
+bson = { version = "2.1.0", optional = true}
+
+# Spec Generation
+schemars = { version = "0.8.8", optional = true }
--- a/crates/core/permissions/src/impl.rs
+++ b/crates/core/permissions/src/impl.rs
@@ -0,0 +1,128 @@
+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(),
+    }
+}
--- a/crates/core/permissions/src/lib.rs
+++ b/crates/core/permissions/src/lib.rs
@@ -0,0 +1,16 @@
+#[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;
--- a/crates/core/permissions/src/models/channel.rs
+++ b/crates/core/permissions/src/models/channel.rs
@@ -0,0 +1,137 @@
+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,
+    )
+});
--- a/crates/core/permissions/src/models/mod.rs
+++ b/crates/core/permissions/src/models/mod.rs
@@ -0,0 +1,58 @@
+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()
+    }
+}
--- a/crates/core/permissions/src/models/server.rs
+++ b/crates/core/permissions/src/models/server.rs
@@ -0,0 +1,97 @@
+#[cfg(feature = "schemas")]
+use schemars::JsonSchema;
+
+/// Representation of a single permission override
+#[derive(Debug, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schemas", derive(JsonSchema))]
+pub struct Override {
+    /// Allow bit flags
+    pub allow: u64,
+    /// Disallow bit flags
+    pub deny: u64,
+}
+
+/// Data permissions Field - contains both allow and deny
+#[derive(Debug, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schemas", derive(JsonSchema))]
+pub struct DataPermissionsField {
+    pub permissions: Override,
+}
+
+/// Data permissions Value - contains allow
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schemas", derive(JsonSchema))]
+pub struct DataPermissionsValue {
+    pub permissions: u64,
+}
+
+/// Data permissions Poly - can contain either Value or Field
+#[derive(Debug, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schemas", derive(JsonSchema))]
+#[cfg_attr(feature = "serde", serde(untagged))]
+pub enum DataPermissionPoly {
+    Value {
+        /// Permission values to set for members in a `Group`
+        permissions: u64,
+    },
+    Field {
+        /// Allow / deny values to set for members in this `TextChannel` or `VoiceChannel`
+        permissions: Override,
+    },
+}
+
+/// Representation of a single permission override
+/// as it appears on models and in the database
+#[derive(Debug, Clone, Copy, Default, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schemas", derive(JsonSchema))]
+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,
+        }
+    }
+}
+
+#[cfg(feature = "bson")]
+use bson::Bson;
+
+#[cfg(feature = "bson")]
+impl From<OverrideField> for Bson {
+    fn from(v: OverrideField) -> Self {
+        Self::Document(bson::to_document(&v).unwrap())
+    }
+}
--- a/crates/core/permissions/src/models/user.rs
+++ b/crates/core/permissions/src/models/user.rs
@@ -0,0 +1,25 @@
+/// 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 });
--- a/crates/core/permissions/src/test.rs
+++ b/crates/core/permissions/src/test.rs
@@ -0,0 +1,377 @@
+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
+        }
+    }
+}
--- a/crates/core/permissions/src/trait.rs
+++ b/crates/core/permissions/src/trait.rs
@@ -0,0 +1,67 @@
+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);
+}
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "revolt-presence"
+version = "0.6.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"
--- a/crates/core/presence/src/lib.rs
+++ b/crates/core/presence/src/lib.rs
@@ -0,0 +1,247 @@
+#[macro_use]
+extern crate log;
+
+use once_cell::sync::Lazy;
+use rand::Rng;
+use redis_kiss::{get_connection, AsyncCommands};
+use std::collections::HashSet;
+
+mod operations;
+use operations::{
+    __add_to_set_string, __add_to_set_u32, __delete_key, __get_set_members_as_string,
+    __get_set_size, __remove_from_set_string, __remove_from_set_u32,
+};
+
+pub static REGION_ID: Lazy<u16> = Lazy::new(|| {
+    std::env::var("REGION_ID")
+        .unwrap_or_else(|_| "0".to_string())
+        .parse()
+        .unwrap()
+});
+
+pub static REGION_KEY: Lazy<String> = Lazy::new(|| format!("region{}", &*REGION_ID));
+pub static ONLINE_SET: &str = "online";
+
+pub static FLAG_BITS: u32 = 0b1;
+
+/// Create a new presence session, returns the ID of this session
+pub async fn create_session(user_id: &str, flags: u8) -> (bool, u32) {
+    info!("Creating a presence session for {user_id} with flags {flags}");
+
+    if let Ok(mut conn) = get_connection().await {
+        // Check whether this is the first session
+        let was_empty = __get_set_size(&mut conn, user_id).await == 0;
+
+        // A session ID is comprised of random data and any flags ORed to the end
+        let session_id = {
+            let mut rng = rand::thread_rng();
+            (rng.gen::<u32>() & !FLAG_BITS) | (flags as u32 & FLAG_BITS)
+        };
+
+        // Add session to user's sessions and to the region
+        __add_to_set_u32(&mut conn, user_id, session_id).await;
+        __add_to_set_string(&mut conn, ONLINE_SET, user_id).await;
+        __add_to_set_string(&mut conn, &REGION_KEY, &format!("{user_id}:{session_id}")).await;
+        info!("Created session for {user_id}, assigned them a session ID of {session_id}.");
+
+        (was_empty, session_id)
+    } else {
+        // Fail through
+        (false, 0)
+    }
+}
+
+/// Delete existing presence session
+pub async fn delete_session(user_id: &str, session_id: u32) -> bool {
+    delete_session_internal(user_id, session_id, false).await
+}
+
+/// Delete existing presence session (but also choose whether to skip region)
+async fn delete_session_internal(user_id: &str, session_id: u32, skip_region: bool) -> bool {
+    info!("Deleting presence session for {user_id} with id {session_id}");
+
+    if let Ok(mut conn) = get_connection().await {
+        // Remove the session
+        __remove_from_set_u32(&mut conn, user_id, session_id).await;
+
+        // Remove from the region
+        if !skip_region {
+            __remove_from_set_string(&mut conn, &REGION_KEY, &format!("{user_id}:{session_id}"))
+                .await;
+        }
+
+        // Return whether this was the last session
+        let is_empty = __get_set_size(&mut conn, user_id).await == 0;
+        if is_empty {
+            __remove_from_set_string(&mut conn, ONLINE_SET, user_id).await;
+            info!("User ID {} just went offline.", &user_id);
+        }
+
+        is_empty
+    } else {
+        // Fail through
+        false
+    }
+}
+
+/// Check whether a given user ID is online
+pub async fn is_online(user_id: &str) -> bool {
+    if let Ok(mut conn) = get_connection().await {
+        conn.exists(user_id).await.unwrap_or(false)
+    } else {
+        false
+    }
+}
+
+/// Check whether a set of users is online, returns a set of the online user IDs
+#[cfg(feature = "redis-is-patched")]
+pub async fn filter_online(user_ids: &'_ [String]) -> HashSet<String> {
+    // Ignore empty list immediately, to save time.
+    let mut set = HashSet::new();
+    if user_ids.is_empty() {
+        return set;
+    }
+
+    // NOTE: at the point that we need mobile indicators
+    // you can interpret the data here and return a new data
+    // structure like HashMap<String /* id */, u8 /* flags */>
+
+    // We need to handle a special case where only one is present
+    // as for some reason or another, Redis does not like us sending
+    // a list of just one ID to the server.
+    if user_ids.len() == 1 {
+        if is_online(&user_ids[0]).await {
+            set.insert(user_ids[0].to_string());
+        }
+
+        return set;
+    }
+
+    // Otherwise, go ahead as normal.
+    if let Ok(mut conn) = get_connection().await {
+        // Ok so, if this breaks, that means we've lost the Redis patch which adds SMISMEMBER
+        // Currently it's patched in through a forked repository, investigate what happen to it
+        let data: Vec<bool> = conn
+            .smismember(ONLINE_SET, user_ids)
+            .await
+            .expect("this shouldn't happen, please read this code! presence/mod.rs");
+
+        if data.is_empty() {
+            return set;
+        }
+
+        // We filter known values to figure out who is online.
+        for i in 0..user_ids.len() {
+            if data[i] {
+                set.insert(user_ids[i].to_string());
+            }
+        }
+    }
+
+    set
+}
+
+/// Check whether a set of users is online, returns a set of the online user IDs
+#[cfg(not(feature = "redis-is-patched"))]
+pub async fn filter_online(user_ids: &'_ [String]) -> HashSet<String> {
+    if user_ids.is_empty() {
+        HashSet::new()
+    } else if let Ok(mut conn) = get_connection().await {
+        let members: Vec<String> = conn.smembers(ONLINE_SET).await.unwrap_or_default();
+        let members: HashSet<&String> = members.iter().collect();
+        let user_ids: HashSet<&String> = user_ids.iter().collect();
+
+        members
+            .intersection(&user_ids)
+            .map(|x| x.to_string())
+            .collect()
+    } else {
+        HashSet::new()
+    }
+}
+
+/// Reset any stale presence data
+pub async fn clear_region(region_id: Option<&str>) {
+    let region_id = region_id.unwrap_or(&*REGION_KEY);
+    let mut conn = get_connection().await.expect("Redis connection");
+
+    let sessions = __get_set_members_as_string(&mut conn, region_id).await;
+    if !sessions.is_empty() {
+        info!(
+            "Cleaning up {} sessions, this may take a while...",
+            sessions.len()
+        );
+
+        // Iterate and delete each session, this will
+        // also send out any relevant events.
+        for session in sessions {
+            let parts = session.split(':').collect::<Vec<&str>>();
+            if let (Some(user_id), Some(session_id)) = (parts.first(), parts.get(1)) {
+                if let Ok(session_id) = session_id.parse() {
+                    delete_session_internal(user_id, session_id, true).await;
+                }
+            }
+        }
+
+        // Then clear the set in Redis.
+        __delete_key(&mut conn, region_id).await;
+
+        info!("Clean up complete.");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{clear_region, create_session, delete_session, filter_online, is_online};
+    use rand::Rng;
+
+    #[async_std::test]
+    async fn it_works() {
+        // Clear the region before we start the tests:
+        clear_region(None).await;
+
+        // Generate some data we'll use:
+        let user_id = rand::thread_rng().gen::<u32>().to_string();
+        let other_id = rand::thread_rng().gen::<u32>().to_string();
+        let flags = 1;
+
+        // Create a session
+        let (first_session, session_id) = create_session(&user_id, flags).await;
+        assert!(first_session);
+        assert_ne!(session_id, 0);
+        assert_eq!(session_id as u8 & flags, flags);
+
+        // Check if the user is online
+        assert!(is_online(&user_id).await);
+
+        let user_ids = filter_online(&[user_id.to_string()]).await;
+        assert_eq!(user_ids.len(), 1);
+        assert!(user_ids.contains(&user_id));
+
+        // Create a few more sessions
+        let (first_session, second_session_id) = create_session(&user_id, 0).await;
+        assert!(!first_session);
+        dbg!(second_session_id);
+        assert_eq!(second_session_id as u8 & 1, 0);
+
+        let (first_session, other_session_id) = create_session(&other_id, 0).await;
+        assert!(first_session);
+
+        let user_ids = filter_online(&[user_id.to_string(), other_id.to_string()]).await;
+        assert_eq!(user_ids.len(), 2);
+        assert!(user_ids.contains(&user_id));
+        assert!(user_ids.contains(&other_id));
+
+        // Remove sessions
+        delete_session(&user_id, session_id).await;
+        delete_session(&other_id, other_session_id).await;
+        assert!(!is_online(&other_id).await);
+
+        // Check if we can wipe everything too
+        clear_region(None).await;
+        assert!(!is_online(&user_id).await);
+
+        let user_ids = filter_online(&[user_id.to_string(), other_id.to_string()]).await;
+        assert!(user_ids.is_empty())
+    }
+}
--- a/crates/quark/src/presence/operations.rs
+++ b/crates/quark/src/presence/operations.rs
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "revolt-result"
+version = "0.6.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 }
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -0,0 +1,184 @@
+#[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));
+    }
+}
--- a/crates/core/result/src/okapi.rs
+++ b/crates/core/result/src/okapi.rs
@@ -0,0 +1,49 @@
+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()
+        })
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul Makles	c8d5128b0c	chore: add additional sanitisation	2023-06-11 12:26:18 +01:00
Paul Makles	0578a05a05	feat: add remove "displayname" field	2023-06-11 12:05:08 +01:00
Paul Makles	9a412b3e08	fix: actually update the display name	2023-06-11 11:50:21 +01:00
Paul Makles	8deec1f80a	fix: display name is optional	2023-06-11 10:56:03 +01:00
Paul Makles	26afbeed84	chore: extend discriminator block list	2023-06-11 10:49:51 +01:00
Paul Makles	9975de01bc	chore: remove webhooks from production	2023-06-11 10:09:50 +01:00
Paul Makles	ac525466b8	chore: cut a new release (0.6.0)	2023-06-11 10:04:15 +01:00
Paul Makles	c7a04e4559	fix: conflict resolution in migration fix: write new username and display name chore: restrict discriminator search space	2023-06-11 09:53:41 +01:00
Paul Makles	5bbe30edbc	feat(core/database): migrate to discriminators	2023-06-11 09:16:24 +01:00
Paul Makles	31c7dc0577	feat: add discriminator and display name fields	2023-06-09 16:34:18 +01:00
Paul Makles	aba5c7d8af	fix: shouldn't prefix dep:	2023-06-04 19:45:47 +01:00
Paul Makles	2f4ea4cabb	refactor(core/models): transitively apply feature flags	2023-06-04 19:45:31 +01:00
Paul Makles	7e801a31bd	fix: make sure feature flags are respected	2023-06-04 19:43:56 +01:00
Paul Makles	eb4870c9d5	fix: explicitly target Rust 1.70.0 for images	2023-06-04 19:42:42 +01:00
Paul Makles	b1fdd7fc74	merge: pull request #251 from revoltchat/fix/zomatree/send-message-null	2023-06-04 19:29:07 +01:00
Paul Makles	bf3e027067	feat: channel model implementation (#250 ) Co-authored-by: ToastXC <100072983+toastxc@users.noreply.github.com>	2023-06-04 18:52:49 +01:00
Zomatree	a7a7e49e18	fix: send message route not accepting null	2023-06-04 18:46:49 +01:00
Paul Makles	3c834d06d4	fix: must not restrict lowerbound for embeds	2023-06-03 17:49:31 +01:00
Paul Makles	f5e6086d2a	fix(core/database): test matches incorrect entry [skip ci]	2023-06-03 17:15:43 +01:00
Paul Makles	3365a8e482	chore: force bind to 0.0.0.0 because it's just ignoring all environment variables???	2023-06-03 17:05:25 +01:00
Paul Makles	268c2d1355	fix: re-order crate publishing	2023-06-03 14:11:44 +01:00
Paul Makles	e9d6b963df	chore: bump version to 0.6.0-rc.1	2023-06-03 14:06:04 +01:00
Paul Makles	f9d9447203	feat: add additional validation for github webhook	2023-06-03 14:02:16 +01:00
Paul Makles	a0002d0b43	feat: reintroduce permission checks for send	2023-06-03 14:00:17 +01:00
Paul Makles	23188032ca	refactor(delta): port routes to core webhook models	2023-06-03 13:01:43 +01:00
Paul Makles	f9f5a30e2c	refactor(quark): strip webhook code	2023-06-03 13:01:28 +01:00
Paul Makles	e393e17b59	feat(core/result): add rocket and okapi support	2023-06-03 13:01:12 +01:00
Paul Makles	a29d8f6aab	refactor(core/models): swap dependency order with db feat(core/models): implement webhook model	2023-06-03 13:01:01 +01:00
Paul Makles	1dbbc3ed8d	feat(core/database): implement webhook model	2023-06-03 13:00:05 +01:00
Paul Makles	410acb5b5c	merge: branch 'master' into webhooks	2023-06-02 18:55:32 +01:00
Paul Makles	53c9160cd6	feat: implement creating strikes feat: add moderator_id to strikes fix: use correct collection for strikes	2023-05-31 19:04:20 +01:00
Paul Makles	28b1170633	ci: switch to stable Rust releases for builds	2023-05-31 17:22:12 +01:00
Paul Makles	4abd4070f7	feat: allow editing owned bots using user edit route	2023-05-31 17:10:57 +01:00
Paul Makles	bca17b11a7	feat: filter reports on fetch	2023-05-31 17:04:33 +01:00
Paul Makles	2a6d532852	feat: allow fetching channels with server	2023-05-31 14:05:46 +01:00
Paul Makles	a9a5af8cc8	feat: account strike CRUD API	2023-05-31 13:39:13 +01:00
Paul Makles	edfa8e5256	feat(core/models): add account strikes	2023-05-31 13:06:16 +01:00
Paul Makles	2ebcfdc770	refactor: clean up hints	2023-05-31 13:02:59 +01:00
Paul Makles	fc47df786b	feat(core/database): add account strikes model	2023-05-31 13:01:19 +01:00
Paul Makles	f6aa405607	fix(core/database): create user for bot CRUD test	2023-05-31 12:58:36 +01:00
Paul Makles	101e8feaa2	fix: fallback to empty string when deserialising	2023-05-25 11:25:25 +01:00
ToastXC	df8f588e15	fix: remove check for bot account under group member fetch (#245 )	2023-05-21 18:34:27 +01:00
Paul Makles	3ef549537e	feat: de-duplicate user update events sent to clients	2023-05-21 16:22:42 +01:00
Paul Makles	d81d08f1ce	feat: add a route for searching for server members	2023-05-21 16:09:14 +01:00
Paul Makles	a77b7717b8	feat: generate and fetch multiple snapshots	2023-05-21 15:36:36 +01:00
Paul Makles	d5f903781d	feat: add more specificity to report reasons	2023-05-21 15:35:16 +01:00
Paul Makles	8b12546b56	fix: allow editing flags and discoverable	2023-05-15 17:18:33 +01:00
Paul Makles	5bb91a7113	merge: pull request #242 from Rexogamer/patch-2 chore: bump max bots count to 10	2023-05-15 17:17:17 +01:00
Sophie L	a04c2512b4	chore: bump max bots count to 10	2023-04-27 16:30:24 +01:00
Paul Makles	c3f0df6567	chore: add style guide [skip ci]	2023-04-27 12:04:50 +01:00
Paul Makles	8b8aec4dc1	feat(core/database): implement server member	2023-04-26 18:58:31 +01:00
Paul Makles	1d228ff76e	feat(core/database): implement server model	2023-04-26 18:32:29 +01:00
Paul Makles	b5863c0104	feat(core/database): implement user settings model	2023-04-26 17:53:46 +01:00
Paul Makles	08ccc43f8d	feat(core/database): implement user operations	2023-04-26 17:36:51 +01:00
Paul Makles	e33ae17061	refactor(core/database): AbstractAttachment -> AbstractAttachments	2023-04-26 16:51:52 +01:00
Paul Makles	60ebdb64d7	feat(core/database): implement File operations	2023-04-26 16:49:39 +01:00
Paul Makles	c27d0ad5bb	chore: move relations.drawio	2023-04-26 16:45:51 +01:00
Paul Makles	c1b9d941f3	refactor(core/database): crud ordering in files	2023-04-26 16:36:38 +01:00
Zomatree	175866ce00	Merge remote-tracking branch 'revoltchat/master' into webhooks	2023-04-25 20:38:09 +01:00
Zomatree	8c5de18991	restrict webhooks to text and group dm channels	2023-04-25 20:30:16 +01:00
Paul Makles	1afb27a508	ci: compile in permissions crate	2023-04-24 10:08:22 +01:00
Paul Makles	6a8481f7df	refactor: is-patched transitive through models	2023-04-23 23:09:21 +01:00
Paul Makles	7f201565c0	feat: implement unoptimised `filter_online` if redis is not patched	2023-04-23 23:06:51 +01:00
Paul Makles	ae9474b95d	fix(core/database): gate rocket-impl properly	2023-04-23 22:17:34 +01:00
Paul Makles	050f3abc89	chore: update crate definitions and bump versions	2023-04-23 22:14:38 +01:00
Paul Makles	888c22cb54	feat(core/database): start implementing permissions	2023-04-23 22:12:15 +01:00
Paul Makles	f633fccbca	feat(core/permissions): initial commit	2023-04-23 22:11:59 +01:00
Paul Makles	39fec310f9	refactor(core/models): move models into v0 module	2023-04-23 18:09:16 +01:00
Paul Makles	d5d922d830	feat(core/models): rest of the conversions to User model	2023-04-23 18:07:23 +01:00
Paul Makles	f8c8407af3	feat(core/models): basic implementation of User and File models	2023-04-23 17:44:36 +01:00
Paul Makles	e6d0d44c5a	feat(core/database): basic implementation of User and File models	2023-04-23 17:44:23 +01:00
Paul Makles	1933c9ea3d	feat(core/database): add Reference struct	2023-04-23 14:59:44 +01:00
Paul Makles	8a695b4bb5	ci: actually make the source folders for building deps	2023-04-23 09:03:37 +01:00
Paul Makles	bf71b45fbb	ci: copy core crates into Dockerfile	2023-04-23 08:51:43 +01:00
Paul Makles	9124c9f1e3	ci: include new core crates in build	2023-04-22 23:42:17 +01:00
Paul Makles	bcc2d05625	merge: branch 'refactor/split-project-into-core-crates'	2023-04-22 21:13:45 +01:00
Paul Makles	22bfd720b5	merge: remote-tracking branch 'origin/master' into refactor/split-project-into-core-crates	2023-04-22 21:09:51 +01:00
Paul Makles	63f56aec0c	ci: re-order services and testing	2023-04-22 20:30:02 +01:00
Paul Makles	dd3d7e9c49	fix(core/database): use configured database name for migrations	2023-04-22 20:15:10 +01:00
Paul Makles	dbb66edd9f	chore(core/database): delete useless example binary	2023-04-22 20:07:56 +01:00
Paul Makles	8bfb48dff3	test(core/database): try migrating the database	2023-04-22 20:02:23 +01:00
Paul Makles	12d963d2bd	refactor: create presence crate and add tests	2023-04-22 20:01:23 +01:00
Paul Makles	c817c2dd40	fix: don't use wildcard for log dependency	2023-04-22 18:03:19 +01:00
Paul Makles	8a230ba989	chore: change publishing order	2023-04-22 18:02:01 +01:00
Paul Makles	2a9cc3190c	fix: forgot to specify version for result crate	2023-04-22 18:01:44 +01:00
Paul Makles	e84d55a697	chore: update Cargo.toml for core crates	2023-04-22 18:01:06 +01:00
Paul Makles	403a94f70c	feat(delta): example implementation of new core models	2023-04-22 17:56:48 +01:00
Paul Makles	633eb78630	chore: migrate to revolt_optional_struct	2023-04-22 17:56:24 +01:00
Paul Makles	bbe1f4936c	chore: bridge gap between core/result and quark	2023-04-22 17:56:09 +01:00
Paul Makles	11a87263be	feat(core/models): implement Bot and PublicBot	2023-04-22 17:55:30 +01:00
Paul Makles	8b30dddc06	chore(core/result): add schema feature	2023-04-22 17:55:12 +01:00
Paul Makles	b93dd90caf	refactor(core/database): use empty strings instead of options	2023-04-22 17:54:46 +01:00
Paul Makles	0054019f82	ci: run test on all pushes	2023-04-22 16:05:40 +01:00
Paul Makles	736220a94e	ci: run tests with and without MongoDB	2023-04-22 16:03:08 +01:00
Paul Makles	a9c82791b3	fix: force OOP bot updates to avoid inconsistencies	2023-04-22 16:01:27 +01:00
Paul Makles	eacf4decab	refactor: clean up database before and after tests	2023-04-22 16:01:07 +01:00
Paul Makles	b8cda2ec74	feat: add drop_database for tests	2023-04-22 16:00:57 +01:00
Paul Makles	69ab7e031b	chore: add linting rules for disallowed methods	2023-04-22 16:00:30 +01:00
Paul Makles	ace6431cb8	fix: ensure database namespace is valid	2023-04-22 15:24:46 +01:00
Paul Makles	40790de909	feat: macros for reducing error boilerplate	2023-04-22 15:23:20 +01:00
Paul Makles	750037b5d2	test: use custom database name and add clean up	2023-04-22 14:58:55 +01:00
Paul Makles	6b10385c0d	feat: implement bots including tests this starts work on #78	2023-04-22 14:25:02 +01:00
Paul Makles	56ead0f894	feat: write result crate	2023-04-22 12:48:09 +01:00
Paul Makles	d633cba630	fix: migration example	2023-04-22 12:12:23 +01:00
Paul Makles	e43833c0ea	refactor: combine models and db crate together	2023-04-22 12:12:02 +01:00
Paul Makles	7f86337cb2	refactor: split `SISMEMBER` into two commands	2023-04-22 10:41:12 +01:00
Paul Makles	f2bb388b3b	refactor: minimum implementation of revolt-models and revolt-database	2023-04-22 00:01:56 +01:00
Paul Makles	43e45aef3f	fix: patch redis-rs for `SMISMEMBER` support	2023-04-21 19:37:33 +01:00
Paul Makles	c5880596a4	refactor: use a separate online user ID set	2023-04-21 19:36:25 +01:00
Paul Makles	59a644891d	fix: collect IDs as set first to deduplicate entries	2023-04-21 18:52:41 +01:00
Paul Makles	a326cdc736	refactor: remove unused import	2023-04-21 18:40:00 +01:00
Zomatree	57f00a283b	make request function names the same as file name	2023-04-20 17:52:10 +01:00
Zomatree	312e1dd41f	update code to be inline with reviews	2023-04-20 17:45:48 +01:00
Zomatree	426d836a09	Merge remote-tracking branch 'revoltchat/master' into webhooks	2023-04-18 19:50:04 +01:00
Zomatree	2fad66d24a	only send a subsect of the webhook in a message	2023-04-18 19:39:34 +01:00
Zomatree	83429f9f65	fix broken merge conflict	2023-04-01 23:09:29 +01:00
Angelo Kontaxis	a60ae78176	Merge branch 'master' into webhooks	2023-04-01 22:52:11 +01:00
Zomatree	7b39f4e9d9	change how webhook information is in the webhook	2023-04-01 22:49:34 +01:00
Zomatree	01577fd798	avoid leaking the token in events	2023-03-11 23:24:10 +00:00
Zomatree	fca91e1560	update upstream code	2023-03-01 11:49:28 +00:00
Angelo Kontaxis	3c881a40a6	Merge branch 'master' into webhooks	2023-02-23 17:26:59 +00:00
Zomatree	c7849a82bf	Merge branch 'master' of github.com:revoltchat/backend into webhooks	2023-01-27 17:27:32 +00:00
Zomatree	781d51df6f	add seperate non token webhook routes	2023-01-27 17:26:32 +00:00
Zomatree	758b1e43e7	no longer make mesage_send.rs public	2023-01-24 22:54:09 +00:00
Zomatree	5cc8231c36	deduplicate message sending	2023-01-24 22:52:18 +00:00
Zomatree	7b447faefa	add pull request events	2023-01-21 22:57:12 +00:00
Zomatree	a017256e95	add more events	2023-01-20 20:15:12 +00:00
Zomatree	1050891d87	Merge branch 'master' of github.com:revoltchat/backend into webhooks	2023-01-20 20:04:18 +00:00
Zomatree	a246cff7f0	Merge branch 'master' of github.com:revoltchat/backend into webhooks	2023-01-18 21:03:15 +00:00
Zomatree	c218db5047	add push event	2022-12-30 22:44:36 +00:00
Zomatree	c7f2f3614f	star event	2022-12-30 18:08:43 +00:00
Zomatree	c826d8cf07	add github webhook support	2022-11-27 06:52:44 +00:00
Zomatree	5cb2320760	inital webhook support	2022-11-26 23:07:22 +00:00