Fix: Correct bad merge

I honestly have no idea what happened here

.forgejo/actions/prepare-docker-build/action.yml

@@ -75,7 +75,7 @@ runs:
 
     - name: Set up QEMU
       if: ${{ env.BUILDKIT_ENDPOINT == '' }}
-      uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
+      uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4
 
     - name: Login to builtin registry
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}

.forgejo/actions/timelord/action.yml

@@ -71,7 +71,7 @@ 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@920ab1831fbf4fb3ef75c8ead83556c918bb7290 # v2
+      uses: https://github.com/taiki-e/install-action@9e1e5806d4a4822de933115878265be9aaa786d9 # v2
       with:
         tool: git-warp-time,timelord-cli@3.0.1
 

.forgejo/workflows/build-debian.yml

@@ -10,7 +10,7 @@ on:
       - "v*.*.*"
   workflow_dispatch:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: '30 0 * * 1'
 
 jobs:
   build:
@@ -41,20 +41,9 @@ 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           ref: ${{ github.ref_name }}
@@ -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,7 +30,7 @@ jobs:
           echo "Fedora version: $VERSION"
 
       - name: Checkout repository with full history
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           ref: ${{ github.ref_name }}

.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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
           fetch-depth: 0

.forgejo/workflows/mirror-images.yml

@@ -41,7 +41,7 @@ jobs:
       DOCKER_MIRROR_TOKEN: ${{ secrets.DOCKER_MIRROR_TOKEN }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@c70ad64367908075211b10dcd2ab9fad4bfa1816 # main
+        uses: https://github.com/regclient/actions/regsync-installer@4b4db1dcc7dad75ad67a788a380f75a20cc8a040 # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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.195.3@sha256:868dffc3d6a46f42dfefe48b6978cc063d8df9c1d58a93a694c8989afa503e34
+      image: ghcr.io/renovatebot/renovate:43.234.0@sha256:bff111bfe347c559c615b658b28721eba5b7bb32a7b7901ea321336767209fe1
       options: --tmpfs /tmp:exec
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           show-progress: false
 

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

@@ -14,7 +14,7 @@ jobs:
   update-flake-hashes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 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
 

.github/FUNDING.yml

@@ -1,4 +1,4 @@
-github: [JadedBlueEyes, nexy7574, gingershaped]
+github: [JadedBlueEyes, timedoutuk, gingershaped]
 custom:
   - https://timedout.uk/donate.html
   - https://jade.ellis.link/sponsors

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
         - id: check-added-large-files
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.46.2
+    rev: v1.47.2
     hooks:
       - id: typos
       - id: typos

Cargo.toml

@@ -12,7 +12,7 @@ license = "Apache-2.0"
 # See also `rust-toolchain.toml`
 readme = "README.md"
 repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
-version = "0.5.9"
+version = "26.6.0-alpha.1"
 
 [workspace.metadata.crane]
 name = "conduwuit"
@@ -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.26"
+version = "0.0.27"
 
 # Used to load forbidden room/user regex from config
 [workspace.dependencies.serde_regex]
@@ -296,7 +296,7 @@ default-features = false
 features = ["env", "toml"]
 
 [workspace.dependencies.hickory-resolver]
-version = "0.25.2"
+version = "0.26.0"
 default-features = false
 features = [
     "serde",
@@ -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?
@@ -344,7 +344,7 @@ version = "1.1.1"
 [workspace.dependencies.ruma]
 # version = "0.14.1"
 git = "https://github.com/ruma/ruma.git"
-rev = "9c9dccc93f054bbd28f23f630223fffa6289ecbc"
+rev = "3ecd80b92794d2d93f657a7b3db62d4be237526b"
 features = [
     "appservice-api-c",
     "client-api",
@@ -373,12 +373,12 @@ features = [
     "unstable-msc4195",
     "unstable-msc4203",
     "unstable-msc4310",
-    "unstable-msc4373",
     "unstable-msc4380",
     "unstable-msc4143",
     "unstable-msc4293",
     "unstable-msc4406",
     "unstable-msc4439",
+    "unstable-msc4466",
     "unstable-extensible-events",
 ]
 

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/+85568e80.feature.md

@@ -0,0 +1 @@
+Added support for Matrix 1.16's `state_after` feature, allowing clients which understand it to sync room state changes more reliably. Contributed by @ginger.

changelog.d/+a4f10a9b.feature.md

@@ -0,0 +1 @@
+Added support for MSC4466, which allows clients to customize how changes to a user's global profile are propagated. Contributed by @ginger.

changelog.d/+bf00f682.bugfix.md

@@ -0,0 +1 @@
+Devices which set their presence as "offline" will no longer be considered for presence updates. Contributed by @timedout.

changelog.d/1762.doc

@@ -0,0 +1 @@
+Added example configuration using caddy-docker-proxy in the livekit setup section of the docs. Contributed by @Cease

changelog.d/1804.bugfix

@@ -0,0 +1 @@
+Fixed admin commands being ignored when they had leading whitespace before admin commands. Contributed by @kitvonsnookerz.

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/1829.misc

@@ -0,0 +1 @@
+Remove support for MSC4373, as the MSC is now closed. Contributed by @vel.

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/917.bugfix.md

@@ -0,0 +1 @@
+Adjusted legacy sync logic to no longer use the `roomsynctoken_shortstatehash` database column. Once this change has been confirmed to be stable and reliable, a future update will remove it entirely, significantly decreasing database sizes. 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
@@ -645,6 +645,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.

docker/Dockerfile

@@ -50,7 +50,7 @@ EOF
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.19.1
+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.19.1
+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/calls/livekit.mdx

@@ -187,6 +187,75 @@ ### 4. Configure your Reverse Proxy
     ```
 
 </details>
+<details>
+   <summary>Example docker compose file with caddy-docker-proxy labels</summary>
+   ```yaml
+   # This setup assumes all containers share the same bridge network
+   services:
+    lk-jwt-service:
+        image: ghcr.io/element-hq/lk-jwt-service:latest
+        container_name: lk-jwt-service
+        # lk-jwt-service environment config here..
+        labels:
+            caddy: livekit.example.com
+            caddy.@lk-jwt-service.path: "/sfu/get* /healthz* /get_token*"
+            caddy.reverse_proxy: "@lk-jwt-service {{upstreams 8081}}"
+
+
+    livekit:
+        image: livekit/livekit-server:latest
+        container_name: livekit
+        command: --config /etc/livekit.yaml
+        restart: unless-stopped
+        labels:
+            caddy: livekit.example.com
+            caddy.reverse_proxy: "{{upstreams 7880}}"
+        volumes:
+            - ./livekit.yaml:/etc/livekit.yaml:ro
+        ports:
+            - "127.0.0.1:7880:7880/tcp"
+            - "7881:7881/tcp"
+            - "50100-50200:50100-50200/udp"
+
+
+    caddy:
+        image: lucaslorentz/caddy-docker-proxy:ci-alpine
+        ports:
+            - 80:80
+            - 443:443
+        environment:
+            - CADDY_INGRESS_NETWORKS=caddy
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+            - ./data:/data
+        restart: unless-stopped
+        labels:
+            # If you already configured `[global.well_known]` with Continuwuity,
+            # comment out the *_respond labels and add this line
+            # caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008
+            caddy.1_respond: /.well-known/matrix/server {"m.server":"matrix.example.com:443"}
+            caddy.2_respond: /.well-known/matrix/client {"m.server":{"base_url":"https://matrix.example.com"},"m.homeserver":{"base_url":"https://matrix.example.com"},"org.matrix.msc4143.rtc_foci":[{"type":"livekit","livekit_service_url":"https://livekit.example.com"}]}
+
+            # If you are having problems with continuwuity serving headers uncomment
+            # the header section below.
+
+            # caddy: example.com
+            # caddy.0_header: "*"
+            # caddy.0_header.Access-Control-Allow-Origin: "*"
+            # caddy.0_header.Access-Control-Allow-Methods: "GET, POST, OPTIONS"
+            # caddy.0_header.Access-Control-Allow-Headers: "Authorization"
+            # caddy.0_header.Content-Type: "application/json"
+
+    homeserver:
+        image: forgejo.ellis.link/continuwuation/continuwuity:latest
+        restart: unless-stopped
+        # add additional environment, volume, and network config here...
+        labels:
+            caddy: matrix.example.com
+            caddy.reverse_proxy: "{{upstreams 8008}}"
+
+    ```
+</details>
 
 
 ### 6. Start Everything

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/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

flake.lock

@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1779575509,
-        "narHash": "sha256-wXKYURZz76ZC5lbuDA1oVQA/MxSB3pSJ1raF1HG0oIc=",
+        "lastModified": 1781566179,
+        "narHash": "sha256-Tqv8I586fYzWpEW/Smq/JqESFa3DVVzVWsnAMtvhy/I=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "831c50f4a4304068f125e603add6a8839f08b3eb",
+        "rev": "74e084413d979d52d2f93b1d93b1ab7b9ee648f5",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1779130139,
-        "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=",
+        "lastModified": 1780532242,
+        "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9",
+        "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1779612045,
-        "narHash": "sha256-+7lfNVnmXJDkiRYHd5NoNwYoyUcc0LcXPaIJqjO7VWM=",
+        "lastModified": 1781527054,
+        "narHash": "sha256-1fX9ev2Fh5QoKQ41G9dYutjo5j/jywu6tZse5Eb1Ck4=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "d7be747f0a65af378de515fc3cee131bf99a008f",
+        "rev": "8c2e51dffefc040a21975da7abf6f252c8c9b783",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779508470,
-        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29916453413845e54a65b8a1cf996842300cd299",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1779569060,
-        "narHash": "sha256-NSnk5D+3KEfRdbgPijs33N2RAKSG6A74SwfnynLcouo=",
+        "lastModified": 1781453968,
+        "narHash": "sha256-+V3nK4pCngbmgyVGXY6Kkrlevp4ocPkJJLf2aqwkDNA=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "987ea33645ab1c709b1df6823038abcb2fe8973e",
+        "rev": "cc272809a173c2c11d0e479d639c811c1eacf049",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "lastModified": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
         "type": "github"
       },
       "original": {

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-gh/xTkxKHL4eiRXzWv8KP7vfjSk61Iq48x47BEDFgfk=";
-          };
+          fnx = inputs'.fenix.packages;
+          stable-toolchain = (mkToolchain fnx).toolchain;
         in
         {
           inherit stable-toolchain;

package-lock.json

@@ -125,14 +125,14 @@
       }
     },
     "node_modules/@rsbuild/core": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-2.0.7.tgz",
-      "integrity": "sha512-LsBONEzsjzOAqO72ot39eI7g53zSfF9QuDXTu4ks8IUX+EZsxRSniQfc+1zVA6a6y3b9KUUtG96avoMLKbWklQ==",
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-2.0.15.tgz",
+      "integrity": "sha512-O8vmMhZu1YImO6jOqt/K/vlJSvkq7UtSq5YM1DIlcEd9LW8Gf6/dkQ1B2KPI6F+hSMFBnTTTumdcIowSLCw97g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rspack/core": "~2.0.4",
-        "@swc/helpers": "^0.5.21"
+        "@rspack/core": "~2.0.8",
+        "@swc/helpers": "^0.5.23"
       },
       "bin": {
         "rsbuild": "bin/rsbuild.js"
@@ -150,9 +150,9 @@
       }
     },
     "node_modules/@rsbuild/plugin-react": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@rsbuild/plugin-react/-/plugin-react-2.0.0.tgz",
-      "integrity": "sha512-/1gzt39EGUSFEqB83g46QoOwsgv172HI18i6au1b6lgIaX4sv9stuX4ijdHbHCp8PqYEq+MyQ99jIQMO6I+etg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@rsbuild/plugin-react/-/plugin-react-2.0.1.tgz",
+      "integrity": "sha512-n5m3VxEm6m3Dv1VkI0WnxsildySJ6M+QjGIzkZDy5UebRCIJ1Q/hlQVyhofBL6C+AcsF9fGjlHQkeiteXJSr3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -169,28 +169,28 @@
       }
     },
     "node_modules/@rspack/binding": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.4.tgz",
-      "integrity": "sha512-/QeJDPUw/lWkBJESG264KA9u6/rAjvoJhKncU4rkTi5Ap45kue5HTgOzr0ufxKdd2Xl72fjFBuqlKmtFDD5LiQ==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.8.tgz",
+      "integrity": "sha512-3uZ+y8aQxq33ty2srMxg2Nu0XuBI6vVrG50rkDaXqwWqOohfgGUSfFuQK7EnSUNy4aFUQlCG6NHialQHJov0wg==",
       "dev": true,
       "license": "MIT",
       "optionalDependencies": {
-        "@rspack/binding-darwin-arm64": "2.0.4",
-        "@rspack/binding-darwin-x64": "2.0.4",
-        "@rspack/binding-linux-arm64-gnu": "2.0.4",
-        "@rspack/binding-linux-arm64-musl": "2.0.4",
-        "@rspack/binding-linux-x64-gnu": "2.0.4",
-        "@rspack/binding-linux-x64-musl": "2.0.4",
-        "@rspack/binding-wasm32-wasi": "2.0.4",
-        "@rspack/binding-win32-arm64-msvc": "2.0.4",
-        "@rspack/binding-win32-ia32-msvc": "2.0.4",
-        "@rspack/binding-win32-x64-msvc": "2.0.4"
+        "@rspack/binding-darwin-arm64": "2.0.8",
+        "@rspack/binding-darwin-x64": "2.0.8",
+        "@rspack/binding-linux-arm64-gnu": "2.0.8",
+        "@rspack/binding-linux-arm64-musl": "2.0.8",
+        "@rspack/binding-linux-x64-gnu": "2.0.8",
+        "@rspack/binding-linux-x64-musl": "2.0.8",
+        "@rspack/binding-wasm32-wasi": "2.0.8",
+        "@rspack/binding-win32-arm64-msvc": "2.0.8",
+        "@rspack/binding-win32-ia32-msvc": "2.0.8",
+        "@rspack/binding-win32-x64-msvc": "2.0.8"
       }
     },
     "node_modules/@rspack/binding-darwin-arm64": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.4.tgz",
-      "integrity": "sha512-0Q1QXFEsZfDc4opiDnb8q50KlBbC2VovViDaYlMJZBzvjAo325mh3itXPfz7YZ31M+TxRE7TUiJXH3ltiV1Hdg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.8.tgz",
+      "integrity": "sha512-vCgbgH7B7qom+uID+RCZsTCOYFb9wC4/4+1U6rMfytrXGVJ72eNQs2tbdjOl0lb18CT3N/n+VkWynUiLk84GwA==",
       "cpu": [
         "arm64"
       ],
@@ -202,9 +202,9 @@
       ]
     },
     "node_modules/@rspack/binding-darwin-x64": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.4.tgz",
-      "integrity": "sha512-oO5J2QYf7+H+aYRj85EiGrDOoDEE9EDDl7NgXv46iWvIF0wXowEHXqnjMFxHxRq2Vf6scT+0yYQX9blWcvMWAA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.8.tgz",
+      "integrity": "sha512-satPm2PD4B7jDTVlVAdvMVdUszwLvWUEnUDzLb77mvVkezKNDZmuhb+e8s+FfKs8hJpNbZ9VAejuA2rr8o985w==",
       "cpu": [
         "x64"
       ],
@@ -216,9 +216,9 @@
       ]
     },
     "node_modules/@rspack/binding-linux-arm64-gnu": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.4.tgz",
-      "integrity": "sha512-BEk6mIYBK4BihW9qXXITJORrVXecTlkRjrqhgefili4xjXtLdcUnxAm9sN/2oJ8m378n2h33qDh4gr2orPBFWQ==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.8.tgz",
+      "integrity": "sha512-pSI+npPQE/uDtiboqvcOIRJbEV2+B+H1xffmko/gw50la92oTUW60kVULFwsb6L0+GVCzIcwX3yq60GtYIn+Ug==",
       "cpu": [
         "arm64"
       ],
@@ -233,9 +233,9 @@
       ]
     },
     "node_modules/@rspack/binding-linux-arm64-musl": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.4.tgz",
-      "integrity": "sha512-Hyt3z1RwNcSMIoaoWLN4Hb/696/O5JPukf8rXQASvf2UkC+X3ij7tr+8lMSYi3Zysi1QL375CnT4fNoABEW0JA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.8.tgz",
+      "integrity": "sha512-igjJ43yxWQ72GZqjDDZSSHax9/Vg+6rLMmOvFglTJUkQpB4Tyvu/YjW+WRjYj2xRw6blOjLxUSJWASvuSqqlvg==",
       "cpu": [
         "arm64"
       ],
@@ -250,9 +250,9 @@
       ]
     },
     "node_modules/@rspack/binding-linux-x64-gnu": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.4.tgz",
-      "integrity": "sha512-xHorBPBZAg0Pn9Q0k9dWZ9euowieDxcSOzQ9JhTCmhDY6wZH5M/kCBFlCs/OQeW5/NUArW3x3MwEdO/0QJHMxg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.8.tgz",
+      "integrity": "sha512-zrkoEOnqj1hOEBO5T2I/2Ts2HSJsYFh1qXwMpK4dMJFGGNWDfNeUa6/LF5uq3VINF3JUl7RL47AgrucoSZJXPA==",
       "cpu": [
         "x64"
       ],
@@ -267,9 +267,9 @@
       ]
     },
     "node_modules/@rspack/binding-linux-x64-musl": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.4.tgz",
-      "integrity": "sha512-QLxEGUXofF0kVNU12Y2NT3Qi9lGs+WbnYpapVeb+2IXtrAXJfU7Rhy7lAp5GLMzYMQNrKKL9SVnTWKbODbNW9Q==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.8.tgz",
+      "integrity": "sha512-6CtDaGZjNDvJd9TBp7a9zABbrPORO21W96+3ZcGBn0YNUPUk4ARxIxrTTpeJ/1F41QDM8AYIkGDdqEYMqTYBsA==",
       "cpu": [
         "x64"
       ],
@@ -284,9 +284,9 @@
       ]
     },
     "node_modules/@rspack/binding-wasm32-wasi": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.4.tgz",
-      "integrity": "sha512-YhN8HkiH46ONU9tm5dyoXDImDWGpU7E4SPqGI4OyAVF0445uIChurIUmTIOYcD6cg81GGeIjozWJOcb635Dcqw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.8.tgz",
+      "integrity": "sha512-Yf4SiqTUroT5Ju+te0YAY2xxKOb35tECsO21v7hYyGa705wrgoAK/MmF7enOvs9GR1iZIqgiLD/wxsIxl8GjJw==",
       "cpu": [
         "wasm32"
       ],
@@ -300,9 +300,9 @@
       }
     },
     "node_modules/@rspack/binding-win32-arm64-msvc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.4.tgz",
-      "integrity": "sha512-MUlYIz82xQRN0aoiXXyEBrNVUwiOSSFRi7nuCgUKduaSdlbPWzCY31IdtOygZ06LVp5JIGUEtyqSrjQq4FrMRw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.8.tgz",
+      "integrity": "sha512-8NCuiQsAhXrwRBy57QZoypqrws/zLBkaQVGiB8hksr6v++8hNigNjqpQARLbd0iyMuHsQQ++8+auGk6xlDXmzw==",
       "cpu": [
         "arm64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rspack/binding-win32-ia32-msvc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.4.tgz",
-      "integrity": "sha512-D7UcIFMzlY2yhhyuW4Ej15gBWmTwUM5DxuObl3Kv31qRv/pmV3MsqUeG5m2dqLbUxzqPH87qnp0cArbkJQ1b+w==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.8.tgz",
+      "integrity": "sha512-bxiekytbX7V9KFAra+HkwtNWC6pYfHEBBZFpiT0xUs3mCFOmAAFVBsBSQsoCP9AdCEXoMAvNdnrHNw3iov4OZw==",
       "cpu": [
         "ia32"
       ],
@@ -328,9 +328,9 @@
       ]
     },
     "node_modules/@rspack/binding-win32-x64-msvc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.4.tgz",
-      "integrity": "sha512-MnYKPfdrAEbtpKg/1SZ6cNtzreIRyQJK4APbxLLPXENdTH5QXQkaTjLMKEeJcJ51FRhI/+yNpOUm2oTHdCQ1Og==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.8.tgz",
+      "integrity": "sha512-7zPs8YCe/ZVJTwd+5lpB0CP0tkn2pONf/T1ycmVY76u21Nrwt8mXQGc/2yH2eWP4B7fikYBr3hGr7mpR2fajqQ==",
       "cpu": [
         "x64"
       ],
@@ -342,20 +342,20 @@
       ]
     },
     "node_modules/@rspack/core": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.4.tgz",
-      "integrity": "sha512-OuxdQeeKWQpNvFBRDOcnoSaQvp6E4APM/6JJMM/k0p6oL1TEFQVGdNu3VGY4mRAsebnNBXapMVMhj+v66Bn2pg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.8.tgz",
+      "integrity": "sha512-+NLGJf8gZxihDmMFzjlly3toc2SMjeDmuvz0/Cai9AMdV4F+Pqcnt2BA9V4e3SY2jmhJQtPwgyyLtR1RiJO77g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rspack/binding": "2.0.4"
+        "@rspack/binding": "2.0.8"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
         "@module-federation/runtime-tools": "^0.24.1 || ^2.0.0",
-        "@swc/helpers": ">=0.5.1"
+        "@swc/helpers": "^0.5.23"
       },
       "peerDependenciesMeta": {
         "@module-federation/runtime-tools": {
@@ -383,17 +383,17 @@
       }
     },
     "node_modules/@rspress/core": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.13.tgz",
-      "integrity": "sha512-lbaBA5eqh7wKdH98TUQEI+SfS3Z6YgaNCup3X+ttrYVLOrxN8PJvbedo6fFAcl+wP3XLy6D0pcnnzAgu8y3tdg==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.14.tgz",
+      "integrity": "sha512-k59i08zwBGgHrjHw8CK1m4CeTrKPvZRmV54bxubQl6AdDdmhJK6WrNg3UthwWmd38scKtqF40ATXDE8RMiNcNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/mdx": "^3.1.1",
         "@mdx-js/react": "^3.1.1",
-        "@rsbuild/core": "^2.0.7",
-        "@rsbuild/plugin-react": "~2.0.0",
-        "@rspress/shared": "2.0.13",
+        "@rsbuild/core": "^2.0.9",
+        "@rsbuild/plugin-react": "~2.0.1",
+        "@rspress/shared": "2.0.14",
         "@shikijs/rehype": "^4.0.2",
         "@types/unist": "^3.0.3",
         "@unhead/react": "^2.1.15",
@@ -436,9 +436,9 @@
       }
     },
     "node_modules/@rspress/plugin-client-redirects": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.13.tgz",
-      "integrity": "sha512-dP753ASTvH6eDtSEulcqq2lE/kTSdOWSCw0nzvXG+7atTWTHDp6z47uH3CGD8E78cBuKyEi4OH+U7V0EtCTc0Q==",
+      "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==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -449,9 +449,9 @@
       }
     },
     "node_modules/@rspress/plugin-sitemap": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.13.tgz",
-      "integrity": "sha512-JtkNlxNuA7BzknKIrLvLQkSk0XVi7OXzrE76ma/cLvleccNWr8LGrHtrac4IrDr+HauK4WKTM2JaHGGHUdOUKw==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.14.tgz",
+      "integrity": "sha512-Gpone22PvXGfGRSyi/WM8IXgsvKhNspXqHjtPD3g62jX8SJL3kpj2YZ2V28WEkg672fICauUYXrpre74Rddcsw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -462,26 +462,26 @@
       }
     },
     "node_modules/@rspress/shared": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.13.tgz",
-      "integrity": "sha512-LmDfr7+MDNWRBbxcNoWkW68A35oRonpDJq2Jlx3L8GCzG4sAsyd6Yw0DebTWAxx7hVOXGMf37nEf1J4aOLEZfg==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.14.tgz",
+      "integrity": "sha512-sCe9tAo+s9tR4DmFSjMyHOxQvhzTSYXkkMUfVEo5w+uMCNXXGAIC6D0xAVDMHq1jIFF9ix47VxzlCo+CYNS14g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rsbuild/core": "^2.0.7",
+        "@rsbuild/core": "^2.0.9",
         "@shikijs/rehype": "^4.0.2",
         "unified": "^11.0.5"
       }
     },
     "node_modules/@shikijs/core": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.1.0.tgz",
-      "integrity": "sha512-jLJtSJeuFffqX6/inRE1zqU5aFv2hrszvYgq3OjbAgFRZiWv7abKMDdQzYxuSDfmUPQozZvI/kuy6VMTvnvqTQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.2.0.tgz",
+      "integrity": "sha512-Hc87Ab1Ld/vEbZRCbwx344I5v+4RU8CVToUTRkqXL1+TjbuOp9U5Xa0M23V4GEWHxVn+yO5otb+HkQVm3ptWQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/primitive": "4.1.0",
-        "@shikijs/types": "4.1.0",
+        "@shikijs/primitive": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4",
         "hast-util-to-html": "^9.0.5"
@@ -491,13 +491,13 @@
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.1.0.tgz",
-      "integrity": "sha512-YquhawCUgaBfhsS72e2Y/dI59gCBNPHu3fEO/tvLaXrTssxZrY5ddjtNLTwndrMgPo8b3IscE+xoICDzpTmlFQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.2.0.tgz",
+      "integrity": "sha512-fjETeq1k5ffyXqRgS6+3hpvqseLalp1kjNfRbXpUgWR8FpZ1CmQfiNHovc5lncYjt/Vg5JK/WJEmLahjwMa0og==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "oniguruma-to-es": "^4.3.6"
       },
@@ -506,13 +506,13 @@
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.1.0.tgz",
-      "integrity": "sha512-axLpjVs45YBvvINa+dJF+NPW+KtFkNXsFr4SDw2BMj9GdeMnGxVB9PQb2xXlJYovslt/nz6giedAyOANkfc7hg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.2.0.tgz",
+      "integrity": "sha512-hTorK1dffPkpbMUk6Z+828PgRo7d07HbnizoP0hNPFjhxMHctj0Px/qoHeGMYafc6ju+u9iMldN4JbVzNQM++g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       },
       "engines": {
@@ -520,26 +520,26 @@
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.1.0.tgz",
-      "integrity": "sha512-nwOMruEkbgdZfQ/b8CgpNBVOpvG1k0N5tbmgiFeqsan401+x3ILqlzZJowSla4Agmq4hG2Uf2wh5jLTEhR8VSg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.2.0.tgz",
+      "integrity": "sha512-bwrVRlJ0wUhZxAbVdvBbv2TTC9yLsh4C/IO5Ofz0T8MQntgDvyVnkbjw9vi50r1kx7RCIJdnJnjZAwmAsXFLZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/primitive": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.1.0.tgz",
-      "integrity": "sha512-zx2/2Uwj2q9X3KSyYREEhXO23xBw5WUhP4orK2lE4r+t9JGITmEe0JH+wPmJhqHpOT2bRRs6lAL945+LDvOAGw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.2.0.tgz",
+      "integrity": "sha512-NOq+DtUkVBJtZMVXL5A0vI0Xk8nvDYaXetFHSJFlOqjDZIVhIPRYFdGkSoElDqNuegikcc3A76SNUa8dTqtAYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
       },
@@ -548,16 +548,16 @@
       }
     },
     "node_modules/@shikijs/rehype": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-4.1.0.tgz",
-      "integrity": "sha512-HQwltCcO2/UiFz44/8whyji4rP1VghLu++MgvQn+lQA8/gvuycGkay8DH8o8VAOvLBDKGOkBEw7cC1Cm33GObQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-4.2.0.tgz",
+      "integrity": "sha512-ST3EWye/dwF1gWskczJNBnwFtDzEQ9ceytXZtyc/GfwR5V0qJrkoSGZO55O3SAKDDsXkTDcsfwd9pVe7ROlAHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0",
+        "@shikijs/types": "4.2.0",
         "@types/hast": "^3.0.4",
         "hast-util-to-string": "^3.0.1",
-        "shiki": "4.1.0",
+        "shiki": "4.2.0",
         "unified": "^11.0.5",
         "unist-util-visit": "^5.1.0"
       },
@@ -566,22 +566,22 @@
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.1.0.tgz",
-      "integrity": "sha512-emCcTnUM7yO2wltYbaxm+yLvcCI4+h8XBKc4KmJ7EZUXoSGjcCHifkI//R4OFit9ewpg7H2/9tjOuXrT2v/Knw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.2.0.tgz",
+      "integrity": "sha512-RX8IHYeLv8Cu2W6ruc3RxUqWn0IYCqSrMBzi/uRGAmfyDNOnNO5BF/Px7o97n4XTpmFTo5GbRaazuOWj+2ak2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.1.0"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.1.0.tgz",
-      "integrity": "sha512-3EQWX54fMpniOrDblzAhiwiJwpiTMW6+B9DWyUd9ska483tbayFYuw47UxwuPknI31bKnySfVQ/QW+jFL4rFdA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.2.0.tgz",
+      "integrity": "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -600,9 +600,9 @@
       "license": "MIT"
     },
     "node_modules/@swc/helpers": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.21.tgz",
-      "integrity": "sha512-jI/VAmtdjB/RnI8GTnokyX7Ug8c+g+ffD6QRLa6XQewtnGyukKkKSk3wLTM3b5cjt1jNh9x0jfVlagdN2gDKQg==",
+      "version": "0.5.23",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.23.tgz",
+      "integrity": "sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -668,9 +668,9 @@
       }
     },
     "node_modules/@types/mdx": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.13.tgz",
-      "integrity": "sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.14.tgz",
+      "integrity": "sha512-T48PeuJtvLosNTPVhfnIp3i/n3a4g4Bad7YCq5k64D4u7NwDrAotikQ+5+sjtUvBmxCMlbo3dVL+C2dP0rWHzg==",
       "dev": true,
       "license": "MIT"
     },
@@ -682,9 +682,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.15",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.15.tgz",
-      "integrity": "sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q==",
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz",
+      "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -723,9 +723,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
+      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -1821,6 +1821,53 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-to-markdown-cjk-friendly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown-cjk-friendly/-/mdast-util-to-markdown-cjk-friendly-1.0.0.tgz",
+      "integrity": "sha512-BoaAm8mlJ+LAYz0Qs532Y3ciTuQYgBUPZcSFbvC/ZKmEMAKgulw84YvQK1gI34t/vL2euSfuaWlqczkTBgamkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-to-markdown": "^2.1.2",
+        "micromark-extension-cjk-friendly-util": "3.0.1",
+        "micromark-util-symbol": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/mdast": "*"
+      },
+      "peerDependenciesMeta": {
+        "@types/mdast": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mdast-util-to-markdown-cjk-friendly-gfm-strikethrough": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown-cjk-friendly-gfm-strikethrough/-/mdast-util-to-markdown-cjk-friendly-gfm-strikethrough-1.0.0.tgz",
+      "integrity": "sha512-1ePVfB4P/vz3xSsm6H3D32r6VYGErxclnuLLFK02/2ReF+UdEKm7caulK6Vm0LBIp5gPRtB2Z1OYDznCkX3k2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-gfm-strikethrough": "^2.0.0",
+        "mdast-util-to-markdown": "^2.1.2",
+        "micromark-extension-cjk-friendly-util": "3.0.1",
+        "micromark-util-symbol": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/mdast": "*"
+      },
+      "peerDependenciesMeta": {
+        "@types/mdast": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/mdast-util-to-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
@@ -2742,9 +2789,9 @@
       }
     },
     "node_modules/property-information": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
-      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz",
+      "integrity": "sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -2753,9 +2800,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
-      "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2763,16 +2810,16 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.6.tgz",
-      "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.6"
+        "react": "^19.2.7"
       }
     },
     "node_modules/react-lazy-with-preload": {
@@ -2822,9 +2869,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.15.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.15.1.tgz",
-      "integrity": "sha512-R8rl9HhgikFYoPJymnUtPXWbnDb3oget6lQnfIoupbt61aT9aOhRkDsY2XRhZRyX1Z/8a5sL74fXmFNm3NRK5A==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.17.0.tgz",
+      "integrity": "sha512-FDELK7rTMlCHO5+reyXsPlmfr7N1F91lPHsWYfMEGQm/KQ+F4JFM8jGoeQDmDvdTs93Fw9aSilH+uKRb4/jXvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2845,13 +2892,13 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.15.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.15.1.tgz",
-      "integrity": "sha512-AzF62gjY6U9rkMq4RfP/r2EVtQ7DMfNMjyOp/flLTCrtRylLiK4wT4pSq6O8rOXZ2eXdZYJPEYe+ifomiv+Igg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.17.0.tgz",
+      "integrity": "sha512-fyU2yjGups/hE6Xz0I5ZYbVL8Gx29eCjgpHaRaTaVU+OOAdfRX05KsvyRm0GO8YQwOkhpU3MurW1jyMUJn+zSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.15.1"
+        "react-router": "7.17.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -3011,12 +3058,13 @@
       }
     },
     "node_modules/remark-cjk-friendly": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/remark-cjk-friendly/-/remark-cjk-friendly-2.0.1.tgz",
-      "integrity": "sha512-6WwkoQyZf/4j5k53zdFYrR8Ca+UVn992jXdLUSBDZR4eBpFhKyVxmA4gUHra/5fesjGIxrDhHesNr/sVoiiysA==",
+      "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "mdast-util-to-markdown-cjk-friendly": "1.0.0",
         "micromark-extension-cjk-friendly": "2.0.1"
       },
       "engines": {
@@ -3033,12 +3081,13 @@
       }
     },
     "node_modules/remark-cjk-friendly-gfm-strikethrough": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/remark-cjk-friendly-gfm-strikethrough/-/remark-cjk-friendly-gfm-strikethrough-2.0.1.tgz",
-      "integrity": "sha512-pWKj25O2eLXIL1aBupayl1fKhco+Brw8qWUWJPVB9EBzbQNd7nGLj0nLmJpggWsGLR5j5y40PIdjxby9IEYTuA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/remark-cjk-friendly-gfm-strikethrough/-/remark-cjk-friendly-gfm-strikethrough-2.1.0.tgz",
+      "integrity": "sha512-3Kyq2hjY7V7eU8MbVbWW6QQLN81pjJcIvKHvPxr8hZZmcq/9wqm3MJ3iUG34Ch9QTM4WHN+a1JVAVC1fSi5mig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "mdast-util-to-markdown-cjk-friendly-gfm-strikethrough": "1.0.0",
         "micromark-extension-cjk-friendly-gfm-strikethrough": "2.0.1"
       },
       "engines": {
@@ -3164,18 +3213,18 @@
       "license": "MIT"
     },
     "node_modules/shiki": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.1.0.tgz",
-      "integrity": "sha512-l/ABZPUR5v70jI10EzqfMS/I96vjSGv2y0ihUV+WYFzv0EfvW4s54m0Lg8wCrrL+2IkwBzFTuxkZjPf8b2NX9Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.2.0.tgz",
+      "integrity": "sha512-hjNax6o/ylDy9lefQEaSDtzaT3iVNtZ3WmpQnbuQNoG4xvnSKf2kSKbihZVO4JRG1TTMejs7CmNRYlWgAL66pQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/core": "4.1.0",
-        "@shikijs/engine-javascript": "4.1.0",
-        "@shikijs/engine-oniguruma": "4.1.0",
-        "@shikijs/langs": "4.1.0",
-        "@shikijs/themes": "4.1.0",
-        "@shikijs/types": "4.1.0",
+        "@shikijs/core": "4.2.0",
+        "@shikijs/engine-javascript": "4.2.0",
+        "@shikijs/engine-oniguruma": "4.2.0",
+        "@shikijs/langs": "4.2.0",
+        "@shikijs/themes": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
       },

rust-toolchain.toml

@@ -10,7 +10,7 @@
 
 [toolchain]
 profile = "minimal"
-channel = "1.95.0"
+channel = "1.96.0"
 components = [
     # For rust-analyzer
     "rust-src",

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,23 @@
 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().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

@@ -26,7 +26,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/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,259 @@ 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().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().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,76 @@
 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)
+		self.write_str(&format!(
+			"New registration token issued: `{token}`. {}.",
+			if let Some(expires) = info.expires {
+				format!("{expires}")
+			} else {
+				"Never expires".to_owned()
+			}
+		))
 		.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()))
-		.await?;
-
-	for token in tokens {
-		self.write_str(&format!("- {token}\n")).await?;
 	}
 
-	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/api/admin/rooms/ban.rs

@@ -13,7 +13,7 @@ pub(crate) async fn ban_room(
 	State(services): State<crate::State>,
 	body: Ruma<rooms::ban::v1::Request>,
 ) -> Result<rooms::ban::v1::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if !services.users.is_admin(sender_user).await {
 		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
 	}

src/api/admin/rooms/list.rs

@@ -13,7 +13,7 @@ pub(crate) async fn list_rooms(
 	State(services): State<crate::State>,
 	body: Ruma<rooms::list::v1::Request>,
 ) -> Result<rooms::list::v1::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if !services.users.is_admin(sender_user).await {
 		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
 	}

src/api/client/account/mod.rs

@@ -27,7 +27,7 @@
 use service::{mailer::messages, uiaa::Identity, users::HashedPassword};
 
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::Ruma;
+use crate::{Ruma, router::ClientIdentity};
 
 pub(crate) mod register;
 pub(crate) mod threepid;
@@ -75,13 +75,11 @@ pub(crate) async fn get_register_available_route(
 		return Err!(Request(UserInUse("User ID is not available.")));
 	}
 
-	if let Some(ref info) = body.appservice_info {
-		if !info.is_user_match(&user_id) {
-			return Err!(Request(Exclusive("Username is not in an appservice namespace.")));
-		}
-	}
-
-	if services.appservice.is_exclusive_user_id(&user_id).await {
+	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.")));
 	}
 
@@ -111,7 +109,12 @@ 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(ref user_id) = body.sender_user {
+	let identity = if let Some(user_id) = body
+		.identity
+		.as_ref()
+		.map(ClientIdentity::expect_sender_user)
+		.transpose()?
+	{
 		// A signed-in user is trying to change their password, prompt them for their
 		// existing one
 
@@ -157,7 +160,12 @@ pub(crate) async fn change_password_route(
 		services
 			.users
 			.all_device_ids(&sender_user)
-			.ready_filter(|id| *id != body.sender_device())
+			.ready_filter(|id| {
+				body.identity
+					.as_ref()
+					.and_then(|identity| identity.sender_device())
+					.is_none_or(|sender_device| sender_device != *id)
+			})
 			.for_each(async |id| services.users.remove_device(&sender_user, &id).await)
 			.await;
 
@@ -173,7 +181,12 @@ pub(crate) async fn change_password_route(
 					.await
 					.ok()
 					.as_ref()
-					.is_some_and(|pusher_device| pusher_device != body.sender_device())
+					.is_some_and(|pusher_device| {
+						body.identity
+							.as_ref()
+							.and_then(|identity| identity.sender_device())
+							.is_none_or(|sender_device| sender_device != *pusher_device)
+					})
 					.then_some(pushkey)
 			})
 			.for_each(async |pushkey| {
@@ -241,9 +254,11 @@ pub(crate) async fn whoami_route(
 	State(_): State<crate::State>,
 	body: Ruma<whoami::v3::Request>,
 ) -> Result<whoami::v3::Response> {
-	Ok(assign!(whoami::v3::Response::new(body.sender_user().to_owned(), false), {
-		device_id: body.sender_device,
-	}))
+	Ok(
+		assign!(whoami::v3::Response::new(body.identity.expect_sender_user()?.to_owned(), false), {
+			device_id: body.identity.sender_device().map(ToOwned::to_owned),
+		}),
+	)
 }
 
 /// # `POST /_matrix/client/r0/account/deactivate`
@@ -266,9 +281,10 @@ pub(crate) async fn deactivate_route(
 	// Authentication for this endpoint is technically optional,
 	// but we require the user to be logged in
 	let sender_user = body
-		.sender_user
+		.identity
 		.as_ref()
-		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))?;
+		.map(ClientIdentity::expect_sender_user)
+		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))??;
 
 	// Prompt the user to confirm with their password using UIAA
 	let _ = services

src/api/client/account/register.rs

@@ -59,7 +59,7 @@ pub(crate) async fn register_route(
 	let allow_registration =
 		services.config.allow_registration || services.firstrun.is_first_run();
 
-	if !allow_registration && body.appservice_info.is_none() {
+	if !allow_registration && body.identity.is_none() {
 		info!(
 			?body.username,
 			?body.initial_device_display_name,
@@ -71,7 +71,7 @@ pub(crate) async fn register_route(
 		)));
 	}
 
-	let identity = if body.appservice_info.is_some() {
+	let identity = if body.identity.is_some() {
 		// Appservices can skip auth
 		None
 	} else {
@@ -107,7 +107,7 @@ pub(crate) async fn register_route(
 		// For appservice logins, make sure that the user ID is in the appservice's
 		// namespace
 
-		match body.appservice_info {
+		match body.identity {
 			| Some(ref info) =>
 				if !info.is_user_match(&user_id) && !emergency_mode_enabled {
 					return Err!(Request(Exclusive(
@@ -125,7 +125,7 @@ pub(crate) async fn register_route(
 		return Err!(Request(Exclusive("Username is reserved by an appservice.")));
 	}
 
-	let password = if body.appservice_info.is_some() {
+	let password = if body.identity.is_some() {
 		None
 	} else if let Some(password) = body.password.as_deref() {
 		Some(HashedPassword::new(password)?)
@@ -134,15 +134,13 @@ pub(crate) async fn register_route(
 	};
 
 	// Create user
-	services.users.create(&user_id, password).await?;
+	services.users.create(&user_id, password)?;
 
 	// 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.appservice_info.is_none()
-	{
+	if !services.globals.new_user_displayname_suffix().is_empty() && body.identity.is_none() {
 		write!(displayname, " {}", services.server.config.new_user_displayname_suffix)?;
 	}
 
@@ -209,7 +207,7 @@ pub(crate) async fn register_route(
 
 	let device_display_name = body.initial_device_display_name.as_deref().unwrap_or("");
 
-	if body.appservice_info.is_none() {
+	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 \
@@ -255,7 +253,7 @@ pub(crate) async fn register_route(
 		}
 	}
 
-	if body.appservice_info.is_none() && !services.server.config.auto_join_rooms.is_empty() {
+	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!(

src/api/client/account/threepid.rs

@@ -13,7 +13,7 @@
 };
 use service::{mailer::messages, uiaa::Identity};
 
-use crate::Ruma;
+use crate::{Ruma, router::ClientIdentity};
 
 /// # `GET _matrix/client/v3/account/3pid`
 ///
@@ -22,7 +22,7 @@ pub(crate) async fn third_party_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_3pids::v3::Request>,
 ) -> Result<get_3pids::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	let mut threepids = vec![];
 
 	if let Some(email) = services
@@ -53,6 +53,14 @@ pub(crate) async fn request_3pid_management_token_via_email_route(
 	State(services): State<crate::State>,
 	body: Ruma<request_3pid_management_token_via_email::v3::Request>,
 ) -> Result<request_3pid_management_token_via_email::v3::Response> {
+	// Authentication for this endpoint is technically optional,
+	// but we require the user to be logged in
+	let sender_user = body
+		.identity
+		.as_ref()
+		.map(ClientIdentity::expect_sender_user)
+		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))??;
+
 	if !services.threepid.email_requirement().may_change() {
 		return Err!(Request(Forbidden("You may not change your email address.")));
 	}
@@ -76,7 +84,7 @@ pub(crate) async fn request_3pid_management_token_via_email_route(
 			Mailbox::new(None, email),
 			|verification_link| messages::ChangeEmail {
 				server_name: services.config.server_name.as_str(),
-				user_id: body.sender_user.as_deref(),
+				user_id: Some(sender_user),
 				verification_link,
 			},
 			&body.client_secret,
@@ -107,8 +115,6 @@ pub(crate) async fn add_3pid_route(
 	State(services): State<crate::State>,
 	body: Ruma<add_3pid::v3::Request>,
 ) -> Result<add_3pid::v3::Response> {
-	let sender_user = body.sender_user();
-
 	if !services.threepid.email_requirement().may_change() {
 		return Err!(Request(Forbidden("You may not change your email address.")));
 	}
@@ -116,7 +122,10 @@ pub(crate) async fn add_3pid_route(
 	// Require password auth to add an email
 	let _ = services
 		.uiaa
-		.authenticate_password(&body.auth, Some(Identity::from_user_id(sender_user)))
+		.authenticate_password(
+			&body.auth,
+			Some(Identity::from_user_id(body.identity.expect_sender_user()?)),
+		)
 		.await?;
 
 	let email = services
@@ -127,7 +136,7 @@ pub(crate) async fn add_3pid_route(
 
 	services
 		.threepid
-		.associate_localpart_email(sender_user.localpart(), &email)
+		.associate_localpart_email(body.identity.expect_sender_user()?.localpart(), &email)
 		.await?;
 
 	Ok(add_3pid::v3::Response::new())
@@ -138,8 +147,6 @@ pub(crate) async fn delete_3pid_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_3pid::v3::Request>,
 ) -> Result<delete_3pid::v3::Response> {
-	let sender_user = body.sender_user();
-
 	if body.medium != Medium::Email {
 		return Ok(delete_3pid::v3::Response::new(ThirdPartyIdRemovalStatus::NoSupport));
 	}
@@ -150,7 +157,7 @@ pub(crate) async fn delete_3pid_route(
 
 	if services
 		.threepid
-		.disassociate_localpart_email(sender_user.localpart())
+		.disassociate_localpart_email(body.identity.expect_sender_user()?.localpart())
 		.await
 		.is_none()
 	{

src/api/client/account_data.rs

@@ -22,9 +22,9 @@ pub(crate) async fn set_global_account_data_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_global_account_data::v3::Request>,
 ) -> Result<set_global_account_data::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
-	if sender_user != body.user_id && body.appservice_info.is_none() {
+	if sender_user != body.user_id && !body.identity.is_appservice() {
 		return Err!(Request(Forbidden("You cannot set account data for other users.")));
 	}
 
@@ -47,9 +47,9 @@ pub(crate) async fn set_room_account_data_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_room_account_data::v3::Request>,
 ) -> Result<set_room_account_data::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
-	if sender_user != body.user_id && body.appservice_info.is_none() {
+	if sender_user != body.user_id && !body.identity.is_appservice() {
 		return Err!(Request(Forbidden("You cannot set account data for other users.")));
 	}
 
@@ -72,9 +72,9 @@ pub(crate) async fn get_global_account_data_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_global_account_data::v3::Request>,
 ) -> Result<get_global_account_data::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
-	if sender_user != body.user_id && body.appservice_info.is_none() {
+	if sender_user != body.user_id && !body.identity.is_appservice() {
 		return Err!(Request(Forbidden("You cannot get account data of other users.")));
 	}
 
@@ -94,9 +94,9 @@ pub(crate) async fn get_room_account_data_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_room_account_data::v3::Request>,
 ) -> Result<get_room_account_data::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
-	if sender_user != body.user_id && body.appservice_info.is_none() {
+	if sender_user != body.user_id && !body.identity.is_appservice() {
 		return Err!(Request(Forbidden("You cannot get account data of other users.")));
 	}
 

src/api/client/admin/suspend.rs

@@ -12,10 +12,11 @@ pub(crate) async fn get_suspended_status(
 	State(services): State<crate::State>,
 	body: Ruma<get_suspended::v1::Request>,
 ) -> Result<get_suspended::v1::Response> {
-	let sender_user = body.sender_user();
-
-	let (admin, active) =
-		join(services.users.is_admin(sender_user), services.users.is_active(&body.user_id)).await;
+	let (admin, active) = join(
+		services.users.is_admin(body.identity.expect_sender_user()?),
+		services.users.is_active(&body.user_id),
+	)
+	.await;
 	if !admin {
 		return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
 	}
@@ -37,7 +38,7 @@ pub(crate) async fn put_suspended_status(
 	State(services): State<crate::State>,
 	body: Ruma<set_suspended::v1::Request>,
 ) -> Result<set_suspended::v1::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let (sender_admin, active, target_admin) = join3(
 		services.users.is_admin(sender_user),

src/api/client/alias.rs

@@ -11,7 +11,8 @@ pub(crate) async fn create_alias_route(
 	State(services): State<crate::State>,
 	body: Ruma<create_alias::v3::Request>,
 ) -> Result<create_alias::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
@@ -19,7 +20,7 @@ pub(crate) async fn create_alias_route(
 	services
 		.rooms
 		.alias
-		.appservice_checks(&body.room_alias, &body.appservice_info)
+		.appservice_checks(&body.room_alias, body.identity.appservice_info())
 		.await?;
 
 	// this isn't apart of alias_checks or delete alias route because we should
@@ -59,7 +60,8 @@ pub(crate) async fn delete_alias_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_alias::v3::Request>,
 ) -> Result<delete_alias::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
@@ -67,7 +69,7 @@ pub(crate) async fn delete_alias_route(
 	services
 		.rooms
 		.alias
-		.appservice_checks(&body.room_alias, &body.appservice_info)
+		.appservice_checks(&body.room_alias, body.identity.appservice_info())
 		.await?;
 
 	services

src/api/client/appservice.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
+use conduwuit::{Err, Result};
 use ruma::{
 	api::{appservice::ping, client::appservice::request_ping},
 	assign,
@@ -15,9 +15,7 @@ pub(crate) async fn appservice_ping(
 	State(services): State<crate::State>,
 	body: Ruma<request_ping::v1::Request>,
 ) -> Result<request_ping::v1::Response> {
-	let appservice_info = body.appservice_info.as_ref().ok_or_else(|| {
-		err!(Request(Forbidden("This endpoint can only be called by appservices.")))
-	})?;
+	let appservice_info = &body.identity;
 
 	if body.appservice_id != appservice_info.registration.id {
 		return Err!(Request(Forbidden(

src/api/client/backup.rs

@@ -25,7 +25,7 @@ pub(crate) async fn create_backup_version_route(
 ) -> Result<create_backup_version::v3::Response> {
 	let version = services
 		.key_backups
-		.create_backup(body.sender_user(), &body.algorithm)?;
+		.create_backup(body.identity.expect_sender_user()?, &body.algorithm)?;
 
 	Ok(create_backup_version::v3::Response::new(version))
 }
@@ -40,7 +40,7 @@ pub(crate) async fn update_backup_version_route(
 ) -> Result<update_backup_version::v3::Response> {
 	services
 		.key_backups
-		.update_backup(body.sender_user(), &body.version, &body.algorithm)
+		.update_backup(body.identity.expect_sender_user()?, &body.version, &body.algorithm)
 		.await?;
 
 	Ok(update_backup_version::v3::Response::new())
@@ -53,13 +53,15 @@ pub(crate) async fn get_latest_backup_info_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_latest_backup_info::v3::Request>,
 ) -> Result<get_latest_backup_info::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	let (version, algorithm) = services
 		.key_backups
-		.get_latest_backup(body.sender_user())
+		.get_latest_backup(sender_user)
 		.await
 		.map_err(|_| err!(Request(NotFound("Key backup does not exist."))))?;
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &version).await;
 
 	Ok(get_latest_backup_info::v3::Response::new(algorithm, count, etag, version))
 }
@@ -71,15 +73,17 @@ pub(crate) async fn get_backup_info_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_backup_info::v3::Request>,
 ) -> Result<get_backup_info::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	let algorithm = services
 		.key_backups
-		.get_backup(body.sender_user(), &body.version)
+		.get_backup(sender_user, &body.version)
 		.await
 		.map_err(|_| {
 			err!(Request(NotFound("Key backup does not exist at version {:?}", body.version)))
 		})?;
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(get_backup_info::v3::Response::new(algorithm, count, etag, body.version.clone()))
 }
@@ -96,7 +100,7 @@ pub(crate) async fn delete_backup_version_route(
 ) -> Result<delete_backup_version::v3::Response> {
 	services
 		.key_backups
-		.delete_backup(body.sender_user(), &body.version)
+		.delete_backup(body.identity.expect_sender_user()?, &body.version)
 		.await;
 
 	Ok(delete_backup_version::v3::Response::new())
@@ -114,9 +118,11 @@ pub(crate) async fn add_backup_keys_route(
 	State(services): State<crate::State>,
 	body: Ruma<add_backup_keys::v3::Request>,
 ) -> Result<add_backup_keys::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if services
 		.key_backups
-		.get_latest_backup_version(body.sender_user())
+		.get_latest_backup_version(sender_user)
 		.await
 		.is_ok_and(|version| version != body.version)
 	{
@@ -129,12 +135,12 @@ pub(crate) async fn add_backup_keys_route(
 		for (session_id, key_data) in &room.sessions {
 			services
 				.key_backups
-				.add_key(body.sender_user(), &body.version, room_id, session_id, key_data)
+				.add_key(sender_user, &body.version, room_id, session_id, key_data)
 				.await?;
 		}
 	}
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(add_backup_keys::v3::Response::new(etag, count))
 }
@@ -151,9 +157,11 @@ pub(crate) async fn add_backup_keys_for_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<add_backup_keys_for_room::v3::Request>,
 ) -> Result<add_backup_keys_for_room::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if services
 		.key_backups
-		.get_latest_backup_version(body.sender_user())
+		.get_latest_backup_version(sender_user)
 		.await
 		.is_ok_and(|version| version != body.version)
 	{
@@ -165,11 +173,11 @@ pub(crate) async fn add_backup_keys_for_room_route(
 	for (session_id, key_data) in &body.sessions {
 		services
 			.key_backups
-			.add_key(body.sender_user(), &body.version, &body.room_id, session_id, key_data)
+			.add_key(sender_user, &body.version, &body.room_id, session_id, key_data)
 			.await?;
 	}
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(add_backup_keys_for_room::v3::Response::new(etag, count))
 }
@@ -186,9 +194,11 @@ pub(crate) async fn add_backup_keys_for_session_route(
 	State(services): State<crate::State>,
 	body: Ruma<add_backup_keys_for_session::v3::Request>,
 ) -> Result<add_backup_keys_for_session::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if services
 		.key_backups
-		.get_latest_backup_version(body.sender_user())
+		.get_latest_backup_version(sender_user)
 		.await
 		.is_ok_and(|version| version != body.version)
 	{
@@ -201,7 +211,7 @@ pub(crate) async fn add_backup_keys_for_session_route(
 	let mut ok_to_replace = true;
 	if let Some(old_key) = &services
 		.key_backups
-		.get_session(body.sender_user(), &body.version, &body.room_id, &body.session_id)
+		.get_session(sender_user, &body.version, &body.room_id, &body.session_id)
 		.await
 		.ok()
 	{
@@ -260,7 +270,7 @@ pub(crate) async fn add_backup_keys_for_session_route(
 		services
 			.key_backups
 			.add_key(
-				body.sender_user(),
+				sender_user,
 				&body.version,
 				&body.room_id,
 				&body.session_id,
@@ -269,7 +279,7 @@ pub(crate) async fn add_backup_keys_for_session_route(
 			.await?;
 	}
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(add_backup_keys_for_session::v3::Response::new(etag, count))
 }
@@ -283,7 +293,7 @@ pub(crate) async fn get_backup_keys_route(
 ) -> Result<get_backup_keys::v3::Response> {
 	let rooms = services
 		.key_backups
-		.get_all(body.sender_user(), &body.version)
+		.get_all(body.identity.expect_sender_user()?, &body.version)
 		.await;
 
 	Ok(get_backup_keys::v3::Response::new(rooms))
@@ -298,7 +308,7 @@ pub(crate) async fn get_backup_keys_for_room_route(
 ) -> Result<get_backup_keys_for_room::v3::Response> {
 	let sessions = services
 		.key_backups
-		.get_room(body.sender_user(), &body.version, &body.room_id)
+		.get_room(body.identity.expect_sender_user()?, &body.version, &body.room_id)
 		.await;
 
 	Ok(get_backup_keys_for_room::v3::Response::new(sessions))
@@ -313,7 +323,12 @@ pub(crate) async fn get_backup_keys_for_session_route(
 ) -> Result<get_backup_keys_for_session::v3::Response> {
 	let key_data = services
 		.key_backups
-		.get_session(body.sender_user(), &body.version, &body.room_id, &body.session_id)
+		.get_session(
+			body.identity.expect_sender_user()?,
+			&body.version,
+			&body.room_id,
+			&body.session_id,
+		)
 		.await
 		.map_err(|_| {
 			err!(Request(NotFound(debug_error!("Backup key not found for this user's session."))))
@@ -329,12 +344,14 @@ pub(crate) async fn delete_backup_keys_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_backup_keys::v3::Request>,
 ) -> Result<delete_backup_keys::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	services
 		.key_backups
-		.delete_all_keys(body.sender_user(), &body.version)
+		.delete_all_keys(sender_user, &body.version)
 		.await;
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(delete_backup_keys::v3::Response::new(etag, count))
 }
@@ -346,12 +363,14 @@ pub(crate) async fn delete_backup_keys_for_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_backup_keys_for_room::v3::Request>,
 ) -> Result<delete_backup_keys_for_room::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	services
 		.key_backups
-		.delete_room_keys(body.sender_user(), &body.version, &body.room_id)
+		.delete_room_keys(sender_user, &body.version, &body.room_id)
 		.await;
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(delete_backup_keys_for_room::v3::Response::new(etag, count))
 }
@@ -363,12 +382,14 @@ pub(crate) async fn delete_backup_keys_for_session_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_backup_keys_for_session::v3::Request>,
 ) -> Result<delete_backup_keys_for_session::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	services
 		.key_backups
-		.delete_room_key(body.sender_user(), &body.version, &body.room_id, &body.session_id)
+		.delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)
 		.await;
 
-	let (count, etag) = get_count_etag(&services, body.sender_user(), &body.version).await;
+	let (count, etag) = get_count_etag(&services, sender_user, &body.version).await;
 
 	Ok(delete_backup_keys_for_session::v3::Response::new(etag, count))
 }

src/api/client/capabilities.rs

@@ -50,7 +50,7 @@ pub(crate) async fn get_capabilities_route(
 
 	if services
 		.users
-		.is_admin(body.sender_user.as_ref().unwrap())
+		.is_admin(body.identity.expect_sender_user()?)
 		.await
 	{
 		// Advertise suspension API

src/api/client/context.rs

@@ -37,8 +37,8 @@ pub(crate) async fn get_context_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_context::v3::Request>,
 ) -> Result<get_context::v3::Response> {
-	let sender = body.sender();
-	let (sender_user, sender_device) = sender;
+	let sender_user = body.identity.expect_sender_user()?;
+	let sender_device = body.identity.sender_device();
 	let room_id = &body.room_id;
 	let event_id = &body.event_id;
 	let filter = &body.filter;
@@ -143,7 +143,7 @@ pub(crate) async fn get_context_route(
 
 	let lazy_loading_context = lazy_loading::Context {
 		user_id: sender_user,
-		device_id: Some(sender_device),
+		device_id: sender_device,
 		room_id,
 		token: Some(base_count.into_unsigned()),
 		options: Some(&filter.lazy_load_options),

src/api/client/dehydrated_device.rs

@@ -25,16 +25,11 @@ pub(crate) async fn put_dehydrated_device_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<put_dehydrated_device::Request>,
 ) -> Result<put_dehydrated_device::Response> {
-	let sender_user = body
-		.sender_user
-		.as_deref()
-		.expect("AccessToken authentication required");
-
-	let device_id = body.body.device_id.clone();
+	let device_id = body.device_id.clone();
 
 	services
 		.users
-		.set_dehydrated_device(sender_user, body.body)
+		.set_dehydrated_device(body.identity.expect_sender_user()?, body.body)
 		.await?;
 
 	Ok(put_dehydrated_device::Response::new(device_id))
@@ -49,7 +44,7 @@ pub(crate) async fn delete_dehydrated_device_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<delete_dehydrated_device::Request>,
 ) -> Result<delete_dehydrated_device::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let device_id = services.users.get_dehydrated_device_id(sender_user).await?;
 
@@ -67,7 +62,7 @@ pub(crate) async fn get_dehydrated_device_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_dehydrated_device::Request>,
 ) -> Result<get_dehydrated_device::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let device = services.users.get_dehydrated_device(sender_user).await?;
 
@@ -83,7 +78,7 @@ pub(crate) async fn get_dehydrated_events_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_events::Request>,
 ) -> Result<get_events::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let device_id = &body.body.device_id;
 	let existing_id = services.users.get_dehydrated_device_id(sender_user).await;

src/api/client/device.rs

@@ -21,7 +21,7 @@ pub(crate) async fn get_devices_route(
 ) -> Result<get_devices::v3::Response> {
 	let devices: Vec<device::Device> = services
 		.users
-		.all_devices_metadata(body.sender_user())
+		.all_devices_metadata(body.identity.expect_sender_user()?)
 		.collect()
 		.await;
 
@@ -37,7 +37,7 @@ pub(crate) async fn get_device_route(
 ) -> Result<get_device::v3::Response> {
 	let device = services
 		.users
-		.get_device_metadata(body.sender_user(), &body.body.device_id)
+		.get_device_metadata(body.identity.expect_sender_user()?, &body.body.device_id)
 		.await
 		.map_err(|_| err!(Request(NotFound("Device not found."))))?;
 
@@ -53,8 +53,8 @@ pub(crate) async fn update_device_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<update_device::v3::Request>,
 ) -> Result<update_device::v3::Response> {
-	let sender_user = body.sender_user();
-	let appservice = body.appservice_info.as_ref();
+	let sender_user = body.identity.expect_sender_user()?;
+	let appservice = body.identity.appservice_info();
 
 	match services
 		.users
@@ -118,8 +118,8 @@ pub(crate) async fn delete_device_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_device::v3::Request>,
 ) -> Result<delete_device::v3::Response> {
-	let sender_user = body.sender_user();
-	let appservice = body.appservice_info.as_ref();
+	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() {
@@ -154,8 +154,8 @@ pub(crate) async fn delete_devices_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_devices::v3::Request>,
 ) -> Result<delete_devices::v3::Response> {
-	let sender_user = body.sender_user();
-	let appservice = body.appservice_info.as_ref();
+	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() {

src/api/client/directory.rs

@@ -112,7 +112,7 @@ pub(crate) async fn set_room_visibility_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<set_room_visibility::v3::Request>,
 ) -> Result<set_room_visibility::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	if !services.rooms.metadata.exists(&body.room_id).await {
 		// Return 404 if the room doesn't exist
@@ -130,7 +130,7 @@ pub(crate) async fn set_room_visibility_route(
 		| room::Visibility::Public => {
 			if services.server.config.lockdown_public_room_directory
 				&& !services.users.is_admin(sender_user).await
-				&& body.appservice_info.is_none()
+				&& !body.identity.is_appservice()
 			{
 				info!(
 					"Non-admin user {sender_user} tried to publish {0} to the room directory \

src/api/client/filter.rs

@@ -15,7 +15,7 @@ pub(crate) async fn get_filter_route(
 ) -> Result<get_filter::v3::Response> {
 	services
 		.users
-		.get_filter(body.sender_user(), &body.filter_id)
+		.get_filter(body.identity.expect_sender_user()?, &body.filter_id)
 		.await
 		.map(get_filter::v3::Response::new)
 		.map_err(|_| err!(Request(NotFound("Filter not found."))))
@@ -30,7 +30,7 @@ pub(crate) async fn create_filter_route(
 ) -> Result<create_filter::v3::Response> {
 	let filter_id = services
 		.users
-		.create_filter(body.sender_user(), &body.filter);
+		.create_filter(body.identity.expect_sender_user()?, &body.filter);
 
 	Ok(create_filter::v3::Response::new(filter_id))
 }

src/api/client/keys.rs

@@ -41,7 +41,8 @@ pub(crate) async fn upload_keys_route(
 	State(services): State<crate::State>,
 	body: Ruma<upload_keys::v3::Request>,
 ) -> Result<upload_keys::v3::Response> {
-	let (sender_user, sender_device) = body.sender();
+	let sender_user = body.identity.expect_sender_user()?;
+	let sender_device = body.identity.expect_sender_device()?;
 
 	for (key_id, one_time_key) in &body.one_time_keys {
 		if one_time_key
@@ -154,7 +155,7 @@ pub(crate) async fn get_keys_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_keys::v3::Request>,
 ) -> Result<get_keys::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	get_keys_helper(
 		&services,
@@ -191,7 +192,7 @@ pub(crate) async fn upload_signing_keys_route(
 	State(services): State<crate::State>,
 	body: Ruma<upload_signing_keys::v3::Request>,
 ) -> Result<upload_signing_keys::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	if uiaa_needed_to_upload_keys(
 		services,
@@ -287,7 +288,7 @@ pub(crate) async fn upload_signatures_route(
 		return Ok(upload_signatures::v3::Response::new());
 	}
 
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	for (user_id, keys) in &body.signed_keys {
 		for (key_id, key) in keys {
@@ -340,7 +341,7 @@ pub(crate) async fn get_key_changes_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_key_changes::v3::Request>,
 ) -> Result<get_key_changes::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let mut device_list_updates = HashSet::new();
 

src/api/client/media.rs

@@ -53,7 +53,7 @@ pub(crate) async fn create_content_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<create_content::v3::Request>,
 ) -> Result<create_content::v3::Response> {
-	let user = body.sender_user();
+	let user = body.identity.expect_sender_user()?;
 	if services.users.is_suspended(user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
@@ -92,7 +92,7 @@ pub(crate) async fn get_content_thumbnail_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_content_thumbnail::v1::Request>,
 ) -> Result<get_content_thumbnail::v1::Response> {
-	let user = body.sender_user();
+	let user = body.identity.expect_sender_user()?;
 
 	let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
 	let mxc = Mxc {
@@ -142,7 +142,7 @@ pub(crate) async fn get_content_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_content::v1::Request>,
 ) -> Result<get_content::v1::Response> {
-	let user = body.sender_user();
+	let user = body.identity.expect_sender_user()?;
 
 	let mxc = Mxc {
 		server_name: &body.server_name,
@@ -189,7 +189,7 @@ pub(crate) async fn get_content_as_filename_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_content_as_filename::v1::Request>,
 ) -> Result<get_content_as_filename::v1::Response> {
-	let user = body.sender_user();
+	let user = body.identity.expect_sender_user()?;
 
 	let mxc = Mxc {
 		server_name: &body.server_name,
@@ -240,7 +240,7 @@ pub(crate) async fn get_media_preview_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_media_preview::v1::Request>,
 ) -> Result<get_media_preview::v1::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let url = &body.url;
 	let url = Url::parse(&body.url).map_err(|e| {

src/api/client/media_legacy.rs

@@ -56,7 +56,7 @@ pub(crate) async fn get_media_preview_legacy_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<get_media_preview::v3::Request>,
 ) -> Result<get_media_preview::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let url = &body.url;
 	let url = Url::parse(&body.url).map_err(|e| {

src/api/client/membership/ban.rs

@@ -15,7 +15,7 @@ pub(crate) async fn ban_user_route(
 	State(services): State<crate::State>,
 	body: Ruma<ban_user::v3::Request>,
 ) -> Result<ban_user::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user == body.user_id {
 		return Err!(Request(Forbidden("You cannot ban yourself.")));

src/api/client/membership/forget.rs

@@ -18,7 +18,7 @@ pub(crate) async fn forget_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<forget_room::v3::Request>,
 ) -> Result<forget_room::v3::Response> {
-	let user_id = body.sender_user();
+	let user_id = body.identity.expect_sender_user()?;
 	let room_id = &body.room_id;
 
 	let joined = services.rooms.state_cache.is_joined(user_id, room_id);

src/api/client/membership/invite.rs

@@ -29,7 +29,7 @@ pub(crate) async fn invite_user_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<invite_user::v3::Request>,
 ) -> Result<invite_user::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}

src/api/client/membership/join.rs

@@ -28,7 +28,7 @@ pub(crate) async fn join_room_by_id_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<join_room_by_id::v3::Request>,
 ) -> Result<join_room_by_id::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
@@ -97,7 +97,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<join_room_by_id_or_alias::v3::Request>,
 ) -> Result<join_room_by_id_or_alias::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	let body = &body.body;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));

src/api/client/membership/kick.rs

@@ -15,7 +15,7 @@ pub(crate) async fn kick_user_route(
 	State(services): State<crate::State>,
 	body: Ruma<kick_user::v3::Request>,
 ) -> Result<kick_user::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}

src/api/client/membership/knock.rs

@@ -51,7 +51,7 @@ pub(crate) async fn knock_room_route(
 	ClientIp(client): ClientIp,
 	body: Ruma<knock_room::v3::Request>,
 ) -> Result<knock_room::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	let body = &body.body;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));

src/api/client/membership/leave.rs

@@ -32,10 +32,15 @@ pub(crate) async fn leave_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<leave_room::v3::Request>,
 ) -> Result<leave_room::v3::Response> {
-	leave_room(&services, body.sender_user(), &body.room_id, body.reason.clone())
-		.boxed()
-		.await
-		.map(|()| leave_room::v3::Response::new())
+	leave_room(
+		&services,
+		body.identity.expect_sender_user()?,
+		&body.room_id,
+		body.reason.clone(),
+	)
+	.boxed()
+	.await
+	.map(|()| leave_room::v3::Response::new())
 }
 
 // Make a user leave all their joined rooms, rescinds knocks, forgets all rooms,

src/api/client/membership/members.rs

@@ -30,7 +30,7 @@ pub(crate) async fn get_member_events_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_member_events::v3::Request>,
 ) -> Result<get_member_events::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	let membership = body.membership.as_ref();
 	let not_membership = body.not_membership.as_ref();
 
@@ -72,7 +72,7 @@ pub(crate) async fn joined_members_route(
 	if !services
 		.rooms
 		.state_accessor
-		.user_can_see_state_events(body.sender_user(), &body.room_id)
+		.user_can_see_state_events(body.identity.expect_sender_user()?, &body.room_id)
 		.await
 	{
 		return Err!(Request(Forbidden("You don't have permission to view this room.")));

src/api/client/membership/mod.rs

@@ -40,7 +40,7 @@ pub(crate) async fn joined_rooms_route(
 	let joined_rooms = services
 		.rooms
 		.state_cache
-		.rooms_joined(body.sender_user())
+		.rooms_joined(body.identity.expect_sender_user()?)
 		.collect()
 		.await;
 

src/api/client/membership/unban.rs

@@ -14,7 +14,7 @@ pub(crate) async fn unban_user_route(
 	State(services): State<crate::State>,
 	body: Ruma<unban_user::v3::Request>,
 ) -> Result<unban_user::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	if services.users.is_suspended(sender_user).await? {
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}

src/api/client/message.rs

@@ -23,7 +23,7 @@
 };
 use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
 use ruma::{
-	DeviceId, RoomId, UserId,
+	RoomId, UserId,
 	api::{
 		Direction,
 		client::{filter::RoomEventFilter, message::get_message_events},
@@ -37,7 +37,6 @@
 	serde::Raw,
 };
 use ruminuwuity::invite_permission_config::FilterLevel;
-use tracing::warn;
 
 use crate::Ruma;
 
@@ -76,8 +75,8 @@ pub(crate) async fn get_message_events_route(
 	ClientIp(client_ip): ClientIp,
 	body: Ruma<get_message_events::v3::Request>,
 ) -> Result<get_message_events::v3::Response> {
-	let sender_user = body.sender_user();
-	let sender_device = body.sender_device.as_deref();
+	let sender_user = body.identity.expect_sender_user()?;
+	let sender_device = body.identity.sender_device();
 	let room_id = &body.room_id;
 	let filter = &body.filter;
 
@@ -158,17 +157,7 @@ pub(crate) async fn get_message_events_route(
 
 	let lazy_loading_context = lazy_loading::Context {
 		user_id: sender_user,
-		device_id: sender_device.or_else(|| {
-			if let Some(registration) = body.appservice_info.as_ref() {
-				Some(<&DeviceId>::from(registration.registration.id.as_str()))
-			} else {
-				warn!(
-					"No device_id provided and no appservice registration found, this should be \
-					 unreachable"
-				);
-				None
-			}
-		}),
+		device_id: sender_device,
 		room_id,
 		token: Some(from.into_unsigned()),
 		options: Some(&filter.lazy_load_options),

src/api/client/mutual_rooms.rs

@@ -15,7 +15,7 @@ pub(crate) async fn get_mutual_rooms_route(
 	State(services): State<crate::State>,
 	body: Ruma<mutual_rooms::unstable::Request>,
 ) -> Result<mutual_rooms::unstable::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user == body.user_id {
 		return Err!(Request(Unknown("You cannot request rooms in common with yourself.")));

src/api/client/openid.rs

@@ -16,7 +16,7 @@ pub(crate) async fn create_openid_token_route(
 	State(services): State<crate::State>,
 	body: Ruma<account::request_openid_token::v3::Request>,
 ) -> Result<account::request_openid_token::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user != body.user_id {
 		return Err!(Request(InvalidParam(

src/api/client/presence.rs

@@ -16,17 +16,19 @@ pub(crate) async fn set_presence_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_presence::v3::Request>,
 ) -> Result<set_presence::v3::Response> {
+	let sender_user = body.identity.expect_sender_user()?;
+
 	if !services.config.allow_local_presence {
 		return Err!(Request(Forbidden("Presence is disabled on this server")));
 	}
 
-	if body.sender_user() != body.user_id && body.appservice_info.is_none() {
+	if sender_user != body.user_id && !body.identity.is_appservice() {
 		return Err!(Request(InvalidParam("Not allowed to set presence of other users")));
 	}
 
 	services
 		.presence
-		.set_presence(body.sender_user(), &body.presence, None, None, body.status_msg.clone())
+		.set_presence(sender_user, &body.presence, None, None, body.status_msg.clone())
 		.await?;
 
 	Ok(set_presence::v3::Response::new())
@@ -49,7 +51,7 @@ pub(crate) async fn get_presence_route(
 	let has_shared_rooms = services
 		.rooms
 		.state_cache
-		.user_sees_user(body.sender_user(), &body.user_id)
+		.user_sees_user(body.identity.expect_sender_user()?, &body.user_id)
 		.await;
 
 	if has_shared_rooms {

src/api/client/profile.rs

@@ -8,12 +8,12 @@
 	UserId,
 	api::{
 		client::profile::{
-			delete_profile_field, get_profile, get_profile_field, set_profile_field,
+			PropagateTo, delete_profile_field, get_profile, get_profile_field, set_profile_field,
 		},
 		federation,
 	},
 	assign,
-	events::room::member::{MembershipState, RoomMemberEventContent},
+	events::room::member::MembershipState,
 	presence::PresenceState,
 	profile::{ProfileFieldName, ProfileFieldValue},
 };
@@ -51,9 +51,12 @@ pub(crate) async fn set_profile_field_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_profile_field::v3::Request>,
 ) -> Result<set_profile_field::v3::Response> {
-	if body.user_id != body.sender_user()
-		&& !(body.appservice_info.is_some()
-			|| services.admin.user_is_admin(body.sender_user()).await)
+	if body.user_id != body.identity.expect_sender_user()?
+		&& !(body.identity.is_appservice()
+			|| services
+				.admin
+				.user_is_admin(body.identity.expect_sender_user()?)
+				.await)
 	{
 		return Err!(Request(Forbidden("You may not change other users' profile data.")));
 	}
@@ -62,8 +65,13 @@ 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()))
-		.await?;
+	set_profile_field(
+		&services,
+		&body.user_id,
+		ProfileFieldChange::Set(body.value.clone()),
+		body.propagate_to.clone(),
+	)
+	.await?;
 
 	Ok(set_profile_field::v3::Response::new())
 }
@@ -72,9 +80,12 @@ pub(crate) async fn delete_profile_field_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_profile_field::v3::Request>,
 ) -> Result<delete_profile_field::v3::Response> {
-	if body.user_id != body.sender_user()
-		&& !(body.appservice_info.is_some()
-			|| services.admin.user_is_admin(body.sender_user()).await)
+	if body.user_id != body.identity.expect_sender_user()?
+		&& !(body.identity.is_appservice()
+			|| services
+				.admin
+				.user_is_admin(body.identity.expect_sender_user()?)
+				.await)
 	{
 		return Err!(Request(Forbidden("You may not change other users' profile data.")));
 	}
@@ -83,8 +94,13 @@ 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()))
-		.await?;
+	set_profile_field(
+		&services,
+		&body.user_id,
+		ProfileFieldChange::Delete(body.field.clone()),
+		body.propagate_to.clone(),
+	)
+	.await?;
 
 	Ok(delete_profile_field::v3::Response::new())
 }
@@ -119,7 +135,13 @@ async fn fetch_full_profile(
 			continue;
 		};
 
-		let _ = set_profile_field(services, user_id, ProfileFieldChange::Set(value)).await;
+		let _ = set_profile_field(
+			services,
+			user_id,
+			ProfileFieldChange::Set(value),
+			PropagateTo::None,
+		)
+		.await;
 	}
 
 	Some(BTreeMap::from_iter(response))
@@ -153,8 +175,13 @@ 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()))
-				.await;
+			let _ = set_profile_field(
+				services,
+				user_id,
+				ProfileFieldChange::Set(value.clone()),
+				PropagateTo::None,
+			)
+			.await;
 
 			Ok(Some(value))
 		} else {
@@ -163,7 +190,13 @@ async fn fetch_profile_field(
 			)))
 		}
 	} else {
-		let _ = set_profile_field(services, user_id, ProfileFieldChange::Delete(field)).await;
+		let _ = set_profile_field(
+			services,
+			user_id,
+			ProfileFieldChange::Delete(field),
+			PropagateTo::None,
+		)
+		.await;
 
 		Ok(None)
 	}
@@ -256,6 +289,7 @@ 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;
@@ -303,6 +337,91 @@ async fn set_profile_field(
 		}
 	}
 
+	// 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
@@ -326,42 +445,5 @@ async fn set_profile_field(
 				.set_profile_key(user_id, other.field_name().as_str(), other.value()),
 	}
 
-	// If the user is local and changed their displayname or avatar_url, update it
-	// in all their joined rooms
-	if matches!(field_name, ProfileFieldName::AvatarUrl | ProfileFieldName::DisplayName)
-		&& services.globals.user_is_local(user_id)
-	{
-		let displayname = services.users.displayname(user_id).await.ok();
-		let avatar_url = services.users.avatar_url(user_id).await.ok();
-		let membership_content = assign!(
-			RoomMemberEventContent::new(MembershipState::Join), { displayname, avatar_url }
-		);
-
-		let mut all_joined_rooms = services.rooms.state_cache.rooms_joined(user_id);
-
-		while let Some(room_id) = all_joined_rooms.next().await {
-			let state_lock = services.rooms.state.mutex.lock(room_id.as_str()).await;
-
-			let _ = services
-				.rooms
-				.timeline
-				.build_and_append_pdu(
-					PartialPdu::state(user_id.to_string(), &membership_content),
-					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;
-		}
-	}
-
 	Ok(())
 }

src/api/client/push.rs

@@ -30,7 +30,7 @@ pub(crate) async fn get_pushrules_all_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushrules_all::v3::Request>,
 ) -> Result<get_pushrules_all::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let Some(content_value) = services
 		.account_data
@@ -101,7 +101,7 @@ pub(crate) async fn get_pushrules_global_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushrules_global_scope::v3::Request>,
 ) -> Result<get_pushrules_global_scope::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let Some(content_value) = services
 		.account_data
@@ -189,7 +189,7 @@ pub(crate) async fn get_pushrule_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushrule::v3::Request>,
 ) -> Result<get_pushrule::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	let sender_user = body.identity.expect_sender_user()?;
 
 	// remove old deprecated mentions push rules as per MSC4210
 	#[allow(deprecated)]
@@ -226,7 +226,7 @@ pub(crate) async fn set_pushrule_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_pushrule::v3::Request>,
 ) -> Result<set_pushrule::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 	let body = &body.body;
 	let mut account_data: PushRulesEvent = services
 		.account_data
@@ -282,7 +282,7 @@ pub(crate) async fn get_pushrule_actions_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushrule_actions::v3::Request>,
 ) -> Result<get_pushrule_actions::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	// remove old deprecated mentions push rules as per MSC4210
 	#[allow(deprecated)]
@@ -316,7 +316,7 @@ pub(crate) async fn set_pushrule_actions_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_pushrule_actions::v3::Request>,
 ) -> Result<set_pushrule_actions::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let mut account_data: PushRulesEvent = services
 		.account_data
@@ -349,7 +349,7 @@ pub(crate) async fn get_pushrule_enabled_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushrule_enabled::v3::Request>,
 ) -> Result<get_pushrule_enabled::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	// remove old deprecated mentions push rules as per MSC4210
 	#[allow(deprecated)]
@@ -383,7 +383,7 @@ pub(crate) async fn set_pushrule_enabled_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_pushrule_enabled::v3::Request>,
 ) -> Result<set_pushrule_enabled::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let mut account_data: PushRulesEvent = services
 		.account_data
@@ -416,7 +416,7 @@ pub(crate) async fn delete_pushrule_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_pushrule::v3::Request>,
 ) -> Result<delete_pushrule::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	let mut account_data: PushRulesEvent = services
 		.account_data
@@ -458,7 +458,7 @@ pub(crate) async fn get_pushers_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_pushers::v3::Request>,
 ) -> Result<get_pushers::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
 
 	Ok(get_pushers::v3::Response::new(services.pusher.get_pushers(sender_user).await))
 }
@@ -472,11 +472,12 @@ pub(crate) async fn set_pushers_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_pusher::v3::Request>,
 ) -> Result<set_pusher::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.identity.expect_sender_user()?;
+	let sender_device = body.identity.expect_sender_device()?;
 
 	services
 		.pusher
-		.set_pusher(sender_user, body.sender_device(), &body.action)
+		.set_pusher(sender_user, sender_device, &body.action)
 		.await?;
 
 	Ok(set_pusher::v3::Response::new())