chore: bump quark revision

closes #102

.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

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+ko_fi: insertish
+custom: https://insrt.uk/donate

.github/workflows/docker.yml

@@ -0,0 +1,103 @@
+name: Docker
+
+on:
+    push:
+        branches:
+            - "master"
+        tags:
+            - "*"
+        paths-ignore:
+            - ".github/**"
+            - "!.github/workflows/docker.yml"
+            - ".vscode/**"
+            - ".gitignore"
+            - ".gitlab-ci.yml"
+            - "LICENSE"
+            - "README"
+    pull_request:
+        branches:
+            - "master"
+        paths:
+            - "Dockerfile"
+    workflow_dispatch:
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        strategy:
+          matrix:
+            architecture: [linux/amd64]
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: "recursive"
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v1
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v1
+            - name: Cache Docker layers
+              uses: actions/cache@v2
+              with:
+                path: /tmp/.buildx-cache/${{ matrix.architecture }}
+                key: ${{ runner.os }}-buildx-${{ matrix.architecture }}-${{ github.sha }}
+            - name: Build
+              uses: docker/build-push-action@v2
+              with:
+                  context: .
+                  platforms: ${{ matrix.architecture }}
+                  cache-from: type=local,src=/tmp/.buildx-cache/${{ matrix.architecture }}
+                  cache-to: type=local,dest=/tmp/.buildx-cache-new/${{ matrix.architecture }},mode=max
+            - name: Move cache
+              run: |
+                rm -rf /tmp/.buildx-cache/${{ matrix.architecture }}
+                mv /tmp/.buildx-cache-new/${{ matrix.architecture }} /tmp/.buildx-cache/${{ matrix.architecture }}
+
+    publish_amd64:
+        needs: [test]
+        runs-on: ubuntu-latest
+        if: github.event_name != 'pull_request'
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: "recursive"
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v1
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v1
+            - name: Cache amd64 Docker layers
+              uses: actions/cache@v2
+              with:
+                path: /tmp/.buildx-cache/linux/amd64
+                key: ${{ runner.os }}-buildx-linux/amd64-${{ github.sha }}
+            - name: Docker meta
+              id: meta
+              uses: docker/metadata-action@v3
+              with:
+                  images: revoltchat/server, ghcr.io/revoltchat/server
+            - name: Login to DockerHub
+              uses: docker/login-action@v1
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - name: Login to Github Container Registry
+              uses: docker/login-action@v1
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+            - name: Build and publish
+              uses: docker/build-push-action@v2
+              with:
+                  context: .
+                  push: true
+                  platforms: linux/amd64
+                  tags: ${{ steps.meta.outputs.tags }}
+                  labels: ${{ steps.meta.outputs.labels }}
+                  cache-from: type=local,src=/tmp/.buildx-cache/linux/amd64
+                  cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+            - name: Move cache
+              run: |
+               rm -rf /tmp/.buildx-cache
+               mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/rust.yaml

@@ -0,0 +1,33 @@
+name: Rust build and test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Rust project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            override: true
+            components: rustfmt, clippy
+
+      - name: Run cargo build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+      
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test

.github/workflows/triage_issue.yml

@@ -0,0 +1,49 @@
+name: Add Issue to Board
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  track_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            query {
+              organization(login: "revoltchat"){
+                projectNext(number: 3) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add issue to project
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          item_id="$( gh api graphql -f query='
+            mutation($project:ID!, $issue:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV

.github/workflows/triage_pr.yml

@@ -0,0 +1,72 @@
+name: Add PR to Board
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, ready_for_review, review_requested]
+
+jobs:
+  track_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            query {
+              organization(login: "revoltchat"){
+                projectNext(number: 3) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Incoming PRs") |.id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add PR to project
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          PR_ID: ${{ github.event.pull_request.node_id }}
+        run: |
+          item_id="$( gh api graphql -f query='
+            mutation($project:ID!, $pr:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $pr}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+
+      - name: Set fields
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $status_field: ID!
+              $status_value: String!
+            ) {
+              set_status: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $status_field
+                value: $status_value
+              }) {
+                projectNextItem {
+                  id
+                  }
+              }
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.INCOMING_OPTION_ID }} --silent

.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

@@ -10,39 +10,59 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-regex = "1"
+# Utility
-md5 = "0.7.0"
+lru = "0.7.0"
+url = "2.2.2"
 log = "0.4.11"
-ulid = "0.4.1"
-rand = "0.7.3"
-time = "0.2.16"
-nanoid = "0.4.0"
-base64 = "0.13.0"
-linkify = "0.6.0"
 dotenv = "0.15.0"
-futures = "0.3.8"
+dashmap = "5.2.0"
-chrono = "0.4.15"
+linkify = "0.6.0"
+once_cell = "1.4.1"
+env_logger = "0.7.1"
+lazy_static = "1.4.0"
+ctrlc = { version = "3.0", features = ["termination"] }
+
+# Lang. Utilities
+regex = "1"
 num_enum = "0.5.1"
 impl_ops = "0.1.1"
-web-push = "0.7.2"
-once_cell = "1.4.1"
 bitfield = "0.13.2"
-env_logger = "0.7.1"
+
+# ID / key generation
+ulid = "0.4.1"
+nanoid = "0.4.0"
+
+# serde
 serde_json = "1.0.57"
-lazy_static = "1.4.0"
-urlencoding = "1.1.1"
-many-to-many = "0.1.2"
-lettre = "0.10.0-alpha.1"
-reqwest = { version = "0.10.8", features = ["json"] }
 serde = { version = "1.0.115", features = ["derive"] }
-validator = { version = "0.11", features = ["derive"] }
+validator = { version = "0.14", features = ["derive"] }
-ctrlc = { version = "3.0", features = ["termination"] }
+
-hive_pubsub = { version = "0.4.4", features = ["mongo"] }
+# async
-async-std = { version = "1.8.0", features = ["tokio02", "attributes"] }
+futures = "0.3.8"
-async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
+chrono = "0.4.15"
-rocket_cors = { git = "https://github.com/insertish/rocket_cors", branch = "master" }
+async-channel = "1.6.1"
-mongodb = { version = "1.1.1", features = ["tokio-runtime"], default-features = false }
+reqwest = { version = "0.11.4", features = ["json"] }
-rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "1db825a0059639144ea8802f6d51b5d27c5b986e" }
+async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
-rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00" }
+
-rocket_prometheus = { git = "https://github.com/insertish/rocket_prometheus", rev = "3d825aedb42793246c306a81fe67c5b187948983" }
+# internal util
-rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "031948c1daaa146128d8a435be116476f2adde00", default-features = false }
+lettre = "0.10.0-alpha.4"
+rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
+
+# redis
+redis = { version = "0.21.2", features = ["async-std-comp"] }
+mobc = { version = "0.7.3" }
+mobc-redis = { version = "0.7.0", default-features = false, features = ["async-std-comp"] }
+
+# web
+rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
+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 = "68403fb55912de9ad98257741b8c93ce165b7abf" }
+# revolt-quark = { path = "../quark" }

Dockerfile

@@ -1,25 +1,22 @@
 # Build Stage
-FROM ekidd/rust-musl-builder:nightly-2021-01-01 AS builder
+FROM rustlang/rust:nightly-slim AS builder
 USER 0:0
 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 cargo build --release --bin dummy
 
-COPY assets/templates ./assets/templates
+COPY Cargo.toml Cargo.lock ./
+COPY assets ./assets
 COPY src ./src
-RUN cargo build --release
+RUN cargo install --locked --path .
 
 # Bundle Stage
-FROM alpine:latest
+FROM debian:buster-slim
-RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN apt-get update && apt-get install -y ca-certificates
-COPY --from=builder /home/rust/src/revolt/target/x86_64-unknown-linux-musl/release/revolt ./
+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

@@ -1,178 +1,178 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
+Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
+The GNU Affero General Public License is a free, copyleft license for
 software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
 
-  The licenses for most software and other practical works are designed
+The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+to take away your freedom to share and change the works. By contrast,
 our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.
 
-  When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
+price. Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
+Developers that use our General Public Licenses protect your rights
 with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
 
-  A secondary benefit of defending all users' freedom is that
+A secondary benefit of defending all users' freedom is that
 improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
+incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
+encouraged by the resulting cooperation. However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
 
-  The GNU Affero General Public License is designed specifically to
+The GNU Affero General Public License is designed specifically to
 ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
+to the community. It requires the operator of a network server to
 provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
+users of that server. Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
 
-  An older license, called the Affero General Public License and
+An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
+published by Affero, was designed to accomplish similar goals. This is
 a different license, not a version of the Affero GPL, but Affero has
 released a new version of the Affero GPL which permits relicensing under
 this license.
 
-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.
 
                        TERMS AND CONDITIONS
 
-  0. Definitions.
+0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+"This License" refers to version 3 of the GNU Affero General Public License.
 
-  "Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
 
-  "The Program" refers to any copyrightable work licensed under this
+"The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
+License. Each licensee is addressed as "you". "Licensees" and
 "recipients" may be individuals or organizations.
 
-  To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
+exact copy. The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
 
-  A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based
 on the Program.
 
-  To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
+computer or modifying a private copy. Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
 
-  To "convey" a work means any kind of propagation that enables other
+To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
+parties to make or receive copies. Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
 
-  An interactive user interface displays "Appropriate Legal Notices"
+An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
+work under this License, and how to view a copy of this License. If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
 
-  1. Source Code.
+1. Source Code.
 
-  The "source code" for a work means the preferred form of the work
+The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
+for making modifications to it. "Object code" means any non-source
 form of a work.
 
-  A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
 
-  The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
+implementation is available to the public in source code form. A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
 
-  The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
+control those activities. However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
+which are not part of the work. For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
 
-  The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
 
-  The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that
 same work.
 
-  2. Basic Permissions.
+2. Basic Permissions.
 
-  All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
+conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
+permission to run the unmodified Program. The output from running a
 covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
+content, constitutes a covered work. This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
 
-  You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
+in force. You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
+not control copyright. Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
 
-  Conveying under any other circumstances is permitted solely under
+Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
+the conditions stated below. Sublicensing is not allowed; section 10
 makes it unnecessary.
 
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-  No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
 
-  When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
@@ -180,9 +180,9 @@ modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
 
-  4. Conveying Verbatim Copies.
+4. Conveying Verbatim Copies.
 
-  You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
@@ -190,12 +190,12 @@ non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
 
-  You may charge any price or no price for each copy that you convey,
+You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
 
-  5. Conveying Modified Source Versions.
+5. Conveying Modified Source Versions.
 
-  You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
 
@@ -220,19 +220,19 @@ terms of section 4, provided that you also meet all of these conditions:
     interfaces that do not display Appropriate Legal Notices, your
     work need not make them do so.
 
-  A compilation of a covered work with other separate and independent
+A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
+beyond what the individual works permit. Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
 
-  6. Conveying Non-Source Forms.
+6. Conveying Non-Source Forms.
 
-  You may convey a covered work in object code form under the terms
+You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
@@ -278,75 +278,75 @@ in one of these ways:
     Source of the work are being offered to the general public at no
     charge under subsection 6d.
 
-  A separable portion of the object code, whose source code is excluded
+A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
 
-  A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
+into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
+doubtful cases shall be resolved in favor of coverage. For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
+actually uses, or expects or is expected to use, the product. A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
 
-  "Installation Information" for a User Product means any methods,
+"Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
+a modified version of its Corresponding Source. The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
 
-  If you convey an object code work under this section in, or with, or
+If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
+by the Installation Information. But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
 
-  The requirement to provide Installation Information does not include a
+The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
+the User Product in which it has been modified or installed. Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
 
-  Corresponding Source conveyed, and Installation Information provided,
+Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
 
-  7. Additional Terms.
+7. Additional Terms.
 
-  "Additional permissions" are terms that supplement the terms of this
+"Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
+that they are valid under applicable law. If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
 
-  When you convey a copy of a covered work, you may at your option
+When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
+it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
+removal in certain cases when you modify the work.) You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
 
-  Notwithstanding any other provision of this License, for material you
+Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
 
@@ -373,74 +373,74 @@ that material) supplement the terms of this License with terms:
     any liability that these contractual assumptions directly impose on
     those licensors and authors.
 
-  All other non-permissive additional terms are considered "further
+All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
+restrictions" within the meaning of section 10. If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
+restriction, you may remove that term. If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
 
-  If you add terms to a covered work in accord with this section, you
+If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
 
-  Additional terms, permissive or non-permissive, may be stated in the
+Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
 
-  8. Termination.
+8. Termination.
 
-  You may not propagate or modify a covered work except as expressly
+You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
+provided under this License. Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
 
-  However, if you cease all violation of this License, then your
+However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
 
-  Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
 
-  Termination of your rights under this section does not terminate the
+Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
+this License. If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
 
-  9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.
 
-  You are not required to accept this License in order to receive or
+You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
+run a copy of the Program. Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
+to receive a copy likewise does not require acceptance. However,
 nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
+modify any covered work. These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
+not accept this License. Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
 
-  10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.
 
-  Each time you convey a covered work, the recipient automatically
+Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
+propagate that work, subject to this License. You are not responsible
 for enforcing compliance by third parties with this License.
 
-  An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
+organization, or merging organizations. If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
@@ -448,43 +448,43 @@ give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
 
-  You may not impose any further restrictions on the exercise of the
+You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
+rights granted or affirmed under this License. For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
 
-  11. Patents.
+11. Patents.
 
-  A "contributor" is a copyright holder who authorizes use under this
+A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
+License of the Program or a work on which the Program is based. The
 work thus licensed is called the contributor's "contributor version".
 
-  A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
+consequence of further modification of the contributor version. For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
 
-  In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
+sue for patent infringement). To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
 
-  If you convey a covered work, knowingly relying on a patent license,
+If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
@@ -492,13 +492,13 @@ then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
+license to downstream recipients. "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
 
-  If, pursuant to or in connection with a single transaction or
+If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
@@ -506,10 +506,10 @@ or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
 
-  A patent license is "discriminatory" if it does not include within
+A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
+specifically granted under this License. You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
@@ -521,83 +521,83 @@ for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
 
-  Nothing in this License shall be construed as excluding or limiting
+Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
 
-  12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.
 
-  If conditions are imposed on you (whether by court order, agreement or
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License. If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
+not convey it at all. For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
+13. Remote Network Interaction; Use with the GNU General Public License.
 
-  Notwithstanding any other provision of this License, if you modify the
+Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
+means of facilitating copying of software. This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
 
-  Notwithstanding any other provision of this License, you have
+Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
+combined work, and to convey the resulting work. The terms of this
 License will continue to apply to the part which is the covered work,
 but the work with which it is combined will remain governed by version
 3 of the GNU General Public License.
 
-  14. Revised Versions of this License.
+14. Revised Versions of this License.
 
-  The Free Software Foundation may publish revised and/or new versions of
+The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
+the GNU Affero General Public License from time to time. Such new versions
 will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the
 Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
+Foundation. If the Program does not specify a version number of the
 GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
-  If the Program specifies that a proxy can decide which future
+If the Program specifies that a proxy can decide which future
 versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
-  Later license versions may give you additional or different
+Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
+permissions. However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
 
-  15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.
 
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-  16. Limitation of Liability.
+16. Limitation of Liability.
 
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
@@ -607,9 +607,9 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
 
-  17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.
 
-  If the disclaimer of warranty and limitation of liability provided
+If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
@@ -620,17 +620,17 @@ copy of the Program in return for a fee.
 
             How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    Server
+    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
@@ -647,15 +647,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
+If your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
+get its source. For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
+of the code. There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
 
-  You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.

README.md

@@ -1,20 +1,45 @@
-![](assets/banner.png)
+# Delta
 
-Delta is a **blazing fast API server** built with Rust for the REVOLT platform.
+## Description
+
+Delta is the API server for the Revolt platform.
+
+**Features:**
 
-Features:
 - Robust and efficient API routes for running a chat platform.
 - Distributed notification system, allowing any node to be seamlessly connected.
 - Simple deployment, based mostly on pure Rust code and libraries.
 - Hooks up to a MongoDB deployment, provide URI and no extra work needed.
 
-## Docker Helper Scripts
+## Stack
 
-If you have Docker installed, you can use the helper scripts to deploy Revolt in your development environment.
+- [Rocket](https://rocket.rs/) (REST)
+- [Async Tungstenite](https://github.com/sdroege/async-tungstenite) (WebSockets)
+- [MongoDB](https://mongodb.com/)
 
-```bash
+## Resources
-./build.sh   # build Docker image
+
-./run.sh     # run Docker container
+### Revolt
-./monitor.sh # view container logs
+
-./remove.sh  # kill and remove container
+- [Revolt Project Board](https://github.com/revoltchat/revolt/discussions) (Submit feature requests here)
-```
+- [Revolt Testers Server](https://app.revolt.chat/invite/Testers)
+- [Contribution Guide](https://developers.revolt.chat/contributing)
+
+## CLI Commands
+
+| Command            | Description                                                                               |
+| ------------------ | ----------------------------------------------------------------------------------------- |
+| `./publish.sh`     | Publish a Docker Image.                                                                   |
+| `./set_version.sh` | Update the version. **Not intended for PR use.**                                          |
+| `cargo build`      | Build/compile Delta.                                                                      |
+| `cargo run`        | Run Delta.                                                                                |
+| `cargo fmt`        | Format Delta. Not intended for PR use to avoid accidentally formatting unformatted files. |
+
+## Contributing
+
+The contribution guide is located at [developers.revolt.chat/contributing](https://developers.revolt.chat/contributing).
+Please note that a pull request should only take care of one issue so that we can review it quickly.
+
+## License
+
+Delta is licensed under the [GNU Affero General Public License v3.0](https://github.com/revoltchat/delta/blob/master/LICENSE).

assets/templates/reset.html

@@ -4,57 +4,58 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>Reset your password.</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
+	
 	<style type="text/css">
 		a[x-apple-data-detectors] {color: inherit !important;}
 	</style>
-
+	
 </head>
 <body style="margin: 0; padding: 0;">
-	<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<table border="0" cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td style="padding: 20px 0 30px 0;">
-
+				
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
+				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
-	<tr>
+					<tr>
-		<td align="center" bgcolor="#ff4654">
+						<td align="center" bgcolor="#ff4654">
-			<img src="https://revolt.chat/header.png" alt="REVOLT logo" width="600" height="168" style="display: block;" />
+							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
-		</td>
+						</td>
-	</tr>
+					</tr>
-	<tr>
+					<tr>
-		<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
+						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
-			<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-				<tr>
+								<tr>
-					<td style="color: #153643; font-family: Arial, sans-serif;">
+									<td style="color: #153643; font-family: Arial, sans-serif;">
-						<h1 style="font-size: 24px; margin: 0;">Reset your password!</h1>
+										<h1 style="font-size: 24px; margin: 0;">Reset your password!</h1>
-					</td>
+									</td>
-				</tr>
+								</tr>
-				<tr>
+								<tr>
-					<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
+									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
-						<p style="margin: 0;">
+										<p>
-              Reset your password by <a href="{{url}}">clicking here</a>.
+											You requested a password reset, if you didn't perform this action you can safely ignore this email.
-            </p>
+										</p>
-            <p>
+										<p style="margin: 0;">
-              Or by manually navigating to the URL: {{url}}
+											Reset your password by navigating to <a href="{{url}}">{{url}}</a>.
-            </p>
+										</p>
-					</td>
+									</td>
-				</tr>
+								</tr>
-			</table>
+							</table>
-		</td>
+						</td>
-	</tr>
+					</tr>
-	<tr>
+					<tr>
-		<td bgcolor="#ff4654" style="padding: 30px 30px;">
+						<td bgcolor="#ff4654" style="padding: 30px 30px;">
-    		<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-				<tr>
+								<tr>
-					<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
+									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
-            <p style="margin: 0;">Sent by REVOLT. &middot; <a style="color: white;" href="https://revolt.chat">Website</a> &middot; <a style="color: white;" href="https://gitlab.insrt.uk/revolt">Source Code</a></p>
+										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
-					</td>
+										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
-				</tr>
+									</td>
-			</table>
+								</tr>
-		</td>
+							</table>
-	</tr>
+						</td>
-</table>
+					</tr>
-
+				</table>
+				
 			</td>
 		</tr>
 	</table>

assets/templates/reset.txt

@@ -0,0 +1,5 @@
+You requested a password reset, if you did not perform this action you can safely ignore this email.
+
+Reset your password here: {{url}}
+
+Sent by Revolt.

assets/templates/reset_plain.html

@@ -0,0 +1,14 @@
+<h2>Reset your password.</h2>
+<p>
+    You requested a password reset, if you did not perform this action you can safely ignore this email.
+</p>
+<p>
+    Reset your password here: <a href="{{url}}">{{url}}</a>
+</p>
+<br/>
+<p>
+   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
+</p>
+<p>
+    Revolt is a user-first chat platform built with modern web technologies.
+</p>

assets/templates/verify.html

@@ -4,57 +4,58 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>Verify your account.</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
+	
 	<style type="text/css">
 		a[x-apple-data-detectors] {color: inherit !important;}
 	</style>
-
+	
 </head>
 <body style="margin: 0; padding: 0;">
-	<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+	<table border="0" cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td style="padding: 20px 0 30px 0;">
-
+				
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
+				<table align="center" border="0" cellpadding="0" cellspacing="0" width="600" style="border-collapse: collapse; border: 1px solid #cccccc;">
-	<tr>
+					<tr>
-		<td align="center" bgcolor="#ff4654">
+						<td align="center" bgcolor="#ff4654">
-			<img src="https://revolt.chat/header.png" alt="REVOLT logo" width="600" height="168" style="display: block;" />
+							<img src="https://revolt.chat/header.png" alt="Revolt logo" width="600" height="168" style="display: block;" />
-		</td>
+						</td>
-	</tr>
+					</tr>
-	<tr>
+					<tr>
-		<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
+						<td bgcolor="#ffffff" style="padding: 40px 30px 40px 30px;">
-			<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-				<tr>
+								<tr>
-					<td style="color: #153643; font-family: Arial, sans-serif;">
+									<td style="color: #153643; font-family: Arial, sans-serif;">
-						<h1 style="font-size: 24px; margin: 0;">Verify your account!</h1>
+										<h1 style="font-size: 24px; margin: 0;">You're almost there!</h1>
-					</td>
+									</td>
-				</tr>
+								</tr>
-				<tr>
+								<tr>
-					<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
+									<td style="color: #153643; font-family: Arial, sans-serif; font-size: 16px; line-height: 24px; padding: 20px 0 0 0;">
-						<p style="margin: 0;">
+										<p>
-              Please verify your account by <a href="{{url}}">clicking here</a>.
+											Verify your account to be able to log into the platform. If you didn't perform this action you can safely ignore this email.
-            </p>
+										</p>
-            <p>
+										<p style="margin: 0;">
-              Or by manually navigating to the URL: {{url}}
+											Please verify your account by navigating to <a href="{{url}}">{{url}}</a>.
-            </p>
+										</p>
-					</td>
+									</td>
-				</tr>
+								</tr>
-			</table>
+							</table>
-		</td>
+						</td>
-	</tr>
+					</tr>
-	<tr>
+					<tr>
-		<td bgcolor="#ff4654" style="padding: 30px 30px;">
+						<td bgcolor="#ff4654" style="padding: 30px 30px;">
-    		<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
+							<table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
-				<tr>
+								<tr>
-					<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
+									<td style="color: #ffffff; font-family: Arial, sans-serif; font-size: 14px;">
-            <p style="margin: 0;">Sent by REVOLT. &middot; <a style="color: white;" href="https://revolt.chat">Website</a> &middot; <a style="color: white;" href="https://gitlab.insrt.uk/revolt">Source Code</a></p>
+										<p style="margin: 0;">Sent by Revolt. &middot; Website: <a style="color: white;" href="https://revolt.chat">https://revolt.chat</a></p>
-					</td>
+										<p>Revolt is a user-first chat platform built with modern web technologies.</p>
-				</tr>
+									</td>
-			</table>
+								</tr>
-		</td>
+							</table>
-	</tr>
+						</td>
-</table>
+					</tr>
-
+				</table>
+				
 			</td>
 		</tr>
 	</table>

assets/templates/verify.txt

@@ -0,0 +1,6 @@
+You're almost there!
+If you did not perform this action you can safely ignore this email.
+
+Please verify your account here: {{url}}
+
+Sent by Revolt.

assets/templates/verify_plain.html

@@ -0,0 +1,15 @@
+<h2>You're almost there!</h2>
+<p>
+    Verify your account to be able to log into the platform.<br/>
+    If you did not perform this action you can safely ignore this email.
+</p>
+<p>
+    Please verify your account here: <a href="{{url}}">{{url}}</a>
+</p>
+<br/>
+<p>
+   Sent by Revolt. · Website: <a href="https://revolt.chat">https://revolt.chat</a>
+</p>
+<p>
+    Revolt is a user-first chat platform built with modern web technologies.
+</p>

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.0-alpha.5
+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/channel.rs

@@ -1,286 +0,0 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use futures::StreamExt;
-use mongodb::{
-    bson::{doc, to_document, Document},
-    options::FindOptions,
-};
-use rocket_contrib::json::JsonValue;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct LastMessage {
-    #[serde(rename = "_id")]
-    id: String,
-    author: String,
-    short: String,
-}
-
-#[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: Option<LastMessage>,
-    },
-    Group {
-        #[serde(rename = "_id")]
-        id: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        nonce: Option<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: Option<LastMessage>,
-    },
-    TextChannel {
-        #[serde(rename = "_id")]
-        id: String,
-        server: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        nonce: Option<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: Option<String>,
-    },
-}
-
-impl Channel {
-    pub fn id(&self) -> &str {
-        match self {
-            Channel::SavedMessages { id, .. }
-            | Channel::DirectMessage { id, .. }
-            | Channel::Group { id, .. }
-            | Channel::TextChannel { id, .. } => id,
-        }
-    }
-
-    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: JsonValue) -> Result<()> {
-        let id = self.id().to_string();
-        ClientboundNotification::ChannelUpdate {
-            id: id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(id);
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        let id = self.id();
-        let messages = get_collection("messages");
-
-        // Delete any invites.
-        get_collection("channel_invites")
-            .delete_many(
-                doc! {
-                    "channel": id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "channel_invites",
-            })?;
-
-        // 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_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "messages",
-            })?;
-
-        // Remove from server object.
-        if let Channel::TextChannel { server, .. } = &self {
-            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(())
-    }
-}

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,420 +0,0 @@
-use crate::util::variables::{USE_JANUARY, VAPID_PRIVATE_KEY};
-use crate::{
-    database::*,
-    notifications::{events::ClientboundNotification, websocket::is_online},
-    util::result::{Error, Result},
-};
-
-use futures::StreamExt;
-use mongodb::options::UpdateOptions;
-use mongodb::{
-    bson::{doc, to_bson, DateTime},
-    options::FindOptions,
-};
-use rocket_contrib::json::JsonValue;
-use serde::{Deserialize, Serialize};
-use ulid::Ulid;
-use web_push::{
-    ContentEncoding, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
-};
-
-#[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 },
-}
-
-#[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,
-        )
-        .publish(&target)
-        .await
-    }
-}
-
-#[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>>,
-}
-
-impl Message {
-    pub fn create(
-        author: String,
-        channel: String,
-        content: Content,
-        mentions: Option<Vec<String>>,
-    ) -> Message {
-        Message {
-            id: Ulid::new().to_string(),
-            nonce: None,
-            channel,
-            author,
-
-            content,
-            attachments: None,
-            edited: None,
-            embeds: None,
-            mentions,
-        }
-    }
-
-    pub async fn publish(self, channel: &Channel) -> Result<()> {
-        get_collection("messages")
-            .insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "insert_one",
-                with: "message",
-            })?;
-
-        // ! FIXME: all this code is legitimately crap
-        // ! rewrite when can be asked
-
-        let ss = self.clone();
-        let c_clone = channel.clone();
-        async_std::task::spawn(async move {
-            let mut set = if let Content::Text(text) = &ss.content {
-                doc! {
-                    "last_message": {
-                        "_id": ss.id.clone(),
-                        "author": ss.author.clone(),
-                        "short": text.chars().take(128).collect::<String>()
-                    }
-                }
-            } else {
-                doc! {}
-            };
-
-            // ! MARK AS ACTIVE
-            // ! FIXME: temp code
-            let channels = get_collection("channels");
-            match &c_clone {
-                Channel::DirectMessage { id, .. } => {
-                    set.insert("active", true);
-                    channels
-                        .update_one(
-                            doc! { "_id": id },
-                            doc! {
-                                "$set": set
-                            },
-                            None,
-                        )
-                        .await
-                        /*.map_err(|_| Error::DatabaseError {
-                            operation: "update_one",
-                            with: "channel",
-                        })?;*/
-                        .unwrap();
-                }
-                Channel::Group { id, .. } => {
-                    if let Content::Text(_) = &ss.content {
-                        channels
-                            .update_one(
-                                doc! { "_id": id },
-                                doc! {
-                                    "$set": set
-                                },
-                                None,
-                            )
-                            .await
-                            /*.map_err(|_| Error::DatabaseError {
-                                operation: "update_one",
-                                with: "channel",
-                            })?;*/
-                            .unwrap();
-                    }
-                }
-                Channel::TextChannel { id, .. } => {
-                    if let Content::Text(_) = &ss.content {
-                        channels
-                            .update_one(
-                                doc! { "_id": id },
-                                doc! {
-                                    "$set": {
-                                        "last_message": &ss.id
-                                    }
-                                },
-                                None,
-                            )
-                            .await
-                            /*.map_err(|_| Error::DatabaseError {
-                                operation: "update_one",
-                                with: "channel",
-                            })?;*/
-                            .unwrap();
-                    }
-                }
-                _ => {}
-            }
-        });
-
-        // ! FIXME: also temp code
-        // ! THIS ADDS ANY MENTIONS
-        if let Some(mentions) = &self.mentions {
-            let message = self.id.clone();
-            let channel = self.channel.clone();
-            let mentions = mentions.clone();
-            async_std::task::spawn(async move {
-                get_collection("channel_unreads")
-                    .update_many(
-                        doc! {
-                            "_id.channel": channel,
-                            "_id.user": {
-                                "$in": mentions
-                            }
-                        },
-                        doc! {
-                            "$push": {
-                                "mentions": message
-                            }
-                        },
-                        UpdateOptions::builder().upsert(true).build(),
-                    )
-                    .await
-                    /*.map_err(|_| Error::DatabaseError {
-                        operation: "update_many",
-                        with: "channel_unreads",
-                    })?;*/
-                    .unwrap();
-            });
-        }
-
-        self.process_embed();
-
-        let enc = serde_json::to_string(&self).unwrap();
-        ClientboundNotification::Message(self).publish(channel.id().to_string());
-
-        /*
-           Web Push Test Code
-        */
-        let c_clone = channel.clone();
-        async_std::task::spawn(async move {
-            // Find all offline users.
-            let mut target_ids = vec![];
-            match &c_clone {
-                Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
-                    for recipient in recipients {
-                        if !is_online(recipient) {
-                            target_ids.push(recipient.clone());
-                        }
-                    }
-                }
-                _ => {}
-            }
-
-            // Fetch their corresponding sessions.
-            if let Ok(mut cursor) = get_collection("accounts")
-                .find(
-                    doc! {
-                        "_id": {
-                            "$in": target_ids
-                        },
-                        "sessions.subscription": {
-                            "$exists": true
-                        }
-                    },
-                    FindOptions::builder()
-                        .projection(doc! { "sessions": 1 })
-                        .build(),
-                )
-                .await
-            {
-                let mut subscriptions = vec![];
-                while let Some(result) = cursor.next().await {
-                    if let Ok(doc) = result {
-                        if let Ok(sessions) = doc.get_array("sessions") {
-                            for session in sessions {
-                                if let Some(doc) = session.as_document() {
-                                    if let Ok(sub) = doc.get_document("subscription") {
-                                        let endpoint = sub.get_str("endpoint").unwrap().to_string();
-                                        let p256dh = sub.get_str("p256dh").unwrap().to_string();
-                                        let auth = sub.get_str("auth").unwrap().to_string();
-
-                                        subscriptions
-                                            .push(SubscriptionInfo::new(endpoint, p256dh, auth));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if subscriptions.len() > 0 {
-                    let client = WebPushClient::new();
-                    let key =
-                        base64::decode_config(VAPID_PRIVATE_KEY.clone(), base64::URL_SAFE).unwrap();
-
-                    for subscription in subscriptions {
-                        let mut builder = WebPushMessageBuilder::new(&subscription).unwrap();
-                        let sig_builder = VapidSignatureBuilder::from_pem(
-                            std::io::Cursor::new(&key),
-                            &subscription,
-                        )
-                        .unwrap();
-                        let signature = sig_builder.build().unwrap();
-                        builder.set_vapid_signature(signature);
-                        builder.set_payload(ContentEncoding::AesGcm, enc.as_bytes());
-                        let m = builder.build().unwrap();
-                        client.send(m).await.ok();
-                    }
-                }
-            }
-        });
-
-        Ok(())
-    }
-
-    pub async fn publish_update(self, data: JsonValue) -> Result<()> {
-        let channel = self.channel.clone();
-        ClientboundNotification::MessageUpdate {
-            id: self.id.clone(),
-            channel: self.channel.clone(),
-            data,
-        }
-        .publish(channel);
-        self.process_embed();
-
-        Ok(())
-    }
-
-    pub fn process_embed(&self) {
-        if !*USE_JANUARY {
-            return;
-        }
-
-        if let Content::Text(text) = &self.content {
-            // ! FIXME: re-write this at some point,
-            // ! or just before we allow user generated embeds
-            let id = self.id.clone();
-            let content = text.clone();
-            let channel = self.channel.clone();
-            async_std::task::spawn(async move {
-                if let Ok(embeds) = Embed::generate(content).await {
-                    if let Ok(bson) = to_bson(&embeds) {
-                        if let Ok(_) = get_collection("messages")
-                            .update_one(
-                                doc! {
-                                    "_id": &id
-                                },
-                                doc! {
-                                    "$set": {
-                                        "embeds": bson
-                                    }
-                                },
-                                None,
-                            )
-                            .await
-                        {
-                            ClientboundNotification::MessageUpdate {
-                                id,
-                                channel: channel.clone(),
-                                data: json!({ "embeds": embeds }),
-                            }
-                            .publish(channel);
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    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_one(
-                    doc! {
-                        "_id": {
-                            "$in": attachment_ids
-                        }
-                    },
-                    doc! {
-                        "$set": {
-                            "deleted": true
-                        }
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "update_one",
-                    with: "attachment",
-                })?;
-        }
-
-        Ok(())
-    }
-}

src/database/entities/microservice/autumn.rs

@@ -1,115 +0,0 @@
-use mongodb::bson::{doc, from_document};
-use serde::{Deserialize, Serialize};
-
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-#[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")]
-    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",
-            })
-    }
-}

src/database/entities/microservice/january.rs

@@ -1,154 +0,0 @@
-use crate::util::{
-    result::{Error, Result},
-    variables::JANUARY_URL,
-};
-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,
-    },
-    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")]
-    color: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum Embed {
-    Website(Metadata),
-    Image(Image),
-    None,
-}
-
-impl Embed {
-    pub async fn generate(content: String) -> Result<Vec<Embed>> {
-        lazy_static! {
-            static ref RE_CODE: Regex = Regex::new("```(?:.|\n)+?```|`(?:.|\n)+?`").unwrap();
-        }
-
-        // Ignore code blocks.
-        let content = RE_CODE.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");
-
-        // ! FIXME: allow multiple links
-        // ! FIXME: prevent generation if link is surrounded with < >
-        let mut finder = LinkFinder::new();
-        finder.kinds(&[LinkKind::Url]);
-        let links: Vec<_> = finder.links(&content).collect();
-
-        if links.len() == 0 {
-            return Err(Error::LabelMe);
-        }
-
-        let link = &links[0];
-
-        let client = reqwest::Client::new();
-        let result = client
-            .get(&format!("{}/embed", *JANUARY_URL))
-            .query(&[("url", link.as_str())])
-            .send()
-            .await;
-
-        match result {
-            Err(_) => return Err(Error::LabelMe),
-            Ok(result) => match result.status() {
-                reqwest::StatusCode::OK => {
-                    let res: Embed = result.json().await.map_err(|_| Error::InvalidOperation)?;
-
-                    Ok(vec![res])
-                }
-                _ => return 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,18 +0,0 @@
-mod channel;
-mod invites;
-mod message;
-mod microservice;
-mod server;
-mod sync;
-mod user;
-
-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::*;

src/database/entities/server.rs

@@ -1,395 +0,0 @@
-use crate::database::*;
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use futures::StreamExt;
-use mongodb::bson::doc;
-use mongodb::bson::from_document;
-use mongodb::bson::to_document;
-use mongodb::bson::Document;
-use mongodb::options::FindOptions;
-use rocket_contrib::json::JsonValue;
-use serde::{Deserialize, Serialize};
-
-#[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>,
-}
-
-#[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,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nonce: Option<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 system_messages: Option<SystemMessageChannels>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub icon: Option<File>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub banner: Option<File>,
-}
-
-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: JsonValue) -> Result<()> {
-        ClientboundNotification::ServerUpdate {
-            id: self.id.clone(),
-            data,
-            clear: None,
-        }
-        .publish(self.id.clone());
-
-        Ok(())
-    }
-
-    pub async fn delete(&self) -> Result<()> {
-        let messages = get_collection("messages");
-
-        // Check if there are any attachments we need to delete.
-        // ! FIXME: make this generic and merge with channel delete
-        // ! e.g. delete_channel(filter: doc!)
-        let message_ids = messages
-            .find(
-                doc! {
-                    "server": &self.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! {
-                    "server": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "delete_many",
-                with: "messages",
-            })?;
-
-        // Delete all channels, members, bans and invites.
-        for with in &["channels", "channel_invites"] {
-            get_collection(with)
-                .delete_many(
-                    doc! {
-                        "server": &self.id
-                    },
-                    None,
-                )
-                .await
-                .map_err(|_| Error::DatabaseError {
-                    operation: "delete_many",
-                    with,
-                })?;
-        }
-
-        // ! FIXME: delete any unreads
-
-        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,
-                })?;
-        }
-
-        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());
-
-        if let Some(attachment) = &self.icon {
-            attachment.delete().await?;
-        }
-
-        if let Some(attachment) = &self.banner {
-            attachment.delete().await?;
-        }
-
-        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_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 join_member(&self, id: &str) -> Result<()> {
-        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);
-        }
-
-        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",
-            })?;
-
-        ClientboundNotification::ServerMemberJoin {
-            id: self.id.clone(),
-            user: id.to_string(),
-        }
-        .publish(self.id.clone());
-
-        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?;
-            }
-        }
-
-        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(())
-    }
-}

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,275 +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;
-
-#[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)]
-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,
-    EarlyAdopter = 256,
-}
-
-impl_op_ex_commutative!(+ |a: &i32, b: &Badges| -> i32 { *a | *b as i32 });
-
-// When changing this struct, update notifications/payload.rs#80
-#[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>,
-
-    // ? 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
-    }
-
-    /// Mutate the user object to appear as seen by user.
-    pub fn with(mut self, permissions: UserPermissions<[u32; 1]>) -> 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);
-
-        if permissions.get_view_profile() {
-            self.online = Some(is_online(&self.id));
-        } else {
-            self.status = None;
-        }
-
-        self.profile = None;
-        self
-    }
-
-    /// 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" {
-            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 },
-                    )
-                    .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 the server IDs the user is in.
-    pub async fn fetch_server_ids(&self) -> Result<Vec<String>> {
-        Ok(get_collection("server_members")
-            .find(
-                doc! {
-                    "_id.user": &self.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(&self) -> Result<Vec<Document>> {
-        Ok(get_collection("channel_unreads")
-            .find(
-                doc! {
-                    "_id.user": &self.id
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "find_one",
-                with: "user_settings",
-            })?
-            .filter_map(async move |s| s.ok())
-            .collect::<Vec<Document>>()
-            .await)
-    }
-}

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,141 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use mongodb::bson::{doc, from_document};
-use rocket::http::RawStr;
-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> {
-        self.fetch("channel_invites").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 RawStr;
-
-    fn from_param(param: &'r RawStr) -> 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,39 +0,0 @@
-use crate::database::*;
-
-use mongodb::bson::{doc, from_document};
-use rauth::auth::Session;
-use rocket::http::Status;
-use rocket::request::{self, FromRequest, Outcome, Request};
-
-#[rocket::async_trait]
-impl<'a, 'r> FromRequest<'a, 'r> for User {
-    type Error = rauth::util::Error;
-
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
-        let session: Session = try_outcome!(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 {
-                Outcome::Success(from_document(doc).unwrap())
-            } else {
-                Outcome::Failure((Status::Forbidden, rauth::util::Error::InvalidSession))
-            }
-        } else {
-            Outcome::Failure((
-                Status::InternalServerError,
-                rauth::util::Error::DatabaseError {
-                    operation: "find_one",
-                    with: "user",
-                },
-            ))
-        }
-    }
-}

src/database/migrations/init.rs

@@ -1,137 +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(
-        "pubsub",
-        CreateCollectionOptions::builder()
-            .capped(true)
-            .size(1_000_000)
-            .build(),
-    )
-    .await
-    .expect("Failed to create pubsub collection.");
-
-    db.run_command(
-        doc! {
-            "createIndexes": "accounts",
-            "indexes": [
-                {
-                    "key": {
-                        "email": 1
-                    },
-                    "name": "email",
-                    "unique": true,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2
-                    }
-                },
-                {
-                    "key": {
-                        "email_normalised": 1
-                    },
-                    "name": "email_normalised",
-                    "unique": true,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2
-                    }
-                }
-            ]
-        },
-        None,
-    )
-    .await
-    .expect("Failed to create account index.");
-
-    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.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,19 +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;
-    }
-}

src/database/migrations/scripts.rs

@@ -1,162 +0,0 @@
-use crate::database::{get_collection, get_db};
-
-use futures::StreamExt;
-use log::info;
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
-};
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-struct MigrationInfo {
-    _id: i32,
-    revision: i32,
-}
-
-pub const LATEST_REVISION: i32 = 5;
-
-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.");
-    }
-
-    // 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,104 +0,0 @@
-use crate::database::*;
-use crate::util::result::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
-}
-
-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;
-}
-
-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(ChannelPermission::View
-                                + ChannelPermission::SendMessage
-                                + ChannelPermission::VoiceCall);
-                        }
-
-                        return Ok(ChannelPermission::View as u32);
-                    }
-                }
-
-                Ok(0)
-            }
-            Channel::Group { recipients, .. } => {
-                if recipients
-                    .iter()
-                    .find(|x| *x == &self.perspective.id)
-                    .is_some()
-                {
-                    Ok(ChannelPermission::View
-                        + ChannelPermission::SendMessage
-                        + ChannelPermission::ManageChannel
-                        + ChannelPermission::VoiceCall
-                        + ChannelPermission::InviteOthers)
-                } else {
-                    Ok(0)
-                }
-            }
-            Channel::TextChannel { server, .. } => {
-                let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
-
-                if self.perspective.id == server.owner {
-                    Ok(u32::MAX)
-                } else {
-                    Ok(ChannelPermission::View
-                        + ChannelPermission::SendMessage
-                        + ChannelPermission::InviteOthers)
-                }
-            }
-        }
-    }
-
-    pub async fn for_channel(self) -> Result<ChannelPermissions<[u32; 1]>> {
-        Ok(ChannelPermissions([self.calculate_channel().await?]))
-    }
-}

src/database/permissions/mod.rs

@@ -1,68 +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>,
-
-    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,
-
-            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_mutual_connection(self) -> PermissionCalculator<'a> {
-        PermissionCalculator {
-            has_mutual_connection: true,
-            ..self
-        }
-    }
-}

src/database/permissions/server.rs

@@ -1,64 +0,0 @@
-use crate::util::result::Result;
-
-use super::PermissionCalculator;
-
-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,   // 16392
-    RemoveAvatars = 0b00000000000000001000000000000000,  // 32784
-                                                         // 16 bits of space
-}
-
-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_members, _: 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 {
-            Ok(ServerPermission::View
-                + ServerPermission::ChangeNickname
-                + ServerPermission::ChangeAvatar)
-        }
-    }
-
-    pub async fn for_server(self) -> Result<ServerPermissions<[u32; 1]>> {
-        Ok(ServerPermissions([self.calculate_server().await?]))
-    }
-}

src/database/permissions/user.rs

@@ -1,107 +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);
-            }
-            _ => {}
-        }
-
-        if self.has_mutual_connection
-            || 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",
-                    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,39 +1,29 @@
-#![feature(proc_macro_hygiene, decl_macro)]
-#![feature(async_closure)]
-
 #[macro_use]
 extern crate rocket;
 #[macro_use]
-extern crate rocket_contrib;
+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 util;
 pub mod version;
 
-use async_std::task;
-use chrono::Duration;
-use futures::join;
 use log::info;
-use rauth::options::{EmailVerification, Options, SMTP};
 use rauth::{
-    auth::Auth,
+    config::{Captcha, Config, EmailVerification, SMTPSettings, Template, Templates},
-    options::{Template, Templates},
+    logic::Auth,
 };
+use revolt_quark::variables::delta::{
+    APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME,
+    USE_EMAIL, USE_HCAPTCHA,
+};
+use revolt_quark::DatabaseInfo;
 use rocket_cors::AllowedOrigins;
-use rocket_prometheus::PrometheusMetrics;
+use std::str::FromStr;
-use util::variables::{
-    APP_URL, HCAPTCHA_KEY, INVITE_ONLY, PUBLIC_URL, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD,
-    SMTP_USERNAME, USE_EMAIL, USE_HCAPTCHA, USE_PROMETHEUS,
-};
 
 #[async_std::main]
 async fn main() {
@@ -41,101 +31,120 @@ 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;
-    notifications::hive::init_hive().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(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: [
+            "Get", "Put", "Post", "Delete", "Options", "Head", "Trace", "Connect", "Patch",
+        ]
+        .iter()
+        .map(|s| FromStr::from_str(s).unwrap())
+        .collect(),
         ..Default::default()
     }
     .to_cors()
     .expect("Failed to create CORS.");
 
-    let mut options = Options::new()
+    let mut config = Config {
-        .base_url(format!("{}/auth", *PUBLIC_URL))
+        email_verification: if *USE_EMAIL {
-        .email_verification(if *USE_EMAIL {
             EmailVerification::Enabled {
-                success_redirect_uri: format!("{}/login", *APP_URL),
+                smtp: SMTPSettings {
-                welcome_redirect_uri: format!("{}/welcome", *APP_URL),
-                password_reset_url: Some(format!("{}/login/reset", *APP_URL)),
-
-                verification_expiry: Duration::days(1),
-                password_reset_expiry: Duration::hours(1),
-
-                templates: Templates {
-                    verify_email: Template {
-                        title: "Verify your REVOLT account.",
-                        text: "Verify your email here: {{url}}",
-                        html: include_str!("../assets/templates/verify.html"),
-                    },
-                    reset_password: Template {
-                        title: "Reset your REVOLT password.",
-                        text: "Reset your password here: {{url}}",
-                        html: include_str!("../assets/templates/reset.html"),
-                    },
-                    welcome: None,
-                },
-
-                smtp: SMTP {
                     from: (*SMTP_FROM).to_string(),
                     host: (*SMTP_HOST).to_string(),
                     username: (*SMTP_USERNAME).to_string(),
                     password: (*SMTP_PASSWORD).to_string(),
+                    reply_to: Some("support@revolt.chat".into()),
+                    port: None,
+                    use_tls: None,
+                },
+                expiry: Default::default(),
+                templates: Templates {
+                    verify: Template {
+                        title: "Verify your Revolt account.".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!(crate::asset!("templates/reset.txt")).into(),
+                        url: format!("{}/login/reset/", *APP_URL),
+                        html: None,
+                    },
+                    welcome: None,
                 },
             }
         } else {
             EmailVerification::Disabled
-        });
+        },
+        ..Default::default()
+    };
 
     if *INVITE_ONLY {
-        options = options.invite_only_collection(database::get_collection("invites"))
+        config.invite_only = true;
     }
 
     if *USE_HCAPTCHA {
-        options = options.hcaptcha_secret(HCAPTCHA_KEY.clone());
+        config.captcha = Captcha::HCaptcha {
+            secret: HCAPTCHA_KEY.clone(),
+        };
     }
 
-    let auth = Auth::new(database::get_collection("accounts"), options);
+    let db = DatabaseInfo::Auto.connect().await.unwrap();
+    db.migrate_database().await.unwrap();
 
-    let mut rocket = rocket::ignite();
+    // 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.");
 
-    if *USE_PROMETHEUS {
+    rauth::entities::sync_models(&mongo_db.database("revolt")).await;
-        info!("Enabled Prometheus metrics!");
-        let prometheus = PrometheusMetrics::new();
-        rocket = rocket
-            .attach(prometheus.clone())
-            .mount("/metrics", prometheus);
-    }
 
+    // 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", rauth::routes::routes())
+        .mount("/", util::ratelimiter::routes())
+        .mount(
+            "/swagger/",
+            rocket_okapi::swagger_ui::make_swagger_ui(&rocket_okapi::swagger_ui::SwaggerUIConfig {
+                url: "../openapi.json".to_owned(),
+                ..Default::default()
+            }),
+        )
         .manage(auth)
+        .manage(db)
         .manage(cors.clone())
+        .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,237 +0,0 @@
-use hive_pubsub::PubSub;
-use mongodb::bson::doc;
-use rauth::auth::Session;
-use rocket_contrib::json::JsonValue;
-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,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type")]
-pub enum ServerboundNotification {
-    Authenticate(Session),
-    BeginTyping { channel: String },
-    EndTyping { channel: String },
-}
-
-#[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 RemoveMemberField {
-    Nickname,
-    Avatar,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type")]
-pub enum ClientboundNotification {
-    Error(WebSocketError),
-    Authenticated,
-    Ready {
-        users: Vec<User>,
-        servers: Vec<Server>,
-        channels: Vec<Channel>,
-    },
-
-    Message(Message),
-    MessageUpdate {
-        id: String,
-        channel: String,
-        data: JsonValue,
-    },
-    MessageDelete {
-        id: String,
-        channel: String,
-    },
-
-    ChannelCreate(Channel),
-    ChannelUpdate {
-        id: String,
-        data: JsonValue,
-        #[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: JsonValue,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveServerField>,
-    },
-    ServerDelete {
-        id: String,
-    },
-    ServerMemberUpdate {
-        id: MemberCompositeKey,
-        data: JsonValue,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveMemberField>,
-    },
-    ServerMemberJoin {
-        id: String,
-        user: String,
-    },
-    ServerMemberLeave {
-        id: String,
-        user: String,
-    },
-
-    UserUpdate {
-        id: String,
-        data: JsonValue,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        clear: Option<RemoveUserField>,
-    },
-    UserRelationship {
-        id: String,
-        user: User,
-        status: RelationshipStatus,
-    },
-    UserPresence {
-        id: String,
-        online: bool,
-    },
-    UserSettingsUpdate {
-        id: String,
-        update: JsonValue,
-    },
-}
-
-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::mongo::publish(get_hive(), &topic, self)
-                .await
-                .ok();
-        });
-    }
-}
-
-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, .. } => {
-                    // ! 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,66 +0,0 @@
-use super::{events::ClientboundNotification, websocket};
-use crate::database::*;
-
-use futures::FutureExt;
-use hive_pubsub::backend::mongo::MongodbPubSub;
-use hive_pubsub::PubSub;
-use log::{debug, error};
-use once_cell::sync::OnceCell;
-use serde_json::to_string;
-
-type Hive = MongodbPubSub<String, String, ClientboundNotification>;
-static HIVE: OnceCell<Hive> = OnceCell::new();
-
-pub async fn init_hive() {
-    let hive = MongodbPubSub::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_collection("pubsub"),
-    );
-
-    if HIVE.set(hive).is_err() {
-        panic!("Failed to set global pubsub instance.");
-    }
-}
-
-pub async fn listen() {
-    HIVE.get()
-        .unwrap()
-        .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 {
-    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,118 +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 server_ids = user.fetch_server_ids().await?;
-    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);
-
-    Ok(ClientboundNotification::Ready {
-        users,
-        servers,
-        channels,
-    })
-}

src/notifications/subscriptions.rs

@@ -1,88 +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()
-        .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,276 +0,0 @@
-use crate::database::*;
-use crate::util::variables::WS_HOST;
-
-use super::subscriptions;
-
-use async_std::net::{TcpListener, TcpStream};
-use async_std::task;
-use async_tungstenite::tungstenite::Message;
-use futures::channel::mpsc::{unbounded, UnboundedSender};
-use futures::stream::TryStreamExt;
-use futures::{pin_mut, prelude::*};
-use hive_pubsub::PubSub;
-use log::{debug, info};
-use many_to_many::ManyToMany;
-use rauth::{
-    auth::{Auth, Session},
-    options::Options,
-};
-use std::collections::HashMap;
-use std::net::SocketAddr;
-use std::sync::{Arc, Mutex, RwLock};
-
-use super::{
-    events::{ClientboundNotification, ServerboundNotification, WebSocketError},
-    hive::get_hive,
-};
-
-type Tx = UnboundedSender<Message>;
-type PeerMap = Arc<Mutex<HashMap<SocketAddr, Tx>>>;
-
-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));
-    }
-}
-
-async fn accept(stream: TcpStream) {
-    let addr = stream
-        .peer_addr()
-        .expect("Connected streams should have a peer address.");
-    let ws_stream = async_tungstenite::accept_async(stream)
-        .await
-        .expect("Error during websocket handshake.");
-
-    info!("User established WebSocket connection from {}.", &addr);
-
-    let (write, read) = ws_stream.split();
-    let (tx, rx) = unbounded();
-    CONNECTIONS.lock().unwrap().insert(addr, tx.clone());
-
-    let send = |notification: ClientboundNotification| {
-        if let Ok(response) = serde_json::to_string(&notification) {
-            if let Err(_) = tx.unbounded_send(Message::Text(response)) {
-                debug!("Failed unbounded_send to websocket stream.");
-            }
-        }
-    };
-
-    let session: Arc<Mutex<Option<Session>>> = Arc::new(Mutex::new(None));
-    let mutex_generator = || session.clone();
-    let fwd = rx.map(Ok).forward(write);
-    let incoming = read.try_for_each(async move |msg| {
-        let mutex = mutex_generator();
-        if let Message::Text(text) = msg {
-            if let Ok(notification) = serde_json::from_str::<ServerboundNotification>(&text) {
-                match notification {
-                    ServerboundNotification::Authenticate(new_session) => {
-                        {
-                            if mutex.lock().unwrap().is_some() {
-                                send(ClientboundNotification::Error(
-                                    WebSocketError::AlreadyAuthenticated,
-                                ));
-
-                                return Ok(());
-                            }
-                        }
-
-                        if let Ok(validated_session) =
-                            Auth::new(get_collection("accounts"), Options::new())
-                                .verify_session(new_session)
-                                .await
-                        {
-                            let id = validated_session.user_id.clone();
-                            if let Ok(user) = (Ref { id: id.clone() }).fetch_user().await {
-                                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(validated_session);
-
-                                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 {
-                                            ClientboundNotification::UserPresence {
-                                                id: id.clone(),
-                                                online: true,
-                                            }
-                                            .publish(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();
-                                let session = mutex.as_ref().unwrap();
-                                session.user_id.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();
-                                let session = mutex.as_ref().unwrap();
-                                session.user_id.clone()
-                            };
-
-                            ClientboundNotification::ChannelStopTyping {
-                                id: channel.clone(),
-                                user,
-                            }
-                            .publish(channel);
-                        } else {
-                            send(ClientboundNotification::Error(
-                                WebSocketError::AlreadyAuthenticated,
-                            ));
-
-                            return Ok(());
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    });
-
-    pin_mut!(fwd, incoming);
-    future::select(fwd, incoming).await;
-
-    info!("User {} disconnected.", &addr);
-    CONNECTIONS.lock().unwrap().remove(&addr);
-
-    let mut offline = None;
-    {
-        let session = session.lock().unwrap();
-        if let Some(session) = session.as_ref() {
-            let mut users = USERS.write().unwrap();
-            users.remove(&session.user_id, &addr);
-            if users.get_left(&session.user_id).is_none() {
-                get_hive().drop_client(&session.user_id).unwrap();
-                offline = Some(session.user_id.clone());
-            }
-        }
-    }
-
-    if let Some(id) = offline {
-        ClientboundNotification::UserPresence {
-            id: id.clone(),
-            online: false,
-        }
-        .publish(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 msg = Message::Text(serde_json::to_string(&notification).unwrap());
-
-    let connections = CONNECTIONS.lock().unwrap();
-    for target in targets {
-        if let Some(conn) = connections.get(&target) {
-            if let Err(_) = conn.unbounded_send(msg.clone()) {
-                debug!("Failed unbounded_send.");
-            }
-        }
-    }
-}
-
-pub fn is_online(user: &String) -> bool {
-    USERS.read().unwrap().get_left(&user).is_some()
-}

src/routes/bots/create.rs

@@ -0,0 +1,65 @@
+use crate::util::regex::RE_USERNAME;
+
+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;
+
+/// # Bot Details
+#[derive(Validate, Deserialize, JsonSchema)]
+pub struct DataCreateBot {
+    /// Bot username
+    #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
+    name: String,
+}
+
+/// # Create Bot
+///
+/// Create a new Revolt bot.
+#[openapi(tag = "Bots")]
+#[post("/create", data = "<info>")]
+pub async fn create_bot(db: &Db, user: User, info: Json<DataCreateBot>) -> Result<Json<Bot>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    let info = info.into_inner();
+    info.validate()
+        .map_err(|error| Error::FailedValidation { error })?;
+
+    if db.get_number_of_bots_by_user(&user.id).await? >= *MAX_BOT_COUNT {
+        return Err(Error::ReachedMaximumBots);
+    }
+
+    if db.is_username_taken(&info.name).await? {
+        return Err(Error::UsernameTaken);
+    }
+
+    let id = Ulid::new().to_string();
+    let bot_user = User {
+        id: id.clone(),
+        username: info.name,
+        bot: Some(BotInformation {
+            owner: user.id.clone(),
+        }),
+        ..Default::default()
+    };
+
+    let bot = Bot {
+        id,
+        owner: user.id,
+        token: nanoid!(64),
+        ..Default::default()
+    };
+
+    db.insert_user(&bot_user).await?;
+    db.insert_bot(&bot).await?;
+    Ok(Json(bot))
+}

src/routes/bots/delete.rs

@@ -0,0 +1,19 @@
+use revolt_quark::{models::User, Db, EmptyResponse, Error, Ref, Result};
+
+/// # Delete Bot
+///
+/// Delete a bot by its id.
+#[openapi(tag = "Bots")]
+#[delete("/<target>")]
+pub async fn delete_bot(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    let bot = target.as_bot(db).await?;
+    if bot.owner != user.id {
+        return Err(Error::NotFound);
+    }
+
+    bot.delete(db).await.map(|_| EmptyResponse)
+}

src/routes/bots/edit.rs

@@ -0,0 +1,107 @@
+use crate::util::regex::RE_USERNAME;
+
+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;
+
+/// # Bot Details
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditBot {
+    /// Bot username
+    #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    name: Option<String>,
+    /// Whether the bot can be added by anyone
+    public: Option<bool>,
+    /// Whether analytics should be gathered for this bot
+    ///
+    /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
+    analytics: Option<bool>,
+    /// Interactions URL
+    #[validate(length(min = 1, max = 2048))]
+    interactions_url: Option<String>,
+    /// 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(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataEditBot>,
+) -> Result<Json<Bot>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    let data = data.into_inner();
+    data.validate()
+        .map_err(|error| Error::FailedValidation { error })?;
+
+    let mut bot = target.as_bot(db).await?;
+    if bot.owner != user.id {
+        return Err(Error::NotFound);
+    }
+
+    if let Some(name) = data.name {
+        if db.is_username_taken(&name).await? {
+            return Err(Error::UsernameTaken);
+        }
+
+        let mut user = db.fetch_user(&bot.id).await?;
+        user.update_username(db, name).await?;
+    }
+
+    if data.public.is_none()
+        && data.analytics.is_none()
+        && data.interactions_url.is_none()
+        && data.remove.is_none()
+    {
+        return Ok(Json(bot));
+    }
+
+    let DataEditBot {
+        public,
+        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 remove.iter().any(|x| x == &FieldsBot::Token) {
+            partial.token = Some(bot.token.clone());
+        }
+    }
+
+    db.update_bot(&bot.id, &partial, remove.unwrap_or_default())
+        .await?;
+
+    bot.apply_options(partial);
+    Ok(Json(bot))
+}

src/routes/bots/fetch.rs

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

src/routes/bots/fetch_owned.rs

@@ -0,0 +1,42 @@
+use revolt_quark::{
+    models::{Bot, User},
+    Db, Error, Result,
+};
+use rocket::serde::json::Json;
+use serde::Serialize;
+
+/// # Owned Bots Response
+///
+/// Both lists are sorted by their IDs.
+#[derive(Serialize, JsonSchema)]
+pub struct OwnedBotsResponse {
+    /// Bot objects
+    bots: Vec<Bot>,
+    /// User objects
+    users: Vec<User>,
+}
+
+/// # Fetch Owned Bots
+///
+/// Fetch all of the bots that you have control over.
+#[openapi(tag = "Bots")]
+#[get("/@me")]
+pub async fn fetch_owned_bots(db: &Db, user: User) -> Result<Json<OwnedBotsResponse>> {
+    if user.bot.is_some() {
+        return Err(Error::IsBot);
+    }
+
+    let mut bots = db.fetch_bots_by_user(&user.id).await?;
+    let user_ids = bots
+        .iter()
+        .map(|x| x.id.to_owned())
+        .collect::<Vec<String>>();
+
+    let mut users = db.fetch_users(&user_ids).await?;
+
+    // Ensure the lists match up exactly.
+    bots.sort_by(|a, b| a.id.cmp(&b.id));
+    users.sort_by(|a, b| a.id.cmp(&b.id));
+
+    Ok(Json(OwnedBotsResponse { users, bots }))
+}

src/routes/bots/fetch_public.rs

@@ -0,0 +1,44 @@
+use revolt_quark::{
+    models::{File, User},
+    Db, Error, Ref, Result,
+};
+
+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(db: &Db, user: Option<User>, target: Ref) -> Result<Json<PublicBot>> {
+    let bot = target.as_bot(db).await?;
+    if !bot.public && user.map_or(true, |x| x.id != bot.owner) {
+        return Err(Error::NotFound);
+    }
+
+    let user = db.fetch_user(&bot.id).await?;
+
+    Ok(Json(PublicBot {
+        id: bot.id,
+        username: user.username,
+        avatar: user.avatar,
+        description: user.profile.and_then(|p| p.content),
+    }))
+}

src/routes/bots/invite.rs

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

src/routes/bots/mod.rs

@@ -0,0 +1,22 @@
+use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
+
+mod create;
+mod delete;
+mod edit;
+mod fetch;
+mod fetch_owned;
+mod fetch_public;
+mod invite;
+
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
+        create::create_bot,
+        invite::invite_bot,
+        fetch_public::fetch_public_bot,
+        fetch::fetch_bot,
+        fetch_owned::fetch_owned_bots,
+        edit::edit_bot,
+        delete::delete_bot,
+    ]
+}

src/routes/channels/channel_ack.rs

@@ -1,52 +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};
-
-use mongodb::bson::doc;
-use mongodb::options::UpdateOptions;
 
+/// # 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<()> {
+pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
-    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() {
+    channel
-        Err(Error::MissingPermission)?
+        .ack(&user.id, &message.id)
-    }
-
-    let id = target.id();
-    get_collection("channel_unreads")
-        .update_one(
-            doc! {
-                "_id.channel": id,
-                "_id.user": &user.id
-            },
-            doc! {
-                "$unset": {
-                    "mentions": 1
-                },
-                "$set": {
-                    "last_id": &message.id
-                }
-            },
-            UpdateOptions::builder().upsert(true).build(),
-        )
         .await
-        .map_err(|_| Error::DatabaseError {
+        .map(|_| EmptyResponse)
-            operation: "update_one",
-            with: "channel_unreads",
-        })?;
-
-    ClientboundNotification::ChannelAck {
-        id: id.to_string(),
-        user: user.id.clone(),
-        message_id: message.id,
-    }
-    .publish(user.id);
-
-    Ok(())
 }

src/routes/channels/channel_delete.rs

@@ -0,0 +1,41 @@
+use revolt_quark::{
+    models::{channel::PartialChannel, Channel, User},
+    perms, Db, EmptyResponse, Error, Permission, Ref, Result,
+};
+
+/// # Close Channel
+///
+/// Deletes a server channel, leaves a group or closes a group.
+#[openapi(tag = "Channel Information")]
+#[delete("/<target>")]
+pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+    let mut channel = target.as_channel(db).await?;
+    let mut perms = perms(&user).channel(&channel);
+    perms.throw_permission(db, Permission::ViewChannel).await?;
+
+    match &channel {
+        Channel::SavedMessages { .. } => Err(Error::NoEffect),
+        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?;
+
+            channel.delete(db).await.map(|_| EmptyResponse)
+        }
+    }
+}

src/routes/channels/channel_edit.rs

@@ -0,0 +1,173 @@
+use revolt_quark::{
+    models::{
+        channel::{Channel, FieldsChannel, PartialChannel},
+        message::SystemMessage,
+        File, User,
+    },
+    perms, Database, Error, Permission, Ref, Result,
+};
+
+use rocket::{serde::json::Json, State};
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Channel Details
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataEditChannel {
+    /// Channel name
+    #[validate(length(min = 1, max = 32))]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    name: Option<String>,
+    /// Channel description
+    #[validate(length(min = 0, max = 1024))]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    description: Option<String>,
+    /// Icon
+    ///
+    /// Provide an Autumn attachment Id.
+    #[validate(length(min = 1, max = 128))]
+    icon: Option<String>,
+    /// Whether this channel is age-restricted
+    #[serde(skip_serializing_if = "Option::is_none")]
+    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(
+    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.nsfw.is_none()
+        && data.remove.is_none()
+    {
+        return Ok(Json(channel));
+    }
+
+    let mut partial: PartialChannel = Default::default();
+    match &mut channel {
+        Channel::Group {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::TextChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        }
+        | Channel::VoiceChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            ..
+        } => {
+            if let Some(fields) = &data.remove {
+                if fields.contains(&FieldsChannel::Icon) {
+                    if let Some(icon) = &icon {
+                        db.mark_attachment_as_deleted(&icon.id).await?;
+                    }
+                }
+
+                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(),
+                    }
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
+                    .await
+                    .ok();
+                }
+
+                if partial.description.is_some() {
+                    SystemMessage::ChannelDescriptionChanged {
+                        by: user.id.clone(),
+                    }
+                    .into_message(channel.id().to_string())
+                    .create(db, &channel, None)
+                    .await
+                    .ok();
+                }
+
+                if partial.icon.is_some() {
+                    SystemMessage::ChannelIconChanged { by: user.id }
+                        .into_message(channel.id().to_string())
+                        .create(db, &channel, None)
+                        .await
+                        .ok();
+                }
+            }
+
+            channel
+                .update(db, partial, data.remove.unwrap_or_default())
+                .await?;
+        }
+        _ => return Err(Error::InvalidOperation),
+    };
+
+    Ok(Json(channel))
+}

src/routes/channels/channel_fetch.rs

@@ -0,0 +1,21 @@
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Database, Permission, Ref, Result,
+};
+
+use rocket::{serde::json::Json, State};
+
+/// # Fetch Channel
+///
+/// Fetch channel by its id.
+#[openapi(tag = "Channel Information")]
+#[get("/<target>")]
+pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<Channel>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
+        .await?;
+
+    Ok(Json(channel))
+}

src/routes/channels/delete_channel.rs

@@ -1,116 +0,0 @@
-use crate::util::result::{Error, Result};
-use crate::{database::*, notifications::events::ClientboundNotification};
-
-use mongodb::bson::doc;
-
-#[delete("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<()> {
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_view() {
-        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(())
-        }
-        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 {
-                    return target.delete().await;
-                }
-            } 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(())
-        }
-        Channel::TextChannel { .. } => {
-            if perm.get_manage_channel() {
-                target.delete().await
-            } else {
-                Err(Error::MissingPermission)
-            }
-        }
-    }
-}

src/routes/channels/edit_channel.rs

@@ -1,151 +0,0 @@
-use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result};
-use crate::{database::*, notifications::events::RemoveChannelField};
-
-use mongodb::bson::{doc, to_document};
-use rocket_contrib::json::Json;
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-#[derive(Validate, Serialize, Deserialize)]
-pub struct Data {
-    #[validate(length(min = 1, max = 32))]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    name: Option<String>,
-    #[validate(length(min = 0, max = 1024))]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    description: Option<String>,
-    #[validate(length(min = 1, max = 128))]
-    icon: Option<String>,
-    remove: Option<RemoveChannelField>,
-}
-
-#[patch("/<target>", data = "<data>")]
-pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
-    let data = data.into_inner();
-    data.validate()
-        .map_err(|error| Error::FailedValidation { error })?;
-
-    if data.name.is_none()
-        && data.description.is_none()
-        && data.icon.is_none()
-        && data.remove.is_none()
-    {
-        return Ok(());
-    }
-
-    let target = target.fetch_channel().await?;
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_manage_channel() {
-        Err(Error::MissingPermission)?
-    }
-
-    match &target {
-        Channel::Group { id, icon, .. } | Channel::TextChannel { id, icon, .. } => {
-            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;
-            }
-
-            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,
-                        by: user.id.clone(),
-                    })
-                    .send_as_system(&target)
-                    .await
-                    .ok();
-                }
-
-                if let Some(_) = data.description {
-                    Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
-                        by: user.id.clone(),
-                    })
-                    .send_as_system(&target)
-                    .await
-                    .ok();
-                }
-
-                if let Some(_) = data.icon {
-                    Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id })
-                        .send_as_system(&target)
-                        .await
-                        .ok();
-                }
-            }
-
-            if remove_icon {
-                if let Some(old_icon) = icon {
-                    old_icon.delete().await?;
-                }
-            }
-
-            Ok(())
-        }
-        _ => Err(Error::InvalidOperation),
-    }
-}

src/routes/channels/fetch_channel.rs

@@ -1,20 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use rocket_contrib::json::JsonValue;
-
-#[get("/<target>")]
-pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    Ok(json!(target))
-}

src/routes/channels/fetch_members.rs

@@ -1,23 +0,0 @@
-use crate::database::*;
-use crate::util::result::{Error, Result};
-
-use rocket_contrib::json::JsonValue;
-
-#[get("/<target>/members")]
-pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
-    let target = target.fetch_channel().await?;
-
-    let perm = permissions::PermissionCalculator::new(&user)
-        .with_channel(&target)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
-    }
-
-    if let Channel::Group { recipients, .. } = target {
-        Ok(json!(user.fetch_multiple_users(recipients).await?))
-    } else {
-        Err(Error::InvalidOperation)
-    }
-}

src/routes/channels/group_add_member.rs

@@ -1,70 +1,28 @@
-use crate::util::result::{Error, Result};
+use revolt_quark::{
-use crate::util::variables::MAX_GROUP_SIZE;
+    models::{Channel, User},
-use crate::{database::*, notifications::events::ClientboundNotification};
+    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<()> {
+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
-    if let Channel::Group { id, recipients, .. } = &channel {
+                .add_user_to_group(db, &member.id, &user.id)
-        if recipients.len() >= *MAX_GROUP_SIZE {
+                .await
-            Err(Error::GroupTooLarge {
+                .map(|_| EmptyResponse)
-                max: *MAX_GROUP_SIZE,
-            })?
         }
-
+        _ => Err(Error::InvalidOperation),
-        if recipients.iter().find(|x| *x == &member.id).is_some() {
-            Err(Error::AlreadyInGroup)?
-        }
-
-        get_collection("channels")
-            .update_one(
-                doc! {
-                    "_id": &id
-                },
-                doc! {
-                    "$push": {
-                        "recipients": &member.id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelGroupJoin {
-            id: id.clone(),
-            user: member.id.clone(),
-        }
-        .publish(id.clone());
-
-        Content::SystemMessage(SystemMessage::UserAdded {
-            id: member.id,
-            by: user.id,
-        })
-        .send_as_system(&channel)
-        .await
-        .ok();
-
-        Ok(())
-    } else {
-        Err(Error::InvalidOperation)
     }
 }

src/routes/channels/group_create.rs

@@ -1,40 +1,53 @@
-use crate::database::*;
+use std::{collections::HashSet, iter::FromIterator};
-use crate::util::result::{Error, Result};
-use crate::util::variables::MAX_GROUP_SIZE;
 
-use mongodb::bson::doc;
+use revolt_quark::{
-use rocket_contrib::json::{Json, JsonValue};
+    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>,
-    // Maximum length of 36 allows both ULIDs and UUIDs.
+    /// Array of user IDs to add to the group
-    #[validate(length(min = 1, max = 36))]
+    ///
-    nonce: String,
+    /// 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>,
 }
 
+/// # Create Group
+///
+/// Create a new group channel.
+#[openapi(tag = "Groups")]
 #[post("/create", data = "<info>")]
-pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
+pub async fn req(db: &Db, user: User, info: Json<DataCreateGroup>) -> Result<Json<Channel>> {
     let info = info.into_inner();
     info.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    let mut set: HashSet<String> = HashSet::from_iter(info.users.iter().cloned());
+    let mut set: HashSet<String> = HashSet::from_iter(info.users.into_iter());
     set.insert(user.id.clone());
 
     if set.len() > *MAX_GROUP_SIZE {
-        Err(Error::GroupTooLarge {
+        return Err(Error::GroupTooLarge {
             max: *MAX_GROUP_SIZE,
-        })?
+        });
     }
 
     for target in &set {
@@ -46,36 +59,22 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
         }
     }
 
-    if get_collection("channels")
+    let group = Channel::Group {
-        .find_one(
+        id: Ulid::new().to_string(),
-            doc! {
-                "nonce": &info.nonce
-            },
-            None,
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "channel",
-        })?
-        .is_some()
-    {
-        Err(Error::DuplicateNonce)?
-    }
 
-    let id = Ulid::new().to_string();
-    let channel = Channel::Group {
-        id,
-        nonce: Some(info.nonce),
         name: info.name,
-        description: info.description,
         owner: user.id,
+        description: info.description,
         recipients: set.into_iter().collect::<Vec<String>>(),
+
         icon: None,
-        last_message: None,
+        last_message_id: None,
+
+        permissions: None,
+
+        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};
+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<()> {
+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 {
+            owner, recipients, ..
+        } => {
+            if &user.id != owner {
+                return Error::from_permission(Permission::ManageChannel);
+            }
 
-    if let Channel::Group {
+            let member = member.as_user(db).await?;
-        id,
+            if user.id == member.id {
-        owner,
+                return Err(Error::CannotRemoveYourself);
-        recipients,
+            }
-        ..
+
-    } = &channel
+            if !recipients.iter().any(|x| *x == member.id) {
-    {
+                return Err(Error::NotInGroup);
-        if &user.id != owner {
+            }
-            // figure out if we want to use perm system here
+
-            Err(Error::MissingPermission)?
+            channel
+                .remove_user_from_group(db, &member.id, Some(&user.id))
+                .await
+                .map(|_| EmptyResponse)
         }
-
+        _ => Err(Error::InvalidOperation),
-        if recipients.iter().find(|x| *x == &member.id).is_none() {
-            Err(Error::NotInGroup)?
-        }
-
-        get_collection("channels")
-            .update_one(
-                doc! {
-                    "_id": &id
-                },
-                doc! {
-                    "$pull": {
-                        "recipients": &member.id
-                    }
-                },
-                None,
-            )
-            .await
-            .map_err(|_| Error::DatabaseError {
-                operation: "update_one",
-                with: "channel",
-            })?;
-
-        ClientboundNotification::ChannelGroupLeave {
-            id: id.clone(),
-            user: member.id.clone(),
-        }
-        .publish(id.clone());
-
-        Content::SystemMessage(SystemMessage::UserRemove {
-            id: member.id,
-            by: user.id,
-        })
-        .send_as_system(&channel)
-        .await
-        .ok();
-
-        Ok(())
-    } else {
-        Err(Error::InvalidOperation)
     }
 }

src/routes/channels/invite_create.rs

@@ -1,47 +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_contrib::json::JsonValue;
-
-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<JsonValue> {
+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, .. } => {
-            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

@@ -0,0 +1,31 @@
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Db, Error, Permission, Ref, Result,
+};
+
+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(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
+    let channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
+        .await?;
+
+    if let Channel::Group { recipients, .. } = channel {
+        Ok(Json(
+            db.fetch_users(&recipients)
+                .await?
+                .into_iter()
+                .map(|x| x.with_relationship(&user))
+                .collect::<Vec<User>>(),
+        ))
+    } else {
+        Err(Error::InvalidOperation)
+    }
+}

src/routes/channels/message_delete.rs

@@ -1,27 +1,22 @@
-use crate::database::*;
+use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
-use crate::util::result::{Error, Result};
-
-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<()> {
+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?;
-
+    if message.channel != target.id {
-    let perm = permissions::PermissionCalculator::new(&user)
+        return Err(Error::NotFound);
-        .with_channel(&channel)
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
     }
 
-    let message = msg.fetch_message(&channel).await?;
+    if message.author != user.id {
-    if message.author != user.id && !perm.get_manage_messages() {
+        perms(&user)
-        match channel {
+            .channel(&target.as_channel(db).await?)
-            Channel::SavedMessages { .. } => unreachable!(),
+            .throw_permission(db, Permission::ManageMessages)
-            _ => Err(Error::CannotEditMessage)?,
+            .await?;
-        }
     }
 
-    message.delete().await
+    message.delete(db).await.map(|_| EmptyResponse)
 }

src/routes/channels/message_edit.rs

@@ -1,74 +1,93 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    models::message::{PartialMessage, SendableEmbed},
+    models::{Message, User},
+    types::january::Embed,
+    Db, Error, Ref, Result, Timestamp,
+};
 
-use chrono::Utc;
+use rocket::serde::json::Json;
-use mongodb::bson::{doc, Bson, DateTime, Document};
-use rocket_contrib::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: String,
+    content: Option<String>,
+    /// Embeds to include in the message
+    #[validate(length(min = 0, max = 10))]
+    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<()> {
+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?;
-    let perm = permissions::PermissionCalculator::new(&user)
+    if message.channel != target {
-        .with_channel(&channel)
+        return Err(Error::NotFound);
-        .for_channel()
-        .await?;
-    if !perm.get_view() {
-        Err(Error::MissingPermission)?
     }
 
-    let 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! {
+    let mut partial = PartialMessage {
-        "content": &edit.content,
+        edited: message.edited,
-        "edited": Bson::DateTime(edited)
+        ..Default::default()
     };
 
-    let mut update = json!({ "content": edit.content, "edited": DateTime(edited) });
+    // 1. Handle content update
-
+    if let Some(content) = &edit.content {
-    if let Some(embeds) = &message.embeds {
+        partial.content = Some(content.clone());
-        let new_embeds: Vec<Document> = vec![];
-
-        for embed in embeds {
-            match embed {
-                Embed::Website(_) | Embed::Image(_) | Embed::None => {} // Otherwise push to new_embeds.
-            }
-        }
-
-        let obj = update.as_object_mut().unwrap();
-        obj.insert("embeds".to_string(), json!(new_embeds).0);
-        set.insert("embeds", new_embeds);
     }
 
-    get_collection("messages")
+    // 2. Clear any auto generated embeds
-        .update_one(
+    let mut new_embeds: Vec<Embed> = vec![];
-            doc! {
+    if let Some(embeds) = &message.embeds {
-                "_id": &message.id
+        for embed in embeds {
-            },
+            if let Embed::Text(embed) = embed {
-            doc! {
+                new_embeds.push(Embed::Text(embed.clone()))
-                "$set": set
+            }
-            },
+        }
-            None,
+    }
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "update_one",
-            with: "message",
-        })?;
 
-    message.publish_update(update).await
+    // 3. Replace if we are given new embeds
+    if let Some(embeds) = edit.embeds {
+        new_embeds.clear();
+
+        for embed in embeds {
+            new_embeds.push(embed.clone().into_embed(db, message.id.clone()).await?);
+        }
+    }
+
+    partial.embeds = Some(new_embeds);
+
+    message.update(db, partial).await?;
+
+    // Queue up a task for processing embeds
+    if let Some(content) = edit.content {
+        revolt_quark::tasks::process_embeds::queue(
+            message.channel.to_string(),
+            message.id.to_string(),
+            content,
+        )
+        .await;
+    }
+
+    Ok(Json(message))
 }

src/routes/channels/message_fetch.rs

@@ -1,20 +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_contrib::json::JsonValue;
+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<JsonValue> {
+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?;
-
+    perms(&user)
-    let perm = permissions::PermissionCalculator::new(&user)
+        .channel(&channel)
-        .with_channel(&channel)
+        .throw_permission(db, Permission::ViewChannel)
-        .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,118 +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;
+    perms, Db, Error, Permission, Ref, Result,
-use mongodb::{
-    bson::{doc, from_document},
-    options::FindOptions,
 };
-use rocket::request::Form;
+use rocket::serde::json::Json;
-use rocket_contrib::json::JsonValue;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-#[derive(Serialize, Deserialize, FromFormValue)]
+/// # 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
+    sort: Option<MessageSort>,
+    /// Message id to search around
+    ///
+    /// Specifying 'nearby' ignores 'before', 'after' and 'sort'.
+    /// It will also take half of limit rounded as the limits to each side.
+    /// It also fetches the message ID specified.
+    #[validate(length(min = 26, max = 26))]
+    nearby: Option<String>,
+    /// Whether to include user (and member, if server channel) objects
     include_users: Option<bool>,
 }
 
+/// # Fetch Messages
+///
+/// Fetch multiple messages.
+#[openapi(tag = "Messaging")]
 #[get("/<target>/messages?<options..>")]
-pub async fn req(user: User, target: Ref, options: Form<Options>) -> Result<JsonValue> {
+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 {
+        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 query = doc! { "channel": target.id() };
+    let OptionsQueryMessages {
+        limit,
+        before,
+        after,
+        sort,
+        nearby,
+        include_users,
+        ..
+    } = options;
 
-    if let Some(before) = &options.before {
+    let messages = db
-        query.insert("_id", doc! { "$lt": before });
+        .fetch_messages(channel.id(), limit, before, after, sort, nearby)
-    }
+        .await?;
 
-    if let Some(after) = &options.after {
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
-        query.insert("_id", doc! { "$gt": after });
-    }
-
-    let sort = if let Sort::Latest = options.sort.as_ref().unwrap_or_else(|| &Sort::Latest) {
-        -1
-    } else {
-        1
-    };
-    let mut cursor = get_collection("messages")
-        .find(
-            query,
-            FindOptions::builder()
-                .limit(options.limit.unwrap_or(50))
-                .sort(doc! {
-                    "_id": sort
-                })
-                .build(),
-        )
         .await
-        .map_err(|_| Error::DatabaseError {
+        .map(Json)
-            operation: "find",
-            with: "messages",
-        })?;
-
-    let mut messages = vec![];
-    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 {
-            ids.insert(message.author.clone());
-        }
-
-        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(&server).await?
-            }))
-        } else {
-            Ok(json!({
-                "messages": messages,
-                "users": users,
-            }))
-        }
-    } else {
-        Ok(json!(messages))
-    }
 }

src/routes/channels/message_query_stale.rs

@@ -1,73 +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_contrib::json::{Json, JsonValue};
 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<JsonValue> {
+///
-    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**
-
+#[openapi(tag = "Messaging")]
-    let perm = permissions::PermissionCalculator::new(&user)
+#[post("/<_target>/messages/stale", data = "<_data>")]
-        .with_channel(&target)
+pub async fn req(_user: User, _target: Ref, _data: Json<OptionsQueryStale>) -> Result<()> {
-        .for_channel()
+    Ok(())
-        .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

@@ -0,0 +1,78 @@
+use revolt_quark::{
+    models::{
+        message::{BulkMessageResponse, MessageSort},
+        User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
+
+use rocket::serde::json::Json;
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Search Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsMessageSearch {
+    /// Full-text search query
+    ///
+    /// See [MongoDB documentation](https://docs.mongodb.com/manual/text-search/#-text-operator) for more information.
+    #[validate(length(min = 1, max = 64))]
+    query: String,
+
+    /// Maximum number of messages to fetch
+    #[validate(range(min = 1, max = 100))]
+    limit: Option<i64>,
+    /// Message id before which messages should be fetched
+    #[validate(length(min = 26, max = 26))]
+    before: Option<String>,
+    /// Message id after which messages should be fetched
+    #[validate(length(min = 26, max = 26))]
+    after: Option<String>,
+    /// Message sort direction
+    ///
+    /// By default, it will be sorted by relevance.
+    #[serde(default = "MessageSort::default")]
+    sort: MessageSort,
+    /// Whether to include user (and member, if server channel) objects
+    include_users: Option<bool>,
+}
+
+/// # Search for Messages
+///
+/// This route searches for messages within the given parameters.
+#[openapi(tag = "Messaging")]
+#[post("/<target>/search", data = "<options>")]
+pub async fn req(
+    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 channel = target.as_channel(db).await?;
+    perms(&user)
+        .channel(&channel)
+        .throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
+        .await?;
+
+    let OptionsMessageSearch {
+        query,
+        limit,
+        before,
+        after,
+        sort,
+        include_users,
+    } = options;
+
+    let messages = db
+        .search_messages(channel.id(), &query, limit, before, after, sort)
+        .await?;
+
+    BulkMessageResponse::transform(db, &channel, messages, include_users)
+        .await
+        .map(Json)
+}

src/routes/channels/message_send.rs

@@ -1,112 +1,193 @@
-use crate::database::*;
+use std::collections::HashSet;
-use crate::util::result::{Error, Result};
+
+use revolt_quark::{
+    models::{
+        message::{Masquerade, Reply, SendableEmbed},
+        Message, User,
+    },
+    perms, Db, Error, Permission, Ref, Result,
+};
 
-use mongodb::{bson::doc, options::FindOneOptions};
 use regex::Regex;
-use rocket_contrib::json::{Json, JsonValue};
+use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 use validator::Validate;
 
-#[derive(Validate, Serialize, Deserialize)]
+use crate::util::idempotency::IdempotencyKey;
-pub struct Data {
+
+#[derive(Validate, Serialize, Deserialize, JsonSchema)]
+pub struct DataMessageSend {
+    /// Unique token to prevent duplicate message sending
+    ///
+    /// **This is deprecated and replaced by `Idempotency-Key`!**
+    nonce: Option<String>,
+
+    /// Message content to send
     #[validate(length(min = 0, max = 2000))]
-    content: String,
+    content: Option<String>,
-    // Maximum length of 36 allows both ULIDs and UUIDs.
+    /// Attachments to include in message
-    #[validate(length(min = 1, max = 36))]
-    nonce: String,
     #[validate(length(min = 1, max = 128))]
     attachments: Option<Vec<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>,
 }
 
 lazy_static! {
-    static ref RE_ULID: Regex = Regex::new(r"<@([0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26})>").unwrap();
+    // ignoring I L O and U is intentional
+    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 req(user: User, target: Ref, message: Json<Data>) -> Result<JsonValue> {
+///
-    message
+/// Sends a message to the given channel.
-        .validate()
+#[openapi(tag = "Messaging")]
+#[post("/<target>/messages", data = "<data>")]
+pub async fn message_send(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataMessageSend>,
+    mut idempotency: IdempotencyKey,
+) -> Result<Json<Message>> {
+    let data = data.into_inner();
+    data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if message.content.len() == 0
+    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();
-    let perm = permissions::PermissionCalculator::new(&user)
+    let mut message = Message {
-        .with_channel(&target)
+        id: message_id.clone(),
-        .for_channel()
+        channel: channel.id().to_string(),
-        .await?;
+        author: user.id.clone(),
+        ..Default::default()
+    };
 
-    if !perm.get_send_message() {
+    // 1. Parse mentions in message.
-        Err(Error::MissingPermission)?
+    let mut mentions = HashSet::new();
+    if let Some(content) = &data.content {
+        for capture in RE_MENTION.captures_iter(content) {
+            if let Some(mention) = capture.get(1) {
+                mentions.insert(mention.as_str().to_string());
+            }
+        }
     }
 
-    if get_collection("messages")
+    // 2. Verify permissions for masquerade.
-        .find_one(
+    if data.masquerade.is_some() {
-            doc! {
+        permissions
-                "nonce": &message.nonce
+            .throw_permission(db, Permission::Masquerade)
-            },
+            .await?;
-            FindOneOptions::builder()
-                .projection(doc! { "_id": 1 })
-                .build(),
-        )
-        .await
-        .map_err(|_| Error::DatabaseError {
-            operation: "find_one",
-            with: "message",
-        })?
-        .is_some()
-    {
-        Err(Error::DuplicateNonce)?
     }
 
-    let id = Ulid::new().to_string();
+    // 3. Verify replies are valid.
-    let attachments = if let Some(ids) = &message.attachments {
+    let mut replies = HashSet::new();
+    if let Some(entries) = data.replies {
+        if entries.len() > 5 {
+            return Err(Error::TooManyReplies);
+        }
+
+        for Reply { id, mention } in entries {
+            let message = Ref::from_unchecked(id).as_message(db).await?;
+
+            replies.insert(message.id);
+
+            if mention {
+                mentions.insert(message.author);
+            }
+        }
+    }
+
+    if !mentions.is_empty() {
+        message.mentions.replace(
+            mentions
+                .into_iter()
+                .filter(|id| !user.has_blocked(id))
+                .collect::<Vec<String>>(),
+        );
+    }
+
+    if !replies.is_empty() {
+        message
+            .replies
+            .replace(replies.into_iter().collect::<Vec<String>>());
+    }
+
+    // 4. Add attachments to message.
+    let mut attachments = vec![];
+    if let Some(ids) = &data.attachments {
+        if !ids.is_empty() {
+            permissions
+                .throw_permission(db, Permission::UploadFiles)
+                .await?;
+        }
+
         // ! FIXME: move this to app config
-        if ids.len() >= 5 {
+        if ids.len() > 5 {
-            return Err(Error::TooManyAttachments)
+            return Err(Error::TooManyAttachments);
         }
 
-        let mut attachments = vec![];
         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?,
+            );
         }
-
-        Some(attachments)
-    } else {
-        None
-    };
-
-    let mut mentions = vec![];
-    if let Some(captures) = RE_ULID.captures_iter(&message.content).next() {
-        // ! FIXME: in the future, verify in group so we can send out push
-        mentions.push(captures[1].to_string());
     }
 
+    if !attachments.is_empty() {
+        message.attachments.replace(attachments);
+    }
 
-    let msg = Message {
+    // 5. Process included embeds.
-        id,
+    let mut embeds = vec![];
-        channel: target.id().to_string(),
+    if let Some(sendable_embeds) = data.embeds {
-        author: user.id,
+        for sendable_embed in sendable_embeds {
+            embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?)
+        }
+    }
 
-        content: Content::Text(message.content.clone()),
+    if !embeds.is_empty() {
-        attachments,
+        message.embeds.replace(embeds);
-        nonce: Some(message.nonce.clone()),
+    }
-        edited: None,
-        embeds: None,
-        mentions: if mentions.len() > 0 {
-            Some(mentions)
-        } else {
-            None
-        },
-    };
 
-    msg.clone().publish(&target).await?;
+    // 6. Set content
+    message.content = data.content;
 
-    Ok(json!(msg))
+    // 7. Pass-through nonce value for clients
+    message.nonce = Some(idempotency.into_key());
+
+    message.create(db, &channel, Some(&user)).await?;
+
+    // Queue up a task for processing embeds
+    if let Some(content) = &message.content {
+        revolt_quark::tasks::process_embeds::queue(
+            channel.id().to_string(),
+            message.id.to_string(),
+            content.clone(),
+        )
+        .await;
+    }
+
+    Ok(Json(message))
 }

src/routes/channels/mod.rs

@@ -1,32 +1,37 @@
 use rocket::Route;
+use rocket_okapi::okapi::openapi3::OpenApi;
 
 mod channel_ack;
-mod delete_channel;
+mod channel_delete;
-mod edit_channel;
+mod channel_edit;
-mod fetch_channel;
+mod channel_fetch;
-mod fetch_members;
 mod group_add_member;
 mod group_create;
 mod group_remove_member;
 mod invite_create;
-mod join_call;
+mod members_fetch;
 mod message_delete;
 mod message_edit;
 mod message_fetch;
 mod message_query;
 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,
-        fetch_channel::req,
+        channel_fetch::req,
-        fetch_members::req,
+        members_fetch::req,
-        delete_channel::req,
+        channel_delete::req,
-        edit_channel::req,
+        channel_edit::req,
         invite_create::req,
-        message_send::req,
+        message_send::message_send,
         message_query::req,
+        message_search::req,
         message_query_stale::req,
         message_fetch::req,
         message_edit::req,
@@ -34,6 +39,8 @@ pub fn routes() -> Vec<Route> {
         group_create::req,
         group_add_member::req,
         group_remove_member::req,
-        join_call::req,
+        voice_join::req,
+        permissions_set::req,
+        permissions_set_default::req,
     ]
 }

src/routes/channels/permissions_set.rs

@@ -0,0 +1,59 @@
+use rocket::serde::json::Json;
+use serde::Deserialize;
+
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
+
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
+pub struct Data {
+    /// Allow / deny values to set for this role
+    permissions: Override,
+}
+
+/// # Set Role Permission
+///
+/// Sets permissions for the specified role in this channel.
+///
+/// Channel must be a `TextChannel` or `VoiceChannel`.
+#[openapi(tag = "Channel Permissions")]
+#[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    role_id: String,
+    data: Json<Data>,
+) -> Result<Json<Channel>> {
+    let mut channel = target.as_channel(db).await?;
+    let mut permissions = perms(&user).channel(&channel);
+
+    permissions
+        .throw_permission_and_view_channel(db, Permission::ManagePermissions)
+        .await?;
+
+    if let Some(server) = permissions.server.get() {
+        if let Some(role) = server.roles.get(&role_id) {
+            if role.rank <= permissions.get_member_rank().unwrap_or(i64::MIN) {
+                return Err(Error::NotElevated);
+            }
+
+            let current_value: Override = role.permissions.into();
+            permissions
+                .throw_permission_override(db, current_value, data.permissions)
+                .await?;
+
+            channel
+                .set_role_permission(db, &role_id, data.permissions.into())
+                .await?;
+
+            Ok(Json(channel))
+        } else {
+            Err(Error::NotFound)
+        }
+    } else {
+        Err(Error::InvalidOperation)
+    }
+}

src/routes/channels/permissions_set_default.rs

@@ -0,0 +1,95 @@
+use rocket::serde::json::Json;
+use serde::Deserialize;
+
+use revolt_quark::{
+    models::{channel::PartialChannel, Channel, User},
+    perms, Db, Error, Override, Permission, Ref, Result,
+};
+
+/// # Permission Value
+#[derive(Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum DataDefaultChannelPermissions {
+    Value {
+        /// Permission values to set for members in a `Group`
+        permissions: u64,
+    },
+    Field {
+        /// Allow / deny values to set for members in this `TextChannel` or `VoiceChannel`
+        permissions: Override,
+    },
+}
+
+/// # Set Default Permission
+///
+/// Sets permissions for the default role in this channel.
+///
+/// Channel must be a `Group`, `TextChannel` or `VoiceChannel`.
+#[openapi(tag = "Channel Permissions")]
+#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    data: Json<DataDefaultChannelPermissions>,
+) -> Result<Json<Channel>> {
+    let data = data.into_inner();
+
+    let mut channel = target.as_channel(db).await?;
+    let mut perm = perms(&user).channel(&channel);
+
+    perm.throw_permission_and_view_channel(db, Permission::ManagePermissions)
+        .await?;
+
+    match &channel {
+        Channel::Group { .. } => {
+            if let DataDefaultChannelPermissions::Value { permissions } = data {
+                channel
+                    .update(
+                        db,
+                        PartialChannel {
+                            permissions: Some(permissions as i64),
+                            ..Default::default()
+                        },
+                        vec![],
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
+            }
+        }
+        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?;
+
+                channel
+                    .update(
+                        db,
+                        PartialChannel {
+                            default_permissions: Some(permissions.into()),
+                            ..Default::default()
+                        },
+                        vec![],
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
+            }
+        }
+        _ => return Err(Error::InvalidOperation),
+    }
+
+    Ok(Json(channel))
+}

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_contrib::json::JsonValue;
+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<JsonValue> {
+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<JsonValue> {
         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<JsonValue> {
         .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<JsonValue> {
         .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,28 +1,31 @@
-use crate::database::*;
+use revolt_quark::{
-use crate::util::result::{Error, Result};
+    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<()> {
+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)
 }

src/routes/invites/invite_fetch.rs

@@ -1,65 +1,131 @@
-use crate::database::*;
+use revolt_quark::models::{Channel, File, Invite};
-use crate::util::result::Result;
+use revolt_quark::{Db, Ref, Result};
 
-use rocket_contrib::json::JsonValue;
+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<JsonValue> {
+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?;
 
-            if let Channel::TextChannel {
+            match channel {
-                id,
+                Channel::TextChannel {
-                server,
+                    id,
-                name,
+                    server,
-                description,
+                    name,
-                ..
+                    description,
-            } = channel
+                    ..
-            {
+                }
-                let server = Ref::from_unchecked(server).fetch_server().await?;
+                | Channel::VoiceChannel {
+                    id,
+                    server,
+                    name,
+                    description,
+                    ..
+                } => {
+                    let server = db.fetch_server(&server).await?;
 
-                Ok(json!(InviteResponse::Server {
+                    InviteResponse::Server {
-                    server_id: server.id,
+                        code: target.id,
-                    server_name: server.name,
+                        member_count: db.fetch_member_count(&server.id).await? as i64,
-                    server_icon: server.icon,
+                        server_id: server.id,
-                    server_banner: server.banner,
+                        server_name: server.name,
+                        server_icon: server.icon,
+                        server_banner: server.banner,
+                        channel_id: id,
+                        channel_name: name,
+                        channel_description: description,
+                        user_name: user.username,
+                        user_avatar: user.avatar,
+                    }
+                }
+                _ => 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: creator.username,
+                    user_name: user.username,
-                    user_avatar: creator.avatar
+                    user_avatar: user.avatar,
-                }))
+                },
-            } else {
+                _ => unreachable!(),
-                unreachable!()
             }
         }
-        _ => unreachable!(),
+    }))
-    }
 }

src/routes/invites/invite_join.rs

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