make federation retry timer-based

Signed-off-by: strawberry <strawberry@puppygock.gay>
rename OutgoingKind enum to OutgoingDestination
2026-05-26 20:49:55 +00:00 · 2024-04-17 22:14:30 -04:00 · 2024-04-17 20:11:18 -04:00 · 2024-04-17 20:05:56 -04:00 · 2024-04-17 19:49:19 -04:00 · 2024-04-17 19:15:12 -04:00
244 changed files with 10382 additions and 11659 deletions
@@ -4,6 +4,7 @@ tests

 # Docker files
 Dockerfile*
+docker-compose*

 # IDE files
 .vscode
@@ -3,5 +3,3 @@
 use flake

 PATH_add bin
-
-dotenv_if_exists
@@ -1,350 +1,266 @@
 name: CI and Artifacts

 on:
-    pull_request:
-    push:
-        # documentation workflow deals with this or is not relevant for this workflow
-        paths-ignore:
-          - '*.md'
-          - 'conduwuit-example.toml'
-          - 'book.toml'
-          - '.gitlab-ci.yml'
-          - '.gitignore'
-          - 'renovate.json'
-          - 'docs/**'
-          - 'debian/**'
-          - 'docker/**'
-        branches:
-            - main
-        tags:
-          - '*'
-    # Allows you to run this workflow manually from the Actions tab
-    workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - dev

-concurrency:
-    group: ${{ github.head_ref || github.ref_name }}
-    cancel-in-progress: true
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:

 env:
-    # Required to make some things output color
-    TERM: ansi
-    # Publishing to my nix binary cache
-    ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
-    # Just in case incremental is still being set to true, speeds up CI
-    CARGO_INCREMENTAL: 0
-    # Custom nix binary cache if fork is being used
-    ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
-    ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
+  # Required to make some things output color
+  TERM: ansi
+  # Publishing to my nix binary cache
+  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+  # Just in case incremental is still being set to true, speeds up CI
+  CARGO_INCREMENTAL: 0
+  # Custom nix binary cache if fork is being used
+  ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
+  ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}

 permissions:
-    packages: write
-    contents: read
+  packages: write
+  contents: read

 jobs:
-    tests:
-        name: Test
-        runs-on: ubuntu-latest
-        steps:
-            - name: Sync repository
-              uses: actions/checkout@v4
+  setup:
+    name: CI Setup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync repository
+        uses: actions/checkout@v4

-            - name: Tag comparison check
-              if: startsWith(github.ref, 'refs/tags/v')
-              run: |
-                  # Tag mismatch with latest repo tag check to prevent potential downgrades
-                  LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
+      - name: Install Nix (with flakes and nix-command enabled)
+        uses: cachix/install-nix-action@v26
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable

-                  if [ $LATEST_TAG != ${{ github.ref_name }} ]; then
-                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.'
-                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.' >> $GITHUB_STEP_SUMMARY
-                    exit 1
-                  fi
+          # Add `nix-community`, Crane, upstream Conduit, and conduwuit binary caches
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+            extra-substituters = https://nix-community.cachix.org
+            extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+            extra-substituters = https://crane.cachix.org
+            extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
+            extra-substituters = https://nix.computer.surgery/conduit
+            extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
+            extra-substituters = https://attic.kennel.juneis.dog/conduit
+            extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
+            extra-substituters = https://attic.kennel.juneis.dog/conduwuit
+            extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=

-            - name: Install Nix
-              uses: DeterminateSystems/nix-installer-action@main
+      - name: Add alternative Nix binary caches if specified
+        if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
+        run: |
+          echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf
+          echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf

-            - name: Enable Cachix binary cache
-              run: |
-                  nix profile install nixpkgs#cachix
-                  cachix use crane
-                  cachix use nix-community
+      - name: Pop/push Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@main

-            - name: Configure Magic Nix Cache
-              uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Configure `nix-direnv`
+        run: |
+          echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"

-            - name: Apply Nix binary cache configuration
-              run: |
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems
-                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
-                  EOF
+      - name: Install `direnv` and `nix-direnv`
+        run: nix-env -f "<nixpkgs>" -iA direnv -iA nix-direnv

-            - name: Use alternative Nix binary caches if specified
-              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
-              run: |
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = ${{ env.ATTIC_ENDPOINT }}
-                  extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}
-                  EOF
+      - name: Pop/push downloaded crate cache
+        uses: actions/cache@v4
+        with:
+          key: downloaded-crates
+          path: ~/.cargo

-            - name: Prepare build environment
-              run: |
-                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
-                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
-                  direnv allow
-                  nix develop --command true
+      - name: Pop/push compiled crate cache
+        uses: actions/cache@v4
+        with:
+          key: compiled-crates-${{runner.os}}
+          path: target

-            - name: Run CI tests
-              run: |
-                  direnv exec . engage > >(tee -a test_output.log)
+      # Do this to shorten the logs for the real CI step
+      - name: Populate `/nix/store`
+        run: nix develop --command true

-            - name: Sync Complement repository
-              uses: actions/checkout@v4
-              with:
-                repository: 'matrix-org/complement'
-                path: complement_src
+      - name: Allow direnv
+        run: direnv allow

-            - name: Run Complement tests
-              run: |
-                  direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
-                  cp -v -f result complement_oci_image.tar.gz
+      - name: Cache x86_64 inputs for devShell
+        run: |
+          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation

-            - name: Upload Complement OCI image
-              uses: actions/upload-artifact@v4
-              with:
-                name: complement_oci_image.tar.gz
-                path: complement_oci_image.tar.gz
-                if-no-files-found: error

-            - name: Upload Complement logs
-              uses: actions/upload-artifact@v4
-              with:
-                name: complement_test_logs.jsonl
-                path: complement_test_logs.jsonl
-                if-no-files-found: error
+  build-and-test:
+    name: CI and Artifacts
+    needs: setup
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [
+          "static-x86_64-unknown-linux-musl",
+          "static-x86_64-unknown-linux-musl-jemalloc",
+          "static-x86_64-unknown-linux-musl-hmalloc",
+          "static-aarch64-unknown-linux-musl",
+          "static-aarch64-unknown-linux-musl-jemalloc",
+          "static-aarch64-unknown-linux-musl-hmalloc",
+          ]
+        oci-target: [
+          "x86_64-unknown-linux-gnu",
+          "x86_64-unknown-linux-musl",
+          "x86_64-unknown-linux-musl-jemalloc",
+          "x86_64-unknown-linux-musl-hmalloc",
+          "aarch64-unknown-linux-musl",
+          "aarch64-unknown-linux-musl-jemalloc",
+          "aarch64-unknown-linux-musl-hmalloc",
+          ]

-            - name: Upload Complement results
-              uses: actions/upload-artifact@v4
-              with:
-                name: complement_test_results.jsonl
-                path: complement_test_results.jsonl
-                if-no-files-found: error
+    steps:
+      - name: Perform continuous integration
+        run: direnv exec . engage

-            - name: Diff Complement results with checked-in repo results
-            # TODO: figure out why our complement results are not 100% consistent so we don't need to allow failures
-              continue-on-error: true
-              run: |
-                  diff -u --color=always tests/test_results/complement/test_results.jsonl complement_test_results.jsonl > >(tee -a complement_test_output.log)

-            - name: Add Complement diff result to Job Summary
-              run: |
-                  echo '# Complement diff results' >> $GITHUB_STEP_SUMMARY
-                  echo '```diff' >> $GITHUB_STEP_SUMMARY
-                  tail -n 100 complement_test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
-                  echo '```' >> $GITHUB_STEP_SUMMARY
+      - name: Build static artifacts
+        run: |
+          ./bin/nix-build-and-cache .#${{ matrix.target }}
+          mkdir -p target/release
+          cp -v -f result/bin/conduit target/release
+          direnv exec . cargo deb --no-build --output target/debian/${{ matrix.target }}.deb

-            - name: Update Job Summary
-              if: success() || failure()
-              run: |
-                  if [ ${{ job.status }} == 'success' ]; then
-                      echo '# ✅ completed suwuccessfully' >> $GITHUB_STEP_SUMMARY
-                  else
-                      echo '```' >> $GITHUB_STEP_SUMMARY
-                      tail -n 20 test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
-                      echo '```' >> $GITHUB_STEP_SUMMARY
-                  fi
+      - name: Upload static artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.target }}
+          path: result/bin/conduit
+          if-no-files-found: error

-    build:
-        name: Build
-        runs-on: ubuntu-latest
-        needs: tests
-        if: github.event.pull_request.draft != true
-        strategy:
-            matrix:
-                include:
-                    - target: aarch64-unknown-linux-musl
-                    - target: aarch64-unknown-linux-musl-jemalloc
-                    - target: x86_64-unknown-linux-musl
-                    - target: x86_64-unknown-linux-musl-jemalloc
-        steps:
-            - name: Sync repository
-              uses: actions/checkout@v4
+      - name: Upload static deb artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.target }}.deb
+          path: target/debian/${{ matrix.target }}.deb
+          if-no-files-found: error

-            - name: Install Nix
-              uses: DeterminateSystems/nix-installer-action@main

-            - name: Install and enable Cachix binary cache
-              run: |
-                  nix profile install nixpkgs#cachix
-                  cachix use crane
-                  cachix use nix-community
+      - name: Build OCI images
+        run: |
+          ./bin/nix-build-and-cache .#oci-image-${{ matrix.oci-target }}
+          cp -v -f result oci-image-${{ matrix.oci-target }}.tar.gz

-            - name: Configure Magic Nix Cache
-              uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Upload OCI image artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: oci-image-${{ matrix.oci-target }}
+          path: oci-image-${{ matrix.oci-target }}.tar.gz
+          if-no-files-found: error
+          # don't compress again
+          compression-level: 0

-            - name: Apply Nix binary cache configuration
-              run: |
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
-                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
-                  EOF

-            - name: Use alternative Nix binary caches if specified
-              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
-              run: |
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = ${{ env.ATTIC_ENDPOINT }}
-                  extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}
-                  EOF

-            - name: Prepare build environment
-              run: |
-                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
-                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
-                  direnv allow
-                  nix develop --command true

-            - name: Build static ${{ matrix.target }}
-              run: |
-                  CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
+  publish:
+    needs: build-and-test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Extract metadata for Dockerhub
+      env:
+        REGISTRY: registry.hub.docker.com
+        IMAGE_NAME: ${{ github.repository }}
+      id: meta-dockerhub
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

-                  bin/nix-build-and-cache just .#static-${{ matrix.target }}
-                  mkdir -v -p target/release/
-                  mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
-                  cp -v -f result/bin/conduit target/release/conduwuit
-                  cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
-                  direnv exec . cargo deb --verbose --no-build --no-strip --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb
-                  mv -v target/release/conduwuit static-${{ matrix.target }}
-                  mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb
+    - name: Extract metadata for GitHub Container Registry
+      env:
+        REGISTRY: ghcr.io
+        IMAGE_NAME: ${{ github.repository }}
+      id: meta-ghcr
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

-            - name: Upload static-${{ matrix.target }}
-              uses: actions/upload-artifact@v4
-              with:
-                  name: static-${{ matrix.target }}
-                  path: static-${{ matrix.target }}
-                  if-no-files-found: error

-            - name: Upload deb ${{ matrix.target }}
-              uses: actions/upload-artifact@v4
-              with:
-                  name: deb-${{ matrix.target }}
-                  path: ${{ matrix.target }}.deb
-                  if-no-files-found: error
-                  compression-level: 0
+    - name: Login to Dockerhub
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
+      if: ${{ (github.event_name != 'pull_request') && (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
+      uses: docker/login-action@v3
+      with:
+        # username is not really a secret
+        username: ${{ vars.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}

-            - name: Build OCI image ${{ matrix.target }}
-              run: |
-                  bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}
-                  cp -v -f result oci-image-${{ matrix.target }}.tar.gz
+    - name: Login to GitHub Container Registry
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v3
+      env:
+        REGISTRY: ghcr.io
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}

-            - name: Upload OCI image ${{ matrix.target }}
-              uses: actions/upload-artifact@v4
-              with:
-                  name: oci-image-${{ matrix.target }}
-                  path: oci-image-${{ matrix.target }}.tar.gz
-                  if-no-files-found: error
-                  compression-level: 0

-    docker:
-        name: Docker publish
-        runs-on: ubuntu-latest
-        needs: build
-        if: (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || (github.event.pull_request.draft != true)) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '')
-        env:
-            DOCKER_ARM64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
-            DOCKER_AMD64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
-            DOCKER_TAG: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
-            GHCR_ARM64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
-            GHCR_AMD64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
-            GHCR_TAG: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
-            GLCR_ARM64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
-            GLCR_AMD64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
-            GLCR_TAG: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            GLCR_BRANCH: registry.gitlab.com/conduwuit/conduwuit:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
+    - name: Publish to Dockerhub
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+        DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
+        IMAGE_NAME: docker.io/${{ github.repository }}
+        IMAGE_SUFFIX_AMD64: amd64
+        IMAGE_SUFFIX_ARM64V8: arm64v8
+      if: ${{ (github.event_name != 'pull_request') && (env.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
+      run: |
+        docker load -i oci-image-amd64.tar.gz
+        IMAGE_ID_AMD64=$(docker images -q conduit:main)
+        docker load -i oci-image-arm64v8.tar.gz
+        IMAGE_ID_ARM64V8=$(docker images -q conduit:main)

-            DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-            GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
-        steps:
-            - name: Login to GitHub Container Registry
-              uses: docker/login-action@v3
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
+        # Tag and push the architecture specific images
+        docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64
+        docker tag $IMAGE_ID_ARM64V8 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker push $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64
+        docker push $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        # Tag the multi-arch image
+        docker manifest create $IMAGE_NAME:$GITHUB_SHA --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker manifest push $IMAGE_NAME:$GITHUB_SHA
+        # Tag and push the git ref
+        docker manifest create $IMAGE_NAME:$GITHUB_REF_NAME --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker manifest push $IMAGE_NAME:$GITHUB_REF_NAME
+        # Tag "main" as latest (stable branch)
+        if [[ "$GITHUB_REF_NAME" = "main" ]]; then
+          docker manifest create $IMAGE_NAME:latest --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+          docker manifest push $IMAGE_NAME:latest
+        fi

-            - name: Login to Docker Hub
-              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
-              uses: docker/login-action@v3
-              with:
-                  registry: docker.io
-                  username: ${{ vars.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Publish to GitHub Container Registry
+      if: github.event_name != 'pull_request'
+      env:
+        IMAGE_NAME: ghcr.io/${{ github.repository }}
+        IMAGE_SUFFIX_AMD64: amd64
+        IMAGE_SUFFIX_ARM64V8: arm64v8
+      run: |
+        docker load -i oci-image-amd64.tar.gz
+        IMAGE_ID_AMD64=$(docker images -q conduit:main)
+        docker load -i oci-image-arm64v8.tar.gz
+        IMAGE_ID_ARM64V8=$(docker images -q conduit:main)

-            - name: Login to GitLab Container Registry
-              if: ${{ (vars.GITLAB_USERNAME != '') && (env.GITLAB_TOKEN != '') }}
-              uses: docker/login-action@v3
-              with:
-                  registry: registry.gitlab.com
-                  username: ${{ vars.GITLAB_USERNAME }}
-                  password: ${{ secrets.GITLAB_TOKEN }}
-
-            - name: Download artifacts
-              uses: actions/download-artifact@v4
-
-            - name: Move OCI images into position
-              run: |
-                  mv -v oci-image-x86_64-*-jemalloc/*.tar.gz oci-image-amd64.tar.gz
-                  mv -v oci-image-aarch64-*-jemalloc/*.tar.gz oci-image-arm64v8.tar.gz
-
-            - name: Load and push amd64 image
-              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
-              run: |
-                  docker load -i oci-image-amd64.tar.gz
-                  docker tag $(docker images -q conduit:main) ${{ env.DOCKER_AMD64 }}
-                  docker tag $(docker images -q conduit:main) ${{ env.GHCR_AMD64 }}
-                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_AMD64 }}
-                  docker push ${{ env.DOCKER_AMD64 }}
-                  docker push ${{ env.GHCR_AMD64 }}
-                  docker push ${{ env.GLCR_AMD64 }}
-
-            - name: Load and push arm64 image
-              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
-              run: |
-                  docker load -i oci-image-arm64v8.tar.gz
-                  docker tag $(docker images -q conduit:main) ${{ env.DOCKER_ARM64 }}
-                  docker tag $(docker images -q conduit:main) ${{ env.GHCR_ARM64 }}
-                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_ARM64 }}
-                  docker push ${{ env.DOCKER_ARM64 }}
-                  docker push ${{ env.GHCR_ARM64 }}
-                  docker push ${{ env.GLCR_ARM64 }}
-
-            - name: Create Docker combined manifests
-              run: |
-                  # Dockerhub Container Registry
-                  docker manifest create ${{ env.DOCKER_TAG }} --amend ${{ env.DOCKER_ARM64 }} --amend ${{ env.DOCKER_AMD64 }}
-                  docker manifest create ${{ env.DOCKER_BRANCH }} --amend ${{ env.DOCKER_ARM64 }} --amend ${{ env.DOCKER_AMD64 }}
-                  # GitHub Container Registry
-                  docker manifest create ${{ env.GHCR_TAG }} --amend ${{ env.GHCR_ARM64 }} --amend ${{ env.GHCR_AMD64 }}
-                  docker manifest create ${{ env.GHCR_BRANCH }} --amend ${{ env.GHCR_ARM64 }} --amend ${{ env.GHCR_AMD64 }}
-                  # GitLab Container Registry
-                  docker manifest create ${{ env.GLCR_TAG }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GCCR_AMD64 }}
-                  docker manifest create ${{ env.GLCR_BRANCH }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GLCR_AMD64 }}
-
-            - name: Push manifests to Docker registries
-              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
-              run: |
-                  docker manifest push ${{ env.DOCKER_TAG }}
-                  docker manifest push ${{ env.DOCKER_BRANCH }}
-                  docker manifest push ${{ env.GHCR_TAG }}
-                  docker manifest push ${{ env.GHCR_BRANCH }}
-                  docker manifest push ${{ env.GLCR_TAG }}
-                  docker manifest push ${{ env.GLCR_BRANCH }}
-
-            - name: Add Image Links to Job Summary
-              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
-              run: |
-                  echo "- \`docker pull ${{ env.DOCKER_TAG }}\`" >> $GITHUB_STEP_SUMMARY
-                  echo "- \`docker pull ${{ env.GHCR_TAG }}\`" >> $GITHUB_STEP_SUMMARY
-                  echo "- \`docker pull ${{ env.GLCR_TAG }}\`" >> $GITHUB_STEP_SUMMARY
+        # Tag and push the architecture specific images
+        docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64
+        docker tag $IMAGE_ID_ARM64V8 $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker push $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64
+        docker push $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        # Tag the multi-arch image
+        docker manifest create $IMAGE_NAME:$GITHUB_SHA --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker manifest push $IMAGE_NAME:$GITHUB_SHA
+        # Tag and push the git ref
+        docker manifest create $IMAGE_NAME:$GITHUB_REF_NAME --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker manifest push $IMAGE_NAME:$GITHUB_REF_NAME
+        # Tag "main" as latest (stable branch)
+        if [[ "$GITHUB_REF_NAME" = "main" ]]; then
+          docker manifest create $IMAGE_NAME:latest --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$GITHUB_SHA-$IMAGE_SUFFIX_ARM64V8
+          docker manifest push $IMAGE_NAME:latest
+        fi
@@ -5,8 +5,6 @@ on:
  push:
    branches:
      - main
-    tags:
-      - '*'

  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
@@ -49,7 +47,7 @@ jobs:
        uses: actions/configure-pages@v5

      - name: Install Nix (with flakes and nix-command enabled)
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v26
        with:
          nix_path: nixpkgs=channel:nixos-unstable

@@ -60,6 +58,8 @@ jobs:
            extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
            extra-substituters = https://crane.cachix.org
            extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
+            extra-substituters = https://nix.computer.surgery/conduit
+            extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
            extra-substituters = https://attic.kennel.juneis.dog/conduit
            extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
            extra-substituters = https://attic.kennel.juneis.dog/conduwuit
@@ -88,13 +88,13 @@ jobs:
      - name: Allow direnv
        run: direnv allow

-      - name: Cache CI dependencies
+      - name: Cache x86_64 inputs for devShell
        run: |
-          ./bin/nix-build-and-cache ci
+          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation

      - name: Build documentation (book)
        run: |
-          ./bin/nix-build-and-cache just .#book
+          ./bin/nix-build-and-cache .#book
          cp -r --dereference result public
      - name: Upload generated documentation (book) as normal artifact
        uses: actions/upload-artifact@v4
@@ -5,8 +5,6 @@ on:
  push:
    branches:
      - main
-    tags:
-      - '*'
  schedule:
    - cron: '00 12 * * *'

@@ -26,7 +24,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Run Trivy code and vulnerability scanner on repo
-        uses: aquasecurity/trivy-action@0.20.0
+        uses: aquasecurity/trivy-action@0.19.0
        with:
          scan-type: repo
          format: sarif
@@ -34,9 +32,9 @@ jobs:
          severity: CRITICAL,HIGH,MEDIUM,LOW

      - name: Run Trivy code and vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@0.20.0
+        uses: aquasecurity/trivy-action@0.19.0
        with:
          scan-type: fs
          format: sarif
          output: trivy-results.sarif
-          severity: CRITICAL,HIGH,MEDIUM,LOW
+          severity: CRITICAL,HIGH,MEDIUM,LOW
@@ -1,6 +1,3 @@
-# Local environment overrides
-/.env
-
 # CMake
 cmake-build-*/

@@ -84,14 +81,5 @@ public/
 # macOS
 .DS_Store

-# VS Code
-.vscode/
-
 # Zed
 .zed/
-
-# idk where you're coming from, but i'm tired of you
-rustc-ice-*
-
-# complement test logs are huge
-tests/test_results/complement/test_logs.jsonl
@@ -6,10 +6,6 @@ stages:
 variables:
  # Makes some things print in color
  TERM: ansi
-  # Faster cache and artifact compression / decompression
-  FF_USE_FASTZIP: true
-  # Print progress reports for cache and artifact transfers
-  TRANSFER_METER_FREQUENCY: 5s

 # Avoid duplicate pipelines
 # See: https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
@@ -31,14 +27,14 @@ before_script:
  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduit" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=" >> /etc/nix/nix.conf; fi

+  # Add upstream Conduit binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://nix.computer.surgery/conduit" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=" >> /etc/nix/nix.conf; fi
+
  # Add alternate binary cache
  - if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null && [ -n "$ATTIC_PUBLIC_KEY" ]; then echo "extra-trusted-public-keys = $ATTIC_PUBLIC_KEY" >> /etc/nix/nix.conf; fi

-  # Add Lix binary cache
-  - if command -v nix > /dev/null; then echo "extra-substituters = https://cache.lix.systems" >> /etc/nix/nix.conf; fi
-  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" >> /etc/nix/nix.conf; fi
-
  # Add crane binary cache
  - if command -v nix > /dev/null; then echo "extra-substituters = https://crane.cachix.org" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=" >> /etc/nix/nix.conf; fi
@@ -58,10 +54,10 @@ before_script:

 ci:
  stage: ci
-  image: nixos/nix:2.22.1
+  image: nixos/nix:2.21.2
  script:
-    # Cache CI dependencies
-    - ./bin/nix-build-and-cache ci
+    # Cache the inputs required for the devShell
+    - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation

    - direnv exec . engage
  cache:
@@ -83,14 +79,14 @@ ci:

 artifacts:
  stage: artifacts
-  image: nixos/nix:2.22.1
+  image: nixos/nix:2.21.2
  script:
-    - ./bin/nix-build-and-cache just .#static-x86_64-unknown-linux-musl
+    - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
    - cp result/bin/conduit x86_64-unknown-linux-musl

    - mkdir -p target/release
    - cp result/bin/conduit target/release
-    - direnv exec . cargo deb --no-build --no-strip
+    - direnv exec . cargo deb --no-build
    - mv target/debian/*.deb x86_64-unknown-linux-musl.deb

    # Since the OCI image package is based on the binary package, this has the
@@ -101,16 +97,16 @@ artifacts:
    # Note that although we have an `oci-image-x86_64-unknown-linux-musl`
    # output, we don't build it because it would be largely redundant to this
    # one since it's all containerized anyway.
-    - ./bin/nix-build-and-cache just .#oci-image
+    - ./bin/nix-build-and-cache .#oci-image
    - cp result oci-image-amd64.tar.gz

-    - ./bin/nix-build-and-cache just .#static-aarch64-unknown-linux-musl
+    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
    - cp result/bin/conduit aarch64-unknown-linux-musl

-    - ./bin/nix-build-and-cache just .#oci-image-aarch64-unknown-linux-musl
+    - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
    - cp result oci-image-arm64v8.tar.gz

-    - ./bin/nix-build-and-cache just .#book
+    - ./bin/nix-build-and-cache .#book
    # We can't just copy the symlink, we need to dereference it https://gitlab.com/gitlab-org/gitlab/-/issues/19746
    - cp -r --dereference result public
  artifacts:
@@ -131,6 +127,49 @@ artifacts:
    - if: $CI
  interruptible: true

+.push-oci-image:
+  stage: publish
+  image: docker:26.0.1
+  services:
+    - docker:26.0.1-dind
+  variables:
+    IMAGE_SUFFIX_AMD64: amd64
+    IMAGE_SUFFIX_ARM64V8: arm64v8
+  script:
+    - docker load -i oci-image-amd64.tar.gz
+    - IMAGE_ID_AMD64=$(docker images -q conduit:main)
+    - docker load -i oci-image-arm64v8.tar.gz
+    - IMAGE_ID_ARM64V8=$(docker images -q conduit:main)
+    # Tag and push the architecture specific images
+    - docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64
+    - docker tag $IMAGE_ID_ARM64V8 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
+    - docker push $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64
+    - docker push $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
+    # Tag the multi-arch image
+    - docker manifest create $IMAGE_NAME:$CI_COMMIT_SHA --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
+    - docker manifest push $IMAGE_NAME:$CI_COMMIT_SHA
+    # Tag and push the git ref
+    - docker manifest create $IMAGE_NAME:$CI_COMMIT_REF_NAME --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
+    - docker manifest push $IMAGE_NAME:$CI_COMMIT_REF_NAME
+    # Tag git tags as 'latest'
+    - |
+      if [[ -n "$CI_COMMIT_TAG" ]]; then
+        docker manifest create $IMAGE_NAME:latest --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
+        docker manifest push $IMAGE_NAME:latest
+      fi
+  dependencies:
+    - artifacts
+  only:
+    - main
+    - tags
+
+oci-image:push-gitlab:
+  extends: .push-oci-image
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
 pages:
  stage: publish
  dependencies:
@@ -0,0 +1,11 @@
+{
+    "recommendations": [
+        "rust-lang.rust-analyzer",
+        "editorconfig.editorconfig",
+        "ms-azuretools.vscode-docker",
+        "eamodio.gitlens",
+        "serayuzgur.crates",
+        "vadimcn.vscode-lldb",
+        "timonwong.shellcheck"
+    ]
+}
@@ -0,0 +1,35 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug conduit",
+            "sourceLanguages": ["rust"],
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=conduit",
+                    "--package=conduit"
+                ],
+                "filter": {
+                    "name": "conduit",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "env": {
+                "RUST_BACKTRACE": "1",
+                "CONDUIT_DATABASE_PATH": "/tmp/awawawa",
+                "CONDUIT_ADDRESS": "0.0.0.0",
+                "CONDUIT_PORT": "55551",
+                "CONDUIT_SERVER_NAME": "your.server.name",
+                "CONDUIT_LOG": "debug"
+            },
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
@@ -1,92 +0,0 @@
-# Contributing guide
-
-This page is for about contributing to conduwuit. The [development](docs/development.md) page may be of interest for you as well.
-
-If you would like to work on an [issue][issues] that is not assigned, preferably ask in the Matrix room first at [#conduwuit:puppygock.gay][conduwuit-matrix], and comment on it.
-
-### Linting and Formatting
-
-It is mandatory all your changes satisfy the lints (clippy, rustc, rustdoc, etc) and your code is formatted via the **nightly** `cargo fmt`. A lot of the `rustfmt.toml` features depend on nightly toolchain. It would be ideal if they weren't nightly-exclusive features, but they currently still are. CI's rustfmt uses nightly.
-
-If you need to allow a lint, please make sure it's either obvious as to why (e.g. clippy saying redundant clone but it's actually required) or it has a comment saying why. Do not write inefficient code for the sake of satisfying lints. If a lint is wrong and provides a more inefficient solution or suggestion, allow the lint and mention that in a comment.
-
-### Running CI tests locally
-
-conduwuit's CI for tests, linting, formatting, audit, etc use [`engage`][engage]. engage can be installed from nixpkgs or `cargo install engage`. conduwuit's Nix flake devshell has the nixpkgs engage with `direnv`. Use `engage --help` for more usage details.
-
-To test, format, lint, etc that CI would do, install engage, allow the `.envrc` file using `direnv allow`, and run `engage`.
-
-All of the tasks are defined at the [engage.toml][engage.toml] file. You can view all of them neatly by running `engage list`
-
-If you would like to run only a specific engage task group, use `just`:
- `engage just <group>`
- Example: `engage just lints`
-
-If you would like to run a specific engage task in a specific group, use `just <GROUP> [TASK]`: `engage just lints cargo-fmt`
-
-The following binaries are used in [`engage.toml`][engage.toml]:
-
- [`engage`][engage]
- `nix`
- [`direnv`][direnv]
- `rustc`
- `cargo`
- `cargo-fmt`
- `rustdoc`
- `cargo-clippy`
- [`cargo-audit`][cargo-audit]
- [`cargo-deb`][cargo-deb]
- [`lychee`][lychee]
-
-### Matrix tests
-
-CI runs [Complement][complement], but currently does not fail if results from the checked-in results differ with the new results. If your changes are done to fix Matrix tests, note that in your pull request. If more Complement tests start failing from your changes, please review the logs (they are uploaded as artifacts) and determine if they're intended or not.
-
-If you'd like to run Complement locally using Nix, see the [testing](docs/development/testing.md) page.
-
-[Sytest][sytest] support will come soon.
-
-### Writing documentation
-
-conduwuit's website uses [`mdbook`][mdbook] and deployed via CI using GitHub Pages in the [`documentation.yml`][documentation.yml] workflow file with Nix's mdbook in the devshell. All documentation is in the `docs/` directory at the top level. The compiled mdbook website is also uploaded as an artifact.
-
-To build the documentation using Nix, run: `bin/nix-build-and-cache just .#book`
-
-The output of the mdbook generation is in `result/`. mdbooks can be opened in your browser from the individual HTML files without any web server needed.
-
-### Inclusivity and Diversity
-
-All **MUST** code and write with inclusivity and diversity in mind. See the [following page by Google on writing inclusive code and documentation](https://developers.google.com/style/inclusive-documentation).
-
-This **EXPLICITLY** forbids usage of terms like "blacklist"/"whitelist" and "master"/"slave", [forbids gender-specific words and phrases](https://developers.google.com/style/pronouns#gender-neutral-pronouns), forbids ableist language like "sanity-check", "cripple", or "insane", and forbids culture-specific language (e.g. US-only holidays or cultures).
-
-No exceptions are allowed. Dependencies that may use these terms are allowed but [do not replicate the name in your functions or variables](https://developers.google.com/style/inclusive-documentation#write-around).
-
-In addition to language, write and code with the user experience in mind. This is software that intends to be used by everyone, so make it easy and comfortable for everyone to use. 🏳️‍⚧️
-
-### Variable, comment, function, etc standards
-
-Rust's default style and standards with regards to [function names, variable names, comments](https://rust-lang.github.io/api-guidelines/naming.html), etc applies here.
-
-### Creating pull requests
-
-Please try to keep contributions to the GitHub. While the mirrors of conduwuit allow for pull/merge requests, there is no guarantee I will see them in a timely manner. Additionally, please mark WIP or unfinished or incomplete PRs as drafts. This prevents me from having to ping once in a while to double check the status of it, especially when the CI completed successfully and everything so it *looks* done.
-
-If you open a pull request on one of the mirrors, it is your responsibility to inform me about its existence. In the future I may try to solve this with more repo bots in the conduwuit Matrix room. There is no mailing list or email-patch support on the sr.ht mirror, but if you'd like to email me a git patch you can do so at `strawberry@puppygock.gay`.
-
-Direct all PRs/MRs to the `main` branch.
-
-By sending a pull request or patch, you are agreeing that your changes are allowed to be licenced under the Apache-2.0 licence and all of your conduct is in line with the Contributor's Covenant.
-
-[issues]: https://github.com/girlbossceo/conduwuit/issues
-[conduwuit-matrix]: https://matrix.to/#/#conduwuit:puppygock.gay
-[complement]: https://github.com/matrix-org/complement/
-[engage.toml]: https://github.com/girlbossceo/conduwuit/blob/main/engage.toml
-[engage]: https://charles.page.computer.surgery/engage/
-[sytest]: https://github.com/matrix-org/sytest/
-[cargo-deb]: https://github.com/kornelski/cargo-deb
-[lychee]: https://github.com/lycheeverse/lychee
-[cargo-audit]: https://github.com/RustSec/rustsec/tree/main/cargo-audit
-[direnv]: https://direnv.net/
-[mdbook]: https://rust-lang.github.io/mdBook/
-[documentation.yml]: https://github.com/girlbossceo/conduwuit/blob/main/.github/workflows/documentation.yml
@@ -1,40 +1,30 @@
 [package]
-# TODO: when can we rename to conduwuit?
 name = "conduit"
-description = "a very cool fork of Conduit, a Matrix homeserver written in Rust"
+description = "a cool fork of Conduit, a Matrix homeserver written in Rust"
 license = "Apache-2.0"
 authors = [
    "strawberry <strawberry@puppygock.gay>",
    "timokoesters <timo@koesters.xyz>",
 ]
-homepage = "https://conduwuit.puppyirl.gay/"
+homepage = "https://puppygock.gay/conduwuit"
 repository = "https://github.com/girlbossceo/conduwuit"
 readme = "README.md"
-version = "0.3.4"
+version = "0.7.0+conduwuit-0.2.0"
 edition = "2021"

 # See also `rust-toolchain.toml`
-rust-version = "1.77.0"
+rust-version = "1.75.0"
+

 [dependencies]
-# 1.1.17 seems broken on nix from a permission error?
-libz-sys = "=1.1.16"
-
-console-subscriber = { version = "0.2", optional = true }
-
-infer = { version = "0.15", default-features = false }
-
-# for hot lib reload
-hot-lib-reloader = { version = "^0.7", optional = true }
-
 # Used for secure identifiers
 rand = "0.8.5"

 # Used for conduit::Error type
-thiserror = "1.0.60"
+thiserror = "1.0.58"

 # Used to encode server public key
-base64 = "0.22.1"
+base64 = "0.22.0"

 # Used when hashing the state
 ring = "0.17.8"
@@ -51,6 +41,8 @@ itertools = "0.12.1"
 # jwt jsonwebtokens
 jsonwebtoken = "9.3.0"

+lru-cache = "0.1.2"
+
 # Used for ruma wrapper
 serde_html_form = "0.2.6"

@@ -58,9 +50,14 @@ serde_html_form = "0.2.6"
 hmac = "0.12.1"
 sha-1 = "0.10.1"

+async-trait = "0.1.80"
+
 # used for checking if an IP is in specific subnets / CIDR ranges easier
 ipaddress = "0.1.3"

+# to encode/decode percent URIs when conduwuit is running without a reverse proxy
+#urlencoding = "2.1.3"
+
 # to get the client IP address of requests
 #axum-client-ip = "0.4.2"

@@ -70,19 +67,13 @@ cyborgtime = "2.1.1"
 # all the web/HTTP dependencies
 # Used for the http request / response body type for Ruma endpoints used with reqwest
 bytes = "1.6.0"
-http = "1.1.0"
-http-body-util = "0.1.1"
+http = "0.2.12"

 # used to replace the channels of the tokio runtime
 loole = "0.3.0"

 # Validating urls in config, was already a transitive dependency
-url = { version = "2.5.0", features = ["serde"] }
-
-async-trait = "0.1.80"
-
-lru-cache = "0.1.2"
-sanitize-filename = "0.5.0"
+url = { version = "2", features = ["serde"] }

 # standard date and time tools
 [dependencies.chrono]
@@ -92,17 +83,12 @@ default-features = false

 # Web framework
 [dependencies.axum]
-version = "0.7.5"
+version = "0.6.20"
 default-features = false
-features = ["form", "http1", "http2", "json", "matched-path"]
-
-[dependencies.axum-extra]
-version = "0.9.3"
-default-features = false
-features = ["typed-header"]
+features = ["form", "headers", "http1", "http2", "json", "matched-path"]

 [dependencies.axum-server]
-version = "0.6.0"
+version = "0.5.1"
 features = ["tls-rustls"]

 [dependencies.tower]
@@ -110,40 +96,31 @@ version = "0.4.13"
 features = ["util"]

 [dependencies.tower-http]
-version = "0.5.2"
-features = [
-    "add-extension",
-    "cors",
-    "sensitive-headers",
-    "set-header",
-    "trace",
-    "util",
-    "catch-panic",
-]
+version = "0.4.4"
+features = ["add-extension", "cors", "sensitive-headers", "trace", "util"]

 [dependencies.hyper]
-version = "1.3.1"
+version = "0.14"
 features = ["server", "http1", "http2"]

-[dependencies.hyper-util]
-version = "0.1.3"
-
 [dependencies.reqwest]
-version = "0.12.4"
+#version = "0.11.27"
+git = "https://github.com/girlbossceo/reqwest"
+rev = "319335e000fdea2e3d01f44245c8a21864d0c1c3"
 default-features = false
 features = ["rustls-tls-native-roots", "socks", "hickory-dns"]

 # all the serde stuff
 # Used for pdu definition
 [dependencies.serde]
-version = "1.0.201"
+version = "1.0.197"
 features = ["rc"]
 # Used for appservice registration files
 [dependencies.serde_yaml]
 version = "0.9.34"
 # Used for ruma wrapper
 [dependencies.serde_json]
-version = "1.0.117"
+version = "1.0.116"
 features = ["raw_value"]


@@ -163,9 +140,11 @@ features = ["jpeg", "png", "gif", "webp"]
 [dependencies.log]
 version = "0.4.21"
 default-features = false
+features = ["max_level_trace", "release_max_level_info"]
 [dependencies.tracing]
 version = "0.1.40"
 default-features = false
+features = ["max_level_trace", "release_max_level_info"]
 [dependencies.tracing-subscriber]
 version = "0.3.18"
 features = ["env-filter"]
@@ -219,16 +198,11 @@ version = "0.32.3"
 optional = true

 # optional jemalloc usage
-[dependencies.tikv-jemalloc-sys]
-version = "0.5.4"
-optional = true
-default-features = false
-features = ["stats", "unprefixed_malloc_on_supported_platforms"]
 [dependencies.tikv-jemallocator]
 version = "0.5.4"
 optional = true
 default-features = false
-features = ["stats", "unprefixed_malloc_on_supported_platforms"]
+features = ["unprefixed_malloc_on_supported_platforms"]
 [dependencies.tikv-jemalloc-ctl]
 version = "0.5.4"
 optional = true
@@ -237,7 +211,7 @@ features = ["use_std"]

 # for URL previews
 [dependencies.webpage]
-version = "2.0.1"
+version = "2.0"
 default-features = false

 # to support multiple variations of setting a config option
@@ -247,7 +221,7 @@ features = ["serde"]

 # to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
 [dependencies.axum-server-dual-protocol]
-version = "0.6"
+version = "0.5.2"
 optional = true

 # used for conduit's CLI and admin room command parsing
@@ -260,15 +234,20 @@ features = ["std", "derive", "help", "usage", "error-context", "string"]
 version = "0.3.30"
 default-features = false

-# Used for reading the configuration from conduwuit.toml & environment variables
+# Used for reading the configuration from conduit.toml & environment variables
 [dependencies.figment]
-version = "0.10.18"
+version = "0.10.17"
 features = ["env", "toml"]

 # Used for matrix spec type definitions and helpers
+#ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+#ruma = { git = "https://github.com/ruma/ruma", rev = "4d9f754657a099df8e61533787b8eebd12946435", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] }
+#ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
 [dependencies.ruma]
 git = "https://github.com/girlbossceo/ruma"
+#rev = "c988b5ff158ede9c10aeffc76ad5e31604f19ddb"
 branch = "conduwuit-changes"
+#path = "../ruma/crates/ruma"
 features = [
    "compat",
    "rand",
@@ -292,17 +271,14 @@ features = [
    "unstable-extensible-events",
 ]

-[dependencies.ruma-identifiers-validation]
-git = "https://github.com/girlbossceo/ruma"
-branch = "conduwuit-changes"
-
 [dependencies.hickory-resolver]
-version = "0.24.1"
-default-features = false
+git = "https://github.com/hickory-dns/hickory-dns"
+rev = "94ac564c3f677e038f7255ddb762e9301d0f2c5d"

 [dependencies.rust-rocksdb]
 git = "https://github.com/zaidoon1/rust-rocksdb"
 branch = "master"
+#rev = "60f783b06b49d2f6fcf1d3dda66c7194e49095d4"
 optional = true
 default-features = true
 features = ["multi-threaded-cf", "zstd"]
@@ -316,7 +292,7 @@ features = ["bundled"]

 # used only by rusqlite
 [dependencies.parking_lot]
-version = "0.12.2"
+version = "0.12.1"
 optional = true

 # used only by rusqlite
@@ -327,6 +303,7 @@ optional = true
 # used only by rusqlite and rust-rocksdb
 [dependencies.num_cpus]
 version = "1.16.0"
+optional = true

 [dependencies.tokio]
 version = "1.37.0"
@@ -335,30 +312,20 @@ features = ["fs", "macros", "sync", "signal"]
 # *nix-specific dependencies
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.28.0", features = ["resource"] }
-sd-notify = { version = "0.4.1", optional = true }    # systemd is only available/relevant on *nix platforms
+sd-notify = { version = "0.4.1", optional = true } # systemd is only available/relevant on *nix platforms
+hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d149644600d326559af0d2b235c945b05c04", features = [
+    "server",
+] } # unix socket support

-
-[target.'cfg(all(not(target_env = "msvc"), target_os = "linux"))'.dependencies]
-hardened_malloc-rs = { version = "0.1.2", optional = true, features = [
+[target.'cfg(all(not(target_env = "msvc"), not(target_os = "macos"), target_os = "linux"))'.dependencies]
+hardened_malloc-rs = { version = "0.1", optional = true, features = [
    "static",
-    "gcc",
+    "clang",
    "light",
 ], default-features = false }
 #hardened_malloc-rs = { optional = true, features = ["static","clang","light"], path = "../hardened_malloc-rs", default-features = false }


-# backport of [https://github.com/tokio-rs/tracing/pull/2956] to the 0.1.x branch of tracing.
-# we can switch back to upstream if #2956 is merged and backported in the upstream repo.
-[patch.crates-io.tracing-subscriber]
-git = "https://github.com/girlbossceo/tracing"
-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-[patch.crates-io.tracing]
-git = "https://github.com/girlbossceo/tracing"
-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-[patch.crates-io.tracing-core]
-git = "https://github.com/girlbossceo/tracing"
-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-
 [features]
 default = [
    "backend_rocksdb",
@@ -368,60 +335,32 @@ default = [
    "gzip_compression",
    "brotli_compression",
    "zstd_compression",
-    "release_max_log_level",
-    "io_uring",
 ]
 backend_sqlite = ["sqlite"]
 backend_rocksdb = ["rocksdb"]
-rocksdb = ["dep:rust-rocksdb"]
-jemalloc = [
-    "dep:tikv-jemalloc-sys",
-    "dep:tikv-jemalloc-ctl",
-    "dep:tikv-jemallocator",
-    "rust-rocksdb/jemalloc",
-]
-jemalloc_prof = ["tikv-jemalloc-sys/profiling"]
-sqlite = ["dep:rusqlite", "dep:parking_lot", "dep:thread_local"]
-systemd = ["dep:sd-notify"]
-sentry_telemetry = ["dep:sentry", "dep:sentry-tracing", "dep:sentry-tower"]
+rocksdb = ["rust-rocksdb", "num_cpus"]
+jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator", "rust-rocksdb/jemalloc"]
+sqlite = ["rusqlite", "parking_lot", "thread_local", "num_cpus"]
+systemd = ["sd-notify"]
+sentry_telemetry = ["sentry", "sentry-tracing", "sentry-tower"]

 gzip_compression = ["tower-http/compression-gzip", "reqwest/gzip"]
 zstd_compression = ["tower-http/compression-zstd"]
 brotli_compression = ["tower-http/compression-br", "reqwest/brotli"]

-sha256_media = ["dep:sha2"]
+sha256_media = ["sha2"]
 io_uring = ["rust-rocksdb/io-uring"]
-axum_dual_protocol = ["dep:axum-server-dual-protocol"]
+axum_dual_protocol = ["axum-server-dual-protocol"]

 perf_measurements = [
-    "dep:opentelemetry",
-    "dep:tracing-flame",
-    "dep:tracing-opentelemetry",
-    "dep:opentelemetry_sdk",
-    "dep:opentelemetry-jaeger",
+    "opentelemetry",
+    "tracing-flame",
+    "tracing-opentelemetry",
+    "opentelemetry_sdk",
+    "opentelemetry-jaeger",
 ]

-# enable the tokio_console server
-# incompatible with release_max_log_level
-tokio_console = ["dep:console-subscriber", "tokio/tracing"]
-
-hot_reload = ["dep:hot-lib-reloader"]
-
-hardened_malloc = ["dep:hardened_malloc-rs"]
-
-# increases performance, reduces build times, and reduces binary size by not compiling or
-# genreating code for log level filters that users will generally not use (debug and trace) only in release builds
-#
-# the expense is obviously losing those log level filters for usage at runtime. debug builds will still have all log levels
-release_max_log_level = [
-    "tracing/max_level_trace",
-    "tracing/release_max_level_info",
-    "log/max_level_trace",
-    "log/release_max_level_info",
-]
-
-# developer feature useful only in debug builds.
-dev_release_log_level = []
+hardened_malloc = ["hardened_malloc-rs"]

 # client/server interopability hacks
 #
@@ -429,51 +368,56 @@ dev_release_log_level = []
 element_hacks = []


+[[bin]]
+name = "conduit"
+path = "src/main.rs"
+
+[lib]
+name = "conduit"
+path = "src/lib.rs"
+
 [package.metadata.deb]
-name = "conduwuit"
+name = "matrix-conduit"
 maintainer = "strawberry <strawberry@puppygock.gay>"
-copyright = "2024, strawberry <strawberry@puppygock.gay>"
+copyright = "2024, Timo Kösters <timo@koesters.xyz>"
 license-file = ["LICENSE", "3"]
 depends = "$auto, ca-certificates"
 extended-description = """\
-a cool hard fork of Conduit, a Matrix homeserver written in Rust"""
+a cool fork of Conduit, a Matrix homeserver written in Rust"""
 section = "net"
 priority = "optional"
 assets = [
    [
        "debian/README.md",
-        "usr/share/doc/conduwuit/README.Debian",
+        "usr/share/doc/matrix-conduit/README.Debian",
        "644",
    ],
    [
        "README.md",
-        "usr/share/doc/conduwuit/",
+        "usr/share/doc/matrix-conduit/",
        "644",
    ],
    [
-        "target/release/conduwuit",
-        "usr/sbin/conduwuit",
+        "target/release/conduit",
+        "usr/sbin/matrix-conduit",
        "755",
    ],
    [
        "conduwuit-example.toml",
-        "etc/conduwuit/conduwuit.toml",
+        "etc/matrix-conduit/conduit.toml",
        "640",
    ],
 ]
-conf-files = ["/etc/conduwuit/conduwuit.toml"]
+conf-files = ["/etc/matrix-conduit/conduit.toml"]
 maintainer-scripts = "debian/"
-systemd-units = { unit-name = "conduwuit", start = false }
+systemd-units = { unit-name = "matrix-conduit" }


 [profile.dev]
-#debug = 0
+debug = 0
 lto = 'off'
 codegen-units = 512
 incremental = true
-overflow-checks = true
-#panic = "abort"
-
 # seems to speed up continuous debug compilations
 [profile.dev.build-override]
 opt-level = 3
@@ -487,17 +431,11 @@ opt-level = 3
 lto = 'thin'
 incremental = false
 opt-level = 3
+overflow-checks = true
 strip = "symbols"
 control-flow-guard = true # Windows only
 debug = 0

-# release profile with debug symbols
-[profile.release-debuginfo]
-inherits = "release"
-strip = "none"
-debug = "full"
-
-
 # high performance release profile which uses fat LTO across all crates, 1 codegen unit, max opt-level, and optimises across all crates
 [profile.release-high-perf]
 inherits = "release"
@@ -535,12 +473,15 @@ elided_lifetimes_in_paths = "warn"
 macro_use_extern_crate = "warn"
 single_use_lifetimes = "warn"
 unsafe_op_in_unsafe_fn = "warn"
-unreachable_pub = "warn"
+
+# not in rust 1.75.0 (doesn't break CI but won't check for it)
+unit_bindings = "warn"

 # this seems to suggest broken code and is not working correctly
 unused_braces = "allow"

 # some sadness
+unreachable_pub = "allow"
 missing_docs = "allow"


@@ -586,6 +527,7 @@ filetype_is_file = "warn"
 float_cmp_const = "warn"
 format_push_string = "warn"
 impl_trait_in_params = "warn"
+ref_to_mut = "warn"
 lossy_float_literal = "warn"
 mem_forget = "warn"
 missing_assert_message = "warn"
@@ -632,8 +574,6 @@ manual_let_else = "warn"
 trivially_copy_pass_by_ref = "warn"
 wildcard_imports = "warn"
 checked_conversions = "warn"
-#integer_arithmetic = "warn"
-#as_conversions = "warn"

 # some sadness
 missing_errors_doc = "allow"
@@ -654,6 +594,7 @@ map_err_ignore = "allow"
 missing_docs_in_private_items = "allow"
 multiple_inherent_impl = "allow"
 error_impl_error = "allow"
+as_conversions = "allow"
 string_add = "allow"
 string_slice = "allow"
 ref_patterns = "allow"
@@ -1,12 +1,13 @@
 # conduwuit

-`main` / stable: [![CI and Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)
+[![CI and Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)

 <!-- ANCHOR: catchphrase -->
-### a very cool, featureful fork of [Conduit](https://conduit.rs/)
+### a well maintained fork of [Conduit](https://conduit.rs/)
 <!-- ANCHOR_END: catchphrase -->

 Visit the [Conduwuit documentation](https://conduwuit.puppyirl.gay/) for more information.
+Alternatively you can open [docs/introduction.md](docs/introduction.md) in this repository.

 <!-- ANCHOR: body -->
 #### What is Matrix?
@@ -26,19 +27,35 @@ friends or company.

 An official conduwuit server ran by me is available at transfem.dev ([element.transfem.dev](https://element.transfem.dev) / [cinny.transfem.dev](https://cinny.transfem.dev))

-transfem.dev is a public homeserver that can be used, it is not a "test only homeserver". This means there are rules, so please read the rules: [https://transfem.dev/homeserver_rules.txt](https://transfem.dev/homeserver_rules.txt)
-
-transfem.dev is also listed at [servers.joinmatrix.org](https://servers.joinmatrix.org/)
-
 #### What is the current status?

-conduwuit is a hard fork of Conduit which is in beta, meaning you can join and participate in most
+conduwuit is a fork of Conduit which is in beta, meaning you can join and participate in most
 Matrix rooms, but not all features are supported and you might run into bugs
 from time to time.

+#### Why does this fork exist? Why don't you contribute back upstream?
+
+I now intend on contributing back as time and mental energy sees fit, but my fork still exists as a way to:
+- avoid unnecessary Matrix and general developer politics
+- avoid bikeshedding unnecessary or irrelevant things in upstream MRs
+- Fast tracked bug fixes, performance improvements, security improvements, and new features
+- Have early access to MRs that may not be suitable/acceptable for Conduit (e.g. too niche, too advanced for general users, only being blocked due to pending on contributor actions that we can fix ourselves downstream, pending Matrix spec stuff, etc)
+- Support unspecced or WIP features
+- Have official support for other OS's like Windows, macOS, and BSD.
+- Have a **stable** testing ground for some MRs or new features and bug fixes
+
+And various other reasons that may not be listed here.
 <!-- ANCHOR_END: body -->

 <!-- ANCHOR: footer -->
+#### How can I contribute?
+
+1. Look for an issue you would like to work on and make sure it's not assigned
+   to other users
+2. Ask someone to assign the issue to you (comment on the issue or chat in
+   [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay))
+3. Fork the repo and work on the issue.
+4. Submit a PR (please keep contributions to the GitHub repo, main development is done here, not the GitLab repo which exists just as a mirror. If you are avoiding GitHub, feel free to join our Matrix chat to get your patch in.)

 #### Contact

@@ -54,17 +71,16 @@ If you run into any question, feel free to

 #### Logo

-Original repo and Matrix room picture was from bran (<3). Current banner image and logo is directly from [this cohost post](https://cohost.org/RatBaby/post/1028290-finally-a-flag-for).
+No official conduwuit logo exists. Repo and Matrix room picture is from bran (<3). Banner image is directly from [this cohost post](https://cohost.org/RatBaby/post/1028290-finally-a-flag-for).

 #### Is it conduwuit or Conduwuit?

-Both, but I prefer conduwuit.
+Both.

 #### Mirrors of conduwuit

 - GitHub: <https://github.com/girlbossceo/conduwuit>
- GitLab: <https://gitlab.com/conduwuit/conduwuit>
- git.girlcock.ceo: <https://git.girlcock.ceo/strawberry/conduwuit>
+- GitLab: <https://gitlab.com/girlbossceo/conduwuit>
 - git.gay: <https://git.gay/june/conduwuit>
 - Codeberg: <https://codeberg.org/girlbossceo/conduwuit>
 - sourcehut: <https://git.sr.ht/~girlbossceo/conduwuit>
@@ -1,2 +0,0 @@
-[advisories]
-ignore = ["RUSTSEC-2020-0016"]
@@ -3,10 +3,6 @@
 set -euo pipefail

 # Path to Complement's source code
-#
-# The `COMPLEMENT_SRC` environment variable is set in the Nix dev shell, which
-# points to a store path containing the Complement source code. It's likely you
-# want to just pass that as the first argument to use it here.
 COMPLEMENT_SRC="$1"

 # A `.jsonl` file to write test logs to
@@ -15,29 +11,27 @@ LOG_FILE="$2"
 # A `.jsonl` file to write test results to
 RESULTS_FILE="$3"

-OCI_IMAGE="complement-conduit:main"
+OCI_IMAGE="complement-conduit:dev"

-toplevel="$(git rev-parse --show-toplevel)"
-
-pushd "$toplevel" > /dev/null
-
-bin/nix-build-and-cache just .#complement
-
-docker load < result
-popd > /dev/null
+env \
+    -C "$(git rev-parse --show-toplevel)" \
+    docker build \
+        --tag "$OCI_IMAGE" \
+        --file tests/complement/Dockerfile \
+        .

 # It's okay (likely, even) that `go test` exits nonzero
 set +o pipefail
 env \
    -C "$COMPLEMENT_SRC" \
    COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
-    go test -tags="conduwuit_blacklist" -v -timeout 1h -json ./tests | tee "$LOG_FILE"
+    go test -vet=all -timeout 30m -json ./tests | tee "$LOG_FILE"
 set -o pipefail

-# Post-process the results into an easy-to-compare format, sorted by Test name for reproducible results
-cat "$LOG_FILE" | jq -s -c 'sort_by(.Test)[]' | jq -c '
+# Post-process the results into an easy-to-compare format
+cat "$LOG_FILE" | jq -c '
    select(
        (.Action == "pass" or .Action == "fail" or .Action == "skip")
        and .Test != null
    ) | {Action: .Action, Test: .Test}
-    ' > "$RESULTS_FILE"
+    ' | sort > "$RESULTS_FILE"
@@ -2,95 +2,40 @@

 set -eo pipefail

-toplevel="$(git rev-parse --show-toplevel)"
+# The first argument must be the desired installable
+INSTALLABLE="$1"

-# Build just the single installable and forward any other arguments too
-just() {
-    # uses nix-output-monitor (nom) if available
-    if command -v nom &> /dev/null; then
-        nom build "$@"
-    else
-        nix build -L "$@"
-    fi
+# Build the installable and forward any other arguments too
+nix build -L "$@"

-    if [ -z "$ATTIC_TOKEN" ]; then
-        echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
-        return
-    fi
-
-    # historical "conduit" store for compatibility purposes, same as conduwuit
-    nix run --inputs-from "$toplevel" attic -- \
+if [ ! -z "$ATTIC_TOKEN" ]; then
+    nix run --inputs-from . attic -- \
        login \
        conduit \
        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduit}" \
        "$ATTIC_TOKEN"

-    # Find all output paths of the installables and their build dependencies
-    readarray -t derivations < <(nix path-info --derivation "$@")
-    cache=()
-    for derivation in "${derivations[@]}"; do
-        cache+=(
-            "$(nix-store --query --requisites --include-outputs "$derivation")"
-        )
-    done
+    # Push the target installable and its build dependencies
+    nix run --inputs-from . attic -- \
+        push \
+        conduit \
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
+        "$(nix path-info "$INSTALLABLE")"

-    # Upload them to Attic (conduit store)
-    #
-    # Use `xargs` and a here-string because something would probably explode if
-    # several thousand arguments got passed to a command at once. Hopefully no
-    # store paths include a newline in them.
-    (
-        IFS=$'\n'
-        nix shell --inputs-from "$toplevel" attic -c xargs \
-            attic push conduit <<< "${cache[*]}"
-    )

-    # main "conduwuit" store
-    nix run --inputs-from "$toplevel" attic -- \
+    # push to "conduwuit" too
+    nix run --inputs-from . attic -- \
        login \
        conduwuit \
        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \
        "$ATTIC_TOKEN"

-    # Upload them to Attic (conduwuit store)
-    #
-    # Use `xargs` and a here-string because something would probably explode if
-    # several thousand arguments got passed to a command at once. Hopefully no
-    # store paths include a newline in them.
-    (
-        IFS=$'\n'
-        nix shell --inputs-from "$toplevel" attic -c xargs \
-            attic push conduwuit <<< "${cache[*]}"
-    )
-}
-
-# Build and cache things needed for CI
-ci() {
-    cache=(
-        --inputs-from "$toplevel"
-
-        # Keep sorted
-        "$toplevel#devShells.x86_64-linux.default"
-        attic#default
-        nixpkgs#direnv
-        nixpkgs#jq
-        nixpkgs#nix-direnv
-    )
-
-    just "${cache[@]}"
-}
-
-# Build and cache *all* the package outputs from the flake.nix
-packages() {
-    declare -a cache="($(
-        nix flake show --json 2> /dev/null |
-            nix run --inputs-from "$toplevel" nixpkgs#jq -- \
-            -r \
-            '.packages."x86_64-linux" | keys | map("'"$toplevel"'#" + .) | @sh'
-    ))"
-
-    just "${cache[@]}"
-}
-
-
-eval "$@"
+    # Push the target installable and its build dependencies
+    nix run --inputs-from . attic -- \
+        push \
+        conduwuit \
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
+        "$(nix path-info "$INSTALLABLE")"
+else
+    echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
+fi
@@ -1,6 +1,6 @@
 [book]
 title = "conduwuit"
-description = "conduwuit, which is a well-maintained fork of Conduit, is a simple, fast and reliable chat server for the Matrix protocol"
+description = "conduwuit, which is a fork of Conduit, is a simple, fast and reliable chat server for the Matrix protocol"
 language = "en"
 multilingual = false
 src = "docs"
@@ -34,17 +34,12 @@
 # Defaults to `matrix.org`
 # trusted_servers = ["matrix.org"]

-# Sentry.io crash/panic reporting, performance monitoring/metrics, etc. This is NOT enabled by default.
-# conduwuit's default Sentry reporting endpoint is o4506996327251968.ingest.us.sentry.io
+# Sentry.io crash/panic reporting, performance monitoring/metrics, etc.
+# Conduwuit's Sentry reporting endpoint is o4506996327251968.ingest.us.sentry.io
 #
-# Defaults to *false*
+# Defaults to false
 #sentry = false

-# Sentry reporting URL if a custom one is desired
-#
-# Defaults to conduwuit's default Sentry endpoint: "https://fe2eb4536aa04949e28eff3128d64757@o4506996327251968.ingest.us.sentry.io/4506996334657536"
-#sentry_endpoint = ""
-
 # Report your Conduwuit server_name in Sentry.io crash reports and metrics
 #
 # Defaults to false
@@ -60,9 +55,8 @@

 ### Database configuration

-# This is the only directory where conduwuit will save its data, including media.
-# Note: this was previously "/var/lib/matrix-conduit"
-database_path = "/var/lib/conduwuit"
+# This is the only directory where conduwuit will save its data, including media
+database_path = "/var/lib/matrix-conduit/"

 # Database backend: Only rocksdb and sqlite are supported. Please note that sqlite
 # will perform significantly worse than rocksdb as it is not intended to be used the
@@ -84,6 +78,21 @@ port = 6167
 # likely need this to be 0.0.0.0.
 address = "127.0.0.1"

+# How many requests conduwuit sends to other servers at the same time concurrently. Default is 500
+# Note that because conduwuit is very fast unlike other homeserver implementations, setting this too
+# high could inadvertently result in ratelimits kicking in, or overloading lower-end homeservers out there.
+#
+# A valid use-case for enabling this is if you have a significant amount of overall federation activity
+# such as many rooms joined/tracked, and many servers in the true destination cache caused by that. Upon
+# rebooting conduwuit, depending on how fast your resources are, client and incoming federation requests
+# may timeout or be "stalled" for a period of time due to hitting the max concurrent requests limit from
+# refreshing federation/destination caches and such.
+#
+# If you have a lot of active users on your homeserver, you will definitely need to raise this.
+#
+# No this will not speed up room joins.
+#max_concurrent_requests = 500
+
 # Max request size for file uploads
 max_request_size = 20_000_000 # in bytes

@@ -270,19 +279,6 @@ url_preview_check_root_domain = false
 # Defaults to true
 allow_profile_lookup_federation_requests = true

-# Config option to automatically deactivate the account of any user who attempts to join a:
-# - banned room
-# - forbidden room alias
-# - room alias or ID with a forbidden server name
-#
-# This may be useful if all your banned lists consist of toxic rooms or servers that no good faith user would ever attempt to join, and
-# to automatically remediate the problem without any admin user intervention.
-#
-# This will also make the user leave all rooms. Federation (e.g. remote room invites) are ignored here.
-#
-# Defaults to false as rooms can be banned for non-moderation-related reasons
-#auto_deactivate_banned_room_attempts = false
-

 ### Misc

@@ -292,8 +288,8 @@ allow_profile_lookup_federation_requests = true
 # For release builds, the tracing crate is configured to only implement levels higher than error to avoid unnecessary overhead in the compiled binary from trace macros.
 # For debug builds, this restriction is not applied.
 #
-# Defaults to "info"
-#log = "info"
+# Defaults to "warn"
+#log = "warn"

 # controls whether encrypted rooms and events are allowed (default true)
 #allow_encryption = false
@@ -350,18 +346,6 @@ allow_profile_lookup_federation_requests = true
 # messages without any attempt at redelivery.
 #startup_netburst_keep = 50

-# If the 'perf_measurements' feature is enabled, enables collecting folded stack trace profile of tracing spans using
-# tracing_flame. The resulting profile can be visualized with inferno[1], speedscope[2], or a number of other tools.
-# [1]: https://github.com/jonhoo/inferno
-# [2]: www.speedscope.app
-# tracing_flame = false
-
-# If 'tracing_flame' is enabled, sets a filter for which events will be included in the profile.
-# Supported syntax is documented at https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives
-# tracing_flame_filter = "trace,h2=off"
-
-# If 'tracing_flame' is enabled, set the path to write the generated profile.
-# tracing_flame_output_path = "./tracing.folded"

 ### Generic database options

@@ -398,10 +382,6 @@ allow_profile_lookup_federation_requests = true
 # Defaults to false
 #rocksdb_optimize_for_spinning_disks = false

-# Enables direct-io to increase database performance. This is enabled by default. Set this option to false if the
-# database resides on a filesystem which does not support direct-io.
-#rocksdb_direct_io = true
-
 # RocksDB log level. This is not the same as conduwuit's log level. This is the log level for the RocksDB engine/library
 # which show up in your database folder/path as `LOG` files. Defaults to error. conduwuit will typically log RocksDB errors as normal.
 #rocksdb_log_level = "error"
@@ -412,31 +392,21 @@ allow_profile_lookup_federation_requests = true
 # Time in seconds before RocksDB will forcibly rotate logs. Defaults to 0.
 #rocksdb_log_time_to_roll = 0

-# Amount of threads that RocksDB will use for parallelism on database operatons such as cleanup, sync, flush, compaction, etc. Set to 0 to use all your logical threads.
+# Amount of threads that RocksDB will use for parallelism on database operatons such as cleanup, sync, flush, compaction, etc. Set to 0 to use all your physical cores.
 #
-# Defaults to your CPU logical thread count.
+# Defaults to your CPU physical core count (not logical threads).
 #rocksdb_parallelism_threads = 0

-# Enables idle IO priority for compaction thread. This prevents any unexpected lag in the server's operation and
-# is usually a good idea. Enabled by default.
-#rocksdb_compaction_ioprio_idle = true
-
-# Enables idle CPU priority for compaction thread. This is not enabled by default to prevent compaction from
-# falling too far behind on busy systems.
-#rocksdb_compaction_prio_idle = false
-
 # Maximum number of LOG files RocksDB will keep. This must *not* be set to 0. It must be at least 1.
 # Defaults to 3 as these are not very useful.
 #rocksdb_max_log_files = 3

 # Type of RocksDB database compression to use.
-# Available options are "zstd", "zlib", "bz2", "lz4", or "none"
+# Available options are "zstd", "zlib", "bz2" and "lz4"
 # It is best to use ZSTD as an overall good balance between speed/performance, storage, IO amplification, and CPU usage.
 # For more performance but less compression (more storage used) and less CPU usage, use LZ4.
 # See https://github.com/facebook/rocksdb/wiki/Compression for more details.
 #
-# "none" will disable compression.
-#
 # Defaults to "zstd"
 #rocksdb_compression_algo = "zstd"

@@ -503,7 +473,7 @@ allow_profile_lookup_federation_requests = true
 # Maximum entries stored in DNS memory-cache. The size of an entry may vary so please take care if
 # raising this value excessively. Only decrease this when using an external DNS cache. Please note
 # that systemd does *not* count as an external cache, even when configured to do so.
-#dns_cache_entries = 32768
+#dns_cache_entries = 12288

 # Minimum time-to-live in seconds for entries in the DNS cache. The default may appear high to most
 # administrators; this is by design. Only decrease this if you are using an external DNS cache.
@@ -512,9 +482,7 @@ allow_profile_lookup_federation_requests = true
 # Minimum time-to-live in seconds for NXDOMAIN entries in the DNS cache. This value is critical for
 # the server to federate efficiently. NXDOMAIN's are assumed to not be returning to the federation
 # and aggressively cached rather than constantly rechecked.
-#
-# Defaults to 3 days as these are *very rarely* false negatives.
-#dns_min_ttl_nxdomain = 259200
+#dns_min_ttl_nxdomain = 86400

 # The number of seconds to wait for a reply to a DNS query. Please note that recursive queries can
 # take up to several seconds for some domains, so this value should not be too low.
@@ -532,27 +500,6 @@ allow_profile_lookup_federation_requests = true
 # The default is to query one nameserver and stop (false).
 #query_all_nameservers = true

-# Enables using *only* TCP for querying your specified nameservers instead of UDP.
-#
-# You very likely do *not* want this. hickory-resolver already falls back to TCP on UDP errors.
-# Defaults to false
-#query_over_tcp_only = false
-
-# DNS A/AAAA record lookup strategy
-#
-# Takes a number of one of the following options:
-# 1 - Ipv4Only (Only query for A records, no AAAA/IPv6)
-# 2 - Ipv6Only (Only query for AAAA records, no A/IPv4)
-# 3 - Ipv4AndIpv6 (Query for A and AAAA records in parallel, uses whatever returns a successful response first)
-# 4 - Ipv6thenIpv4 (Query for AAAA record, if that fails then query the A record)
-# 5 - Ipv4thenIpv6 (Query for A record, if that fails then query the AAAA record)
-#
-# If you don't have IPv6 networking, then for better performance it may be suitable to set this to Ipv4Only (1) as
-# you will never ever use the AAAA record contents even if the AAAA record is successful instead of the A record.
-#
-# Defaults to 5 - Ipv4ThenIpv6 as this is the most compatible and IPv4 networking is currently the most prevalent.
-#ip_lookup_strategy = 5
-

 ### Request Timeouts, Connection Timeouts, and Connection Pooling

@@ -565,37 +512,30 @@ allow_profile_lookup_federation_requests = true
 ##
 ## Generally these defaults are the best, but if you find a reason to need to change these they are here.

-# Default/base connection timeout.
+# Default/base connection timeout
 # This is used only by URL previews and update/news endpoint checks
 #
 # Defaults to 10 seconds
 #request_conn_timeout = 10

-# Default/base request timeout. The time waiting to receive more data from another server.
-# This is used only by URL previews, update/news, and misc endpoint checks
+# Default/base request timeout
+# This is used only by URL previews and update/news endpoint checks
 #
 # Defaults to 35 seconds
 #request_timeout = 35

-# Default/base request total timeout. The time limit for a whole request. This is set very high to not
-# cancel healthy requests while serving as a backstop.
-# This is used only by URL previews and update/news endpoint checks
-#
-# Defaults to 320 seconds
-#request_total_timeout = 320
-
-# Default/base idle connection pool timeout
-# This is used only by URL previews and update/news endpoint checks
-#
-# Defaults to 5 seconds
-#request_idle_timeout = 5
-
 # Default/base max idle connections per host
 # This is used only by URL previews and update/news endpoint checks
 #
 # Defaults to 1 as generally the same open connection can be re-used
 #request_idle_per_host = 1

+# Default/base idle connection pool timeout
+# This is used only by URL previews and update/news endpoint checks
+#
+# Defaults to 5 seconds
+#request_idle_timeout = 5
+
 # Federation well-known resolution connection timeout
 #
 # Defaults to 6 seconds
@@ -606,42 +546,26 @@ allow_profile_lookup_federation_requests = true
 # Defaults to 10 seconds
 #well_known_timeout = 10

-# Federation client request timeout
+# Federation client/server request timeout
 # You most definitely want this to be high to account for extremely large room joins, slow homeservers, your own resources etc.
 #
 # Defaults to 300 seconds
 #federation_timeout = 300

-# Federation client idle connection pool timeout
-#
-# Defaults to 25 seconds
-#federation_idle_timeout = 25
-
-# Federation client max idle connections per host
+# Federation client/sender max idle connections per host
 #
 # Defaults to 1 as generally the same open connection can be re-used
 #federation_idle_per_host = 1

-# Federation sender request timeout
-# The time it takes for the remote server to process sent transactions can take a while.
+# Federation client/sender idle connection pool timeout
 #
-# Defaults to 180 seconds
-#sender_timeout = 180
-
-# Federation sender idle connection pool timeout
-#
-# Defaults to 180 seconds
-#sender_idle_timeout = 180
-
-# Federation sender transaction retry backoff limit
-#
-# Defaults to 86400 seconds
-#sender_retry_backoff_limit = 86400
+# Defaults to 25 seconds
+#federation_idle_timeout = 25

 # Appservice URL request connection timeout
 #
-# Defaults to 35 seconds as generally appservices are hosted within the same network
-#appservice_timeout = 35
+# Defaults to 120 seconds
+#appservice_timeout = 120

 # Appservice URL idle connection pool timeout
 #
@@ -675,11 +599,6 @@ allow_profile_lookup_federation_requests = true
 #
 #allow_outgoing_presence = true

-# Config option to enable the presence idle timer for remote users. Disabling is offered as an optimization for
-# servers participating in many large rooms or when resources are limited. Disabling it may cause incorrect
-# presence states (i.e. stuck online) to be seen for some remote users. Defaults to true.
-#presence_timeout_remote_users = true
-
 # Config option to control how many seconds before presence updates that you are idle. Defaults to 5 minutes.
 #presence_idle_timeout_s = 300

@@ -1,22 +1,37 @@
-# conduwuit for Debian
+conduwuit for Debian
+==================

-Information about downloading and deploying the Debian package. This may also be referenced for other `apt`-based distros such as Ubuntu.
+Installation
+------------

-### Installation
+Information about downloading, building and deploying the Debian package, see
+the "Installing Conduit" section in the Deploying docs.
+All following sections until "Setting up the Reverse Proxy" be ignored because
+this is handled automatically by the packaging.

-It is recommended to see the [generic deployment guide](../deploying/generic.md) for further information if needed as usage of the Debian package is generally related.
+Configuration
+-------------

-### Configuration
+When installed, Debconf generates the configuration of the homeserver
+(host)name, the address and port it listens on. This configuration ends up in
+`/etc/matrix-conduit/conduit.toml`.

-When installed, the example config is placed at `/etc/conduwuit/conduwuit.toml` as the default config. At the minimum, you will need to change your `server_name` here.
+You can tweak more detailed settings by uncommenting and setting the variables
+in `/etc/matrix-conduit/conduit.toml`. This involves settings such as the maximum
+file size for download/upload, enabling federation, etc.

-You can tweak more detailed settings by uncommenting and setting the config options
-in `/etc/conduwuit/conduwuit.toml`.
+Running
+-------

-### Running
+The package uses the `matrix-conduit.service` systemd unit file to start and
+stop Conduit. It loads the configuration file mentioned above to set up the
+environment before running the server.

-The package uses the [`conduwuit.service`](../configuration.md#example-systemd-unit-file) systemd unit file to start and stop conduwuit. The binary is installed at `/usr/sbin/conduwuit`.
+This package assumes by default that Conduit will be placed behind a reverse
+proxy such as Apache or nginx. This default deployment entails just listening
+on `127.0.0.1` and the free port `6167` and is reachable via a client using the URL
+<http://localhost:6167>.

-This package assumes by default that conduwuit will be placed behind a reverse proxy. The default config options apply (listening on `localhost` and TCP port `6167`). Matrix federation requires a valid domain name and TLS, so you will need to set up TLS certificates and renewal for it to work properly if you intend to federate.
-
-Consult various online documentation and guides on setting up a reverse proxy and TLS. Caddy is documented at the [generic deployment guide](../deploying/generic.md#setting-up-the-reverse-proxy) as it's the easiest and most user friendly.
+At a later stage this packaging may support also setting up TLS and running
+stand-alone.  In this case, however, you need to set up some certificates and
+renewal, for it to work properly.
@@ -1,18 +1,17 @@
 #!/bin/sh
 set -e

-# TODO: implement debconf support that is maintainable without duplicating the config
 # Source debconf library.
-#. /usr/share/debconf/confmodule
-#
-## Ask for the Matrix homeserver name, address and port.
-#db_input high conduwuit/hostname || true
-#db_go
-#
-#db_input low conduwuit/address || true
-#db_go
-#
-#db_input medium conduwuit/port || true
-#db_go
+. /usr/share/debconf/confmodule
+
+# Ask for the Matrix homeserver name, address and port.
+db_input high matrix-conduit/hostname || true
+db_go
+
+db_input low matrix-conduit/address || true
+db_go
+
+db_input medium matrix-conduit/port || true
+db_go

 exit 0
@@ -1,20 +1,13 @@
 [Unit]
 Description=conduwuit Matrix homeserver
-Documentation=https://conduwuit.puppyirl.gay/
 After=network-online.target

 [Service]
 DynamicUser=yes
-User=conduwuit
-Group=conduwuit
+User=_matrix-conduit
+Group=_matrix-conduit
 Type=notify

-Environment="CONDUWUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
-
-ExecStart=/usr/sbin/conduwuit
-
-ReadWritePaths=/var/lib/conduwuit /etc/conduwuit
-
 AmbientCapabilities=
 CapabilityBoundingSet=

@@ -43,19 +36,22 @@ RestrictNamespaces=yes
 RestrictRealtime=yes
 RestrictSUIDSGID=yes
 SystemCallArchitectures=native
-SystemCallFilter=@system-service @resources
-SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc
+SystemCallFilter=@system-service
+SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @resources @privileged @keyring @ipc
 SystemCallErrorNumber=EPERM
-#StateDirectory=conduwuit
+StateDirectory=matrix-conduit

-RuntimeDirectory=conduwuit
+RuntimeDirectory=conduit
 RuntimeDirectoryMode=0750

+Environment="CONDUIT_CONFIG=/etc/matrix-conduit/conduit.toml"
+
+ExecStart=/usr/sbin/matrix-conduit
 Restart=on-failure
 RestartSec=5

-TimeoutStopSec=2m
-TimeoutStartSec=2m
+TimeoutStopSec=4m
+TimeoutStartSec=4m

 StartLimitInterval=1m
 StartLimitBurst=5
@@ -1,43 +1,28 @@
 #!/bin/sh
 set -e

-# TODO: implement debconf support that is maintainable without duplicating the config
-#. /usr/share/debconf/confmodule
+. /usr/share/debconf/confmodule

-CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
-CONDUWUIT_CONFIG_PATH=/etc/conduwuit
-CONDUWUIT_CONFIG_FILE="${CONDUWUIT_CONFIG_PATH}/conduwuit.toml"
+CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/

 case "$1" in
  configure)
-    # Create the `conduwuit` user if it does not exist yet.
-    if ! getent passwd conduwuit > /dev/null ; then
-      echo 'Adding system user for the conduwuit Matrix homeserver' 1>&2
+    # Create the `_matrix-conduit` user if it does not exist yet.
+    if ! getent passwd _matrix-conduit > /dev/null ; then
+      echo 'Adding system user for the Conduwuit Matrix homeserver' 1>&2
      adduser --system --group --quiet \
-        --home "$CONDUWUIT_DATABASE_PATH" \
+        --home "$CONDUIT_DATABASE_PATH" \
        --disabled-login \
        --shell "/usr/sbin/nologin" \
-        --verbose \
-        conduwuit
+        --force-badname \
+        _matrix-conduit
    fi

    # Create the database path if it does not exist yet and fix up ownership
-    # and permissions for the config.
-    mkdir -v -p "$CONDUWUIT_DATABASE_PATH"
-
-    # symlink the previous location for compatibility
-    ln -s -v "$CONDUWUIT_DATABASE_PATH" "/var/lib/matrix-conduit"
-
-    chown -v conduwuit:conduwuit -R "$CONDUWUIT_DATABASE_PATH"
-    chown -v conduwuit:conduwuit -R "$CONDUWUIT_CONFIG_PATH"
-
-    chmod -v 740 "$CONDUWUIT_DATABASE_PATH"
-
-    echo ''
-    echo 'Make sure you edit the example config at /etc/conduwuit/conduwuit.toml before starting!'
-    echo 'To start the server, run: systemctl start conduwuit.service'
-    echo ''
-
+    # and permissions.
+    mkdir -p "$CONDUIT_DATABASE_PATH"
+    chown _matrix-conduit:_matrix-conduit -R "$CONDUIT_DATABASE_PATH"
+    chmod 700 "$CONDUIT_DATABASE_PATH"
    ;;
 esac

@@ -1,10 +1,10 @@
 #!/bin/sh
 set -e

-#. /usr/share/debconf/confmodule
+. /usr/share/debconf/confmodule

-CONDUWUIT_CONFIG_PATH=/etc/conduwuit
-CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
+CONDUIT_CONFIG_PATH=/etc/matrix-conduit
+CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit

 case $1 in
  purge)
@@ -14,12 +14,12 @@ case $1 in
    # Per https://www.debian.org/doc/debian-policy/ch-files.html#behavior
    # "configuration files must be preserved when the package is removed, and
    #  only deleted when the package is purged."
-    if [ -d "$CONDUWUIT_CONFIG_PATH" ]; then
-      rm -v -r "$CONDUWUIT_CONFIG_PATH"
+    if [ -d "$CONDUIT_CONFIG_PATH" ]; then
+      rm -r "$CONDUIT_CONFIG_PATH"
    fi

-    if [ -d "$CONDUWUIT_DATABASE_PATH" ]; then
-      rm -v -r "$CONDUWUIT_DATABASE_PATH"
+    if [ -d "$CONDUIT_DATABASE_PATH" ]; then
+      rm -r "$CONDUIT_DATABASE_PATH"
    fi
    ;;
 esac
@@ -0,0 +1,21 @@
+Template: matrix-conduit/hostname
+Type: string
+Default: localhost
+Description: The server (host)name of the Matrix homeserver
+ This is the hostname the homeserver will be reachable at via a client.
+ .
+ If set to "localhost", you can connect with a client locally and clients
+ from other hosts and also other homeservers will not be able to reach you!
+
+Template: matrix-conduit/address
+Type: string
+Default: 127.0.0.1
+Description: The listen address of the Matrix homeserver
+ This is the address the homeserver will listen on. Leave it set to 127.0.0.1
+ when using a reverse proxy.
+
+Template: matrix-conduit/port
+Type: string
+Default: 6167
+Description: The port of the Matrix homeserver
+ This port is most often just accessed by a reverse proxy.
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# If the config file does not contain a default port and the CONDUIT_PORT env is not set, create
+# try to get port from process list
+if [ -z "${CONDUIT_PORT}" ]; then
+  CONDUIT_PORT=$(ss -tlpn | grep conduit | grep -m1 -o ':[0-9]*' | grep -m1 -o '[0-9]*')
+fi
+
+# If CONDUIT_ADDRESS is not set try to get the address from the process list
+if [ -z "${CONDUIT_ADDRESS}" ]; then
+  CONDUIT_ADDRESS=$(ss -tlpn | awk -F ' +|:' '/conduit/ { print $4 }')
+fi
+
+# The actual health check.
+# We try to first get a response on HTTP and when that fails on HTTPS and when that fails, we exit with code 1.
+# TODO: Change this to a single wget call. Do we have a config value that we can check for that?
+wget --no-verbose --tries=1 --spider "http://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \
+    wget --no-verbose --tries=1 --spider "https://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \
+    exit 1
@@ -2,17 +2,12 @@

 - [Introduction](introduction.md)
 - [Differences from upstream Conduit](differences.md)
+
 - [Example configuration](configuration.md)
 - [Deploying](deploying.md)
    - [Generic](deploying/generic.md)
-    - [NixOS](deploying/nixos.md)
-    - [Docker](deploying/docker.md)
-    - [Arch Linux](deploying/arch-linux.md)
    - [Debian](deploying/debian.md)
+    - [Docker](deploying/docker.md)
+    - [NixOS](deploying/nixos.md)
 - [TURN](turn.md)
 - [Appservices](appservices.md)
- [Maintenance](maintenance.md)
- [Troubleshooting](troubleshooting.md)
- [Development](development.md)
-    - [Contributing](contributing.md)
-    - [Testing](development/testing.md)
@@ -3,9 +3,3 @@
 ``` toml
 {{#include ../conduwuit-example.toml}}
 ```
-
-# Example systemd unit file
-
-```
-{{#include ../debian/conduwuit.service}}
-```
@@ -1 +0,0 @@
-{{#include ../CONTRIBUTING.md}}
@@ -1,8 +0,0 @@
-# conduwuit for Arch Linux
-
-Currently conduwuit is only on the Arch User Repository (AUR).
-
-The conduwuit AUR packages are community maintained and are not maintained by conduwuit development team, but the AUR package maintainers are in the Matrix room. Please attempt to verify your AUR package's PKGBUILD file looks fine before asking for support.
-
- [conduwuit](https://aur.archlinux.org/packages/conduwuit) - latest tagged conduwuit
- [conduwuit-git](https://aur.archlinux.org/packages/conduwuit-git) - latest git conduwuit from `main` branch
@@ -1,35 +1,46 @@
-# conduwuit - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
-        ### If you already built the conduduwit image with 'docker build' or want to use the Docker Hub image,
+        ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image,
        ### then you are ready to go.
        image: girlbossceo/conduwuit:latest
+        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
+        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this:
+        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
+        # build:
+        #     context: .
+        #     args:
+        #         CREATED: '2021-03-16T08:18:27Z'
+        #         VERSION: '0.1.0'
+        #         LOCAL: 'false'
+        #         GIT_REF: origin/master
        restart: unless-stopped
        volumes:
-            - db:/var/lib/conduwuit
-            #- ./conduwuit.toml:/etc/conduwuit.toml
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
        networks:
            - proxy
        environment:
-            CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
-            CONDUWUIT_DATABASE_BACKEND: rocksdb
-            CONDUWUIT_PORT: 6167
-            CONDUWUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
-            CONDUWUIT_ALLOW_REGISTRATION: 'true'
-            CONDUWUIT_ALLOW_FEDERATION: 'true'
-            CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-            CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            #CONDUWUIT_LOG: warn,state_res=warn
-            CONDUWUIT_ADDRESS: 0.0.0.0
-            #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
+            CONDUIT_DATABASE_BACKEND: rocksdb
+            CONDUIT_PORT: 6167
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
+            CONDUIT_ALLOW_REGISTRATION: 'true'
+            CONDUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
+            #CONDUIT_LOG: warn,state_res=warn
+            CONDUIT_ADDRESS: 0.0.0.0
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
        #cpuset: "0-4" # Uncomment to limit to specific CPU cores

    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-    # and in the docker compose override file.
+    # and in the docker-compose override file.
    well-known:
        image: nginx:latest
        restart: unless-stopped
@@ -38,7 +49,7 @@ services:
            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and conduwuit
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@@ -1,4 +1,4 @@
-# conduwuit - Traefik Reverse Proxy Labels
+# Conduit - Traefik Reverse Proxy Labels
 version: '2.4' # uses '2.4' for cpuset

 services:
@@ -7,10 +7,10 @@ services:
            - "traefik.enable=true"
            - "traefik.docker.network=proxy"  # Change this to the name of your Traefik docker proxy network

-            - "traefik.http.routers.to-conduwuit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which conduwuit is hosted
-            - "traefik.http.routers.to-conduwuit.tls=true"
-            - "traefik.http.routers.to-conduwuit.tls.certresolver=letsencrypt"
-            - "traefik.http.routers.to-conduwuit.middlewares=cors-headers@docker"
+            - "traefik.http.routers.to-conduit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which Conduit is hosted
+            - "traefik.http.routers.to-conduit.tls=true"
+            - "traefik.http.routers.to-conduit.tls.certresolver=letsencrypt"
+            - "traefik.http.routers.to-conduit.middlewares=cors-headers@docker"

            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
@@ -18,7 +18,7 @@ services:

    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-    # and in the docker compose file.
+    # and in the docker-compose file.
    well-known:
        labels:
            - "traefik.enable=true"
@@ -1,38 +1,49 @@
-# conduwuit - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
-        ### If you already built the conduwuit image with 'docker build' or want to use the Docker Hub image,
+        ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image,
        ### then you are ready to go.
        image: girlbossceo/conduwuit:latest
+        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
+        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this:
+        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
+        # build:
+        #     context: .
+        #     args:
+        #         CREATED: '2021-03-16T08:18:27Z'
+        #         VERSION: '0.1.0'
+        #         LOCAL: 'false'
+        #         GIT_REF: origin/master
        restart: unless-stopped
        volumes:
-            - db:/srv/conduwuit/.local/share/conduwuit
-            #- ./conduwuit.toml:/etc/conduwuit.toml
+            - db:/srv/conduit/.local/share/conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
        networks:
            - proxy
        environment:
-            CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            CONDUWUIT_ALLOW_REGISTRATION : 'true'
-            #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            CONDUIT_ALLOW_REGISTRATION : 'true'
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
            ### Uncomment and change values as desired
-            # CONDUWUIT_ADDRESS: 0.0.0.0
-            # CONDUWUIT_PORT: 6167
-            # CONDUWUIT_LOG: info  # default is: "warn,state_res=warn"
-            # CONDUWUIT_ALLOW_JAEGER: 'false'
-            # CONDUWUIT_ALLOW_ENCRYPTION: 'true'
-            # CONDUWUIT_ALLOW_FEDERATION: 'true'
-            # CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-            # CONDUWUIT_DATABASE_PATH: /srv/conduwuit/.local/share/conduwuit
-            # CONDUWUIT_WORKERS: 10
-            # CONDUWUIT_MAX_REQUEST_SIZE: 20000000  # in bytes, ~20 MB
+            # CONDUIT_ADDRESS: 0.0.0.0
+            # CONDUIT_PORT: 6167
+            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
+            # CONDUIT_LOG: info  # default is: "warn,state_res=warn"
+            # CONDUIT_ALLOW_JAEGER: 'false'
+            # CONDUIT_ALLOW_ENCRYPTION: 'true'
+            # CONDUIT_ALLOW_FEDERATION: 'true'
+            # CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
+            # CONDUIT_WORKERS: 10
+            # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
        #cpuset: "0-4" # Uncomment to limit to specific CPU cores

    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-    # and in the docker compose override file.
+    # and in the docker-compose override file.
    well-known:
        image: nginx:latest
        restart: unless-stopped
@@ -42,7 +53,7 @@ services:

    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and conduwuit
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@@ -83,4 +94,4 @@ volumes:
    acme:

 networks:
-    proxy:
+    proxy:
@@ -1,35 +1,46 @@
-# conduwuit
+# Conduit
 version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
-        ### If you already built the conduwuit image with 'docker build' or want to use a registry image,
+        ### If you already built the Conduit image with 'docker build' or want to use a registry image,
        ### then you are ready to go.
        image: girlbossceo/conduwuit:latest
+        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
+        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this:
+        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
+        # build:
+        #     context: .
+        #     args:
+        #         CREATED: '2021-03-16T08:18:27Z'
+        #         VERSION: '0.1.0'
+        #         LOCAL: 'false'
+        #         GIT_REF: origin/master
        restart: unless-stopped
        ports:
            - 8448:6167
        volumes:
-            - db:/var/lib/conduwuit
-            #- ./conduwuit.toml:/etc/conduwuit.toml
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
        environment:
-            CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
-            CONDUWUIT_DATABASE_BACKEND: rocksdb
-            CONDUWUIT_PORT: 6167
-            CONDUWUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
-            CONDUWUIT_ALLOW_REGISTRATION: 'true'
-            CONDUWUIT_ALLOW_FEDERATION: 'true'
-            CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-            CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            #CONDUWUIT_LOG: warn,state_res=warn
-            CONDUWUIT_ADDRESS: 0.0.0.0
-            #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
+            CONDUIT_DATABASE_BACKEND: rocksdb
+            CONDUIT_PORT: 6167
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
+            CONDUIT_ALLOW_REGISTRATION: 'true'
+            CONDUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_MAX_CONCURRENT_REQUESTS: 400
+            #CONDUIT_LOG: warn,state_res=warn
+            CONDUIT_ADDRESS: 0.0.0.0
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
    #
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and conduwuit
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@@ -1,4 +1,4 @@
-# conduwuit for Docker
+# Conduwuit for Docker

 ## Docker

@@ -11,51 +11,68 @@ OCI images for conduwuit are available in the registries listed below.

 | Registry        | Image                                                           | Size                          | Notes                  |
 | --------------- | --------------------------------------------------------------- | ----------------------------- | ---------------------- |
-| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:latest][gh] | ![Image Size][shield-latest]  | Stable tagged image.          |
-| GitLab Registry | [registry.gitlab.com/conduwuit/conduwuit:latest][gl] | ![Image Size][shield-latest]  | Stable tagged image.          |
-| Docker Hub      | [docker.io/girlbossceo/conduwuit:latest][dh]             | ![Image Size][shield-latest]  | Stable tagged image.          |
-| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:main][gh]   | ![Image Size][shield-main]    | Stable main branch.   |
-| GitLab Registry | [registry.gitlab.com/conduwuit/conduwuit:main][gl]   | ![Image Size][shield-main]    | Stable main branch.   |
-| Docker Hub      | [docker.io/girlbossceo/conduwuit:main][dh]               | ![Image Size][shield-main]    | Stable main branch.   |
+| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:latest][gh] | ![Image Size][shield-latest]  | Stable image.          |
+| Docker Hub      | [docker.io/girlbossceo/conduwuit:latest][dh]             | ![Image Size][shield-latest]  | Stable image.          |
+| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:main][gh]   | ![Image Size][shield-main]    | Development version.   |
+| Docker Hub      | [docker.io/girlbossceo/conduwuit:main][dh]               | ![Image Size][shield-main]    | Development version.   |
+

 [dh]: https://hub.docker.com/repository/docker/girlbossceo/conduwuit
 [gh]: https://github.com/girlbossceo/conduwuit/pkgs/container/conduwuit
-[gl]: https://gitlab.com/conduwuit/conduwuit/container_registry/6351657
 [shield-latest]: https://img.shields.io/docker/image-size/girlbossceo/conduwuit/latest
 [shield-main]: https://img.shields.io/docker/image-size/girlbossceo/conduwuit/main


-Use
+Use 
 ```bash
 docker image pull <link>
 ```
 to pull it to your machine.


+
+### Build using a Dockerfile
+
+The Dockerfile provided by Conduit has two stages, each of which creates an image.
+
+1. **Builder:** Builds the binary from local context or by cloning a git revision from the official repository.
+2. **Runner:** Copies the built binary from **Builder** and sets up the runtime environment, like creating a volume to persist the database and applying the correct permissions.
+
+To build the image you can use the following command
+
+```bash
+docker build --tag girlbossceo/conduwuit:main .
+```
+
+which also will tag the resulting image as `girlbossceo/conduwuit:main`.
+
+
+
 ### Run

 When you have the image you can simply run it with

 ```bash
 docker run -d -p 8448:6167 \
-  -v db:/var/lib/conduwuit/ \
+  -v db:/var/lib/matrix-conduit/ \
  -e CONDUIT_SERVER_NAME="your.server.name" \
  -e CONDUIT_DATABASE_BACKEND="rocksdb" \
-  -e CONDUIT_ALLOW_REGISTRATION=false \
+  -e CONDUIT_ALLOW_REGISTRATION=true \
  -e CONDUIT_ALLOW_FEDERATION=true \
-  -e CONDUIT_MAX_REQUEST_SIZE="40000000" \
+  -e CONDUIT_MAX_REQUEST_SIZE="20000000" \
  -e CONDUIT_TRUSTED_SERVERS="[\"matrix.org\"]" \
+  -e CONDUIT_MAX_CONCURRENT_REQUESTS="500" \
  -e CONDUIT_LOG="warn,ruma_state_res=warn" \
  --name conduit <link>
 ```

-or you can use [docker compose](#docker-compose).
+or you can use [docker-compose](#docker-compose).

-The `-d` flag lets the container run in detached mode. You may supply an optional `conduwuit.toml` config file, the example config can be found [here](../configuration.md).
-You can pass in different env vars to change config values on the fly. You can even configure conduwuit completely by using env vars. For an overview of possible
-values, please take a look at the [`docker-compose.yml`](docker-compose.yml) file.
+The `-d` flag lets the container run in detached mode. You now need to supply a `conduit.toml` config file, an example can be found [here](../configuration.md).
+You can pass in different env vars to change config values on the fly. You can even configure Conduit completely by using env vars, but for that you need
+to pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file.

-If you just want to test conduwuit for a short time, you can use the `--rm` flag, which will clean up everything related to your container after you stop it.
+If you just want to test Conduit for a short time, you can use the `--rm` flag, which will clean up everything related to your container after you stop it.

 ### Docker-compose

@@ -70,14 +87,14 @@ When picking the traefik-related compose file, rename it so it matches `docker-c
 rename the override file to `docker-compose.override.yml`. Edit the latter with the values you want
 for your server.

-Additional info about deploying conduwuit can be found [here](generic.md).
+Additional info about deploying Conduit can be found [here](generic.md).

 ### Build

-To build the conduwuit image with docker-compose, you first need to open and modify the `docker-compose.yml` file. There you need to comment the `image:` option and uncomment the `build:` option. Then call docker compose with:
+To build the Conduit image with docker-compose, you first need to open and modify the `docker-compose.yml` file. There you need to comment the `image:` option and uncomment the `build:` option. Then call docker-compose with:

 ```bash
-docker compose up
+docker-compose up
 ```

 This will also start the container right afterwards, so if want it to run in detached mode, you also should use the `-d` flag.
@@ -87,7 +104,7 @@ This will also start the container right afterwards, so if want it to run in det
 If you already have built the image or want to use one from the registries, you can just start the container and everything else in the compose file in detached mode with:

 ```bash
-docker compose up -d
+docker-compose up -d
 ```

 > **Note:** Don't forget to modify and adjust the compose file to your needs.
@@ -99,15 +116,101 @@ containerized app and services available through the web. With the two provided
 [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or
 [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and
 [`docker-compose.override.yml`](docker-compose.override.yml), it is equally easy to deploy
-and use conduwuit, with a little caveat. If you already took a look at the files, then you should have
+and use Conduit, with a little caveat. If you already took a look at the files, then you should have
 seen the `well-known` service, and that is the little caveat. Traefik is simply a proxy and
-loadbalancer and is not able to serve any kind of content, but for conduwuit to federate, we need to
+loadbalancer and is not able to serve any kind of content, but for Conduit to federate, we need to
 either expose ports `443` and `8448` or serve two endpoints `.well-known/matrix/client` and
 `.well-known/matrix/server`.

 With the service `well-known` we use a single `nginx` container that will serve those two files.

+So...step by step:
+
+1. Copy [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or
+[`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and [`docker-compose.override.yml`](docker-compose.override.yml) from the repository and remove `.for-traefik` (or `.with-traefik`) from the filename.
+2. Open both files and modify/adjust them to your needs. Meaning, change the `CONDUIT_SERVER_NAME` and the volume host mappings according to your needs.
+3. Create the `conduit.toml` config file, an example can be found [here](../configuration.md), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars.
+4. Uncomment the `element-web` service if you want to host your own Element Web Client and create a `element_config.json`.
+5. Create the files needed by the `well-known` service.
+
+   - `./nginx/matrix.conf` (relative to the compose file, you can change this, but then also need to change the volume mapping)
+
+     ```nginx
+     server {
+         server_name <SUBDOMAIN>.<DOMAIN>;
+         listen      80 default_server;
+
+         location /.well-known/matrix/server {
+            return 200 '{"m.server": "<SUBDOMAIN>.<DOMAIN>:443"}';
+            types { } default_type "application/json; charset=utf-8";
+         }
+
+        location /.well-known/matrix/client {
+            return 200 '{"m.homeserver": {"base_url": "https://<SUBDOMAIN>.<DOMAIN>"}}';
+            types { } default_type "application/json; charset=utf-8";
+            add_header "Access-Control-Allow-Origin" *;
+        }
+
+        location / {
+            return 404;
+        }
+     }
+     ```
+
+6. Run `docker-compose up -d`
+7. Connect to your homeserver with your preferred client and create a user. You should do this immediately after starting Conduit, because the first created user is the admin.
+
+
+

 ## Voice communication

-See the [TURN](../turn.md) page.
+In order to make or receive calls, a TURN server is required. Conduit suggests using [Coturn](https://github.com/coturn/coturn) for this purpose, which is also available as a Docker image. Before proceeding with the software installation, it is essential to have the necessary configurations in place.
+
+### Configuration
+
+Create a configuration file called `coturn.conf` containing:
+
+```conf
+use-auth-secret
+static-auth-secret=<a secret key>
+realm=<your server domain>
+```
+A common way to generate a suitable alphanumeric secret key is by using `pwgen -s 64 1`.
+
+These same values need to be set in conduit. You can either modify conduit.toml to include these lines:
+```
+turn_uris = ["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]
+turn_secret = "<secret key from coturn configuration>"
+```
+or append the following to the docker environment variables dependig on which configuration method you used earlier:
+```yml
+CONDUIT_TURN_URIS: '["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]'
+CONDUIT_TURN_SECRET: "<secret key from coturn configuration>"
+```
+Restart Conduit to apply these changes.
+
+### Run
+Run the [Coturn](https://hub.docker.com/r/coturn/coturn) image using 
+```bash
+docker run -d --network=host -v $(pwd)/coturn.conf:/etc/coturn/turnserver.conf coturn/coturn
+```
+
+or docker-compose. For the latter, paste the following section into a file called `docker-compose.yml`
+and run `docker-compose up -d` in the same directory.
+
+```yml
+version: 3
+services:
+    turn:
+      container_name: coturn-server
+      image: docker.io/coturn/coturn
+      restart: unless-stopped
+      network_mode: "host"
+      volumes:
+        - ./coturn.conf:/etc/coturn/turnserver.conf
+```
+
+To understand why the host networking mode is used and explore alternative configuration options, please visit the following link: https://github.com/coturn/coturn/blob/master/docker/coturn/README.md.
+For security recommendations see Synapse's [Coturn documentation](https://github.com/matrix-org/synapse/blob/develop/docs/setup/turn/coturn.md#configuration).
+
@@ -1,5 +1,7 @@
 # Generic deployment documentation

+### Please note that this documentation is not fully representative of conduwuit at the moment. Assume majority of it is outdated.
+
 > ## Getting help
 >
 > If you run into any problems while setting up conduwuit, ask us
@@ -9,70 +11,98 @@

 You may simply download the binary that fits your machine. Run `uname -m` to see what you need.

-Prebuilt binaries can be downloaded from the latest tagged release [here](https://github.com/girlbossceo/conduwuit/releases/latest).
+Prebuilt binaries can be downloaded from the latest successful CI workflow on the main branch here: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=branch%3Amain+actor%3Agirlbossceo+is%3Asuccess+event%3Apush

-The latest tagged release also includes the Debian packages.
-
-Alternatively, you may compile the binary yourself. We recommend using [Lix](https://lix.systems) to build conduwuit as this has the most guaranteed
-reproducibiltiy and easiest to get a build environment and output going.
-
-Otherwise, follow standard Rust project build guides (installing git and cloning the repo, getting the Rust toolchain via rustup, installing LLVM toolchain + libclang, installing liburing for io_uring and RocksDB, etc).
-
-## Adding a conduwuit user
-
-While conduwuit can run as any user it is better to use dedicated users for different services. This also allows
-you to make sure that the file permissions are correctly set up.
-
-In Debian or RHEL, you can use this command to create a conduwuit user:
+Alternatively, you may compile the binary yourself. First, install any dependencies:

 ```bash
-sudo adduser --system conduwuit --group --disabled-login --no-create-home
+# Debian
+$ sudo apt install libclang-dev build-essential
+
+# RHEL
+$ sudo dnf install clang
+```
+Then, `cd` into the source tree of conduit-next and run:
+```bash
+$ cargo build --release
 ```

-For distros without `adduser`:
+## Adding a Conduit user
+
+While Conduit can run as any user it is usually better to use dedicated users for different services. This also allows
+you to make sure that the file permissions are correctly set up.
+
+In Debian or RHEL, you can use this command to create a Conduit user:

 ```bash
-sudo useradd -r --shell /usr/bin/nologin --no-create-home conduwuit
+sudo adduser --system conduit --group --disabled-login --no-create-home
 ```

 ## Forwarding ports in the firewall or the router

-conduwuit uses the ports 443 and 8448 both of which need to be open in the firewall.
+Conduit uses the ports 443 and 8448 both of which need to be open in the firewall.

-If conduwuit runs behind a router or in a container and has a different public IP address than the host system these public ports need to be forwarded directly or indirectly to the port mentioned in the config.
+If Conduit runs behind a router or in a container and has a different public IP address than the host system these public ports need to be forwarded directly or indirectly to the port mentioned in the config.

 ## Setting up a systemd service

-The systemd unit for conduwuit can be found [here](../configuration.md#example-systemd-unit-file). You may need to change the `ExecStart=` path to where you placed the conduwuit binary.
+Now we'll set up a systemd service for Conduit, so it's easy to start/stop Conduit and set it to autostart when your
+server reboots. Simply paste the default systemd service you can find below into
+`/etc/systemd/system/conduit.service`.

-## Creating the conduwuit configuration file
+```systemd
+[Unit]
+Description=Conduwuit Matrix Server
+After=network.target

-Now we need to create the conduwuit's config file in `/etc/conduwuit/conduwuit.toml`. The example config can be found at [conduwuit-example.toml](../configuration.md).**Please take a moment to read it. You need to change at least the server name.**
+[Service]
+Environment="CONDUIT_CONFIG=/etc/matrix-conduit/conduit.toml"
+User=conduit
+Group=conduit
+RuntimeDirectory=conduit
+RuntimeDirectoryMode=0750
+Restart=always
+ExecStart=/usr/local/bin/matrix-conduit

+[Install]
+WantedBy=multi-user.target
+```
+
+Finally, run
+
+```bash
+$ sudo systemctl daemon-reload
+```
+
+## Creating the Conduit configuration file
+
+Now we need to create the Conduit's config file in `/etc/conduwuit/conduwuit.toml`. Paste this in **and take a moment
+to read it. You need to change at least the server name.**  
 RocksDB (`rocksdb`) is the only supported database backend. SQLite only exists for historical reasons and is not recommended. Any performance issues, storage issues, database issues, etc will not be assisted if using SQLite and you will be asked to migrate to RocksDB first.

+See the following example config at [conduwuit-example.toml](../configuration.md)
+
 ## Setting the correct file permissions

-If you are using a dedicated user for conduwuit, you will need to allow it to read the config. To do that you can run this command on
-
+As we are using a Conduit specific user we need to allow it to read the config. To do that you can run this command on
 Debian or RHEL:

 ```bash
-sudo chown -R root:root /etc/conduwuit
-sudo chmod 755 /etc/conduwuit
+sudo chown -R root:root /etc/matrix-conduit
+sudo chmod 755 /etc/matrix-conduit
 ```

 If you use the default database path you also need to run this:

 ```bash
-sudo mkdir -p /var/lib/conduwuit/
-sudo chown -R conduwuit:conduwuit /var/lib/conduwuit/
-sudo chmod 700 /var/lib/conduwuit/
+sudo mkdir -p /var/lib/matrix-conduit/
+sudo chown -R conduit:conduit /var/lib/matrix-conduit/
+sudo chmod 700 /var/lib/matrix-conduit/
 ```

 ## Setting up the Reverse Proxy

-Refer to the documentation or various guides online of your chosen reverse proxy software. A [Caddy](https://caddyserver.com/) example will be provided as this is the recommended reverse proxy for new users and is very trivial to use (handles TLS, reverse proxy headers, etc transparently with proper defaults).
+Refer to the documentation or various guides online of your chosen reverse proxy software. A Caddy example will be provided as this is the recommended reverse proxy for new users and is very trivial.

 ### Caddy

@@ -84,28 +114,28 @@ your.server.name, your.server.name:8448 {
        reverse_proxy 127.0.0.1:6167

        # UNIX socket
-        #reverse_proxy unix//run/conduwuit/conduwuit.sock
+        #reverse_proxy unix//run/conduit/conduit.sock
 }
 ```

-That's it! Just start and enable the service and you're set.
+That's it! Just start or enable the service and you're set.

 ```bash
-$ sudo systemctl enable --now caddy
+$ sudo systemctl enable caddy
 ```

 ## You're done!

-Now you can start conduwuit with:
+Now you can start Conduit with:

 ```bash
-$ sudo systemctl start conduwuit
+$ sudo systemctl start conduit
 ```

 Set it to start automatically when your system boots with:

 ```bash
-$ sudo systemctl enable conduwuit
+$ sudo systemctl enable conduit
 ```

 ## How do I know it works?
@@ -1,10 +1,10 @@
-# conduwuit for NixOS
+# Conduwuit for NixOS

-conduwuit can be acquired by [Lix][lix] from various places:
+Conduwuit can be acquired by Nix from various places:

 * The `flake.nix` at the root of the repo
 * The `default.nix` at the root of the repo
-* From conduwuit's binary cache
+* From Conduwuit's binary cache

 A binary cache for conduwuit that the CI/CD publishes to is available at the
 following places (both are the same just different names):
@@ -20,12 +20,11 @@ If specifying a URL in your flake, please use the GitHub remote: `github:girlbos

 The `flake.nix` and `default.nix` do not (currently) provide a NixOS module, so
 (for now) [`services.matrix-conduit`][module] from Nixpkgs should be used to
-configure conduwuit.
+configure Conduit.

 If you want to run the latest code, you should get Conduwuit from the `flake.nix`
 or `default.nix` and set [`services.matrix-conduit.package`][package]
 appropriately.

-[lix]: https://lix.systems/
 [module]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit
 [package]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit.package
@@ -1,23 +0,0 @@
-# Development
-
-Information about developing the project. If you are only interested in using
-it, you can safely ignore this section. If you plan on contributing, see the
-[contributor's guide](contributing.md).
-
-## Debugging with `tokio-console`
-
-[`tokio-console`][1] can be a useful tool for debugging and profiling. To make
-a `tokio-console`-enabled build of Conduwuit, enable the `tokio_console` feature,
-disable the default `release_max_log_level` feature, and set the
-`--cfg tokio_unstable` flag to enable experimental tokio APIs. A build might
-look like this:
-
-```bash
-RUSTFLAGS="--cfg tokio_unstable" cargo build \
-    --release \
-    --no-default-features \
-    --features
-    backend_rocksdb,systemd,element_hacks,sentry_telemetry,gzip_compression,brotli_compression,zstd_compression,tokio_console
-```
-
-[1]: https://docs.rs/tokio-console/latest/tokio_console/
@@ -1,20 +0,0 @@
-# Testing
-
-## Complement
-
-Have a look at [Complement's repository][complement] for an explanation of what
-it is.
-
-To test against Complement, with [Lix][lix] and direnv installed and set up, you can:
-
-* Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl ./path/to/results.jsonl`
-  to build a Complement image, run the tests, and output the logs and results
-  to the specified paths. This will also output the OCI image at `result`
-* Run `nix build .#complement` from the root of the repository to just build a
-  Complement OCI image outputted to `result` (it's a `.tar.gz` file)
-* Or download the latest Complement OCI image from the CI workflow artifacts output
-  from the commit/revision you want to test (e.g. from main) [here][ci-workflows]
-
-[lix]: https://lix.systems/
-[ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
-[complement]: https://github.com/matrix-org/complement
@@ -1,159 +1,109 @@
-#### **Note: This list may not up to date. There are rapidly more and more improvements, fixes, changes, etc being made that it is becoming more difficult to maintain this list. I recommend that you give conduwuit a try and see the differences for yourself. If you have any concerns, feel free to join the conduwuit Matrix room and ask any pre-usage questions.**
+#### **Note: This list is not up to date. There are rapidly more and more improvements, fixes, changes, etc being made that it is becoming more difficult to maintain this list. I recommend that you give Conduwuit a try and see the differences for yourself. If you have any concerns, feel free to join the Conduwuit Matrix room and ask any pre-usage questions.**

-### list of features, bug fixes, etc that conduwuit does that Conduit does not:
+### list of features, bug fixes, etc that conduwuit does that upstream does not:

-Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
-
-## Performance:
- Concurrency support for key fetching for faster remote room joins and room joins that will error less frequently
- Send `Cache-Control` response header with `immutable` and 1 year cache length for all media requests (download and thumbnail) to instruct clients to cache media, and reduce server load from media requests that could be otherwise cached
+- GitLab CI ported to GitHub Actions
+- Fixed every single clippy (default lints) and rustc warnings, including some that were performance related or potential safety issues / unsoundness
+- Add a **lot** of other clippy and rustc lints and a rustfmt.toml file
+- Has Renovate and significantly updates all dependencies possible
+- Uses proper argon2 crate instead of questionable rust-argon2 crate
+- Improved and cleaned up logging (less noisy dead server logging, registration attempts, more useful troubleshooting logging, etc)
+- Attempts and interest in removing extreme and unnecessary panics/unwraps/expects that can lead to denial of service or such (upstream and upstream contributors want this unusual behaviour for some reason)
+- Merged and cleaned up upstream MRs that have been sitting for 6-12 months
+- Configurable RocksDB logging (`LOG` files) with proper defaults (rotate, max size, verbosity, etc) to stop LOG files from accumulating so much
+- Concurrency support for key fetching for faster remote room joins and room joins that will error less frequently (via upstream MR)
+- Room version 11 support (via upstream MR)
+- Explicit startup error/warning if your configuration allows open registration without a token or such like Synapse
+- Improved RocksDB defaults to use new features that help with performance significantly, uses settings tailored to SSDs, various ways to tweak RocksDB, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage.
+- Revamped admin room infrastructure and commands (via upstream MR)
+- Admin room commands to delete room aliases and unpublish rooms from our room directory (via upstream MR)
+- Make spaces/hierarchy cache use cache_capacity_modifier instead of hardcoded small value
+- Add *optional* feature flag to use SHA256 key names for media instead of base64 to overcome filesystem file name length limitations (OS error file name too long) (via upstream MR)
 - Add feature flags and config options to enable/build with zstd, brotli, and/or gzip HTTP body compression (response and request)
- Eliminate all usage of the thread-blocking `getaddrinfo(3)` call upon DNS queries, significantly improving federation latency/ping and cache DNS results (NXDOMAINs, successful queries, etc) using hickory-dns / hickory-resolver
- Vastly improve RocksDB default settings to use new features that help with performance significantly, uses settings tailored to SSDs, various ways to tweak RocksDB, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage or buggy filesystems.
- Add a Cargo build profile for aggressive build-time performance optimisations for release builds (1 codegen unit, no debug, fat LTO, etc, and optimise all crates with same)
- Implement database flush and cleanup conduwuit operations when using RocksDB
- Implement RocksDB write buffer corking and coalescing in database write-heavy areas
- Perform connection pooling and keepalives where necessary to significantly improve federation performance and latency
- Various config options to tweak connection pooling, request timeouts, connection timeouts, DNS timeouts and settings, etc with good defaults which also help huge with performance via reusing connections and retrying where needed
- Implement building conduwuit with jemalloc (which extends to the RocksDB jemalloc feature for maximum gains) or hardened_malloc light variant, and produce CI builds with jemalloc for performance (Nix doesn't seem to build [hardened_malloc-rs](https://github.com/girlbossceo/hardened_malloc-rs) properly)
- Add support for caching DNS results with hickory-dns / hickory-resolver in conduwuit (not a replacement for a proper resolver cache, but still far better than nothing)
- Add config option for using DNS over TCP, and config option for controlling A/AAAA record lookup strategy (e.g. don't query AAAA records if you don't have IPv6 connectivity)
- Overall significant database, Client-Server, and federation performance and latency improvements (check out the ping room leaderboards if you don't believe me :>)
- Add config options for RocksDB compression and bottommost compression, including choosing the algorithm and compression level
- Use [loole](https://github.com/mahdi-shojaee/loole) MPSC channels instead of tokio MPSC channels for huge performance boosts in sending channels (mainly relevant for federation) and presence channels
- Use `tracing`/`log`'s `release_max_level_info` feature to improve performance, build speeds, binary size, and CPU usage in release builds by avoid compiling debug/trace log level macros that users will generally never use (can be disabled with a build-time feature flag)
- Enable RocksDB async read I/O via `io_uring` by default
-
-
-## General Fixes:
- Raise and improve all the various request timeouts making some things like room joins and client bugs error less or none at all than they should, and make them all user configurable
- Add missing `reason` field to user ban events (`/ban`)
- Fixed spec compliance issue with room version 8 - 11 joins (https://github.com/matrix-org/synapse/issues/16717 / https://github.com/matrix-org/matrix-spec/issues/1708)
- Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic
- Stop sending `make_join` requests on room joins if 15 servers respond with `M_UNSUPPORTED_ROOM_VERSION` or `M_INVALID_ROOM_VERSION`
- Stop sending `make_join` requests if 50 servers cannot provide `make_join` for us
- Respect *most* client parameters for `/media/` requests (`allow_redirect` still needs work)
- Increased graceful shutdown timeout from a low 60 seconds to 180 seconds to avoid killing connections and let the remaining ones finish processing
- Return joined member count of rooms for push rules/conditions instead of a hardcoded value of 10
- Make `CONDUIT_CONFIG` optional, relevant for container users that configure only by environment variables and no longer need to set `CONDUIT_CONFIG` to an empty string.
- Allow HEAD and PATCH (MSC4138) HTTP requests in CORS for clients (despite not being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need to behave the same as GET requests, Synapse supports HEAD requests)
- Resolve and remove some "features" from upstream that result in concurrency hazards, exponential backoff issues, or arbitrary performance limiters
- Find more servers for outbound federation `/hierarchy` requests instead of just the room ID server name
- Support for suggesting servers to join through at `/_matrix/client/v3/directory/room/{roomAlias}`
- Support for suggesting servers to join through us at `/_matrix/federation/v1/query/directory`
- Add workaround for [Out Of Your Element](https://gitdab.com/cadence/out-of-your-element) appservice bridge to make it functional on conduwuit (bug has already been reported)
-
-
-## Moderation:
- (Also see [Admin Room](#admin-room) for all the admin commands pertaining to moderation, there's a lot!)
- Add support for room banning/blocking by ID using admin command
- Add support for serving `support` well-known from `[well_known.support]` (MSC1929)
- Config option to forbid publishing rooms to the room directory (`lockdown_public_room_directory`) except for admins
- Admin commands to delete room aliases and unpublish rooms from our room directory
- For all [`/report`](https://spec.matrix.org/v1.9/client-server-api/#post_matrixclientv3roomsroomidreporteventid) requests: check if the reported event ID belongs to the reported room ID, raise report reasoning character limit to 750, fix broken formatting, make a small delayed random response per spec suggestion on privacy, and check if the sender user is in the reported room.
- Support blocking servers from downloading remote media from, returning a 404
- Don't allow `m.call.invite` events to be sent in public rooms (prevents calling the entire room)
- On new public room creations, only allow moderators to send `m.call.invite`, `org.matrix.msc3401.call`, and `org.matrix.msc3401.call.member` events
- Add support for a "global ACLs" feature (`forbidden_remote_server_names`) that blocks inbound remote room invites, room joins by room ID on server name, room joins by room alias on server name, incoming federated joins, and incoming federated room directory requests. This is very helpful for blocking servers that are purely toxic/bad and serve no value in allowing our users to suffer from things like room invite spam or such. Please note that this is not a substitute for room ACLs.
- Add support for a config option to forbid our local users from sending federated room directory requests for (`forbidden_remote_room_directory_server_names`). Similar to above, useful for blocking servers that help prevent our users from wandering into bad areas of Matrix via room directories of those malicious servers.
- Add config option for auto remediating/deactivating local non-admin users who attempt to join bad/forbidden rooms (`auto_deactivate_banned_room_attempts`)
-
-
-## Privacy/Security:
+- Add support for querying both Matrix SRV records, the deprecated `_matrix` record and `_matrix-fed` record if necessary
 - Add config option for device name federation with a privacy-friendly default (disabled)
 - Add config option for requiring authentication to the `/publicRooms` endpoint (room directory) with a default enabled for privacy
 - Add config option for federating `/publicRooms` endpoint (room directory) to other servers with a default disabled for privacy
- Uses proper `argon2` crate by RustCrypto instead of questionable `rust-argon2` crate
- Generate passwords with 25 characters instead of 15
- Config option `ip_range_denylist` to support refusing to send requests (typically federation) to specific IP ranges, typically RFC 1918, non-routable, testnet, etc addresses like Synapse for security (note: this is not a guaranteed protection, and you should be using a firewall with zones if you want guaranteed protection as doing this on the application level is prone to bypasses).
- Config option to block non-admin users from sending room invites or receiving remote room invites. Admin users are still allowed.
- Config option to disable incoming and/or outgoing remote read receipts
- Config option to disable incoming and/or outgoing remote typing indicators
- Config option to disable incoming, outgoing, and/or local presence
- Sanitise file names for the `Content-Disposition` header for all media requests (thumbnails, downloads, uploads)
- Return `inline` or `attachment` based on the detected file MIME type for the `Content-Disposition` and only allow images/videos/text/audio to be `inline`
- Send secure default HTTP headers such as a strong restrictive CSP, deny iframes, disable `X-XSS-Protection`, disable interest cohort in `Permission-Policy`, etc to mitigate any potential attack surface such as from untrusted media
-
-
-## Administration/Logging:
- Commandline argument to specify the path to a config file instead of relying on `CONDUIT_CONFIG`
- Revamped admin room infrastructure and commands
- Substantially clean up, improve, and fix logging (less noisy dead server logging, registration attempts, more useful troubleshooting logging, proper error propagation, etc)
- Configurable RocksDB logging (`LOG` files) with proper defaults (rotate, max size, verbosity, etc) to stop LOG files from accumulating so much
- Explicit startup error if your configuration allows open registration without a token or such like Synapse with a way to bypass it if needed
- Replace the lightning bolt emoji option with support for setting any arbitrary text (e.g. another emoji) to suffix to all new user registrations, with a conduwuit default of 🏳️‍⚧️
- Implement config option to auto join rooms upon registration
- Warn on unknown config options specified
- Add `/_conduwuit/server_version` route to return the version of conduwuit without relying on the federation API `/_matrix/federation/v1/version`
- Add configurable RocksDB recovery modes to aid in recovering corrupted RocksDB databases
- Support config options via `CONDUWUIT_` prefix and accessing non-global struct config options with the `__` split (e.g. `CONDUWUIT_WELL_KNOWN__SERVER`)
- Add support for listening on multiple TCP ports
- Disable update check by default as it's not useful for conduwuit
- **Opt-in** Sentry.io telemetry and metrics, mainly used for crash reporting
-
-
-## Maintenance/Stability:
- GitLab CI ported to GitHub Actions
- Repo is mirrored to GitHub, GitLab, git.gay, git.girlcock.ceo, sourcehut, and Codeberg (see README.md for their links)
- Docker container images published to GitLab Container Registry, GitHub Container Registry, and Dockerhub
- Extensively revamp the example config to be extremely helpful and useful to both new users and power users
- Fixed every single clippy (default lints) and rustc warnings, including some that were performance related or potential safety issues / unsoundness
- Add a **lot** of other clippy and rustc lints and a rustfmt.toml file
- Has [Renovate](https://docs.renovatebot.com/), [Trivy](https://github.com/aquasecurity/trivy-action), and keeps ALL dependencies as up to date as possible
- Attempts and interest in removing extreme and unnecessary panics/unwraps/expects that can lead to denial of service or such (upstream and upstream contributors want this unusual behaviour for some reason)
- Purge unmaintained/irrelevant/broken database backends (heed, sled, persy) and other unnecessary code or overhead
+- Add support for listening on a UNIX socket for performance and host security with proper default permissions (660)
+- Add missing `destination` key to all `X-Matrix` `Authorization` requests (spec compliance issue)
+- Use aggressive build-time performance optimisations for release builds (1 codegen unit, no debug, fat LTO, etc, and optimise all crates with same)
+- Raise various hardcoded timeouts in codebase that were way too short, making some things like room joins and client bugs error less or none at all than they should
+- Add debug admin command to force update user device lists (could potentially resolve some E2EE flukes) (`ForceDeviceListUpdates`)
+- Declare various missing Matrix versions and features at `/_matrix/client/versions`
+- Add support for serving server and client well-known files from conduwuit using `well_known_client` and `well_known_server` options
+- Send a User-Agent on all of our requests (`conduwuit/0.7.0-alpha+conduwuit-0.1.1`) which strangely was not done upstream since forever. Some providers consider no User-Agent suspicious and block said requests.
+- Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic
+- Allow HEAD HTTP requests in CORS for clients (despite not being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need to behave the same as GET requests, Synapse supports HEAD requests)
+- Purge unmaintained/irrelevant/broken database backends (heed, sled, persy)
 - webp support for images
- Add cargo audit support to CI
- CI tests with all features
- Add timestamp by commit date support to building OCI images for keeping image build reproducibility and still have a meaningful "last modified date" for OCI image metadata
- Update rusqlite/sqlite (not that you should be using it)
- Startup check if conduwuit running in a container and is listening on 127.0.0.1 (generally containers are using NAT networking and 0.0.0.0 is the intended listening address)
-
-
-## Admin Room:
- Fix admin room handler to not panic/crash if the admin room command response fails (e.g. too large message)
- Add command to dynamically change conduwuit's tracing log level filter on the fly
- Add admin command to fetch a server's `/.well-known/matrix/support` file
- Add debug admin command to force update user device lists (could potentially resolve some E2EE flukes)
- Implement **RocksDB online backups**, listing RocksDB backups, and listing database file counts all via admin commands
- Add various database visibility commands such as being able to query the getters and iterators used in conduwuit, a very helpful online debugging utility
- Forbid the admin room from being made public or world readable history
- Add `!admin` as a way to call the admin bot
- Extend clear cache admin command to support clearing more caches such as DNS and TLS name overrides
- Admin debug command to send a federation request/ping to a server's `/_matrix/federation/v1/version` endpoint and measures the latency it took
+- Support for suggesting servers to join at `/_matrix/client/v3/directory/room/{roomAlias}`
+- Prevent admin credential commands like reset password and deactivate user from modifying non-local users (https://gitlab.com/famedly/conduit/-/issues/377)
+- Fixed spec compliance issue with room version 8 - 11 joins (https://github.com/matrix-org/synapse/issues/16717 / https://github.com/matrix-org/matrix-spec/issues/1708)
+- Add basic cache eviction for true destinations when requests fail if we use a cached destination (e.g. a server has modified their well-known and we're still connecting to the old destination)
+- Generate passwords with 25 characters instead of 15
+- Add missing `reason` field to user ban events (`/ban`)
+- For all [`/report`](https://spec.matrix.org/v1.9/client-server-api/#post_matrixclientv3roomsroomidreporteventid) requests: check if the reported event ID belongs to the reported room ID, raise report reasoning character limit to 750, fix broken formatting, make a small delayed random response per spec suggestion on privacy, and check if the sender user is in the reported room.
+- Support blocking servers from downloading remote media from
+- Support sending `well_known` response to client logins if using config option `well_known_client`
+- Send `avatar_url` on invite room membership events/changes
+- Revamp example config, adding a lot of config options available (still some missing)
+- Return joined member count of rooms for push rules/conditions instead of a hardcoded value of 10
+- Respect *most* client parameters for `/media/` requests (`allow_redirect` still needs work)
+- Config option `ip_range_denylist` to support refusing to send requests (typically federation) to specific IP ranges, typically RFC 1918, non-routable, testnet, etc addresses like Synapse for security (note: this is not a guaranteed protection, and you should be using a firewall with zones if you want guaranteed protection as doing this on the application level is prone to bypasses).
+- Support for creating rooms with custom room IDs like Maunium Synapse (`room_id` request body field to `/createRoom`)
+- Assume well-knowns are broken if they exceed past 10000 characters.
+- Basic validation/checks on user-specified room aliases and custom room ID creations
+- Warn on unknown config options specified
+- URL preview support (via upstream MR) with various improvements
+- Increased graceful shutdown timeout from a low 60 seconds to 180 seconds to avoid killing connections and let the remaining ones finish processing
+- Query parameter `?format=event|content` for returning either the room state event's content (default) for the full room state event on ` /_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see https://github.com/matrix-org/matrix-spec/issues/1047)
+- Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, and blocks room invites (remote and local) to the banned room, as a moderation feature
+- Add admin command to delete media via a specific MXC. This deletes the MXC from our database, and the file locally.
+- Replace the lightning bolt emoji option with support for setting any arbitrary text (e.g. another emoji) to suffix to all new user registrations
 - Add admin command to bulk delete media via a codeblock list of MXC URLs.
 - Add admin command to delete both the thumbnail and media MXC URLs from an event ID (e.g. from an abuse report)
+- Add `!admin` as a way to call the Conduit admin bot
+- Add support for listening on multiple TCP ports
 - Add admin command to list all the rooms a local user is joined in
 - Add admin command to delete all remote media in the past X minutes as a form of deleting media that you don't want on your server that a remote user posted in a room
- Add admin command to return a room's state
- Admin debug command to fetch a PDU from a remote server and inserts it into our database/timeline as backfill
- Add admin command to delete media via a specific MXC. This deletes the MXC from our database, and the file locally.
- Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, and blocks room invites (remote and local) to the banned room, as a moderation feature
- Add admin commands to output jemalloc memory stats and memory usage
- Add admin command to get conduwuit's uptime
- Add admin command to get rooms a *remote* user shares with us
-
-
-## Misc:
- Support for creating rooms with custom room IDs like Maunium Synapse (`room_id` request body field to `/createRoom`)
- Query parameter `?format=event|content` for returning either the room state event's content (default) for the full room state event on ` /_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see https://github.com/matrix-org/matrix-spec/issues/1047)
- Add **optional** feature flag to use SHA256 key names for media instead of base64 to overcome filesystem file name length limitations (OS error file name too long)
- Send a User-Agent on all of our requests
- Send `avatar_url` on invite room membership events/changes
- Support sending [`well_known` response to client login responses](https://spec.matrix.org/v1.10/client-server-api/#post_matrixclientv3login) if using config option `[well_known.client]`
- Implement `include_state` search criteria support for `/search` requests (response now can include room states)
- Declare various missing Matrix versions and features at `/_matrix/client/versions`
+- Config option to block non-admin users from sending room invites or receiving remote room invites. Admin users are still allowed.
+- Startup check if conduwuit running in a container and is listening on 127.0.0.1
+- Make `CONDUIT_CONFIG` optional, relevant for container users that configure only by environment variables and no longer need to set `CONDUIT_CONFIG` to an empty string.
+- Config option to change Conduit's behaviour of homeserver key fetching (`query_trusted_key_servers_first`). This option sets whether conduwuit will query trusted notary key servers first before the individual homeserver(s), or vice versa.
+- Implement database flush and cleanup Conduit operations when using RocksDB
 - Implement legacy Matrix `/v1/` media endpoints that some clients and servers may still call
- Config option to change Conduit's behaviour of homeserver key fetching (`query_trusted_key_servers_first`). This option sets whether conduwuit will query trusted notary key servers first before the individual homeserver(s), or vice versa which may help in joining certain rooms.
+- Commandline argument to specify the path to a config file
+- Admin debug command to fetch a PDU from a remote server and inserts it into our database/timeline
+- Update rusqlite/sqlite (not that you should be using it)
+- Disable update check by default as it's not useful for conduwuit
+- Config option to disable incoming remote read receipts if desired
+- Extend clear cache admin command to support clearing DNS and TLS name override caches
+- Responsive outgoing read receipt EDU support
+- Eliminate all usage of the thread-blocking `getaddrinfo(3)` call upon DNS queries, significantly improving federation latency/ping and cache DNS results using hickory-dns / hickory-resolver
+- Store the sender user with the MXC URL for all media uploads (`/upload`) (not for thumbnails or media requests which are unauthenticated)
+- Perform connection pooling and keepalives where necessary to significantly improve federation performance and latency
+- Implement RocksDB online backups via admin command
+- Implement RocksDB write buffer corking and coalescing in database write-heavy areas
+- Various config options to tweak connection pooling, request timeouts, connection timeouts, DNS timeouts and settings, etc with good defaults
+- Implement config option to auto join rooms upon registration
+- Overall significant database, Client-Server, and federation performance and latency improvements
+- Outgoing read receipt and private read receipt support (EDU)
+- Outgoing typing indicator support (EDU)
+- Outgoing and local presence support (EDU)
+- **Opt-in** Sentry.io telemetry and metrics, mainly used for crash reporting
+- Add `/_conduwuit/server_version` route to return the version of Conduwuit without relying on the federation API `/_matrix/federation/v1/version`
+- Add configurable RocksDB recovery modes to aid in recovering corrupte RocksDB database
+- Config option to forbid publishing rooms to the room directory (`lockdown_public_room_directory`) except for admins
+- Don't allow `m.call.invite` events to be sent in public rooms (prevents calling the entire room)
+- On new public room creations, only allow moderators to send `m.call.invite`, `org.matrix.msc3401.call`, and `org.matrix.msc3401.call.member` events
+- Stop sending `make_join` requests on room joins if 15 servers respond with `M_UNSUPPORTED_ROOM_VERSION` or `M_INVALID_ROOM_VERSION`
+- Stop sending `make_join` requests if 50 servers cannot provide `make_join` for us
+- Admin debug command to send a federation request/ping to a server's `/_matrix/federation/v1/version` endpoint and measures the latency it took
+- Implement building Conduwuit with jemalloc or hardened_malloc light variant, and produce CI builds with jemalloc or hardened_malloc, for performance and/or security
+- Significant RocksDB tuning and improvements tailored to maximising Conduwuit performance with RocksDB
 - Implement unstable MSC2666 support for querying mutual rooms with a user
- Assume well-knowns are broken if they exceed past 10000 characters.
- Add support for the Matrix spec compliance test suite [Complement](https://github.com/matrix-org/complement/) via the Nix flake and various other fixes for it
- Add support for listening on both HTTP and HTTPS if using direct TLS with conduwuit for usecases such as Complement
- Implement running and diff'ing Complement results in CI
- Interest in supporting other operating systems such as macOS, BSDs, and Windows, and getting them added into CI and doing builds for them
- Add config option for disabling RocksDB Direct IO if needed
- Add various documentation on maintaining conduwuit, using RocksDB online backups, some troubleshooting, using admin commands, etc
- (Developers): Add support for tokio-console
- (Developers): Add support for tracing flame graphs
- Add `release-debuginfo` Cargo build profile
- No cryptocurrency donations allowed, conduwuit is fully maintained by independent queer maintainers, and with a strong priority on inclusitivity and comfort for protected groups 🏳️‍⚧️
+- Add admin command to fetch a server's `/.well-known/matrix/support` file
+- Send `Cache-Control` response header with immutable and 1 year cache length for all media requests to instruct clients to cache media, and reduce server load from media requests that could be otherwise cached
+- Forbid the admin room from being made public
+- Fix admin room handler to not panic/crash if the admin room command response fails (e.g. too large message)
+- Implement `include_state` search criteria support for `/search` requests (response now can include room states)
@@ -6,7 +6,7 @@

 #### What's different about your fork than upstream Conduit?

-See the [differences](differences.md) page
+See [differences.md](differences.md)

 #### How can I deploy my own?

@@ -14,8 +14,4 @@ See the [differences](differences.md) page

 If you want to connect an Appservice to Conduwuit, take a look at the [appservices documentation](appservices.md).

-#### How can I contribute?
-
-See the [contributor's guide](contributing.md)
-
 {{#include ../README.md:footer}}
@@ -1,63 +0,0 @@
-# Maintaining your conduwuit setup
-
-## Moderation
-
-conduwuit has moderation through admin room commands. "binary commands" (medium priority) and an admin API (low priority) is planned. Some moderation-related config options are available in the example config such as "global ACLs" and blocking media requests to certain servers. See the example config for the moderation config options under the "Moderation / Privacy / Security" section.
-
-conduwuit has moderation admin commands for:
- managing room aliases (`!admin rooms alias`)
- managing room directory (`!admin rooms directory`)
- managing room banning/blocking and user removal (`!admin rooms moderation`)
- managing user accounts (`!admin users`)
- fetching `/.well-known/matrix/support` from servers (`!admin federation`)
- blocking incoming federation for certain rooms (not the same as room banning) (`!admin federation`)
- deleting media (see [the media section](#media))
-
-Any commands with `-list` in them will require a codeblock in the message with each object being newline delimited. An example of doing this is:
-
-````
-!admin rooms moderation ban-list-of-rooms
-```
-!roomid1:server.name
-!roomid2:server.name
-!roomid3:server.name
-```
-````
-
-## Database
-
-If using RocksDB, there's very little you need to do. Compaction is ran automatically based on various defined thresholds tuned for conduwuit to be high performance with the least I/O amplifcation or overhead. Manually running compaction is not recommended, or compaction via a timer. RocksDB is built with io_uring support via liburing for async read I/O.
-
-Some RocksDB settings can be adjusted such as the compression method chosen. See the RocksDB section in the [example config](configuration.md). btrfs users may benefit from disabling compression on RocksDB if CoW is in use.
-
-RocksDB troubleshooting can be found [in the RocksDB section of troubleshooting](troubleshooting.md).
-
-## Backups
-
-Currently only RocksDB supports online backups. If you'd like to backup your database online without any downtime, see the `!admin server` command for the backup commands and the `database_backup_path` config options in the example config. Please note that the format of the database backup is not the exact same. This is unfortunately a bad design choice by Facebook as we are using the database backup engine API from RocksDB, however the data is still there and can still be joined together.
-
-To restore a backup from an online RocksDB backup:
- shutdown conduwuit
- create a new directory for merging together the data
- in the online backup created, copy all `.sst` files in `$DATABASE_BACKUP_PATH/shared_checksum` to your new directory
- trim all the strings so instead of `######_sxxxxxxxxx.sst`, it reads `######.sst`. A way of doing this with sed and bash is `for file in *.sst; do mv "$file" "$(echo "$file" | sed 's/_s.*/.sst/')"; done`
- copy all the files in `$DATABASE_BACKUP_PATH/1` to your new directory
- set your `database_path` config option to your new directory, or replace your old one with the new one you crafted
- start up conduwuit again and it should open as normal
-
-If you'd like to do an offline backup, shutdown conduwuit and copy your `database_path` directory elsewhere. This can be restored with no modifications needed.
-
-Backing up media is also just copying the `media/` directory from your database directory.
-
-## Media
-
-Media still needs various work, however conduwuit implements media deletion via:
- MXC URI
- Delete list of MXC URIs
- Delete remote media in the past `N` seconds/minutes
-
-See the `!admin media` command for further information. All media in conduwuit is stored at `$DATABASE_DIR/media`. This will be configurable soon.
-
-If you are finding yourself needing extensive granular control over media, we recommend looking into [Matrix Media Repo](https://github.com/t2bot/matrix-media-repo). conduwuit intends to implement various utilities for media, but MMR is dedicated to extensive media management.
-
-Built-in S3 support is also planned, but for now using a "S3 filesystem" on `media/` works. conduwuit also sends a `Cache-Control` header of 1 year and immutable for all media requests (download and thumbnail) to reduce unnecessary media requests from browsers.
@@ -1,62 +0,0 @@
-# Troubleshooting conduwuit
-
-> ## Docker users ⚠️
->
-> Docker is extremely UX unfriendly. Because of this, a ton of issues or support is actually Docker support, not conduwuit support. We also cannot document the ever-growing list of Docker issues here.
->
-> If you intend on asking for support and you are using Docker, **PLEASE** triple validate your issues are **NOT** because you have a misconfiguration in your Docker setup.
->
-> If there are things like Compose file issues or Dockerhub image issues, those can still be mentioned as long as they're something we can fix.
-
-## Rocksdb / database issues
-
-#### Direct IO
-
-Some filesystems may not like RocksDB using [Direct IO](https://github.com/facebook/rocksdb/wiki/Direct-IO). Direct IO is for non-buffered I/O which improves conduwuit performance, but at least FUSE is a filesystem potentially known to not like this. See the [example config](configuration.md) for disabling it if needed. Issues from Direct IO on unsupported filesystems are usually shown as startup errors.
-
-#### Database corruption
-
-If your database is corrupted and is failing to start (e.g. checksum mismatch), it may be recoverable but careful steps must be taken, and there is no guarantee it may be recoverable.
-
-RocksDB has the following recovery modes:
-
- `TolerateCorruptedTailRecords`
- `AbsoluteConsistency`
- `PointInTime`
- `SkipAnyCorruptedRecord`
-
-By default, conduwuit uses `TolerateCorruptedTailRecords` as generally these may be due to bad federation and we can re-fetch the correct data over federation. The RocksDB default is `PointInTime` which will attempt to restore a "snapshot" of the data when it was last known to be good. This data can be either a few seconds old, or multiple minutes prior. `PointInTime` may not be suitable for default usage due to clients and servers possibly not being able to handle sudden "backwards time travels", and `AbsoluteConsistency` may be too strict.
-
-`AbsoluteConsistency` will fail to start the database if any sign of corruption is detected. `SkipAnyCorruptedRecord` will skip all forms of corruption unless it forbids the database from opening (e.g. too severe). Usage of `SkipAnyCorruptedRecord` voids any support as this may cause more damage and/or leave your database in a permanently inconsistent state, but it may do something if `PointInTime` does not work as a last ditch effort.
-
-With this in mind:
- First start conduwuit with the `PointInTime` recovery method. See the [example config](configuration.md) for how to do this using `rocksdb_recovery_mode`
- If your database successfully opens, clients are recommended to clear their client cache to account for the rollback
- Leave your conduwuit running in `PointInTime` for at least 30-60 minutes so as much possible corruption is restored
- If all goes will, you should be able to restore back to using `TolerateCorruptedTailRecords` and you have successfully recovered your database
-
-## Media
-
-#### "File name too long"
-
-If you are running into the "file name is too long" OS error for media requests, your filesystem cannot handle file name lengths >=255 characters. This is unfortuntely due to Conduit (upstream) using base64 for file name keys which is very problematic for some filesystems as the base64 input is untrusted and long file names or specific inputs can cause this. If you would like to avoid this, you may build conduwuit yourself with the `sha256_media` feature. **This will lose database compatibility with upstream**.
-
-## Debugging
-
-Note that users should not really be debugging things. If you find yourself debugging and find the issue, please let us know and/or how we can fix it. Various debug commands can be found in `!admin debug`.
-
-#### Debug/Trace log level
-
-conduwuit builds without debug or trace log levels by default for at least performance reasons. This may change in the future and/or binaries providing such configurations may be provided. If you need to access debug/trace log levels, you will need to build without the `release_max_log_level` feature.
-
-#### Changing log level dynamically
-
-conduwuit supports changing the tracing log environment filter on-the-fly using the admin command `!admin debug change-log-level`. This accepts a string **without quotes** the same format as the `log` config option.
-
-#### Pinging servers
-
-conduwuit can ping other servers using `!admin debug ping`. This takes a server name and goes through the server discovery process and queries `/_matrix/federation/v1/version`. Errors are outputted.
-
-#### Allocator memory stats
-
-If using jemalloc (for now) and built with jemallocator's `stats` feature, you can see conduwuit's jemalloc memory stats by using `!admin debug memory-stats`
@@ -1,55 +1,25 @@
 # Setting up TURN/STURN

-In order to make or receive calls, a TURN server is required. conduwuit suggests using [Coturn](https://github.com/coturn/coturn) for this purpose, which is also available as a Docker image.
+## General instructions

-### Configuration
+* It is assumed you have a [Coturn server](https://github.com/coturn/coturn) up and running. See [Synapse reference implementation](https://github.com/matrix-org/synapse/blob/develop/docs/turn-howto.md).

-Create a configuration file called `coturn.conf` containing:
-
-```conf
-use-auth-secret
-static-auth-secret=<a secret key>
-realm=<your server domain>
-```
-A common way to generate a suitable alphanumeric secret key is by using `pwgen -s 64 1`.
-
-These same values need to be set in conduwuit. You can either modify conduwuit.toml to include these lines:
+## Edit/Add a few settings to your existing conduit.toml

 ```
-turn_uris = ["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]
-turn_secret = "<secret key from coturn configuration>"
+# Refer to your Coturn settings. 
+# `your.turn.url` has to match the REALM setting of your Coturn as well as `transport`.
+turn_uris = ["turn:your.turn.url?transport=udp", "turn:your.turn.url?transport=tcp"]
+
+# static-auth-secret of your turnserver
+turn_secret = "ADD SECRET HERE"
+
+# If you have your TURN server configured to use a username and password
+# you can provide these information too. In this case comment out `turn_secret above`!
+#turn_username = ""
+#turn_password = ""
 ```

-or append the following to the docker environment variables dependig on which configuration method you used earlier:
+## Apply settings

-```yml
-CONDUIT_TURN_URIS: '["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]'
-CONDUIT_TURN_SECRET: "<secret key from coturn configuration>"
-```
-
-Restart conduwuit to apply these changes.
-
-### Run
-Run the [Coturn](https://hub.docker.com/r/coturn/coturn) image using
-```bash
-docker run -d --network=host -v $(pwd)/coturn.conf:/etc/coturn/turnserver.conf coturn/coturn
-```
-
-or docker-compose. For the latter, paste the following section into a file called `docker-compose.yml`
-and run `docker compose up -d` in the same directory.
-
-```yml
-version: 3
-services:
-    turn:
-      container_name: coturn-server
-      image: docker.io/coturn/coturn
-      restart: unless-stopped
-      network_mode: "host"
-      volumes:
-        - ./coturn.conf:/etc/coturn/turnserver.conf
-```
-
-To understand why the host networking mode is used and explore alternative configuration options, please visit [Coturn's Docker documentation](https://github.com/coturn/coturn/blob/master/docker/coturn/README.md).
-
-For security recommendations see Synapse's [Coturn documentation](https://element-hq.github.io/synapse/latest/turn-howto.html).
+Restart Conduit.
@@ -58,7 +58,7 @@ script = "lychee --version"
 [[task]]
 name = "cargo-audit"
 group = "security"
-script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked --ignore RUSTSEC-2020-0016"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"

 [[task]]
 name = "cargo-fmt"
@@ -78,60 +78,14 @@ RUSTDOCFLAGS="-D warnings" cargo doc \
 """

 [[task]]
-name = "clippy/default"
+name = "cargo-clippy"
 group = "lints"
-script = """
-cargo clippy \
-    --workspace \
-    --all-targets \
-    --color=always \
-    -- \
-    -D warnings
-"""
-
-[[task]]
-name = "clippy/all"
-group = "lints"
-script = """
-cargo clippy \
-    --workspace \
-    --all-targets \
-    --all-features \
-    --color=always \
-    -- \
-    -D warnings
-"""
-
-[[task]]
-name = "clippy/jemalloc"
-group = "lints"
-script = """
-cargo clippy \
-    --workspace \
-    --features jemalloc \
-    --all-targets \
-    --color=always \
-    -- \
-    -D warnings
-"""
-
-[[task]]
-name = "clippy/hardened_malloc"
-group = "lints"
-script = """
-cargo clippy \
-    --workspace \
-    --features hardened_malloc \
-    --all-targets \
-    --color=always \
-    -- \
-    -D warnings
-"""
+script = "cargo clippy --workspace --all-targets --all-features --color=always -- -D warnings"

 [[task]]
 name = "lychee"
 group = "lints"
-script = "lychee --verbose --offline docs *.md"
+script = "lychee --offline docs"

 [[task]]
 name = "cargo"
@@ -9,11 +9,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1711742460,
-        "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
+        "lastModified": 1707922053,
+        "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=",
        "owner": "zhaofengli",
        "repo": "attic",
-        "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
+        "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21",
        "type": "github"
      },
      "original": {
@@ -23,23 +23,6 @@
        "type": "github"
      }
    },
-    "complement": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715700731,
-        "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=",
-        "owner": "matrix-org",
-        "repo": "complement",
-        "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matrix-org",
-        "ref": "main",
-        "repo": "complement",
-        "type": "github"
-      }
-    },
    "crane": {
      "inputs": {
        "nixpkgs": [
@@ -68,17 +51,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1715274763,
-        "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=",
+        "lastModified": 1707685877,
+        "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5",
+        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
        "type": "github"
      },
      "original": {
        "owner": "ipetkov",
-        "ref": "master",
        "repo": "crane",
+        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
        "type": "github"
      }
    },
@@ -90,16 +73,15 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1715322226,
-        "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=",
+        "lastModified": 1711606966,
+        "narHash": "sha256-nTaO7ZDL4D02dVC5ktqnXNiNuODBUHyE4qEcFjAUCQY=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "297c756ba6249d483c1dafe42378560458842173",
+        "rev": "aa45c3e901ea42d6633af083c0c555efaf948b17",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "main",
        "repo": "fenix",
        "type": "github"
      }
@@ -132,7 +114,6 @@
      },
      "original": {
        "owner": "edolstra",
-        "ref": "master",
        "repo": "flake-compat",
        "type": "github"
      }
@@ -166,7 +147,6 @@
      },
      "original": {
        "owner": "numtide",
-        "ref": "main",
        "repo": "flake-utils",
        "type": "github"
      }
@@ -182,18 +162,17 @@
      },
      "original": {
        "owner": "numtide",
-        "ref": "main",
        "repo": "nix-filter",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1711401922,
-        "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=",
+        "lastModified": 1702539185,
+        "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "07262b18b97000d16a4bdb003418bd2fb067a932",
+        "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
        "type": "github"
      },
      "original": {
@@ -205,11 +184,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1711460390,
-        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
+        "lastModified": 1702780907,
+        "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
+        "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
        "type": "github"
      },
      "original": {
@@ -221,11 +200,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
        "type": "github"
      },
      "original": {
@@ -235,44 +214,25 @@
        "type": "github"
      }
    },
-    "rocksdb": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1714770052,
-        "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=",
-        "owner": "girlbossceo",
-        "repo": "rocksdb",
-        "rev": "db6df0b185774778457dabfcbd822cb81760cade",
-        "type": "github"
-      },
-      "original": {
-        "owner": "girlbossceo",
-        "ref": "v9.1.1",
-        "repo": "rocksdb",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "attic": "attic",
-        "complement": "complement",
        "crane": "crane_2",
        "fenix": "fenix",
        "flake-compat": "flake-compat_2",
        "flake-utils": "flake-utils_2",
        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_2",
-        "rocksdb": "rocksdb"
+        "nixpkgs": "nixpkgs_2"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1715255944,
-        "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=",
+        "lastModified": 1711562745,
+        "narHash": "sha256-s/YOyBM0vumhkqCFi8CnV5imFlC5JJrGia8CmEXyQkM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "5bf2f85c8054d80424899fa581db1b192230efb5",
+        "rev": "ad51a17c627b4ca57f83f0dc1f3bb5f3f17e6d0b",
        "type": "github"
      },
      "original": {
@@ -1,69 +1,257 @@
 {
  inputs = {
-    attic.url = "github:zhaofengli/attic?ref=main";
-    complement = { url = "github:matrix-org/complement?ref=main"; flake = false; };
-    crane = { url = "github:ipetkov/crane?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; };
-    fenix = { url = "github:nix-community/fenix?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; };
-    flake-compat = { url = "github:edolstra/flake-compat?ref=master"; flake = false; };
-    flake-utils.url = "github:numtide/flake-utils?ref=main";
-    nix-filter.url = "github:numtide/nix-filter?ref=main";
    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
-    # https://github.com/girlbossceo/rocksdb/commit/db6df0b185774778457dabfcbd822cb81760cade
-    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.1.1"; flake = false; };
+    flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    crane = {
+      # Pin latest crane that's not affected by the following bugs:
+      #
+      # * <https://github.com/ipetkov/crane/issues/527#issuecomment-1978079140>
+      # * <https://github.com/toml-rs/toml/issues/691>
+      # * <https://github.com/toml-rs/toml/issues/267>
+      url = "github:ipetkov/crane?rev=2c653e4478476a52c6aa3ac0495e4dea7449ea0e";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    attic.url = "github:zhaofengli/attic?ref=main";
  };

-  outputs = inputs:
-    inputs.flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    { self
+    , nixpkgs
+    , flake-utils
+    , nix-filter
+
+    , fenix
+    , crane
+    , ...
+    }: flake-utils.lib.eachDefaultSystem (system:
    let
-      pkgsHost = inputs.nixpkgs.legacyPackages.${system};
+      pkgsHost = nixpkgs.legacyPackages.${system};
+      allocator = null;
+
+      rocksdb' = pkgs:
+        let
+          version = "9.0.0";
+        in
+        (pkgs.rocksdb.overrideAttrs (old: {
+          inherit version;
+          src = pkgs.fetchFromGitHub {
+            owner = "girlbossceo";
+            repo = "rocksdb";
+            rev = "449768a833b79c267c584b5ab1d50e73db6faf9d";
+            hash = "sha256-MjmGfAlZ5WC2+hFH6nEUprqBjO8xiTQh2HJIqQ5mIg8=";
+          };
+        }));
+
+      # Nix-accessible `Cargo.toml`
+      cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);

      # The Rust toolchain to use
-      toolchain = inputs.fenix.packages.${system}.fromToolchainFile {
+      toolchain = fenix.packages.${system}.fromToolchainFile {
        file = ./rust-toolchain.toml;

        # See also `rust-toolchain.toml`
-        sha256 = "sha256-+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8";
+        sha256 = "sha256-SXRtAuO4IqNOQq+nLbrsDFbVk+3aVA8NNpSZsKlVH/8=";
      };

-      scope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
-        book = self.callPackage ./nix/pkgs/book {};
-        complement = self.callPackage ./nix/pkgs/complement {};
-        craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain toolchain);
-        inherit inputs;
-        main = self.callPackage ./nix/pkgs/main {};
-        oci-image = self.callPackage ./nix/pkgs/oci-image {};
-        rocksdb = pkgs.rocksdb.overrideAttrs (old: {
-          src = inputs.rocksdb;
-          version = pkgs.lib.removePrefix
-            "v"
-            (builtins.fromJSON (builtins.readFile ./flake.lock))
-              .nodes.rocksdb.original.ref;
-        });
-      });
+      builder = pkgs:
+        ((crane.mkLib pkgs).overrideToolchain toolchain).buildPackage;

-      scopeHost = (scope pkgsHost);
+      nativeBuildInputs = pkgs: [
+        # bindgen needs the build platform's libclang. Apparently due to
+        # "splicing weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't
+        # quite do the right thing here.
+        pkgs.pkgsBuildHost.rustPlatform.bindgenHook
+      ];
+
+      env = pkgs: {
+        CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev;
+        ROCKSDB_INCLUDE_DIR = "${rocksdb' pkgs}/include";
+        ROCKSDB_LIB_DIR = "${rocksdb' pkgs}/lib";
+      }
+      // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isStatic {
+        ROCKSDB_STATIC = "";
+      }
+      // {
+        CARGO_BUILD_RUSTFLAGS = let inherit (pkgs) lib stdenv; in
+          lib.concatStringsSep " " ([ ]
+            ++ lib.optionals
+            # This disables PIE for static builds, which isn't great in terms
+            # of security. Unfortunately, my hand is forced because nixpkgs'
+            # `libstdc++.a` is built without `-fPIE`, which precludes us from
+            # leaving PIE enabled.
+            stdenv.hostPlatform.isStatic
+            [ "-C" "relocation-model=static" ]
+            ++ lib.optionals
+            (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
+            [ "-l" "c" ]
+            ++ lib.optionals
+            # This check has to match the one [here][0]. We only need to set
+            # these flags when using a different linker. Don't ask me why,
+            # though, because I don't know. All I know is it breaks otherwise.
+            #
+            # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L37-L40
+            (
+              # Nixpkgs doesn't check for x86_64 here but we do, because I
+              # observed a failure building statically for x86_64 without
+              # including it here. Linkers are weird.
+              (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
+                && stdenv.hostPlatform.isStatic
+                && !stdenv.isDarwin
+                && !stdenv.cc.bintools.isLLVM
+            )
+            [
+              "-l"
+              "stdc++"
+              "-L"
+              "${stdenv.cc.cc.lib}/${stdenv.hostPlatform.config}/lib"
+            ]
+          );
+      }
+
+      # What follows is stolen from [here][0]. Its purpose is to properly
+      # configure compilers and linkers for various stages of the build, and
+      # even covers the case of build scripts that need native code compiled and
+      # run on the build platform (I think).
+      #
+      # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
+      // (
+        let
+          inherit (pkgs.rust.lib) envVars;
+        in
+        pkgs.lib.optionalAttrs
+          (pkgs.stdenv.targetPlatform.rust.rustcTarget
+            != pkgs.stdenv.hostPlatform.rust.rustcTarget)
+          (
+            let
+              inherit (pkgs.stdenv.targetPlatform.rust) cargoEnvVarTarget;
+            in
+            {
+              "CC_${cargoEnvVarTarget}" = envVars.ccForTarget;
+              "CXX_${cargoEnvVarTarget}" = envVars.cxxForTarget;
+              "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" =
+                envVars.linkerForTarget;
+            }
+          )
+        // (
+          let
+            inherit (pkgs.stdenv.hostPlatform.rust) cargoEnvVarTarget rustcTarget;
+          in
+          {
+            "CC_${cargoEnvVarTarget}" = envVars.ccForHost;
+            "CXX_${cargoEnvVarTarget}" = envVars.cxxForHost;
+            "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForHost;
+            CARGO_BUILD_TARGET = rustcTarget;
+          }
+        )
+        // (
+          let
+            inherit (pkgs.stdenv.buildPlatform.rust) cargoEnvVarTarget;
+          in
+          {
+            "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
+            "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
+            "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;
+            HOST_CC = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/cc";
+            HOST_CXX = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/c++";
+          }
+        )
+      );
+
+      mkPackage = pkgs: allocator: builder pkgs {
+        src = nix-filter {
+          root = ./.;
+          include = [
+            "src"
+            "Cargo.toml"
+            "Cargo.lock"
+          ];
+        };
+
+        buildFeatures = [ ]
+          ++ (if allocator == "jemalloc" then [ "jemalloc" ] else [ ])
+          ++ (if allocator == "hmalloc" then [ "hardened_malloc" ] else [ ])
+        ;
+
+        rocksdb' = (if allocator == "jemalloc" then (pkgs.rocksdb.override { enableJemalloc = true; }) else (rocksdb' pkgs));
+
+        # This is redundant with CI
+        doCheck = false;
+
+        env = env pkgs;
+        nativeBuildInputs = nativeBuildInputs pkgs;
+
+        meta.mainProgram = cargoToml.package.name;
+      };
+
+      mkOciImage = pkgs: package: allocator:
+        pkgs.dockerTools.buildLayeredImage {
+          name = package.pname;
+          tag = "main";
+          # Debian makes builds reproducible through using the HEAD commit's date
+          created = "@${toString self.lastModified}";
+          contents = [
+            pkgs.dockerTools.caCertificates
+          ];
+          config = {
+            # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
+            # are handled as expected
+            Entrypoint = [
+              "${pkgs.lib.getExe' pkgs.tini "tini"}"
+              "--"
+            ];
+            Cmd = [
+              "${pkgs.lib.getExe package}"
+            ];
+          };
+        };
    in
    {
      packages = {
-        default = scopeHost.main;
-        jemalloc = scopeHost.main.override { features = ["jemalloc"]; };
-        hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; };
+        default = mkPackage pkgsHost null;
+        jemalloc = mkPackage pkgsHost "jemalloc";
+        hmalloc = mkPackage pkgsHost "hmalloc";
+        oci-image = mkOciImage pkgsHost self.packages.${system}.default null;
+        oci-image-jemalloc = mkOciImage pkgsHost self.packages.${system}.default "jemalloc";
+        oci-image-hmalloc = mkOciImage pkgsHost self.packages.${system}.default "hmalloc";

-        oci-image = scopeHost.oci-image;
-        oci-image-jemalloc = scopeHost.oci-image.override {
-          main = scopeHost.main.override {
-            features = ["jemalloc"];
+        book =
+          let
+            package = self.packages.${system}.default;
+          in
+          pkgsHost.stdenv.mkDerivation {
+            pname = "${package.pname}-book";
+            version = package.version;
+
+            src = nix-filter {
+              root = ./.;
+              include = [
+                "book.toml"
+                "conduwuit-example.toml"
+                "README.md"
+                "debian/README.md"
+                "docs"
+              ];
+            };
+
+            nativeBuildInputs = (with pkgsHost; [
+              mdbook
+            ]);
+
+            buildPhase = ''
+              mdbook build
+              mv public $out
+            '';
          };
-        };
-        oci-image-hmalloc = scopeHost.oci-image.override {
-          main = scopeHost.main.override {
-            features = ["hardened_malloc"];
-          };
-        };
-
-        book = scopeHost.book;
-
-        complement = scopeHost.complement;
      }
      //
      builtins.listToAttrs
@@ -73,96 +261,90 @@
              let
                binaryName = "static-${crossSystem}";
                pkgsCrossStatic =
-                  (import inputs.nixpkgs {
+                  (import nixpkgs {
                    inherit system;
                    crossSystem = {
                      config = crossSystem;
                    };
                  }).pkgsStatic;
-                scopeCrossStatic = scope pkgsCrossStatic;
              in
              [
                # An output for a statically-linked binary
                {
                  name = binaryName;
-                  value = scopeCrossStatic.main;
+                  value = mkPackage pkgsCrossStatic null;
                }

                # An output for a statically-linked binary with jemalloc
                {
                  name = "${binaryName}-jemalloc";
-                  value = scopeCrossStatic.main.override {
-                    features = ["jemalloc"];
-                  };
+                  value = mkPackage pkgsCrossStatic "jemalloc";
                }

                # An output for a statically-linked binary with hardened_malloc
                {
                  name = "${binaryName}-hmalloc";
-                  value = scopeCrossStatic.main.override {
-                    features = ["hardened_malloc"];
-                  };
+                  value = mkPackage pkgsCrossStatic "hmalloc";
                }

                # An output for an OCI image based on that binary
                {
                  name = "oci-image-${crossSystem}";
-                  value = scopeCrossStatic.oci-image;
+                  value = mkOciImage
+                    pkgsCrossStatic
+                    self.packages.${system}.${binaryName}
+                    null;
                }

                # An output for an OCI image based on that binary with jemalloc
                {
                  name = "oci-image-${crossSystem}-jemalloc";
-                  value = scopeCrossStatic.oci-image.override {
-                    main = scopeCrossStatic.main.override {
-                      features = ["jemalloc"];
-                    };
-                  };
+                  value = mkOciImage
+                    pkgsCrossStatic
+                    self.packages.${system}.${binaryName}
+                    "jemalloc";
                }

                # An output for an OCI image based on that binary with hardened_malloc
                {
                  name = "oci-image-${crossSystem}-hmalloc";
-                  value = scopeCrossStatic.oci-image.override {
-                    main = scopeCrossStatic.main.override {
-                      features = ["hardened_malloc"];
-                    };
-                  };
+                  value = mkOciImage
+                    pkgsCrossStatic
+                    self.packages.${system}.${binaryName}
+                    "hmalloc";
                }
              ]
            )
            [
              "x86_64-unknown-linux-musl"
+              "x86_64-unknown-linux-musl-jemalloc"
+              "x86_64-unknown-linux-musl-hmalloc"
              "aarch64-unknown-linux-musl"
+              "aarch64-unknown-linux-musl-jemalloc"
+              "aarch64-unknown-linux-musl-hmalloc"
            ]
          )
        );

      devShells.default = pkgsHost.mkShell {
-        env = scopeHost.main.env // {
+        env = env pkgsHost // {
          # Rust Analyzer needs to be able to find the path to default crate
          # sources, and it can read this environment variable to do so. The
          # `rust-src` component is required in order for this to work.
          RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
-
-          # Convenient way to access a pinned version of Complement's source
-          # code.
-          COMPLEMENT_SRC = inputs.complement.outPath;
        };

        # Development tools
-        packages = [
+        nativeBuildInputs = nativeBuildInputs pkgsHost ++ [
          # Always use nightly rustfmt because most of its options are unstable
          #
          # This needs to come before `toolchain` in this list, otherwise
          # `$PATH` will have stable rustfmt instead.
-          inputs.fenix.packages.${system}.latest.rustfmt
+          fenix.packages.${system}.latest.rustfmt

          toolchain
-        ]
-        ++ (with pkgsHost; [
+        ] ++ (with pkgsHost; [
          engage
-          cargo-audit

          # Needed for producing Debian packages
          cargo-deb
@@ -179,13 +361,7 @@

          # Useful for editing the book locally
          mdbook
-        ])
-        ++ (if !pkgsHost.stdenv.isDarwin then [
-            # Needed for building with io_uring
-            pkgsHost.liburing
-        ] else [])
-        ++
-        scopeHost.main.nativeBuildInputs;
+        ]);
      };
    });
 }
@@ -1,33 +0,0 @@
-{ inputs
-
-# Dependencies
-, main
-, mdbook
-, stdenv
-}:
-
-stdenv.mkDerivation {
-  inherit (main) pname version;
-
-  src = inputs.nix-filter {
-    root = inputs.self;
-    include = [
-      "book.toml"
-      "conduwuit-example.toml"
-      "CONTRIBUTING.md"
-      "README.md"
-      "debian/conduwuit.service"
-      "debian/README.md"
-      "docs"
-    ];
-  };
-
-  nativeBuildInputs = [
-    mdbook
-  ];
-
-  buildPhase = ''
-    mdbook build
-    mv public $out
-  '';
-}
@@ -1,19 +0,0 @@
-[global]
-address = "0.0.0.0"
-allow_device_name_federation = true
-allow_guest_registration = true
-allow_public_room_directory_over_federation = true
-allow_public_room_directory_without_auth = true
-allow_registration = true
-allow_unstable_room_versions = true
-database_backend = "rocksdb"
-database_path = "/database"
-log = "trace"
-port = [8008, 8448]
-trusted_servers = []
-yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true
-
-[global.tls]
-certs = "/certificate.crt"
-dual_protocol = true
-key = "/private_key.key"
@@ -1,92 +0,0 @@
-# Dependencies
-{ bashInteractive
-, buildEnv
-, coreutils
-, dockerTools
-, gawk
-, lib
-, main
-, openssl
-, stdenv
-, tini
-, writeShellScriptBin
-}:
-
-let
-  main' = main.override {
-    profile = "dev";
-    features = ["axum_dual_protocol"];
-  };
-
-  start = writeShellScriptBin "start" ''
-    set -euxo pipefail
-
-    ${lib.getExe openssl} genrsa -out private_key.key 2048
-    ${lib.getExe openssl} req \
-      -new \
-      -sha256 \
-      -key private_key.key \
-      -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=$SERVER_NAME" \
-      -out signing_request.csr
-    cp ${./v3.ext} v3.ext
-    echo "DNS.1 = $SERVER_NAME" >> v3.ext
-    echo "IP.1 = $(${lib.getExe gawk} 'END{print $1}' /etc/hosts)" \
-      >> v3.ext
-    ${lib.getExe openssl} x509 \
-      -req \
-      -extfile v3.ext \
-      -in signing_request.csr \
-      -CA /complement/ca/ca.crt \
-      -CAkey /complement/ca/ca.key \
-      -CAcreateserial \
-      -out certificate.crt \
-      -days 1 \
-      -sha256
-
-    ${lib.getExe' coreutils "env"} \
-      CONDUIT_SERVER_NAME="$SERVER_NAME" \
-      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8448" \
-      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8008" \
-      ${lib.getExe main'}
-  '';
-in
-
-dockerTools.buildImage {
-  name = "complement-${main.pname}";
-  tag = "main";
-
-  copyToRoot = buildEnv {
-    name = "root";
-    pathsToLink = [
-      "/bin"
-    ];
-    paths = [
-      bashInteractive
-      coreutils
-      main'
-      start
-    ];
-  };
-
-  config = {
-    Cmd = [
-      "${lib.getExe start}"
-    ];
-
-    Entrypoint = if !stdenv.isDarwin
-      # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
-      # are handled as expected
-      then [ "${lib.getExe' tini "tini"}" "--" ]
-      else [];
-
-    Env = [
-      "SSL_CERT_FILE=/complement/ca/ca.crt"
-      "CONDUWUIT_CONFIG=${./config.toml}"
-    ];
-
-    ExposedPorts = {
-      "8008/tcp" = {};
-      "8448/tcp" = {};
-    };
-  };
-}
@@ -1,6 +0,0 @@
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
@@ -1,100 +0,0 @@
-{ lib
-, pkgsBuildHost
-, rust
-, stdenv
-}:
-
-lib.optionalAttrs stdenv.hostPlatform.isStatic {
-  ROCKSDB_STATIC = "";
-}
-//
-{
-  CARGO_BUILD_RUSTFLAGS =
-    lib.concatStringsSep
-      " "
-      ([]
-        # This disables PIE for static builds, which isn't great in terms
-        # of security. Unfortunately, my hand is forced because nixpkgs'
-        # `libstdc++.a` is built without `-fPIE`, which precludes us from
-        # leaving PIE enabled.
-        ++ lib.optionals
-          stdenv.hostPlatform.isStatic
-          [ "-C" "relocation-model=static" ]
-        ++ lib.optionals
-          (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
-          [ "-l" "c" ]
-        ++ lib.optionals
-          # This check has to match the one [here][0]. We only need to set
-          # these flags when using a different linker. Don't ask me why,
-          # though, because I don't know. All I know is it breaks otherwise.
-          #
-          # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L37-L40
-          (
-            # Nixpkgs doesn't check for x86_64 here but we do, because I
-            # observed a failure building statically for x86_64 without
-            # including it here. Linkers are weird.
-            (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
-              && stdenv.hostPlatform.isStatic
-              && !stdenv.isDarwin
-              && !stdenv.cc.bintools.isLLVM
-          )
-          [
-            "-l"
-            "stdc++"
-            "-L"
-            "${stdenv.cc.cc.lib}/${stdenv.hostPlatform.config}/lib"
-          ]
-      );
-}
-
-# What follows is stolen from [here][0]. Its purpose is to properly
-# configure compilers and linkers for various stages of the build, and
-# even covers the case of build scripts that need native code compiled and
-# run on the build platform (I think).
-#
-# [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
-//
-(
-  let
-    inherit (rust.lib) envVars;
-  in
-  lib.optionalAttrs
-    (stdenv.targetPlatform.rust.rustcTarget
-      != stdenv.hostPlatform.rust.rustcTarget)
-    (
-      let
-        inherit (stdenv.targetPlatform.rust) cargoEnvVarTarget;
-      in
-      {
-        "CC_${cargoEnvVarTarget}" = envVars.ccForTarget;
-        "CXX_${cargoEnvVarTarget}" = envVars.cxxForTarget;
-        "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" =
-          envVars.linkerForTarget;
-      }
-    )
-  //
-  (
-    let
-      inherit (stdenv.hostPlatform.rust) cargoEnvVarTarget rustcTarget;
-    in
-    {
-      "CC_${cargoEnvVarTarget}" = envVars.ccForHost;
-      "CXX_${cargoEnvVarTarget}" = envVars.cxxForHost;
-      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForHost;
-      CARGO_BUILD_TARGET = rustcTarget;
-    }
-  )
-  //
-  (
-    let
-      inherit (stdenv.buildPlatform.rust) cargoEnvVarTarget;
-    in
-    {
-      "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
-      "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
-      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;
-      HOST_CC = "${pkgsBuildHost.stdenv.cc}/bin/cc";
-      HOST_CXX = "${pkgsBuildHost.stdenv.cc}/bin/c++";
-    }
-  )
-)
@@ -1,108 +0,0 @@
-# Dependencies (keep sorted)
-{ craneLib
-, inputs
-, lib
-, libiconv
-, pkgsBuildHost
-, rocksdb
-, rust
-, stdenv
-
-# Options (keep sorted)
-, default_features ? true
-, features ? []
-, profile ? "release"
-}:
-
-let
-buildDepsOnlyEnv =
-  let
-    rocksdb' = rocksdb.override {
-      enableJemalloc = builtins.elem "jemalloc" features;
-    };
-  in
-  {
-    CARGO_PROFILE = profile;
-    ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
-    ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
-  }
-  //
-  (import ./cross-compilation-env.nix {
-    # Keep sorted
-    inherit
-      lib
-      pkgsBuildHost
-      rust
-      stdenv;
-  });
-
-buildPackageEnv = {
-  CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
-} // buildDepsOnlyEnv;
-
-commonAttrs = {
-  inherit
-    (craneLib.crateNameFromCargoToml {
-      cargoToml = "${inputs.self}/Cargo.toml";
-    })
-    pname
-    version;
-
-    src = let filter = inputs.nix-filter.lib; in filter {
-      root = inputs.self;
-
-      # Keep sorted
-      include = [
-        "Cargo.lock"
-        "Cargo.toml"
-        "hot_lib"
-        "src"
-      ];
-    };
-
-    nativeBuildInputs = [
-      # bindgen needs the build platform's libclang. Apparently due to "splicing
-      # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
-      # right thing here.
-      pkgsBuildHost.rustPlatform.bindgenHook
-  ]
-  ++ lib.optionals stdenv.isDarwin [
-      # https://github.com/NixOS/nixpkgs/issues/206242
-      libiconv
-
-      # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell
-      # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612
-      pkgsBuildHost.darwin.apple_sdk.frameworks.Security
-    ];
- };
-in
-
-craneLib.buildPackage ( commonAttrs // {
-  cargoArtifacts = craneLib.buildDepsOnly (commonAttrs // {
-    env = buildDepsOnlyEnv;
-  });
-
-  cargoExtraArgs = ""
-    + lib.optionalString
-      (!default_features)
-      "--no-default-features "
-    + lib.optionalString
-      (features != [])
-      "--features " + (builtins.concatStringsSep "," features);
-
-  # This is redundant with CI
-  cargoTestCommand = "";
-  cargoCheckCommand = "";
-  doCheck = false;
-
-  # https://crane.dev/faq/rebuilds-bindgen.html
-  NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
-
-  env = buildPackageEnv;
-
-  passthru = {
-    env = buildPackageEnv;
-  };
-
-  meta.mainProgram = commonAttrs.pname;
-})
@@ -1,28 +0,0 @@
-{ inputs
-
-# Dependencies
-, dockerTools
-, lib
-, main
-, stdenv
-, tini
-}:
-
-dockerTools.buildLayeredImage {
-  name = main.pname;
-  tag = "main";
-  created = "@${toString inputs.self.lastModified}";
-  contents = [
-    dockerTools.caCertificates
-  ];
-  config = {
-    Entrypoint = if !stdenv.isDarwin
-      # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
-      # are handled as expected
-      then [ "${lib.getExe' tini "tini"}" "--" ]
-      else [];
-    Cmd = [
-      "${lib.getExe main}"
-    ];
-  };
-}
@@ -11,5 +11,6 @@
  },
  "nix": {
    "enabled": true
-  }
+  },
+  "ignoreDeps": ["tower-http", "axum-server", "hyper", "axum", "http"]
 }
@@ -11,7 +11,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.

 [toolchain]
-channel = "1.77.0"
+channel = "1.75.0"
 components = [
    # For rust-analyzer
    "rust-src",
@@ -20,4 +20,4 @@ targets = [
    "x86_64-unknown-linux-gnu",
    "x86_64-unknown-linux-musl",
    "aarch64-unknown-linux-musl",
-]
+]
@@ -1,7 +0,0 @@
-//! Default allocator with no special features
-
-/// Always returns the empty string
-pub(crate) fn memory_stats() -> String { Default::default() }
-
-/// Always returns the empty string
-pub(crate) fn memory_usage() -> String { Default::default() }
@@ -1,8 +0,0 @@
-#[global_allocator]
-static HMALLOC: hardened_malloc_rs::HardenedMalloc = hardened_malloc_rs::HardenedMalloc;
-
-pub(crate) fn memory_usage() -> String {
-	String::default() //TODO: get usage
-}
-
-pub(crate) fn memory_stats() -> String { "Extended statistics are not available from hardened_malloc.".to_owned() }
@@ -1,50 +0,0 @@
-use std::ffi::{c_char, c_void};
-
-use tikv_jemalloc_ctl as mallctl;
-use tikv_jemalloc_sys as ffi;
-use tikv_jemallocator as jemalloc;
-
-#[global_allocator]
-static JEMALLOC: jemalloc::Jemalloc = jemalloc::Jemalloc;
-
-pub(crate) fn memory_usage() -> String {
-	use mallctl::stats;
-	let allocated = stats::allocated::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	let active = stats::active::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	let mapped = stats::mapped::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	let metadata = stats::metadata::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	let resident = stats::resident::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	let retained = stats::retained::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
-	format!(
-		" allocated: {allocated:.2} MiB\n active: {active:.2} MiB\n mapped: {mapped:.2} MiB\n metadata: {metadata:.2} \
-		 MiB\n resident: {resident:.2} MiB\n retained: {retained:.2} MiB\n "
-	)
-}
-
-pub(crate) fn memory_stats() -> String {
-	const MAX_LENGTH: usize = 65536 - 4096;
-
-	let opts_s = "d";
-	let mut str = String::new();
-
-	let opaque = std::ptr::from_mut(&mut str).cast::<c_void>();
-	let opts_p: *const c_char = std::ffi::CString::new(opts_s).expect("cstring").into_raw() as *const c_char;
-
-	// SAFETY: calls malloc_stats_print() with our string instance which must remain
-	// in this frame. https://docs.rs/tikv-jemalloc-sys/latest/tikv_jemalloc_sys/fn.malloc_stats_print.html
-	unsafe { ffi::malloc_stats_print(Some(malloc_stats_cb), opaque, opts_p) };
-
-	str.truncate(MAX_LENGTH);
-	format!("<pre><code>{str}</code></pre>")
-}
-
-extern "C" fn malloc_stats_cb(opaque: *mut c_void, msg: *const c_char) {
-	// SAFETY: we have to trust the opaque points to our String
-	let res: &mut String = unsafe { opaque.cast::<String>().as_mut().unwrap() };
-
-	// SAFETY: we have to trust the string is null terminated.
-	let msg = unsafe { std::ffi::CStr::from_ptr(msg) };
-
-	let msg = String::from_utf8_lossy(msg.to_bytes());
-	res.push_str(msg.as_ref());
-}
@@ -1,25 +0,0 @@
-//! Integration with allocators
-
-// jemalloc
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
-mod je;
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
-pub(crate) use je::{memory_stats, memory_usage};
-
-// hardened_malloc
-#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
-mod hardened;
-#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
-pub(crate) use hardened::{memory_stats, memory_usage};
-
-// default, enabled when none or multiple of the above are enabled
-#[cfg(any(
-	not(any(feature = "jemalloc", feature = "hardened_malloc")),
-	all(feature = "jemalloc", feature = "hardened_malloc"),
-))]
-mod default;
-#[cfg(any(
-	not(any(feature = "jemalloc", feature = "hardened_malloc")),
-	all(feature = "jemalloc", feature = "hardened_malloc"),
-))]
-pub(crate) use default::{memory_stats, memory_usage};
@@ -1,5 +1,3 @@
-use std::fmt::Write as _;
-
 use register::RegistrationKind;
 use ruma::{
 	api::client::{
@@ -20,9 +18,7 @@ use tracing::{error, info, warn};
 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
 	api::client_server::{self, join_room_by_id_helper},
-	service, services,
-	utils::{self, user_id::user_is_local},
-	Error, Result, Ruma,
+	service, services, utils, Error, Result, Ruma,
 };

 const RANDOM_USER_ID_LENGTH: usize = 10;
@@ -38,13 +34,13 @@ const RANDOM_USER_ID_LENGTH: usize = 10;
 ///
 /// Note: This will not reserve the username, so the username might become
 /// invalid when trying to register
-pub(crate) async fn get_register_available_route(
+pub async fn get_register_available_route(
 	body: Ruma<get_username_availability::v3::Request>,
 ) -> Result<get_username_availability::v3::Response> {
 	// Validate user id
 	let user_id = UserId::parse_with_server_name(body.username.to_lowercase(), services().globals.server_name())
 		.ok()
-		.filter(|user_id| !user_id.is_historical() && user_is_local(user_id))
+		.filter(|user_id| !user_id.is_historical() && user_id.server_name() == services().globals.server_name())
 		.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

 	// Check if username is creative enough
@@ -86,7 +82,7 @@ pub(crate) async fn get_register_available_route(
 /// - If `inhibit_login` is false: Creates a device and returns device id and
 ///   access_token
 #[allow(clippy::doc_markdown)]
-pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
+pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
 	if !services().globals.allow_registration() && body.appservice_info.is_none() {
 		info!(
 			"Registration disabled and request not from known appservice, rejecting registration attempt for username \
@@ -129,7 +125,9 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 			let proposed_user_id =
 				UserId::parse_with_server_name(username.to_lowercase(), services().globals.server_name())
 					.ok()
-					.filter(|user_id| !user_id.is_historical() && user_is_local(user_id))
+					.filter(|user_id| {
+						!user_id.is_historical() && user_id.server_name() == services().globals.server_name()
+					})
 					.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

 			if services().users.exists(&proposed_user_id)? {
@@ -240,7 +238,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 	// If `new_user_displayname_suffix` is set, registration will push whatever
 	// content is set to the user's display name with a space before it
 	if !services().globals.new_user_displayname_suffix().is_empty() {
-		_ = write!(displayname, " {}", services().globals.config.new_user_displayname_suffix);
+		displayname.push_str(&(" ".to_owned() + services().globals.new_user_displayname_suffix()));
 	}

 	services()
@@ -296,8 +294,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 			.admin
 			.send_message(RoomMessageEventContent::notice_plain(format!(
 				"New user \"{user_id}\" registered on this server."
-			)))
-			.await;
+			)));
 	}

 	// log in conduit admin channel if a guest registered
@@ -313,30 +310,27 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 					.send_message(RoomMessageEventContent::notice_plain(format!(
 						"Guest user \"{user_id}\" with device display name `{device_display_name}` registered on this \
 						 server."
-					)))
-					.await;
+					)));
 			} else {
 				services()
 					.admin
 					.send_message(RoomMessageEventContent::notice_plain(format!(
 						"Guest user \"{user_id}\" with no device display name registered on this server.",
-					)))
-					.await;
+					)));
 			}
 		} else {
 			services()
 				.admin
 				.send_message(RoomMessageEventContent::notice_plain(format!(
 					"Guest user \"{user_id}\" with no device display name registered on this server.",
-				)))
-				.await;
+				)));
 		}
 	}

 	// If this is the first real user, grant them admin privileges except for guest
 	// users Note: the server user, @conduit:servername, is generated first
 	if !is_guest {
-		if let Some(admin_room) = service::admin::Service::get_admin_room().await? {
+		if let Some(admin_room) = service::admin::Service::get_admin_room()? {
 			if services()
 				.rooms
 				.state_cache
@@ -412,9 +406,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub(crate) async fn change_password_route(
-	body: Ruma<change_password::v3::Request>,
-) -> Result<change_password::v3::Response> {
+pub async fn change_password_route(body: Ruma<change_password::v3::Request>) -> Result<change_password::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -467,8 +459,7 @@ pub(crate) async fn change_password_route(
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
 			"User {sender_user} changed their password."
-		)))
-		.await;
+		)));

 	Ok(change_password::v3::Response {})
 }
@@ -478,7 +469,7 @@ pub(crate) async fn change_password_route(
 /// Get `user_id` of the sender user.
 ///
 /// Note: Also works for Application Services
-pub(crate) async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3::Response> {
+pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let device_id = body.sender_device.clone();

@@ -500,7 +491,7 @@ pub(crate) async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoa
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Result<deactivate::v3::Response> {
+pub async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Result<deactivate::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -533,7 +524,7 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
 	}

 	// Make the user leave all rooms before deactivation
-	client_server::leave_all_rooms(sender_user).await;
+	client_server::leave_all_rooms(sender_user).await?;

 	// Remove devices and mark account as deactivated
 	services().users.deactivate_account(sender_user)?;
@@ -543,8 +534,7 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
 			"User {sender_user} deactivated their account."
-		)))
-		.await;
+		)));

 	Ok(deactivate::v3::Response {
 		id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
@@ -556,7 +546,7 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
 /// Get a list of third party identifiers associated with this account.
 ///
 /// - Currently always returns empty list
-pub(crate) async fn third_party_route(body: Ruma<get_3pids::v3::Request>) -> Result<get_3pids::v3::Response> {
+pub async fn third_party_route(body: Ruma<get_3pids::v3::Request>) -> Result<get_3pids::v3::Response> {
 	let _sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	Ok(get_3pids::v3::Response::new(Vec::new()))
@@ -569,7 +559,7 @@ pub(crate) async fn third_party_route(body: Ruma<get_3pids::v3::Request>) -> Res
 ///
 /// - 403 signals that The homeserver does not allow the third party identifier
 ///   as a contact option.
-pub(crate) async fn request_3pid_management_token_via_email_route(
+pub async fn request_3pid_management_token_via_email_route(
 	_body: Ruma<request_3pid_management_token_via_email::v3::Request>,
 ) -> Result<request_3pid_management_token_via_email::v3::Response> {
 	Err(Error::BadRequest(
@@ -585,7 +575,7 @@ pub(crate) async fn request_3pid_management_token_via_email_route(
 ///
 /// - 403 signals that The homeserver does not allow the third party identifier
 ///   as a contact option.
-pub(crate) async fn request_3pid_management_token_via_msisdn_route(
+pub async fn request_3pid_management_token_via_msisdn_route(
 	_body: Ruma<request_3pid_management_token_via_msisdn::v3::Request>,
 ) -> Result<request_3pid_management_token_via_msisdn::v3::Response> {
 	Err(Error::BadRequest(
@@ -8,29 +8,37 @@ use ruma::{
 		},
 		federation,
 	},
-	OwnedRoomAliasId, OwnedRoomId, OwnedServerName,
+	OwnedRoomAliasId, OwnedServerName,
 };
-use tracing::debug;

-use crate::{
-	debug_info, debug_warn, service::appservice::RegistrationInfo, services, utils::server_name::server_is_ours, Error,
-	Result, Ruma,
-};
+use crate::{services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
-pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) -> Result<create_alias::v3::Response> {
-	alias_checks(&body.room_alias, &body.appservice_info).await?;
+pub async fn create_alias_route(body: Ruma<create_alias::v3::Request>) -> Result<create_alias::v3::Response> {
+	if body.room_alias.server_name() != services().globals.server_name() {
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
+	}

-	// this isn't apart of alias_checks or delete alias route because we should
-	// allow removing forbidden room aliases
 	if services()
 		.globals
 		.forbidden_alias_names()
 		.is_match(body.room_alias.alias())
 	{
-		return Err(Error::BadRequest(ErrorKind::forbidden(), "Room alias is forbidden."));
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias is forbidden."));
+	}
+
+	if let Some(ref info) = body.appservice_info {
+		if !info.aliases.is_match(body.room_alias.as_str()) {
+			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
+		}
+	} else if services()
+		.appservice
+		.is_exclusive_alias(&body.room_alias)
+		.await
+	{
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
 	}

 	if services()
@@ -63,8 +71,10 @@ pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) ->
 ///
 /// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
-pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
-	alias_checks(&body.room_alias, &body.appservice_info).await?;
+pub async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
+	if body.room_alias.server_name() != services().globals.server_name() {
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
+	}

 	if services()
 		.rooms
@@ -75,6 +85,18 @@ pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) ->
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Alias does not exist."));
 	}

+	if let Some(ref info) = body.appservice_info {
+		if !info.aliases.is_match(body.room_alias.as_str()) {
+			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
+		}
+	} else if services()
+		.appservice
+		.is_exclusive_alias(&body.room_alias)
+		.await
+	{
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
+	}
+
 	if services()
 		.rooms
 		.alias
@@ -95,21 +117,13 @@ pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) ->
 /// # `GET /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Resolve an alias locally or over federation.
-pub(crate) async fn get_alias_route(body: Ruma<get_alias::v3::Request>) -> Result<get_alias::v3::Response> {
-	get_alias_helper(body.body.room_alias, None).await
+pub async fn get_alias_route(body: Ruma<get_alias::v3::Request>) -> Result<get_alias::v3::Response> {
+	get_alias_helper(body.body.room_alias).await
 }

-pub(crate) async fn get_alias_helper(
-	room_alias: OwnedRoomAliasId, servers: Option<Vec<OwnedServerName>>,
-) -> Result<get_alias::v3::Response> {
-	debug!("get_alias_helper servers: {servers:?}");
-	if !server_is_ours(room_alias.server_name())
-		&& (!servers
-			.as_ref()
-			.is_some_and(|servers| servers.contains(&services().globals.server_name().to_owned()))
-			|| servers.as_ref().is_none())
-	{
-		let mut response = services()
+pub(crate) async fn get_alias_helper(room_alias: OwnedRoomAliasId) -> Result<get_alias::v3::Response> {
+	if room_alias.server_name() != services().globals.server_name() {
+		let response = services()
 			.sending
 			.send_federation_request(
 				room_alias.server_name(),
@@ -117,63 +131,47 @@ pub(crate) async fn get_alias_helper(
 					room_alias: room_alias.clone(),
 				},
 			)
-			.await;
+			.await?;

-		debug_info!("room alias server_name get_alias_helper response: {response:?}");
+		let room_id = response.room_id;

-		if let Err(ref e) = response {
-			debug_info!(
-				"Server {} of the original room alias failed to assist in resolving room alias: {e}",
-				room_alias.server_name()
-			);
+		let mut servers = response.servers;
+
+		// since the room alias server_name responded, insert it into the list
+		servers.push(room_alias.server_name().into());
+
+		// find active servers in room state cache to suggest
+		servers.extend(
+			services()
+				.rooms
+				.state_cache
+				.room_servers(&room_id)
+				.filter_map(Result::ok),
+		);
+
+		servers.sort_unstable();
+		servers.dedup();
+
+		// shuffle list of servers randomly after sort and dedupe
+		servers.shuffle(&mut rand::thread_rng());
+
+		// prefer the very first server to be ourselves if available, else prefer the
+		// room alias server first
+		if let Some(server_index) = servers
+			.iter()
+			.position(|server| server == services().globals.server_name())
+		{
+			servers.remove(server_index);
+			servers.insert(0, services().globals.server_name().to_owned());
+		} else if let Some(alias_server_index) = servers
+			.iter()
+			.position(|server| server == room_alias.server_name())
+		{
+			servers.remove(alias_server_index);
+			servers.insert(0, room_alias.server_name().into());
 		}

-		if response.as_ref().is_ok_and(|resp| resp.servers.is_empty()) || response.as_ref().is_err() {
-			if let Some(servers) = servers {
-				for server in servers {
-					response = services()
-						.sending
-						.send_federation_request(
-							&server,
-							federation::query::get_room_information::v1::Request {
-								room_alias: room_alias.clone(),
-							},
-						)
-						.await;
-					debug_info!("Got response from server {server} for room aliases: {response:?}");
-
-					if let Ok(ref response) = response {
-						if !response.servers.is_empty() {
-							break;
-						}
-						debug_warn!(
-							"Server {server} responded with room aliases, but was empty? Response: {response:?}"
-						);
-					}
-				}
-			}
-		}
-
-		if let Ok(response) = response {
-			let room_id = response.room_id;
-
-			let mut pre_servers = response.servers;
-			// since the room alis server responded, insert it into the list
-			pre_servers.push(room_alias.server_name().into());
-
-			let servers = room_available_servers(&room_id, &room_alias, &Some(pre_servers));
-			debug_warn!(
-				"room alias servers from federation response for room ID {room_id} and room alias {room_alias}: \
-				 {servers:?}"
-			);
-
-			return Ok(get_alias::v3::Response::new(room_id, servers));
-		}
-
-		return Err(Error::BadRequest(
-			ErrorKind::NotFound,
-			"No servers could assist in resolving the room alias",
-		));
+		return Ok(get_alias::v3::Response::new(room_id, servers));
 	}

 	let mut room_id = None;
@@ -211,67 +209,28 @@ pub(crate) async fn get_alias_helper(
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found."));
 	};

-	let servers = room_available_servers(&room_id, &room_alias, &None);
-
-	debug_warn!("room alias servers for room ID {room_id} and room alias {room_alias}");
-
-	Ok(get_alias::v3::Response::new(room_id, servers))
-}
-
-fn room_available_servers(
-	room_id: &OwnedRoomId, room_alias: &OwnedRoomAliasId, pre_servers: &Option<Vec<OwnedServerName>>,
-) -> Vec<OwnedServerName> {
 	// find active servers in room state cache to suggest
 	let mut servers: Vec<OwnedServerName> = services()
 		.rooms
 		.state_cache
-		.room_servers(room_id)
+		.room_servers(&room_id)
 		.filter_map(Result::ok)
 		.collect();

-	// push any servers we want in the list already (e.g. responded remote alias
-	// servers, room alias server itself)
-	if let Some(pre_servers) = pre_servers {
-		servers.extend(pre_servers.clone());
-	};
-
 	servers.sort_unstable();
 	servers.dedup();

 	// shuffle list of servers randomly after sort and dedupe
 	servers.shuffle(&mut rand::thread_rng());

-	// insert our server as the very first choice if in list, else check if we can
-	// prefer the room alias server first
+	// insert our server as the very first choice if in list
 	if let Some(server_index) = servers
 		.iter()
-		.position(|server_name| server_is_ours(server_name))
+		.position(|server| server == services().globals.server_name())
 	{
 		servers.remove(server_index);
 		servers.insert(0, services().globals.server_name().to_owned());
-	} else if let Some(alias_server_index) = servers
-		.iter()
-		.position(|server| server == room_alias.server_name())
-	{
-		servers.remove(alias_server_index);
-		servers.insert(0, room_alias.server_name().into());
 	}

-	servers
-}
-
-async fn alias_checks(room_alias: &OwnedRoomAliasId, appservice_info: &Option<RegistrationInfo>) -> Result<()> {
-	if !server_is_ours(room_alias.server_name()) {
-		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
-	}
-
-	if let Some(ref info) = appservice_info {
-		if !info.aliases.is_match(room_alias.as_str()) {
-			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
-		}
-	} else if services().appservice.is_exclusive_alias(room_alias).await {
-		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
-	}
-
-	Ok(())
+	Ok(get_alias::v3::Response::new(room_id, servers))
 }
@@ -1,14 +1,11 @@
-use ruma::{
-	api::client::{
-		backup::{
-			add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,
-			delete_backup_keys, delete_backup_keys_for_room, delete_backup_keys_for_session, delete_backup_version,
-			get_backup_info, get_backup_keys, get_backup_keys_for_room, get_backup_keys_for_session,
-			get_latest_backup_info, update_backup_version,
-		},
-		error::ErrorKind,
+use ruma::api::client::{
+	backup::{
+		add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,
+		delete_backup_keys, delete_backup_keys_for_room, delete_backup_keys_for_session, delete_backup_version,
+		get_backup_info, get_backup_keys, get_backup_keys_for_room, get_backup_keys_for_session,
+		get_latest_backup_info, update_backup_version,
 	},
-	UInt,
+	error::ErrorKind,
 };

 use crate::{services, Error, Result, Ruma};
@@ -16,7 +13,7 @@ use crate::{services, Error, Result, Ruma};
 /// # `POST /_matrix/client/r0/room_keys/version`
 ///
 /// Creates a new backup.
-pub(crate) async fn create_backup_version_route(
+pub async fn create_backup_version_route(
 	body: Ruma<create_backup_version::v3::Request>,
 ) -> Result<create_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -33,7 +30,7 @@ pub(crate) async fn create_backup_version_route(
 ///
 /// Update information about an existing backup. Only `auth_data` can be
 /// modified.
-pub(crate) async fn update_backup_version_route(
+pub async fn update_backup_version_route(
 	body: Ruma<update_backup_version::v3::Request>,
 ) -> Result<update_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -47,7 +44,7 @@ pub(crate) async fn update_backup_version_route(
 /// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about the latest backup version.
-pub(crate) async fn get_latest_backup_info_route(
+pub async fn get_latest_backup_info_route(
 	body: Ruma<get_latest_backup_info::v3::Request>,
 ) -> Result<get_latest_backup_info::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -55,37 +52,32 @@ pub(crate) async fn get_latest_backup_info_route(
 	let (version, algorithm) = services()
 		.key_backups
 		.get_latest_backup(sender_user)?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;

 	Ok(get_latest_backup_info::v3::Response {
 		algorithm,
-		count: (UInt::try_from(services().key_backups.count_keys(sender_user, &version)?)
-			.expect("user backup keys count should not be that high")),
+		count: (services().key_backups.count_keys(sender_user, &version)? as u32).into(),
 		etag: services().key_backups.get_etag(sender_user, &version)?,
 		version,
 	})
 }

-/// # `GET /_matrix/client/v3/room_keys/version/{version}`
+/// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about an existing backup.
-pub(crate) async fn get_backup_info_route(
-	body: Ruma<get_backup_info::v3::Request>,
-) -> Result<get_backup_info::v3::Response> {
+pub async fn get_backup_info_route(body: Ruma<get_backup_info::v3::Request>) -> Result<get_backup_info::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let algorithm = services()
 		.key_backups
 		.get_backup(sender_user, &body.version)?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;

 	Ok(get_backup_info::v3::Response {
 		algorithm,
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -99,7 +91,7 @@ pub(crate) async fn get_backup_info_route(
 ///
 /// - Deletes both information about the backup, as well as all key data related
 ///   to the backup
-pub(crate) async fn delete_backup_version_route(
+pub async fn delete_backup_version_route(
 	body: Ruma<delete_backup_version::v3::Request>,
 ) -> Result<delete_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -119,9 +111,7 @@ pub(crate) async fn delete_backup_version_route(
 ///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-pub(crate) async fn add_backup_keys_route(
-	body: Ruma<add_backup_keys::v3::Request>,
-) -> Result<add_backup_keys::v3::Response> {
+pub async fn add_backup_keys_route(body: Ruma<add_backup_keys::v3::Request>) -> Result<add_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if Some(&body.version)
@@ -145,12 +135,10 @@ pub(crate) async fn add_backup_keys_route(
 	}

 	Ok(add_backup_keys::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -165,7 +153,7 @@ pub(crate) async fn add_backup_keys_route(
 ///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-pub(crate) async fn add_backup_keys_for_room_route(
+pub async fn add_backup_keys_for_room_route(
 	body: Ruma<add_backup_keys_for_room::v3::Request>,
 ) -> Result<add_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -189,12 +177,10 @@ pub(crate) async fn add_backup_keys_for_room_route(
 	}

 	Ok(add_backup_keys_for_room::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -209,7 +195,7 @@ pub(crate) async fn add_backup_keys_for_room_route(
 ///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-pub(crate) async fn add_backup_keys_for_session_route(
+pub async fn add_backup_keys_for_session_route(
 	body: Ruma<add_backup_keys_for_session::v3::Request>,
 ) -> Result<add_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -231,12 +217,10 @@ pub(crate) async fn add_backup_keys_for_session_route(
 		.add_key(sender_user, &body.version, &body.room_id, &body.session_id, &body.session_data)?;

 	Ok(add_backup_keys_for_session::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -246,9 +230,7 @@ pub(crate) async fn add_backup_keys_for_session_route(
 /// # `GET /_matrix/client/r0/room_keys/keys`
 ///
 /// Retrieves all keys from the backup.
-pub(crate) async fn get_backup_keys_route(
-	body: Ruma<get_backup_keys::v3::Request>,
-) -> Result<get_backup_keys::v3::Response> {
+pub async fn get_backup_keys_route(body: Ruma<get_backup_keys::v3::Request>) -> Result<get_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let rooms = services().key_backups.get_all(sender_user, &body.version)?;
@@ -261,7 +243,7 @@ pub(crate) async fn get_backup_keys_route(
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}`
 ///
 /// Retrieves all keys from the backup for a given room.
-pub(crate) async fn get_backup_keys_for_room_route(
+pub async fn get_backup_keys_for_room_route(
 	body: Ruma<get_backup_keys_for_room::v3::Request>,
 ) -> Result<get_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -278,7 +260,7 @@ pub(crate) async fn get_backup_keys_for_room_route(
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
 ///
 /// Retrieves a key from the backup.
-pub(crate) async fn get_backup_keys_for_session_route(
+pub async fn get_backup_keys_for_session_route(
 	body: Ruma<get_backup_keys_for_session::v3::Request>,
 ) -> Result<get_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -286,7 +268,10 @@ pub(crate) async fn get_backup_keys_for_session_route(
 	let key_data = services()
 		.key_backups
 		.get_session(sender_user, &body.version, &body.room_id, &body.session_id)?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Backup key not found for this user's session."))?;
+		.ok_or(Error::BadRequest(
+			ErrorKind::NotFound,
+			"Backup key not found for this user's session.",
+		))?;

 	Ok(get_backup_keys_for_session::v3::Response {
 		key_data,
@@ -296,7 +281,7 @@ pub(crate) async fn get_backup_keys_for_session_route(
 /// # `DELETE /_matrix/client/r0/room_keys/keys`
 ///
 /// Delete the keys from the backup.
-pub(crate) async fn delete_backup_keys_route(
+pub async fn delete_backup_keys_route(
 	body: Ruma<delete_backup_keys::v3::Request>,
 ) -> Result<delete_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -306,12 +291,10 @@ pub(crate) async fn delete_backup_keys_route(
 		.delete_all_keys(sender_user, &body.version)?;

 	Ok(delete_backup_keys::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -321,7 +304,7 @@ pub(crate) async fn delete_backup_keys_route(
 /// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}`
 ///
 /// Delete the keys from the backup for a given room.
-pub(crate) async fn delete_backup_keys_for_room_route(
+pub async fn delete_backup_keys_for_room_route(
 	body: Ruma<delete_backup_keys_for_room::v3::Request>,
 ) -> Result<delete_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -331,12 +314,10 @@ pub(crate) async fn delete_backup_keys_for_room_route(
 		.delete_room_keys(sender_user, &body.version, &body.room_id)?;

 	Ok(delete_backup_keys_for_room::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -346,7 +327,7 @@ pub(crate) async fn delete_backup_keys_for_room_route(
 /// # `DELETE /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
 ///
 /// Delete a key from the backup.
-pub(crate) async fn delete_backup_keys_for_session_route(
+pub async fn delete_backup_keys_for_session_route(
 	body: Ruma<delete_backup_keys_for_session::v3::Request>,
 ) -> Result<delete_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -356,12 +337,10 @@ pub(crate) async fn delete_backup_keys_for_session_route(
 		.delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)?;

 	Ok(delete_backup_keys_for_session::v3::Response {
-		count: (UInt::try_from(
-			services()
-				.key_backups
-				.count_keys(sender_user, &body.version)?,
-		)
-		.expect("user backup keys count should not be that high")),
+		count: (services()
+			.key_backups
+			.count_keys(sender_user, &body.version)? as u32)
+			.into(),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -1,7 +1,8 @@
 use std::collections::BTreeMap;

 use ruma::api::client::discovery::get_capabilities::{
-	self, Capabilities, RoomVersionStability, RoomVersionsCapability, ThirdPartyIdChangesCapability,
+	self, Capabilities, ChangePasswordCapability, RoomVersionStability, RoomVersionsCapability, SetAvatarUrlCapability,
+	SetDisplayNameCapability, ThirdPartyIdChangesCapability,
 };

 use crate::{services, Result, Ruma};
@@ -10,7 +11,7 @@ use crate::{services, Result, Ruma};
 ///
 /// Get information on the supported feature set and other relevent capabilities
 /// of this server.
-pub(crate) async fn get_capabilities_route(
+pub async fn get_capabilities_route(
 	_body: Ruma<get_capabilities::v3::Request>,
 ) -> Result<get_capabilities::v3::Response> {
 	let mut available = BTreeMap::new();
@@ -21,12 +22,24 @@ pub(crate) async fn get_capabilities_route(
 		available.insert(room_version.clone(), RoomVersionStability::Stable);
 	}

-	let mut capabilities = Capabilities::default();
+	let mut capabilities = Capabilities::new();
 	capabilities.room_versions = RoomVersionsCapability {
 		default: services().globals.default_room_version(),
 		available,
 	};

+	capabilities.change_password = ChangePasswordCapability {
+		enabled: true,
+	};
+
+	capabilities.set_avatar_url = SetAvatarUrlCapability {
+		enabled: true,
+	};
+
+	capabilities.set_displayname = SetDisplayNameCapability {
+		enabled: true,
+	};
+
 	// conduit does not implement 3PID stuff
 	capabilities.thirdparty_id_changes = ThirdPartyIdChangesCapability {
 		enabled: false,
@@ -5,7 +5,6 @@ use ruma::{
 	},
 	events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
 	serde::Raw,
-	OwnedUserId, RoomId,
 };
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};
@@ -15,10 +14,25 @@ use crate::{services, Error, Result, Ruma};
 /// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Sets some account data for the sender user.
-pub(crate) async fn set_global_account_data_route(
+pub async fn set_global_account_data_route(
 	body: Ruma<set_global_account_data::v3::Request>,
 ) -> Result<set_global_account_data::v3::Response> {
-	set_account_data(None, &body.sender_user, &body.event_type.to_string(), body.data.json())?;
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	let data: serde_json::Value = serde_json::from_str(body.data.json().get())
+		.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
+
+	let event_type = body.event_type.to_string();
+
+	services().account_data.update(
+		None,
+		sender_user,
+		event_type.clone().into(),
+		&json!({
+			"type": event_type,
+			"content": data,
+		}),
+	)?;

 	Ok(set_global_account_data::v3::Response {})
 }
@@ -26,14 +40,24 @@ pub(crate) async fn set_global_account_data_route(
 /// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
 ///
 /// Sets some room account data for the sender user.
-pub(crate) async fn set_room_account_data_route(
+pub async fn set_room_account_data_route(
 	body: Ruma<set_room_account_data::v3::Request>,
 ) -> Result<set_room_account_data::v3::Response> {
-	set_account_data(
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	let data: serde_json::Value = serde_json::from_str(body.data.json().get())
+		.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
+
+	let event_type = body.event_type.to_string();
+
+	services().account_data.update(
 		Some(&body.room_id),
-		&body.sender_user,
-		&body.event_type.to_string(),
-		body.data.json(),
+		sender_user,
+		event_type.clone().into(),
+		&json!({
+			"type": event_type,
+			"content": data,
+		}),
 	)?;

 	Ok(set_room_account_data::v3::Response {})
@@ -42,7 +66,7 @@ pub(crate) async fn set_room_account_data_route(
 /// # `GET /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Gets some account data for the sender user.
-pub(crate) async fn get_global_account_data_route(
+pub async fn get_global_account_data_route(
 	body: Ruma<get_global_account_data::v3::Request>,
 ) -> Result<get_global_account_data::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -50,7 +74,7 @@ pub(crate) async fn get_global_account_data_route(
 	let event: Box<RawJsonValue> = services()
 		.account_data
 		.get(None, sender_user, body.event_type.to_string().into())?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;

 	let account_data = serde_json::from_str::<ExtractGlobalEventContent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -64,7 +88,7 @@ pub(crate) async fn get_global_account_data_route(
 /// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
 ///
 /// Gets some room account data for the sender user.
-pub(crate) async fn get_room_account_data_route(
+pub async fn get_room_account_data_route(
 	body: Ruma<get_room_account_data::v3::Request>,
 ) -> Result<get_room_account_data::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -72,7 +96,7 @@ pub(crate) async fn get_room_account_data_route(
 	let event: Box<RawJsonValue> = services()
 		.account_data
 		.get(Some(&body.room_id), sender_user, body.event_type.clone())?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;

 	let account_data = serde_json::from_str::<ExtractRoomEventContent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -83,27 +107,6 @@ pub(crate) async fn get_room_account_data_route(
 	})
 }

-fn set_account_data(
-	room_id: Option<&RoomId>, sender_user: &Option<OwnedUserId>, event_type: &str, data: &RawJsonValue,
-) -> Result<()> {
-	let sender_user = sender_user.as_ref().expect("user is authenticated");
-
-	let data: serde_json::Value =
-		serde_json::from_str(data.get()).map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
-
-	services().account_data.update(
-		room_id,
-		sender_user,
-		event_type.into(),
-		&json!({
-			"type": event_type,
-			"content": data,
-		}),
-	)?;
-
-	Ok(())
-}
-
 #[derive(Deserialize)]
 struct ExtractRoomEventContent {
 	content: Raw<AnyRoomAccountDataEventContent>,
@@ -15,7 +15,7 @@ use crate::{services, Error, Result, Ruma};
 /// - Only works if the user is joined (TODO: always allow, but only show events
 ///   if the user was
 /// joined, depending on history_visibility)
-pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> Result<get_context::v3::Response> {
+pub async fn get_context_route(body: Ruma<get_context::v3::Request>) -> Result<get_context::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -63,8 +63,8 @@ pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> R
 		lazy_loaded.insert(base_event.sender.as_str().to_owned());
 	}

-	// Use limit or else 10, with maximum 100
-	let limit = usize::try_from(body.limit).unwrap_or(10).min(100);
+	// Use limit with maximum 100
+	let limit = u64::from(body.limit).min(100) as usize;

 	let base_event = base_event.to_room_event();

@@ -188,12 +188,14 @@ pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> R
 		}
 	}

-	Ok(get_context::v3::Response {
+	let resp = get_context::v3::Response {
 		start: Some(start_token),
 		end: Some(end_token),
 		events_before,
 		event: Some(base_event),
 		events_after,
 		state,
-	})
+	};
+
+	Ok(resp)
 }
@@ -10,7 +10,7 @@ use crate::{services, utils, Error, Result, Ruma};
 /// # `GET /_matrix/client/r0/devices`
 ///
 /// Get metadata on all devices of the sender user.
-pub(crate) async fn get_devices_route(body: Ruma<get_devices::v3::Request>) -> Result<get_devices::v3::Response> {
+pub async fn get_devices_route(body: Ruma<get_devices::v3::Request>) -> Result<get_devices::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let devices: Vec<device::Device> = services()
@@ -27,7 +27,7 @@ pub(crate) async fn get_devices_route(body: Ruma<get_devices::v3::Request>) -> R
 /// # `GET /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Get metadata on a single device of the sender user.
-pub(crate) async fn get_device_route(body: Ruma<get_device::v3::Request>) -> Result<get_device::v3::Response> {
+pub async fn get_device_route(body: Ruma<get_device::v3::Request>) -> Result<get_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let device = services()
@@ -43,7 +43,7 @@ pub(crate) async fn get_device_route(body: Ruma<get_device::v3::Request>) -> Res
 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Updates the metadata on a given device of the sender user.
-pub(crate) async fn update_device_route(body: Ruma<update_device::v3::Request>) -> Result<update_device::v3::Response> {
+pub async fn update_device_route(body: Ruma<update_device::v3::Request>) -> Result<update_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let mut device = services()
@@ -70,7 +70,7 @@ pub(crate) async fn update_device_route(body: Ruma<update_device::v3::Request>)
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub(crate) async fn delete_device_route(body: Ruma<delete_device::v3::Request>) -> Result<delete_device::v3::Response> {
+pub async fn delete_device_route(body: Ruma<delete_device::v3::Request>) -> Result<delete_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -122,9 +122,7 @@ pub(crate) async fn delete_device_route(body: Ruma<delete_device::v3::Request>)
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub(crate) async fn delete_devices_route(
-	body: Ruma<delete_devices::v3::Request>,
-) -> Result<delete_devices::v3::Response> {
+pub async fn delete_devices_route(body: Ruma<delete_devices::v3::Request>) -> Result<delete_devices::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -20,18 +20,18 @@ use ruma::{
 		},
 		StateEventType,
 	},
-	uint, ServerName, UInt,
+	ServerName, UInt,
 };
 use tracing::{error, info, warn};

-use crate::{services, utils::server_name::server_is_ours, Error, Result, Ruma};
+use crate::{services, Error, Result, Ruma};

 /// # `POST /_matrix/client/v3/publicRooms`
 ///
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-pub(crate) async fn get_public_rooms_filtered_route(
+pub async fn get_public_rooms_filtered_route(
 	body: Ruma<get_public_rooms_filtered::v3::Request>,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
 	if let Some(server) = &body.server {
@@ -68,7 +68,7 @@ pub(crate) async fn get_public_rooms_filtered_route(
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-pub(crate) async fn get_public_rooms_route(
+pub async fn get_public_rooms_route(
 	body: Ruma<get_public_rooms::v3::Request>,
 ) -> Result<get_public_rooms::v3::Response> {
 	if let Some(server) = &body.server {
@@ -110,7 +110,7 @@ pub(crate) async fn get_public_rooms_route(
 /// Sets the visibility of a given room in the room directory.
 ///
 /// - TODO: Access control checks
-pub(crate) async fn set_room_visibility_route(
+pub async fn set_room_visibility_route(
 	body: Ruma<set_room_visibility::v3::Request>,
 ) -> Result<set_room_visibility::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -153,7 +153,7 @@ pub(crate) async fn set_room_visibility_route(
 /// # `GET /_matrix/client/r0/directory/list/room/{roomId}`
 ///
 /// Gets the visibility of a given room in the room directory.
-pub(crate) async fn get_room_visibility_route(
+pub async fn get_room_visibility_route(
 	body: Ruma<get_room_visibility::v3::Request>,
 ) -> Result<get_room_visibility::v3::Response> {
 	if !services().rooms.metadata.exists(&body.room_id)? {
@@ -173,7 +173,7 @@ pub(crate) async fn get_room_visibility_route(
 pub(crate) async fn get_public_rooms_filtered_helper(
 	server: Option<&ServerName>, limit: Option<UInt>, since: Option<&str>, filter: &Filter, _network: &RoomNetwork,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
-	if let Some(other_server) = server.filter(|server_name| !server_is_ours(server_name)) {
+	if let Some(other_server) = server.filter(|server| *server != services().globals.server_name().as_str()) {
 		let response = services()
 			.sending
 			.send_federation_request(
@@ -198,9 +198,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		});
 	}

-	// Use limit or else 10, with maximum 100
 	let limit = limit.map_or(10, u64::from);
-	let mut num_since: u64 = 0;
+	let mut num_since = 0_u64;

 	if let Some(s) = &since {
 		let mut characters = s.chars();
@@ -364,16 +363,12 @@ pub(crate) async fn get_public_rooms_filtered_helper(

 	all_rooms.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members));

-	let total_room_count_estimate = UInt::try_from(all_rooms.len()).unwrap_or_else(|_| uint!(0));
+	let total_room_count_estimate = (all_rooms.len() as u32).into();

 	let chunk: Vec<_> = all_rooms
 		.into_iter()
-		.skip(
-			num_since
-				.try_into()
-				.expect("num_since should not be this high"),
-		)
-		.take(limit.try_into().expect("limit should not be this high"))
+		.skip(num_since as usize)
+		.take(limit as usize)
 		.collect();

 	let prev_batch = if num_since == 0 {
@@ -382,15 +377,10 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		Some(format!("p{num_since}"))
 	};

-	let next_batch = if chunk.len() < limit.try_into().unwrap() {
+	let next_batch = if chunk.len() < limit as usize {
 		None
 	} else {
-		Some(format!(
-			"n{}",
-			num_since
-				.checked_add(limit)
-				.expect("num_since and limit should not be that large")
-		))
+		Some(format!("n{}", num_since + limit))
 	};

 	Ok(get_public_rooms_filtered::v3::Response {
@@ -10,7 +10,7 @@ use crate::{services, Error, Result, Ruma};
 /// Loads a filter that was previously created.
 ///
 /// - A user can only access their own filters
-pub(crate) async fn get_filter_route(body: Ruma<get_filter::v3::Request>) -> Result<get_filter::v3::Response> {
+pub async fn get_filter_route(body: Ruma<get_filter::v3::Request>) -> Result<get_filter::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let Some(filter) = services().users.get_filter(sender_user, &body.filter_id)? else {
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Filter not found."));
@@ -22,7 +22,7 @@ pub(crate) async fn get_filter_route(body: Ruma<get_filter::v3::Request>) -> Res
 /// # `PUT /_matrix/client/r0/user/{userId}/filter`
 ///
 /// Creates a new filter to be used by other endpoints.
-pub(crate) async fn create_filter_route(body: Ruma<create_filter::v3::Request>) -> Result<create_filter::v3::Response> {
+pub async fn create_filter_route(body: Ruma<create_filter::v3::Request>) -> Result<create_filter::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	Ok(create_filter::v3::Response::new(
 		services().users.create_filter(sender_user, &body.filter)?,
@@ -1,5 +1,4 @@
 use std::{
-	cmp,
 	collections::{hash_map, BTreeMap, HashMap, HashSet},
 	time::{Duration, Instant},
 };
@@ -18,14 +17,10 @@ use ruma::{
 	DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde_json::json;
-use tracing::debug;
+use tracing::{debug, error};

 use super::SESSION_ID_LENGTH;
-use crate::{
-	services,
-	utils::{self, user_id::user_is_local},
-	Error, Result, Ruma,
-};
+use crate::{services, utils, Error, Result, Ruma};

 /// # `POST /_matrix/client/r0/keys/upload`
 ///
@@ -34,7 +29,7 @@ use crate::{
 /// - Adds one time keys
 /// - If there are no device keys yet: Adds device keys (TODO: merge with
 ///   existing keys?)
-pub(crate) async fn upload_keys_route(body: Ruma<upload_keys::v3::Request>) -> Result<upload_keys::v3::Response> {
+pub async fn upload_keys_route(body: Ruma<upload_keys::v3::Request>) -> Result<upload_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -73,23 +68,27 @@ pub(crate) async fn upload_keys_route(body: Ruma<upload_keys::v3::Request>) -> R
 /// - Gets master keys, self-signing keys, user signing keys and device keys.
 /// - The master and self-signing keys contain signatures that the user is
 ///   allowed to see
-pub(crate) async fn get_keys_route(body: Ruma<get_keys::v3::Request>) -> Result<get_keys::v3::Response> {
+pub async fn get_keys_route(body: Ruma<get_keys::v3::Request>) -> Result<get_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-	get_keys_helper(
+	let response = get_keys_helper(
 		Some(sender_user),
 		&body.device_keys,
 		|u| u == sender_user,
 		true, // Always allow local users to see device names of other local users
 	)
-	.await
+	.await?;
+
+	Ok(response)
 }

 /// # `POST /_matrix/client/r0/keys/claim`
 ///
 /// Claims one-time keys
-pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v3::Request>) -> Result<claim_keys::v3::Response> {
-	claim_keys_helper(&body.one_time_keys).await
+pub async fn claim_keys_route(body: Ruma<claim_keys::v3::Request>) -> Result<claim_keys::v3::Response> {
+	let response = claim_keys_helper(&body.one_time_keys).await?;
+
+	Ok(response)
 }

 /// # `POST /_matrix/client/r0/keys/device_signing/upload`
@@ -97,7 +96,7 @@ pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v3::Request>) -> Res
 /// Uploads end-to-end key information for the sender user.
 ///
 /// - Requires UIAA to verify password
-pub(crate) async fn upload_signing_keys_route(
+pub async fn upload_signing_keys_route(
 	body: Ruma<upload_signing_keys::v3::Request>,
 ) -> Result<upload_signing_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -148,7 +147,7 @@ pub(crate) async fn upload_signing_keys_route(
 /// # `POST /_matrix/client/r0/keys/signatures/upload`
 ///
 /// Uploads end-to-end key signatures from the sender user.
-pub(crate) async fn upload_signatures_route(
+pub async fn upload_signatures_route(
 	body: Ruma<upload_signatures::v3::Request>,
 ) -> Result<upload_signatures::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -194,9 +193,7 @@ pub(crate) async fn upload_signatures_route(
 /// previous sync token.
 ///
 /// - TODO: left users
-pub(crate) async fn get_key_changes_route(
-	body: Ruma<get_key_changes::v3::Request>,
-) -> Result<get_key_changes::v3::Response> {
+pub async fn get_key_changes_route(body: Ruma<get_key_changes::v3::Request>) -> Result<get_key_changes::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let mut device_list_updates = HashSet::new();
@@ -261,7 +258,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 	for (user_id, device_ids) in device_keys_input {
 		let user_id: &UserId = user_id;

-		if !user_is_local(user_id) {
+		if user_id.server_name() != services().globals.server_name() {
 			get_over_federation
 				.entry(user_id.server_name())
 				.or_insert_with(Vec::new)
@@ -339,9 +336,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			hash_map::Entry::Vacant(e) => {
 				e.insert((Instant::now(), 1));
 			},
-			hash_map::Entry::Occupied(mut e) => {
-				*e.get_mut() = (Instant::now(), e.get().1.saturating_add(1));
-			},
+			hash_map::Entry::Occupied(mut e) => *e.get_mut() = (Instant::now(), e.get().1 + 1),
 		}
 	};

@@ -356,8 +351,10 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 				.get(server)
 			{
 				// Exponential backoff
-				const MAX_DURATION: Duration = Duration::from_secs(60 * 60 * 24);
-				let min_elapsed_duration = cmp::min(MAX_DURATION, Duration::from_secs(5 * 60) * (*tries) * (*tries));
+				let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
+				if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
+					min_elapsed_duration = Duration::from_secs(60 * 60 * 24);
+				}

 				if time.elapsed() < min_elapsed_duration {
 					debug!("Backing off query from {:?}", server);
@@ -369,16 +366,23 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			for (user_id, keys) in vec {
 				device_keys_input_fed.insert(user_id.to_owned(), keys.clone());
 			}
-
-			let request = federation::keys::get_keys::v1::Request {
-				device_keys: device_keys_input_fed,
-			};
-			let response = services()
-				.sending
-				.send_federation_request(server, request)
-				.await;
-
-			(server, Ok(response))
+			(
+				server,
+				tokio::time::timeout(
+					Duration::from_secs(90),
+					services().sending.send_federation_request(
+						server,
+						federation::keys::get_keys::v1::Request {
+							device_keys: device_keys_input_fed,
+						},
+					),
+				)
+				.await
+				.map_err(|e| {
+					error!("get_keys_helper query took too long: {e}");
+					Error::BadServerResponse("get_keys_helper query took too long")
+				}),
+			)
 		})
 		.collect();

@@ -402,7 +406,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 					false, /* Dont notify. A notification would trigger another key request resulting in an
 					       * endless loop */
 				)?;
-				master_keys.insert(user.clone(), raw);
+				master_keys.insert(user, raw);
 			}

 			self_signing_keys.extend(response.self_signing_keys);
@@ -455,7 +459,7 @@ pub(crate) async fn claim_keys_helper(
 	let mut get_over_federation = BTreeMap::new();

 	for (user_id, map) in one_time_keys_input {
-		if !user_is_local(user_id) {
+		if user_id.server_name() != services().globals.server_name() {
 			get_over_federation
 				.entry(user_id.server_name())
 				.or_insert_with(Vec::new)
@@ -10,35 +10,21 @@ use ruma::api::client::{
 		get_media_preview,
 	},
 };
-use tracing::{debug, error, warn};
+use tracing::{debug, error, info, warn};
 use webpage::HTML;

 use crate::{
-	debug_warn,
 	service::media::{FileMeta, UrlPreviewData},
-	services,
-	utils::{
-		self,
-		content_disposition::{
-			content_disposition_type, make_content_disposition, make_content_type, sanitise_filename,
-		},
-		server_name::server_is_ours,
-	},
-	Error, Result, Ruma, RumaResponse,
+	services, utils, Error, Result, Ruma, RumaResponse,
 };

 /// generated MXC ID (`media-id`) length
 const MXC_LENGTH: usize = 32;

-/// Cache control for immutable objects
-const CACHE_CONTROL_IMMUTABLE: &str = "public,max-age=31536000,immutable";
-
-const CORP_CROSS_ORIGIN: &str = "cross-origin";
-
 /// # `GET /_matrix/media/v3/config`
 ///
 /// Returns max upload size.
-pub(crate) async fn get_media_config_route(
+pub async fn get_media_config_route(
 	_body: Ruma<get_media_config::v3::Request>,
 ) -> Result<get_media_config::v3::Response> {
 	Ok(get_media_config::v3::Response {
@@ -53,16 +39,19 @@ pub(crate) async fn get_media_config_route(
 /// See <https://spec.matrix.org/legacy/legacy/#id27>
 ///
 /// Returns max upload size.
-pub(crate) async fn get_media_config_v1_route(
-	body: Ruma<get_media_config::v3::Request>,
+pub async fn get_media_config_v1_route(
+	_body: Ruma<get_media_config::v3::Request>,
 ) -> Result<RumaResponse<get_media_config::v3::Response>> {
-	get_media_config_route(body).await.map(RumaResponse)
+	Ok(get_media_config::v3::Response {
+		upload_size: services().globals.max_request_size().into(),
+	}
+	.into())
 }

 /// # `GET /_matrix/media/v3/preview_url`
 ///
 /// Returns URL preview.
-pub(crate) async fn get_media_preview_route(
+pub async fn get_media_preview_route(
 	body: Ruma<get_media_preview::v3::Request>,
 ) -> Result<get_media_preview::v3::Response> {
 	let url = &body.url;
@@ -106,10 +95,41 @@ pub(crate) async fn get_media_preview_route(
 /// See <https://spec.matrix.org/legacy/legacy/#id27>
 ///
 /// Returns URL preview.
-pub(crate) async fn get_media_preview_v1_route(
+pub async fn get_media_preview_v1_route(
 	body: Ruma<get_media_preview::v3::Request>,
 ) -> Result<RumaResponse<get_media_preview::v3::Response>> {
-	get_media_preview_route(body).await.map(RumaResponse)
+	let url = &body.url;
+	if !url_preview_allowed(url) {
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "URL is not allowed to be previewed"));
+	}
+
+	match get_url_preview(url).await {
+		Ok(preview) => {
+			let res = serde_json::value::to_raw_value(&preview).map_err(|e| {
+				error!("Failed to convert UrlPreviewData into a serde json value: {}", e);
+				Error::BadRequest(
+					ErrorKind::LimitExceeded {
+						retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
+					},
+					"Failed to generate a URL preview, try again later.",
+				)
+			})?;
+
+			Ok(get_media_preview::v3::Response::from_raw_value(res).into())
+		},
+		Err(e) => {
+			warn!("Failed to generate a URL preview: {e}");
+
+			// there doesn't seem to be an agreed-upon error code in the spec.
+			// the only response codes in the preview_url spec page are 200 and 429.
+			Err(Error::BadRequest(
+				ErrorKind::LimitExceeded {
+					retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
+				},
+				"Failed to generate a URL preview, try again later.",
+			))
+		},
+	}
 }

 /// # `POST /_matrix/media/v3/upload`
@@ -118,9 +138,7 @@ pub(crate) async fn get_media_preview_v1_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
-pub(crate) async fn create_content_route(
-	body: Ruma<create_content::v3::Request>,
-) -> Result<create_content::v3::Response> {
+pub async fn create_content_route(body: Ruma<create_content::v3::Request>) -> Result<create_content::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let mxc = format!(
@@ -129,8 +147,6 @@ pub(crate) async fn create_content_route(
 		utils::random_string(MXC_LENGTH)
 	);

-	let content_type = Some(make_content_type(&body.file, &body.content_type).to_owned());
-
 	services()
 		.media
 		.create(
@@ -138,21 +154,17 @@ pub(crate) async fn create_content_route(
 			mxc.clone(),
 			body.filename
 				.as_ref()
-				.map(|filename| {
-					format!(
-						"{}; filename={}",
-						content_disposition_type(&body.file, &content_type),
-						sanitise_filename(filename.to_owned())
-					)
-				})
+				.map(|filename| "inline; filename=".to_owned() + filename)
 				.as_deref(),
-			content_type.as_deref(),
+			body.content_type.as_deref(),
 			&body.file,
 		)
 		.await?;

+	let content_uri = mxc.into();
+
 	Ok(create_content::v3::Response {
-		content_uri: mxc.into(),
+		content_uri,
 		blurhash: None,
 	})
 }
@@ -167,314 +179,55 @@ pub(crate) async fn create_content_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
-pub(crate) async fn create_content_v1_route(
+pub async fn create_content_v1_route(
 	body: Ruma<create_content::v3::Request>,
 ) -> Result<RumaResponse<create_content::v3::Response>> {
-	create_content_route(body).await.map(RumaResponse)
-}
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}`
-///
-/// Load media from our server or over federation.
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_route(body: Ruma<get_content::v3::Request>) -> Result<get_content::v3::Response> {
-	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+	let mxc = format!(
+		"mxc://{}/{}",
+		services().globals.server_name(),
+		utils::random_string(MXC_LENGTH)
+	);

-	if let Some(FileMeta {
-		content_type,
-		file,
-		content_disposition,
-	}) = services().media.get(mxc.clone()).await?
-	{
-		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
-
-		Ok(get_content::v3::Response {
-			file,
-			content_type,
-			content_disposition,
-			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-		})
-	} else if !server_is_ours(&body.server_name) && body.allow_remote {
-		let response = get_remote_content(
-			&mxc,
-			&body.server_name,
-			body.media_id.clone(),
-			body.allow_redirect,
-			body.timeout_ms,
-		)
-		.await
-		.map_err(|e| {
-			debug_warn!("Fetching media `{}` failed: {:?}", mxc, e);
-			Error::BadRequest(ErrorKind::NotFound, "Remote media error.")
-		})?;
-
-		let content_disposition = Some(make_content_disposition(
-			&response.file,
-			&response.content_type,
-			response.content_disposition,
-		));
-		let content_type = Some(make_content_type(&response.file, &response.content_type).to_owned());
-
-		Ok(get_content::v3::Response {
-			file: response.file,
-			content_type,
-			content_disposition,
-			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-			cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
-		})
-	} else {
-		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
-	}
-}
-
-/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}`
-///
-/// Load media from our server or over federation.
-///
-/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
-/// clients may call. conduwuit adds these for compatibility purposes.
-/// See <https://spec.matrix.org/legacy/legacy/#id27>
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_v1_route(
-	body: Ruma<get_content::v3::Request>,
-) -> Result<RumaResponse<get_content::v3::Response>> {
-	get_content_route(body).await.map(RumaResponse)
-}
-
-/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}/{fileName}`
-///
-/// Load media from our server or over federation, permitting desired filename.
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_as_filename_route(
-	body: Ruma<get_content_as_filename::v3::Request>,
-) -> Result<get_content_as_filename::v3::Response> {
-	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
-
-	if let Some(FileMeta {
-		content_type,
-		file,
-		content_disposition,
-	}) = services().media.get(mxc.clone()).await?
-	{
-		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
-
-		Ok(get_content_as_filename::v3::Response {
-			file,
-			content_type,
-			content_disposition,
-			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-		})
-	} else if !server_is_ours(&body.server_name) && body.allow_remote {
-		match get_remote_content(
-			&mxc,
-			&body.server_name,
-			body.media_id.clone(),
-			body.allow_redirect,
-			body.timeout_ms,
-		)
-		.await
-		{
-			Ok(remote_content_response) => {
-				let content_disposition = Some(make_content_disposition(
-					&remote_content_response.file,
-					&remote_content_response.content_type,
-					remote_content_response.content_disposition,
-				));
-				let content_type = Some(
-					make_content_type(&remote_content_response.file, &remote_content_response.content_type).to_owned(),
-				);
-
-				Ok(get_content_as_filename::v3::Response {
-					content_disposition,
-					content_type,
-					file: remote_content_response.file,
-					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-					cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-				})
-			},
-			Err(e) => {
-				debug_warn!("Fetching media `{}` failed: {:?}", mxc, e);
-				Err(Error::BadRequest(ErrorKind::NotFound, "Remote media error."))
-			},
-		}
-	} else {
-		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
-	}
-}
-
-/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}/{fileName}`
-///
-/// Load media from our server or over federation, permitting desired filename.
-///
-/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
-/// clients may call. conduwuit adds these for compatibility purposes.
-/// See <https://spec.matrix.org/legacy/legacy/#id27>
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_as_filename_v1_route(
-	body: Ruma<get_content_as_filename::v3::Request>,
-) -> Result<RumaResponse<get_content_as_filename::v3::Response>> {
-	get_content_as_filename_route(body).await.map(RumaResponse)
-}
-
-/// # `GET /_matrix/media/v3/thumbnail/{serverName}/{mediaId}`
-///
-/// Load media thumbnail from our server or over federation.
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_thumbnail_route(
-	body: Ruma<get_content_thumbnail::v3::Request>,
-) -> Result<get_content_thumbnail::v3::Response> {
-	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
-
-	if let Some(FileMeta {
-		content_type,
-		file,
-		content_disposition,
-	}) = services()
+	services()
 		.media
-		.get_thumbnail(
+		.create(
+			Some(sender_user.clone()),
 			mxc.clone(),
-			body.width
-				.try_into()
-				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
-			body.height
-				.try_into()
-				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
+			body.filename
+				.as_ref()
+				.map(|filename| "inline; filename=".to_owned() + filename)
+				.as_deref(),
+			body.content_type.as_deref(),
+			&body.file,
 		)
-		.await?
-	{
-		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
+		.await?;

-		Ok(get_content_thumbnail::v3::Response {
-			file,
-			content_type,
-			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-			content_disposition,
-		})
-	} else if !server_is_ours(&body.server_name) && body.allow_remote {
-		if services()
-			.globals
-			.prevent_media_downloads_from()
-			.contains(&body.server_name)
-		{
-			// we'll lie to the client and say the blocked server's media was not found and
-			// log. the client has no way of telling anyways so this is a security bonus.
-			debug_warn!("Received request for media `{}` on blocklisted server", mxc);
-			return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
-		}
+	let content_uri = mxc.into();

-		match services()
-			.sending
-			.send_federation_request(
-				&body.server_name,
-				get_content_thumbnail::v3::Request {
-					allow_remote: body.allow_remote,
-					height: body.height,
-					width: body.width,
-					method: body.method.clone(),
-					server_name: body.server_name.clone(),
-					media_id: body.media_id.clone(),
-					timeout_ms: body.timeout_ms,
-					allow_redirect: body.allow_redirect,
-				},
-			)
-			.await
-		{
-			Ok(get_thumbnail_response) => {
-				services()
-					.media
-					.upload_thumbnail(
-						None,
-						mxc,
-						None,
-						get_thumbnail_response.content_type.as_deref(),
-						body.width.try_into().expect("all UInts are valid u32s"),
-						body.height.try_into().expect("all UInts are valid u32s"),
-						&get_thumbnail_response.file,
-					)
-					.await?;
-
-				let content_disposition = Some(make_content_disposition(
-					&get_thumbnail_response.file,
-					&get_thumbnail_response.content_type,
-					get_thumbnail_response.content_disposition,
-				));
-				let content_type = Some(
-					make_content_type(&get_thumbnail_response.file, &get_thumbnail_response.content_type).to_owned(),
-				);
-
-				Ok(get_content_thumbnail::v3::Response {
-					file: get_thumbnail_response.file,
-					content_type,
-					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-					cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
-					content_disposition,
-				})
-			},
-			Err(e) => {
-				debug_warn!("Fetching media `{}` failed: {:?}", mxc, e);
-				Err(Error::BadRequest(ErrorKind::NotFound, "Remote media error."))
-			},
-		}
-	} else {
-		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	Ok(create_content::v3::Response {
+		content_uri,
+		blurhash: None,
 	}
+	.into())
 }

-/// # `GET /_matrix/media/v1/thumbnail/{serverName}/{mediaId}`
-///
-/// Load media thumbnail from our server or over federation.
-///
-/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
-/// clients may call. conduwuit adds these for compatibility purposes.
-/// See <https://spec.matrix.org/legacy/legacy/#id27>
-///
-/// - Only allows federation if `allow_remote` is true
-/// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-///   seconds
-pub(crate) async fn get_content_thumbnail_v1_route(
-	body: Ruma<get_content_thumbnail::v3::Request>,
-) -> Result<RumaResponse<get_content_thumbnail::v3::Response>> {
-	get_content_thumbnail_route(body).await.map(RumaResponse)
-}
-
-async fn get_remote_content(
+/// helper method to fetch remote media from other servers over federation
+pub async fn get_remote_content(
 	mxc: &str, server_name: &ruma::ServerName, media_id: String, allow_redirect: bool, timeout_ms: Duration,
 ) -> Result<get_content::v3::Response, Error> {
+	// we'll lie to the client and say the blocked server's media was not found and
+	// log. the client has no way of telling anyways so this is a security bonus.
 	if services()
 		.globals
 		.prevent_media_downloads_from()
 		.contains(&server_name.to_owned())
 	{
-		// we'll lie to the client and say the blocked server's media was not found and
-		// log. the client has no way of telling anyways so this is a security bonus.
-		debug_warn!("Received request for media `{mxc}` on blocklisted server");
+		info!(
+			"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
+			mxc
+		);
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
 	}

@@ -492,32 +245,384 @@ async fn get_remote_content(
 		)
 		.await?;

-	let content_disposition = Some(make_content_disposition(
-		&content_response.file,
-		&content_response.content_type,
-		content_response.content_disposition,
-	));
-
-	let content_type = Some(make_content_type(&content_response.file, &content_response.content_type).to_owned());
-
 	services()
 		.media
 		.create(
 			None,
 			mxc.to_owned(),
-			content_disposition.as_deref(),
-			content_type.as_deref(),
+			content_response.content_disposition.as_deref(),
+			content_response.content_type.as_deref(),
 			&content_response.file,
 		)
 		.await?;

-	Ok(get_content::v3::Response {
-		file: content_response.file,
-		content_type,
+	Ok(content_response)
+}
+
+/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}`
+///
+/// Load media from our server or over federation.
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_route(body: Ruma<get_content::v3::Request>) -> Result<get_content::v3::Response> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
 		content_disposition,
-		cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
-		cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
-	})
+		content_type,
+		file,
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content::v3::Response {
+			file,
+			content_type,
+			content_disposition,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		})
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+		Ok(remote_content_response)
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
+/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}`
+///
+/// Load media from our server or over federation.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_v1_route(
+	body: Ruma<get_content::v3::Request>,
+) -> Result<RumaResponse<get_content::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_disposition,
+		content_type,
+		file,
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content::v3::Response {
+			file,
+			content_type,
+			content_disposition,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+		Ok(remote_content_response.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
+/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}/{fileName}`
+///
+/// Load media from our server or over federation, permitting desired filename.
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_as_filename_route(
+	body: Ruma<get_content_as_filename::v3::Request>,
+) -> Result<get_content_as_filename::v3::Response> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content_as_filename::v3::Response {
+			file,
+			content_type,
+			content_disposition: Some(format!("inline; filename={}", body.filename)),
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		})
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+
+		Ok(get_content_as_filename::v3::Response {
+			content_disposition: Some(format!("inline: filename={}", body.filename)),
+			content_type: remote_content_response.content_type,
+			file: remote_content_response.file,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		})
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
+/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}/{fileName}`
+///
+/// Load media from our server or over federation, permitting desired filename.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_as_filename_v1_route(
+	body: Ruma<get_content_as_filename::v3::Request>,
+) -> Result<RumaResponse<get_content_as_filename::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content_as_filename::v3::Response {
+			file,
+			content_type,
+			content_disposition: Some(format!("inline; filename={}", body.filename)),
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+
+		Ok(get_content_as_filename::v3::Response {
+			content_disposition: Some(format!("inline: filename={}", body.filename)),
+			content_type: remote_content_response.content_type,
+			file: remote_content_response.file,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		}
+		.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
+/// # `GET /_matrix/media/v3/thumbnail/{serverName}/{mediaId}`
+///
+/// Load media thumbnail from our server or over federation.
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_thumbnail_route(
+	body: Ruma<get_content_thumbnail::v3::Request>,
+) -> Result<get_content_thumbnail::v3::Response> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services()
+		.media
+		.get_thumbnail(
+			mxc.clone(),
+			body.width
+				.try_into()
+				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
+			body.height
+				.try_into()
+				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
+		)
+		.await?
+	{
+		Ok(get_content_thumbnail::v3::Response {
+			file,
+			content_type,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		})
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		// we'll lie to the client and say the blocked server's media was not found and
+		// log. the client has no way of telling anyways so this is a security bonus.
+		if services()
+			.globals
+			.prevent_media_downloads_from()
+			.contains(&body.server_name.clone())
+		{
+			info!(
+				"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
+				mxc
+			);
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
+		}
+
+		let get_thumbnail_response = services()
+			.sending
+			.send_federation_request(
+				&body.server_name,
+				get_content_thumbnail::v3::Request {
+					allow_remote: body.allow_remote,
+					height: body.height,
+					width: body.width,
+					method: body.method.clone(),
+					server_name: body.server_name.clone(),
+					media_id: body.media_id.clone(),
+					timeout_ms: body.timeout_ms,
+					allow_redirect: body.allow_redirect,
+				},
+			)
+			.await?;
+
+		services()
+			.media
+			.upload_thumbnail(
+				None,
+				mxc,
+				None,
+				get_thumbnail_response.content_type.as_deref(),
+				body.width.try_into().expect("all UInts are valid u32s"),
+				body.height.try_into().expect("all UInts are valid u32s"),
+				&get_thumbnail_response.file,
+			)
+			.await?;
+
+		Ok(get_thumbnail_response)
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
+/// # `GET /_matrix/media/v1/thumbnail/{serverName}/{mediaId}`
+///
+/// Load media thumbnail from our server or over federation.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_thumbnail_v1_route(
+	body: Ruma<get_content_thumbnail::v3::Request>,
+) -> Result<RumaResponse<get_content_thumbnail::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services()
+		.media
+		.get_thumbnail(
+			mxc.clone(),
+			body.width
+				.try_into()
+				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
+			body.height
+				.try_into()
+				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
+		)
+		.await?
+	{
+		Ok(get_content_thumbnail::v3::Response {
+			file,
+			content_type,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cache_control: Some("public, max-age=31536000, immutable".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		// we'll lie to the client and say the blocked server's media was not found and
+		// log. the client has no way of telling anyways so this is a security bonus.
+		if services()
+			.globals
+			.prevent_media_downloads_from()
+			.contains(&body.server_name.clone())
+		{
+			info!(
+				"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
+				mxc
+			);
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
+		}
+
+		let get_thumbnail_response = services()
+			.sending
+			.send_federation_request(
+				&body.server_name,
+				get_content_thumbnail::v3::Request {
+					allow_remote: body.allow_remote,
+					height: body.height,
+					width: body.width,
+					method: body.method.clone(),
+					server_name: body.server_name.clone(),
+					media_id: body.media_id.clone(),
+					timeout_ms: body.timeout_ms,
+					allow_redirect: body.allow_redirect,
+				},
+			)
+			.await?;
+
+		services()
+			.media
+			.upload_thumbnail(
+				None,
+				mxc,
+				None,
+				get_thumbnail_response.content_type.as_deref(),
+				body.width.try_into().expect("all UInts are valid u32s"),
+				body.height.try_into().expect("all UInts are valid u32s"),
+				&get_thumbnail_response.file,
+			)
+			.await?;
+
+		Ok(get_thumbnail_response.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
 }

 async fn download_image(client: &reqwest::Client, url: &str) -> Result<UrlPreviewData> {
@@ -587,8 +692,20 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview

 async fn request_url_preview(url: &str) -> Result<UrlPreviewData> {
 	if let Ok(ip) = IPAddress::parse(url) {
-		if !services().globals.valid_cidr_range(&ip) {
-			return Err(Error::BadServerResponse("Requesting from this address is forbidden"));
+		let cidr_ranges_s = services().globals.ip_range_denylist().to_vec();
+		let mut cidr_ranges: Vec<IPAddress> = Vec::new();
+
+		for cidr in cidr_ranges_s {
+			cidr_ranges.push(IPAddress::parse(cidr).expect("we checked this at startup"));
+		}
+
+		for cidr in cidr_ranges {
+			if cidr.includes(&ip) {
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"Requesting from this address is forbidden",
+				));
+			}
 		}
 	}

@@ -597,8 +714,20 @@ async fn request_url_preview(url: &str) -> Result<UrlPreviewData> {

 	if let Some(remote_addr) = response.remote_addr() {
 		if let Ok(ip) = IPAddress::parse(remote_addr.ip().to_string()) {
-			if !services().globals.valid_cidr_range(&ip) {
-				return Err(Error::BadServerResponse("Requesting from this address is forbidden"));
+			let cidr_ranges_s = services().globals.ip_range_denylist().to_vec();
+			let mut cidr_ranges: Vec<IPAddress> = Vec::new();
+
+			for cidr in cidr_ranges_s {
+				cidr_ranges.push(IPAddress::parse(cidr).expect("we checked this at startup"));
+			}
+
+			for cidr in cidr_ranges {
+				if cidr.includes(&ip) {
+					return Err(Error::BadRequest(
+						ErrorKind::forbidden(),
+						"Requesting from this address is forbidden",
+					));
+				}
 			}
 		}
 	}
@@ -1,5 +1,4 @@
 use std::{
-	cmp,
 	collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
 	sync::Arc,
 	time::{Duration, Instant},
@@ -21,13 +20,12 @@ use ruma::{
 		room::{
 			join_rules::{AllowRule, JoinRule, RoomJoinRulesEventContent},
 			member::{MembershipState, RoomMemberEventContent},
-			message::RoomMessageEventContent,
 		},
 		StateEventType, TimelineEventType,
 	},
 	serde::Base64,
 	state_res, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, OwnedServerName,
-	OwnedUserId, RoomId, RoomVersionId, ServerName, UserId,
+	OwnedUserId, RoomId, RoomVersionId, UserId,
 };
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use tokio::sync::RwLock;
@@ -36,96 +34,9 @@ use tracing::{debug, error, info, trace, warn};
 use super::get_alias_helper;
 use crate::{
 	service::pdu::{gen_event_id_canonical_json, PduBuilder},
-	services,
-	utils::{self, server_name::server_is_ours, user_id::user_is_local},
-	Error, PduEvent, Result, Ruma,
+	services, utils, Error, PduEvent, Result, Ruma,
 };

-/// Checks if the room is banned in any way possible and the sender user is not
-/// an admin.
-///
-/// Performs automatic deactivation if `auto_deactivate_banned_room_attempts` is
-/// enabled
-#[tracing::instrument]
-async fn banned_room_check(user_id: &UserId, room_id: Option<&RoomId>, server_name: Option<&ServerName>) -> Result<()> {
-	if !services().users.is_admin(user_id)? {
-		if let Some(room_id) = room_id {
-			if services().rooms.metadata.is_banned(room_id)?
-				|| services()
-					.globals
-					.config
-					.forbidden_remote_server_names
-					.contains(&room_id.server_name().unwrap().to_owned())
-			{
-				warn!(
-					"User {user_id} who is not an admin attempted to send an invite for or attempted to join a banned \
-					 room or banned room server name: {room_id}."
-				);
-
-				if services()
-					.globals
-					.config
-					.auto_deactivate_banned_room_attempts
-				{
-					warn!("Automatically deactivating user {user_id} due to attempted banned room join");
-					services()
-						.admin
-						.send_message(RoomMessageEventContent::text_plain(format!(
-							"Automatically deactivating user {user_id} due to attempted banned room join"
-						)))
-						.await;
-
-					// ignore errors
-					leave_all_rooms(user_id).await;
-					_ = services().users.deactivate_account(user_id);
-				}
-
-				return Err(Error::BadRequest(
-					ErrorKind::forbidden(),
-					"This room is banned on this homeserver.",
-				));
-			}
-		} else if let Some(server_name) = server_name {
-			if services()
-				.globals
-				.config
-				.forbidden_remote_server_names
-				.contains(&server_name.to_owned())
-			{
-				warn!(
-					"User {user_id} who is not an admin tried joining a room which has the server name {server_name} \
-					 that is globally forbidden. Rejecting.",
-				);
-
-				if services()
-					.globals
-					.config
-					.auto_deactivate_banned_room_attempts
-				{
-					warn!("Automatically deactivating user {user_id} due to attempted banned room join");
-					services()
-						.admin
-						.send_message(RoomMessageEventContent::text_plain(format!(
-							"Automatically deactivating user {user_id} due to attempted banned room join"
-						)))
-						.await;
-
-					// ignore errors
-					leave_all_rooms(user_id).await;
-					_ = services().users.deactivate_account(user_id);
-				}
-
-				return Err(Error::BadRequest(
-					ErrorKind::forbidden(),
-					"This remote server is banned on this homeserver.",
-				));
-			}
-		}
-	}
-
-	Ok(())
-}
-
 /// # `POST /_matrix/client/r0/rooms/{roomId}/join`
 ///
 /// Tries to join the sender user into a room.
@@ -134,12 +45,35 @@ async fn banned_room_check(user_id: &UserId, room_id: Option<&RoomId>, server_na
 ///   rules locally
 /// - If the server does not know about the room: asks other servers over
 ///   federation
-pub(crate) async fn join_room_by_id_route(
-	body: Ruma<join_room_by_id::v3::Request>,
-) -> Result<join_room_by_id::v3::Response> {
+pub async fn join_room_by_id_route(body: Ruma<join_room_by_id::v3::Request>) -> Result<join_room_by_id::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-	banned_room_check(sender_user, Some(&body.room_id), body.room_id.server_name()).await?;
+	if services().rooms.metadata.is_banned(&body.room_id)? && !services().users.is_admin(sender_user)? {
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"This room is banned on this homeserver.",
+		));
+	}
+
+	if let Some(server) = body.room_id.server_name() {
+		if services()
+			.globals
+			.config
+			.forbidden_remote_server_names
+			.contains(&server.to_owned())
+			&& !services().users.is_admin(sender_user)?
+		{
+			warn!(
+				"User {sender_user} tried joining room ID {} which has a server name that is globally forbidden. \
+				 Rejecting.",
+				body.room_id
+			);
+			return Err(Error::BadRequest(
+				ErrorKind::forbidden(),
+				"This remote server is banned on this homeserver.",
+			));
+		}
+	}

 	// There is no body.server_name for /roomId/join
 	let mut servers = services()
@@ -181,10 +115,9 @@ pub(crate) async fn join_room_by_id_route(
 ///
 /// - If the server knowns about this room: creates the join event and does auth
 ///   rules locally
-/// - If the server does not know about the room: use the server name query
-///   param if specified. if not specified, asks other servers over federation
-///   via room alias server name and room ID server name
-pub(crate) async fn join_room_by_id_or_alias_route(
+/// - If the server does not know about the room: asks other servers over
+///   federation
+pub async fn join_room_by_id_or_alias_route(
 	body: Ruma<join_room_by_id_or_alias::v3::Request>,
 ) -> Result<join_room_by_id_or_alias::v3::Response> {
 	let sender_user = body.sender_user.as_deref().expect("user is authenticated");
@@ -192,9 +125,34 @@ pub(crate) async fn join_room_by_id_or_alias_route(

 	let (servers, room_id) = match OwnedRoomId::try_from(body.room_id_or_alias) {
 		Ok(room_id) => {
-			banned_room_check(sender_user, Some(&room_id), room_id.server_name()).await?;
+			if services().rooms.metadata.is_banned(&room_id)? && !services().users.is_admin(sender_user)? {
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"This room is banned on this homeserver.",
+				));
+			}
+
+			if let Some(server) = room_id.server_name() {
+				if services()
+					.globals
+					.config
+					.forbidden_remote_server_names
+					.contains(&server.to_owned())
+					&& !services().users.is_admin(sender_user)?
+				{
+					warn!(
+						"User {sender_user} tried joining room ID {room_id} which has a server name that is globally \
+						 forbidden. Rejecting.",
+					);
+					return Err(Error::BadRequest(
+						ErrorKind::forbidden(),
+						"This remote server is banned on this homeserver.",
+					));
+				}
+			}

 			let mut servers = body.server_name.clone();
+
 			servers.extend(
 				services()
 					.rooms
@@ -223,34 +181,54 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 			(servers, room_id)
 		},
 		Err(room_alias) => {
-			let response = get_alias_helper(room_alias.clone(), Some(body.server_name.clone())).await?;
+			let response = get_alias_helper(room_alias.clone()).await?;

-			banned_room_check(sender_user, Some(&response.room_id), Some(room_alias.server_name())).await?;
+			if services().rooms.metadata.is_banned(&response.room_id)? && !services().users.is_admin(sender_user)? {
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"This room is banned on this homeserver.",
+				));
+			}

-			let mut servers = body.server_name;
-			servers.extend(response.servers);
-			servers.extend(
-				services()
-					.rooms
-					.state_cache
-					.servers_invite_via(&response.room_id)?
-					.unwrap_or(
-						services()
-							.rooms
-							.state_cache
-							.invite_state(sender_user, &response.room_id)?
-							.unwrap_or_default()
-							.iter()
-							.filter_map(|event| serde_json::from_str(event.json().get()).ok())
-							.filter_map(|event: serde_json::Value| event.get("sender").cloned())
-							.filter_map(|sender| sender.as_str().map(ToOwned::to_owned))
-							.filter_map(|sender| UserId::parse(sender).ok())
-							.map(|user| user.server_name().to_owned())
-							.collect(),
-					),
-			);
+			if services()
+				.globals
+				.config
+				.forbidden_remote_server_names
+				.contains(&room_alias.server_name().to_owned())
+				&& !services().users.is_admin(sender_user)?
+			{
+				warn!(
+					"User {sender_user} tried joining room alias {} with room ID {} which has a server name that is \
+					 globally forbidden. Rejecting.",
+					&room_alias, &response.room_id
+				);
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"This remote server is banned on this homeserver.",
+				));
+			}

-			(servers, response.room_id)
+			if let Some(server) = response.room_id.server_name() {
+				if services()
+					.globals
+					.config
+					.forbidden_remote_server_names
+					.contains(&server.to_owned())
+					&& !services().users.is_admin(sender_user)?
+				{
+					warn!(
+						"User {sender_user} tried joining room alias {} with room ID {} which has a server name that \
+						 is globally forbidden. Rejecting.",
+						&room_alias, &response.room_id
+					);
+					return Err(Error::BadRequest(
+						ErrorKind::forbidden(),
+						"This remote server is banned on this homeserver.",
+					));
+				}
+			}
+
+			(response.servers, response.room_id)
 		},
 	};

@@ -273,7 +251,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 /// Tries to leave the sender user from a room.
 ///
 /// - This should always work if the user is currently joined.
-pub(crate) async fn leave_room_route(body: Ruma<leave_room::v3::Request>) -> Result<leave_room::v3::Response> {
+pub async fn leave_room_route(body: Ruma<leave_room::v3::Request>) -> Result<leave_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	leave_room(sender_user, &body.room_id, body.reason.clone()).await?;
@@ -284,7 +262,7 @@ pub(crate) async fn leave_room_route(body: Ruma<leave_room::v3::Request>) -> Res
 /// # `POST /_matrix/client/r0/rooms/{roomId}/invite`
 ///
 /// Tries to send an invite event into the room.
-pub(crate) async fn invite_user_route(body: Ruma<invite_user::v3::Request>) -> Result<invite_user::v3::Response> {
+pub async fn invite_user_route(body: Ruma<invite_user::v3::Request>) -> Result<invite_user::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services().users.is_admin(sender_user)? && services().globals.block_non_admin_invites() {
@@ -298,7 +276,30 @@ pub(crate) async fn invite_user_route(body: Ruma<invite_user::v3::Request>) -> R
 		));
 	}

-	banned_room_check(sender_user, Some(&body.room_id), body.room_id.server_name()).await?;
+	if services().rooms.metadata.is_banned(&body.room_id)? && !services().users.is_admin(sender_user)? {
+		info!(
+			"Local user {} who is not an admin attempted to send an invite for banned room {}.",
+			&sender_user, &body.room_id
+		);
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"This room is banned on this homeserver.",
+		));
+	}
+
+	if let Some(server) = body.room_id.server_name() {
+		if services()
+			.globals
+			.config
+			.forbidden_remote_server_names
+			.contains(&server.to_owned())
+		{
+			return Err(Error::BadRequest(
+				ErrorKind::forbidden(),
+				"Server is banned on this homeserver.",
+			));
+		}
+	}

 	if let invite_user::v3::InvitationRecipient::UserId {
 		user_id,
@@ -314,9 +315,18 @@ pub(crate) async fn invite_user_route(body: Ruma<invite_user::v3::Request>) -> R
 /// # `POST /_matrix/client/r0/rooms/{roomId}/kick`
 ///
 /// Tries to send a kick event into the room.
-pub(crate) async fn kick_user_route(body: Ruma<kick_user::v3::Request>) -> Result<kick_user::v3::Response> {
+pub async fn kick_user_route(body: Ruma<kick_user::v3::Request>) -> Result<kick_user::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

+	if let Ok(true) = services()
+		.rooms
+		.state_cache
+		.is_left(sender_user, &body.room_id)
+	{
+		info!("{} is not in room {}", &body.user_id, &body.room_id);
+		return Ok(kick_user::v3::Response {});
+	}
+
 	let mut event: RoomMemberEventContent = serde_json::from_str(
 		services()
 			.rooms
@@ -370,9 +380,20 @@ pub(crate) async fn kick_user_route(body: Ruma<kick_user::v3::Request>) -> Resul
 /// # `POST /_matrix/client/r0/rooms/{roomId}/ban`
 ///
 /// Tries to send a ban event into the room.
-pub(crate) async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<ban_user::v3::Response> {
+pub async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<ban_user::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

+	if let Ok(Some(membership_event)) = services()
+		.rooms
+		.state_accessor
+		.get_member(&body.room_id, sender_user)
+	{
+		if membership_event.membership == MembershipState::Ban {
+			info!("{} is already banned in {}", &body.user_id, &body.room_id);
+			return Ok(ban_user::v3::Response {});
+		}
+	}
+
 	let event = services()
 		.rooms
 		.state_accessor
@@ -380,11 +401,11 @@ pub(crate) async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<
 		.map_or(
 			Ok(RoomMemberEventContent {
 				membership: MembershipState::Ban,
-				displayname: None,
-				avatar_url: None,
+				displayname: services().users.displayname(&body.user_id)?,
+				avatar_url: services().users.avatar_url(&body.user_id)?,
 				is_direct: None,
 				third_party_invite: None,
-				blurhash: services().users.blurhash(&body.user_id).unwrap_or_default(),
+				blurhash: services().users.blurhash(&body.user_id)?,
 				reason: body.reason.clone(),
 				join_authorized_via_users_server: None,
 			}),
@@ -392,8 +413,14 @@ pub(crate) async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<
 				serde_json::from_str(event.content.get())
 					.map(|event: RoomMemberEventContent| RoomMemberEventContent {
 						membership: MembershipState::Ban,
-						displayname: None,
-						avatar_url: None,
+						displayname: services()
+							.users
+							.displayname(&body.user_id)
+							.unwrap_or_default(),
+						avatar_url: services()
+							.users
+							.avatar_url(&body.user_id)
+							.unwrap_or_default(),
 						blurhash: services().users.blurhash(&body.user_id).unwrap_or_default(),
 						reason: body.reason.clone(),
 						join_authorized_via_users_server: None,
@@ -439,9 +466,20 @@ pub(crate) async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<
 /// # `POST /_matrix/client/r0/rooms/{roomId}/unban`
 ///
 /// Tries to send an unban event into the room.
-pub(crate) async fn unban_user_route(body: Ruma<unban_user::v3::Request>) -> Result<unban_user::v3::Response> {
+pub async fn unban_user_route(body: Ruma<unban_user::v3::Request>) -> Result<unban_user::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

+	if let Ok(Some(membership_event)) = services()
+		.rooms
+		.state_accessor
+		.get_member(&body.room_id, sender_user)
+	{
+		if membership_event.membership != MembershipState::Ban {
+			info!("{} is already unbanned in {}", &body.user_id, &body.room_id);
+			return Ok(unban_user::v3::Response {});
+		}
+	}
+
 	let mut event: RoomMemberEventContent = serde_json::from_str(
 		services()
 			.rooms
@@ -499,7 +537,7 @@ pub(crate) async fn unban_user_route(body: Ruma<unban_user::v3::Request>) -> Res
 ///
 /// Note: Other devices of the user have no way of knowing the room was
 /// forgotten, so this has to be called from every device
-pub(crate) async fn forget_room_route(body: Ruma<forget_room::v3::Request>) -> Result<forget_room::v3::Response> {
+pub async fn forget_room_route(body: Ruma<forget_room::v3::Request>) -> Result<forget_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	services()
@@ -513,7 +551,7 @@ pub(crate) async fn forget_room_route(body: Ruma<forget_room::v3::Request>) -> R
 /// # `POST /_matrix/client/r0/joined_rooms`
 ///
 /// Lists all rooms the user has joined.
-pub(crate) async fn joined_rooms_route(body: Ruma<joined_rooms::v3::Request>) -> Result<joined_rooms::v3::Response> {
+pub async fn joined_rooms_route(body: Ruma<joined_rooms::v3::Request>) -> Result<joined_rooms::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	Ok(joined_rooms::v3::Response {
@@ -532,7 +570,7 @@ pub(crate) async fn joined_rooms_route(body: Ruma<joined_rooms::v3::Request>) ->
 /// specific membership).
 ///
 /// - Only works if the user is currently joined
-pub(crate) async fn get_member_events_route(
+pub async fn get_member_events_route(
 	body: Ruma<get_member_events::v3::Request>,
 ) -> Result<get_member_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -567,9 +605,7 @@ pub(crate) async fn get_member_events_route(
 ///
 /// - The sender user must be in the room
 /// - TODO: An appservice just needs a puppet joined
-pub(crate) async fn joined_members_route(
-	body: Ruma<joined_members::v3::Request>,
-) -> Result<joined_members::v3::Response> {
+pub async fn joined_members_route(body: Ruma<joined_members::v3::Request>) -> Result<joined_members::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services()
@@ -887,7 +923,7 @@ pub(crate) async fn join_room_by_id_helper(
 				.add_pdu_outlier(&event_id, &value)?;
 		}

-		debug!("Running send_join auth check");
+		info!("Running send_join auth check");

 		let auth_check = state_res::event_auth::auth_check(
 			&state_res::RoomVersion::new(&room_version_id).expect("room version is supported"),
@@ -911,11 +947,11 @@ pub(crate) async fn join_room_by_id_helper(
 		)
 		.map_err(|e| {
 			warn!("Auth check failed: {e}");
-			Error::BadRequest(ErrorKind::forbidden(), "Auth check failed")
+			Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed")
 		})?;

 		if !auth_check {
-			return Err(Error::BadRequest(ErrorKind::forbidden(), "Auth check failed"));
+			return Err(Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed"));
 		}

 		info!("Saving state from send_join");
@@ -1008,7 +1044,7 @@ pub(crate) async fn join_room_by_id_helper(
 			.state_cache
 			.room_members(room_id)
 			.filter_map(Result::ok)
-			.filter(|user| user_is_local(user))
+			.filter(|user| user.server_name() == services().globals.server_name())
 			.collect::<Vec<OwnedUserId>>();

 		let mut authorized_user: Option<OwnedUserId> = None;
@@ -1070,7 +1106,7 @@ pub(crate) async fn join_room_by_id_helper(
 		if !restriction_rooms.is_empty()
 			&& servers
 				.iter()
-				.any(|server_name| !server_is_ours(server_name))
+				.all(|s| *s != services().globals.server_name())
 		{
 			info!(
 				"We couldn't do the join locally, maybe federation can help to satisfy the restricted join \
@@ -1201,7 +1237,7 @@ pub(crate) async fn join_room_by_id_helper(
 				services()
 					.rooms
 					.event_handler
-					.handle_incoming_pdu(&remote_server, room_id, &signed_event_id, signed_value, true, &pub_key_map)
+					.handle_incoming_pdu(&remote_server, &signed_event_id, room_id, signed_value, true, &pub_key_map)
 					.await?;
 			} else {
 				return Err(error);
@@ -1219,11 +1255,11 @@ async fn make_join_request(
 ) -> Result<(federation::membership::prepare_join_event::v1::Response, OwnedServerName)> {
 	let mut make_join_response_and_server = Err(Error::BadServerResponse("No server available to assist in joining."));

-	let mut make_join_counter: u16 = 0;
-	let mut incompatible_room_version_count: u8 = 0;
+	let mut make_join_counter = 0;
+	let mut incompatible_room_version_count = 0;

 	for remote_server in servers {
-		if server_is_ours(remote_server) {
+		if remote_server == services().globals.server_name() {
 			continue;
 		}
 		info!("Asking {remote_server} for make_join ({make_join_counter})");
@@ -1240,7 +1276,7 @@ async fn make_join_request(
 			.await;

 		trace!("make_join response: {:?}", make_join_response);
-		make_join_counter = make_join_counter.saturating_add(1);
+		make_join_counter += 1;

 		if let Err(ref e) = make_join_response {
 			trace!("make_join ErrorKind string: {:?}", e.error_code().to_string());
@@ -1254,7 +1290,7 @@ async fn make_join_request(
 					.to_string()
 					.contains("M_UNSUPPORTED_ROOM_VERSION")
 			{
-				incompatible_room_version_count = incompatible_room_version_count.saturating_add(1);
+				incompatible_room_version_count += 1;
 			}

 			if incompatible_room_version_count > 15 {
@@ -1311,9 +1347,7 @@ async fn validate_and_add_event_id(
 			Entry::Vacant(e) => {
 				e.insert((Instant::now(), 1));
 			},
-			Entry::Occupied(mut e) => {
-				*e.get_mut() = (Instant::now(), e.get().1.saturating_add(1));
-			},
+			Entry::Occupied(mut e) => *e.get_mut() = (Instant::now(), e.get().1 + 1),
 		}
 	};

@@ -1325,8 +1359,10 @@ async fn validate_and_add_event_id(
 		.get(&event_id)
 	{
 		// Exponential backoff
-		const MAX_DURATION: Duration = Duration::from_secs(60 * 60 * 24);
-		let min_elapsed_duration = cmp::min(MAX_DURATION, Duration::from_secs(5 * 60) * (*tries) * (*tries));
+		let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
+		if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
+			min_elapsed_duration = Duration::from_secs(60 * 60 * 24);
+		}

 		if time.elapsed() < min_elapsed_duration {
 			debug!("Backing off from {}", event_id);
@@ -1356,7 +1392,7 @@ pub(crate) async fn invite_helper(
 		));
 	}

-	if !user_is_local(user_id) {
+	if user_id.server_name() != services().globals.server_name() {
 		let (pdu, pdu_json, invite_room_state) = {
 			let mutex_state = Arc::clone(
 				services()
@@ -1458,7 +1494,7 @@ pub(crate) async fn invite_helper(
 		let pdu_id: Vec<u8> = services()
 			.rooms
 			.event_handler
-			.handle_incoming_pdu(&origin, room_id, &event_id, value, true, &pub_key_map)
+			.handle_incoming_pdu(&origin, &event_id, room_id, value, true, &pub_key_map)
 			.await?
 			.ok_or(Error::BadRequest(
 				ErrorKind::InvalidParam,
@@ -1523,9 +1559,8 @@ pub(crate) async fn invite_helper(
 	Ok(())
 }

-// Make a user leave all their joined rooms, forgets all rooms, and ignores
-// errors
-pub(crate) async fn leave_all_rooms(user_id: &UserId) {
+// Make a user leave all their joined rooms
+pub async fn leave_all_rooms(user_id: &UserId) -> Result<()> {
 	let all_rooms = services()
 		.rooms
 		.state_cache
@@ -1545,12 +1580,13 @@ pub(crate) async fn leave_all_rooms(user_id: &UserId) {
 		};

 		// ignore errors
-		_ = services().rooms.state_cache.forget(&room_id, user_id);
 		_ = leave_room(user_id, &room_id, None).await;
 	}
+
+	Ok(())
 }

-pub(crate) async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<String>) -> Result<()> {
+pub async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<String>) -> Result<()> {
 	// Ask a remote server if we don't have this room
 	if !services()
 		.rooms
@@ -28,7 +28,7 @@ use crate::{
 /// - The only requirement for the content is that it has to be valid json
 /// - Tries to send the event into the room, auth rules will determine if it is
 ///   allowed
-pub(crate) async fn send_message_event_route(
+pub async fn send_message_event_route(
 	body: Ruma<send_message_event::v3::Request>,
 ) -> Result<send_message_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -119,7 +119,7 @@ pub(crate) async fn send_message_event_route(
 /// - Only works if the user is joined (TODO: always allow, but only show events
 ///   where the user was
 /// joined, depending on `history_visibility`)
-pub(crate) async fn get_message_events_route(
+pub async fn get_message_events_route(
 	body: Ruma<get_message_events::v3::Request>,
 ) -> Result<get_message_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -144,7 +144,7 @@ pub(crate) async fn get_message_events_route(
 		.lazy_load_confirm_delivery(sender_user, sender_device, &body.room_id, from)
 		.await?;

-	let limit = usize::try_from(body.limit).unwrap_or(10).min(100);
+	let limit = u64::from(body.limit).min(100) as usize;

 	let next_token;

@@ -159,9 +159,8 @@ pub(crate) async fn get_message_events_route(
 				.timeline
 				.pdus_after(sender_user, &body.room_id, from)?
 				.filter_map(Result::ok) // Filter out buggy events
-				.filter(|(_, pdu)| { contains_url_filter(pdu, &body.filter) && visibility_filter(pdu, sender_user, &body.room_id)
-
-				})
+				.filter(|(_, pdu)| contains_url_filter(pdu, &body.filter))
+				.filter(|(_, pdu)| visibility_filter(pdu, sender_user, &body.room_id))
 				.take_while(|&(k, _)| Some(k) != to) // Stop at `to`
 				.take(limit)
 				.collect();
@@ -206,7 +205,8 @@ pub(crate) async fn get_message_events_route(
 				.timeline
 				.pdus_until(sender_user, &body.room_id, from)?
 				.filter_map(Result::ok) // Filter out buggy events
-				.filter(|(_, pdu)| {contains_url_filter(pdu, &body.filter) && visibility_filter(pdu, sender_user, &body.room_id)})
+				.filter(|(_, pdu)| contains_url_filter(pdu, &body.filter))
+				.filter(|(_, pdu)| visibility_filter(pdu, sender_user, &body.room_id))
 				.take_while(|&(k, _)| Some(k) != to) // Stop at `to`
 				.take(limit)
 				.collect();
@@ -34,50 +34,50 @@ mod unversioned;
 mod user_directory;
 mod voip;

-pub(crate) use account::*;
-pub(crate) use alias::*;
-pub(crate) use backup::*;
-pub(crate) use capabilities::*;
-pub(crate) use config::*;
-pub(crate) use context::*;
-pub(crate) use device::*;
-pub(crate) use directory::*;
-pub(crate) use filter::*;
-pub(crate) use keys::*;
-pub(crate) use media::*;
-pub(crate) use membership::*;
-pub(crate) use message::*;
-pub(crate) use presence::*;
-pub(crate) use profile::*;
-pub(crate) use push::*;
-pub(crate) use read_marker::*;
-pub(crate) use redact::*;
-pub(crate) use relations::*;
-pub(crate) use report::*;
-pub(crate) use room::*;
-pub(crate) use search::*;
-pub(crate) use session::*;
-pub(crate) use space::*;
-pub(crate) use state::*;
-pub(crate) use sync::*;
-pub(crate) use tag::*;
-pub(crate) use thirdparty::*;
-pub(crate) use threads::*;
-pub(crate) use to_device::*;
-pub(crate) use typing::*;
-pub(crate) use unstable::*;
-pub(crate) use unversioned::*;
-pub(crate) use user_directory::*;
-pub(crate) use voip::*;
+pub use account::*;
+pub use alias::*;
+pub use backup::*;
+pub use capabilities::*;
+pub use config::*;
+pub use context::*;
+pub use device::*;
+pub use directory::*;
+pub use filter::*;
+pub use keys::*;
+pub use media::*;
+pub use membership::*;
+pub use message::*;
+pub use presence::*;
+pub use profile::*;
+pub use push::*;
+pub use read_marker::*;
+pub use redact::*;
+pub use relations::*;
+pub use report::*;
+pub use room::*;
+pub use search::*;
+pub use session::*;
+pub use space::*;
+pub use state::*;
+pub use sync::*;
+pub use tag::*;
+pub use thirdparty::*;
+pub use threads::*;
+pub use to_device::*;
+pub use typing::*;
+pub use unstable::*;
+pub use unversioned::*;
+pub use user_directory::*;
+pub use voip::*;

 /// generated device ID length
-const DEVICE_ID_LENGTH: usize = 10;
+pub const DEVICE_ID_LENGTH: usize = 10;

 /// generated user access token length
-const TOKEN_LENGTH: usize = 32;
+pub const TOKEN_LENGTH: usize = 32;

 /// generated user session ID length
-pub(crate) const SESSION_ID_LENGTH: usize = 32;
+pub const SESSION_ID_LENGTH: usize = 32;

 /// auto-generated password length
-pub(crate) const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
+pub const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
@@ -10,7 +10,7 @@ use crate::{services, Error, Result, Ruma};
 /// # `PUT /_matrix/client/r0/presence/{userId}/status`
 ///
 /// Sets the presence state of the sender user.
-pub(crate) async fn set_presence_route(body: Ruma<set_presence::v3::Request>) -> Result<set_presence::v3::Response> {
+pub async fn set_presence_route(body: Ruma<set_presence::v3::Request>) -> Result<set_presence::v3::Response> {
 	if !services().globals.allow_local_presence() {
 		return Err(Error::BadRequest(ErrorKind::forbidden(), "Presence is disabled on this server"));
 	}
@@ -28,7 +28,7 @@ pub(crate) async fn set_presence_route(body: Ruma<set_presence::v3::Request>) ->
 /// Gets the presence state of the given user.
 ///
 /// - Only works if you share a room with the user
-pub(crate) async fn get_presence_route(body: Ruma<get_presence::v3::Request>) -> Result<get_presence::v3::Response> {
+pub async fn get_presence_route(body: Ruma<get_presence::v3::Request>) -> Result<get_presence::v3::Response> {
 	if !services().globals.allow_local_presence() {
 		return Err(Error::BadRequest(ErrorKind::forbidden(), "Presence is disabled on this server"));
 	}
@@ -42,27 +42,16 @@ pub(crate) async fn get_presence_route(body: Ruma<get_presence::v3::Request>) ->
 		.user
 		.get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])?
 	{
-		if let Some(presence) = services().presence.get_presence(&body.user_id)? {
+		if let Some(presence) = services().presence.get_presence(sender_user)? {
 			presence_event = Some(presence);
 			break;
 		}
 	}

 	if let Some(presence) = presence_event {
-		let status_msg = if presence
-			.content
-			.status_msg
-			.as_ref()
-			.is_some_and(String::is_empty)
-		{
-			None
-		} else {
-			presence.content.status_msg
-		};
-
 		Ok(get_presence::v3::Response {
 			// TODO: Should ruma just use the presenceeventcontent type here?
-			status_msg,
+			status_msg: presence.content.status_msg,
 			currently_active: presence.content.currently_active,
 			last_active_ago: presence
 				.content
@@ -13,14 +13,14 @@ use ruma::{
 };
 use serde_json::value::to_raw_value;

-use crate::{service::pdu::PduBuilder, services, utils::user_id::user_is_local, Error, Result, Ruma};
+use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
 /// Updates the displayname.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-pub(crate) async fn set_displayname_route(
+pub async fn set_displayname_route(
 	body: Ruma<set_display_name::v3::Request>,
 ) -> Result<set_display_name::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -102,10 +102,10 @@ pub(crate) async fn set_displayname_route(
 ///
 /// - If user is on another server and we do not have a local copy already
 /// fetch displayname over federation
-pub(crate) async fn get_displayname_route(
+pub async fn get_displayname_route(
 	body: Ruma<get_display_name::v3::Request>,
 ) -> Result<get_display_name::v3::Response> {
-	if !user_is_local(&body.user_id) {
+	if body.user_id.server_name() != services().globals.server_name() {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending
@@ -157,9 +157,7 @@ pub(crate) async fn get_displayname_route(
 /// Updates the `avatar_url` and `blurhash`.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-pub(crate) async fn set_avatar_url_route(
-	body: Ruma<set_avatar_url::v3::Request>,
-) -> Result<set_avatar_url::v3::Response> {
+pub async fn set_avatar_url_route(body: Ruma<set_avatar_url::v3::Request>) -> Result<set_avatar_url::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	services()
@@ -244,10 +242,8 @@ pub(crate) async fn set_avatar_url_route(
 ///
 /// - If user is on another server and we do not have a local copy already
 /// fetch `avatar_url` and blurhash over federation
-pub(crate) async fn get_avatar_url_route(
-	body: Ruma<get_avatar_url::v3::Request>,
-) -> Result<get_avatar_url::v3::Response> {
-	if !user_is_local(&body.user_id) {
+pub async fn get_avatar_url_route(body: Ruma<get_avatar_url::v3::Request>) -> Result<get_avatar_url::v3::Response> {
+	if body.user_id.server_name() != services().globals.server_name() {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending
@@ -302,8 +298,8 @@ pub(crate) async fn get_avatar_url_route(
 ///
 /// - If user is on another server and we do not have a local copy already,
 /// fetch profile over federation.
-pub(crate) async fn get_profile_route(body: Ruma<get_profile::v3::Request>) -> Result<get_profile::v3::Response> {
-	if !user_is_local(&body.user_id) {
+pub async fn get_profile_route(body: Ruma<get_profile::v3::Request>) -> Result<get_profile::v3::Response> {
+	if body.user_id.server_name() != services().globals.server_name() {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending
@@ -15,7 +15,7 @@ use crate::{services, Error, Result, Ruma};
 /// # `GET /_matrix/client/r0/pushrules/`
 ///
 /// Retrieves the push rules event for this user.
-pub(crate) async fn get_pushrules_all_route(
+pub async fn get_pushrules_all_route(
 	body: Ruma<get_pushrules_all::v3::Request>,
 ) -> Result<get_pushrules_all::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -55,7 +55,7 @@ pub(crate) async fn get_pushrules_all_route(
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Retrieves a single specified push rule for this user.
-pub(crate) async fn get_pushrule_route(body: Ruma<get_pushrule::v3::Request>) -> Result<get_pushrule::v3::Response> {
+pub async fn get_pushrule_route(body: Ruma<get_pushrule::v3::Request>) -> Result<get_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let event = services()
@@ -84,7 +84,7 @@ pub(crate) async fn get_pushrule_route(body: Ruma<get_pushrule::v3::Request>) ->
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Creates a single specified push rule for this user.
-pub(crate) async fn set_pushrule_route(body: Ruma<set_pushrule::v3::Request>) -> Result<set_pushrule::v3::Response> {
+pub async fn set_pushrule_route(body: Ruma<set_pushrule::v3::Request>) -> Result<set_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let body = body.body;

@@ -147,7 +147,7 @@ pub(crate) async fn set_pushrule_route(body: Ruma<set_pushrule::v3::Request>) ->
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
 ///
 /// Gets the actions of a single specified push rule for this user.
-pub(crate) async fn get_pushrule_actions_route(
+pub async fn get_pushrule_actions_route(
 	body: Ruma<get_pushrule_actions::v3::Request>,
 ) -> Result<get_pushrule_actions::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -182,7 +182,7 @@ pub(crate) async fn get_pushrule_actions_route(
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
 ///
 /// Sets the actions of a single specified push rule for this user.
-pub(crate) async fn set_pushrule_actions_route(
+pub async fn set_pushrule_actions_route(
 	body: Ruma<set_pushrule_actions::v3::Request>,
 ) -> Result<set_pushrule_actions::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -224,7 +224,7 @@ pub(crate) async fn set_pushrule_actions_route(
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
 ///
 /// Gets the enabled status of a single specified push rule for this user.
-pub(crate) async fn get_pushrule_enabled_route(
+pub async fn get_pushrule_enabled_route(
 	body: Ruma<get_pushrule_enabled::v3::Request>,
 ) -> Result<get_pushrule_enabled::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -258,7 +258,7 @@ pub(crate) async fn get_pushrule_enabled_route(
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
 ///
 /// Sets the enabled status of a single specified push rule for this user.
-pub(crate) async fn set_pushrule_enabled_route(
+pub async fn set_pushrule_enabled_route(
 	body: Ruma<set_pushrule_enabled::v3::Request>,
 ) -> Result<set_pushrule_enabled::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -300,9 +300,7 @@ pub(crate) async fn set_pushrule_enabled_route(
 /// # `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Deletes a single specified push rule for this user.
-pub(crate) async fn delete_pushrule_route(
-	body: Ruma<delete_pushrule::v3::Request>,
-) -> Result<delete_pushrule::v3::Response> {
+pub async fn delete_pushrule_route(body: Ruma<delete_pushrule::v3::Request>) -> Result<delete_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if body.scope != RuleScope::Global {
@@ -349,7 +347,7 @@ pub(crate) async fn delete_pushrule_route(
 /// # `GET /_matrix/client/r0/pushers`
 ///
 /// Gets all currently active pushers for the sender user.
-pub(crate) async fn get_pushers_route(body: Ruma<get_pushers::v3::Request>) -> Result<get_pushers::v3::Response> {
+pub async fn get_pushers_route(body: Ruma<get_pushers::v3::Request>) -> Result<get_pushers::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	Ok(get_pushers::v3::Response {
@@ -362,7 +360,7 @@ pub(crate) async fn get_pushers_route(body: Ruma<get_pushers::v3::Request>) -> R
 /// Adds a pusher for the sender user.
 ///
 /// - TODO: Handle `append`
-pub(crate) async fn set_pushers_route(body: Ruma<set_pusher::v3::Request>) -> Result<set_pusher::v3::Response> {
+pub async fn set_pushers_route(body: Ruma<set_pusher::v3::Request>) -> Result<set_pusher::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	services()
@@ -18,9 +18,7 @@ use crate::{service::rooms::timeline::PduCount, services, Error, Result, Ruma};
 /// - Updates fully-read account data event to `fully_read`
 /// - If `read_receipt` is set: Update private marker and public read receipt
 ///   EDU
-pub(crate) async fn set_read_marker_route(
-	body: Ruma<set_read_marker::v3::Request>,
-) -> Result<set_read_marker::v3::Response> {
+pub async fn set_read_marker_route(body: Ruma<set_read_marker::v3::Request>) -> Result<set_read_marker::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if let Some(fully_read) = &body.fully_read {
@@ -97,9 +95,7 @@ pub(crate) async fn set_read_marker_route(
 /// # `POST /_matrix/client/r0/rooms/{roomId}/receipt/{receiptType}/{eventId}`
 ///
 /// Sets private read marker and public read receipt EDU.
-pub(crate) async fn create_receipt_route(
-	body: Ruma<create_receipt::v3::Request>,
-) -> Result<create_receipt::v3::Response> {
+pub async fn create_receipt_route(body: Ruma<create_receipt::v3::Request>) -> Result<create_receipt::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if matches!(
@@ -13,7 +13,7 @@ use crate::{service::pdu::PduBuilder, services, Result, Ruma};
 /// Tries to send a redaction event into the room.
 ///
 /// - TODO: Handle txn id
-pub(crate) async fn redact_event_route(body: Ruma<redact_event::v3::Request>) -> Result<redact_event::v3::Response> {
+pub async fn redact_event_route(body: Ruma<redact_event::v3::Request>) -> Result<redact_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let body = body.body;

@@ -5,7 +5,7 @@ use ruma::api::client::relations::{
 use crate::{services, Result, Ruma};

 /// # `GET /_matrix/client/r0/rooms/{roomId}/relations/{eventId}/{relType}/{eventType}`
-pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
+pub async fn get_relating_events_with_rel_type_and_event_type_route(
 	body: Ruma<get_relating_events_with_rel_type_and_event_type::v1::Request>,
 ) -> Result<get_relating_events_with_rel_type_and_event_type::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -35,7 +35,7 @@ pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
 }

 /// # `GET /_matrix/client/r0/rooms/{roomId}/relations/{eventId}/{relType}`
-pub(crate) async fn get_relating_events_with_rel_type_route(
+pub async fn get_relating_events_with_rel_type_route(
 	body: Ruma<get_relating_events_with_rel_type::v1::Request>,
 ) -> Result<get_relating_events_with_rel_type::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -65,7 +65,7 @@ pub(crate) async fn get_relating_events_with_rel_type_route(
 }

 /// # `GET /_matrix/client/r0/rooms/{roomId}/relations/{eventId}`
-pub(crate) async fn get_relating_events_route(
+pub async fn get_relating_events_route(
 	body: Ruma<get_relating_events::v1::Request>,
 ) -> Result<get_relating_events::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -4,26 +4,21 @@ use rand::Rng;
 use ruma::{
 	api::client::{error::ErrorKind, room::report_content},
 	events::room::message,
-	int, EventId, RoomId, UserId,
+	int,
 };
 use tokio::time::sleep;
-use tracing::info;
+use tracing::{debug, info};

-use crate::{debug_info, service::pdu::PduEvent, services, utils::HtmlEscape, Error, Result, Ruma};
+use crate::{services, utils::HtmlEscape, Error, Result, Ruma};

 /// # `POST /_matrix/client/v3/rooms/{roomId}/report/{eventId}`
 ///
 /// Reports an inappropriate event to homeserver admins
-pub(crate) async fn report_event_route(
-	body: Ruma<report_content::v3::Request>,
-) -> Result<report_content::v3::Response> {
+pub async fn report_event_route(body: Ruma<report_content::v3::Request>) -> Result<report_content::v3::Response> {
 	// user authentication
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-	info!(
-		"Received /report request by user {sender_user} for room {} and event ID {}",
-		body.room_id, body.event_id
-	);
+	info!("Received /report request by user {}", sender_user);

 	// check if we know about the reported event ID or if it's invalid
 	let Some(pdu) = services().rooms.timeline.get_pdu(&body.event_id)? else {
@@ -33,7 +28,43 @@ pub(crate) async fn report_event_route(
 		));
 	};

-	is_report_valid(&pdu.event_id, &body.room_id, sender_user, &body.reason, body.score, &pdu)?;
+	// check if the room ID from the URI matches the PDU's room ID
+	if body.room_id != pdu.room_id {
+		return Err(Error::BadRequest(
+			ErrorKind::NotFound,
+			"Event ID does not belong to the reported room",
+		));
+	}
+
+	// check if reporting user is in the reporting room
+	if !services()
+		.rooms
+		.state_cache
+		.room_members(&pdu.room_id)
+		.filter_map(Result::ok)
+		.any(|user_id| user_id == *sender_user)
+	{
+		return Err(Error::BadRequest(
+			ErrorKind::NotFound,
+			"You are not in the room you are reporting.",
+		));
+	}
+
+	// check if score is in valid range
+	if let Some(true) = body.score.map(|s| s > int!(0) || s < int!(-100)) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Invalid score, must be within 0 to -100",
+		));
+	};
+
+	// check if report reasoning is less than or equal to 750 characters
+	if let Some(true) = body.reason.clone().map(|s| s.chars().count() >= 750) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Reason too long, should be 750 characters or fewer",
+		));
+	};

 	// send admin room message that we received the report with an @room ping for
 	// urgency
@@ -64,70 +95,17 @@ pub(crate) async fn report_event_route(
 				body.score.unwrap_or_else(|| ruma::Int::from(0)),
 				HtmlEscape(body.reason.as_deref().unwrap_or(""))
 			),
-		))
-		.await;
+		));

-	delay_response().await?;
+	// even though this is kinda security by obscurity, let's still make a small
+	// random delay sending a successful response per spec suggestion regarding
+	// enumerating for potential events existing in our server.
+	let time_to_wait = rand::thread_rng().gen_range(8..21);
+	debug!(
+		"Got successful /report request, waiting {} seconds before sending successful response.",
+		time_to_wait
+	);
+	sleep(Duration::from_secs(time_to_wait)).await;

 	Ok(report_content::v3::Response {})
 }
-
-/// in the following order:
-///
-/// check if the room ID from the URI matches the PDU's room ID
-/// check if reporting user is in the reporting room
-/// check if score is in valid range
-/// check if report reasoning is less than or equal to 750 characters
-fn is_report_valid(
-	event_id: &EventId, room_id: &RoomId, sender_user: &UserId, reason: &Option<String>, score: Option<ruma::Int>,
-	pdu: &std::sync::Arc<PduEvent>,
-) -> Result<bool> {
-	debug_info!("Checking if report from user {sender_user} for event {event_id} in room {room_id} is valid");
-
-	if room_id != pdu.room_id {
-		return Err(Error::BadRequest(
-			ErrorKind::NotFound,
-			"Event ID does not belong to the reported room",
-		));
-	}
-
-	if !services()
-		.rooms
-		.state_cache
-		.room_members(&pdu.room_id)
-		.filter_map(Result::ok)
-		.any(|user_id| user_id == *sender_user)
-	{
-		return Err(Error::BadRequest(
-			ErrorKind::NotFound,
-			"You are not in the room you are reporting.",
-		));
-	}
-
-	if let Some(true) = score.map(|s| s > int!(0) || s < int!(-100)) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Invalid score, must be within 0 to -100",
-		));
-	};
-
-	if let Some(true) = reason.clone().map(|s| s.len() >= 750) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Reason too long, should be 750 characters or fewer",
-		));
-	};
-
-	Ok(true)
-}
-
-/// even though this is kinda security by obscurity, let's still make a small
-/// random delay sending a successful response per spec suggestion regarding
-/// enumerating for potential events existing in our server.
-async fn delay_response() -> Result<()> {
-	let time_to_wait = rand::thread_rng().gen_range(8..21);
-	debug_info!("Got successful /report request, waiting {time_to_wait} seconds before sending successful response.");
-	sleep(Duration::from_secs(time_to_wait)).await;
-
-	Ok(())
-}
@@ -21,31 +21,13 @@ use ruma::{
 		StateEventType, TimelineEventType,
 	},
 	int,
-	serde::{JsonObject, Raw},
-	CanonicalJsonObject, Int, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomVersionId,
+	serde::JsonObject,
+	CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};
-use tracing::{error, info, warn};
+use tracing::{debug, error, info, warn};

-use crate::{
-	api::client_server::invite_helper,
-	debug_info, debug_warn,
-	service::{appservice::RegistrationInfo, pdu::PduBuilder},
-	services, Error, Result, Ruma,
-};
-
-/// Recommended transferable state events list from the spec
-const TRANSFERABLE_STATE_EVENTS: &[StateEventType; 9] = &[
-	StateEventType::RoomServerAcl,
-	StateEventType::RoomEncryption,
-	StateEventType::RoomName,
-	StateEventType::RoomAvatar,
-	StateEventType::RoomTopic,
-	StateEventType::RoomGuestAccess,
-	StateEventType::RoomHistoryVisibility,
-	StateEventType::RoomJoinRules,
-	StateEventType::RoomPowerLevels,
-];
+use crate::{api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma};

 /// # `POST /_matrix/client/v3/createRoom`
 ///
@@ -63,7 +45,7 @@ const TRANSFERABLE_STATE_EVENTS: &[StateEventType; 9] = &[
 /// - Send events listed in initial state
 /// - Send events implied by `name` and `topic`
 /// - Send invite events
-pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<create_room::v3::Response> {
+pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<create_room::v3::Response> {
 	use create_room::v3::RoomPreset;

 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -75,11 +57,55 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		return Err(Error::BadRequest(ErrorKind::forbidden(), "Room creation has been disabled."));
 	}

-	let room_id: OwnedRoomId = if let Some(custom_room_id) = &body.room_id {
-		custom_room_id_check(custom_room_id)?
+	let room_id: OwnedRoomId;
+
+	// checks if the user specified an explicit (custom) room_id to be created with
+	// in request body. falls back to normal generated room ID if not specified.
+	if let Some(CanonicalJsonValue::Object(json_body)) = &body.json_body {
+		match json_body.get("room_id") {
+			Some(custom_room_id) => {
+				let custom_room_id_s = custom_room_id.to_string();
+
+				// do some checks on the custom room ID similar to room aliases
+				if custom_room_id_s.contains(':') {
+					return Err(Error::BadRequest(
+						ErrorKind::InvalidParam,
+						"Custom room ID contained `:` which is not allowed. Please note that this expects a \
+						 localpart, not the full room ID.",
+					));
+				} else if custom_room_id_s.contains(char::is_whitespace) {
+					return Err(Error::BadRequest(
+						ErrorKind::InvalidParam,
+						"Custom room ID contained spaces which is not valid.",
+					));
+				} else if custom_room_id_s.len() > 255 {
+					return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
+				}
+
+				// apply forbidden room alias checks to custom room IDs too
+				if services()
+					.globals
+					.forbidden_alias_names()
+					.is_match(&custom_room_id_s)
+				{
+					return Err(Error::BadRequest(ErrorKind::Unknown, "Custom room ID is forbidden."));
+				}
+
+				let full_room_id = "!".to_owned()
+					+ &custom_room_id_s.replace('"', "")
+					+ ":" + services().globals.server_name().as_ref();
+				debug!("Full room ID: {}", full_room_id);
+
+				room_id = RoomId::parse(full_room_id).map_err(|e| {
+					info!("User attempted to create room with custom room ID but failed parsing: {}", e);
+					Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID could not be parsed")
+				})?;
+			},
+			None => room_id = RoomId::new(services().globals.server_name()),
+		}
 	} else {
-		RoomId::new(&services().globals.config.server_name)
-	};
+		room_id = RoomId::new(services().globals.server_name());
+	}

 	// check if room ID doesn't already exist instead of erroring on auth check
 	if services().rooms.short.get_shortroomid(&room_id)?.is_some() {
@@ -102,11 +128,74 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 	);
 	let state_lock = mutex_state.lock().await;

-	let alias: Option<OwnedRoomAliasId> = if let Some(alias) = &body.room_alias_name {
-		Some(room_alias_check(alias, &body.appservice_info).await?)
-	} else {
-		None
-	};
+	let alias: Option<OwnedRoomAliasId> = body
+		.room_alias_name
+		.as_ref()
+		.map_or(Ok(None), |localpart| {
+			// Basic checks on the room alias validity
+			if localpart.contains(':') {
+				return Err(Error::BadRequest(
+					ErrorKind::InvalidParam,
+					"Room alias contained `:` which is not allowed. Please note that this expects a localpart, not \
+					 the full room alias.",
+				));
+			} else if localpart.contains(char::is_whitespace) {
+				return Err(Error::BadRequest(
+					ErrorKind::InvalidParam,
+					"Room alias contained spaces which is not a valid room alias.",
+				));
+			} else if localpart.len() > 255 {
+				// there is nothing spec-wise saying to check the limit of this,
+				// however absurdly long room aliases are guaranteed to be unreadable or done
+				// maliciously. there is no reason a room alias should even exceed 100
+				// characters as is. generally in spec, 255 is matrix's fav number
+				return Err(Error::BadRequest(
+					ErrorKind::InvalidParam,
+					"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
+				));
+			} else if localpart.contains('"') {
+				return Err(Error::BadRequest(
+					ErrorKind::InvalidParam,
+					"Room alias contained `\"` which is not allowed.",
+				));
+			}
+
+			// check if room alias is forbidden
+			if services()
+				.globals
+				.forbidden_alias_names()
+				.is_match(localpart)
+			{
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
+			}
+
+			let alias =
+				RoomAliasId::parse(format!("#{}:{}", localpart, services().globals.server_name())).map_err(|e| {
+					warn!("Failed to parse room alias for room ID {}: {e}", room_id);
+					Error::BadRequest(ErrorKind::InvalidParam, "Invalid room alias specified.")
+				})?;
+
+			if services()
+				.rooms
+				.alias
+				.resolve_local_alias(&alias)?
+				.is_some()
+			{
+				Err(Error::BadRequest(ErrorKind::RoomInUse, "Room alias already exists."))
+			} else {
+				Ok(Some(alias))
+			}
+		})?;
+
+	if let Some(ref alias) = alias {
+		if let Some(ref info) = body.appservice_info {
+			if !info.aliases.is_match(alias.as_str()) {
+				return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
+			}
+		} else if services().appservice.is_exclusive_alias(alias).await {
+			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
+		}
+	}

 	let room_version = match body.room_version.clone() {
 		Some(room_version) => {
@@ -194,7 +283,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 			};
 			let mut content = serde_json::from_str::<CanonicalJsonObject>(
 				to_raw_value(&content)
-					.expect("we just created this as content was None")
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?
 					.get(),
 			)
 			.unwrap();
@@ -202,12 +291,23 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 				"room_version".into(),
 				json!(room_version.as_str())
 					.try_into()
-					.expect("we just created this as content was None"),
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
 			);
 			content
 		},
 	};

+	// Validate creation content
+	let de_result = serde_json::from_str::<CanonicalJsonObject>(
+		to_raw_value(&content)
+			.expect("Invalid creation content")
+			.get(),
+	);
+
+	if de_result.is_err() {
+		return Err(Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"));
+	}
+
 	// 1. The room create event
 	services()
 		.rooms
@@ -271,8 +371,39 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		}
 	}

-	let power_levels_content =
-		default_power_levels_content(&body.power_level_content_override, &body.visibility, users)?;
+	let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent {
+		users,
+		..Default::default()
+	})
+	.expect("event is valid, we just created it");
+
+	// secure proper defaults of sensitive/dangerous permissions that moderators
+	// (power level 50) should not have easy access to
+	power_levels_content["events"]["m.room.power_levels"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.server_acl"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.tombstone"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.encryption"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.history_visibility"] =
+		serde_json::to_value(100).expect("100 is valid Value");
+
+	// synapse does this too. clients do not expose these permissions. it prevents
+	// default users from calling public rooms, for obvious reasons.
+	if body.visibility == room::Visibility::Public {
+		power_levels_content["events"]["m.call.invite"] = serde_json::to_value(50).expect("50 is valid Value");
+		power_levels_content["events"]["org.matrix.msc3401.call"] =
+			serde_json::to_value(50).expect("50 is valid Value");
+		power_levels_content["events"]["org.matrix.msc3401.call.member"] =
+			serde_json::to_value(50).expect("50 is valid Value");
+	}
+
+	if let Some(power_level_content_override) = &body.power_level_content_override {
+		let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
+			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;
+
+		for (key, value) in json {
+			power_levels_content[key] = value;
+		}
+	}

 	services()
 		.rooms
@@ -388,17 +519,6 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 			Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event.")
 		})?;

-		debug_warn!("initial state event: {event:?}");
-
-		// client/appservice workaround: if a user sends an initial_state event with a
-		// state event in there with the content of literally `{}` (not null or empty
-		// string), let's just skip it over and warn.
-		if pdu_builder.content.get().eq("{}") {
-			info!("skipping empty initial state event with content of `{{}}`: {event:?}");
-			debug_warn!("content: {}", pdu_builder.content.get());
-			continue;
-		}
-
 		// Implicit state key defaults to ""
 		pdu_builder.state_key.get_or_insert_with(String::new);

@@ -472,7 +592,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		services().rooms.directory.set_public(&room_id)?;
 	}

-	info!("{sender_user} created a room with room ID {room_id}");
+	info!("{} created a room", sender_user);

 	Ok(create_room::v3::Response::new(room_id))
 }
@@ -483,9 +603,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 ///
 /// - You have to currently be joined to the room (TODO: Respect history
 ///   visibility)
-pub(crate) async fn get_room_event_route(
-	body: Ruma<get_room_event::v3::Request>,
-) -> Result<get_room_event::v3::Response> {
+pub async fn get_room_event_route(body: Ruma<get_room_event::v3::Request>) -> Result<get_room_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let event = services()
@@ -522,7 +640,7 @@ pub(crate) async fn get_room_event_route(
 ///
 /// - Only users joined to the room are allowed to call this, or if
 ///   `history_visibility` is world readable in the room
-pub(crate) async fn get_room_aliases_route(body: Ruma<aliases::v3::Request>) -> Result<aliases::v3::Response> {
+pub async fn get_room_aliases_route(body: Ruma<aliases::v3::Request>) -> Result<aliases::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services()
@@ -556,7 +674,7 @@ pub(crate) async fn get_room_aliases_route(body: Ruma<aliases::v3::Request>) ->
 /// - Transfers some state events
 /// - Moves local aliases
 /// - Modifies old room power levels to prevent users from speaking
-pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) -> Result<upgrade_room::v3::Response> {
+pub async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) -> Result<upgrade_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services()
@@ -691,13 +809,13 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 	);

 	// Validate creation event content
-	if serde_json::from_str::<CanonicalJsonObject>(
+	let de_result = serde_json::from_str::<CanonicalJsonObject>(
 		to_raw_value(&create_event_content)
 			.expect("Error forming creation event")
 			.get(),
-	)
-	.is_err()
-	{
+	);
+
+	if de_result.is_err() {
 		return Err(Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"));
 	}

@@ -746,12 +864,25 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 		)
 		.await?;

+	// Recommended transferable state events list from the specs
+	let transferable_state_events = vec![
+		StateEventType::RoomServerAcl,
+		StateEventType::RoomEncryption,
+		StateEventType::RoomName,
+		StateEventType::RoomAvatar,
+		StateEventType::RoomTopic,
+		StateEventType::RoomGuestAccess,
+		StateEventType::RoomHistoryVisibility,
+		StateEventType::RoomJoinRules,
+		StateEventType::RoomPowerLevels,
+	];
+
 	// Replicate transferable state events to the new room
-	for event_type in TRANSFERABLE_STATE_EVENTS {
+	for event_type in transferable_state_events {
 		let event_content = match services()
 			.rooms
 			.state_accessor
-			.room_state_get(&body.room_id, event_type, "")?
+			.room_state_get(&body.room_id, &event_type, "")?
 		{
 			Some(v) => v.content.clone(),
 			None => continue, // Skipping missing events.
@@ -801,15 +932,7 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 	.map_err(|_| Error::bad_database("Invalid room event in database."))?;

 	// Setting events_default and invite to the greater of 50 and users_default + 1
-	let new_level = max(
-		int!(50),
-		power_levels_event_content
-			.users_default
-			.checked_add(int!(1))
-			.ok_or_else(|| {
-				Error::BadRequest(ErrorKind::BadJson, "users_default power levels event content is not valid")
-			})?,
-	);
+	let new_level = max(int!(50), power_levels_event_content.users_default + int!(1));
 	power_levels_event_content.events_default = new_level;
 	power_levels_event_content.invite = new_level;

@@ -839,154 +962,3 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 		replacement_room,
 	})
 }
-
-/// creates the power_levels_content for the PDU builder
-fn default_power_levels_content(
-	power_level_content_override: &Option<Raw<RoomPowerLevelsEventContent>>, visibility: &room::Visibility,
-	users: BTreeMap<OwnedUserId, Int>,
-) -> Result<serde_json::Value> {
-	let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent {
-		users,
-		..Default::default()
-	})
-	.expect("event is valid, we just created it");
-
-	// secure proper defaults of sensitive/dangerous permissions that moderators
-	// (power level 50) should not have easy access to
-	power_levels_content["events"]["m.room.power_levels"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.server_acl"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.tombstone"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.encryption"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.history_visibility"] =
-		serde_json::to_value(100).expect("100 is valid Value");
-
-	// synapse does this too. clients do not expose these permissions. it prevents
-	// default users from calling public rooms, for obvious reasons.
-	if *visibility == room::Visibility::Public {
-		power_levels_content["events"]["m.call.invite"] = serde_json::to_value(50).expect("50 is valid Value");
-		power_levels_content["events"]["org.matrix.msc3401.call"] =
-			serde_json::to_value(50).expect("50 is valid Value");
-		power_levels_content["events"]["org.matrix.msc3401.call.member"] =
-			serde_json::to_value(50).expect("50 is valid Value");
-	}
-
-	if let Some(power_level_content_override) = power_level_content_override {
-		let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
-			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;
-
-		for (key, value) in json {
-			power_levels_content[key] = value;
-		}
-	}
-
-	Ok(power_levels_content)
-}
-
-/// if a room is being created with a room alias, run our checks
-async fn room_alias_check(
-	room_alias_name: &String, appservice_info: &Option<RegistrationInfo>,
-) -> Result<OwnedRoomAliasId> {
-	// Basic checks on the room alias validity
-	if room_alias_name.contains(':') {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Room alias contained `:` which is not allowed. Please note that this expects a localpart, not the full \
-			 room alias.",
-		));
-	} else if room_alias_name.contains(char::is_whitespace) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Room alias contained spaces which is not a valid room alias.",
-		));
-	} else if room_alias_name.len() > 255 {
-		// there is nothing spec-wise saying to check the limit of this,
-		// however absurdly long room aliases are guaranteed to be unreadable or done
-		// maliciously. there is no reason a room alias should even exceed 100
-		// characters as is. generally in spec, 255 is matrix's fav number
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
-		));
-	} else if room_alias_name.contains('"') {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Room alias contained `\"` which is not allowed.",
-		));
-	}
-
-	// check if room alias is forbidden
-	if services()
-		.globals
-		.forbidden_alias_names()
-		.is_match(room_alias_name)
-	{
-		return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
-	}
-
-	let full_room_alias = RoomAliasId::parse(format!("#{}:{}", room_alias_name, services().globals.config.server_name))
-		.map_err(|e| {
-			info!("Failed to parse room alias {room_alias_name}: {e}");
-			Error::BadRequest(ErrorKind::InvalidParam, "Invalid room alias specified.")
-		})?;
-
-	if services()
-		.rooms
-		.alias
-		.resolve_local_alias(&full_room_alias)?
-		.is_some()
-	{
-		return Err(Error::BadRequest(ErrorKind::RoomInUse, "Room alias already exists."));
-	}
-
-	if let Some(ref info) = appservice_info {
-		if !info.aliases.is_match(full_room_alias.as_str()) {
-			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
-		}
-	} else if services()
-		.appservice
-		.is_exclusive_alias(&full_room_alias)
-		.await
-	{
-		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
-	}
-
-	debug_info!("Full room alias: {full_room_alias}");
-
-	Ok(full_room_alias)
-}
-
-/// if a room is being created with a custom room ID, run our checks against it
-fn custom_room_id_check(custom_room_id: &String) -> Result<OwnedRoomId> {
-	// apply forbidden room alias checks to custom room IDs too
-	if services()
-		.globals
-		.forbidden_alias_names()
-		.is_match(custom_room_id)
-	{
-		return Err(Error::BadRequest(ErrorKind::Unknown, "Custom room ID is forbidden."));
-	}
-
-	if custom_room_id.contains(':') {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Custom room ID contained `:` which is not allowed. Please note that this expects a localpart, not the \
-			 full room ID.",
-		));
-	} else if custom_room_id.contains(char::is_whitespace) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Custom room ID contained spaces which is not valid.",
-		));
-	} else if custom_room_id.len() > 255 {
-		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
-	}
-
-	let full_room_id = format!("!{}:{}", custom_room_id, services().globals.config.server_name);
-
-	debug_info!("Full custom room ID: {full_room_id}");
-
-	RoomId::parse(full_room_id).map_err(|e| {
-		info!("User attempted to create room with custom room ID {custom_room_id} but failed parsing: {e}");
-		Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID could not be parsed")
-	})
-}
@@ -10,7 +10,7 @@ use ruma::{
 	},
 	events::AnyStateEvent,
 	serde::Raw,
-	uint, OwnedRoomId,
+	OwnedRoomId,
 };
 use tracing::debug;

@@ -22,7 +22,7 @@ use crate::{services, Error, Result, Ruma};
 ///
 /// - Only works if the user is currently joined to the room (TODO: Respect
 ///   history visibility)
-pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>) -> Result<search_events::v3::Response> {
+pub async fn search_events_route(body: Ruma<search_events::v3::Request>) -> Result<search_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let search_criteria = body.search_categories.room_events.as_ref().unwrap();
@@ -39,12 +39,7 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 	});

 	// Use limit or else 10, with maximum 100
-	let limit: usize = filter
-		.limit
-		.unwrap_or_else(|| uint!(10))
-		.try_into()
-		.unwrap_or(10)
-		.min(100);
+	let limit = filter.limit.map_or(10, u64::from).min(100) as usize;

 	let mut room_states: BTreeMap<OwnedRoomId, Vec<Raw<AnyStateEvent>>> = BTreeMap::new();

@@ -111,16 +106,14 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 		}
 	}

-	let skip: usize = match body.next_batch.as_ref().map(|s| s.parse()) {
+	let skip = match body.next_batch.as_ref().map(|s| s.parse()) {
 		Some(Ok(s)) => s,
 		Some(Err(_)) => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid next_batch token.")),
 		None => 0, // Default to the start
 	};

 	let mut results = Vec::new();
-	let next_batch: usize = skip.saturating_add(limit);
-
-	for _ in 0..next_batch {
+	for _ in 0..skip + limit {
 		if let Some(s) = searches
 			.iter_mut()
 			.map(|s| (s.peek().cloned(), s))
@@ -169,12 +162,12 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 	let next_batch = if results.len() < limit {
 		None
 	} else {
-		Some(next_batch.to_string())
+		Some((skip + limit).to_string())
 	};

 	Ok(search_events::v3::Response::new(ResultCategories {
 		room_events: ResultRoomEvents {
-			count: Some(results.len().try_into().unwrap_or_else(|_| uint!(0))),
+			count: Some((results.len() as u32).into()),
 			groups: BTreeMap::new(), // TODO
 			next_batch,
 			results,
@@ -18,7 +18,7 @@ use ruma::{
 	UserId,
 };
 use serde::Deserialize;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};

 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::{services, utils, Error, Result, Ruma};
@@ -33,9 +33,7 @@ struct Claims {
 ///
 /// Get the supported login types of this server. One of these should be used as
 /// the `type` field when logging in.
-pub(crate) async fn get_login_types_route(
-	_body: Ruma<get_login_types::v3::Request>,
-) -> Result<get_login_types::v3::Response> {
+pub async fn get_login_types_route(_body: Ruma<get_login_types::v3::Request>) -> Result<get_login_types::v3::Response> {
 	Ok(get_login_types::v3::Response::new(vec![
 		get_login_types::v3::LoginType::Password(PasswordLoginType::default()),
 		get_login_types::v3::LoginType::ApplicationService(ApplicationServiceLoginType::default()),
@@ -56,7 +54,7 @@ pub(crate) async fn get_login_types_route(
 /// Note: You can use [`GET
 /// /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
-pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Response> {
+pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Response> {
 	// Validate login method
 	// TODO: Other login methods
 	let user_id = match &body.login_info {
@@ -76,7 +74,14 @@ pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login:
 				warn!("Bad login type: {:?}", &body.login_info);
 				return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
 			}
-			.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
+			.map_err(|e| {
+				warn!("Failed to parse username from user logging in: {e}");
+				Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+			})?;
+
+			if services().appservice.is_exclusive_user_id(&user_id).await {
+				return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
+			}

 			let hash = services()
 				.users
@@ -87,15 +92,18 @@ pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login:
 				return Err(Error::BadRequest(ErrorKind::UserDeactivated, "The user has been deactivated"));
 			}

-			let parsed_hash = PasswordHash::new(&hash)
-				.map_err(|_| Error::BadServerResponse("Unknown error occurred hashing password."))?;
+			let Ok(parsed_hash) = PasswordHash::new(&hash) else {
+				error!("error while hashing user {}", user_id);
+				return Err(Error::BadServerResponse("could not hash"));
+			};

-			if services()
+			let hash_matches = services()
 				.globals
 				.argon
 				.verify_password(password.as_bytes(), &parsed_hash)
-				.is_err()
-			{
+				.is_ok();
+
+			if !hash_matches {
 				return Err(Error::BadRequest(ErrorKind::forbidden(), "Wrong username or password."));
 			}

@@ -115,10 +123,17 @@ pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login:

 				let username = token.claims.sub.to_lowercase();

-				UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
-					warn!("Failed to parse username from user logging in: {e}");
-					Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
-				})?
+				let user_id =
+					UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
+						warn!("Failed to parse username from user logging in: {e}");
+						Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+					})?;
+
+				if services().appservice.is_exclusive_user_id(&user_id).await {
+					return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
+				}
+
+				user_id
 			} else {
 				return Err(Error::BadRequest(
 					ErrorKind::Unknown,
@@ -220,7 +235,7 @@ pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login:
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub(crate) async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3::Response> {
+pub async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -245,7 +260,7 @@ pub(crate) async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logo
 /// Note: This is equivalent to calling [`GET
 /// /_matrix/client/r0/logout`](fn.logout_route.html) from each device of this
 /// user.
-pub(crate) async fn logout_all_route(body: Ruma<logout_all::v3::Request>) -> Result<logout_all::v3::Response> {
+pub async fn logout_all_route(body: Ruma<logout_all::v3::Request>) -> Result<logout_all::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	for device_id in services().users.all_device_ids(sender_user).flatten() {
@@ -2,7 +2,7 @@ use std::str::FromStr;

 use ruma::{
 	api::client::{error::ErrorKind, space::get_hierarchy},
-	uint, UInt,
+	UInt,
 };

 use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Ruma};
@@ -11,15 +11,13 @@ use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Rum
 ///
 /// Paginates over the space tree in a depth-first manner to locate child rooms
 /// of a given space.
-pub(crate) async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
+pub async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-	let limit: usize = body
+	let limit = body
 		.limit
-		.unwrap_or_else(|| uint!(10))
-		.try_into()
-		.unwrap_or(10)
-		.min(100);
+		.unwrap_or_else(|| UInt::from(10_u32))
+		.min(UInt::from(100_u32));

 	let max_depth = body
 		.max_depth
@@ -47,9 +45,9 @@ pub(crate) async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>)
 		.get_client_hierarchy(
 			sender_user,
 			&body.room_id,
-			limit,
-			key.map_or(0, |token| token.skip.try_into().unwrap_or(0)),
-			max_depth.try_into().unwrap_or(3),
+			u64::from(limit) as usize,
+			key.map_or(0, |token| u64::from(token.skip) as usize),
+			u64::from(max_depth) as usize,
 			body.suggested_only,
 		)
 		.await
@@ -8,7 +8,6 @@ use ruma::{
 	events::{
 		room::{
 			canonical_alias::RoomCanonicalAliasEventContent,
-			history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
 			join_rules::{JoinRule, RoomJoinRulesEventContent},
 		},
 		AnyStateEventContent, StateEventType,
@@ -20,9 +19,7 @@ use tracing::{error, log::warn};

 use crate::{
 	service::{self, pdu::PduBuilder},
-	services,
-	utils::server_name::server_is_ours,
-	Error, Result, Ruma, RumaResponse,
+	services, Error, Result, Ruma, RumaResponse,
 };

 /// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}/{stateKey}`
@@ -33,7 +30,7 @@ use crate::{
 /// - Tries to send the event into the room, auth rules will determine if it is
 ///   allowed
 /// - If event is new `canonical_alias`: Rejects if alias is incorrect
-pub(crate) async fn send_state_event_for_key_route(
+pub async fn send_state_event_for_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<send_state_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -42,7 +39,7 @@ pub(crate) async fn send_state_event_for_key_route(
 		sender_user,
 		&body.room_id,
 		&body.event_type,
-		&body.body.body,
+		&body.body.body, // Yes, I hate it too
 		body.state_key.clone(),
 	)
 	.await?;
@@ -61,10 +58,25 @@ pub(crate) async fn send_state_event_for_key_route(
 /// - Tries to send the event into the room, auth rules will determine if it is
 ///   allowed
 /// - If event is new `canonical_alias`: Rejects if alias is incorrect
-pub(crate) async fn send_state_event_for_empty_key_route(
+pub async fn send_state_event_for_empty_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<RumaResponse<send_state_event::v3::Response>> {
-	send_state_event_for_key_route(body).await.map(RumaResponse)
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	let event_id = send_state_event_for_key_helper(
+		sender_user,
+		&body.room_id,
+		&body.event_type.to_string().into(),
+		&body.body.body,
+		body.state_key.clone(),
+	)
+	.await?;
+
+	let event_id = (*event_id).to_owned();
+	Ok(send_state_event::v3::Response {
+		event_id,
+	}
+	.into())
 }

 /// # `GET /_matrix/client/v3/rooms/{roomid}/state`
@@ -73,7 +85,7 @@ pub(crate) async fn send_state_event_for_empty_key_route(
 ///
 /// - If not joined: Only works if current room history visibility is world
 ///   readable
-pub(crate) async fn get_state_events_route(
+pub async fn get_state_events_route(
 	body: Ruma<get_state_events::v3::Request>,
 ) -> Result<get_state_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -109,7 +121,7 @@ pub(crate) async fn get_state_events_route(
 ///
 /// - If not joined: Only works if current room history visibility is world
 ///   readable
-pub(crate) async fn get_state_events_for_key_route(
+pub async fn get_state_events_for_key_route(
 	body: Ruma<get_state_events_for_key::v3::Request>,
 ) -> Result<get_state_events_for_key::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -164,16 +176,109 @@ pub(crate) async fn get_state_events_for_key_route(
 ///
 /// - If not joined: Only works if current room history visibility is world
 ///   readable
-pub(crate) async fn get_state_events_for_empty_key_route(
+pub async fn get_state_events_for_empty_key_route(
 	body: Ruma<get_state_events_for_key::v3::Request>,
 ) -> Result<RumaResponse<get_state_events_for_key::v3::Response>> {
-	get_state_events_for_key_route(body).await.map(RumaResponse)
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	if !services()
+		.rooms
+		.state_accessor
+		.user_can_see_state_events(sender_user, &body.room_id)?
+	{
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"You don't have permission to view the room state.",
+		));
+	}
+
+	let event = services()
+		.rooms
+		.state_accessor
+		.room_state_get(&body.room_id, &body.event_type, "")?
+		.ok_or_else(|| {
+			warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
+			Error::BadRequest(ErrorKind::NotFound, "State event not found.")
+		})?;
+
+	if body
+		.format
+		.as_ref()
+		.is_some_and(|f| f.to_lowercase().eq("event"))
+	{
+		Ok(get_state_events_for_key::v3::Response {
+			content: None,
+			event: serde_json::from_str(event.to_state_event().json().get()).map_err(|e| {
+				error!("Invalid room state event in database: {}", e);
+				Error::bad_database("Invalid room state event in database")
+			})?,
+		}
+		.into())
+	} else {
+		Ok(get_state_events_for_key::v3::Response {
+			content: Some(serde_json::from_str(event.content.get()).map_err(|e| {
+				error!("Invalid room state event content in database: {}", e);
+				Error::bad_database("Invalid room state event content in database")
+			})?),
+			event: None,
+		}
+		.into())
+	}
 }

 async fn send_state_event_for_key_helper(
 	sender: &UserId, room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>, state_key: String,
 ) -> Result<Arc<EventId>> {
-	allowed_to_send_state_event(room_id, event_type, json).await?;
+	match *event_type {
+		// Forbid m.room.encryption if encryption is disabled
+		StateEventType::RoomEncryption => {
+			if !services().globals.allow_encryption() {
+				return Err(Error::BadRequest(ErrorKind::forbidden(), "Encryption has been disabled"));
+			}
+		},
+		// admin room is a sensitive room, it should not ever be made public
+		StateEventType::RoomJoinRules => {
+			if let Some(admin_room_id) = service::admin::Service::get_admin_room()? {
+				if admin_room_id == room_id {
+					if let Ok(join_rule) = serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get()) {
+						if join_rule.join_rule == JoinRule::Public {
+							return Err(Error::BadRequest(
+								ErrorKind::forbidden(),
+								"Admin room is not allowed to be public.",
+							));
+						}
+					}
+				}
+			}
+		},
+		// TODO: allow alias if it previously existed
+		StateEventType::RoomCanonicalAlias => {
+			if let Ok(canonical_alias) = serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get()) {
+				let mut aliases = canonical_alias.alt_aliases.clone();
+
+				if let Some(alias) = canonical_alias.alias {
+					aliases.push(alias);
+				}
+
+				for alias in aliases {
+					if alias.server_name() != services().globals.server_name()
+						|| services()
+                        .rooms
+                        .alias
+                        .resolve_local_alias(&alias)?
+                        .filter(|room| room == room_id) // Make sure it's the right room
+                        .is_none()
+					{
+						return Err(Error::BadRequest(
+							ErrorKind::forbidden(),
+							"You are only allowed to send canonical_alias events when its aliases already exist",
+						));
+					}
+				}
+			}
+		},
+		_ => {},
+	}

 	let mutex_state = Arc::clone(
 		services()
@@ -205,76 +310,3 @@ async fn send_state_event_for_key_helper(

 	Ok(event_id)
 }
-
-async fn allowed_to_send_state_event(
-	room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>,
-) -> Result<()> {
-	match event_type {
-		// Forbid m.room.encryption if encryption is disabled
-		StateEventType::RoomEncryption => {
-			if !services().globals.allow_encryption() {
-				return Err(Error::BadRequest(ErrorKind::forbidden(), "Encryption has been disabled"));
-			}
-		},
-		// admin room is a sensitive room, it should not ever be made public
-		StateEventType::RoomJoinRules => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
-				if admin_room_id == room_id {
-					if let Ok(join_rule) = serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get()) {
-						if join_rule.join_rule == JoinRule::Public {
-							return Err(Error::BadRequest(
-								ErrorKind::forbidden(),
-								"Admin room is not allowed to be public.",
-							));
-						}
-					}
-				}
-			}
-		},
-		// admin room is a sensitive room, it should not ever be made world readable
-		StateEventType::RoomHistoryVisibility => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
-				if admin_room_id == room_id {
-					if let Ok(visibility_content) =
-						serde_json::from_str::<RoomHistoryVisibilityEventContent>(json.json().get())
-					{
-						if visibility_content.history_visibility == HistoryVisibility::WorldReadable {
-							return Err(Error::BadRequest(
-								ErrorKind::forbidden(),
-								"Admin room is not allowed to be made world readable (public room history).",
-							));
-						}
-					}
-				}
-			}
-		},
-		// TODO: allow alias if it previously existed
-		StateEventType::RoomCanonicalAlias => {
-			if let Ok(canonical_alias) = serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get()) {
-				let mut aliases = canonical_alias.alt_aliases.clone();
-
-				if let Some(alias) = canonical_alias.alias {
-					aliases.push(alias);
-				}
-
-				for alias in aliases {
-					if !server_is_ours(alias.server_name())
-						|| services()
-                           .rooms
-                           .alias
-                           .resolve_local_alias(&alias)?
-                           .filter(|room| room == room_id) // Make sure it's the right room
-                           .is_none()
-					{
-						return Err(Error::BadRequest(
-							ErrorKind::forbidden(),
-							"You are only allowed to send canonical_alias events when its aliases already exist",
-						));
-					}
-				}
-			}
-		},
-		_ => (),
-	}
-	Ok(())
-}
@@ -28,7 +28,7 @@ use ruma::{
 	uint, DeviceId, EventId, OwnedDeviceId, OwnedUserId, RoomId, UInt, UserId,
 };
 use tokio::sync::watch::Sender;
-use tracing::{debug, error, Instrument as _, Span};
+use tracing::{debug, error};

 use crate::{
 	service::{pdu::EventHash, rooms::timeline::PduCount},
@@ -77,7 +77,7 @@ use crate::{
 /// - Sync is handled in an async task, multiple requests from the same device
 ///   with the same
 /// `since` will be cached
-pub(crate) async fn sync_events_route(
+pub async fn sync_events_route(
 	body: Ruma<sync_events::v3::Request>,
 ) -> Result<sync_events::v3::Response, RumaResponse<UiaaResponse>> {
 	let sender_user = body.sender_user.expect("user is authenticated");
@@ -271,17 +271,164 @@ async fn sync_helper(
 		.rooms_left(&sender_user)
 		.collect();
 	for result in all_left_rooms {
-		handle_left_room(
-			since,
-			&result?.0,
-			&sender_user,
-			&mut left_rooms,
-			&next_batch_string,
-			full_state,
-			lazy_load_enabled,
-		)
-		.instrument(Span::current())
-		.await?;
+		let (room_id, _) = result?;
+
+		{
+			// Get and drop the lock to wait for remaining operations to finish
+			let mutex_insert = Arc::clone(
+				services()
+					.globals
+					.roomid_mutex_insert
+					.write()
+					.await
+					.entry(room_id.clone())
+					.or_default(),
+			);
+			let insert_lock = mutex_insert.lock().await;
+			drop(insert_lock);
+		};
+
+		let left_count = services()
+			.rooms
+			.state_cache
+			.get_left_count(&room_id, &sender_user)?;
+
+		// Left before last sync
+		if Some(since) >= left_count {
+			continue;
+		}
+
+		if !services().rooms.metadata.exists(&room_id)? {
+			// This is just a rejected invite, not a room we know
+			// Insert a leave event anyways
+			let event = PduEvent {
+				event_id: EventId::new(services().globals.server_name()).into(),
+				sender: sender_user.clone(),
+				origin: None,
+				origin_server_ts: utils::millis_since_unix_epoch()
+					.try_into()
+					.expect("Timestamp is valid js_int value"),
+				kind: TimelineEventType::RoomMember,
+				content: serde_json::from_str(r#"{"membership":"leave"}"#).expect("this is valid JSON"),
+				state_key: Some(sender_user.to_string()),
+				unsigned: None,
+				// The following keys are dropped on conversion
+				room_id: room_id.clone(),
+				prev_events: vec![],
+				depth: uint!(1),
+				auth_events: vec![],
+				redacts: None,
+				hashes: EventHash {
+					sha256: String::new(),
+				},
+				signatures: None,
+			};
+
+			left_rooms.insert(
+				room_id,
+				LeftRoom {
+					account_data: RoomAccountData {
+						events: Vec::new(),
+					},
+					timeline: Timeline {
+						limited: false,
+						prev_batch: Some(next_batch_string.clone()),
+						events: Vec::new(),
+					},
+					state: State {
+						events: vec![event.to_sync_state_event()],
+					},
+				},
+			);
+			continue;
+		}
+
+		let mut left_state_events = Vec::new();
+
+		let since_shortstatehash = services()
+			.rooms
+			.user
+			.get_token_shortstatehash(&room_id, since)?;
+
+		let since_state_ids = match since_shortstatehash {
+			Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
+			None => HashMap::new(),
+		};
+
+		let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id(
+			&room_id,
+			&StateEventType::RoomMember,
+			sender_user.as_str(),
+		)?
+		else {
+			error!("Left room but no left state event");
+			continue;
+		};
+
+		let Some(left_shortstatehash) = services()
+			.rooms
+			.state_accessor
+			.pdu_shortstatehash(&left_event_id)?
+		else {
+			error!("Leave event has no state");
+			continue;
+		};
+
+		let mut left_state_ids = services()
+			.rooms
+			.state_accessor
+			.state_full_ids(left_shortstatehash)
+			.await?;
+
+		let leave_shortstatekey = services()
+			.rooms
+			.short
+			.get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
+
+		left_state_ids.insert(leave_shortstatekey, left_event_id);
+
+		let mut i = 0;
+		for (key, id) in left_state_ids {
+			if full_state || since_state_ids.get(&key) != Some(&id) {
+				let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?;
+
+				if !lazy_load_enabled
+                    || event_type != StateEventType::RoomMember
+                    || full_state
+                    // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
+                    || (cfg!(feature = "element_hacks") && *sender_user == state_key)
+				{
+					let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+						error!("Pdu in state not found: {}", id);
+						continue;
+					};
+
+					left_state_events.push(pdu.to_sync_state_event());
+
+					i += 1;
+					if i % 100 == 0 {
+						tokio::task::yield_now().await;
+					}
+				}
+			}
+		}
+
+		left_rooms.insert(
+			room_id.clone(),
+			LeftRoom {
+				account_data: RoomAccountData {
+					events: Vec::new(),
+				},
+				timeline: Timeline {
+					limited: false,
+					prev_batch: Some(next_batch_string.clone()),
+					events: Vec::new(),
+				},
+				state: State {
+					events: left_state_events,
+				},
+			},
+		);
 	}

 	let mut invited_rooms = BTreeMap::new();
@@ -420,170 +567,6 @@ async fn sync_helper(
 	}
 }

-#[tracing::instrument(skip_all, fields(user_id = %sender_user, room_id = %room_id))]
-async fn handle_left_room(
-	since: u64, room_id: &RoomId, sender_user: &UserId, left_rooms: &mut BTreeMap<ruma::OwnedRoomId, LeftRoom>,
-	next_batch_string: &str, full_state: bool, lazy_load_enabled: bool,
-) -> Result<()> {
-	{
-		// Get and drop the lock to wait for remaining operations to finish
-		let mutex_insert = Arc::clone(
-			services()
-				.globals
-				.roomid_mutex_insert
-				.write()
-				.await
-				.entry(room_id.to_owned())
-				.or_default(),
-		);
-		let insert_lock = mutex_insert.lock().await;
-		drop(insert_lock);
-	};
-
-	let left_count = services()
-		.rooms
-		.state_cache
-		.get_left_count(room_id, sender_user)?;
-
-	// Left before last sync
-	if Some(since) >= left_count {
-		return Ok(());
-	}
-
-	if !services().rooms.metadata.exists(room_id)? {
-		// This is just a rejected invite, not a room we know
-		// Insert a leave event anyways
-		let event = PduEvent {
-			event_id: EventId::new(services().globals.server_name()).into(),
-			sender: sender_user.to_owned(),
-			origin: None,
-			origin_server_ts: utils::millis_since_unix_epoch()
-				.try_into()
-				.expect("Timestamp is valid js_int value"),
-			kind: TimelineEventType::RoomMember,
-			content: serde_json::from_str(r#"{"membership":"leave"}"#).expect("this is valid JSON"),
-			state_key: Some(sender_user.to_string()),
-			unsigned: None,
-			// The following keys are dropped on conversion
-			room_id: room_id.to_owned(),
-			prev_events: vec![],
-			depth: uint!(1),
-			auth_events: vec![],
-			redacts: None,
-			hashes: EventHash {
-				sha256: String::new(),
-			},
-			signatures: None,
-		};
-
-		left_rooms.insert(
-			room_id.to_owned(),
-			LeftRoom {
-				account_data: RoomAccountData {
-					events: Vec::new(),
-				},
-				timeline: Timeline {
-					limited: false,
-					prev_batch: Some(next_batch_string.to_owned()),
-					events: Vec::new(),
-				},
-				state: State {
-					events: vec![event.to_sync_state_event()],
-				},
-			},
-		);
-		return Ok(());
-	}
-
-	let mut left_state_events = Vec::new();
-
-	let since_shortstatehash = services()
-		.rooms
-		.user
-		.get_token_shortstatehash(room_id, since)?;
-
-	let since_state_ids = match since_shortstatehash {
-		Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
-		None => HashMap::new(),
-	};
-
-	let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id(
-		room_id,
-		&StateEventType::RoomMember,
-		sender_user.as_str(),
-	)?
-	else {
-		error!("Left room but no left state event");
-		return Ok(());
-	};
-
-	let Some(left_shortstatehash) = services()
-		.rooms
-		.state_accessor
-		.pdu_shortstatehash(&left_event_id)?
-	else {
-		error!(event_id = %left_event_id, "Leave event has no state");
-		return Ok(());
-	};
-
-	let mut left_state_ids = services()
-		.rooms
-		.state_accessor
-		.state_full_ids(left_shortstatehash)
-		.await?;
-
-	let leave_shortstatekey = services()
-		.rooms
-		.short
-		.get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
-
-	left_state_ids.insert(leave_shortstatekey, left_event_id);
-
-	let mut i: u8 = 0;
-	for (key, id) in left_state_ids {
-		if full_state || since_state_ids.get(&key) != Some(&id) {
-			let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?;
-
-			if !lazy_load_enabled
-                    || event_type != StateEventType::RoomMember
-                    || full_state
-                    // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
-                    || (cfg!(feature = "element_hacks") && *sender_user == state_key)
-			{
-				let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
-					error!("Pdu in state not found: {}", id);
-					continue;
-				};
-
-				left_state_events.push(pdu.to_sync_state_event());
-
-				i = i.wrapping_add(1);
-				if i % 100 == 0 {
-					tokio::task::yield_now().await;
-				}
-			}
-		}
-	}
-
-	left_rooms.insert(
-		room_id.to_owned(),
-		LeftRoom {
-			account_data: RoomAccountData {
-				events: Vec::new(),
-			},
-			timeline: Timeline {
-				limited: false,
-				prev_batch: Some(next_batch_string.to_owned()),
-				events: Vec::new(),
-			},
-			state: State {
-				events: left_state_events,
-			},
-		},
-	);
-	Ok(())
-}
-
 async fn process_presence_updates(
 	presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, since: u64, syncing_user: &OwnedUserId,
 ) -> Result<()> {
@@ -705,7 +688,7 @@ async fn load_joined_room(
 				// Recalculate heroes (first 5 members)
 				let mut heroes = Vec::new();

-				if joined_member_count.saturating_add(invited_member_count) <= 5 {
+				if joined_member_count + invited_member_count <= 5 {
 					// Go through all PDUs and for each member event, check if the user is still
 					// joined or invited until we have 5 or we reach the end

@@ -784,7 +767,7 @@ async fn load_joined_room(
 				let mut state_events = Vec::new();
 				let mut lazy_loaded = HashSet::new();

-				let mut i: u8 = 0;
+				let mut i = 0;
 				for (shortstatekey, id) in current_state_ids {
 					let (event_type, state_key) = services()
 						.rooms
@@ -798,7 +781,7 @@ async fn load_joined_room(
 						};
 						state_events.push(pdu);

-						i = i.wrapping_add(1);
+						i += 1;
 						if i % 100 == 0 {
 							tokio::task::yield_now().await;
 						}
@@ -819,7 +802,7 @@ async fn load_joined_room(
 						}
 						state_events.push(pdu);

-						i = i.wrapping_add(1);
+						i += 1;
 						if i % 100 == 0 {
 							tokio::task::yield_now().await;
 						}
@@ -1189,7 +1172,7 @@ fn share_encrypted_room(sender_user: &UserId, user_id: &UserId, ignore_room: &Ro
 /// POST `/_matrix/client/unstable/org.matrix.msc3575/sync`
 ///
 /// Sliding Sync endpoint (future endpoint: `/_matrix/client/v4/sync`)
-pub(crate) async fn sync_events_v4_route(
+pub async fn sync_events_v4_route(
 	body: Ruma<sync_events::v4::Request>,
 ) -> Result<sync_events::v4::Response, RumaResponse<UiaaResponse>> {
 	let sender_user = body.sender_user.expect("user is authenticated");
@@ -1416,14 +1399,10 @@ pub(crate) async fn sync_events_v4_route(
 					.ranges
 					.into_iter()
 					.map(|mut r| {
-						r.0 = r.0.clamp(
-							uint!(0),
-							UInt::try_from(all_joined_rooms.len().saturating_sub(1)).unwrap_or(UInt::MAX),
-						);
-						r.1 = r.1.clamp(
-							r.0,
-							UInt::try_from(all_joined_rooms.len().saturating_sub(1)).unwrap_or(UInt::MAX),
-						);
+						r.0 =
+							r.0.clamp(uint!(0), UInt::from(all_joined_rooms.len() as u32 - 1));
+						r.1 =
+							r.1.clamp(r.0, UInt::from(all_joined_rooms.len() as u32 - 1));
 						let room_ids = all_joined_rooms[(u64::from(r.0) as usize)..=(u64::from(r.1) as usize)].to_vec();
 						new_known_rooms.extend(room_ids.iter().cloned());
 						for room_id in &room_ids {
@@ -1596,13 +1575,14 @@ pub(crate) async fn sync_events_v4_route(
 			.collect::<Vec<_>>();
 		let name = match heroes.len().cmp(&(1_usize)) {
 			Ordering::Greater => {
-				let firsts = heroes[1..]
-					.iter()
-					.map(|h| h.0.clone())
-					.collect::<Vec<_>>()
-					.join(", ");
 				let last = heroes[0].0.clone();
-				Some(format!("{firsts} and {last}"))
+				Some(
+					heroes[1..]
+						.iter()
+						.map(|h| h.0.clone())
+						.collect::<Vec<_>>()
+						.join(", ") + " and " + &last,
+				)
 			},
 			Ordering::Equal => Some(heroes[0].0.clone()),
 			Ordering::Less => None,
@@ -15,7 +15,7 @@ use crate::{services, Error, Result, Ruma};
 /// Adds a tag to the room.
 ///
 /// - Inserts the tag into the tag event of the room account data.
-pub(crate) async fn update_tag_route(body: Ruma<create_tag::v3::Request>) -> Result<create_tag::v3::Response> {
+pub async fn update_tag_route(body: Ruma<create_tag::v3::Request>) -> Result<create_tag::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let event = services()
@@ -53,7 +53,7 @@ pub(crate) async fn update_tag_route(body: Ruma<create_tag::v3::Request>) -> Res
 /// Deletes a tag from the room.
 ///
 /// - Removes the tag from the tag event of the room account data.
-pub(crate) async fn delete_tag_route(body: Ruma<delete_tag::v3::Request>) -> Result<delete_tag::v3::Response> {
+pub async fn delete_tag_route(body: Ruma<delete_tag::v3::Request>) -> Result<delete_tag::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let event = services()
@@ -88,7 +88,7 @@ pub(crate) async fn delete_tag_route(body: Ruma<delete_tag::v3::Request>) -> Res
 /// Returns tags on the room.
 ///
 /// - Gets the tag event of the room account data.
-pub(crate) async fn get_tags_route(body: Ruma<get_tags::v3::Request>) -> Result<get_tags::v3::Response> {
+pub async fn get_tags_route(body: Ruma<get_tags::v3::Request>) -> Result<get_tags::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let event = services()
@@ -7,9 +7,7 @@ use crate::{Result, Ruma};
 /// # `GET /_matrix/client/r0/thirdparty/protocols`
 ///
 /// TODO: Fetches all metadata about protocols supported by the homeserver.
-pub(crate) async fn get_protocols_route(
-	_body: Ruma<get_protocols::v3::Request>,
-) -> Result<get_protocols::v3::Response> {
+pub async fn get_protocols_route(_body: Ruma<get_protocols::v3::Request>) -> Result<get_protocols::v3::Response> {
 	// TODO
 	Ok(get_protocols::v3::Response {
 		protocols: BTreeMap::new(),
@@ -1,19 +1,15 @@
-use ruma::{
-	api::client::{error::ErrorKind, threads::get_threads},
-	uint,
-};
+use ruma::api::client::{error::ErrorKind, threads::get_threads};

 use crate::{services, Error, Result, Ruma};

 /// # `GET /_matrix/client/r0/rooms/{roomId}/threads`
-pub(crate) async fn get_threads_route(body: Ruma<get_threads::v1::Request>) -> Result<get_threads::v1::Response> {
+pub async fn get_threads_route(body: Ruma<get_threads::v1::Request>) -> Result<get_threads::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	// Use limit or else 10, with maximum 100
 	let limit = body
 		.limit
-		.unwrap_or_else(|| uint!(10))
-		.try_into()
+		.and_then(|l| l.try_into().ok())
 		.unwrap_or(10)
 		.min(100);

@@ -8,12 +8,12 @@ use ruma::{
 	to_device::DeviceIdOrAllDevices,
 };

-use crate::{services, utils::user_id::user_is_local, Error, Result, Ruma};
+use crate::{services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
 /// Send a to-device event to a set of client devices.
-pub(crate) async fn send_event_to_device_route(
+pub async fn send_event_to_device_route(
 	body: Ruma<send_event_to_device::v3::Request>,
 ) -> Result<send_event_to_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -30,7 +30,7 @@ pub(crate) async fn send_event_to_device_route(

 	for (target_user_id, map) in &body.messages {
 		for (target_device_id_maybe, event) in map {
-			if !user_is_local(target_user_id) {
+			if target_user_id.server_name() != services().globals.server_name() {
 				let mut map = BTreeMap::new();
 				map.insert(target_device_id_maybe.clone(), event.clone());
 				let mut messages = BTreeMap::new();
@@ -5,7 +5,7 @@ use crate::{services, utils, Error, Result, Ruma};
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
 /// Sets the typing state of the sender user.
-pub(crate) async fn create_typing_event_route(
+pub async fn create_typing_event_route(
 	body: Ruma<create_typing_event::v3::Request>,
 ) -> Result<create_typing_event::v3::Response> {
 	use create_typing_event::v3::Typing;
@@ -22,30 +22,14 @@ pub(crate) async fn create_typing_event_route(

 	if let Typing::Yes(duration) = body.state {
 		let duration = utils::clamp(
-			duration.as_millis().try_into().unwrap_or(u64::MAX),
-			services()
-				.globals
-				.config
-				.typing_client_timeout_min_s
-				.checked_mul(1000)
-				.unwrap(),
-			services()
-				.globals
-				.config
-				.typing_client_timeout_max_s
-				.checked_mul(1000)
-				.unwrap(),
+			duration.as_millis() as u64,
+			services().globals.config.typing_client_timeout_min_s * 1000,
+			services().globals.config.typing_client_timeout_max_s * 1000,
 		);
 		services()
 			.rooms
 			.typing
-			.typing_add(
-				sender_user,
-				&body.room_id,
-				utils::millis_since_unix_epoch()
-					.checked_add(duration)
-					.expect("user typing timeout should not get this high"),
-			)
+			.typing_add(sender_user, &body.room_id, utils::millis_since_unix_epoch() + duration)
 			.await?;
 	} else {
 		services()
@@ -12,7 +12,7 @@ use crate::{services, Error, Result, Ruma};
 /// TODO: Implement pagination, currently this just returns everything
 ///
 /// An implementation of [MSC2666](https://github.com/matrix-org/matrix-spec-proposals/pull/2666)
-pub(crate) async fn get_mutual_rooms_route(
+pub async fn get_mutual_rooms_route(
 	body: Ruma<mutual_rooms::unstable::Request>,
 ) -> Result<mutual_rooms::unstable::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -10,7 +10,7 @@ use ruma::api::client::{
 	error::ErrorKind,
 };

-use crate::{services, utils::conduwuit_version, Error, Result, Ruma};
+use crate::{services, Error, Result, Ruma};

 /// # `GET /_matrix/client/versions`
 ///
@@ -24,7 +24,7 @@ use crate::{services, utils::conduwuit_version, Error, Result, Ruma};
 ///
 /// Note: Unstable features are used while developing new features. Clients
 /// should avoid using unstable features in their stable releases
-pub(crate) async fn get_supported_versions_route(
+pub async fn get_supported_versions_route(
 	_body: Ruma<get_supported_versions::Request>,
 ) -> Result<get_supported_versions::Response> {
 	let resp = get_supported_versions::Response {
@@ -60,9 +60,7 @@ pub(crate) async fn get_supported_versions_route(
 /// # `GET /.well-known/matrix/client`
 ///
 /// Returns the .well-known URL if it is configured, otherwise returns 404.
-pub(crate) async fn well_known_client(
-	_body: Ruma<discover_homeserver::Request>,
-) -> Result<discover_homeserver::Response> {
+pub async fn well_known_client(_body: Ruma<discover_homeserver::Request>) -> Result<discover_homeserver::Response> {
 	let client_url = match services().globals.well_known_client() {
 		Some(url) => url.to_string(),
 		None => return Err(Error::BadRequest(ErrorKind::NotFound, "Not found.")),
@@ -83,7 +81,7 @@ pub(crate) async fn well_known_client(
 /// # `GET /.well-known/matrix/support`
 ///
 /// Server support contact and support page of a homeserver's domain.
-pub(crate) async fn well_known_support(_body: Ruma<discover_support::Request>) -> Result<discover_support::Response> {
+pub async fn well_known_support(_body: Ruma<discover_support::Request>) -> Result<discover_support::Response> {
 	let support_page = services()
 		.globals
 		.well_known_support_page()
@@ -133,7 +131,7 @@ pub(crate) async fn well_known_support(_body: Ruma<discover_support::Request>) -
 ///
 /// Endpoint provided by sliding sync proxy used by some clients such as Element
 /// Web as a non-standard health check.
-pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
+pub async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 	let server_url = match services().globals.well_known_client() {
 		Some(url) => url.to_string(),
 		None => match services().globals.well_known_server() {
@@ -142,9 +140,14 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 		},
 	};

+	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
+		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
+		None => env!("CARGO_PKG_VERSION").to_owned(),
+	};
+
 	Ok(Json(serde_json::json!({
 		"server": server_url,
-		"version": conduwuit_version(),
+		"version": version,
 	})))
 }

@@ -152,9 +155,14 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 ///
 /// Conduwuit-specific API to get the server version, results akin to
 /// `/_matrix/federation/v1/version`
-pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
+pub async fn conduwuit_server_version() -> Result<impl IntoResponse> {
+	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
+		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
+		None => env!("CARGO_PKG_VERSION").to_owned(),
+	};
+
 	Ok(Json(serde_json::json!({
 		"name": "Conduwuit",
-		"version": conduwuit_version(),
+		"version": version,
 	})))
 }
@@ -15,9 +15,9 @@ use crate::{services, Result, Ruma};
 /// - Hides any local users that aren't in any public rooms (i.e. those that
 ///   have the join rule set to public)
 /// and don't share a room with the sender
-pub(crate) async fn search_users_route(body: Ruma<search_users::v3::Request>) -> Result<search_users::v3::Response> {
+pub async fn search_users_route(body: Ruma<search_users::v3::Request>) -> Result<search_users::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-	let limit = usize::try_from(body.limit).unwrap_or(10); // default limit is 10
+	let limit = u64::from(body.limit) as usize;

 	let mut users = services().users.iter().filter_map(|user_id| {
 		// Filter out buggy users (they should not exist, but you never know...)
@@ -12,7 +12,7 @@ type HmacSha1 = Hmac<Sha1>;
 /// # `GET /_matrix/client/r0/voip/turnServer`
 ///
 /// TODO: Returns information about the recommended turn server.
-pub(crate) async fn turn_server_route(
+pub async fn turn_server_route(
 	body: Ruma<get_turn_server_info::v3::Request>,
 ) -> Result<get_turn_server_info::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -21,9 +21,7 @@ pub(crate) async fn turn_server_route(

 	let (username, password) = if !turn_secret.is_empty() {
 		let expiry = SecondsSinceUnixEpoch::from_system_time(
-			SystemTime::now()
-				.checked_add(Duration::from_secs(services().globals.turn_ttl()))
-				.expect("TURN TTL should not get this high"),
+			SystemTime::now() + Duration::from_secs(services().globals.turn_ttl()),
 		)
 		.expect("time is valid");

@@ -1,3 +1,3 @@
-pub(crate) mod client_server;
-pub(crate) mod ruma_wrapper;
-pub(crate) mod server_server;
+pub mod client_server;
+pub mod ruma_wrapper;
+pub mod server_server;
@@ -2,22 +2,17 @@ use std::{collections::BTreeMap, str};

 use axum::{
 	async_trait,
-	extract::{FromRequest, Path},
-	response::{IntoResponse, Response},
-	RequestExt, RequestPartsExt,
-};
-use axum_extra::{
+	body::{Full, HttpBody},
+	extract::{rejection::TypedHeaderRejectionReason, FromRequest, Path, TypedHeader},
 	headers::{
 		authorization::{Bearer, Credentials},
 		Authorization,
 	},
-	typed_header::TypedHeaderRejectionReason,
-	TypedHeader,
+	response::{IntoResponse, Response},
+	BoxError, RequestExt, RequestPartsExt,
 };
-use bytes::{BufMut, BytesMut};
-use http::{uri::PathAndQuery, StatusCode};
-use http_body_util::Full;
-use hyper::Request;
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+use http::{uri::PathAndQuery, Request, StatusCode};
 use ruma::{
 	api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
 	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
@@ -26,7 +21,7 @@ use serde::Deserialize;
 use tracing::{debug, error, trace, warn};

 use super::{Ruma, RumaResponse};
-use crate::{debug_warn, service::appservice::RegistrationInfo, services, Error, Result};
+use crate::{service::appservice::RegistrationInfo, services, Error, Result};

 enum Token {
 	Appservice(Box<RegistrationInfo>),
@@ -42,27 +37,33 @@ struct QueryParams {
 }

 #[async_trait]
-impl<T, S> FromRequest<S, axum::body::Body> for Ruma<T>
+impl<T, S, B> FromRequest<S, B> for Ruma<T>
 where
 	T: IncomingRequest,
+	B: HttpBody + Send + 'static,
+	B::Data: Send,
+	B::Error: Into<BoxError>,
 {
 	type Rejection = Error;

 	#[allow(unused_qualifications)] // async traits
-	async fn from_request(req: Request<axum::body::Body>, _state: &S) -> Result<Self, Self::Rejection> {
-		let limited = req.with_limited_body();
-		let (mut parts, body) = limited.into_parts();
-		let mut body = axum::body::to_bytes(
-			body,
-			services()
-				.globals
-				.config
-				.max_request_size
-				.try_into()
-				.expect("failed to convert max request size"),
-		)
-		.await
-		.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+	async fn from_request(req: Request<B>, _state: &S) -> Result<Self, Self::Rejection> {
+		let (mut parts, mut body) = match req.with_limited_body() {
+			Ok(limited_req) => {
+				let (parts, body) = limited_req.into_parts();
+				let body = to_bytes(body)
+					.await
+					.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+				(parts, body)
+			},
+			Err(original_req) => {
+				let (parts, body) = original_req.into_parts();
+				let body = to_bytes(body)
+					.await
+					.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+				(parts, body)
+			},
+		};

 		let metadata = T::METADATA;
 		let auth_header: Option<TypedHeader<Authorization<Bearer>>> = parts.extract().await?;
@@ -132,7 +133,7 @@ where
 					"Unknown access token.",
 				))
 			},
-			(AuthScheme::AccessToken, Token::Appservice(info)) => {
+			(AuthScheme::AccessToken | AuthScheme::AccessTokenOptional, Token::Appservice(info)) => {
 				let user_id = query_params
 					.user_id
 					.map_or_else(
@@ -156,10 +157,9 @@ where

 				(Some(user_id), None, None, Some(*info))
 			},
-			(
-				AuthScheme::None | AuthScheme::AccessTokenOptional | AuthScheme::AppserviceToken,
-				Token::Appservice(info),
-			) => (None, None, None, Some(*info)),
+			(AuthScheme::None | AuthScheme::AppserviceToken, Token::Appservice(info)) => {
+				(None, None, None, Some(*info))
+			},
 			(AuthScheme::AccessToken, Token::None) => {
 				return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token."));
 			},
@@ -317,8 +317,8 @@ where

 		trace!("{:?} {:?} {:?}", http_request.method(), http_request.uri(), json_body);
 		let body = T::try_from_http_request(http_request, &path_params).map_err(|e| {
-			warn!("try_from_http_request failed: {e:?}",);
-			debug_warn!("JSON body: {:?}", json_body);
+			warn!("try_from_http_request failed: {e:?}\nPath parameters: {path_params:?}",);
+			debug!("JSON body: {:?}", json_body);
 			Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
 		})?;

@@ -397,3 +397,55 @@ impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
 		}
 	}
 }
+
+// copied from hyper under the following license:
+// Copyright (c) 2014-2021 Sean McArthur
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+pub(crate) async fn to_bytes<T>(body: T) -> Result<Bytes, T::Error>
+where
+	T: HttpBody,
+{
+	futures_util::pin_mut!(body);
+
+	// If there's only 1 chunk, we can just return Buf::to_bytes()
+	let mut first = if let Some(buf) = body.data().await {
+		buf?
+	} else {
+		return Ok(Bytes::new());
+	};
+
+	let second = if let Some(buf) = body.data().await {
+		buf?
+	} else {
+		return Ok(first.copy_to_bytes(first.remaining()));
+	};
+
+	// With more than 1 buf, we gotta flatten into a Vec first.
+	let cap = first.remaining() + second.remaining() + body.size_hint().lower() as usize;
+	let mut vec = Vec::with_capacity(cap);
+	vec.put(first);
+	vec.put(second);
+
+	while let Some(buf) = body.data().await {
+		vec.put(buf?);
+	}
+
+	Ok(vec.into())
+}
@@ -7,13 +7,14 @@ use crate::{service::appservice::RegistrationInfo, Error};
 mod axum;

 /// Extractor for Ruma request structs
-pub(crate) struct Ruma<T> {
-	pub(crate) body: T,
-	pub(crate) sender_user: Option<OwnedUserId>,
-	pub(crate) sender_device: Option<OwnedDeviceId>,
-	pub(crate) sender_servername: Option<OwnedServerName>,
-	pub(crate) json_body: Option<CanonicalJsonValue>, // This is None when body is not a valid string
-	pub(crate) appservice_info: Option<RegistrationInfo>,
+pub struct Ruma<T> {
+	pub body: T,
+	pub sender_user: Option<OwnedUserId>,
+	pub sender_device: Option<OwnedDeviceId>,
+	pub sender_servername: Option<OwnedServerName>,
+	// This is None when body is not a valid string
+	pub json_body: Option<CanonicalJsonValue>,
+	pub appservice_info: Option<RegistrationInfo>,
 }

 impl<T> Deref for Ruma<T> {
@@ -23,7 +24,7 @@ impl<T> Deref for Ruma<T> {
 }

 #[derive(Clone)]
-pub(crate) struct RumaResponse<T>(pub(crate) T);
+pub struct RumaResponse<T>(pub T);

 impl<T> From<T> for RumaResponse<T> {
 	fn from(t: T) -> Self { Self(t) }
@@ -49,27 +49,29 @@ use ruma::{
 };
 use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
 use tokio::sync::RwLock;
-use tracing::{debug, error, trace, warn};
+use tracing::{debug, error, info, trace, warn};

 use crate::{
 	api::client_server::{self, claim_keys_helper, get_keys_helper},
-	debug_error,
 	service::pdu::{gen_event_id_canonical_json, PduBuilder},
-	services,
-	utils::{self, server_name::server_is_ours, user_id::user_is_local},
-	Error, PduEvent, Result, Ruma,
+	services, utils, Error, PduEvent, Result, Ruma,
 };

 /// # `GET /_matrix/federation/v1/version`
 ///
 /// Get version information on this server.
-pub(crate) async fn get_server_version_route(
+pub async fn get_server_version_route(
 	_body: Ruma<get_server_version::v1::Request>,
 ) -> Result<get_server_version::v1::Response> {
+	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
+		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
+		None => env!("CARGO_PKG_VERSION").to_owned(),
+	};
+
 	Ok(get_server_version::v1::Response {
 		server: Some(get_server_version::v1::Server {
 			name: Some("Conduwuit".to_owned()),
-			version: Some(utils::conduwuit_version()),
+			version: Some(version),
 		}),
 	})
 }
@@ -83,7 +85,7 @@ pub(crate) async fn get_server_version_route(
 /// forever.
 // Response type for this endpoint is Json because we need to calculate a
 // signature for the response
-pub(crate) async fn get_server_keys_route() -> Result<impl IntoResponse> {
+pub async fn get_server_keys_route() -> Result<impl IntoResponse> {
 	let mut verify_keys: BTreeMap<OwnedServerSigningKeyId, VerifyKey> = BTreeMap::new();
 	verify_keys.insert(
 		format!("ed25519:{}", services().globals.keypair().version())
@@ -101,9 +103,7 @@ pub(crate) async fn get_server_keys_route() -> Result<impl IntoResponse> {
 				old_verify_keys: BTreeMap::new(),
 				signatures: BTreeMap::new(),
 				valid_until_ts: MilliSecondsSinceUnixEpoch::from_system_time(
-					SystemTime::now()
-						.checked_add(Duration::from_secs(86400 * 7))
-						.expect("valid_until_ts should not get this high"),
+					SystemTime::now() + Duration::from_secs(86400 * 7),
 				)
 				.expect("time is valid"),
 			})
@@ -132,12 +132,12 @@ pub(crate) async fn get_server_keys_route() -> Result<impl IntoResponse> {
 /// - Matrix does not support invalidating public keys, so the key returned by
 ///   this will be valid
 /// forever.
-pub(crate) async fn get_server_keys_deprecated_route() -> impl IntoResponse { get_server_keys_route().await }
+pub async fn get_server_keys_deprecated_route() -> impl IntoResponse { get_server_keys_route().await }

 /// # `POST /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-pub(crate) async fn get_public_rooms_filtered_route(
+pub async fn get_public_rooms_filtered_route(
 	body: Ruma<get_public_rooms_filtered::v1::Request>,
 ) -> Result<get_public_rooms_filtered::v1::Response> {
 	if !services()
@@ -155,7 +155,10 @@ pub(crate) async fn get_public_rooms_filtered_route(
 		&body.room_network,
 	)
 	.await
-	.map_err(|_| Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list."))?;
+	.map_err(|e| {
+		warn!("Failed to return our /publicRooms: {e}");
+		Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list.")
+	})?;

 	Ok(get_public_rooms_filtered::v1::Response {
 		chunk: response.chunk,
@@ -168,7 +171,7 @@ pub(crate) async fn get_public_rooms_filtered_route(
 /// # `GET /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-pub(crate) async fn get_public_rooms_route(
+pub async fn get_public_rooms_route(
 	body: Ruma<get_public_rooms::v1::Request>,
 ) -> Result<get_public_rooms::v1::Response> {
 	if !services()
@@ -186,7 +189,10 @@ pub(crate) async fn get_public_rooms_route(
 		&body.room_network,
 	)
 	.await
-	.map_err(|_| Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list."))?;
+	.map_err(|e| {
+		warn!("Failed to return our /publicRooms: {e}");
+		Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list.")
+	})?;

 	Ok(get_public_rooms::v1::Response {
 		chunk: response.chunk,
@@ -196,7 +202,7 @@ pub(crate) async fn get_public_rooms_route(
 	})
 }

-pub(crate) fn parse_incoming_pdu(pdu: &RawJsonValue) -> Result<(OwnedEventId, CanonicalJsonObject, OwnedRoomId)> {
+pub fn parse_incoming_pdu(pdu: &RawJsonValue) -> Result<(OwnedEventId, CanonicalJsonObject, OwnedRoomId)> {
 	let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
 		warn!("Error parsing incoming event {:?}: {:?}", pdu, e);
 		Error::BadServerResponse("Invalid PDU in server response")
@@ -208,7 +214,7 @@ pub(crate) fn parse_incoming_pdu(pdu: &RawJsonValue) -> Result<(OwnedEventId, Ca
 		.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid room id in pdu"))?;

 	let Ok(room_version_id) = services().rooms.state.get_room_version(&room_id) else {
-		return Err(Error::Err(format!("Server is not in room {room_id}")));
+		return Err(Error::Error(format!("Server is not in room {room_id}")));
 	};

 	let Ok((event_id, value)) = gen_event_id_canonical_json(pdu, &room_version_id) else {
@@ -225,7 +231,7 @@ pub(crate) fn parse_incoming_pdu(pdu: &RawJsonValue) -> Result<(OwnedEventId, Ca
 /// # `PUT /_matrix/federation/v1/send/{txnId}`
 ///
 /// Push EDUs and PDUs to this server.
-pub(crate) async fn send_transaction_message_route(
+pub async fn send_transaction_message_route(
 	body: Ruma<send_transaction_message::v1::Request>,
 ) -> Result<send_transaction_message::v1::Response> {
 	let sender_servername = body
@@ -302,7 +308,7 @@ pub(crate) async fn send_transaction_message_route(
 			services()
 				.rooms
 				.event_handler
-				.handle_incoming_pdu(sender_servername, &room_id, &event_id, value, true, &pub_key_map)
+				.handle_incoming_pdu(sender_servername, &event_id, &room_id, value, true, &pub_key_map)
 				.await
 				.map(|_| ()),
 		);
@@ -384,7 +390,7 @@ pub(crate) async fn send_transaction_message_route(
 								.readreceipt_update(&user_id, &room_id, event)?;
 						} else {
 							// TODO fetch missing events
-							debug_error!("No known event ids in read receipt: {:?}", user_updates);
+							debug!("No known event ids in read receipt: {:?}", user_updates);
 						}
 					}
 				}
@@ -400,13 +406,8 @@ pub(crate) async fn send_transaction_message_route(
 					.is_joined(&typing.user_id, &typing.room_id)?
 				{
 					if typing.typing {
-						let timeout = utils::millis_since_unix_epoch().saturating_add(
-							services()
-								.globals
-								.config
-								.typing_federation_timeout_s
-								.saturating_mul(1000),
-						);
+						let timeout = utils::millis_since_unix_epoch()
+							+ services().globals.config.typing_federation_timeout_s * 1000;
 						services()
 							.rooms
 							.typing
@@ -452,7 +453,7 @@ pub(crate) async fn send_transaction_message_route(
 									target_device_id,
 									&ev_type.to_string(),
 									event.deserialize_as().map_err(|e| {
-										error!("To-Device event is invalid: {event:?} {e}");
+										warn!("To-Device event is invalid: {event:?} {e}");
 										Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
 									})?,
 								)?;
@@ -521,7 +522,7 @@ pub(crate) async fn send_transaction_message_route(
 ///
 /// - Only works if a user of this server is currently invited or joined the
 ///   room
-pub(crate) async fn get_event_route(body: Ruma<get_event::v1::Request>) -> Result<get_event::v1::Response> {
+pub async fn get_event_route(body: Ruma<get_event::v1::Request>) -> Result<get_event::v1::Response> {
 	let sender_servername = body
 		.sender_servername
 		.as_ref()
@@ -531,7 +532,10 @@ pub(crate) async fn get_event_route(body: Ruma<get_event::v1::Request>) -> Resul
 		.rooms
 		.timeline
 		.get_pdu_json(&body.event_id)?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Event not found."))?;
+		.ok_or_else(|| {
+			warn!("Event not found, event ID: {:?}", &body.event_id);
+			Error::BadRequest(ErrorKind::NotFound, "Event not found.")
+		})?;

 	let room_id_str = event
 		.get("room_id")
@@ -568,12 +572,14 @@ pub(crate) async fn get_event_route(body: Ruma<get_event::v1::Request>) -> Resul
 ///
 /// Retrieves events from before the sender joined the room, if the room's
 /// history visibility allows.
-pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) -> Result<get_backfill::v1::Response> {
+pub async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) -> Result<get_backfill::v1::Response> {
 	let sender_servername = body
 		.sender_servername
 		.as_ref()
 		.expect("server is authenticated");

+	debug!("Got backfill request from: {}", sender_servername);
+
 	if !services()
 		.rooms
 		.state_cache
@@ -629,7 +635,7 @@ pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) ->
 /// # `POST /_matrix/federation/v1/get_missing_events/{roomId}`
 ///
 /// Retrieves events that the sender is missing.
-pub(crate) async fn get_missing_events_route(
+pub async fn get_missing_events_route(
 	body: Ruma<get_missing_events::v1::Request>,
 ) -> Result<get_missing_events::v1::Response> {
 	let sender_servername = body
@@ -665,11 +671,15 @@ pub(crate) async fn get_missing_events_route(
 				.map_err(|_| Error::bad_database("Invalid room id field in event in database"))?;

 			if event_room_id != body.room_id {
-				return Err(Error::BadRequest(ErrorKind::InvalidParam, "Event from wrong room"));
+				warn!(
+					"Evil event detected: Event {} found while searching in room {}",
+					queued_events[i], body.room_id
+				);
+				return Err(Error::BadRequest(ErrorKind::InvalidParam, "Evil event detected"));
 			}

 			if body.earliest_events.contains(&queued_events[i]) {
-				i = i.saturating_add(1);
+				i += 1;
 				continue;
 			}

@@ -678,7 +688,7 @@ pub(crate) async fn get_missing_events_route(
 				&body.room_id,
 				&queued_events[i],
 			)? {
-				i = i.saturating_add(1);
+				i += 1;
 				continue;
 			}

@@ -695,7 +705,7 @@ pub(crate) async fn get_missing_events_route(
 			);
 			events.push(PduEvent::convert_to_outgoing_federation_event(pdu));
 		}
-		i = i.saturating_add(1);
+		i += 1;
 	}

 	Ok(get_missing_events::v1::Response {
@@ -708,7 +718,7 @@ pub(crate) async fn get_missing_events_route(
 /// Retrieves the auth chain for a given event.
 ///
 /// - This does not include the event itself
-pub(crate) async fn get_event_authorization_route(
+pub async fn get_event_authorization_route(
 	body: Ruma<get_event_authorization::v1::Request>,
 ) -> Result<get_event_authorization::v1::Response> {
 	let sender_servername = body
@@ -733,7 +743,10 @@ pub(crate) async fn get_event_authorization_route(
 		.rooms
 		.timeline
 		.get_pdu_json(&body.event_id)?
-		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Event not found."))?;
+		.ok_or_else(|| {
+			warn!("Event not found, event ID: {:?}", &body.event_id);
+			Error::BadRequest(ErrorKind::NotFound, "Event not found.")
+		})?;

 	let room_id_str = event
 		.get("room_id")
@@ -760,9 +773,7 @@ pub(crate) async fn get_event_authorization_route(
 /// # `GET /_matrix/federation/v1/state/{roomId}`
 ///
 /// Retrieves the current state of the room.
-pub(crate) async fn get_room_state_route(
-	body: Ruma<get_room_state::v1::Request>,
-) -> Result<get_room_state::v1::Response> {
+pub async fn get_room_state_route(body: Ruma<get_room_state::v1::Request>) -> Result<get_room_state::v1::Response> {
 	let sender_servername = body
 		.sender_servername
 		.as_ref()
@@ -814,12 +825,12 @@ pub(crate) async fn get_room_state_route(
 	Ok(get_room_state::v1::Response {
 		auth_chain: auth_chain_ids
 			.filter_map(|id| {
-				services()
-					.rooms
-					.timeline
-					.get_pdu_json(&id)
-					.ok()?
-					.map(PduEvent::convert_to_outgoing_federation_event)
+				if let Some(json) = services().rooms.timeline.get_pdu_json(&id).ok()? {
+					Some(PduEvent::convert_to_outgoing_federation_event(json))
+				} else {
+					error!("Could not find event json for {id} in db.");
+					None
+				}
 			})
 			.collect(),
 		pdus,
@@ -829,7 +840,7 @@ pub(crate) async fn get_room_state_route(
 /// # `GET /_matrix/federation/v1/state_ids/{roomId}`
 ///
 /// Retrieves the current state of the room.
-pub(crate) async fn get_room_state_ids_route(
+pub async fn get_room_state_ids_route(
 	body: Ruma<get_room_state_ids::v1::Request>,
 ) -> Result<get_room_state_ids::v1::Response> {
 	let sender_servername = body
@@ -880,7 +891,7 @@ pub(crate) async fn get_room_state_ids_route(
 /// # `GET /_matrix/federation/v1/make_join/{roomId}/{userId}`
 ///
 /// Creates a join template.
-pub(crate) async fn create_join_event_template_route(
+pub async fn create_join_event_template_route(
 	body: Ruma<prepare_join_event::v1::Request>,
 ) -> Result<prepare_join_event::v1::Response> {
 	if !services().rooms.metadata.exists(&body.room_id)? {
@@ -948,8 +959,10 @@ pub(crate) async fn create_join_event_template_route(
 	let join_rules_event_content: Option<RoomJoinRulesEventContent> = join_rules_event
 		.as_ref()
 		.map(|join_rules_event| {
-			serde_json::from_str(join_rules_event.content.get())
-				.map_err(|_| Error::bad_database("Invalid join rules event in db."))
+			serde_json::from_str(join_rules_event.content.get()).map_err(|e| {
+				warn!("Invalid join rules event: {}", e);
+				Error::bad_database("Invalid join rules event in db.")
+			})
 		})
 		.transpose()?;

@@ -982,7 +995,7 @@ pub(crate) async fn create_join_event_template_route(
 						.state_cache
 						.room_members(&body.room_id)
 						.filter_map(Result::ok)
-						.filter(|user| user_is_local(user))
+						.filter(|user| user.server_name() == services().globals.server_name())
 						.collect();

 					let mut auth_user = None;
@@ -1135,7 +1148,10 @@ async fn create_join_event(
 		&mut value,
 		&room_version_id,
 	)
-	.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Failed to sign event."))?;
+	.map_err(|e| {
+		warn!("Failed to sign event: {e}");
+		Error::BadRequest(ErrorKind::InvalidParam, "Failed to sign event.")
+	})?;

 	let origin: OwnedServerName = serde_json::from_value(
 		serde_json::to_value(
@@ -1166,7 +1182,7 @@ async fn create_join_event(
 	let pdu_id: Vec<u8> = services()
 		.rooms
 		.event_handler
-		.handle_incoming_pdu(&origin, room_id, &event_id, value.clone(), true, &pub_key_map)
+		.handle_incoming_pdu(&origin, &event_id, room_id, value.clone(), true, &pub_key_map)
 		.await?
 		.ok_or(Error::BadRequest(
 			ErrorKind::InvalidParam,
@@ -1208,7 +1224,7 @@ async fn create_join_event(
 /// # `PUT /_matrix/federation/v1/send_join/{roomId}/{eventId}`
 ///
 /// Submits a signed join event.
-pub(crate) async fn create_join_event_v1_route(
+pub async fn create_join_event_v1_route(
 	body: Ruma<create_join_event::v1::Request>,
 ) -> Result<create_join_event::v1::Response> {
 	let sender_servername = body
@@ -1262,7 +1278,7 @@ pub(crate) async fn create_join_event_v1_route(
 /// # `PUT /_matrix/federation/v2/send_join/{roomId}/{eventId}`
 ///
 /// Submits a signed join event.
-pub(crate) async fn create_join_event_v2_route(
+pub async fn create_join_event_v2_route(
 	body: Ruma<create_join_event::v2::Request>,
 ) -> Result<create_join_event::v2::Response> {
 	let sender_servername = body
@@ -1276,6 +1292,11 @@ pub(crate) async fn create_join_event_v2_route(
 		.forbidden_remote_server_names
 		.contains(sender_servername)
 	{
+		warn!(
+			"Server {sender_servername} tried joining room ID {} who has a server name that is globally forbidden. \
+			 Rejecting.",
+			&body.room_id,
+		);
 		return Err(Error::BadRequest(
 			ErrorKind::forbidden(),
 			"Server is banned on this homeserver.",
@@ -1317,7 +1338,7 @@ pub(crate) async fn create_join_event_v2_route(
 /// # `PUT /_matrix/federation/v1/make_leave/{roomId}/{eventId}`
 ///
 /// Creates a leave template.
-pub(crate) async fn create_leave_event_template_route(
+pub async fn create_leave_event_template_route(
 	body: Ruma<prepare_leave_event::v1::Request>,
 ) -> Result<prepare_leave_event::v1::Response> {
 	let sender_servername = body
@@ -1385,6 +1406,7 @@ pub(crate) async fn create_leave_event_template_route(
 			pdu_json.remove("event_id");
 		},
 		_ => {
+			warn!("Unexpected or unsupported room version {room_version_id}");
 			return Err(Error::BadRequest(
 				ErrorKind::BadJson,
 				"Unexpected or unsupported room version found",
@@ -1444,7 +1466,7 @@ async fn create_leave_event(sender_servername: &ServerName, room_id: &RoomId, pd
 	let pdu_id: Vec<u8> = services()
 		.rooms
 		.event_handler
-		.handle_incoming_pdu(&origin, room_id, &event_id, value, true, &pub_key_map)
+		.handle_incoming_pdu(&origin, &event_id, room_id, value, true, &pub_key_map)
 		.await?
 		.ok_or(Error::BadRequest(
 			ErrorKind::InvalidParam,
@@ -1458,7 +1480,7 @@ async fn create_leave_event(sender_servername: &ServerName, room_id: &RoomId, pd
 		.state_cache
 		.room_servers(room_id)
 		.filter_map(Result::ok)
-		.filter(|server| !server_is_ours(server));
+		.filter(|server| &**server != services().globals.server_name());

 	services().sending.send_pdu_servers(servers, &pdu_id)?;

@@ -1468,7 +1490,7 @@ async fn create_leave_event(sender_servername: &ServerName, room_id: &RoomId, pd
 /// # `PUT /_matrix/federation/v1/send_leave/{roomId}/{eventId}`
 ///
 /// Submits a signed leave event.
-pub(crate) async fn create_leave_event_v1_route(
+pub async fn create_leave_event_v1_route(
 	body: Ruma<create_leave_event::v1::Request>,
 ) -> Result<create_leave_event::v1::Response> {
 	let sender_servername = body
@@ -1484,7 +1506,7 @@ pub(crate) async fn create_leave_event_v1_route(
 /// # `PUT /_matrix/federation/v2/send_leave/{roomId}/{eventId}`
 ///
 /// Submits a signed leave event.
-pub(crate) async fn create_leave_event_v2_route(
+pub async fn create_leave_event_v2_route(
 	body: Ruma<create_leave_event::v2::Request>,
 ) -> Result<create_leave_event::v2::Response> {
 	let sender_servername = body
@@ -1500,7 +1522,7 @@ pub(crate) async fn create_leave_event_v2_route(
 /// # `PUT /_matrix/federation/v2/invite/{roomId}/{eventId}`
 ///
 /// Invites a remote user to a room.
-pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>) -> Result<create_invite::v2::Response> {
+pub async fn create_invite_route(body: Ruma<create_invite::v2::Request>) -> Result<create_invite::v2::Response> {
 	let sender_servername = body
 		.sender_servername
 		.as_ref()
@@ -1531,6 +1553,11 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 			.forbidden_remote_server_names
 			.contains(&server.to_owned())
 		{
+			warn!(
+				"Received federated/remote invite from server {sender_servername} for room ID {} which has a banned \
+				 server name. Rejecting.",
+				body.room_id
+			);
 			return Err(Error::BadRequest(
 				ErrorKind::forbidden(),
 				"Server is banned on this homeserver.",
@@ -1560,8 +1587,10 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 		}
 	}

-	let mut signed_event = utils::to_canonical_object(&body.event)
-		.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invite event is invalid."))?;
+	let mut signed_event = utils::to_canonical_object(&body.event).map_err(|e| {
+		error!("Failed to convert invite event to canonical JSON: {}", e);
+		Error::BadRequest(ErrorKind::InvalidParam, "Invite event is invalid.")
+	})?;

 	ruma::signatures::hash_and_sign_event(
 		services().globals.server_name().as_str(),
@@ -1601,6 +1630,10 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 	.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "state_key is not a user id."))?;

 	if services().rooms.metadata.is_banned(&body.room_id)? && !services().users.is_admin(&invited_user)? {
+		info!(
+			"Received remote invite from server {} for room {} and for user {invited_user}, but room is banned by us.",
+			&sender_servername, &body.room_id
+		);
 		return Err(Error::BadRequest(
 			ErrorKind::forbidden(),
 			"This room is banned on this homeserver.",
@@ -1608,6 +1641,11 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 	}

 	if services().globals.block_non_admin_invites() && !services().users.is_admin(&invited_user)? {
+		info!(
+			"Received remote invite from server {} for room {} and for user {invited_user} who is not an admin, but \
+			 \"block_non_admin_invites\" is enabled, rejecting.",
+			&sender_servername, &body.room_id
+		);
 		return Err(Error::BadRequest(
 			ErrorKind::forbidden(),
 			"This server does not allow room invites.",
@@ -1621,8 +1659,10 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)

 	event.insert("event_id".to_owned(), "$placeholder".into());

-	let pdu: PduEvent = serde_json::from_value(event.into())
-		.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event."))?;
+	let pdu: PduEvent = serde_json::from_value(event.into()).map_err(|e| {
+		warn!("Invalid invite event: {}", e);
+		Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event.")
+	})?;

 	invite_state.push(pdu.to_stripped_state_event());

@@ -1652,8 +1692,8 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 /// # `GET /_matrix/federation/v1/user/devices/{userId}`
 ///
 /// Gets information on all devices of the user.
-pub(crate) async fn get_devices_route(body: Ruma<get_devices::v1::Request>) -> Result<get_devices::v1::Response> {
-	if !user_is_local(&body.user_id) {
+pub async fn get_devices_route(body: Ruma<get_devices::v1::Request>) -> Result<get_devices::v1::Response> {
+	if body.user_id.server_name() != services().globals.server_name() {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Tried to access user from other server.",
@@ -1706,7 +1746,7 @@ pub(crate) async fn get_devices_route(body: Ruma<get_devices::v1::Request>) -> R
 /// # `GET /_matrix/federation/v1/query/directory`
 ///
 /// Resolve a room alias to a room id.
-pub(crate) async fn get_room_information_route(
+pub async fn get_room_information_route(
 	body: Ruma<get_room_information::v1::Request>,
 ) -> Result<get_room_information::v1::Response> {
 	let room_id = services()
@@ -1746,7 +1786,7 @@ pub(crate) async fn get_room_information_route(
 ///
 ///
 /// Gets information on a profile.
-pub(crate) async fn get_profile_information_route(
+pub async fn get_profile_information_route(
 	body: Ruma<get_profile_information::v1::Request>,
 ) -> Result<get_profile_information::v1::Response> {
 	if !services()
@@ -1759,7 +1799,7 @@ pub(crate) async fn get_profile_information_route(
 		));
 	}

-	if !server_is_ours(body.user_id.server_name()) {
+	if body.user_id.server_name() != services().globals.server_name() {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"User does not belong to this server",
@@ -1797,8 +1837,12 @@ pub(crate) async fn get_profile_information_route(
 /// # `POST /_matrix/federation/v1/user/keys/query`
 ///
 /// Gets devices and identity keys for the given users.
-pub(crate) async fn get_keys_route(body: Ruma<get_keys::v1::Request>) -> Result<get_keys::v1::Response> {
-	if body.device_keys.iter().any(|(u, _)| !user_is_local(u)) {
+pub async fn get_keys_route(body: Ruma<get_keys::v1::Request>) -> Result<get_keys::v1::Response> {
+	if body
+		.device_keys
+		.iter()
+		.any(|(u, _)| u.server_name() != services().globals.server_name())
+	{
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"User does not belong to this server.",
@@ -1823,8 +1867,12 @@ pub(crate) async fn get_keys_route(body: Ruma<get_keys::v1::Request>) -> Result<
 /// # `POST /_matrix/federation/v1/user/keys/claim`
 ///
 /// Claims one-time keys.
-pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v1::Request>) -> Result<claim_keys::v1::Response> {
-	if body.one_time_keys.iter().any(|(u, _)| !user_is_local(u)) {
+pub async fn claim_keys_route(body: Ruma<claim_keys::v1::Request>) -> Result<claim_keys::v1::Response> {
+	if body
+		.one_time_keys
+		.iter()
+		.any(|(u, _)| u.server_name() != services().globals.server_name())
+	{
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Tried to access user from other server.",
@@ -1841,9 +1889,7 @@ pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v1::Request>) -> Res
 /// # `GET /.well-known/matrix/server`
 ///
 /// Returns the .well-known URL if it is configured, otherwise returns 404.
-pub(crate) async fn well_known_server(
-	_body: Ruma<discover_homeserver::Request>,
-) -> Result<discover_homeserver::Response> {
+pub async fn well_known_server(_body: Ruma<discover_homeserver::Request>) -> Result<discover_homeserver::Response> {
 	Ok(discover_homeserver::Response {
 		server: match services().globals.well_known_server() {
 			Some(server_name) => server_name.to_owned(),
@@ -1856,7 +1902,7 @@ pub(crate) async fn well_known_server(
 ///
 /// Gets the space tree in a depth-first manner to locate child rooms of a given
 /// space.
-pub(crate) async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
+pub async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
 	let sender_servername = body
 		.sender_servername
 		.as_ref()
@@ -0,0 +1,33 @@
+//! Integration with `clap`
+
+use std::path::PathBuf;
+
+use clap::Parser;
+
+/// Returns the current version of the crate with extra info if supplied
+///
+/// Set the environment variable `CONDUIT_VERSION_EXTRA` to any UTF-8 string to
+/// include it in parenthesis after the SemVer version. A common value are git
+/// commit hashes.
+#[allow(clippy::doc_markdown)]
+fn version() -> String {
+	let cargo_pkg_version = env!("CARGO_PKG_VERSION");
+
+	match option_env!("CONDUIT_VERSION_EXTRA") {
+		Some(x) => format!("{} ({})", cargo_pkg_version, x),
+		None => cargo_pkg_version.to_owned(),
+	}
+}
+
+/// Commandline arguments
+#[derive(Parser, Debug)]
+#[clap(version = version(), about, long_about = None)]
+pub struct Args {
+	#[arg(short, long)]
+	/// Optional argument to the path of a conduwuit config TOML file
+	pub config: Option<PathBuf>,
+}
+
+/// Parse commandline arguments into structured data
+#[must_use]
+pub fn parse() -> Args { Args::parse() }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
strawberry	d5a9c98657	make federation retry timer-based Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 22:14:30 -04:00
strawberry	395b466b4a	rename OutgoingKind enum to OutgoingDestination Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 20:11:18 -04:00
strawberry	0376b58006	use latest main rev for hickory (and for reqwest) Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 20:05:56 -04:00
strawberry	78c1e2f427	adjust DNS default config options Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 19:49:19 -04:00
strawberry	6614b8f6bf	ci: remove download env Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 19:15:12 -04:00
strawberry	c2fa8e6f8d	split up CI steps Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 17:59:01 -04:00
strawberry	b8108f5897	cargo fmt Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 17:50:34 -04:00
morguldir	cf8358cbe6	Remove extra test flag when publishing to ghcr in the CI test -n checks if a string is longer than non-zero, but we just need a compare Signed-off-by: morguldir <morguldir@protonmail.com>	2024-04-17 17:22:52 -04:00
strawberry	7ecc570bb8	Revert "dont use loole for sending channel code" This reverts commit `d0a9666a29`.	2024-04-17 15:16:01 -04:00
strawberry	002799177d	fix wrong warn message Signed-off-by: strawberry <strawberry@puppygock.gay>	2024-04-17 15:15:52 -04:00