chore: bump version and clean up repo

refactor: switch from "rauth" to Authifier crate
refactor: clippy warning for empty list
2023-01-29 14:16:18 +00:00 · 2023-01-29 14:14:35 +00:00 · 2023-01-27 16:18:00 +00:00 · 2023-01-27 16:17:47 +00:00 · 2023-01-27 16:06:27 +00:00 · 2023-01-24 19:43:40 +00:00
70 changed files with 798 additions and 391 deletions
@@ -1,2 +0,0 @@
-ko_fi: insertish
-custom: https://insrt.uk/donate
@@ -1,10 +1,10 @@
-name: Rust build and test
+name: Rust build, test, and generate specification

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

 env:
  CARGO_TERM_COLOR: always
@@ -18,16 +18,58 @@ jobs:
      - name: Install latest nightly
        uses: actions-rs/toolchain@v1
        with:
-            toolchain: nightly
-            override: true
-            components: rustfmt, clippy
+          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
+
+      - name: Copy .env.example
+        if: github.event_name != 'pull_request'
+        run: |
+          cp .env.example .env
+
+      - name: Run services in background
+        if: github.event_name != 'pull_request'
+        run: |
+          docker-compose -f docker-compose.db.yml up -d
+
+      - name: Start API in background
+        if: github.event_name != 'pull_request'
+        run: |
+          cargo run --bin revolt-delta &
+
+      - name: Wait for API to go up
+        if: github.event_name != 'pull_request'
+        uses: nev7n/wait_for_response@v1
+        with:
+          url: "http://localhost:8000/"
+
+      - name: Checkout API repository
+        if: github.event_name != 'pull_request'
+        uses: actions/checkout@v3
+        with:
+          repository: revoltchat/api
+          path: api
+
+      - name: Download OpenAPI specification
+        if: github.event_name != 'pull_request'
+        run: curl http://localhost:8000/openapi.json -o api/OpenAPI.json
+
+      - name: Commit changes
+        if: github.event_name != 'pull_request'
+        uses: EndBug/add-and-commit@v4
+        with:
+          cwd: "api"
+          add: "*.json"
+          message: "chore: generate OpenAPI specification"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -15,22 +15,27 @@ jobs:
          gh api graphql -f query='
            query {
              organization(login: "revoltchat"){
-                projectNext(number: 3) {
+                projectV2(number: 3) {
                  id
                  fields(first:20) {
                    nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                    }
                  }
                }
              }
            }' > 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
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV

      - name: Add issue to project
        env:
@@ -39,11 +44,11 @@ jobs:
        run: |
          item_id="$( gh api graphql -f query='
            mutation($project:ID!, $issue:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
+                item {
                  id
                }
              }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
+
          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
@@ -15,22 +15,27 @@ jobs:
          gh api graphql -f query='
            query {
              organization(login: "revoltchat"){
-                projectNext(number: 3) {
+                projectV2(number: 3) {
                  id
                  fields(first:20) {
                    nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                    }
                  }
                }
              }
            }' > 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
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'INCOMING_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Incoming PRs") |.id' project_data.json) >> $GITHUB_ENV

      - name: Add PR to project
        env:
@@ -39,13 +44,13 @@ jobs:
        run: |
          item_id="$( gh api graphql -f query='
            mutation($project:ID!, $pr:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $pr}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $pr}) {
+                item {
                  id
                }
              }
-            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
+            }' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectV2ItemById.item.id')"
+
          echo 'ITEM_ID='$item_id >> $GITHUB_ENV

      - name: Set fields
@@ -59,14 +64,16 @@ jobs:
              $status_field: ID!
              $status_value: String!
            ) {
-              set_status: updateProjectNextItemField(input: {
+              set_status: updateProjectV2ItemFieldValue(input: {
                projectId: $project
                itemId: $item
                fieldId: $status_field
-                value: $status_value
+                value: {
+                  singleSelectOptionId: $status_value
+                }
              }) {
-                projectNextItem {
+                projectV2Item {
                  id
-                  }
+                }
              }
            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.INCOMING_OPTION_ID }} --silent
@@ -81,6 +81,12 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "anyhow"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -100,7 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -166,11 +172,12 @@ dependencies = [

 [[package]]
 name = "async-lock"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
 dependencies = [
 "event-listener",
+ "futures-lite",
 ]

 [[package]]
@@ -198,7 +205,7 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -263,7 +270,7 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -280,7 +287,7 @@ checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -323,6 +330,40 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "authifier"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84411393a4326726ead660991ce8047f1865fa89900fb6c18e1e6c513cf1f9b"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "base32",
+ "bson",
+ "chrono",
+ "futures",
+ "handlebars",
+ "iso8601-timestamp",
+ "lazy_static",
+ "lettre",
+ "log",
+ "mongodb",
+ "nanoid",
+ "rand 0.8.5",
+ "regex",
+ "reqwest",
+ "revolt_okapi",
+ "revolt_rocket_okapi",
+ "rocket",
+ "rust-argon2",
+ "schemars",
+ "serde",
+ "serde_json",
+ "totp-lite",
+ "ulid 0.5.0",
+ "validator 0.15.0",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.8"
@@ -517,6 +558,9 @@ name = "cc"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+dependencies = [
+ "jobserver",
+]

 [[package]]
 name = "cfg-if"
@@ -606,7 +650,7 @@ dependencies = [
 "rand 0.8.5",
 "sha2",
 "subtle",
- "time 0.3.9",
+ "time 0.3.17",
 "version_check",
 ]

@@ -672,7 +716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -705,7 +749,7 @@ dependencies = [
 "proc-macro2",
 "quote 1.0.18",
 "strsim",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -716,7 +760,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
 "darling_core",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -765,7 +809,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -798,7 +842,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -872,7 +916,27 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "enum-iterator"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187"
+dependencies = [
+ "enum-iterator-derive",
+]
+
+[[package]]
+name = "enum-iterator-derive"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -1056,7 +1120,7 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -1138,6 +1202,18 @@ dependencies = [
 "wasi 0.10.0+wasi-snapshot-preview1",
 ]

+[[package]]
+name = "getset"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote 1.0.18",
+ "syn 1.0.107",
+]
+
 [[package]]
 name = "ghash"
 version = "0.4.4"
@@ -1154,6 +1230,19 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"

+[[package]]
+name = "git2"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
+dependencies = [
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "url",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -1514,7 +1603,7 @@ dependencies = [
 "generic-array 0.14.5",
 "schemars",
 "serde",
- "time 0.3.9",
+ "time 0.3.17",
 ]

 [[package]]
@@ -1529,6 +1618,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"

+[[package]]
+name = "jobserver"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.57"
@@ -1590,6 +1688,30 @@ version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"

+[[package]]
+name = "libgit2-sys"
+version = "0.14.1+1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.4"
@@ -1914,6 +2036,15 @@ dependencies = [
 "minimal-lexical",
 ]

+[[package]]
+name = "ntapi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -1961,16 +2092,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -1982,17 +2104,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "okapi"
-version = "0.7.0-rc.1"
-source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120"
-dependencies = [
- "log",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.13.0"
@@ -2034,7 +2145,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -2139,7 +2250,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -2177,7 +2288,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -2208,7 +2319,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -2295,7 +2406,7 @@ dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 "version_check",
 ]

@@ -2312,9 +2423,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
 "unicode-ident",
 ]
@@ -2327,7 +2438,7 @@ checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 "version_check",
 "yansi",
 ]
@@ -2502,39 +2613,6 @@ dependencies = [
 "rand_core 0.3.1",
 ]

-[[package]]
-name = "rauth"
-version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=43a4081dd5943db39d27229d4792b0afe82c1674#43a4081dd5943db39d27229d4792b0afe82c1674"
-dependencies = [
- "async-std",
- "async-trait",
- "base32",
- "bson",
- "chrono",
- "futures",
- "handlebars",
- "iso8601-timestamp",
- "lazy_static",
- "lettre",
- "log",
- "mongodb",
- "nanoid",
- "okapi",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "rocket",
- "rocket_okapi",
- "rust-argon2",
- "schemars",
- "serde",
- "serde_json",
- "totp-lite",
- "ulid 0.5.0",
- "validator 0.15.0",
-]
-
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -2628,7 +2706,7 @@ checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -2714,7 +2792,7 @@ dependencies = [

 [[package]]
 name = "revolt-bonfire"
-version = "0.5.5"
+version = "0.5.7"
 dependencies = [
 "async-std",
 "async-tungstenite",
@@ -2730,7 +2808,7 @@ dependencies = [

 [[package]]
 name = "revolt-delta"
-version = "0.5.5"
+version = "0.5.7"
 dependencies = [
 "async-channel",
 "async-std",
@@ -2755,25 +2833,28 @@ dependencies = [
 "regex",
 "reqwest",
 "revolt-quark",
+ "revolt_rocket_okapi",
 "rocket",
+ "rocket_authifier",
 "rocket_empty",
- "rocket_okapi",
- "rocket_rauth",
 "schemars",
 "serde",
 "serde_json",
 "ulid 0.4.1",
 "url",
 "validator 0.14.0",
+ "vergen",
 ]

 [[package]]
 name = "revolt-quark"
-version = "0.1.0"
+version = "0.5.7"
 dependencies = [
+ "async-lock",
 "async-recursion",
 "async-std",
 "async-trait",
+ "authifier",
 "base64 0.13.0",
 "bincode",
 "bitfield",
@@ -2792,19 +2873,18 @@ dependencies = [
 "mongodb",
 "nanoid",
 "num_enum",
- "okapi",
 "once_cell",
 "optional_struct",
 "pretty_env_logger",
- "rauth",
 "redis-kiss",
 "regex",
 "reqwest",
+ "revolt_okapi",
+ "revolt_rocket_okapi",
 "rocket",
 "rocket_cors",
 "rocket_empty",
 "rocket_http",
- "rocket_okapi",
 "schemars",
 "sentry",
 "serde",
@@ -2814,6 +2894,47 @@ dependencies = [
 "web-push",
 ]

+[[package]]
+name = "revolt_okapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23bfdf7ae769c3042fe727f6e5c17363b02a64b4b33ad60c3e5f73b26df7835b"
+dependencies = [
+ "log",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "revolt_rocket_okapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "275e1e9bd3343f75225cafa64f4bfb939c8b21c5f861141180fc0e24769ff6cf"
+dependencies = [
+ "either",
+ "log",
+ "revolt_okapi",
+ "revolt_rocket_okapi_codegen",
+ "rocket",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "revolt_rocket_okapi_codegen"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6620569d8ac8f0a1690fcca13f488503807a60e96ebf729749b59aca1dbef9"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote 1.0.18",
+ "rocket_http",
+ "syn 1.0.107",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -2881,7 +3002,7 @@ dependencies = [
 "serde_json",
 "state",
 "tempfile",
- "time 0.3.9",
+ "time 0.3.17",
 "tokio 1.18.2",
 "tokio-stream",
 "tokio-util 0.7.2",
@@ -2890,6 +3011,22 @@ dependencies = [
 "yansi",
 ]

+[[package]]
+name = "rocket_authifier"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4554a81937341d8c3cd3e43431ac2d23624444dc3a88e7ffd3ff66593779293"
+dependencies = [
+ "authifier",
+ "iso8601-timestamp",
+ "revolt_okapi",
+ "revolt_rocket_okapi",
+ "rocket",
+ "rocket_empty",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "rocket_codegen"
 version = "0.5.0-rc.2"
@@ -2902,15 +3039,16 @@ dependencies = [
 "proc-macro2",
 "quote 1.0.18",
 "rocket_http",
- "syn 1.0.96",
+ "syn 1.0.107",
 "unicode-xid 0.2.3",
 ]

 [[package]]
 name = "rocket_cors"
-version = "0.5.2"
-source = "git+https://github.com/lawliet89/rocket_cors?rev=5843861a88958c16bfaa0b40f0d8910772bcd2f6#5843861a88958c16bfaa0b40f0d8910772bcd2f6"
+version = "0.6.0-alpha1"
+source = "git+https://github.com/lawliet89/rocket_cors?rev=c17e8145baa4790319fdb6a473e465b960f55e7c#c17e8145baa4790319fdb6a473e465b960f55e7c"
 dependencies = [
+ "http",
 "log",
 "regex",
 "rocket",
@@ -2923,12 +3061,13 @@ dependencies = [

 [[package]]
 name = "rocket_empty"
-version = "0.1.0"
-source = "git+https://github.com/insertish/rocket_empty?branch=master#9d8234fc3bb215ea241b787301e8cff68ae53652"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c0922e47f981204fee38578a8efcf47a5c1a4ac0eb7f59e6bdfa3e61c8e3d69"
 dependencies = [
- "okapi",
+ "revolt_okapi",
+ "revolt_rocket_okapi",
 "rocket",
- "rocket_okapi",
 ]

 [[package]]
@@ -2953,53 +3092,11 @@ dependencies = [
 "smallvec",
 "stable-pattern",
 "state",
- "time 0.3.9",
+ "time 0.3.17",
 "tokio 1.18.2",
 "uncased",
 ]

-[[package]]
-name = "rocket_okapi"
-version = "0.8.0-rc.1"
-source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120"
-dependencies = [
- "either",
- "log",
- "okapi",
- "rocket",
- "rocket_okapi_codegen",
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "rocket_okapi_codegen"
-version = "0.8.0-rc.1"
-source = "git+https://github.com/insertish/okapi?rev=a1048d0c8cd771e424ec97d33d825c32e06aa120#a1048d0c8cd771e424ec97d33d825c32e06aa120"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote 1.0.18",
- "rocket_http",
- "syn 1.0.96",
-]
-
-[[package]]
-name = "rocket_rauth"
-version = "1.0.0"
-source = "git+https://github.com/insertish/rauth?rev=43a4081dd5943db39d27229d4792b0afe82c1674#43a4081dd5943db39d27229d4792b0afe82c1674"
-dependencies = [
- "iso8601-timestamp",
- "okapi",
- "rauth",
- "rocket",
- "rocket_empty",
- "rocket_okapi",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "rust-argon2"
 version = "1.0.0"
@@ -3069,9 +3166,9 @@ dependencies = [

 [[package]]
 name = "rustversion"
-version = "1.0.6"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"

 [[package]]
 name = "ryu"
@@ -3117,7 +3214,7 @@ dependencies = [
 "proc-macro2",
 "quote 1.0.18",
 "serde_derive_internals",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3261,16 +3358,16 @@ dependencies = [
 "serde",
 "serde_json",
 "thiserror",
- "time 0.3.9",
+ "time 0.3.17",
 "url",
 "uuid",
 ]

 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
 "serde_derive",
 ]
@@ -3286,13 +3383,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3303,14 +3400,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
 "indexmap",
 "itoa 1.0.2",
@@ -3349,7 +3446,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3527,9 +3624,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.96"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
@@ -3545,6 +3642,20 @@ dependencies = [
 "unicode-xid 0.0.4",
 ]

+[[package]]
+name = "sysinfo"
+version = "0.27.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c215311383d25d03753375c53ab9fad8fc0cf46953c409211e065edeabf577ee"
+dependencies = [
+ "cfg-if 1.0.0",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -3576,22 +3687,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3616,21 +3727,30 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.9"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
 dependencies = [
 "itoa 1.0.2",
- "libc",
- "num_threads",
+ "serde",
+ "time-core",
 "time-macros",
 ]

 [[package]]
-name = "time-macros"
-version = "0.2.4"
+name = "time-core"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
+[[package]]
+name = "time-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+dependencies = [
+ "time-core",
+]

 [[package]]
 name = "tinyvec"
@@ -3691,7 +3811,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3827,7 +3947,7 @@ checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -3957,7 +4077,7 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -4168,7 +4288,7 @@ dependencies = [
 "proc-macro2",
 "quote 1.0.18",
 "regex",
- "syn 1.0.96",
+ "syn 1.0.107",
 "validator_types",
 ]

@@ -4179,7 +4299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
 dependencies = [
 "proc-macro2",
- "syn 1.0.96",
+ "syn 1.0.107",
 ]

 [[package]]
@@ -4204,6 +4324,24 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

+[[package]]
+name = "vergen"
+version = "7.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99"
+dependencies = [
+ "anyhow",
+ "cfg-if 1.0.0",
+ "enum-iterator",
+ "getset",
+ "git2",
+ "rustc_version 0.4.0",
+ "rustversion",
+ "sysinfo",
+ "thiserror",
+ "time 0.3.17",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -4259,7 +4397,7 @@ dependencies = [
 "log",
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 "wasm-bindgen-shared",
 ]

@@ -4293,7 +4431,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.18",
- "syn 1.0.96",
+ "syn 1.0.107",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Build base image
-docker build -t revolt.chat/base:latest -f Dockerfile .
-
-# Build crates
-docker build -t revolt.chat/delta:latest -f crates/delta/Dockerfile .
-docker build -t revolt.chat/bonfire:latest -f crates/bonfire/Dockerfile .
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.5.5"
+version = "0.5.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.5.5"
+version = "0.5.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -51,13 +51,15 @@ mobc-redis = { version = "0.7.0", default-features = false, features = ["async-s

 # web
 rocket = { version = "0.5.0-rc.2", default-features = false, features = ["json"] }
-rocket_empty = { git = "https://github.com/insertish/rocket_empty", branch = "master" }
-rocket_rauth = { git = "https://github.com/insertish/rauth", rev = "43a4081dd5943db39d27229d4792b0afe82c1674" }
+rocket_empty = { version = "0.1.1", features = ["schema"] }
+rocket_authifier = { version = "1.0.7" }

 # spec generation
 schemars = "0.8.8"
-# rocket_okapi = "0.8.0-rc.1"
-rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "a1048d0c8cd771e424ec97d33d825c32e06aa120", features = [ "swagger" ] }
+revolt_rocket_okapi = { version = "0.9.1", features = [ "swagger" ] }

 # quark
 revolt-quark = { path = "../quark" }
+
+[build-dependencies]
+vergen = "7.5.0"
@@ -0,0 +1,16 @@
+use vergen::{vergen, Config};
+
+use std::process::Command;
+
+fn main() {
+    if let Ok(output) = Command::new("git")
+        .args(["config", "--get", "remote.origin.url"])
+        .output()
+    {
+        if let Ok(git_origin) = String::from_utf8(output.stdout) {
+            println!("cargo:rustc-env=GIT_ORIGIN_URL={}", git_origin);
+        }
+    }
+
+    vergen(Config::default()).ok();
+}
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate rocket;
 #[macro_use]
-extern crate rocket_okapi;
+extern crate revolt_rocket_okapi;
 #[macro_use]
 extern crate serde_json;
 #[macro_use]
@@ -10,7 +10,9 @@ extern crate lazy_static;
 pub mod routes;
 pub mod util;

-use revolt_quark::rauth::RAuth;
+use async_std::channel::unbounded;
+use revolt_quark::authifier::{Authifier, AuthifierEvent};
+use revolt_quark::events::client::EventV1;
 use revolt_quark::DatabaseInfo;

 #[launch]
@@ -25,13 +27,33 @@ async fn rocket() -> _ {
    let db = DatabaseInfo::Auto.connect().await.unwrap();
    db.migrate_database().await.unwrap();

-    // Setup rAuth
-    let rauth = RAuth {
+    // Setup Authifier event channel
+    let (sender, receiver) = unbounded();
+
+    // Setup Authifier
+    let authifier = Authifier {
        database: db.clone().into(),
-        config: revolt_quark::util::rauth::config(),
+        config: revolt_quark::util::authifier::config(),
+        event_channel: Some(sender),
    };

-    // Launch background task workers.
+    // Launch a listener for Authifier events
+    async_std::task::spawn(async move {
+        while let Ok(event) = receiver.recv().await {
+            match &event {
+                AuthifierEvent::CreateSession { .. } | AuthifierEvent::CreateAccount { .. } => {
+                    EventV1::Auth(event).global().await
+                }
+                AuthifierEvent::DeleteSession { user_id, .. }
+                | AuthifierEvent::DeleteAllSessions { user_id, .. } => {
+                    let id = user_id.to_string();
+                    EventV1::Auth(event).private(id).await
+                }
+            }
+        }
+    });
+
+    // Launch background task workers
    async_std::task::spawn(revolt_quark::tasks::start_workers(db.clone()));

    // Configure CORS
@@ -43,7 +65,7 @@ async fn rocket() -> _ {
        .mount("/", revolt_quark::web::cors::catch_all_options_routes())
        .mount("/", revolt_quark::web::ratelimiter::routes())
        .mount("/swagger/", revolt_quark::web::swagger::routes())
-        .manage(rauth)
+        .manage(authifier)
        .manage(db)
        .manage(cors.clone())
        .attach(revolt_quark::web::ratelimiter::RatelimitFairing)
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod create;
 mod delete;
@@ -65,16 +65,20 @@ pub async fn message_send(
    data.validate()
        .map_err(|error| Error::FailedValidation { error })?;

+    // Validate Message is within reasonable length limits
    Message::validate_sum(&data.content, &data.embeds)?;

+    // Ensure the request is unique
    idempotency.consume_nonce(data.nonce).await?;

+    // Ensure we have permissions to send a message
    let channel = target.as_channel(db).await?;
    let mut permissions = perms(&user).channel(&channel);
    permissions
        .throw_permission_and_view_channel(db, Permission::SendMessage)
        .await?;

+    // Check the message is not empty
    if (data.content.as_ref().map_or(true, |v| v.is_empty()))
        && (data.attachments.as_ref().map_or(true, |v| v.is_empty()))
        && (data.embeds.as_ref().map_or(true, |v| v.is_empty()))
@@ -82,6 +86,22 @@ pub async fn message_send(
        return Err(Error::EmptyMessage);
    }

+    // Ensure restrict_reactions is not specified without reactions list
+    if let Some(interactions) = &data.interactions {
+        if interactions.restrict_reactions {
+            let disallowed = if let Some(list) = &interactions.reactions {
+                list.is_empty()
+            } else {
+                true
+            };
+
+            if disallowed {
+                return Err(Error::InvalidProperty);
+            }
+        }
+    }
+
+    // Start constructing the message
    let message_id = Ulid::new().to_string();
    let mut message = Message {
        id: message_id.clone(),
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod channel_ack;
 mod channel_delete;
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod emoji_create;
 mod emoji_delete;
@@ -23,6 +23,9 @@ pub enum InviteResponse {
        /// Attachment for server banner
        #[serde(skip_serializing_if = "Option::is_none")]
        server_banner: Option<File>,
+        /// Enum of server flags
+        #[serde(skip_serializing_if = "Option::is_none")]
+        server_flags: Option<i32>,
        /// Id of server channel
        channel_id: String,
        /// Name of server channel
@@ -94,6 +97,7 @@ pub async fn req(db: &Db, target: Ref) -> Result<Json<InviteResponse>> {
                        server_name: server.name,
                        server_icon: server.icon,
                        server_banner: server.banner,
+                        server_flags: server.flags,
                        channel_id: id,
                        channel_name: name,
                        channel_description: description,
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod invite_delete;
 mod invite_fetch;
@@ -1,7 +1,7 @@
+use revolt_rocket_okapi::{revolt_okapi::openapi3::OpenApi, settings::OpenApiSettings};
 pub use rocket::http::Status;
 pub use rocket::response::Redirect;
 use rocket::{Build, Rocket};
-use rocket_okapi::{okapi::openapi3::OpenApi, settings::OpenApiSettings};

 mod bots;
 mod channels;
@@ -27,9 +27,9 @@ pub fn mount(mut rocket: Rocket<Build>) -> Rocket<Build> {
        "/servers" => servers::routes(),
        "/invites" => invites::routes(),
        "/custom" => customisation::routes(),
-        "/auth/account" => rocket_rauth::routes::account::routes(),
-        "/auth/session" => rocket_rauth::routes::session::routes(),
-        "/auth/mfa" => rocket_rauth::routes::mfa::routes(),
+        "/auth/account" => rocket_authifier::routes::account::routes(),
+        "/auth/session" => rocket_authifier::routes::session::routes(),
+        "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
        "/onboard" => onboard::routes(),
        "/push" => push::routes(),
        "/sync" => sync::routes(),
@@ -39,7 +39,7 @@ pub fn mount(mut rocket: Rocket<Build>) -> Rocket<Build> {
 }

 fn custom_openapi_spec() -> OpenApi {
-    use rocket_okapi::okapi::openapi3::*;
+    use revolt_rocket_okapi::revolt_okapi::openapi3::*;

    let mut extensions = schemars::Map::new();
    extensions.insert(
@@ -1,5 +1,7 @@
 use crate::util::regex::RE_USERNAME;
-use revolt_quark::{models::User, rauth::models::Session, Database, EmptyResponse, Error, Result};
+use revolt_quark::{
+    authifier::models::Session, models::User, Database, EmptyResponse, Error, Result,
+};

 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
@@ -1,4 +1,4 @@
-use revolt_quark::{models::User, rauth::models::Session};
+use revolt_quark::{authifier::models::Session, models::User};
 use rocket::serde::json::Json;
 use serde::Serialize;

@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod complete;
 mod hello;
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod subscribe;
 mod unsubscribe;
@@ -1,7 +1,7 @@
 use revolt_quark::{
-    rauth::{
+    authifier::{
        models::{Session, WebPushSubscription},
-        RAuth,
+        Authifier,
    },
    EmptyResponse, Error, Result,
 };
@@ -16,13 +16,13 @@ use rocket::{serde::json::Json, State};
 #[openapi(tag = "Web Push")]
 #[post("/subscribe", data = "<data>")]
 pub async fn req(
-    rauth: &State<RAuth>,
+    authifier: &State<Authifier>,
    mut session: Session,
    data: Json<WebPushSubscription>,
 ) -> Result<EmptyResponse> {
    session.subscription = Some(data.into_inner());
    session
-        .save(&rauth)
+        .save(authifier)
        .await
        .map(|_| EmptyResponse)
        .map_err(|_| Error::DatabaseError {
@@ -1,5 +1,5 @@
 use revolt_quark::{
-    rauth::{models::Session, RAuth},
+    authifier::{models::Session, Authifier},
    EmptyResponse, Error, Result,
 };

@@ -10,10 +10,10 @@ use rocket::State;
 /// Remove the Web Push subscription associated with the current session.
 #[openapi(tag = "Web Push")]
 #[post("/unsubscribe")]
-pub async fn req(rauth: &State<RAuth>, mut session: Session) -> Result<EmptyResponse> {
+pub async fn req(authifier: &State<Authifier>, mut session: Session) -> Result<EmptyResponse> {
    session.subscription = None;
    session
-        .save(&rauth)
+        .save(authifier)
        .await
        .map(|_| EmptyResponse)
        .map_err(|_| Error::DatabaseError {
@@ -54,6 +54,21 @@ pub struct RevoltFeatures {
    pub voso: VoiceFeature,
 }

+/// # Build Information
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct BuildInformation {
+    /// Commit Hash
+    pub commit_sha: String,
+    /// Commit Timestamp
+    pub commit_timestamp: String,
+    /// Git Semver
+    pub semver: String,
+    /// Git Origin URL
+    pub origin_url: String,
+    /// Build Timestamp
+    pub timestamp: String,
+}
+
 /// # Server Configuration
 #[derive(Serialize, JsonSchema, Debug)]
 pub struct RevoltConfig {
@@ -67,6 +82,8 @@ pub struct RevoltConfig {
    pub app: String,
    /// Web Push VAPID public key
    pub vapid: String,
+    /// Build information
+    pub build: BuildInformation,
 }

 /// # Query Node
@@ -101,6 +118,14 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
        ws: EXTERNAL_WS_URL.to_string(),
        app: APP_URL.to_string(),
        vapid: VAPID_PUBLIC_KEY.to_string(),
+        build: BuildInformation {
+            commit_sha: env!("VERGEN_GIT_SHA", "<failed to generate>").to_string(),
+            commit_timestamp: env!("VERGEN_GIT_COMMIT_TIMESTAMP", "<failed to generate>")
+                .to_string(),
+            semver: env!("VERGEN_GIT_SEMVER", "<failed to generate>").to_string(),
+            origin_url: env!("GIT_ORIGIN_URL", "<failed to generate>").to_string(),
+            timestamp: env!("VERGEN_BUILD_TIMESTAMP", "<failed to generate>").to_string(),
+        },
    }))
 }

@@ -1,8 +1,6 @@
 use revolt_quark::{
    models::{Member, User},
-    perms,
-    presence::presence_filter_online,
-    Db, Ref, Result,
+    perms, Db, Ref, Result,
 };

 use rocket::serde::json::Json;
@@ -47,16 +45,7 @@ pub async fn req(
        user_ids.push(member.id.user.clone());
    }

-    let online_ids = presence_filter_online(&user_ids).await;
-    let mut users = db
-        .fetch_users(&user_ids)
-        .await?
-        .into_iter()
-        .map(|mut user| {
-            user.online = Some(online_ids.contains(&user.id));
-            user.foreign()
-        })
-        .collect::<Vec<User>>();
+    let mut users = User::fetch_foreign_users(db, &user_ids).await?;

    // Ensure the lists match up exactly.
    members.sort_by(|a, b| a.id.user.cmp(&b.id.user));
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod ban_create;
 mod ban_list;
@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod get_settings;
 mod get_unreads;
@@ -1,5 +1,5 @@
 use crate::util::regex::RE_USERNAME;
-use revolt_quark::{models::User, rauth::models::Account, Database, Error, Result};
+use revolt_quark::{authifier::models::Account, models::User, Database, Error, Result};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -0,0 +1,26 @@
+use revolt_quark::{Database, Ref, Result};
+
+use rocket::{serde::json::Json, State};
+use serde::Serialize;
+
+/// # Flag Response
+#[derive(Serialize, JsonSchema)]
+pub struct FlagResponse {
+    /// Flags
+    flags: i32,
+}
+
+/// # Fetch User Flags
+///
+/// Retrieve a user's flags.
+#[openapi(tag = "User Information")]
+#[get("/<target>/flags")]
+pub async fn fetch_user_flags(db: &State<Database>, target: Ref) -> Result<Json<FlagResponse>> {
+    let flags = if let Ok(target) = target.as_user(db).await {
+        target.flags.unwrap_or_default()
+    } else {
+        0
+    };
+
+    Ok(Json(FlagResponse { flags }))
+}
@@ -1,7 +1,7 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::{self, MediaType, RefOr};
 use rocket::http::ContentType;
 use rocket::response::{self, Responder};
 use rocket::{Request, Response};
-use rocket_okapi::okapi::openapi3::{self, MediaType, RefOr};
 use schemars::schema::{InstanceType, SchemaObject, SingleOrVec};

 pub struct CachedFile((ContentType, Vec<u8>));
@@ -16,10 +16,10 @@ impl<'r> Responder<'r, 'static> for CachedFile {
    }
 }

-impl rocket_okapi::response::OpenApiResponderInner for CachedFile {
+impl revolt_rocket_okapi::response::OpenApiResponderInner for CachedFile {
    fn responses(
-        _gen: &mut rocket_okapi::gen::OpenApiGenerator,
-    ) -> std::result::Result<openapi3::Responses, rocket_okapi::OpenApiError> {
+        _gen: &mut revolt_rocket_okapi::gen::OpenApiGenerator,
+    ) -> std::result::Result<openapi3::Responses, revolt_rocket_okapi::OpenApiError> {
        let mut responses = schemars::Map::new();
        let mut content = schemars::Map::new();

@@ -1,5 +1,5 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
 use rocket::Route;
-use rocket_okapi::okapi::openapi3::OpenApi;

 mod add_friend;
 mod block_user;
@@ -9,6 +9,7 @@ mod fetch_dms;
 mod fetch_profile;
 mod fetch_self;
 mod fetch_user;
+mod fetch_user_flags;
 mod find_mutual;
 mod get_default_avatar;
 mod open_dm;
@@ -21,6 +22,7 @@ pub fn routes() -> (Vec<Route>, OpenApi) {
        // User Information
        fetch_self::req,
        fetch_user::req,
+        fetch_user_flags::fetch_user_flags,
        edit_user::req,
        change_username::req,
        get_default_avatar::req,
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-quark"
-version = "0.1.0"
+version = "0.5.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"

@@ -16,9 +16,9 @@ rocket_impl = [
    "lru",
    "dashmap",

-    "rauth/database-mongodb",
-    "rauth/rocket_impl",
-    "rauth/okapi_impl"
+    "authifier/database-mongodb",
+    "authifier/rocket_impl",
+    "authifier/okapi_impl"
 ]

 test = [ "async-std", "mongo", "mongodb/async-std-runtime", "rocket_impl" ]
@@ -38,10 +38,8 @@ bson = { version = "2.1.0", features = ["chrono-0_4"] }

 # Spec Generation
 schemars = "0.8.8"
-okapi = { git = "https://github.com/insertish/okapi", rev = "a1048d0c8cd771e424ec97d33d825c32e06aa120" }
-rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "a1048d0c8cd771e424ec97d33d825c32e06aa120" }
-# okapi = "0.7.0-rc.1"
-# rocket_okapi = "0.8.0-rc.1"
+revolt_okapi = "0.9.1"
+revolt_rocket_okapi = { version = "0.9.1", features = [ "swagger" ] }

 # Databases
 redis-kiss = { version = "0.1.3" }
@@ -71,6 +69,7 @@ reqwest = "0.11.10"
 bitfield = "0.13.2"
 once_cell = "1.13.0"
 lazy_static = "1.4.0"
+async-lock = "2.6.0"

 lru = { version = "0.7.6", optional = true }
 dashmap = { version = "5.2.0", optional = true }
@@ -82,11 +81,11 @@ web-push = "0.7.2"
 # Implementations
 rocket_http = { optional = true, version = "0.5.0-rc.2" }
 rocket = { optional = true, version = "0.5.0-rc.2", default-features = false, features = ["json"] }
-rocket_empty = { optional = true, git = "https://github.com/insertish/rocket_empty", branch = "master" }
-rocket_cors = { optional = true, git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
+rocket_empty = { version = "0.1.1", optional = true, features = [ "schema" ] }
+rocket_cors = { optional = true, git = "https://github.com/lawliet89/rocket_cors", rev = "c17e8145baa4790319fdb6a473e465b960f55e7c" }

-# rAuth
-rauth = { git = "https://github.com/insertish/rauth", rev = "43a4081dd5943db39d27229d4792b0afe82c1674", features = [ "async-std-runtime" ] }
+# Authifier
+authifier = { version = "1.0.7", features = [ "async-std-runtime" ] }

 # Sentry
 sentry = "0.25.0"
@@ -103,6 +103,7 @@
                              </tbody>
                            </table>
                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
                              Sent from Revolt<br>
                              Made in the EU
                            </div>
@@ -21,6 +21,7 @@
        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Confirm</a>
      </div>
      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
        Sent from Revolt<br />
        Made in the EU
      </div>
@@ -2,5 +2,6 @@ You requested to have your account deleted, if you did not perform this action p

 Please navigate to: {{url}}

-Sent by Revolt.
-Made in the EU.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU
@@ -103,6 +103,7 @@
                              </tbody>
                            </table>
                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
                              Sent from Revolt<br>
                              Made in the EU
                            </div>
@@ -17,6 +17,7 @@
        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Reset</a>
      </div>
      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
        Sent from Revolt<br />
        Made in the EU
      </div>
@@ -2,5 +2,6 @@ You requested a password reset, if you did not perform this action you can safel

 Please navigate to: {{url}}

-Sent by Revolt.
-Made in the EU.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU
@@ -103,6 +103,7 @@
                              </tbody>
                            </table>
                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
                              Sent from Revolt<br>
                              Made in the EU
                            </div>
@@ -18,6 +18,7 @@
        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Confirm</a>
      </div>
      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
        Sent from Revolt<br />
        Made in the EU
      </div>
@@ -3,5 +3,6 @@ To complete your sign up, we just need to verify your email.

 Please navigate to: {{url}}

-Sent by Revolt.
-Made in the EU.
+This email is intended for {{email}}
+Sent by Revolt
+Made in the EU
@@ -61,13 +61,13 @@ impl Deref for Database {
    }
 }

-impl From<Database> for rauth::Database {
+impl From<Database> for authifier::Database {
    fn from(val: Database) -> Self {
        match val {
-            Database::Dummy(_) => rauth::Database::default(),
-            Database::MongoDb(MongoDb(client)) => {
-                rauth::Database::MongoDb(rauth::database::MongoDb(client.database("revolt")))
-            }
+            Database::Dummy(_) => authifier::Database::default(),
+            Database::MongoDb(MongoDb(client)) => authifier::Database::MongoDb(
+                authifier::database::MongoDb(client.database("revolt")),
+            ),
        }
    }
 }
@@ -1,3 +1,4 @@
+use authifier::AuthifierEvent;
 use serde::{Deserialize, Serialize};

 use crate::models::channel::{FieldsChannel, PartialChannel};
@@ -195,9 +196,23 @@ pub enum EventV1 {
    /// Settings updated remotely
    UserSettingsUpdate { id: String, update: UserSettings },

+    /// User has been platform banned or deleted their account
+    ///
+    /// Clients should remove the following associated data:
+    /// - Messages
+    /// - DM Channels
+    /// - Relationships
+    /// - Server Memberships
+    ///
+    /// User flags are specified to explain why a wipe is occurring though not all reasons will necessarily ever appear.
+    UserPlatformWipe { user_id: String, flags: i32 },
+
    /// New emoji
    EmojiCreate(Emoji),

    /// Delete emoji
    EmojiDelete { id: String },
+
+    /// Auth events
+    Auth(AuthifierEvent),
 }
@@ -23,11 +23,7 @@ impl Cache {
    pub async fn can_view_channel(&self, db: &Database, channel: &Channel) -> bool {
        match &channel {
            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
-                let member = self
-                    .members
-                    .iter()
-                    .map(|(_, x)| x)
-                    .find(|x| &x.id.server == server);
+                let member = self.members.values().find(|x| &x.id.server == server);

                let server = self.servers.get(server);
                let mut perms = perms(self.users.get(&self.user_id).unwrap()).channel(channel);
@@ -563,4 +559,9 @@ impl EventV1 {
    pub async fn private(self, id: String) {
        self.p(format!("{}!", id)).await;
    }
+
+    /// Publish internal global event
+    pub async fn global(self) {
+        self.p("global".to_string()).await;
+    }
 }
@@ -383,7 +383,7 @@ impl BulkMessageResponse {
    ) -> Result<BulkMessageResponse> {
        if let Some(true) = include_users {
            let user_ids = messages.get_user_ids();
-            let users = db.fetch_users(&user_ids).await?;
+            let users = User::fetch_foreign_users(db, &user_ids).await?;

            Ok(match channel {
                Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
@@ -4,6 +4,7 @@ use crate::models::user::{
 };
 use crate::permissions::defn::UserPerms;
 use crate::permissions::r#impl::user::get_relationship;
+use crate::presence::presence_filter_online;
 use crate::{perms, Database, Error, Result};

 use futures::try_join;
@@ -67,6 +68,7 @@ impl User {
    }

    /// Mutate the user object to remove redundant information
+    #[must_use]
    pub fn foreign(mut self) -> User {
        self.profile = None;
        self.relations = None;
@@ -94,6 +96,21 @@ impl User {
        self
    }

+    /// Fetch foreign users by a list of IDs
+    pub async fn fetch_foreign_users(db: &Database, user_ids: &[String]) -> Result<Vec<User>> {
+        let online_ids = presence_filter_online(user_ids).await;
+
+        Ok(db
+            .fetch_users(user_ids)
+            .await?
+            .into_iter()
+            .map(|mut user| {
+                user.online = Some(online_ids.contains(&user.id));
+                user.foreign()
+            })
+            .collect::<Vec<User>>())
+    }
+
    /// Mutate the user object to include relationship (if it does not already exist)
    #[must_use]
    pub fn with_relationship(self, perspective: &User) -> User {
@@ -215,7 +215,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
    }

    if revision <= 8 {
-        info!("Running migration [revision 8 / 2021-09-10]: Update to rAuth version 1.");
+        info!("Running migration [revision 8 / 2021-09-10]: Update to Authifier version 1.");

        db.db()
            .run_command(
@@ -603,20 +603,20 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
    }

    if revision <= 15 {
-        info!("Running migration [revision 15 / 04-06-2022]: Migrate rAuth to latest version.");
+        info!("Running migration [revision 15 / 04-06-2022]: Migrate Authifier to latest version.");

-        let db = rauth::Database::MongoDb(rauth::database::MongoDb(db.db()));
-        db.run_migration(rauth::Migration::M2022_06_03EnsureUpToSpec)
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        db.run_migration(authifier::Migration::M2022_06_03EnsureUpToSpec)
            .await
            .unwrap();
    }

    if revision <= 16 {
-        info!("Running migration [revision 16 / 07-07-2022]: Add `emojis` collection and rAuth migration.");
+        info!("Running migration [revision 16 / 07-07-2022]: Add `emojis` collection and Authifier migration.");

-        let rauth_db = rauth::Database::MongoDb(rauth::database::MongoDb(db.db()));
-        rauth_db
-            .run_migration(rauth::Migration::M2022_06_09AddIndexForDeletion)
+        let authifier_db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        authifier_db
+            .run_migration(authifier::Migration::M2022_06_09AddIndexForDeletion)
            .await
            .unwrap();

@@ -1,7 +1,7 @@
-use okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use rauth::models::Session;
-use rocket_okapi::gen::OpenApiGenerator;
-use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
+use authifier::models::Session;
+use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
+use revolt_rocket_okapi::gen::OpenApiGenerator;
+use revolt_rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};

 use rocket::http::Status;
 use rocket::request::{self, FromRequest, Outcome, Request};
@@ -12,7 +12,7 @@ use crate::Database;

 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for User {
-    type Error = rauth::Error;
+    type Error = authifier::Error;

    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
        let user: &Option<User> = request
@@ -43,7 +43,7 @@ impl<'r> FromRequest<'r> for User {
        if let Some(user) = user {
            Outcome::Success(user.clone())
        } else {
-            Outcome::Failure((Status::Unauthorized, rauth::Error::InvalidSession))
+            Outcome::Failure((Status::Unauthorized, authifier::Error::InvalidSession))
        }
    }
 }
@@ -53,7 +53,7 @@ impl<'r> OpenApiFromRequest<'r> for User {
        _gen: &mut OpenApiGenerator,
        _name: String,
        _required: bool,
-    ) -> rocket_okapi::Result<RequestHeaderInput> {
+    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
        let mut requirements = schemars::Map::new();
        requirements.insert("Session Token".to_owned(), vec![]);

@@ -17,8 +17,8 @@ extern crate bitfield;
 #[macro_use]
 extern crate bson;

+pub use authifier;
 pub use iso8601_timestamp::Timestamp;
-pub use rauth;
 pub use redis_kiss;

 pub mod events;
@@ -161,7 +161,7 @@ pub struct PartialChannel {
 }

 /// Optional fields on channel object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsChannel {
    Description,
    Icon,
@@ -81,7 +81,7 @@ pub struct Masquerade {
    pub name: Option<String>,
    /// Replace the avatar shown on this message (URL to image file)
    #[serde(skip_serializing_if = "Option::is_none")]
-    #[validate(length(min = 1, max = 128))]
+    #[validate(length(min = 1, max = 256))]
    pub avatar: Option<String>,
    /// Replace the display role colour shown on this message
    ///
@@ -98,6 +98,8 @@ pub struct Interactions {
    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub reactions: Option<IndexSet<String>>,
    /// Whether reactions should be restricted to the given list
+    ///
+    /// Can only be set to true if reactions list is of at least length 1
    #[serde(skip_serializing_if = "if_false", default)]
    pub restrict_reactions: bool,
 }
@@ -134,7 +134,7 @@ pub struct Server {
 }

 /// Optional fields on server object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsServer {
    Description,
    Categories,
@@ -144,7 +144,7 @@ pub enum FieldsServer {
 }

 /// Optional fields on server object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsRole {
    Colour,
 }
@@ -42,7 +42,7 @@ pub struct Member {
 }

 /// Optional fields on server member object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsMember {
    Nickname,
    Avatar,
@@ -56,7 +56,7 @@ pub struct Bot {
 }

 /// Optional fields on bot object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq)]
 pub enum FieldsBot {
    Token,
    InteractionsURL,
@@ -10,7 +10,7 @@ pub fn if_false(t: &bool) -> bool {
 }

 /// User's relationship with another user (or themselves)
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
 pub enum RelationshipStatus {
    None,
    User,
@@ -30,7 +30,7 @@ pub struct Relationship {
 }

 /// Presence status
-#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)]
 pub enum Presence {
    /// User is online
    Online,
@@ -105,6 +105,8 @@ pub enum Flags {
    Deleted = 2,
    /// User was banned off the platform
    Banned = 4,
+    /// User was marked as spam and removed from platform
+    Spam = 8,
 }

 /// Bot information for if the user is a bot
@@ -163,7 +165,7 @@ pub struct User {
 }

 /// Optional fields on user object
-#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)]
 pub enum FieldsUser {
    Avatar,
    StatusText,
@@ -97,7 +97,7 @@ impl From<i64> for PermissionValue {

 impl From<u64> for PermissionValue {
    fn from(v: u64) -> Self {
-        Self(v as u64)
+        Self(v)
    }
 }

@@ -24,7 +24,7 @@ pub enum Permission {
    /// Manage server customisation (includes emoji)
    ManageCustomisation = 1 << 4,

-    // % 1 bits reserved
+    // % 1 bit reserved

    // * Member permissions
    /// Kick other members below their ranking
@@ -109,10 +109,11 @@ lazy_static! {
        + Permission::Connect
        + Permission::Speak;
    pub static ref DEFAULT_PERMISSION_SAVED_MESSAGES: u64 = Permission::GrantAllSafe as u64;
-    pub static ref DEFAULT_PERMISSION_DIRECT_MESSAGE: u64 =
-        *DEFAULT_PERMISSION + Permission::ManageChannel;
+    pub static ref DEFAULT_PERMISSION_DIRECT_MESSAGE: u64 = *DEFAULT_PERMISSION 
+        + Permission::ManageChannel
+        + Permission::React;
    pub static ref DEFAULT_PERMISSION_SERVER: u64 =
-        *DEFAULT_PERMISSION + Permission::ChangeNickname + Permission::ChangeAvatar;
+        *DEFAULT_PERMISSION + Permission::React + Permission::ChangeNickname + Permission::ChangeAvatar;
 }

 bitfield! {
@@ -35,7 +35,7 @@ pub async fn presence_create_session(user_id: &str, flags: u8) -> (bool, u8) {
    __set_key_presence_entry(&mut conn, user_id, entry).await;

    // Add to region set in case of failure.
-    __add_to_set_sessions(&mut conn, &*REGION_KEY, user_id, session_id).await;
+    __add_to_set_sessions(&mut conn, &REGION_KEY, user_id, session_id).await;
    (was_empty, session_id)
 }

@@ -74,7 +74,7 @@ async fn presence_delete_session_internal(

        // Remove from region set.
        if !skip_region {
-            __remove_from_set_sessions(&mut conn, &*REGION_KEY, user_id, session_id).await;
+            __remove_from_set_sessions(&mut conn, &REGION_KEY, user_id, session_id).await;
        }
    }

@@ -147,7 +147,7 @@ pub async fn presence_clear_region(region_id: Option<&str>) {
        // also send out any relevant events.
        for session in sessions {
            let parts = session.split(':').collect::<Vec<&str>>();
-            if let (Some(user_id), Some(session_id)) = (parts.get(0), parts.get(1)) {
+            if let (Some(user_id), Some(session_id)) = (parts.first(), parts.get(1)) {
                if let Ok(session_id) = session_id.parse() {
                    presence_delete_session_internal(user_id, session_id, true).await;
                }
@@ -53,5 +53,5 @@ pub async fn __get_set_sessions(conn: &mut Conn, region_id: &str) -> Vec<String>

 /// Delete region session set
 pub async fn __delete_set_sessions(conn: &mut Conn, region_id: &str) {
-    let _: () = conn.del(region_id).await.unwrap();
+    conn.del::<_, ()>(region_id).await.unwrap();
 }
@@ -1,11 +1,14 @@
-use crate::util::variables::delta::{JANUARY_URL, MAX_EMBED_COUNT};
+use crate::util::variables::delta::{JANUARY_URL, MAX_EMBED_COUNT, JANUARY_CONCURRENT_CONNECTIONS};
 use crate::{
    models::{message::AppendMessage, Message},
    types::january::Embed,
    Database,
 };

+use async_lock::Semaphore;
+use async_std::task::spawn;
 use deadqueue::limited::Queue;
+use std::sync::Arc;

 /// Task information
 #[derive(Debug)]
@@ -36,21 +39,30 @@ pub async fn queue(channel: String, id: String, content: String) {

 /// Start a new worker
 pub async fn worker(db: Database) {
+    let semaphore = Arc::new(Semaphore::new(*JANUARY_CONCURRENT_CONNECTIONS));
+
    loop {
        let task = Q.pop().await;
-        if let Ok(embeds) = Embed::generate(task.content, &*JANUARY_URL, *MAX_EMBED_COUNT).await {
-            if let Err(err) = Message::append(
-                &db,
-                task.id,
-                task.channel,
-                AppendMessage {
-                    embeds: Some(embeds),
-                },
-            )
-            .await
-            {
-                error!("Encountered an error appending to message: {:?}", err);
+        let db = db.clone();
+        let semaphore = semaphore.clone();
+
+        spawn(async move {
+            let embeds = Embed::generate(task.content, &JANUARY_URL, *MAX_EMBED_COUNT, semaphore).await;
+
+            if let Ok(embeds) = embeds {
+                if let Err(err) = Message::append(
+                    &db,
+                    task.id,
+                    task.channel,
+                    AppendMessage {
+                        embeds: Some(embeds),
+                    },
+                )
+                .await
+                {
+                    error!("Encountered an error appending to message: {:?}", err);
+                }
            }
-        }
+        });
    }
 }
@@ -1,8 +1,8 @@
 use crate::bson::doc;
 use crate::util::variables::delta::VAPID_PRIVATE_KEY;

+use authifier::Database;
 use deadqueue::limited::Queue;
-use rauth::Database;
 use web_push::{
    ContentEncoding, SubscriptionInfo, SubscriptionKeys, VapidSignatureBuilder, WebPushClient,
    WebPushMessageBuilder,
@@ -1,7 +1,10 @@
+use async_lock::Semaphore;
+use async_std::task::spawn;
+use futures::future::join_all;
 use linkify::{LinkFinder, LinkKind};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
+use std::{collections::HashSet, sync::Arc};

 use crate::{models::attachment::File, Error, Result};

@@ -95,6 +98,8 @@ pub enum Special {
        content_type: BandcampType,
        id: String,
    },
+    /// Streamable Video
+    Streamable { id: String },
 }

 /// Website metadata
@@ -172,7 +177,12 @@ pub enum Embed {

 impl Embed {
    /// Generate embeds from given content
-    pub async fn generate(content: String, host: &str, max_embeds: usize) -> Result<Vec<Embed>> {
+    pub async fn generate(
+        content: String,
+        host: &str,
+        max_embeds: usize,
+        semaphore: Arc<Semaphore>,
+    ) -> Result<Vec<Embed>> {
        lazy_static! {
            static ref RE_CODE: Regex = Regex::new("```(?:.|\n)+?```|`(?:.|\n)+?`").unwrap();
            static ref RE_IGNORED: Regex = Regex::new("(<http.+>)").unwrap();
@@ -223,26 +233,37 @@ impl Embed {
        }

        // ! FIXME: batch request to january?
-        let mut embeds: Vec<Embed> = Vec::new();
        let client = reqwest::Client::new();
+
+        let mut tasks = Vec::new();
+        let url = format!("{host}/embed");
+
        for link in links {
-            let result = client
-                .get(&format!("{}/embed", host))
-                .query(&[("url", link)])
-                .send()
-                .await;
+            let client = client.clone();
+            let url = url.clone();
+            let semaphore = semaphore.clone();

-            if result.is_err() {
-                continue;
-            }
+            tasks.push(spawn(async move {
+                let guard = semaphore.acquire().await;

-            let response = result.unwrap();
-            if response.status().is_success() {
-                let res: Embed = response.json().await.map_err(|_| Error::InvalidOperation)?;
-                embeds.push(res);
-            }
+                let response = client.get(url).query(&[("url", link)]).send().await.ok()?;
+
+                drop(guard);
+
+                if response.status().is_success() {
+                    response.json::<Embed>().await.ok()
+                } else {
+                    None
+                }
+            }));
        }

+        let embeds = join_all(tasks)
+            .await
+            .into_iter()
+            .flatten()
+            .collect::<Vec<Embed>>();
+
        // Prevent database update when no embeds are found.
        if !embeds.is_empty() {
            Ok(embeds)
@@ -1,9 +1,11 @@
+use authifier::config::{ResolveIp, Shield};
+
 use super::variables::delta::{
-    APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME,
-    USE_EMAIL, USE_HCAPTCHA,
+    APP_URL, AUTHIFIER_SHIELD_KEY, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD,
+    SMTP_USERNAME, USE_EMAIL, USE_HCAPTCHA,
 };

-use crate::rauth::config::{
+use crate::authifier::config::{
    Captcha, Config, EmailVerificationConfig, SMTPSettings, Template, Templates,
 };

@@ -59,5 +61,19 @@ pub fn config() -> Config {
        };
    }

+    if let Some(api_key) = &*AUTHIFIER_SHIELD_KEY {
+        config.shield = Shield::Enabled {
+            api_key: api_key.to_string(),
+            strict: false,
+        };
+    }
+
+    if std::env::var("TRUST_CLOUDFLARE")
+        .map(|x| x == "1")
+        .unwrap_or_default()
+    {
+        config.resolve_ip = ResolveIp::Cloudflare;
+    }
+
    config
 }
@@ -1,7 +1,7 @@
+pub mod authifier;
 pub mod log;
 pub mod manipulation;
 pub mod pfp;
-pub mod rauth;
 pub mod r#ref;
 pub mod regex;
 pub mod result;
@@ -1,4 +1,5 @@
-use okapi::openapi3::{self, SchemaObject};
+use revolt_okapi::openapi3::SchemaObject;
+use revolt_rocket_okapi::revolt_okapi::openapi3;
 use rocket::{
    http::{ContentType, Status},
    response::{self, Responder},
@@ -19,10 +20,10 @@ pub enum Error {
    /// This error was not labeled :(
    LabelMe,

-    // ? Onboarding related errors.
+    // ? Onboarding related errors
    AlreadyOnboarded,

-    // ? User related errors.
+    // ? User related errors
    UsernameTaken,
    InvalidUsername,
    UnknownUser,
@@ -32,7 +33,7 @@ pub enum Error {
    BlockedByOther,
    NotFriends,

-    // ? Channel related errors.
+    // ? Channel related errors
    UnknownChannel,
    UnknownAttachment,
    UnknownMessage,
@@ -49,7 +50,7 @@ pub enum Error {
    AlreadyInGroup,
    NotInGroup,

-    // ? Server related errors.
+    // ? Server related errors
    UnknownServer,
    InvalidRole,
    Banned,
@@ -58,12 +59,12 @@ pub enum Error {
    },
    TooManyEmoji,

-    // ? Bot related errors.
+    // ? Bot related errors
    ReachedMaximumBots,
    IsBot,
    BotIsPrivate,

-    // ? Permission errors.
+    // ? Permission errors
    MissingPermission {
        permission: Permission,
    },
@@ -74,7 +75,7 @@ pub enum Error {
    CannotGiveMissingPermissions,
    NotOwner,

-    // ? General errors.
+    // ? General errors
    DatabaseError {
        operation: &'static str,
        with: &'static str,
@@ -82,6 +83,7 @@ pub enum Error {
    InternalError,
    InvalidOperation,
    InvalidCredentials,
+    InvalidProperty,
    InvalidSession,
    DuplicateNonce,
    VosoUnavailable,
@@ -174,6 +176,7 @@ impl<'r> Responder<'r, 'static> for Error {
            Error::InternalError => Status::InternalServerError,
            Error::InvalidOperation => Status::BadRequest,
            Error::InvalidCredentials => Status::Unauthorized,
+            Error::InvalidProperty => Status::BadRequest,
            Error::InvalidSession => Status::Unauthorized,
            Error::DuplicateNonce => Status::Conflict,
            Error::VosoUnavailable => Status::BadRequest,
@@ -194,11 +197,11 @@ impl<'r> Responder<'r, 'static> for Error {
    }
 }

-impl rocket_okapi::response::OpenApiResponderInner for Error {
+impl revolt_rocket_okapi::response::OpenApiResponderInner for Error {
    fn responses(
-        gen: &mut rocket_okapi::gen::OpenApiGenerator,
-    ) -> std::result::Result<openapi3::Responses, rocket_okapi::OpenApiError> {
-        let mut content = okapi::Map::new();
+        gen: &mut revolt_rocket_okapi::gen::OpenApiGenerator,
+    ) -> std::result::Result<openapi3::Responses, revolt_rocket_okapi::OpenApiError> {
+        let mut content = revolt_okapi::Map::new();

        let settings = schemars::gen::SchemaSettings::default().with(|s| {
            s.option_nullable = true;
@@ -13,6 +13,8 @@ lazy_static! {
        env::var("AUTUMN_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
    pub static ref JANUARY_URL: String =
        env::var("JANUARY_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
+    pub static ref JANUARY_CONCURRENT_CONNECTIONS: usize =
+        env::var("JANUARY_CONCURRENT_CONNECTIONS").map_or(50, |v| v.parse().unwrap());
    pub static ref VOSO_URL: String =
        env::var("VOSO_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
    pub static ref VOSO_WS_HOST: String =
@@ -28,6 +30,8 @@ lazy_static! {
        env::var("REVOLT_VAPID_PRIVATE_KEY").expect("Missing REVOLT_VAPID_PRIVATE_KEY environment variable.");
    pub static ref VAPID_PUBLIC_KEY: String =
        env::var("REVOLT_VAPID_PUBLIC_KEY").expect("Missing REVOLT_VAPID_PUBLIC_KEY environment variable.");
+    pub static ref AUTHIFIER_SHIELD_KEY: Option<String> =
+        env::var("REVOLT_AUTHIFIER_SHIELD_KEY").ok();

    // Application Flags
    pub static ref INVITE_ONLY: bool = env::var("REVOLT_INVITE_ONLY").map_or(false, |v| v == "1");
@@ -1,11 +1,11 @@
 use crate::{Error, Result};

 use async_std::sync::Mutex;
+use revolt_rocket_okapi::gen::OpenApiGenerator;
+use revolt_rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
+use revolt_rocket_okapi::revolt_okapi::openapi3::{Parameter, ParameterValue};
 use rocket::http::Status;
 use rocket::request::{FromRequest, Outcome};
-use rocket_okapi::gen::OpenApiGenerator;
-use rocket_okapi::okapi::openapi3::{Parameter, ParameterValue};
-use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
 use schemars::schema::{InstanceType, SchemaObject, SingleOrVec};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -47,7 +47,7 @@ impl<'r> OpenApiFromRequest<'r> for IdempotencyKey {
        _gen: &mut OpenApiGenerator,
        _name: String,
        _required: bool,
-    ) -> rocket_okapi::Result<RequestHeaderInput> {
+    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
        Ok(RequestHeaderInput::Parameter(Parameter {
            name: "Idempotency-Key".to_string(),
            description: Some("Unique key to prevent duplicate requests".to_string()),
@@ -8,7 +8,7 @@ use std::hash::Hasher;
 use std::ops::Add;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};

-use crate::rauth::models::Session;
+use crate::authifier::models::Session;
 use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::uri::Origin;
 use rocket::http::{Method, Status};
@@ -16,8 +16,8 @@ use rocket::request::{FromRequest, Outcome};
 use rocket::serde::json::Json;
 use rocket::{Data, Request, Response};

-use rocket_okapi::gen::OpenApiGenerator;
-use rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
+use revolt_rocket_okapi::gen::OpenApiGenerator;
+use revolt_rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};

 use serde::Serialize;

@@ -51,7 +51,7 @@ impl Entry {
    }

    /// Deduct one unit from the bucket and save
-    pub fn deduct(mut self, key: u64) {
+    pub fn deduct(mut self) {
        let current_time = now().as_millis();
        if current_time > self.reset {
            self.used = 1;
@@ -59,7 +59,10 @@ impl Entry {
        } else {
            self.used += 1;
        }
+    }

+    /// Save information
+    pub fn save(self, key: u64) {
        MAP.insert(key, self);
    }

@@ -189,10 +192,12 @@ impl Ratelimiter {
        let entry = Entry::from(key);

        let remaining = entry.get_remaining(limit);
-        let reset = entry.left_until_reset();
-
        if remaining > 0 {
-            entry.deduct(key);
+            entry.deduct();
+
+            let reset = entry.left_until_reset();
+            entry.save(key);
+
            Ok(Ratelimiter {
                key,
                limit,
@@ -200,7 +205,7 @@ impl Ratelimiter {
                reset,
            })
        } else {
-            Err(reset)
+            Err(entry.left_until_reset())
        }
    }
 }
@@ -236,7 +241,7 @@ impl<'r> OpenApiFromRequest<'r> for Ratelimiter {
        _gen: &mut OpenApiGenerator,
        _name: String,
        _required: bool,
-    ) -> rocket_okapi::Result<RequestHeaderInput> {
+    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
        Ok(RequestHeaderInput::None)
    }
 }
@@ -1,7 +1,7 @@
 use rocket::Route;

 pub fn routes() -> Vec<Route> {
-    rocket_okapi::swagger_ui::make_swagger_ui(&rocket_okapi::swagger_ui::SwaggerUIConfig {
+    revolt_rocket_okapi::swagger_ui::make_swagger_ui(&revolt_rocket_okapi::swagger_ui::SwaggerUIConfig {
        url: "../openapi.json".to_owned(),
        ..Default::default()
    })
@@ -0,0 +1,9 @@
+version: "3.3"
+services:
+  # MongoDB
+  database:
+    image: mongo
+    ports:
+      - "27017:27017"
+    volumes:
+      - ./.data/db:/data/db
Author	SHA1	Message	Date
Paul Makles	0da4baf777	chore: bump version and clean up repo	2023-01-29 14:16:18 +00:00
Paul Makles	c03fcda85b	refactor: switch from "rauth" to Authifier crate	2023-01-29 14:14:35 +00:00
Paul Makles	0afbcc065f	refactor: clippy warning for empty list	2023-01-27 16:18:00 +00:00
Paul Makles	a406e5504d	chore: add support for Streamable in media struct	2023-01-27 16:17:47 +00:00
Zomatree	e8c233f60b	feat: concurrently query January for embeds (#221 )	2023-01-27 16:06:27 +00:00
insertish	72595f30d4	ci: synced local '.github/workflows/triage_pr.yml' with remote 'workflows/triage_pr.yml' [skip ci]	2023-01-24 19:43:40 +00:00
insertish	39e345af74	ci: synced local '.github/workflows/triage_issue.yml' with remote 'workflows/triage_issue.yml' [skip ci]	2023-01-24 19:43:40 +00:00
Paul Makles	e0b918771d	chore: ensure restrict_reactions is used in conjunction with reactions list	2023-01-20 18:06:44 +00:00
Paul Makles	7a6bd70dcd	feat: add route to fetch user flags chore: bump rauth to change disabled account behaviour	2023-01-20 17:47:26 +00:00
Paul Makles	c0ef3d295a	fix: fallback if vergen cannot generate data	2023-01-20 17:14:25 +00:00
Paul Makles	f5c95f9d12	chore: bump rauth for lockout reset on pwd reset	2023-01-20 15:57:58 +00:00
Paul Makles	fed1da72fd	feat: support rauth events feat: add platform user wipe event	2023-01-20 15:43:45 +00:00
Paul Makles	cf9c0bc5e1	chore: bump rauth	2023-01-20 14:00:19 +00:00
Paul Makles	cc2054838a	chore: swap okapi for revolt_okapi	2023-01-20 14:00:19 +00:00
Paul MaklesandTheBobBobs	d9d2735efa	fix(ratelimiter): re-calculate reset time closes #204 Co-authored-by: TheBobBobs <84781603+TheBobBobs@users.noreply.github.com>	2023-01-18 18:26:00 +00:00
Ryan	94b0472934	feat: pass server flags with invite data (#203 )	2023-01-18 18:17:59 +00:00
Sophie L	4a7917e9ea	feat: enable reactions by default in servers/DMs	2023-01-18 18:17:37 +00:00
Lea	ce6b454874	fix: raise masquerade avatar URL length limit	2023-01-18 18:17:05 +00:00
ToastXC	fc32996b51	chore: remove clippy warnings (#213 )	2023-01-18 18:16:27 +00:00
Paul Makles	32d3683013	fix(ci): re-order docker-compose arguments chore(ci): prevent running gen on PR	2023-01-14 15:53:09 +00:00
Paul Makles	0cebb69e02	feat: automate generating OpenAPI specification	2023-01-14 15:42:30 +00:00
Paul Makles	117958d8cd	feat: include build information in root api call	2023-01-14 15:42:06 +00:00
Paul Makles	c5b823ad13	chore: clippy warnings	2023-01-03 21:06:43 +00:00
Paul Makles	27b4699299	fix: unify foreign user fetch into one method	2023-01-03 21:04:04 +00:00
Paul Makles	ee1c4cc2d5	chore: bump quark feat: update email templates to include recipient	2022-11-19 16:52:51 +00:00