merge: pull request #135 from revoltchat/quark

.env.example

@@ -0,0 +1,79 @@
+# MongoDB URI
+MONGODB=mongodb://localhost
+
+# URL to where the Revolt app is publicly accessible
+REVOLT_APP_URL=http://local.revolt.chat:5000
+
+# URL to where the API is publicly accessible
+REVOLT_PUBLIC_URL=http://local.revolt.chat:8000
+VITE_API_URL=http://local.revolt.chat:8000
+
+# URL to where the WebSocket server is publicly accessible
+REVOLT_EXTERNAL_WS_URL=ws://local.revolt.chat:9000
+
+# URL to where Autumn is publicly available
+AUTUMN_PUBLIC_URL=http://local.revolt.chat:3000
+
+# URL to where January is publicly available
+JANUARY_PUBLIC_URL=http://local.revolt.chat:7000
+
+# URL to where Vortex is publicly available
+# VOSO_PUBLIC_URL=https://voso.revolt.chat
+
+
+##
+## hCaptcha Settings
+##
+
+# If you are sure that you don't want to use hCaptcha, set to 1.
+REVOLT_UNSAFE_NO_CAPTCHA=1
+
+# hCaptcha API key
+# REVOLT_HCAPTCHA_KEY=0x0000000000000000000000000000000000000000
+
+# hCaptcha site key
+# REVOLT_HCAPTCHA_SITEKEY=10000000-ffff-ffff-ffff-000000000001
+
+
+##
+## Email Settings
+##
+
+# If you are sure that you don't want to use email verification, set to 1.
+REVOLT_UNSAFE_NO_EMAIL=1
+
+# SMTP host
+# REVOLT_SMTP_HOST=smtp.example.com
+
+# SMTP username
+# REVOLT_SMTP_USERNAME=noreply@example.com
+
+# SMTP password
+# REVOLT_SMTP_PASSWORD=CHANGEME
+
+# SMTP From header
+# REVOLT_SMTP_FROM=Revolt <noreply@example.com>
+
+
+##
+## Application Settings
+##
+
+# Whether to only allow users to sign up if they have an invite code
+REVOLT_INVITE_ONLY=0
+
+# Maximum number of people that can be in a group chat
+REVOLT_MAX_GROUP_SIZE=150
+
+# VAPID keys for push notifications
+# Generate using this guide: https://gitlab.insrt.uk/revolt/delta/-/wikis/vapid
+# --> Please replace these keys before going into production! <--
+REVOLT_VAPID_PRIVATE_KEY=LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUJSUWpyTWxLRnBiVWhsUHpUbERvcEliYk1yeVNrNXpKYzVYVzIxSjJDS3hvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFWnkrQkg2TGJQZ2hEa3pEempXOG0rUXVPM3pCajRXT1phdkR6ZU00c0pqbmFwd1psTFE0WAp1ZDh2TzVodU94QWhMQlU3WWRldVovWHlBdFpWZmNyQi9BPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
+REVOLT_VAPID_PUBLIC_KEY=BGcvgR-i2z4IQ5Mw841vJvkLjt8wY-FjmWrw83jOLCY52qcGZS0OF7nfLzuYbjsQISwVO2HXrmf18gLWVX3Kwfw=
+
+
+##
+## Vortex configuration
+##
+
+# VOSO_MANAGE_TOKEN=CHANGEME

.gitignore

@@ -3,5 +3,6 @@ Rocket.toml
 /target_backup
 **/*.rs.bk
 .mongo
+.data
 .env
 avatar.png

.gitlab-ci.yml

@@ -1,20 +0,0 @@
-stages:
-  - build
-
-# Rocket does not currently compile on stable Rust.
-# Once it does, we can uncomment this, and instead
-# put `allow-failure: true` on the nightly build.
-#
-# rust-latest:
-#   stage: build
-#   image: rust:latest
-#   script:
-#     - cargo build --verbose
-#     - cargo test --verbose
-
-rust-nightly:
-  stage: build
-  image: rustlang/rust:nightly
-  script:
-    - cargo build --verbose
-    - cargo test --verbose

.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/target/debug/revolt",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [{
+                "name": "ROCKET_ADDRESS",
+                "value": "0.0.0.0"
+            }, {
+                "name": "MONGODB",
+                "value": "mongodb://localhost"
+            }],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description":  "Set Disassembly Flavor to Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "rust-analyzer.diagnostics.disabled": [
+    "editor.formatOnSave": true,
-        "unresolved-macro-call"
+    "rust-analyzer.checkOnSave.command": "clippy"
-    ]
 }

Cargo.toml

@@ -15,6 +15,7 @@ lru = "0.7.0"
 url = "2.2.2"
 log = "0.4.11"
 dotenv = "0.15.0"
+dashmap = "5.2.0"
 linkify = "0.6.0"
 once_cell = "1.4.1"
 env_logger = "0.7.1"
@@ -26,18 +27,15 @@ regex = "1"
 num_enum = "0.5.1"
 impl_ops = "0.1.1"
 bitfield = "0.13.2"
-phf = { version = "0.9.0", features = ["macros"] }
 
 # ID / key generation
 ulid = "0.4.1"
 nanoid = "0.4.0"
-base64 = "0.13.0"
 
 # serde
 serde_json = "1.0.57"
 serde = { version = "1.0.115", features = ["derive"] }
-validator = { version = "0.11", features = ["derive"] }
+validator = { version = "0.14", features = ["derive"] }
-rmp-serde = { git = "https://github.com/insertish/msgpack-rust", rev = "5bf2c24203ad422233cf35b7b7bfad9f7e811814" }
 
 # async
 futures = "0.3.8"
@@ -47,11 +45,8 @@ reqwest = { version = "0.11.4", features = ["json"] }
 async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
 
 # internal util
-web-push = "0.7.2"
-many-to-many = "0.1.2"
 lettre = "0.10.0-alpha.4"
-rauth = { git = "https://github.com/insertish/rauth", rev = "157263ffcbd6cb1073e288b215db227634c4c29a" }
+rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
-hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "b0f3db9d33990530d7640d4bbb309c8d9eb5c0cf", features = ["redis-backend"] }
 
 # redis
 redis = { version = "0.21.2", features = ["async-std-comp"] }
@@ -59,7 +54,15 @@ mobc = { version = "0.7.3" }
 mobc-redis = { version = "0.7.0", default-features = false, features = ["async-std-comp"] }
 
 # web
-async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
 rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
-mongodb = { version = "1.2.2", features = ["tokio-runtime"], default-features = false }
+mongodb = { version = "1.2.2", features = ["async-std-runtime"], default-features = false }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
+
+# spec generation
+schemars = "0.8.8"
+# rocket_okapi = "0.8.0-rc.1"
+rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "dcf0df115596ee07a587a7a543cddf3d7944645b", features = [ "swagger" ] }
+
+# quark
+revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "eafefbcb3c612c8fdc3f052d05ddd9b1a4c5ec1b" }
+# revolt-quark = { path = "../quark" }

Dockerfile

@@ -5,11 +5,10 @@ WORKDIR /home/rust/src
 
 RUN USER=root cargo new --bin revolt
 WORKDIR /home/rust/src/revolt
-COPY Cargo.toml Cargo.lock ./
+RUN apt-get update && apt-get install -y libssl-dev pkg-config
-COPY src/bin/dummy.rs ./src/bin/dummy.rs
-RUN apt-get update && apt-get install -y libssl-dev pkg-config && cargo build --release --bin dummy
 
-COPY assets/templates ./assets/templates
+COPY Cargo.toml Cargo.lock ./
+COPY assets ./assets
 COPY src ./src
 RUN cargo install --locked --path .
 
@@ -17,9 +16,7 @@ RUN cargo install --locked --path .
 FROM debian:buster-slim
 RUN apt-get update && apt-get install -y ca-certificates
 COPY --from=builder /usr/local/cargo/bin/revolt ./
-COPY assets ./assets
 EXPOSE 8000
-EXPOSE 9000
 ENV ROCKET_ADDRESS 0.0.0.0
 ENV ROCKET_PORT 8000
 CMD ["./revolt"]

LICENSE

@@ -629,8 +629,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Server
+    Revolt Delta
-    Copyright (C) 2021  REVOLT
+    Copyright (C) 2022 Pawel Makles
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published

README.md

@@ -2,7 +2,7 @@
 
 ## Description
 
-Delta is a blazing fast API server built with Rust for Revolt.
+Delta is the API server for the Revolt platform.
 
 **Features:**
 

deny.toml

@@ -0,0 +1,210 @@
+# This template contains all of the possible sections and their default values
+
+# Note that all fields that take a lint level have these possible values:
+# * deny - An error will be produced and the check will fail
+# * warn - A warning will be produced, but the check will not fail
+# * allow - No warning or error will be produced, though in some cases a note
+# will be
+
+# The values provided in this template are the default values that will be used
+# when any section or field is not specified in your own configuration
+
+# If 1 or more target triples (and optionally, target_features) are specified,
+# only the specified targets will be checked when running `cargo deny check`.
+# This means, if a particular package is only ever used as a target specific
+# dependency, such as, for example, the `nix` crate only being used via the
+# `target_family = "unix"` configuration, that only having windows targets in
+# this list would mean the nix crate, as well as any of its exclusive
+# dependencies not shared by any other crates, would be ignored, as the target
+# list here is effectively saying which targets you are building for.
+targets = [
+    # The triple can be any string, but only the target triples built in to
+    # rustc (as of 1.40) can be checked against actual config expressions
+    #{ triple = "x86_64-unknown-linux-musl" },
+    # You can also specify which target_features you promise are enabled for a
+    # particular target. target_features are currently not validated against
+    # the actual valid features supported by the target architecture.
+    #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
+]
+
+# This section is considered when running `cargo deny check advisories`
+# More documentation for the advisories section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
+[advisories]
+# The path where the advisory database is cloned/fetched into
+db-path = "~/.cargo/advisory-db"
+# The url(s) of the advisory databases to use
+db-urls = ["https://github.com/rustsec/advisory-db"]
+# The lint level for security vulnerabilities
+vulnerability = "deny"
+# The lint level for unmaintained crates
+unmaintained = "warn"
+# The lint level for crates that have been yanked from their source registry
+yanked = "warn"
+# The lint level for crates with security notices. Note that as of
+# 2019-12-17 there are no security notice advisories in
+# https://github.com/rustsec/advisory-db
+notice = "warn"
+# A list of advisory IDs to ignore. Note that ignored advisories will still
+# output a note when they are encountered.
+ignore = [
+    #"RUSTSEC-0000-0000",
+]
+# Threshold for security vulnerabilities, any vulnerability with a CVSS score
+# lower than the range specified will be ignored. Note that ignored advisories
+# will still output a note when they are encountered.
+# * None - CVSS Score 0.0
+# * Low - CVSS Score 0.1 - 3.9
+# * Medium - CVSS Score 4.0 - 6.9
+# * High - CVSS Score 7.0 - 8.9
+# * Critical - CVSS Score 9.0 - 10.0
+#severity-threshold =
+
+# This section is considered when running `cargo deny check licenses`
+# More documentation for the licenses section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
+[licenses]
+# The lint level for crates which do not have a detectable license
+unlicensed = "warn"
+# List of explicitly allowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+allow = [
+    "MIT",
+    "ISC",
+    "0BSD",
+    "CC0-1.0",
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    #"Apache-2.0 WITH LLVM-exception",
+]
+# List of explicitly disallowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+deny = [
+    #"Nokia",
+]
+# Lint level for licenses considered copyleft
+copyleft = "warn"
+# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
+# * both - The license will be approved if it is both OSI-approved *AND* FSF
+# * either - The license will be approved if it is either OSI-approved *OR* FSF
+# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
+# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
+# * neither - This predicate is ignored and the default lint level is used
+allow-osi-fsf-free = "neither"
+# Lint level used when no other predicates are matched
+# 1. License isn't in the allow or deny lists
+# 2. License isn't copyleft
+# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
+default = "deny"
+# The confidence threshold for detecting a license from license text.
+# The higher the value, the more closely the license text must be to the
+# canonical license text of a valid SPDX license file.
+# [possible values: any between 0.0 and 1.0].
+confidence-threshold = 0.8
+# Allow 1 or more licenses on a per-crate basis, so that particular licenses
+# aren't accepted for every possible crate as with the normal allow list
+exceptions = [
+    # Each entry is the crate and version constraint, and its specific allow
+    # list
+    #{ allow = ["Zlib"], name = "adler32", version = "*" },
+]
+
+# Some crates don't have (easily) machine readable licensing information,
+# adding a clarification entry for it allows you to manually specify the
+# licensing information
+#[[licenses.clarify]]
+# The name of the crate the clarification applies to
+#name = "ring"
+# The optional version constraint for the crate
+#version = "*"
+# The SPDX expression for the license requirements of the crate
+#expression = "MIT AND ISC AND OpenSSL"
+# One or more files in the crate's source used as the "source of truth" for
+# the license expression. If the contents match, the clarification will be used
+# when running the license check, otherwise the clarification will be ignored
+# and the crate will be checked normally, which may produce warnings or errors
+# depending on the rest of your configuration
+#license-files = [
+    # Each entry is a crate relative path, and the (opaque) hash of its contents
+    #{ path = "LICENSE", hash = 0xbd0eed23 }
+#]
+
+[licenses.private]
+# If true, ignores workspace crates that aren't published, or are only
+# published to private registries.
+# To see how to mark a crate as unpublished (to the official registry),
+# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
+ignore = false
+# One or more private registries that you might publish crates to, if a crate
+# is only published to private registries, and ignore is true, the crate will
+# not have its license(s) checked
+registries = [
+    #"https://sekretz.com/registry
+]
+
+# This section is considered when running `cargo deny check bans`.
+# More documentation about the 'bans' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
+[bans]
+# Lint level for when multiple versions of the same crate are detected
+multiple-versions = "warn"
+# Lint level for when a crate version requirement is `*`
+wildcards = "allow"
+# The graph highlighting used when creating dotgraphs for crates
+# with multiple versions
+# * lowest-version - The path to the lowest versioned duplicate is highlighted
+# * simplest-path - The path to the version with the fewest edges is highlighted
+# * all - Both lowest-version and simplest-path are used
+highlight = "all"
+# List of crates that are allowed. Use with care!
+allow = [
+    #{ name = "ansi_term", version = "=0.11.0" },
+]
+# List of crates to deny
+deny = [
+    # Each entry the name of a crate and a version range. If version is
+    # not specified, all versions will be matched.
+    #{ name = "ansi_term", version = "=0.11.0" },
+    #
+    # Wrapper crates can optionally be specified to allow the crate when it
+    # is a direct dependency of the otherwise banned crate
+    #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+]
+# Certain crates/versions that will be skipped when doing duplicate detection.
+skip = [
+    #{ name = "ansi_term", version = "=0.11.0" },
+]
+# Similarly to `skip` allows you to skip certain crates during duplicate
+# detection. Unlike skip, it also includes the entire tree of transitive
+# dependencies starting at the specified crate, up to a certain depth, which is
+# by default infinite
+skip-tree = [
+    #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
+]
+
+# This section is considered when running `cargo deny check sources`.
+# More documentation about the 'sources' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
+[sources]
+# Lint level for what to happen when a crate from a crate registry that is not
+# in the allow list is encountered
+unknown-registry = "warn"
+# Lint level for what to happen when a crate from a git repository that is not
+# in the allow list is encountered
+unknown-git = "warn"
+# List of URLs for allowed crate registries. Defaults to the crates.io index
+# if not specified. If it is specified but empty, no registries are allowed.
+allow-registry = ["https://github.com/rust-lang/crates.io-index"]
+# List of URLs for allowed Git repositories
+allow-git = ["https://gitlab.insrt.uk/insert/hive"]
+
+[sources.allow-org]
+# 1 or more github.com organizations to allow git sources for
+github = ["insertish"]
+# 1 or more gitlab.com organizations to allow git sources for
+gitlab = []
+# 1 or more bitbucket.org organizations to allow git sources for
+bitbucket = [""]

docker-compose.yml

@@ -14,5 +14,4 @@ services:
       - REVOLT_UNSAFE_NO_CAPTCHA=1
     ports:
       - "8000:8000"
-      - "9000:9000"
     restart: unless-stopped

set_version.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.3-alpha.16
+export version=0.5.3
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs

src/bin/dummy.rs

@@ -1 +0,0 @@
-fn main() {}

src/database/entities/bots.rs

@@ -1,20 +0,0 @@
-use serde::{Serialize, Deserialize};
-
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Bot {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub owner: String,
-    pub token: String,
-    pub public: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub analytics: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub discoverable: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub interactions_url: Option<String>,
-}

src/database/entities/channel.rs

@@ -1,392 +0,0 @@
-use std::collections::HashMap;
-
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_GROUP_SIZE;
-use futures::StreamExt;
-use mongodb::bson::Bson;
-use mongodb::{
-    bson::{doc, to_document, Document},
-    options::FindOptions,
-};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "channel_type")]
-pub enum Channel {
-    SavedMessages {
-        #[serde(rename = "_id")]
-        id: String,
-        user: String,
-    },
-    DirectMessage {
-        #[serde(rename = "_id")]
-        id: String,
-
-        active: bool,
-        recipients: Vec<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-    },
-    Group {
-        #[serde(rename = "_id")]
-        id: String,
-
-        name: String,
-        owner: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-        recipients: Vec<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        permissions: Option<i32>,
-
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-   },
-    TextChannel {
-        #[serde(rename = "_id")]
-        id: String,
-        server: String,
-
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        last_message_id: Option<String>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        default_permissions: Option<i32>,
-        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-        role_permissions: HashMap<String, i32>,
-        
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-    },
-    VoiceChannel {
-        #[serde(rename = "_id")]
-        id: String,
-        server: String,
-
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        icon: Option<File>,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        default_permissions: Option<i32>,
-        #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-        role_permissions: HashMap<String, i32>,
-
-        #[serde(skip_serializing_if = "entities::server::if_false", default)]
-        nsfw: bool
-    },
-}
-
-impl Channel {
-    pub fn id(&self) -> &str {
-        match self {
-            Channel::SavedMessages { id, .. }
-            | Channel::DirectMessage { id, .. }
-            | Channel::Group { id, .. }
-            | Channel::TextChannel { id, .. }
-            | Channel::VoiceChannel { id, .. } => id,
-        }
-    }
-    pub fn has_messaging(&self) -> Result<()> {
-        match self {
-            Channel::SavedMessages { .. }
-            | Channel::DirectMessage { .. }
-            | Channel::Group { .. }
-            | Channel::TextChannel { .. } => Ok(()),
-            Channel::VoiceChannel { .. } => Err(Error::InvalidOperation)
-        }
-    }
-
-    pub async fn publish(self) -> Result<()> {
-        get_collection("channels")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "channel",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "channel",
-            })?;
-
-        let channel_id = self.id().to_string();
-        ClientboundNotification::ChannelCreate(self).publish(channel_id);
-
-        Ok(())
-    }
-
-    pub async fn publish_update(&self, data: Value) -> Result<()> {
-        let id = self.id().to_string();
-        ClientboundNotification::ChannelUpdate {
-            id: id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(id);
-
-        Ok(())
-    }
-
-    pub async fn delete_associated_objects(id: Bson) -> Result<()> {
-        get_collection("channel_invites")
-            .delete_many(
-                doc! {
-                    "channel": id
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channel_invites",
-            })
-    }
-
-    pub async fn delete_messages(id: Bson) -> Result<()> {
-        let messages = get_collection("messages");
-
-        // Delete any unreads.
-        get_collection("channel_unreads")
-            .delete_many(
-                doc! {
-                    "_id.channel": &id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channel_unreads",
-            })?;
-
-        // Check if there are any attachments we need to delete.
-        let message_ids = messages
-            .find(
-                doc! {
-                    "channel": &id,
-                    "attachment": {
-                        "$exists": 1
-                    }
-                },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "fetch_many",
-                with: "messages",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| x.get_str("_id").ok().map(|x| x.to_string()))
-            .collect::<Vec<String>>();
-
-        // If we found any, mark them as deleted.
-        if message_ids.len() > 0 {
-            get_collection("attachments")
-                .update_many(
-                    doc! {
-                        "message_id": {
-                            "$in": message_ids
-                        }
-                    },
-                    doc! {
-                        "$set": {
-                            "deleted": true
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_many",
-                    with: "attachments",
-                })?;
-        }
-
-        // And then delete said messages.
-        messages
-            .delete_many(
-                doc! {
-                    "channel": id
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "messages",
-            })
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        let id = self.id();
-
-        // Delete any invites.
-        Channel::delete_associated_objects(Bson::String(id.to_string())).await?;
-
-        // Delete messages.
-        match &self {
-            Channel::VoiceChannel { .. } => {},
-            _ => {
-                Channel::delete_messages(Bson::String(id.to_string())).await?;
-            }
-        }
-
-        // Remove from server object.
-        match &self {
-            Channel::TextChannel { server, .. }
-            | Channel::VoiceChannel { server, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-                let mut update = doc! {
-                    "$pull": {
-                        "channels": id
-                    }
-                };
-
-                if let Some(sys) = &server.system_messages {
-                    let mut unset = doc! {};
-
-                    if let Some(cid) = &sys.user_joined {
-                        if id == cid {
-                            unset.insert("system_messages.user_joined", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_left {
-                        if id == cid {
-                            unset.insert("system_messages.user_left", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_kicked {
-                        if id == cid {
-                            unset.insert("system_messages.user_kicked", 1);
-                        }
-                    }
-
-                    if let Some(cid) = &sys.user_banned {
-                        if id == cid {
-                            unset.insert("system_messages.user_banned", 1);
-                        }
-                    }
-
-                    if unset.len() > 0 {
-                        update.insert("$unset", unset);
-                    }
-                }
-
-                get_collection("servers")
-                    .update_one(
-                        doc! {
-                            "_id": server.id
-                        },
-                        update,
-                        None,
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "servers",
-                    })?;
-            },
-            _ => {}
-        }
-
-        // Finally, delete the channel object.
-        get_collection("channels")
-            .delete_one(
-                doc! {
-                    "_id": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelDelete { id: id.to_string() }.publish(id.to_string());
-
-        if let Channel::Group { icon, .. } = self {
-            if let Some(attachment) = icon {
-                attachment.delete().await?;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn add_to_group(&self, member: String, by_user: String) -> Result<()> {
-        if let Channel::Group { id, recipients, .. } = &self {
-            if recipients.len() >= *MAX_GROUP_SIZE {
-                Err(Error::GroupTooLarge {
-                    max: *MAX_GROUP_SIZE,
-                })?
-            }
-
-            if recipients.iter().find(|x| *x == &member).is_some() {
-                Err(Error::AlreadyInGroup)?
-            }
-
-            get_collection("channels")
-                .update_one(
-                    doc! {
-                        "_id": &id
-                    },
-                    doc! {
-                        "$push": {
-                            "recipients": &member
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "channel",
-                })?;
-
-            ClientboundNotification::ChannelGroupJoin {
-                id: id.clone(),
-                user: member.clone(),
-            }
-            .publish(id.clone());
-
-            Content::SystemMessage(SystemMessage::UserAdded {
-                id: member,
-                by: by_user,
-            })
-            .send_as_system(&self)
-            .await
-            .ok();
-            Ok(())
-        } else {
-            Err(Error::InvalidOperation)
-        }
-    }
-}

src/database/entities/invites.rs

@@ -1,96 +0,0 @@
-use mongodb::bson::doc;
-use mongodb::bson::from_document;
-use mongodb::bson::to_document;
-use serde::{Deserialize, Serialize};
-
-use crate::database::get_collection;
-use crate::util::result::Error;
-use crate::util::result::Result;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Invite {
-    Server {
-        #[serde(rename = "_id")]
-        code: String,
-        server: String,
-        creator: String,
-        channel: String,
-    },
-    Group {
-        #[serde(rename = "_id")]
-        code: String,
-        creator: String,
-        channel: String,
-    }, /* User {
-           code: String,
-           user: String
-       } */
-}
-
-impl Invite {
-    pub fn code(&self) -> &String {
-        match &self {
-            Invite::Server { code, .. } => code,
-            Invite::Group { code, .. } => code,
-        }
-    }
-
-    pub fn creator(&self) -> &String {
-        match &self {
-            Invite::Server { creator, .. } => creator,
-            Invite::Group { creator, .. } => creator,
-        }
-    }
-
-    pub async fn get(code: &str) -> Result<Invite> {
-        let doc = get_collection("channel_invites")
-            .find_one(doc! { "_id": code }, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "invite",
-            })?
-            .ok_or_else(|| Error::UnknownServer)?;
-
-        from_document::<Invite>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: "invite",
-        })
-    }
-
-    pub async fn save(self) -> Result<()> {
-        get_collection("channel_invites")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "invite",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "invite",
-            })?;
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        get_collection("channel_invites")
-            .delete_one(
-                doc! {
-                    "_id": self.code()
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "invite",
-            })?;
-
-        Ok(())
-    }
-}

src/database/entities/message.rs

@@ -1,363 +0,0 @@
-use crate::util::variables::{USE_JANUARY, PUBLIC_URL, APP_URL};
-use crate::{
-    database::*,
-    notifications::{events::ClientboundNotification, websocket::is_online},
-    util::result::{Error, Result},
-};
-
-use mongodb::bson::{doc, to_bson, DateTime};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
-use validator::Validate;
-use std::collections::HashSet;
-use std::time::SystemTime;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct PushNotification {
-    pub author: String,
-    pub icon: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub image: Option<String>,
-    pub body: String,
-    pub tag: String,
-    pub timestamp: u64,
-    pub url: String,
-}
-
-impl PushNotification {
-    pub async fn new(msg: Message, channel: &Channel) -> Self {
-        let author = Ref::from_unchecked(msg.author.clone())
-            .fetch_user()
-            .await;
-
-        let (author, avatar) = if let Ok(author) = author {
-            (Some(author.username), author.avatar)
-        } else {
-            (None, None)
-        };
-
-        let icon = if let Some(avatar) = avatar {
-            avatar.get_autumn_url()
-        } else {
-            format!("{}/users/{}/default_avatar", PUBLIC_URL.as_str(), msg.author)
-        };
-
-        let image = msg.attachments.map_or(None, |attachments| {
-            attachments
-                .first()
-                .map_or(None, |v| Some(v.get_autumn_url()))
-        });
-
-        let body = match msg.content {
-            Content::Text(body) => body,
-            Content::SystemMessage(sys_msg) => sys_msg.into()
-        };
-
-        let timestamp = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .expect("system time should be valid")
-            .as_secs();
-
-        Self {
-            author: author.unwrap_or_else(|| "Unknown".into()),
-            icon,
-            image,
-            body,
-            tag: channel.id().to_string(),
-            timestamp,
-            url: format!("{}/channel/{}/{}", *APP_URL, channel.id(), msg.id),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum SystemMessage {
-    #[serde(rename = "text")]
-    Text { content: String },
-    #[serde(rename = "user_added")]
-    UserAdded { id: String, by: String },
-    #[serde(rename = "user_remove")]
-    UserRemove { id: String, by: String },
-    #[serde(rename = "user_joined")]
-    UserJoined { id: String },
-    #[serde(rename = "user_left")]
-    UserLeft { id: String },
-    #[serde(rename = "user_kicked")]
-    UserKicked { id: String },
-    #[serde(rename = "user_banned")]
-    UserBanned { id: String },
-    #[serde(rename = "channel_renamed")]
-    ChannelRenamed { name: String, by: String },
-    #[serde(rename = "channel_description_changed")]
-    ChannelDescriptionChanged { by: String },
-    #[serde(rename = "channel_icon_changed")]
-    ChannelIconChanged { by: String },
-}
-
-impl Into<String> for SystemMessage {
-    fn into(self) -> String {
-        match self {
-            SystemMessage::Text { content } => content,
-            SystemMessage::UserAdded { .. } => "User added to the channel.".to_string(),
-            SystemMessage::UserRemove { .. } => "User removed from the channel.".to_string(),
-            SystemMessage::UserJoined { .. } => "User joined the channel.".to_string(),
-            SystemMessage::UserLeft { .. } => "User left the channel.".to_string(),
-            SystemMessage::UserKicked { .. } => "User kicked from the channel.".to_string(),
-            SystemMessage::UserBanned { .. } => "User banned from the channel.".to_string(),
-            SystemMessage::ChannelRenamed { .. } => "Channel renamed.".to_string(),
-            SystemMessage::ChannelDescriptionChanged { .. } => "Channel description changed.".to_string(),
-            SystemMessage::ChannelIconChanged { .. } => "Channel icon changed.".to_string()
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum Content {
-    Text(String),
-    SystemMessage(SystemMessage),
-}
-
-impl Content {
-    pub async fn send_as_system(self, target: &Channel) -> Result<()> {
-        Message::create(
-            "00000000000000000000000000".to_string(),
-            target.id().to_string(),
-            self,
-            None,
-            None,
-            None
-        )
-        .publish(&target, false)
-        .await
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Validate)]
-pub struct Masquerade {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 32))]
-    name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 128))]
-    avatar: Option<String>
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Message {
-    #[serde(rename = "_id")]
-    pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nonce: Option<String>,
-    pub channel: String,
-    pub author: String,
-
-    pub content: Content,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub attachments: Option<Vec<File>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub edited: Option<DateTime>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub embeds: Option<Vec<Embed>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mentions: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub replies: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub masquerade: Option<Masquerade>
-}
-
-impl Message {
-    pub fn create(
-        author: String,
-        channel: String,
-        content: Content,
-        mentions: Option<Vec<String>>,
-        replies: Option<Vec<String>>,
-        masquerade: Option<Masquerade>,
-    ) -> Message {
-        Message {
-            id: Ulid::new().to_string(),
-            nonce: None,
-            channel,
-            author,
-            content,
-            attachments: None,
-            edited: None,
-            embeds: None,
-            mentions,
-            replies,
-            masquerade
-        }
-    }
-
-    pub async fn publish(self, channel: &Channel, process_embeds: bool) -> Result<()> {
-        // Publish message event
-        ClientboundNotification::Message(self.clone())
-            .publish(channel.id().to_string());
-
-        // Commit message to database
-        get_collection("messages")
-            .insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "message",
-            })?;
-
-        // spawn task_queue ( process embeds )
-        if process_embeds {
-            self.process_embed().await;
-        }
-
-        // spawn task_queue ( update last_message_id )
-        match channel {
-            Channel::DirectMessage { id, .. } =>
-                crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), true).await,
-            Channel::Group { id, .. } | Channel::TextChannel { id, .. } =>
-                crate::task_queue::task_last_message_id::queue(id.clone(), self.id.clone(), false).await,
-            _ => {}
-        }
-
-        // if mentions {
-        //  spawn task_queue ( update channel_unreads )
-        // }
-        if let Some(mentions) = &self.mentions {
-            for user in mentions {
-                crate::task_queue::task_ack::queue(
-                    channel.id().into(),
-                    user.clone(),
-                    crate::task_queue::task_ack::AckEvent::AddMention {
-                        ids: vec![ self.id.clone() ]
-                    }
-                ).await;
-            }
-        }
-
-        // if (channel => DM | Group) | mentions {
-        //  spawn task_queue ( web push )
-        // }
-        let mut target_ids = vec![];
-        match &channel {
-            Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
-                for recipient in recipients {
-                    if !is_online(recipient) {
-                        target_ids.push(recipient.clone());
-                    }
-                }
-            }
-            Channel::TextChannel { .. } => {
-                if let Some(mentions) = &self.mentions {
-                    target_ids.append(&mut mentions.clone());
-                }
-            }
-            _ => {}
-        }
-
-        if target_ids.len() > 0 {
-            if let Ok(payload) = serde_json::to_string(&PushNotification::new(self, &channel).await) {
-                crate::task_queue::task_web_push::queue(target_ids, payload).await;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn publish_update(self, data: Value) -> Result<()> {
-        let channel = self.channel.clone();
-        ClientboundNotification::MessageUpdate {
-            id: self.id.clone(),
-            channel: self.channel.clone(),
-            data,
-        }
-        .publish(channel);
-
-        self.process_embed().await;
-        Ok(())
-    }
-
-    pub async fn process_embed(&self) {
-        if !*USE_JANUARY {
-            return;
-        }
-
-        if let Content::Text(text) = &self.content {
-            crate::task_queue::task_process_embeds::queue(self.channel.clone(), self.id.clone(), text.clone()).await;
-        }
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        if let Some(attachments) = &self.attachments {
-            for attachment in attachments {
-                attachment.delete().await?;
-            }
-        }
-
-        get_collection("messages")
-            .delete_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "message",
-            })?;
-
-        let channel = self.channel.clone();
-        ClientboundNotification::MessageDelete {
-            id: self.id.clone(),
-            channel: self.channel.clone(),
-        }
-        .publish(channel);
-
-        if let Some(attachments) = &self.attachments {
-            let attachment_ids: Vec<String> =
-                attachments.iter().map(|f| f.id.to_string()).collect();
-            get_collection("attachments")
-                .update_many(
-                    doc! {
-                        "_id": {
-                            "$in": attachment_ids
-                        }
-                    },
-                    doc! {
-                        "$set": {
-                            "deleted": true
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_many",
-                    with: "attachment",
-                })?;
-        }
-
-        Ok(())
-    }
-
-    pub fn add_associated_user_ids(&self, ids: &mut HashSet<String>) {
-        ids.insert(self.author.clone());
-
-        if let Content::SystemMessage(sys) = &self.content {
-            match sys {
-                SystemMessage::Text { .. } => {},
-                SystemMessage::UserAdded { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
-                SystemMessage::UserRemove { id, by } => { ids.insert(id.clone()); ids.insert(by.clone()); },
-                SystemMessage::UserJoined { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserLeft { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserKicked { id } => { ids.insert(id.clone()); },
-                SystemMessage::UserBanned { id } => { ids.insert(id.clone()); },
-                SystemMessage::ChannelRenamed { by, .. } => { ids.insert(by.clone()); },
-                SystemMessage::ChannelDescriptionChanged { by } => { ids.insert(by.clone()); },
-                SystemMessage::ChannelIconChanged { by } => { ids.insert(by.clone()); }
-            }
-        }
-    }
-}

src/database/entities/microservice/autumn.rs

@@ -1,122 +0,0 @@
-use mongodb::bson::{doc, from_document};
-use serde::{Deserialize, Serialize};
-
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::AUTUMN_URL;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-enum Metadata {
-    File,
-    Text,
-    Image { width: isize, height: isize },
-    Video { width: isize, height: isize },
-    Audio,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct File {
-    #[serde(rename = "_id")]
-    pub id: String,
-    tag: String,
-    filename: String,
-    metadata: Metadata,
-    content_type: String,
-    size: isize,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    deleted: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    reported: Option<bool>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    message_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    user_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    server_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    object_id: Option<String>,
-}
-
-impl File {
-    pub async fn find_and_use(
-        attachment_id: &str,
-        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
-    ) -> Result<File> {
-        let attachments = get_collection("attachments");
-        let key = format!("{}_id", parent_type);
-        if let Some(doc) = attachments
-            .find_one(
-                doc! {
-                    "_id": attachment_id,
-                    "tag": &tag,
-                    key.clone(): {
-                        "$exists": false
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "attachment",
-            })?
-        {
-            let attachment = from_document::<File>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "attachment",
-            })?;
-
-            attachments
-                .update_one(
-                    doc! {
-                        "_id": &attachment.id
-                    },
-                    doc! {
-                        "$set": {
-                            key: &parent_id
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "attachment",
-                })?;
-
-            Ok(attachment)
-        } else {
-            Err(Error::UnknownAttachment)
-        }
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        get_collection("attachments")
-            .update_one(
-                doc! {
-                    "_id": &self.id
-                },
-                doc! {
-                    "$set": {
-                        "deleted": true
-                    }
-                },
-                None,
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "attachment",
-            })
-    }
-
-    pub fn get_autumn_url(&self) -> String {
-        format!("{}/{}/{}", AUTUMN_URL.as_str(), self.tag, self.id)
-    }
-}

src/database/entities/microservice/january.rs

@@ -1,200 +0,0 @@
-use crate::util::{
-    result::{Error, Result},
-    variables::JANUARY_URL,
-    variables::MAX_EMBED_COUNT,
-};
-use crate::database::entities::microservice::autumn::File;
-use linkify::{LinkFinder, LinkKind};
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum ImageSize {
-    Large,
-    Preview,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Image {
-    pub url: String,
-    pub width: isize,
-    pub height: isize,
-    pub size: ImageSize,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Video {
-    pub url: String,
-    pub width: isize,
-    pub height: isize,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum TwitchType {
-    Channel,
-    Video,
-    Clip,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum BandcampType {
-    Album,
-    Track,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Special {
-    None,
-    YouTube {
-        id: String,
-
-        #[serde(skip_serializing_if = "Option::is_none")]
-        timestamp: Option<String>,
-    },
-    Twitch {
-        content_type: TwitchType,
-        id: String,
-    },
-    Spotify {
-        content_type: String,
-        id: String,
-    },
-    Soundcloud,
-    Bandcamp {
-        content_type: BandcampType,
-        id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Metadata {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    special: Option<Special>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    title: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    image: Option<Image>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    video: Option<Video>,
-
-    // #[serde(skip_serializing_if = "Option::is_none")]
-    // opengraph_type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    site_name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    icon_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    colour: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Text {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub media: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-	pub colour: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Embed {
-    Website(Metadata),
-    Image(Image),
-    Text(Text),
-    None,
-}
-
-impl Embed {
-    pub async fn generate(content: String) -> Result<Vec<Embed>> {
-        lazy_static! {
-            static ref RE_CODE: Regex = Regex::new("```(?:.|\n)+?```|`(?:.|\n)+?`").unwrap();
-            static ref RE_IGNORED: Regex = Regex::new("(<http.+>)").unwrap();
-        }
-
-        // Ignore code blocks.
-        let content = RE_CODE.replace_all(&content, "");
-
-        // Ignore all content between angle brackets starting with http.
-        let content = RE_IGNORED.replace_all(&content, "");
-
-        let content = content
-            // Ignore quoted lines.
-            .split("\n")
-            .map(|v| {
-                if let Some(c) = v.chars().next() {
-                    if c == '>' {
-                        return "";
-                    }
-                }
-
-                v
-            })
-            .collect::<Vec<&str>>()
-            .join("\n");
-
-        let mut finder = LinkFinder::new();
-        finder.kinds(&[LinkKind::Url]);
-        let links: Vec<_> = finder.links(&content).take(*MAX_EMBED_COUNT).collect();
-
-        if links.len() == 0 {
-            return Err(Error::LabelMe);
-        }
-
-        let mut embeds: Vec<Embed> = Vec::new();
-
-        let mut link_index = 0;
-
-        // ! FIXME: batch request to january?
-        while link_index < links.len() {
-            let link = &links[link_index];
-
-            // Check if we already processed this link.
-            if link_index != 0 && links.iter().take(link_index).any(|x| x.as_str() == link.as_str()) {
-                link_index = link_index + 1;
-                continue;
-            }
-
-            let client = reqwest::Client::new();
-            let result = client
-                .get(&format!("{}/embed", *JANUARY_URL))
-                .query(&[("url", link.as_str())])
-                .send()
-                .await;
-
-            if result.is_err() {
-                link_index = link_index + 1;
-                continue;
-            }
-
-            let response = result.unwrap();
-            if response.status().is_success() {
-                let res: Embed = response.json().await.map_err(|_| Error::InvalidOperation)?;
-
-                embeds.push(res);
-            }
-
-            link_index = link_index + 1;
-        }
-
-        // Prevent database update when no embeds are found.
-        if embeds.len() > 0 {
-            Ok(embeds)
-        } else {
-            Err(Error::LabelMe)
-        }
-    }
-}

src/database/entities/microservice/mod.rs

@@ -1,2 +0,0 @@
-pub mod autumn;
-pub mod january;

src/database/entities/mod.rs

@@ -1,20 +0,0 @@
-mod channel;
-mod invites;
-mod message;
-mod microservice;
-mod server;
-mod sync;
-mod user;
-mod bots;
-
-use microservice::*;
-
-pub use autumn::*;
-pub use channel::*;
-pub use invites::*;
-pub use january::*;
-pub use message::*;
-pub use server::*;
-pub use sync::*;
-pub use user::*;
-pub use bots::*;

src/database/entities/server.rs

@@ -1,470 +0,0 @@
-use std::collections::HashMap;
-
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use futures::StreamExt;
-use mongodb::bson::{Bson, doc};
-use mongodb::bson::from_document;
-use mongodb::bson::to_document;
-use mongodb::bson::Document;
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct MemberCompositeKey {
-    pub server: String,
-    pub user: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Member {
-    #[serde(rename = "_id")]
-    pub id: MemberCompositeKey,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nickname: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar: Option<File>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub roles: Option<Vec<String>>
-}
-
-pub type PermissionTuple = (
-    i32, // server permission
-    i32  // channel permission
-);
-
-pub fn if_false(t: &bool) -> bool {
-    !t
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Role {
-    pub name: String,
-    pub permissions: PermissionTuple,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub colour: Option<String>,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub hoist: bool,
-    #[serde(default)]
-    pub rank: i64,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Category {
-    pub id: String,
-    pub title: String,
-    pub channels: Vec<String>
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Ban {
-    #[serde(rename = "_id")]
-    pub id: MemberCompositeKey,
-    pub reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct SystemMessageChannels {
-    pub user_joined: Option<String>,
-    pub user_left: Option<String>,
-    pub user_kicked: Option<String>,
-    pub user_banned: Option<String>,
-}
-
-pub enum RemoveMember {
-    Leave,
-    Kick,
-    Ban,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Server {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub owner: String,
-
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-
-    pub channels: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub categories: Option<Vec<Category>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub system_messages: Option<SystemMessageChannels>,
-
-    #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-    pub roles: HashMap<String, Role>,
-    pub default_permissions: PermissionTuple,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub banner: Option<File>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub flags: Option<i32>,
-
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub nsfw: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub analytics: bool,
-    #[serde(skip_serializing_if = "if_false", default)]
-    pub discoverable: bool
-}
-
-impl Server {
-    pub async fn create(self) -> Result<()> {
-        get_collection("servers")
-            .insert_one(
-                to_document(&self).map_err(|_| Error::DatabaseError {
-                    operation: "to_bson",
-                    with: "channel",
-                })?,
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "server",
-            })?;
-
-        Ok(())
-    }
-
-    pub async fn publish_update(&self, data: Value) -> Result<()> {
-        ClientboundNotification::ServerUpdate {
-            id: self.id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(self.id.clone());
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        // Check if there are any attachments we need to delete.
-        Channel::delete_messages(Bson::Document(doc! { "$in": &self.channels })).await?;
-
-        // Delete all channels.
-        get_collection("channels")
-            .delete_many(
-                doc! {
-                    "server": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channels",
-            })?;
-
-        // Delete any associated objects, e.g. unreads and invites.
-        Channel::delete_associated_objects(Bson::Document(doc! { "$in": &self.channels })).await?;
-
-        // Delete members and bans.
-        for with in &["server_members", "server_bans"] {
-            get_collection(with)
-                .delete_many(
-                    doc! {
-                        "_id.server": &self.id
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "delete_many",
-                    with,
-                })?;
-        }
-
-        // Delete server icon / banner.
-        if let Some(attachment) = &self.icon {
-            attachment.delete().await?;
-        }
-
-        if let Some(attachment) = &self.banner {
-            attachment.delete().await?;
-        }
-
-        // Delete the server
-        get_collection("servers")
-            .delete_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "server",
-            })?;
-
-        ClientboundNotification::ServerDelete {
-            id: self.id.clone(),
-        }
-        .publish(self.id.clone());
-
-        Ok(())
-    }
-
-    pub async fn fetch_members(id: &str) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| from_document(x).ok())
-            .collect::<Vec<Member>>())
-    }
-
-    pub async fn fetch_members_with_ids(id: &str, ids: &Vec<String>) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id,
-                    "_id.user": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| from_document(x).ok())
-            .collect::<Vec<Member>>())
-    }
-
-    pub async fn fetch_member_ids(id: &str) -> Result<Vec<String>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                x.get_document("_id")
-                    .ok()
-                    .map(|i| i.get_str("user").ok().map(|x| x.to_string()))
-            })
-            .flatten()
-            .collect::<Vec<String>>())
-    }
-
-    pub async fn mark_as_read(&self, id: &str) -> Result<()> {
-        let current_time = Ulid::new().to_string();
-        let unreads = get_collection("channel_unreads");
-
-        unreads.delete_many(
-            doc! {
-                "_id.channel": {
-                    "$in": &self.channels
-                },
-                "_id.user": &id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "delete_many",
-            with: "channel_unreads",
-        })?;
-
-        unreads.insert_many(
-        self.channels
-                .iter()
-                .map(|channel| doc! {
-                    "_id": {
-                        "channel": channel,
-                        "user": &id
-                    },
-                    "last_id": &current_time
-                })
-                .collect::<Vec<Document>>(),
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_many",
-            with: "channel_unreads",
-        })
-        .map(|_| ())
-    }
-
-    pub async fn join_member(&self, id: &str) -> Result<()> {
-        // Check if user is banned.
-        if get_collection("server_bans")
-            .find_one(
-                doc! {
-                    "_id.server": &self.id,
-                    "_id.user": &id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_bans",
-            })?
-            .is_some()
-        {
-            return Err(Error::Banned);
-        }
-
-        // Add user to server.
-        get_collection("server_members")
-            .insert_one(
-                doc! {
-                    "_id": {
-                        "server": &self.id,
-                        "user": &id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "server_members",
-            })?;
-
-        // Announce that user joined server.
-        ClientboundNotification::ServerMemberJoin {
-            id: self.id.clone(),
-            user: id.to_string(),
-        }
-        .publish(self.id.clone());
-
-        // Broadcast join message.
-        if let Some(channels) = &self.system_messages {
-            if let Some(cid) = &channels.user_joined {
-                let channel = Ref::from_unchecked(cid.clone()).fetch_channel().await?;
-                Content::SystemMessage(SystemMessage::UserJoined { id: id.to_string() })
-                    .send_as_system(&channel)
-                    .await?;
-            }
-        }
-
-        // Mark entire server as read.
-        self.mark_as_read(&id).await?;
-
-        Ok(())
-    }
-
-    pub async fn remove_member(&self, id: &str, removal: RemoveMember) -> Result<()> {
-        let result = get_collection("server_members")
-            .delete_one(
-                doc! {
-                    "_id": {
-                        "server": &self.id,
-                        "user": &id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_one",
-                with: "server_members",
-            })?;
-
-        if result.deleted_count > 0 {
-            ClientboundNotification::ServerMemberLeave {
-                id: self.id.clone(),
-                user: id.to_string(),
-            }
-            .publish(self.id.clone());
-
-            if let Some(channels) = &self.system_messages {
-                let message = match removal {
-                    RemoveMember::Leave => {
-                        if let Some(cid) = &channels.user_left {
-                            Some((cid.clone(), SystemMessage::UserLeft { id: id.to_string() }))
-                        } else {
-                            None
-                        }
-                    }
-                    RemoveMember::Kick => {
-                        if let Some(cid) = &channels.user_kicked {
-                            Some((
-                                cid.clone(),
-                                SystemMessage::UserKicked { id: id.to_string() },
-                            ))
-                        } else {
-                            None
-                        }
-                    }
-                    RemoveMember::Ban => {
-                        if let Some(cid) = &channels.user_banned {
-                            Some((
-                                cid.clone(),
-                                SystemMessage::UserBanned { id: id.to_string() },
-                            ))
-                        } else {
-                            None
-                        }
-                    }
-                };
-
-                if let Some((cid, message)) = message {
-                    let channel = Ref::from_unchecked(cid).fetch_channel().await?;
-                    Content::SystemMessage(message)
-                        .send_as_system(&channel)
-                        .await?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn get_member_count(id: &str) -> Result<i64> {
-        Ok(get_collection("server_members")
-            .count_documents(
-                doc! {
-                    "_id.server": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "count_documents",
-                with: "server_members",
-            })?)
-    }
-}

src/database/entities/sync.rs

@@ -1,19 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-pub type UserSettings = HashMap<String, (i64, String)>;
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ChannelCompositeKey {
-    pub channel: String,
-    pub user: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ChannelUnread {
-    #[serde(rename = "_id")]
-    pub id: ChannelCompositeKey,
-
-    pub last_id: Option<String>,
-    pub mentions: Option<Vec<String>>,
-}

src/database/entities/user.rs

@@ -1,337 +0,0 @@
-use futures::StreamExt;
-use mongodb::bson::Document;
-use mongodb::options::{Collation, FindOneOptions};
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
-};
-use num_enum::TryFromPrimitive;
-use serde::{Deserialize, Serialize};
-use std::ops;
-use ulid::Ulid;
-use validator::Validate;
-
-use crate::database::permissions::user::UserPermissions;
-use crate::database::*;
-use crate::notifications::websocket::is_online;
-use crate::util::result::{Error, Result};
-use crate::util::variables::EARLY_ADOPTER_BADGE;
-use crate::util::variables::MAX_SERVER_COUNT;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum RelationshipStatus {
-    None,
-    User,
-    Friend,
-    Outgoing,
-    Incoming,
-    Blocked,
-    BlockedOther,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Relationship {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub status: RelationshipStatus,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum Presence {
-    Online,
-    Idle,
-    Busy,
-    Invisible,
-}
-
-#[derive(Validate, Serialize, Deserialize, Debug, Clone)]
-pub struct UserStatus {
-    #[validate(length(min = 1, max = 128))]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub text: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub presence: Option<Presence>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct UserProfile {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub content: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub background: Option<File>,
-}
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(i32)]
-pub enum Badges {
-    Developer = 1,
-    Translator = 2,
-    Supporter = 4,
-    ResponsibleDisclosure = 8,
-    Founder = 16,
-    PlatformModeration = 32,
-    ActiveSupporter = 64,
-    Paw = 128,
-    EarlyAdopter = 256,
-    ReservedRelevantJokeBadge1 = 512
-}
-
-impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct BotInformation {
-    owner: String
-}
-
-// When changing this struct, update notifications/payload.rs#113
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct User {
-    #[serde(rename = "_id")]
-    pub id: String,
-    pub username: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub avatar: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub relations: Option<Vec<Relationship>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub badges: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<UserStatus>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub profile: Option<UserProfile>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub flags: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bot: Option<BotInformation>,
-
-    // ? This should never be pushed to the collection.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub relationship: Option<RelationshipStatus>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub online: Option<bool>,
-}
-
-impl User {
-    /// Mutate the user object to include relationship as seen by user.
-    pub fn from(mut self, user: &User) -> User {
-        self.relationship = Some(RelationshipStatus::None);
-
-        if self.id == user.id {
-            self.relationship = Some(RelationshipStatus::User);
-            return self;
-        }
-
-        self.relations = None;
-        if let Some(relations) = &user.relations {
-            if let Some(relationship) = relations.iter().find(|x| self.id == x.id) {
-                self.relationship = Some(relationship.status.clone());
-                return self;
-            }
-        }
-
-        self
-    }
-
-    /// Apply any relevant badges.
-    pub fn apply_badges(mut self) -> User {
-        let mut badges = self.badges.unwrap_or_else(|| 0);
-        if let Ok(id) = Ulid::from_string(&self.id) {
-            if id.datetime().timestamp_millis() < *EARLY_ADOPTER_BADGE {
-                badges = badges + Badges::EarlyAdopter;
-            }
-        }
-
-        self.badges = Some(badges);
-        self
-    }
-
-    /// Mutate the user object to appear as seen by user.
-    pub fn with(self, permissions: UserPermissions<[u32; 1]>) -> User {
-        let mut user = self.apply_badges();
-
-        if permissions.get_view_profile() {
-            user.online = Some(is_online(&user.id));
-        } else {
-            user.status = None;
-        }
-
-        // If the user's status is `Presence::Invisible`, return it as `Presence::Offline`
-        if let Some(status) = &user.status {
-            if let Some(presence) = &status.presence {
-                if presence == &Presence::Invisible {
-                    user.status = None;
-                    user.online = Some(false);
-                }
-            }
-        }
-
-        user.profile = None;
-        user
-    }
-
-    /// Mutate the user object to appear as seen by user.
-    /// Also overrides the relationship status.
-    pub async fn from_override(
-        mut self,
-        user: &User,
-        relationship: RelationshipStatus,
-    ) -> Result<User> {
-        let permissions = PermissionCalculator::new(&user)
-            .with_relationship(&relationship)
-            .for_user(&self.id)
-            .await?;
-
-        self.relations = None;
-        self.relationship = Some(relationship);
-        Ok(self.with(permissions))
-    }
-
-    /// Utility function for checking claimed usernames.
-    pub async fn is_username_taken(username: &str) -> Result<bool> {
-        if username.to_lowercase() == "revolt" || username.to_lowercase() == "admin" || username.to_lowercase() == "system" {
-            return Ok(true);
-        }
-
-        if get_collection("users")
-            .find_one(
-                doc! {
-                    "username": username
-                },
-                FindOneOptions::builder()
-                    .collation(Collation::builder().locale("en").strength(2).build())
-                    .build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "user",
-            })?
-            .is_some()
-        {
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    /// Utility function for fetching multiple users from the perspective of one.
-    /// Assumes user has a mutual connection with others.
-    pub async fn fetch_multiple_users(&self, user_ids: &Vec<String>) -> Result<Vec<User>> {
-        let mut users = vec![];
-        let mut cursor = get_collection("users")
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": user_ids
-                    }
-                },
-                FindOptions::builder()
-                    .projection(
-                        doc! { "_id": 1, "username": 1, "avatar": 1, "badges": 1, "status": 1, "flags": 1, "bot": 1 },
-                    )
-                    .build(),
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "users",
-            })?;
-
-        while let Some(result) = cursor.next().await {
-            if let Ok(doc) = result {
-                let other: User = from_document(doc).map_err(|_| Error::DatabaseError {
-                    operation: "from_document",
-                    with: "user",
-                })?;
-
-                let permissions = PermissionCalculator::new(&self)
-                    .with_mutual_connection()
-                    .with_user(&other)
-                    .for_user_given()
-                    .await?;
-
-                users.push(other.from(&self).with(permissions));
-            }
-        }
-
-        Ok(users)
-    }
-
-    /// Utility function to get all of a user's memberships.
-    pub async fn fetch_memberships(id: &str) -> Result<Vec<Member>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                from_document(x).ok()
-            })
-            .collect::<Vec<Member>>())
-    }
-
-    /// Utility function to get all the server IDs the user is in.
-    pub async fn fetch_server_ids(id: &str) -> Result<Vec<String>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find",
-                with: "server_members",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await
-            .into_iter()
-            .filter_map(|x| {
-                x.get_document("_id")
-                    .ok()
-                    .map(|i| i.get_str("server").ok().map(|x| x.to_string()))
-            })
-            .flatten()
-            .collect::<Vec<String>>())
-    }
-
-    /// Utility function to fetch unread objects for user.
-    pub async fn fetch_unreads(id: &str) -> Result<Vec<Document>> {
-        Ok(get_collection("channel_unreads")
-            .find(
-                doc! {
-                    "_id.user": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "user_settings",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await)
-    }
-
-    /// Check if this user can acquire another server.
-    pub async fn can_acquire_server(id: &str) -> Result<bool> {
-        let server_ids = User::fetch_server_ids(&id).await?;
-        Ok(server_ids.len() < *MAX_SERVER_COUNT)
-    }
-}

src/database/guards/mod.rs

@@ -1,4 +0,0 @@
-pub mod reference;
-pub mod user;
-
-pub use reference::Ref;

src/database/guards/reference.rs

@@ -1,162 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use mongodb::bson::{doc, from_document};
-use rocket::request::FromParam;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use validator::Validate;
-
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Ref {
-    #[validate(length(min = 1, max = 26))]
-    pub id: String,
-}
-
-impl Ref {
-    pub fn from_unchecked(id: String) -> Ref {
-        Ref { id }
-    }
-
-    pub fn from(id: String) -> Result<Ref> {
-        let r = Ref { id };
-        r.validate()
-            .map_err(|error| Error::FailedValidation { error })?;
-        Ok(r)
-    }
-
-    async fn fetch<T: DeserializeOwned>(&self, collection: &'static str) -> Result<T> {
-        let doc = get_collection(&collection)
-            .find_one(
-                doc! {
-                    "_id": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: &collection,
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(from_document::<T>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: &collection,
-        })?)
-    }
-
-    pub async fn fetch_user(&self) -> Result<User> {
-        self.fetch("users").await
-    }
-
-    pub async fn fetch_channel(&self) -> Result<Channel> {
-        self.fetch("channels").await
-    }
-
-    pub async fn fetch_server(&self) -> Result<Server> {
-        self.fetch("servers").await
-    }
-
-    pub async fn fetch_invite(&self) -> Result<Invite> {
-        match self.fetch("channel_invites").await {
-            Ok(invite) => Ok(invite),
-            Err(err) => {
-                if let Ok(server) = self.fetch::<Server>("servers").await {
-                    if server.discoverable {
-                        return Ok(
-                            Invite::Server {
-                                code: server.id.clone(),
-                                server: server.id,
-                                creator: server.owner,
-                                channel: server.channels[0].clone(),
-                            }
-                        )
-                    }
-                }
-
-                Err(err)
-            }
-        }
-    }
-
-    pub async fn fetch_bot(&self) -> Result<Bot> {
-        self.fetch("bots").await
-    }
-
-    pub async fn fetch_member(&self, server: &str) -> Result<Member> {
-        let doc = get_collection("server_members")
-            .find_one(
-                doc! {
-                    "_id.user": &self.id,
-                    "_id.server": server
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_member",
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(
-            from_document::<Member>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "server_member",
-            })?,
-        )
-    }
-
-    pub async fn fetch_ban(&self, server: &str) -> Result<Ban> {
-        let doc = get_collection("server_bans")
-            .find_one(
-                doc! {
-                    "_id.user": &self.id,
-                    "_id.server": server
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "server_ban",
-            })?
-            .ok_or_else(|| Error::NotFound)?;
-
-        Ok(from_document::<Ban>(doc).map_err(|_| Error::DatabaseError {
-            operation: "from_document",
-            with: "server_ban",
-        })?)
-    }
-
-    pub async fn fetch_message(&self, channel: &Channel) -> Result<Message> {
-        let message: Message = self.fetch("messages").await?;
-        if &message.channel != channel.id() {
-            Err(Error::InvalidOperation)
-        } else {
-            Ok(message)
-        }
-    }
-}
-
-impl User {
-    pub fn as_ref(&self) -> Ref {
-        Ref {
-            id: self.id.to_string(),
-        }
-    }
-}
-
-impl<'r> FromParam<'r> for Ref {
-    type Error = &'r str;
-
-    fn from_param(param: &'r str) -> Result<Self, Self::Error> {
-        if let Ok(result) = Ref::from(param.to_string()) {
-            if result.validate().is_ok() {
-                return Ok(result);
-            }
-        }
-
-        Err(param)
-    }
-}

src/database/guards/user.rs

@@ -1,81 +0,0 @@
-use crate::database::*;
-
-use mongodb::bson::{doc, from_document};
-use rauth::entities::Session;
-use rocket::http::Status;
-use rocket::request::{self, FromRequest, Outcome, Request};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for User {
-    type Error = rauth::util::Error;
-
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let user: &Option<User> = request.local_cache_async(async {
-            let header_bot_token = request
-                .headers()
-                .get("x-bot-token")
-                .next()
-                .map(|x| x.to_string());
-
-            if let Some(bot_token) = header_bot_token {
-                if let Ok(result) = get_collection("bots")
-                    .find_one(
-                        doc! {
-                            "token": bot_token
-                        },
-                        None,
-                    )
-                    .await
-                {
-                    if let Some(doc) = result {
-                        let id = doc.get_str("_id").unwrap();
-                        if let Ok(result) = get_collection("users")
-                            .find_one(
-                                doc! {
-                                    "_id": &id
-                                },
-                                None,
-                            )
-                            .await
-                        {
-                            if let Some(doc) = result {
-                                if let Ok(user) = from_document(doc) {
-                                    return Some(user)
-                                }
-                            }
-                        }
-                    }
-                }
-            } else {
-                if let Outcome::Success(session) = request.guard::<Session>().await {
-                    if let Ok(result) = get_collection("users")
-                        .find_one(
-                            doc! {
-                                "_id": &session.user_id
-                            },
-                            None,
-                        )
-                        .await
-                    {
-                        if let Some(doc) = result {
-                            if let Ok(user) = from_document(doc) {
-                                return Some(user)
-                            }
-                        }
-                    }
-                }
-            }
-
-            None
-        }).await;
-
-        if let Some(user) = user {
-            Outcome::Success(user.clone())
-        } else {
-            Outcome::Failure((
-                Status::Forbidden,
-                rauth::util::Error::InvalidSession,
-            ))
-        }
-    }
-}

src/database/migrations/init.rs

@@ -1,188 +0,0 @@
-use super::super::get_db;
-use super::scripts::LATEST_REVISION;
-
-use log::info;
-use mongodb::bson::doc;
-use mongodb::options::CreateCollectionOptions;
-
-pub async fn create_database() {
-    info!("Creating database.");
-    let db = get_db();
-
-    db.create_collection("accounts", None)
-        .await
-        .expect("Failed to create accounts collection.");
-
-    db.create_collection("users", None)
-        .await
-        .expect("Failed to create users collection.");
-
-    db.create_collection("channels", None)
-        .await
-        .expect("Failed to create channels collection.");
-
-    db.create_collection("messages", None)
-        .await
-        .expect("Failed to create messages collection.");
-
-    db.create_collection("servers", None)
-        .await
-        .expect("Failed to create servers collection.");
-
-    db.create_collection("server_members", None)
-        .await
-        .expect("Failed to create server_members collection.");
-
-    db.create_collection("server_bans", None)
-        .await
-        .expect("Failed to create server_bans collection.");
-
-    db.create_collection("channel_invites", None)
-        .await
-        .expect("Failed to create channel_invites collection.");
-
-    db.create_collection("channel_unreads", None)
-        .await
-        .expect("Failed to create channel_unreads collection.");
-
-    db.create_collection("migrations", None)
-        .await
-        .expect("Failed to create migrations collection.");
-
-    db.create_collection("attachments", None)
-        .await
-        .expect("Failed to create attachments collection.");
-
-    db.create_collection("user_settings", None)
-        .await
-        .expect("Failed to create user_settings collection.");
-
-    db.create_collection("bots", None)
-        .await
-        .expect("Failed to create bots collection.");
-
-    db.create_collection(
-        "pubsub",
-        CreateCollectionOptions::builder()
-            .capped(true)
-            .size(1_000_000)
-            .build(),
-    )
-    .await
-    .expect("Failed to create pubsub collection.");
-
-    db.run_command(
-        doc! {
-            "createIndexes": "users",
-            "indexes": [
-                {
-                    "key": {
-                        "username": 1
-                    },
-                    "name": "username",
-                    "unique": true,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2
-                    }
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create username index.");
-
-    db.run_command(
-        doc! {
-            "createIndexes": "messages",
-            "indexes": [
-                {
-                    "key": {
-                        "content": "text"
-                    },
-                    "name": "content"
-                },
-                {
-                    "key": {
-                        "channel": 1
-                    },
-                    "name": "channel"
-                },
-                {
-                    "key": {
-                        "channel": 1,
-                        "_id": 1
-                    },
-                    "name": "channel_id_compound"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create message index.");
-
-    get_db()
-    .run_command(
-        doc! {
-            "createIndexes": "channel_unreads",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.channel": 1,
-                        "_id.user": 1,
-                    },
-                    "name": "compound_id"
-                },
-                {
-                    "key": {
-                        "_id.user": 1,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create channel_unreads index.");
-
-    get_db()
-    .run_command(
-        doc! {
-            "createIndexes": "server_members",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.server": 1,
-                        "_id.user": 1,
-                    },
-                    "name": "compound_id"
-                },
-                {
-                    "key": {
-                        "_id.user": 1,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create server_members index.");
-
-    db.collection("migrations")
-        .insert_one(
-            doc! {
-                "_id": 0,
-                "revision": LATEST_REVISION
-            },
-            None,
-        )
-        .await
-        .expect("Failed to save migration info.");
-
-    info!("Created database.");
-}

src/database/migrations/mod.rs

@@ -1,22 +0,0 @@
-use super::get_connection;
-
-pub mod init;
-pub mod scripts;
-
-pub async fn run_migrations() {
-    let client = get_connection();
-
-    let list = client
-        .list_database_names(None, None)
-        .await
-        .expect("Failed to fetch database names.");
-    
-    if list.iter().position(|x| x == "revolt").is_none() {
-        init::create_database().await;
-    } else {
-        scripts::migrate_database().await;
-    }
-    
-    // panic!("https://pbs.twimg.com/media/EDTpB5JWwAUvyxd.jpg");
-    rauth::entities::sync_models(&super::get_db()).await;
-}

src/database/migrations/scripts.rs

@@ -1,474 +0,0 @@
-use crate::database::{permissions, get_collection, get_db, PermissionTuple};
-
-use futures::StreamExt;
-use log::info;
-use mongodb::{bson::{Document, doc, from_bson, from_document, to_document}, options::FindOptions};
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-struct MigrationInfo {
-    _id: i32,
-    revision: i32,
-}
-
-pub const LATEST_REVISION: i32 = 13;
-
-pub async fn migrate_database() {
-    let migrations = get_collection("migrations");
-    let data = migrations
-        .find_one(None, None)
-        .await
-        .expect("Failed to fetch migration data.");
-
-    if let Some(doc) = data {
-        let info: MigrationInfo =
-            from_document(doc).expect("Failed to read migration information.");
-
-        let revision = run_migrations(info.revision).await;
-
-        migrations
-            .update_one(
-                doc! {
-                    "_id": info._id
-                },
-                doc! {
-                    "$set": {
-                        "revision": revision
-                    }
-                },
-                None,
-            )
-            .await
-            .expect("Failed to commit migration information.");
-
-        info!("Migration complete. Currently at revision {}.", revision);
-    } else {
-        panic!("Database was configured incorrectly, possibly because initalization failed.")
-    }
-}
-
-pub async fn run_migrations(revision: i32) -> i32 {
-    info!("Starting database migration.");
-
-    if revision <= 0 {
-        info!("Running migration [revision 0]: Test migration system.");
-    }
-
-    if revision <= 1 {
-        info!("Running migration [revision 1 / 2021-04-24]: Migrate to Autumn v1.0.0.");
-
-        let messages = get_collection("messages");
-        let attachments = get_collection("attachments");
-
-        messages
-            .update_many(
-                doc! { "attachment": { "$exists": 1 } },
-                doc! { "$set": { "attachment.tag": "attachments", "attachment.size": 0 } },
-                None,
-            )
-            .await
-            .expect("Failed to update messages.");
-
-        attachments
-            .update_many(
-                doc! {},
-                doc! { "$set": { "tag": "attachments", "size": 0 } },
-                None,
-            )
-            .await
-            .expect("Failed to update attachments.");
-    }
-
-    if revision <= 2 {
-        info!("Running migration [revision 2 / 2021-05-08]: Add servers collection.");
-
-        get_db()
-            .create_collection("servers", None)
-            .await
-            .expect("Failed to create servers collection.");
-    }
-
-    if revision <= 3 {
-        info!("Running migration [revision 3 / 2021-05-25]: Support multiple file uploads, add channel_unreads and user_settings.");
-
-        let messages = get_collection("messages");
-        let mut cursor = messages
-            .find(
-                doc! {
-                    "attachment": {
-                        "$exists": 1
-                    }
-                },
-                FindOptions::builder()
-                    .projection(doc! {
-                        "_id": 1,
-                        "attachments": [ "$attachment" ]
-                    })
-                    .build(),
-            )
-            .await
-            .expect("Failed to fetch messages.");
-
-        while let Some(result) = cursor.next().await {
-            let doc = result.unwrap();
-            let id = doc.get_str("_id").unwrap();
-            let attachments = doc.get_array("attachments").unwrap();
-
-            messages
-                .update_one(
-                    doc! { "_id": id },
-                    doc! { "$unset": { "attachment": 1 }, "$set": { "attachments": attachments } },
-                    None,
-                )
-                .await
-                .unwrap();
-        }
-
-        get_db()
-            .create_collection("channel_unreads", None)
-            .await
-            .expect("Failed to create channel_unreads collection.");
-
-        get_db()
-            .create_collection("user_settings", None)
-            .await
-            .expect("Failed to create user_settings collection.");
-    }
-
-    if revision <= 4 {
-        info!("Running migration [revision 4 / 2021-06-01]: Add more server collections.");
-
-        get_db()
-            .create_collection("server_members", None)
-            .await
-            .expect("Failed to create server_members collection.");
-
-        get_db()
-            .create_collection("server_bans", None)
-            .await
-            .expect("Failed to create server_bans collection.");
-
-        get_db()
-            .create_collection("channel_invites", None)
-            .await
-            .expect("Failed to create channel_invites collection.");
-    }
-
-    if revision <= 5 {
-        info!("Running migration [revision 5 / 2021-06-26]: Add permissions.");
-
-        #[derive(Serialize)]
-        struct Server {
-            pub default_permissions: PermissionTuple,
-        }
-
-        let server = Server {
-            default_permissions: (
-                *permissions::server::DEFAULT_PERMISSION as i32,
-                *permissions::channel::DEFAULT_PERMISSION_SERVER as i32
-            )
-        };
-
-        get_collection("servers")
-            .update_many(
-                doc! { },
-                doc! {
-                    "$set": to_document(&server).unwrap()
-                },
-                None
-            )
-            .await
-            .expect("Failed to migrate servers.");
-    }
-
-    if revision <= 6 {
-        info!("Running migration [revision 6 / 2021-07-09]: Add message text index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "content": "text"
-                        },
-                        "name": "content"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-    }
-
-    if revision <= 7 {
-        info!("Running migration [revision 7 / 2021-08-11]: Add message text index.");
-
-        get_db()
-            .create_collection("bots", None)
-            .await
-            .expect("Failed to create bots collection.");
-    }
-
-    if revision <= 8 {
-        info!("Running migration [revision 8 / 2021-09-10]: Update to rAuth version 1.");
-
-        get_db()
-            .run_command(
-                doc! {
-                    "dropIndexes": "accounts",
-                    "index": ["email", "email_normalised"]
-                },
-                None,
-            )
-            .await
-            .expect("Failed to delete legacy account indexes.");
-
-        let col = get_collection("sessions");
-        let mut cursor = get_collection("accounts")
-            .find(doc! { }, None)
-            .await
-            .unwrap();
-        
-        while let Some(doc) = cursor.next().await {
-            if let Ok(account) = doc {
-                let id = account.get_str("_id").unwrap();
-                if let Some(sessions) = account.get("sessions") {
-                    #[derive(Deserialize)]
-                    struct Session {
-                        id: String,
-                        token: String,
-                        friendly_name: String,
-                        subscription: Option<Document>,
-                    }
-
-                    let sessions = from_bson::<Vec<Session>>(sessions.clone()).unwrap();
-                    for session in sessions {
-                        info!("Converting session {} to new format.", &session.id);
-
-                        let mut doc = doc! {
-                            "_id": session.id,
-                            "token": session.token,
-                            "user_id": id.clone(),
-                            "name": session.friendly_name,
-                        };
-
-                        if let Some(sub) = session.subscription {
-                            doc.insert("subscription", sub);
-                        }
-
-                        col.insert_one(doc, None).await.ok();
-                    }
-                } else {
-                    info!("Account doesn't have any sessions!");
-                }
-            }
-        }
-
-        get_collection("accounts")
-            .update_many(
-                doc! { },
-                doc! {
-                    "$unset": {
-                        "sessions": 1,
-                    },
-                    "$set": {
-                        "mfa": {
-                            "recovery_codes": []
-                        }
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-    }
-
-    if revision <= 9 {
-        info!("Running migration [revision 9 / 2021-09-14]: Switch from last_message to last_message_id.");
-
-        let mut cursor = get_collection("channels")
-            .find(doc! { }, None)
-            .await
-            .unwrap();
-        
-        while let Some(doc) = cursor.next().await {
-            if let Ok(channel) = doc {
-                let channel_id = channel.get_str("_id").unwrap();
-                if let Some(last_message) = channel.get("last_message") {
-                    #[derive(Serialize, Deserialize, Debug, Clone)]
-                    pub struct Obj {
-                        #[serde(rename = "_id")]
-                        id: String,
-                    }
-
-                    #[derive(Serialize, Deserialize, Debug, Clone)]
-                    #[serde(untagged)]
-                    pub enum LastMessage {
-                        Obj(Obj),
-                        Id(String)
-                    }
-
-                    let lm = from_bson::<LastMessage>(last_message.clone()).unwrap();
-                    let id = match lm {
-                        LastMessage::Obj(Obj { id }) => id,
-                        LastMessage::Id(id) => id
-                    };
-
-                    info!("Converting session {} to new format.", &channel_id);
-                    get_collection("channels")
-                        .update_one(
-                            doc! {
-                                "_id": channel_id
-                            },
-                            doc! {
-                                "$set": {
-                                    "last_message_id": id
-                                },
-                                "$unset": {
-                                    "last_message": 1,
-                                }
-                            },
-                            None
-                        )
-                        .await
-                        .unwrap();
-                } else {
-                    info!("{} has no last_message.", &channel_id);
-                }
-            }
-        }
-    }
-
-    if revision <= 10 {
-        info!("Running migration [revision 10 / 2021-11-01]: Remove nonce values on channels and servers.");
-
-        get_collection("servers")
-            .update_many(
-                doc! {},
-                doc! {
-                    "$unset": {
-                        "nonce": 1,
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-
-        get_collection("channels")
-            .update_many(
-                doc! {},
-                doc! {
-                    "$unset": {
-                        "nonce": 1,
-                    }
-                },
-                None
-            )
-            .await
-            .unwrap();
-    }
-
-    if revision <= 11 {
-        info!("Running migration [revision 11 / 2021-11-14]: Add indexes to database.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "channel": 1
-                        },
-                        "name": "channel"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "channel_unreads",
-                "indexes": [
-                    {
-                        "key": {
-                            "_id.channel": 1,
-                            "_id.user": 1,
-                        },
-                        "name": "compound_id"
-                    },
-                    {
-                        "key": {
-                            "_id.user": 1,
-                        },
-                        "name": "user_id"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create channel_unreads index.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "server_members",
-                "indexes": [
-                    {
-                        "key": {
-                            "_id.server": 1,
-                            "_id.user": 1,
-                        },
-                        "name": "compound_id"
-                    },
-                    {
-                        "key": {
-                            "_id.user": 1,
-                        },
-                        "name": "user_id"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create server_members index.");
-    }
-
-    if revision <= 12 {
-        info!("Running migration [revision 12 / 2021-11-21]: Add indexes to database.");
-
-        get_db()
-        .run_command(
-            doc! {
-                "createIndexes": "messages",
-                "indexes": [
-                    {
-                        "key": {
-                            "channel": 1,
-                            "_id": 1
-                        },
-                        "name": "channel_id_compound"
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .expect("Failed to create message index.");
-    }
-
-    // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
-
-    // Reminder to update LATEST_REVISION when adding new migrations.
-    LATEST_REVISION
-}

src/database/mod.rs

@@ -1,36 +0,0 @@
-use crate::util::variables::MONGO_URI;
-
-use mongodb::{Client, Collection, Database};
-use once_cell::sync::OnceCell;
-
-static DBCONN: OnceCell<Client> = OnceCell::new();
-
-pub async fn connect() {
-    let client = Client::with_uri_str(&MONGO_URI)
-        .await
-        .expect("Failed to init db connection.");
-
-    DBCONN.set(client).unwrap();
-    migrations::run_migrations().await;
-}
-
-pub fn get_connection() -> &'static Client {
-    DBCONN.get().unwrap()
-}
-
-pub fn get_db() -> Database {
-    get_connection().database("revolt")
-}
-
-pub fn get_collection(collection: &str) -> Collection {
-    get_db().collection(collection)
-}
-
-pub mod entities;
-pub mod guards;
-pub mod migrations;
-pub mod permissions;
-
-pub use entities::*;
-pub use guards::*;
-pub use permissions::*;

src/database/permissions/channel.rs

@@ -1,159 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum ChannelPermission {
-    View = 0b00000000000000000000000000000001,           // 1
-    SendMessage = 0b00000000000000000000000000000010,    // 2
-    ManageMessages = 0b00000000000000000000000000000100, // 4
-    ManageChannel = 0b00000000000000000000000000001000,  // 8
-    VoiceCall = 0b00000000000000000000000000010000,      // 16
-    InviteOthers = 0b00000000000000000000000000100000,   // 32
-    EmbedLinks = 0b00000000000000000000000001000000,     // 64
-    UploadFiles = 0b00000000000000000000000010000000,   // 128
-    Masquerade = 0b00000000000000000000000100000000,   // 256
-}
-
-lazy_static! {
-    pub static ref DEFAULT_PERMISSION_DM: u32 =
-        ChannelPermission::View
-        + ChannelPermission::SendMessage
-        + ChannelPermission::ManageChannel
-        + ChannelPermission::VoiceCall
-        + ChannelPermission::InviteOthers
-        + ChannelPermission::EmbedLinks
-        + ChannelPermission::UploadFiles
-        + ChannelPermission::Masquerade;
-
-    pub static ref DEFAULT_PERMISSION_SERVER: u32 =
-        ChannelPermission::View
-        + ChannelPermission::SendMessage
-        + ChannelPermission::VoiceCall
-        + ChannelPermission::InviteOthers
-        + ChannelPermission::EmbedLinks
-        + ChannelPermission::UploadFiles;
-}
-
-impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &ChannelPermission| -> u32 { *a | *b as u32 });
-
-bitfield! {
-    pub struct ChannelPermissions(MSB0 [u32]);
-    u32;
-    pub get_view, _: 31;
-    pub get_send_message, _: 30;
-    pub get_manage_messages, _: 29;
-    pub get_manage_channel, _: 28;
-    pub get_voice_call, _: 27;
-    pub get_invite_others, _: 26;
-    pub get_embed_links, _: 25;
-    pub get_upload_files, _: 24;
-    pub get_masquerade, _: 23;
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_channel(self) -> Result<u32> {
-        let channel = if let Some(channel) = self.channel {
-            channel
-        } else {
-            unreachable!()
-        };
-
-        match channel {
-            Channel::SavedMessages { user: owner, .. } => {
-                if &self.perspective.id == owner {
-                    Ok(u32::MAX)
-                } else {
-                    Ok(0)
-                }
-            }
-            Channel::DirectMessage { recipients, .. } => {
-                if recipients
-                    .iter()
-                    .find(|x| *x == &self.perspective.id)
-                    .is_some()
-                {
-                    if let Some(recipient) = recipients.iter().find(|x| *x != &self.perspective.id)
-                    {
-                        let perms = self.for_user(recipient).await?;
-
-                        if perms.get_send_message() {
-                            return Ok(*DEFAULT_PERMISSION_DM);
-                        }
-
-                        return Ok(ChannelPermission::View as u32);
-                    }
-                }
-
-                Ok(0)
-            }
-            Channel::Group { recipients, permissions, owner, .. } => {
-                if &self.perspective.id == owner {
-                    return Ok(*DEFAULT_PERMISSION_DM)
-                }
-
-                if recipients
-                    .iter()
-                    .find(|x| *x == &self.perspective.id)
-                    .is_some()
-                {
-                    if let Some(permissions) = permissions {
-                        Ok(permissions.clone() as u32)
-                    } else {
-                        Ok(*DEFAULT_PERMISSION_DM)
-                    }
-                } else {
-                    Ok(0)
-                }
-            }
-            Channel::TextChannel { server, default_permissions, role_permissions, .. }
-            | Channel::VoiceChannel { server, default_permissions, role_permissions, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-
-                if self.perspective.id == server.owner {
-                    Ok(u32::MAX)
-                } else {
-                    match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
-                        Ok(member) => {
-                            let mut perm = if let Some(permission) = default_permissions {
-                                *permission as u32
-                            } else {
-                                server.default_permissions.1 as u32
-                            };
-
-                            if let Some(roles) = member.roles {
-                                for role in roles {
-                                    if let Some(permission) = role_permissions.get(&role) {
-                                        perm |= *permission as u32;
-                                    }
-
-                                    if let Some(server_role) = server.roles.get(&role) {
-                                        perm |= server_role.permissions.1 as u32;
-                                    }
-                                }
-                            }
-
-                            Ok(perm)
-                        }
-                        Err(error) => {
-                            match &error {
-                                Error::NotFound => Ok(0),
-                                _ => Err(error)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub async fn for_channel(self) -> Result<ChannelPermissions<[u32; 1]>> {
-        Ok(ChannelPermissions([self.calculate_channel().await?]))
-    }
-}

src/database/permissions/mod.rs

@@ -1,77 +0,0 @@
-pub use crate::database::*;
-
-pub mod channel;
-pub mod server;
-pub mod user;
-
-pub use user::get_relationship;
-
-pub struct PermissionCalculator<'a> {
-    perspective: &'a User,
-
-    user: Option<&'a User>,
-    relationship: Option<&'a RelationshipStatus>,
-    channel: Option<&'a Channel>,
-    server: Option<&'a Server>,
-    // member: Option<&'a Member>,
-
-    has_mutual_connection: bool,
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub fn new(perspective: &'a User) -> PermissionCalculator {
-        PermissionCalculator {
-            perspective,
-
-            user: None,
-            relationship: None,
-            channel: None,
-            server: None,
-            // member: None,
-
-            has_mutual_connection: false,
-        }
-    }
-
-    pub fn with_user(self, user: &'a User) -> PermissionCalculator {
-        PermissionCalculator {
-            user: Some(&user),
-            ..self
-        }
-    }
-
-    pub fn with_relationship(self, relationship: &'a RelationshipStatus) -> PermissionCalculator {
-        PermissionCalculator {
-            relationship: Some(&relationship),
-            ..self
-        }
-    }
-
-    pub fn with_channel(self, channel: &'a Channel) -> PermissionCalculator {
-        PermissionCalculator {
-            channel: Some(&channel),
-            ..self
-        }
-    }
-
-    pub fn with_server(self, server: &'a Server) -> PermissionCalculator {
-        PermissionCalculator {
-            server: Some(&server),
-            ..self
-        }
-    }
-
-    /* pub fn with_member(self, member: &'a Member) -> PermissionCalculator {
-        PermissionCalculator {
-            member: Some(&member),
-            ..self
-        }
-    } */
-
-    pub fn with_mutual_connection(self) -> PermissionCalculator<'a> {
-        PermissionCalculator {
-            has_mutual_connection: true,
-            ..self
-        }
-    }
-}

src/database/permissions/server.rs

@@ -1,89 +0,0 @@
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-use super::Ref;
-
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum ServerPermission {
-    View = 0b00000000000000000000000000000001,           // 1
-    ManageRoles = 0b00000000000000000000000000000010,    // 2
-    ManageChannels = 0b00000000000000000000000000000100, // 4
-    ManageServer = 0b00000000000000000000000000001000,   // 8
-    KickMembers = 0b00000000000000000000000000010000,    // 16
-    BanMembers = 0b00000000000000000000000000100000,     // 32
-    // 6 bits of space
-    ChangeNickname = 0b00000000000000000001000000000000, // 4096
-    ManageNicknames = 0b00000000000000000010000000000000, // 8192
-    ChangeAvatar = 0b00000000000000000100000000000000,   // 16382
-    RemoveAvatars = 0b00000000000000001000000000000000,  // 32768
-                                                         // 16 bits of space
-}
-
-lazy_static! {
-    pub static ref DEFAULT_PERMISSION: u32 =
-        ServerPermission::View
-        + ServerPermission::ChangeNickname
-        + ServerPermission::ChangeAvatar;
-}
-
-impl_op_ex!(+ |a: &ServerPermission, b: &ServerPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &ServerPermission| -> u32 { *a | *b as u32 });
-
-bitfield! {
-    pub struct ServerPermissions(MSB0 [u32]);
-    u32;
-    pub get_view, _: 31;
-    pub get_manage_roles, _: 30;
-    pub get_manage_channels, _: 29;
-    pub get_manage_server, _: 28;
-    pub get_kick_members, _: 27;
-    pub get_ban_members, _: 26;
-
-    pub get_change_nickname, _: 19;
-    pub get_manage_nicknames, _: 18;
-    pub get_change_avatar, _: 17;
-    pub get_remove_avatars, _: 16;
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_server(self) -> Result<u32> {
-        let server = if let Some(server) = self.server {
-            server
-        } else {
-            unreachable!()
-        };
-
-        if self.perspective.id == server.owner {
-            Ok(u32::MAX)
-        } else {
-            match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
-                Ok(member) => {
-                    let mut perm = server.default_permissions.0 as u32;
-                    if let Some(roles) = member.roles {
-                        for role in roles {
-                            if let Some(server_role) = server.roles.get(&role) {
-                                perm |= server_role.permissions.0 as u32;
-                            }
-                        }
-                    }
-
-                    Ok(perm)
-                }
-                Err(error) => {
-                    match &error {
-                        Error::NotFound => Ok(0),
-                        _ => Err(error)
-                    }
-                }
-            }
-        }
-    }
-
-    pub async fn for_server(self) -> Result<ServerPermissions<[u32; 1]>> {
-        Ok(ServerPermissions([self.calculate_server().await?]))
-    }
-}

src/database/permissions/user.rs

@@ -1,131 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use super::PermissionCalculator;
-
-use mongodb::bson::doc;
-use num_enum::TryFromPrimitive;
-use std::ops;
-
-#[derive(Debug, PartialEq, Eq, TryFromPrimitive, Copy, Clone)]
-#[repr(u32)]
-pub enum UserPermission {
-    Access = 0b00000000000000000000000000000001,      // 1
-    ViewProfile = 0b00000000000000000000000000000010, // 2
-    SendMessage = 0b00000000000000000000000000000100, // 4
-    Invite = 0b00000000000000000000000000001000,      // 8
-}
-
-bitfield! {
-    pub struct UserPermissions(MSB0 [u32]);
-    u32;
-    pub get_access, _: 31;
-    pub get_view_profile, _: 30;
-    pub get_send_message, _: 29;
-    pub get_invite, _: 28;
-}
-
-impl_op_ex!(+ |a: &UserPermission, b: &UserPermission| -> u32 { *a as u32 | *b as u32 });
-impl_op_ex_commutative!(+ |a: &u32, b: &UserPermission| -> u32 { *a | *b as u32 });
-
-pub fn get_relationship(a: &User, b: &str) -> RelationshipStatus {
-    if a.id == b {
-        return RelationshipStatus::User;
-    }
-
-    if let Some(relations) = &a.relations {
-        if let Some(relationship) = relations.iter().find(|x| x.id == b) {
-            return relationship.status.clone();
-        }
-    }
-
-    RelationshipStatus::None
-}
-
-impl<'a> PermissionCalculator<'a> {
-    pub async fn calculate_user(self, target: &str) -> Result<u32> {
-        if &self.perspective.id == target {
-            return Ok(u32::MAX);
-        }
-
-        let mut permissions: u32 = 0;
-        match self
-            .relationship
-            .clone()
-            .map(|v| v.to_owned())
-            .unwrap_or_else(|| get_relationship(&self.perspective, &target))
-        {
-            RelationshipStatus::Friend | RelationshipStatus::User => return Ok(u32::MAX),
-            RelationshipStatus::Blocked | RelationshipStatus::BlockedOther => {
-                return Ok(UserPermission::Access as u32)
-            }
-            RelationshipStatus::Incoming | RelationshipStatus::Outgoing => {
-                permissions = UserPermission::Access as u32;
-                // ! INFO: if we add boolean switch for permission to
-                // ! message people who have mutual, we need to get
-                // ! rid of this return statement.
-                // return Ok(permissions);
-            }
-            _ => {}
-        }
-
-        let check_server_overlap = async || {
-            let server_ids = User::fetch_server_ids(&self.perspective.id).await?;
-
-            Ok(
-                get_collection("server_members")
-                    .find_one(
-                        doc! {
-                            "_id.user": &target,
-                            "_id.server": {
-                                "$in": server_ids
-                            }
-                        },
-                        None
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "find_one",
-                        with: "server_members",
-                    })?
-                    .is_some()
-            )
-        };
-
-        if self.has_mutual_connection
-            || check_server_overlap().await?
-            || get_collection("channels")
-                .find_one(
-                    doc! {
-                        "channel_type": {
-                            "$in": ["Group", "DirectMessage"]
-                        },
-                        "recipients": {
-                            "$all": [ &self.perspective.id, target ]
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "find_one",
-                    with: "channels",
-                })?
-                .is_some()
-        {
-            // ! FIXME: add privacy settings
-            return Ok(UserPermission::Access + UserPermission::ViewProfile);
-        }
-
-        Ok(permissions)
-    }
-
-    pub async fn for_user(self, target: &str) -> Result<UserPermissions<[u32; 1]>> {
-        Ok(UserPermissions([self.calculate_user(&target).await?]))
-    }
-
-    pub async fn for_user_given(self) -> Result<UserPermissions<[u32; 1]>> {
-        let id = &self.user.unwrap().id;
-        Ok(UserPermissions([self.calculate_user(&id).await?]))
-    }
-}

src/main.rs

@@ -1,41 +1,29 @@
-#![feature(proc_macro_hygiene, decl_macro)]
-#![feature(async_closure)]
-#![feature(const_option)]
-
 #[macro_use]
 extern crate rocket;
 #[macro_use]
+extern crate rocket_okapi;
+#[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate lazy_static;
-#[macro_use]
-extern crate impl_ops;
-#[macro_use]
-extern crate bitfield;
 extern crate ctrlc;
 
-pub mod database;
-pub mod notifications;
 pub mod routes;
-pub mod redis;
 pub mod util;
 pub mod version;
-pub mod task_queue;
 
-use async_std::task;
-use futures::join;
 use log::info;
 use rauth::{
     config::{Captcha, Config, EmailVerification, SMTPSettings, Template, Templates},
     logic::Auth,
 };
-use std::str::FromStr;
+use revolt_quark::variables::delta::{
-use rocket_cors::AllowedOrigins;
-use util::variables::{
     APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME,
     USE_EMAIL, USE_HCAPTCHA,
 };
-use crate::util::ratelimit::RatelimitState;
+use revolt_quark::DatabaseInfo;
+use rocket_cors::AllowedOrigins;
+use std::str::FromStr;
 
 #[async_std::main]
 async fn main() {
@@ -43,33 +31,19 @@ async fn main() {
     env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "info"));
 
     info!(
-        "Starting REVOLT server [version {}].",
+        "Starting Revolt server [version {}].",
         crate::version::VERSION
     );
 
-    util::variables::preflight_checks();
+    revolt_quark::variables::delta::preflight_checks();
-    database::connect().await;
-    redis::connect().await;
-    notifications::hive::init_hive().await;
-    task_queue::start_queues().await;
 
+    #[cfg(debug_assertions)]
     ctrlc::set_handler(move || {
         // Force ungraceful exit to avoid hang.
         std::process::exit(0);
     })
     .expect("Error setting Ctrl-C handler");
 
-    let web_task = task::spawn(launch_web());
-    let hive_task = task::spawn_local(notifications::hive::listen());
-
-    join!(
-        web_task,
-        hive_task,
-        notifications::websocket::launch_server()
-    );
-}
-
-async fn launch_web() {
     let cors = rocket_cors::CorsOptions {
         allowed_origins: AllowedOrigins::All,
         allowed_methods: [
@@ -99,13 +73,13 @@ async fn launch_web() {
                 templates: Templates {
                     verify: Template {
                         title: "Verify your Revolt account.".into(),
-                        text: include_str!("../assets/templates/verify.txt").into(),
+                        text: include_str!(crate::asset!("templates/verify.txt")).into(),
                         url: format!("{}/login/verify/", *APP_URL),
                         html: None,
                     },
                     reset: Template {
                         title: "Reset your Revolt password.".into(),
-                        text: include_str!("../assets/templates/reset.txt").into(),
+                        text: include_str!(crate::asset!("templates/reset.txt")).into(),
                         url: format!("{}/login/reset/", *APP_URL),
                         html: None,
                     },
@@ -128,17 +102,49 @@ async fn launch_web() {
         };
     }
 
-    let auth = Auth::new(database::get_db(), config);
+    let db = DatabaseInfo::Auto.connect().await.unwrap();
+    db.migrate_database().await.unwrap();
+
+    // This is entirely temporary code until rauth is migrated to quark.
+    // (and / or otherwise gets updated to MongoDB v2 driver)
+    let mongo_db = mongodb::Client::with_uri_str(
+        &std::env::var("MONGODB").unwrap_or_else(|_| "mongodb://localhost".to_string()),
+    )
+    .await
+    .expect("Failed to init db connection.");
+
+    rauth::entities::sync_models(&mongo_db.database("revolt")).await;
+
+    // Launch background task workers.
+    async_std::task::spawn(revolt_quark::tasks::start_workers(db.clone()));
+
+    let auth = Auth::new(mongo_db.database("revolt"), config);
     let rocket = rocket::build();
     routes::mount(rocket)
         .mount("/", rocket_cors::catch_all_options_routes())
-        .mount("/auth/account", rauth::web::account::routes())
+        .mount("/", util::ratelimiter::routes())
-        .mount("/auth/session", rauth::web::session::routes())
+        .mount(
+            "/swagger/",
+            rocket_okapi::swagger_ui::make_swagger_ui(&rocket_okapi::swagger_ui::SwaggerUIConfig {
+                url: "../openapi.json".to_owned(),
+                ..Default::default()
+            }),
+        )
         .manage(auth)
+        .manage(db)
         .manage(cors.clone())
-        .manage(RatelimitState::new())
+        .attach(util::ratelimiter::RatelimitFairing)
         .attach(cors)
         .launch()
         .await
         .unwrap();
 }
+
+/// Resolve asset
+macro_rules! asset {
+    ($path:literal) => {
+        concat!(env!("CARGO_MANIFEST_DIR"), "/assets/", $path)
+    };
+}
+
+pub(crate) use asset;

src/notifications/events.rs

@@ -1,281 +0,0 @@
-use hive_pubsub::PubSub;
-use mongodb::bson::doc;
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-use super::hive::{get_hive, subscribe_if_exists};
-use crate::{database::*, util::result::Result};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "error")]
-pub enum WebSocketError {
-    LabelMe,
-    InternalError { at: String },
-    InvalidSession,
-    OnboardingNotFinished,
-    AlreadyAuthenticated,
-    MalformedData { msg: String },
-}
-
-#[derive(Deserialize, Debug)]
-pub struct Auth {
-    pub token: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum Ping {
-    Binary(Vec<u8>),
-    Number(usize)
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type")]
-pub enum ServerboundNotification {
-    Authenticate(Auth),
-    BeginTyping { channel: String },
-    EndTyping { channel: String },
-    Ping { data: Ping, responded: Option<()> },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveUserField {
-    ProfileContent,
-    ProfileBackground,
-    StatusText,
-    Avatar,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveChannelField {
-    Icon,
-    Description,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveServerField {
-    Icon,
-    Banner,
-    Description,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveRoleField {
-    Colour,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveMemberField {
-    Nickname,
-    Avatar,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum RemoveBotField {
-    InteractionsURL,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum ClientboundNotification {
-    Error(WebSocketError),
-    Authenticated,
-    Ready {
-        users: Vec<User>,
-        servers: Vec<Server>,
-        channels: Vec<Channel>,
-        members: Vec<Member>,
-    },
-    Pong { data: Ping },
-
-    Message(Message),
-    MessageUpdate {
-        id: String,
-        channel: String,
-        data: Value,
-    },
-    MessageDelete {
-        id: String,
-        channel: String,
-    },
-
-    ChannelCreate(Channel),
-    ChannelUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveChannelField>,
-    },
-    ChannelDelete {
-        id: String,
-    },
-    ChannelGroupJoin {
-        id: String,
-        user: String,
-    },
-    ChannelGroupLeave {
-        id: String,
-        user: String,
-    },
-    ChannelStartTyping {
-        id: String,
-        user: String,
-    },
-    ChannelStopTyping {
-        id: String,
-        user: String,
-    },
-    ChannelAck {
-        id: String,
-        user: String,
-        message_id: String,
-    },
-
-    ServerUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveServerField>,
-    },
-    ServerDelete {
-        id: String,
-    },
-    ServerMemberUpdate {
-        id: MemberCompositeKey,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveMemberField>,
-    },
-    ServerMemberJoin {
-        id: String,
-        user: String,
-    },
-    ServerMemberLeave {
-        id: String,
-        user: String,
-    },
-    ServerRoleUpdate {
-        id: String,
-        role_id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveRoleField>,
-    },
-    ServerRoleDelete {
-        id: String,
-        role_id: String,
-    },
-
-    UserUpdate {
-        id: String,
-        data: Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveUserField>,
-    },
-    UserRelationship {
-        id: String,
-        user: User,
-        status: RelationshipStatus,
-    },
-    UserSettingsUpdate {
-        id: String,
-        update: Value,
-    },
-}
-
-impl ClientboundNotification {
-    pub fn publish(self, topic: String) {
-        async_std::task::spawn(async move {
-            prehandle_hook(&self).await.ok(); // ! FIXME: this should be moved to pubsub
-            hive_pubsub::backend::redis::publish(get_hive(), topic, self)
-                .await
-                .ok();
-        });
-    }
-
-    pub fn publish_as_user(self, user: String) {
-        self.clone().publish(user.clone());
-
-        async_std::task::spawn(async move {
-            if let Ok(server_ids) = User::fetch_server_ids(&user).await {
-                for server in server_ids {
-                    self.clone().publish(server.clone());
-                }
-            }
-        });
-    }
-}
-
-pub async fn prehandle_hook(notification: &ClientboundNotification) -> Result<()> {
-    match &notification {
-        ClientboundNotification::ChannelGroupJoin { id, user } => {
-            subscribe_if_exists(user.clone(), id.clone()).ok();
-        }
-        ClientboundNotification::ChannelCreate(channel) => {
-            let channel_id = channel.id();
-            match &channel {
-                Channel::SavedMessages { user, .. } => {
-                    subscribe_if_exists(user.clone(), channel_id.to_string()).ok();
-                }
-                Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
-                    for recipient in recipients {
-                        subscribe_if_exists(recipient.clone(), channel_id.to_string()).ok();
-                    }
-                }
-                Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
-                    // ! FIXME: write a better algorithm?
-                    let members = Server::fetch_member_ids(server).await?;
-                    for member in members {
-                        subscribe_if_exists(member.clone(), channel_id.to_string()).ok();
-                    }
-                }
-            }
-        }
-        ClientboundNotification::ServerMemberJoin { id, user } => {
-            let server = Ref::from_unchecked(id.clone()).fetch_server().await?;
-
-            subscribe_if_exists(user.clone(), id.clone()).ok();
-
-            for channel in server.channels {
-                subscribe_if_exists(user.clone(), channel).ok();
-            }
-        }
-        ClientboundNotification::UserRelationship { id, user, status } => {
-            if status != &RelationshipStatus::None {
-                subscribe_if_exists(id.clone(), user.id.clone()).ok();
-            }
-        }
-        _ => {}
-    }
-
-    Ok(())
-}
-
-pub async fn posthandle_hook(notification: &ClientboundNotification) {
-    match &notification {
-        ClientboundNotification::ChannelDelete { id } => {
-            get_hive().hive.drop_topic(&id).ok();
-        }
-        ClientboundNotification::ChannelGroupLeave { id, user } => {
-            get_hive().hive.unsubscribe(user, id).ok();
-        }
-        ClientboundNotification::ServerDelete { id } => {
-            get_hive().hive.drop_topic(&id).ok();
-        }
-        ClientboundNotification::ServerMemberLeave { id, user } => {
-            get_hive().hive.unsubscribe(user, id).ok();
-
-            if let Ok(server) = Ref::from_unchecked(id.clone()).fetch_server().await {
-                for channel in server.channels {
-                    get_hive().hive.unsubscribe(user, &channel).ok();
-                }
-            }
-        }
-        ClientboundNotification::UserRelationship { id, user, status } => {
-            if status == &RelationshipStatus::None {
-                get_hive().hive.unsubscribe(id, &user.id).ok();
-            }
-        }
-        _ => {}
-    }
-}

src/notifications/hive.rs

@@ -1,73 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use super::{events::ClientboundNotification, websocket};
-use crate::redis::get_pool;
-use crate::util::variables::REDIS_URI;
-
-use futures::FutureExt;
-use hive_pubsub::backend::redis::RedisPubSub;
-use hive_pubsub::PubSub;
-use log::{debug, error};
-use once_cell::sync::OnceCell;
-use serde_json::to_string;
-
-type Hive<'a> = RedisPubSub<'a, String, String, ClientboundNotification>;
-static HIVE: OnceCell<Hive<'static>> = OnceCell::new();
-
-pub async fn init_hive() {
-    let pubsub_con = redis::Client::open(REDIS_URI.to_string()).unwrap().get_async_connection().await.unwrap().into_pubsub();
-
-    let hive = RedisPubSub::new(
-        |ids, notification: ClientboundNotification| {
-            let notif = notification.clone();
-            async_std::task::spawn(async move {
-                super::events::posthandle_hook(&notif).await;
-            });
-
-            if let Ok(data) = to_string(&notification) {
-                debug!("Pushing out notification. {}", data);
-                websocket::publish(ids, notification);
-            } else {
-                error!("Failed to serialise notification.");
-            }
-        },
-        get_pool(),
-        Arc::new(Mutex::new(pubsub_con))
-    );
-
-    if HIVE.set(hive).is_err() {
-        panic!("Failed to set global pubsub instance.");
-    }
-}
-
-pub async fn listen() {
-    HIVE.get()
-        .unwrap()
-        .clone()
-        .listen()
-        .fuse()
-        .await
-        .expect("Hive hit an error");
-}
-
-pub fn subscribe_multiple(user: String, topics: Vec<String>) -> Result<(), String> {
-    let hive = HIVE.get().unwrap();
-    for topic in topics {
-        hive.subscribe(user.clone(), topic)?;
-    }
-
-    Ok(())
-}
-
-pub fn subscribe_if_exists(user: String, topic: String) -> Result<(), String> {
-    let hive = HIVE.get().unwrap();
-    if hive.hive.map.lock().unwrap().get_left(&user).is_some() {
-        hive.subscribe(user, topic)?;
-    }
-
-    Ok(())
-}
-
-pub fn get_hive() -> &'static Hive<'static> {
-    HIVE.get().unwrap()
-}

src/notifications/mod.rs

@@ -1,5 +0,0 @@
-pub mod events;
-pub mod hive;
-pub mod payload;
-pub mod subscriptions;
-pub mod websocket;

src/notifications/payload.rs

@@ -1,124 +0,0 @@
-use std::collections::HashSet;
-
-use crate::{database::*, notifications::events::ClientboundNotification};
-use crate::{
-    database::{entities::User, get_collection},
-    util::result::{Error, Result},
-};
-use futures::StreamExt;
-use mongodb::bson::{doc, from_document};
-
-pub async fn generate_ready(mut user: User) -> Result<ClientboundNotification> {
-    let mut user_ids: HashSet<String> = HashSet::new();
-
-    if let Some(relationships) = &user.relations {
-        user_ids.extend(
-            relationships
-                .iter()
-                .map(|relationship| relationship.id.clone()),
-        );
-    }
-
-    let members = User::fetch_memberships(&user.id).await?;
-    let server_ids: Vec<String> = members.iter()
-        .map(|x| x.id.server.clone())
-        .collect();
-    
-    let mut cursor = get_collection("servers")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": server_ids
-                }
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "servers",
-        })?;
-
-    let mut servers = vec![];
-    let mut channel_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let server: Server = from_document(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "server",
-            })?;
-
-            channel_ids.extend(server.channels.iter().cloned());
-            servers.push(server);
-        }
-    }
-
-    let mut cursor = get_collection("channels")
-        .find(
-            doc! {
-                "$or": [
-                    {
-                        "_id": {
-                            "$in": channel_ids
-                        }
-                    },
-                    {
-                        "channel_type": "SavedMessages",
-                        "user": &user.id
-                    },
-                    {
-                        "channel_type": "DirectMessage",
-                        "recipients": &user.id
-                    },
-                    {
-                        "channel_type": "Group",
-                        "recipients": &user.id
-                    }
-                ]
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "channels",
-        })?;
-
-    let mut channels = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let channel = from_document(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "channel",
-            })?;
-
-            if let Channel::Group { recipients, .. } = &channel {
-                user_ids.extend(recipients.iter().cloned());
-            } else if let Channel::DirectMessage { recipients, .. } = &channel {
-                user_ids.extend(recipients.iter().cloned());
-            }
-
-            channels.push(channel);
-        }
-    }
-
-    user_ids.remove(&user.id);
-    let mut users = if user_ids.len() > 0 {
-        user.fetch_multiple_users(&user_ids.into_iter().collect::<Vec<String>>())
-            .await?
-    } else {
-        vec![]
-    };
-
-    user.relationship = Some(RelationshipStatus::User);
-    user.online = Some(true);
-    
-    users.push(user.apply_badges());
-
-    Ok(ClientboundNotification::Ready {
-        users,
-        servers,
-        channels,
-        members
-    })
-}

src/notifications/subscriptions.rs

@@ -1,87 +0,0 @@
-use crate::database::*;
-
-use super::hive::get_hive;
-use futures::StreamExt;
-use hive_pubsub::PubSub;
-use mongodb::bson::doc;
-use mongodb::bson::Document;
-use mongodb::options::FindOptions;
-
-pub async fn generate_subscriptions(user: &User) -> Result<(), String> {
-    let hive = get_hive();
-    hive.subscribe(user.id.clone(), user.id.clone())?;
-
-    if let Some(relations) = &user.relations {
-        for relation in relations {
-            hive.subscribe(user.id.clone(), relation.id.clone())?;
-        }
-    }
-
-    let server_ids = User::fetch_server_ids(&user.id)
-        .await
-        .map_err(|_| "Failed to fetch memberships.".to_string())?;
-
-    let channel_ids = get_collection("servers")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": &server_ids
-                }
-            },
-            None,
-        )
-        .await
-        .map_err(|_| "Failed to fetch servers.".to_string())?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| {
-            x.get_array("channels").ok().map(|v| {
-                v.into_iter()
-                    .filter_map(|x| x.as_str().map(|x| x.to_string()))
-                    .collect::<Vec<String>>()
-            })
-        })
-        .flatten()
-        .collect::<Vec<String>>();
-
-    for id in server_ids {
-        hive.subscribe(user.id.clone(), id)?;
-    }
-
-    for id in channel_ids {
-        hive.subscribe(user.id.clone(), id)?;
-    }
-
-    let mut cursor = get_collection("channels")
-        .find(
-            doc! {
-                "$or": [
-                    {
-                        "channel_type": "SavedMessages",
-                        "user": &user.id
-                    },
-                    {
-                        "channel_type": "DirectMessage",
-                        "recipients": &user.id
-                    },
-                    {
-                        "channel_type": "Group",
-                        "recipients": &user.id
-                    }
-                ]
-            },
-            FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-        )
-        .await
-        .map_err(|_| "Failed to fetch channels.".to_string())?;
-
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            hive.subscribe(user.id.clone(), doc.get_str("_id").unwrap().to_string())?;
-        }
-    }
-
-    Ok(())
-}

src/notifications/websocket.rs

@@ -1,393 +0,0 @@
-use crate::database::*;
-use crate::notifications::events::Ping;
-use crate::util::variables::WS_HOST;
-
-use super::subscriptions;
-
-use async_std::net::{TcpListener, TcpStream};
-use async_std::task;
-use async_tungstenite::tungstenite::{handshake::server, Message};
-use futures::channel::{
-    mpsc::{unbounded, UnboundedSender},
-    oneshot,
-};
-use futures::stream::TryStreamExt;
-use futures::{pin_mut, prelude::*};
-use hive_pubsub::PubSub;
-use log::{debug, info};
-use many_to_many::ManyToMany;
-use mongodb::bson::doc;
-use rauth::entities::{Model, Session};
-use rmp_serde;
-use std::collections::HashMap;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex, RwLock};
-use url::Url;
-
-use super::{
-    events::{ClientboundNotification, ServerboundNotification, WebSocketError},
-    hive::get_hive,
-};
-
-type Tx = UnboundedSender<Message>;
-type PeerMap = Arc<Mutex<HashMap<SocketAddr, (Tx, MSGFormat)>>>;
-
-lazy_static! {
-    static ref CONNECTIONS: PeerMap = Arc::new(Mutex::new(HashMap::new()));
-    static ref USERS: Arc<RwLock<ManyToMany<String, SocketAddr>>> =
-        Arc::new(RwLock::new(ManyToMany::new()));
-}
-
-pub async fn launch_server() {
-    let try_socket = TcpListener::bind(WS_HOST.to_string()).await;
-    let listener = try_socket.expect("Failed to bind");
-    info!("Listening on: {}", *WS_HOST);
-
-    while let Ok((stream, _)) = listener.accept().await {
-        task::spawn(accept(stream));
-    }
-}
-
-#[derive(Debug, Clone)]
-enum MSGFormat {
-    JSON,
-    MSGPACK,
-}
-
-struct HeaderCallback {
-    sender: oneshot::Sender<MSGFormat>,
-}
-
-impl server::Callback for HeaderCallback {
-    fn on_request(
-        self,
-        request: &server::Request,
-        response: server::Response,
-    ) -> Result<server::Response, server::ErrorResponse> {
-        // we dont get some of the data sometimes so im generating a fake url with the only data we actually need
-        let url = format!(
-            "ws://example.com?{}",
-            request.uri().query().unwrap_or("?format=json")
-        );
-        let mut query: HashMap<_, _> = url
-            .parse::<Url>()
-            .unwrap()
-            .query_pairs()
-            .into_owned()
-            .collect(); // should be safe to use unwrap here as we just made the url ourself
-        let format_query: Option<String> = query.remove("format");
-
-        let format = match format_query.as_deref().unwrap_or("json") {
-            "msgpack" => MSGFormat::MSGPACK,
-            "json" => MSGFormat::JSON,
-            _ => MSGFormat::JSON, // Fallback to JSON.
-        };
-
-        if self.sender.send(format).is_ok() {
-            Ok(response)
-        } else {
-            Err(server::ErrorResponse::new(None))
-        }
-    }
-}
-
-async fn accept(stream: TcpStream) {
-    let addr = stream
-        .peer_addr()
-        .expect("Connected streams should have a peer address.");
-    let (sender, receiver) = oneshot::channel::<MSGFormat>();
-
-    let ws_stream =
-        async_tungstenite::accept_hdr_async_with_config(stream, HeaderCallback { sender }, None)
-            .await
-            .expect("Error during websocket handshake.");
-
-    let msg_format = receiver.await.unwrap(); // TODO: not use unwrap
-
-    info!("User established WebSocket connection from {}.", &addr);
-
-    let (write, read) = ws_stream.split();
-    let (tx, rx) = unbounded();
-    CONNECTIONS.lock().unwrap().insert(addr, (tx.clone(), msg_format.clone()));
-
-    let send = |notification: ClientboundNotification| {
-        let res = match msg_format {
-            MSGFormat::JSON => match serde_json::to_string(&notification) {
-                Ok(s) => Message::Text(s),
-                Err(_) => return
-            }
-            MSGFormat::MSGPACK => match rmp_serde::to_vec_named(&notification) {
-                Ok(v) => Message::Binary(v),
-                Err(_) => return,
-            },
-        };
-
-        if let Err(_) = tx.unbounded_send(res) {
-            debug!("Failed unbounded_send to websocket stream.");
-        }
-    };
-
-    let user_id: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
-    let mutex_generator = || user_id.clone();
-    let fwd = rx.map(Ok).forward(write);
-    let incoming = read.try_for_each(async move |msg| {
-        let mutex = mutex_generator();
-
-        let maybe_decoded = match msg {
-            Message::Text(text) => {
-                serde_json::from_str::<ServerboundNotification>(&text).map_err(|e| e.to_string())
-            }
-            Message::Binary(vec) => {
-                rmp_serde::decode::from_read::<&[u8], ServerboundNotification>(vec.as_slice())
-                    .map_err(|e| e.to_string())
-            }
-            Message::Ping(vec) => Ok(ServerboundNotification::Ping { data: Ping::Binary(vec), responded: Some(()) }),
-            _ => return Ok(()),
-        };
-
-        let notification = match maybe_decoded {
-            Err(why) => {
-                send(ClientboundNotification::Error(
-                    WebSocketError::MalformedData {
-                        msg: why.to_string(),
-                    },
-                ));
-                return Ok(());
-            }
-            Ok(n) => n,
-        };
-
-        match notification {
-            ServerboundNotification::Authenticate(auth) => {
-                {
-                    if mutex.lock().unwrap().is_some() {
-                        send(ClientboundNotification::Error(
-                            WebSocketError::AlreadyAuthenticated,
-                        ));
-
-                        return Ok(());
-                    }
-                }
-
-                let id = if let Ok(Some(session)) =
-                    Session::find_one(&get_db(), doc! { "token": &auth.token }, None).await
-                {
-                    Some(session.user_id)
-                } else if let Ok(Some(bot)) = get_collection("bots")
-                    .find_one(doc! { "token": auth.token }, None)
-                    .await
-                {
-                    Some(bot.get_str("_id").unwrap().to_string())
-                } else {
-                    None
-                };
-
-                if let Some(id) = id {
-                    if let Ok(user) = (Ref { id: id.clone() }).fetch_user().await {
-                        let is_invisible = if let Some(status) = &user.status {
-                            if let Some(presence) = &status.presence {
-                                presence == &Presence::Invisible
-                            } else {
-                                false
-                            }
-                        } else {
-                            false
-                        };
-
-                        let was_online = is_online(&id);
-
-                        {
-                            match USERS.write() {
-                                Ok(mut map) => {
-                                    map.insert(id.clone(), addr);
-                                }
-                                Err(_) => {
-                                    send(ClientboundNotification::Error(
-                                        WebSocketError::InternalError {
-                                            at: "Writing users map.".to_string(),
-                                        },
-                                    ));
-
-                                    return Ok(());
-                                }
-                            }
-                        }
-
-                        *mutex.lock().unwrap() = Some(id.clone());
-
-                        if let Err(_) = subscriptions::generate_subscriptions(&user).await {
-                            send(ClientboundNotification::Error(
-                                WebSocketError::InternalError {
-                                    at: "Generating subscriptions.".to_string(),
-                                },
-                            ));
-
-                            return Ok(());
-                        }
-
-                        send(ClientboundNotification::Authenticated);
-
-                        match super::payload::generate_ready(user).await {
-                            Ok(payload) => {
-                                send(payload);
-
-                                if !was_online && !is_invisible {
-                                    ClientboundNotification::UserUpdate {
-                                        id: id.clone(),
-                                        data: json!({
-                                            "online": true
-                                        }),
-                                        clear: None,
-                                    }
-                                    .publish_as_user(id);
-                                }
-                            }
-                            Err(_) => {
-                                send(ClientboundNotification::Error(
-                                    WebSocketError::InternalError {
-                                        at: "Generating payload.".to_string(),
-                                    },
-                                ));
-
-                                return Ok(());
-                            }
-                        }
-                    } else {
-                        send(ClientboundNotification::Error(
-                            WebSocketError::OnboardingNotFinished,
-                        ));
-                    }
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::InvalidSession,
-                    ));
-                }
-            }
-            // ! TEMP: verify user part of channel
-            // ! Could just run permission check here.
-            ServerboundNotification::BeginTyping { channel } => {
-                if mutex.lock().unwrap().is_some() {
-                    let user = {
-                        let mutex = mutex.lock().unwrap();
-                        mutex.as_ref().unwrap().clone()
-                    };
-
-                    ClientboundNotification::ChannelStartTyping {
-                        id: channel.clone(),
-                        user,
-                    }
-                    .publish(channel);
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::AlreadyAuthenticated,
-                    ));
-
-                    return Ok(());
-                }
-            }
-            ServerboundNotification::EndTyping { channel } => {
-                if mutex.lock().unwrap().is_some() {
-                    let user = {
-                        let mutex = mutex.lock().unwrap();
-                        mutex.as_ref().unwrap().clone()
-                    };
-
-                    ClientboundNotification::ChannelStopTyping {
-                        id: channel.clone(),
-                        user,
-                    }
-                    .publish(channel);
-                } else {
-                    send(ClientboundNotification::Error(
-                        WebSocketError::AlreadyAuthenticated,
-                    ));
-
-                    return Ok(());
-                }
-            }
-            ServerboundNotification::Ping { data, responded } => {
-                debug!("Ping received from connection {}. Payload: {:?}", &addr, data);
-
-                if responded.is_none() {
-                    send(ClientboundNotification::Pong { data });
-                }
-            }
-        }
-        Ok(())
-    });
-
-    pin_mut!(fwd, incoming);
-    future::select(fwd, incoming).await;
-
-    info!("User {} disconnected.", &addr);
-    CONNECTIONS.lock().unwrap().remove(&addr);
-
-    let mut offline = None;
-    {
-        let user_id = user_id.lock().unwrap();
-        if let Some(user_id) = user_id.as_ref() {
-            let mut users = USERS.write().unwrap();
-            users.remove(&user_id, &addr);
-            if users.get_left(&user_id).is_none() {
-                get_hive().drop_client(&user_id).unwrap();
-                offline = Some(user_id.clone());
-            }
-        }
-    }
-
-    if let Some(id) = offline {
-        ClientboundNotification::UserUpdate {
-            id: id.clone(),
-            data: json!({
-                "online": false
-            }),
-            clear: None,
-        }
-        .publish_as_user(id);
-    }
-}
-
-pub fn publish(ids: Vec<String>, notification: ClientboundNotification) {
-    let mut targets = vec![];
-    {
-        let users = USERS.read().unwrap();
-        for id in ids {
-            // Block certain notifications from reaching users that aren't meant to see them.
-            match &notification {
-                ClientboundNotification::UserRelationship { id: user_id, .. }
-                | ClientboundNotification::UserSettingsUpdate { id: user_id, .. }
-                | ClientboundNotification::ChannelAck { user: user_id, .. } => {
-                    if &id != user_id {
-                        continue;
-                    }
-                }
-                _ => {}
-            }
-
-            if let Some(mut arr) = users.get_left(&id) {
-                targets.append(&mut arr);
-            }
-        }
-    }
-
-    let json_msg = Message::Text(serde_json::to_string(&notification).unwrap());
-    let msgpack_msg = Message::Binary(rmp_serde::to_vec_named(&notification).unwrap());
-
-    let connections = CONNECTIONS.lock().unwrap();
-    for target in targets {
-        if let Some((conn, msg_format)) = connections.get(&target) {
-            let msg = match msg_format {
-                MSGFormat::JSON => json_msg.clone(),
-                MSGFormat::MSGPACK => msgpack_msg.clone()
-            };
-
-            if let Err(_) = conn.unbounded_send(msg) {
-                debug!("Failed unbounded_send.");
-            }
-        }
-    }
-}
-
-pub fn is_online(user: &String) -> bool {
-    USERS.read().unwrap().get_left(&user).is_some()
-}

src/redis/mod.rs

@@ -1,18 +0,0 @@
-use crate::util::variables::REDIS_URI;
-
-use mobc::Pool;
-use mobc_redis::RedisConnectionManager;
-use once_cell::sync::OnceCell;
-
-static REDISPOOL: OnceCell<Pool<RedisConnectionManager>> = OnceCell::new();
-
-pub async fn connect() {
-    let client = mobc_redis::redis::Client::open(REDIS_URI.to_string()).unwrap();
-    let manager = mobc_redis::RedisConnectionManager::new(client);
-    let pool = mobc::Pool::builder().max_open(100).build(manager);
-    REDISPOOL.set(pool).ok().unwrap();
-}
-
-pub fn get_pool() -> &'static Pool<RedisConnectionManager> {
-    REDISPOOL.get().unwrap()
-}

src/routes/bots/create.rs

@@ -1,89 +1,65 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_BOT_COUNT;
 use crate::util::regex::RE_USERNAME;
 
-use mongodb::bson::{doc, to_document};
-use rocket::serde::json::{Json, Value};
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
 use nanoid::nanoid;
+use revolt_quark::{
+    models::{user::BotInformation, Bot, User},
+    variables::delta::MAX_BOT_COUNT,
+    Db, Error, Result,
+};
+
+use rocket::serde::json::Json;
+use serde::Deserialize;
+use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Bot Details
-pub struct Data {
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateBot {
+    /// Bot username
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     name: String,
 }
 
+/// # Create Bot
+///
+/// Create a new Revolt bot.
+#[openapi(tag = "Bots")]
 #[post("/create", data = "<info>")]
-pub async fn create_bot(user: User, info: Json<Data>) -> Result<Value> {
+pub async fn create_bot(db: &Db, user: User, info: Json<DataCreateBot>) -> Result<Json<Bot>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if get_collection("bots")
+    if db.get_number_of_bots_by_user(&user.id).await? >= *MAX_BOT_COUNT {
-        .count_documents(
+        return Err(Error::ReachedMaximumBots);
-            doc! {
-                "owner": &user.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "count_documents",
-            with: "bots",
-        })? as usize >= *MAX_BOT_COUNT {
-        return Err(Error::ReachedMaximumBots)
     }
 
-    let id = Ulid::new().to_string();
+    if db.is_username_taken(&info.name).await? {
-    let token = nanoid!(64);
-    let bot = Bot {
-        id: id.clone(),
-        owner: user.id.clone(),
-        token,
-        public: false,
-        analytics: false,
-        discoverable: false,
-        interactions_url: None
-    };
-
-    if User::is_username_taken(&info.name).await? {
         return Err(Error::UsernameTaken);
     }
 
-    get_collection("users")
+    let id = Ulid::new().to_string();
-        .insert_one(
+    let bot_user = User {
-            doc! {
+        id: id.clone(),
-                "_id": &id,
+        username: info.name,
-                "username": &info.name,
+        bot: Some(BotInformation {
-                "bot": {
+            owner: user.id.clone(),
-                    "owner": &user.id
+        }),
-                }
+        ..Default::default()
-            },
+    };
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
 
-    get_collection("bots")
+    let bot = Bot {
-        .insert_one(
+        id,
-            to_document(&bot).map_err(|_| Error::DatabaseError { with: "bot", operation: "to_document" })?,
+        owner: user.id,
-            None,
+        token: nanoid!(64),
-        )
+        ..Default::default()
-        .await
+    };
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
 
-    Ok(json!(bot))
+    db.insert_user(&bot_user).await?;
+    db.insert_bot(&bot).await?;
+    Ok(Json(bot))
 }

src/routes/bots/delete.rs

@@ -1,67 +1,19 @@
-use crate::database::*;
+use revolt_quark::{models::User, Db, EmptyResponse, Error, Ref, Result};
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, EmptyResponse, Result};
-
-use mongodb::bson::doc;
 
+/// # Delete Bot
+///
+/// Delete a bot by its id.
+#[openapi(tag = "Bots")]
 #[delete("/<target>")]
-pub async fn delete_bot(user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn delete_bot(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
-    let bot = target.fetch_bot().await?;
+    let bot = target.as_bot(db).await?;
     if bot.owner != user.id {
-        return Err(Error::MissingPermission);
+        return Err(Error::NotFound);
     }
 
-    let username = format!("Deleted User {}", &bot.id);
+    bot.delete(db).await.map(|_| EmptyResponse)
-    get_collection("users")
-        .update_one(
-            doc! {
-                "_id": &bot.id
-            },
-            doc! {
-                "$set": {
-                    "username": &username,
-                    "flags": 2
-                },
-                "$unset": {
-                    "avatar": 1,
-                    "status": 1,
-                    "profile": 1
-                }
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "user",
-            operation: "update_one"
-        })?;
-
-    ClientboundNotification::UserUpdate {
-        id: target.id.clone(),
-        data: json!({
-            "username": username,
-            "flags": 2
-        }),
-        clear: None,
-    }
-    .publish_as_user(target.id.clone());
-
-    get_collection("bots")
-        .delete_one(
-            doc! {
-                "_id": &bot.id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "bot",
-            operation: "delete_one"
-        })?;
-
-    Ok(EmptyResponse {})
 }

src/routes/bots/edit.rs

@@ -1,120 +1,107 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
-use crate::{database::*, notifications::events::RemoveBotField};
 use crate::util::regex::RE_USERNAME;
 
-use mongodb::bson::doc;
+use revolt_quark::{
+    models::{
+        bot::{FieldsBot, PartialBot},
+        Bot, User,
+    },
+    Db, Error, Ref, Result,
+};
+
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Bot Details
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditBot {
+    /// Bot username
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
+    /// Whether the bot can be added by anyone
     public: Option<bool>,
+    /// Whether analytics should be gathered for this bot
+    ///
+    /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
     analytics: Option<bool>,
+    /// Interactions URL
+    #[validate(length(min = 1, max = 2048))]
     interactions_url: Option<String>,
-    remove: Option<RemoveBotField>,
+    /// Fields to remove from bot object
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsBot>>,
 }
 
+/// # Edit Bot
+///
+/// Edit bot details by its id.
+#[openapi(tag = "Bots")]
 #[patch("/<target>", data = "<data>")]
-pub async fn edit_bot(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn edit_bot(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataEditBot>,
+) -> Result<Json<Bot>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.name.is_none()
+    let mut bot = target.as_bot(db).await?;
-        && data.public.is_none()
+    if bot.owner != user.id {
+        return Err(Error::NotFound);
+    }
+
+    if let Some(name) = data.name {
+        if db.is_username_taken(&name).await? {
+            return Err(Error::UsernameTaken);
+        }
+
+        let mut user = db.fetch_user(&bot.id).await?;
+        user.update_username(db, name).await?;
+    }
+
+    if data.public.is_none()
         && data.analytics.is_none()
         && data.interactions_url.is_none()
         && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(bot));
     }
 
-    let bot = target.fetch_bot().await?;
+    let DataEditBot {
-    if bot.owner != user.id {
+        public,
-        return Err(Error::MissingPermission);
+        analytics,
+        interactions_url,
+        remove,
+        ..
+    } = data;
+
+    let mut partial = PartialBot {
+        public,
+        analytics,
+        interactions_url,
+        ..Default::default()
+    };
+
+    if let Some(remove) = &remove {
+        for field in remove {
+            bot.remove(field);
         }
 
-    if let Some(name) = &data.name {
+        if remove.iter().any(|x| x == &FieldsBot::Token) {
-        if User::is_username_taken(&name).await? {
+            partial.token = Some(bot.token.clone());
-            return Err(Error::UsernameTaken);
-        }
-
-        get_collection("users")
-            .update_one(
-                doc! { "_id": &target.id },
-                doc! {
-                    "$set": {
-                        "username": name
-                    }
-                },
-                None
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "user",
-            })?;
-
-        ClientboundNotification::UserUpdate {
-            id: target.id.clone(),
-            data: json!({
-                "username": name
-            }),
-            clear: None,
-        }
-        .publish_as_user(target.id.clone());
-    }
-
-    let mut set = doc! {};
-    let mut unset = doc! {};
-
-    if let Some(remove) = &data.remove {
-        match remove {
-            RemoveBotField::InteractionsURL => {
-                unset.insert("interactions_url", 1);
-            }
         }
     }
 
-    if let Some(public) = &data.public {
+    db.update_bot(&bot.id, &partial, remove.unwrap_or_default())
-        set.insert("public", public);
+        .await?;
-    }
 
-    if let Some(analytics) = &data.analytics {
+    bot.apply_options(partial);
-        set.insert("analytics", analytics);
+    Ok(Json(bot))
-    }
-
-    if let Some(interactions_url) = &data.interactions_url {
-        set.insert("interactions_url", interactions_url);
-    }
-
-    let mut operations = doc! {};
-    if set.len() > 0 {
-        operations.insert("$set", &set);
-    }
-
-    if unset.len() > 0 {
-        operations.insert("$unset", unset);
-    }
-
-    if operations.len() > 0 {
-        get_collection("bots")
-            .update_one(doc! { "_id": &target.id }, operations, None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "bot",
-            })?;
-    }
-
-    Ok(EmptyResponse {})
 }

src/routes/bots/fetch.rs

@@ -1,26 +1,36 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Bot, User},
+    Db, Error, Ref, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-use serde_json::Value;
+/// # Bot Response
+#[derive(Serialize, JsonSchema)]
+pub struct BotResponse {
+    /// Bot object
+    bot: Bot,
+    /// User object
+    user: User,
+}
 
+/// # Fetch Bot
+///
+/// Fetch details of a bot you own by its id.
+#[openapi(tag = "Bots")]
 #[get("/<target>")]
-pub async fn fetch_bot(user: User, target: Ref) -> Result<Value> {
+pub async fn fetch_bot(db: &Db, user: User, target: Ref) -> Result<Json<BotResponse>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
-    let bot = target.fetch_bot().await?;
+    let bot = target.as_bot(db).await?;
-
-    if !bot.public {
     if bot.owner != user.id {
-            return Err(Error::BotIsPrivate);
+        return Err(Error::NotFound);
-        }
     }
 
-    let user = Ref::from_unchecked(bot.id.clone()).fetch_user().await?;
+    Ok(Json(BotResponse {
-    
+        user: db.fetch_user(&bot.id).await?.foreign(),
-    Ok(json!({
+        bot,
-        "bot": bot,
-        "user": user
     }))
 }

src/routes/bots/fetch_owned.rs

@@ -1,56 +1,42 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Bot, User},
+    Db, Error, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-use futures::StreamExt;
+/// # Owned Bots Response
-use mongodb::bson::{Document, doc, from_document};
+///
-use serde_json::Value;
+/// Both lists are sorted by their IDs.
+#[derive(Serialize, JsonSchema)]
+pub struct OwnedBotsResponse {
+    /// Bot objects
+    bots: Vec<Bot>,
+    /// User objects
+    users: Vec<User>,
+}
 
+/// # Fetch Owned Bots
+///
+/// Fetch all of the bots that you have control over.
+#[openapi(tag = "Bots")]
 #[get("/@me")]
-pub async fn fetch_owned_bots(user: User) -> Result<Value> {
+pub async fn fetch_owned_bots(db: &Db, user: User) -> Result<Json<OwnedBotsResponse>> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
-    let bots = get_collection("bots")
+    let mut bots = db.fetch_bots_by_user(&user.id).await?;
-        .find(
+    let user_ids = bots
-            doc! {
+        .iter()
-                "owner": &user.id
+        .map(|x| x.id.to_owned())
-            },
+        .collect::<Vec<String>>();
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "bots",
-            operation: "find"
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| from_document(x).ok())
-        .collect::<Vec<Bot>>();
 
-    let users = get_collection("users")
+    let mut users = db.fetch_users(&user_ids).await?;
-        .find(
-            doc! {
-                "bot.owner": &user.id
-            },
-            None
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            with: "users",
-            operation: "find"
-        })?
-        .filter_map(async move |s| s.ok())
-        .collect::<Vec<Document>>()
-        .await
-        .into_iter()
-        .filter_map(|x| from_document(x).ok())
-        .collect::<Vec<User>>();
 
-    Ok(json!({
+    // Ensure the lists match up exactly.
-        "bots": bots,
+    bots.sort_by(|a, b| a.id.cmp(&b.id));
-        "users": users
+    users.sort_by(|a, b| a.id.cmp(&b.id));
-    }))
+
+    Ok(Json(OwnedBotsResponse { users, bots }))
 }

src/routes/bots/fetch_public.rs

@@ -1,28 +1,44 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{File, User},
+    Db, Error, Ref, Result,
+};
 
-use serde_json::Value;
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
 
+/// # Public Bot
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct PublicBot {
+    /// Bot Id
+    #[serde(rename = "_id")]
+    id: String,
+    /// Bot Username
+    username: String,
+    /// Profile Avatar
+    #[serde(skip_serializing_if = "Option::is_none")]
+    avatar: Option<File>,
+    /// Profile Description
+    #[serde(skip_serializing_if = "Option::is_none")]
+    description: Option<String>,
+}
+
+/// # Fetch Public Bot
+///
+/// Fetch details of a public (or owned) bot by its id.
+#[openapi(tag = "Bots")]
 #[get("/<target>/invite")]
-pub async fn fetch_public_bot(user: User, target: Ref) -> Result<Value> {
+pub async fn fetch_public_bot(db: &Db, user: Option<User>, target: Ref) -> Result<Json<PublicBot>> {
-    if user.bot.is_some() {
+    let bot = target.as_bot(db).await?;
-        return Err(Error::IsBot)
+    if !bot.public && user.map_or(true, |x| x.id != bot.owner) {
+        return Err(Error::NotFound);
     }
 
-    let bot = target.fetch_bot().await?;
+    let user = db.fetch_user(&bot.id).await?;
 
-    if !bot.public {
+    Ok(Json(PublicBot {
-        if bot.owner != user.id {
+        id: bot.id,
-            return Err(Error::BotIsPrivate);
+        username: user.username,
-        }
+        avatar: user.avatar,
-    }
+        description: user.profile.and_then(|p| p.content),
-
-    let user = Ref::from_unchecked(bot.id.clone()).fetch_user().await?;
-
-    Ok(json!({
-        "_id": bot.id,
-        "username": user.username,
-        "avatar": user.avatar,
-        "description": user.profile.map(|p| p.content)
     }))
 }

src/routes/bots/invite.rs

@@ -1,70 +1,71 @@
-use crate::database::*;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
-use crate::util::result::{Error, Result, EmptyResponse};
 
 use rocket::serde::json::Json;
 use serde::Deserialize;
 
-#[derive(Deserialize)]
+/// # Invite Destination
-pub struct ServerId {
+#[derive(Deserialize, JsonSchema)]
-    server: String
-}
-
-#[derive(Deserialize)]
-pub struct GroupId {
-    group: String
-}
-
-#[derive(Deserialize)]
 #[serde(untagged)]
-pub enum Destination {
+pub enum InviteBotDestination {
-    Server(ServerId),
+    /// Invite to a server
-    Group(GroupId)
+    Server {
+        /// Server Id
+        server: String,
+    },
+    /// Invite to a group
+    Group {
+        /// Group Id
+        group: String,
+    },
 }
 
+/// # Invite Bot
+///
+/// Invite a bot to a server or group by its id.`
+#[openapi(tag = "Bots")]
 #[post("/<target>/invite", data = "<dest>")]
-pub async fn invite_bot(user: User, target: Ref, dest: Json<Destination>) -> Result<EmptyResponse> {
+pub async fn invite_bot(
+    db: &Db,
+    user: User,
+    target: Ref,
+    dest: Json<InviteBotDestination>,
+) -> Result<EmptyResponse> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
-    let bot = target.fetch_bot().await?;
+    let bot = target.as_bot(db).await?;
-
+    if !bot.public && bot.owner != user.id {
-    if !bot.public {
-        if bot.owner != user.id {
         return Err(Error::BotIsPrivate);
     }
-    }
 
     match dest.into_inner() {
-        Destination::Server(ServerId { server }) => {
+        InviteBotDestination::Server { server } => {
-            let server = Ref::from(server)?.fetch_server().await?;
+            let server = db.fetch_server(&server).await?;
 
-            let perm = permissions::PermissionCalculator::new(&user)
+            perms(&user)
-                .with_server(&server)
+                .server(&server)
-                .for_server()
+                .throw_permission(db, Permission::ManageServer)
                 .await?;
 
-            if !perm.get_manage_server() {
+            let user = db.fetch_user(&bot.id).await?;
-                Err(Error::MissingPermission)?
+            server
+                .create_member(db, user, None)
+                .await
+                .map(|_| EmptyResponse)
         }
+        InviteBotDestination::Group { group } => {
+            let mut channel = db.fetch_channel(&group).await?;
 
-            server.join_member(&bot.id).await?;
+            perms(&user)
-            Ok(EmptyResponse {})
+                .channel(&channel)
-        }
+                .throw_permission_and_view_channel(db, Permission::InviteOthers)
-        Destination::Group(GroupId { group }) => {
-            let channel = Ref::from(group)?.fetch_channel().await?;
-
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_channel(&channel)
-                .for_channel()
                 .await?;
 
-            if !perm.get_invite_others() {
+            channel
-                Err(Error::MissingPermission)?
+                .add_user_to_group(db, &bot.id, &user.id)
-            }
+                .await
-
+                .map(|_| EmptyResponse)
-            channel.add_to_group(bot.id, user.id).await?;
-            Ok(EmptyResponse {})
         }
     }
 }

src/routes/bots/mod.rs

@@ -1,15 +1,16 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod create;
-mod invite;
+mod delete;
-mod fetch_public;
+mod edit;
 mod fetch;
 mod fetch_owned;
-mod edit;
+mod fetch_public;
-mod delete;
+mod invite;
 
-pub fn routes() -> Vec<Route> {
+pub fn routes() -> (Vec<Route>, OpenApi) {
-    routes![
+    openapi_get_routes_spec![
         create::create_bot,
         invite::invite_bot,
         fetch_public::fetch_public_bot,

src/routes/channels/channel_ack.rs

@@ -1,38 +1,19 @@
-use crate::database::*;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
 
+/// # Acknowledge Message
+///
+/// Lets the server and all other clients know that we've seen this message id in this channel.
+#[openapi(tag = "Messaging")]
 #[put("/<target>/ack/<message>")]
-pub async fn req(user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
-    if user.bot.is_some() {
+    let channel = target.as_channel(db).await?;
-        return Err(Error::IsBot)
+    perms(&user)
-    }
+        .channel(&channel)
-
+        .throw_permission(db, Permission::ViewChannel)
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
         .await?;
 
-    if !perm.get_view() {
+    channel
-        Err(Error::MissingPermission)?
+        .ack(&user.id, &message.id)
-    }
+        .await
-
+        .map(|_| EmptyResponse)
-    crate::task_queue::task_ack::queue(
-        target.id().into(),
-        user.id.clone(),
-        crate::task_queue::task_ack::AckEvent::AckMessage {
-            id: message.id.clone()
-        }
-    ).await;
-
-    ClientboundNotification::ChannelAck {
-        id: target.id().into(),
-        user: user.id.clone(),
-        message_id: message.id,
-    }
-    .publish(user.id);
-
-    Ok(EmptyResponse {})
 }

src/routes/channels/channel_delete.rs

@@ -1,119 +1,41 @@
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
-use crate::{database::*, notifications::events::ClientboundNotification};
+    models::{channel::PartialChannel, Channel, User},
-
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
-use mongodb::bson::doc;
+};
 
+/// # Close Channel
+///
+/// Deletes a server channel, leaves a group or closes a group.
+#[openapi(tag = "Channel Information")]
 #[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
-    let target = target.fetch_channel().await?;
+    let mut channel = target.as_channel(db).await?;
+    let mut perms = perms(&user).channel(&channel);
+    perms.throw_permission(db, Permission::ViewChannel).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
+    match &channel {
-        .with_channel(&target)
+        Channel::SavedMessages { .. } => Err(Error::NoEffect),
-        .for_channel()
+        Channel::DirectMessage { .. } => channel
+            .update(
+                db,
+                PartialChannel {
+                    active: Some(false),
+                    ..Default::default()
+                },
+                vec![],
+            )
+            .await
+            .map(|_| EmptyResponse),
+        Channel::Group { .. } => channel
+            .remove_user_from_group(db, &user.id, None)
+            .await
+            .map(|_| EmptyResponse),
+        Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
+            perms
+                .throw_permission(db, Permission::ManageChannel)
                 .await?;
 
-    if !perm.get_view() {
+            channel.delete(db).await.map(|_| EmptyResponse)
-        Err(Error::MissingPermission)?
-    }
-
-    match &target {
-        Channel::SavedMessages { .. } => Err(Error::NoEffect),
-        Channel::DirectMessage { .. } => {
-            get_collection("channels")
-                .update_one(
-                    doc! {
-                        "_id": target.id()
-                    },
-                    doc! {
-                        "$set": {
-                            "active": false
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "channel",
-                })?;
-
-            Ok(EmptyResponse {})
-        }
-        Channel::Group {
-            id,
-            owner,
-            recipients,
-            ..
-        } => {
-            if &user.id == owner {
-                if let Some(new_owner) = recipients.iter().find(|x| *x != &user.id) {
-                    get_collection("channels")
-                        .update_one(
-                            doc! {
-                                "_id": &id
-                            },
-                            doc! {
-                                "$set": {
-                                    "owner": new_owner
-                                },
-                                "$pull": {
-                                    "recipients": &user.id
-                                }
-                            },
-                            None,
-                        )
-                        .await
-                        .map_err(|_| Error::DatabaseError {
-                            operation: "update_one",
-                            with: "channel",
-                        })?;
-
-                    target.publish_update(json!({ "owner": new_owner })).await?;
-                } else {
-                    target.delete().await?;
-                    return Ok(EmptyResponse {});
-                }
-            } else {
-                get_collection("channels")
-                    .update_one(
-                        doc! {
-                            "_id": &id
-                        },
-                        doc! {
-                            "$pull": {
-                                "recipients": &user.id
-                            }
-                        },
-                        None,
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel",
-                    })?;
-            }
-
-            ClientboundNotification::ChannelGroupLeave {
-                id: id.clone(),
-                user: user.id.clone(),
-            }
-            .publish(id.clone());
-
-            Content::SystemMessage(SystemMessage::UserLeft { id: user.id })
-                .send_as_system(&target)
-                .await
-                .ok();
-
-            Ok(EmptyResponse {})
-        }
-        Channel::TextChannel { .. } |
-        Channel::VoiceChannel { .. } => {
-            if perm.get_manage_channel() {
-                target.delete().await?;
-                Ok(EmptyResponse {})
-            } else {
-                Err(Error::MissingPermission)
-            }
         }
     }
 }

src/routes/channels/channel_edit.rs

@@ -1,160 +1,173 @@
-use crate::notifications::events::ClientboundNotification;
+use revolt_quark::{
-use crate::util::result::{Error, Result, EmptyResponse};
+    models::{
-use crate::{database::*, notifications::events::RemoveChannelField};
+        channel::{Channel, FieldsChannel, PartialChannel},
+        message::SystemMessage,
+        File, User,
+    },
+    perms, Database, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::{doc, to_document};
+use rocket::{serde::json::Json, State};
-use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Channel Details
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditChannel {
+    /// Channel name
     #[validate(length(min = 1, max = 32))]
     #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
+    /// Channel description
     #[validate(length(min = 0, max = 1024))]
     #[serde(skip_serializing_if = "Option::is_none")]
     description: Option<String>,
+    /// Icon
+    ///
+    /// Provide an Autumn attachment Id.
     #[validate(length(min = 1, max = 128))]
     icon: Option<String>,
-    remove: Option<RemoveChannelField>,
+    /// Whether this channel is age-restricted
     #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
+    #[validate(length(min = 1))]
+    remove: Option<Vec<FieldsChannel>>,
 }
 
+/// # Edit Channel
+///
+/// Edit a channel object by its id.
+#[openapi(tag = "Channel Information")]
 #[patch("/<target>", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &State<Database>,
+    user: User,
+    target: Ref,
+    data: Json<DataEditChannel>,
+) -> Result<Json<Channel>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
+    let mut channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ManageChannel)
+        .await?;
+
     if data.name.is_none()
         && data.description.is_none()
         && data.icon.is_none()
-        && data.remove.is_none()
         && data.nsfw.is_none()
+        && data.remove.is_none()
     {
-        return Ok(EmptyResponse {});
+        return Ok(Json(channel));
     }
 
-    let target = target.fetch_channel().await?;
+    let mut partial: PartialChannel = Default::default();
-    let perm = permissions::PermissionCalculator::new(&user)
+    match &mut channel {
-        .with_channel(&target)
+        Channel::Group {
-        .for_channel()
+            id,
-        .await?;
-
-    if !perm.get_manage_channel() {
-        Err(Error::MissingPermission)?
-    }
-
-    match &target {
-        Channel::Group { id, icon, .. }
-        | Channel::TextChannel { id, icon, .. }
-        | Channel::VoiceChannel { id, icon, .. } => {
-            let mut set = doc! {};
-            let mut unset = doc! {};
-
-            let mut remove_icon = false;
-            if let Some(remove) = &data.remove {
-                match remove {
-                    RemoveChannelField::Icon => {
-                        unset.insert("icon", 1);
-                        remove_icon = true;
-                    }
-                    RemoveChannelField::Description => {
-                        unset.insert("description", 1);
-                    }
-                }
-            }
-
-            if let Some(name) = &data.name {
-                set.insert("name", name);
-            }
-
-            if let Some(description) = &data.description {
-                set.insert("description", description);
-            }
-
-            if let Some(attachment_id) = &data.icon {
-                let attachment =
-                    File::find_and_use(&attachment_id, "icons", "object", target.id()).await?;
-                set.insert(
-                    "icon",
-                    to_document(&attachment).map_err(|_| Error::DatabaseError {
-                        operation: "to_document",
-                        with: "attachment",
-                    })?,
-                );
-
-                remove_icon = true;
-            }
-
-            if let Some(nsfw) = &data.nsfw {
-                set.insert("nsfw", nsfw);
-            }
-            
-            let mut operations = doc! {};
-            if set.len() > 0 {
-                operations.insert("$set", &set);
-            }
-
-            if unset.len() > 0 {
-                operations.insert("$unset", unset);
-            }
-
-            if operations.len() > 0 {
-                get_collection("channels")
-                    .update_one(doc! { "_id": &id }, operations, None)
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel",
-                    })?;
-            }
-
-            ClientboundNotification::ChannelUpdate {
-                id: id.clone(),
-                data: json!(set),
-                clear: data.remove,
-            }
-            .publish(id.clone());
-
-            if let Channel::Group { .. } = &target {
-                if let Some(name) = data.name {
-                    Content::SystemMessage(SystemMessage::ChannelRenamed {
             name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::TextChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::VoiceChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        } => {
+            if let Some(fields) = &data.remove {
+                if fields.contains(&FieldsChannel::Icon) {
+                    if let Some(icon) = &icon {
+                        db.mark_attachment_as_deleted(&icon.id).await?;
+                    }
+                }
+
+                for field in fields {
+                    match field {
+                        FieldsChannel::Description => {
+                            description.take();
+                        }
+                        FieldsChannel::Icon => {
+                            icon.take();
+                        }
+                        _ => {}
+                    }
+                }
+            }
+
+            if let Some(icon_id) = data.icon {
+                partial.icon = Some(File::use_icon(db, &icon_id, id).await?);
+                *icon = partial.icon.clone();
+            }
+
+            if let Some(new_name) = data.name {
+                *name = new_name.clone();
+                partial.name = Some(new_name);
+            }
+
+            if let Some(new_description) = data.description {
+                partial.description = Some(new_description);
+                *description = partial.description.clone();
+            }
+
+            if let Some(new_nsfw) = data.nsfw {
+                *nsfw = new_nsfw;
+                partial.nsfw = Some(new_nsfw);
+            }
+
+            // Send out mutation system messages.
+            if let Channel::Group { .. } = &channel {
+                if let Some(name) = &partial.name {
+                    SystemMessage::ChannelRenamed {
+                        name: name.to_string(),
                         by: user.id.clone(),
-                    })
+                    }
-                    .send_as_system(&target)
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
                     .await
                     .ok();
                 }
 
-                if let Some(_) = data.description {
+                if partial.description.is_some() {
-                    Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
+                    SystemMessage::ChannelDescriptionChanged {
                         by: user.id.clone(),
-                    })
+                    }
-                    .send_as_system(&target)
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
                     .await
                     .ok();
                 }
 
-                if let Some(_) = data.icon {
+                if partial.icon.is_some() {
-                    Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id })
+                    SystemMessage::ChannelIconChanged { by: user.id }
-                        .send_as_system(&target)
+                        .into_message(channel.id().to_string())
+                        .create(db, &channel, None)
                         .await
                         .ok();
                 }
             }
 
-            if remove_icon {
+            channel
-                if let Some(old_icon) = icon {
+                .update(db, partial, data.remove.unwrap_or_default())
-                    old_icon.delete().await?;
+                .await?;
-                }
         }
+        _ => return Err(Error::InvalidOperation),
+    };
 
-            Ok(EmptyResponse {})
+    Ok(Json(channel))
-        }
-        _ => Err(Error::InvalidOperation),
-    }
 }

src/routes/channels/channel_fetch.rs

@@ -1,20 +1,21 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Channel, User},
+    perms, Database, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::{serde::json::Json, State};
 
+/// # Fetch Channel
+///
+/// Fetch channel by its id.
+#[openapi(tag = "Channel Information")]
 #[get("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<Channel>> {
-    let target = target.fetch_channel().await?;
+    let channel = target.as_channel(db).await?;
-
+    perms(&user)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .channel(&channel)
-        .with_channel(&target)
+        .throw_permission(db, Permission::ViewChannel)
-        .for_channel()
         .await?;
 
-    if !perm.get_view() {
+    Ok(Json(channel))
-        Err(Error::MissingPermission)?
-    }
-
-    Ok(json!(target))
 }

src/routes/channels/group_add_member.rs

@@ -1,24 +1,28 @@
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
-use crate::database::*;
+    models::{Channel, User},
-
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
-use mongodb::bson::doc;
+};
 
+/// # Add Member to Group
+///
+/// Adds another user to the group.
+#[openapi(tag = "Groups")]
 #[put("/<target>/recipients/<member>")]
-pub async fn req(user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
-    if get_relationship(&user, &member.id) != RelationshipStatus::Friend {
+    let mut channel = target.as_channel(db).await?;
-        Err(Error::NotFriends)?
+    perms(&user)
-    }
+        .channel(&channel)
-
+        .throw_permission_and_view_channel(db, Permission::InviteOthers)
-    let channel = target.fetch_channel().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
         .await?;
 
-    if !perm.get_invite_others() {
+    match &channel {
-        Err(Error::MissingPermission)?
+        Channel::Group { .. } => {
+            let member = member.as_user(db).await?;
+            channel
+                .add_user_to_group(db, &member.id, &user.id)
+                .await
+                .map(|_| EmptyResponse)
+        }
+        _ => Err(Error::InvalidOperation),
     }
-
-    channel.add_to_group(member.id, user.id).await?;
-    Ok(EmptyResponse {})
 }

src/routes/channels/group_create.rs

@@ -1,44 +1,53 @@
-use crate::database::*;
+use std::{collections::HashSet, iter::FromIterator};
-use crate::util::idempotency::IdempotencyKey;
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_GROUP_SIZE;
 
-use mongodb::bson::doc;
+use revolt_quark::{
-use rocket::serde::json::{Json, Value};
+    get_relationship,
+    models::{user::RelationshipStatus, Channel, User},
+    variables::delta::MAX_GROUP_SIZE,
+    Db, Error, Result,
+};
+
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
-use std::iter::FromIterator;
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Group Data
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataCreateGroup {
+    /// Group name
     #[validate(length(min = 1, max = 32))]
     name: String,
+    /// Group description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+    /// Array of user IDs to add to the group
+    ///
+    /// Must be friends with these users.
+    #[validate(length(min = 0, max = 49))]
     users: Vec<String>,
+    /// Whether this group is age-restricted
     #[serde(skip_serializing_if = "Option::is_none")]
-    nsfw: Option<bool>
+    nsfw: Option<bool>,
 }
 
+/// # Create Group
+///
+/// Create a new group channel.
+#[openapi(tag = "Groups")]
 #[post("/create", data = "<info>")]
-pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) -> Result<Value> {
+pub async fn req(db: &Db, user: User, info: Json<DataCreateGroup>) -> Result<Json<Channel>> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-    
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let mut set: HashSet<String> = HashSet::from_iter(info.users.iter().cloned());
+    let mut set: HashSet<String> = HashSet::from_iter(info.users.into_iter());
     set.insert(user.id.clone());
 
     if set.len() > *MAX_GROUP_SIZE {
-        Err(Error::GroupTooLarge {
+        return Err(Error::GroupTooLarge {
             max: *MAX_GROUP_SIZE,
-        })?
+        });
     }
 
     for target in &set {
@@ -50,20 +59,22 @@ pub async fn req(_idempotency: IdempotencyKey, user: User, info: Json<Data>) ->
         }
     }
 
-    let id = Ulid::new().to_string();
+    let group = Channel::Group {
-    let channel = Channel::Group {
+        id: Ulid::new().to_string(),
-        id,
+
         name: info.name,
-        description: info.description,
         owner: user.id,
+        description: info.description,
         recipients: set.into_iter().collect::<Vec<String>>(),
+
         icon: None,
         last_message_id: None,
+
         permissions: None,
-        nsfw: info.nsfw.unwrap_or_default()
+
+        nsfw: info.nsfw.unwrap_or(false),
     };
 
-    channel.clone().publish().await?;
+    group.create(db).await?;
-
+    Ok(Json(group))
-    Ok(json!(channel))
 }

src/routes/channels/group_remove_member.rs

@@ -1,66 +1,38 @@
-use crate::util::result::{Error, Result, EmptyResponse};
+use revolt_quark::{
-use crate::{database::*, notifications::events::ClientboundNotification};
+    models::{Channel, User},
-
+    Db, EmptyResponse, Error, Permission, Ref, Result,
-use mongodb::bson::doc;
+};
 
+/// # Remove Member from Group
+///
+/// Removes a user from the group.
+#[openapi(tag = "Groups")]
 #[delete("/<target>/recipients/<member>")]
-pub async fn req(user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
-    if &user.id == &member.id {
+    let channel = target.as_channel(db).await?;
-        Err(Error::CannotRemoveYourself)?
-    }
 
-    let channel = target.fetch_channel().await?;
+    match &channel {
-
+        Channel::Group {
-    if let Channel::Group {
+            owner, recipients, ..
-        id,
+        } => {
-        owner,
-        recipients,
-        ..
-    } = &channel
-    {
             if &user.id != owner {
-            // figure out if we want to use perm system here
+                return Error::from_permission(Permission::ManageChannel);
-            Err(Error::MissingPermission)?
             }
 
-        if recipients.iter().find(|x| *x == &member.id).is_none() {
+            let member = member.as_user(db).await?;
-            Err(Error::NotInGroup)?
+            if user.id == member.id {
+                return Err(Error::CannotRemoveYourself);
             }
 
-        get_collection("channels")
+            if !recipients.iter().any(|x| *x == member.id) {
-            .update_one(
+                return Err(Error::NotInGroup);
-                doc! {
-                    "_id": &id
-                },
-                doc! {
-                    "$pull": {
-                        "recipients": &member.id
             }
-                },
+
-                None,
+            channel
-            )
+                .remove_user_from_group(db, &member.id, Some(&user.id))
                 .await
-            .map_err(|_| Error::DatabaseError {
+                .map(|_| EmptyResponse)
-                operation: "update_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelGroupLeave {
-            id: id.clone(),
-            user: member.id.clone(),
         }
-        .publish(id.clone());
+        _ => Err(Error::InvalidOperation),
-
-        Content::SystemMessage(SystemMessage::UserRemove {
-            id: member.id,
-            by: user.id,
-        })
-        .send_as_system(&channel)
-        .await
-        .ok();
-
-        Ok(EmptyResponse {})
-    } else {
-        Err(Error::InvalidOperation)
     }
 }

src/routes/channels/invite_create.rs

@@ -1,48 +1,23 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Invite, User},
+    perms, Db, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
+use rocket::serde::json::Json;
-use nanoid::nanoid;
-use rocket::serde::json::Value;
-
-lazy_static! {
-    static ref ALPHABET: [char; 54] = [
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-        'J', 'K', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-        'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'
-    ];
-}
 
+/// # Create Invite
+///
+/// Creates an invite to this channel.
+///
+/// Channel must be a `TextChannel`.
+#[openapi(tag = "Channel Invites")]
 #[post("/<target>/invites")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Invite>> {
-    let target = target.fetch_channel().await?;
+    let channel = target.as_channel(db).await?;
-    let perm = permissions::PermissionCalculator::new(&user)
+    perms(&user)
-        .with_channel(&target)
+        .channel(&channel)
-        .for_channel()
+        .throw_permission_and_view_channel(db, Permission::InviteOthers)
         .await?;
 
-    if !perm.get_invite_others() {
+    Invite::create(db, &user, &channel).await.map(Json)
-        return Err(Error::MissingPermission);
-    }
-
-    let code = nanoid!(8, &*ALPHABET);
-    match &target {
-        Channel::Group { .. } => {
-            unimplemented!()
-        }
-        Channel::TextChannel { id, server, .. }
-        | Channel::VoiceChannel { id, server, .. } => {
-            Invite::Server {
-                code: code.clone(),
-                creator: user.id,
-                server: server.clone(),
-                channel: id.clone(),
-            }
-            .save()
-            .await?;
-
-            Ok(json!({ "code": code }))
-        }
-        _ => Err(Error::InvalidOperation),
-    }
 }

src/routes/channels/members_fetch.rs

@@ -1,22 +1,30 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Channel, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 
+/// # Fetch Group Members
+///
+/// Retrieves all users who are part of this group.
+#[openapi(tag = "Groups")]
 #[get("/<target>/members")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
-    let target = target.fetch_channel().await?;
+    let channel = target.as_channel(db).await?;
-
+    perms(&user)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .channel(&channel)
-        .with_channel(&target)
+        .throw_permission(db, Permission::ViewChannel)
-        .for_channel()
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    if let Channel::Group { recipients, .. } = target {
+    if let Channel::Group { recipients, .. } = channel {
-        Ok(json!(user.fetch_multiple_users(&recipients).await?))
+        Ok(Json(
+            db.fetch_users(&recipients)
+                .await?
+                .into_iter()
+                .map(|x| x.with_relationship(&user))
+                .collect::<Vec<User>>(),
+        ))
     } else {
         Err(Error::InvalidOperation)
     }

src/routes/channels/message_delete.rs

@@ -1,29 +1,22 @@
-use crate::database::*;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
 
+/// # Delete Message
+///
+/// Delete a message you've sent or one you have permission to delete.
+#[openapi(tag = "Messaging")]
 #[delete("/<target>/messages/<msg>")]
-pub async fn req(user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
-    let channel = target.fetch_channel().await?;
+    let message = msg.as_message(db).await?;
-    channel.has_messaging()?;
+    if message.channel != target.id {
+        return Err(Error::NotFound);
+    }
 
-    let perm = permissions::PermissionCalculator::new(&user)
+    if message.author != user.id {
-        .with_channel(&channel)
+        perms(&user)
-        .for_channel()
+            .channel(&target.as_channel(db).await?)
+            .throw_permission(db, Permission::ManageMessages)
             .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
     }
 
-    let message = msg.fetch_message(&channel).await?;
+    message.delete(db).await.map(|_| EmptyResponse)
-    if message.author != user.id && !perm.get_manage_messages() {
-        match channel {
-            Channel::SavedMessages { .. } => unreachable!(),
-            _ => Err(Error::CannotEditMessage)?,
-        }
-    }
-
-    message.delete().await?;
-    Ok(EmptyResponse {})
 }

src/routes/channels/message_edit.rs

@@ -1,106 +1,93 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result, EmptyResponse};
+    models::message::{PartialMessage, SendableEmbed},
-use crate::routes::channels::message_send::SendableEmbed;
+    models::{Message, User},
+    types::january::Embed,
+    Db, Error, Ref, Result, Timestamp,
+};
 
-use chrono::Utc;
-use mongodb::bson::{Bson, Document, doc, to_document};
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Message Details
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditMessage {
+    /// New message content
     #[validate(length(min = 1, max = 2000))]
     content: Option<String>,
+    /// Embeds to include in the message
     #[validate(length(min = 0, max = 10))]
-    embeds: Option<Vec<SendableEmbed>>
+    embeds: Option<Vec<SendableEmbed>>,
 }
 
+/// # Edit Message
+///
+/// Edits a message that you've previously sent.
+#[openapi(tag = "Messaging")]
 #[patch("/<target>/messages/<msg>", data = "<edit>")]
-pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: String,
+    msg: Ref,
+    edit: Json<DataEditMessage>,
+) -> Result<Json<Message>> {
+    let edit = edit.into_inner();
     edit.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let channel = target.fetch_channel().await?;
+    let mut message = msg.as_message(db).await?;
-    channel.has_messaging()?;
+    if message.channel != target {
-
+        return Err(Error::NotFound);
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&channel)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
     }
 
-    let mut message = msg.fetch_message(&channel).await?;
     if message.author != user.id {
-        Err(Error::CannotEditMessage)?
+        return Err(Error::CannotEditMessage);
     }
 
-    let edited = Utc::now();
+    message.edited = Some(Timestamp::now_utc());
-    let mut set = doc! { "edited": Bson::DateTime(edited) };
+    let mut partial = PartialMessage {
-    let mut unset = doc! {};
+        edited: message.edited,
-    let mut update = json!({ "edited": Bson::DateTime(edited) });
+        ..Default::default()
+    };
 
-    if let Some(new_content) = &edit.content {
+    // 1. Handle content update
-        set.insert("content", new_content.clone());
+    if let Some(content) = &edit.content {
-        update.as_object_mut().unwrap().insert("content".to_string(), json!(new_content.clone()));
+        partial.content = Some(content.clone());
-        message.content = Content::Text(new_content.clone());
     }
 
+    // 2. Clear any auto generated embeds
     let mut new_embeds: Vec<Embed> = vec![];
-
     if let Some(embeds) = &message.embeds {
         for embed in embeds {
-            match embed {
+            if let Embed::Text(embed) = embed {
-                Embed::Text(embed) => new_embeds.push(Embed::Text(embed.clone())),
+                new_embeds.push(Embed::Text(embed.clone()))
-                _ => {}
             }
         }
     }
 
-    if let Some(edited_embeds) = &edit.embeds {
+    // 3. Replace if we are given new embeds
+    if let Some(embeds) = edit.embeds {
         new_embeds.clear();
 
-        for embed in edited_embeds {
+        for embed in embeds {
-            new_embeds.push(embed.clone().into_embed(message.id.clone()).await?);
+            new_embeds.push(embed.clone().into_embed(db, message.id.clone()).await?);
         }
     }
 
-    if new_embeds.len() > 0 {
+    partial.embeds = Some(new_embeds);
-        let embed_docs: Vec<Document> = new_embeds
-            .clone()
-            .into_iter()
-            .map(|embed| to_document(&embed).unwrap())
-            .collect();
 
-        let obj = update.as_object_mut().unwrap();
+    message.update(db, partial).await?;
-        obj.insert("embeds".to_string(), json!(embed_docs));
-        set.insert("embeds", embed_docs);
-        message.embeds = Some(new_embeds)
-    } else if edit.embeds.is_some() {
-        let obj = update.as_object_mut().unwrap();
-        obj.insert("embeds".to_string(), json!([]));
-        unset.insert("embeds", 1 as u32);
-    }
 
-    get_collection("messages")
+    // Queue up a task for processing embeds
-        .update_one(
+    if let Some(content) = edit.content {
-            doc! {
+        revolt_quark::tasks::process_embeds::queue(
-                "_id": &message.id
+            message.channel.to_string(),
-            },
+            message.id.to_string(),
-            doc! {
+            content,
-                "$set": set,
-                "$unset": unset
-            },
-            None,
         )
-        .await
+        .await;
-        .map_err(|_| Error::DatabaseError {
+    }
-            operation: "update_one",
+
-            with: "message",
+    Ok(Json(message))
-        })?;
-
-    message.publish_update(update).await?;
-    Ok(EmptyResponse {})
 }

src/routes/channels/message_fetch.rs

@@ -1,21 +1,26 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Message, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 
+/// # Fetch Message
+///
+/// Retrieves a message by its id.
+#[openapi(tag = "Messaging")]
 #[get("/<target>/messages/<msg>")]
-pub async fn req(user: User, target: Ref, msg: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<Json<Message>> {
-    let channel = target.fetch_channel().await?;
+    let channel = target.as_channel(db).await?;
-    channel.has_messaging()?;
+    perms(&user)
-
+        .channel(&channel)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .throw_permission(db, Permission::ViewChannel)
-        .with_channel(&channel)
-        .for_channel()
         .await?;
-    if !perm.get_view() {
+
-        Err(Error::MissingPermission)?
+    let message = msg.as_message(db).await?;
+    if message.channel != channel.as_id() {
+        return Err(Error::NotFound);
     }
 
-    let message = msg.fetch_message(&channel).await?;
+    Ok(Json(message))
-    Ok(json!(message))
 }

src/routes/channels/message_query.rs

@@ -1,186 +1,81 @@
-use std::collections::HashSet;
+use revolt_quark::{
-
+    models::{
-use crate::database::*;
+        message::{BulkMessageResponse, MessageSort},
-use crate::util::result::{Error, Result};
+        User,
-
+    },
-use futures::{StreamExt, try_join};
+    perms, Db, Error, Permission, Ref, Result,
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
 };
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Serialize, Deserialize, FromFormField)]
+/// # Query Parameters
-pub enum Sort {
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
-    Latest,
+pub struct OptionsQueryMessages {
-    Oldest,
+    /// Maximum number of messages to fetch
-}
+    ///
-
+    /// For fetching nearby messages, this is \`(limit + 1)\`.
-#[derive(Validate, Serialize, Deserialize, FromForm)]
-pub struct Options {
     #[validate(range(min = 1, max = 100))]
     limit: Option<i64>,
+    /// Message id before which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     before: Option<String>,
+    /// Message id after which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     after: Option<String>,
-    sort: Option<Sort>,
+    /// Message sort direction
-    // Specifying 'nearby' ignores 'before', 'after' and 'sort'.
+    sort: Option<MessageSort>,
-    // It will also take half of limit rounded as the limits to each side.
+    /// Message id to search around
-    // It also fetches the message ID specified.
+    ///
+    /// Specifying 'nearby' ignores 'before', 'after' and 'sort'.
+    /// It will also take half of limit rounded as the limits to each side.
+    /// It also fetches the message ID specified.
     #[validate(length(min = 26, max = 26))]
     nearby: Option<String>,
+    /// Whether to include user (and member, if server channel) objects
     include_users: Option<bool>,
 }
 
+/// # Fetch Messages
+///
+/// Fetch multiple messages.
+#[openapi(tag = "Messaging")]
 #[get("/<target>/messages?<options..>")]
-pub async fn req(user: User, target: Ref, options: Options) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsQueryMessages,
+) -> Result<Json<BulkMessageResponse>> {
     options
         .validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_channel().await?;
+    if let Some(MessageSort::Relevance) = options.sort {
-    target.has_messaging()?;
+        return Err(Error::InvalidOperation);
+    }
 
-    let perm = permissions::PermissionCalculator::new(&user)
+    let channel = target.as_channel(db).await?;
-        .with_channel(&target)
+    perms(&user)
-        .for_channel()
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    let mut messages = vec![];
+    let OptionsQueryMessages {
+        limit,
+        before,
+        after,
+        sort,
+        nearby,
+        include_users,
+        ..
+    } = options;
 
-    let collection = get_collection("messages");
+    let messages = db
-    let limit = options.limit.unwrap_or(50);
+        .fetch_messages(channel.id(), limit, before, after, sort, nearby)
-    let channel = target.id();
+        .await?;
-    if let Some(nearby) = &options.nearby {
-        let mut cursors = try_join!(
-            collection.find(
-                doc! {
-                    "channel": channel,
-                    "_id": {
-                        "$gte": &nearby
-                    }
-                },
-                FindOptions::builder()
-                    .limit(limit / 2 + 1)
-                    .sort(doc! {
-                        "_id": 1
-                    })
-                    .build(),
-            ),
-            collection.find(
-                doc! {
-                    "channel": channel,
-                    "_id": {
-                        "$lt": &nearby
-                    }
-                },
-                FindOptions::builder()
-                    .limit(limit / 2)
-                    .sort(doc! {
-                        "_id": -1
-                    })
-                    .build(),
-            )
-        )
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "messages",
-        })?;
 
-        while let Some(result) = cursors.0.next().await {
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-
-        while let Some(result) = cursors.1.next().await {
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-    } else {
-        let mut query = doc! { "channel": target.id() };
-        if let Some(before) = &options.before {
-            query.insert("_id", doc! { "$lt": before });
-        }
-
-        if let Some(after) = &options.after {
-            query.insert("_id", doc! { "$gt": after });
-        }
-
-        let sort: i32 = if let Sort::Latest = options.sort.as_ref().unwrap_or_else(|| &Sort::Latest) {
-            -1
-        } else {
-            1
-        };
-
-        let mut cursor = collection
-            .find(
-                query,
-                FindOptions::builder()
-                    .limit(limit)
-                    .sort(doc! {
-                        "_id": sort
-                    })
-                    .build(),
-            )
         .await
-            .map_err(|_| Error::DatabaseError {
+        .map(Json)
-                operation: "find",
-                with: "messages",
-            })?;
-
-        while let Some(result) = cursor.next().await {
-            if let Ok(doc) = result {
-                messages.push(
-                    from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                        operation: "from_document",
-                        with: "message",
-                    })?,
-                );
-            }
-        }
-    }
-
-    if options.include_users.unwrap_or_else(|| false) {
-        let mut ids = HashSet::new();
-        for message in &messages {
-            message.add_associated_user_ids(&mut ids);
-        }
-
-        ids.remove(&user.id);
-        let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(&user_ids).await?;
-
-        if let Channel::TextChannel { server, .. } = target {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
-            }))
-        } else {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-            }))
-        }
-    } else {
-        Ok(json!(messages))
-    }
 }

src/routes/channels/message_query_stale.rs

@@ -1,74 +1,26 @@
-use crate::database::*;
+use revolt_quark::{models::User, Ref, Result};
-use crate::util::result::{Error, Result};
 
-use futures::StreamExt;
+use rocket::serde::json::Json;
-use mongodb::bson::{doc, from_document};
-use rocket::serde::json::{Json, Value};
 use serde::{Deserialize, Serialize};
+use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
+/// # Query Parameters
-pub struct Options {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct OptionsQueryStale {
+    /// Array of message IDs
+    #[validate(length(min = 0, max = 150))]
     ids: Vec<String>,
 }
 
-#[post("/<target>/messages/stale", data = "<data>")]
+/// # Poll Message Changes
-pub async fn req(user: User, target: Ref, data: Json<Options>) -> Result<Value> {
+///
-    if data.ids.len() > 150 {
+/// This route returns any changed message objects and tells you if any have been deleted.
-        return Err(Error::TooManyIds);
+///
-    }
+/// Don't actually poll this route, instead use this to update your local database.
-
+///
-    let target = target.fetch_channel().await?;
+/// **DEPRECATED**
-    target.has_messaging()?;
+#[openapi(tag = "Messaging")]
-
+#[post("/<_target>/messages/stale", data = "<_data>")]
-    let perm = permissions::PermissionCalculator::new(&user)
+pub async fn req(_user: User, _target: Ref, _data: Json<OptionsQueryStale>) -> Result<()> {
-        .with_channel(&target)
+    Ok(())
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    let mut cursor = get_collection("messages")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": &data.ids
-                },
-                "channel": target.id()
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "messages",
-        })?;
-
-    let mut updated = vec![];
-    let mut found_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            let msg = from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                operation: "from_document",
-                with: "message",
-            })?;
-
-            found_ids.push(msg.id.clone());
-            if msg.edited.is_some() {
-                updated.push(msg);
-            }
-        }
-    }
-
-    let mut deleted = vec![];
-    for id in &data.ids {
-        if found_ids.iter().find(|x| *x == id).is_none() {
-            deleted.push(id);
-        }
-    }
-
-    Ok(json!({
-        "updated": updated,
-        "deleted": deleted
-    }))
 }

src/routes/channels/message_search.rs

@@ -1,162 +1,78 @@
-use std::collections::HashSet;
+use revolt_quark::{
-
+    models::{
-use crate::database::*;
+        message::{BulkMessageResponse, MessageSort},
-use crate::util::result::{Error, Result};
+        User,
-
+    },
-use futures::StreamExt;
+    perms, Db, Error, Permission, Ref, Result,
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
 };
-use rocket::serde::json::{Json, Value};
+
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Serialize, Deserialize, FromFormField)]
+/// # Search Parameters
-pub enum Sort {
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
-    Relevance,
+pub struct OptionsMessageSearch {
-    Latest,
+    /// Full-text search query
-    Oldest,
+    ///
-}
+    /// See [MongoDB documentation](https://docs.mongodb.com/manual/text-search/#-text-operator) for more information.
-
-impl Default for Sort {
-    fn default() -> Sort {
-        Sort::Relevance
-    }
-}
-
-#[derive(Validate, Serialize, Deserialize, FromForm)]
-pub struct Options {
     #[validate(length(min = 1, max = 64))]
     query: String,
 
+    /// Maximum number of messages to fetch
     #[validate(range(min = 1, max = 100))]
     limit: Option<i64>,
+    /// Message id before which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     before: Option<String>,
+    /// Message id after which messages should be fetched
     #[validate(length(min = 26, max = 26))]
     after: Option<String>,
-    #[serde(default = "Sort::default")]
+    /// Message sort direction
-    sort: Sort,
+    ///
+    /// By default, it will be sorted by relevance.
+    #[serde(default = "MessageSort::default")]
+    sort: MessageSort,
+    /// Whether to include user (and member, if server channel) objects
     include_users: Option<bool>,
 }
 
+/// # Search for Messages
+///
+/// This route searches for messages within the given parameters.
+#[openapi(tag = "Messaging")]
 #[post("/<target>/search", data = "<options>")]
-pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: Json<OptionsMessageSearch>,
+) -> Result<Json<BulkMessageResponse>> {
+    let options = options.into_inner();
     options
         .validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_channel().await?;
+    let channel = target.as_channel(db).await?;
-    target.has_messaging()?;
+    perms(&user)
-
+        .channel(&channel)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
-        .with_channel(&target)
-        .for_channel()
         .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
 
-    let mut messages = vec![];
+    let OptionsMessageSearch {
-    let limit = options.limit.unwrap_or(50);
+        query,
+        limit,
+        before,
+        after,
+        sort,
+        include_users,
+    } = options;
 
-    let mut filter = doc! {
+    let messages = db
-        "channel": target.id(),
+        .search_messages(channel.id(), &query, limit, before, after, sort)
-        "$text": {
+        .await?;
-            "$search": &options.query
-        }
-    };
 
-    if let Some(doc) = match (&options.before, &options.after) {
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
-        (Some(before), Some(after)) => Some(doc! {
-            "lt": before,
-            "gt": after
-        }),
-        (Some(before), _) => Some(doc! {
-            "lt": before
-        }),
-        (_, Some(after)) => Some(doc! {
-            "gt": after
-        }),
-        _ => None
-    } {
-        filter.insert("_id", doc);
-    }
-
-    let mut cursor = get_collection("messages")
-        .find(
-            filter,
-            FindOptions::builder()
-                .projection(
-                    if let Sort::Relevance = &options.sort {
-                        doc! {
-                            "score": {
-                                "$meta": "textScore"
-                            }
-                        }
-                    } else {
-                        doc! {}
-                    }
-                )
-                .limit(limit)
-                .sort(
-                    match &options.sort {
-                        Sort::Relevance => doc! {
-                            "score": {
-                                "$meta": "textScore"
-                            }
-                        },
-                        Sort::Latest => doc! {
-                            "_id": -1 as i32
-                        },
-                        Sort::Oldest => doc! {
-                            "_id": 1 as i32
-                        }
-                    }
-                )
-                .build(),
-        )
         .await
-        .map_err(|_| Error::DatabaseError {
+        .map(Json)
-            operation: "find",
-            with: "messages",
-        })?;
-    
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            messages.push(
-                from_document::<Message>(doc).map_err(|_| Error::DatabaseError {
-                    operation: "from_document",
-                    with: "message",
-                })?,
-            );
-        }
-    }
-
-    if options.include_users.unwrap_or_else(|| false) {
-        let mut ids = HashSet::new();
-        for message in &messages {
-            message.add_associated_user_ids(&mut ids);
-        }
-
-        ids.remove(&user.id);
-        let user_ids = ids.into_iter().collect();
-        let users = user.fetch_multiple_users(&user_ids).await?;
-
-        if let Channel::TextChannel { server, .. } = target {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-                "members": Server::fetch_members_with_ids(&server, &user_ids).await?
-            }))
-        } else {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-            }))
-        }
-    } else {
-        Ok(json!(messages))
-    }
 }

src/routes/channels/message_send.rs

@@ -1,64 +1,42 @@
 use std::collections::HashSet;
 
-use crate::database::*;
+use revolt_quark::{
-use crate::util::idempotency::IdempotencyKey;
+    models::{
-use crate::util::ratelimit::{Ratelimiter, RatelimitResponse};
+        message::{Masquerade, Reply, SendableEmbed},
-use crate::util::result::{Error, Result};
+        Message, User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
 use regex::Regex;
-use rocket::serde::json::{Json, Value};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
+use crate::util::idempotency::IdempotencyKey;
-pub struct Reply {
-    id: String,
-    mention: bool
-}
 
-#[derive(Validate, Serialize, Deserialize, Clone, Debug)]
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
-pub struct SendableEmbed {
+pub struct DataMessageSend {
-    icon_url: Option<String>,
+    /// Unique token to prevent duplicate message sending
-    url: Option<String>,
+    ///
-    #[validate(length(min = 1, max = 100))]
+    /// **This is deprecated and replaced by `Idempotency-Key`!**
-    title: Option<String>,
+    nonce: Option<String>,
-    #[validate(length(min = 1, max = 2000))]
-    description: Option<String>,
-    media: Option<String>,
-	colour: Option<String>,
-}
 
-impl SendableEmbed {
+    /// Message content to send
-    pub async fn into_embed(self, message_id: String) -> Result<Embed> {
-        let media = if let Some(id) = self.media {
-            Some(File::find_and_use(&id, "attachments", "message", &message_id).await?)
-        } else { None };
-
-        Ok(Embed::Text(Text {
-            icon_url: self.icon_url,
-            url: self.url,
-            title: self.title,
-            description: self.description,
-            media,
-            colour: self.colour
-        }))
-    }
-}
-
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
     #[validate(length(min = 0, max = 2000))]
-    content: String,
+    content: Option<String>,
+    /// Attachments to include in message
     #[validate(length(min = 1, max = 128))]
     attachments: Option<Vec<String>>,
-    nonce: Option<String>,
+    /// Messages to reply to
     replies: Option<Vec<Reply>>,
+    /// Embeds to include in message
+    #[validate(length(min = 1, max = 10))]
+    embeds: Option<Vec<SendableEmbed>>,
+    /// Masquerade to apply to this message
     #[validate]
     masquerade: Option<Masquerade>,
-    #[validate(length(min = 1, max = 10))]
-    embeds: Option<Vec<SendableEmbed>>
 }
 
 lazy_static! {
@@ -66,57 +44,71 @@ lazy_static! {
     static ref RE_MENTION: Regex = Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap();
 }
 
-#[post("/<target>/messages", data = "<message>")]
+/// # Send Message
-pub async fn message_send(user: User, _r: Ratelimiter, mut idempotency: IdempotencyKey, target: Ref, message: Json<Data>) -> Result<RatelimitResponse<Value>> {
+///
-    let message = message.into_inner();
+/// Sends a message to the given channel.
-    idempotency.consume_nonce(message.nonce.clone());
+#[openapi(tag = "Messaging")]
-
+#[post("/<target>/messages", data = "<data>")]
-    message
+pub async fn message_send(
-        .validate()
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataMessageSend>,
+    mut idempotency: IdempotencyKey,
+) -> Result<Json<Message>> {
+    let data = data.into_inner();
+    data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if message.content.len() == 0
+    idempotency.consume_nonce(data.nonce).await?;
-        && (message.attachments.is_none() || message.attachments.as_ref().unwrap().len() == 0)
+
+    let channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+    permissions
+        .throw_permission_and_view_channel(db, Permission::SendMessage)
+        .await?;
+
+    if (data.content.as_ref().map_or(true, |v| v.is_empty()))
+        && (data.attachments.as_ref().map_or(true, |v| v.is_empty()))
+        && (data.embeds.as_ref().map_or(true, |v| v.is_empty()))
     {
         return Err(Error::EmptyMessage);
     }
 
-    let target = target.fetch_channel().await?;
+    let message_id = Ulid::new().to_string();
-    target.has_messaging()?;
+    let mut message = Message {
-    
+        id: message_id.clone(),
-    let perm = permissions::PermissionCalculator::new(&user)
+        channel: channel.id().to_string(),
-        .with_channel(&target)
+        author: user.id.clone(),
-        .for_channel()
+        ..Default::default()
-        .await?;
+    };
-
-    if !perm.get_send_message() {
-        return Err(Error::MissingPermission)
-    }
 
+    // 1. Parse mentions in message.
     let mut mentions = HashSet::new();
-    for capture in RE_MENTION.captures_iter(&message.content) {
+    if let Some(content) = &data.content {
+        for capture in RE_MENTION.captures_iter(content) {
             if let Some(mention) = capture.get(1) {
                 mentions.insert(mention.as_str().to_string());
             }
         }
-
-    if let Some(_) = &message.masquerade {
-        if !perm.get_masquerade() {
-            return Err(Error::MissingPermission)
-        }
     }
 
+    // 2. Verify permissions for masquerade.
+    if data.masquerade.is_some() {
+        permissions
+            .throw_permission(db, Permission::Masquerade)
+            .await?;
+    }
+
+    // 3. Verify replies are valid.
     let mut replies = HashSet::new();
-    if let Some(entries) = message.replies {
+    if let Some(entries) = data.replies {
-        // ! FIXME: move this to app config
         if entries.len() > 5 {
-            return Err(Error::TooManyReplies)
+            return Err(Error::TooManyReplies);
         }
 
         for Reply { id, mention } in entries {
-            let message = Ref::from_unchecked(id)
+            let message = Ref::from_unchecked(id).as_message(db).await?;
-                .fetch_message(&target)
-                .await?;
 
             replies.insert(message.id);
 
@@ -126,56 +118,76 @@ pub async fn message_send(user: User, _r: Ratelimiter, mut idempotency: Idempote
         }
     }
 
-    let id = Ulid::new().to_string();
+    if !mentions.is_empty() {
-    let mut attachments = vec![];
+        message.mentions.replace(
+            mentions
+                .into_iter()
+                .filter(|id| !user.has_blocked(id))
+                .collect::<Vec<String>>(),
+        );
+    }
 
-    if let Some(ids) = &message.attachments {
+    if !replies.is_empty() {
-        if ids.len() > 0 && !perm.get_upload_files() {
+        message
-            return Err(Error::MissingPermission)
+            .replies
+            .replace(replies.into_iter().collect::<Vec<String>>());
+    }
+
+    // 4. Add attachments to message.
+    let mut attachments = vec![];
+    if let Some(ids) = &data.attachments {
+        if !ids.is_empty() {
+            permissions
+                .throw_permission(db, Permission::UploadFiles)
+                .await?;
         }
 
         // ! FIXME: move this to app config
         if ids.len() > 5 {
-            return Err(Error::TooManyAttachments)
+            return Err(Error::TooManyAttachments);
         }
 
         for attachment_id in ids {
-            attachments
+            attachments.push(
-                .push(File::find_and_use(attachment_id, "attachments", "message", &id).await?);
+                db.find_and_use_attachment(attachment_id, "attachments", "message", &message_id)
+                    .await?,
+            );
         }
     }
 
+    if !attachments.is_empty() {
+        message.attachments.replace(attachments);
+    }
+
+    // 5. Process included embeds.
     let mut embeds = vec![];
-
+    if let Some(sendable_embeds) = data.embeds {
-    if let Some(sendable_embeds) = message.embeds {
         for sendable_embed in sendable_embeds {
-            embeds.push(sendable_embed.into_embed(id.clone()).await?)
+            embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?)
         }
     }
 
-    let msg = Message {
+    if !embeds.is_empty() {
-        id,
+        message.embeds.replace(embeds);
-        channel: target.id().to_string(),
+    }
-        author: user.id,
+
-
+    // 6. Set content
-        content: Content::Text(message.content.clone()),
+    message.content = data.content;
-        nonce: Some(idempotency.key),
+
-        edited: None,
+    // 7. Pass-through nonce value for clients
-        embeds: if embeds.len() > 0 { Some(embeds) } else { None },
+    message.nonce = Some(idempotency.into_key());
-        attachments: if attachments.len() > 0 { Some(attachments) } else { None },
+
-        mentions: if mentions.len() > 0 {
+    message.create(db, &channel, Some(&user)).await?;
-            Some(mentions.into_iter().collect::<Vec<String>>())
+
-        } else {
+    // Queue up a task for processing embeds
-            None
+    if let Some(content) = &message.content {
-        },
+        revolt_quark::tasks::process_embeds::queue(
-        replies: if replies.len() > 0 {
+            channel.id().to_string(),
-            Some(replies.into_iter().collect::<Vec<String>>())
+            message.id.to_string(),
-        } else {
+            content.clone(),
-            None
+        )
-        },
+        .await;
-        masquerade: message.masquerade
+    }
-    };
+
-
+    Ok(Json(message))
-    msg.clone().publish(&target, perm.get_embed_links()).await?;
-    Ok(RatelimitResponse(json!(msg)))
 }

src/routes/channels/mod.rs

@@ -1,27 +1,28 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod channel_ack;
 mod channel_delete;
 mod channel_edit;
 mod channel_fetch;
-mod members_fetch;
 mod group_add_member;
 mod group_create;
 mod group_remove_member;
 mod invite_create;
-mod voice_join;
+mod members_fetch;
 mod message_delete;
 mod message_edit;
 mod message_fetch;
 mod message_query;
-mod message_search;
 mod message_query_stale;
+mod message_search;
 mod message_send;
 mod permissions_set;
 mod permissions_set_default;
+mod voice_join;
 
-pub fn routes() -> Vec<Route> {
+pub fn routes() -> (Vec<Route>, OpenApi) {
-    routes![
+    openapi_get_routes_spec![
         channel_ack::req,
         channel_fetch::req,
         members_fetch::req,

src/routes/channels/permissions_set.rs

@@ -1,68 +1,59 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::Deserialize;
-use validator::Contains;
 
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result, EmptyResponse};
+    models::{Channel, User},
-use crate::notifications::events::ClientboundNotification;
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
 
-#[derive(Serialize, Deserialize)]
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
 pub struct Data {
-    permissions: u32
+    /// Allow / deny values to set for this role
+    permissions: Override,
 }
 
-#[put("/<target>/permissions/<role>", data = "<data>", rank = 2)]
+/// # Set Role Permission
-pub async fn req(user: User, target: Ref, role: String, data: Json<Data>) -> Result<EmptyResponse> {
+///
-    let target = target.fetch_channel().await?;
+/// Sets permissions for the specified role in this channel.
+///
+/// Channel must be a `TextChannel` or `VoiceChannel`.
+#[openapi(tag = "Channel Permissions")]
+#[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    role_id: String,
+    data: Json<Data>,
+) -> Result<Json<Channel>> {
+    let mut channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
 
-    match target {
+    permissions
-        Channel::TextChannel { id, server, mut role_permissions, .. }
+        .throw_permission_and_view_channel(db, Permission::ManagePermissions)
-        | Channel::VoiceChannel { id, server, mut role_permissions, .. } => {
-            let target = Ref::from_unchecked(server).fetch_server().await?;
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_server(&target)
-                .for_server()
         .await?;
 
-            if !perm.get_manage_roles() {
+    if let Some(server) = permissions.server.get() {
-                return Err(Error::MissingPermission);
+        if let Some(role) = server.roles.get(&role_id) {
+            if role.rank <= permissions.get_member_rank().unwrap_or(i64::MIN) {
+                return Err(Error::NotElevated);
             }
 
-            if !target.roles.has_element(&role) {
+            let current_value: Override = role.permissions.into();
-                return Err(Error::NotFound);
+            permissions
-            }
+                .throw_permission_override(db, current_value, data.permissions)
+                .await?;
 
-            let permissions: u32 = data.permissions;
+            channel
+                .set_role_permission(db, &role_id, data.permissions.into())
+                .await?;
 
-            get_collection("channels")
+            Ok(Json(channel))
-            .update_one(
+        } else {
-                doc! { "_id": &id },
+            Err(Error::NotFound)
-                doc! {
-                    "$set": {
-                        "role_permissions.".to_owned() + &role: permissions as i32
         }
-                },
+    } else {
-                None
+        Err(Error::InvalidOperation)
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "channel"
-            })?;
-
-            role_permissions.insert(role, permissions as i32);
-            ClientboundNotification::ChannelUpdate {
-                id: id.clone(),
-                data: json!({
-                    "role_permissions": role_permissions
-                }),
-                clear: None
-            }
-            .publish(id);
-
-            Ok(EmptyResponse {})
-        }
-        _ => Err(Error::InvalidOperation)
     }
 }

src/routes/channels/permissions_set_default.rs

@@ -1,97 +1,95 @@
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::Deserialize;
 
-use crate::database::*;
+use revolt_quark::{
-use crate::database::permissions::channel::{ ChannelPermission, DEFAULT_PERMISSION_DM };
+    models::{channel::PartialChannel, Channel, User},
-use crate::notifications::events::ClientboundNotification;
+    perms, Db, Error, Override, Permission, Ref, Result,
-use crate::util::result::{Error, Result, EmptyResponse};
+};
 
-#[derive(Serialize, Deserialize)]
+/// # Permission Value
-pub struct Data {
+#[derive(Deserialize, JsonSchema)]
-    permissions: u32
+#[serde(untagged)]
-}
+pub enum DataDefaultChannelPermissions {
-
+    Value {
-#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
+        /// Permission values to set for members in a `Group`
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+        permissions: u64,
-    let target = target.fetch_channel().await?;
-
-    match target {
-        Channel::Group { id, owner, .. } => {
-            if user.id == owner {
-                let permissions: u32 = ChannelPermission::View as u32 | (data.permissions & *DEFAULT_PERMISSION_DM);
-
-                get_collection("channels")
-                    .update_one(
-                        doc! { "_id": &id },
-                        doc! {
-                            "$set": {
-                                "permissions": permissions as i32
-                            }
     },
-                        None
+    Field {
-                    )
+        /// Allow / deny values to set for members in this `TextChannel` or `VoiceChannel`
-                    .await
+        permissions: Override,
-                    .map_err(|_| Error::DatabaseError {
+    },
-                        operation: "update_one",
+}
-                        with: "channel"
-                    })?;
 
-                ClientboundNotification::ChannelUpdate {
+/// # Set Default Permission
-                    id: id.clone(),
+///
-                    data: json!({
+/// Sets permissions for the default role in this channel.
-                        "permissions": permissions as i32
+///
-                    }),
+/// Channel must be a `Group`, `TextChannel` or `VoiceChannel`.
-                    clear: None
+#[openapi(tag = "Channel Permissions")]
-                }
+#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
-                .publish(id);
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataDefaultChannelPermissions>,
+) -> Result<Json<Channel>> {
+    let data = data.into_inner();
 
-                Ok(EmptyResponse {})
+    let mut channel = target.as_channel(db).await?;
-            } else {
+    let mut perm = perms(&user).channel(&channel);
-                Err(Error::MissingPermission)
+
-            }
+    perm.throw_permission_and_view_channel(db, Permission::ManagePermissions)
-        }
-        Channel::TextChannel { id, server, .. }
-        | Channel::VoiceChannel { id, server, .. } => {
-            let target = Ref::from_unchecked(server).fetch_server().await?;
-            let perm = permissions::PermissionCalculator::new(&user)
-                .with_server(&target)
-                .for_server()
         .await?;
 
-            if !perm.get_manage_roles() {
+    match &channel {
-                return Err(Error::MissingPermission);
+        Channel::Group { .. } => {
-            }
+            if let DataDefaultChannelPermissions::Value { permissions } = data {
-
+                channel
-            let permissions: u32 = data.permissions;
+                    .update(
-
+                        db,
-            get_collection("channels")
+                        PartialChannel {
-                .update_one(
+                            permissions: Some(permissions as i64),
-                    doc! { "_id": &id },
+                            ..Default::default()
-                    doc! {
-                        "$set": {
-                            "default_permissions": permissions as i32
-                        }
                         },
-                    None
+                        vec![],
                     )
-                .await
+                    .await?;
-                .map_err(|_| Error::DatabaseError {
+            } else {
-                    operation: "update_one",
+                return Err(Error::InvalidOperation);
-                    with: "channel"
+            }
-                })?;
+        }
+        Channel::TextChannel {
+            default_permissions,
+            ..
+        }
+        | Channel::VoiceChannel {
+            default_permissions,
+            ..
+        } => {
+            if let DataDefaultChannelPermissions::Field { permissions } = data {
+                perm.throw_permission_override(
+                    db,
+                    default_permissions.map(|x| x.into()),
+                    permissions,
+                )
+                .await?;
 
-            ClientboundNotification::ChannelUpdate {
+                channel
-                id: id.clone(),
+                    .update(
-                data: json!({
+                        db,
-                    "default_permissions": permissions as i32
+                        PartialChannel {
-                }),
+                            default_permissions: Some(permissions.into()),
-                clear: None
+                            ..Default::default()
+                        },
+                        vec![],
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
+            }
+        }
+        _ => return Err(Error::InvalidOperation),
     }
-            .publish(id);
 
-            Ok(EmptyResponse {})
+    Ok(Json(channel))
-        }
-        _ => Err(Error::InvalidOperation)
-    }
 }

src/routes/channels/voice_join.rs

@@ -1,44 +1,50 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Channel, User},
-use crate::util::variables::{USE_VOSO, VOSO_MANAGE_TOKEN, VOSO_URL};
+    perms,
+    variables::delta::{USE_VOSO, VOSO_MANAGE_TOKEN, VOSO_URL},
+    Db, Error, Permission, Ref, Result,
+};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize)]
+/// # Voice Server Token Response
-struct CreateUserResponse {
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct CreateVoiceUserResponse {
+    /// Token for authenticating with the voice server
     token: String,
 }
 
+/// # Join Call
+///
+/// Asks the voice server for a token to join the call.
+#[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<CreateVoiceUserResponse>> {
+    let channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+
+    permissions
+        .throw_permission_and_view_channel(db, Permission::Connect)
+        .await?;
+
     if !*USE_VOSO {
         return Err(Error::VosoUnavailable);
     }
 
-    let target = target.fetch_channel().await?;
+    match channel {
-    match target {
         Channel::SavedMessages { .. } | Channel::TextChannel { .. } => {
             return Err(Error::CannotJoinCall)
         }
         _ => {}
     }
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_voice_call() {
-        return Err(Error::MissingPermission);
-    }
-
     // To join a call:
     // - Check if the room exists.
     // - If not, create it.
     let client = reqwest::Client::new();
     let result = client
-        .get(&format!("{}/room/{}", *VOSO_URL, target.id()))
+        .get(&format!("{}/room/{}", *VOSO_URL, channel.id()))
         .header(
             reqwest::header::AUTHORIZATION,
             VOSO_MANAGE_TOKEN.to_string(),
@@ -51,14 +57,15 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         Ok(result) => match result.status() {
             reqwest::StatusCode::OK => (),
             reqwest::StatusCode::NOT_FOUND => {
-                if let Err(_) = client
+                if (client
-                    .post(&format!("{}/room/{}", *VOSO_URL, target.id()))
+                    .post(&format!("{}/room/{}", *VOSO_URL, channel.id()))
                     .header(
                         reqwest::header::AUTHORIZATION,
                         VOSO_MANAGE_TOKEN.to_string(),
                     )
                     .send()
-                    .await
+                    .await)
+                    .is_err()
                 {
                     return Err(Error::VosoUnavailable);
                 }
@@ -72,7 +79,7 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         .post(&format!(
             "{}/room/{}/user/{}",
             *VOSO_URL,
-            target.id(),
+            channel.id(),
             user.id
         ))
         .header(
@@ -82,9 +89,11 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
         .send()
         .await
     {
-        let res: CreateUserResponse = response.json().await.map_err(|_| Error::InvalidOperation)?;
+        response
-
+            .json()
-        Ok(json!(res))
+            .await
+            .map_err(|_| Error::InvalidOperation)
+            .map(Json)
     } else {
         Err(Error::VosoUnavailable)
     }

src/routes/invites/invite_delete.rs

@@ -1,30 +1,31 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result, EmptyResponse};
+    models::{Invite, User},
+    perms, Db, EmptyResponse, Permission, Ref, Result,
+};
 
+/// # Delete Invite
+///
+/// Delete an invite by its id.
+#[openapi(tag = "Invites")]
 #[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
-    let target = target.fetch_invite().await?;
+    let invite = target.as_invite(db).await?;
 
-    if target.creator() == &user.id {
+    if user.id == invite.creator() {
-        target.delete().await?;
+        db.delete_invite(invite.code()).await
     } else {
-        match &target {
+        match invite {
-            Invite::Server { server, .. } => {
+            Invite::Server { code, server, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
+                let server = db.fetch_server(&server).await?;
-                let perm = permissions::PermissionCalculator::new(&user)
+                perms(&user)
-                    .with_server(&server)
+                    .server(&server)
-                    .for_server()
+                    .throw_permission(db, Permission::ManageServer)
                     .await?;
 
-                if !perm.get_manage_server() {
+                db.delete_invite(&code).await
-                    return Err(Error::MissingPermission);
-                }
-
-                target.delete().await?;
             }
             _ => unreachable!(),
         }
     }
-
+    .map(|_| EmptyResponse)
-    Ok(EmptyResponse {})
 }

src/routes/invites/invite_fetch.rs

@@ -1,48 +1,95 @@
-use crate::database::*;
+use revolt_quark::models::{Channel, File, Invite};
-use crate::util::result::Result;
+use revolt_quark::{Db, Ref, Result};
 
-use rocket::serde::json::Value;
+use rocket::serde::json::Json;
 use serde::Serialize;
 
-#[derive(Serialize, Debug, Clone)]
+/// # Invite
+#[allow(clippy::large_enum_variant)]
+#[derive(Serialize, Debug, Clone, JsonSchema)]
 #[serde(tag = "type")]
 pub enum InviteResponse {
+    /// Server channel invite
     Server {
+        /// Invite code
+        code: String,
+        /// Id of the server
         server_id: String,
+        /// Name of the server
         server_name: String,
+        /// Attachment for server icon
         #[serde(skip_serializing_if = "Option::is_none")]
         server_icon: Option<File>,
+        /// Attachment for server banner
         #[serde(skip_serializing_if = "Option::is_none")]
         server_banner: Option<File>,
+        /// Id of server channel
         channel_id: String,
+        /// Name of server channel
         channel_name: String,
+        /// Description of server channel
         #[serde(skip_serializing_if = "Option::is_none")]
         channel_description: Option<String>,
+        /// Name of user who created the invite
         user_name: String,
+        /// Avatar of the user who created the invite
         #[serde(skip_serializing_if = "Option::is_none")]
         user_avatar: Option<File>,
+        /// Number of members in this server
         member_count: i64,
     },
+    /// Group channel invite
+    Group {
+        /// Invite code
+        code: String,
+        /// Id of group channel
+        channel_id: String,
+        /// Name of group channel
+        channel_name: String,
+        /// Description of group channel
+        #[serde(skip_serializing_if = "Option::is_none")]
+        channel_description: Option<String>,
+        /// Name of user who created the invite
+        user_name: String,
+        /// Avatar of the user who created the invite
+        #[serde(skip_serializing_if = "Option::is_none")]
+        user_avatar: Option<File>,
+    },
 }
 
+/// # Fetch Invite
+///
+/// Fetch an invite by its id.
+#[openapi(tag = "Invites")]
 #[get("/<target>")]
-pub async fn req(target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, target: Ref) -> Result<Json<InviteResponse>> {
-    let target = target.fetch_invite().await?;
+    Ok(Json(match target.as_invite(db).await? {
-
-    match target {
         Invite::Server {
             channel, creator, ..
         } => {
-            let channel = Ref::from_unchecked(channel).fetch_channel().await?;
+            let channel = db.fetch_channel(&channel).await?;
-            let creator = Ref::from_unchecked(creator).fetch_user().await?;
+            let user = db.fetch_user(&creator).await?;
 
             match channel {
-                Channel::TextChannel { id, server, name, description, .. }
+                Channel::TextChannel {
-                | Channel::VoiceChannel { id, server, name, description, .. } => {
+                    id,
-                    let server = Ref::from_unchecked(server).fetch_server().await?;
+                    server,
+                    name,
+                    description,
+                    ..
+                }
+                | Channel::VoiceChannel {
+                    id,
+                    server,
+                    name,
+                    description,
+                    ..
+                } => {
+                    let server = db.fetch_server(&server).await?;
 
-                    Ok(json!(InviteResponse::Server {
+                    InviteResponse::Server {
-                        member_count: Server::get_member_count(&server.id).await?,
+                        code: target.id,
+                        member_count: db.fetch_member_count(&server.id).await? as i64,
                         server_id: server.id,
                         server_name: server.name,
                         server_icon: server.icon,
@@ -50,13 +97,35 @@ pub async fn req(target: Ref) -> Result<Value> {
                         channel_id: id,
                         channel_name: name,
                         channel_description: description,
-                        user_name: creator.username,
+                        user_name: user.username,
-                        user_avatar: creator.avatar
+                        user_avatar: user.avatar,
-                    }))
-                }
-                _ => unreachable!()
                     }
                 }
                 _ => unreachable!(),
             }
         }
+        Invite::Group {
+            channel, creator, ..
+        } => {
+            let channel = db.fetch_channel(&channel).await?;
+            let user = db.fetch_user(&creator).await?;
+
+            match channel {
+                Channel::Group {
+                    id,
+                    name,
+                    description,
+                    ..
+                } => InviteResponse::Group {
+                    code: target.id,
+                    channel_id: id,
+                    channel_name: name,
+                    channel_description: description,
+                    user_name: user.username,
+                    user_avatar: user.avatar,
+                },
+                _ => unreachable!(),
+            }
+        }
+    }))
+}

src/routes/invites/invite_join.rs

@@ -1,41 +1,46 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Channel, Invite, Server, User},
-use crate::util::variables::MAX_SERVER_COUNT;
+    variables::delta::MAX_SERVER_COUNT,
-
+    Db, Error, Ref, Result,
-use rocket::serde::json::Value;
-
-#[post("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot)
-    }
-
-    if !User::can_acquire_server(&user.id).await? {
-        Err(Error::TooManyServers {
-            max: *MAX_SERVER_COUNT,
-        })?
-    }
-    
-    let target = target.fetch_invite().await?;
-
-    match target {
-        Invite::Server { channel, .. } => {
-            let channel = Ref::from_unchecked(channel).fetch_channel().await?;
-            let server = match &channel {
-                Channel::TextChannel { server, .. }
-                | Channel::VoiceChannel { server, .. } => {
-                    Ref::from_unchecked(server.clone()).fetch_server().await?
-                }
-                _ => unreachable!()
 };
 
-            server.join_member(&user.id).await?;
+use rocket::serde::json::Json;
+use serde::Serialize;
 
-            Ok(json!({
+/// # Join Response
-                "type": "Server",
+#[derive(Serialize, JsonSchema)]
-                "channel": channel,
+#[serde(tag = "type")]
-                "server": server
+pub enum InviteJoinResponse {
-            }))
+    Server {
+        /// Channels in the server
+        channels: Vec<Channel>,
+        /// Server we are joining
+        server: Server,
+    },
+}
+
+/// # Join Invite
+///
+/// Join an invite by its ID.
+#[openapi(tag = "Invites")]
+#[post("/<target>")]
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<InviteJoinResponse>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    if !user.can_acquire_server(db).await? {
+        return Err(Error::TooManyServers {
+            max: *MAX_SERVER_COUNT,
+        });
+    }
+
+    let invite = target.as_invite(db).await?;
+    match &invite {
+        Invite::Server { server, .. } => {
+            let server = db.fetch_server(server).await?;
+            let channels = server.create_member(db, user, None).await?;
+            Ok(Json(InviteJoinResponse::Server { channels, server }))
         }
         _ => unreachable!(),
     }

src/routes/invites/mod.rs

@@ -1,9 +1,10 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod invite_delete;
 mod invite_fetch;
 mod invite_join;
 
-pub fn routes() -> Vec<Route> {
+pub fn routes() -> (Vec<Route>, OpenApi) {
-    routes![invite_fetch::req, invite_join::req, invite_delete::req]
+    openapi_get_routes_spec![invite_fetch::req, invite_join::req, invite_delete::req]
 }

src/routes/mod.rs

@@ -1,6 +1,7 @@
 pub use rocket::http::Status;
 pub use rocket::response::Redirect;
 use rocket::{Build, Rocket};
+use rocket_okapi::{okapi::openapi3::OpenApi, settings::OpenApiSettings};
 
 mod bots;
 mod channels;
@@ -12,15 +13,255 @@ mod servers;
 mod sync;
 mod users;
 
-pub fn mount(rocket: Rocket<Build>) -> Rocket<Build> {
+pub fn mount(mut rocket: Rocket<Build>) -> Rocket<Build> {
+    let settings = OpenApiSettings::default();
+
+    mount_endpoints_and_merged_docs! {
+        rocket, "/".to_owned(), settings,
+        "/" => (vec![], custom_openapi_spec()),
+        "" => openapi_get_routes_spec![root::root, root::ping],
+        "/users" => users::routes(),
+        "/bots" => bots::routes(),
+        "/channels" => channels::routes(),
+        "/servers" => servers::routes(),
+        "/invites" => invites::routes(),
+        "/auth/account" => rauth::web::account::routes(),
+        "/auth/session" => rauth::web::session::routes(),
+        "/onboard" => onboard::routes(),
+        "/push" => push::routes(),
+        "/sync" => sync::routes(),
+    };
+
     rocket
-        .mount("/", routes![root::root, root::ping])
+}
-        .mount("/onboard", onboard::routes())
+
-        .mount("/users", users::routes())
+fn custom_openapi_spec() -> OpenApi {
-        .mount("/channels", channels::routes())
+    use rocket_okapi::okapi::openapi3::*;
-        .mount("/servers", servers::routes())
+
-        .mount("/bots", bots::routes())
+    let mut extensions = schemars::Map::new();
-        .mount("/invites", invites::routes())
+    extensions.insert(
-        .mount("/push", push::routes())
+        "x-logo".to_owned(),
-        .mount("/sync", sync::routes())
+        json!({
+            "url": "https://revolt.chat/header.png",
+            "altText": "Revolt Header"
+        }),
+    );
+
+    extensions.insert(
+        "x-tagGroups".to_owned(),
+        json!([
+          {
+            "name": "Revolt",
+            "tags": [
+              "Core"
+            ]
+          },
+          {
+            "name": "Users",
+            "tags": [
+              "User Information",
+              "Direct Messaging",
+              "Relationships"
+            ]
+          },
+          {
+            "name": "Bots",
+            "tags": [
+              "Bots"
+            ]
+          },
+          {
+            "name": "Channels",
+            "tags": [
+              "Channel Information",
+              "Channel Invites",
+              "Channel Permissions",
+              "Messaging",
+              "Groups",
+              "Voice"
+            ]
+          },
+          {
+            "name": "Servers",
+            "tags": [
+              "Server Information",
+              "Server Members",
+              "Server Permissions"
+            ]
+          },
+          {
+            "name": "Invites",
+            "tags": [
+              "Invites"
+            ]
+          },
+          {
+            "name": "Authentication",
+            "tags": [
+              "Account",
+              "Session",
+              "Onboarding"
+            ]
+          },
+          {
+            "name": "Miscellaneous",
+            "tags": [
+              "Sync",
+              "Web Push"
+            ]
+          }
+        ]),
+    );
+
+    OpenApi {
+        openapi: OpenApi::default_version(),
+        info: Info {
+            title: "Revolt API".to_owned(),
+            description: Some("User-first privacy focused chat platform.".to_owned()),
+            terms_of_service: Some("https://revolt.chat/terms".to_owned()),
+            contact: Some(Contact {
+                name: Some("Revolt Support".to_owned()),
+                url: Some("https://revolt.chat".to_owned()),
+                email: Some("contact@revolt.chat".to_owned()),
+                ..Default::default()
+            }),
+            license: Some(License {
+                name: "AGPLv3".to_owned(),
+                url: Some("https://github.com/revoltchat/delta/blob/master/LICENSE".to_owned()),
+                ..Default::default()
+            }),
+            version: "0.5.3-rc.1".to_owned(),
+            ..Default::default()
+        },
+        servers: vec![
+            Server {
+                url: "https://api.revolt.chat".to_owned(),
+                description: Some("Revolt API".to_owned()),
+                ..Default::default()
+            },
+            Server {
+                url: "http://local.revolt.chat:8000".to_owned(),
+                description: Some("Local Revolt Environment".to_owned()),
+                ..Default::default()
+            },
+        ],
+        external_docs: Some(ExternalDocs {
+            url: "https://developers.revolt.chat".to_owned(),
+            description: Some("Revolt Developer Documentation".to_owned()),
+            ..Default::default()
+        }),
+        extensions,
+        tags: vec![
+            Tag {
+                name: "Core".to_owned(),
+                description: Some(
+                    "Use in your applications to determine information about the Revolt node"
+                        .to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "User Information".to_owned(),
+                description: Some("Query and fetch users on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Direct Messaging".to_owned(),
+                description: Some("Direct message other users on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Relationships".to_owned(),
+                description: Some(
+                    "Manage your friendships and block list on the platform".to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "Bots".to_owned(),
+                description: Some("Create and edit bots".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Information".to_owned(),
+                description: Some("Query and fetch channels on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Invites".to_owned(),
+                description: Some("Create and manage invites for channels".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Channel Permissions".to_owned(),
+                description: Some("Manage permissions for channels".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Messaging".to_owned(),
+                description: Some("Send and manipulate messages".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Groups".to_owned(),
+                description: Some("Create, invite users and manipulate groups".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Voice".to_owned(),
+                description: Some("Join and talk with other users".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Information".to_owned(),
+                description: Some("Query and fetch servers on Revolt".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Members".to_owned(),
+                description: Some("Find and edit server members".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Server Permissions".to_owned(),
+                description: Some("Manage permissions for servers".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Invites".to_owned(),
+                description: Some("View, join and delete invites".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Account".to_owned(),
+                description: Some("Manage your account".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Session".to_owned(),
+                description: Some("Create and manage sessions".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Onboarding".to_owned(),
+                description: Some(
+                    "After signing up to Revolt, users must pick a unique username".to_owned(),
+                ),
+                ..Default::default()
+            },
+            Tag {
+                name: "Sync".to_owned(),
+                description: Some("Upload and retrieve any JSON data between clients".to_owned()),
+                ..Default::default()
+            },
+            Tag {
+                name: "Web Push".to_owned(),
+                description: Some(
+                    "Subscribe to and receive Revolt push notifications while offline".to_owned(),
+                ),
+                ..Default::default()
+            },
+        ],
+        ..Default::default()
+    }
 }

src/routes/onboard/complete.rs

@@ -1,45 +1,47 @@
-use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
 use crate::util::regex::RE_USERNAME;
+use revolt_quark::{models::User, Database, EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
 use rauth::entities::Session;
-use rocket::serde::json::Json;
+use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # New User Data
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataOnboard {
+    /// New username which will be used to identify the user on the platform
     #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
     username: String,
 }
 
+/// # Complete Onboarding
+///
+/// This sets a new username, completes onboarding and allows a user to start using Revolt.
+#[openapi(tag = "Onboarding")]
 #[post("/complete", data = "<data>")]
-pub async fn req(session: Session, user: Option<User>, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &State<Database>,
+    session: Session,
+    user: Option<User>,
+    data: Json<DataOnboard>,
+) -> Result<EmptyResponse> {
     if user.is_some() {
-        Err(Error::AlreadyOnboarded)?
+        return Err(Error::AlreadyOnboarded);
     }
 
+    let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if User::is_username_taken(&data.username).await? {
+    if db.is_username_taken(&data.username).await? {
         return Err(Error::UsernameTaken);
     }
 
-    get_collection("users")
+    let user = User {
-        .insert_one(
+        id: session.user_id,
-            doc! {
+        username: data.username,
-                "_id": session.user_id,
+        ..Default::default()
-                "username": &data.username
+    };
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "user",
-        })?;
 
-    Ok(EmptyResponse {})
+    db.insert_user(&user).await.map(|_| EmptyResponse)
 }

src/routes/onboard/hello.rs

@@ -1,11 +1,22 @@
-use crate::database::*;
-
 use rauth::entities::Session;
-use rocket::serde::json::Value;
+use revolt_quark::models::User;
+use rocket::serde::json::Json;
+use serde::Serialize;
 
+/// # Onboarding Status
+#[derive(Serialize, JsonSchema)]
+pub struct DataHello {
+    /// Whether onboarding is required
+    onboarding: bool,
+}
+
+/// # Check Onboarding Status
+///
+/// This will tell you whether the current account requires onboarding or whether you can continue to send requests as usual. You may skip calling this if you're restoring an existing session.
+#[openapi(tag = "Onboarding")]
 #[get("/hello")]
-pub async fn req(_session: Session, user: Option<User>) -> Value {
+pub async fn req(_session: Session, user: Option<User>) -> Json<DataHello> {
-    json!({
+    Json(DataHello {
-        "onboarding": user.is_none()
+        onboarding: user.is_none(),
     })
 }

src/routes/onboard/mod.rs

@@ -1,8 +1,9 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod complete;
 mod hello;
 
-pub fn routes() -> Vec<Route> {
+pub fn routes() -> (Vec<Route>, OpenApi) {
-    routes![hello::req, complete::req]
+    openapi_get_routes_spec![hello::req, complete::req]
 }

src/routes/push/mod.rs

@@ -1,8 +1,9 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod subscribe;
 mod unsubscribe;
 
-pub fn routes() -> Vec<Route> {
+pub fn routes() -> (Vec<Route>, OpenApi) {
-    routes![subscribe::req, unsubscribe::req]
+    openapi_get_routes_spec![subscribe::req, unsubscribe::req]
 }

src/routes/push/subscribe.rs

@@ -1,15 +1,26 @@
-use crate::database::*;
+use revolt_quark::{EmptyResponse, Error, Result};
-use crate::util::result::{EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
+use rauth::{
-use rauth::entities::{Model, Session, WebPushSubscription};
+    entities::{Model, Session, WebPushSubscription},
-use rocket::serde::json::Json;
+    logic::Auth,
+};
+use rocket::{serde::json::Json, State};
 
+/// # Push Subscribe
+///
+/// Create a new Web Push subscription.
+///
+/// If an existing subscription exists on this session, it will be removed.
+#[openapi(tag = "Web Push")]
 #[post("/subscribe", data = "<data>")]
-pub async fn req(mut session: Session, data: Json<WebPushSubscription>) -> Result<EmptyResponse> {
+pub async fn req(
+    auth: &State<Auth>,
+    mut session: Session,
+    data: Json<WebPushSubscription>,
+) -> Result<EmptyResponse> {
     session.subscription = Some(data.into_inner());
     session
-        .save(&get_db(), None)
+        .save(&auth.db, None)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {

src/routes/push/unsubscribe.rs

@@ -1,14 +1,20 @@
-use crate::database::*;
+use revolt_quark::{EmptyResponse, Error, Result};
-use crate::util::result::{EmptyResponse, Error, Result};
 
-use mongodb::bson::doc;
+use rauth::{
-use rauth::entities::{Model, Session};
+    entities::{Model, Session},
+    logic::Auth,
+};
+use rocket::State;
 
+/// # Unsubscribe
+///
+/// Remove the Web Push subscription associated with the current session.
+#[openapi(tag = "Web Push")]
 #[post("/unsubscribe")]
-pub async fn req(mut session: Session) -> Result<EmptyResponse> {
+pub async fn req(auth: &State<Auth>, mut session: Session) -> Result<EmptyResponse> {
     session.subscription = None;
     session
-        .save(&get_db(), None)
+        .save(&auth.db, None)
         .await
         .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {

src/routes/root.rs

@@ -1,43 +1,112 @@
-use crate::util::{ratelimit::Ratelimiter, variables::{
+use revolt_quark::variables::delta::{
     APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, JANUARY_URL, USE_AUTUMN,
     USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
-}};
+};
+use revolt_quark::Result;
 
-use mongodb::bson::doc;
+use rocket::http::Status;
-use rocket::{http::Status, serde::json::Value};
+use rocket::serde::json::Json;
+use serde::Serialize;
 
+/// # hCaptcha Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct CaptchaFeature {
+    /// Whether captcha is enabled
+    pub enabled: bool,
+    /// Client key used for solving captcha
+    pub key: String,
+}
+
+/// # Generic Service Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct Feature {
+    /// Whether the service is enabled
+    pub enabled: bool,
+    /// URL pointing to the service
+    pub url: String,
+}
+
+/// # Voice Server Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct VoiceFeature {
+    /// Whether voice is enabled
+    pub enabled: bool,
+    /// URL pointing to the voice API
+    pub url: String,
+    /// URL pointing to the voice WebSocket server
+    pub ws: String,
+}
+
+/// # Feature Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct RevoltFeatures {
+    /// hCaptcha configuration
+    pub captcha: CaptchaFeature,
+    /// Whether email verification is enabled
+    pub email: bool,
+    /// Whether this server is invite only
+    pub invite_only: bool,
+    /// File server service configuration
+    pub autumn: Feature,
+    /// Proxy service configuration
+    pub january: Feature,
+    /// Voice server configuration
+    pub voso: VoiceFeature,
+}
+
+/// # Server Configuration
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct RevoltConfig {
+    /// Revolt API Version
+    pub revolt: String,
+    /// Features enabled on this Revolt node
+    pub features: RevoltFeatures,
+    /// WebSocket URL
+    pub ws: String,
+    /// URL pointing to the client serving this node
+    pub app: String,
+    /// Web Push VAPID public key
+    pub vapid: String,
+}
+
+/// # Query Node
+///
+/// Fetch the server configuration for this Revolt instance.
+#[openapi(tag = "Core")]
 #[get("/")]
-pub async fn root() -> Value {
+pub async fn root() -> Result<Json<RevoltConfig>> {
-    json!({
+    Ok(Json(RevoltConfig {
-        "revolt": crate::version::VERSION,
+        revolt: crate::version::VERSION.to_string(),
-        "features": {
+        features: RevoltFeatures {
-            "captcha": {
+            captcha: CaptchaFeature {
-                "enabled": *USE_HCAPTCHA,
+                enabled: *USE_HCAPTCHA,
-                "key": HCAPTCHA_SITEKEY.to_string()
+                key: HCAPTCHA_SITEKEY.to_string(),
             },
-            "email": *USE_EMAIL,
+            email: *USE_EMAIL,
-            "invite_only": *INVITE_ONLY,
+            invite_only: *INVITE_ONLY,
-            "autumn": {
+            autumn: Feature {
-                "enabled": *USE_AUTUMN,
+                enabled: *USE_AUTUMN,
-                "url": *AUTUMN_URL
+                url: AUTUMN_URL.to_string(),
             },
-            "january": {
+            january: Feature {
-                "enabled": *USE_JANUARY,
+                enabled: *USE_JANUARY,
-                "url": *JANUARY_URL
+                url: JANUARY_URL.to_string(),
             },
-            "voso": {
+            voso: VoiceFeature {
-                "enabled": *USE_VOSO,
+                enabled: *USE_VOSO,
-                "url": *VOSO_URL,
+                url: VOSO_URL.to_string(),
-                "ws": *VOSO_WS_HOST
+                ws: VOSO_WS_HOST.to_string(),
-            }
             },
-        "ws": *EXTERNAL_WS_URL,
+        },
-        "app": *APP_URL,
+        ws: EXTERNAL_WS_URL.to_string(),
-        "vapid": *VAPID_PUBLIC_KEY
+        app: APP_URL.to_string(),
-    })
+        vapid: VAPID_PUBLIC_KEY.to_string(),
+    }))
 }
 
+/// Example endpoint.
+#[openapi(skip)]
 #[get("/ping")]
-pub async fn ping(_limitguard: Ratelimiter) -> Status {
+pub async fn ping(/*_limitguard: Ratelimiter*/) -> Status {
     Status::Ok
 }

src/routes/servers/ban_create.rs

@@ -1,62 +1,59 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result, EmptyResponse};
+    models::{ServerBan, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Ban Information
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataBanCreate {
+    /// Ban reason
     #[validate(length(min = 1, max = 1024))]
     reason: Option<String>,
 }
 
+/// # Ban User
+///
+/// Ban a user by their id.
+#[openapi(tag = "Server Members")]
 #[put("/<server>/bans/<target>", data = "<data>")]
-pub async fn req(user: User, server: Ref, target: Ref, data: Json<Data>) -> Result<EmptyResponse> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    server: Ref,
+    target: Ref,
+    data: Json<DataBanCreate>,
+) -> Result<Json<ServerBan>> {
     let data = data.into_inner();
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let server = server.fetch_server().await?;
+    let server = server.as_server(db).await?;
 
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_server(&server)
-        .for_server()
-        .await?;
-
-    if !perm.get_ban_members() {
-        Err(Error::MissingPermission)?
-    }
-
-    let target = target.fetch_user().await?;
     if target.id == user.id {
-        return Err(Error::InvalidOperation);
+        return Err(Error::CannotRemoveYourself);
     }
 
     if target.id == server.owner {
-        return Err(Error::MissingPermission);
+        return Err(Error::InvalidOperation);
     }
 
-    let mut document = doc! {
+    let mut permissions = perms(&user).server(&server);
-        "_id": {
-            "server": &server.id,
-            "user": &target.id
-        }
-    };
 
-    if let Some(reason) = data.reason {
+    permissions
-        document.insert("reason", reason);
+        .throw_permission(db, Permission::BanMembers)
+        .await?;
+
+    let member = target.as_member(db, &server.id).await?;
+
+    if member.get_ranking(permissions.server.get().unwrap())
+        <= permissions.get_member_rank().unwrap_or(i64::MIN)
+    {
+        return Err(Error::NotElevated);
     }
 
-    get_collection("server_bans")
+    server.ban_member(db, member, data.reason).await.map(Json)
-        .insert_one(document, None)
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "insert_one",
-            with: "server_ban",
-        })?;
-
-    server.remove_member(&target.id, RemoveMember::Ban).await?;
-    Ok(EmptyResponse {})
 }

src/routes/servers/ban_list.rs

@@ -1,87 +1,67 @@
-use crate::database::*;
+use revolt_quark::models::{File, ServerBan, User};
-use crate::util::result::{Error, Result};
+use revolt_quark::{perms, Db, Permission, Ref, Result};
 
-use futures::StreamExt;
+use rocket::serde::json::Json;
-use mongodb::options::FindOptions;
+use serde::{Deserialize, Serialize};
-use serde::{Serialize, Deserialize};
-use rocket::serde::json::Value;
-use mongodb::bson::{doc, from_document};
 
-#[derive(Serialize, Deserialize)]
+/// # Banned User
+///
+/// Just enoguh user information to list bans.
+#[derive(Serialize, Deserialize, JsonSchema)]
 struct BannedUser {
-    _id: String,
+    /// Id of the banned user
-    username: String,
+    #[serde(rename = "_id")]
-    avatar: Option<File>
+    pub id: String,
+    /// Username of the banned user
+    pub username: String,
+    /// Avatar of the banned user
+    pub avatar: Option<File>,
 }
 
-#[get("/<target>/bans")]
+/// # Ban List Result
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+#[derive(Serialize, Deserialize, JsonSchema)]
-    let target = target.fetch_server().await?;
+pub struct BanListResult {
+    /// Users objects
+    users: Vec<BannedUser>,
+    /// Ban objects
+    bans: Vec<ServerBan>,
+}
 
-    let perm = permissions::PermissionCalculator::new(&user)
+impl From<User> for BannedUser {
-        .with_server(&target)
+    fn from(user: User) -> Self {
-        .for_server()
+        BannedUser {
+            id: user.id,
+            username: user.username,
+            avatar: user.avatar,
+        }
+    }
+}
+
+/// # Fetch Bans
+///
+/// Fetch all bans on a server.
+#[openapi(tag = "Server Members")]
+#[get("/<target>/bans")]
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<BanListResult>> {
+    let server = target.as_server(db).await?;
+    perms(&user)
+        .server(&server)
+        .throw_permission(db, Permission::BanMembers)
         .await?;
 
-    if !perm.get_ban_members() {
+    let bans = db.fetch_bans(&server.id).await?;
-        return Err(Error::MissingPermission);
+    let users = db
-    }
+        .fetch_users(
-
+            &bans
-    let mut cursor = get_collection("server_bans")
+                .iter()
-        .find(
+                .map(|x| &x.id.user)
-            doc! {
+                .cloned()
-                "_id.server": target.id
+                .collect::<Vec<String>>(),
-            },
-            None,
         )
-        .await
+        .await?
-        .map_err(|_| Error::DatabaseError {
+        .into_iter()
-            operation: "find",
+        .map(|x| x.into())
-            with: "server_bans",
+        .collect();
-        })?;
 
-    let mut bans = vec![];
+    Ok(Json(BanListResult { users, bans }))
-    let mut user_ids = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(ban) = from_document::<Ban>(doc) {
-                user_ids.push(ban.id.user.clone());
-                bans.push(ban);
-            }
-        }
-    }
-
-    let mut cursor = get_collection("users")
-        .find(
-            doc! {
-                "_id": {
-                    "$in": user_ids
-                }
-            },
-            FindOptions::builder()
-                .projection(doc! {
-                    "username": 1,
-                    "avatar": 1
-                })
-                .build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "users",
-        })?;
-
-    let mut users = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(user) = from_document::<BannedUser>(doc) {
-                users.push(user);
-            }
-        }
-    }
-
-    Ok(json!({
-        "users": users,
-        "bans": bans
-    }))
 }

src/routes/servers/ban_remove.rs

@@ -1,43 +1,17 @@
-use crate::database::*;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
-use crate::util::result::{Error, Result, EmptyResponse};
-
-use mongodb::bson::doc;
 
+/// # Unban user
+///
+/// Remove a user's ban.
+#[openapi(tag = "Server Members")]
 #[delete("/<server>/bans/<target>")]
-pub async fn req(user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
+pub async fn req(db: &Db, user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
-    let server = server.fetch_server().await?;
+    let server = server.as_server(db).await?;
-
+    perms(&user)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .server(&server)
-        .with_server(&server)
+        .throw_permission(db, Permission::BanMembers)
-        .for_server()
         .await?;
 
-    if !perm.get_ban_members() {
+    let ban = target.as_ban(db, &server.id).await?;
-        Err(Error::MissingPermission)?
+    db.delete_ban(&ban.id).await.map(|_| EmptyResponse)
-    }
-
-    if target.id == user.id {
-        return Err(Error::InvalidOperation);
-    }
-
-    if target.id == server.owner {
-        return Err(Error::MissingPermission);
-    }
-
-    let target = target.fetch_ban(&server.id).await?;
-    get_collection("server_bans")
-        .delete_one(
-            doc! {
-                "_id.server": &server.id,
-                "_id.user": &target.id.user
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "delete_one",
-            with: "server_ban",
-        })?;
-
-    Ok(EmptyResponse {})
 }

src/routes/servers/channel_create.rs

@@ -1,19 +1,22 @@
 use std::collections::HashMap;
 
-use crate::database::*;
+use revolt_quark::{
-use crate::util::idempotency::IdempotencyKey;
+    models::{server::PartialServer, Channel, User},
-use crate::util::result::{Error, Result};
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::bson::doc;
+use rocket::serde::json::Json;
-use rocket::serde::json::{Json, Value};
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Serialize, Deserialize)]
+/// # Channel Type
+#[derive(Serialize, Deserialize, JsonSchema)]
 enum ChannelType {
+    /// Text Channel
     Text,
-    Voice
+    /// Voice Channel
+    Voice,
 }
 
 impl Default for ChannelType {
@@ -22,83 +25,96 @@ impl Default for ChannelType {
     }
 }
 
-#[derive(Validate, Serialize, Deserialize)]
+/// # Channel Data
-pub struct Data {
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataCreateChannel {
+    /// Channel type
     #[serde(rename = "type", default = "ChannelType::default")]
     channel_type: ChannelType,
+    /// Channel name
     #[validate(length(min = 1, max = 32))]
     name: String,
+    /// Channel description
     #[validate(length(min = 0, max = 1024))]
     description: Option<String>,
+    /// Whether this channel is age restricted
     #[serde(skip_serializing_if = "Option::is_none")]
     nsfw: Option<bool>,
 }
 
+/// # Create Channel
+///
+/// Create a new Text or Voice channel.
+#[openapi(tag = "Server Information")]
 #[post("/<target>/channels", data = "<info>")]
-pub async fn req(_idempotency: IdempotencyKey, user: User, target: Ref, info: Json<Data>) -> Result<Value> {
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    info: Json<DataCreateChannel>,
+) -> Result<Json<Channel>> {
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let target = target.fetch_server().await?;
+    let mut server = target.as_server(db).await?;
-    let perm = permissions::PermissionCalculator::new(&user)
+    perms(&user)
-        .with_server(&target)
+        .server(&server)
-        .for_server()
+        .throw_permission(db, Permission::ManageChannel)
         .await?;
 
-    if !perm.get_manage_channels() {
-        Err(Error::MissingPermission)?
-    }
-
     let id = Ulid::new().to_string();
-    let channel = match info.channel_type {
+    let mut channels = server.channels.clone();
-        ChannelType::Text => Channel::TextChannel {
+    channels.push(id.clone());
-            id: id.clone(),
+
-            server: target.id.clone(),
+    let DataCreateChannel {
+        name,
+        description,
+        nsfw,
+        channel_type,
+    } = info;
+    let channel = match channel_type {
+        ChannelType::Text => Channel::TextChannel {
+            id,
+            server: server.id.clone(),
+
+            name,
+            description,
 
-            name: info.name,
-            description: info.description,
             icon: None,
             last_message_id: None,
 
             default_permissions: None,
             role_permissions: HashMap::new(),
 
-            nsfw: info.nsfw.unwrap_or_default(),
+            nsfw: nsfw.unwrap_or(false),
         },
         ChannelType::Voice => Channel::VoiceChannel {
-            id: id.clone(),
+            id,
-            server: target.id.clone(),
+            server: server.id.clone(),
 
-            name: info.name,
+            name,
-            description: info.description,
+            description,
             icon: None,
 
             default_permissions: None,
             role_permissions: HashMap::new(),
 
-            nsfw: info.nsfw.unwrap_or_default()
+            nsfw: nsfw.unwrap_or(false),
-        }
+        },
     };
 
-    channel.clone().publish().await?;
+    channel.create(db).await?;
-    get_collection("servers")
+    server
-        .update_one(
+        .update(
-            doc! {
+            db,
-                "_id": target.id
+            PartialServer {
+                channels: Some(channels),
+                ..Default::default()
             },
-            doc! {
+            vec![],
-                "$addToSet": {
-                    "channels": id
-                }
-            },
-            None,
         )
-        .await
+        .await?;
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "server",
-        })?;
 
-    Ok(json!(channel))
+    Ok(Json(channel))
 }

src/routes/servers/invites_fetch.rs

@@ -1,53 +1,21 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::{Invite, User},
+    perms, Db, Permission, Ref, Result,
+};
 
-use futures::StreamExt;
+use rocket::serde::json::Json;
-use mongodb::bson::{doc, from_document};
-use rocket::serde::json::Value;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ServerInvite {
-    #[serde(rename = "_id")]
-    code: String,
-    creator: String,
-    channel: String,
-}
 
+/// # Fetch Invites
+///
+/// Fetch all server invites.
+#[openapi(tag = "Server Members")]
 #[get("/<target>/invites")]
-pub async fn req(user: User, target: Ref) -> Result<Value> {
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<Invite>>> {
-    let target = target.fetch_server().await?;
+    let server = target.as_server(db).await?;
-
+    perms(&user)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .server(&server)
-        .with_server(&target)
+        .throw_permission(db, Permission::ManageServer)
-        .for_server()
         .await?;
 
-    if !perm.get_manage_server() {
+    db.fetch_invites_for_server(&server.id).await.map(Json)
-        Err(Error::MissingPermission)?
-    }
-
-    let mut cursor = get_collection("channel_invites")
-        .find(
-            doc! {
-                "server": target.id
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find",
-            with: "channel_invites",
-        })?;
-
-    let mut invites = vec![];
-    while let Some(result) = cursor.next().await {
-        if let Ok(doc) = result {
-            if let Ok(invite) = from_document::<Invite>(doc) {
-                invites.push(invite);
-            }
-        }
-    }
-
-    Ok(json!(invites))
 }