fix: Config file formatting

They accidentally got removed in a recent refactor

Fixes #1890

.forgejo/actions/rust-toolchain/action.yml

@@ -33,7 +33,7 @@ runs:
         echo "version=$(rustup --version)" >> $GITHUB_OUTPUT
     - name: Cache rustup toolchains
       if: steps.rustup-version.outputs.version == ''
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           ~/.rustup

.forgejo/actions/setup-llvm-with-apt/action.yml

@@ -57,7 +57,7 @@ runs:
 
     - name: Check for LLVM cache
       id: cache
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           /usr/bin/clang-*

.forgejo/actions/setup-rust/action.yml

@@ -65,7 +65,7 @@ runs:
 
     - name: Cache toolchain binaries
       id: toolchain-cache
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           .cargo/bin
@@ -76,7 +76,7 @@ runs:
 
     - name: Cache Cargo registry and git
       id: registry-cache
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           .cargo/registry/index

.forgejo/actions/timelord/action.yml

@@ -31,7 +31,7 @@ runs:
 
     - name: Restore binary cache
       id: binary-cache
-      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           /usr/share/rust/.cargo/bin
@@ -71,13 +71,13 @@ runs:
 
     - name: Install timelord-cli and git-warp-time
       if: steps.check-binaries.outputs.need-install == 'true'
-      uses: https://github.com/taiki-e/install-action@15449e3094499af05d8d964a1c884208e4b8b595 # v2
+      uses: https://github.com/taiki-e/install-action@9bcaee1dcae34154180f412e2fa69355a7cda9f6 # v2
       with:
         tool: git-warp-time,timelord-cli@3.0.1
 
     - name: Save binary cache
       if: steps.check-binaries.outputs.need-install == 'true'
-      uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: |
           /usr/share/rust/.cargo/bin
@@ -87,7 +87,7 @@ runs:
 
     - name: Restore timelord cache with fallbacks
       id: timelord-restore
-      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: ${{ env.TIMELORD_CACHE_PATH }}
         key: ${{ env.TIMELORD_KEY }}
@@ -114,7 +114,7 @@ runs:
         timelord sync --source-dir ${{ env.TIMELORD_PATH }} --cache-dir ${{ env.TIMELORD_CACHE_PATH }}
 
     - name: Save updated timelord cache immediately
-      uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
       with:
         path: ${{ env.TIMELORD_CACHE_PATH }}
         key: ${{ env.TIMELORD_KEY }}

.forgejo/workflows/build-debian.yml

@@ -10,7 +10,7 @@ on:
       - "v*.*.*"
   workflow_dispatch:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: '30 0 * * 1'
 
 jobs:
   build:
@@ -41,26 +41,15 @@ jobs:
       #    else
       #      echo "No workaround needed for llvm-project#153385"
       #    fi
-      - name: Pick compatible clang version
-        id: clang-version
-        run: |
-          # both latest need to use clang-23, but oldstable and previous can just use clang
-          if [[ "${{ matrix.container }}" == "ubuntu-latest" ]]; then
-            echo "Using clang-23 package for ${{ matrix.container }}"
-            echo "version=clang-23" >> $GITHUB_OUTPUT
-          else
-            echo "Using default clang package for ${{ matrix.container }}"
-            echo "version=clang" >> $GITHUB_OUTPUT
-          fi
 
       - name: Checkout repository with full history
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           ref: ${{ github.ref_name }}
 
       - name: Cache Cargo registry
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             ~/.cargo/registry
@@ -93,10 +82,10 @@ jobs:
           # VERSION is the package version, COMPONENT is used in
           # apt's repository config like a git repo branch
           VERSION=$BASE_VERSION
-          if [[ ${{ forge.ref_name }} =~ ^v+[0-9]\.+[0-9]\.+[0-9]$ ]]; then
+          if [[ ${{ forge.ref_name }} =~ ^v+[0-9]+\.+[0-9]+\.+[0-9]+$ ]]; then
             # Use the "stable" component for tagged semver releases
             COMPONENT="stable"
-          elif [[ ${{ forge.ref_name }} =~ ^v+[0-9]\.+[0-9]\.+[0-9] ]]; then
+          elif [[ ${{ forge.ref_name }} =~ ^v+[0-9]+\.+[0-9]+\.+[0-9]+ ]]; then
             # Use the "unstable" component for tagged semver pre-releases
             COMPONENT="unstable"
           else
@@ -130,7 +119,7 @@ jobs:
         run: |
           apt-get update -y
           # Build dependencies for rocksdb
-          apt-get install -y liburing-dev ${{ steps.clang-version.outputs.version }}
+          apt-get install -y liburing-dev clang
 
       - name: Run cargo-deb
         id: cargo-deb

.forgejo/workflows/build-fedora.yml

@@ -16,7 +16,7 @@ on:
     #   - '.forgejo/workflows/build-fedora.yml'
   workflow_dispatch:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: '30 0 * * 2'
 
 jobs:
   build:
@@ -30,14 +30,14 @@ jobs:
           echo "Fedora version: $VERSION"
 
       - name: Checkout repository with full history
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           ref: ${{ github.ref_name }}
 
 
       - name: Cache DNF packages
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /var/cache/dnf
@@ -47,7 +47,7 @@ jobs:
             dnf-fedora${{ steps.fedora.outputs.version }}-
 
       - name: Cache Cargo registry
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             ~/.cargo/registry
@@ -57,7 +57,7 @@ jobs:
             cargo-fedora${{ steps.fedora.outputs.version }}-
 
       - name: Cache Rust build dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             ~/rpmbuild/BUILD/*/target/release/deps

.forgejo/workflows/build-nix.yml

@@ -0,0 +1,71 @@
+name: Build / Static via Nix
+
+concurrency:
+  group: "build-nix-${{ forge.ref }}"
+  cancel-in-progress: true
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+  workflow_dispatch:
+  schedule:
+    - cron: '30 0 * * 3'
+
+jobs:
+  build:
+    name: "Build ${{ matrix.filename }} Binary"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - package: default-static-x86_64
+            filename: conduwuit-linux-static-amd64
+          - package: default-static-aarch64
+            filename: conduwuit-linux-static-arm64
+
+          - package: max-perf-static-aarch64
+            filename: conduwuit-linux-static-arm64-maxperf
+          - package: max-perf-haswell-static-x86_64
+            filename: conduwuit-haswell-linux-static-amd64-maxperf
+
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+
+      - name: Install Lix
+        uses: https://github.com/samueldr/lix-gha-installer-action@a0fee77b2a98bb7c5c0ed7ae6d6ad4903dbdad0d
+        with:
+          extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
+
+      - name: Build static binary
+        run: |
+          nix build .#${{ matrix.package }}
+          install -D result/bin/conduwuit /tmp/binaries/${{ matrix.filename }}
+
+      - name: Upload binary artifact
+        uses: forgejo/upload-artifact@v4
+        with:
+          name: ${{ matrix.filename }}
+          path: /tmp/binaries/${{ matrix.filename }}
+
+  release-binaries:
+    name: "Release Binaries"
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    permissions:
+      contents: write
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Download binary artifacts
+        uses: forgejo/download-artifact@v4
+        with:
+          pattern: conduwuit*
+          path: binaries
+          merge-multiple: true
+      - name: Create Release and Upload
+        uses: https://github.com/softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
+        with:
+          draft: true
+          files: binaries/*

.forgejo/workflows/check-changelog.yml

@@ -14,23 +14,19 @@ jobs:
     name: Check changelog is added
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-          sparse-checkout: .
-
       - name: Check for changelog entry
         id: check_files
         run: |
-          git fetch origin ${GITHUB_BASE_REF}
+          AUTH=$(echo -n "x-access-token:${{ secrets.GITHUB_TOKEN }}" | base64 -w 0)
+          git config --global http.${{ github.server_url }}/.extraheader "Authorization: basic $AUTH"
+          git clone "${{ github.event.repository.clone_url }}" repo.git --bare
+
+          git -C repo.git fetch origin pull/${{ github.event.pull_request.number }}/head
 
           # Check for Added (A) or Modified (M) files in changelog.d
-          CHANGELOG_CHANGES=$(git diff --name-status origin/${GITHUB_BASE_REF}...HEAD -- changelog.d/)
+          CHANGELOG_CHANGES=$(git -C repo.git diff --name-status ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} -- changelog.d/)
 
-          SRC_CHANGES=$(git diff --name-status origin/${GITHUB_BASE_REF}...HEAD -- src/)
+          SRC_CHANGES=$(git -C repo.git diff --name-status ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} -- src/)
 
           echo "Changes in changelog.d/:"
           echo "$CHANGELOG_CHANGES"

.forgejo/workflows/documentation.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Sync repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -37,7 +37,7 @@ jobs:
           node-version: 22
 
       - name: Cache npm dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: ~/.npm
           key: continuwuity-rspress-${{ steps.runner-env.outputs.slug }}-${{ steps.runner-env.outputs.arch }}-node-${{ steps.runner-env.outputs.node_version }}-${{ hashFiles('package-lock.json') }}

.forgejo/workflows/mirror-images.yml

@@ -41,7 +41,7 @@ jobs:
       DOCKER_MIRROR_TOKEN: ${{ secrets.DOCKER_MIRROR_TOKEN }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -55,7 +55,7 @@ jobs:
       #     repositories: continuwuity
 
       - name: Install regsync
-        uses: https://github.com/regclient/actions/regsync-installer@14f9d37db17b5dc41fefd1ffdd1af4b9e2490560 # main
+        uses: https://github.com/regclient/actions/regsync-installer@9a2d4216180dbb3e2dccfa60d2dd4afd98e42ec5 # main
 
       - name: Check what images need mirroring
         run: |

.forgejo/workflows/prek-checks.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -48,7 +48,7 @@ jobs:
       rust: ${{ steps.filter.outputs.rust }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 

.forgejo/workflows/release-image.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Prepare Docker build environment
@@ -100,7 +100,7 @@ jobs:
     needs: build-release
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Create multi-platform manifest
@@ -133,7 +133,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Prepare max-perf Docker build environment
@@ -187,7 +187,7 @@ jobs:
     needs: build-maxperf
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Create max-perf manifest
@@ -216,7 +216,7 @@ jobs:
           path: binaries
           merge-multiple: true
       - name: Create Release and Upload
-        uses: https://github.com/softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3
+        uses: https://github.com/softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
         with:
           draft: true
           files: binaries/*

.forgejo/workflows/renovate.yml

@@ -43,11 +43,11 @@ jobs:
     name: Renovate
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/renovatebot/renovate:43.222.1@sha256:b9af3f59f3f4d92b2c41e9f4ca3ffe92400503f20158d0bd67d07a3fdbe781d2
+      image: ghcr.io/renovatebot/renovate:43.246.1@sha256:5965c08f8ca5baff8dc9bf3a32c44ca71fef843ad94880e9696d46e1d722b0fa
       options: --tmpfs /tmp:exec
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           show-progress: false
 
@@ -55,7 +55,7 @@ jobs:
         run: /usr/local/renovate/node -e 'console.log(`node heap limit = ${require("v8").getHeapStatistics().heap_size_limit / (1024 * 1024)} Mb`)'
 
       - name: Restore renovate repo cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /tmp/renovate/cache/renovate/repository
@@ -64,7 +64,7 @@ jobs:
             renovate-repo-cache-
 
       - name: Restore renovate package cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /tmp/renovate/cache/renovate/renovate-cache-sqlite
@@ -73,7 +73,7 @@ jobs:
             renovate-package-cache-
 
       - name: Restore renovate OSV cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /tmp/osv
@@ -117,7 +117,7 @@ jobs:
 
       - name: Save renovate package cache
         if: always()
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /tmp/renovate/cache/renovate/renovate-cache-sqlite
@@ -125,7 +125,7 @@ jobs:
 
       - name: Save renovate OSV cache
         if: always()
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           path: |
             /tmp/osv

.forgejo/workflows/update-flake-hashes.yml

@@ -14,7 +14,7 @@ jobs:
   update-flake-hashes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: true
           token: ${{ secrets.FORGEJO_TOKEN }}
@@ -27,7 +27,7 @@ jobs:
       - name: Get new toolchain hash
         run: |
           # Set the current sha256 to an empty hash to make `nix build` calculate a new one
-          awk '/fromToolchainFile *\{/{found=1; print; next} found && /sha256 =/{sub(/sha256 = .*/, "sha256 = lib.fakeSha256;"); found=0} 1' nix/rust.nix > temp.nix
+          awk '/fromToolchainName *\{/{found=1; print; next} found && /sha256 =/{sub(/sha256 = .*/, "sha256 = lib.fakeSha256;"); found=0} 1' nix/rust.nix > temp.nix
           mv temp.nix nix/rust.nix
 
           # Build continuwuity and filter for the new hash
@@ -39,7 +39,7 @@ jobs:
           sed -i "s|lib.fakeSha256|\"$new_hash\"|" nix/rust.nix
 
           echo "New hash:"
-          awk -F'"' '/fromToolchainFile/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
+          awk -F'"' '/fromToolchainName/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
           echo "Expected new hash:"
           cat new_toolchain_hash.txt
 

Cargo.toml

@@ -45,7 +45,7 @@ version = "1.0.6"
 version = "1.0.0"
 
 [workspace.dependencies.cargo_toml]
-version = "0.22"
+version = "1.0"
 default-features = false
 features = ["features"]
 
@@ -124,7 +124,7 @@ default-features = false
 features = ["util"]
 
 [workspace.dependencies.tower-http]
-version = "0.6.8"
+version = "0.7.0"
 default-features = false
 features = [
     "add-extension",
@@ -164,7 +164,7 @@ features = ["raw_value"]
 
 # Used for appservice registration files
 [workspace.dependencies.serde-saphyr]
-version = "0.0.27"
+version = "0.0.28"
 
 # Used to load forbidden room/user regex from config
 [workspace.dependencies.serde_regex]
@@ -316,7 +316,7 @@ default-features = false
 
 # Used to make working with iterators easier, was already a transitive depdendency
 [workspace.dependencies.itertools]
-version = "0.14.0"
+version = "0.15.0"
 
 # to parse user-friendly time durations in admin commands
 #TODO: overlaps chrono?
@@ -356,6 +356,7 @@ features = [
     "ring-compat",
     "compat-upload-signatures",
     "compat-optional-txn-pdus",
+    "compat-get-3pids",
     "unstable-msc2666",
     "unstable-msc2867",
     "unstable-msc2870",
@@ -402,6 +403,9 @@ default-features = false
 version = "0.11.0"
 default-features = false
 
+[workspace.dependencies.openidconnect]
+version = "4.0.1"
+
 # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
 [workspace.dependencies.opentelemetry]
 version = "0.32.0"
@@ -559,6 +563,9 @@ features = ["std"]
 [workspace.dependencies.nonzero_ext]
 version = "0.3.0"
 
+[workspace.dependencies.serde_urlencoded]
+version = "0.7.1"
+
 #
 # Patches
 #

SECURITY.md

@@ -23,6 +23,7 @@ ### Responsible Disclosure
 1. **Contact members of the team directly** over E2EE private message.
    - [@jade:ellis.link](https://matrix.to/#/@jade:ellis.link)
    - [@nex:nexy7574.co.uk](https://matrix.to/#/@nex:nexy7574.co.uk)
+   - [@ginger:gingershaped.computer](https://matrix.to/#/@ginger:gingershaped.computer)
 2. **Email the security team** at [security@continuwuity.org](mailto:security@continuwuity.org). This is not E2EE, so don't include sensitive details.
 3. **Do not disclose the vulnerability publicly** until it has been addressed
 4. **Provide detailed information** about the vulnerability, including:

changelog.d/+12935c96.feature.md

@@ -0,0 +1 @@
+Appservice device management as outlined in MSC4190 (part of Matrix 1.17) is now fully supported. Contributed by @ginger.

changelog.d/+7865cde6.feature.md

@@ -0,0 +1 @@
+Users may now be forbidden from deactivating their own accounts with the new `allow_deactivation` config option. Contributed by @ginger.

changelog.d/+98691708.feature.md

@@ -0,0 +1 @@
+Added support for authenticating clients using the new OAuth 2.0 login API. Contributed by @ginger.

changelog.d/1818.feature.md

@@ -0,0 +1,2 @@
+Improved the performance and reliability of fetching missing events, improving network partition recovery. Contributed
+by @nex.

changelog.d/1853.feature

@@ -0,0 +1 @@
+Added static builds using Nix, allowing for Continuwuity on musl. During this, we also introduced a `max-perf-haswell` package, separating it from `max-perf`, so you may want to swap to this if you are on NixOS. Contributed by @Henry-Hiles (QuadRadical).

changelog.d/1875.feature

@@ -0,0 +1 @@
+Added support for MSC4380 invite blocking, which has become part of the Matrix specification in v1.18. Contributed by @nex.

changelog.d/1877.feature

@@ -0,0 +1 @@
+Added `!admin debug get-state-at` command

changelog.d/765.feature.md

@@ -0,0 +1 @@
+Added support for linking an external identity provider with OIDC. Contributed by @ginger.

conduwuit-example.toml

@@ -297,7 +297,7 @@
 
 # This item is undocumented. Please contribute documentation for it.
 #
-#max_fetch_prev_events = 192
+#max_fetch_prev_events = 1024
 
 # How many incoming federation transactions the server is willing to be
 # processing at any given time before it becomes overloaded and starts
@@ -521,17 +521,15 @@
 #
 #recaptcha_private_site_key =
 
-# Policy documents, such as terms and conditions or a privacy policy,
-# which users must agree to when registering an account.
+# Controls whether users are allowed to deactivate their own accounts
+# through the account management panel or their Matrix clients. Server
+# admins can always deactivate users using the relevant admin commands.
 #
-# Example:
-# ```ignore
-# [global.registration_terms.privacy_policy]
-# en = { name = "Privacy Policy", url = "https://homeserver.example/en/privacy_policy.html" }
-# es = { name = "Política de Privacidad", url = "https://homeserver.example/es/privacy_policy.html" }
-# ```
+# Note that, in some jurisdictions, you may be legally required to honor
+# users who request to deactivate their accounts if you set this option
+# to `false`.
 #
-#registration_terms = {}
+#allow_deactivation = true
 
 # Controls whether encrypted rooms and events are allowed.
 #
@@ -645,6 +643,14 @@
 #
 #default_room_acl_deny =
 
+# The number of forward extremities to tolerate in a room before
+# attempting to manually squash them with a "dummy event". Setting this
+# above 20 will hinder its efficacy, and setting it below 5 will cause
+# more dummy events to be sent than necessary (which increases federation
+# traffic).
+#
+#dummy_event_threshold = 10
+
 # Enable OpenTelemetry OTLP tracing export. This replaces the deprecated
 # Jaeger exporter. Traces will be sent via OTLP to a collector (such as
 # Jaeger) that supports the OpenTelemetry Protocol.
@@ -1428,6 +1434,11 @@
 #
 #send_messages_from_ignored_users_to_client = false
 
+# Send "org.matrix.dummy_event" events to the client. This is a debugging
+# option.
+#
+#send_dummy_events_to_clients = false
+
 # Vector list of IPv4 and IPv6 CIDR ranges / subnets *in quotes* that you
 # do not want continuwuity to send outbound requests to. Defaults to
 # RFC1918, unroutable, loopback, multicast, and testnet addresses for
@@ -1987,3 +1998,119 @@
 # `require_email_for_registration`.
 #
 #require_email_for_token_registration = false
+
+#[global.registration_terms]
+
+# The language code to provide to clients along with the policy documents.
+#
+#language = "en"
+
+# Policy documents, such as terms and conditions or a privacy policy,
+# which users must agree to when registering an account.
+#
+# Example:
+# ```ignore
+# [global.registration_terms.documents]
+# privacy_policy = { name = "Privacy Policy", url = "https://homeserver.example/en/privacy_policy.html" }
+# ```
+#
+#documents =
+
+#[global.oauth]
+
+# The compatibility mode to use for OAuth.
+#
+# - "disabled": OAuth will be unavailable. Users will only be able to log
+#   in using legacy authentication.
+# - "hybrid": OAuth and legacy authentication will both be available. Some
+#   clients may only use one or the other.
+# - "exclusive": Only OAuth will be available. Clients which require
+#   legacy authentication will be unable to log in.
+#
+#compatibility_mode = "hybrid"
+
+#[global.oauth.oidc]
+# Uncommenting this section will enable Continuwuity's support for
+# authenticating users using an OpenID Connect-compatible identity provider.
+# This is referred to as "delegated authentication".
+#
+# IMPORTANT NOTE: When delegated authentication is active, Continuwuity will behave as if
+# the `global.oauth.compatibility_mode` setting is set to `exclusive`.
+# Matrix clients which do not support OAuth login (also referred to as "next-gen auth") will NOT be able
+# to log in while delegated authentication is active.
+
+
+# The OIDC issuer URL. Continuwuity will use OpenID Connect Discovery to
+# automatically fetch the identity provider's metadata from this URL.
+# Generally you should set this to the base domain your identity provider
+# runs on.
+#
+#discovery_url =
+
+# The OAuth client ID for Continuwuity to use when communicating with the
+# identity provider.
+#
+#client_id =
+
+# The OAuth client secret for Continuwuity to use when communicating with
+# the identity provider.
+#
+#client_secret =
+
+# Additional scopes Continuwuity should request from the IDP. This may be
+# necessary to access certain claims. Continuwuity always requests the
+# `openid` scope.
+#
+#additional_scopes = []
+
+# Whether the user should be prompted to choose a localpart
+# when signing in for the first time. If this is `false`, Continuwuity
+# will attempt to use the value of the `preferred_username_claim`
+# (see below) as the user's localpart. Authentication will
+# fail if this claim is missing or is not a valid localpart.
+#
+#prompt_for_localpart = true
+
+# The claim to use for the user's localpart, if `prompt_for_localpart` is
+# false.
+#
+#preferred_username_claim = "preferred_username"
+
+# The claim which will be used to set the user's email address,
+# either on initial registration or on every login depending on
+# the value of `profile_key_import_mode`. Continuwuity assumes that
+# the IDP has taken care of verifying that the user controls the email
+# address it provides.
+#
+# This option does nothing if SMTP is not configured.
+#
+# If this option is set, and `profile_key_import_mode` is `on_login`,
+# users will not be able to change their email addresses themselves.
+#
+#email_claim = "email"
+
+# Defines how claims returned from the IDP should be mapped to a user's
+# profile data. The profile field named in each key will be set from the
+# claim named in the corresponding value when the user first registers,
+# and possibly on subsequent logins as well, depending on the value of
+# `profile_key_import_mode` (see below).
+#
+# Per-room overrides to the user's display name or avatar will be
+# preserved by the import process.
+#
+# SECURITY NOTE: If the `avatar_url` field is set, Continuwuity will
+# perform a HTTP GET to the URL in the mapped claim and use the returned
+# file as the user's profile picture. Make sure your users are not able
+# to set the value of the mapped claim to an arbitrary URL.
+#
+#profile_key_map = { displayname = "name" }
+
+# When profile keys should be imported from the IDP's claims.
+#
+# - "on_registration": Listed keys will be imported once, when the user
+#   logs in for the first time and their shadow account is created.
+# - "on_login": Listed keys will be imported every time the user logs in.
+#   Additionally, users will not be able to manually edit any listed keys
+#   through their Matrix client.
+#
+#profile_key_import_mode = "on_registration"

docker/Dockerfile

@@ -50,7 +50,7 @@ EOF
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.20.0
+ENV BINSTALL_VERSION=1.20.1
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docker/musl.Dockerfile

@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/etc/apk/cache apk add \
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.20.0
+ENV BINSTALL_VERSION=1.20.1
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docs/deploying/generic.mdx

@@ -47,9 +47,15 @@ #### Performance-optimised builds
 
 ### Nix
 
-Theres a Nix package defined in our flake, available for Linux and MacOS. Add continuwuity as an input to your flake, and use `inputs.continuwuity.packages.${system}.default` to get a working Continuwuity package.
+If you wish to generate a static binary, you can do so using Nix: `nix build git+https://forgejo.ellis.link/continuwuation/continuwuity#packageName`, where `packageName` is one of:
 
-If you simply wish to generate a binary using Nix, you can run `nix build git+https://forgejo.ellis.link/continuwuation/continuwuity` to generate a binary in `result/bin/conduwuit`.
+- `default-static-x86_64`
+- `default-static-aarch64`
+- `max-perf-static-x86_64`
+- `max-perf-haswell-static-x86_64`
+- `max-perf-static-aarch64`
+
+`max-perf` takes longer to build, but has more runtime optimizations. Haswell builds are optimized for modern CPUs.
 
 ### Compiling
 

docs/deploying/nixos.mdx

@@ -47,9 +47,16 @@ ### Available options
 - `extraEnvironment`: Extra environment variables to pass to the Continuwuity server
 - `package`: The Continuwuity package to use, defaults to `pkgs.matrix-continuwuity`
     - You may want to override this to be from our flake, for faster updates and unstable versions:
+
     ```nix
-    package = inputs.continuwuity.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    package = inputs.continuwuity.packages.${pkgs.stdenv.hostPlatform.system}.packageName;
     ```
+
+    Where `packageName` is one of:
+    - `default`
+    - `max-perf`: Takes longer to build, but has more runtime optimizations
+    - `max-perf-haswell`: Optimized for modern CPUs, don't use if your CPU is not Haswell or later.
+
 - `admin.enable`: Whether to add the `conduwuit` binary to `PATH` for administration (enabled by default)
 - `settings`: The Continuwuity configuration
 

docs/public/.well-known/continuwuity/announcements

@@ -6,10 +6,10 @@
             "message": "Welcome to Continuwuity! Important announcements about the project will appear here."
         },
         {
-            "id": 13,
+            "id": 14,
             "mention_room": true,
-            "date": "2026-05-08",
-            "message": "[v0.5.9](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v0.5.9) has been released, fixing a few low-severity federation-related vulnerabilities. It is recommended you read the changelog and update as soon as possible. There are no new features or other changes in this release, only related bugfixes. Deployments tracking the main branch should also update to the latest commit."
+            "date": "2026-06-20",
+            "message": "[v0.5.10](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v0.5.10) has been released. It is a security release, so we suggest you update as soon as possible. Don't forget to also join [our announcements room](https://matrix.to/#/!jIdNjSM5X-V5JVx2h2kAhUZIIQ08GyzPL55NFZAH1vM/%24K1ISNKIqfNiZzsNVCaTt2E7ZtNeP6Dsy6sbz9l3rO0A?via=ellis.link&via=gingershaped.computer&via=matrix.org)."
         }
     ]
 }

docs/reference/admin/debug.md

@@ -10,7 +10,13 @@ ## `!admin debug echo`
 
 ## `!admin debug get-auth-chain`
 
-Get the auth_chain of a PDU
+Loads the auth_chain of a PDU, reporting how long it took
+
+## `!admin debug show-auth-chain`
+
+Walks & displays the auth_chain of a PDU in a mermaid graph format.
+
+This is useless to basically anyone but developers, and is also probably slow and memory hungry.
 
 ## `!admin debug parse-pdu`
 
@@ -44,6 +50,12 @@ ## `!admin debug get-room-state`
 
 Of course the check is still done on the actual client API.
 
+## `!admin debug get-state-at`
+
+Gets all the room state events at the specified event.
+
+State at event might not be available for some PDUs, such as rejected ones.
+
 ## `!admin debug get-signing-keys`
 
 Get and display signing keys from local cache or remote server

docs/reference/admin/index.md

@@ -14,6 +14,7 @@ ## Categories
 - [`!admin appservices`](appservices/): Commands for managing appservices
 - [`!admin users`](users/): Commands for managing local users
 - [`!admin token`](token/): Commands for managing registration tokens
+- [`!admin oidc`](oidc/): Commands for managing OIDC
 - [`!admin rooms`](rooms/): Commands for managing rooms
 - [`!admin federation`](federation/): Commands for managing federation
 - [`!admin server`](server/): Commands for managing the server

docs/reference/admin/oidc.md

@@ -0,0 +1,13 @@
+<!-- This file is generated by `cargo xtask generate-docs`. Do not edit. -->
+# `!admin oidc`
+
+Commands for managing OIDC
+
+
+## `!admin oidc link`
+
+Link a user ID to the given subject claim
+
+## `!admin oidc unlink`
+
+Unlink the given subject claim from its associated user ID

docs/reference/admin/users.md

@@ -12,10 +12,6 @@ ## `!admin users reset-password`
 
 Reset user password
 
-## `!admin users issue-password-reset-link`
-
-Issue a self-service password reset link for a user
-
 ## `!admin users get-email`
 
 Get a user's associated email address
@@ -96,6 +92,14 @@ ## `!admin users list-users`
 
 List local users in the database
 
+## `!admin users list-invited-rooms`
+
+Lists all the rooms (local and remote) that the specified user is invited to
+
+## `!admin users reject-all-invites`
+
+Manually make a user reject all current invites
+
 ## `!admin users list-joined-rooms`
 
 Lists all the rooms (local and remote) that the specified user is joined in

docs/troubleshooting.mdx

@@ -10,7 +10,7 @@ ## Continuwuity issues
 
 ### Slow joins to rooms
 
-Some slowness is to be expected if you're the first person on your homserver to join a room (which will
+Some slowness is to be expected if you're the first person on your homeserver to join a room (which will
 always be the case for single-user homeservers). In this situation, your homeserver has to verify the signatures of
 all of the state events sent by other servers before your join. To make this process as fast as possible, make sure you have
 multiple fast, trusted servers listed in `trusted_servers` in your configuration, and ensure

nix/crane.nix

@@ -1,14 +0,0 @@
-{ inputs, ... }:
-{
-  perSystem =
-    {
-      pkgs,
-      self',
-      ...
-    }:
-    {
-      _module.args.craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (
-        pkgs: self'.packages.stable-toolchain
-      );
-    };
-}

nix/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./rust.nix
-    ./crane.nix
     ./packages
     ./devshell.nix
     ./fmt.nix

nix/devshell.nix

@@ -1,7 +1,6 @@
-{
+{ inputs, ... }: {
   perSystem =
     {
-      craneLib,
       self',
       lib,
       pkgs,
@@ -9,34 +8,36 @@
     }:
     {
       # basic nix shell containing all things necessary to build continuwuity in all flavors manually (on x86_64-linux)
-      devShells.default = craneLib.devShell {
-        packages = [
-          self'.packages.rocksdb
-          pkgs.nodejs
-          pkgs.pkg-config
-        ]
-        ++ lib.optionals pkgs.stdenv.isLinux [
-          pkgs.liburing
-          pkgs.rust-jemalloc-sys-unprefixed
-        ];
-
-        env = {
-          LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
-          LD_LIBRARY_PATH = lib.makeLibraryPath (
-            [
-              pkgs.stdenv.cc.cc.lib
+      devShells.default =
+        ((inputs.crane.mkLib pkgs).overrideToolchain (pkgs: self'.packages.stable-toolchain)).devShell
+          {
+            packages = [
+              self'.packages.rocksdb
+              pkgs.nodejs
+              pkgs.pkg-config
             ]
             ++ lib.optionals pkgs.stdenv.isLinux [
               pkgs.liburing
-              pkgs.jemalloc
-            ]
-          );
-        }
-        // lib.optionalAttrs pkgs.stdenv.isLinux {
-          PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
-            pkgs.liburing.dev
-          ];
-        };
-      };
+              pkgs.rust-jemalloc-sys-unprefixed
+            ];
+
+            env = {
+              LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
+              LD_LIBRARY_PATH = lib.makeLibraryPath (
+                [
+                  pkgs.stdenv.cc.cc.lib
+                ]
+                ++ lib.optionals pkgs.stdenv.isLinux [
+                  pkgs.liburing
+                  pkgs.jemalloc
+                ]
+              );
+            }
+            // lib.optionalAttrs pkgs.stdenv.isLinux {
+              PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
+                pkgs.liburing.dev
+              ];
+            };
+          };
     };
 }

nix/packages/continuwuity.nix

@@ -2,14 +2,14 @@
   lib,
   self,
   stdenv,
-  liburing,
+  rocksdb,
   craneLib,
   pkg-config,
+  liburing,
   rustPlatform,
   cargoExtraArgs ? "",
   rustflags ? "",
   target_cpu ? null,
-  rocksdb,
   profile ? "release",
 }:
 let
@@ -28,18 +28,26 @@ let
   };
 
   attrs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+
     inherit src;
+
     nativeBuildInputs = [
       pkg-config
       rustPlatform.bindgenHook
     ];
+
     buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ liburing ];
+
     env = {
-      ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-      ROCKSDB_LIB_DIR = "${rocksdb}/lib";
       CARGO_PROFILE = profile;
       RUSTFLAGS = rustflags;
     }
+    // (lib.optionalAttrs (rocksdb != null) {
+      ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
+      ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+    })
     // (lib.optionalAttrs (target_cpu != null) {
       TARGET_CPU = target_cpu;
     });
@@ -51,7 +59,7 @@ craneLib.buildPackage (
     cargoArtifacts = craneLib.buildDepsOnly attrs;
 
     # Needed to make continuwuity link to rocksdb
-    postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && rocksdb != null) ''
       old_rpath="$(patchelf --print-rpath $out/bin/conduwuit)"
       extra_rpath="${
         lib.makeLibraryPath [

nix/packages/default.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   self,
   ...
 }:
@@ -6,32 +7,84 @@
   perSystem =
     {
       self',
+      lib,
       pkgs,
+      inputs',
+      system,
       craneLib,
+      mkToolchain,
       ...
     }:
     {
-      packages = {
-        rocksdb = pkgs.callPackage ./rocksdb.nix { };
-        default = pkgs.callPackage ./continuwuity.nix {
-          inherit self craneLib;
-          inherit (self'.packages) rocksdb;
-          # extra features via `cargoExtraArgs`
-          cargoExtraArgs = "-F http3";
-          # extra RUSTFLAGS via `rustflags`
-          # the stuff below is required for http3
-          rustflags = "--cfg reqwest_unstable";
-        };
-        # users may also override this with other cargo profiles to build for other feature sets
-        # for features configuration see `default` package which enables http3 by default
+      packages =
+        let
+          mkPackages =
+            pkgs:
+            let
+              fnx = inputs'.fenix.packages;
 
-        # example: different compilation profile and different target_cpu
-        max-perf-haswell = self'.packages.default.override {
-          # compiles explicitly for haswell arch cpus
-          target_cpu = "haswell";
-          # compiles slower but with more thorough optimizations
-          profile = "release-max-perf";
-        };
-      };
+              isStatic = pkgs.stdenv.hostPlatform.isMusl;
+
+              craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (
+                _:
+                if isStatic then
+                  fnx.combine [
+                    self'.packages.stable-toolchain
+                    (mkToolchain fnx.targets.${pkgs.stdenv.hostPlatform.config}).rust-std
+                  ]
+                else
+                  self'.packages.stable-toolchain
+              );
+
+              default = pkgs.callPackage ./continuwuity.nix {
+                inherit self craneLib;
+
+                liburing = (if isStatic then pkgs.pkgsStatic else pkgs).liburing;
+                rocksdb = if isStatic then null else self'.packages.rocksdb;
+
+                # extra features via `cargoExtraArgs`
+                cargoExtraArgs = "-F http3";
+                # extra RUSTFLAGS via `rustflags`
+                # the stuff below is required for http3
+                rustflags = "--cfg reqwest_unstable";
+              };
+
+              # users may also override this with other cargo profiles to build for other feature sets
+              # for features configuration see `default` package which enables http3 by default
+
+              max-perf = default.override {
+                # compiles slower but with more thorough optimizations
+                profile = "release-max-perf";
+              };
+
+              max-perf-haswell = max-perf.override {
+                # compiles explicitly for haswell arch cpus
+                target_cpu = "haswell";
+              };
+            in
+            {
+              inherit default max-perf max-perf-haswell;
+            };
+        in
+        {
+          rocksdb = pkgs.callPackage ./rocksdb.nix { };
+        }
+        // (mkPackages pkgs)
+        // (lib.mapAttrs' (name: value: lib.nameValuePair "${name}-static-x86_64" value) (
+          mkPackages (
+            import inputs.nixpkgs {
+              localSystem = system;
+              crossSystem = "x86_64-unknown-linux-musl";
+            }
+          )
+        ))
+        // (lib.mapAttrs' (name: value: lib.nameValuePair "${name}-static-aarch64" value) (
+          mkPackages (
+            import inputs.nixpkgs {
+              localSystem = system;
+              crossSystem = "aarch64-unknown-linux-musl";
+            }
+          )
+        ));
     };
 }

nix/rust.nix

@@ -2,22 +2,26 @@
 {
   perSystem =
     {
-      system,
       lib,
+      inputs',
       pkgs,
       ...
     }:
+    let
+      mkToolchain =
+        target:
+        target.fromToolchainName {
+          name = (lib.importTOML "${inputs.self}/rust-toolchain.toml").toolchain.channel;
+          sha256 = "sha256-mvUGEOHYJpn3ikC5hckneuGixaC+yGrkMM/liDIDgoU=";
+        };
+    in
     {
+      _module.args = { inherit mkToolchain; };
+
       packages =
         let
-          fnx = inputs.fenix.packages.${system};
-
-          stable-toolchain = fnx.fromToolchainFile {
-            file = inputs.self + "/rust-toolchain.toml";
-
-            # See also `rust-toolchain.toml`
-            sha256 = "sha256-mvUGEOHYJpn3ikC5hckneuGixaC+yGrkMM/liDIDgoU=";
-          };
+          fnx = inputs'.fenix.packages;
+          stable-toolchain = (mkToolchain fnx).toolchain;
         in
         {
           inherit stable-toolchain;

package-lock.json

@@ -383,18 +383,18 @@
       }
     },
     "node_modules/@rspress/core": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.14.tgz",
-      "integrity": "sha512-k59i08zwBGgHrjHw8CK1m4CeTrKPvZRmV54bxubQl6AdDdmhJK6WrNg3UthwWmd38scKtqF40ATXDE8RMiNcNA==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.15.tgz",
+      "integrity": "sha512-epLmUXYscNRw/GtQZx2oknoBE9wKbCrUGEOrQEDI4Qq8X32GdM4d7itzuHsliY7q3IbffKx8rMVbvlmygEocTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/mdx": "^3.1.1",
         "@mdx-js/react": "^3.1.1",
-        "@rsbuild/core": "^2.0.9",
+        "@rsbuild/core": "^2.0.15",
         "@rsbuild/plugin-react": "~2.0.1",
-        "@rspress/shared": "2.0.14",
-        "@shikijs/rehype": "^4.0.2",
+        "@rspress/shared": "2.0.15",
+        "@shikijs/rehype": "^4.2.0",
         "@types/unist": "^3.0.3",
         "@unhead/react": "^2.1.15",
         "body-scroll-lock": "4.0.0-beta.0",
@@ -407,22 +407,22 @@
         "mdast-util-mdxjs-esm": "^2.0.1",
         "medium-zoom": "1.1.0",
         "nprogress": "^0.2.0",
-        "react": "^19.2.6",
-        "react-dom": "^19.2.6",
+        "react": "^19.2.7",
+        "react-dom": "^19.2.7",
         "react-lazy-with-preload": "^2.2.1",
         "react-reconciler": "0.33.0",
         "react-render-to-markdown": "19.1.0",
         "react-router-dom": "^7.15.1",
         "rehype-external-links": "^3.0.0",
         "rehype-raw": "^7.0.0",
-        "remark-cjk-friendly": "^2.0.1",
-        "remark-cjk-friendly-gfm-strikethrough": "^2.0.1",
+        "remark-cjk-friendly": "^2.3.1",
+        "remark-cjk-friendly-gfm-strikethrough": "^2.1.0",
         "remark-gfm": "^4.0.1",
         "remark-mdx": "^3.1.1",
         "remark-parse": "^11.0.0",
         "remark-stringify": "^11.0.0",
         "scroll-into-view-if-needed": "^3.1.0",
-        "shiki": "^4.0.2",
+        "shiki": "^4.2.0",
         "unified": "^11.0.5",
         "unist-util-remove": "^4.0.0",
         "unist-util-visit": "^5.1.0",
@@ -436,9 +436,9 @@
       }
     },
     "node_modules/@rspress/plugin-client-redirects": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.14.tgz",
-      "integrity": "sha512-/WpbWUiepQglpPeplxCnELe2c7VdBUxPiICPAVnS1ZxAFdYkIpW0C+Vbk1t08kZqx8EAZGu+s6Zy43zyQpjdxg==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.15.tgz",
+      "integrity": "sha512-bPf/KIHH7Y6huLTtK6JXwRfxM7zKjksoxm46+IBsF1wisw0doKkEKR9HwJydxWnykyKBbA2cuZOaoT4h174Z1w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -449,9 +449,9 @@
       }
     },
     "node_modules/@rspress/plugin-sitemap": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.14.tgz",
-      "integrity": "sha512-Gpone22PvXGfGRSyi/WM8IXgsvKhNspXqHjtPD3g62jX8SJL3kpj2YZ2V28WEkg672fICauUYXrpre74Rddcsw==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.15.tgz",
+      "integrity": "sha512-z1hbyGP79ZXdSGJxiWw7ZjmX8qW0q9nXMDxr14cVEg/wdj7ToVzGtZHw0wvTPE0YiKG3BMiGkVNfE1rdOaPXiQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -462,14 +462,14 @@
       }
     },
     "node_modules/@rspress/shared": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.14.tgz",
-      "integrity": "sha512-sCe9tAo+s9tR4DmFSjMyHOxQvhzTSYXkkMUfVEo5w+uMCNXXGAIC6D0xAVDMHq1jIFF9ix47VxzlCo+CYNS14g==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.15.tgz",
+      "integrity": "sha512-o8aYwEzNuTmWnmKe91ntPv+34u3RbtAe+rcK9XC5MANOlgncwOaCs3bUa8/B1/llwyLoNgrpi+VB9bEiU11ZRQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rsbuild/core": "^2.0.9",
-        "@shikijs/rehype": "^4.0.2",
+        "@rsbuild/core": "^2.0.15",
+        "@shikijs/rehype": "^4.2.0",
         "unified": "^11.0.5"
       }
     },
@@ -3058,9 +3058,9 @@
       }
     },
     "node_modules/remark-cjk-friendly": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/remark-cjk-friendly/-/remark-cjk-friendly-2.1.0.tgz",
-      "integrity": "sha512-ZWGDfTJNLEZ1gap+pd33K13ZhRAWgVDqxKA7JIlBs5IDu+qvbiWl/pEbeuxzRrWyrrkeFFoTnvNw00iW9mBcow==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/remark-cjk-friendly/-/remark-cjk-friendly-2.3.1.tgz",
+      "integrity": "sha512-f+pKZRxCRwNEGFBKNRAZAqU91GIK1SAo3ZyFHWRUgC9zcxRR0BXKd6YwqgSsxtW0rNpUDtONj7H5nje2WL3fcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

src/admin/admin.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use conduwuit::Result;
+use conduwuit::{Err, Result};
 
 use crate::{
 	appservice::{self, AppserviceCommand},
@@ -8,6 +8,7 @@
 	debug::{self, DebugCommand},
 	federation::{self, FederationCommand},
 	media::{self, MediaCommand},
+	oidc::{self, OidcCommand},
 	query::{self, QueryCommand},
 	room::{self, RoomCommand},
 	server::{self, ServerCommand},
@@ -16,46 +17,50 @@
 };
 
 #[derive(Debug, Parser)]
-#[command(name = conduwuit_core::name(), version = conduwuit_core::version())]
+#[command(name = conduwuit_core::BRANDING, version = conduwuit_core::version())]
 pub enum AdminCommand {
-	#[command(subcommand)]
 	/// Commands for managing appservices
+	#[command(subcommand)]
 	Appservices(AppserviceCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing local users
+	#[command(subcommand)]
 	Users(UserCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing registration tokens
+	#[command(subcommand)]
 	Token(TokenCommand),
 
+	/// Commands for managing OIDC
 	#[command(subcommand)]
+	Oidc(OidcCommand),
+
 	/// Commands for managing rooms
+	#[command(subcommand)]
 	Rooms(RoomCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing federation
+	#[command(subcommand)]
 	Federation(FederationCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing the server
+	#[command(subcommand)]
 	Server(ServerCommand),
 
-	#[command(subcommand)]
 	/// Commands for managing media
+	#[command(subcommand)]
 	Media(MediaCommand),
 
-	#[command(subcommand)]
 	/// Commands for checking integrity
+	#[command(subcommand)]
 	Check(CheckCommand),
 
-	#[command(subcommand)]
 	/// Commands for debugging things
+	#[command(subcommand)]
 	Debug(DebugCommand),
 
-	#[command(subcommand)]
 	/// Low-level queries for database getters and iterators
+	#[command(subcommand)]
 	Query(QueryCommand),
 }
 
@@ -80,6 +85,16 @@ pub(super) async fn process(command: AdminCommand, context: &Context<'_>) -> Res
 			context.bail_restricted()?;
 			token::process(command, context).await
 		},
+		| Oidc(command) => {
+			// OIDC commands are all restricted
+			context.bail_restricted()?;
+
+			if !context.services.oidc.enabled() {
+				return Err!("OIDC is not configured");
+			}
+
+			oidc::process(command, context).await
+		},
 		| Rooms(command) => room::process(command, context).await,
 		| Federation(command) => federation::process(command, context).await,
 		| Server(command) => server::process(command, context).await,

src/admin/appservice/commands.rs

@@ -1,80 +1,76 @@
 use conduwuit::{Err, Result, checked};
 use futures::{FutureExt, StreamExt, TryFutureExt};
 
-use crate::admin_command;
+impl crate::Context<'_> {
+	pub(super) async fn register(&self) -> Result {
+		let body = &self.body;
+		let body_len = self.body.len();
+		if body_len < 2
+			|| !body[0].trim().starts_with("```")
+			|| body.last().unwrap_or(&"").trim() != "```"
+		{
+			return Err!("Expected code block in command body. Add --help for details.");
+		}
 
-#[admin_command]
-pub(super) async fn register(&self) -> Result {
-	let body = &self.body;
-	let body_len = self.body.len();
-	if body_len < 2
-		|| !body[0].trim().starts_with("```")
-		|| body.last().unwrap_or(&"").trim() != "```"
-	{
-		return Err!("Expected code block in command body. Add --help for details.");
+		let range = 1..checked!(body_len - 1)?;
+		let appservice_config_body = body[range].join("\n");
+		let parsed_config = serde_saphyr::from_str(&appservice_config_body);
+		match parsed_config {
+			| Err(e) => return Err!("Could not parse appservice config as YAML: {e}"),
+			| Ok(registration) => match self
+				.services
+				.appservice
+				.register_appservice(&registration, &appservice_config_body)
+				.await
+				.map(|()| registration.id)
+			{
+				| Err(e) => return Err!("Failed to register appservice: {e}"),
+				| Ok(id) => write!(self, "Appservice registered with ID: {id}"),
+			},
+		}
+		.await
 	}
 
-	let range = 1..checked!(body_len - 1)?;
-	let appservice_config_body = body[range].join("\n");
-	let parsed_config = serde_saphyr::from_str(&appservice_config_body);
-	match parsed_config {
-		| Err(e) => return Err!("Could not parse appservice config as YAML: {e}"),
-		| Ok(registration) => match self
+	pub(super) async fn unregister(&self, appservice_identifier: String) -> Result {
+		match self
 			.services
 			.appservice
-			.register_appservice(&registration, &appservice_config_body)
+			.unregister_appservice(&appservice_identifier)
 			.await
-			.map(|()| registration.id)
 		{
-			| Err(e) => return Err!("Failed to register appservice: {e}"),
-			| Ok(id) => write!(self, "Appservice registered with ID: {id}"),
-		},
-	}
-	.await
-}
-
-#[admin_command]
-pub(super) async fn unregister(&self, appservice_identifier: String) -> Result {
-	match self
-		.services
-		.appservice
-		.unregister_appservice(&appservice_identifier)
+			| Err(e) => return Err!("Failed to unregister appservice: {e}"),
+			| Ok(()) => write!(self, "Appservice unregistered."),
+		}
 		.await
-	{
-		| Err(e) => return Err!("Failed to unregister appservice: {e}"),
-		| Ok(()) => write!(self, "Appservice unregistered."),
 	}
-	.await
-}
 
-#[admin_command]
-pub(super) async fn show_appservice_config(&self, appservice_identifier: String) -> Result {
-	match self
-		.services
-		.appservice
-		.get_registration(&appservice_identifier)
+	pub(super) async fn show_appservice_config(&self, appservice_identifier: String) -> Result {
+		match self
+			.services
+			.appservice
+			.get_registration(&appservice_identifier)
+			.await
+		{
+			| None => return Err!("Appservice does not exist."),
+			| Some(config) => {
+				let config_str = serde_saphyr::to_string(&config)?;
+				write!(self, "Config for {appservice_identifier}:\n\n```yaml\n{config_str}\n```")
+			},
+		}
 		.await
-	{
-		| None => return Err!("Appservice does not exist."),
-		| Some(config) => {
-			let config_str = serde_saphyr::to_string(&config)?;
-			write!(self, "Config for {appservice_identifier}:\n\n```yaml\n{config_str}\n```")
-		},
 	}
-	.await
-}
 
-#[admin_command]
-pub(super) async fn list_registered(&self) -> Result {
-	self.services
-		.appservice
-		.iter_ids()
-		.collect()
-		.map(Ok)
-		.and_then(|appservices: Vec<_>| {
-			let len = appservices.len();
-			let list = appservices.join(", ");
-			write!(self, "Appservices ({len}): {list}")
-		})
-		.await
+	pub(super) async fn list_registered(&self) -> Result {
+		self.services
+			.appservice
+			.iter_ids()
+			.collect()
+			.map(Ok)
+			.and_then(|appservices: Vec<_>| {
+				let len = appservices.len();
+				let list = appservices.join(", ");
+				write!(self, "Appservices ({len}): {list}")
+			})
+			.await
+	}
 }

src/admin/check/commands.rs

@@ -1,23 +1,28 @@
 use conduwuit::Result;
-use conduwuit_macros::implement;
 use futures::StreamExt;
 
 use crate::Context;
 
-#[implement(Context, params = "<'_>")]
-pub(super) async fn check_all_users(&self) -> Result {
-	let timer = tokio::time::Instant::now();
-	let users = self.services.users.stream().collect::<Vec<_>>().await;
-	let query_time = timer.elapsed();
+impl Context<'_> {
+	pub(super) async fn check_all_users(&self) -> Result {
+		let timer = tokio::time::Instant::now();
+		let users = self
+			.services
+			.users
+			.stream_local_users()
+			.collect::<Vec<_>>()
+			.await;
+		let query_time = timer.elapsed();
 
-	let total = users.len();
-	let err_count = users.iter().filter(|_user| false).count();
-	let ok_count = users.iter().filter(|_user| true).count();
+		let total = users.len();
+		let err_count = users.iter().filter(|_user| false).count();
+		let ok_count = users.iter().filter(|_user| true).count();
 
-	self.write_str(&format!(
-		"Database query completed in {query_time:?}:\n\n```\nTotal entries: \
-		 {total:?}\nFailure/Invalid user count: {err_count:?}\nSuccess/Valid user count: \
-		 {ok_count:?}\n```"
-	))
-	.await
+		self.write_str(&format!(
+			"Database query completed in {query_time:?}:\n\n```\nTotal entries: \
+			 {total:?}\nFailure/Invalid user count: {err_count:?}\nSuccess/Valid user count: \
+			 {ok_count:?}\n```"
+		))
+		.await
+	}
 }

src/admin/debug/mod.rs

@@ -95,6 +95,14 @@ pub enum DebugCommand {
 		room_id: OwnedRoomOrAliasId,
 	},
 
+	/// Gets all the room state events at the specified event.
+	///
+	/// State at event might not be available for some PDUs, such as rejected
+	/// ones.
+	GetStateAt {
+		event_id: OwnedEventId,
+	},
+
 	/// Get and display signing keys from local cache or remote server.
 	GetSigningKeys {
 		server_name: Option<OwnedServerName>,
@@ -237,6 +245,11 @@ pub enum DebugCommand {
 	/// Send a test email to the invoking admin's email address
 	SendTestEmail,
 
+	/// Lists room IDs by forward extremity count in descending order
+	RoomsByExtremityCount {
+		page: Option<usize>,
+	},
+
 	/// Developer test stubs
 	#[command(subcommand)]
 	#[allow(non_snake_case)]

src/admin/debug/tester.rs

@@ -1,6 +1,6 @@
 use conduwuit::{Err, Result};
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, clap::Subcommand)]
@@ -11,37 +11,32 @@ pub enum TesterCommand {
 	Timer,
 }
 
-#[rustfmt::skip]
-#[admin_command]
-async fn panic(&self) -> Result {
+impl crate::Context<'_> {
+	#[rustfmt::skip]
+	async fn panic(&self) -> Result {
+		panic!("panicked")
+	}
 
-	panic!("panicked")
-}
+	#[rustfmt::skip]
+	async fn failure(&self) -> Result {
+		Err!("failed")
+	}
 
-#[rustfmt::skip]
-#[admin_command]
-async fn failure(&self) -> Result {
+	#[inline(never)]
+	#[rustfmt::skip]
+	async fn tester(&self) -> Result {
+		self.write_str("Ok").await
+	}
 
-	Err!("failed")
-}
+	#[inline(never)]
+	#[rustfmt::skip]
+	async fn timer(&self) -> Result {
+		let started = std::time::Instant::now();
+		timed(self.body);
 
-#[inline(never)]
-#[rustfmt::skip]
-#[admin_command]
-async fn tester(&self) -> Result {
-
-	self.write_str("Ok").await
-}
-
-#[inline(never)]
-#[rustfmt::skip]
-#[admin_command]
-async fn timer(&self) -> Result {
-	let started = std::time::Instant::now();
-	timed(self.body);
-
-	let elapsed = started.elapsed();
-	self.write_str(&format!("completed in {elapsed:#?}")).await
+		let elapsed = started.elapsed();
+		self.write_str(&format!("completed in {elapsed:#?}")).await
+	}
 }
 
 #[inline(never)]

src/admin/federation/commands.rs

@@ -4,127 +4,131 @@
 use futures::StreamExt;
 use ruma::{OwnedRoomId, OwnedServerName, OwnedUserId};
 
-use crate::{admin_command, get_room_info};
+use crate::get_room_info;
 
-#[admin_command]
-pub(super) async fn disable_room(&self, room_id: OwnedRoomId) -> Result {
-	self.bail_restricted()?;
-	self.services.rooms.metadata.disable_room(&room_id, true);
-	self.write_str("Room disabled.").await
-}
+impl crate::Context<'_> {
+	pub(super) async fn disable_room(&self, room_id: OwnedRoomId) -> Result {
+		self.bail_restricted()?;
+		self.services.rooms.metadata.disable_room(&room_id, true);
+		self.write_str("Room disabled.").await
+	}
 
-#[admin_command]
-pub(super) async fn enable_room(&self, room_id: OwnedRoomId) -> Result {
-	self.bail_restricted()?;
-	self.services.rooms.metadata.disable_room(&room_id, false);
-	self.write_str("Room enabled.").await
-}
+	pub(super) async fn enable_room(&self, room_id: OwnedRoomId) -> Result {
+		self.bail_restricted()?;
+		self.services.rooms.metadata.disable_room(&room_id, false);
+		self.write_str("Room enabled.").await
+	}
 
-#[admin_command]
-pub(super) async fn incoming_federation(&self) -> Result {
-	let msg = {
-		let map = self
+	pub(super) async fn incoming_federation(&self) -> Result {
+		let msg = {
+			let map = self
+				.services
+				.rooms
+				.event_handler
+				.federation_handletime
+				.read();
+
+			let mut msg = format!(
+				"Handling {} incoming PDUs across {} active transactions:\n",
+				map.len(),
+				self.services.transactions.txn_active_handle_count()
+			);
+			for (r, (e, i)) in map.iter() {
+				let elapsed = i.elapsed();
+				writeln!(
+					msg,
+					"{} {}: {}m{}s",
+					r,
+					e,
+					elapsed.as_secs() / 60,
+					elapsed.as_secs() % 60
+				)?;
+			}
+			msg
+		};
+
+		self.write_str(&msg).await
+	}
+
+	pub(super) async fn fetch_support_well_known(&self, server_name: OwnedServerName) -> Result {
+		let response = self
+			.services
+			.client
+			.default
+			.get(format!("https://{server_name}/.well-known/matrix/support"))
+			.send()
+			.await?;
+
+		let text = response
+			.limit_read_text(
+				self.services
+					.config
+					.max_request_size
+					.try_into()
+					.expect("u64 fits into usize"),
+			)
+			.await?;
+
+		if text.is_empty() {
+			return Err!("Response text/body is empty.");
+		}
+
+		if text.len() > 1500 {
+			return Err!(
+				"Response text/body is over 1500 characters, assuming no support well-known.",
+			);
+		}
+
+		let json: serde_json::Value = match serde_json::from_str(&text) {
+			| Ok(json) => json,
+			| Err(_) => {
+				return Err!("Response text/body is not valid JSON.",);
+			},
+		};
+
+		let pretty_json: String = match serde_json::to_string_pretty(&json) {
+			| Ok(json) => json,
+			| Err(_) => {
+				return Err!("Response text/body is not valid JSON.",);
+			},
+		};
+
+		self.write_str(&format!("Got JSON response:\n\n```json\n{pretty_json}\n```"))
+			.await
+	}
+
+	pub(super) async fn remote_user_in_rooms(&self, user_id: OwnedUserId) -> Result {
+		if user_id.server_name() == self.services.server.name {
+			return Err!(
+				"User belongs to our server, please use `list-joined-rooms` user admin command \
+				 instead.",
+			);
+		}
+
+		let mut rooms: Vec<(OwnedRoomId, u64, String)> = self
 			.services
 			.rooms
-			.event_handler
-			.federation_handletime
-			.read();
+			.state_cache
+			.rooms_joined(&user_id)
+			.then(async |room_id| get_room_info(self.services, &room_id).await)
+			.collect()
+			.await;
 
-		let mut msg = format!(
-			"Handling {} incoming PDUs across {} active transactions:\n",
-			map.len(),
-			self.services.transactions.txn_active_handle_count()
-		);
-		for (r, (e, i)) in map.iter() {
-			let elapsed = i.elapsed();
-			writeln!(msg, "{} {}: {}m{}s", r, e, elapsed.as_secs() / 60, elapsed.as_secs() % 60)?;
+		if rooms.is_empty() {
+			return Err!("User is not in any rooms.");
 		}
-		msg
-	};
 
-	self.write_str(&msg).await
-}
-
-#[admin_command]
-pub(super) async fn fetch_support_well_known(&self, server_name: OwnedServerName) -> Result {
-	let response = self
-		.services
-		.client
-		.default
-		.get(format!("https://{server_name}/.well-known/matrix/support"))
-		.send()
-		.await?;
-
-	let text = response
-		.limit_read_text(
-			self.services
-				.config
-				.max_request_size
-				.try_into()
-				.expect("u64 fits into usize"),
-		)
-		.await?;
-
-	if text.is_empty() {
-		return Err!("Response text/body is empty.");
-	}
-
-	if text.len() > 1500 {
-		return Err!(
-			"Response text/body is over 1500 characters, assuming no support well-known.",
-		);
-	}
-
-	let json: serde_json::Value = match serde_json::from_str(&text) {
-		| Ok(json) => json,
-		| Err(_) => {
-			return Err!("Response text/body is not valid JSON.",);
-		},
-	};
-
-	let pretty_json: String = match serde_json::to_string_pretty(&json) {
-		| Ok(json) => json,
-		| Err(_) => {
-			return Err!("Response text/body is not valid JSON.",);
-		},
-	};
-
-	self.write_str(&format!("Got JSON response:\n\n```json\n{pretty_json}\n```"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn remote_user_in_rooms(&self, user_id: OwnedUserId) -> Result {
-	if user_id.server_name() == self.services.server.name {
-		return Err!(
-			"User belongs to our server, please use `list-joined-rooms` user admin command \
-			 instead.",
-		);
-	}
-
-	let mut rooms: Vec<(OwnedRoomId, u64, String)> = self
-		.services
-		.rooms
-		.state_cache
-		.rooms_joined(&user_id)
-		.then(async |room_id| get_room_info(self.services, &room_id).await)
-		.collect()
-		.await;
-
-	if rooms.is_empty() {
-		return Err!("User is not in any rooms.");
-	}
-
-	rooms.sort_by_key(|r| r.1);
-	rooms.reverse();
-
-	let num = rooms.len();
-	let body = rooms
-		.iter()
-		.map(|(id, members, name)| format!("{id} | Members: {members} | Name: {name}"))
-		.collect::<Vec<_>>()
-		.join("\n");
-
-	self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```"))
-		.await
+		rooms.sort_by_key(|r| r.1);
+		rooms.reverse();
+
+		let num = rooms.len();
+		let body = rooms
+			.iter()
+			.map(|(id, members, name)| format!("{id} | Members: {members} | Name: {name}"))
+			.collect::<Vec<_>>()
+			.join("\n");
+
+		self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```"))
+			.await
+	}
 }

src/admin/media/commands.rs

@@ -9,401 +9,403 @@
 use ruma::{OwnedEventId, OwnedMxcUri, OwnedServerName};
 use service::media::mxc::Mxc;
 
-use crate::{admin_command, utils::parse_local_user_id};
+use crate::utils::parse_local_user_id;
 
-#[admin_command]
-pub(super) async fn delete(
-	&self,
-	mxc: Option<OwnedMxcUri>,
-	event_id: Option<OwnedEventId>,
-) -> Result {
-	self.bail_restricted()?;
+impl crate::Context<'_> {
+	pub(super) async fn delete(
+		&self,
+		mxc: Option<OwnedMxcUri>,
+		event_id: Option<OwnedEventId>,
+	) -> Result {
+		self.bail_restricted()?;
 
-	if event_id.is_some() && mxc.is_some() {
-		return Err!("Please specify either an MXC or an event ID, not both.",);
-	}
+		if event_id.is_some() && mxc.is_some() {
+			return Err!("Please specify either an MXC or an event ID, not both.",);
+		}
 
-	if let Some(mxc) = mxc {
-		trace!("Got MXC URL: {mxc}");
-		self.services
-			.media
-			.delete(&mxc.as_str().try_into()?)
-			.await?;
+		if let Some(mxc) = mxc {
+			trace!("Got MXC URL: {mxc}");
+			self.services
+				.media
+				.delete(&mxc.as_str().try_into()?)
+				.await?;
 
-		return self
-			.write_str("Deleted the MXC from our database and on our filesystem.")
-			.await;
-	}
+			return self
+				.write_str("Deleted the MXC from our database and on our filesystem.")
+				.await;
+		}
 
-	if let Some(event_id) = event_id {
-		trace!("Got event ID to delete media from: {event_id}");
+		if let Some(event_id) = event_id {
+			trace!("Got event ID to delete media from: {event_id}");
 
-		let mut mxc_urls = Vec::with_capacity(4);
+			let mut mxc_urls = Vec::with_capacity(4);
 
-		// parsing the PDU for any MXC URLs begins here
-		match self.services.rooms.timeline.get_pdu_json(&event_id).await {
-			| Ok(event_json) => {
-				if let Some(content_key) = event_json.get("content") {
-					debug!("Event ID has \"content\".");
-					let content_obj = content_key.as_object();
+			// parsing the PDU for any MXC URLs begins here
+			match self.services.rooms.timeline.get_pdu_json(&event_id).await {
+				| Ok(event_json) => {
+					if let Some(content_key) = event_json.get("content") {
+						debug!("Event ID has \"content\".");
+						let content_obj = content_key.as_object();
 
-					if let Some(content) = content_obj {
-						// 1. attempts to parse the "url" key
-						debug!("Attempting to go into \"url\" key for main media file");
-						if let Some(url) = content.get("url") {
-							debug!("Got a URL in the event ID {event_id}: {url}");
+						if let Some(content) = content_obj {
+							// 1. attempts to parse the "url" key
+							debug!("Attempting to go into \"url\" key for main media file");
+							if let Some(url) = content.get("url") {
+								debug!("Got a URL in the event ID {event_id}: {url}");
 
-							if url.to_string().starts_with("\"mxc://") {
-								debug!("Pushing URL {url} to list of MXCs to delete");
-								let final_url = url.to_string().replace('"', "");
-								mxc_urls.push(final_url);
-							} else {
-								info!(
-									"Found a URL in the event ID {event_id} but did not start \
-									 with mxc://, ignoring"
-								);
-							}
-						}
-
-						// 2. attempts to parse the "info" key
-						debug!("Attempting to go into \"info\" key for thumbnails");
-						if let Some(info_key) = content.get("info") {
-							debug!("Event ID has \"info\".");
-							let info_obj = info_key.as_object();
-
-							if let Some(info) = info_obj {
-								if let Some(thumbnail_url) = info.get("thumbnail_url") {
-									debug!("Found a thumbnail_url in info key: {thumbnail_url}");
-
-									if thumbnail_url.to_string().starts_with("\"mxc://") {
-										debug!(
-											"Pushing thumbnail URL {thumbnail_url} to list of \
-											 MXCs to delete"
-										);
-										let final_thumbnail_url =
-											thumbnail_url.to_string().replace('"', "");
-										mxc_urls.push(final_thumbnail_url);
-									} else {
-										info!(
-											"Found a thumbnail URL in the event ID {event_id} \
-											 but did not start with mxc://, ignoring"
-										);
-									}
+								if url.to_string().starts_with("\"mxc://") {
+									debug!("Pushing URL {url} to list of MXCs to delete");
+									let final_url = url.to_string().replace('"', "");
+									mxc_urls.push(final_url);
 								} else {
 									info!(
-										"No \"thumbnail_url\" key in \"info\" key, assuming no \
-										 thumbnails."
+										"Found a URL in the event ID {event_id} but did not \
+										 start with mxc://, ignoring"
 									);
 								}
 							}
-						}
 
-						// 3. attempts to parse the "file" key
-						debug!("Attempting to go into \"file\" key");
-						if let Some(file_key) = content.get("file") {
-							debug!("Event ID has \"file\".");
-							let file_obj = file_key.as_object();
+							// 2. attempts to parse the "info" key
+							debug!("Attempting to go into \"info\" key for thumbnails");
+							if let Some(info_key) = content.get("info") {
+								debug!("Event ID has \"info\".");
+								let info_obj = info_key.as_object();
 
-							if let Some(file) = file_obj {
-								if let Some(url) = file.get("url") {
-									debug!("Found url in file key: {url}");
+								if let Some(info) = info_obj {
+									if let Some(thumbnail_url) = info.get("thumbnail_url") {
+										debug!(
+											"Found a thumbnail_url in info key: {thumbnail_url}"
+										);
 
-									if url.to_string().starts_with("\"mxc://") {
-										debug!("Pushing URL {url} to list of MXCs to delete");
-										let final_url = url.to_string().replace('"', "");
-										mxc_urls.push(final_url);
+										if thumbnail_url.to_string().starts_with("\"mxc://") {
+											debug!(
+												"Pushing thumbnail URL {thumbnail_url} to list \
+												 of MXCs to delete"
+											);
+											let final_thumbnail_url =
+												thumbnail_url.to_string().replace('"', "");
+											mxc_urls.push(final_thumbnail_url);
+										} else {
+											info!(
+												"Found a thumbnail URL in the event ID \
+												 {event_id} but did not start with mxc://, \
+												 ignoring"
+											);
+										}
 									} else {
-										warn!(
-											"Found a URL in the event ID {event_id} but did not \
-											 start with mxc://, ignoring"
+										info!(
+											"No \"thumbnail_url\" key in \"info\" key, assuming \
+											 no thumbnails."
 										);
 									}
-								} else {
-									error!("No \"url\" key in \"file\" key.");
 								}
 							}
+
+							// 3. attempts to parse the "file" key
+							debug!("Attempting to go into \"file\" key");
+							if let Some(file_key) = content.get("file") {
+								debug!("Event ID has \"file\".");
+								let file_obj = file_key.as_object();
+
+								if let Some(file) = file_obj {
+									if let Some(url) = file.get("url") {
+										debug!("Found url in file key: {url}");
+
+										if url.to_string().starts_with("\"mxc://") {
+											debug!("Pushing URL {url} to list of MXCs to delete");
+											let final_url = url.to_string().replace('"', "");
+											mxc_urls.push(final_url);
+										} else {
+											warn!(
+												"Found a URL in the event ID {event_id} but did \
+												 not start with mxc://, ignoring"
+											);
+										}
+									} else {
+										error!("No \"url\" key in \"file\" key.");
+									}
+								}
+							}
+						} else {
+							return Err!(
+								"Event ID does not have a \"content\" key or failed parsing the \
+								 event ID JSON.",
+							);
 						}
 					} else {
 						return Err!(
-							"Event ID does not have a \"content\" key or failed parsing the \
-							 event ID JSON.",
+							"Event ID does not have a \"content\" key, this is not a message or \
+							 an event type that contains media.",
 						);
 					}
-				} else {
-					return Err!(
-						"Event ID does not have a \"content\" key, this is not a message or an \
-						 event type that contains media.",
-					);
+				},
+				| _ => {
+					return Err!("Event ID does not exist or is not known to us.",);
+				},
+			}
+
+			if mxc_urls.is_empty() {
+				return Err!("Parsed event ID but found no MXC URLs.",);
+			}
+
+			let mut mxc_deletion_count: usize = 0;
+
+			for mxc_url in mxc_urls {
+				match self
+					.services
+					.media
+					.delete(&mxc_url.as_str().try_into()?)
+					.await
+				{
+					| Ok(()) => {
+						debug_info!(
+							"Successfully deleted {mxc_url} from filesystem and database"
+						);
+						mxc_deletion_count = mxc_deletion_count.saturating_add(1);
+					},
+					| Err(e) => {
+						debug_warn!(
+							"Failed to delete {mxc_url}, ignoring error and skipping: {e}"
+						);
+						continue;
+					},
 				}
-			},
-			| _ => {
-				return Err!("Event ID does not exist or is not known to us.",);
-			},
+			}
+
+			return self
+				.write_str(&format!(
+					"Deleted {mxc_deletion_count} total MXCs from our database and the \
+					 filesystem from event ID {event_id}."
+				))
+				.await;
 		}
 
-		if mxc_urls.is_empty() {
-			return Err!("Parsed event ID but found no MXC URLs.",);
+		Err!(
+			"Please specify either an MXC using --mxc or an event ID using --event-id of the \
+			 message containing an image. See --help for details."
+		)
+	}
+
+	pub(super) async fn delete_list(&self) -> Result {
+		self.bail_restricted()?;
+
+		if self.body.len() < 2
+			|| !self.body[0].trim().starts_with("```")
+			|| self.body.last().unwrap_or(&"").trim() != "```"
+		{
+			return Err!("Expected code block in command body. Add --help for details.",);
 		}
 
+		let mut failed_parsed_mxcs: usize = 0;
+
+		let mxc_list = self
+			.body
+			.to_vec()
+			.drain(1..self.body.len().checked_sub(1).unwrap())
+			.filter_map(|mxc_s| {
+				mxc_s
+					.try_into()
+					.inspect_err(|e| {
+						debug_warn!("Failed to parse user-provided MXC URI: {e}");
+						failed_parsed_mxcs = failed_parsed_mxcs.saturating_add(1);
+					})
+					.ok()
+			})
+			.collect::<Vec<Mxc<'_>>>();
+
 		let mut mxc_deletion_count: usize = 0;
 
-		for mxc_url in mxc_urls {
-			match self
-				.services
-				.media
-				.delete(&mxc_url.as_str().try_into()?)
-				.await
-			{
+		for mxc in &mxc_list {
+			trace!(%failed_parsed_mxcs, %mxc_deletion_count, "Deleting MXC {mxc} in bulk");
+			match self.services.media.delete(mxc).await {
 				| Ok(()) => {
-					debug_info!("Successfully deleted {mxc_url} from filesystem and database");
+					debug_info!("Successfully deleted {mxc} from filesystem and database");
 					mxc_deletion_count = mxc_deletion_count.saturating_add(1);
 				},
 				| Err(e) => {
-					debug_warn!("Failed to delete {mxc_url}, ignoring error and skipping: {e}");
+					debug_warn!("Failed to delete {mxc}, ignoring error and skipping: {e}");
 					continue;
 				},
 			}
 		}
 
-		return self
-			.write_str(&format!(
-				"Deleted {mxc_deletion_count} total MXCs from our database and the filesystem \
-				 from event ID {event_id}."
-			))
-			.await;
+		self.write_str(&format!(
+			"Finished bulk MXC deletion, deleted {mxc_deletion_count} total MXCs from our \
+			 database and the filesystem. {failed_parsed_mxcs} MXCs failed to be parsed from \
+			 the database.",
+		))
+		.await
 	}
 
-	Err!(
-		"Please specify either an MXC using --mxc or an event ID using --event-id of the \
-		 message containing an image. See --help for details."
-	)
-}
+	pub(super) async fn delete_past_remote_media(
+		&self,
+		duration: String,
+		before: bool,
+		after: bool,
+		yes_i_want_to_delete_local_media: bool,
+	) -> Result {
+		self.bail_restricted()?;
 
-#[admin_command]
-pub(super) async fn delete_list(&self) -> Result {
-	self.bail_restricted()?;
-
-	if self.body.len() < 2
-		|| !self.body[0].trim().starts_with("```")
-		|| self.body.last().unwrap_or(&"").trim() != "```"
-	{
-		return Err!("Expected code block in command body. Add --help for details.",);
-	}
-
-	let mut failed_parsed_mxcs: usize = 0;
-
-	let mxc_list = self
-		.body
-		.to_vec()
-		.drain(1..self.body.len().checked_sub(1).unwrap())
-		.filter_map(|mxc_s| {
-			mxc_s
-				.try_into()
-				.inspect_err(|e| {
-					debug_warn!("Failed to parse user-provided MXC URI: {e}");
-					failed_parsed_mxcs = failed_parsed_mxcs.saturating_add(1);
-				})
-				.ok()
-		})
-		.collect::<Vec<Mxc<'_>>>();
-
-	let mut mxc_deletion_count: usize = 0;
-
-	for mxc in &mxc_list {
-		trace!(%failed_parsed_mxcs, %mxc_deletion_count, "Deleting MXC {mxc} in bulk");
-		match self.services.media.delete(mxc).await {
-			| Ok(()) => {
-				debug_info!("Successfully deleted {mxc} from filesystem and database");
-				mxc_deletion_count = mxc_deletion_count.saturating_add(1);
-			},
-			| Err(e) => {
-				debug_warn!("Failed to delete {mxc}, ignoring error and skipping: {e}");
-				continue;
-			},
+		if before && after {
+			return Err!("Please only pick one argument, --before or --after.",);
 		}
-	}
+		assert!(!(before && after), "--before and --after should not be specified together");
 
-	self.write_str(&format!(
-		"Finished bulk MXC deletion, deleted {mxc_deletion_count} total MXCs from our database \
-		 and the filesystem. {failed_parsed_mxcs} MXCs failed to be parsed from the database.",
-	))
-	.await
-}
-
-#[admin_command]
-pub(super) async fn delete_past_remote_media(
-	&self,
-	duration: String,
-	before: bool,
-	after: bool,
-	yes_i_want_to_delete_local_media: bool,
-) -> Result {
-	self.bail_restricted()?;
-
-	if before && after {
-		return Err!("Please only pick one argument, --before or --after.",);
-	}
-	assert!(!(before && after), "--before and --after should not be specified together");
-
-	let direction = if after {
-		TimeDirection::After
-	} else {
-		TimeDirection::Before
-	};
-
-	let time_boundary = parse_timepoint_ago(&duration)?;
-	let deleted_count = self
-		.services
-		.media
-		.delete_all_media_within_timeframe(
-			time_boundary,
-			direction,
-			yes_i_want_to_delete_local_media,
-		)
-		.await?;
-
-	self.write_str(&format!("Deleted {deleted_count} total files."))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn delete_all_from_user(&self, username: String) -> Result {
-	let user_id = parse_local_user_id(self.services, &username)?;
-
-	let deleted_count = self.services.media.delete_from_user(&user_id).await?;
-
-	self.write_str(&format!("Deleted {deleted_count} total files."))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn delete_all_from_server(
-	&self,
-	server_name: OwnedServerName,
-	yes_i_want_to_delete_local_media: bool,
-) -> Result {
-	self.bail_restricted()?;
-
-	if server_name == self.services.globals.server_name() && !yes_i_want_to_delete_local_media {
-		return Err!("This command only works for remote media by default.",);
-	}
-
-	let Ok(all_mxcs) = self
-		.services
-		.media
-		.get_all_mxcs()
-		.await
-		.inspect_err(|e| error!("Failed to get MXC URIs from our database: {e}"))
-	else {
-		return Err!("Failed to get MXC URIs from our database",);
-	};
-
-	let mut deleted_count: usize = 0;
-
-	for mxc in all_mxcs {
-		let Ok(mxc_server_name) = mxc.server_name().inspect_err(|e| {
-			debug_warn!(
-				"Failed to parse MXC {mxc} server name from database, ignoring error and \
-				 skipping: {e}"
-			);
-		}) else {
-			continue;
+		let direction = if after {
+			TimeDirection::After
+		} else {
+			TimeDirection::Before
 		};
 
-		if mxc_server_name != server_name
-			|| (self.services.globals.server_is_ours(mxc_server_name)
-				&& !yes_i_want_to_delete_local_media)
+		let time_boundary = parse_timepoint_ago(&duration)?;
+		let deleted_count = self
+			.services
+			.media
+			.delete_all_media_within_timeframe(
+				time_boundary,
+				direction,
+				yes_i_want_to_delete_local_media,
+			)
+			.await?;
+
+		self.write_str(&format!("Deleted {deleted_count} total files."))
+			.await
+	}
+
+	pub(super) async fn delete_all_from_user(&self, username: String) -> Result {
+		let user_id = parse_local_user_id(self.services, &username)?;
+
+		let deleted_count = self.services.media.delete_from_user(&user_id).await?;
+
+		self.write_str(&format!("Deleted {deleted_count} total files."))
+			.await
+	}
+
+	pub(super) async fn delete_all_from_server(
+		&self,
+		server_name: OwnedServerName,
+		yes_i_want_to_delete_local_media: bool,
+	) -> Result {
+		self.bail_restricted()?;
+
+		if server_name == self.services.globals.server_name() && !yes_i_want_to_delete_local_media
 		{
-			trace!("skipping MXC URI {mxc}");
-			continue;
+			return Err!("This command only works for remote media by default.",);
 		}
 
-		let mxc: Mxc<'_> = mxc.as_str().try_into()?;
+		let Ok(all_mxcs) = self
+			.services
+			.media
+			.get_all_mxcs()
+			.await
+			.inspect_err(|e| error!("Failed to get MXC URIs from our database: {e}"))
+		else {
+			return Err!("Failed to get MXC URIs from our database",);
+		};
 
-		match self.services.media.delete(&mxc).await {
-			| Ok(()) => {
-				deleted_count = deleted_count.saturating_add(1);
-			},
-			| Err(e) => {
-				debug_warn!("Failed to delete {mxc}, ignoring error and skipping: {e}");
+		let mut deleted_count: usize = 0;
+
+		for mxc in all_mxcs {
+			let Ok(mxc_server_name) = mxc.server_name().inspect_err(|e| {
+				debug_warn!(
+					"Failed to parse MXC {mxc} server name from database, ignoring error and \
+					 skipping: {e}"
+				);
+			}) else {
 				continue;
-			},
+			};
+
+			if mxc_server_name != server_name
+				|| (self.services.globals.server_is_ours(mxc_server_name)
+					&& !yes_i_want_to_delete_local_media)
+			{
+				trace!("skipping MXC URI {mxc}");
+				continue;
+			}
+
+			let mxc: Mxc<'_> = mxc.as_str().try_into()?;
+
+			match self.services.media.delete(&mxc).await {
+				| Ok(()) => {
+					deleted_count = deleted_count.saturating_add(1);
+				},
+				| Err(e) => {
+					debug_warn!("Failed to delete {mxc}, ignoring error and skipping: {e}");
+					continue;
+				},
+			}
 		}
+
+		self.write_str(&format!("Deleted {deleted_count} total files."))
+			.await
 	}
 
-	self.write_str(&format!("Deleted {deleted_count} total files."))
-		.await
-}
+	pub(super) async fn get_file_info(&self, mxc: OwnedMxcUri) -> Result {
+		let mxc: Mxc<'_> = mxc.as_str().try_into()?;
+		let metadata = self.services.media.get_metadata(&mxc).await;
 
-#[admin_command]
-pub(super) async fn get_file_info(&self, mxc: OwnedMxcUri) -> Result {
-	let mxc: Mxc<'_> = mxc.as_str().try_into()?;
-	let metadata = self.services.media.get_metadata(&mxc).await;
-
-	self.write_str(&format!("```\n{metadata:#?}\n```")).await
-}
-
-#[admin_command]
-pub(super) async fn get_remote_file(
-	&self,
-	mxc: OwnedMxcUri,
-	server: Option<OwnedServerName>,
-	timeout: u32,
-) -> Result {
-	let mxc: Mxc<'_> = mxc.as_str().try_into()?;
-	let timeout = Duration::from_millis(timeout.into());
-	let mut result = self
-		.services
-		.media
-		.fetch_remote_content(&mxc, None, server.as_deref(), timeout)
-		.await?;
-
-	// Grab the length of the content before clearing it to not flood the output
-	let len = result.content.as_ref().expect("content").len();
-	result.content.as_mut().expect("content").clear();
-
-	self.write_str(&format!("```\n{result:#?}\nreceived {len} bytes for file content.\n```"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn get_remote_thumbnail(
-	&self,
-	mxc: OwnedMxcUri,
-	server: Option<OwnedServerName>,
-	timeout: u32,
-	width: u32,
-	height: u32,
-) -> Result {
-	let mxc: Mxc<'_> = mxc.as_str().try_into()?;
-	let timeout = Duration::from_millis(timeout.into());
-	let dim = Dim::new(width, height, None);
-	let mut result = self
-		.services
-		.media
-		.fetch_remote_thumbnail(&mxc, None, server.as_deref(), timeout, &dim)
-		.await?;
-
-	// Grab the length of the content before clearing it to not flood the output
-	let len = result.content.as_ref().expect("content").len();
-	result.content.as_mut().expect("content").clear();
-
-	self.write_str(&format!("```\n{result:#?}\nreceived {len} bytes for file content.\n```"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn delete_url_preview(&self, url: Option<String>, all: bool) -> Result {
-	if all {
-		self.services.media.clear_url_previews().await;
-
-		return self.write_str("Deleted all cached URL previews.").await;
+		self.write_str(&format!("```\n{metadata:#?}\n```")).await
 	}
 
-	let url = url.expect("clap enforces url is required unless --all");
+	pub(super) async fn get_remote_file(
+		&self,
+		mxc: OwnedMxcUri,
+		server: Option<OwnedServerName>,
+		timeout: u32,
+	) -> Result {
+		let mxc: Mxc<'_> = mxc.as_str().try_into()?;
+		let timeout = Duration::from_millis(timeout.into());
+		let mut result = self
+			.services
+			.media
+			.fetch_remote_content(&mxc, None, server.as_deref(), timeout)
+			.await?;
 
-	self.services.media.remove_url_preview(&url).await?;
+		// Grab the length of the content before clearing it to not flood the output
+		let len = result.content.as_ref().expect("content").len();
+		result.content.as_mut().expect("content").clear();
 
-	self.write_str(&format!("Deleted cached URL preview for: {url}"))
-		.await
+		self.write_str(&format!("```\n{result:#?}\nreceived {len} bytes for file content.\n```"))
+			.await
+	}
+
+	pub(super) async fn get_remote_thumbnail(
+		&self,
+		mxc: OwnedMxcUri,
+		server: Option<OwnedServerName>,
+		timeout: u32,
+		width: u32,
+		height: u32,
+	) -> Result {
+		let mxc: Mxc<'_> = mxc.as_str().try_into()?;
+		let timeout = Duration::from_millis(timeout.into());
+		let dim = Dim::new(width, height, None);
+		let mut result = self
+			.services
+			.media
+			.fetch_remote_thumbnail(&mxc, None, server.as_deref(), timeout, &dim)
+			.await?;
+
+		// Grab the length of the content before clearing it to not flood the output
+		let len = result.content.as_ref().expect("content").len();
+		result.content.as_mut().expect("content").clear();
+
+		self.write_str(&format!("```\n{result:#?}\nreceived {len} bytes for file content.\n```"))
+			.await
+	}
+
+	pub(super) async fn delete_url_preview(&self, url: Option<String>, all: bool) -> Result {
+		if all {
+			self.services.media.clear_url_previews().await;
+
+			return self.write_str("Deleted all cached URL previews.").await;
+		}
+
+		let url = url.expect("clap enforces url is required unless --all");
+
+		self.services.media.remove_url_preview(&url).await?;
+
+		self.write_str(&format!("Deleted cached URL preview for: {url}"))
+			.await
+	}
 }

src/admin/mod.rs

@@ -16,6 +16,7 @@
 pub(crate) mod debug;
 pub(crate) mod federation;
 pub(crate) mod media;
+pub(crate) mod oidc;
 pub(crate) mod query;
 pub(crate) mod room;
 pub(crate) mod server;
@@ -26,7 +27,7 @@
 extern crate conduwuit_core as conduwuit;
 extern crate conduwuit_service as service;
 
-pub(crate) use conduwuit_macros::{admin_command, admin_command_dispatch};
+pub(crate) use conduwuit_macros::admin_command_dispatch;
 
 pub(crate) use crate::{context::Context, utils::get_room_info};
 

src/admin/oidc/commands.rs

@@ -0,0 +1,25 @@
+use conduwuit::Result;
+
+use crate::utils::parse_active_local_user_id;
+
+impl crate::Context<'_> {
+	pub(super) async fn oidc_link(&self, user_id: String, subject: String) -> Result {
+		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
+
+		self.services.oidc.link_user(&user_id, &subject);
+
+		self.write_str(&format!("Subject `{subject}` linked to account `{user_id}`."))
+			.await?;
+
+		Ok(())
+	}
+
+	pub(super) async fn oidc_unlink(&self, subject: String) -> Result {
+		self.services.oidc.unlink_user(&subject);
+
+		self.write_str(&format!("Subject `{subject}` unlinked."))
+			.await?;
+
+		Ok(())
+	}
+}

src/admin/oidc/mod.rs

@@ -0,0 +1,22 @@
+mod commands;
+
+use clap::Subcommand;
+use conduwuit::Result;
+use conduwuit_macros::admin_command_dispatch;
+
+#[admin_command_dispatch]
+#[derive(Debug, Subcommand)]
+pub enum OidcCommand {
+	/// Link a user ID to the given subject claim.
+	#[clap(name = "link")]
+	OidcLink {
+		user_id: String,
+		subject: String,
+	},
+
+	/// Unlink the given subject claim from its associated user ID.
+	#[clap(name = "unlink")]
+	OidcUnlink {
+		subject: String,
+	},
+}

src/admin/query/account_data.rs

@@ -4,7 +4,7 @@
 use futures::StreamExt;
 use ruma::{OwnedRoomId, OwnedUserId, exports::serde::Serialize};
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -31,50 +31,50 @@ pub enum AccountDataCommand {
 	},
 }
 
-#[admin_command]
-async fn changes_since(
-	&self,
-	user_id: OwnedUserId,
-	since: u64,
-	room_id: Option<OwnedRoomId>,
-) -> Result {
-	let timer = tokio::time::Instant::now();
-	let results: Vec<_> = self
-		.services
-		.account_data
-		.changes_since(room_id.as_deref(), &user_id, Some(since), None)
-		.collect()
-		.await;
-	let query_time = timer.elapsed();
+impl crate::Context<'_> {
+	async fn changes_since(
+		&self,
+		user_id: OwnedUserId,
+		since: u64,
+		room_id: Option<OwnedRoomId>,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let results: Vec<_> = self
+			.services
+			.account_data
+			.changes_since(room_id.as_deref(), &user_id, Some(since), None)
+			.collect()
+			.await;
+		let query_time = timer.elapsed();
 
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn account_data_get(
-	&self,
-	user_id: OwnedUserId,
-	kind: String,
-	room_id: Option<OwnedRoomId>,
-) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.account_data
-		.get_raw(room_id.as_deref(), &user_id, &kind)
-		.await;
-	let query_time = timer.elapsed();
-
-	let json = serde_json::to_string_pretty(&match room_id {
-		| None => result
-			.deserialized::<ruma::serde::Raw<ruma::events::AnyGlobalAccountDataEvent>>()?
-			.serialize(serde_json::value::Serializer)?,
-		| Some(_) => result
-			.deserialized::<ruma::serde::Raw<ruma::events::AnyRoomAccountDataEvent>>()?
-			.serialize(serde_json::value::Serializer)?,
-	})?;
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{json}\n```"))
-		.await
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"))
+			.await
+	}
+
+	async fn account_data_get(
+		&self,
+		user_id: OwnedUserId,
+		kind: String,
+		room_id: Option<OwnedRoomId>,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.account_data
+			.get_raw(room_id.as_deref(), &user_id, &kind)
+			.await;
+		let query_time = timer.elapsed();
+
+		let json = serde_json::to_string_pretty(&match room_id {
+			| None => result
+				.deserialized::<ruma::serde::Raw<ruma::events::AnyGlobalAccountDataEvent>>()?
+				.serialize(serde_json::value::Serializer)?,
+			| Some(_) => result
+				.deserialized::<ruma::serde::Raw<ruma::events::AnyRoomAccountDataEvent>>()?
+				.serialize(serde_json::value::Serializer)?,
+		})?;
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{json}\n```"))
+			.await
+	}
 }

src/admin/query/raw.rs

@@ -13,7 +13,7 @@
 use futures::{FutureExt, Stream, StreamExt, TryStreamExt};
 use tokio::time::Instant;
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -159,279 +159,287 @@ pub enum RawCommand {
 	},
 }
 
-#[admin_command]
-pub(super) async fn compact(
-	&self,
-	map: Option<Vec<String>>,
-	start: Option<String>,
-	stop: Option<String>,
-	from: Option<usize>,
-	into: Option<usize>,
-	parallelism: Option<usize>,
-	exhaustive: bool,
-) -> Result {
-	use conduwuit_database::compact::Options;
+impl crate::Context<'_> {
+	pub(super) async fn compact(
+		&self,
+		map: Option<Vec<String>>,
+		start: Option<String>,
+		stop: Option<String>,
+		from: Option<usize>,
+		into: Option<usize>,
+		parallelism: Option<usize>,
+		exhaustive: bool,
+	) -> Result {
+		use conduwuit_database::compact::Options;
 
-	let default_all_maps: Option<_> = map.is_none().then(|| {
-		self.services
-			.db
-			.keys()
-			.map(Deref::deref)
-			.map(ToOwned::to_owned)
-	});
+		let default_all_maps: Option<_> = map.is_none().then(|| {
+			self.services
+				.db
+				.keys()
+				.map(Deref::deref)
+				.map(ToOwned::to_owned)
+		});
 
-	let maps: Vec<_> = map
-		.unwrap_or_default()
-		.into_iter()
-		.chain(default_all_maps.into_iter().flatten())
-		.map(|map| self.services.db.get(&map))
-		.filter_map(Result::ok)
-		.cloned()
-		.collect();
+		let maps: Vec<_> = map
+			.unwrap_or_default()
+			.into_iter()
+			.chain(default_all_maps.into_iter().flatten())
+			.map(|map| self.services.db.get(&map))
+			.filter_map(Result::ok)
+			.cloned()
+			.collect();
 
-	if maps.is_empty() {
-		return Err!("--map argument invalid. not found in database");
+		if maps.is_empty() {
+			return Err!("--map argument invalid. not found in database");
+		}
+
+		let range = (
+			start.as_ref().map(String::as_bytes).map(Into::into),
+			stop.as_ref().map(String::as_bytes).map(Into::into),
+		);
+
+		let options = Options {
+			range,
+			level: (from, into),
+			exclusive: parallelism.is_some_and(is_zero!()),
+			exhaustive,
+		};
+
+		let runtime = self.services.server.runtime().clone();
+		let parallelism = parallelism.unwrap_or(1);
+		let results = maps
+			.into_iter()
+			.try_stream::<conduwuit::Error>()
+			.paralleln_and_then(runtime, parallelism, move |map| {
+				map.compact_blocking(options.clone())?;
+				Ok(map.name().to_owned())
+			})
+			.collect::<Vec<_>>();
+
+		let timer = Instant::now();
+		let results = results.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("Jobs completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"))
+			.await
 	}
 
-	let range = (
-		start.as_ref().map(String::as_bytes).map(Into::into),
-		stop.as_ref().map(String::as_bytes).map(Into::into),
-	);
+	pub(super) async fn raw_count(&self, map: Option<String>, prefix: Option<String>) -> Result {
+		let prefix = prefix.as_deref().unwrap_or(EMPTY);
 
-	let options = Options {
-		range,
-		level: (from, into),
-		exclusive: parallelism.is_some_and(is_zero!()),
-		exhaustive,
-	};
+		let timer = Instant::now();
+		let count = with_maps_or(map.as_deref(), self.services)
+			.then(|map| map.raw_count_prefix(&prefix))
+			.ready_fold(0_usize, usize::saturating_add)
+			.await;
 
-	let runtime = self.services.server.runtime().clone();
-	let parallelism = parallelism.unwrap_or(1);
-	let results = maps
-		.into_iter()
-		.try_stream::<conduwuit::Error>()
-		.paralleln_and_then(runtime, parallelism, move |map| {
-			map.compact_blocking(options.clone())?;
-			Ok(map.name().to_owned())
-		})
-		.collect::<Vec<_>>();
+		let query_time = timer.elapsed();
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{count:#?}\n```"))
+			.await
+	}
 
-	let timer = Instant::now();
-	let results = results.await;
-	let query_time = timer.elapsed();
-	self.write_str(&format!("Jobs completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"))
-		.await
-}
+	pub(super) async fn raw_keys(&self, map: String, prefix: Option<String>) -> Result {
+		writeln!(self, "```").boxed().await?;
 
-#[admin_command]
-pub(super) async fn raw_count(&self, map: Option<String>, prefix: Option<String>) -> Result {
-	let prefix = prefix.as_deref().unwrap_or(EMPTY);
+		let map = self.services.db.get(map.as_str())?;
+		let timer = Instant::now();
+		prefix
+			.as_deref()
+			.map_or_else(|| map.raw_keys().boxed(), |prefix| map.raw_keys_prefix(prefix).boxed())
+			.map_ok(String::from_utf8_lossy)
+			.try_for_each(|str| writeln!(self, "{str:?}"))
+			.boxed()
+			.await?;
 
-	let timer = Instant::now();
-	let count = with_maps_or(map.as_deref(), self.services)
-		.then(|map| map.raw_count_prefix(&prefix))
-		.ready_fold(0_usize, usize::saturating_add)
-		.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{count:#?}\n```"))
-		.await
-}
+	pub(super) async fn raw_keys_sizes(
+		&self,
+		map: Option<String>,
+		prefix: Option<String>,
+	) -> Result {
+		let prefix = prefix.as_deref().unwrap_or(EMPTY);
 
-#[admin_command]
-pub(super) async fn raw_keys(&self, map: String, prefix: Option<String>) -> Result {
-	writeln!(self, "```").boxed().await?;
+		let timer = Instant::now();
+		let result = with_maps_or(map.as_deref(), self.services)
+			.map(|map| map.raw_keys_prefix(&prefix))
+			.flatten()
+			.ignore_err()
+			.map(<[u8]>::len)
+			.ready_fold_default(|mut map: BTreeMap<_, usize>, len| {
+				let entry = map.entry(len).or_default();
+				*entry = entry.saturating_add(1);
+				map
+			})
+			.await;
 
-	let map = self.services.db.get(map.as_str())?;
-	let timer = Instant::now();
-	prefix
-		.as_deref()
-		.map_or_else(|| map.raw_keys().boxed(), |prefix| map.raw_keys_prefix(prefix).boxed())
-		.map_ok(String::from_utf8_lossy)
-		.try_for_each(|str| writeln!(self, "{str:?}"))
-		.boxed()
-		.await?;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("```\n{result:#?}\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_keys_total(
+		&self,
+		map: Option<String>,
+		prefix: Option<String>,
+	) -> Result {
+		let prefix = prefix.as_deref().unwrap_or(EMPTY);
 
-#[admin_command]
-pub(super) async fn raw_keys_sizes(&self, map: Option<String>, prefix: Option<String>) -> Result {
-	let prefix = prefix.as_deref().unwrap_or(EMPTY);
+		let timer = Instant::now();
+		let result = with_maps_or(map.as_deref(), self.services)
+			.map(|map| map.raw_keys_prefix(&prefix))
+			.flatten()
+			.ignore_err()
+			.map(<[u8]>::len)
+			.ready_fold_default(|acc: usize, len| acc.saturating_add(len))
+			.await;
 
-	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
-		.map(|map| map.raw_keys_prefix(&prefix))
-		.flatten()
-		.ignore_err()
-		.map(<[u8]>::len)
-		.ready_fold_default(|mut map: BTreeMap<_, usize>, len| {
-			let entry = map.entry(len).or_default();
-			*entry = entry.saturating_add(1);
-			map
-		})
-		.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("```\n{result:#?}\n\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("```\n{result:#?}\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_vals_sizes(
+		&self,
+		map: Option<String>,
+		prefix: Option<String>,
+	) -> Result {
+		let prefix = prefix.as_deref().unwrap_or(EMPTY);
 
-#[admin_command]
-pub(super) async fn raw_keys_total(&self, map: Option<String>, prefix: Option<String>) -> Result {
-	let prefix = prefix.as_deref().unwrap_or(EMPTY);
+		let timer = Instant::now();
+		let result = with_maps_or(map.as_deref(), self.services)
+			.map(|map| map.raw_stream_prefix(&prefix))
+			.flatten()
+			.ignore_err()
+			.map(at!(1))
+			.map(<[u8]>::len)
+			.ready_fold_default(|mut map: BTreeMap<_, usize>, len| {
+				let entry = map.entry(len).or_default();
+				*entry = entry.saturating_add(1);
+				map
+			})
+			.await;
 
-	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
-		.map(|map| map.raw_keys_prefix(&prefix))
-		.flatten()
-		.ignore_err()
-		.map(<[u8]>::len)
-		.ready_fold_default(|acc: usize, len| acc.saturating_add(len))
-		.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("```\n{result:#?}\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("```\n{result:#?}\n\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_vals_total(
+		&self,
+		map: Option<String>,
+		prefix: Option<String>,
+	) -> Result {
+		let prefix = prefix.as_deref().unwrap_or(EMPTY);
 
-#[admin_command]
-pub(super) async fn raw_vals_sizes(&self, map: Option<String>, prefix: Option<String>) -> Result {
-	let prefix = prefix.as_deref().unwrap_or(EMPTY);
+		let timer = Instant::now();
+		let result = with_maps_or(map.as_deref(), self.services)
+			.map(|map| map.raw_stream_prefix(&prefix))
+			.flatten()
+			.ignore_err()
+			.map(at!(1))
+			.map(<[u8]>::len)
+			.ready_fold_default(|acc: usize, len| acc.saturating_add(len))
+			.await;
 
-	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
-		.map(|map| map.raw_stream_prefix(&prefix))
-		.flatten()
-		.ignore_err()
-		.map(at!(1))
-		.map(<[u8]>::len)
-		.ready_fold_default(|mut map: BTreeMap<_, usize>, len| {
-			let entry = map.entry(len).or_default();
-			*entry = entry.saturating_add(1);
-			map
-		})
-		.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("```\n{result:#?}\n\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("```\n{result:#?}\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_iter(&self, map: String, prefix: Option<String>) -> Result {
+		writeln!(self, "```").await?;
 
-#[admin_command]
-pub(super) async fn raw_vals_total(&self, map: Option<String>, prefix: Option<String>) -> Result {
-	let prefix = prefix.as_deref().unwrap_or(EMPTY);
+		let map = self.services.db.get(&map)?;
+		let timer = Instant::now();
+		prefix
+			.as_deref()
+			.map_or_else(
+				|| map.raw_stream().boxed(),
+				|prefix| map.raw_stream_prefix(prefix).boxed(),
+			)
+			.map_ok(apply!(2, String::from_utf8_lossy))
+			.map_ok(apply!(2, Cow::into_owned))
+			.try_for_each(|keyval| writeln!(self, "{keyval:?}"))
+			.boxed()
+			.await?;
 
-	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
-		.map(|map| map.raw_stream_prefix(&prefix))
-		.flatten()
-		.ignore_err()
-		.map(at!(1))
-		.map(<[u8]>::len)
-		.ready_fold_default(|acc: usize, len| acc.saturating_add(len))
-		.await;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("```\n{result:#?}\n\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_keys_from(
+		&self,
+		map: String,
+		start: String,
+		limit: Option<usize>,
+	) -> Result {
+		writeln!(self, "```").await?;
 
-#[admin_command]
-pub(super) async fn raw_iter(&self, map: String, prefix: Option<String>) -> Result {
-	writeln!(self, "```").await?;
+		let map = self.services.db.get(&map)?;
+		let timer = Instant::now();
+		map.raw_keys_from(&start)
+			.map_ok(String::from_utf8_lossy)
+			.take(limit.unwrap_or(usize::MAX))
+			.try_for_each(|str| writeln!(self, "{str:?}"))
+			.boxed()
+			.await?;
 
-	let map = self.services.db.get(&map)?;
-	let timer = Instant::now();
-	prefix
-		.as_deref()
-		.map_or_else(|| map.raw_stream().boxed(), |prefix| map.raw_stream_prefix(prefix).boxed())
-		.map_ok(apply!(2, String::from_utf8_lossy))
-		.map_ok(apply!(2, Cow::into_owned))
-		.try_for_each(|keyval| writeln!(self, "{keyval:?}"))
-		.boxed()
-		.await?;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
+			.await
+	}
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+	pub(super) async fn raw_iter_from(
+		&self,
+		map: String,
+		start: String,
+		limit: Option<usize>,
+	) -> Result {
+		let map = self.services.db.get(&map)?;
+		let timer = Instant::now();
+		let result = map
+			.raw_stream_from(&start)
+			.map_ok(apply!(2, String::from_utf8_lossy))
+			.map_ok(apply!(2, Cow::into_owned))
+			.take(limit.unwrap_or(usize::MAX))
+			.try_collect::<Vec<(String, String)>>()
+			.await?;
 
-#[admin_command]
-pub(super) async fn raw_keys_from(
-	&self,
-	map: String,
-	start: String,
-	limit: Option<usize>,
-) -> Result {
-	writeln!(self, "```").await?;
+		let query_time = timer.elapsed();
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
 
-	let map = self.services.db.get(&map)?;
-	let timer = Instant::now();
-	map.raw_keys_from(&start)
-		.map_ok(String::from_utf8_lossy)
-		.take(limit.unwrap_or(usize::MAX))
-		.try_for_each(|str| writeln!(self, "{str:?}"))
-		.boxed()
-		.await?;
+	pub(super) async fn raw_del(&self, map: String, key: String) -> Result {
+		let map = self.services.db.get(&map)?;
+		let timer = Instant::now();
+		map.remove(&key);
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("\n```\n\nQuery completed in {query_time:?}"))
-		.await
-}
+		let query_time = timer.elapsed();
+		self.write_str(&format!("Operation completed in {query_time:?}"))
+			.await
+	}
 
-#[admin_command]
-pub(super) async fn raw_iter_from(
-	&self,
-	map: String,
-	start: String,
-	limit: Option<usize>,
-) -> Result {
-	let map = self.services.db.get(&map)?;
-	let timer = Instant::now();
-	let result = map
-		.raw_stream_from(&start)
-		.map_ok(apply!(2, String::from_utf8_lossy))
-		.map_ok(apply!(2, Cow::into_owned))
-		.take(limit.unwrap_or(usize::MAX))
-		.try_collect::<Vec<(String, String)>>()
-		.await?;
+	pub(super) async fn raw_get(&self, map: String, key: String) -> Result {
+		let map = self.services.db.get(&map)?;
+		let timer = Instant::now();
+		let handle = map.get(&key).await?;
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
+		let query_time = timer.elapsed();
+		let result = String::from_utf8_lossy(&handle);
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:?}\n```"))
+			.await
+	}
 
-#[admin_command]
-pub(super) async fn raw_del(&self, map: String, key: String) -> Result {
-	let map = self.services.db.get(&map)?;
-	let timer = Instant::now();
-	map.remove(&key);
+	pub(super) async fn raw_maps(&self) -> Result {
+		let list: Vec<_> = self.services.db.iter().map(at!(0)).copied().collect();
 
-	let query_time = timer.elapsed();
-	self.write_str(&format!("Operation completed in {query_time:?}"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn raw_get(&self, map: String, key: String) -> Result {
-	let map = self.services.db.get(&map)?;
-	let timer = Instant::now();
-	let handle = map.get(&key).await?;
-
-	let query_time = timer.elapsed();
-	let result = String::from_utf8_lossy(&handle);
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:?}\n```"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn raw_maps(&self) -> Result {
-	let list: Vec<_> = self.services.db.iter().map(at!(0)).copied().collect();
-
-	self.write_str(&format!("{list:#?}")).await
+		self.write_str(&format!("{list:#?}")).await
+	}
 }
 
 fn with_maps_or<'a>(

src/admin/query/resolver.rs

@@ -3,7 +3,7 @@
 use futures::StreamExt;
 use ruma::OwnedServerName;
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -39,67 +39,68 @@ pub enum ResolverCommand {
 	},
 }
 
-#[admin_command]
-async fn destinations_cache(&self, server_name: Option<OwnedServerName>) -> Result {
-	use service::resolver::cache::CachedDest;
+impl crate::Context<'_> {
+	async fn destinations_cache(&self, server_name: Option<OwnedServerName>) -> Result {
+		use service::resolver::cache::CachedDest;
 
-	writeln!(self, "| Server Name | Destination | Hostname | Expires |").await?;
-	writeln!(self, "| ----------- | ----------- | -------- | ------- |").await?;
+		writeln!(self, "| Server Name | Destination | Hostname | Expires |").await?;
+		writeln!(self, "| ----------- | ----------- | -------- | ------- |").await?;
 
-	let mut destinations = self.services.resolver.cache.destinations().boxed();
+		let mut destinations = self.services.resolver.cache.destinations().boxed();
 
-	while let Some((name, CachedDest { dest, host, expire })) = destinations.next().await {
-		if let Some(server_name) = server_name.as_ref() {
-			if name != *server_name {
-				continue;
+		while let Some((name, CachedDest { dest, host, expire })) = destinations.next().await {
+			if let Some(server_name) = server_name.as_ref() {
+				if name != *server_name {
+					continue;
+				}
 			}
+
+			let expire = time::format(expire, "%+");
+			self.write_str(&format!("| {name} | {dest} | {host} | {expire} |\n"))
+				.await?;
 		}
 
-		let expire = time::format(expire, "%+");
-		self.write_str(&format!("| {name} | {dest} | {host} | {expire} |\n"))
-			.await?;
+		Ok(())
 	}
 
-	Ok(())
-}
+	async fn overrides_cache(&self, server_name: Option<String>) -> Result {
+		use service::resolver::cache::CachedOverride;
 
-#[admin_command]
-async fn overrides_cache(&self, server_name: Option<String>) -> Result {
-	use service::resolver::cache::CachedOverride;
+		writeln!(self, "| Server Name | IP  | Port | Expires | Overriding |").await?;
+		writeln!(self, "| ----------- | --- | ----:| ------- | ---------- |").await?;
 
-	writeln!(self, "| Server Name | IP  | Port | Expires | Overriding |").await?;
-	writeln!(self, "| ----------- | --- | ----:| ------- | ---------- |").await?;
+		let mut overrides = self.services.resolver.cache.overrides().boxed();
 
-	let mut overrides = self.services.resolver.cache.overrides().boxed();
-
-	while let Some((name, CachedOverride { ips, port, expire, overriding })) =
-		overrides.next().await
-	{
-		if let Some(server_name) = server_name.as_ref() {
-			if name != *server_name {
-				continue;
+		while let Some((name, CachedOverride { ips, port, expire, overriding })) =
+			overrides.next().await
+		{
+			if let Some(server_name) = server_name.as_ref() {
+				if name != *server_name {
+					continue;
+				}
 			}
+
+			let expire = time::format(expire, "%+");
+			self.write_str(&format!(
+				"| {name} | {ips:?} | {port} | {expire} | {overriding:?} |\n"
+			))
+			.await?;
 		}
 
-		let expire = time::format(expire, "%+");
-		self.write_str(&format!("| {name} | {ips:?} | {port} | {expire} | {overriding:?} |\n"))
-			.await?;
+		Ok(())
 	}
 
-	Ok(())
-}
-
-#[admin_command]
-async fn flush_cache(&self, name: Option<OwnedServerName>, all: bool) -> Result {
-	if all {
-		self.services.resolver.cache.clear().await;
-		writeln!(self, "Resolver caches cleared!").await
-	} else if let Some(name) = name {
-		self.services.resolver.cache.del_destination(&name);
-		self.services.resolver.cache.del_override(&name);
-		self.write_str(&format!("Cleared {name} from resolver caches!"))
-			.await
-	} else {
-		Err!("Missing name. Supply a name or use --all to flush the whole cache.")
+	async fn flush_cache(&self, name: Option<OwnedServerName>, all: bool) -> Result {
+		if all {
+			self.services.resolver.cache.clear().await;
+			writeln!(self, "Resolver caches cleared!").await
+		} else if let Some(name) = name {
+			self.services.resolver.cache.del_destination(&name);
+			self.services.resolver.cache.del_override(&name);
+			self.write_str(&format!("Cleared {name} from resolver caches!"))
+				.await
+		} else {
+			Err!("Missing name. Supply a name or use --all to flush the whole cache.")
+		}
 	}
 }

src/admin/query/room_timeline.rs

@@ -3,7 +3,7 @@
 use futures::TryStreamExt;
 use ruma::OwnedRoomOrAliasId;
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -23,39 +23,39 @@ pub enum RoomTimelineCommand {
 	},
 }
 
-#[admin_command]
-pub(super) async fn last(&self, room_id: OwnedRoomOrAliasId) -> Result {
-	let room_id = self.services.rooms.alias.resolve(&room_id).await?;
+impl crate::Context<'_> {
+	pub(super) async fn last(&self, room_id: OwnedRoomOrAliasId) -> Result {
+		let room_id = self.services.rooms.alias.resolve(&room_id).await?;
 
-	let result = self
-		.services
-		.rooms
-		.timeline
-		.last_timeline_count(&room_id)
-		.await?;
+		let result = self
+			.services
+			.rooms
+			.timeline
+			.last_timeline_count(&room_id)
+			.await?;
 
-	self.write_str(&format!("{result:#?}")).await
-}
-
-#[admin_command]
-pub(super) async fn pdus(
-	&self,
-	room_id: OwnedRoomOrAliasId,
-	from: Option<String>,
-	limit: Option<usize>,
-) -> Result {
-	let room_id = self.services.rooms.alias.resolve(&room_id).await?;
-
-	let from: Option<PduCount> = from.as_deref().map(str::parse).transpose()?;
-
-	let result: Vec<_> = self
-		.services
-		.rooms
-		.timeline
-		.pdus_rev(&room_id, from)
-		.try_take(limit.unwrap_or(3))
-		.try_collect()
-		.await?;
-
-	self.write_str(&format!("```\n{result:#?}\n```")).await
+		self.write_str(&format!("{result:#?}")).await
+	}
+
+	pub(super) async fn pdus(
+		&self,
+		room_id: OwnedRoomOrAliasId,
+		from: Option<String>,
+		limit: Option<usize>,
+	) -> Result {
+		let room_id = self.services.rooms.alias.resolve(&room_id).await?;
+
+		let from: Option<PduCount> = from.as_deref().map(str::parse).transpose()?;
+
+		let result: Vec<_> = self
+			.services
+			.rooms
+			.timeline
+			.pdus_rev(&room_id, from)
+			.try_take(limit.unwrap_or(3))
+			.try_collect()
+			.await?;
+
+		self.write_str(&format!("```\n{result:#?}\n```")).await
+	}
 }

src/admin/query/short.rs

@@ -2,7 +2,7 @@
 use conduwuit::Result;
 use ruma::{OwnedEventId, OwnedRoomOrAliasId};
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -17,23 +17,23 @@ pub enum ShortCommand {
 	},
 }
 
-#[admin_command]
-pub(super) async fn short_event_id(&self, event_id: OwnedEventId) -> Result {
-	let shortid = self
-		.services
-		.rooms
-		.short
-		.get_shorteventid(&event_id)
-		.await?;
+impl crate::Context<'_> {
+	pub(super) async fn short_event_id(&self, event_id: OwnedEventId) -> Result {
+		let shortid = self
+			.services
+			.rooms
+			.short
+			.get_shorteventid(&event_id)
+			.await?;
 
-	self.write_str(&format!("{shortid:#?}")).await
-}
-
-#[admin_command]
-pub(super) async fn short_room_id(&self, room_id: OwnedRoomOrAliasId) -> Result {
-	let room_id = self.services.rooms.alias.resolve(&room_id).await?;
-
-	let shortid = self.services.rooms.short.get_shortroomid(&room_id).await?;
-
-	self.write_str(&format!("{shortid:#?}")).await
+		self.write_str(&format!("{shortid:#?}")).await
+	}
+
+	pub(super) async fn short_room_id(&self, room_id: OwnedRoomOrAliasId) -> Result {
+		let room_id = self.services.rooms.alias.resolve(&room_id).await?;
+
+		let shortid = self.services.rooms.short.get_shortroomid(&room_id).await?;
+
+		self.write_str(&format!("{shortid:#?}")).await
+	}
 }

src/admin/query/users.rs

@@ -3,7 +3,7 @@
 use futures::stream::StreamExt;
 use ruma::{OwnedDeviceId, OwnedRoomId, OwnedUserId};
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -92,263 +92,264 @@ pub enum UsersCommand {
 	},
 }
 
-#[admin_command]
-async fn get_shared_rooms(&self, user_a: OwnedUserId, user_b: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result: Vec<_> = self
-		.services
-		.rooms
-		.state_cache
-		.get_shared_rooms(&user_a, &user_b)
-		.collect()
-		.await;
-	let query_time = timer.elapsed();
+impl crate::Context<'_> {
+	async fn get_shared_rooms(&self, user_a: OwnedUserId, user_b: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result: Vec<_> = self
+			.services
+			.rooms
+			.state_cache
+			.get_shared_rooms(&user_a, &user_b)
+			.collect()
+			.await;
+		let query_time = timer.elapsed();
 
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_backup_session(
-	&self,
-	user_id: OwnedUserId,
-	version: String,
-	room_id: OwnedRoomId,
-	session_id: String,
-) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.key_backups
-		.get_session(&user_id, &version, &room_id, &session_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_room_backups(
-	&self,
-	user_id: OwnedUserId,
-	version: String,
-	room_id: OwnedRoomId,
-) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.key_backups
-		.get_room(&user_id, &version, &room_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_all_backups(&self, user_id: OwnedUserId, version: String) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self.services.key_backups.get_all(&user_id, &version).await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_backup_algorithm(&self, user_id: OwnedUserId, version: String) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.key_backups
-		.get_backup(&user_id, &version)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_latest_backup_version(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.key_backups
-		.get_latest_backup_version(&user_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_latest_backup(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self.services.key_backups.get_latest_backup(&user_id).await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn iter_users(&self) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result: Vec<OwnedUserId> = self.services.users.stream().map(Into::into).collect().await;
-
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn iter_users2(&self) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result: Vec<_> = self.services.users.stream().collect().await;
-	let result: Vec<_> = result
-		.into_iter()
-		.map(|user_id| String::from_utf8_lossy(user_id.as_bytes()).into_owned())
-		.collect();
-
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn count_users(&self) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self.services.users.count().await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn list_devices(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let devices = self
-		.services
-		.users
-		.all_device_ids(&user_id)
-		.collect::<Vec<_>>()
-		.await;
-
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{devices:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn list_devices_metadata(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let devices = self
-		.services
-		.users
-		.all_devices_metadata(&user_id)
-		.collect::<Vec<_>>()
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{devices:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_device_metadata(&self, user_id: OwnedUserId, device_id: OwnedDeviceId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let device = self
-		.services
-		.users
-		.get_device_metadata(&user_id, &device_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{device:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_devices_version(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let device = self.services.users.get_devicelist_version(&user_id).await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{device:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn count_one_time_keys(&self, user_id: OwnedUserId, device_id: OwnedDeviceId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.users
-		.count_one_time_keys(&user_id, &device_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_device_keys(&self, user_id: OwnedUserId, device_id: OwnedDeviceId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.users
-		.get_device_keys(&user_id, &device_id)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_user_signing_key(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self.services.users.get_user_signing_key(&user_id).await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_master_key(&self, user_id: OwnedUserId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.users
-		.get_master_key(None, &user_id, &|_| true)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn get_to_device_events(&self, user_id: OwnedUserId, device_id: OwnedDeviceId) -> Result {
-	let timer = tokio::time::Instant::now();
-	let result = self
-		.services
-		.users
-		.get_to_device_events(&user_id, &device_id, None, None)
-		.collect::<Vec<_>>()
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
-		.await
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_backup_session(
+		&self,
+		user_id: OwnedUserId,
+		version: String,
+		room_id: OwnedRoomId,
+		session_id: String,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.key_backups
+			.get_session(&user_id, &version, &room_id, &session_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_room_backups(
+		&self,
+		user_id: OwnedUserId,
+		version: String,
+		room_id: OwnedRoomId,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.key_backups
+			.get_room(&user_id, &version, &room_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_all_backups(&self, user_id: OwnedUserId, version: String) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self.services.key_backups.get_all(&user_id, &version).await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_backup_algorithm(&self, user_id: OwnedUserId, version: String) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.key_backups
+			.get_backup(&user_id, &version)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_latest_backup_version(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.key_backups
+			.get_latest_backup_version(&user_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_latest_backup(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self.services.key_backups.get_latest_backup(&user_id).await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn iter_users(&self) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result: Vec<OwnedUserId> = self
+			.services
+			.users
+			.stream_local_users()
+			.map(Into::into)
+			.collect()
+			.await;
+
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn iter_users2(&self) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result: Vec<_> = self.services.users.stream_local_users().collect().await;
+		let result: Vec<_> = result
+			.into_iter()
+			.map(|user_id| String::from_utf8_lossy(user_id.as_bytes()).into_owned())
+			.collect();
+
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:?}\n```"))
+			.await
+	}
+
+	async fn count_users(&self) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self.services.users.count().await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn list_devices(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let devices = self
+			.services
+			.users
+			.all_device_ids(&user_id)
+			.collect::<Vec<_>>()
+			.await;
+
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{devices:#?}\n```"))
+			.await
+	}
+
+	async fn list_devices_metadata(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let devices = self
+			.services
+			.users
+			.all_devices_metadata(&user_id)
+			.collect::<Vec<_>>()
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{devices:#?}\n```"))
+			.await
+	}
+
+	async fn get_device_metadata(
+		&self,
+		user_id: OwnedUserId,
+		device_id: OwnedDeviceId,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let device = self
+			.services
+			.users
+			.get_device_metadata(&user_id, &device_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{device:#?}\n```"))
+			.await
+	}
+
+	async fn get_devices_version(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let device = self.services.users.get_devicelist_version(&user_id).await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{device:#?}\n```"))
+			.await
+	}
+
+	async fn count_one_time_keys(
+		&self,
+		user_id: OwnedUserId,
+		device_id: OwnedDeviceId,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.users
+			.count_one_time_keys(&user_id, &device_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_device_keys(&self, user_id: OwnedUserId, device_id: OwnedDeviceId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.users
+			.get_device_keys(&user_id, &device_id)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_user_signing_key(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self.services.users.get_user_signing_key(&user_id).await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_master_key(&self, user_id: OwnedUserId) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.users
+			.get_master_key(None, &user_id, &|_| true)
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
+
+	async fn get_to_device_events(
+		&self,
+		user_id: OwnedUserId,
+		device_id: OwnedDeviceId,
+	) -> Result {
+		let timer = tokio::time::Instant::now();
+		let result = self
+			.services
+			.users
+			.get_to_device_events(&user_id, &device_id, None, None)
+			.collect::<Vec<_>>()
+			.await;
+		let query_time = timer.elapsed();
+
+		self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"))
+			.await
+	}
 }

src/admin/room/commands.rs

@@ -2,83 +2,83 @@
 use futures::StreamExt;
 use ruma::OwnedRoomId;
 
-use crate::{PAGE_SIZE, admin_command, get_room_info};
+use crate::{PAGE_SIZE, get_room_info};
 
-#[allow(clippy::fn_params_excessive_bools)]
-#[admin_command]
-pub(super) async fn list_rooms(
-	&self,
-	page: Option<usize>,
-	exclude_disabled: bool,
-	exclude_banned: bool,
-	include_empty: bool,
-	no_details: bool,
-) -> Result {
-	// TODO: i know there's a way to do this with clap, but i can't seem to find it
-	let page = page.unwrap_or(1);
-	let mut rooms = self
-		.services
-		.rooms
-		.metadata
-		.iter_ids()
-		.filter_map(|room_id| async move {
-			(!exclude_disabled || !self.services.rooms.metadata.is_disabled(&room_id).await)
-				.then_some(room_id)
-		})
-		.filter_map(|room_id| async move {
-			(!exclude_banned || !self.services.rooms.metadata.is_banned(&room_id).await)
-				.then_some(room_id)
-		})
-		.then(async |room_id| get_room_info(self.services, &room_id).await)
-		.then(|(room_id, total_members, name)| async move {
-			let local_members: Vec<_> = self
-				.services
-				.rooms
-				.state_cache
-				.active_local_users_in_room(&room_id)
-				.collect()
-				.await;
-			let local_members = local_members.len();
-			(room_id, total_members, local_members, name)
-		})
-		.filter_map(|(room_id, total_members, local_members, name)| async move {
-			(include_empty || local_members > 0).then_some((room_id, total_members, name))
-		})
-		.collect::<Vec<_>>()
-		.await;
+impl crate::Context<'_> {
+	#[allow(clippy::fn_params_excessive_bools)]
+	pub(super) async fn list_rooms(
+		&self,
+		page: Option<usize>,
+		exclude_disabled: bool,
+		exclude_banned: bool,
+		include_empty: bool,
+		no_details: bool,
+	) -> Result {
+		// TODO: i know there's a way to do this with clap, but i can't seem to find it
+		let page = page.unwrap_or(1);
+		let mut rooms = self
+			.services
+			.rooms
+			.metadata
+			.iter_ids()
+			.filter_map(|room_id| async move {
+				(!exclude_disabled || !self.services.rooms.metadata.is_disabled(&room_id).await)
+					.then_some(room_id)
+			})
+			.filter_map(|room_id| async move {
+				(!exclude_banned || !self.services.rooms.metadata.is_banned(&room_id).await)
+					.then_some(room_id)
+			})
+			.then(async |room_id| get_room_info(self.services, &room_id).await)
+			.then(|(room_id, total_members, name)| async move {
+				let local_members: Vec<_> = self
+					.services
+					.rooms
+					.state_cache
+					.active_local_users_in_room(&room_id)
+					.collect()
+					.await;
+				let local_members = local_members.len();
+				(room_id, total_members, local_members, name)
+			})
+			.filter_map(|(room_id, total_members, local_members, name)| async move {
+				(include_empty || local_members > 0).then_some((room_id, total_members, name))
+			})
+			.collect::<Vec<_>>()
+			.await;
 
-	rooms.sort_by_key(|r| r.1);
-	rooms.reverse();
+		rooms.sort_by_key(|r| r.1);
+		rooms.reverse();
 
-	let rooms = rooms
-		.into_iter()
-		.skip(page.saturating_sub(1).saturating_mul(PAGE_SIZE))
-		.take(PAGE_SIZE)
-		.collect::<Vec<_>>();
+		let rooms = rooms
+			.into_iter()
+			.skip(page.saturating_sub(1).saturating_mul(PAGE_SIZE))
+			.take(PAGE_SIZE)
+			.collect::<Vec<_>>();
 
-	if rooms.is_empty() {
-		return Err!("No more rooms.");
+		if rooms.is_empty() {
+			return Err!("No more rooms.");
+		}
+
+		let body = rooms
+			.iter()
+			.map(|(id, members, name)| {
+				if no_details {
+					format!("{id}")
+				} else {
+					format!("{id}\tMembers: {members}\tName: {name}")
+				}
+			})
+			.collect::<Vec<_>>()
+			.join("\n");
+
+		self.write_str(&format!("Rooms ({}):\n```\n{body}\n```", rooms.len()))
+			.await
 	}
 
-	let body = rooms
-		.iter()
-		.map(|(id, members, name)| {
-			if no_details {
-				format!("{id}")
-			} else {
-				format!("{id}\tMembers: {members}\tName: {name}")
-			}
-		})
-		.collect::<Vec<_>>()
-		.join("\n");
+	pub(super) async fn exists(&self, room_id: OwnedRoomId) -> Result {
+		let result = self.services.rooms.metadata.exists(&room_id).await;
 
-	self.write_str(&format!("Rooms ({}):\n```\n{body}\n```", rooms.len()))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn exists(&self, room_id: OwnedRoomId) -> Result {
-	let result = self.services.rooms.metadata.exists(&room_id).await;
-
-	self.write_str(&format!("{result}")).await
+		self.write_str(&format!("{result}")).await
+	}
 }

src/admin/room/info.rs

@@ -3,7 +3,7 @@
 use futures::StreamExt;
 use ruma::OwnedRoomId;
 
-use crate::{admin_command, admin_command_dispatch};
+use crate::admin_command_dispatch;
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -26,62 +26,62 @@ pub enum RoomInfoCommand {
 	},
 }
 
-#[admin_command]
-async fn list_joined_members(&self, room_id: OwnedRoomId, local_only: bool) -> Result {
-	let room_name = self
-		.services
-		.rooms
-		.state_accessor
-		.get_name(&room_id)
-		.await
-		.unwrap_or_else(|_| room_id.to_string());
+impl crate::Context<'_> {
+	async fn list_joined_members(&self, room_id: OwnedRoomId, local_only: bool) -> Result {
+		let room_name = self
+			.services
+			.rooms
+			.state_accessor
+			.get_name(&room_id)
+			.await
+			.unwrap_or_else(|_| room_id.to_string());
 
-	let member_info: Vec<_> = self
-		.services
-		.rooms
-		.state_cache
-		.room_members(&room_id)
-		.ready_filter(|user_id| {
-			local_only
-				.then(|| self.services.globals.user_is_local(user_id))
-				.unwrap_or(true)
-		})
-		.filter_map(|user_id| async move {
-			Some((
-				self.services
-					.users
-					.displayname(&user_id)
-					.await
-					.unwrap_or_else(|_| user_id.to_string()),
-				user_id,
-			))
-		})
-		.collect()
-		.await;
+		let member_info: Vec<_> = self
+			.services
+			.rooms
+			.state_cache
+			.room_members(&room_id)
+			.ready_filter(|user_id| {
+				local_only
+					.then(|| self.services.globals.user_is_local(user_id))
+					.unwrap_or(true)
+			})
+			.filter_map(|user_id| async move {
+				Some((
+					self.services
+						.users
+						.displayname(&user_id)
+						.await
+						.unwrap_or_else(|_| user_id.to_string()),
+					user_id,
+				))
+			})
+			.collect()
+			.await;
 
-	let num = member_info.len();
-	let body = member_info
-		.into_iter()
-		.map(|(displayname, mxid)| format!("{mxid} | {displayname}"))
-		.collect::<Vec<_>>()
-		.join("\n");
+		let num = member_info.len();
+		let body = member_info
+			.into_iter()
+			.map(|(displayname, mxid)| format!("{mxid} | {displayname}"))
+			.collect::<Vec<_>>()
+			.join("\n");
 
-	self.write_str(&format!("{num} Members in Room \"{room_name}\":\n```\n{body}\n```"))
-		.await
-}
-
-#[admin_command]
-async fn view_room_topic(&self, room_id: OwnedRoomId) -> Result {
-	let Ok(room_topic) = self
-		.services
-		.rooms
-		.state_accessor
-		.get_room_topic(&room_id)
-		.await
-	else {
-		return Err!("Room does not have a room topic set.");
-	};
-
-	self.write_str(&format!("Room topic:\n```\n{room_topic}\n```"))
-		.await
+		self.write_str(&format!("{num} Members in Room \"{room_name}\":\n```\n{body}\n```"))
+			.await
+	}
+
+	async fn view_room_topic(&self, room_id: OwnedRoomId) -> Result {
+		let Ok(room_topic) = self
+			.services
+			.rooms
+			.state_accessor
+			.get_room_topic(&room_id)
+			.await
+		else {
+			return Err!("Room does not have a room topic set.");
+		};
+
+		self.write_str(&format!("Room topic:\n```\n{room_topic}\n```"))
+			.await
+	}
 }

src/admin/room/moderation.rs

@@ -8,7 +8,7 @@
 use futures::{FutureExt, StreamExt};
 use ruma::{OwnedRoomId, OwnedRoomOrAliasId, RoomAliasId, RoomId, RoomOrAliasId};
 
-use crate::{admin_command, admin_command_dispatch, get_room_info};
+use crate::{admin_command_dispatch, get_room_info};
 
 #[admin_command_dispatch]
 #[derive(Debug, Subcommand)]
@@ -45,238 +45,72 @@ pub enum RoomModerationCommand {
 	},
 }
 
-#[admin_command]
-async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
-	debug!("Got room alias or ID: {}", room);
+impl crate::Context<'_> {
+	async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
+		debug!("Got room alias or ID: {}", room);
 
-	let admin_room_alias = &self.services.globals.admin_alias;
+		let admin_room_alias = &self.services.globals.admin_alias;
 
-	if let Ok(admin_room_id) = self.services.admin.get_admin_room().await {
-		if room.to_string().eq(&admin_room_id) || room.to_string().eq(admin_room_alias) {
-			return Err!("Not allowed to ban the admin room.");
+		if let Ok(admin_room_id) = self.services.admin.get_admin_room().await {
+			if room.to_string().eq(&admin_room_id) || room.to_string().eq(admin_room_alias) {
+				return Err!("Not allowed to ban the admin room.");
+			}
 		}
-	}
 
-	let room_id = if room.is_room_id() {
-		let room_id = match RoomId::parse(&room) {
-			| Ok(room_id) => room_id,
-			| Err(e) => {
-				return Err!(
-					"Failed to parse room ID {room}. Please note that this requires a full room \
-					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-					 (`#roomalias:example.com`): {e}"
-				);
-			},
+		let room_id = if room.is_room_id() {
+			let room_id = match RoomId::parse(&room) {
+				| Ok(room_id) => room_id,
+				| Err(e) => {
+					return Err!(
+						"Failed to parse room ID {room}. Please note that this requires a full \
+						 room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+						 (`#roomalias:example.com`): {e}"
+					);
+				},
+			};
+
+			debug!("Room specified is a room ID, banning room ID");
+
+			room_id.clone()
+		} else if room.is_room_alias_id() {
+			let room_alias = match RoomAliasId::parse(&room) {
+				| Ok(room_alias) => room_alias,
+				| Err(e) => {
+					return Err!(
+						"Failed to parse room ID {room}. Please note that this requires a full \
+						 room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+						 (`#roomalias:example.com`): {e}"
+					);
+				},
+			};
+
+			debug!(
+				"Room specified is not a room ID, attempting to resolve room alias to a room ID \
+				 locally, if not using get_alias_helper to fetch room ID remotely"
+			);
+
+			match self.services.rooms.alias.resolve_alias(&room_alias).await {
+				| Ok((room_id, servers)) => {
+					debug!(
+						%room_id,
+						?servers,
+						"Got federation response fetching room ID for room {room}"
+					);
+					room_id
+				},
+				| Err(e) => {
+					return Err!("Failed to resolve room alias {room} to a room ID: {e}");
+				},
+			}
+		} else {
+			return Err!(
+				"Room specified is not a room ID or room alias. Please note that this requires \
+				 a full room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+				 (`#roomalias:example.com`)",
+			);
 		};
 
-		debug!("Room specified is a room ID, banning room ID");
-
-		room_id.clone()
-	} else if room.is_room_alias_id() {
-		let room_alias = match RoomAliasId::parse(&room) {
-			| Ok(room_alias) => room_alias,
-			| Err(e) => {
-				return Err!(
-					"Failed to parse room ID {room}. Please note that this requires a full room \
-					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-					 (`#roomalias:example.com`): {e}"
-				);
-			},
-		};
-
-		debug!(
-			"Room specified is not a room ID, attempting to resolve room alias to a room ID \
-			 locally, if not using get_alias_helper to fetch room ID remotely"
-		);
-
-		match self.services.rooms.alias.resolve_alias(&room_alias).await {
-			| Ok((room_id, servers)) => {
-				debug!(
-					%room_id,
-					?servers,
-					"Got federation response fetching room ID for room {room}"
-				);
-				room_id
-			},
-			| Err(e) => {
-				return Err!("Failed to resolve room alias {room} to a room ID: {e}");
-			},
-		}
-	} else {
-		return Err!(
-			"Room specified is not a room ID or room alias. Please note that this requires a \
-			 full room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-			 (`#roomalias:example.com`)",
-		);
-	};
-
-	info!("Making all users leave the room {room_id} and forgetting it");
-	let mut users = self
-		.services
-		.rooms
-		.state_cache
-		.room_members(&room_id)
-		.ready_filter(|user| self.services.globals.user_is_local(user))
-		.boxed();
-
-	while let Some(ref user_id) = users.next().await {
-		info!(
-			"Attempting leave for user {user_id} in room {room_id} (ignoring all errors, \
-			 evicting admins too)",
-		);
-
-		if let Err(e) = leave_room(self.services, user_id, &room_id, None)
-			.boxed()
-			.await
-		{
-			warn!("Failed to leave room: {e}");
-		}
-
-		self.services.rooms.state_cache.forget(&room_id, user_id);
-	}
-
-	self.services
-		.rooms
-		.alias
-		.local_aliases_for_room(&room_id)
-		.for_each(|local_alias| async move {
-			self.services
-				.rooms
-				.alias
-				.remove_alias(&local_alias, &self.services.globals.server_user)
-				.await
-				.ok();
-		})
-		.await;
-
-	self.services.rooms.directory.set_not_public(&room_id); // remove from the room directory
-	self.services.rooms.metadata.ban_room(&room_id, true); // prevent further joins
-	self.services.rooms.metadata.disable_room(&room_id, true); // disable federation
-
-	self.write_str(
-		"Room banned, removed all our local users, and disabled incoming federation with room.",
-	)
-	.await
-}
-
-#[admin_command]
-async fn ban_list_of_rooms(&self) -> Result {
-	if self.body.len() < 2
-		|| !self.body[0].trim().starts_with("```")
-		|| self.body.last().unwrap_or(&"").trim() != "```"
-	{
-		return Err!("Expected code block in command body. Add --help for details.",);
-	}
-
-	let rooms_s = self
-		.body
-		.to_vec()
-		.drain(1..self.body.len().saturating_sub(1))
-		.collect::<Vec<_>>();
-
-	let admin_room_alias = &self.services.globals.admin_alias;
-
-	let mut room_ban_count: usize = 0;
-	let mut room_ids: Vec<OwnedRoomId> = Vec::new();
-
-	for &room in &rooms_s {
-		match <&RoomOrAliasId>::try_from(room) {
-			| Ok(room_alias_or_id) => {
-				if let Ok(admin_room_id) = self.services.admin.get_admin_room().await {
-					if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(admin_room_alias)
-					{
-						warn!("User specified admin room in bulk ban list, ignoring");
-						continue;
-					}
-				}
-
-				if room_alias_or_id.is_room_id() {
-					let room_id = match RoomId::parse(room_alias_or_id) {
-						| Ok(room_id) => room_id,
-						| Err(e) => {
-							// ignore rooms we failed to parse
-							warn!(
-								"Error parsing room \"{room}\" during bulk room banning, \
-								 ignoring error and logging here: {e}"
-							);
-							continue;
-						},
-					};
-
-					room_ids.push(room_id.clone());
-				}
-
-				if room_alias_or_id.is_room_alias_id() {
-					match RoomAliasId::parse(room_alias_or_id) {
-						| Ok(room_alias) => {
-							let room_id = match self
-								.services
-								.rooms
-								.alias
-								.resolve_local_alias(&room_alias)
-								.await
-							{
-								| Ok(room_id) => room_id,
-								| _ => {
-									debug!(
-										"We don't have this room alias to a room ID locally, \
-										 attempting to fetch room ID over federation"
-									);
-
-									match self
-										.services
-										.rooms
-										.alias
-										.resolve_alias(&room_alias)
-										.await
-									{
-										| Ok((room_id, servers)) => {
-											debug!(
-												%room_id,
-												?servers,
-												"Got federation response fetching room ID for \
-												 {room}",
-											);
-											room_id
-										},
-										| Err(e) => {
-											warn!(
-												"Failed to resolve room alias {room} to a room \
-												 ID: {e}"
-											);
-											continue;
-										},
-									}
-								},
-							};
-
-							room_ids.push(room_id);
-						},
-						| Err(e) => {
-							warn!(
-								"Error parsing room \"{room}\" during bulk room banning, \
-								 ignoring error and logging here: {e}"
-							);
-							continue;
-						},
-					}
-				}
-			},
-			| Err(e) => {
-				warn!(
-					"Error parsing room \"{room}\" during bulk room banning, ignoring error and \
-					 logging here: {e}"
-				);
-				continue;
-			},
-		}
-	}
-
-	for room_id in room_ids {
-		debug!("Banned {room_id} successfully");
-		room_ban_count = room_ban_count.saturating_add(1);
-
-		debug!("Making all users leave the room {room_id} and forgetting it");
+		info!("Making all users leave the room {room_id} and forgetting it");
 		let mut users = self
 			.services
 			.rooms
@@ -286,7 +120,7 @@ async fn ban_list_of_rooms(&self) -> Result {
 			.boxed();
 
 		while let Some(ref user_id) = users.next().await {
-			debug!(
+			info!(
 				"Attempting leave for user {user_id} in room {room_id} (ignoring all errors, \
 				 evicting admins too)",
 			);
@@ -301,7 +135,6 @@ async fn ban_list_of_rooms(&self) -> Result {
 			self.services.rooms.state_cache.forget(&room_id, user_id);
 		}
 
-		// remove any local aliases, ignore errors
 		self.services
 			.rooms
 			.alias
@@ -316,139 +149,307 @@ async fn ban_list_of_rooms(&self) -> Result {
 			})
 			.await;
 
-		self.services.rooms.metadata.ban_room(&room_id, true);
-		// unpublish from room directory, ignore errors
-		self.services.rooms.directory.set_not_public(&room_id);
-		self.services.rooms.metadata.disable_room(&room_id, true);
+		self.services.rooms.directory.set_not_public(&room_id); // remove from the room directory
+		self.services.rooms.metadata.ban_room(&room_id, true); // prevent further joins
+		self.services.rooms.metadata.disable_room(&room_id, true); // disable federation
+
+		self.write_str(
+			"Room banned, removed all our local users, and disabled incoming federation with \
+			 room.",
+		)
+		.await
 	}
 
-	self.write_str(&format!(
-		"Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, and \
-		 disabled incoming federation with the room."
-	))
-	.await
-}
+	async fn ban_list_of_rooms(&self) -> Result {
+		if self.body.len() < 2
+			|| !self.body[0].trim().starts_with("```")
+			|| self.body.last().unwrap_or(&"").trim() != "```"
+		{
+			return Err!("Expected code block in command body. Add --help for details.",);
+		}
 
-#[admin_command]
-async fn unban_room(&self, room: OwnedRoomOrAliasId) -> Result {
-	let room_id = if room.is_room_id() {
-		let room_id = match RoomId::parse(&room) {
-			| Ok(room_id) => room_id,
-			| Err(e) => {
-				return Err!(
-					"Failed to parse room ID {room}. Please note that this requires a full room \
-					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-					 (`#roomalias:example.com`): {e}"
+		let rooms_s = self
+			.body
+			.to_vec()
+			.drain(1..self.body.len().saturating_sub(1))
+			.collect::<Vec<_>>();
+
+		let admin_room_alias = &self.services.globals.admin_alias;
+
+		let mut room_ban_count: usize = 0;
+		let mut room_ids: Vec<OwnedRoomId> = Vec::new();
+
+		for &room in &rooms_s {
+			match <&RoomOrAliasId>::try_from(room) {
+				| Ok(room_alias_or_id) => {
+					if let Ok(admin_room_id) = self.services.admin.get_admin_room().await {
+						if room.to_owned().eq(&admin_room_id)
+							|| room.to_owned().eq(admin_room_alias)
+						{
+							warn!("User specified admin room in bulk ban list, ignoring");
+							continue;
+						}
+					}
+
+					if room_alias_or_id.is_room_id() {
+						let room_id = match RoomId::parse(room_alias_or_id) {
+							| Ok(room_id) => room_id,
+							| Err(e) => {
+								// ignore rooms we failed to parse
+								warn!(
+									"Error parsing room \"{room}\" during bulk room banning, \
+									 ignoring error and logging here: {e}"
+								);
+								continue;
+							},
+						};
+
+						room_ids.push(room_id.clone());
+					}
+
+					if room_alias_or_id.is_room_alias_id() {
+						match RoomAliasId::parse(room_alias_or_id) {
+							| Ok(room_alias) => {
+								let room_id = match self
+									.services
+									.rooms
+									.alias
+									.resolve_local_alias(&room_alias)
+									.await
+								{
+									| Ok(room_id) => room_id,
+									| _ => {
+										debug!(
+											"We don't have this room alias to a room ID \
+											 locally, attempting to fetch room ID over \
+											 federation"
+										);
+
+										match self
+											.services
+											.rooms
+											.alias
+											.resolve_alias(&room_alias)
+											.await
+										{
+											| Ok((room_id, servers)) => {
+												debug!(
+													%room_id,
+													?servers,
+													"Got federation response fetching room ID for \
+													 {room}",
+												);
+												room_id
+											},
+											| Err(e) => {
+												warn!(
+													"Failed to resolve room alias {room} to a \
+													 room ID: {e}"
+												);
+												continue;
+											},
+										}
+									},
+								};
+
+								room_ids.push(room_id);
+							},
+							| Err(e) => {
+								warn!(
+									"Error parsing room \"{room}\" during bulk room banning, \
+									 ignoring error and logging here: {e}"
+								);
+								continue;
+							},
+						}
+					}
+				},
+				| Err(e) => {
+					warn!(
+						"Error parsing room \"{room}\" during bulk room banning, ignoring error \
+						 and logging here: {e}"
+					);
+					continue;
+				},
+			}
+		}
+
+		for room_id in room_ids {
+			debug!("Banned {room_id} successfully");
+			room_ban_count = room_ban_count.saturating_add(1);
+
+			debug!("Making all users leave the room {room_id} and forgetting it");
+			let mut users = self
+				.services
+				.rooms
+				.state_cache
+				.room_members(&room_id)
+				.ready_filter(|user| self.services.globals.user_is_local(user))
+				.boxed();
+
+			while let Some(ref user_id) = users.next().await {
+				debug!(
+					"Attempting leave for user {user_id} in room {room_id} (ignoring all \
+					 errors, evicting admins too)",
 				);
-			},
+
+				if let Err(e) = leave_room(self.services, user_id, &room_id, None)
+					.boxed()
+					.await
+				{
+					warn!("Failed to leave room: {e}");
+				}
+
+				self.services.rooms.state_cache.forget(&room_id, user_id);
+			}
+
+			// remove any local aliases, ignore errors
+			self.services
+				.rooms
+				.alias
+				.local_aliases_for_room(&room_id)
+				.for_each(|local_alias| async move {
+					self.services
+						.rooms
+						.alias
+						.remove_alias(&local_alias, &self.services.globals.server_user)
+						.await
+						.ok();
+				})
+				.await;
+
+			self.services.rooms.metadata.ban_room(&room_id, true);
+			// unpublish from room directory, ignore errors
+			self.services.rooms.directory.set_not_public(&room_id);
+			self.services.rooms.metadata.disable_room(&room_id, true);
+		}
+
+		self.write_str(&format!(
+			"Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, \
+			 and disabled incoming federation with the room."
+		))
+		.await
+	}
+
+	async fn unban_room(&self, room: OwnedRoomOrAliasId) -> Result {
+		let room_id = if room.is_room_id() {
+			let room_id = match RoomId::parse(&room) {
+				| Ok(room_id) => room_id,
+				| Err(e) => {
+					return Err!(
+						"Failed to parse room ID {room}. Please note that this requires a full \
+						 room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+						 (`#roomalias:example.com`): {e}"
+					);
+				},
+			};
+
+			debug!("Room specified is a room ID, unbanning room ID");
+			self.services.rooms.metadata.ban_room(&room_id, false);
+
+			room_id.clone()
+		} else if room.is_room_alias_id() {
+			let room_alias = match RoomAliasId::parse(&room) {
+				| Ok(room_alias) => room_alias,
+				| Err(e) => {
+					return Err!(
+						"Failed to parse room ID {room}. Please note that this requires a full \
+						 room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+						 (`#roomalias:example.com`): {e}"
+					);
+				},
+			};
+
+			debug!(
+				"Room specified is not a room ID, attempting to resolve room alias to a room ID \
+				 locally, if not using get_alias_helper to fetch room ID remotely"
+			);
+
+			let room_id = match self
+				.services
+				.rooms
+				.alias
+				.resolve_local_alias(&room_alias)
+				.await
+			{
+				| Ok(room_id) => room_id,
+				| _ => {
+					debug!(
+						"We don't have this room alias to a room ID locally, attempting to \
+						 fetch room ID over federation"
+					);
+
+					match self.services.rooms.alias.resolve_alias(&room_alias).await {
+						| Ok((room_id, servers)) => {
+							debug!(
+								%room_id,
+								?servers,
+								"Got federation response fetching room ID for room {room}"
+							);
+							room_id
+						},
+						| Err(e) => {
+							return Err!("Failed to resolve room alias {room} to a room ID: {e}");
+						},
+					}
+				},
+			};
+
+			self.services.rooms.metadata.ban_room(&room_id, false);
+
+			room_id
+		} else {
+			return Err!(
+				"Room specified is not a room ID or room alias. Please note that this requires \
+				 a full room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
+				 (`#roomalias:example.com`)",
+			);
 		};
 
-		debug!("Room specified is a room ID, unbanning room ID");
-		self.services.rooms.metadata.ban_room(&room_id, false);
+		self.services.rooms.metadata.disable_room(&room_id, false);
+		self.write_str("Room unbanned and federation re-enabled.")
+			.await
+	}
 
-		room_id.clone()
-	} else if room.is_room_alias_id() {
-		let room_alias = match RoomAliasId::parse(&room) {
-			| Ok(room_alias) => room_alias,
-			| Err(e) => {
-				return Err!(
-					"Failed to parse room ID {room}. Please note that this requires a full room \
-					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-					 (`#roomalias:example.com`): {e}"
-				);
-			},
-		};
-
-		debug!(
-			"Room specified is not a room ID, attempting to resolve room alias to a room ID \
-			 locally, if not using get_alias_helper to fetch room ID remotely"
-		);
-
-		let room_id = match self
+	async fn list_banned_rooms(&self, no_details: bool) -> Result {
+		let room_ids: Vec<OwnedRoomId> = self
 			.services
 			.rooms
-			.alias
-			.resolve_local_alias(&room_alias)
-			.await
-		{
-			| Ok(room_id) => room_id,
-			| _ => {
-				debug!(
-					"We don't have this room alias to a room ID locally, attempting to fetch \
-					 room ID over federation"
-				);
+			.metadata
+			.list_banned_rooms()
+			.map(Into::into)
+			.collect()
+			.await;
 
-				match self.services.rooms.alias.resolve_alias(&room_alias).await {
-					| Ok((room_id, servers)) => {
-						debug!(
-							%room_id,
-							?servers,
-							"Got federation response fetching room ID for room {room}"
-						);
-						room_id
-					},
-					| Err(e) => {
-						return Err!("Failed to resolve room alias {room} to a room ID: {e}");
-					},
+		if room_ids.is_empty() {
+			return Err!("No rooms are banned.");
+		}
+
+		let mut rooms = room_ids
+			.iter()
+			.stream()
+			.then(|room_id| get_room_info(self.services, room_id))
+			.collect::<Vec<_>>()
+			.await;
+
+		rooms.sort_by_key(|r| r.1);
+		rooms.reverse();
+
+		let num = rooms.len();
+
+		let body = rooms
+			.iter()
+			.map(|(id, members, name)| {
+				if no_details {
+					format!("{id}")
+				} else {
+					format!("{id}\tMembers: {members}\tName: {name}")
 				}
-			},
-		};
+			})
+			.collect::<Vec<_>>()
+			.join("\n");
 
-		self.services.rooms.metadata.ban_room(&room_id, false);
-
-		room_id
-	} else {
-		return Err!(
-			"Room specified is not a room ID or room alias. Please note that this requires a \
-			 full room ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
-			 (`#roomalias:example.com`)",
-		);
-	};
-
-	self.services.rooms.metadata.disable_room(&room_id, false);
-	self.write_str("Room unbanned and federation re-enabled.")
-		.await
-}
-
-#[admin_command]
-async fn list_banned_rooms(&self, no_details: bool) -> Result {
-	let room_ids: Vec<OwnedRoomId> = self
-		.services
-		.rooms
-		.metadata
-		.list_banned_rooms()
-		.map(Into::into)
-		.collect()
-		.await;
-
-	if room_ids.is_empty() {
-		return Err!("No rooms are banned.");
+		self.write_str(&format!("Rooms Banned ({num}):\n```\n{body}\n```"))
+			.await
 	}
-
-	let mut rooms = room_ids
-		.iter()
-		.stream()
-		.then(|room_id| get_room_info(self.services, room_id))
-		.collect::<Vec<_>>()
-		.await;
-
-	rooms.sort_by_key(|r| r.1);
-	rooms.reverse();
-
-	let num = rooms.len();
-
-	let body = rooms
-		.iter()
-		.map(|(id, members, name)| {
-			if no_details {
-				format!("{id}")
-			} else {
-				format!("{id}\tMembers: {members}\tName: {name}")
-			}
-		})
-		.collect::<Vec<_>>()
-		.join("\n");
-
-	self.write_str(&format!("Rooms Banned ({num}):\n```\n{body}\n```"))
-		.await
 }

src/admin/server/commands.rs

@@ -7,243 +7,230 @@
 };
 use futures::TryStreamExt;
 
-use crate::admin_command;
+impl crate::Context<'_> {
+	pub(super) async fn uptime(&self) -> Result {
+		let elapsed = self
+			.services
+			.server
+			.started
+			.elapsed()
+			.expect("standard duration");
 
-#[admin_command]
-pub(super) async fn uptime(&self) -> Result {
-	let elapsed = self
-		.services
-		.server
-		.started
-		.elapsed()
-		.expect("standard duration");
+		let result = time::pretty(elapsed);
+		self.write_str(&format!("{result}.")).await
+	}
 
-	let result = time::pretty(elapsed);
-	self.write_str(&format!("{result}.")).await
-}
+	pub(super) async fn show_config(&self) -> Result {
+		self.bail_restricted()?;
 
-#[admin_command]
-pub(super) async fn show_config(&self) -> Result {
-	self.bail_restricted()?;
+		self.write_str(&format!("{}", *self.services.server.config))
+			.await
+	}
 
-	self.write_str(&format!("{}", *self.services.server.config))
-		.await
-}
+	pub(super) async fn reload_config(&self, path: Option<PathBuf>) -> Result {
+		// The path argument is only what's optionally passed via the admin command,
+		// so we need to merge it with the existing paths if any were given at startup.
+		let mut paths = Vec::new();
 
-#[admin_command]
-pub(super) async fn reload_config(&self, path: Option<PathBuf>) -> Result {
-	// The path argument is only what's optionally passed via the admin command,
-	// so we need to merge it with the existing paths if any were given at startup.
-	let mut paths = Vec::new();
+		// Add previously saved paths to the argument list
+		self.services
+			.config
+			.config_paths
+			.clone()
+			.unwrap_or_default()
+			.iter()
+			.for_each(|p| paths.push(p.to_owned()));
 
-	// Add previously saved paths to the argument list
-	self.services
-		.config
-		.config_paths
-		.clone()
-		.unwrap_or_default()
-		.iter()
-		.for_each(|p| paths.push(p.to_owned()));
-
-	// If a path is given, and it's not already in the list,
-	// add it last, so that it overrides earlier files
-	if let Some(p) = path {
-		if !paths.contains(&p) {
-			paths.push(p);
+		// If a path is given, and it's not already in the list,
+		// add it last, so that it overrides earlier files
+		if let Some(p) = path {
+			if !paths.contains(&p) {
+				paths.push(p);
+			}
 		}
+
+		self.services.config.reload(&paths)?;
+
+		self.write_str(&format!("Successfully reconfigured from paths: {paths:?}"))
+			.await
 	}
 
-	self.services.config.reload(&paths)?;
+	pub(super) async fn memory_usage(&self) -> Result {
+		let services_usage = self.services.memory_usage().await?;
+		let database_usage = self.services.db.db.memory_usage()?;
+		let allocator_usage = conduwuit::alloc::memory_usage()
+			.map_or(String::new(), |s| format!("\nAllocator:\n{s}"));
 
-	self.write_str(&format!("Successfully reconfigured from paths: {paths:?}"))
+		self.write_str(&format!(
+			"Services:\n{services_usage}\nDatabase:\n{database_usage}{allocator_usage}",
+		))
 		.await
-}
-
-#[admin_command]
-pub(super) async fn memory_usage(&self) -> Result {
-	let services_usage = self.services.memory_usage().await?;
-	let database_usage = self.services.db.db.memory_usage()?;
-	let allocator_usage =
-		conduwuit::alloc::memory_usage().map_or(String::new(), |s| format!("\nAllocator:\n{s}"));
-
-	self.write_str(&format!(
-		"Services:\n{services_usage}\nDatabase:\n{database_usage}{allocator_usage}",
-	))
-	.await
-}
-
-#[admin_command]
-pub(super) async fn clear_caches(&self) -> Result {
-	self.services.clear_cache().await;
-
-	self.write_str("Done.").await
-}
-
-#[admin_command]
-pub(super) async fn list_backups(&self) -> Result {
-	self.services
-		.db
-		.db
-		.backup_list()?
-		.try_stream()
-		.try_for_each(|result| writeln!(self, "{result}"))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn backup_database(&self) -> Result {
-	self.bail_restricted()?;
-
-	let db = Arc::clone(&self.services.db);
-	let result = self
-		.services
-		.server
-		.runtime()
-		.spawn_blocking(move || match db.db.backup() {
-			| Ok(()) => "Done".to_owned(),
-			| Err(e) => format!("Failed: {e}"),
-		})
-		.await?;
-
-	let count = self.services.db.db.backup_count()?;
-	self.write_str(&format!("{result}. Currently have {count} backups."))
-		.await
-}
-
-#[admin_command]
-pub(super) async fn admin_notice(&self, message: Vec<String>) -> Result {
-	let message = message.join(" ");
-	self.services.admin.send_text(&message).await;
-
-	self.write_str("Notice was sent to #admins").await
-}
-
-#[admin_command]
-pub(super) async fn reload_mods(&self) -> Result {
-	self.bail_restricted()?;
-
-	self.services.server.reload()?;
-
-	self.write_str("Reloading server...").await
-}
-
-#[admin_command]
-#[cfg(unix)]
-pub(super) async fn restart(&self, force: bool) -> Result {
-	use conduwuit::utils::sys::current_exe_deleted;
-
-	if !force && current_exe_deleted() {
-		return Err!(
-			"The server cannot be restarted because the executable changed. If this is expected \
-			 use --force to override."
-		);
 	}
 
-	self.services.server.restart()?;
+	pub(super) async fn clear_caches(&self) -> Result {
+		self.services.clear_cache().await;
 
-	self.write_str("Restarting server...").await
-}
-
-#[admin_command]
-pub(super) async fn shutdown(&self) -> Result {
-	self.bail_restricted()?;
-
-	warn!("shutdown command");
-	self.services.server.shutdown()?;
-
-	self.write_str("Shutting down server...").await
-}
-
-#[admin_command]
-pub(super) async fn list_features(&self) -> Result {
-	let mut enabled_features = conduwuit::info::introspection::ENABLED_FEATURES
-		.lock()
-		.expect("locked")
-		.values()
-		.flat_map(|f| f.iter())
-		.collect::<Vec<_>>();
-
-	enabled_features.sort_unstable();
-	enabled_features.dedup();
-
-	let mut available_features = conduwuit::build_metadata::WORKSPACE_FEATURES
-		.iter()
-		.flat_map(|(_, f)| f.iter())
-		.collect::<Vec<_>>();
-
-	available_features.sort_unstable();
-	available_features.dedup();
-
-	let mut features = String::new();
-
-	for feature in available_features {
-		let active = enabled_features.contains(&feature);
-		let emoji = if active { "✅" } else { "❌" };
-		let remark = if active { "[enabled]" } else { "" };
-		writeln!(features, "{emoji} {feature} {remark}")?;
-	}
-
-	self.write_str(&features).await
-}
-
-#[admin_command]
-pub(super) async fn build_info(&self) -> Result {
-	use conduwuit::build_metadata::built;
-
-	let mut info = String::new();
-
-	// Version information
-	writeln!(info, "# Build Information\n")?;
-	writeln!(info, "**Version:** {}", built::PKG_VERSION)?;
-	writeln!(info, "**Package:** {}", built::PKG_NAME)?;
-	writeln!(info, "**Description:** {}", built::PKG_DESCRIPTION)?;
-
-	// Git information
-	writeln!(info, "\n## Git Information\n")?;
-	if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH {
-		writeln!(info, "**Commit Hash:** {hash}")?;
-	}
-	if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH_SHORT {
-		writeln!(info, "**Commit Hash (short):** {hash}")?;
-	}
-	if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_WEB_URL {
-		writeln!(info, "**Repository:** {url}")?;
-	}
-	if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_COMMIT_URL {
-		writeln!(info, "**Commit URL:** {url}")?;
-	}
-
-	// Build environment
-	writeln!(info, "\n## Build Environment\n")?;
-	writeln!(info, "**Profile:** {}", built::PROFILE)?;
-	writeln!(info, "**Optimization Level:** {}", built::OPT_LEVEL)?;
-	writeln!(info, "**Debug:** {}", built::DEBUG)?;
-	writeln!(info, "**Target:** {}", built::TARGET)?;
-	writeln!(info, "**Host:** {}", built::HOST)?;
-
-	// Rust compiler information
-	writeln!(info, "\n## Compiler Information\n")?;
-	writeln!(info, "**Rustc Version:** {}", built::RUSTC_VERSION)?;
-	if !built::RUSTDOC_VERSION.is_empty() {
-		writeln!(info, "**Rustdoc Version:** {}", built::RUSTDOC_VERSION)?;
-	}
-
-	// Target configuration
-	writeln!(info, "\n## Target Configuration\n")?;
-	writeln!(info, "**Architecture:** {}", built::CFG_TARGET_ARCH)?;
-	writeln!(info, "**OS:** {}", built::CFG_OS)?;
-	writeln!(info, "**Family:** {}", built::CFG_FAMILY)?;
-	writeln!(info, "**Endianness:** {}", built::CFG_ENDIAN)?;
-	writeln!(info, "**Pointer Width:** {} bits", built::CFG_POINTER_WIDTH)?;
-	if !built::CFG_ENV.is_empty() {
-		writeln!(info, "**Environment:** {}", built::CFG_ENV)?;
-	}
-
-	// CI information
-	if let Some(ci) = built::CI_PLATFORM {
-		writeln!(info, "\n## CI Platform\n")?;
-		writeln!(info, "**Platform:** {ci}")?;
-	}
-
-	self.write_str(&info).await
+		self.write_str("Done.").await
+	}
+
+	pub(super) async fn list_backups(&self) -> Result {
+		self.services
+			.db
+			.db
+			.backup_list()?
+			.try_stream()
+			.try_for_each(|result| writeln!(self, "{result}"))
+			.await
+	}
+
+	pub(super) async fn backup_database(&self) -> Result {
+		self.bail_restricted()?;
+
+		let db = Arc::clone(&self.services.db);
+		let result = self
+			.services
+			.server
+			.runtime()
+			.spawn_blocking(move || match db.db.backup() {
+				| Ok(()) => "Done".to_owned(),
+				| Err(e) => format!("Failed: {e}"),
+			})
+			.await?;
+
+		let count = self.services.db.db.backup_count()?;
+		self.write_str(&format!("{result}. Currently have {count} backups."))
+			.await
+	}
+
+	pub(super) async fn admin_notice(&self, message: Vec<String>) -> Result {
+		let message = message.join(" ");
+		self.services.admin.send_text(&message).await;
+
+		self.write_str("Notice was sent to #admins").await
+	}
+
+	pub(super) async fn reload_mods(&self) -> Result {
+		self.bail_restricted()?;
+
+		self.services.server.reload()?;
+
+		self.write_str("Reloading server...").await
+	}
+
+	#[cfg(unix)]
+	pub(super) async fn restart(&self, force: bool) -> Result {
+		use conduwuit::utils::sys::current_exe_deleted;
+
+		if !force && current_exe_deleted() {
+			return Err!(
+				"The server cannot be restarted because the executable changed. If this is \
+				 expected use --force to override."
+			);
+		}
+
+		self.services.server.restart()?;
+
+		self.write_str("Restarting server...").await
+	}
+
+	pub(super) async fn shutdown(&self) -> Result {
+		self.bail_restricted()?;
+
+		warn!("shutdown command");
+		self.services.server.shutdown()?;
+
+		self.write_str("Shutting down server...").await
+	}
+
+	pub(super) async fn list_features(&self) -> Result {
+		let mut enabled_features = conduwuit::info::introspection::ENABLED_FEATURES
+			.lock()
+			.expect("locked")
+			.values()
+			.flat_map(|f| f.iter())
+			.collect::<Vec<_>>();
+
+		enabled_features.sort_unstable();
+		enabled_features.dedup();
+
+		let mut available_features = conduwuit::build_metadata::WORKSPACE_FEATURES
+			.iter()
+			.flat_map(|(_, f)| f.iter())
+			.collect::<Vec<_>>();
+
+		available_features.sort_unstable();
+		available_features.dedup();
+
+		let mut features = String::new();
+
+		for feature in available_features {
+			let active = enabled_features.contains(&feature);
+			let emoji = if active { "✅" } else { "❌" };
+			let remark = if active { "[enabled]" } else { "" };
+			writeln!(features, "{emoji} {feature} {remark}")?;
+		}
+
+		self.write_str(&features).await
+	}
+
+	pub(super) async fn build_info(&self) -> Result {
+		use conduwuit::build_metadata::built;
+
+		let mut info = String::new();
+
+		// Version information
+		writeln!(info, "# Build Information\n")?;
+		writeln!(info, "**Version:** {}", built::PKG_VERSION)?;
+		writeln!(info, "**Package:** {}", built::PKG_NAME)?;
+		writeln!(info, "**Description:** {}", built::PKG_DESCRIPTION)?;
+
+		// Git information
+		writeln!(info, "\n## Git Information\n")?;
+		if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH {
+			writeln!(info, "**Commit Hash:** {hash}")?;
+		}
+		if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH_SHORT {
+			writeln!(info, "**Commit Hash (short):** {hash}")?;
+		}
+		if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_WEB_URL {
+			writeln!(info, "**Repository:** {url}")?;
+		}
+		if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_COMMIT_URL {
+			writeln!(info, "**Commit URL:** {url}")?;
+		}
+
+		// Build environment
+		writeln!(info, "\n## Build Environment\n")?;
+		writeln!(info, "**Profile:** {}", built::PROFILE)?;
+		writeln!(info, "**Optimization Level:** {}", built::OPT_LEVEL)?;
+		writeln!(info, "**Debug:** {}", built::DEBUG)?;
+		writeln!(info, "**Target:** {}", built::TARGET)?;
+		writeln!(info, "**Host:** {}", built::HOST)?;
+
+		// Rust compiler information
+		writeln!(info, "\n## Compiler Information\n")?;
+		writeln!(info, "**Rustc Version:** {}", built::RUSTC_VERSION)?;
+		if !built::RUSTDOC_VERSION.is_empty() {
+			writeln!(info, "**Rustdoc Version:** {}", built::RUSTDOC_VERSION)?;
+		}
+
+		// Target configuration
+		writeln!(info, "\n## Target Configuration\n")?;
+		writeln!(info, "**Architecture:** {}", built::CFG_TARGET_ARCH)?;
+		writeln!(info, "**OS:** {}", built::CFG_OS)?;
+		writeln!(info, "**Family:** {}", built::CFG_FAMILY)?;
+		writeln!(info, "**Endianness:** {}", built::CFG_ENDIAN)?;
+		writeln!(info, "**Pointer Width:** {} bits", built::CFG_POINTER_WIDTH)?;
+		if !built::CFG_ENV.is_empty() {
+			writeln!(info, "**Environment:** {}", built::CFG_ENV)?;
+		}
+
+		// CI information
+		if let Some(ci) = built::CI_PLATFORM {
+			writeln!(info, "\n## CI Platform\n")?;
+			writeln!(info, "**Platform:** {ci}")?;
+		}
+
+		self.write_str(&info).await
+	}
 }

src/admin/token/commands.rs

@@ -1,76 +1,99 @@
 use conduwuit::{Err, Result, utils};
-use conduwuit_macros::admin_command;
 use futures::StreamExt;
 use service::registration_tokens::TokenExpires;
 
-#[admin_command]
-pub(super) async fn issue_token(&self, expires: super::TokenExpires) -> Result {
-	let expires = {
-		if expires.immortal {
-			None
-		} else if let Some(max_uses) = expires.max_uses {
-			Some(TokenExpires::AfterUses(max_uses))
-		} else if expires.once {
-			Some(TokenExpires::AfterUses(1))
-		} else if let Some(max_age) = expires
-			.max_age
-			.as_deref()
-			.map(|max_age| utils::time::timepoint_from_now(utils::time::parse_duration(max_age)?))
-			.transpose()?
-		{
-			Some(TokenExpires::AfterTime(max_age))
-		} else {
-			unreachable!();
-		}
-	};
+impl crate::Context<'_> {
+	pub(super) async fn issue_token(&self, expires: super::TokenExpires) -> Result {
+		let expires = {
+			if expires.immortal {
+				None
+			} else if let Some(max_uses) = expires.max_uses {
+				Some(TokenExpires::AfterUses(max_uses))
+			} else if expires.once {
+				Some(TokenExpires::AfterUses(1))
+			} else if let Some(max_age) = expires
+				.max_age
+				.as_deref()
+				.map(|max_age| {
+					utils::time::timepoint_from_now(utils::time::parse_duration(max_age)?)
+				})
+				.transpose()?
+			{
+				Some(TokenExpires::AfterTime(max_age))
+			} else {
+				unreachable!();
+			}
+		};
 
-	let (token, info) = self
-		.services
-		.registration_tokens
-		.issue_token(self.sender_or_service_user().into(), expires);
+		let (token, info) = self
+			.services
+			.registration_tokens
+			.issue_token(self.sender_or_service_user().into(), expires);
 
-	self.write_str(&format!(
-		"New registration token issued: `{token}`. {}.",
-		if let Some(expires) = info.expires {
-			format!("{expires}")
-		} else {
-			"Never expires".to_owned()
-		}
-	))
-	.await
-}
-
-#[admin_command]
-pub(super) async fn revoke_token(&self, token: String) -> Result {
-	let Some(token) = self
-		.services
-		.registration_tokens
-		.validate_token(token)
-		.await
-	else {
-		return Err!("This token does not exist or has already expired.");
-	};
-
-	self.services.registration_tokens.revoke_token(token)?;
-
-	self.write_str("Token revoked successfully.").await
-}
-
-#[admin_command]
-pub(super) async fn list_tokens(&self) -> Result {
-	let tokens: Vec<_> = self
-		.services
-		.registration_tokens
-		.iterate_tokens()
-		.collect()
-		.await;
-
-	self.write_str(&format!("Found {} registration tokens:\n", tokens.len()))
+		self.write_str(&format!(
+			"New registration token issued: `{token}` . {}.",
+			if let Some(expires) = info.expires {
+				format!("{expires}")
+			} else {
+				"Never expires".to_owned()
+			}
+		))
 		.await?;
 
-	for token in tokens {
-		self.write_str(&format!("- {token}\n")).await?;
+		if self
+			.services
+			.config
+			.oauth
+			.compatibility_mode()
+			.oauth_available()
+		{
+			self.write_str(&format!(
+				"\nInvite link using this token: {}",
+				self.services
+					.config
+					.get_client_domain()
+					.join(&format!(
+						"{}/account/register/?flow=trusted&token={token}",
+						conduwuit::ROUTE_PREFIX
+					))
+					.unwrap()
+			))
+			.await?;
+		}
+
+		Ok(())
 	}
 
-	Ok(())
+	pub(super) async fn revoke_token(&self, token: String) -> Result {
+		let Some(token) = self
+			.services
+			.registration_tokens
+			.validate_token(token)
+			.await
+		else {
+			return Err!("This token does not exist or has already expired.");
+		};
+
+		self.services.registration_tokens.revoke_token(token)?;
+
+		self.write_str("Token revoked successfully.").await
+	}
+
+	pub(super) async fn list_tokens(&self) -> Result {
+		let tokens: Vec<_> = self
+			.services
+			.registration_tokens
+			.iterate_tokens()
+			.collect()
+			.await;
+
+		self.write_str(&format!("Found {} registration tokens:\n", tokens.len()))
+			.await?;
+
+		for token in tokens {
+			self.write_str(&format!("- {token}\n")).await?;
+		}
+
+		Ok(())
+	}
 }

src/admin/user/mod.rs

@@ -27,12 +27,9 @@ pub enum UserCommand {
 		username: String,
 		/// New password for the user, if unspecified one is generated
 		password: Option<String>,
-	},
 
-	/// Issue a self-service password reset link for a user.
-	IssuePasswordResetLink {
-		/// Username of the user who may use the link
-		username: String,
+		#[arg(long)]
+		convert_to_local_account: bool,
 	},
 
 	/// Get a user's associated email address.

src/admin/utils.rs

@@ -54,14 +54,7 @@ pub(crate) async fn parse_active_local_user_id(
 	user_id: &str,
 ) -> Result<OwnedUserId> {
 	let user_id = parse_local_user_id(services, user_id)?;
-
-	if !services.users.exists(&user_id).await {
-		return Err!("User {user_id:?} does not exist on this server.");
-	}
-
-	if services.users.is_deactivated(&user_id).await? {
-		return Err!("User {user_id:?} is deactivated.");
-	}
+	services.users.status(&user_id).await.ensure_active()?;
 
 	Ok(user_id)
 }

src/api/client/account/mod.rs

@@ -24,7 +24,7 @@
 		power_levels::RoomPowerLevelsEventContent,
 	},
 };
-use service::{mailer::messages, uiaa::Identity, users::HashedPassword};
+use service::{mailer::messages, uiaa::UiaaInitiator, users::HashedPassword};
 
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::{Ruma, router::ClientIdentity};
@@ -49,39 +49,16 @@ pub(crate) async fn get_register_available_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_username_availability::v3::Request>,
 ) -> Result<get_username_availability::v3::Response> {
-	// Validate user id
-	let user_id =
-		match UserId::parse_with_server_name(&body.username, services.globals.server_name()) {
-			| Ok(user_id) => {
-				if let Err(e) = user_id.validate_strict() {
-					return Err!(Request(InvalidUsername(debug_warn!(
-						"Username {} contains disallowed characters or spaces: {e}",
-						body.username
-					))));
-				}
-
-				user_id
-			},
-			| Err(e) => {
-				return Err!(Request(InvalidUsername(debug_warn!(
-					"Username {} is not valid: {e}",
-					body.username
-				))));
-			},
-		};
-
-	// Check if username is creative enough
-	if services.users.exists(&user_id).await {
-		return Err!(Request(UserInUse("User ID is not available.")));
-	}
-
-	if let Some(ClientIdentity::Appservice { appservice_info, .. }) = &body.identity
-		&& !appservice_info.is_user_match(&user_id)
-	{
-		return Err!(Request(Exclusive("Username is not in an appservice namespace.")));
-	} else if services.appservice.is_exclusive_user_id(&user_id).await {
-		return Err!(Request(Exclusive("Username is reserved by an appservice.")));
-	}
+	let _ = services
+		.users
+		.determine_registration_user_id(
+			Some(body.username.clone()),
+			None,
+			body.identity
+				.as_ref()
+				.and_then(ClientIdentity::appservice_info),
+		)
+		.await?;
 
 	Ok(get_username_availability::v3::Response::new(true))
 }
@@ -109,12 +86,7 @@ pub(crate) async fn change_password_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<change_password::v3::Request>,
 ) -> Result<change_password::v3::Response> {
-	let identity = if let Some(user_id) = body
-		.identity
-		.as_ref()
-		.map(ClientIdentity::expect_sender_user)
-		.transpose()?
-	{
+	let identity = if let Some(identity) = body.identity.as_ref() {
 		// A signed-in user is trying to change their password, prompt them for their
 		// existing one
 
@@ -124,7 +96,10 @@ pub(crate) async fn change_password_route(
 				&body.auth,
 				vec![AuthFlow::new(vec![AuthType::Password])],
 				Box::default(),
-				Some(Identity::from_user_id(user_id)),
+				Some(UiaaInitiator::new(
+					identity.expect_sender_user()?,
+					identity.sender_device(),
+				)),
 			)
 			.await?
 	} else {
@@ -153,7 +128,8 @@ pub(crate) async fn change_password_route(
 
 	services
 		.users
-		.set_password(&sender_user, Some(HashedPassword::new(&body.new_password)?));
+		.set_password(&sender_user, HashedPassword::new(&body.new_password)?)
+		.await?;
 
 	if body.logout_devices {
 		// Logout all devices except the current one
@@ -280,16 +256,24 @@ pub(crate) async fn deactivate_route(
 ) -> Result<deactivate::v3::Response> {
 	// Authentication for this endpoint is technically optional,
 	// but we require the user to be logged in
-	let sender_user = body
+	let identity = body
 		.identity
 		.as_ref()
-		.map(ClientIdentity::expect_sender_user)
-		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))??;
+		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))?;
+
+	let sender_user = identity.expect_sender_user()?;
+
+	if !services.config.allow_deactivation {
+		return Err!(Request(Forbidden(
+			"You may not deactivate your own account. Contact your server's administrator for \
+			 assistance."
+		)));
+	}
 
 	// Prompt the user to confirm with their password using UIAA
 	let _ = services
 		.uiaa
-		.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+		.authenticate_password(&body.auth, sender_user, identity.sender_device(), None)
 		.await?;
 
 	// Remove profile pictures and display name

src/api/client/account/register.rs

@@ -1,17 +1,15 @@
-use std::{collections::HashMap, fmt::Write};
+use std::collections::HashMap;
 
 use axum::extract::State;
 use axum_client_ip::ClientIp;
 use conduwuit::{
-	Err, Result, debug_info, error, info,
+	Err, Result, debug_info, info,
 	utils::{self},
-	warn,
 };
 use conduwuit_service::Services;
-use futures::{FutureExt, StreamExt};
+use futures::StreamExt;
 use lettre::{Address, message::Mailbox};
 use ruma::{
-	OwnedUserId, UserId,
 	api::client::{
 		account::{
 			register::{self, LoginType, RegistrationKind},
@@ -20,11 +18,6 @@
 		uiaa::{AuthFlow, AuthType},
 	},
 	assign,
-	events::{
-		GlobalAccountDataEventType, push_rules::PushRulesEvent,
-		room::message::RoomMessageEventContent,
-	},
-	push,
 };
 use serde_json::value::RawValue;
 use service::{mailer::messages, users::HashedPassword};
@@ -32,8 +25,6 @@
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::Ruma;
 
-const RANDOM_USER_ID_LENGTH: usize = 10;
-
 /// # `POST /_matrix/client/v3/register`
 ///
 /// Register an account on this homeserver.
@@ -52,8 +43,6 @@ pub(crate) async fn register_route(
 		return Err!(Request(GuestAccessForbidden("Guests may not register on this server.")));
 	}
 
-	let emergency_mode_enabled = services.config.emergency_password.is_some();
-
 	// Allow registration if it's enabled in the config file or if this is the first
 	// run (so the first user account can be created)
 	let allow_registration =
@@ -71,99 +60,59 @@ pub(crate) async fn register_route(
 		)));
 	}
 
-	let identity = if body.identity.is_some() {
-		// Appservices can skip auth
-		None
+	let user_id = if body.body.login_type == Some(LoginType::ApplicationService) {
+		let Some(appservice_info) = &body.identity else {
+			return Err!(Request(Forbidden(
+				"Only appservices can use the appservice login type."
+			)));
+		};
+
+		let user_id = services
+			.users
+			.determine_registration_user_id(body.username.clone(), None, Some(appservice_info))
+			.await?;
+
+		services.users.create_shadow_account(&user_id).await?;
+
+		user_id
 	} else {
 		// Perform UIAA to determine the user's identity
 		let (flows, params) = create_registration_uiaa_session(&services).await?;
 
-		Some(
-			services
-				.uiaa
-				.authenticate(&body.auth, flows, params, None)
-				.await?,
-		)
-	};
-
-	// If the user didn't supply a username but did supply an email, use
-	// the email's user as their initial localpart to avoid falling back to
-	// a randomly generated localpart
-	let supplied_username = body.username.clone().or_else(|| {
-		if let Some(identity) = &identity
-			&& let Some(email) = &identity.email
-		{
-			Some(email.user().to_owned())
-		} else {
-			None
-		}
-	});
-
-	let user_id =
-		determine_registration_user_id(&services, supplied_username, emergency_mode_enabled)
+		let identity = services
+			.uiaa
+			.authenticate(&body.auth, flows, params, None)
 			.await?;
 
-	if body.body.login_type == Some(LoginType::ApplicationService) {
-		// For appservice logins, make sure that the user ID is in the appservice's
-		// namespace
+		let password = if let Some(password) = &body.password {
+			HashedPassword::new(password)?
+		} else {
+			return Err!(Request(InvalidParam("A password must be provided.")));
+		};
 
-		match body.identity {
-			| Some(ref info) =>
-				if !info.is_user_match(&user_id) && !emergency_mode_enabled {
-					return Err!(Request(Exclusive(
-						"Username is not in an appservice namespace."
-					)));
-				},
-			| _ => {
-				return Err!(Request(MissingToken("Missing appservice token.")));
-			},
-		}
-	} else if services.appservice.is_exclusive_user_id(&user_id).await && !emergency_mode_enabled
-	{
-		// For non-appservice logins, ban user IDs which are in an appservice's
-		// namespace (unless emergency mode is enabled)
-		return Err!(Request(Exclusive("Username is reserved by an appservice.")));
-	}
+		let user_id = services
+			.users
+			.determine_registration_user_id(body.username.clone(), identity.email.as_ref(), None)
+			.await?;
 
-	let password = if body.identity.is_some() {
-		None
-	} else if let Some(password) = body.password.as_deref() {
-		Some(HashedPassword::new(password)?)
-	} else {
-		return Err!(Request(InvalidParam("A password must be provided")));
+		services
+			.users
+			.create_local_account(&user_id, Some(password), identity.email)
+			.await?;
+
+		user_id
 	};
 
-	// Create user
-	services.users.create(&user_id, password).await?;
-
-	// Set an initial display name
-	let mut displayname = user_id.localpart().to_owned();
-
-	// Apply the new user displayname suffix, if it's set
-	if !services.globals.new_user_displayname_suffix().is_empty() && body.identity.is_none() {
-		write!(displayname, " {}", services.server.config.new_user_displayname_suffix)?;
-	}
-
-	services
-		.users
-		.set_displayname(&user_id, Some(displayname.clone()));
-
-	// Initial account data
-	services
-		.account_data
-		.update(
-			None,
-			&user_id,
-			GlobalAccountDataEventType::PushRules.to_string().into(),
-			&serde_json::to_value(PushRulesEvent::new(
-				push::Ruleset::server_default(&user_id).into(),
-			))
-			.expect("should be able to serialize push rules"),
-		)
-		.await?;
-
-	// Generate new device id if the user didn't specify one
 	let (token, device) = if !body.inhibit_login {
+		// If UIAA is disabled, we can't create a device. In that case only appservices
+		// can reach this point in the first place, so we return an error for them.
+		if !services.config.oauth.compatibility_mode().uiaa_available() {
+			return Err!(Request(AppserviceLoginUnsupported(
+				"User-interactive appservice registration is not available on this server."
+			)));
+		}
+
+		// Generate new device id if the user didn't specify one
 		let device_id = body
 			.device_id
 			.clone()
@@ -179,6 +128,7 @@ pub(crate) async fn register_route(
 				&user_id,
 				&device_id,
 				&new_token,
+				None,
 				body.initial_device_display_name.clone(),
 				Some(client.to_string()),
 			)
@@ -189,118 +139,7 @@ pub(crate) async fn register_route(
 		(None, None)
 	};
 
-	debug_info!(%user_id, ?device, "User account was created");
-
-	// If the user registered with an email, associate it with their account.
-	if let Some(identity) = identity
-		&& let Some(email) = identity.email
-	{
-		// This may fail if the email is already in use, but we already check for that
-		// in `/requestToken`, so ignoring the error is acceptable here in the rare case
-		// that an email is sniped by another user between the `/requestToken` request
-		// and the `/register` request.
-		let _ = services
-			.threepid
-			.associate_localpart_email(user_id.localpart(), &email)
-			.await;
-	}
-
-	let device_display_name = body.initial_device_display_name.as_deref().unwrap_or("");
-
-	if body.identity.is_none() {
-		if !device_display_name.is_empty() {
-			let notice = format!(
-				"New user \"{user_id}\" registered on this server from IP {client} and device \
-				 display name \"{device_display_name}\""
-			);
-
-			info!("{notice}");
-			if services.server.config.admin_room_notices {
-				services.admin.notice(&notice).await;
-			}
-		} else {
-			let notice = format!("New user \"{user_id}\" registered on this server.");
-
-			info!("{notice}");
-			if services.server.config.admin_room_notices {
-				services.admin.notice(&notice).await;
-			}
-		}
-	}
-
-	// Make the first user to register an administrator and disable first-run mode.
-	let was_first_user = services.firstrun.empower_first_user(&user_id).await?;
-
-	// If the registering user was not the first and we're suspending users on
-	// register, suspend them.
-	if !was_first_user && services.config.suspend_on_register {
-		// Note that we can still do auto joins for suspended users
-		services
-			.users
-			.suspend_account(&user_id, &services.globals.server_user)
-			.await;
-		// And send an @room notice to the admin room, to prompt admins to review the
-		// new user and ideally unsuspend them if deemed appropriate.
-		if services.server.config.admin_room_notices {
-			services
-				.admin
-				.send_loud_message(RoomMessageEventContent::text_plain(format!(
-					"User {user_id} has been suspended as they are not the first user on this \
-					 server. Please review and unsuspend them if appropriate."
-				)))
-				.await
-				.ok();
-		}
-	}
-
-	if body.identity.is_none() && !services.server.config.auto_join_rooms.is_empty() {
-		for room in &services.server.config.auto_join_rooms {
-			let Ok(room_id) = services.rooms.alias.resolve(room).await else {
-				error!(
-					"Failed to resolve room alias to room ID when attempting to auto join \
-					 {room}, skipping"
-				);
-				continue;
-			};
-
-			if !services
-				.rooms
-				.state_cache
-				.server_in_room(services.globals.server_name(), &room_id)
-				.await
-			{
-				warn!(
-					"Skipping room {room} to automatically join as we have never joined before."
-				);
-				continue;
-			}
-
-			if let Some(room_server_name) = room.server_name() {
-				match services
-					.rooms
-					.membership
-					.join_room(
-						&user_id,
-						&room_id,
-						Some("Automatically joining this room upon registration".to_owned()),
-						&[services.globals.server_name().to_owned(), room_server_name.to_owned()],
-					)
-					.boxed()
-					.await
-				{
-					| Err(e) => {
-						// don't return this error so we don't fail registrations
-						error!(
-							"Failed to automatically join room {room} for user {user_id}: {e}"
-						);
-					},
-					| _ => {
-						info!("Automatically joined room {room} for user {user_id}");
-					},
-				}
-			}
-		}
-	}
+	debug_info!(%user_id, ?device, "New account created via legacy registration");
 
 	Ok(assign!(register::v3::Response::new(user_id), {
 		access_token: token,
@@ -372,21 +211,21 @@ async fn create_registration_uiaa_session(
 
 		// Require all users to agree to the terms and conditions, if configured
 		let terms = &services.config.registration_terms;
-		if !terms.is_empty() {
-			let mut terms =
-				serde_json::to_value(terms.clone()).expect("failed to serialize terms");
+		if !terms.documents.is_empty() {
+			let mut terms_map = HashMap::new();
 
-			// Insert a dummy `version` field
-			for (_, documents) in terms.as_object_mut().unwrap() {
-				let documents = documents.as_object_mut().unwrap();
-
-				documents.insert("version".to_owned(), "latest".into());
+			for (id, document) in &terms.documents {
+				terms_map.insert(id.to_owned(), serde_json::json!({
+					terms.language.clone(): serde_json::to_value(document).expect("should be able to serialize document")
+				}));
 			}
 
+			terms_map.insert("version".to_owned(), "latest".into());
+
 			params.insert(
 				AuthType::Terms.as_str().to_owned(),
 				serde_json::json!({
-					"policies": terms,
+					"policies": terms_map,
 				}),
 			);
 
@@ -419,81 +258,6 @@ async fn create_registration_uiaa_session(
 	Ok((flows, params))
 }
 
-async fn determine_registration_user_id(
-	services: &Services,
-	supplied_username: Option<String>,
-	emergency_mode_enabled: bool,
-) -> Result<OwnedUserId> {
-	if let Some(supplied_username) = supplied_username {
-		// The user gets to pick their username. Do some validation to make sure it's
-		// acceptable.
-
-		// Don't allow registration with forbidden usernames.
-		if services
-			.globals
-			.forbidden_usernames()
-			.is_match(&supplied_username)
-			&& !emergency_mode_enabled
-		{
-			return Err!(Request(Forbidden("Username is forbidden")));
-		}
-
-		// Create and validate the user ID
-		let user_id = match UserId::parse_with_server_name(
-			&supplied_username,
-			services.globals.server_name(),
-		) {
-			| Ok(user_id) => {
-				if let Err(e) = user_id.validate_strict() {
-					// Unless we are in emergency mode, we should follow synapse's behaviour on
-					// not allowing things like spaces and UTF-8 characters in usernames
-					if !emergency_mode_enabled {
-						return Err!(Request(InvalidUsername(debug_warn!(
-							"Username {supplied_username} contains disallowed characters or \
-							 spaces: {e}"
-						))));
-					}
-				}
-
-				// Don't allow registration with user IDs that aren't local
-				if !services.globals.user_is_local(&user_id) {
-					return Err!(Request(InvalidUsername(
-						"Username {supplied_username} is not local to this server"
-					)));
-				}
-
-				user_id
-			},
-			| Err(e) => {
-				return Err!(Request(InvalidUsername(debug_warn!(
-					"Username {supplied_username} is not valid: {e}"
-				))));
-			},
-		};
-
-		if services.users.exists(&user_id).await {
-			return Err!(Request(UserInUse("User ID is not available.")));
-		}
-
-		Ok(user_id)
-	} else {
-		// The user didn't specify a username. Generate a username for
-		// them.
-
-		loop {
-			let user_id = UserId::parse_with_server_name(
-				utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
-				services.globals.server_name(),
-			)
-			.unwrap();
-
-			if !services.users.exists(&user_id).await {
-				break Ok(user_id);
-			}
-		}
-	}
-}
-
 /// # `POST /_matrix/client/v3/register/email/requestToken`
 ///
 /// Requests a validation email for the purpose of registering a new account.

src/api/client/account/threepid.rs

@@ -11,7 +11,7 @@
 	},
 	thirdparty::{Medium, ThirdPartyIdentifierInit},
 };
-use service::{mailer::messages, uiaa::Identity};
+use service::mailer::messages;
 
 use crate::{Ruma, router::ClientIdentity};
 
@@ -124,15 +124,18 @@ pub(crate) async fn add_3pid_route(
 		.uiaa
 		.authenticate_password(
 			&body.auth,
-			Some(Identity::from_user_id(body.identity.expect_sender_user()?)),
+			body.identity.expect_sender_user()?,
+			body.identity.sender_device(),
+			None,
 		)
 		.await?;
 
 	let email = services
 		.threepid
-		.consume_valid_session(&body.sid, &body.client_secret)
+		.get_valid_session(&body.sid, &body.client_secret)
 		.await
-		.map_err(|message| err!(Request(ThreepidAuthFailed("{message}"))))?;
+		.map_err(|message| err!(Request(ThreepidAuthFailed("{message}"))))?
+		.consume();
 
 	services
 		.threepid

src/api/client/admin/lock.rs

@@ -0,0 +1,87 @@
+use axum::extract::State;
+use conduwuit::{Err, Result};
+use futures::future::{join, join3};
+use ruma::api::client::admin::{is_user_locked, lock_user};
+
+use crate::Ruma;
+
+/// # `GET /_matrix/client/v1/admin/lock/{userId}`
+///
+/// Check the account lock status of a target user
+pub(crate) async fn get_lock_status(
+	State(services): State<crate::State>,
+	body: Ruma<is_user_locked::v1::Request>,
+) -> Result<is_user_locked::v1::Response> {
+	let (admin, status) = join(
+		services.users.is_admin(body.identity.expect_sender_user()?),
+		services.users.status(&body.user_id),
+	)
+	.await;
+
+	if !admin {
+		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
+	}
+
+	status.ensure_active()?;
+
+	Ok(is_user_locked::v1::Response::new(
+		services.users.is_locked(&body.user_id).await?,
+	))
+}
+
+/// # `PUT /_matrix/client/v1/admin/lock/{userId}`
+///
+/// Set the account lock status of a target user
+pub(crate) async fn put_lock_status(
+	State(services): State<crate::State>,
+	body: Ruma<lock_user::v1::Request>,
+) -> Result<lock_user::v1::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
+	let (sender_admin, status, target_admin) = join3(
+		services.users.is_admin(sender_user),
+		services.users.status(&body.user_id),
+		services.users.is_admin(&body.user_id),
+	)
+	.await;
+
+	if !sender_admin {
+		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
+	}
+
+	status.ensure_active()?;
+
+	if body.user_id == *sender_user {
+		return Err!(Request(Forbidden("You cannot lock yourself")));
+	}
+
+	if target_admin {
+		return Err!(Request(Forbidden("You cannot lock another server administrator")));
+	}
+
+	if services.users.is_locked(&body.user_id).await? == body.locked {
+		// No change
+		return Ok(lock_user::v1::Response::new(body.locked));
+	}
+
+	let action = if body.locked {
+		services
+			.users
+			.suspend_account(&body.user_id, sender_user)
+			.await;
+		"locked"
+	} else {
+		services.users.unsuspend_account(&body.user_id).await;
+		"unlocked"
+	};
+
+	if services.config.admin_room_notices {
+		// Notify the admin room that an account has been un/suspended
+		services
+			.admin
+			.send_text(&format!("{} has been {} by {}.", body.user_id, action, sender_user))
+			.await;
+	}
+
+	Ok(lock_user::v1::Response::new(body.locked))
+}

src/api/client/admin/mod.rs

@@ -1,3 +1,4 @@
+mod lock;
 mod suspend;
 
-pub(crate) use self::suspend::*;
+pub(crate) use self::{lock::*, suspend::*};

src/api/client/admin/suspend.rs

@@ -1,7 +1,7 @@
 use axum::extract::State;
 use conduwuit::{Err, Result};
 use futures::future::{join, join3};
-use ruminuwuity::admin::{get_suspended, set_suspended};
+use ruma::api::client::admin::{is_user_suspended, suspend_user};
 
 use crate::Ruma;
 
@@ -10,23 +10,21 @@
 /// Check the suspension status of a target user
 pub(crate) async fn get_suspended_status(
 	State(services): State<crate::State>,
-	body: Ruma<get_suspended::v1::Request>,
-) -> Result<get_suspended::v1::Response> {
-	let (admin, active) = join(
+	body: Ruma<is_user_suspended::v1::Request>,
+) -> Result<is_user_suspended::v1::Response> {
+	let (admin, status) = join(
 		services.users.is_admin(body.identity.expect_sender_user()?),
-		services.users.is_active(&body.user_id),
+		services.users.status(&body.user_id),
 	)
 	.await;
+
 	if !admin {
 		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
 	}
-	if !services.globals.user_is_local(&body.user_id) {
-		return Err!(Request(InvalidParam("Can only check the suspended status of local users")));
-	}
-	if !active {
-		return Err!(Request(NotFound("Unknown user")));
-	}
-	Ok(get_suspended::v1::Response::new(
+
+	status.ensure_active()?;
+
+	Ok(is_user_suspended::v1::Response::new(
 		services.users.is_suspended(&body.user_id).await?,
 	))
 }
@@ -36,13 +34,13 @@ pub(crate) async fn get_suspended_status(
 /// Set the suspension status of a target user
 pub(crate) async fn put_suspended_status(
 	State(services): State<crate::State>,
-	body: Ruma<set_suspended::v1::Request>,
-) -> Result<set_suspended::v1::Response> {
+	body: Ruma<suspend_user::v1::Request>,
+) -> Result<suspend_user::v1::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
 
-	let (sender_admin, active, target_admin) = join3(
+	let (sender_admin, status, target_admin) = join3(
 		services.users.is_admin(sender_user),
-		services.users.is_active(&body.user_id),
+		services.users.status(&body.user_id),
 		services.users.is_admin(&body.user_id),
 	)
 	.await;
@@ -50,21 +48,20 @@ pub(crate) async fn put_suspended_status(
 	if !sender_admin {
 		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
 	}
-	if !services.globals.user_is_local(&body.user_id) {
-		return Err!(Request(InvalidParam("Can only set the suspended status of local users")));
-	}
-	if !active {
-		return Err!(Request(NotFound("Unknown user")));
-	}
+
+	status.ensure_active()?;
+
 	if body.user_id == *sender_user {
 		return Err!(Request(Forbidden("You cannot suspend yourself")));
 	}
+
 	if target_admin {
 		return Err!(Request(Forbidden("You cannot suspend another server administrator")));
 	}
+
 	if services.users.is_suspended(&body.user_id).await? == body.suspended {
 		// No change
-		return Ok(set_suspended::v1::Response::new(body.suspended));
+		return Ok(suspend_user::v1::Response::new(body.suspended));
 	}
 
 	let action = if body.suspended {
@@ -86,5 +83,5 @@ pub(crate) async fn put_suspended_status(
 			.await;
 	}
 
-	Ok(set_suspended::v1::Response::new(body.suspended))
+	Ok(suspend_user::v1::Response::new(body.suspended))
 }

src/api/client/capabilities.rs

@@ -7,12 +7,12 @@
 	api::client::discovery::get_capabilities::{
 		self,
 		v3::{
-			Capabilities, GetLoginTokenCapability, RoomVersionStability, RoomVersionsCapability,
-			ThirdPartyIdChangesCapability,
+			Capabilities, GetLoginTokenCapability, ProfileFieldsCapability, RoomVersionStability,
+			RoomVersionsCapability, ThirdPartyIdChangesCapability,
 		},
 	},
+	assign,
 };
-use serde_json::json;
 
 use crate::Ruma;
 
@@ -40,22 +40,20 @@ pub(crate) async fn get_capabilities_route(
 	capabilities.get_login_token =
 		GetLoginTokenCapability::new(services.server.config.login_via_existing_session);
 
-	// MSC4133 capability
-	capabilities.set("uk.tcpip.msc4133.profile_fields", json!({"enabled": true}))?;
-
-	capabilities.set(
-		"org.matrix.msc4267.forget_forced_upon_leave",
-		json!({"enabled": services.config.forget_forced_upon_leave}),
-	)?;
+	capabilities.forget_forced_upon_leave.enabled = true;
 
 	if services
 		.users
 		.is_admin(body.identity.expect_sender_user()?)
 		.await
 	{
-		// Advertise suspension API
-		capabilities.set("uk.timedout.msc4323", json!({"suspend": true, "lock": false}))?;
+		capabilities.account_moderation.lock = true;
+		capabilities.account_moderation.suspend = true;
 	}
 
+	capabilities.profile_fields = Some(
+		assign!(ProfileFieldsCapability::new(true), { disallowed: Some(services.oidc.restricted_profile_fields()) }),
+	);
+
 	Ok(get_capabilities::v3::Response::new(capabilities))
 }

src/api/client/device.rs

@@ -8,7 +8,6 @@
 		self, delete_device, delete_devices, get_device, get_devices, update_device,
 	},
 };
-use service::uiaa::Identity;
 
 use crate::{Ruma, client::DEVICE_ID_LENGTH};
 
@@ -95,6 +94,7 @@ pub(crate) async fn update_device_route(
 					&device_id,
 					&appservice.registration.as_token,
 					None,
+					None,
 					Some(client.to_string()),
 				)
 				.await?;
@@ -119,14 +119,15 @@ pub(crate) async fn delete_device_route(
 	body: Ruma<delete_device::v3::Request>,
 ) -> Result<delete_device::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
-	let appservice = body.identity.appservice_info();
 
 	// Appservices get to skip UIAA for this endpoint
-	if appservice.is_none() {
+	if !body.identity.is_appservice() {
+		let sender_device = body.identity.expect_sender_device()?;
+
 		// Prompt the user to confirm with their password using UIAA
 		let _ = services
 			.uiaa
-			.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+			.authenticate_password(&body.auth, sender_user, Some(sender_device), None)
 			.await?;
 	}
 
@@ -155,14 +156,13 @@ pub(crate) async fn delete_devices_route(
 	body: Ruma<delete_devices::v3::Request>,
 ) -> Result<delete_devices::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
-	let appservice = body.identity.appservice_info();
 
 	// Appservices get to skip UIAA for this endpoint
-	if appservice.is_none() {
+	if let Some(sender_device) = body.identity.sender_device() {
 		// Prompt the user to confirm with their password using UIAA
 		let _ = services
 			.uiaa
-			.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+			.authenticate_password(&body.auth, sender_user, Some(sender_device), None)
 			.await?;
 	}
 

src/api/client/keys.rs

@@ -26,7 +26,7 @@
 	serde::Raw,
 };
 use serde_json::json;
-use service::uiaa::Identity;
+use service::oauth::OAuthTicket;
 
 use crate::Ruma;
 
@@ -197,6 +197,7 @@ pub(crate) async fn upload_signing_keys_route(
 	if uiaa_needed_to_upload_keys(
 		services,
 		sender_user,
+		body.identity.is_appservice(),
 		body.self_signing_key.as_ref(),
 		body.user_signing_key.as_ref(),
 		body.master_key.as_ref(),
@@ -205,7 +206,12 @@ pub(crate) async fn upload_signing_keys_route(
 	{
 		let _ = services
 			.uiaa
-			.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+			.authenticate_password(
+				&body.auth,
+				sender_user,
+				body.identity.sender_device(),
+				Some(OAuthTicket::CrossSigningReset),
+			)
 			.await?;
 	}
 
@@ -226,10 +232,16 @@ pub(crate) async fn upload_signing_keys_route(
 async fn uiaa_needed_to_upload_keys(
 	services: crate::State,
 	user_id: &UserId,
+	is_appservice: bool,
 	self_signing_key: Option<&Raw<CrossSigningKey>>,
 	user_signing_key: Option<&Raw<CrossSigningKey>>,
 	master_signing_key: Option<&Raw<CrossSigningKey>>,
 ) -> bool {
+	if is_appservice {
+		// Appservices can skip UIAA for this endpoint
+		return false;
+	}
+
 	let (self_signing_key, user_signing_key, master_signing_key) = (
 		self_signing_key.map(Raw::deserialize).flat_ok(),
 		user_signing_key.map(Raw::deserialize).flat_ok(),

src/api/client/message.rs

@@ -291,7 +291,9 @@ pub(crate) async fn is_ignored_pdu<Pdu>(
 {
 	// exclude Synapse's dummy events from bloating up response bodies. clients
 	// don't need to see this.
-	if event.kind().to_string() == "org.matrix.dummy_event" {
+	if !services.config.send_dummy_events_to_clients
+		&& event.kind().to_string() == "org.matrix.dummy_event"
+	{
 		return Ok(true);
 	}
 

src/api/client/mod.rs

@@ -16,6 +16,7 @@
 pub(super) mod membership;
 pub(super) mod message;
 pub(super) mod mutual_rooms;
+pub(super) mod oauth;
 pub(super) mod openid;
 pub(super) mod presence;
 pub(super) mod profile;
@@ -61,6 +62,7 @@
 pub use membership::{leave_all_rooms, leave_room, remote_leave_room};
 pub(super) use message::*;
 pub(super) use mutual_rooms::*;
+pub(super) use oauth::*;
 pub(super) use openid::*;
 pub(super) use presence::*;
 pub(super) use profile::*;
@@ -73,6 +75,7 @@
 pub(super) use room::*;
 pub(super) use search::*;
 pub(super) use send::*;
+pub use session::handle_login;
 pub(super) use session::*;
 pub(super) use space::*;
 pub(super) use state::*;

src/api/client/oauth/mod.rs

@@ -0,0 +1,56 @@
+use axum::{
+	Json, Router,
+	extract::{Request, State},
+	middleware::{self, Next},
+	response::{IntoResponse, Response},
+	routing::method_routing::{get, post},
+};
+use const_str::concat;
+use http::StatusCode;
+use serde_json::json;
+pub(crate) use server_metadata::*;
+
+mod register_client;
+mod server_metadata;
+mod token;
+
+const BASE_PATH: &str = concat!(conduwuit_core::ROUTE_PREFIX, "/oauth2/");
+const AUTH_CODE_PATH: &str = "grant/authorization_code";
+const JWKS_URI_PATH: &str = "client/keys.json";
+const CLIENT_REGISTER_PATH: &str = "client/register";
+const TOKEN_REVOKE_PATH: &str = "client/revoke";
+const TOKEN_PATH: &str = "grant/token";
+const ACCOUNT_MANAGEMENT_PATH: &str = concat!(conduwuit_core::ROUTE_PREFIX, "/account/deeplink");
+
+pub(crate) fn router(state: crate::State) -> Router<crate::State> {
+	Router::new()
+		.nest(BASE_PATH, oauth_router())
+		.route(
+			"/.well-known/openid-configuration",
+			get(
+				// TODO(unspecced): used by old versions of the matrix-js-sdk
+				async |State(services): State<crate::State>| {
+					Json(authorization_server_metadata(&services).await)
+				},
+			),
+		)
+		.layer(middleware::from_fn_with_state(
+			state,
+			async |State(state): State<crate::State>, request: Request, next: Next| -> Response {
+				if state.config.oauth.compatibility_mode().oauth_available() {
+					next.run(request).await
+				} else {
+					(StatusCode::NOT_FOUND, "OAuth is unavailable on this server").into_response()
+				}
+			},
+		))
+}
+
+fn oauth_router() -> Router<crate::State> {
+	Router::new()
+		.route(concat!("/", CLIENT_REGISTER_PATH), post(register_client::register_client_route))
+		// TODO(unspecced): used by old versions of the matrix-js-sdk
+		.route(concat!("/", JWKS_URI_PATH), get(async || Json(json!({"keys": []}))))
+		.route(concat!("/", TOKEN_PATH), post(token::token_route))
+		.route(concat!("/", TOKEN_REVOKE_PATH), post(token::revoke_token_route))
+}

src/api/client/oauth/register_client.rs

@@ -0,0 +1,28 @@
+use axum::{
+	Json,
+	extract::State,
+	response::{IntoResponse, Response},
+};
+use http::StatusCode;
+use serde::Serialize;
+use service::oauth::client_metadata::ClientMetadata;
+
+#[derive(Serialize)]
+struct RegisteredClient {
+	client_id: String,
+	#[serde(flatten)]
+	metadata: ClientMetadata,
+}
+
+pub(crate) async fn register_client_route(
+	State(services): State<crate::State>,
+	Json(metadata): Json<ClientMetadata>,
+) -> Result<Response, Response> {
+	let client_id = services
+		.oauth
+		.register_client(&metadata)
+		.await
+		.map_err(|err| (StatusCode::BAD_REQUEST, Json(err)).into_response())?;
+
+	Ok(Json(RegisteredClient { client_id, metadata }).into_response())
+}

src/api/client/oauth/server_metadata.rs

@@ -0,0 +1,62 @@
+use axum::extract::State;
+use conduwuit::{Err, Result};
+use ruma::{
+	api::client::discovery::get_authorization_server_metadata::{
+		self, v1::AccountManagementAction,
+	},
+	serde::Raw,
+};
+use serde_json::{Value, json};
+use service::Services;
+
+use crate::{
+	Ruma,
+	client::oauth::{
+		ACCOUNT_MANAGEMENT_PATH, AUTH_CODE_PATH, CLIENT_REGISTER_PATH, JWKS_URI_PATH, TOKEN_PATH,
+		TOKEN_REVOKE_PATH,
+	},
+};
+
+pub(crate) async fn get_authorization_server_metadata_route(
+	State(services): State<crate::State>,
+	_body: Ruma<get_authorization_server_metadata::v1::Request>,
+) -> Result<get_authorization_server_metadata::v1::Response> {
+	if !services.config.oauth.compatibility_mode().oauth_available() {
+		return Err!(Request(Unrecognized("OAuth is unavailable on this server")));
+	}
+
+	let metadata = Raw::new(&authorization_server_metadata(&services).await).unwrap();
+
+	Ok(get_authorization_server_metadata::v1::Response::new(metadata.cast_unchecked()))
+}
+
+pub(crate) async fn authorization_server_metadata(services: &Services) -> Value {
+	let endpoint_base = services
+		.config
+		.get_client_domain()
+		.join(super::BASE_PATH)
+		.unwrap();
+
+	json!({
+		"account_management_uri": endpoint_base.join(ACCOUNT_MANAGEMENT_PATH).unwrap(),
+		"account_management_actions_supported": [
+			AccountManagementAction::AccountDeactivate,
+			AccountManagementAction::CrossSigningReset,
+			AccountManagementAction::DeviceDelete,
+			AccountManagementAction::DeviceView,
+			AccountManagementAction::DevicesList,
+			AccountManagementAction::Profile,
+		],
+		"authorization_endpoint": endpoint_base.join(AUTH_CODE_PATH).unwrap(),
+		"code_challenge_methods_supported": ["S256"],
+		"grant_types_supported": ["authorization_code", "refresh_token"],
+		"issuer": services.config.get_client_domain(),
+		"jwks_uri": endpoint_base.join(JWKS_URI_PATH).unwrap(),
+		"prompt_values_supported": ["create"],
+		"registration_endpoint": endpoint_base.join(CLIENT_REGISTER_PATH).unwrap(),
+		"response_modes_supported": ["query", "fragment"],
+		"response_types_supported": ["code"],
+		"revocation_endpoint": endpoint_base.join(TOKEN_REVOKE_PATH).unwrap(),
+		"token_endpoint": endpoint_base.join(TOKEN_PATH).unwrap(),
+	})
+}

src/api/client/oauth/token.rs

@@ -0,0 +1,23 @@
+use axum::{Form, Json, extract::State, response::IntoResponse};
+use http::StatusCode;
+use service::oauth::grant::{RevokeTokenRequest, TokenRequest};
+
+pub(crate) async fn token_route(
+	State(services): State<crate::State>,
+	Form(request): Form<TokenRequest>,
+) -> impl IntoResponse {
+	match services.oauth.issue_token(request).await {
+		| Ok(response) => Ok(Json(response)),
+		| Err(err) => Err((StatusCode::BAD_REQUEST, Json(err))),
+	}
+}
+
+pub(crate) async fn revoke_token_route(
+	State(services): State<crate::State>,
+	Form(request): Form<RevokeTokenRequest>,
+) -> impl IntoResponse {
+	match services.oauth.revoke_token(request.token).await {
+		| Ok(()) => Ok(StatusCode::OK),
+		| Err(err) => Err((StatusCode::BAD_REQUEST, Json(err))),
+	}
+}

src/api/client/profile.rs

@@ -1,9 +1,8 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Err, Result, matrix::pdu::PartialPdu, utils::to_canonical_object};
+use conduwuit::{Err, Result};
 use conduwuit_service::Services;
-use futures::StreamExt;
 use ruma::{
 	UserId,
 	api::{
@@ -13,11 +12,10 @@
 		federation,
 	},
 	assign,
-	events::room::member::MembershipState,
-	presence::PresenceState,
 	profile::{ProfileFieldName, ProfileFieldValue},
 };
-use serde_json::{Value, to_value};
+use serde_json::Value;
+use service::users::ProfileFieldChange;
 
 use crate::Ruma;
 
@@ -65,13 +63,24 @@ pub(crate) async fn set_profile_field_route(
 		return Err!(Request(InvalidParam("You may not change a remote user's profile data.")));
 	}
 
-	set_profile_field(
-		&services,
-		&body.user_id,
-		ProfileFieldChange::Set(body.value.clone()),
-		body.propagate_to.clone(),
-	)
-	.await?;
+	if services
+		.oidc
+		.restricted_profile_fields()
+		.contains(&body.value.field_name())
+	{
+		return Err!(Request(Forbidden(
+			"This profile field is controlled by your identity provider."
+		)));
+	}
+
+	services
+		.users
+		.set_profile_field(
+			&body.user_id,
+			ProfileFieldChange::Set(body.value.clone()),
+			body.propagate_to.clone(),
+		)
+		.await?;
 
 	Ok(set_profile_field::v3::Response::new())
 }
@@ -94,13 +103,24 @@ pub(crate) async fn delete_profile_field_route(
 		return Err!(Request(InvalidParam("You may not change a remote user's profile data.")));
 	}
 
-	set_profile_field(
-		&services,
-		&body.user_id,
-		ProfileFieldChange::Delete(body.field.clone()),
-		body.propagate_to.clone(),
-	)
-	.await?;
+	if services
+		.oidc
+		.restricted_profile_fields()
+		.contains(&body.field)
+	{
+		return Err!(Request(Forbidden(
+			"This profile field is controlled by your identity provider."
+		)));
+	}
+
+	services
+		.users
+		.set_profile_field(
+			&body.user_id,
+			ProfileFieldChange::Delete(body.field.clone()),
+			body.propagate_to.clone(),
+		)
+		.await?;
 
 	Ok(delete_profile_field::v3::Response::new())
 }
@@ -110,8 +130,8 @@ async fn fetch_full_profile(
 	user_id: &UserId,
 ) -> Option<BTreeMap<String, Value>> {
 	// If the user exists locally, fetch their local profile
-	if services.users.exists(user_id).await {
-		return Some(get_local_profile(services, user_id).await);
+	if services.users.status(user_id).await.is_found() {
+		return Some(services.users.get_local_profile(user_id).await);
 	}
 
 	// Otherwise ask their homeserver
@@ -135,13 +155,10 @@ async fn fetch_full_profile(
 			continue;
 		};
 
-		let _ = set_profile_field(
-			services,
-			user_id,
-			ProfileFieldChange::Set(value),
-			PropagateTo::None,
-		)
-		.await;
+		let _ = services
+			.users
+			.set_profile_field(user_id, ProfileFieldChange::Set(value), PropagateTo::None)
+			.await;
 	}
 
 	Some(BTreeMap::from_iter(response))
@@ -154,7 +171,7 @@ async fn fetch_profile_field(
 ) -> Result<Option<ProfileFieldValue>> {
 	// If the user exists locally, fetch their local profile field
 	if services.globals.user_is_local(user_id) {
-		return Ok(get_local_profile_field(services, user_id, field).await);
+		return Ok(services.users.get_local_profile_field(user_id, field).await);
 	}
 
 	// Otherwise ask their homeserver
@@ -175,13 +192,14 @@ async fn fetch_profile_field(
 
 	if let Some(value) = response.get(field.as_str()).map(ToOwned::to_owned) {
 		if let Ok(value) = ProfileFieldValue::new(field.as_str(), value) {
-			let _ = set_profile_field(
-				services,
-				user_id,
-				ProfileFieldChange::Set(value.clone()),
-				PropagateTo::None,
-			)
-			.await;
+			let _ = services
+				.users
+				.set_profile_field(
+					user_id,
+					ProfileFieldChange::Set(value.clone()),
+					PropagateTo::None,
+				)
+				.await;
 
 			Ok(Some(value))
 		} else {
@@ -190,260 +208,11 @@ async fn fetch_profile_field(
 			)))
 		}
 	} else {
-		let _ = set_profile_field(
-			services,
-			user_id,
-			ProfileFieldChange::Delete(field),
-			PropagateTo::None,
-		)
-		.await;
+		let _ = services
+			.users
+			.set_profile_field(user_id, ProfileFieldChange::Delete(field), PropagateTo::None)
+			.await;
 
 		Ok(None)
 	}
 }
-
-pub(crate) async fn get_local_profile(
-	services: &Services,
-	user_id: &UserId,
-) -> BTreeMap<String, Value> {
-	let mut profile = BTreeMap::new();
-
-	// Get displayname and avatar_url independently because `all_profile_keys`
-	// doesn't include them
-	for field in [ProfileFieldName::AvatarUrl, ProfileFieldName::DisplayName] {
-		let key = field.as_str().to_owned();
-
-		if let Some(value) = get_local_profile_field(services, user_id, field).await {
-			profile.insert(key, value.value().into_owned());
-		}
-	}
-
-	// Insert all other profile fields
-	let mut all_fields = services.users.all_profile_keys(user_id);
-
-	while let Some((key, value)) = all_fields.next().await {
-		profile.insert(key, value);
-	}
-
-	profile
-}
-
-pub(crate) async fn get_local_profile_field(
-	services: &Services,
-	user_id: &UserId,
-	field: ProfileFieldName,
-) -> Option<ProfileFieldValue> {
-	let value = match field.clone() {
-		| ProfileFieldName::AvatarUrl => services
-			.users
-			.avatar_url(user_id)
-			.await
-			.ok()
-			.map(to_value)
-			.transpose()
-			.expect("converting avatar url to value should succeed"),
-		| ProfileFieldName::DisplayName => services
-			.users
-			.displayname(user_id)
-			.await
-			.ok()
-			.map(to_value)
-			.transpose()
-			.expect("converting displayname to value should succeed"),
-		| other => services
-			.users
-			.profile_key(user_id, other.as_str())
-			.await
-			.ok(),
-	}?;
-
-	Some(
-		ProfileFieldValue::new(field.as_str(), value)
-			.expect("local profile field should be valid"),
-	)
-}
-
-enum ProfileFieldChange {
-	Set(ProfileFieldValue),
-	Delete(ProfileFieldName),
-}
-
-impl ProfileFieldChange {
-	fn field_name(&self) -> ProfileFieldName {
-		match self {
-			| &Self::Delete(ref name) => name.clone(),
-			| &Self::Set(ref value) => value.field_name(),
-		}
-	}
-
-	fn value(&self) -> Option<Value> {
-		if let Self::Set(value) = self {
-			Some(value.value().into_owned())
-		} else {
-			None
-		}
-	}
-}
-
-async fn set_profile_field(
-	services: &Services,
-	user_id: &UserId,
-	change: ProfileFieldChange,
-	propagate_to: PropagateTo,
-) -> Result<()> {
-	const MAX_KEY_LENGTH_BYTES: usize = 255;
-	const MAX_PROFILE_LENGTH_BYTES: usize = 65536;
-
-	let field_name = change.field_name();
-
-	// TODO: The spec mentions special error codes (M_PROFILE_TOO_LARGE,
-	// M_KEY_TOO_LARGE) for profile field size limits, but they're not in its list
-	// of error codes and Ruma doesn't have them. Should we return those, or is
-	// M_TOO_LARGE okay?
-	if field_name.as_str().len() > MAX_KEY_LENGTH_BYTES {
-		return Err!(Request(TooLarge(
-			"Individual profile keys must not exceed {MAX_KEY_LENGTH_BYTES} bytes in length."
-		)));
-	}
-
-	// Serialize the entire profile as canonical JSON, including the new change,
-	// to check if it exceeds 64 KiB
-	{
-		let mut full_profile = get_local_profile(services, user_id).await;
-
-		match &change {
-			| ProfileFieldChange::Set(value) => {
-				full_profile.insert(
-					value.field_name().as_str().to_owned(),
-					value.value().clone().into_owned(),
-				);
-			},
-			| ProfileFieldChange::Delete(key) => {
-				full_profile.remove(key.as_str());
-			},
-		}
-
-		if let Ok(canonical_profile) = to_canonical_object(full_profile) {
-			if serde_json::to_string(&canonical_profile)
-				.expect("should be able to serialize to string")
-				.len() > MAX_PROFILE_LENGTH_BYTES
-			{
-				return Err!(
-					"Profile data must not exceed {MAX_PROFILE_LENGTH_BYTES} bytes in length."
-				);
-			}
-		} else {
-			return Err!(Request(BadJson("Failed to canonicalize profile.")));
-		}
-	}
-
-	// If the user is local and changed their displayname or avatar_url, update it
-	// in all their joined rooms. This is done before updating their profile data
-	// so we can check the old value of the field if `propagate_to` is `unchanged`.
-	if matches!(field_name, ProfileFieldName::AvatarUrl | ProfileFieldName::DisplayName)
-		&& matches!(propagate_to, PropagateTo::All | PropagateTo::Unchanged)
-		&& services.globals.user_is_local(user_id)
-	{
-		let current_displayname = services.users.displayname(user_id).await.ok();
-		let current_avatar_url = services.users.avatar_url(user_id).await.ok();
-
-		let mut all_joined_rooms = services.rooms.state_cache.rooms_joined(user_id);
-
-		while let Some(room_id) = all_joined_rooms.next().await {
-			// TODO: this clobbers any custom fields on the event content
-			let mut current_membership = services
-				.rooms
-				.state_accessor
-				.get_member(&room_id, user_id)
-				.await
-				.expect("should be able to fetch membership event for joined room");
-
-			assert_eq!(
-				current_membership.membership,
-				MembershipState::Join,
-				"user should be joined"
-			);
-
-			// If `propagate_to` is `unchanged`, and the current value of the field we're
-			// updating was changed from its global value in this room, skip it.
-			if matches!(propagate_to, PropagateTo::Unchanged) {
-				let field_changed_from_global = match field_name {
-					| ProfileFieldName::AvatarUrl =>
-						current_membership.avatar_url.as_ref() != current_avatar_url.as_ref(),
-					| ProfileFieldName::DisplayName =>
-						current_membership.displayname.as_ref() != current_displayname.as_ref(),
-					| _ => unreachable!(),
-				};
-
-				if field_changed_from_global {
-					continue;
-				}
-			}
-
-			let state_lock = services.rooms.state.mutex.lock(room_id.as_str()).await;
-
-			// Preserve keys in accordance with the key copying rules
-			current_membership.reason = None;
-			current_membership.join_authorized_via_users_server = None;
-			match &change {
-				| ProfileFieldChange::Set(ProfileFieldValue::AvatarUrl(avatar_url)) => {
-					current_membership.avatar_url = Some(avatar_url.clone());
-				},
-				| ProfileFieldChange::Set(ProfileFieldValue::DisplayName(displayname)) => {
-					current_membership.displayname = Some(displayname.clone());
-				},
-				| ProfileFieldChange::Delete(ProfileFieldName::AvatarUrl) => {
-					current_membership.avatar_url = None;
-				},
-				| ProfileFieldChange::Delete(ProfileFieldName::DisplayName) => {
-					current_membership.displayname = None;
-				},
-				| _ => unreachable!(),
-			}
-
-			let _ = services
-				.rooms
-				.timeline
-				.build_and_append_pdu(
-					PartialPdu::state(user_id.to_string(), &current_membership),
-					user_id,
-					Some(&room_id),
-					&state_lock,
-				)
-				.await;
-		}
-
-		if services.config.allow_local_presence {
-			// Send a presence EDU to indicate the profile changed
-			let _ = services
-				.presence
-				.ping_presence(user_id, &PresenceState::Online)
-				.await;
-		}
-	}
-
-	match change {
-		| ProfileFieldChange::Set(ProfileFieldValue::DisplayName(displayname)) => {
-			services
-				.users
-				.set_displayname(user_id, Some(displayname).filter(|dn| !dn.is_empty()));
-		},
-		| ProfileFieldChange::Set(ProfileFieldValue::AvatarUrl(avatar_url)) => {
-			services
-				.users
-				.set_avatar_url(user_id, Some(avatar_url).filter(|av| av.is_valid()));
-		},
-		| ProfileFieldChange::Delete(ProfileFieldName::DisplayName) => {
-			services.users.set_displayname(user_id, None);
-		},
-		| ProfileFieldChange::Delete(ProfileFieldName::AvatarUrl) => {
-			services.users.set_avatar_url(user_id, None);
-		},
-		| other =>
-			services
-				.users
-				.set_profile_key(user_id, other.field_name().as_str(), other.value()),
-	}
-
-	Ok(())
-}

src/api/client/report.rs

@@ -149,7 +149,7 @@ pub(crate) async fn report_user_route(
 
 	delay_response().await;
 
-	if !services.users.is_active_local(&body.user_id).await {
+	if !services.users.status(&body.user_id).await.is_found() {
 		// return 200 as to not reveal if the user exists. Recommended by spec.
 		return Ok(report_user::v3::Response::new());
 	}

src/api/client/session.rs

@@ -21,7 +21,7 @@
 			},
 			login::{
 				self,
-				v3::{DiscoveryInfo, HomeserverInfo},
+				v3::{DiscoveryInfo, HomeserverInfo, LoginInfo},
 			},
 			logout, logout_all,
 		},
@@ -29,7 +29,6 @@
 	},
 	assign,
 };
-use service::uiaa::Identity;
 
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::Ruma;
@@ -44,6 +43,12 @@ pub(crate) async fn get_login_types_route(
 	ClientIp(client): ClientIp,
 	_body: Ruma<get_login_types::v3::Request>,
 ) -> Result<get_login_types::v3::Response> {
+	if !services.config.oauth.compatibility_mode().uiaa_available() {
+		return Err!(Request(Unrecognized(
+			"User-interactive authentication is not available on this server."
+		)));
+	}
+
 	Ok(get_login_types::v3::Response::new(vec![
 		get_login_types::v3::LoginType::Password(PasswordLoginType::default()),
 		get_login_types::v3::LoginType::ApplicationService(ApplicationServiceLoginType::default()),
@@ -53,7 +58,7 @@ pub(crate) async fn get_login_types_route(
 	]))
 }
 
-pub(crate) async fn handle_login(
+pub async fn handle_login(
 	services: &Services,
 	identifier: Option<&UserIdentifier>,
 	password: &str,
@@ -83,10 +88,6 @@ pub(crate) async fn handle_login(
 		UserId::parse_with_server_name(user_id_or_localpart, &services.config.server_name)
 			.map_err(|_| err!(Request(InvalidUsername("User ID is malformed"))))?;
 
-	if !services.globals.user_is_local(&user_id) {
-		return Err!(Request(InvalidParam("User ID does not belong to this homeserver")));
-	}
-
 	if services.users.is_locked(&user_id).await? {
 		return Err!(Request(UserLocked("This account has been locked.")));
 	}
@@ -119,19 +120,29 @@ pub(crate) async fn login_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<login::v3::Request>,
 ) -> Result<login::v3::Response> {
+	if !services.config.oauth.compatibility_mode().uiaa_available() {
+		return match body.login_info {
+			| LoginInfo::ApplicationService(_) => {
+				Err!(Request(AppserviceLoginUnsupported(
+					"User-interactive appservice login is not available on this server."
+				)))
+			},
+			| _ => {
+				Err!(Request(Unrecognized(
+					"User-interactive authentication is not available on this server."
+				)))
+			},
+		};
+	}
+
 	let emergency_mode_enabled = services.config.emergency_password.is_some();
 
 	// Validate login method
-	// TODO: Other login methods
 	let user_id = match &body.login_info {
 		#[allow(deprecated)]
-		| login::v3::LoginInfo::Password(login::v3::Password {
-			identifier,
-			password,
-			user,
-			..
-		}) => handle_login(&services, identifier.as_ref(), password, user.as_ref()).await?,
-		| login::v3::LoginInfo::Token(login::v3::Token { token, .. }) => {
+		| LoginInfo::Password(login::v3::Password { identifier, password, user, .. }) =>
+			handle_login(&services, identifier.as_ref(), password, user.as_ref()).await?,
+		| LoginInfo::Token(login::v3::Token { token, .. }) => {
 			debug!("Got token login type");
 			if !services.server.config.login_via_existing_session {
 				return Err!(Request(Unknown("Token login is not enabled.")));
@@ -139,7 +150,7 @@ pub(crate) async fn login_route(
 			services.users.find_from_login_token(token).await?
 		},
 		#[allow(deprecated)]
-		| login::v3::LoginInfo::ApplicationService(login::v3::ApplicationService {
+		| LoginInfo::ApplicationService(login::v3::ApplicationService {
 			identifier,
 			user,
 			..
@@ -173,7 +184,6 @@ pub(crate) async fn login_route(
 			user_id
 		},
 		| _ => {
-			debug!("/login json_body: {:?}", &body.json_body);
 			return Err!(Request(Unknown(
 				debug_warn!(?body.login_info, "Invalid or unsupported login type")
 			)));
@@ -203,7 +213,7 @@ pub(crate) async fn login_route(
 	if device_exists {
 		services
 			.users
-			.set_token(&user_id, &device_id, &token)
+			.set_token(&user_id, &device_id, &token, None)
 			.await?;
 	} else {
 		services
@@ -212,6 +222,7 @@ pub(crate) async fn login_route(
 				&user_id,
 				&device_id,
 				&token,
+				None,
 				body.initial_device_display_name.clone(),
 				Some(client.to_string()),
 			)
@@ -250,7 +261,7 @@ pub(crate) async fn login_token_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_login_token::v1::Request>,
 ) -> Result<get_login_token::v1::Response> {
-	if !services.server.config.login_via_existing_session {
+	if !services.config.login_via_existing_session {
 		return Err!(Request(Forbidden("Login via an existing session is not enabled")));
 	}
 
@@ -259,7 +270,7 @@ pub(crate) async fn login_token_route(
 	// Prompt the user to confirm with their password using UIAA
 	let _ = services
 		.uiaa
-		.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+		.authenticate_password(&body.auth, sender_user, body.identity.sender_device(), None)
 		.await?;
 
 	let login_token = utils::random_string(TOKEN_LENGTH);

src/api/client/sync/v5.rs

@@ -70,7 +70,6 @@ pub(crate) async fn sync_events_v5_route(
 	ClientIp(client_ip): ClientIp,
 	body: Ruma<sync_events::v5::Request>,
 ) -> Result<sync_events::v5::Response> {
-	debug_assert!(DEFAULT_BUMP_TYPES.is_sorted(), "DEFAULT_BUMP_TYPES is not sorted");
 	let sender_user = body.identity.expect_sender_user()?;
 	let sender_device = body.identity.expect_sender_device()?;
 

src/api/client/unversioned.rs

@@ -35,8 +35,8 @@ pub(crate) async fn get_supported_versions_route(
 /// `/_matrix/federation/v1/version`
 pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
 	Ok(Json(serde_json::json!({
-		"name": conduwuit::version::name(),
-		"version": conduwuit::version::version(),
+		"name": conduwuit::BRANDING,
+		"version": conduwuit::version(),
 	})))
 }
 

src/api/client/user_directory.rs

@@ -32,22 +32,26 @@ pub(crate) async fn search_users_route(
 		.min(LIMIT_MAX);
 
 	let search_term = body.search_term.to_lowercase();
-	let mut users = services.users.stream().broad_filter_map(async |user_id| {
-		let display_name = services.users.displayname(&user_id).await.ok();
 
-		let user_id_matches = user_id.as_str().to_lowercase().contains(&search_term);
+	let mut users = services
+		.users
+		.stream_local_users()
+		.chain(services.users.stream_remote_users())
+		.broad_filter_map(async |user_id| {
+			let display_name = services.users.displayname(&user_id).await.ok();
 
-		let display_name_matches = display_name
-			.as_deref()
-			.map(str::to_lowercase)
-			.is_some_and(|display_name| display_name.contains(&search_term));
+			let user_id_matches = user_id.as_str().to_lowercase().contains(&search_term);
 
-		if !user_id_matches && !display_name_matches {
-			return None;
-		}
+			let display_name_matches = display_name
+				.as_deref()
+				.map(str::to_lowercase)
+				.is_some_and(|display_name| display_name.contains(&search_term));
 
-		let user_in_public_room =
-			services
+			if !user_id_matches && !display_name_matches {
+				return None;
+			}
+
+			let user_in_public_room = services
 				.rooms
 				.state_cache
 				.rooms_joined(&user_id)
@@ -60,22 +64,22 @@ pub(crate) async fn search_users_route(
 						.await
 				});
 
-		let user_sees_user = services
-			.rooms
-			.state_cache
-			.user_sees_user(sender_user, &user_id);
+			let user_sees_user = services
+				.rooms
+				.state_cache
+				.user_sees_user(sender_user, &user_id);
 
-		pin_mut!(user_in_public_room, user_sees_user);
+			pin_mut!(user_in_public_room, user_sees_user);
 
-		if user_in_public_room.or(user_sees_user).await {
-			Some(assign!(search_users::v3::User::new(user_id.clone()), {
-				display_name,
-				avatar_url: services.users.avatar_url(&user_id).await.ok(),
-			}))
-		} else {
-			None
-		}
-	});
+			if user_in_public_room.or(user_sees_user).await {
+				Some(assign!(search_users::v3::User::new(user_id.clone()), {
+					display_name,
+					avatar_url: services.users.avatar_url(&user_id).await.ok(),
+				}))
+			} else {
+				None
+			}
+		});
 
 	let results = users.by_ref().take(limit).collect().await;
 	let limited = users.next().await.is_some();

src/api/client/well_known.rs

@@ -3,8 +3,7 @@
 use ruma::{
 	api::client::discovery::{
 		discover_homeserver::{self, HomeserverInfo},
-		discover_policy_server,
-		discover_support::{self, Contact, ContactRole},
+		discover_policy_server, discover_support,
 	},
 	assign,
 };
@@ -67,46 +66,7 @@ pub(crate) async fn well_known_support(
 		.as_ref()
 		.map(ToString::to_string);
 
-	let email_address = services.config.well_known.support_email.clone();
-	let matrix_id = services.config.well_known.support_mxid.clone();
-	let pgp_key = services.config.well_known.support_pgp_key.clone();
-
-	// TODO: support defining multiple contacts in the config
-	let mut contacts: Vec<Contact> = vec![];
-
-	let role = services
-		.config
-		.well_known
-		.support_role
-		.clone()
-		.unwrap_or(ContactRole::Admin);
-
-	// Add configured contact if at least one contact method is specified
-	let configured_contact = match (matrix_id, email_address) {
-		| (Some(matrix_id), email_address) =>
-			Some(assign!(Contact::with_matrix_id(role, matrix_id), { email_address })),
-		| (None, Some(email_address)) => Some(Contact::with_email_address(role, email_address)),
-		| (None, None) => None,
-	};
-
-	if let Some(mut configured_contact) = configured_contact {
-		configured_contact.pgp_key = pgp_key;
-
-		contacts.push(configured_contact);
-	}
-
-	// Try to add admin users as contacts if no contacts are configured
-	if contacts.is_empty() {
-		let admin_users = services.admin.get_admins().await;
-
-		for user_id in &admin_users {
-			if *user_id == services.globals.server_user {
-				continue;
-			}
-
-			contacts.push(Contact::with_matrix_id(ContactRole::Admin, user_id.to_owned()));
-		}
-	}
+	let contacts = services.admin.get_support_contacts().await;
 
 	if contacts.is_empty() && support_page.is_none() {
 		// No admin room, no configured contacts, and no support page

src/api/mod.rs

@@ -1,4 +1,5 @@
 #![type_length_limit = "16384"] //TODO: reduce me
+#![recursion_limit = "256"] // My Giant Async Function
 #![allow(clippy::toplevel_ref_arg)]
 
 extern crate conduwuit_core as conduwuit;

src/api/router.rs

@@ -10,7 +10,7 @@
 	response::{IntoResponse, Redirect},
 	routing::{any, get, post},
 };
-use conduwuit::{Server, err};
+use conduwuit::err;
 pub(super) use conduwuit_service::state::State;
 use http::{Uri, uri};
 
@@ -18,8 +18,8 @@
 pub(super) use self::{args::Args as Ruma, auth::ClientIdentity, response::RumaResponse};
 use crate::{admin, client, server};
 
-pub fn build(router: Router<State>, server: &Server) -> Router<State> {
-	let config = &server.config;
+pub fn build(router: Router<State>, state: State) -> Router<State> {
+	let config = &state.server.config;
 	let mut router = router
         .ruma_route(&client::appservice_ping)
 		.ruma_route(&client::get_supported_versions_route)
@@ -181,11 +181,15 @@ pub fn build(router: Router<State>, server: &Server) -> Router<State> {
 		.ruma_route(&client::get_room_summary)
 		.ruma_route(&client::get_suspended_status)
 		.ruma_route(&client::put_suspended_status)
+		.ruma_route(&client::get_lock_status)
+		.ruma_route(&client::put_lock_status)
 		.ruma_route(&client::well_known_support)
 		.ruma_route(&client::well_known_client)
 		.ruma_route(&client::well_known_policy_server)
 		.ruma_route(&client::get_rtc_transports)
 		.ruma_route(&client::room_initial_sync_route)
+		.ruma_route(&client::get_authorization_server_metadata_route)
+		.merge(client::oauth::router(state))
 		.route("/_conduwuit/server_version", get(client::conduwuit_server_version))
 		.route("/_continuwuity/server_version", get(client::conduwuit_server_version))
 		.ruma_route(&admin::rooms::ban::ban_room)

src/api/router/auth.rs

@@ -1,6 +1,7 @@
 use std::any::{Any, TypeId};
 
-use conduwuit::{Err, Result, err};
+use conduwuit::{Err, Error, Result, err};
+use http::StatusCode;
 use ruma::{
 	DeviceId, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
 	api::{
@@ -10,12 +11,15 @@
 			AuthScheme, NoAccessToken, NoAuthentication,
 		},
 		client,
+		error::{ErrorKind, UnknownTokenErrorData},
 		federation::authentication::ServerSignatures,
 	},
+	assign,
 };
 use service::{
 	Services,
 	server_keys::{PubKeyMap, PubKeys},
+	users::AccessTokenStatus,
 };
 
 use crate::{router::args::AuthQueryParams, service::appservice::RegistrationInfo};
@@ -162,7 +166,23 @@ async fn verify<B: AsRef<[u8]> + Sync>(
 		query: AuthQueryParams,
 		route: TypeId,
 	) -> Result<Self::Identity> {
-		if let Ok((sender_user, sender_device)) = services.users.find_from_token(&output).await {
+		if output.is_empty() {
+			return Err!(Request(Unauthorized("Missing access token.")));
+		}
+		if let Some((sender_user, sender_device, status)) =
+			services.users.find_from_token(&output).await
+		{
+			// If the token is expired we return a soft logout
+			if matches!(status, AccessTokenStatus::Expired) {
+				return Err(Error::Request(
+					ErrorKind::UnknownToken(
+						assign!(UnknownTokenErrorData::new(), { soft_logout: true }),
+					),
+					"This token has expired".into(),
+					StatusCode::UNAUTHORIZED,
+				));
+			}
+
 			// Locked users can only use /logout and /logout/all
 			if services
 				.users
@@ -173,7 +193,7 @@ async fn verify<B: AsRef<[u8]> + Sync>(
 				if !(route == TypeId::of::<client::session::logout::v3::Request>()
 					|| route == TypeId::of::<client::session::logout_all::v3::Request>())
 				{
-					return Err!(Request(Unauthorized("Your account is locked.")));
+					return Err!(Request(UserLocked("Your account is locked.")));
 				}
 			}
 
@@ -224,7 +244,11 @@ async fn verify<B: AsRef<[u8]> + Sync>(
 				appservice_info: Box::new(appservice_info),
 			})
 		} else {
-			Err!(Request(Unauthorized("Invalid access token.")))
+			Err(Error::Request(
+				ErrorKind::UnknownToken(UnknownTokenErrorData::new()),
+				"Invalid token".into(),
+				StatusCode::UNAUTHORIZED,
+			))
 		}
 	}
 }
@@ -259,6 +283,9 @@ async fn verify<B: AsRef<[u8]> + Sync>(
 		_query: AuthQueryParams,
 		_route: TypeId,
 	) -> Result<Self::Identity> {
+		if output.is_empty() {
+			return Err!(Request(Unauthorized("Missing access token.")));
+		}
 		let Ok(appservice_info) = services.appservice.find_from_token(&output).await else {
 			return Err!(Request(Unauthorized("Invalid appservice token.")));
 		};

src/api/server/backfill.rs

@@ -32,7 +32,7 @@ pub(crate) async fn get_backfill_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 	if !services
 		.rooms

src/api/server/event.rs

@@ -44,7 +44,7 @@ pub(crate) async fn get_event_route(
 		room_id,
 		event_id: Some(&body.event_id),
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if !services

src/api/server/event_auth.rs

@@ -23,7 +23,7 @@ pub(crate) async fn get_event_authorization_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if services

src/api/server/get_missing_events.rs

@@ -4,15 +4,11 @@
 use conduwuit::{Err, Event, Result, debug, info, trace, utils::to_canonical_object, warn};
 use ruma::{OwnedEventId, api::federation::event::get_missing_events};
 use serde_json::{json, value::RawValue};
+use service::rooms::event_handler::GET_MISSING_EVENTS_MAX_BATCH_SIZE;
 
 use super::AccessCheck;
 use crate::Ruma;
 
-/// arbitrary number but synapse's is 20 and we can handle lots of these anyways
-const LIMIT_MAX: usize = 50;
-/// spec says default is 10
-const LIMIT_DEFAULT: usize = 10;
-
 /// # `POST /_matrix/federation/v1/get_missing_events/{roomId}`
 ///
 /// Retrieves events that the sender is missing.
@@ -26,7 +22,7 @@ pub(crate) async fn get_missing_events_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if !services
@@ -45,8 +41,8 @@ pub(crate) async fn get_missing_events_route(
 	let limit = body
 		.limit
 		.try_into()
-		.unwrap_or(LIMIT_DEFAULT)
-		.min(LIMIT_MAX);
+		.unwrap_or(10)
+		.min(GET_MISSING_EVENTS_MAX_BATCH_SIZE);
 
 	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
 

src/api/server/query.rs

@@ -7,10 +7,7 @@
 	api::federation::query::{get_profile_information, get_room_information},
 };
 
-use crate::{
-	Ruma,
-	client::{get_local_profile, get_local_profile_field},
-};
+use crate::Ruma;
 
 /// # `GET /_matrix/federation/v1/query/directory`
 ///
@@ -75,15 +72,19 @@ pub(crate) async fn get_profile_information_route(
 	let response = if let Some(field) = &body.field {
 		let mut response = get_profile_information::v1::Response::new();
 
-		if let Some(value) =
-			get_local_profile_field(&services, &body.user_id, field.to_owned()).await
+		if let Some(value) = services
+			.users
+			.get_local_profile_field(&body.user_id, field.to_owned())
+			.await
 		{
 			response.set(value.field_name().as_str().to_owned(), value.value().into_owned());
 		}
 
 		response
 	} else {
-		get_local_profile(&services, &body.user_id)
+		services
+			.users
+			.get_local_profile(&body.user_id)
 			.await
 			.into_iter()
 			.collect()

src/api/server/send.rs

@@ -1,5 +1,5 @@
 use std::{
-	collections::{BTreeMap, HashMap, HashSet},
+	collections::{BTreeMap, HashMap},
 	net::IpAddr,
 	time::{Duration, Instant},
 };
@@ -7,9 +7,8 @@
 use axum::extract::State;
 use axum_client_ip::ClientIp;
 use conduwuit::{
-	Err, Error, Result, debug, debug_warn, err, error,
+	Err, Error, Result, debug, debug_error, debug_warn, err, error,
 	result::LogErr,
-	state_res::lexicographical_topological_sort,
 	trace,
 	utils::{
 		IterStream, ReadyExt, millis_since_unix_epoch,
@@ -25,8 +24,7 @@
 use http::StatusCode;
 use itertools::Itertools;
 use ruma::{
-	CanonicalJsonObject, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId,
-	OwnedUserId, RoomId, ServerName, UInt, UserId,
+	CanonicalJsonObject, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, ServerName, UserId,
 	api::{
 		error::{ErrorKind, LimitExceededErrorData},
 		federation::transactions::{
@@ -39,12 +37,12 @@
 		},
 	},
 	events::receipt::{ReceiptEvent, ReceiptEventContent, ReceiptType},
-	int,
 	serde::Raw,
 	to_device::DeviceIdOrAllDevices,
 };
-use service::transactions::{
-	FederationTxnState, TransactionError, TxnKey, WrappedTransactionResponse,
+use service::{
+	rooms::event_handler::build_local_dag,
+	transactions::{FederationTxnState, TransactionError, TxnKey, WrappedTransactionResponse},
 };
 use tokio::sync::watch::{Receiver, Sender};
 use tracing::instrument;
@@ -133,6 +131,7 @@ async fn wait_for_result(
 }
 
 #[instrument(
+	name="transaction"
 	skip_all,
 	fields(
 		id = ?body.transaction_id.as_str(),
@@ -174,8 +173,14 @@ async fn process_inbound_transaction(
 
 	for (id, result) in &results {
 		if let Err(e) = result {
-			if matches!(e, Error::BadRequest(ErrorKind::NotFound, _)) {
-				debug_warn!("Incoming PDU failed {id}: {e:?}");
+			match e {
+				| Error::BadRequest(
+					ErrorKind::Forbidden | ErrorKind::InvalidParam | ErrorKind::BadJson,
+					..,
+				) => {
+					debug_warn!("Incoming PDU {id} failed: {e:?}");
+				},
+				| _ => debug_error!("Incoming PDU {id} failed: {e:?}"),
 			}
 		}
 	}
@@ -269,74 +274,6 @@ async fn handle(
 	Ok(results)
 }
 
-/// Attempts to build a localised directed acyclic graph out of the given PDUs,
-/// returning them in a topologically sorted order.
-///
-/// This is used to attempt to process PDUs in an order that respects their
-/// dependencies, however it is ultimately the sender's responsibility to send
-/// them in a processable order, so this is just a best effort attempt. It does
-/// not account for power levels or other tie breaks.
-async fn build_local_dag(
-	pdu_map: &HashMap<OwnedEventId, CanonicalJsonObject>,
-) -> Result<Vec<OwnedEventId>> {
-	debug_assert!(pdu_map.len() >= 2, "needless call to build_local_dag with less than 2 PDUs");
-	let mut dag: HashMap<OwnedEventId, HashSet<OwnedEventId>> =
-		HashMap::with_capacity(pdu_map.len());
-	let mut id_origin_ts: HashMap<OwnedEventId, _> = HashMap::with_capacity(pdu_map.len());
-
-	for (event_id, value) in pdu_map {
-		// We already checked that these properties are correct in parse_incoming_pdu,
-		// so it's safe to unwrap here.
-		// We also filter to remove any prev_events that are not in this pdu_map, as we
-		// need to have at least one event with zero out degrees for the lexico-topo
-		// sort below. If there are multiple events with omitted prevs, they will be
-		// ordered by timestamp, then event ID. At that point though, it's unlikely to
-		// matter.
-		let prev_events = value
-			.get("prev_events")
-			.unwrap()
-			.as_array()
-			.unwrap()
-			.iter()
-			.map(|v| EventId::parse(v.as_str().unwrap()).unwrap())
-			.filter(|id| pdu_map.contains_key(id))
-			.collect();
-
-		dag.insert(event_id.clone(), prev_events);
-		let origin_server_ts = value
-			.get("origin_server_ts")
-			.and_then(ruma::CanonicalJsonValue::as_integer)
-			.unwrap_or_default();
-		id_origin_ts.insert(event_id.clone(), origin_server_ts);
-	}
-
-	debug!(count = dag.len(), "Sorting incoming events with partial graph");
-	lexicographical_topological_sort(&dag, &async |node_id| {
-		// Note: we don't bother fetching power levels because that would massively slow
-		// this function down. This is a best-effort attempt to order events correctly
-		// for processing, however ultimately that should be the sender's job.
-		let ts = id_origin_ts
-			.get(&node_id)
-			.copied()
-			.unwrap_or_else(|| int!(0))
-			.to_string()
-			.parse::<u64>()
-			.ok()
-			.and_then(UInt::new)
-			.unwrap_or_default();
-		Ok((int!(0), MilliSecondsSinceUnixEpoch(ts)))
-	})
-	.await
-	.inspect(|sorted| {
-		debug_assert_eq!(
-			sorted.len(),
-			pdu_map.len(),
-			"Sorted graph was not the same size as the input graph"
-		);
-	})
-	.map_err(|e| err!("failed to resolve local graph: {e}"))
-}
-
 async fn handle_room(
 	services: &Services,
 	_client: &IpAddr,
@@ -352,7 +289,7 @@ async fn handle_room(
 		.await;
 
 	let room_id = &room_id;
-	let pdu_map: HashMap<OwnedEventId, CanonicalJsonObject> = pdus
+	let mut pdu_map: HashMap<OwnedEventId, CanonicalJsonObject> = pdus
 		.into_iter()
 		.map(|(_, event_id, value)| (event_id, value))
 		.collect();
@@ -360,7 +297,11 @@ async fn handle_room(
 	// failure (e.g., cycles). This is best-effort; proper ordering is the sender's
 	// responsibility.
 	let sorted_event_ids = if pdu_map.len() >= 2 {
-		build_local_dag(&pdu_map).await.unwrap_or_else(|e| {
+		let refmap = pdu_map
+			.iter()
+			.map(|(event_id, obj)| (event_id.clone(), obj))
+			.collect();
+		build_local_dag(&refmap).await.unwrap_or_else(|e| {
 			debug_warn!("Failed to build local DAG for room {room_id}: {e}");
 			pdu_map.keys().cloned().collect()
 		})
@@ -370,9 +311,8 @@ async fn handle_room(
 	let mut results = Vec::with_capacity(sorted_event_ids.len());
 	for event_id in sorted_event_ids {
 		let value = pdu_map
-			.get(&event_id)
-			.expect("sorted event IDs must be from the original map")
-			.clone();
+			.remove(&event_id)
+			.expect("sorted event IDs must be from the original map");
 		services
 			.server
 			.check_running()
@@ -380,7 +320,8 @@ async fn handle_room(
 		let result = services
 			.rooms
 			.event_handler
-			.handle_incoming_pdu(origin, room_id, &event_id, value, true)
+			.handle_incoming_pdu(origin, room_id, &event_id, value.clone(), true)
+			.boxed()
 			.await
 			.map(|_| ());
 		results.push((event_id, result));
@@ -676,6 +617,14 @@ async fn handle_edu_direct_to_device(
 	messages
 		.into_iter()
 		.stream()
+		.broad_filter_map(|(target_user_id, map)| async move {
+			services
+				.users
+				.status(&target_user_id)
+				.await
+				.is_active()
+				.then_some((target_user_id, map))
+		})
 		.for_each_concurrent(automatic_width(), |(target_user_id, map)| {
 			handle_edu_direct_to_device_user(services, target_user_id, sender, &ev_type, map)
 		})

src/api/server/state.rs

@@ -21,7 +21,7 @@ pub(crate) async fn get_room_state_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if services