fix: Pin aws-lc-rs and aws-lc-sys to older version

works around build issue:
https://github.com/aws/aws-lc-rs/issues/1168

.forgejo/actions/create-docker-manifest/action.yml

@@ -44,7 +44,7 @@ runs:
 
     - name: Login to builtin registry
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
-      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
+      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
       with:
         registry: ${{ env.BUILTIN_REGISTRY }}
         username: ${{ inputs.registry_user }}
@@ -52,7 +52,7 @@ runs:
 
     - name: Set up Docker Buildx
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
-      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
+      uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
       with:
         # Use persistent BuildKit if BUILDKIT_ENDPOINT is set (e.g. tcp://buildkit:8125)
         driver: ${{ env.BUILDKIT_ENDPOINT != '' && 'remote' || 'docker-container' }}
@@ -61,7 +61,7 @@ runs:
     - name: Extract metadata (tags) for Docker
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
       id: meta
-      uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6
+      uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
       with:
         flavor: |
           latest=auto

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

@@ -67,7 +67,7 @@ runs:
       uses: ./.forgejo/actions/rust-toolchain
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
+      uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
       with:
         # Use persistent BuildKit if BUILDKIT_ENDPOINT is set (e.g. tcp://buildkit:8125)
         driver: ${{ env.BUILDKIT_ENDPOINT != '' && 'remote' || 'docker-container' }}
@@ -75,11 +75,11 @@ 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' }}
-      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
+      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
       with:
         registry: ${{ env.BUILTIN_REGISTRY }}
         username: ${{ inputs.registry_user }}
@@ -87,7 +87,7 @@ runs:
 
     - name: Extract metadata (labels, annotations) for Docker
       id: meta
-      uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6
+      uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
       with:
         images: ${{ inputs.images }}
         # default labels & annotations: https://github.com/docker/metadata-action/blob/master/src/meta.ts#L509

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

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

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

@@ -17,7 +17,7 @@ inputs:
   llvm-version:
     description: 'LLVM version to install'
     required: false
-    default: '20'
+    default: '21'
 
 outputs:
   llvm-version:
@@ -57,7 +57,7 @@ runs:
 
     - name: Check for LLVM cache
       id: cache
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
       with:
         path: |
           /usr/bin/clang-*

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

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

.forgejo/actions/timelord/action.yml

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

.forgejo/workflows/auto-labeler.yml

@@ -28,7 +28,7 @@ jobs:
             const labelsToAdd = new Set();
 
             for (const file of fileNames) {
-              if (file.startsWith('docs/') || file.startsWith('theme/') || file.endsWith('.md') || file == 'rspress.config.ts') {
+              if (file.startsWith('docs/') || file.startsWith('theme/') || (file.endsWith('.md') && !file.startsWith('changelog.d/')) || file == 'rspress.config.ts') {
                 labelsToAdd.add('Documentation');
               }
               if (file.startsWith('.forgejo/')) {

.forgejo/workflows/build-debian.yml

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

.forgejo/workflows/build-fedora.yml

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

.forgejo/workflows/build-nix.yml

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

.forgejo/workflows/check-changelog.yml

@@ -14,23 +14,19 @@ jobs:
     name: Check changelog is added
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@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
@@ -37,7 +37,7 @@ jobs:
           node-version: 22
 
       - name: Cache npm dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: ~/.npm
           key: continuwuity-rspress-${{ steps.runner-env.outputs.slug }}-${{ steps.runner-env.outputs.arch }}-node-${{ steps.runner-env.outputs.node_version }}-${{ hashFiles('package-lock.json') }}
@@ -56,7 +56,7 @@ jobs:
 
       - name: Deploy to Cloudflare Pages (Production)
         if: github.ref == 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
-        uses: https://github.com/cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3
+        uses: https://github.com/cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4
         with:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
@@ -64,7 +64,7 @@ jobs:
 
       - name: Deploy to Cloudflare Pages (Preview)
         if: github.ref != 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
-        uses: https://github.com/cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3
+        uses: https://github.com/cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4
         with:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.forgejo/workflows/element.yml

@@ -121,7 +121,7 @@ jobs:
       - name: 🚀 Deploy to Cloudflare Pages
         if: vars.CLOUDFLARE_PROJECT_NAME != ''
         id: deploy
-        uses: https://github.com/cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3
+        uses: https://github.com/cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0 # v4
         with:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.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@f3c6d87835906c175eb6ccfc18b348b69bb447e7 # main
+        uses: https://github.com/regclient/actions/regsync-installer@9a2d4216180dbb3e2dccfa60d2dd4afd98e42ec5 # main
 
       - name: Check what images need mirroring
         run: |

.forgejo/workflows/prek-checks.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@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
@@ -62,7 +62,7 @@ jobs:
           registry_password: ${{ secrets.BUILTIN_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }}
       - name: Build and push Docker image by digest
         id: build
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
         with:
           context: .
           file: "docker/Dockerfile"
@@ -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
@@ -149,7 +149,7 @@ jobs:
           registry_password: ${{ secrets.BUILTIN_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }}
       - name: Build and push max-perf Docker image by digest
         id: build
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
         with:
           context: .
           file: "docker/Dockerfile"
@@ -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@v2
+        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.140.0@sha256:61303c28b10a491c559529fb6f41745850e4755a43a54c04c3ae6848d6eaf5cc
+      image: ghcr.io/renovatebot/renovate:43.246.1@sha256:5965c08f8ca5baff8dc9bf3a32c44ca71fef843ad94880e9696d46e1d722b0fa
       options: --tmpfs /tmp:exec
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           show-progress: false
 
@@ -55,7 +55,7 @@ jobs:
         run: /usr/local/renovate/node -e 'console.log(`node heap limit = ${require("v8").getHeapStatistics().heap_size_limit / (1024 * 1024)} Mb`)'
 
       - name: Restore renovate repo cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: |
             /tmp/renovate/cache/renovate/repository
@@ -64,7 +64,7 @@ jobs:
             renovate-repo-cache-
 
       - name: Restore renovate package cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: |
             /tmp/renovate/cache/renovate/renovate-cache-sqlite
@@ -73,7 +73,7 @@ jobs:
             renovate-package-cache-
 
       - name: Restore renovate OSV cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: |
             /tmp/osv
@@ -117,7 +117,7 @@ jobs:
 
       - name: Save renovate package cache
         if: always()
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: |
             /tmp/renovate/cache/renovate/renovate-cache-sqlite
@@ -125,7 +125,7 @@ jobs:
 
       - name: Save renovate OSV cache
         if: always()
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
         with:
           path: |
             /tmp/osv

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

@@ -14,7 +14,7 @@ jobs:
   update-flake-hashes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@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.0
+    rev: v1.47.2
     hooks:
       - id: typos
       - id: typos

CODE_OF_CONDUCT.md

@@ -1 +1 @@
-Contributors are expected to follow the [Continuwuity Community Guidelines](continuwuity.org/community/guidelines).
+Contributors are expected to follow the [Continuwuity Community Guidelines](https://continuwuity.org/community/guidelines).

CONTRIBUTING.md

@@ -137,9 +137,9 @@ ### Commit Messages
 
 Examples:
 ```
-feat: add user authentication
-fix(database): resolve connection pooling issue
-docs: update installation instructions
+feat: Add user authentication
+fix(database): Resolve connection pooling issue
+docs: Update installation instructions
 ```
 
 The project uses the `committed` hook to validate commit messages in pre-commit. This ensures all commits follow the conventional format.

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.8"
+version = "26.6.0-alpha.1"
 
 [workspace.metadata.crane]
 name = "conduwuit"
@@ -39,13 +39,13 @@ features = ["ffi", "std", "union"]
 version = "1.1.0"
 
 [workspace.dependencies.ctor]
-version = "0.13.0"
+version = "1.0.6"
 
 [workspace.dependencies.dtor]
-version = "0.13.0"
+version = "1.0.0"
 
 [workspace.dependencies.cargo_toml]
-version = "0.22"
+version = "1.0"
 default-features = false
 features = ["features"]
 
@@ -124,7 +124,7 @@ default-features = false
 features = ["util"]
 
 [workspace.dependencies.tower-http]
-version = "0.6.8"
+version = "0.7.0"
 default-features = false
 features = [
     "add-extension",
@@ -141,6 +141,12 @@ features = [
 version = "0.23.25"
 default-features = false
 
+[workspace.dependencies.aws-lc-sys]
+version = "0.41.0"
+
+[workspace.dependencies.aws-lc-rs]
+version = "1.17.0"
+
 [workspace.dependencies.reqwest]
 version = "0.13.2"
 default-features = false
@@ -164,7 +170,7 @@ features = ["raw_value"]
 
 # Used for appservice registration files
 [workspace.dependencies.serde-saphyr]
-version = "0.0.25"
+version = "0.0.28"
 
 # Used to load forbidden room/user regex from config
 [workspace.dependencies.serde_regex]
@@ -180,7 +186,7 @@ version = "0.5.3"
 features = ["alloc", "rand"]
 default-features = false
 
-# Used to generate thumbnails for images & blurhashes
+# Used to generate thumbnails for images
 [workspace.dependencies.image]
 version = "0.25.5"
 default-features = false
@@ -191,14 +197,6 @@ features = [
     "webp",
 ]
 
-[workspace.dependencies.blurhash]
-version = "0.2.3"
-default-features = false
-features = [
-    "fast-linear-to-srgb",
-    "image",
-]
-
 # logging
 [workspace.dependencies.log]
 version = "0.4.27"
@@ -304,7 +302,7 @@ default-features = false
 features = ["env", "toml"]
 
 [workspace.dependencies.hickory-resolver]
-version = "0.25.2"
+version = "0.26.0"
 default-features = false
 features = [
     "serde",
@@ -324,7 +322,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?
@@ -352,7 +350,7 @@ version = "1.1.1"
 [workspace.dependencies.ruma]
 # version = "0.14.1"
 git = "https://github.com/ruma/ruma.git"
-rev = "5742fec0021b85fedbf5cd1f59c50a00bb5b9f7c"
+rev = "3ecd80b92794d2d93f657a7b3db62d4be237526b"
 features = [
     "appservice-api-c",
     "client-api",
@@ -364,7 +362,7 @@ features = [
     "ring-compat",
     "compat-upload-signatures",
     "compat-optional-txn-pdus",
-    "unstable-msc2448",
+    "compat-get-3pids",
     "unstable-msc2666",
     "unstable-msc2867",
     "unstable-msc2870",
@@ -382,18 +380,18 @@ features = [
     "unstable-msc4195",
     "unstable-msc4203",
     "unstable-msc4310",
-    "unstable-msc4373",
     "unstable-msc4380",
     "unstable-msc4143",
     "unstable-msc4293",
     "unstable-msc4406",
     "unstable-msc4439",
+    "unstable-msc4466",
     "unstable-extensible-events",
 ]
 
 [workspace.dependencies.rust-rocksdb]
 git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1"
-rev = "31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9"
+rev = "0a25ff92f7c09b55eec496b9c192c7d5136ab2b8"
 default-features = false
 features = [
     "multi-threaded-cf",
@@ -411,22 +409,25 @@ default-features = false
 version = "0.11.0"
 default-features = false
 
+[workspace.dependencies.openidconnect]
+version = "4.0.1"
+
 # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
 [workspace.dependencies.opentelemetry]
-version = "0.31.0"
+version = "0.32.0"
 
 [workspace.dependencies.tracing-flame]
 version = "0.2.0"
 
 [workspace.dependencies.tracing-opentelemetry]
-version = "0.32.0"
+version = "0.33.0"
 
 [workspace.dependencies.opentelemetry_sdk]
-version = "0.31.0"
+version = "0.32.0"
 features = ["rt-tokio"]
 
 [workspace.dependencies.opentelemetry-otlp]
-version = "0.31.0"
+version = "0.32.0"
 features = ["http", "grpc-tonic", "trace", "logs", "metrics"]
 
 
@@ -543,7 +544,7 @@ version = "2.1.1"
 features = ["std"]
 
 [workspace.dependencies.minicbor-serde]
-version = "0.6.0"
+version = "0.7.0"
 features = ["std"]
 
 [workspace.dependencies.maplit]
@@ -568,6 +569,12 @@ features = ["std"]
 [workspace.dependencies.nonzero_ext]
 version = "0.3.0"
 
+[workspace.dependencies.resolvematrix]
+version = "0.1.0"
+
+[workspace.dependencies.serde_urlencoded]
+version = "0.7.1"
+
 #
 # Patches
 #

SECURITY.md

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

changelog.d/+12935c96.feature.md

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

changelog.d/+32bb7e0d.bugfix.md

@@ -0,0 +1 @@
+Improved invite and join reliability in clients using legacy sync. Contributed by @ginger

changelog.d/+7865cde6.feature.md

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

changelog.d/+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/+98691708.feature.md

@@ -0,0 +1 @@
+Added support for authenticating clients using the new OAuth 2.0 login API. 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/+cbef004c.removal.md

@@ -0,0 +1 @@
+The deprecated `well_known.rtc_focus_server_urls` config option has been removed. MatrixRTC foci should be configured using the `matrix_rtc.foci` config option.

changelog.d/+f7afb79b.misc.md

@@ -0,0 +1 @@
+The version of Debian that the Docker-based build process uses has been upgraded from Bookworm to Trixie, meaning that standalone binaries now have a minimum glibc of 2.41, and can no longer be used on distro versions from before 2025-01-30

changelog.d/+fe90cdea.removal.md

@@ -0,0 +1 @@
+Support for server-side blurhashing (part of MSC2448) has been removed.

changelog.d/1487.feature

@@ -0,0 +1 @@
+Updated [MSC4284: Policy Servers](https://github.com/matrix-org/matrix-spec-proposals/pull/4284) implementation to support the newly stabilised proposal. Contributed by @nex.

changelog.d/1505.refactor.md

@@ -0,0 +1 @@
+Rewrite the resolver service to use [resolvematrix](https://forgejo.ellis.link/continuwuation/resolvematrix) for server resolution. Rewrite by @s1lv3r, crate by @Jade

changelog.d/1691.feature

@@ -0,0 +1 @@
+Added config option for default room ACLs. Contributed by @eve.

changelog.d/1742.bugfix

@@ -0,0 +1 @@
+fix `!admin query account-data account-data-get` not returning the content

changelog.d/1747.feature.md

@@ -0,0 +1,9 @@
+Implemented event rejection, which should resolve and prevent future netsplits of the kinds observed
+within some Continuwuity rooms.
+Also resolved several bugs related to both soft-failing events, and event backfilling, which should
+improve state resolution stability.
+The `!admin debug get-pdu` command was updated to disambiguate event acceptance status, and
+`!admin debug show-auth-chain` was added to visually display event auth chains, which may assist
+developers in debugging strangely complex events.
+
+Contributed by @nex.

changelog.d/1752.bugfix

@@ -0,0 +1 @@
+Fixed an issue where Continuwuity would only advertise support for the unstable endpoint for Mutual Rooms (MSC2666), despite only supporting the stable endpoint. Contributed by @Henry-Hiles (QuadRadical)

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

@@ -0,0 +1 @@
+Fixed several bugs in the `POST /_matrix/client/v3/rooms/{roomId}/upgrade` endpoint. Contributed by @nex.

changelog.d/1807.feature.md

@@ -0,0 +1 @@
+Added full support for [MSC4168: Update `m.space.*` state on room upgrade](https://github.com/matrix-org/matrix-spec-proposals/pull/4168). Contributed by @nex.

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/765.feature.md

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

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
@@ -372,21 +372,18 @@
 #
 #federation_timeout = 60
 
-# MSC4284 Policy server request timeout (seconds). Generally policy
+# Policy server request timeout (seconds). Generally policy
 # servers should respond near instantly, however may slow down under
 # load. If a policy server doesn't respond in a short amount of time, the
 # room it is configured in may become unusable if this limit is set too
-# high. 10 seconds is a good default, however dropping this to 3-5 seconds
-# can be acceptable.
+# high. 30 seconds is a good default, however lower values may be
+# acceptable if temporary send failures are an okay trade-off.
 #
-# Please be aware that policy requests are *NOT* currently re-tried, so if
-# a spam check request fails, the event will be assumed to be not spam,
-# which in some cases may result in spam being sent to or received from
-# the room that would typically be prevented.
 #
 # About policy servers: https://matrix.org/blog/2025/04/introducing-policy-servers/
+# (Stabilized in Matrix v1.18)
 #
-#policy_server_request_timeout = 10
+#policy_server_request_timeout = 30
 
 # Federation client idle connection pool timeout (seconds).
 #
@@ -524,17 +521,15 @@
 #
 #recaptcha_private_site_key =
 
-# Policy documents, such as terms and conditions or a privacy policy,
-# which users must agree to when registering an account.
+# Controls whether users are allowed to deactivate their own accounts
+# through the account management panel or their Matrix clients. Server
+# admins can always deactivate users using the relevant admin commands.
 #
-# Example:
-# ```ignore
-# [global.registration_terms.privacy_policy]
-# en = { name = "Privacy Policy", url = "https://homeserver.example/en/privacy_policy.html" }
-# es = { name = "Política de Privacidad", url = "https://homeserver.example/es/privacy_policy.html" }
-# ```
+# Note that, in some jurisdictions, you may be legally required to honor
+# users who request to deactivate their accounts if you set this option
+# to `false`.
 #
-#registration_terms = {}
+#allow_deactivation = true
 
 # Controls whether encrypted rooms and events are allowed.
 #
@@ -624,6 +619,38 @@
 #
 #default_room_version = "12"
 
+# A default allow value for the Access Control List when creating a room.
+#
+# If a list is provided, new rooms will be created with
+# a m.room.server_acl event. Only servers which match one of the patterns
+# in the list will be permitted to participate in the room.
+#
+# ACLs in existing rooms will not be updated automatically. This is not
+# a substitute for moderation bots.
+#
+#default_room_acl_allow =
+
+# A default deny value for the Access Control List when creating a room.
+#
+# If a list is provided, new rooms will be created with
+# a m.room.server_acl event. Servers which match one of the patterns
+# in the list will be NOT permitted to participate in the room.
+#
+# This config cannot be used if the default_room_acl_allow config is used.
+#
+# ACLs in existing rooms will not be updated automatically. This is not
+# a substitute for moderation bots.
+#
+#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.
@@ -1407,6 +1434,11 @@
 #
 #send_messages_from_ignored_users_to_client = false
 
+# Send "org.matrix.dummy_event" events to the client. This is a debugging
+# option.
+#
+#send_dummy_events_to_clients = false
+
 # Vector list of IPv4 and IPv6 CIDR ranges / subnets *in quotes* that you
 # do not want continuwuity to send outbound requests to. Defaults to
 # RFC1918, unroutable, loopback, multicast, and testnet addresses for
@@ -1570,19 +1602,6 @@
 #
 #block_non_admin_invites = false
 
-# Enable or disable making requests to MSC4284 Policy Servers.
-# It is recommended you keep this enabled unless you experience frequent
-# connectivity issues, such as in a restricted networking environment.
-#
-#enable_msc4284_policy_servers = true
-
-# Enable running locally generated events through configured MSC4284
-# policy servers. You may wish to disable this if your server is
-# single-user for a slight speed benefit in some rooms, but otherwise
-# should leave it enabled.
-#
-#policy_server_check_own_events = true
-
 # Allow admins to enter commands in rooms other than "#admins" (admin
 # room) by prefixing your message with "\!admin" or "\\!admin" followed up
 # a normal continuwuity admin command. The reply will be publicly visible
@@ -1849,6 +1868,11 @@
 #
 #support_page =
 
+# The ed25519 public key for the policy server available at this server's
+# name. Must be unpadded base64.
+#
+#policy_server_public_key =
+
 # Role string for server support contacts, to be served as part of the
 # MSC1929 server support endpoint at /.well-known/matrix/support.
 #
@@ -1874,34 +1898,6 @@
 #
 #support_pgp_key =
 
-# **DEPRECATED**: Use `[global.matrix_rtc].foci` instead.
-#
-# A list of MatrixRTC foci URLs which will be served as part of the
-# MSC4143 client endpoint at /.well-known/matrix/client.
-#
-# This option is deprecated and will be removed in a future release.
-# Please migrate to the new `[global.matrix_rtc]` config section.
-#
-#rtc_focus_server_urls = []
-
-[global.blurhashing]
-
-# blurhashing x component, 4 is recommended by https://blurha.sh/
-#
-#components_x = 4
-
-# blurhashing y component, 3 is recommended by https://blurha.sh/
-#
-#components_y = 3
-
-# Max raw size that the server will blurhash, this is the size of the
-# image after converting it to raw data, it should be higher than the
-# upload limit but not too high. The higher it is the higher the
-# potential load will be for clients requesting blurhashes. The default
-# is 33.55MB. Setting it to 0 disables blurhashing.
-#
-#blurhash_max_raw_size = 33554432
-
 [global.matrix_rtc]
 
 # A list of MatrixRTC foci (transports) which will be served via the
@@ -1987,8 +1983,10 @@
 #
 #sender =
 
-# Whether to require that users provide an email address when they
-# register.
+# Whether to allow public registration with an email address.
+#
+# Note that, if this option is enabled, anyone will be able to register an
+# account with just an email address.
 #
 # If either this option or `require_email_for_token_registration` are set,
 # users will not be allowed to remove their email address.
@@ -1996,6 +1994,130 @@
 #require_email_for_registration = false
 
 # Whether to require that users who register with a registration token
-# provide an email address.
+# provide an email address. This option is independent of
+# `require_email_for_registration`.
 #
 #require_email_for_token_registration = false
+
+#[global.registration_terms]
+
+# The language code to provide to clients along with the policy documents.
+#
+#language = "en"
+
+# Policy documents, such as terms and conditions or a privacy policy,
+# which users must agree to when registering an account.
+#
+# Example:
+# ```ignore
+# [global.registration_terms.documents]
+# privacy_policy = { name = "Privacy Policy", url = "https://homeserver.example/en/privacy_policy.html" }
+# ```
+#
+#documents =
+
+#[global.oauth]
+
+# The compatibility mode to use for OAuth.
+#
+# - "disabled": OAuth will be unavailable. Users will only be able to log
+#   in using legacy authentication.
+# - "hybrid": OAuth and legacy authentication will both be available. Some
+#   clients may only use one or the other.
+# - "exclusive": Only OAuth will be available. Clients which require
+#   legacy authentication will be unable to log in.
+#
+#compatibility_mode = "hybrid"
+
+#[global.oauth.oidc]
+# Uncommenting this section will enable Continuwuity's support for
+# authenticating users using an OpenID Connect-compatible identity provider.
+# This is referred to as "delegated authentication".
+#
+# IMPORTANT NOTE: When delegated authentication is active, Continuwuity will behave as if
+# the `global.oauth.compatibility_mode` setting is set to `exclusive`.
+# Matrix clients which do not support OAuth login (also referred to as "next-gen auth") will NOT be able
+# to log in while delegated authentication is active.
+
+
+# The OIDC issuer URL. Continuwuity will use OpenID Connect Discovery to
+# automatically fetch the identity provider's metadata from this URL.
+# Generally you should set this to the base domain your identity provider
+# runs on.
+#
+#discovery_url =
+
+# The OAuth client ID for Continuwuity to use when communicating with the
+# identity provider.
+#
+#client_id =
+
+# The OAuth client secret for Continuwuity to use when communicating with
+# the identity provider.
+#
+#client_secret =
+
+# A path to a file which Continuwuity will read the client secret from.
+# If this option is set, it will override `client_secret`.
+#
+# The server will fail to start if the file cannot be read.
+#
+#client_secret_file =
+
+# Additional scopes Continuwuity should request from the IDP. This may be
+# necessary to access certain claims. Continuwuity always requests the
+# `openid` scope.
+#
+#additional_scopes = []
+
+# Whether the user should be prompted to choose a localpart
+# when signing in for the first time. If this is `false`, Continuwuity
+# will attempt to use the value of the `preferred_username_claim`
+# (see below) as the user's localpart. Authentication will
+# fail if this claim is missing or is not a valid localpart.
+#
+#prompt_for_localpart = true
+
+# The claim to use for the user's localpart, if `prompt_for_localpart` is
+# false.
+#
+#preferred_username_claim = "preferred_username"
+
+# The claim which will be used to set the user's email address,
+# either on initial registration or on every login depending on
+# the value of `profile_key_import_mode`. Continuwuity assumes that
+# the IDP has taken care of verifying that the user controls the email
+# address it provides.
+#
+# This option does nothing if SMTP is not configured.
+#
+# If this option is set, and `profile_key_import_mode` is `on_login`,
+# users will not be able to change their email addresses themselves.
+#
+#email_claim = "email"
+
+# Defines how claims returned from the IDP should be mapped to a user's
+# profile data. The profile field named in each key will be set from the
+# claim named in the corresponding value when the user first registers,
+# and possibly on subsequent logins as well, depending on the value of
+# `profile_key_import_mode` (see below).
+#
+# Per-room overrides to the user's display name or avatar will be
+# preserved by the import process.
+#
+# SECURITY NOTE: If the `avatar_url` field is set, Continuwuity will
+# perform a HTTP GET to the URL in the mapped claim and use the returned
+# file as the user's profile picture. Make sure your users are not able
+# to set the value of the mapped claim to an arbitrary URL.
+#
+#profile_key_map = { displayname = "name" }
+
+# When profile keys should be imported from the IDP's claims.
+#
+# - "on_registration": Listed keys will be imported once, when the user
+#   logs in for the first time and their shadow account is created.
+# - "on_login": Listed keys will be imported every time the user logs in.
+#   Additionally, users will not be able to manually edit any listed keys
+#   through their Matrix client.
+#
+#profile_key_import_mode = "on_registration"

docker/Dockerfile

@@ -1,5 +1,5 @@
 ARG RUST_VERSION=1
-ARG DEBIAN_VERSION=bookworm
+ARG DEBIAN_VERSION=trixie
 
 FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx
 FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-${DEBIAN_VERSION} AS base
@@ -10,7 +10,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean
 
 # Match Rustc version as close as possible
 # rustc -vV
-ARG LLVM_VERSION=21
+ARG LLVM_VERSION=22
 # ENV RUSTUP_TOOLCHAIN=${RUST_VERSION}
 
 # Install repo tools
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get install -y \
     pkg-config make jq \
-    wget curl git software-properties-common \
+    wget curl git lsb-release gpg \
     file
     # golang cmake
 
@@ -50,7 +50,7 @@ EOF
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.19.0
+ENV BINSTALL_VERSION=1.20.1
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docker/musl.Dockerfile

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

docs/advanced/dns.mdx

@@ -74,13 +74,11 @@ ## Unbound
 
 - Increase `discard-timeout` to something like `4800` to wait longer for upstream resolvers, as recursion can take a long time to respond to some domains. Continuwuity default to `dns_timeout = 10` seconds, so dropping requests early would lead to unnecessary retries and/or failures.
 
-### Using a forwarder (optional)
+### Recursion versus forwarding
 
-Unbound by default employs **recursive resolution** and contacts many servers around the world. If this is not performant enough, consider forwarding your queries to public resolvers to benefit from their CDNs and get faster responses.
+Unbound by default employs **recursive resolution** and contacts many servers around the world. While this allows updated and authoritative answers and are generally viable for most users, sometimes these recursive queries can be too slow to fully resolve. As an alternative, you can consider **forwarding** your queries to public resolvers, and benefit from faster responses from their CDNs.
 
-However, most popular upstreams (such as Google DNS or Quad9) employ IP ratelimiting, so a generous cache is still needed to avoid making too many queries.
-
-DNS-over-TLS forwarders may also be used should you need on-the-wire encryption, but TLS overhead causes some speed penalties.
+Do note that most popular upstreams (such as Google DNS or Quad9) employ IP ratelimiting, so a generous cache is still needed to avoid making too many queries.
 
 If you want to use forwarders, configure it as follows:
 
@@ -99,6 +97,8 @@ # Use cloudflare public resolvers as an example
     # forward-addr: 2606:4700:4700::1111@53
 
 # alternatively, use DNS-over-TLS for forwarders.
+# this will encrypt traffic between you and the forwarder,
+# but takes more time due to TLS overhead.
 # forward-zone:
     # name: "."
     # forward-tls-upstream: yes
@@ -133,9 +133,11 @@ ### dnsmasq
 
 [arch-linux-dnsmasq]: https://wiki.archlinux.org/title/Dnsmasq
 
-### Technitium
+### Technitium DNS
 
-[Technitium][technitium] supports recursion as well as a myriad of forwarding protocols, allows saving cache to disk natively, and does work well with Continuwuity. Its default configurations however ratelimits single-IP requests by a lot, and hence must be changed. You may consult this [community guide][technitium-continuwuity] for more details on setting up a dedicated Technitium for Continuwuity.
+[Technitium DNS Server][technitium] supports recursion as well as a myriad of forwarding protocols, allows saving cache to disk natively, and does work well with Continuwuity. Its out-of-the-box configs however ratelimits single-IP requests by a lot, and hence must be changed.
+
+You may consult this [community guide][technitium-continuwuity] for more details on setting up and fine-tuning a dedicated Technitium instance for Continuwuity.
 
 [technitium]: https://github.com/TechnitiumSoftware/DnsServer
 [technitium-continuwuity]: https://muoi.me/~stratself/articles/technitium-continuwuity/
@@ -150,11 +152,13 @@ ## Testing
 
 ## Further steps
 
-- (Recommended) Set **`dns_cache_entries = 0`** inside Continuwuity and fully rely on the more performant external resolver.
+It is recommended to set **`dns_cache_entries = 0`** inside Continuwuity to fully rely on the external resolver. While Continuwuity does have an internal cache, it can run into reliability issues if you're federating with many domains.
+
+Additionally, you can also make the following improvements:
 
 - Consider employing **persistent cache to disk**, so your resolver can still run without hassle after a restart. Unbound, via [Cache DB module][unbound-cachedb], can use Redis as a storage backend for this feature.
 
-- Consider [enabling **Serve Stale**][unbound-serve-stale] functionality to serve expired data beyond DNS TTLs. Since most Matrix homeservers have static IPs, this should help improve federation with them especially when upstream resolvers have timed out. For dnsproxy, this corresponds to its [optimistic caching options][dnsproxy-usage].
+- Consider [enabling **Serve Stale**][unbound-serve-stale] functionality to serve expired data beyond DNS TTLs. Since most Matrix homeservers have static IPs, this should still allow federating with them when upstream resolvers have timed out. For dnsproxy, this corresponds to its [optimistic caching options][dnsproxy-usage].
 
 - If you still experience DNS performance issues, another step could be to **disable DNSSEC** (which is computationally expensive) at a cost of slightly decreased security. On Unbound this is done by commenting out `trust-anchors` config options and removing the `validator` module.
 

docs/calls/livekit.mdx

@@ -25,9 +25,9 @@ ### 2. Services
 :::tip Generating the secrets
 LiveKit provides a utility to generate secure random keys
 ```bash
-~$ docker run --rm livekit/livekit-server:latest generate-keys
-API Key:  APIUxUnMnSkuFWV
-API Secret:  t93ZVjPeoEdyx7Wbet3kG4L3NGZIZVEFvqe0UuiVc22A
+docker run --rm livekit/livekit-server:latest generate-keys
+# API Key:  APIUxUnMnSkuFWV
+# API Secret:  t93ZVjPeoEdyx7Wbet3kG4L3NGZIZVEFvqe0UuiVc22A
 ```
 :::
 
@@ -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
@@ -262,14 +331,14 @@ # livekit.yaml
 
 ## Testing
 
-To test that LiveKit is successfully integrated with Continuwuity, you will need to replicate its [Token Exchange Flow](https://github.com/element-hq/lk-jwt-service#%EF%B8%8F-how-it-works--token-exchange-flow).
+To test that LiveKit is successfully integrated with Continuwuity, you will need to replicate its [Token Exchange Flow](https://github.com/element-hq/lk-jwt-service#%EF%B8%8F-how-it-works--token-exchange-flow). Follow the steps below while checking Docker logs (`docker-compose logs --follow`), in order to help [troubleshooting](#troubleshooting) any issues.
 
 First, you will need an access token for your current login session. These can be found in your client's settings or obtained via [this website](https://timedout.uk/mxtoken.html).
 
-Then, using that token, fetch the discovery endpoints for MatrixRTC services
+Then, using that token, fetch the discovery endpoints for MatrixRTC services:
 
 ```bash
-curl -X POST -H "Authorization: Bearer <session-access-token>" \
+curl -H "Authorization: Bearer <session-access-token>" \
   https://matrix.example.com/_matrix/client/unstable/org.matrix.msc4143/rtc/transports
 ```
 
@@ -318,7 +387,7 @@ ## Testing
 You can then send this payload to the lk-jwt-service:
 
 ```bash
-~$ curl -X POST -d @payload.json https://livekit.example.com/get_token
+curl -X POST -d @payload.json https://livekit.example.com/get_token
 ```
 
 The lk-jwt-service will, after checking against Continuwuity, answer with a `jwt` token to create a LiveKit media room:
@@ -331,22 +400,31 @@ ## Testing
 
 ## Troubleshooting
 
-To debug any issues, you can place a call or redo the Testing instructions, and check the container logs for any specific errors. Use `docker-compose logs --follow` to follow them in real-time.
+To debug any issues, you can place a call or redo the Testing instructions, and check the container logs for any specific errors. Use `docker-compose logs --follow` to follow these logs in real-time.
 
 ### Common errors in Element Call UI
 
 - `MISSING_MATRIX_RTC_FOCUS`: LiveKit is missing from Continuwuity's config file
 - "Waiting for media" popup always showing: a LiveKit URL has been configured in Continuwuity, but your client cannot connect to it for some reason
 
+For browser-based clients, you can also inspect connections using DevTools' Networking tab, to see which requests are erroring out.
+
 ### Docker loopback networking issues
 
 Some distros do not allow Docker containers to connect to its host's public IP by default. This would cause `lk-jwt-service` to fail connecting to `livekit` or `continuwuity` on the same host. As a result, you would see connection refused/connection timeouts log entries in the JWT service, even when `LIVEKIT_URL` has been configured correctly.
 
+You can also test that this is the case by cURLing from a sidecar container:
+
+```bash
+docker run --rm --net container:lk-jwt-service docker.io/curlimages/curl https://livekit.example.com
+# --- some errors ---
+```
+
 To alleviate this, you can try one of the following workarounds:
 
 - Use `network_mode: host` for the `lk-jwt-service` container (instead of the default bridge networking).
 
-- Add an `extra_hosts` file mapping livekit's (and continuwuity's) domain name to a localhost address:
+- Add an `extra_hosts` file mapping livekit's (and continuwuity's) domain name to a locally-reachable address:
 
     ```diff
     # in docker-compose.yaml
@@ -360,12 +438,7 @@ ### Docker loopback networking issues
 
 - (**untested, use at your own risk**) Implement an iptables workaround as shown [here](https://forums.docker.com/t/unable-to-connect-to-host-service-from-inside-docker-container/145749/6).
 
-After implementing the changes and restarting your compose, you can test whether the connection works by cURLing from a sidecar container:
-
-```bash
-~$ docker run --rm --net container:lk-jwt-service docker.io/curlimages/curl https://livekit.example.com
-OK
-```
+After implementing the changes and restarting your compose, `lk-jwt-service` should now connect to your other services. The sidecar container test above should now return an `OK` from LiveKit.
 
 ### Workaround for non-federating servers
 

docs/deploying/docker.mdx

@@ -185,13 +185,15 @@ ## Testing
 
 Test that your setup works by following these [instructions](./generic.mdx#how-do-i-know-it-works)
 
+Check your container logs using `docker-compose logs --follow` to debug any issues. See the [Troubleshooting](../troubleshooting.mdx) page for common errors and how to fix them.
+
 ## Other deployment methods
 
 ### Docker - Quick Run
 
-:::note For testing only
-The instructions below are only meant for a quick demo of Continuwuity.
-For production deployment, we recommend using [Docker Compose](#docker-compose)
+:::warning For testing only
+The instructions below are only meant for a quick demo of Continuwuity with **federation disabled**.
+For production deployment, we recommend using [Docker Compose](#docker-compose).
 :::
 
 Get a working Continuwuity server with an admin user in four steps:
@@ -211,7 +213,7 @@ ### Docker - Quick Run
       -e CONTINUWUITY_SERVER_NAME="example.com" \
       -e CONTINUWUITY_DATABASE_PATH="/var/lib/continuwuity" \
       -e CONTINUWUITY_ADDRESS="0.0.0.0" \
-      -e CONTINUWUITY_ALLOW_REGISTRATION="false" \
+      -e CONTINUWUITY_ALLOW_FEDERATION="false" \
       --name continuwuity \
       forgejo.ellis.link/continuwuation/continuwuity:latest \
       /sbin/conduwuit
@@ -233,9 +235,9 @@ ### Docker - Quick Run
     Pick your own username and password!
     ```
 
-4. Configure your reverse proxy to forward HTTPS traffic to Continuwuity at port 8008. See [Docker Compose](#docker-compose) for examples.
+4. Configure your reverse proxy to forward HTTPS traffic to Continuwuity at port 8008. See [Docker Compose](#docker-compose) or the [Generic instructions](./generic.mdx#setting-up-the-reverse-proxy) for examples.
 
-Once configured, log in to your server with any Matrix client, and register for an account with the registration token from step 3. You'll automatically be invited to the admin room where you can [manage your server](../reference/admin).
+Once configured, log in to your server with any Matrix client, and register for an account with the registration token from step 3. If you did not configure step 4., log in via the `http://<your_server_ip>:8008` address. You will be automatically invited to the admin room where you can [manage your server](../reference/admin).
 
 ### (Optional) Building Custom Images
 
@@ -269,4 +271,5 @@ ## Next steps
 
 - For smooth federation, set up a caching resolver according to the [**DNS tuning guide**](../advanced/dns.mdx) (recommended)
 - To set up Audio/Video communication, see the [**Calls**](../calls.mdx) page.
+- Consult the [Maintenance](../maintenance.mdx) page for guidance on maintaining your homeserver.
 - If you want to set up an appservice, take a look at the [**Appservice Guide**](../appservices.mdx).

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
 
@@ -260,7 +266,7 @@ ## Starting Your Server
 ```
 
 You can then open [a Matrix client][matrix-clients],
-enter your homeserver address, and try to register with the provided token.
+enter your homeserver address, and register with the provided token.
 By default, the first user is the instance's first admin. They will be added
 to the `#admin:example.com` room and be able to [issue admin commands](../reference/admin/index.md).
 
@@ -296,4 +302,5 @@ ## What's next?
 
 - For smooth federation, set up a caching resolver according to the [**DNS tuning guide**](../advanced/dns.mdx) (recommended)
 - For Audio/Video call functionality see the [**Calls**](../calls.md) page.
+- Consult the [Maintenance](../maintenance.mdx) page for guidance on maintaining your homeserver.
 - If you want to set up an appservice, take a look at the [**Appservice Guide**](../appservices.md).

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": 12,
-            "mention_room": false,
-            "date": "2026-04-24",
-            "message": "[v0.5.8](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v0.5.8) is out! This is a patch release which fixes a bug in 0.5.7's email support -- upgrade soon if you use that feature."
+            "id": 14,
+            "mention_room": true,
+            "date": "2026-06-20",
+            "message": "[v0.5.10](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v0.5.10) has been released. It is a security release, so we suggest you update as soon as possible. Don't forget to also join [our announcements room](https://matrix.to/#/!jIdNjSM5X-V5JVx2h2kAhUZIIQ08GyzPL55NFZAH1vM/%24K1ISNKIqfNiZzsNVCaTt2E7ZtNeP6Dsy6sbz9l3rO0A?via=ellis.link&via=gingershaped.computer&via=matrix.org)."
         }
     ]
 }

docs/reference/admin/debug.md

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

docs/reference/admin/index.md

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

docs/reference/admin/oidc.md

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

docs/reference/admin/users.md

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

docs/troubleshooting.mdx

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

engage.toml

@@ -146,7 +146,7 @@ cargo clippy \
     --locked \
     --profile test \
     --no-default-features \
-    --features=console,systemd,element_hacks,direct_tls,perf_measurements,brotli_compression,blurhashing \
+    --features=console,systemd,element_hacks,direct_tls,perf_measurements,brotli_compression \
     --color=always \
     -- \
     -D warnings

flake.lock

@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1777645914,
-        "narHash": "sha256-P1T7QVQS13OvkXEuEhI91CLaQfyv6iqV9vW8IBLLDYg=",
+        "lastModified": 1781566179,
+        "narHash": "sha256-Tqv8I586fYzWpEW/Smq/JqESFa3DVVzVWsnAMtvhy/I=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "d6ba1f7070ba91f45efe372d68eb648be67d0417",
+        "rev": "74e084413d979d52d2f93b1d93b1ab7b9ee648f5",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1777335812,
-        "narHash": "sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc=",
+        "lastModified": 1780532242,
+        "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "5e0fb2f64edff2822249f21293b8304dedaaf676",
+        "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1777624102,
-        "narHash": "sha256-thSyElkje577x/kAbP72nHlfiFc1a+tCudskLPHXe9s=",
+        "lastModified": 1781527054,
+        "narHash": "sha256-1fX9ev2Fh5QoKQ41G9dYutjo5j/jywu6tZse5Eb1Ck4=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "4d81601e0b73f20d81d066754ad0e7d1e7f75a06",
+        "rev": "8c2e51dffefc040a21975da7abf6f252c8c9b783",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1774748309,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1777583169,
-        "narHash": "sha256-dVJ4+wrRKc8oIgp3rLOFSq1obt/sCKlXy3h47qof/w0=",
+        "lastModified": 1781453968,
+        "narHash": "sha256-+V3nK4pCngbmgyVGXY6Kkrlevp4ocPkJJLf2aqwkDNA=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "aa64e4828a2bbba44463c1229a81c748d3cce583",
+        "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,
-  callPackage,
+  liburing,
   rustPlatform,
   cargoExtraArgs ? "",
   rustflags ? "",
-  rocksdb ? callPackage ./rocksdb.nix { },
+  target_cpu ? null,
   profile ? "release",
 }:
 let
@@ -28,18 +28,29 @@ 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;
+    });
   };
 in
 craneLib.buildPackage (
@@ -48,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 [
@@ -56,7 +67,7 @@ craneLib.buildPackage (
         ]
       }"
 
-      patchelf  --set-rpath "$old_rpath:$extra_rpath" $out/bin/conduwuit
+      patchelf --set-rpath "$old_rpath:$extra_rpath" $out/bin/conduwuit
     '';
 
     meta = {

nix/packages/default.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   self,
   ...
 }:
@@ -6,29 +7,84 @@
   perSystem =
     {
       self',
+      lib,
       pkgs,
+      inputs',
+      system,
       craneLib,
+      mkToolchain,
       ...
     }:
     {
-      packages = {
-        rocksdb = pkgs.callPackage ./rocksdb.nix { };
-        default = pkgs.callPackage ./continuwuity.nix {
-          inherit self craneLib;
-          # 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
-        #
-        # other examples include:
-        #
-        # - release-high-perf
-        max-perf = self'.packages.default.override {
-          profile = "release-max-perf";
-        };
-      };
+      packages =
+        let
+          mkPackages =
+            pkgs:
+            let
+              fnx = inputs'.fenix.packages;
+
+              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/packages/rocksdb.nix

@@ -1,5 +1,7 @@
 {
-  stdenv,
+  # stdenv,
+  # enableJemalloc ? stdenv.hostPlatform.isLinux,
+  enableJemalloc ? false,
   rocksdb,
   fetchFromGitea,
   rust-jemalloc-sys-unprefixed,
@@ -13,16 +15,16 @@
   #
   # [1]: https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs#L17
   jemalloc = rust-jemalloc-sys-unprefixed;
-  enableJemalloc = stdenv.hostPlatform.isLinux;
+  inherit enableJemalloc;
 }).overrideAttrs
   ({
-    version = "continuwuity-v0.5.0-unstable-2026-03-27";
+    version = "continuwuity-v0.5.0-unstable-2026-05-19";
     src = fetchFromGitea {
       domain = "forgejo.ellis.link";
       owner = "continuwuation";
       repo = "rocksdb";
-      rev = "463f47afceebfe088f6922420265546bd237f249";
-      hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk=";
+      rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
+      hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
     };
 
     # We have this already at https://forgejo.ellis.link/continuwuation/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155

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-h+t2xTBz5yt2YIO+1VMIIGlCU7gyp2LYOFvaV1nwOXU=";
+        };
+    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-sqSWJDUxc+zaz1nBWMAJKTAGBuGWP25GCftIOlCEAtA=";
-          };
+          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.3",
-      "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-2.0.3.tgz",
-      "integrity": "sha512-2myp7jUgGen50saxW8OJD/eMVKp7HnuBN5MUzwRb6mDbRZZVpoorfI4LQqiGSBNjGLB6jltvx/R2yHmcmnchwg==",
+      "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.1",
-        "@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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.1.tgz",
-      "integrity": "sha512-ynV1gw4KqFtQ0P+ZZh76SUj49wBb2FuHW3zSmHverHWuxBhzvrZS6/dZ+fCFQG8bTTPtrPz0RQUTN3uEDbPVBQ==",
+      "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.1",
-        "@rspack/binding-darwin-x64": "2.0.1",
-        "@rspack/binding-linux-arm64-gnu": "2.0.1",
-        "@rspack/binding-linux-arm64-musl": "2.0.1",
-        "@rspack/binding-linux-x64-gnu": "2.0.1",
-        "@rspack/binding-linux-x64-musl": "2.0.1",
-        "@rspack/binding-wasm32-wasi": "2.0.1",
-        "@rspack/binding-win32-arm64-msvc": "2.0.1",
-        "@rspack/binding-win32-ia32-msvc": "2.0.1",
-        "@rspack/binding-win32-x64-msvc": "2.0.1"
+        "@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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.1.tgz",
-      "integrity": "sha512-CGFO5zmajD1Itch1lxAI7+gvKiagzyqXopHv/jHG9Su2WWQ2/Nhn2/rkSpdp6ptE9ri6+6tCOOahf099/v/Xog==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.1.tgz",
-      "integrity": "sha512-2vvBNBoS09/PurupBwSrlTZd8283o00B8v20ncsNUdEff41uCR/hzIrYoTIVWnVST+Gt5O1+cfcfORp397lajg==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.1.tgz",
-      "integrity": "sha512-uvNXk6ahE3AH3h2avnd1Mgno68YQpS4cfX1OkOGWIC/roL+NrOP2XVXV4yfVAoydPALDO7AfbIfN0QdmBK3rsA==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.1.tgz",
-      "integrity": "sha512-S/a6uN9PiZ5O/PjSqyIXhuRC1lVzeJkJV69NeLk5sIEUiDQ/aQGZG97uN+tluwpbo1tPbLJkdHYETfjspOX4Pg==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.1.tgz",
-      "integrity": "sha512-C13Kk0OkZiocZVj187Sf753UH6pDXnuEu6vzUvi3qv9ltibG1ki0H2Y8isXBYL2cHQOV+hk0g1S6/4z3TTB97A==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.1.tgz",
-      "integrity": "sha512-TQsiBFpEDGkuvK9tNdGj/Uc+AIytzqhxXH/1jKU6M24cWB1DTw/Cx7DdrkCBDyq3129K3POLdujvbWCGqBzQUw==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.1.tgz",
-      "integrity": "sha512-wk3gyUgBW/ayP49bI54bkY8+EQnfBHxdoe9dz3oobSTZQc8AOWwmUUDEPltW8rUvPOM6dfHECTOUMnfaf2f5yA==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.1.tgz",
-      "integrity": "sha512-rHjLcy3VcAC3+x+PxH+gwhwv6tPe0JdXTNT5eAOs9wgZIM6T9p4wre49+K4Qy98+Fb7TTbLX0ObUitlOkGwTSA==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.1.tgz",
-      "integrity": "sha512-Ad1vVqMBBnd4T8rsORngu9sl2kyRTlS4kMlvFudjzl1X2UFArEDBe0YVGNN7ZvahM12CErUx2WiN8Sd8pb+qXQ==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.1.tgz",
-      "integrity": "sha512-oPM2Jtm7HOlmxl/aBfleAVlL6t9VeHx6WvEets7BBJMInemFXAQd4CErRqybf7rXutACzLeUWBOue4Jpd1/ykw==",
+      "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.1",
-      "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.1.tgz",
-      "integrity": "sha512-lgfZiExh8kDR/3obgi3RQKwKG5av1Xf5qDN1aVde777W9pbmx0Pqvrww1qtNvJ+gobEjbrrn5HEZWYGe0VLmcA==",
+      "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.1"
+        "@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,20 +383,20 @@
       }
     },
     "node_modules/@rspress/core": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.10.tgz",
-      "integrity": "sha512-DvoV7YUW538x0CVAGyYPKfjUHgEuq7Z8LZq1cpfUgBpA1DynFUK3Ls6spvdoAHAl3l0AN+xxOHpu/sRVhzqi/A==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.16.tgz",
+      "integrity": "sha512-jJcYNNBKY/VLR8oxLqdd5uvm6bHahXeF3wSaoAe2U1hxWWwoP9k4rBTDx9X3JkUWcgnthu7UgtMiHeLs+2fhFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/mdx": "^3.1.1",
         "@mdx-js/react": "^3.1.1",
-        "@rsbuild/core": "^2.0.2",
-        "@rsbuild/plugin-react": "~2.0.0",
-        "@rspress/shared": "2.0.10",
-        "@shikijs/rehype": "^4.0.2",
+        "@rsbuild/core": "^2.0.15",
+        "@rsbuild/plugin-react": "~2.0.1",
+        "@rspress/shared": "2.0.16",
+        "@shikijs/rehype": "^4.2.0",
         "@types/unist": "^3.0.3",
-        "@unhead/react": "^2.1.13",
+        "@unhead/react": "^2.1.15",
         "body-scroll-lock": "4.0.0-beta.0",
         "clsx": "2.1.1",
         "copy-to-clipboard": "^3.3.3",
@@ -407,22 +407,22 @@
         "mdast-util-mdxjs-esm": "^2.0.1",
         "medium-zoom": "1.1.0",
         "nprogress": "^0.2.0",
-        "react": "^19.2.5",
-        "react-dom": "^19.2.5",
+        "react": "^19.2.7",
+        "react-dom": "^19.2.7",
         "react-lazy-with-preload": "^2.2.1",
         "react-reconciler": "0.33.0",
-        "react-render-to-markdown": "19.0.1",
-        "react-router-dom": "^7.13.2",
+        "react-render-to-markdown": "19.1.0",
+        "react-router-dom": "^7.18.1",
         "rehype-external-links": "^3.0.0",
         "rehype-raw": "^7.0.0",
-        "remark-cjk-friendly": "^2.0.1",
-        "remark-cjk-friendly-gfm-strikethrough": "^2.0.1",
+        "remark-cjk-friendly": "^2.3.1",
+        "remark-cjk-friendly-gfm-strikethrough": "^2.3.1",
         "remark-gfm": "^4.0.1",
         "remark-mdx": "^3.1.1",
         "remark-parse": "^11.0.0",
         "remark-stringify": "^11.0.0",
         "scroll-into-view-if-needed": "^3.1.0",
-        "shiki": "^4.0.2",
+        "shiki": "^4.2.0",
         "unified": "^11.0.5",
         "unist-util-remove": "^4.0.0",
         "unist-util-visit": "^5.1.0",
@@ -436,9 +436,9 @@
       }
     },
     "node_modules/@rspress/plugin-client-redirects": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.10.tgz",
-      "integrity": "sha512-ImOm3h/cbXiJXIvpwv3Wn9rM91xgdhKbD2WX+WlMlWO4AtQfKR4XFrVhIZZAkrt09eeotRIklA7nu8Nuzzzbsw==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.16.tgz",
+      "integrity": "sha512-FEjZb+3lxpkEESdt0uWa4dRQU7d/Okn5SyX7CDaMHdHuqg4XdOidAQ/95ZzgXomN7YVPv40eVe/0is3oWnAjew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -449,9 +449,9 @@
       }
     },
     "node_modules/@rspress/plugin-sitemap": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.10.tgz",
-      "integrity": "sha512-PZLig9+OlnyLcy6x9BlEqWSRef6TzDWB6Dlh2/hY41FtKlhyb7d7U56RGlLselWaQV54SHVa6H/y611A56ZI2g==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.16.tgz",
+      "integrity": "sha512-zRPvKAGF8EexblJvrkhhHtD2Kqlbaw6XFjbIMM07gs0SIUKNg1o3T2I/uo5cvWtk0pGfYyyAJj94HoqLUgUsEw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -462,26 +462,26 @@
       }
     },
     "node_modules/@rspress/shared": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.10.tgz",
-      "integrity": "sha512-Kx10OAHWqi2jvW7ScmBUbkGjnwv4E6rEoelUchcL8It8nQ4nAVk0xvvES7m64knEon55zDbs8JQumCjbHu801Q==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.16.tgz",
+      "integrity": "sha512-FjBSfGtgrlR1bRJ0EQLyNo2qXUXxzb2QE3NPRIICf8TKpP413gRCMyMRtzhbIqD4Gn7k+em82VAkWTAAQjQLTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rsbuild/core": "^2.0.2",
-        "@shikijs/rehype": "^4.0.2",
+        "@rsbuild/core": "^2.0.15",
+        "@shikijs/rehype": "^4.2.0",
         "unified": "^11.0.5"
       }
     },
     "node_modules/@shikijs/core": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.0.2.tgz",
-      "integrity": "sha512-hxT0YF4ExEqB8G/qFdtJvpmHXBYJ2lWW7qTHDarVkIudPFE6iCIrqdgWxGn5s+ppkGXI0aEGlibI0PAyzP3zlw==",
+      "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.0.2",
-        "@shikijs/types": "4.0.2",
+        "@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,28 +491,28 @@
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.0.2.tgz",
-      "integrity": "sha512-7PW0Nm49DcoUIQEXlJhNNBHyoGMjalRETTCcjMqEaMoJRLljy1Bi/EGV3/qLBgLKQejdspiiYuHGQW6dX94Nag==",
+      "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.0.2",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
-        "oniguruma-to-es": "^4.3.4"
+        "oniguruma-to-es": "^4.3.6"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.0.2.tgz",
-      "integrity": "sha512-UpCB9Y2sUKlS9z8juFSKz7ZtysmeXCgnRF0dlhXBkmQnek7lAToPte8DkxmEYGNTMii72zU/lyXiCB6StuZeJg==",
+      "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.0.2",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       },
       "engines": {
@@ -520,26 +520,26 @@
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.0.2.tgz",
-      "integrity": "sha512-KaXby5dvoeuZzN0rYQiPMjFoUrz4hgwIE+D6Du9owcHcl6/g16/yT5BQxSW5cGt2MZBz6Hl0YuRqf12omRfUUg==",
+      "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.0.2"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/primitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.0.2.tgz",
-      "integrity": "sha512-M6UMPrSa3fN5ayeJwFVl9qWofl273wtK1VG8ySDZ1mQBfhCpdd8nEx7nPZ/tk7k+TYcpqBZzj/AnwxT9lO+HJw==",
+      "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.0.2",
+        "@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.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-4.0.2.tgz",
-      "integrity": "sha512-cmPlKLD8JeojasNFoY64162ScpEdEdQUMuVodPCrv1nx1z3bjmGwoKWDruQWa/ejSznImlaeB0Ty6Q3zPaVQAA==",
+      "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.0.2",
+        "@shikijs/types": "4.2.0",
         "@types/hast": "^3.0.4",
         "hast-util-to-string": "^3.0.1",
-        "shiki": "4.0.2",
+        "shiki": "4.2.0",
         "unified": "^11.0.5",
         "unist-util-visit": "^5.1.0"
       },
@@ -566,22 +566,22 @@
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.0.2.tgz",
-      "integrity": "sha512-mjCafwt8lJJaVSsQvNVrJumbnnj1RI8jbUKrPKgE6E3OvQKxnuRoBaYC51H4IGHePsGN/QtALglWBU7DoKDFnA==",
+      "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.0.2"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.0.2.tgz",
-      "integrity": "sha512-qzbeRooUTPnLE+sHD/Z8DStmaDgnbbc/pMrU203950aRqjX/6AFHeDYT+j00y2lPdz0ywJKx7o/7qnqTivtlXg==",
+      "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": {
@@ -610,9 +610,9 @@
       }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
+      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -631,9 +631,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -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.14",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
-      "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
+      "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,
@@ -700,20 +700,20 @@
       "license": "MIT"
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.1.tgz",
+      "integrity": "sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@unhead/react": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/@unhead/react/-/react-2.1.13.tgz",
-      "integrity": "sha512-gC48tNJ0UtbithkiKCc2WUlxbVVk5o171EtruS2w2hQUblfYFHzCPu2hljjT1e0tUHXXqN8EMv7mpxHddMB2sg==",
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/@unhead/react/-/react-2.1.15.tgz",
+      "integrity": "sha512-5hfAaZ3XJq9JkspRzZdSPsMrXXA8v/SKiEOxZcN9L40o44byF/50bcQuOLgSSCAx8802mI5VG32KZXWTtsLu9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "unhead": "2.1.13"
+        "unhead": "2.1.15"
       },
       "funding": {
         "url": "https://github.com/sponsors/harlan-zw"
@@ -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": {
@@ -1150,9 +1150,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
-      "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
+      "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -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.5",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.5.tgz",
-      "integrity": "sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==",
+      "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.5",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.5.tgz",
-      "integrity": "sha512-J5bAZz+DXMMwW/wV3xzKke59Af6CHY7G4uYLN1OvBcKEsWOs4pQExj86BBKamxl/Ik5bx9whOrvBlSDfWzgSag==",
+      "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.5"
+        "react": "^19.2.7"
       }
     },
     "node_modules/react-lazy-with-preload": {
@@ -2809,9 +2856,9 @@
       }
     },
     "node_modules/react-render-to-markdown": {
-      "version": "19.0.1",
-      "resolved": "https://registry.npmjs.org/react-render-to-markdown/-/react-render-to-markdown-19.0.1.tgz",
-      "integrity": "sha512-BPv48o+ubcu2JyUDIktvJXFqLIZqR7hA4mvGu1eFIofz9fogT2me9UvXwRvqvGs9jEtNaJkxZIUKUX0oiK4hDA==",
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/react-render-to-markdown/-/react-render-to-markdown-19.1.0.tgz",
+      "integrity": "sha512-dF9b3tO41ezqdmHP8X92kbHbMexJ6iC7iHw4ykC8fwiO7DgpFc9PhMoKlI+BcPzRxGcWgQSdrixVB9RykhjJpQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2822,9 +2869,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.14.2.tgz",
-      "integrity": "sha512-yCqNne6I8IB6rVCH7XUvlBK7/QKyqypBFGv+8dj4QBFJiiRX+FG7/nkdAvGElyvVZ/HQP5N19wzteuTARXi5Gw==",
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.1.tgz",
+      "integrity": "sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2845,13 +2892,13 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.14.2.tgz",
-      "integrity": "sha512-YZcM5ES8jJSM+KrJ9BdvHHqlnGTg5tH3sC5ChFRj4inosKctdyzBDhOyyHdGk597q2OT6NTrCA1OvB/YDwfekQ==",
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.1.tgz",
+      "integrity": "sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.14.2"
+        "react-router": "7.18.1"
       },
       "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.3.1",
+      "resolved": "https://registry.npmjs.org/remark-cjk-friendly/-/remark-cjk-friendly-2.3.1.tgz",
+      "integrity": "sha512-f+pKZRxCRwNEGFBKNRAZAqU91GIK1SAo3ZyFHWRUgC9zcxRR0BXKd6YwqgSsxtW0rNpUDtONj7H5nje2WL3fcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "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.3.1",
+      "resolved": "https://registry.npmjs.org/remark-cjk-friendly-gfm-strikethrough/-/remark-cjk-friendly-gfm-strikethrough-2.3.1.tgz",
+      "integrity": "sha512-JE3TGgouk/sy92SemNMEUhO5mNP4on04cmzOV3s3R5Dbk160ewmpM4tgPiinKKvoJ5UW2fTu7FOYsjVbusSA9w==",
       "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.0.2",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.0.2.tgz",
-      "integrity": "sha512-eAVKTMedR5ckPo4xne/PjYQYrU3qx78gtJZ+sHlXEg5IHhhoQhMfZVzetTYuaJS0L2Ef3AcCRzCHV8T0WI6nIQ==",
+      "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.0.2",
-        "@shikijs/engine-javascript": "4.0.2",
-        "@shikijs/engine-oniguruma": "4.0.2",
-        "@shikijs/langs": "4.0.2",
-        "@shikijs/themes": "4.0.2",
-        "@shikijs/types": "4.0.2",
+        "@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"
       },
@@ -3290,9 +3339,9 @@
       }
     },
     "node_modules/unhead": {
-      "version": "2.1.13",
-      "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.1.13.tgz",
-      "integrity": "sha512-jO9M1sI6b2h/1KpIu4Jeu+ptumLmUKboRRLxys5pYHFeT+lqTzfNHbYUX9bxVDhC1FBszAGuWcUVlmvIPsah8Q==",
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.1.15.tgz",
+      "integrity": "sha512-MCt5T90mCWyr3Z6pUCdM9lVRXoMoVBlL7z7U4CYVIiaDiuzad/UCfLuMqz5MeNmpZUgoBCQnrucJimU7EZR+XA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

renovate.json

@@ -5,7 +5,7 @@
     "osvVulnerabilityAlerts": true,
     "lockFileMaintenance": {
         "enabled": true,
-        "schedule": ["at any time"]
+        "schedule": ["* * * * 0,6"]
     },
     "platformAutomerge": true,
     "nix": {
@@ -66,6 +66,17 @@
             "matchUpdateTypes": ["minor", "patch"],
             "groupName": "github-actions-non-major"
         },
+        {
+            "description": "Batch GitHub Actions digest updates",
+            "matchManagers": ["github-actions"],
+            "matchUpdateTypes": ["digest"],
+            "groupName": "github-actions-digest",
+            "automerge": true,
+            "automergeStrategy": "fast-forward",
+            "schedule": [
+              "* 0-7 * * 2"
+            ]
+        },
         {
             "description": "Batch patch-level Node.js dependency updates",
             "matchManagers": ["npm"],
@@ -83,7 +94,10 @@
             "matchPackageNames": ["crate-ci/typos"],
             "matchUpdateTypes": ["minor", "patch"],
             "automerge": true,
-            "automergeStrategy": "fast-forward"
+            "automergeStrategy": "fast-forward",
+            "schedule": [
+              "* 0-7 * * 3"
+            ]
         },
         {
             "description": "Auto-merge renovatebot docker image updates",
@@ -91,7 +105,9 @@
             "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
             "automerge": true,
             "automergeStrategy": "fast-forward",
-            "extends": ["schedule:earlyMondays"]
+            "schedule": [
+              "* 0-7 * * 1"
+            ]
         }
     ],
     "customManagers": [

rust-toolchain.toml

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

src/admin/Cargo.toml

@@ -92,6 +92,7 @@ serde-saphyr.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
+resolvematrix.workspace = true
 
 [lints]
 workspace = true

src/admin/admin.rs

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

src/admin/appservice/commands.rs

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

src/admin/check/commands.rs

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

src/admin/debug/mod.rs

@@ -17,12 +17,21 @@ pub enum DebugCommand {
 		message: Vec<String>,
 	},
 
-	/// Get the auth_chain of a PDU
+	/// Loads the auth_chain of a PDU, reporting how long it took.
 	GetAuthChain {
 		/// An event ID (the $ character followed by the base64 reference hash)
 		event_id: OwnedEventId,
 	},
 
+	/// Walks & displays the auth_chain of a PDU in a mermaid graph format.
+	///
+	/// This is useless to basically anyone but developers, and is also probably
+	/// slow and memory hungry.
+	ShowAuthChain {
+		/// The root event ID to start walking back from.
+		event_id: OwnedEventId,
+	},
+
 	/// Parse and print a PDU from a JSON
 	///
 	/// The PDU event is only checked for validity and is not added to the
@@ -86,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>,
@@ -228,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,131 +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.",
-		);
-	}
-
-	if !self.services.users.exists(&user_id).await {
-		return Err!("Remote user does not exist in our database.",);
-	}
-
-	let mut rooms: Vec<(OwnedRoomId, u64, String)> = self
-		.services
-		.rooms
-		.state_cache
-		.rooms_joined(&user_id)
-		.then(async |room_id| get_room_info(self.services, &room_id).await)
-		.collect()
-		.await;
-
-	if rooms.is_empty() {
-		return Err!("User is not in any rooms.");
-	}
-
-	rooms.sort_by_key(|r| r.1);
-	rooms.reverse();
-
-	let num = rooms.len();
-	let body = rooms
-		.iter()
-		.map(|(id, members, name)| format!("{id} | Members: {members} | Name: {name}"))
-		.collect::<Vec<_>>()
-		.join("\n");
-
-	self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```"))
-		.await
+		rooms.sort_by_key(|r| r.1);
+		rooms.reverse();
+
+		let num = rooms.len();
+		let body = rooms
+			.iter()
+			.map(|(id, members, name)| format!("{id} | Members: {members} | Name: {name}"))
+			.collect::<Vec<_>>()
+			.join("\n");
+
+		self.write_str(&format!("Rooms {user_id} shares with us ({num}):\n```\n{body}\n```"))
+			.await
+	}
 }

src/admin/media/commands.rs

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

src/admin/mod.rs

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

src/admin/oidc/commands.rs

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

src/admin/oidc/mod.rs

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

src/admin/query/account_data.rs

@@ -1,9 +1,10 @@
 use clap::Subcommand;
 use conduwuit::Result;
+use conduwuit_database::Deserialized as _;
 use futures::StreamExt;
-use ruma::{OwnedRoomId, OwnedUserId};
+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)]
@@ -30,41 +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 results = self
-		.services
-		.account_data
-		.get_raw(room_id.as_deref(), &user_id, &kind)
-		.await;
-	let query_time = timer.elapsed();
-
-	self.write_str(&format!("Query completed in {query_time:?}:\n\n```rs\n{results:#?}\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,73 @@ 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.dns.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.dns.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.resolver.clear_cache();
+			self.services.resolver.dns.cache.clear().await;
+			writeln!(self, "Resolver caches cleared!").await
+		} else if let Some(name) = name {
+			self.services
+				.resolver
+				.resolver
+				.remove_cache_entry(name.as_str());
+			self.services.resolver.dns.cache.del_destination(&name);
+			self.services.resolver.dns.cache.del_override(&name);
+			self.write_str(&format!("Cleared {name} from resolver caches!"))
+				.await
+		} else {
+			Err!("Missing name. Supply a name or use --all to flush the whole cache.")
+		}
 	}
 }

src/admin/query/room_timeline.rs

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

src/admin/query/short.rs

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

src/admin/query/users.rs

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

src/admin/room/commands.rs

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

src/admin/room/info.rs

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

src/admin/room/moderation.rs

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

src/admin/server/commands.rs

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