make federation retry timer-based

Signed-off-by: strawberry <strawberry@puppygock.gay>
rename OutgoingKind enum to OutgoingDestination
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 · 2024-04-17 17:59:01 -04:00
235 changed files with 39800 additions and 33284 deletions
@@ -0,0 +1,15 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+tab_width = 4
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+
+[*.nix]
+indent_size = 2
@@ -0,0 +1,7 @@
+# .git-blame-ignore-revs
+# adds a proper rustfmt.toml and formats the entire codebase
+1d1ac065141181438e744e7d8abd0e45f75a2f91
+f419c64aca300a338096b4e0db4c73ace54f23d0
+# use chain_width 60
+162948313c212193965dece50b816ef0903172ba
+5998a0d883d31b866f7c8c46433a8857eae51a89
@@ -5,28 +5,40 @@ on:
  push:
    branches:
      - main
+      - dev
+
+  # 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 }}
+
+permissions:
+  packages: write
+  contents: read

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

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

-          # Add the `nix-community` cachix to speed up things that leverage it
+          # 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
@@ -40,6 +52,12 @@ jobs:
            extra-substituters = https://attic.kennel.juneis.dog/conduwuit
            extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=

+      - 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: Pop/push Magic Nix Cache
        uses: DeterminateSystems/magic-nix-cache-action@main

@@ -66,73 +84,86 @@ jobs:
      - name: Populate `/nix/store`
        run: nix develop --command true

+      - name: Allow direnv
+        run: direnv allow
+
+      - name: Cache x86_64 inputs for devShell
+        run: |
+          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+
+
+  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",
+          ]
+
+    steps:
      - name: Perform continuous integration
-        run: |
-          direnv allow
-          direnv exec . engage
+        run: direnv exec . engage

-      - name: Build static-x86_64-unknown-linux-musl
-        run: |
-          ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl

-      - name: Upload artifact static-x86_64-unknown-linux-musl
+      - 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: Upload static artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: static-x86_64-unknown-linux-musl
+          name: ${{ matrix.target }}
          path: result/bin/conduit
          if-no-files-found: error

-      - name: Build static-aarch64-unknown-linux-musl
-        run: |
-          ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
-
-      - name: Upload artifact static-aarch64-unknown-linux-musl
+      - name: Upload static deb artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: static-aarch64-unknown-linux-musl
-          path: result/bin/conduit
+          name: ${{ matrix.target }}.deb
+          path: target/debian/${{ matrix.target }}.deb
          if-no-files-found: error

-      - name: Build oci-image-x86_64-unknown-linux-gnu
-        run: |
-          ./bin/nix-build-and-cache .#oci-image
-          cp -f result oci-image-amd64.tar.gz

-      - name: Upload artifact oci-image-x86_64-unknown-linux-gnu
+      - 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: Upload OCI image artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: oci-image-x86_64-unknown-linux-gnu
-          path: oci-image-amd64.tar.gz
-          # don't compress again
-          compression-level: 0
-
-      - name: Build oci-image-aarch64-unknown-linux-musl
-        run: |
-          ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
-          cp -f result oci-image-arm64v8.tar.gz
-
-      - name: Upload artifact oci-image-aarch64-unknown-linux-musl
-        uses: actions/upload-artifact@v4
-        with:
-          name: oci-image-aarch64-unknown-linux-musl
-          path: oci-image-arm64v8.tar.gz
+          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: Build deb-x86_64-unknown-linux-gnu
-        run: |
-          sudo apt-get update && sudo apt-get install -y --no-install-recommends libclang-dev
-          cargo install cargo-deb
-          cargo deb

-      - name: Upload artifact deb-x86_64-unknown-linux-gnu
-        uses: actions/upload-artifact@v4
-        with:
-          name: deb-x86_64-unknown-linux-gnu
-          path: target/debian/*.deb
-          if-no-files-found: error

+
+  publish:
+    needs: build-and-test
+    runs-on: ubuntu-latest
+    steps:
    - name: Extract metadata for Dockerhub
      env:
        REGISTRY: registry.hub.docker.com
@@ -151,11 +182,16 @@ jobs:
      with:
        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

+
    - name: Login to Dockerhub
-        if: github.event_name != 'pull_request'
+      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: girlbossceo
+        # username is not really a secret
+        username: ${{ vars.DOCKER_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Login to GitHub Container Registry
@@ -165,15 +201,18 @@ jobs:
        REGISTRY: ghcr.io
      with:
        registry: ${{ env.REGISTRY }}
-          username: girlbossceo
+        username: ${{ github.repository_owner }}
        password: ${{ secrets.GITHUB_TOKEN }}

+
    - name: Publish to Dockerhub
-        if: github.event_name != 'pull_request'
      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)
@@ -191,8 +230,8 @@ jobs:
        # 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 git tags as 'latest'
-          if [[ -n "$GITHUB_REF_NAME" ]]; then
+        # 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
@@ -220,8 +259,8 @@ jobs:
        # 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 git tags as 'latest'
-          if [[ -n "$GITHUB_REF_NAME" ]]; then
+        # 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
@@ -0,0 +1,117 @@
+name: Documentation and GitHub Pages
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+  # 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 }}
+  # Custom nix binary cache if fork is being used
+  ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
+  ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  docs:
+    name: Documentation and GitHub Pages
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Sync repository
+        uses: actions/checkout@v4
+
+      - name: Setup GitHub Pages
+        if: github.event_name != 'pull_request'
+        uses: actions/configure-pages@v5
+
+      - name: Install Nix (with flakes and nix-command enabled)
+        uses: cachix/install-nix-action@v26
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+          # 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: 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: Pop/push 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: Install `direnv` and `nix-direnv`
+        run: nix-env -f "<nixpkgs>" -iA direnv -iA nix-direnv
+
+      # Do this to shorten the logs for the real CI step
+      - name: Populate `/nix/store`
+        run: nix develop --command true
+
+      - name: Allow direnv
+        run: direnv allow
+
+      - name: Cache x86_64 inputs for devShell
+        run: |
+          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+
+      - name: Build documentation (book)
+        run: |
+          ./bin/nix-build-and-cache .#book
+          cp -r --dereference result public
+      - name: Upload generated documentation (book) as normal artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: public
+          path: public
+          if-no-files-found: error
+          # don't compress again
+          compression-level: 0
+
+      - name: Upload generated documentation (book) as GitHub Pages artifact
+        if: github.event_name != 'pull_request'
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: public
+
+      - name: Deploy to GitHub Pages
+        if: github.event_name != 'pull_request'
+        id: deployment
+        uses: actions/deploy-pages@v4
@@ -24,7 +24,7 @@ jobs:
        uses: actions/checkout@v4

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

      - name: Run Trivy code and vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.19.0
        with:
          scan-type: fs
          format: sarif
@@ -74,3 +74,12 @@ test-conduit.toml

 # Gitlab CI cache
 /.gitlab-ci.d
+
+# mdbook output
+public/
+
+# macOS
+.DS_Store
+
+# Zed
+.zed/
@@ -6,22 +6,45 @@ stages:
 variables:
  # Makes some things print in color
  TERM: ansi
-  NIX_CONFIG: |
-    experimental-features = nix-command flake
-    extra-substituters = https://nix.computer.surgery/conduit
-    extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
-    extra-substituters = https://crane.cachix.org
-    extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
-    extra-substituters = https://nix-community.cachix.org
-    extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
-    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=
+
+# Avoid duplicate pipelines
+# See: https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI

 before_script:
+  # Enable nix-command and flakes
+  - if command -v nix > /dev/null; then echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf; fi
+
+  # Add conduwuit binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduwuit" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=" >> /etc/nix/nix.conf; fi
+
+  - 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 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
+
+  # Add nix-community binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://nix-community.cachix.org" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" >> /etc/nix/nix.conf; fi
+
  # Install direnv and nix-direnv
-  - if command -v nix > /dev/null; then nix-env -iA nixpkgs.direnv nixpkgs.nix-direnv nixpkgs.engage; fi
+  - if command -v nix > /dev/null; then nix-env -iA nixpkgs.direnv nixpkgs.nix-direnv; fi

  # Allow .envrc
  - if command -v nix > /dev/null; then direnv allow; fi
@@ -31,109 +54,87 @@ before_script:

 ci:
  stage: ci
-  image: nixos/nix:2.20.2
+  image: nixos/nix:2.21.2
  script:
+    # Cache the inputs required for the devShell
+    - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+
    - direnv exec . engage
  cache:
    key: nix
    paths:
      - target
      - .gitlab-ci.d
+  rules:
+    # CI on upstream runners (only available for maintainers)
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $IS_UPSTREAM_CI == "true"
+    # Manual CI on unprotected branches that are not MRs
+    - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_PROTECTED == "false"
+      when: manual
+    # Manual CI on forks
+    - if: $IS_UPSTREAM_CI != "true"
+      when: manual
+    - if: $CI
+  interruptible: true

-static:x86_64-unknown-linux-musl:
+artifacts:
  stage: artifacts
-  image: nixos/nix:2.20.2
+  image: nixos/nix:2.21.2
  script:
-    # Push artifacts and build requirements to binary cache
    - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
+    - cp result/bin/conduit x86_64-unknown-linux-musl

-    # Make the output less difficult to find
-    - cp result/bin/conduit conduit
-  artifacts:
-    paths:
-      - conduit
+    - mkdir -p target/release
+    - cp result/bin/conduit target/release
+    - direnv exec . cargo deb --no-build
+    - mv target/debian/*.deb x86_64-unknown-linux-musl.deb

-static:aarch64-unknown-linux-musl:
-  stage: artifacts
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
-    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
-
-    # Make the output less difficult to find
-    - cp result/bin/conduit conduit
-  artifacts:
-    paths:
-      - conduit
-
-# 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.
-oci-image:x86_64-unknown-linux-gnu:
-  stage: artifacts
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
-    #
    # Since the OCI image package is based on the binary package, this has the
    # fun side effect of uploading the normal binary too. Conduit users who are
    # deploying with Nix can leverage this fact by adding our binary cache to
    # their systems.
+    #
+    # 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 .#oci-image
-
-    # Make the output less difficult to find
    - cp result oci-image-amd64.tar.gz
-  artifacts:
-    paths:
-      - oci-image-amd64.tar.gz

-oci-image:aarch64-unknown-linux-musl:
-  stage: artifacts
-  needs:
-    # Wait for the static binary job to finish before starting so we don't have
-    # to build that twice for no reason
-    - static:aarch64-unknown-linux-musl
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
+    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
+    - cp result/bin/conduit aarch64-unknown-linux-musl
+
    - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
-
-    # Make the output less difficult to find
    - cp result oci-image-arm64v8.tar.gz
+
+    - ./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:
    paths:
+      - x86_64-unknown-linux-musl
+      - aarch64-unknown-linux-musl
+      - x86_64-unknown-linux-musl.deb
+      - oci-image-amd64.tar.gz
      - oci-image-arm64v8.tar.gz
+      - public
+  rules:
+    # CI required for all MRs
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # Optional CI on forks
+    - if: $IS_UPSTREAM_CI != "true"
+      when: manual
+      allow_failure: true
+    - if: $CI
+  interruptible: true

-debian:x86_64-unknown-linux-gnu:
-  stage: artifacts
-  # See also `rust-toolchain.toml`
-  image: rust:1.75.0
-  script:
-    - cargo install cargo-deb
-    - cargo deb
-
-    # Make the output less difficult to find
-    - mv target/debian/*.deb conduit.deb
-  artifacts:
-    paths:
-      - conduit.deb
-  cache:
-    key: debian
-    paths:
-      - target
-      - .gitlab-ci.d
-
-docker-publish:
+.push-oci-image:
  stage: publish
-  image: docker:25.0.3
+  image: docker:26.0.1
  services:
-    - docker:25.0.3-dind
+    - docker:26.0.1-dind
  variables:
-    IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
    IMAGE_SUFFIX_AMD64: amd64
    IMAGE_SUFFIX_ARM64V8: arm64v8
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
  script:
    - docker load -i oci-image-amd64.tar.gz
    - IMAGE_ID_AMD64=$(docker images -q conduit:main)
@@ -157,8 +158,26 @@ docker-publish:
        docker manifest push $IMAGE_NAME:latest
      fi
  dependencies:
-    - oci-image:x86_64-unknown-linux-gnu
-    - oci-image:aarch64-unknown-linux-musl
+    - 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:
+    - artifacts
+  only:
+    - next
+  script:
+    - "true"
+  artifacts:
+    paths:
+      - public
@@ -0,0 +1,3 @@
+# Docs: Map markdown to html files
+- source: /docs/(.+)\.md/
+  public: '\1.html'
@@ -1,6 +1,7 @@
 {
    "recommendations": [
        "rust-lang.rust-analyzer",
+        "editorconfig.editorconfig",
        "ms-azuretools.vscode-docker",
        "eamodio.gitlens",
        "serayuzgur.crates",
@@ -23,11 +23,11 @@
            "args": [],
            "env": {
                "RUST_BACKTRACE": "1",
-                "CONDUIT_CONFIG": "",
-                "CONDUIT_SERVER_NAME": "localhost",
-                "CONDUIT_DATABASE_PATH": "/tmp",
+                "CONDUIT_DATABASE_PATH": "/tmp/awawawa",
                "CONDUIT_ADDRESS": "0.0.0.0",
-                "CONDUIT_PORT": "6167"
+                "CONDUIT_PORT": "55551",
+                "CONDUIT_SERVER_NAME": "your.server.name",
+                "CONDUIT_LOG": "debug"
            },
            "cwd": "${workspaceFolder}"
        }
@@ -2,133 +2,375 @@
 name = "conduit"
 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>"]
+authors = [
+    "strawberry <strawberry@puppygock.gay>",
+    "timokoesters <timo@koesters.xyz>",
+]
 homepage = "https://puppygock.gay/conduwuit"
-repository = "https://gitlab.com/girlbossceo/conduwuit"
+repository = "https://github.com/girlbossceo/conduwuit"
 readme = "README.md"
-version = "0.7.0-alpha+conduwuit-0.1.3"
+version = "0.7.0+conduwuit-0.2.0"
 edition = "2021"

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

-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
+# Used for secure identifiers
+rand = "0.8.5"
+
+# Used for conduit::Error type
+thiserror = "1.0.58"
+
+# Used to encode server public key
+base64 = "0.22.0"
+
+# Used when hashing the state
+ring = "0.17.8"
+
+# Used to find matching events for appservices
+regex = "1.10.4"
+
+# Used to load forbidden room/user regex from config
+serde_regex = "1.1.0"
+
+# Used to make working with iterators easier, was already a transitive depdendency
+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"
+
+# used for TURN server authentication
+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"
+
+# to parse user-friendly time durations in admin commands
+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 = "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", features = ["serde"] }
+
+# standard date and time tools
+[dependencies.chrono]
+version = "0.4.38"
+features = ["alloc"]
+default-features = false
+
 # Web framework
-axum = { version = "0.6.20", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true }
-axum-server = { version = "0.5.1", features = ["tls-rustls"] }
-tower = { version = "0.4.13", features = ["util"] }
-tower-http = { version = "0.4.4", features = ["add-extension", "cors", "sensitive-headers", "trace", "util", "compression-zstd"] }
+[dependencies.axum]
+version = "0.6.20"
+default-features = false
+features = ["form", "headers", "http1", "http2", "json", "matched-path"]
+
+[dependencies.axum-server]
+version = "0.5.1"
+features = ["tls-rustls"]
+
+[dependencies.tower]
+version = "0.4.13"
+features = ["util"]
+
+[dependencies.tower-http]
+version = "0.4.4"
+features = ["add-extension", "cors", "sensitive-headers", "trace", "util"]
+
+[dependencies.hyper]
+version = "0.14"
+features = ["server", "http1", "http2"]
+
+[dependencies.reqwest]
+#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.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.116"
+features = ["raw_value"]
+
+
+# Used for password hashing
+[dependencies.argon2]
+version = "0.5.3"
+features = ["alloc", "rand"]
+default-features = false
+
+# Used to generate thumbnails for images
+[dependencies.image]
+version = "0.25.1"
+default-features = false
+features = ["jpeg", "png", "gif", "webp"]
+
+# logging
+[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"]
+
+# optional SHA256 media keys feature
+[dependencies.sha2]
+version = "0.10.8"
+optional = true
+
+# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
+[dependencies.opentelemetry]
+version = "0.21.0"
+optional = true
+[dependencies.tracing-flame]
+version = "0.2.0"
+optional = true
+[dependencies.tracing-opentelemetry]
+version = "0.22.0"
+optional = true
+[dependencies.opentelemetry_sdk]
+version = "0.21.2"
+optional = true
+features = ["rt-tokio"]
+[dependencies.opentelemetry-jaeger]
+version = "0.20.0"
+optional = true
+features = ["rt-tokio"]
+
+# optional sentry metrics for crash/panic reporting
+[dependencies.sentry]
+version = "0.32.3"
+optional = true
+default-features = false
+features = [
+    "backtrace",
+    "contexts",
+    "debug-images",
+    "panic",
+    "rustls",
+    "tower",
+    "tower-http",
+    "tracing",
+    "reqwest",
+    "log",
+]
+[dependencies.sentry-tracing]
+version = "0.32.3"
+optional = true
+[dependencies.sentry-tower]
+version = "0.32.3"
+optional = true
+
+# optional jemalloc usage
+[dependencies.tikv-jemallocator]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["unprefixed_malloc_on_supported_platforms"]
+[dependencies.tikv-jemalloc-ctl]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["use_std"]
+
+# for URL previews
+[dependencies.webpage]
+version = "2.0"
+default-features = false
+
+# to support multiple variations of setting a config option
+[dependencies.either]
+version = "1.11.0"
+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.5.2"
+optional = true
+
+# used for conduit's CLI and admin room command parsing
+[dependencies.clap]
+version = "4.5.4"
+default-features = false
+features = ["std", "derive", "help", "usage", "error-context", "string"]
+
+[dependencies.futures-util]
+version = "0.3.30"
+default-features = false
+
+# Used for reading the configuration from conduit.toml & environment variables
+[dependencies.figment]
+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 = { git = "https://github.com/girlbossceo/ruma", rev = "788ea6b00fab49b04a17d88caa0c840b7d74aa13", 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",
+    "appservice-api-c",
+    "client-api",
+    "federation-api",
+    "push-gateway-api-c",
+    "state-res",
+    "unstable-exhaustive-types",
+    "ring-compat",
+    "unstable-unspecified",
+    "unstable-msc2448",
+    "unstable-msc2666",
+    "unstable-msc2867",
+    "unstable-msc2870",
+    "unstable-msc3026",
+    "unstable-msc3061",
+    "unstable-msc3575",
+    "unstable-msc4121",
+    "unstable-msc4125",
+    "unstable-extensible-events",
+]

-# Async runtime and utilities
+[dependencies.hickory-resolver]
+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"]
+
+[dependencies.rusqlite]
+git = "https://github.com/rusqlite/rusqlite"
+#branch = "master"
+rev = "e00b626e2b1c67347d789fb7f600281705c89381"
+optional = true
+features = ["bundled"]
+
+# used only by rusqlite
+[dependencies.parking_lot]
+version = "0.12.1"
+optional = true
+
+# used only by rusqlite
+[dependencies.thread_local]
+version = "1.1.8"
+optional = true
+
+# used only by rusqlite and rust-rocksdb
+[dependencies.num_cpus]
+version = "1.16.0"
+optional = true
+
+[dependencies.tokio]
+version = "1.37.0"
+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
 hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d149644600d326559af0d2b235c945b05c04", features = [
    "server",
-] }
-hyper = { version = "0.14", features = ["server", "http1", "http2"] }
-tokio = { version = "1.36.0", features = ["fs", "macros", "signal", "sync"] }
+] } # unix socket support

-# Used for the http request / response body type for Ruma endpoints used with reqwest
-bytes = "1.5.0"
-http = "0.2.11"
-# Used for ruma wrapper
-serde_json = { version = "1.0.114", features = ["raw_value"] }
-# Used for appservice registration files
-serde_yaml = "0.9.32"
-# Used for pdu definition
-serde = { version = "1.0.197", features = ["rc"] }
-# Used for secure identifiers
-rand = "0.8.5"
-# Used to hash passwords
-argon2 = "0.5.3"
-reqwest = { version = "0.11.24", default-features = false, features = ["rustls-tls-native-roots", "socks"] }
-# Used for conduit::Error type
-thiserror = "1.0.57"
-# Used to generate thumbnails for images
-image = { version = "0.24.8", default-features = false, features = ["jpeg", "png", "gif", "webp"] }
-# Used to encode server public key
-base64 = "0.21.7"
-# Used when hashing the state
-ring = "0.17.8"
-# Used when querying the SRV record of other servers
-trust-dns-resolver = "0.23.2"
-# Used to find matching events for appservices
-regex = "1.10.3"
-# Used to load forbidden room/user regex from config
-serde_regex = "1.1.0"
-itertools = "0.12.1"
-# jwt jsonwebtokens
-jsonwebtoken = "9.2.0"
-# Performance measurements
-tracing = { version = "0.1.40", features = [] }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tracing-flame = "0.2.0"
-opentelemetry = "0.21.0"
-opentelemetry_sdk = { version = "0.21.2", features = ["rt-tokio"] }
-opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio"] }
-tracing-opentelemetry = "0.22.0"
-lru-cache = "0.1.2"
-rusqlite = { git = "https://github.com/rusqlite/rusqlite", rev = "ccfbc28ae1edc3090fb1b331fdc145f052ec73b9", optional = true, features = ["bundled"] }
-parking_lot = { version = "0.12.1", optional = true }
-num_cpus = "1.16.0"
-threadpool = "1.8.1"
-# Used for ruma wrapper
-serde_html_form = "0.2.4"
+[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",
+    "clang",
+    "light",
+], default-features = false }
+#hardened_malloc-rs = { optional = true, features = ["static","clang","light"], path = "../hardened_malloc-rs", default-features = false }

-thread_local = "1.1.7"
-# used for TURN server authentication
-hmac = "0.12.1"
-sha-1 = "0.10.1"
-sha2 = { version = "0.10.8" }
-# used for conduit's CLI and admin room command parsing
-clap = { version = "4.5.1", default-features = false, features = ["std", "derive", "help", "usage", "error-context"] }
-futures-util = { version = "0.3.30", default-features = false }
-# Used for reading the configuration from conduit.toml & environment variables
-figment = { version = "0.10.14", features = ["env", "toml"] }
-
-tikv-jemalloc-ctl = { version = "0.5.4", features = ["use_std"], optional = true }
-tikv-jemallocator = { version = "0.5.4", features = ["unprefixed_malloc_on_supported_platforms"], optional = true }
-lazy_static = "1.4.0"
-async-trait = "0.1.77"
-
-# used for checking if an IP is in specific subnets / CIDR ranges
-ipaddress = "0.1.3"
-
-sd-notify = { version = "0.4.1", optional = true }
-
-webpage = { version = "2.0", default-features = false }
-
-rocksdb = { version = "0.22.0", default-features = true, features = ["multi-threaded-cf", "zstd"], optional = true }
-
-
-[target.'cfg(unix)'.dependencies]
-nix = { version = "0.27.1", features = ["resource"] }

 [features]
-default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"]
+default = [
+    "backend_rocksdb",
+    "systemd",
+    "element_hacks",
+    "sentry_telemetry",
+    "gzip_compression",
+    "brotli_compression",
+    "zstd_compression",
+]
 backend_sqlite = ["sqlite"]
 backend_rocksdb = ["rocksdb"]
-jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
-sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
-conduit_bin = ["axum"]
+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"]
-#gzip_compression = ["tower-http/compression-gzip"]
-zstd_compression = []
-#brotli_compression = ["tower-http/compression-br"]
-#compression = ["tower-http/compression-full"]
-sha256_media = []
-io_uring = ["rocksdb/io-uring"]
+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 = ["sha2"]
+io_uring = ["rust-rocksdb/io-uring"]
+axum_dual_protocol = ["axum-server-dual-protocol"]
+
+perf_measurements = [
+    "opentelemetry",
+    "tracing-flame",
+    "tracing-opentelemetry",
+    "opentelemetry_sdk",
+    "opentelemetry-jaeger",
+]
+
+hardened_malloc = ["hardened_malloc-rs"]
+
+# client/server interopability hacks
+#
+## element has various non-spec compliant behaviour
+element_hacks = []
+

 [[bin]]
 name = "conduit"
 path = "src/main.rs"
-required-features = ["conduit_bin"]

 [lib]
 name = "conduit"
@@ -145,20 +387,44 @@ a cool fork of Conduit, a Matrix homeserver written in Rust"""
 section = "net"
 priority = "optional"
 assets = [
-  ["debian/README.md", "usr/share/doc/matrix-conduit/README.Debian", "644"],
-  ["README.md", "usr/share/doc/matrix-conduit/", "644"],
-  ["target/release/conduit", "usr/sbin/matrix-conduit", "755"],
-]
-conf-files = [
-  "/etc/matrix-conduit/conduit.toml"
+    [
+        "debian/README.md",
+        "usr/share/doc/matrix-conduit/README.Debian",
+        "644",
+    ],
+    [
+        "README.md",
+        "usr/share/doc/matrix-conduit/",
+        "644",
+    ],
+    [
+        "target/release/conduit",
+        "usr/sbin/matrix-conduit",
+        "755",
+    ],
+    [
+        "conduwuit-example.toml",
+        "etc/matrix-conduit/conduit.toml",
+        "640",
+    ],
 ]
+conf-files = ["/etc/matrix-conduit/conduit.toml"]
 maintainer-scripts = "debian/"
 systemd-units = { unit-name = "matrix-conduit" }

+
 [profile.dev]
 debug = 0
 lto = 'off'
+codegen-units = 512
 incremental = true
+# seems to speed up continuous debug compilations
+[profile.dev.build-override]
+opt-level = 3
+[profile.dev.package."*"] # external dependencies
+opt-level = 1
+[profile.dev.package."tokio"]
+opt-level = 3

 # default release profile
 [profile.release]
@@ -167,7 +433,7 @@ incremental = false
 opt-level = 3
 overflow-checks = true
 strip = "symbols"
-panic = "abort"
+control-flow-guard = true # Windows only
 debug = 0

 # high performance release profile which uses fat LTO across all crates, 1 codegen unit, max opt-level, and optimises across all crates
@@ -175,6 +441,7 @@ debug = 0
 inherits = "release"
 lto = 'fat'
 codegen-units = 1
+panic = "abort"

 # For releases also try to max optimizations for dependencies:
 [profile.release-high-perf.build-override]
@@ -187,29 +454,46 @@ debug = 0
 opt-level = 3
 codegen-units = 1

+
 [lints]
 workspace = true

 [workspace.lints.rust]
 missing_abi = "warn"
-# missing_docs = "warn"
 noop_method_call = "warn"
 pointer_structural_match = "warn"
 explicit_outlives_requirements = "warn"
-# unreachable_pub = "warn"
 unused_extern_crates = "warn"
 unused_import_braces = "warn"
-# unused_lifetimes = "warn"
+unused_lifetimes = "warn"
 unused_qualifications = "warn"
+unused_macro_rules = "warn"
 dead_code = "warn"
+elided_lifetimes_in_paths = "warn"
+macro_use_extern_crate = "warn"
+single_use_lifetimes = "warn"
+unsafe_op_in_unsafe_fn = "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"
+

 [workspace.lints.clippy]
+# pedantic = "warn"
+
 suspicious = "warn" # assume deny in practice
 perf = "warn"       # assume deny in practice
+
 redundant_clone = "warn"
 cloned_instead_of_copied = "warn"
 expl_impl_clone_on_copy = "warn"
-# pedantic = "warn"
 unnecessary_cast = "warn"
 cast_lossless = "warn"
 ptr_as_ptr = "warn"
@@ -218,28 +502,99 @@ char_lit_as_u8 = "warn"
 dbg_macro = "warn"
 empty_structs_with_brackets = "warn"
 get_unwrap = "warn"
-# if_then_some_else_none = "warn"
-# let_underscore_must_use = "warn"
-# map_err_ignore = "warn"
-# missing_docs_in_private_items = "warn"
 negative_feature_names = "warn"
 pub_without_shorthand = "warn"
 rc_buffer = "warn"
 rc_mutex = "warn"
 redundant_feature_names = "warn"
 redundant_type_annotations = "warn"
-# ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
 str_to_string = "warn"
-# string_add = "warn"
-# string_slice = "warn"
 string_to_string = "warn"
 tests_outside_test_module = "warn"
 undocumented_unsafe_blocks = "warn"
 unneeded_field_pattern = "warn"
 unseparated_literal_suffix = "warn"
-# unwrap_used = "warn"
-# expect_used = "warn"
 wildcard_dependencies = "warn"
-# or_fun_call = "warn"
+or_fun_call = "warn"
 unnecessary_lazy_evaluations = "warn"
+assertions_on_result_states = "warn"
+default_union_representation = "warn"
+deref_by_slicing = "warn"
+empty_drop = "warn"
+exit = "warn"
+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"
+mutex_atomic = "warn"
+semicolon_outside_block = "warn"
+fn_to_numeric_cast = "warn"
+fn_to_numeric_cast_with_truncation = "warn"
+string_lit_chars_any = "warn"
+suspicious_xor_used_as_pow = "warn"
+try_err = "warn"
+unnecessary_safety_comment = "warn"
+unnecessary_safety_doc = "warn"
+unnecessary_self_imports = "warn"
+verbose_file_reads = "warn"
+cast_possible_wrap = "warn"
+redundant_closure_for_method_calls = "warn"
+large_futures = "warn"
+semicolon_if_nothing_returned = "warn"
+match_bool = "warn"
+struct_excessive_bools = "warn"
+must_use_candidate = "warn"
+collapsible_else_if = "warn"
+inconsistent_struct_constructor = "warn"
+manual_string_new = "warn"
+zero_sized_map_values = "warn"
+unnecessary_box_returns = "warn"
+map_unwrap_or = "warn"
+implicit_clone = "warn"
+match_wildcard_for_single_variants = "warn"
+unnecessary_wraps = "warn"
+match_same_arms = "warn"
+ignored_unit_patterns = "warn"
+redundant_else = "warn"
+explicit_into_iter_loop = "warn"
+used_underscore_binding = "warn"
+needless_pass_by_value = "warn"
+too_many_lines = "warn"
+let_underscore_untyped = "warn"
+single_match = "warn"
+single_match_else = "warn"
+explicit_deref_methods = "warn"
+explicit_iter_loop = "warn"
+manual_let_else = "warn"
+trivially_copy_pass_by_ref = "warn"
+wildcard_imports = "warn"
+checked_conversions = "warn"
+
+# some sadness
+missing_errors_doc = "allow"
+missing_panics_doc = "allow"
+module_name_repetitions = "allow"
+if_not_else = "allow"
+doc_markdown = "allow"
+cast_possible_truncation = "allow"
+cast_precision_loss = "allow"
+cast_sign_loss = "allow"
+same_name_method = "allow"
+mod_module_files = "allow"
+unwrap_used = "allow"
+expect_used = "allow"
+if_then_some_else_none = "allow"
+let_underscore_must_use = "allow"
+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,330 +0,0 @@
-# Deploying Conduit
-
-### 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
-> in `#conduwuit:puppygock.gay` or [open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new).
-
-## Installing conduwuit
-
-You may simply download the binary that fits your machine. Run `uname -m` to see what you need. Now copy the appropriate URL:
-
-**Stable versions:**
-
-| CPU Architecture                            | Download stable version                                         |
-| ------------------------------------------- | --------------------------------------------------------------- |
-| x84_64 / amd64 (Most servers and computers) | [Binary][x84_64-glibc-master] / [.deb][x84_64-glibc-master-deb] |
-| armv7 (e.g. Raspberry Pi by default)        | [Binary][armv7-glibc-master] / [.deb][armv7-glibc-master-deb]   |
-| armv8 / aarch64                             | [Binary][armv8-glibc-master] / [.deb][armv8-glibc-master-deb]   |
-
-[x84_64-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_amd64/conduit?job=docker:master
-[armv7-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm_v7/conduit?job=docker:master
-[armv8-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm64/conduit?job=docker:master
-[x84_64-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_amd64/conduit.deb?job=docker:master
-[armv7-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm_v7/conduit.deb?job=docker:master
-[armv8-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm64/conduit.deb?job=docker:master
-
-**Latest versions:**
-
-| Target | Type | Download |
-|-|-|-|
-| `x86_64-unknown-linux-gnu` | Dynamically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit.deb?job=debian:x86_64-unknown-linux-gnu) |
-| `x86_64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit?job=static:x86_64-unknown-linux-musl) |
-| `aarch64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit?job=static:aarch64-unknown-linux-musl) |
-| `x86_64-unknown-linux-musl` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/oci-image-amd64.tar.gz?job=oci-image:x86_64-unknown-linux-musl) |
-| `aarch64-unknown-linux-musl` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/oci-image-arm64v8.tar.gz?job=oci-image:aarch64-unknown-linux-musl) |
-
-```bash
-$ sudo wget -O /usr/local/bin/matrix-conduit <url>
-$ sudo chmod +x /usr/local/bin/matrix-conduit
-```
-
-Alternatively, you may compile the binary yourself. First, install any dependencies:
-
-```bash
-# 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
-```
-
-If you want to cross compile Conduit to another architecture, read the guide below.
-
-<details>
-<summary>Cross compilation</summary>
-
-As easiest way to compile conduit for another platform [cross-rs](https://github.com/cross-rs/cross) is recommended, so install it first.
-
-In order to use RockDB as storage backend append `-latomic` to linker flags.
-
-For example, to build a binary for Raspberry Pi Zero W (ARMv6) you need `arm-unknown-linux-gnueabihf` as compilation
-target.
-
-```bash
-git clone https://gitlab.com/famedly/conduit.git
-cd conduit
-export RUSTFLAGS='-C link-arg=-lgcc -Clink-arg=-latomic -Clink-arg=-static-libgcc'
-cross build --release --no-default-features --features conduit_bin,backend_rocksdb --target=arm-unknown-linux-gnueabihf
-```
-</details>
-
-## 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 adduser --system conduit --group --disabled-login --no-create-home
-```
-
-## Forwarding ports in the firewall or the router
-
-Conduit uses the ports 443 and 8448 both of which need to be open in the firewall.
-
-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.
-
-## Optional: Avoid port 8448
-
-If Conduit runs behind Cloudflare reverse proxy, which doesn't support port 8448 on free plans, [delegation](https://matrix-org.github.io/synapse/latest/delegate.html) can be set up to have federation traffic routed to port 443:
-```apache
-# .well-known delegation on Apache
-<Files "/.well-known/matrix/server">
-    ErrorDocument 200 '{"m.server": "your.server.name:443"}'
-    Header always set Content-Type application/json
-    Header always set Access-Control-Allow-Origin *
-</Files>
-```
-[SRV DNS record](https://spec.matrix.org/latest/server-server-api/#resolving-server-names) delegation is also [possible](https://www.cloudflare.com/en-gb/learning/dns/dns-records/dns-srv-record/).
-
-## Setting up a systemd service
-
-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`.
-
-```systemd
-[Unit]
-Description=Conduit Matrix Server
-After=network.target
-
-[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.**  
-You can also choose to use a different database backend, but right now only `rocksdb` and `sqlite` are recommended.
-
-See the following example config at [conduwuit-example.toml](conduwuit-example.toml)
-
-## Setting the correct file permissions
-
-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/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/matrix-conduit/
-sudo chown -R conduit:conduit /var/lib/matrix-conduit/
-sudo chmod 700 /var/lib/matrix-conduit/
-```
-
-## Setting up the Reverse Proxy
-
-This depends on whether you use Apache, Caddy, Nginx or another web server.
-
-### Apache
-
-Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this:
-
-```apache
-# Requires mod_proxy and mod_proxy_http
-#
-# On Apache instance compiled from source,
-# paste into httpd-ssl.conf or httpd.conf
-
-Listen 8448
-
-<VirtualHost *:443 *:8448>
-
-ServerName your.server.name # EDIT THIS
-
-AllowEncodedSlashes NoDecode
-
-# TCP
-ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ timeout=300 nocanon
-ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
-
-# UNIX socket
-#ProxyPass /_matrix/ unix:/run/conduit/conduit.sock|http://127.0.0.1:6167/_matrix/ nocanon
-#ProxyPassReverse /_matrix/ unix:/run/conduit/conduit.sock|http://127.0.0.1:6167/_matrix/
-
-</VirtualHost>
-```
-
-**You need to make some edits again.** When you are done, run
-
-```bash
-# Debian
-$ sudo systemctl reload apache2
-
-# Installed from source
-$ sudo apachectl -k graceful
-```
-
-### Caddy
-
-Create `/etc/caddy/conf.d/conduit_caddyfile` and enter this (substitute for your server name).
-
-```caddy
-your.server.name, your.server.name:8448 {
-        # TCP
-        reverse_proxy /_matrix/* 127.0.0.1:6167
-
-        # UNIX socket
-        #reverse_proxy /_matrix/* unix//run/conduit/conduit.sock
-}
-```
-
-That's it! Just start or enable the service and you're set.
-
-```bash
-$ sudo systemctl enable caddy
-```
-
-### Nginx
-
-If you use Nginx and not Apache, add the following server section inside the http section of `/etc/nginx/nginx.conf`
-
-```nginx
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    listen 8448 ssl http2;
-    listen [::]:8448 ssl http2;
-    server_name your.server.name; # EDIT THIS
-    merge_slashes off;
-
-    # Nginx defaults to only allow 1MB uploads
-    # Increase this to allow posting large files such as videos
-    client_max_body_size 20M;
-
-    # UNIX socket
-    #upstream backend {
-    #    server unix:/run/conduit/conduit.sock;
-    #}
-
-    location /_matrix/ {
-        # TCP
-        proxy_pass http://127.0.0.1:6167$request_uri;
-
-        # UNIX socket
-        #proxy_pass http://backend;
-
-        proxy_set_header Host $http_host;
-        proxy_buffering off;
-        proxy_read_timeout 5m;
-    }
-
-    ssl_certificate /etc/letsencrypt/live/your.server.name/fullchain.pem; # EDIT THIS
-    ssl_certificate_key /etc/letsencrypt/live/your.server.name/privkey.pem; # EDIT THIS
-    ssl_trusted_certificate /etc/letsencrypt/live/your.server.name/chain.pem; # EDIT THIS
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-}
-```
-
-**You need to make some edits again.** When you are done, run
-
-```bash
-$ sudo systemctl reload nginx
-```
-
-## SSL Certificate
-
-If you chose Caddy as your web proxy SSL certificates are handled automatically and you can skip this step.
-
-The easiest way to get an SSL certificate, if you don't have one already, is to [install](https://certbot.eff.org/instructions) `certbot` and run this:
-
-```bash
-# To use ECC for the private key, 
-# paste into /etc/letsencrypt/cli.ini:
-# key-type = ecdsa
-# elliptic-curve = secp384r1
-
-$ sudo certbot -d your.server.name
-```
-[Automated renewal](https://eff-certbot.readthedocs.io/en/stable/using.html#automated-renewals) is usually preconfigured.
-
-If using Cloudflare, configure instead the edge and origin certificates in dashboard. In case you’re already running a website on the same Apache server, you can just copy-and-paste the SSL configuration from your main virtual host on port 443 into the above-mentioned vhost.
-
-## You're done!
-
-Now you can start Conduit with:
-
-```bash
-$ sudo systemctl start conduit
-```
-
-Set it to start automatically when your system boots with:
-
-```bash
-$ sudo systemctl enable conduit
-```
-
-## How do I know it works?
-
-You can open <https://app.element.io>, enter your homeserver and try to register.
-
-You can also use these commands as a quick health check.
-
-```bash
-$ curl https://your.server.name/_matrix/client/versions
-
-# If using port 8448
-$ curl https://your.server.name:8448/_matrix/client/versions
-```
-
- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/).
-  If you can register but cannot join federated rooms check your config again and also check if the port 8448 is open and forwarded correctly.
-
-# What's next?
-
-## Audio/Video calls
-
-For Audio/Video call functionality see the [TURN Guide](TURN.md).
-
-## Appservices
-
-If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
@@ -1,10 +1,20 @@
 # conduwuit
-### a well maintained fork of [Conduit](https://conduit.rs/)

+[![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 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?
+
 [Matrix](https://matrix.org) is an open network for secure and decentralized
 communication. Users from every Matrix homeserver can chat with users from all
-other Matrix servers. You can even use bridges (also called Matrix appservices)
+other Matrix servers. You can even use bridges (also called Matrix Appservices)
 to communicate with users outside of Matrix, like a community on Discord.

 #### What is the goal?
@@ -15,46 +25,29 @@ friends or company.

 #### Can I try it out?

-There are no public conduwuit homeservers available, however conduwuit is incredibly simple to install. It's just a binary, a config file, and a database path.
+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))

 #### What is the current status?

 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. conduwuit attempts to fix and improve the majority of upstream Conduit bugs
-or UX issues that are taking too long to be resolved, or unnecessary Matrix or developer
-politics halting simple things from being merged or fixed, and general inactivity.
-
-There are still a few nice to have features missing that some users may notice:
-
- Outgoing read receipts and typing indicators (receiving works)
-
-#### What's different about your fork than upstream Conduit?
-
-See [DIFFERENCES.md](DIFFERENCES.md)
+from time to time.

 #### Why does this fork exist? Why don't you contribute back upstream?

-I have tried, but:
- unnecessary Matrix / developer politics
- bikeshedding unnecessary or irrelevant things in MRs
- disagreement with how the upstream project is maintained including the codebase
- upstream maintainer inactivity
- questionable community members
- lack of MR reviews or issue triaging and no upstream maintainer interest in receiving help
- severe bugs, including denial of service and other likely vulnerabilities, not being merged due to things mentioned above
- no interest in adding co-maintainers to help out
+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

-are what are keeping me from contributing. If the state of the upstream project improves, I'm
-willing to start contributing again. As is, I think if folks want a more polished and well-kept version of Conduit, conduwuit exists for that.
-
-#### How can I deploy my own?
-
- Simple install (this was tested the most): [DEPLOY.md](DEPLOY.md)
- Nix/NixOS: [nix/README.md](nix/README.md)
-
-If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md](APPSERVICES.md).
+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
@@ -62,8 +55,7 @@ If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md]
 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.)
+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

@@ -73,18 +65,23 @@ If you run into any question, feel free to

 #### Donate

-Liberapay: <https://liberapay.com/girlbossceo>\
-Ko-fi: <https://ko-fi.com/puppygock>\
-GitHub Sponsors: <https://github.com/sponsors/girlbossceo>
+- Liberapay: <https://liberapay.com/girlbossceo>
+- Ko-fi: <https://ko-fi.com/puppygock>
+- GitHub Sponsors: <https://github.com/sponsors/girlbossceo>

 #### Logo

-No official conduwuit logo exists. Repo and Matrix room picture is from bran (<3).
+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.

 #### Mirrors of conduwuit

-GitHub: https://github.com/girlbossceo/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
+- GitHub: <https://github.com/girlbossceo/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>
+<!-- ANCHOR_END: footer -->
@@ -17,7 +17,7 @@ env \
    -C "$(git rev-parse --show-toplevel)" \
    docker build \
        --tag "$OCI_IMAGE" \
-        --file complement/Dockerfile \
+        --file tests/complement/Dockerfile \
        .

 # It's okay (likely, even) that `go test` exits nonzero
@@ -25,7 +25,7 @@ set +o pipefail
 env \
    -C "$COMPLEMENT_SRC" \
    COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
-    go test -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
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-set -euo pipefail
+set -eo pipefail

 # The first argument must be the desired installable
 INSTALLABLE="$1"
@@ -8,43 +8,34 @@ INSTALLABLE="$1"
 # Build the installable and forward any other arguments too
 nix build -L "$@"

-if [ ! -z ${ATTIC_TOKEN+x} ]; then
-
-nix run --inputs-from . attic -- login \
+if [ ! -z "$ATTIC_TOKEN" ]; then
+    nix run --inputs-from . attic -- \
+        login \
        conduit \
-        https://attic.kennel.juneis.dog/conduit \
+        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduit}" \
        "$ATTIC_TOKEN"

-    push_args=(
-        # Attic and its build dependencies
-        "$(nix path-info --inputs-from . attic)"
-        "$(nix path-info --inputs-from . attic --derivation)"
-
-        # The target installable and its build dependencies
-        "$(nix path-info "$INSTALLABLE" --derivation)"
+    # Push the target installable and its build dependencies
+    nix run --inputs-from . attic -- \
+        push \
+        conduit \
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
        "$(nix path-info "$INSTALLABLE")"
-    )

-    nix run --inputs-from . attic -- push conduit "${push_args[@]}"

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

-    push_args=(
-        # Attic and its build dependencies
-        "$(nix path-info --inputs-from . attic)"
-        "$(nix path-info --inputs-from . attic --derivation)"
-
-        # The target installable and its build dependencies
-        "$(nix path-info "$INSTALLABLE" --derivation)"
+    # Push the target installable and its build dependencies
+    nix run --inputs-from . attic -- \
+        push \
+        conduwuit \
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
        "$(nix path-info "$INSTALLABLE")"
-    )
-
-    nix run --inputs-from . attic -- push conduwuit "${push_args[@]}"
-
 else
    echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
 fi
@@ -0,0 +1,18 @@
+[book]
+title = "conduwuit"
+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"
+
+[build]
+build-dir = "public"
+create-missing = true
+
+[output.html]
+git-repository-url = "https://github.com/girlbossceo/conduwuit"
+edit-url-template = "https://github.com/girlbossceo/conduwuit/edit/main/{path}"
+git-repository-icon = "fa-github-square"
+
+[output.html.search]
+limit-results = 15
@@ -0,0 +1 @@
+too-many-lines-threshold = 700
@@ -1,46 +0,0 @@
-FROM rust:1.75.0
-
-WORKDIR /workdir
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libclang-dev
-
-COPY Cargo.toml Cargo.toml
-COPY Cargo.lock Cargo.lock
-COPY src src
-RUN cargo build --release \
-    && mv target/release/conduit conduit \
-    && rm -rf target
-
-# Install caddy
-RUN apt-get update \
-    && apt-get install -y \
-    debian-keyring \
-    debian-archive-keyring \
-    apt-transport-https \
-    curl \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/gpg.key' \
-    | gpg --dearmor -o /usr/share/keyrings/caddy-testing-archive-keyring.gpg \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/debian.deb.txt' \
-    | tee /etc/apt/sources.list.d/caddy-testing.list \
-    && apt-get update \
-    && apt-get install -y caddy
-
-COPY conduit-example.toml conduit.toml
-COPY complement/caddy.json caddy.json
-
-ENV SERVER_NAME=localhost
-ENV CONDUIT_CONFIG=/workdir/conduit.toml
-
-RUN sed -i "s/port = 6167/port = 8008/g" conduit.toml
-RUN echo "log = \"warn,_=off,sled=off\"" >> conduit.toml
-RUN sed -i "s/address = \"127.0.0.1\"/address = \"0.0.0.0\"/g" conduit.toml
-
-EXPOSE 8008 8448
-
-CMD uname -a && \
-    sed -i "s/#server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" conduit.toml && \
-    sed -i "s/your.server.name/${SERVER_NAME}/g" caddy.json && \
-    caddy start --config caddy.json > /dev/null && \
-    /workdir/conduit
-
@@ -1,12 +0,0 @@
-# Complement
-
-## What's that?
-
-Have a look at [its repository](https://github.com/matrix-org/complement).
-
-## How do I use it with Conduit?
-
-The script at [`../bin/complement`](../bin/complement) has automation for this.
-It takes a few command line arguments, you can read the script to find out what
-those are.
-
@@ -1,72 +0,0 @@
-{
-    "logging": {
-        "logs": {
-            "default": {
-                "level": "WARN"
-            }
-        }
-    },
-    "apps": {
-        "http": {
-            "https_port": 8448,
-            "servers": {
-                "srv0": {
-                    "listen": [":8448"],
-                    "routes": [{
-                        "match": [{
-                            "host": ["your.server.name"]
-                        }],
-                        "handle": [{
-                            "handler": "subroute",
-                            "routes": [{
-                                "handle": [{
-                                    "handler": "reverse_proxy",
-                                    "upstreams": [{
-                                        "dial": "127.0.0.1:8008"
-                                    }]
-                                }]
-                            }]
-                        }],
-                        "terminal": true
-                    }],
-                    "tls_connection_policies": [{
-                        "match": {
-                            "sni": ["your.server.name"]
-                        }
-                    }]
-                }
-            }
-        },
-        "pki": {
-            "certificate_authorities": {
-                "local": {
-                    "name": "Complement CA",
-                    "root": {
-                        "certificate": "/complement/ca/ca.crt",
-                        "private_key": "/complement/ca/ca.key"
-                    },
-                    "intermediate": {
-                        "certificate": "/complement/ca/ca.crt",
-                        "private_key": "/complement/ca/ca.key"
-                    }
-                }
-            }
-        },
-        "tls": {
-            "automation": {
-                "policies": [{
-                    "subjects": ["your.server.name"],
-                    "issuers": [{
-                        "module": "internal"
-                    }],
-                    "on_demand": true
-                }, {
-                    "issuers": [{
-                        "module": "internal",
-                        "ca": "local"
-                    }]
-                }]
-            }
-        }
-    }
-}
@@ -2,6 +2,8 @@
 #  This is the official example config for conduwuit.
 #  If you use it for your server, you will need to adjust it to your own needs.
 #  At the very least, change the server_name field!
+#
+#  This documentation can also be found at https://conduwuit.puppyirl.gay/configuration.html
 # =============================================================================

 [global]
@@ -22,18 +24,39 @@
 # YOU NEED TO EDIT THIS
 #server_name = "your.server.name"

-# Servers listed here will be used to gather public keys of other servers.
-# Generally, copying this exactly should be enough. (Currently, conduwuit doesn't
-# support batched key requests, so this list should only contain Synapse
-# servers.) Defaults to `matrix.org`
+# Servers listed here will be used to gather public keys of other servers (notary trusted key servers).
+#
+# The default behaviour for conduwuit is to attempt to query trusted key servers before querying the individual servers.
+# This is done for performance reasons, but if you would like to query individual servers before the notary servers
+# configured below, set to
+#
+# (Currently, conduwuit doesn't support batched key requests, so this list should only contain Synapse servers)
+# Defaults to `matrix.org`
 # trusted_servers = ["matrix.org"]

+# Sentry.io crash/panic reporting, performance monitoring/metrics, etc.
+# Conduwuit's Sentry reporting endpoint is o4506996327251968.ingest.us.sentry.io
+#
+# Defaults to false
+#sentry = false
+
+# Report your Conduwuit server_name in Sentry.io crash reports and metrics
+#
+# Defaults to false
+#sentry_send_server_name = false
+
+# Performance monitoring/tracing sample rate for Sentry.io
+#
+# Note that too high values may impact performance, and can be disabled by setting it to 0.0
+#
+# Defaults to 0.15
+#sentry_traces_sample_rate = 0.15


 ### Database configuration

 # This is the only directory where conduwuit will save its data, including media
-database_path = "/var/lib/conduwuit/"
+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
@@ -41,13 +64,13 @@ database_path = "/var/lib/conduwuit/"
 database_backend = "rocksdb"


-
 ### Network

-# The port conduwuit will be running on. You need to set up a reverse proxy such as
+# The port(s) conduwuit will be running on. You need to set up a reverse proxy such as
 # Caddy or Nginx so all requests to /_matrix on port 443 and 8448 will be
 # forwarded to the conduwuit instance running on this port
 # Docker users: Don't change this, you'll need to map an external port to this.
+# To listen on multiple ports, specify a vector e.g. [8080, 8448]
 port = 6167

 # default address (IPv4 or IPv6) conduwuit will listen on. Generally you want this to be
@@ -80,15 +103,31 @@ max_request_size = 20_000_000 # in bytes
 #unix_socket_perms = 660

 # Set this to true for conduwuit to compress HTTP response bodies using zstd.
-# Please be aware that enabling HTTP compression may weaken or even defeat TLS.
+# This option does nothing if conduwuit was not built with `zstd_compression` feature.
+# Please be aware that enabling HTTP compression may weaken TLS.
 # Most users should not need to enable this.
 # See https://breachattack.com/ and https://wikipedia.org/wiki/BREACH before deciding to enable this.
 zstd_compression = false

+# Set this to true for conduwuit to compress HTTP response bodies using gzip.
+# This option does nothing if conduwuit was not built with `gzip_compression` feature.
+# Please be aware that enabling HTTP compression may weaken TLS.
+# Most users should not need to enable this.
+# See https://breachattack.com/ and https://wikipedia.org/wiki/BREACH before deciding to enable this.
+gzip_compression = false
+
+# Set this to true for conduwuit to compress HTTP response bodies using brotli.
+# This option does nothing if conduwuit was not built with `brotli_compression` feature.
+# Please be aware that enabling HTTP compression may weaken TLS.
+# Most users should not need to enable this.
+# See https://breachattack.com/ and https://wikipedia.org/wiki/BREACH before deciding to enable this.
+brotli_compression = false
+
 # Vector list of IPv4 and IPv6 CIDR ranges / subnets *in quotes* that you do not want conduwuit to send outbound requests to.
 # Defaults to RFC1918, unroutable, loopback, multicast, and testnet addresses for security.
 #
 # To disable, set this to be an empty vector (`[]`).
+# Please be aware that this is *not* a guarantee. You should be using a firewall with zones as doing this on the application layer may have bypasses.
 #
 # Currently this does not account for proxies in use like Synapse does.
 ip_range_denylist = [
@@ -114,18 +153,25 @@ ip_range_denylist = [
 ]


-
 ### Moderation / Privacy / Security

 # Set to true to allow user type "guest" registrations. Element attempts to register guest users automatically.
-# For private homeservers, this is best at false.
+# Defaults to false
 allow_guest_registration = false

+# Set to true to log guest registrations in the admin room.
+# Defaults to false as it may be noisy or unnecessary.
+log_guest_registrations = false
+
+# Set to true to allow guest registrations/users to auto join any rooms specified in `auto_join_rooms`
+# Defaults to false
+allow_guests_auto_join_rooms = false
+
 # Vector list of servers that conduwuit will refuse to download remote media from.
 # No default.
 # prevent_media_downloads_from = ["example.com", "example.local"]

-# Enables open registration. If set to false, no users can register on this
+# Enables registration. If set to false, no users can register on this
 # server.
 # If set to true without a token configured, users can register with no form of 2nd-
 # step only if you set
@@ -151,6 +197,32 @@ registration_token = "change this token for something specific to your server"
 # defaults to true
 # allow_room_creation = true

+# controls whether non-admin local users are forbidden from sending room invites (local and remote),
+# and if non-admin users can receive remote room invites. admins are always allowed to send and receive all room invites.
+# defaults to false
+# block_non_admin_invites = false
+
+# List of forbidden username patterns/strings. Values in this list are matched as *contains*.
+# This is checked upon username availability check, registration, and startup as warnings if any local users in your database
+# have a forbidden username.
+# No default.
+# forbidden_usernames = []
+
+# List of forbidden room aliases and room IDs as patterns/strings. Values in this list are matched as *contains*.
+# This is checked upon room alias creation, custom room ID creation if used, and startup as warnings if any room aliases
+# in your database have a forbidden room alias/ID.
+# No default.
+# forbidden_alias_names = []
+
+# List of forbidden server names that we will block all client room joins, incoming federated room directory requests, incoming federated invites for, and incoming federated joins. This check is applied on the room ID, room alias, sender server name, and sender user's server name.
+# Basically "global" ACLs. For our user (client) checks, admin users are allowed.
+# No default.
+# forbidden_remote_server_names = []
+
+# List of forbidden server names that we will block all outgoing federated room directory requests for. Useful for preventing our users from wandering into bad servers or spaces.
+# No default.
+# forbidden_remote_room_directory_server_names = []
+
 # Set this to true to allow your server's public room directory to be federated.
 # Set this to false to protect against /publicRooms spiders, but will forbid external users
 # from viewing your server's public room directory. If federation is disabled entirely
@@ -161,6 +233,12 @@ allow_public_room_directory_over_federation = false
 # authentication (access token) through the Client APIs. Set this to false to protect against /publicRooms spiders.
 allow_public_room_directory_without_auth = false

+# Set this to true to lock down your server's public room directory and only allow admins to publish rooms to the room directory.
+# Unpublishing is still allowed by all users with this enabled.
+#
+# Defaults to false
+lockdown_public_room_directory = false
+
 # Set this to true to allow federating device display names / allow external users to see your device display name.
 # If federation is disabled entirely (`allow_federation`), this is inherently false. For privacy, this is best disabled.
 allow_device_name_federation = false
@@ -171,7 +249,7 @@ allow_device_name_federation = false
 url_preview_domain_contains_allowlist = []

 # Vector list of explicit domains allowed to send requests to for URL previews. Defaults to none.
-# Note: This is an *explicit* match, not a ccontains match. Putting "google.com" will match "https://google.com", "http://google.com", but not "https://mymaliciousdomainexamplegoogle.com"
+# Note: This is an *explicit* match, not a contains match. Putting "google.com" will match "https://google.com", "http://google.com", but not "https://mymaliciousdomainexamplegoogle.com"
 # Setting this to "*" will allow all URL previews. Please note that this opens up significant attack surface to your server, you are expected to be aware of the risks by doing so.
 url_preview_domain_explicit_allowlist = []

@@ -180,45 +258,97 @@ url_preview_domain_explicit_allowlist = []
 # Setting this to "*" will allow all URL previews. Please note that this opens up significant attack surface to your server, you are expected to be aware of the risks by doing so.
 url_preview_url_contains_allowlist = []

-# Maximum amount of bytes allowed in a URL preview body size when spidering. Defaults to 1MB (1_000_000 bytes)
-url_preview_max_spider_size = 1_000_000
+# Vector list of explicit domains not allowed to send requests to for URL previews. Defaults to none.
+# Note: This is an *explicit* match, not a contains match. Putting "google.com" will match "https://google.com", "http://google.com", but not "https://mymaliciousdomainexamplegoogle.com"
+# The denylist is checked first before allowlist. Setting this to "*" will not do anything.
+url_preview_domain_explicit_denylist = []
+
+# Maximum amount of bytes allowed in a URL preview body size when spidering. Defaults to 384KB (384_000 bytes)
+url_preview_max_spider_size = 384_000

 # Option to decide whether you would like to run the domain allowlist checks (contains and explicit) on the root domain or not. Does not apply to URL contains allowlist. Defaults to false.
 # Example: If this is enabled and you have "wikipedia.org" allowed in the explicit and/or contains domain allowlist, it will allow all subdomains under "wikipedia.org" such as "en.m.wikipedia.org" as the root domain is checked and matched.
 # Useful if the domain contains allowlist is still too broad for you but you still want to allow all the subdomains under a root domain.
 url_preview_check_root_domain = false

+# Config option to allow or disallow incoming federation requests that obtain the profiles
+# of our local users from `/_matrix/federation/v1/query/profile`
+#
+# This is inherently false if `allow_federation` is disabled
+#
+# Defaults to true
+allow_profile_lookup_federation_requests = true


 ### Misc

 # max log level for conduwuit. allows debug, info, warn, or error
+# see also: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives
+# **Caveat**:
+# 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 "warn"
 #log = "warn"

 # controls whether encrypted rooms and events are allowed (default true)
 #allow_encryption = false

-# conduwuit will send a simple GET request periodically to `https://pupbrain.dev/check-for-updates/stable`
+# if enabled, conduwuit will send a simple GET request periodically to `https://pupbrain.dev/check-for-updates/stable`
 # for any new announcements made. Despite the name, this is not an update check
-# endpoint, it is simply an announcement check endpoint. I don't plan on using
-# this so feel free to disable it.
-allow_check_for_updates = true
-
-# Enables adding the lightning bolt emoji (⚡️) to all newly registered users'
-# initial display names. 
-enable_lightning_bolt = false
-
-# If you are using delegation via well-known files and you cannot serve them from your reverse proxy, you can
-# uncomment these to serve them directly from conduwuit. This requires proxying all requests to conduwuit, not just `/_matrix` to work.
-#well_known_server = "matrix.example.com:443"
-#well_known_client = "https://matrix.example.com"
-# Note that whatever you put will show up in the well-known JSON values.
+# endpoint, it is simply an announcement check endpoint.
+# Defaults to false.
+#allow_check_for_updates = false

 # Set to false to disable users from joining or creating room versions that aren't 100% officially supported by conduwuit.
-# conduwuit officially supports room versions 6 - 10. conduwuit has experimental/unstable support for 1 - 5, and 11.
+# conduwuit officially supports room versions 6 - 10. conduwuit has experimental/unstable support for 3 - 5, and 11.
 # Defaults to true.
 #allow_unstable_room_versions = true

+# Option to control adding arbitrary text to the end of the user's displayname upon registration with a space before the text.
+# This was the lightning bolt emoji option, just replaced with support for adding your own custom text or emojis.
+# To disable, set this to "" (an empty string)
+# Defaults to "🏳️‍⚧️" (trans pride flag)
+#new_user_displayname_suffix = "🏳️‍⚧️"
+
+# Option to control whether conduwuit will query your list of trusted notary key servers (`trusted_servers`) for
+# remote homeserver signing keys it doesn't know *first*, or query the individual servers first before falling back to the trusted
+# key servers.
+#
+# The former/default behaviour makes federated/remote rooms joins generally faster because we're querying a single (or list of) server
+# that we know works, is reasonably fast, and is reliable for just about all the homeserver signing keys in the room. Querying individual
+# servers may take longer depending on the general infrastructure of everyone in there, how many dead servers there are, etc.
+#
+# However, this does create an increased reliance on one single or multiple large entities as `trusted_servers` should generally
+# contain long-term and large servers who know a very large number of homeservers.
+#
+# If you don't know what any of this means, leave this and `trusted_servers` alone to their defaults.
+#
+# Defaults to true as this is the fastest option for federation.
+#query_trusted_key_servers_first = true
+
+# List/vector of room **IDs** that conduwuit will make newly registered users join.
+# The room IDs specified must be rooms that you have joined at least once on the server, and must be public.
+#
+# No default.
+#auto_join_rooms = []
+
+# Retry failed and incomplete messages to remote servers immediately upon startup. This is called bursting.
+# If this is disabled, said messages may not be delivered until more messages are queued for that server.
+# Do not change this option unless server resources are extremely limited or the scale of the server's
+# deployment is huge. Do not disable this unless you know what you are doing.
+#startup_netburst = true
+
+# Limit the startup netburst to the most recent (default: 50) messages queued for each remote server. All older
+# messages are dropped and not reattempted. The `startup_netburst` option must be enabled for this value to have
+# any effect. Do not change this value unless you know what you are doing. Set this value to -1 to reattempt
+# every message without trimming the queues; this may consume significant disk. Set this value to 0 to drop all
+# messages without any attempt at redelivery.
+#startup_netburst_keep = 50
+
+
+### Generic database options
+
 # Set this to any float value to multiply conduwuit's in-memory LRU caches with.
 # May be useful if you have significant memory to spare to increase performance.
 # Defaults to 1.0.
@@ -226,19 +356,35 @@ enable_lightning_bolt = false

 # Set this to any float value in megabytes for conduwuit to tell the database engine that this much memory is available for database-related caches.
 # May be useful if you have significant memory to spare to increase performance.
-# Defaults to 300.0
-#db_cache_capacity_mb = 300.0
+# Defaults to 256.0
+#db_cache_capacity_mb = 256.0

+# Interval in seconds when conduwuit will run database cleanup operations.
+#
+# For SQLite: this will flush the WAL by executing `PRAGMA wal_checkpoint(RESTART)` (https://www.sqlite.org/pragma.html#pragma_wal_checkpoint)
+# For RocksDB: this will run `flush_opt` to flush database memtables to SST files on disk (https://docs.rs/rocksdb/latest/rocksdb/struct.DBCommon.html#method.flush_opt)
+# These operations always run on shutdown.
+#
+# Defaults to 30 minutes (1800 seconds) to avoid IO amplification from too frequent cleanups
+#cleanup_second_interval = 1800


 ### RocksDB options

 # Set this to true to use RocksDB config options that are tailored to HDDs (slower device storage)
+#
+# It is worth noting that by default, conduwuit will use RocksDB with Direct IO enabled. *Generally* speaking this improves performance as it bypasses buffered I/O (system page cache).
+# However there is a potential chance that Direct IO may cause issues with database operations if your setup is uncommon. This has been observed with FUSE filesystems, and possibly ZFS filesystem.
+# RocksDB generally deals/corrects these issues but it cannot account for all setups.
+# If you experience any weird RocksDB issues, try enabling this option as it turns off Direct IO and feel free to report in the conduwuit Matrix room if this option fixes your DB issues.
+# See https://github.com/facebook/rocksdb/wiki/Direct-IO for more information.
+#
+# Defaults to false
 #rocksdb_optimize_for_spinning_disks = false

-# RocksDB log level. This is not the same as conduwuit's log level. This is the log level for RocksDB itself
-# which show up in your database folder/path as `LOG` files. Defaults to warn. conduwuit will typically log RocksDB errors. 
-#rocksdb_log_level = "warn"
+# 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"

 # Max RocksDB `LOG` file size before rotating in bytes. Defaults to 4MB.
 #rocksdb_max_log_file_size = 4194304
@@ -246,32 +392,271 @@ enable_lightning_bolt = false
 # 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 physical cores.
+#
+# Defaults to your CPU physical core count (not logical threads).
+#rocksdb_parallelism_threads = 0
+
+# 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" 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.
+#
+# Defaults to "zstd"
+#rocksdb_compression_algo = "zstd"
+
+# Level of compression the specified compression algorithm for RocksDB to use.
+# Default is 32767, which is internally read by RocksDB as the default magic number and
+# translated to the library's default compression level as they all differ.
+# See their `kDefaultCompressionLevel`.
+#
+#rocksdb_compression_level = 32767
+
+# Level of compression the specified compression algorithm for the bottommost level/data for RocksDB to use.
+# Default is 32767, which is internally read by RocksDB as the default magic number and
+# translated to the library's default compression level as they all differ.
+# See their `kDefaultCompressionLevel`.
+#
+# Since this is the bottommost level (generally old and least used data), it may be desirable to have a very
+# high compression level here as it's lesss likely for this data to be used. Research your chosen compression algorithm.
+#
+#rocksdb_bottommost_compression_level = 32767
+
+# Whether to enable RocksDB "bottommost_compression".
+# At the expense of more CPU usage, this will further compress the database to reduce more storage.
+# It is recommended to use ZSTD compression with this for best compression results.
+# See https://github.com/facebook/rocksdb/wiki/Compression for more details.
+#
+# Defaults to false as this uses more CPU when compressing.
+#rocksdb_bottommost_compression = false
+
+# Database recovery mode (for RocksDB WAL corruption)
+#
+# Use this option when the server reports corruption and refuses to start. Set mode 2 (PointInTime)
+# to cleanly recover from this corruption. The server will continue from the last good state,
+# several seconds or minutes prior to the crash. Clients may have to run "clear-cache & reload" to
+# account for the rollback. Upon success, you may reset the mode back to default and restart again.
+# Please note in some cases the corruption error may not be cleared for at least 30 minutes of
+# operation in PointInTime mode.
+#
+# As a very last ditch effort, if PointInTime does not fix or resolve anything, you can try mode
+# 3 (SkipAnyCorruptedRecord) but this will leave the server in a potentially inconsistent state.
+#
+# The default mode 1 (TolerateCorruptedTailRecords) will automatically drop the last entry in the
+# database if corrupted during shutdown, but nothing more. It is extraordinarily unlikely this will
+# desynchronize clients. To disable any form of silent rollback set mode 0 (AbsoluteConsistency).
+#
+# The options are:
+# 0 = AbsoluteConsistency
+# 1 = TolerateCorruptedTailRecords (default)
+# 2 = PointInTime (use me if trying to recover)
+# 3 = SkipAnyCorruptedRecord (you now voided your Conduwuit warranty)
+#
+# See https://github.com/facebook/rocksdb/wiki/WAL-Recovery-Modes for more information
+#
+# Defaults to 1 (TolerateCorruptedTailRecords)
+#rocksdb_recovery_mode = 1
+
+# Controls whether memory buffers are written to storage at the fixed interval set by `cleanup_period_interval`
+# even when they are not full. Setting this will increase load on the storage backplane and is never advised
+# under normal circumstances.
+#rocksdb_periodic_cleanup = false


-### Presence
+### Domain Name Resolution and Caching

-# Config option to control local (your server only) presence updates/requests. Defaults to false.
+# 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 = 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.
+#dns_min_ttl = 10800
+
+# 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.
+#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.
+#dns_timeout = 10
+
+# Number of retries after a timeout.
+#dns_attempts = 10
+
+# Fallback to TCP on DNS errors. Set this to false if unsupported by nameserver.
+#dns_tcp_fallback = true
+
+# Enable to query all nameservers until the domain is found. Referred to as "trust_negative_responses" in hickory_resolver.
+# This can avoid useless DNS queries if the first nameserver responds with NXDOMAIN or an empty NOERROR response.
+#
+# The default is to query one nameserver and stop (false).
+#query_all_nameservers = true
+
+
+### Request Timeouts, Connection Timeouts, and Connection Pooling
+
+## Request Timeouts are HTTP response timeouts
+## Connection Timeouts are TCP connection timeouts
+##
+## Connection Pooling Timeouts are timeouts for keeping an open idle connection alive.
+## Connection pooling and keepalive is very useful for federation or other places where for performance reasons,
+## we want to keep connections open that we will re-use frequently due to TCP and TLS 1.3 overhead/expensiveness.
+##
+## Generally these defaults are the best, but if you find a reason to need to change these they are here.
+
+# 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
+# This is used only by URL previews and update/news endpoint checks
+#
+# Defaults to 35 seconds
+#request_timeout = 35
+
+# 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
+#well_known_conn_timeout = 6
+
+# Federation HTTP well-known resolution request timeout
+#
+# Defaults to 10 seconds
+#well_known_timeout = 10
+
+# 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/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 client/sender idle connection pool timeout
+#
+# Defaults to 25 seconds
+#federation_idle_timeout = 25
+
+# Appservice URL request connection timeout
+#
+# Defaults to 120 seconds
+#appservice_timeout = 120
+
+# Appservice URL idle connection pool timeout
+#
+# Defaults to 300 seconds
+#appservice_idle_timeout = 300
+
+# Notification gateway pusher idle connection pool timeout
+#
+# Defaults to 15 seconds
+#pusher_idle_timeout = 15
+
+
+### Presence / Typing Indicators / Read Receipts
+
+# Config option to control local (your server only) presence updates/requests. Defaults to true.
 # Note that presence on conduwuit is very fast unlike Synapse's.
 # If using outgoing presence, this MUST be enabled.
-#allow_local_presence = false
+#
+#allow_local_presence = true

-# Config option to control incoming federated presence updates/requests. Defaults to false.
+# Config option to control incoming federated presence updates/requests. Defaults to true.
 # This option receives presence updates from other servers, but does not send any unless `allow_outgoing_presence` is true.
 # Note that presence on conduwuit is very fast unlike Synapse's.
-#allow_incoming_presence = false
+#
+#allow_incoming_presence = true

-# Config option to control outgoing presence updates/requests. Defaults to false.
+# Config option to control outgoing presence updates/requests. Defaults to true.
 # This option sends presence updates to other servers, but does not receive any unless `allow_incoming_presence` is true.
 # Note that presence on conduwuit is very fast unlike Synapse's.
 # If using outgoing presence, you MUST enable `allow_local_presence` as well.
 #
-# Warning: Outgoing federated presence is not spec compliant due to relying on PDUs and EDUs combined.
-# Outgoing presence will not be very reliable due to this and any issues with federated outgoing presence are very likely attributed to this issue.
-# Incoming presence and local presence are unaffected.
-#allow_outgoing_presence = false
+#allow_outgoing_presence = true

 # Config option to control how many seconds before presence updates that you are idle. Defaults to 5 minutes.
 #presence_idle_timeout_s = 300

 # Config option to control how many seconds before presence updates that you are offline. Defaults to 30 minutes.
 #presence_offline_timeout_s = 1800
+
+# Config option to control whether we should receive remote incoming read receipts.
+# Defaults to true.
+#allow_incoming_read_receipts = true
+
+# Config option to control whether we should send read receipts to remote servers.
+# Defaults to true.
+#allow_outgoing_read_receipts = true
+
+# Config option to control outgoing typing updates to federation. Defaults to true.
+#allow_outgoing_typing = true
+
+# Config option to control incoming typing updates from federation. Defaults to true.
+#allow_incoming_typing = true
+
+# Config option to control maximum time federation user can indicate typing.
+#typing_federation_timeout_s = 30
+
+# Config option to control minimum time local client can indicate typing. This does not override
+# a client's request to stop typing. It only enforces a minimum value in case of no stop request.
+#typing_client_timeout_min_s = 15
+
+# Config option to control maximum time local client can indicate typing.
+#typing_client_timeout_max_s = 45
+
+
+# Other options not in [global]:
+#
+#
+# Enables running conduwuit with direct TLS support
+# It is strongly recommended you use a reverse proxy instead. This is primarily relevant for test suites like complement that require a private CA setup.
+# [global.tls]
+# certs = "/path/to/my/certificate.crt"
+# key = "/path/to/my/private_key.key"
+#
+# Whether to listen and allow for HTTP and HTTPS connections (insecure!)
+# This config option is only available if conduwuit was built with `axum_dual_protocol` feature (not default feature)
+# Defaults to false
+#dual_protocol = false
+
+
+# If you are using delegation via well-known files and you cannot serve them from your reverse proxy, you can
+# uncomment these to serve them directly from conduwuit. This requires proxying all requests to conduwuit, not just `/_matrix` to work.
+#
+#[global.well_known]
+#server = "matrix.example.com:443"
+#client = "https://matrix.example.com"
+#
+# A single contact and/or support page for /.well-known/matrix/support
+# All options here are strings. Currently only supports 1 single contact.
+# No default.
+#
+#support_page = ""
+#support_role = ""
+#support_email = ""
+#support_mxid = ""
@@ -5,7 +5,7 @@ Installation
 ------------

 Information about downloading, building and deploying the Debian package, see
-the "Installing Conduit" section in [DEPLOY.md](../DEPLOY.md).
+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.

@@ -1,5 +1,5 @@
 [Unit]
-Description=Conduit Matrix homeserver
+Description=conduwuit Matrix homeserver
 After=network-online.target

 [Service]
@@ -50,6 +50,9 @@ ExecStart=/usr/sbin/matrix-conduit
 Restart=on-failure
 RestartSec=5

+TimeoutStopSec=4m
+TimeoutStartSec=4m
+
 StartLimitInterval=1m
 StartLimitBurst=5

@@ -3,18 +3,17 @@ set -e

 . /usr/share/debconf/confmodule

-CONDUIT_CONFIG_PATH=/etc/matrix-conduit
-CONDUIT_CONFIG_FILE="${CONDUIT_CONFIG_PATH}/conduit.toml"
 CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/

 case "$1" in
  configure)
    # 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 Conduit Matrix homeserver' 1>&2
+      echo 'Adding system user for the Conduwuit Matrix homeserver' 1>&2
      adduser --system --group --quiet \
        --home "$CONDUIT_DATABASE_PATH" \
        --disabled-login \
+        --shell "/usr/sbin/nologin" \
        --force-badname \
        _matrix-conduit
    fi
@@ -22,299 +21,8 @@ case "$1" in
    # Create the database path if it does not exist yet and fix up ownership
    # and permissions.
    mkdir -p "$CONDUIT_DATABASE_PATH"
-    chown _matrix-conduit "$CONDUIT_DATABASE_PATH"
+    chown _matrix-conduit:_matrix-conduit -R "$CONDUIT_DATABASE_PATH"
    chmod 700 "$CONDUIT_DATABASE_PATH"
-
-    if [ ! -e "$CONDUIT_CONFIG_FILE" ]; then
-      # Write the debconf values in the config.
-      db_get matrix-conduit/hostname
-      CONDUIT_SERVER_NAME="$RET"
-      db_get matrix-conduit/address
-      CONDUIT_ADDRESS="$RET"
-      db_get matrix-conduit/port
-      CONDUIT_PORT="$RET"
-      mkdir -p "$CONDUIT_CONFIG_PATH"
-      cat > "$CONDUIT_CONFIG_FILE" << EOF
-# =============================================================================
-#  This is the official example config for conduwuit.
-#  If you use it for your server, you will need to adjust it to your own needs.
-#  At the very least, change the server_name field!
-# =============================================================================
-
-[global]
-
-# The server_name is the pretty name of this server. It is used as a suffix for user
-# and room ids. Examples: matrix.org, conduit.rs
-
-# The Conduit server needs all /_matrix/ requests to be reachable at
-# https://your.server.name/ on port 443 (client-server) and 8448 (federation).
-
-# If that's not possible for you, you can create /.well-known files to redirect
-# requests (delegation). See
-# https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient
-# and
-# https://spec.matrix.org/v1.9/server-server-api/#getwell-knownmatrixserver
-# for more information
-
-# YOU NEED TO EDIT THIS
-server_name = "${CONDUIT_SERVER_NAME}"
-
-# Servers listed here will be used to gather public keys of other servers.
-# Generally, copying this exactly should be enough. (Currently, conduwuit doesn't
-# support batched key requests, so this list should only contain Synapse
-# servers.) Defaults to `matrix.org`
-# trusted_servers = ["matrix.org"]
-
-
-
-### Database configuration
-
-# This is the only directory where conduwuit will save its data, including media
-database_path = "${CONDUIT_DATABASE_PATH}"
-
-# 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
-# way it is by conduwuit. sqlite only exists for historical reasons.
-database_backend = "rocksdb"
-
-
-
-### Network
-
-# The port conduwuit will be running on. You need to set up a reverse proxy such as
-# Caddy or Nginx so all requests to /_matrix on port 443 and 8448 will be
-# forwarded to the conduwuit instance running on this port
-# Docker users: Don't change this, you'll need to map an external port to this.
-port = ${CONDUIT_PORT}
-
-# default address (IPv4 or IPv6) conduwuit will listen on. Generally you want this to be
-# localhost (127.0.0.1 / ::1). If you are using Docker or a container NAT networking setup, you
-# likely need this to be 0.0.0.0. 
-address = "${CONDUIT_ADDRESS}"
-
-# 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
-
-# Uncomment unix_socket_path to listen on a UNIX socket at the specified path.
-# If listening on a UNIX socket, you must remove/comment the 'address' key if defined and add your
-# reverse proxy to the 'conduwuit' group, unless world RW permissions are specified with unix_socket_perms (666 minimum).
-#unix_socket_path = "/run/conduwuit/conduwuit.sock"
-#unix_socket_perms = 660
-
-# Set this to true for conduwuit to compress HTTP response bodies using zstd.
-# Please be aware that enabling HTTP compression may weaken or even defeat TLS.
-# Most users should not need to enable this.
-# See https://breachattack.com/ and https://wikipedia.org/wiki/BREACH before deciding to enable this.
-zstd_compression = false
-
-# Vector list of IPv4 and IPv6 CIDR ranges / subnets *in quotes* that you do not want conduwuit to send outbound requests to.
-# Defaults to RFC1918, unroutable, loopback, multicast, and testnet addresses for security.
-#
-# To disable, set this to be an empty vector (`[]`).
-#
-# Currently this does not account for proxies in use like Synapse does.
-ip_range_denylist = [
-    "127.0.0.0/8",
-    "10.0.0.0/8",
-    "172.16.0.0/12",
-    "192.168.0.0/16",
-    "100.64.0.0/10",
-    "192.0.0.0/24",
-    "169.254.0.0/16",
-    "192.88.99.0/24",
-    "198.18.0.0/15",
-    "192.0.2.0/24",
-    "198.51.100.0/24",
-    "203.0.113.0/24",
-    "224.0.0.0/4",
-    "::1/128",
-    "fe80::/10",
-    "fc00::/7",
-    "2001:db8::/32",
-    "ff00::/8",
-    "fec0::/10",
-]
-
-
-
-### Moderation / Privacy / Security
-
-# Set to true to allow user type "guest" registrations. Element attempts to register guest users automatically.
-# For private homeservers, this is best at false.
-allow_guest_registration = false
-
-# Vector list of servers that conduwuit will refuse to download remote media from.
-# No default.
-# prevent_media_downloads_from = ["example.com", "example.local"]
-
-# Enables open registration. If set to false, no users can register on this
-# server.
-# If set to true without a token configured, users can register with no form of 2nd-
-# step only if you set
-# `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` to
-# true in your config. If you would like
-# registration only via token reg, please configure the `registration_token` key.
-allow_registration = false
-# Please note that an open registration homeserver with no second-step verification
-# is highly prone to abuse and potential defederation by homeservers, including
-# matrix.org.
-
-# A static registration token that new users will have to provide when creating
-# an account. If unset and `allow_registration` is true, registration is open
-# without any condition. YOU NEED TO EDIT THIS.
-registration_token = "change this token for something specific to your server"
-
-# controls whether federation is allowed or not
-# defaults to true
-# allow_federation = true
-
-# controls whether users are allowed to create rooms.
-# appservices and admins are always allowed to create rooms
-# defaults to true
-# allow_room_creation = true
-
-# Set this to true to allow your server's public room directory to be federated.
-# Set this to false to protect against /publicRooms spiders, but will forbid external users
-# from viewing your server's public room directory. If federation is disabled entirely
-# (`allow_federation`), this is inherently false.
-allow_public_room_directory_over_federation = false
-
-# Set this to true to allow your server's public room directory to be queried without client
-# authentication (access token) through the Client APIs. Set this to false to protect against /publicRooms spiders.
-allow_public_room_directory_without_auth = false
-
-# Set this to true to allow federating device display names / allow external users to see your device display name.
-# If federation is disabled entirely (`allow_federation`), this is inherently false. For privacy, this is best disabled.
-allow_device_name_federation = false
-
-# Vector list of domains allowed to send requests to for URL previews. Defaults to none.
-# Note: this is a *contains* match, not an explicit match. Putting "google.com" will match "https://google.com" and "http://mymaliciousdomainexamplegoogle.com"
-# Setting this to "*" will allow all URL previews. Please note that this opens up significant attack surface to your server, you are expected to be aware of the risks by doing so.
-url_preview_domain_contains_allowlist = []
-
-# Vector list of explicit domains allowed to send requests to for URL previews. Defaults to none.
-# Note: This is an *explicit* match, not a ccontains match. Putting "google.com" will match "https://google.com", "http://google.com", but not "https://mymaliciousdomainexamplegoogle.com"
-# Setting this to "*" will allow all URL previews. Please note that this opens up significant attack surface to your server, you are expected to be aware of the risks by doing so.
-url_preview_domain_explicit_allowlist = []
-
-# Vector list of URLs allowed to send requests to for URL previews. Defaults to none.
-# Note that this is a *contains* match, not an explicit match. Putting "google.com" will match "https://google.com/", "https://google.com/url?q=https://mymaliciousdomainexample.com", and "https://mymaliciousdomainexample.com/hi/google.com"
-# Setting this to "*" will allow all URL previews. Please note that this opens up significant attack surface to your server, you are expected to be aware of the risks by doing so.
-url_preview_url_contains_allowlist = []
-
-# Maximum amount of bytes allowed in a URL preview body size when spidering. Defaults to 1MB (1_000_000 bytes)
-url_preview_max_spider_size = 1_000_000
-
-# Option to decide whether you would like to run the domain allowlist checks (contains and explicit) on the root domain or not. Does not apply to URL contains allowlist. Defaults to false.
-# Example: If this is enabled and you have "wikipedia.org" allowed in the explicit and/or contains domain allowlist, it will allow all subdomains under "wikipedia.org" such as "en.m.wikipedia.org" as the root domain is checked and matched.
-# Useful if the domain contains allowlist is still too broad for you but you still want to allow all the subdomains under a root domain.
-url_preview_check_root_domain = false
-
-
-
-### Misc
-
-# max log level for conduwuit. allows debug, info, warn, or error
-#log = "warn"
-
-# controls whether encrypted rooms and events are allowed (default true)
-#allow_encryption = false
-
-# conduwuit will send a simple GET request periodically to `https://pupbrain.dev/check-for-updates/stable`
-# for any new announcements made. Despite the name, this is not an update check
-# endpoint, it is simply an announcement check endpoint. I don't plan on using
-# this so feel free to disable it.
-allow_check_for_updates = true
-
-# Enables adding the lightning bolt emoji (⚡️) to all newly registered users'
-# initial display names. 
-enable_lightning_bolt = false
-
-# If you are using delegation via well-known files and you cannot serve them from your reverse proxy, you can
-# uncomment these to serve them directly from conduwuit. This requires proxying all requests to conduwuit, not just `/_matrix` to work.
-#well_known_server = "matrix.example.com:443"
-#well_known_client = "https://matrix.example.com"
-# Note that whatever you put will show up in the well-known JSON values.
-
-# Set to false to disable users from joining or creating room versions that aren't 100% officially supported by conduwuit.
-# conduwuit officially supports room versions 6 - 10. conduwuit has experimental/unstable support for 1 - 5, and 11.
-# Defaults to true.
-#allow_unstable_room_versions = true
-
-# Set this to any float value to multiply conduwuit's in-memory LRU caches with.
-# May be useful if you have significant memory to spare to increase performance.
-# Defaults to 1.0.
-#conduit_cache_capacity_modifier = 1.0
-
-# Set this to any float value in megabytes for conduwuit to tell the database engine that this much memory is available for database-related caches.
-# May be useful if you have significant memory to spare to increase performance.
-# Defaults to 900.0
-#db_cache_capacity_mb = 900.0
-
-
-
-### RocksDB options
-
-# Set this to true to use RocksDB config options that are tailored to HDDs (slower device storage)
-#rocksdb_optimize_for_spinning_disks = false
-
-# RocksDB log level. This is not the same as conduwuit's log level. This is the log level for RocksDB itself
-# which show up in your database folder/path as `LOG` files. Defaults to warn. conduwuit will typically log RocksDB errors. 
-#rocksdb_log_level = "warn"
-
-# Max RocksDB `LOG` file size before rotating in bytes. Defaults to 4MB.
-#rocksdb_max_log_file_size = 4194304
-
-# Time in seconds before RocksDB will forcibly rotate logs. Defaults to 0.
-#rocksdb_log_time_to_roll = 0
-
-
-
-### Presence
-
-# Config option to control local (your server only) presence updates/requests. Defaults to false.
-# Note that presence on conduwuit is very fast unlike Synapse's.
-# If using outgoing presence, this MUST be enabled.
-#allow_local_presence = false
-
-# Config option to control incoming federated presence updates/requests. Defaults to false.
-# This option receives presence updates from other servers, but does not send any unless `allow_outgoing_presence` is true.
-# Note that presence on conduwuit is very fast unlike Synapse's.
-#allow_incoming_presence = false
-
-# Config option to control outgoing presence updates/requests. Defaults to false.
-# This option sends presence updates to other servers, but does not receive any unless `allow_incoming_presence` is true.
-# Note that presence on conduwuit is very fast unlike Synapse's.
-# If using outgoing presence, you MUST enable `allow_local_presence` as well.
-#
-# Warning: Outgoing federated presence is not spec compliant due to relying on PDUs and EDUs combined.
-# Outgoing presence will not be very reliable due to this and any issues with federated outgoing presence are very likely attributed to this issue.
-# Incoming presence and local presence are unaffected.
-#allow_outgoing_presence = false
-
-# Config option to control how many seconds before presence updates that you are idle. Defaults to 5 minutes.
-#presence_idle_timeout_s = 300
-
-# Config option to control how many seconds before presence updates that you are offline. Defaults to 30 minutes.
-#presence_offline_timeout_s = 1800
-
-EOF
-    fi
    ;;
 esac

@@ -0,0 +1,13 @@
+# Summary
+
+- [Introduction](introduction.md)
+- [Differences from upstream Conduit](differences.md)
+
+- [Example configuration](configuration.md)
+- [Deploying](deploying.md)
+    - [Generic](deploying/generic.md)
+    - [Debian](deploying/debian.md)
+    - [Docker](deploying/docker.md)
+    - [NixOS](deploying/nixos.md)
+- [TURN](turn.md)
+- [Appservices](appservices.md)
@@ -2,7 +2,7 @@

 ## Getting help

-If you run into any problems while setting up an Appservice, write an email to `timo@koesters.xyz`, ask us in [#conduit:fachschaften.org](https://matrix.to/#/#conduit:fachschaften.org) or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
+If you run into any problems while setting up an Appservice: ask us in [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay) or [open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new).

 ## Set up the appservice - general instructions

@@ -31,9 +31,9 @@ the room like this:
    ```

 You can confirm it worked by sending a message like this:
-`@conduit:your.server.name: list-appservices`
+`@conduit:your.server.name: appservices list`

-The @conduit bot should answer with `Appservices (1): your-bridge`
+The `@conduit` bot should answer with `Appservices (1): your-bridge`

 Then you are done. Conduit will send messages to the appservices and the
 appservice can send requests to the homeserver. You don't need to restart
@@ -46,9 +46,9 @@ could help.

 To remove an appservice go to your admin room and execute

-`@conduit:your.server.name: unregister-appservice <name>`
+`@conduit:your.server.name: appservices unregister <name>`

-where `<name>` one of the output of `list-appservices`.
+where `<name>` one of the output of `appservices list`.

 ### Tested appservices

@@ -0,0 +1,5 @@
+# Example configuration
+
+``` toml
+{{#include ../conduwuit-example.toml}}
+```
@@ -0,0 +1,3 @@
+# Deploying
+
+This chapter describes various ways to deploy Conduwuit.
@@ -0,0 +1 @@
+{{#include ../../debian/README.md}}
@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
@@ -18,12 +18,13 @@ services:
        #         GIT_REF: origin/master
        restart: unless-stopped
        volumes:
-            - db:/var/lib/matrix-conduit/
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
        networks:
            - proxy
        environment:
            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            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
@@ -34,7 +35,8 @@ services:
            #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
            #CONDUIT_LOG: warn,state_res=warn
            CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Ignore this
+            #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
@@ -1,5 +1,5 @@
 # Conduit - Traefik Reverse Proxy Labels
-version: '3'
+version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
@@ -19,19 +19,17 @@ services:
        restart: unless-stopped
        volumes:
            - db:/srv/conduit/.local/share/conduit
-            ### Uncomment if you want to use conduit.toml to configure Conduit
-            ### Note: Set env vars will override conduit.toml values
-            # - ./conduit.toml:/srv/conduit/conduit.toml
+            #- ./conduwuit.toml:/etc/conduit.toml
        networks:
            - proxy
        environment:
-            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
+            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
            # CONDUIT_ADDRESS: 0.0.0.0
            # CONDUIT_PORT: 6167
-            # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
            # 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'
@@ -41,6 +39,7 @@ services:
            # 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
@@ -1,5 +1,5 @@
 # Conduit
-version: '3'
+version: '2.4' # uses '2.4' for cpuset

 services:
    homeserver:
@@ -20,10 +20,11 @@ services:
        ports:
            - 8448:6167
        volumes:
-            - db:/var/lib/matrix-conduit/
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
        environment:
            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            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
@@ -34,7 +35,8 @@ services:
            #CONDUIT_MAX_CONCURRENT_REQUESTS: 400
            #CONDUIT_LOG: warn,state_res=warn
            CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Ignore this
+            #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
@@ -1,6 +1,4 @@
-# Deploy using Docker
-
-> **Note:** To run and use Conduit you should probably use it with a Domain or Subdomain behind a reverse proxy (like Nginx, Traefik, Apache, ...) with a Lets Encrypt certificate.
+# Conduwuit for Docker

 ## Docker

@@ -9,7 +7,7 @@ To run conduwuit with Docker you can either build the image yourself or pull it

 ### Use a registry

-OCI images for conduwuit are available in the registries listed below. We recommend using the image tagged as `latest` from GitLab's own registry.
+OCI images for conduwuit are available in the registries listed below.

 | Registry        | Image                                                           | Size                          | Notes                  |
 | --------------- | --------------------------------------------------------------- | ----------------------------- | ---------------------- |
@@ -33,7 +31,7 @@ to pull it to your machine.



-### Build using a dockerfile
+### Build using a Dockerfile

 The Dockerfile provided by Conduit has two stages, each of which creates an image.

@@ -70,7 +68,7 @@ docker run -d -p 8448:6167 \

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

-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](../conduit-example.toml).
+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.

@@ -89,7 +87,7 @@ 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 Conduit can be found [here](../DEPLOY.md).
+Additional info about deploying Conduit can be found [here](generic.md).

 ### Build

@@ -131,7 +129,7 @@ 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](../conduit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars.
+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.

@@ -0,0 +1,165 @@
+# 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
+> in `#conduwuit:puppygock.gay` or [open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new).
+
+## Installing conduwuit
+
+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 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
+
+Alternatively, you may compile the binary yourself. First, install any dependencies:
+
+```bash
+# 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
+```
+
+## 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 adduser --system conduit --group --disabled-login --no-create-home
+```
+
+## Forwarding ports in the firewall or the router
+
+Conduit uses the ports 443 and 8448 both of which need to be open in the firewall.
+
+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
+
+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`.
+
+```systemd
+[Unit]
+Description=Conduwuit Matrix Server
+After=network.target
+
+[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
+
+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/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/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 example will be provided as this is the recommended reverse proxy for new users and is very trivial.
+
+### Caddy
+
+Create `/etc/caddy/conf.d/conduwuit_caddyfile` and enter this (substitute for your server name).
+
+```caddy
+your.server.name, your.server.name:8448 {
+        # TCP
+        reverse_proxy 127.0.0.1:6167
+
+        # UNIX socket
+        #reverse_proxy unix//run/conduit/conduit.sock
+}
+```
+
+That's it! Just start or enable the service and you're set.
+
+```bash
+$ sudo systemctl enable caddy
+```
+
+## You're done!
+
+Now you can start Conduit with:
+
+```bash
+$ sudo systemctl start conduit
+```
+
+Set it to start automatically when your system boots with:
+
+```bash
+$ sudo systemctl enable conduit
+```
+
+## How do I know it works?
+
+You can open [a Matrix client](https://matrix.org/ecosystem/clients), enter your homeserver and try to register.
+
+You can also use these commands as a quick health check.
+
+```bash
+$ curl https://your.server.name/_conduwuit/server_version
+
+# If using port 8448
+$ curl https://your.server.name:8448/_conduwuit/server_version
+```
+
+- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/).
+  If you can register but cannot join federated rooms check your config again and also check if the port 8448 is open and forwarded correctly.
+
+# What's next?
+
+## Audio/Video calls
+
+For Audio/Video call functionality see the [TURN Guide](../turn.md).
+
+## Appservices
+
+If you want to set up an appservice, take a look at the [Appservice Guide](../appservices.md).
@@ -0,0 +1,30 @@
+# Conduwuit for NixOS
+
+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
+
+A binary cache for conduwuit that the CI/CD publishes to is available at the
+following places (both are the same just different names):
+```
+https://attic.kennel.juneis.dog/conduit
+conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
+
+https://attic.kennel.juneis.dog/conduwuit
+conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
+```
+
+If specifying a URL in your flake, please use the GitHub remote: `github:girlbossceo/conduwuit`
+
+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 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.
+
+[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,44 +1,38 @@
+#### **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 upstream does not:

 - 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
- Federated presence support and configurable local presence (via upstream MR)
 - Concurrency support for key fetching for faster remote room joins and room joins that will error less frequently (via upstream MR)
- Experimental room version 11 support (via upstream MR)
- Enabled all non-officially-supported room versions as experimental so we can at least attempt to join them
- Configurable guest registration including forbidding guest registrations if no admin user is created yet, respects allow registration setting, and an optional override setting with a default of no guest registrations allowed.
+- 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, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage.
- Updated Ruma to latest commit where possible, and add some unstable MSCs (some still require an implementation though)
- conduwuit allows MXIDs with `+` in them (thanks to Ruma update)
+- 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
- Make PDU appending, building, etc asynchronous
 - 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 *optional* feature flag to enable zstd HTTP body compression
+- Add feature flags and config options to enable/build with zstd, brotli, and/or gzip HTTP body compression (response and request)
 - 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
 - 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)
- Fix spec compliance issue with servers being able to fetch remote user profiles over federation for users who don't belong to our server (`/_matrix/federation/v1/query/profile`)
 - 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
- Add non-standard sliding sync proxy health check (?) endpoint at `/client/server.json` that some clients such as Element Web query using the `well_known_client` or `well_known_server` config 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
- Basic binary commands like `conduwuit --version` work (interested in expanding it more)
 - 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
@@ -46,7 +40,6 @@
 - 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)
- Only follow 6 redirects total in our default reqwest ClientBuilder
 - 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.
@@ -56,16 +49,61 @@
 - 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.
+- 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
- Add support for preventing certain room alias names and usernames using regex (via upstream MR) and extended to custom room IDs
- Revamp appservice registration to ruma's `Registration` type which fixes various appservice registration issues, including fixing crashing upon no URL specified (via upstream MR)
 - 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, and ask systemd for more time to shutdown if needed to prevent systemd's default [`TimeoutStopSec=`](https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#TimeoutStopSec=) of 90 seconds from killing conduwuit
- Bumped default max_concurrent_requests to 500
- Add support for the deprecated `user` identifier field for all `/login` requests
+- 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, as a moderation feature
+- 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
+- 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
+- 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
+- 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)
@@ -0,0 +1,17 @@
+# Conduwuit
+
+{{#include ../README.md:catchphrase}}
+
+{{#include ../README.md:body}}
+
+#### What's different about your fork than upstream Conduit?
+
+See [differences.md](differences.md)
+
+#### How can I deploy my own?
+
+- [Deployment options](deploying.md)
+
+If you want to connect an Appservice to Conduwuit, take a look at the [appservices documentation](appservices.md).
+
+{{#include ../README.md:footer}}
@@ -40,6 +40,26 @@ name = "cargo-clippy"
 group = "versions"
 script = "cargo clippy -- --version"

+[[task]]
+name = "cargo-audit"
+group = "versions"
+script = "cargo audit --version"
+
+[[task]]
+name = "cargo-deb"
+group = "versions"
+script = "cargo deb --version"
+
+[[task]]
+name = "lychee"
+group = "versions"
+script = "lychee --version"
+
+[[task]]
+name = "cargo-audit"
+group = "security"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"
+
 [[task]]
 name = "cargo-fmt"
 group = "lints"
@@ -51,6 +71,7 @@ group = "lints"
 script = """
 RUSTDOCFLAGS="-D warnings" cargo doc \
    --workspace \
+    --all-features \
    --no-deps \
    --document-private-items \
    --color always
@@ -59,7 +80,12 @@ RUSTDOCFLAGS="-D warnings" cargo doc \
 [[task]]
 name = "cargo-clippy"
 group = "lints"
-script = "cargo clippy --workspace --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 --offline docs"

 [[task]]
 name = "cargo"
@@ -68,12 +94,8 @@ script = """
 cargo test \
    --workspace \
    --all-targets \
+    --all-features \
    --color=always \
    -- \
    --color=always
 """
-
-[[task]]
-name = "cargo-audit"
-group = "security"
-script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"
@@ -60,8 +60,8 @@
      },
      "original": {
        "owner": "ipetkov",
-        "ref": "master",
        "repo": "crane",
+        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
        "type": "github"
      }
    },
@@ -73,11 +73,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1707891749,
-        "narHash": "sha256-SeikNYElHgv8uVMbiA9/pU3Cce7ssIsiM8CnEiwd1Nc=",
+        "lastModified": 1711606966,
+        "narHash": "sha256-nTaO7ZDL4D02dVC5ktqnXNiNuODBUHyE4qEcFjAUCQY=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "3115aab064ef38cccd792c45429af8df43d6d277",
+        "rev": "aa45c3e901ea42d6633af083c0c555efaf948b17",
        "type": "github"
      },
      "original": {
@@ -138,11 +138,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -153,11 +153,11 @@
    },
    "nix-filter": {
      "locked": {
-        "lastModified": 1705332318,
-        "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
+        "lastModified": 1710156097,
+        "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
        "owner": "numtide",
        "repo": "nix-filter",
-        "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
+        "rev": "3342559a24e85fc164b295c3444e8a139924675b",
        "type": "github"
      },
      "original": {
@@ -200,11 +200,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
        "type": "github"
      },
      "original": {
@@ -228,11 +228,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1707849817,
-        "narHash": "sha256-If6T0MDErp3/z7DBlpG4bV46IPP+7BWSlgTI88cmbw0=",
+        "lastModified": 1711562745,
+        "narHash": "sha256-s/YOyBM0vumhkqCFi8CnV5imFlC5JJrGia8CmEXyQkM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "a02a219773629686bd8ff123ca1aa995fa50d976",
+        "rev": "ad51a17c627b4ca57f83f0dc1f3bb5f3f17e6d0b",
        "type": "github"
      },
      "original": {
@@ -13,7 +13,12 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    crane = {
-      url = "github:ipetkov/crane?ref=master";
+      # 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";
@@ -31,16 +36,21 @@
    }: flake-utils.lib.eachDefaultSystem (system:
    let
      pkgsHost = nixpkgs.legacyPackages.${system};
+      allocator = null;

-      rocksdb' = pkgs: pkgs.rocksdb.overrideAttrs (old:
-              {
+      rocksdb' = pkgs:
+        let
+          version = "9.0.0";
+        in
+        (pkgs.rocksdb.overrideAttrs (old: {
+          inherit version;
          src = pkgs.fetchFromGitHub {
-                  owner = "facebook";
+            owner = "girlbossceo";
            repo = "rocksdb";
-                  rev = "v8.10.0";
-                  hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
+            rev = "449768a833b79c267c584b5ab1d50e73db6faf9d";
+            hash = "sha256-MjmGfAlZ5WC2+hFH6nEUprqBjO8xiTQh2HJIqQ5mIg8=";
          };
-              });
+        }));

      # Nix-accessible `Cargo.toml`
      cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
@@ -60,10 +70,11 @@
        # 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.buildPackages.rustPlatform.bindgenHook
+        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";
      }
@@ -88,7 +99,7 @@
            # 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/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
+            # [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
@@ -112,7 +123,7 @@
      # 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/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L64-L78
+      # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
      // (
        let
          inherit (pkgs.rust.lib) envVars;
@@ -150,12 +161,13 @@
            "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
            "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
            "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;
-          HOST_CC = "${pkgs.buildPackages.stdenv.cc}/bin/cc";
-          HOST_CXX = "${pkgs.buildPackages.stdenv.cc}/bin/c++";
+            HOST_CC = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/cc";
+            HOST_CXX = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/c++";
          }
-      ));
+        )
+      );

-      package = pkgs: builder pkgs {
+      mkPackage = pkgs: allocator: builder pkgs {
        src = nix-filter {
          root = ./.;
          include = [
@@ -165,6 +177,13 @@
          ];
        };

+        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;

@@ -174,11 +193,13 @@
        meta.mainProgram = cargoToml.package.name;
      };

-      mkOciImage = pkgs: package:
-        pkgs.dockerTools.buildImage {
+      mkOciImage = pkgs: package: allocator:
+        pkgs.dockerTools.buildLayeredImage {
          name = package.pname;
          tag = "main";
-          copyToRoot = [
+          # Debian makes builds reproducible through using the HEAD commit's date
+          created = "@${toString self.lastModified}";
+          contents = [
            pkgs.dockerTools.caCertificates
          ];
          config = {
@@ -196,8 +217,41 @@
    in
    {
      packages = {
-        default = package pkgsHost;
-        oci-image = mkOciImage pkgsHost self.packages.${system}.default;
+        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";
+
+        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
+            '';
+          };
      }
      //
      builtins.listToAttrs
@@ -218,7 +272,19 @@
                # An output for a statically-linked binary
                {
                  name = binaryName;
-                  value = package pkgsCrossStatic;
+                  value = mkPackage pkgsCrossStatic null;
+                }
+
+                # An output for a statically-linked binary with jemalloc
+                {
+                  name = "${binaryName}-jemalloc";
+                  value = mkPackage pkgsCrossStatic "jemalloc";
+                }
+
+                # An output for a statically-linked binary with hardened_malloc
+                {
+                  name = "${binaryName}-hmalloc";
+                  value = mkPackage pkgsCrossStatic "hmalloc";
                }

                # An output for an OCI image based on that binary
@@ -226,13 +292,36 @@
                  name = "oci-image-${crossSystem}";
                  value = mkOciImage
                    pkgsCrossStatic
-                    self.packages.${system}.${binaryName};
+                    self.packages.${system}.${binaryName}
+                    null;
+                }
+
+                # An output for an OCI image based on that binary with jemalloc
+                {
+                  name = "oci-image-${crossSystem}-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 = 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"
            ]
          )
        );
@@ -257,12 +346,21 @@
        ] ++ (with pkgsHost; [
          engage

+          # Needed for producing Debian packages
+          cargo-deb
+
          # Needed for Complement
          go
          olm

          # Needed for our script for Complement
          jq
+
+          # Needed for finding broken markdown links
+          lychee
+
+          # Useful for editing the book locally
+          mdbook
        ]);
      };
    });
@@ -1,198 +0,0 @@
-# Conduit for Nix/NixOS
-
-This guide assumes you have a recent version of Nix (^2.4) installed.
-
-Since Conduit ships as a Nix flake, you'll first need to [enable
-flakes][enable_flakes].
-
-You can now use the usual Nix commands to interact with Conduit's flake. For
-example, `nix run gitlab:famedly/conduit` will run Conduit (though you'll need
-to provide configuration and such manually as usual).
-
-If your NixOS configuration is defined as a flake, you can depend on this flake
-to provide a more up-to-date version than provided by `nixpkgs`. In your flake,
-add the following to your `inputs`:
-
-```nix
-conduit = {
-    url = "gitlab:famedly/conduit";
-
-    # Assuming you have an input for nixpkgs called `nixpkgs`. If you experience
-    # build failures while using this, try commenting/deleting this line. This
-    # will probably also require you to always build from source.
-    inputs.nixpkgs.follows = "nixpkgs";
-};
-```
-
-Next, make sure you're passing your flake inputs to the `specialArgs` argument
-of `nixpkgs.lib.nixosSystem` [as explained here][specialargs]. This guide will
-assume you've named the group `flake-inputs`.
-
-Now you can configure Conduit and a reverse proxy for it. Add the following to
-a new Nix file and include it in your configuration:
-
-```nix
-{ config
-, pkgs
-, flake-inputs
-, ...
-}:
-
-let
-  # You'll need to edit these values
-
-  # The hostname that will appear in your user and room IDs
-  server_name = "example.com";
-
-  # The hostname that Conduit actually runs on
-  #
-  # This can be the same as `server_name` if you want. This is only necessary
-  # when Conduit is running on a different machine than the one hosting your
-  # root domain. This configuration also assumes this is all running on a single
-  # machine, some tweaks will need to be made if this is not the case.
-  matrix_hostname = "matrix.${server_name}";
-
-  # An admin email for TLS certificate notifications
-  admin_email = "admin@${server_name}";
-
-  # These ones you can leave alone
-
-  # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server`
-  well_known_server = pkgs.writeText "well-known-matrix-server" ''
-    {
-      "m.server": "${matrix_hostname}"
-    }
-  '';
-
-  # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client`
-  well_known_client = pkgs.writeText "well-known-matrix-client" ''
-    {
-      "m.homeserver": {
-        "base_url": "https://${matrix_hostname}"
-      }
-    }
-  '';
-in
-
-{
-  # Configure Conduit itself
-  services.matrix-conduit = {
-    enable = true;
-
-    # This causes NixOS to use the flake defined in this repository instead of
-    # the build of Conduit built into nixpkgs.
-    package = flake-inputs.conduit.packages.${pkgs.system}.default;
-
-    settings.global = {
-      inherit server_name;
-    };
-  };
-
-  # Configure automated TLS acquisition/renewal
-  security.acme = {
-    acceptTerms = true;
-    defaults = {
-      email = admin_email;
-    };
-  };
-
-  # ACME data must be readable by the NGINX user
-  users.users.nginx.extraGroups = [
-    "acme"
-  ];
-
-  # Configure NGINX as a reverse proxy
-  services.nginx = {
-    enable = true;
-    recommendedProxySettings = true;
-
-    virtualHosts = {
-      "${matrix_hostname}" = {
-        forceSSL = true;
-        enableACME = true;
-
-        listen = [
-          {
-            addr = "0.0.0.0";
-            port = 443;
-            ssl = true;
-          }
-          {
-            addr = "[::]";
-            port = 443;
-            ssl = true;
-          }          {
-            addr = "0.0.0.0";
-            port = 8448;
-            ssl = true;
-          }
-          {
-            addr = "[::]";
-            port = 8448;
-            ssl = true;
-          }
-        ];
-
-        locations."/_matrix/" = {
-          proxyPass = "http://backend_conduit$request_uri";
-          proxyWebsockets = true;
-          extraConfig = ''
-            proxy_set_header Host $host;
-            proxy_buffering off;
-          '';
-        };
-
-        extraConfig = ''
-          merge_slashes off;
-        '';
-      };
-
-      "${server_name}" = {
-        forceSSL = true;
-        enableACME = true;
-
-        locations."=/.well-known/matrix/server" = {
-          # Use the contents of the derivation built previously
-          alias = "${well_known_server}";
-
-          extraConfig = ''
-            # Set the header since by default NGINX thinks it's just bytes
-            default_type application/json;
-          '';
-        };
-
-        locations."=/.well-known/matrix/client" = {
-          # Use the contents of the derivation built previously
-          alias = "${well_known_client}";
-
-          extraConfig = ''
-            # Set the header since by default NGINX thinks it's just bytes
-            default_type application/json;
-
-            # https://matrix.org/docs/spec/client_server/r0.4.0#web-browser-clients
-            add_header Access-Control-Allow-Origin "*";
-          '';
-        };
-      };
-    };
-
-    upstreams = {
-      "backend_conduit" = {
-        servers = {
-          "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = { };
-        };
-      };
-    };
-  };
-
-  # Open firewall ports for HTTP, HTTPS, and Matrix federation
-  networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
-  networking.firewall.allowedUDPPorts = [ 80 443 8448 ];
-}
-```
-
-Now you can rebuild your system configuration and you should be good to go!
-
-[enable_flakes]: https://nixos.wiki/wiki/Flakes#Enable_flakes
-
-[specialargs]: https://nixos.wiki/wiki/Flakes#Using_nix_flakes_with_NixOS
@@ -3,6 +3,7 @@
 # Other files that need upkeep when this changes:
 #
 # * `.gitlab-ci.yml`
+# * `.github/workflows/ci.yml`
 # * `Cargo.toml`
 # * `flake.nix`
 #
@@ -1,2 +1,28 @@
-unstable_features = true
+edition = "2021"
+
+condense_wildcard_suffixes = true
+format_code_in_doc_comments = true
+format_macro_bodies = true
+format_macro_matchers = true
+format_strings = true
+hex_literal_case = "Upper"
+max_width = 120
+tab_spaces = 4
+array_width = 80
+comment_width = 80
+wrap_comments = true
+fn_params_layout = "Compressed"
+fn_call_width = 80
+fn_single_line = true
+hard_tabs = true
+match_block_trailing_comma = true
 imports_granularity = "Crate"
+normalize_comments = false
+reorder_impl_items = true
+reorder_imports = true
+group_imports = "StdExternalCrate"
+newline_style = "Unix"
+use_field_init_shorthand = true
+use_small_heuristics = "Off"
+use_try_shorthand = true
+chain_width = 60
@@ -1,114 +0,0 @@
-use crate::{services, utils, Error, Result};
-use bytes::BytesMut;
-use ruma::api::{
-    appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
-};
-use std::{fmt::Debug, mem, time::Duration};
-use tracing::warn;
-
-/// Sends a request to an appservice
-///
-/// Only returns None if there is no url specified in the appservice registration file
-pub(crate) async fn send_request<T: OutgoingRequest>(
-    registration: Registration,
-    request: T,
-) -> Option<Result<T::IncomingResponse>>
-where
-    T: Debug,
-{
-    if let Some(destination) = registration.url {
-        let hs_token = registration.hs_token.as_str();
-
-        let mut http_request = request
-            .try_into_http_request::<BytesMut>(
-                &destination,
-                SendAccessToken::IfRequired(hs_token),
-                &[MatrixVersion::V1_0],
-            )
-            .map_err(|e| {
-                warn!("Failed to find destination {}: {}", destination, e);
-                Error::BadServerResponse("Invalid destination")
-            })
-            .unwrap()
-            .map(|body| body.freeze());
-
-        let mut parts = http_request.uri().clone().into_parts();
-        let old_path_and_query = parts.path_and_query.unwrap().as_str().to_owned();
-        let symbol = if old_path_and_query.contains('?') {
-            "&"
-        } else {
-            "?"
-        };
-
-        parts.path_and_query = Some(
-            (old_path_and_query + symbol + "access_token=" + hs_token)
-                .parse()
-                .unwrap(),
-        );
-        *http_request.uri_mut() = parts.try_into().expect("our manipulation is always valid");
-
-        let mut reqwest_request = reqwest::Request::try_from(http_request)
-            .expect("all http requests are valid reqwest requests");
-
-        *reqwest_request.timeout_mut() = Some(Duration::from_secs(120));
-
-        let url = reqwest_request.url().clone();
-        let mut response = match services()
-            .globals
-            .default_client()
-            .execute(reqwest_request)
-            .await
-        {
-            Ok(r) => r,
-            Err(e) => {
-                warn!(
-                    "Could not send request to appservice {} at {}: {}",
-                    registration.id, destination, e
-                );
-                return Some(Err(e.into()));
-            }
-        };
-
-        // reqwest::Response -> http::Response conversion
-        let status = response.status();
-        let mut http_response_builder = http::Response::builder()
-            .status(status)
-            .version(response.version());
-        mem::swap(
-            response.headers_mut(),
-            http_response_builder
-                .headers_mut()
-                .expect("http::response::Builder is usable"),
-        );
-
-        let body = response.bytes().await.unwrap_or_else(|e| {
-            warn!("server error: {}", e);
-            Vec::new().into()
-        }); // TODO: handle timeout
-
-        if !status.is_success() {
-            warn!(
-                "Appservice returned bad response {} {}\n{}\n{:?}",
-                destination,
-                status,
-                url,
-                utils::string_from_bytes(&body)
-            );
-        }
-
-        let response = T::IncomingResponse::try_from_http_response(
-            http_response_builder
-                .body(body)
-                .expect("reqwest body is valid http body"),
-        );
-        Some(response.map_err(|_| {
-            warn!(
-                "Appservice returned invalid response bytes {}\n{}",
-                destination, url
-            );
-            Error::BadServerResponse("Server returned bad response.")
-        }))
-    } else {
-        None
-    }
-}
@@ -1,11 +1,11 @@
-use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
-use crate::{api::client_server, services, utils, Error, Result, Ruma};
+use register::RegistrationKind;
 use ruma::{
 	api::client::{
 		account::{
-            change_password, deactivate, get_3pids, get_username_availability, register,
-            request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn,
-            whoami, ThirdPartyIdRemovalStatus,
+			change_password, deactivate, get_3pids, get_username_availability,
+			register::{self, LoginType},
+			request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn, whoami,
+			ThirdPartyIdRemovalStatus,
 		},
 		error::ErrorKind,
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
@@ -13,9 +13,13 @@ use ruma::{
 	events::{room::message::RoomMessageEventContent, GlobalAccountDataEventType},
 	push, UserId,
 };
-use tracing::{info, warn};
+use tracing::{error, info, warn};

-use register::RegistrationKind;
+use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
+use crate::{
+	api::client_server::{self, join_room_by_id_helper},
+	service, services, utils, Error, Result, Ruma,
+};

 const RANDOM_USER_ID_LENGTH: usize = 10;

@@ -28,30 +32,20 @@ const RANDOM_USER_ID_LENGTH: usize = 10;
 /// - The server name of the user id matches this server
 /// - No user or appservice on this server already claimed this username
 ///
-/// Note: This will not reserve the username, so the username might become invalid when trying to register
+/// Note: This will not reserve the username, so the username might become
+/// invalid when trying to register
 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(),
-    )
+	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_id.server_name() == services().globals.server_name()
-    })
-    .ok_or(Error::BadRequest(
-        ErrorKind::InvalidUsername,
-        "Username is invalid.",
-    ))?;
+		.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
 	if services().users.exists(&user_id)? {
-        return Err(Error::BadRequest(
-            ErrorKind::UserInUse,
-            "Desired user ID is already taken.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::UserInUse, "Desired user ID is already taken."));
 	}

 	if services()
@@ -59,84 +53,85 @@ pub async fn get_register_available_route(
 		.forbidden_usernames()
 		.is_match(user_id.localpart())
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::Unknown,
-            "Username is forbidden.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
 	}

 	// TODO add check for appservice namespaces

 	// If no if check is true we have an username that's available to be used.
-    Ok(get_username_availability::v3::Response { available: true })
+	Ok(get_username_availability::v3::Response {
+		available: true,
+	})
 }

 /// # `POST /_matrix/client/v3/register`
 ///
 /// Register an account on this homeserver.
 ///
-/// You can use [`GET /_matrix/client/v3/register/available`](fn.get_register_available_route.html)
-/// to check if the user id is valid and available.
+/// You can use [`GET
+/// /_matrix/client/v3/register/available`](fn.get_register_available_route.
+/// html) to check if the user id is valid and available.
 ///
 /// - Only works if registration is enabled
-/// - If type is guest: ignores all parameters except initial_device_display_name
+/// - If type is guest: ignores all parameters except
+///   initial_device_display_name
 /// - If sender is not appservice: Requires UIAA (but we only use a dummy stage)
-/// - If type is not guest and no username is given: Always fails after UIAA check
+/// - If type is not guest and no username is given: Always fails after UIAA
+///   check
 /// - Creates a new account and populates it with default account data
-/// - If `inhibit_login` is false: Creates a device and returns device id and access_token
+/// - If `inhibit_login` is false: Creates a device and returns device id and
+///   access_token
+#[allow(clippy::doc_markdown)]
 pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
-    if !services().globals.allow_registration() && !body.from_appservice {
-        info!("Registration disabled and request not from known appservice, rejecting registration attempt for username {:?}", body.username);
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Registration has been disabled.",
-        ));
+	if !services().globals.allow_registration() && body.appservice_info.is_none() {
+		info!(
+			"Registration disabled and request not from known appservice, rejecting registration attempt for username \
+			 {:?}",
+			body.username
+		);
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Registration has been disabled."));
 	}

 	let is_guest = body.kind == RegistrationKind::Guest;

 	if is_guest
 		&& (!services().globals.allow_guest_registration()
-            || (services().globals.allow_registration()
-                && services().globals.config.registration_token.is_some()))
+			|| (services().globals.allow_registration() && services().globals.config.registration_token.is_some()))
 	{
-        info!("Guest registration disabled / registration enabled with token configured, rejecting guest registration, initial device name: {:?}", body.initial_device_display_name);
+		info!(
+			"Guest registration disabled / registration enabled with token configured, rejecting guest registration, \
+			 initial device name: {:?}",
+			body.initial_device_display_name
+		);
 		return Err(Error::BadRequest(
 			ErrorKind::GuestAccessForbidden,
 			"Guest registration is disabled.",
 		));
 	}

-    // forbid guests from registering if there is not a real admin user yet. give generic user error.
+	// forbid guests from registering if there is not a real admin user yet. give
+	// generic user error.
 	if is_guest && services().users.count()? < 2 {
-        warn!("Guest account attempted to register before a real admin user has been registered, rejecting registration. Guest's initial device name: {:?}", body.initial_device_display_name);
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Registration temporarily disabled.",
-        ));
+		warn!(
+			"Guest account attempted to register before a real admin user has been registered, rejecting \
+			 registration. Guest's initial device name: {:?}",
+			body.initial_device_display_name
+		);
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Registration temporarily disabled."));
 	}

 	let user_id = match (&body.username, is_guest) {
 		(Some(username), false) => {
-            let proposed_user_id = UserId::parse_with_server_name(
-                username.to_lowercase(),
-                services().globals.server_name(),
-            )
+			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_id.server_name() == services().globals.server_name()
+						!user_id.is_historical() && user_id.server_name() == services().globals.server_name()
 					})
-            .ok_or(Error::BadRequest(
-                ErrorKind::InvalidUsername,
-                "Username is invalid.",
-            ))?;
+					.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

 			if services().users.exists(&proposed_user_id)? {
-                return Err(Error::BadRequest(
-                    ErrorKind::UserInUse,
-                    "Desired user ID is already taken.",
-                ));
+				return Err(Error::BadRequest(ErrorKind::UserInUse, "Desired user ID is already taken."));
 			}

 			if services()
@@ -144,14 +139,11 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 				.forbidden_usernames()
 				.is_match(proposed_user_id.localpart())
 			{
-                return Err(Error::BadRequest(
-                    ErrorKind::Unknown,
-                    "Username is forbidden.",
-                ));
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
 			}

 			proposed_user_id
-        }
+		},
 		_ => loop {
 			let proposed_user_id = UserId::parse_with_server_name(
 				utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
@@ -164,6 +156,18 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 		},
 	};

+	if body.body.login_type == Some(LoginType::ApplicationService) {
+		if let Some(ref info) = body.appservice_info {
+			if !info.is_user_match(&user_id) {
+				return Err(Error::BadRequest(ErrorKind::Exclusive, "User is not in namespace."));
+			}
+		} else {
+			return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing appservice token."));
+		}
+	} else if services().appservice.is_exclusive_user_id(&user_id).await {
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
+	}
+
 	// UIAA
 	let mut uiaainfo;
 	let skip_auth;
@@ -174,11 +178,11 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 				stages: vec![AuthType::RegistrationToken],
 			}],
 			completed: Vec::new(),
-            params: Default::default(),
+			params: Box::default(),
 			session: None,
 			auth_error: None,
 		};
-        skip_auth = body.from_appservice;
+		skip_auth = body.appservice_info.is_some();
 	} else {
 		// No registration token necessary, but clients must still go through the flow
 		uiaainfo = UiaaInfo {
@@ -186,18 +190,17 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 				stages: vec![AuthType::Dummy],
 			}],
 			completed: Vec::new(),
-            params: Default::default(),
+			params: Box::default(),
 			session: None,
 			auth_error: None,
 		};
-        skip_auth = body.from_appservice || is_guest;
+		skip_auth = body.appservice_info.is_some() || is_guest;
 	}

 	if !skip_auth {
 		if let Some(auth) = &body.auth {
 			let (worked, uiaainfo) = services().uiaa.try_auth(
-                &UserId::parse_with_server_name("", services().globals.server_name())
-                    .expect("we know this is valid"),
+				&UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid"),
 				"".into(),
 				auth,
 				&uiaainfo,
@@ -209,8 +212,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 		} else if let Some(json) = body.json_body {
 			uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
 			services().uiaa.create(
-                &UserId::parse_with_server_name("", services().globals.server_name())
-                    .expect("we know this is valid"),
+				&UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid"),
 				"".into(),
 				&uiaainfo,
 				&json,
@@ -233,9 +235,10 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	// Default to pretty displayname
 	let mut displayname = user_id.localpart().to_owned();

-    // If enabled append lightning bolt to display name (default true)
-    if services().globals.enable_lightning_bolt() {
-        displayname.push_str(" ⚡️");
+	// 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() {
+		displayname.push_str(&(" ".to_owned() + services().globals.new_user_displayname_suffix()));
 	}

 	services()
@@ -279,17 +282,14 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	let token = utils::random_string(TOKEN_LENGTH);

 	// Create device for this account
-    services().users.create_device(
-        &user_id,
-        &device_id,
-        &token,
-        body.initial_device_display_name.clone(),
-    )?;
+	services()
+		.users
+		.create_device(&user_id, &device_id, &token, body.initial_device_display_name.clone())?;

 	info!("New user \"{}\" registered on this server.", user_id);

 	// log in conduit admin channel if a non-guest user registered
-    if !body.from_appservice && !is_guest {
+	if body.appservice_info.is_none() && !is_guest {
 		services()
 			.admin
 			.send_message(RoomMessageEventContent::notice_plain(format!(
@@ -298,18 +298,45 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	}

 	// log in conduit admin channel if a guest registered
-    if !body.from_appservice && is_guest {
+	if body.appservice_info.is_none() && is_guest && services().globals.log_guest_registrations() {
+		if let Some(device_display_name) = &body.initial_device_display_name {
+			if body
+				.initial_device_display_name
+				.as_ref()
+				.is_some_and(|device_display_name| !device_display_name.is_empty())
+			{
 				services()
 					.admin
 					.send_message(RoomMessageEventContent::notice_plain(format!(
-            "Guest user \"{user_id}\" with device display name `{:?}` registered on this server.",
-            body.initial_device_display_name
+						"Guest user \"{user_id}\" with device display name `{device_display_name}` registered on this \
+						 server."
+					)));
+			} else {
+				services()
+					.admin
+					.send_message(RoomMessageEventContent::notice_plain(format!(
+						"Guest user \"{user_id}\" with no device display name registered on this server.",
 					)));
 			}
+		} else {
+			services()
+				.admin
+				.send_message(RoomMessageEventContent::notice_plain(format!(
+					"Guest user \"{user_id}\" with no device display name registered on this server.",
+				)));
+		}
+	}

-    // 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 services().users.count()? == 2 && !is_guest {
+	// 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()? {
+			if services()
+				.rooms
+				.state_cache
+				.room_joined_count(&admin_room)?
+				== Some(1)
+			{
 				services()
 					.admin
 					.make_user_admin(&user_id, displayname)
@@ -317,6 +344,41 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe

 				warn!("Granting {} admin privileges as the first user", user_id);
 			}
+		}
+	}
+
+	if body.appservice_info.is_none()
+		&& !services().globals.config.auto_join_rooms.is_empty()
+		&& (services().globals.allow_guests_auto_join_rooms() || !is_guest)
+	{
+		for room in &services().globals.config.auto_join_rooms {
+			if !services()
+				.rooms
+				.state_cache
+				.server_in_room(services().globals.server_name(), room)?
+			{
+				warn!("Skipping room {room} to automatically join as we have never joined before.");
+				continue;
+			}
+
+			if let Some(room_id_server_name) = room.server_name() {
+				if let Err(e) = join_room_by_id_helper(
+					Some(&user_id),
+					room,
+					Some("Automatically joining this room upon registration".to_owned()),
+					&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],
+					None,
+				)
+				.await
+				{
+					// don't return this error so we don't fail registrations
+					error!("Failed to automatically join room {room} for user {user_id}: {e}");
+				} else {
+					info!("Automatically joined room {room} for user {user_id}");
+				};
+			}
+		}
+	}

 	Ok(register::v3::Response {
 		access_token: Some(token),
@@ -333,17 +395,18 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 ///
 /// - Requires UIAA to verify user password
 /// - Changes the password of the sender user
-/// - The password hash is calculated using argon2 with 32 character salt, the plain password is
+/// - The password hash is calculated using argon2 with 32 character salt, the
+///   plain password is
 /// not saved
 ///
-/// If logout_devices is true it does the following for each device except the sender device:
+/// If logout_devices is true it does the following for each device except the
+/// sender device:
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub 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");

@@ -352,14 +415,13 @@ pub async fn change_password_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};

 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
-            services()
+		let (worked, uiaainfo) = services()
 			.uiaa
 			.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
@@ -385,7 +447,7 @@ pub async fn change_password_route(
 		for id in services()
 			.users
 			.all_device_ids(sender_user)
-            .filter_map(|id| id.ok())
+			.filter_map(Result::ok)
 			.filter(|id| id != sender_device)
 		{
 			services().users.remove_device(sender_user, &id)?;
@@ -404,17 +466,17 @@ pub async fn change_password_route(

 /// # `GET _matrix/client/r0/account/whoami`
 ///
-/// Get user_id of the sender user.
+/// Get `user_id` of the sender user.
 ///
 /// Note: Also works for Application Services
 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.as_ref().cloned();
+	let device_id = body.sender_device.clone();

 	Ok(whoami::v3::Response {
 		user_id: sender_user.clone(),
 		device_id,
-        is_guest: services().users.is_deactivated(sender_user)? && !body.from_appservice,
+		is_guest: services().users.is_deactivated(sender_user)? && body.appservice_info.is_none(),
 	})
 }

@@ -424,13 +486,12 @@ pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3:
 ///
 /// - Leaves all rooms and rejects all invitations
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes all device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-pub 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");

@@ -439,14 +500,13 @@ pub async fn deactivate_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};

 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
-            services()
+		let (worked, uiaainfo) = services()
 			.uiaa
 			.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
@@ -486,9 +546,7 @@ pub async fn deactivate_route(
 /// Get a list of third party identifiers associated with this account.
 ///
 /// - Currently always returns empty list
-pub 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()))
@@ -496,9 +554,11 @@ pub async fn third_party_route(

 /// # `POST /_matrix/client/v3/account/3pid/email/requestToken`
 ///
-/// "This API should be used to request validation tokens when adding an email address to an account"
+/// "This API should be used to request validation tokens when adding an email
+/// address to an account"
 ///
-/// - 403 signals that The homeserver does not allow the third party identifier as a contact option.
+/// - 403 signals that The homeserver does not allow the third party identifier
+///   as a contact option.
 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> {
@@ -510,9 +570,11 @@ pub async fn request_3pid_management_token_via_email_route(

 /// # `POST /_matrix/client/v3/account/3pid/msisdn/requestToken`
 ///
-/// "This API should be used to request validation tokens when adding an phone number to an account"
+/// "This API should be used to request validation tokens when adding an phone
+/// number to an account"
 ///
-/// - 403 signals that The homeserver does not allow the third party identifier as a contact option.
+/// - 403 signals that The homeserver does not allow the third party identifier
+///   as a contact option.
 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> {
@@ -1,6 +1,4 @@
-use crate::{services, Error, Result, Ruma};
 use rand::seq::SliceRandom;
-use regex::Regex;
 use ruma::{
 	api::{
 		appservice,
@@ -13,28 +11,34 @@ use ruma::{
 	OwnedRoomAliasId, OwnedServerName,
 };

+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
-pub async fn create_alias_route(
-    body: Ruma<create_alias::v3::Request>,
-) -> Result<create_alias::v3::Response> {
+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.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
 	}

 	if services()
 		.globals
-        .forbidden_room_names()
+		.forbidden_alias_names()
 		.is_match(body.room_alias.alias())
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::Unknown,
-            "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()
@@ -67,14 +71,9 @@ pub async fn create_alias_route(
 ///
 /// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
-pub async fn delete_alias_route(
-    body: Ruma<delete_alias::v3::Request>,
-) -> Result<delete_alias::v3::Response> {
+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.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
 	}

 	if services()
@@ -83,10 +82,19 @@ pub async fn delete_alias_route(
 		.resolve_local_alias(&body.room_alias)?
 		.is_none()
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Alias does not exist.",
-        ));
+		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()
@@ -109,22 +117,18 @@ pub async fn delete_alias_route(
 /// # `GET /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Resolve an alias locally or over federation.
-pub async fn get_alias_route(
-    body: Ruma<get_alias::v3::Request>,
-) -> Result<get_alias::v3::Response> {
+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,
-) -> Result<get_alias::v3::Response> {
+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(),
 				federation::query::get_room_information::v1::Request {
-                    room_alias: room_alias.to_owned(),
+					room_alias: room_alias.clone(),
 				},
 			)
 			.await?;
@@ -133,25 +137,17 @@ pub(crate) async fn get_alias_helper(

 		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
-        for extra_servers in services()
+		servers.extend(
+			services()
 				.rooms
 				.state_cache
 				.room_servers(&room_id)
-            .filter_map(|r| r.ok())
-        {
-            servers.push(extra_servers);
-        }
-
-        // insert our server as the very first choice if in list
-        if let Some(server_index) = servers
-            .clone()
-            .into_iter()
-            .position(|server| server == services().globals.server_name())
-        {
-            servers.remove(server_index);
-            servers.insert(0, services().globals.server_name().to_owned());
-        }
+				.filter_map(Result::ok),
+		);

 		servers.sort_unstable();
 		servers.dedup();
@@ -159,6 +155,22 @@ pub(crate) async fn get_alias_helper(
 		// 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());
+		}
+
 		return Ok(get_alias::v3::Response::new(room_id, servers));
 	}

@@ -166,78 +178,44 @@ pub(crate) async fn get_alias_helper(
 	match services().rooms.alias.resolve_local_alias(&room_alias)? {
 		Some(r) => room_id = Some(r),
 		None => {
-            for (_id, registration) in services().appservice.all()? {
-                let aliases = registration
-                    .namespaces
-                    .aliases
-                    .iter()
-                    .filter_map(|alias| Regex::new(alias.regex.as_str()).ok())
-                    .collect::<Vec<_>>();
-
-                if aliases
-                    .iter()
-                    .any(|aliases| aliases.is_match(room_alias.as_str()))
-                    && if let Some(opt_result) = services()
+			for appservice in services().appservice.read().await.values() {
+				if appservice.aliases.is_match(room_alias.as_str())
+					&& matches!(
+						services()
 							.sending
 							.send_appservice_request(
-                            registration,
+								appservice.registration.clone(),
 								appservice::query::query_room_alias::v1::Request {
 									room_alias: room_alias.clone(),
 								},
 							)
-                        .await
-                    {
-                        opt_result.is_ok()
-                    } else {
-                        false
-                    }
-                {
+							.await,
+						Ok(Some(_opt_result))
+					) {
 					room_id = Some(
 						services()
 							.rooms
 							.alias
 							.resolve_local_alias(&room_alias)?
-                            .ok_or_else(|| {
-                                Error::bad_config("Appservice lied to us. Room does not exist.")
-                            })?,
+							.ok_or_else(|| Error::bad_config("Room does not exist."))?,
 					);
 					break;
 				}
 			}
-        }
+		},
 	};

-    let room_id = match room_id {
-        Some(room_id) => room_id,
-        None => {
-            return Err(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Room with alias not found.",
-            ))
-        }
+	let Some(room_id) = room_id else {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found."));
 	};

-    let mut servers: Vec<OwnedServerName> = Vec::new();
-
 	// find active servers in room state cache to suggest
-    for extra_servers in services()
+	let mut servers: Vec<OwnedServerName> = services()
 		.rooms
 		.state_cache
 		.room_servers(&room_id)
-        .filter_map(|r| r.ok())
-    {
-        servers.push(extra_servers);
-    }
-
-    // insert our server as the very first choice if in list
-    if let Some(server_index) = servers
-        .clone()
-        .into_iter()
-        .position(|server| server == services().globals.server_name())
-    {
-        servers.remove(server_index);
-        servers.insert(0, services().globals.server_name().to_owned());
-    }
+		.filter_map(Result::ok)
+		.collect();

 	servers.sort_unstable();
 	servers.dedup();
@@ -245,5 +223,14 @@ pub(crate) async fn get_alias_helper(
 	// 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
+	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());
+	}
+
 	Ok(get_alias::v3::Response::new(room_id, servers))
 }
@@ -1,15 +1,15 @@
-use crate::{services, Error, Result, Ruma};
 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,
+		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 crate::{services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/room_keys/version`
 ///
 /// Creates a new backup.
@@ -21,12 +21,15 @@ pub async fn create_backup_version_route(
 		.key_backups
 		.create_backup(sender_user, &body.algorithm)?;

-    Ok(create_backup_version::v3::Response { version })
+	Ok(create_backup_version::v3::Response {
+		version,
+	})
 }

 /// # `PUT /_matrix/client/r0/room_keys/version/{version}`
 ///
-/// Update information about an existing backup. Only `auth_data` can be modified.
+/// Update information about an existing backup. Only `auth_data` can be
+/// modified.
 pub async fn update_backup_version_route(
 	body: Ruma<update_backup_version::v3::Request>,
 ) -> Result<update_backup_version::v3::Response> {
@@ -49,10 +52,7 @@ pub async fn get_latest_backup_info_route(
 	let (version, algorithm) = services()
 		.key_backups
 		.get_latest_backup(sender_user)?
-        .ok_or(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,
@@ -65,17 +65,12 @@ pub async fn get_latest_backup_info_route(
 /// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about an existing backup.
-pub 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(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,
@@ -86,7 +81,7 @@ pub async fn get_backup_info_route(
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
-        version: body.version.to_owned(),
+		version: body.version.clone(),
 	})
 }

@@ -94,7 +89,8 @@ pub async fn get_backup_info_route(
 ///
 /// Delete an existing key backup.
 ///
-/// - Deletes both information about the backup, as well as all key data related to the backup
+/// - Deletes both information about the backup, as well as all key data related
+///   to the backup
 pub async fn delete_backup_version_route(
 	body: Ruma<delete_backup_version::v3::Request>,
 ) -> Result<delete_backup_version::v3::Response> {
@@ -111,12 +107,11 @@ pub async fn delete_backup_version_route(
 ///
 /// Add the received backup keys to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-pub 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)
@@ -133,13 +128,9 @@ pub async fn add_backup_keys_route(

 	for (room_id, room) in &body.rooms {
 		for (session_id, key_data) in &room.sessions {
-            services().key_backups.add_key(
-                sender_user,
-                &body.version,
-                room_id,
-                session_id,
-                key_data,
-            )?
+			services()
+				.key_backups
+				.add_key(sender_user, &body.version, room_id, session_id, key_data)?;
 		}
 	}

@@ -158,7 +149,8 @@ pub async fn add_backup_keys_route(
 ///
 /// Add the received backup keys to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
 pub async fn add_backup_keys_for_room_route(
@@ -179,13 +171,9 @@ pub async fn add_backup_keys_for_room_route(
 	}

 	for (session_id, key_data) in &body.sessions {
-        services().key_backups.add_key(
-            sender_user,
-            &body.version,
-            &body.room_id,
-            session_id,
-            key_data,
-        )?
+		services()
+			.key_backups
+			.add_key(sender_user, &body.version, &body.room_id, session_id, key_data)?;
 	}

 	Ok(add_backup_keys_for_room::v3::Response {
@@ -203,7 +191,8 @@ pub async fn add_backup_keys_for_room_route(
 ///
 /// Add the received backup key to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
 pub async fn add_backup_keys_for_session_route(
@@ -223,13 +212,9 @@ pub async fn add_backup_keys_for_session_route(
 		));
 	}

-    services().key_backups.add_key(
-        sender_user,
-        &body.version,
-        &body.room_id,
-        &body.session_id,
-        &body.session_data,
-    )?;
+	services()
+		.key_backups
+		.add_key(sender_user, &body.version, &body.room_id, &body.session_id, &body.session_data)?;

 	Ok(add_backup_keys_for_session::v3::Response {
 		count: (services()
@@ -245,14 +230,14 @@ pub async fn add_backup_keys_for_session_route(
 /// # `GET /_matrix/client/r0/room_keys/keys`
 ///
 /// Retrieves all keys from the backup.
-pub 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)?;

-    Ok(get_backup_keys::v3::Response { rooms })
+	Ok(get_backup_keys::v3::Response {
+		rooms,
+	})
 }

 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}`
@@ -267,7 +252,9 @@ pub async fn get_backup_keys_for_room_route(
 		.key_backups
 		.get_room(sender_user, &body.version, &body.room_id)?;

-    Ok(get_backup_keys_for_room::v3::Response { sessions })
+	Ok(get_backup_keys_for_room::v3::Response {
+		sessions,
+	})
 }

 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
@@ -286,7 +273,9 @@ pub async fn get_backup_keys_for_session_route(
 			"Backup key not found for this user's session.",
 		))?;

-    Ok(get_backup_keys_for_session::v3::Response { key_data })
+	Ok(get_backup_keys_for_session::v3::Response {
+		key_data,
+	})
 }

 /// # `DELETE /_matrix/client/r0/room_keys/keys`
@@ -343,12 +332,9 @@ pub async fn delete_backup_keys_for_session_route(
 ) -> Result<delete_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    services().key_backups.delete_room_key(
-        sender_user,
-        &body.version,
-        &body.room_id,
-        &body.session_id,
-    )?;
+	services()
+		.key_backups
+		.delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)?;

 	Ok(delete_backup_keys_for_session::v3::Response {
 		count: (services()
@@ -1,12 +1,16 @@
-use crate::{services, Result, Ruma};
-use ruma::api::client::discovery::get_capabilities::{
-    self, Capabilities, RoomVersionStability, RoomVersionsCapability,
-};
 use std::collections::BTreeMap;

-/// # `GET /_matrix/client/r0/capabilities`
+use ruma::api::client::discovery::get_capabilities::{
+	self, Capabilities, ChangePasswordCapability, RoomVersionStability, RoomVersionsCapability, SetAvatarUrlCapability,
+	SetDisplayNameCapability, ThirdPartyIdChangesCapability,
+};
+
+use crate::{services, Result, Ruma};
+
+/// # `GET /_matrix/client/v3/capabilities`
 ///
-/// Get information on the supported feature set and other relevent capabilities of this server.
+/// Get information on the supported feature set and other relevent capabilities
+/// of this server.
 pub async fn get_capabilities_route(
 	_body: Ruma<get_capabilities::v3::Request>,
 ) -> Result<get_capabilities::v3::Response> {
@@ -24,5 +28,24 @@ pub async fn get_capabilities_route(
 		available,
 	};

-    Ok(get_capabilities::v3::Response { capabilities })
+	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,
+	};
+
+	Ok(get_capabilities::v3::Response {
+		capabilities,
+	})
 }
@@ -1,10 +1,6 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::client::{
-        config::{
-            get_global_account_data, get_room_account_data, set_global_account_data,
-            set_room_account_data,
-        },
+		config::{get_global_account_data, get_room_account_data, set_global_account_data, set_room_account_data},
 		error::ErrorKind,
 	},
 	events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
@@ -13,6 +9,8 @@ use ruma::{
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};

+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Sets some account data for the sender user.
@@ -82,7 +80,9 @@ pub async fn get_global_account_data_route(
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 		.content;

-    Ok(get_global_account_data::v3::Response { account_data })
+	Ok(get_global_account_data::v3::Response {
+		account_data,
+	})
 }

 /// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
@@ -102,7 +102,9 @@ pub async fn get_room_account_data_route(
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 		.content;

-    Ok(get_room_account_data::v3::Response { account_data })
+	Ok(get_room_account_data::v3::Response {
+		account_data,
+	})
 }

 #[derive(Deserialize)]
@@ -1,20 +1,21 @@
-use crate::{services, Error, Result, Ruma};
+use std::collections::HashSet;
+
 use ruma::{
 	api::client::{context::get_context, error::ErrorKind, filter::LazyLoadOptions},
 	events::StateEventType,
 };
-use std::collections::HashSet;
 use tracing::error;

+use crate::{services, Error, Result, Ruma};
+
 /// # `GET /_matrix/client/r0/rooms/{roomId}/context`
 ///
 /// Allows loading room history around an event.
 ///
-/// - Only works if the user is joined (TODO: always allow, but only show events if the user was
+/// - Only works if the user is joined (TODO: always allow, but only show events
+///   if the user was
 /// joined, depending on history_visibility)
-pub 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");

@@ -22,7 +23,7 @@ pub async fn get_context_route(
 		LazyLoadOptions::Enabled {
 			include_redundant_members,
 		} => (true, *include_redundant_members),
-        _ => (false, false),
+		LazyLoadOptions::Disabled => (false, false),
 	};

 	let mut lazy_loaded = HashSet::new();
@@ -31,20 +32,13 @@ pub async fn get_context_route(
 		.rooms
 		.timeline
 		.get_pdu_count(&body.event_id)?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Base event id not found.",
-        ))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Base event id not found."))?;

-    let base_event =
-        services()
+	let base_event = services()
 		.rooms
 		.timeline
 		.get_pdu(&body.event_id)?
-            .ok_or(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Base event not found.",
-            ))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Base event not found."))?;

 	let room_id = base_event.room_id.clone();

@@ -54,7 +48,7 @@ pub async fn get_context_route(
 		.user_can_see_event(sender_user, &room_id, &body.event_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view this event.",
 		));
 	}
@@ -79,7 +73,7 @@ pub async fn get_context_route(
 		.timeline
 		.pdus_until(sender_user, &room_id, base_token)?
 		.take(limit / 2)
-        .filter_map(|r| r.ok()) // Remove buggy events
+		.filter_map(Result::ok) // Remove buggy events
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -103,8 +97,7 @@ pub async fn get_context_route(

 	let start_token = events_before
 		.last()
-        .map(|(count, _)| count.stringify())
-        .unwrap_or_else(|| base_token.stringify());
+		.map_or_else(|| base_token.stringify(), |(count, _)| count.stringify());

 	let events_before: Vec<_> = events_before
 		.into_iter()
@@ -116,7 +109,7 @@ pub async fn get_context_route(
 		.timeline
 		.pdus_after(sender_user, &room_id, base_token)?
 		.take(limit / 2)
-        .filter_map(|r| r.ok()) // Remove buggy events
+		.filter_map(Result::ok) // Remove buggy events
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -138,18 +131,22 @@ pub async fn get_context_route(
 		}
 	}

-    let shortstatehash = match services().rooms.state_accessor.pdu_shortstatehash(
+	let shortstatehash = services()
+		.rooms
+		.state_accessor
+		.pdu_shortstatehash(
 			events_after
 				.last()
 				.map_or(&*body.event_id, |(_, e)| &*e.event_id),
-    )? {
-        Some(s) => s,
-        None => services()
+		)?
+		.map_or(
+			services()
 				.rooms
 				.state
 				.get_room_shortstatehash(&room_id)?
 				.expect("All rooms have state"),
-    };
+			|hash| hash,
+		);

 	let state_ids = services()
 		.rooms
@@ -159,8 +156,7 @@ pub async fn get_context_route(

 	let end_token = events_after
 		.last()
-        .map(|(count, _)| count.stringify())
-        .unwrap_or_else(|| base_token.stringify());
+		.map_or_else(|| base_token.stringify(), |(count, _)| count.stringify());

 	let events_after: Vec<_> = events_after
 		.into_iter()
@@ -176,22 +172,18 @@ pub async fn get_context_route(
 			.get_statekey_from_short(shortstatekey)?;

 		if event_type != StateEventType::RoomMember {
-            let pdu = match services().rooms.timeline.get_pdu(&id)? {
-                Some(pdu) => pdu,
-                None => {
+			let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
 				error!("Pdu in state not found: {}", id);
 				continue;
-                }
 			};
+
 			state.push(pdu.to_state_event());
 		} else if !lazy_load_enabled || lazy_loaded.contains(&state_key) {
-            let pdu = match services().rooms.timeline.get_pdu(&id)? {
-                Some(pdu) => pdu,
-                None => {
+			let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
 				error!("Pdu in state not found: {}", id);
 				continue;
-                }
 			};
+
 			state.push(pdu.to_state_event());
 		}
 	}
@@ -1,4 +1,3 @@
-use crate::{services, utils, Error, Result, Ruma};
 use ruma::api::client::{
 	device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
 	error::ErrorKind,
@@ -6,30 +5,29 @@ use ruma::api::client::{
 };

 use super::SESSION_ID_LENGTH;
+use crate::{services, utils, Error, Result, Ruma};

 /// # `GET /_matrix/client/r0/devices`
 ///
 /// Get metadata on all devices of the sender user.
-pub 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()
 		.users
 		.all_devices_metadata(sender_user)
-        .filter_map(|r| r.ok()) // Filter out buggy devices
+		.filter_map(Result::ok) // Filter out buggy devices
 		.collect();

-    Ok(get_devices::v3::Response { devices })
+	Ok(get_devices::v3::Response {
+		devices,
+	})
 }

 /// # `GET /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Get metadata on a single device of the sender user.
-pub 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()
@@ -37,15 +35,15 @@ pub async fn get_device_route(
 		.get_device_metadata(sender_user, &body.body.device_id)?
 		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;

-    Ok(get_device::v3::Response { device })
+	Ok(get_device::v3::Response {
+		device,
+	})
 }

 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Updates the metadata on a given device of the sender user.
-pub 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()
@@ -53,7 +51,7 @@ pub async fn update_device_route(
 		.get_device_metadata(sender_user, &body.device_id)?
 		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;

-    device.display_name = body.display_name.clone();
+	device.display_name.clone_from(&body.display_name);

 	services()
 		.users
@@ -68,12 +66,11 @@ pub async fn update_device_route(
 ///
 /// - Requires UIAA to verify user password
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub 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");

@@ -83,14 +80,13 @@ pub async fn delete_device_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};

 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
-            services()
+		let (worked, uiaainfo) = services()
 			.uiaa
 			.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
@@ -122,12 +118,11 @@ pub async fn delete_device_route(
 ///
 /// For each device:
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub 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");

@@ -137,14 +132,13 @@ pub async fn delete_devices_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};

 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
-            services()
+		let (worked, uiaainfo) = services()
 			.uiaa
 			.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
@@ -162,7 +156,7 @@ pub async fn delete_devices_route(
 	}

 	for device_id in &body.devices {
-        services().users.remove_device(sender_user, device_id)?
+		services().users.remove_device(sender_user, device_id)?;
 	}

 	Ok(delete_devices::v3::Response {})
@@ -1,11 +1,7 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::{
 		client::{
-            directory::{
-                get_public_rooms, get_public_rooms_filtered, get_room_visibility,
-                set_room_visibility,
-            },
+			directory::{get_public_rooms, get_public_rooms_filtered, get_room_visibility, set_room_visibility},
 			error::ErrorKind,
 			room,
 		},
@@ -28,6 +24,8 @@ use ruma::{
 };
 use tracing::{error, info, warn};

+use crate::{services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/publicRooms`
 ///
 /// Lists the public rooms on this server.
@@ -36,15 +34,20 @@ use tracing::{error, info, warn};
 pub async fn get_public_rooms_filtered_route(
 	body: Ruma<get_public_rooms_filtered::v3::Request>,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
-    if !services()
+	if let Some(server) = &body.server {
+		if services()
 			.globals
-        .config
-        .allow_public_room_directory_without_auth
+			.forbidden_remote_room_directory_server_names()
+			.contains(server)
 		{
-        let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
+			return Err(Error::BadRequest(
+				ErrorKind::forbidden(),
+				"Server is banned on this homeserver.",
+			));
+		}
 	}

-    get_public_rooms_filtered_helper(
+	let response = get_public_rooms_filtered_helper(
 		body.server.as_deref(),
 		body.limit,
 		body.since.as_deref(),
@@ -52,6 +55,12 @@ pub async fn get_public_rooms_filtered_route(
 		&body.room_network,
 	)
 	.await
+	.map_err(|e| {
+		warn!("Failed to return our /publicRooms: {e}");
+		Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list.")
+	})?;
+
+	Ok(response)
 }

 /// # `GET /_matrix/client/v3/publicRooms`
@@ -62,12 +71,17 @@ pub async fn get_public_rooms_filtered_route(
 pub async fn get_public_rooms_route(
 	body: Ruma<get_public_rooms::v3::Request>,
 ) -> Result<get_public_rooms::v3::Response> {
-    if !services()
+	if let Some(server) = &body.server {
+		if services()
 			.globals
-        .config
-        .allow_public_room_directory_without_auth
+			.forbidden_remote_room_directory_server_names()
+			.contains(server)
 		{
-        let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
+			return Err(Error::BadRequest(
+				ErrorKind::forbidden(),
+				"Server is banned on this homeserver.",
+			));
+		}
 	}

 	let response = get_public_rooms_filtered_helper(
@@ -77,7 +91,11 @@ pub async fn get_public_rooms_route(
 		&Filter::default(),
 		&RoomNetwork::Matrix,
 	)
-    .await?;
+	.await
+	.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::v3::Response {
 		chunk: response.chunk,
@@ -104,16 +122,29 @@ pub async fn set_room_visibility_route(

 	match &body.visibility {
 		room::Visibility::Public => {
-            services().rooms.directory.set_public(&body.room_id)?;
-            info!("{} made {} public", sender_user, body.room_id);
+			if services().globals.config.lockdown_public_room_directory && !services().users.is_admin(sender_user)? {
+				info!(
+					"Non-admin user {sender_user} tried to publish {0} to the room directory while \
+					 \"lockdown_public_room_directory\" is enabled",
+					body.room_id
+				);
+
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"Publishing rooms to the room directory is not allowed",
+				));
 			}
+
+			services().rooms.directory.set_public(&body.room_id)?;
+			info!("{sender_user} made {0} public", body.room_id);
+		},
 		room::Visibility::Private => services().rooms.directory.set_not_public(&body.room_id)?,
 		_ => {
 			return Err(Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Room visibility type is not supported.",
 			));
-        }
+		},
 	}

 	Ok(set_room_visibility::v3::Response {})
@@ -140,15 +171,9 @@ pub 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,
+	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| *server != services().globals.server_name().as_str())
-    {
+	if let Some(other_server) = server.filter(|server| *server != services().globals.server_name().as_str()) {
 		let response = services()
 			.sending
 			.send_federation_request(
@@ -181,12 +206,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		let backwards = match characters.next() {
 			Some('n') => false,
 			Some('p') => true,
-            _ => {
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Invalid `since` token",
-                ))
-            }
+			_ => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid `since` token")),
 		};

 		num_since = characters
@@ -214,9 +234,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.map_or(Ok(None), |s| {
 						serde_json::from_str(s.content.get())
 							.map(|c: RoomCanonicalAliasEventContent| c.alias)
-                            .map_err(|_| {
-                                Error::bad_database("Invalid canonical alias event in database.")
-                            })
+							.map_err(|_| Error::bad_database("Invalid canonical alias event in database."))
 					})?,
 				name: services().rooms.state_accessor.get_name(&room_id)?,
 				num_joined_members: services()
@@ -236,8 +254,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.map_or(Ok(None), |s| {
 						serde_json::from_str(s.content.get())
 							.map(|c: RoomTopicEventContent| Some(c.topic))
-                            .map_err(|_| {
-                                error!("Invalid room topic event in database for room {}", room_id);
+							.map_err(|e| {
+								error!("Invalid room topic event in database for room {room_id}: {e}");
 								Error::bad_database("Invalid room topic event in database.")
 							})
 					})
@@ -251,24 +269,20 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 							.map(|c: RoomHistoryVisibilityEventContent| {
 								c.history_visibility == HistoryVisibility::WorldReadable
 							})
-                            .map_err(|_| {
-                                Error::bad_database(
-                                    "Invalid room history visibility event in database.",
-                                )
-                            })
-                    })?,
+                            .map_err(|e| {
+                                error!(
+                                    "Invalid room history visibility event in database for room {room_id}, assuming is \"shared\": {e}",
+                                );
+                                Error::bad_database("Invalid room history visibility event in database.")
+                            })}).unwrap_or(false),
 				guest_can_join: services()
 					.rooms
 					.state_accessor
 					.room_state_get(&room_id, &StateEventType::RoomGuestAccess, "")?
 					.map_or(Ok(false), |s| {
 						serde_json::from_str(s.content.get())
-                            .map(|c: RoomGuestAccessEventContent| {
-                                c.guest_access == GuestAccess::CanJoin
-                            })
-                            .map_err(|_| {
-                                Error::bad_database("Invalid room guest access event in database.")
-                            })
+							.map(|c: RoomGuestAccessEventContent| c.guest_access == GuestAccess::CanJoin)
+							.map_err(|_| Error::bad_database("Invalid room guest access event in database."))
 					})?,
 				avatar_url: services()
 					.rooms
@@ -277,9 +291,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.map(|s| {
 						serde_json::from_str(s.content.get())
 							.map(|c: RoomAvatarEventContent| c.url)
-                            .map_err(|_| {
-                                Error::bad_database("Invalid room avatar event in database.")
-                            })
+							.map_err(|_| Error::bad_database("Invalid room avatar event in database."))
 					})
 					.transpose()?
 					// url is now an Option<String> so we must flatten
@@ -308,12 +320,10 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.state_accessor
 					.room_state_get(&room_id, &StateEventType::RoomCreate, "")?
 					.map(|s| {
-                        serde_json::from_str::<RoomCreateEventContent>(s.content.get()).map_err(
-                            |e| {
+						serde_json::from_str::<RoomCreateEventContent>(s.content.get()).map_err(|e| {
 							error!("Invalid room create event in database: {}", e);
 							Error::BadDatabase("Invalid room create event in database.")
-                            },
-                        )
+						})
 					})
 					.transpose()?
 					.and_then(|e| e.room_type),
@@ -323,11 +333,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		})
 		.filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms
 		.filter(|chunk| {
-            if let Some(query) = filter
-                .generic_search_term
-                .as_ref()
-                .map(|q| q.to_lowercase())
-            {
+			if let Some(query) = filter.generic_search_term.as_ref().map(|q| q.to_lowercase()) {
 				if let Some(name) = &chunk.name {
 					if name.as_str().to_lowercase().contains(&query) {
 						return true;
@@ -1,21 +1,19 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::api::client::{
 	error::ErrorKind,
 	filter::{create_filter, get_filter},
 };

+use crate::{services, Error, Result, Ruma};
+
 /// # `GET /_matrix/client/r0/user/{userId}/filter/{filterId}`
 ///
 /// Loads a filter that was previously created.
 ///
 /// - A user can only access their own filters
-pub 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 filter = match services().users.get_filter(sender_user, &body.filter_id)? {
-        Some(filter) => filter,
-        None => return Err(Error::BadRequest(ErrorKind::NotFound, "Filter not found.")),
+	let Some(filter) = services().users.get_filter(sender_user, &body.filter_id)? else {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Filter not found."));
 	};

 	Ok(get_filter::v3::Response::new(filter))
@@ -24,9 +22,7 @@ pub async fn get_filter_route(
 /// # `PUT /_matrix/client/r0/user/{userId}/filter`
 ///
 /// Creates a new filter to be used by other endpoints.
-pub 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,14 +1,14 @@
-use super::SESSION_ID_LENGTH;
-use crate::{services, utils, Error, Result, Ruma};
+use std::{
+	collections::{hash_map, BTreeMap, HashMap, HashSet},
+	time::{Duration, Instant},
+};
+
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use ruma::{
 	api::{
 		client::{
 			error::ErrorKind,
-            keys::{
-                claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
-                upload_signing_keys,
-            },
+			keys::{claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures, upload_signing_keys},
 			uiaa::{AuthFlow, AuthType, UiaaInfo},
 		},
 		federation,
@@ -17,21 +17,19 @@ use ruma::{
 	DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde_json::json;
-use std::{
-    collections::{hash_map, BTreeMap, HashMap, HashSet},
-    time::{Duration, Instant},
-};
 use tracing::{debug, error};

+use super::SESSION_ID_LENGTH;
+use crate::{services, utils, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/keys/upload`
 ///
 /// Publish end-to-end encryption keys for the sender device.
 ///
 /// - Adds one time keys
-/// - If there are no device keys yet: Adds device keys (TODO: merge with existing keys?)
-pub async fn upload_keys_route(
-    body: Ruma<upload_keys::v3::Request>,
-) -> Result<upload_keys::v3::Response> {
+/// - If there are no device keys yet: Adds device keys (TODO: merge with
+///   existing keys?)
+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");

@@ -68,7 +66,8 @@ pub async fn upload_keys_route(
 ///
 /// - Always fetches users from other servers over federation
 /// - 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
+/// - The master and self-signing keys contain signatures that the user is
+///   allowed to see
 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");

@@ -86,9 +85,7 @@ pub async fn get_keys_route(body: Ruma<get_keys::v3::Request>) -> Result<get_key
 /// # `POST /_matrix/client/r0/keys/claim`
 ///
 /// Claims one-time keys
-pub async fn claim_keys_route(
-    body: Ruma<claim_keys::v3::Request>,
-) -> Result<claim_keys::v3::Response> {
+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)
@@ -111,14 +108,13 @@ pub async fn upload_signing_keys_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};

 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
-            services()
+		let (worked, uiaainfo) = services()
 			.uiaa
 			.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
@@ -163,22 +159,12 @@ pub async fn upload_signatures_route(

 			for signature in key
 				.get("signatures")
-                .ok_or(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Missing signatures field.",
-                ))?
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Missing signatures field."))?
 				.get(sender_user.to_string())
-                .ok_or(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Invalid user in signatures field.",
-                ))?
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid user in signatures field."))?
 				.as_object()
-                .ok_or(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Invalid signature.",
-                ))?
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature."))?
 				.clone()
-                .into_iter()
 			{
 				// Signature validation?
 				let signature = (
@@ -186,10 +172,7 @@ pub async fn upload_signatures_route(
 					signature
 						.1
 						.as_str()
-                        .ok_or(Error::BadRequest(
-                            ErrorKind::InvalidParam,
-                            "Invalid signature value.",
-                        ))?
+						.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature value."))?
 						.to_owned(),
 				);
 				services()
@@ -206,12 +189,11 @@ pub async fn upload_signatures_route(

 /// # `POST /_matrix/client/r0/keys/changes`
 ///
-/// Gets a list of users who have updated their device identity keys since the previous sync token.
+/// Gets a list of users who have updated their device identity keys since the
+/// previous sync token.
 ///
 /// - TODO: left users
-pub 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();
@@ -230,28 +212,30 @@ pub async fn get_key_changes_route(
 						.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?,
 				),
 			)
-            .filter_map(|r| r.ok()),
+			.filter_map(Result::ok),
 	);

 	for room_id in services()
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 	{
 		device_list_updates.extend(
 			services()
 				.users
 				.keys_changed(
 					room_id.as_ref(),
-                    body.from.parse().map_err(|_| {
-                        Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`.")
-                    })?,
-                    Some(body.to.parse().map_err(|_| {
-                        Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`.")
-                    })?),
+					body.from
+						.parse()
+						.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`."))?,
+					Some(
+						body.to
+							.parse()
+							.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?,
+					),
 				)
-                .filter_map(|r| r.ok()),
+				.filter_map(Result::ok),
 		);
 	}
 	Ok(get_key_changes::v3::Response {
@@ -261,9 +245,7 @@ pub async fn get_key_changes_route(
 }

 pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
-    sender_user: Option<&UserId>,
-    device_keys_input: &BTreeMap<OwnedUserId, Vec<OwnedDeviceId>>,
-    allowed_signatures: F,
+	sender_user: Option<&UserId>, device_keys_input: &BTreeMap<OwnedUserId, Vec<OwnedDeviceId>>, allowed_signatures: F,
 	include_display_names: bool,
 ) -> Result<get_keys::v3::Response> {
 	let mut master_keys = BTreeMap::new();
@@ -292,9 +274,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 					let metadata = services()
 						.users
 						.get_device_metadata(user_id, &device_id)?
-                        .ok_or_else(|| {
-                            Error::bad_database("all_device_keys contained nonexistent device.")
-                        })?;
+						.ok_or_else(|| Error::bad_database("all_device_keys contained nonexistent device."))?;

 					add_unsigned_device_display_name(&mut keys, metadata, include_display_names)
 						.map_err(|_| Error::bad_database("invalid device keys in database"))?;
@@ -323,8 +303,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			}
 		}

-        if let Some(master_key) =
-            services()
+		if let Some(master_key) = services()
 			.users
 			.get_master_key(sender_user, user_id, &allowed_signatures)?
 		{
@@ -346,17 +325,19 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(

 	let mut failures = BTreeMap::new();

-    let back_off = |id| match services()
+	let back_off = |id| async {
+		match services()
 			.globals
 			.bad_query_ratelimiter
 			.write()
-        .unwrap()
+			.await
 			.entry(id)
 		{
 			hash_map::Entry::Vacant(e) => {
 				e.insert((Instant::now(), 1));
-        }
+			},
 			hash_map::Entry::Occupied(mut e) => *e.get_mut() = (Instant::now(), e.get().1 + 1),
+		}
 	};

 	let mut futures: FuturesUnordered<_> = get_over_federation
@@ -366,7 +347,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 				.globals
 				.bad_query_ratelimiter
 				.read()
-                .unwrap()
+				.await
 				.get(server)
 			{
 				// Exponential backoff
@@ -377,10 +358,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(

 				if time.elapsed() < min_elapsed_duration {
 					debug!("Backing off query from {:?}", server);
-                    return (
-                        server,
-                        Err(Error::BadServerResponse("bad query, still backing off")),
-                    );
+					return (server, Err(Error::BadServerResponse("bad query, still backing off")));
 				}
 			}

@@ -391,7 +369,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			(
 				server,
 				tokio::time::timeout(
-                    Duration::from_secs(50),
+					Duration::from_secs(90),
 					services().sending.send_federation_request(
 						server,
 						federation::keys::get_keys::v1::Request {
@@ -401,7 +379,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 				)
 				.await
 				.map_err(|e| {
-                    error!("get_keys_helper query took too long: {}", e);
+					error!("get_keys_helper query took too long: {e}");
 					Error::BadServerResponse("get_keys_helper query took too long")
 				}),
 			)
@@ -409,53 +387,47 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 		.collect();

 	while let Some((server, response)) = futures.next().await {
-        match response {
-            Ok(Ok(response)) => {
+		if let Ok(Ok(response)) = response {
 			for (user, masterkey) in response.master_keys {
-                    let (master_key_id, mut master_key) =
-                        services().users.parse_master_key(&user, &masterkey)?;
+				let (master_key_id, mut master_key) = services().users.parse_master_key(&user, &masterkey)?;

-                    if let Some(our_master_key) = services().users.get_key(
-                        &master_key_id,
-                        sender_user,
-                        &user,
-                        &allowed_signatures,
-                    )? {
-                        let (_, our_master_key) =
-                            services().users.parse_master_key(&user, &our_master_key)?;
+				if let Some(our_master_key) =
+					services()
+						.users
+						.get_key(&master_key_id, sender_user, &user, &allowed_signatures)?
+				{
+					let (_, our_master_key) = services().users.parse_master_key(&user, &our_master_key)?;
 					master_key.signatures.extend(our_master_key.signatures);
 				}
 				let json = serde_json::to_value(master_key).expect("to_value always works");
 				let raw = serde_json::from_value(json).expect("Raw::from_value always works");
 				services().users.add_cross_signing_keys(
 					&user, &raw, &None, &None,
-                        false, // Dont notify. A notification would trigger another key request resulting in an endless loop
+					false, /* Dont notify. A notification would trigger another key request resulting in an
+					       * endless loop */
 				)?;
 				master_keys.insert(user, raw);
 			}

 			self_signing_keys.extend(response.self_signing_keys);
 			device_keys.extend(response.device_keys);
-            }
-            _ => {
-                back_off(server.to_owned());
+		} else {
+			back_off(server.to_owned()).await;
 			failures.insert(server.to_string(), json!({}));
 		}
 	}
-    }

 	Ok(get_keys::v3::Response {
+		failures,
+		device_keys,
 		master_keys,
 		self_signing_keys,
 		user_signing_keys,
-        device_keys,
-        failures,
 	})
 }

 fn add_unsigned_device_display_name(
-    keys: &mut Raw<ruma::encryption::DeviceKeys>,
-    metadata: ruma::api::client::device::Device,
+	keys: &mut Raw<ruma::encryption::DeviceKeys>, metadata: ruma::api::client::device::Device,
 	include_display_names: bool,
 ) -> serde_json::Result<()> {
 	if let Some(display_name) = metadata.display_name {
@@ -496,8 +468,7 @@ pub(crate) async fn claim_keys_helper(

 		let mut container = BTreeMap::new();
 		for (device_id, key_algorithm) in map {
-            if let Some(one_time_keys) =
-                services()
+			if let Some(one_time_keys) = services()
 				.users
 				.take_one_time_key(user_id, device_id, key_algorithm)?
 			{
@@ -537,10 +508,10 @@ pub(crate) async fn claim_keys_helper(
 		match response {
 			Ok(keys) => {
 				one_time_keys.extend(keys.one_time_keys);
-            }
+			},
 			Err(_e) => {
 				failures.insert(server.to_string(), json!({}));
-            }
+			},
 		}
 	}

@@ -1,22 +1,23 @@
-use std::{io::Cursor, net::IpAddr, sync::Arc, time::Duration};
+use std::{io::Cursor, sync::Arc, time::Duration};

-use crate::{
-    service::media::{FileMeta, UrlPreviewData},
-    services, utils, Error, Result, Ruma,
-};
 use image::io::Reader as ImgReader;
-
+use ipaddress::IPAddress;
 use reqwest::Url;
 use ruma::api::client::{
-    error::ErrorKind,
+	error::{ErrorKind, RetryAfter},
 	media::{
-        create_content, get_content, get_content_as_filename, get_content_thumbnail,
-        get_media_config, get_media_preview,
+		create_content, get_content, get_content_as_filename, get_content_thumbnail, get_media_config,
+		get_media_preview,
 	},
 };
 use tracing::{debug, error, info, warn};
 use webpage::HTML;

+use crate::{
+	service::media::{FileMeta, UrlPreviewData},
+	services, utils, Error, Result, Ruma, RumaResponse,
+};
+
 /// generated MXC ID (`media-id`) length
 const MXC_LENGTH: usize = 32;

@@ -31,6 +32,22 @@ pub async fn get_media_config_route(
 	})
 }

+/// # `GET /_matrix/media/v1/config`
+///
+/// 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>
+///
+/// Returns max upload size.
+pub async fn get_media_config_v1_route(
+	_body: Ruma<get_media_config::v3::Request>,
+) -> Result<RumaResponse<get_media_config::v3::Response>> {
+	Ok(get_media_config::v3::Response {
+		upload_size: services().globals.max_request_size().into(),
+	}
+	.into())
+}
+
 /// # `GET /_matrix/media/v3/preview_url`
 ///
 /// Returns URL preview.
@@ -39,33 +56,80 @@ pub async fn get_media_preview_route(
 ) -> Result<get_media_preview::v3::Response> {
 	let url = &body.url;
 	if !url_preview_allowed(url) {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "URL is not allowed to be previewed",
-        ));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "URL is not allowed to be previewed"));
 	}

-    if let Ok(preview) = get_url_preview(url).await {
+	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!("Failed to convert UrlPreviewData into a serde json value: {}", e);
 				Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unknown error occurred parsing URL preview",
+					ErrorKind::LimitExceeded {
+						retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
+					},
+					"Failed to generate a URL preview, try again later.",
 				)
 			})?;

-        return Ok(get_media_preview::v3::Response::from_raw_value(res));
-    }
+			Ok(get_media_preview::v3::Response::from_raw_value(res))
+		},
+		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_ms: Some(Duration::from_secs(5)),
+					retry_after: Some(RetryAfter::Delay(Duration::from_secs(5))),
 				},
-        "Retry later",
+				"Failed to generate a URL preview, try again later.",
 			))
+		},
+	}
+}
+
+/// # `GET /_matrix/media/v1/preview_url`
+///
+/// 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>
+///
+/// Returns URL preview.
+pub async fn get_media_preview_v1_route(
+	body: Ruma<get_media_preview::v3::Request>,
+) -> Result<RumaResponse<get_media_preview::v3::Response>> {
+	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`
@@ -74,9 +138,9 @@ pub async fn get_media_preview_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
-pub 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!(
 		"mxc://{}/{}",
 		services().globals.server_name(),
@@ -86,6 +150,7 @@ pub async fn create_content_route(
 	services()
 		.media
 		.create(
+			Some(sender_user.clone()),
 			mxc.clone(),
 			body.filename
 				.as_ref()
@@ -104,22 +169,65 @@ pub async fn create_content_route(
 	})
 }

+/// # `POST /_matrix/media/v1/upload`
+///
+/// Permanently save media in the server.
+///
+/// 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>
+///
+/// - Some metadata will be saved in the database
+/// - Media will be saved in the media/ directory
+pub async fn create_content_v1_route(
+	body: Ruma<create_content::v3::Request>,
+) -> Result<RumaResponse<create_content::v3::Response>> {
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	let mxc = format!(
+		"mxc://{}/{}",
+		services().globals.server_name(),
+		utils::random_string(MXC_LENGTH)
+	);
+
+	services()
+		.media
+		.create(
+			Some(sender_user.clone()),
+			mxc.clone(),
+			body.filename
+				.as_ref()
+				.map(|filename| "inline; filename=".to_owned() + filename)
+				.as_deref(),
+			body.content_type.as_deref(),
+			&body.file,
+		)
+		.await?;
+
+	let content_uri = mxc.into();
+
+	Ok(create_content::v3::Response {
+		content_uri,
+		blurhash: None,
+	}
+	.into())
+}
+
 /// 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,
+	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.
+	// 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())
 	{
-        info!("Received request for remote media `{}` but server is in our media server blocklist. Returning 404.", mxc);
+		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."));
 	}

@@ -140,6 +248,7 @@ pub async fn get_remote_content(
 	services()
 		.media
 		.create(
+			None,
 			mxc.to_owned(),
 			content_response.content_disposition.as_deref(),
 			content_response.content_type.as_deref(),
@@ -156,10 +265,9 @@ pub async fn get_remote_content(
 ///
 /// - 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> {
+/// - 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 {
@@ -173,6 +281,7 @@ pub async fn get_content_route(
 			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(
@@ -189,20 +298,69 @@ pub async fn get_content_route(
 	}
 }

+/// # `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
+/// - 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, ..
+		content_type,
+		file,
+		..
 	}) = services().media.get(mxc.clone()).await?
 	{
 		Ok(get_content_as_filename::v3::Response {
@@ -210,6 +368,7 @@ pub async fn get_content_as_filename_route(
 			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(
@@ -226,26 +385,84 @@ pub async fn get_content_as_filename_route(
 			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
+/// - 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, ..
+		content_type,
+		file,
+		..
 	}) = services()
 		.media
 		.get_thumbnail(
@@ -263,16 +480,20 @@ pub async fn get_content_thumbnail_route(
 			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.
+		// 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.to_owned())
+			.contains(&body.server_name.clone())
 		{
-            info!("Received request for remote media `{}` but server is in our media server blocklist. Returning 404.", mxc);
+			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."));
 		}

@@ -296,6 +517,7 @@ pub async fn get_content_thumbnail_route(
 		services()
 			.media
 			.upload_thumbnail(
+				None,
 				mxc,
 				None,
 				get_thumbnail_response.content_type.as_deref(),
@@ -311,6 +533,98 @@ pub async fn get_content_thumbnail_route(
 	}
 }

+/// # `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> {
 	let image = client.get(url).send().await?.bytes().await?;
 	let mxc = format!(
@@ -321,7 +635,7 @@ async fn download_image(client: &reqwest::Client, url: &str) -> Result<UrlPrevie

 	services()
 		.media
-        .create(mxc.clone(), None, None, &image)
+		.create(None, mxc.clone(), None, None, &image)
 		.await?;

 	let (width, height) = match ImgReader::new(Cursor::new(&image)).with_guessed_format() {
@@ -348,19 +662,18 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview
 	while let Some(chunk) = response.chunk().await? {
 		bytes.extend_from_slice(&chunk);
 		if bytes.len() > services().globals.url_preview_max_spider_size() {
-            debug!("Response body from URL {} exceeds url_preview_max_spider_size ({}), not processing the rest of the response body and assuming our necessary data is in this range.", url, services().globals.url_preview_max_spider_size());
+			debug!(
+				"Response body from URL {} exceeds url_preview_max_spider_size ({}), not processing the rest of the \
+				 response body and assuming our necessary data is in this range.",
+				url,
+				services().globals.url_preview_max_spider_size()
+			);
 			break;
 		}
 	}
 	let body = String::from_utf8_lossy(&bytes);
-    let html = match HTML::from_string(body.to_string(), Some(url.to_owned())) {
-        Ok(html) => html,
-        Err(_) => {
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Failed to parse HTML",
-            ))
-        }
+	let Ok(html) = HTML::from_string(body.to_string(), Some(url.to_owned())) else {
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to parse HTML"));
 	};

 	let mut data = match html.opengraph.images.first() {
@@ -377,95 +690,59 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview
 	Ok(data)
 }

-fn url_request_allowed(addr: &IpAddr) -> bool {
-    // TODO: make this check ip_range_denylist
-
-    // could be implemented with reqwest when it supports IP filtering:
-    // https://github.com/seanmonstar/reqwest/issues/1515
-
-    // These checks have been taken from the Rust core/net/ipaddr.rs crate,
-    // IpAddr::V4.is_global() and IpAddr::V6.is_global(), as .is_global is not
-    // yet stabilized. TODO: Once this is stable, this match can be simplified.
-    match addr {
-        IpAddr::V4(ip4) => {
-            !(ip4.octets()[0] == 0 // "This network"
-                || ip4.is_private()
-                || (ip4.octets()[0] == 100 && (ip4.octets()[1] & 0b1100_0000 == 0b0100_0000)) // is_shared()
-                || ip4.is_loopback()
-                || ip4.is_link_local()
-                // addresses reserved for future protocols (`192.0.0.0/24`)
-                || (ip4.octets()[0] == 192 && ip4.octets()[1] == 0 && ip4.octets()[2] == 0)
-                || ip4.is_documentation()
-                || (ip4.octets()[0] == 198 && (ip4.octets()[1] & 0xfe) == 18) // is_benchmarking()
-                || (ip4.octets()[0] & 240 == 240 && !ip4.is_broadcast()) // is_reserved()
-                || ip4.is_broadcast())
-        }
-        IpAddr::V6(ip6) => {
-            !(ip6.is_unspecified()
-                || ip6.is_loopback()
-                // IPv4-mapped Address (`::ffff:0:0/96`)
-                || matches!(ip6.segments(), [0, 0, 0, 0, 0, 0xffff, _, _])
-                // IPv4-IPv6 Translat. (`64:ff9b:1::/48`)
-                || matches!(ip6.segments(), [0x64, 0xff9b, 1, _, _, _, _, _])
-                // Discard-Only Address Block (`100::/64`)
-                || matches!(ip6.segments(), [0x100, 0, 0, 0, _, _, _, _])
-                // IETF Protocol Assignments (`2001::/23`)
-                || (matches!(ip6.segments(), [0x2001, b, _, _, _, _, _, _] if b < 0x200)
-                    && !(
-                        // Port Control Protocol Anycast (`2001:1::1`)
-                        u128::from_be_bytes(ip6.octets()) == 0x2001_0001_0000_0000_0000_0000_0000_0001
-                        // Traversal Using Relays around NAT Anycast (`2001:1::2`)
-                        || u128::from_be_bytes(ip6.octets()) == 0x2001_0001_0000_0000_0000_0000_0000_0002
-                        // AMT (`2001:3::/32`)
-                        || matches!(ip6.segments(), [0x2001, 3, _, _, _, _, _, _])
-                        // AS112-v6 (`2001:4:112::/48`)
-                        || matches!(ip6.segments(), [0x2001, 4, 0x112, _, _, _, _, _])
-                        // ORCHIDv2 (`2001:20::/28`)
-                        || matches!(ip6.segments(), [0x2001, b, _, _, _, _, _, _] if (0x20..=0x2F).contains(&b))
-                    ))
-                || ((ip6.segments()[0] == 0x2001) && (ip6.segments()[1] == 0xdb8)) // is_documentation()
-                || ((ip6.segments()[0] & 0xfe00) == 0xfc00) // is_unique_local()
-                || ((ip6.segments()[0] & 0xffc0) == 0xfe80)) // is_unicast_link_local
-        }
-    }
-}
-
 async fn request_url_preview(url: &str) -> Result<UrlPreviewData> {
-    let client = services().globals.url_preview_client();
-    let response = client.head(url).send().await?;
+	if let Ok(ip) = IPAddress::parse(url) {
+		let cidr_ranges_s = services().globals.ip_range_denylist().to_vec();
+		let mut cidr_ranges: Vec<IPAddress> = Vec::new();

-    if !response
-        .remote_addr()
-        .map_or(false, |a| url_request_allowed(&a.ip()))
-    {
+		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,
+					ErrorKind::forbidden(),
 					"Requesting from this address is forbidden",
 				));
 			}
+		}
+	}

-    let content_type = match response
+	let client = &services().globals.client.url_preview;
+	let response = client.head(url).send().await?;
+
+	if let Some(remote_addr) = response.remote_addr() {
+		if let Ok(ip) = IPAddress::parse(remote_addr.ip().to_string()) {
+			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",
+					));
+				}
+			}
+		}
+	}
+
+	let Some(content_type) = response
 		.headers()
 		.get(reqwest::header::CONTENT_TYPE)
 		.and_then(|x| x.to_str().ok())
-    {
-        Some(ct) => ct,
-        None => {
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unknown Content-Type",
-            ))
-        }
+	else {
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Unknown Content-Type"));
 	};
 	let data = match content_type {
-        html if html.starts_with("text/html") => download_html(&client, url).await?,
-        img if img.starts_with("image/") => download_image(&client, url).await?,
-        _ => {
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unsupported Content-Type",
-            ))
-        }
+		html if html.starts_with("text/html") => download_html(client, url).await?,
+		img if img.starts_with("image/") => download_image(client, url).await?,
+		_ => return Err(Error::BadRequest(ErrorKind::Unknown, "Unsupported Content-Type")),
 	};

 	services().media.set_url_preview(url, &data).await?;
@@ -484,7 +761,7 @@ async fn get_url_preview(url: &str) -> Result<UrlPreviewData> {
 			.media
 			.url_preview_mutex
 			.write()
-            .unwrap()
+			.await
 			.entry(url.to_owned())
 			.or_default(),
 	);
@@ -502,7 +779,7 @@ fn url_preview_allowed(url_str: &str) -> bool {
 		Err(e) => {
 			warn!("Failed to parse URL from a str: {}", e);
 			return false;
-        }
+		},
 	};

 	if ["http", "https"]
@@ -515,36 +792,36 @@ fn url_preview_allowed(url_str: &str) -> bool {

 	let host = match url.host_str() {
 		None => {
-            debug!(
-                "Ignoring URL preview for a URL that does not have a host (?): {}",
-                url
-            );
+			debug!("Ignoring URL preview for a URL that does not have a host (?): {}", url);
 			return false;
-        }
+		},
 		Some(h) => h.to_owned(),
 	};

 	let allowlist_domain_contains = services().globals.url_preview_domain_contains_allowlist();
 	let allowlist_domain_explicit = services().globals.url_preview_domain_explicit_allowlist();
+	let denylist_domain_explicit = services().globals.url_preview_domain_explicit_denylist();
 	let allowlist_url_contains = services().globals.url_preview_url_contains_allowlist();

 	if allowlist_domain_contains.contains(&"*".to_owned())
 		|| allowlist_domain_explicit.contains(&"*".to_owned())
 		|| allowlist_url_contains.contains(&"*".to_owned())
 	{
-        debug!(
-            "Config key contains * which is allowing all URL previews. Allowing URL {}",
-            url
-        );
+		debug!("Config key contains * which is allowing all URL previews. Allowing URL {}", url);
 		return true;
 	}

 	if !host.is_empty() {
-        if allowlist_domain_explicit.contains(&host) {
+		if denylist_domain_explicit.contains(&host) {
 			debug!(
-                "Host {} is allowed by url_preview_domain_explicit_allowlist (check 1/3)",
+				"Host {} is not allowed by url_preview_domain_explicit_denylist (check 1/4)",
 				&host
 			);
+			return false;
+		}
+
+		if allowlist_domain_explicit.contains(&host) {
+			debug!("Host {} is allowed by url_preview_domain_explicit_allowlist (check 2/4)", &host);
 			return true;
 		}

@@ -552,10 +829,7 @@ fn url_preview_allowed(url_str: &str) -> bool {
 			.iter()
 			.any(|domain_s| domain_s.contains(&host.clone()))
 		{
-            debug!(
-                "Host {} is allowed by url_preview_domain_contains_allowlist (check 2/3)",
-                &host
-            );
+			debug!("Host {} is allowed by url_preview_domain_contains_allowlist (check 3/4)", &host);
 			return true;
 		}

@@ -563,10 +837,7 @@ fn url_preview_allowed(url_str: &str) -> bool {
 			.iter()
 			.any(|url_s| url.to_string().contains(&url_s.to_string()))
 		{
-            debug!(
-                "URL {} is allowed by url_preview_url_contains_allowlist (check 3/3)",
-                &host
-            );
+			debug!("URL {} is allowed by url_preview_url_contains_allowlist (check 4/4)", &host);
 			return true;
 		}

@@ -576,9 +847,17 @@ fn url_preview_allowed(url_str: &str) -> bool {
 			match host.split_once('.') {
 				None => return false,
 				Some((_, root_domain)) => {
+					if denylist_domain_explicit.contains(&root_domain.to_owned()) {
+						debug!(
+							"Root domain {} is not allowed by url_preview_domain_explicit_denylist (check 1/3)",
+							&root_domain
+						);
+						return true;
+					}
+
 					if allowlist_domain_explicit.contains(&root_domain.to_owned()) {
 						debug!(
-                        "Root domain {} is allowed by url_preview_domain_explicit_allowlist (check 1/3)",
+							"Root domain {} is allowed by url_preview_domain_explicit_allowlist (check 2/3)",
 							&root_domain
 						);
 						return true;
@@ -589,12 +868,12 @@ fn url_preview_allowed(url_str: &str) -> bool {
 						.any(|domain_s| domain_s.contains(&root_domain.to_owned()))
 					{
 						debug!(
-                    "Root domain {} is allowed by url_preview_domain_contains_allowlist (check 2/3)",
+							"Root domain {} is allowed by url_preview_domain_contains_allowlist (check 3/3)",
 							&root_domain
 						);
 						return true;
 					}
-                }
+				},
 			}
 		}
 	}
@@ -1,27 +1,33 @@
-use crate::{
-    service::{pdu::PduBuilder, rooms::timeline::PduCount},
-    services, utils, Error, Result, Ruma,
-};
-use ruma::{
-    api::client::{
-        error::ErrorKind,
-        message::{get_message_events, send_message_event},
-    },
-    events::{StateEventType, TimelineEventType},
-};
-use serde_json::from_str;
 use std::{
 	collections::{BTreeMap, HashSet},
 	sync::Arc,
 };

+use ruma::{
+	api::client::{
+		error::ErrorKind,
+		filter::{RoomEventFilter, UrlFilter},
+		message::{get_message_events, send_message_event},
+	},
+	events::{MessageLikeEventType, StateEventType},
+	RoomId, UserId,
+};
+use serde_json::{from_str, Value};
+
+use crate::{
+	service::{pdu::PduBuilder, rooms::timeline::PduCount},
+	services, utils, Error, PduEvent, Result, Ruma,
+};
+
 /// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
 /// Send a message event into the room.
 ///
-/// - Is a NOOP if the txn id was already used before and returns the same event id again
+/// - Is a NOOP if the txn id was already used before and returns the same event
+///   id again
 /// - 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
+/// - Tries to send the event into the room, auth rules will determine if it is
+///   allowed
 pub async fn send_message_event_route(
 	body: Ruma<send_message_event::v3::Request>,
 ) -> Result<send_message_event::v3::Response> {
@@ -33,71 +39,28 @@ pub async fn send_message_event_route(
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(body.room_id.clone())
 			.or_default(),
 	);
 	let state_lock = mutex_state.lock().await;

 	// Forbid m.room.encrypted if encryption is disabled
-    if TimelineEventType::RoomEncrypted == body.event_type.to_string().into()
-        && !services().globals.allow_encryption()
+	if MessageLikeEventType::RoomEncrypted == body.event_type && !services().globals.allow_encryption() {
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Encryption has been disabled"));
+	}
+
+	if body.event_type == MessageLikeEventType::CallInvite
+		&& services().rooms.directory.is_public_room(&body.room_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
+			ErrorKind::forbidden(),
+			"Room call invites are not allowed in public rooms",
 		));
 	}

-    // certain event types require certain fields to be valid in request bodies.
-    // this helps prevent attempting to handle events that we can't deserialise later so don't waste resources on it.
-    //
-    // see https://spec.matrix.org/v1.9/client-server-api/#events-2 for what's required per event type.
-    match body.event_type.to_string().into() {
-        TimelineEventType::RoomMessage => {
-            let body_field = body.body.body.get_field::<String>("body");
-            let msgtype_field = body.body.body.get_field::<String>("msgtype");
-
-            if body_field.is_err() {
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "'body' field in JSON request is invalid",
-                ));
-            }
-
-            if msgtype_field.is_err() {
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "'msgtype' field in JSON request is invalid",
-                ));
-            }
-        }
-        TimelineEventType::RoomName => {
-            let name_field = body.body.body.get_field::<String>("name");
-
-            if name_field.is_err() {
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "'name' field in JSON request is invalid",
-                ));
-            }
-        }
-        TimelineEventType::RoomTopic => {
-            let topic_field = body.body.body.get_field::<String>("topic");
-
-            if topic_field.is_err() {
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "'topic' field in JSON request is invalid",
-                ));
-            }
-        }
-        _ => {} // event may be custom/experimental or can be empty don't do anything with it
-    };
-
 	// Check if this is a new transaction id
-    if let Some(response) =
-        services()
+	if let Some(response) = services()
 		.transaction_ids
 		.existing_txnid(sender_user, sender_device, &body.txn_id)?
 	{
@@ -114,7 +77,9 @@ pub async fn send_message_event_route(
 			.map_err(|_| Error::bad_database("Invalid txnid bytes in database."))?
 			.try_into()
 			.map_err(|_| Error::bad_database("Invalid event id in txnid data."))?;
-        return Ok(send_message_event::v3::Response { event_id });
+		return Ok(send_message_event::v3::Response {
+			event_id,
+		});
 	}

 	let mut unsigned = BTreeMap::new();
@@ -138,26 +103,22 @@ pub async fn send_message_event_route(
 		)
 		.await?;

-    services().transaction_ids.add_txnid(
-        sender_user,
-        sender_device,
-        &body.txn_id,
-        event_id.as_bytes(),
-    )?;
+	services()
+		.transaction_ids
+		.add_txnid(sender_user, sender_device, &body.txn_id, event_id.as_bytes())?;

 	drop(state_lock);

-    Ok(send_message_event::v3::Response::new(
-        (*event_id).to_owned(),
-    ))
+	Ok(send_message_event::v3::Response::new((*event_id).to_owned()))
 }

 /// # `GET /_matrix/client/r0/rooms/{roomId}/messages`
 ///
 /// Allows paginating through room history.
 ///
-/// - Only works if the user is joined (TODO: always allow, but only show events where the user was
-/// joined, depending on history_visibility)
+/// - Only works if the user is joined (TODO: always allow, but only show events
+///   where the user was
+/// joined, depending on `history_visibility`)
 pub async fn get_message_events_route(
 	body: Ruma<get_message_events::v3::Request>,
 ) -> Result<get_message_events::v3::Response> {
@@ -177,12 +138,11 @@ pub async fn get_message_events_route(
 		.as_ref()
 		.and_then(|t| PduCount::try_from_string(t).ok());

-    services().rooms.lazy_loading.lazy_load_confirm_delivery(
-        sender_user,
-        sender_device,
-        &body.room_id,
-        from,
-    )?;
+	services()
+		.rooms
+		.lazy_loading
+		.lazy_load_confirm_delivery(sender_user, sender_device, &body.room_id, from)
+		.await?;

 	let limit = u64::from(body.limit).min(100) as usize;

@@ -198,23 +158,20 @@ pub async fn get_message_events_route(
 				.rooms
 				.timeline
 				.pdus_after(sender_user, &body.room_id, from)?
-                .take(limit)
-                .filter_map(|r| r.ok()) // Filter out buggy events
-                .filter(|(_, pdu)| {
-                    services()
-                        .rooms
-                        .state_accessor
-                        .user_can_see_event(sender_user, &body.room_id, &pdu.event_id)
-                        .unwrap_or(false)
-                })
+				.filter_map(Result::ok) // Filter out buggy events
+				.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();

 			for (_, event) in &events_after {
-                /* TODO: Remove this when these are resolved:
+				/* TODO: Remove the not "element_hacks" check when these are resolved:
 				 * https://github.com/vector-im/element-android/issues/3417
 				 * https://github.com/vector-im/element-web/issues/21034
-                if !services().rooms.lazy_loading.lazy_load_was_sent_before(
+				 */
+				if !cfg!(feature = "element_hacks")
+					&& !services().rooms.lazy_loading.lazy_load_was_sent_before(
 						sender_user,
 						sender_device,
 						&body.room_id,
@@ -222,7 +179,7 @@ pub async fn get_message_events_route(
 					)? {
 					lazy_loaded.insert(event.sender.clone());
 				}
-                */
+
 				lazy_loaded.insert(event.sender.clone());
 			}

@@ -236,7 +193,7 @@ pub async fn get_message_events_route(
 			resp.start = from.stringify();
 			resp.end = next_token.map(|count| count.stringify());
 			resp.chunk = events_after;
-        }
+		},
 		ruma::api::Direction::Backward => {
 			services()
 				.rooms
@@ -247,23 +204,20 @@ pub async fn get_message_events_route(
 				.rooms
 				.timeline
 				.pdus_until(sender_user, &body.room_id, from)?
-                .take(limit)
-                .filter_map(|r| r.ok()) // Filter out buggy events
-                .filter(|(_, pdu)| {
-                    services()
-                        .rooms
-                        .state_accessor
-                        .user_can_see_event(sender_user, &body.room_id, &pdu.event_id)
-                        .unwrap_or(false)
-                })
+				.filter_map(Result::ok) // Filter out buggy events
+				.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();

 			for (_, event) in &events_before {
-                /* TODO: Remove this when these are resolved:
+				/* TODO: Remove the not "element_hacks" check when these are resolved:
 				 * https://github.com/vector-im/element-android/issues/3417
 				 * https://github.com/vector-im/element-web/issues/21034
-                if !services().rooms.lazy_loading.lazy_load_was_sent_before(
+				 */
+				if !cfg!(feature = "element_hacks")
+					&& !services().rooms.lazy_loading.lazy_load_was_sent_before(
 						sender_user,
 						sender_device,
 						&body.room_id,
@@ -271,7 +225,7 @@ pub async fn get_message_events_route(
 					)? {
 					lazy_loaded.insert(event.sender.clone());
 				}
-                */
+
 				lazy_loaded.insert(event.sender.clone());
 			}

@@ -285,7 +239,7 @@ pub async fn get_message_events_route(
 			resp.start = from.stringify();
 			resp.end = next_token.map(|count| count.stringify());
 			resp.chunk = events_before;
-        }
+		},
 	}

 	resp.state = Vec::new();
@@ -299,18 +253,37 @@ pub async fn get_message_events_route(
 		}
 	}

-    // TODO: enable again when we are sure clients can handle it
-    /*
+	// remove the feature check when we are sure clients like element can handle it
+	if !cfg!(feature = "element_hacks") {
 		if let Some(next_token) = next_token {
-        services().rooms.lazy_loading.lazy_load_mark_sent(
-            sender_user,
-            sender_device,
-            &body.room_id,
-            lazy_loaded,
-            next_token,
-        );
+			services()
+				.rooms
+				.lazy_loading
+				.lazy_load_mark_sent(sender_user, sender_device, &body.room_id, lazy_loaded, next_token)
+				.await;
+		}
 	}
-    */

 	Ok(resp)
 }
+
+fn visibility_filter(pdu: &PduEvent, user_id: &UserId, room_id: &RoomId) -> bool {
+	services()
+		.rooms
+		.state_accessor
+		.user_can_see_event(user_id, room_id, &pdu.event_id)
+		.unwrap_or(false)
+}
+
+fn contains_url_filter(pdu: &PduEvent, filter: &RoomEventFilter) -> bool {
+	if filter.url_filter.is_none() {
+		return true;
+	}
+
+	let content: Value = from_str(pdu.content.get()).unwrap();
+	match filter.url_filter {
+		Some(UrlFilter::EventsWithoutUrl) => !content["url"].is_string(),
+		Some(UrlFilter::EventsWithUrl) => content["url"].is_string(),
+		None => true,
+	}
+}
@@ -29,6 +29,7 @@ mod thirdparty;
 mod threads;
 mod to_device;
 mod typing;
+mod unstable;
 mod unversioned;
 mod user_directory;
 mod voip;
@@ -64,6 +65,7 @@ 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::*;
@@ -1,36 +1,24 @@
-use crate::{services, Error, Result, Ruma};
+use std::time::Duration;
+
 use ruma::api::client::{
 	error::ErrorKind,
 	presence::{get_presence, set_presence},
 };
-use std::time::Duration;
+
+use crate::{services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/r0/presence/{userId}/status`
 ///
 /// Sets the presence state of the sender user.
-pub 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",
-        ));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Presence is disabled on this server"));
 	}

 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    for room_id in services().rooms.state_cache.rooms_joined(sender_user) {
-        let room_id = room_id?;
-
-        services().rooms.edus.presence.set_presence(
-            &room_id,
-            sender_user,
-            body.presence.clone(),
-            None,
-            None,
-            body.status_msg.clone(),
-        )?;
-    }
+	services()
+		.presence
+		.set_presence(sender_user, &body.presence, None, None, body.status_msg.clone())?;

 	Ok(set_presence::v3::Response {})
 }
@@ -40,33 +28,21 @@ pub async fn set_presence_route(
 /// Gets the presence state of the given user.
 ///
 /// - Only works if you share a room with the user
-pub 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",
-        ));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Presence is disabled on this server"));
 	}

 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	let mut presence_event = None;

-    for room_id in services()
+	for _room_id in services()
 		.rooms
 		.user
 		.get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])?
 	{
-        let room_id = room_id?;
-
-        if let Some(presence) = services()
-            .rooms
-            .edus
-            .presence
-            .get_presence(&room_id, sender_user)?
-        {
+		if let Some(presence) = services().presence.get_presence(sender_user)? {
 			presence_event = Some(presence);
 			break;
 		}
@@ -1,19 +1,19 @@
-use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
+use std::sync::Arc;
+
 use ruma::{
 	api::{
 		client::{
 			error::ErrorKind,
-            profile::{
-                get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name,
+			profile::{get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name},
 		},
-        },
-        federation::{self, query::get_profile_information::v1::ProfileField},
+		federation,
 	},
 	events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType},
 	presence::PresenceState,
 };
 use serde_json::value::to_raw_value;
-use std::sync::Arc;
+
+use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
@@ -35,27 +35,21 @@ pub async fn set_displayname_route(
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.map(|room_id| {
 			Ok::<_, Error>((
 				PduBuilder {
 					event_type: TimelineEventType::RoomMember,
 					content: to_raw_value(&RoomMemberEventContent {
 						displayname: body.displayname.clone(),
+						join_authorized_via_users_server: None,
 						..serde_json::from_str(
 							services()
 								.rooms
 								.state_accessor
-                                .room_state_get(
-                                    &room_id,
-                                    &StateEventType::RoomMember,
-                                    sender_user.as_str(),
-                                )?
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
 								.ok_or_else(|| {
-                                    Error::bad_database(
-                                        "Tried to send displayname update for user not in the \
-                                     room.",
-                                    )
+									Error::bad_database("Tried to send displayname update for user not in the room.")
 								})?
 								.content
 								.get(),
@@ -70,7 +64,7 @@ pub async fn set_displayname_route(
 				room_id,
 			))
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.collect();

 	for (pdu_builder, room_id) in all_rooms_joined {
@@ -79,13 +73,13 @@ pub async fn set_displayname_route(
 				.globals
 				.roomid_mutex_state
 				.write()
-                .unwrap()
+				.await
 				.entry(room_id.clone())
 				.or_default(),
 		);
 		let state_lock = mutex_state.lock().await;

-        let _ = services()
+		_ = services()
 			.rooms
 			.timeline
 			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
@@ -95,10 +89,8 @@ pub async fn set_displayname_route(
 	if services().globals.allow_local_presence() {
 		// Presence update
 		services()
-            .rooms
-            .edus
 			.presence
-            .ping_presence(sender_user, PresenceState::Online)?;
+			.ping_presence(sender_user, &PresenceState::Online)?;
 	}

 	Ok(set_display_name::v3::Response {})
@@ -113,58 +105,59 @@ pub async fn set_displayname_route(
 pub async fn get_displayname_route(
 	body: Ruma<get_display_name::v3::Request>,
 ) -> Result<get_display_name::v3::Response> {
-    if (services().users.exists(&body.user_id)?)
-        && (body.user_id.server_name() != services().globals.server_name())
-    {
-        let response = services()
+	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
 			.send_federation_request(
 				body.user_id.server_name(),
 				federation::query::get_profile_information::v1::Request {
 					user_id: body.user_id.clone(),
-                    field: Some(ProfileField::DisplayName),
+					field: None, // we want the full user's profile to update locally too
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}

-        /*
-            TODO: ignore errors properly?
-        // Create and update our local copy of the user
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
+			services()
 				.users
 				.set_displayname(&body.user_id, response.displayname.clone())
-            .await;
-        let _ = services()
+				.await?;
+			services()
 				.users
-            .set_avatar_url(&body.user_id, response.avatar_url)
-            .await;
-        let _ = services()
+				.set_avatar_url(&body.user_id, response.avatar_url.clone())
+				.await?;
+			services()
 				.users
-            .set_blurhash(&body.user_id, response.blurhash)
-            .await;
-        */
+				.set_blurhash(&body.user_id, response.blurhash.clone())
+				.await?;

 			return Ok(get_display_name::v3::Response {
 				displayname: response.displayname,
 			});
 		}
+	}
+
+	if !services().users.exists(&body.user_id)? {
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
+		// federation
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
+	}

 	Ok(get_display_name::v3::Response {
 		displayname: services().users.displayname(&body.user_id)?,
 	})
 }

-/// # `PUT /_matrix/client/r0/profile/{userId}/avatar_url`
+/// # `PUT /_matrix/client/v3/profile/{userId}/avatar_url`
 ///
-/// Updates the avatar_url and blurhash.
+/// Updates the `avatar_url` and `blurhash`.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-pub 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()
@@ -182,27 +175,21 @@ pub async fn set_avatar_url_route(
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.map(|room_id| {
 			Ok::<_, Error>((
 				PduBuilder {
 					event_type: TimelineEventType::RoomMember,
 					content: to_raw_value(&RoomMemberEventContent {
 						avatar_url: body.avatar_url.clone(),
+						join_authorized_via_users_server: None,
 						..serde_json::from_str(
 							services()
 								.rooms
 								.state_accessor
-                                .room_state_get(
-                                    &room_id,
-                                    &StateEventType::RoomMember,
-                                    sender_user.as_str(),
-                                )?
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
 								.ok_or_else(|| {
-                                    Error::bad_database(
-                                        "Tried to send displayname update for user not in the \
-                                     room.",
-                                    )
+									Error::bad_database("Tried to send displayname update for user not in the room.")
 								})?
 								.content
 								.get(),
@@ -217,7 +204,7 @@ pub async fn set_avatar_url_route(
 				room_id,
 			))
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.collect();

 	for (pdu_builder, room_id) in all_joined_rooms {
@@ -226,13 +213,13 @@ pub async fn set_avatar_url_route(
 				.globals
 				.roomid_mutex_state
 				.write()
-                .unwrap()
+				.await
 				.entry(room_id.clone())
 				.or_default(),
 		);
 		let state_lock = mutex_state.lock().await;

-        let _ = services()
+		_ = services()
 			.rooms
 			.timeline
 			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
@@ -242,10 +229,8 @@ pub async fn set_avatar_url_route(
 	if services().globals.allow_local_presence() {
 		// Presence update
 		services()
-            .rooms
-            .edus
 			.presence
-            .ping_presence(sender_user, PresenceState::Online)?;
+			.ping_presence(sender_user, &PresenceState::Online)?;
 	}

 	Ok(set_avatar_url::v3::Response {})
@@ -253,52 +238,53 @@ pub async fn set_avatar_url_route(

 /// # `GET /_matrix/client/v3/profile/{userId}/avatar_url`
 ///
-/// Returns the avatar_url and blurhash of the user.
+/// Returns the `avatar_url` and `blurhash` of the user.
 ///
 /// - If user is on another server and we do not have a local copy already
-/// fetch avatar_url and blurhash over federation
-pub async fn get_avatar_url_route(
-    body: Ruma<get_avatar_url::v3::Request>,
-) -> Result<get_avatar_url::v3::Response> {
-    if (services().users.exists(&body.user_id)?)
-        && (body.user_id.server_name() != services().globals.server_name())
-    {
-        let response = services()
+/// fetch `avatar_url` and blurhash over federation
+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
 			.send_federation_request(
 				body.user_id.server_name(),
 				federation::query::get_profile_information::v1::Request {
 					user_id: body.user_id.clone(),
-                    field: Some(ProfileField::AvatarUrl),
+					field: None, // we want the full user's profile to update locally as well
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}

-        /*
-            TODO: ignore errors properly?
-        // Create and update our local copy of the user
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
+			services()
 				.users
-            .set_displayname(&body.user_id, response.displayname)
-            .await;
-        let _ = services()
+				.set_displayname(&body.user_id, response.displayname.clone())
+				.await?;
+			services()
 				.users
 				.set_avatar_url(&body.user_id, response.avatar_url.clone())
-            .await;
-        let _ = services()
+				.await?;
+			services()
 				.users
 				.set_blurhash(&body.user_id, response.blurhash.clone())
-            .await;
-        */
+				.await?;

 			return Ok(get_avatar_url::v3::Response {
 				avatar_url: response.avatar_url,
 				blurhash: response.blurhash,
 			});
 		}
+	}
+
+	if !services().users.exists(&body.user_id)? {
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
+		// federation
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
+	}

 	Ok(get_avatar_url::v3::Response {
 		avatar_url: services().users.avatar_url(&body.user_id)?,
@@ -312,13 +298,10 @@ pub 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 async fn get_profile_route(
-    body: Ruma<get_profile::v3::Request>,
-) -> Result<get_profile::v3::Response> {
-    if (services().users.exists(&body.user_id)?)
-        && (body.user_id.server_name() != services().globals.server_name())
-    {
-        let response = services()
+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
 			.send_federation_request(
 				body.user_id.server_name(),
@@ -327,27 +310,24 @@ pub async fn get_profile_route(
 					field: None,
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}

-        /*
-            TODO: ignore errors properly?
-        // Create and update our local copy of the user
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
+			services()
 				.users
 				.set_displayname(&body.user_id, response.displayname.clone())
-            .await;
-        let _ = services()
+				.await?;
+			services()
 				.users
 				.set_avatar_url(&body.user_id, response.avatar_url.clone())
-            .await;
-        let _ = services()
+				.await?;
+			services()
 				.users
 				.set_blurhash(&body.user_id, response.blurhash.clone())
-            .await;
-        */
+				.await?;

 			return Ok(get_profile::v3::Response {
 				displayname: response.displayname,
@@ -355,13 +335,12 @@ pub async fn get_profile_route(
 				blurhash: response.blurhash,
 			});
 		}
+	}

 	if !services().users.exists(&body.user_id)? {
-        // Return 404 if this user doesn't exist and we couldn't fetch it over federation
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Profile was not found.",
-        ));
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
+		// federation
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
 	}

 	Ok(get_profile::v3::Response {
@@ -1,18 +1,18 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		push::{
-            delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled,
-            get_pushrules_all, set_pusher, set_pushrule, set_pushrule_actions,
-            set_pushrule_enabled, RuleScope,
+			delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled, get_pushrules_all,
+			set_pusher, set_pushrule, set_pushrule_actions, set_pushrule_enabled, RuleScope,
 		},
 	},
 	events::{push_rules::PushRulesEvent, GlobalAccountDataEventType},
-    push::{InsertPushRuleError, RemovePushRuleError},
+	push::{InsertPushRuleError, RemovePushRuleError, Ruleset},
 };

-/// # `GET /_matrix/client/r0/pushrules`
+use crate::{services, Error, Result, Ruma};
+
+/// # `GET /_matrix/client/r0/pushrules/`
 ///
 /// Retrieves the push rules event for this user.
 pub async fn get_pushrules_all_route(
@@ -20,18 +20,12 @@ pub async fn get_pushrules_all_route(
 ) -> Result<get_pushrules_all::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let event = services()
+	let event =
+		services()
 			.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+			.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?;

+	if let Some(event) = event {
 		let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 			.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 			.content;
@@ -39,27 +33,35 @@ pub async fn get_pushrules_all_route(
 		Ok(get_pushrules_all::v3::Response {
 			global: account_data.global,
 		})
+	} else {
+		services().account_data.update(
+			None,
+			sender_user,
+			GlobalAccountDataEventType::PushRules.to_string().into(),
+			&serde_json::to_value(PushRulesEvent {
+				content: ruma::events::push_rules::PushRulesEventContent {
+					global: Ruleset::server_default(sender_user),
+				},
+			})
+			.expect("to json always works"),
+		)?;
+
+		Ok(get_pushrules_all::v3::Response {
+			global: Ruleset::server_default(sender_user),
+		})
+	}
 }

 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Retrieves a single specified push rule for this user.
-pub 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()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -71,21 +73,18 @@ pub async fn get_pushrule_route(
 		.map(Into::into);

 	if let Some(rule) = rule {
-        Ok(get_pushrule::v3::Response { rule })
+		Ok(get_pushrule::v3::Response {
+			rule,
+		})
 	} else {
-        Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))
+		Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))
 	}
 }

 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Creates a single specified push rule for this user.
-pub 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;

@@ -98,41 +97,33 @@ pub async fn set_pushrule_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;

-    if let Err(error) = account_data.content.global.insert(
-        body.rule.clone(),
-        body.after.as_deref(),
-        body.before.as_deref(),
-    ) {
+	if let Err(error) =
+		account_data
+			.content
+			.global
+			.insert(body.rule.clone(), body.after.as_deref(), body.before.as_deref())
+	{
 		let err = match error {
 			InsertPushRuleError::ServerDefaultRuleId => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Rule IDs starting with a dot are reserved for server-default rules.",
 			),
-            InsertPushRuleError::InvalidRuleId => Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "Rule ID containing invalid characters.",
-            ),
+			InsertPushRuleError::InvalidRuleId => {
+				Error::BadRequest(ErrorKind::InvalidParam, "Rule ID containing invalid characters.")
+			},
 			InsertPushRuleError::RelativeToServerDefaultRule => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Can't place a push rule relatively to a server-default rule.",
 			),
-            InsertPushRuleError::UnknownRuleId => Error::BadRequest(
-                ErrorKind::NotFound,
-                "The before or after rule could not be found.",
-            ),
+			InsertPushRuleError::UnknownRuleId => {
+				Error::BadRequest(ErrorKind::NotFound, "The before or after rule could not be found.")
+			},
 			InsertPushRuleError::BeforeHigherThanAfter => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"The before rule has a higher priority than the after rule.",
@@ -170,15 +161,8 @@ pub async fn get_pushrule_actions_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -188,12 +172,11 @@ pub async fn get_pushrule_actions_route(
 	let actions = global
 		.get(body.kind.clone(), &body.rule_id)
 		.map(|rule| rule.actions().to_owned())
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))?;
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))?;

-    Ok(get_pushrule_actions::v3::Response { actions })
+	Ok(get_pushrule_actions::v3::Response {
+		actions,
+	})
 }

 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
@@ -213,15 +196,8 @@ pub async fn set_pushrule_actions_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
@@ -232,10 +208,7 @@ pub async fn set_pushrule_actions_route(
 		.set_actions(body.kind.clone(), &body.rule_id, body.actions.clone())
 		.is_err()
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."));
 	}

 	services().account_data.update(
@@ -265,15 +238,8 @@ pub async fn get_pushrule_enabled_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
@@ -281,13 +247,12 @@ pub async fn get_pushrule_enabled_route(
 	let global = account_data.content.global;
 	let enabled = global
 		.get(body.kind.clone(), &body.rule_id)
-        .map(|r| r.enabled())
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))?;
+		.map(ruma::push::AnyPushRuleRef::enabled)
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))?;

-    Ok(get_pushrule_enabled::v3::Response { enabled })
+	Ok(get_pushrule_enabled::v3::Response {
+		enabled,
+	})
 }

 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
@@ -307,15 +272,8 @@ pub async fn set_pushrule_enabled_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
@@ -326,10 +284,7 @@ pub async fn set_pushrule_enabled_route(
 		.set_enabled(body.kind.clone(), &body.rule_id, body.enabled)
 		.is_err()
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."));
 	}

 	services().account_data.update(
@@ -345,9 +300,7 @@ pub async fn set_pushrule_enabled_route(
 /// # `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Deletes a single specified push rule for this user.
-pub 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 {
@@ -359,15 +312,8 @@ pub async fn delete_pushrule_route(

 	let event = services()
 		.account_data
-        .get(
-            None,
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;

 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
@@ -378,13 +324,10 @@ pub async fn delete_pushrule_route(
 		.remove(body.kind.clone(), &body.rule_id)
 	{
 		let err = match error {
-            RemovePushRuleError::ServerDefault => Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "Cannot delete a server-default pushrule.",
-            ),
-            RemovePushRuleError::NotFound => {
-                Error::BadRequest(ErrorKind::NotFound, "Push rule not found.")
-            }
+			RemovePushRuleError::ServerDefault => {
+				Error::BadRequest(ErrorKind::InvalidParam, "Cannot delete a server-default pushrule.")
+			},
+			RemovePushRuleError::NotFound => Error::BadRequest(ErrorKind::NotFound, "Push rule not found."),
 			_ => Error::BadRequest(ErrorKind::InvalidParam, "Invalid data."),
 		};

@@ -404,9 +347,7 @@ pub async fn delete_pushrule_route(
 /// # `GET /_matrix/client/r0/pushers`
 ///
 /// Gets all currently active pushers for the sender user.
-pub 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 {
@@ -419,9 +360,7 @@ pub async fn get_pushers_route(
 /// Adds a pusher for the sender user.
 ///
 /// - TODO: Handle `append`
-pub 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()
@@ -1,4 +1,5 @@
-use crate::{service::rooms::timeline::PduCount, services, Error, Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::{
 	api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
 	events::{
@@ -7,17 +8,17 @@ use ruma::{
 	},
 	MilliSecondsSinceUnixEpoch,
 };
-use std::collections::BTreeMap;
+
+use crate::{service::rooms::timeline::PduCount, services, Error, Result, Ruma};

 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
 /// Sets different types of read markers.
 ///
 /// - Updates fully-read account data event to `fully_read`
-/// - If `read_receipt` is set: Update private marker and public read receipt EDU
-pub async fn set_read_marker_route(
-    body: Ruma<set_read_marker::v3::Request>,
-) -> Result<set_read_marker::v3::Response> {
+/// - If `read_receipt` is set: Update private marker and public read receipt
+///   EDU
+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 {
@@ -46,22 +47,18 @@ pub async fn set_read_marker_route(
 			.rooms
 			.timeline
 			.get_pdu_count(event)?
-            .ok_or(Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "Event does not exist.",
-            ))?;
+			.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Event does not exist."))?;
 		let count = match count {
 			PduCount::Backfilled(_) => {
 				return Err(Error::BadRequest(
 					ErrorKind::InvalidParam,
 					"Read receipt is in backfilled timeline",
 				))
-            }
+			},
 			PduCount::Normal(c) => c,
 		};
 		services()
 			.rooms
-            .edus
 			.read_receipt
 			.private_read_set(&body.room_id, sender_user, count)?;
 	}
@@ -82,7 +79,7 @@ pub async fn set_read_marker_route(
 		let mut receipt_content = BTreeMap::new();
 		receipt_content.insert(event.to_owned(), receipts);

-        services().rooms.edus.read_receipt.readreceipt_update(
+		services().rooms.read_receipt.readreceipt_update(
 			sender_user,
 			&body.room_id,
 			ruma::events::receipt::ReceiptEvent {
@@ -98,9 +95,7 @@ pub 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 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!(
@@ -126,7 +121,7 @@ pub async fn create_receipt_route(
 				RoomAccountDataEventType::FullyRead,
 				&serde_json::to_value(fully_read_event).expect("to json value always works"),
 			)?;
-        }
+		},
 		create_receipt::v3::ReceiptType::Read => {
 			let mut user_receipts = BTreeMap::new();
 			user_receipts.insert(
@@ -140,9 +135,9 @@ pub async fn create_receipt_route(
 			receipts.insert(ReceiptType::Read, user_receipts);

 			let mut receipt_content = BTreeMap::new();
-            receipt_content.insert(body.event_id.to_owned(), receipts);
+			receipt_content.insert(body.event_id.clone(), receipts);

-            services().rooms.edus.read_receipt.readreceipt_update(
+			services().rooms.read_receipt.readreceipt_update(
 				sender_user,
 				&body.room_id,
 				ruma::events::receipt::ReceiptEvent {
@@ -150,31 +145,27 @@ pub async fn create_receipt_route(
 					room_id: body.room_id.clone(),
 				},
 			)?;
-        }
+		},
 		create_receipt::v3::ReceiptType::ReadPrivate => {
 			let count = services()
 				.rooms
 				.timeline
 				.get_pdu_count(&body.event_id)?
-                .ok_or(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Event does not exist.",
-                ))?;
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Event does not exist."))?;
 			let count = match count {
 				PduCount::Backfilled(_) => {
 					return Err(Error::BadRequest(
 						ErrorKind::InvalidParam,
 						"Read receipt is in backfilled timeline",
 					))
-                }
+				},
 				PduCount::Normal(c) => c,
 			};
-            services().rooms.edus.read_receipt.private_read_set(
-                &body.room_id,
-                sender_user,
-                count,
-            )?;
-        }
+			services()
+				.rooms
+				.read_receipt
+				.private_read_set(&body.room_id, sender_user, count)?;
+		},
 		_ => return Err(Error::bad_database("Unsupported receipt type")),
 	}

@@ -1,21 +1,19 @@
 use std::sync::Arc;

-use crate::{service::pdu::PduBuilder, services, Result, Ruma};
 use ruma::{
 	api::client::redact::redact_event,
 	events::{room::redaction::RoomRedactionEventContent, TimelineEventType},
 };
-
 use serde_json::value::to_raw_value;

+use crate::{service::pdu::PduBuilder, services, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
 ///
 /// Tries to send a redaction event into the room.
 ///
 /// - TODO: Handle txn id
-pub 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;

@@ -24,7 +22,7 @@ pub async fn redact_event_route(
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(body.room_id.clone())
 			.or_default(),
 	);
@@ -54,5 +52,7 @@ pub async fn redact_event_route(
 	drop(state_lock);

 	let event_id = (*event_id).to_owned();
-    Ok(redact_event::v3::Response { event_id })
+	Ok(redact_event::v3::Response {
+		event_id,
+	})
 }
@@ -1,9 +1,8 @@
 use ruma::api::client::relations::{
-    get_relating_events, get_relating_events_with_rel_type,
-    get_relating_events_with_rel_type_and_event_type,
+	get_relating_events, get_relating_events_with_rel_type, get_relating_events_with_rel_type_and_event_type,
 };

-use crate::{service::rooms::timeline::PduCount, services, Result, Ruma};
+use crate::{services, Result, Ruma};

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

-    let from = match body.from.clone() {
-        Some(from) => PduCount::try_from_string(&from)?,
-        None => match ruma::api::Direction::Backward {
-            // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
-        },
-    };
-
-    let to = body
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
-
-    // Use limit or else 10, with maximum 100
-    let limit = body
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
-
 	let res = services()
 		.rooms
 		.pdu_metadata
@@ -39,20 +17,21 @@ pub async fn get_relating_events_with_rel_type_and_event_type_route(
 			sender_user,
 			&body.room_id,
 			&body.event_id,
-            Some(body.event_type.clone()),
-            Some(body.rel_type.clone()),
-            from,
-            to,
-            limit,
+			&Some(body.event_type.clone()),
+			&Some(body.rel_type.clone()),
+			&body.from,
+			&body.to,
+			&body.limit,
+			body.recurse,
+			body.dir,
 		)?;

-    Ok(
-        get_relating_events_with_rel_type_and_event_type::v1::Response {
+	Ok(get_relating_events_with_rel_type_and_event_type::v1::Response {
 		chunk: res.chunk,
 		next_batch: res.next_batch,
 		prev_batch: res.prev_batch,
-        },
-    )
+		recursion_depth: res.recursion_depth,
+	})
 }

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

-    let from = match body.from.clone() {
-        Some(from) => PduCount::try_from_string(&from)?,
-        None => match ruma::api::Direction::Backward {
-            // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
-        },
-    };
-
-    let to = body
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
-
-    // Use limit or else 10, with maximum 100
-    let limit = body
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
-
 	let res = services()
 		.rooms
 		.pdu_metadata
@@ -89,17 +47,20 @@ pub async fn get_relating_events_with_rel_type_route(
 			sender_user,
 			&body.room_id,
 			&body.event_id,
-            None,
-            Some(body.rel_type.clone()),
-            from,
-            to,
-            limit,
+			&None,
+			&Some(body.rel_type.clone()),
+			&body.from,
+			&body.to,
+			&body.limit,
+			body.recurse,
+			body.dir,
 		)?;

 	Ok(get_relating_events_with_rel_type::v1::Response {
 		chunk: res.chunk,
 		next_batch: res.next_batch,
 		prev_batch: res.prev_batch,
+		recursion_depth: res.recursion_depth,
 	})
 }

@@ -109,27 +70,6 @@ pub async fn get_relating_events_route(
 ) -> Result<get_relating_events::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    let from = match body.from.clone() {
-        Some(from) => PduCount::try_from_string(&from)?,
-        None => match ruma::api::Direction::Backward {
-            // TODO: fix ruma so `body.dir` exists
-            ruma::api::Direction::Forward => PduCount::min(),
-            ruma::api::Direction::Backward => PduCount::max(),
-        },
-    };
-
-    let to = body
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
-
-    // Use limit or else 10, with maximum 100
-    let limit = body
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
-
 	services()
 		.rooms
 		.pdu_metadata
@@ -137,10 +77,12 @@ pub async fn get_relating_events_route(
 			sender_user,
 			&body.room_id,
 			&body.event_id,
-            None,
-            None,
-            from,
-            to,
-            limit,
+			&None,
+			&None,
+			&body.from,
+			&body.to,
+			&body.limit,
+			body.recurse,
+			body.dir,
 		)
 }
@@ -1,6 +1,5 @@
 use std::time::Duration;

-use crate::{services, utils::HtmlEscape, Error, Result, Ruma};
 use rand::Rng;
 use ruma::{
 	api::client::{error::ErrorKind, room::report_content},
@@ -10,27 +9,23 @@ use ruma::{
 use tokio::time::sleep;
 use tracing::{debug, info};

+use crate::{services, utils::HtmlEscape, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/rooms/{roomId}/report/{eventId}`
 ///
 /// Reports an inappropriate event to homeserver admins
-///
-pub 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);

 	// check if we know about the reported event ID or if it's invalid
-    let pdu = match services().rooms.timeline.get_pdu(&body.event_id)? {
-        Some(pdu) => pdu,
-        _ => {
+	let Some(pdu) = services().rooms.timeline.get_pdu(&body.event_id)? else {
 		return Err(Error::BadRequest(
 			ErrorKind::NotFound,
 			"Event ID is not known to us or Event ID is invalid",
-            ))
-        }
+		));
 	};

 	// check if the room ID from the URI matches the PDU's room ID
@@ -46,7 +41,7 @@ pub async fn report_event_route(
 		.rooms
 		.state_cache
 		.room_members(&pdu.room_id)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.any(|user_id| user_id == *sender_user)
 	{
 		return Err(Error::BadRequest(
@@ -71,22 +66,19 @@ pub async fn report_event_route(
 		));
 	};

-    // send admin room message that we received the report with an @room ping for urgency
+	// send admin room message that we received the report with an @room ping for
+	// urgency
 	services()
 		.admin
 		.send_message(message::RoomMessageEventContent::text_html(
 			format!(
-                "@room Report received from: {}\n\n\
-                Event ID: {}\n\
-                Room ID: {}\n\
-                Sent By: {}\n\n\
-                Report Score: {}\n\
-                Report Reason: {}",
+				"@room Report received from: {}\n\nEvent ID: {}\nRoom ID: {}\nSent By: {}\n\nReport Score: {}\nReport \
+				 Reason: {}",
 				sender_user.to_owned(),
 				pdu.event_id,
 				pdu.room_id,
-                pdu.sender.to_owned(),
-                body.score.unwrap_or(ruma::Int::from(0)),
+				pdu.sender.clone(),
+				body.score.unwrap_or_else(|| ruma::Int::from(0)),
 				body.reason.as_deref().unwrap_or("")
 			),
 			format!(
@@ -97,16 +89,17 @@ pub async fn report_event_route(
                Report Info<ul><li>Report Score: {4}</li><li>Report Reason: {5}</li></ul></li>\
                </ul></details>",
 				sender_user.to_owned(),
-            pdu.event_id.to_owned(),
-            pdu.room_id.to_owned(),
-            pdu.sender.to_owned(),
-            body.score.unwrap_or(ruma::Int::from(0)),
+				pdu.event_id.clone(),
+				pdu.room_id.clone(),
+				pdu.sender.clone(),
+				body.score.unwrap_or_else(|| ruma::Int::from(0)),
 				HtmlEscape(body.reason.as_deref().unwrap_or(""))
 			),
 		));

-    // 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.
+	// 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.",
@@ -1,6 +1,5 @@
-use crate::{
-    api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma,
-};
+use std::{cmp::max, collections::BTreeMap, sync::Arc};
+
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -23,19 +22,19 @@ use ruma::{
 	},
 	int,
 	serde::JsonObject,
-    CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId,
-    RoomVersionId,
+	CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};
-use std::{cmp::max, collections::BTreeMap, sync::Arc};
 use tracing::{debug, error, info, warn};

+use crate::{api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/createRoom`
 ///
 /// Creates a new room.
 ///
 /// - Room ID is randomly generated
-/// - Create alias if room_alias_name is set
+/// - Create alias if `room_alias_name` is set
 /// - Send create event
 /// - Join sender user
 /// - Send power levels event
@@ -46,27 +45,22 @@ use tracing::{debug, error, info, warn};
 /// - Send events listed in initial state
 /// - Send events implied by `name` and `topic`
 /// - Send invite events
-pub 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");

 	if !services().globals.allow_room_creation()
-        && !&body.from_appservice
+		&& body.appservice_info.is_none()
 		&& !services().users.is_admin(sender_user)?
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Room creation has been disabled.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Room creation has been disabled."));
 	}

 	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.
+	// 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) => {
@@ -76,7 +70,8 @@ pub async fn create_room_route(
 				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.",
+						"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(
@@ -84,45 +79,32 @@ pub async fn create_room_route(
 						"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.",
-                    ));
+					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_room_names()
+					.forbidden_alias_names()
 					.is_match(&custom_room_id_s)
 				{
-                    return Err(Error::BadRequest(
-                        ErrorKind::Unknown,
-                        "Custom room ID is forbidden.",
-                    ));
+					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();
+					+ ":" + 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",
-                    )
+					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 {
-        room_id = RoomId::new(services().globals.server_name())
+		room_id = RoomId::new(services().globals.server_name());
 	}

 	// check if room ID doesn't already exist instead of erroring on auth check
@@ -140,22 +122,22 @@ pub async fn create_room_route(
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(room_id.clone())
 			.or_default(),
 	);
 	let state_lock = mutex_state.lock().await;

-    let alias: Option<OwnedRoomAliasId> =
-        body.room_alias_name
+	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.",
+					"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(
@@ -164,9 +146,9 @@ pub async fn create_room_route(
 				));
 			} 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 
+				// 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.",
@@ -181,21 +163,14 @@ pub async fn create_room_route(
 			// check if room alias is forbidden
 			if services()
 				.globals
-                    .forbidden_room_names()
+				.forbidden_alias_names()
 				.is_match(localpart)
 			{
-                    return Err(Error::BadRequest(
-                        ErrorKind::Unknown,
-                        "Room alias name is forbidden.",
-                    ));
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
 			}

-                let alias = RoomAliasId::parse(format!(
-                    "#{}:{}",
-                    localpart,
-                    services().globals.server_name()
-                ))
-                .map_err(|e| {
+			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.")
 				})?;
@@ -206,15 +181,22 @@ pub async fn create_room_route(
 				.resolve_local_alias(&alias)?
 				.is_some()
 			{
-                    Err(Error::BadRequest(
-                        ErrorKind::RoomInUse,
-                        "Room alias already exists.",
-                    ))
+				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) => {
 			if services()
@@ -229,7 +211,7 @@ pub async fn create_room_route(
 					"This server does not support that room version.",
 				));
 			}
-        }
+		},
 		None => services().globals.default_room_version(),
 	};

@@ -259,27 +241,26 @@ pub async fn create_room_route(
 							Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
 						})?,
 					);
-                }
-                RoomVersionId::V11 => {} // V11 removed the "creator" key
+				},
+				RoomVersionId::V11 => {}, // V11 removed the "creator" key
 				_ => {
-                    warn!("Unexpected or unsupported room version {}", room_version);
+					warn!("Unexpected or unsupported room version {room_version}");
 					return Err(Error::BadRequest(
 						ErrorKind::BadJson,
 						"Unexpected or unsupported room version found",
 					));
-                }
+				},
 			}

 			content.insert(
 				"room_version".into(),
-                json!(room_version.as_str()).try_into().map_err(|_| {
-                    Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
-                })?,
+				json!(room_version.as_str())
+					.try_into()
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
 			);
 			content
-        }
+		},
 		None => {
-            // TODO: Add correct value for v11
 			let content = match room_version {
 				RoomVersionId::V1
 				| RoomVersionId::V2
@@ -293,12 +274,12 @@ pub async fn create_room_route(
 				| RoomVersionId::V10 => RoomCreateEventContent::new_v1(sender_user.clone()),
 				RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
 				_ => {
-                    warn!("Unexpected or unsupported room version {}", room_version);
+					warn!("Unexpected or unsupported room version {room_version}");
 					return Err(Error::BadRequest(
 						ErrorKind::BadJson,
 						"Unexpected or unsupported room version found",
 					));
-                }
+				},
 			};
 			let mut content = serde_json::from_str::<CanonicalJsonObject>(
 				to_raw_value(&content)
@@ -308,12 +289,12 @@ pub async fn create_room_route(
 			.unwrap();
 			content.insert(
 				"room_version".into(),
-                json!(room_version.as_str()).try_into().map_err(|_| {
-                    Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
-                })?,
+				json!(room_version.as_str())
+					.try_into()
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
 			);
 			content
-        }
+		},
 	};

 	// Validate creation content
@@ -324,10 +305,7 @@ pub async fn create_room_route(
 	);

 	if de_result.is_err() {
-        return Err(Error::BadRequest(
-            ErrorKind::BadJson,
-            "Invalid creation content",
-        ));
+		return Err(Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"));
 	}

 	// 1. The room create event
@@ -339,7 +317,7 @@ pub async fn create_room_route(
 				event_type: TimelineEventType::RoomCreate,
 				content: to_raw_value(&content).expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -380,7 +358,6 @@ pub async fn create_room_route(

 	// Figure out preset. We need it for preset specific events
 	let preset = body.preset.clone().unwrap_or(match &body.visibility {
-        room::Visibility::Private => RoomPreset::PrivateChat,
 		room::Visibility::Public => RoomPreset::PublicChat,
 		_ => RoomPreset::PrivateChat, // Room visibility should not be custom
 	});
@@ -400,11 +377,28 @@ pub async fn create_room_route(
 	})
 	.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.")
-            })?;
+			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;

 		for (key, value) in json {
 			power_levels_content[key] = value;
@@ -417,10 +411,9 @@ pub async fn create_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomPowerLevels,
-                content: to_raw_value(&power_levels_content)
-                    .expect("to_raw_value always works on serde_json::Value"),
+				content: to_raw_value(&power_levels_content).expect("to_raw_value always works on serde_json::Value"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -443,7 +436,7 @@ pub async fn create_room_route(
 					})
 					.expect("We checked that alias earlier, it must be fine"),
 					unsigned: None,
-                    state_key: Some("".to_owned()),
+					state_key: Some(String::new()),
 					redacts: None,
 				},
 				sender_user,
@@ -469,7 +462,7 @@ pub async fn create_room_route(
 				}))
 				.expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -485,12 +478,10 @@ pub async fn create_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomHistoryVisibility,
-                content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
-                    HistoryVisibility::Shared,
-                ))
+				content: to_raw_value(&RoomHistoryVisibilityEventContent::new(HistoryVisibility::Shared))
 					.expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -512,7 +503,7 @@ pub async fn create_room_route(
 				}))
 				.expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -529,12 +520,10 @@ pub async fn create_room_route(
 		})?;

 		// Implicit state key defaults to ""
-        pdu_builder.state_key.get_or_insert_with(|| "".to_owned());
+		pdu_builder.state_key.get_or_insert_with(String::new);

 		// Silently skip encryption events if they are not allowed
-        if pdu_builder.event_type == TimelineEventType::RoomEncryption
-            && !services().globals.allow_encryption()
-        {
+		if pdu_builder.event_type == TimelineEventType::RoomEncryption && !services().globals.allow_encryption() {
 			continue;
 		}

@@ -556,7 +545,7 @@ pub async fn create_room_route(
 					content: to_raw_value(&RoomNameEventContent::new(name.clone()))
 						.expect("event is valid, we just created it"),
 					unsigned: None,
-                    state_key: Some("".to_owned()),
+					state_key: Some(String::new()),
 					redacts: None,
 				},
 				sender_user,
@@ -578,7 +567,7 @@ pub async fn create_room_route(
 					})
 					.expect("event is valid, we just created it"),
 					unsigned: None,
-                    state_key: Some("".to_owned()),
+					state_key: Some(String::new()),
 					redacts: None,
 				},
 				sender_user,
@@ -591,7 +580,7 @@ pub async fn create_room_route(
 	// 8. Events implied by invite (and TODO: invite_3pid)
 	drop(state_lock);
 	for user_id in &body.invite {
-        let _ = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await;
+		_ = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await;
 	}

 	// Homeserver specific stuff
@@ -612,10 +601,9 @@ pub async fn create_room_route(
 ///
 /// Gets a single event.
 ///
-/// - You have to currently be joined to the room (TODO: Respect history visibility)
-pub async fn get_room_event_route(
-    body: Ruma<get_room_event::v3::Request>,
-) -> Result<get_room_event::v3::Response> {
+/// - You have to currently be joined to the room (TODO: Respect history
+///   visibility)
+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()
@@ -627,13 +615,13 @@ pub async fn get_room_event_route(
 			Error::BadRequest(ErrorKind::NotFound, "Event not found.")
 		})?;

-    if !services().rooms.state_accessor.user_can_see_event(
-        sender_user,
-        &event.room_id,
-        &body.event_id,
-    )? {
+	if !services()
+		.rooms
+		.state_accessor
+		.user_can_see_event(sender_user, &event.room_id, &body.event_id)?
+	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view this event.",
 		));
 	}
@@ -650,19 +638,18 @@ pub async fn get_room_event_route(
 ///
 /// Lists all aliases of the room.
 ///
-/// - Only users joined to the room are allowed to call this TODO: Allow any user to call it if history_visibility is world readable
-pub async fn get_room_aliases_route(
-    body: Ruma<aliases::v3::Request>,
-) -> Result<aliases::v3::Response> {
+/// - Only users joined to the room are allowed to call this, or if
+///   `history_visibility` is world readable in the room
+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()
 		.rooms
-        .state_cache
-        .is_joined(sender_user, &body.room_id)?
+		.state_accessor
+		.user_can_see_state_events(sender_user, &body.room_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view this room.",
 		));
 	}
@@ -672,7 +659,7 @@ pub async fn get_room_aliases_route(
 			.rooms
 			.alias
 			.local_aliases_for_room(&body.room_id)
-            .filter_map(|a| a.ok())
+			.filter_map(Result::ok)
 			.collect(),
 	})
 }
@@ -687,9 +674,7 @@ pub async fn get_room_aliases_route(
 /// - Transfers some state events
 /// - Moves local aliases
 /// - Modifies old room power levels to prevent users from speaking
-pub 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()
@@ -715,14 +700,15 @@ pub async fn upgrade_room_route(
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(body.room_id.clone())
 			.or_default(),
 	);
 	let state_lock = mutex_state.lock().await;

-    // Send a m.room.tombstone event to the old room to indicate that it is not intended to be used any further
-    // Fail if the sender does not have the required permissions
+	// Send a m.room.tombstone event to the old room to indicate that it is not
+	// intended to be used any further Fail if the sender does not have the required
+	// permissions
 	let tombstone_event_id = services()
 		.rooms
 		.timeline
@@ -735,7 +721,7 @@ pub async fn upgrade_room_route(
 				})
 				.expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -751,7 +737,7 @@ pub async fn upgrade_room_route(
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(replacement_room.clone())
 			.or_default(),
 	);
@@ -775,7 +761,8 @@ pub async fn upgrade_room_route(
 		(*tombstone_event_id).to_owned(),
 	));

-    // Send a m.room.create event containing a predecessor field and the applicable room_version
+	// Send a m.room.create event containing a predecessor field and the applicable
+	// room_version
 	match body.new_version {
 		RoomVersionId::V1
 		| RoomVersionId::V2
@@ -794,21 +781,18 @@ pub async fn upgrade_room_route(
 					Error::BadRequest(ErrorKind::BadJson, "Error forming creation event")
 				})?,
 			);
-        }
+		},
 		RoomVersionId::V11 => {
 			// "creator" key no longer exists in V11 rooms
 			create_event_content.remove("creator");
-        }
+		},
 		_ => {
-            warn!(
-                "Unexpected or unsupported room version {}",
-                body.new_version
-            );
+			warn!("Unexpected or unsupported room version {}", body.new_version);
 			return Err(Error::BadRequest(
 				ErrorKind::BadJson,
 				"Unexpected or unsupported room version found",
 			));
-        }
+		},
 	}

 	create_event_content.insert(
@@ -832,10 +816,7 @@ pub async fn upgrade_room_route(
 	);

 	if de_result.is_err() {
-        return Err(Error::BadRequest(
-            ErrorKind::BadJson,
-            "Error forming creation event",
-        ));
+		return Err(Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"));
 	}

 	services()
@@ -844,10 +825,9 @@ pub async fn upgrade_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomCreate,
-                content: to_raw_value(&create_event_content)
-                    .expect("event is valid, we just created it"),
+				content: to_raw_value(&create_event_content).expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -899,8 +879,7 @@ pub async fn upgrade_room_route(

 	// Replicate transferable state events to the new room
 	for event_type in transferable_state_events {
-        let event_content =
-            match services()
+		let event_content = match services()
 			.rooms
 			.state_accessor
 			.room_state_get(&body.room_id, &event_type, "")?
@@ -917,7 +896,7 @@ pub async fn upgrade_room_route(
 					event_type: event_type.to_string().into(),
 					content: event_content,
 					unsigned: None,
-                    state_key: Some("".to_owned()),
+					state_key: Some(String::new()),
 					redacts: None,
 				},
 				sender_user,
@@ -932,7 +911,7 @@ pub async fn upgrade_room_route(
 		.rooms
 		.alias
 		.local_aliases_for_room(&body.room_id)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 	{
 		services()
 			.rooms
@@ -957,17 +936,17 @@ pub async fn upgrade_room_route(
 	power_levels_event_content.events_default = new_level;
 	power_levels_event_content.invite = new_level;

-    // Modify the power levels in the old room to prevent sending of events and inviting new users
-    let _ = services()
+	// Modify the power levels in the old room to prevent sending of events and
+	// inviting new users
+	_ = services()
 		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomPowerLevels,
-                content: to_raw_value(&power_levels_event_content)
-                    .expect("event is valid, we just created it"),
+				content: to_raw_value(&power_levels_event_content).expect("event is valid, we just created it"),
 				unsigned: None,
-                state_key: Some("".to_owned()),
+				state_key: Some(String::new()),
 				redacts: None,
 			},
 			sender_user,
@@ -979,5 +958,7 @@ pub async fn upgrade_room_route(
 	drop(state_lock);

 	// Return the replacement room id
-    Ok(upgrade_room::v3::Response { replacement_room })
+	Ok(upgrade_room::v3::Response {
+		replacement_room,
+	})
 }
@@ -1,49 +1,98 @@
-use crate::{services, Error, Result, Ruma};
-use ruma::api::client::{
+use std::collections::BTreeMap;
+
+use ruma::{
+	api::client::{
 		error::ErrorKind,
 		search::search_events::{
 			self,
 			v3::{EventContextResult, ResultCategories, ResultRoomEvents, SearchResult},
 		},
+	},
+	events::AnyStateEvent,
+	serde::Raw,
+	OwnedRoomId,
 };
+use tracing::debug;

-use std::collections::BTreeMap;
+use crate::{services, Error, Result, Ruma};

 /// # `POST /_matrix/client/r0/search`
 ///
 /// Searches rooms for messages.
 ///
-/// - Only works if the user is currently joined to the room (TODO: Respect history visibility)
-pub async fn search_events_route(
-    body: Ruma<search_events::v3::Request>,
-) -> Result<search_events::v3::Response> {
+/// - Only works if the user is currently joined to the room (TODO: Respect
+///   history visibility)
+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();
 	let filter = &search_criteria.filter;
+	let include_state = &search_criteria.include_state;

 	let room_ids = filter.rooms.clone().unwrap_or_else(|| {
 		services()
 			.rooms
 			.state_cache
 			.rooms_joined(sender_user)
-            .filter_map(|r| r.ok())
+			.filter_map(Result::ok)
 			.collect()
 	});

 	// Use limit or else 10, with maximum 100
 	let limit = filter.limit.map_or(10, u64::from).min(100) as usize;

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

-    for room_id in room_ids {
+	if include_state.is_some_and(|include_state| include_state) {
+		for room_id in &room_ids {
 			if !services()
 				.rooms
 				.state_cache
-            .is_joined(sender_user, &room_id)?
+				.is_joined(sender_user, room_id)?
 			{
 				return Err(Error::BadRequest(
-                ErrorKind::Forbidden,
+					ErrorKind::forbidden(),
+					"You don't have permission to view this room.",
+				));
+			}
+
+			// check if sender_user can see state events
+			if services()
+				.rooms
+				.state_accessor
+				.user_can_see_state_events(sender_user, room_id)?
+			{
+				let room_state = services()
+					.rooms
+					.state_accessor
+					.room_state_full(room_id)
+					.await?
+					.values()
+					.map(|pdu| pdu.to_state_event())
+					.collect::<Vec<_>>();
+
+				debug!("Room state: {:?}", room_state);
+
+				room_states.insert(room_id.clone(), room_state);
+			} else {
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
+					"You don't have permission to view this room.",
+				));
+			}
+		}
+	}
+
+	let mut searches = Vec::new();
+
+	for room_id in &room_ids {
+		if !services()
+			.rooms
+			.state_cache
+			.is_joined(sender_user, room_id)?
+		{
+			return Err(Error::BadRequest(
+				ErrorKind::forbidden(),
 				"You don't have permission to view this room.",
 			));
 		}
@@ -51,7 +100,7 @@ pub async fn search_events_route(
 		if let Some(search) = services()
 			.rooms
 			.search
-            .search_pdus(&room_id, &search_criteria.search_term)?
+			.search_pdus(room_id, &search_criteria.search_term)?
 		{
 			searches.push(search.0.peekable());
 		}
@@ -59,12 +108,7 @@ pub async fn search_events_route(

 	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.",
-            ))
-        }
+		Some(Err(_)) => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid next_batch token.")),
 		None => 0, // Default to the start
 	};

@@ -110,7 +154,7 @@ pub async fn search_events_route(
 				result: Some(result),
 			})
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.skip(skip)
 		.take(limit)
 		.collect();
@@ -123,11 +167,11 @@ pub async fn search_events_route(

 	Ok(search_events::v3::Response::new(ResultCategories {
 		room_events: ResultRoomEvents {
-            count: Some((results.len() as u32).into()), // TODO: set this to none. Element shouldn't depend on it
+			count: Some((results.len() as u32).into()),
 			groups: BTreeMap::new(), // TODO
 			next_batch,
 			results,
-            state: BTreeMap::new(), // TODO
+			state: room_states,
 			highlights: search_criteria
 				.search_term
 				.split_terminator(|c: char| !c.is_alphanumeric())
@@ -1,11 +1,12 @@
-use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::{services, utils, Error, Result, Ruma};
 use argon2::{PasswordHash, PasswordVerifier};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		session::{
-            get_login_types,
+			get_login_types::{
+				self,
+				v3::{ApplicationServiceLoginType, PasswordLoginType},
+			},
 			login::{
 				self,
 				v3::{DiscoveryInfo, HomeserverInfo},
@@ -19,6 +20,9 @@ use ruma::{
 use serde::Deserialize;
 use tracing::{debug, error, info, warn};

+use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
+use crate::{services, utils, Error, Result, Ruma};
+
 #[derive(Debug, Deserialize)]
 struct Claims {
 	sub: String,
@@ -27,27 +31,28 @@ struct Claims {

 /// # `GET /_matrix/client/v3/login`
 ///
-/// Get the supported login types of this server. One of these should be used as the `type` field
-/// when logging in.
-pub async fn get_login_types_route(
-    _body: Ruma<get_login_types::v3::Request>,
-) -> Result<get_login_types::v3::Response> {
+/// Get the supported login types of this server. One of these should be used as
+/// the `type` field when logging in.
+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(Default::default()),
-        get_login_types::v3::LoginType::ApplicationService(Default::default()),
+		get_login_types::v3::LoginType::Password(PasswordLoginType::default()),
+		get_login_types::v3::LoginType::ApplicationService(ApplicationServiceLoginType::default()),
 	]))
 }

 /// # `POST /_matrix/client/v3/login`
 ///
-/// Authenticates the user and returns an access token it can use in subsequent requests.
+/// Authenticates the user and returns an access token it can use in subsequent
+/// requests.
 ///
-/// - The user needs to authenticate using their password (or if enabled using a json web token)
+/// - The user needs to authenticate using their password (or if enabled using a
+///   json web token)
 /// - If `device_id` is known: invalidates old access token of that device
 /// - If `device_id` is unknown: creates a new device
 /// - Returns access token that is associated with the user and device
 ///
-/// Note: You can use [`GET /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
+/// Note: You can use [`GET
+/// /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
 pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Response> {
 	// Validate login method
@@ -61,37 +66,30 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 			..
 		}) => {
 			debug!("Got password login type");
-            let username = if let Some(UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
-                debug!("Using username from identifier field");
-                user_id.to_lowercase()
-            } else if let Some(user_id) = user {
-                warn!("User \"{}\" is attempting to login with the deprecated \"user\" field at \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is destined to be removed in a future Matrix release.", user_id);
-                user_id.to_lowercase()
+			let user_id = if let Some(UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
+				UserId::parse_with_server_name(user_id.to_lowercase(), services().globals.server_name())
+			} else if let Some(user) = user {
+				UserId::parse(user)
 			} else {
 				warn!("Bad login type: {:?}", &body.login_info);
-                return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
-            };
-
-            let user_id =
-                UserId::parse_with_server_name(username, services().globals.server_name())
+				return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
+			}
 			.map_err(|e| {
-                        warn!("Failed to parse username from user logging in: {}", 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
 				.password_hash(&user_id)?
-                .ok_or(Error::BadRequest(
-                    ErrorKind::Forbidden,
-                    "Wrong username or password.",
-                ))?;
+				.ok_or(Error::BadRequest(ErrorKind::forbidden(), "Wrong username or password."))?;

 			if hash.is_empty() {
-                return Err(Error::BadRequest(
-                    ErrorKind::UserDeactivated,
-                    "The user has been deactivated",
-                ));
+				return Err(Error::BadRequest(ErrorKind::UserDeactivated, "The user has been deactivated"));
 			}

 			let Ok(parsed_hash) = PasswordHash::new(&hash) else {
@@ -106,79 +104,77 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 				.is_ok();

 			if !hash_matches {
-                return Err(Error::BadRequest(
-                    ErrorKind::Forbidden,
-                    "Wrong username or password.",
-                ));
+				return Err(Error::BadRequest(ErrorKind::forbidden(), "Wrong username or password."));
 			}

 			user_id
-        }
-        login::v3::LoginInfo::Token(login::v3::Token { token }) => {
+		},
+		login::v3::LoginInfo::Token(login::v3::Token {
+			token,
+		}) => {
 			debug!("Got token login type");
 			if let Some(jwt_decoding_key) = services().globals.jwt_decoding_key() {
-                let token = jsonwebtoken::decode::<Claims>(
-                    token,
-                    jwt_decoding_key,
-                    &jsonwebtoken::Validation::default(),
-                )
+				let token =
+					jsonwebtoken::decode::<Claims>(token, jwt_decoding_key, &jsonwebtoken::Validation::default())
 						.map_err(|e| {
-                    warn!("Failed to parse JWT token from user logging in: {}", e);
+							warn!("Failed to parse JWT token from user logging in: {e}");
 							Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid.")
 						})?;

 				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);
+				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,
 					"Token login is not supported (server has no jwt decoding key).",
 				));
 			}
-        }
+		},
 		#[allow(deprecated)]
 		login::v3::LoginInfo::ApplicationService(login::v3::ApplicationService {
 			identifier,
 			user,
 		}) => {
 			debug!("Got appservice login type");
-            if !body.from_appservice {
-                info!("User tried logging in as an appservice, but request body is not from a known/registered appservice");
-                return Err(Error::BadRequest(
-                    ErrorKind::Forbidden,
-                    "Forbidden login type.",
-                ));
-            };
-            let username = if let Some(UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
-                user_id.to_lowercase()
-            } else if let Some(user_id) = user {
-                warn!("Appservice \"{}\" is attempting to login with the deprecated \"user\" field at \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is destined to be removed in a future Matrix release.", user_id);
-                user_id.to_lowercase()
+			let user_id = if let Some(UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
+				UserId::parse_with_server_name(user_id.to_lowercase(), services().globals.server_name())
+			} else if let Some(user) = user {
+				UserId::parse(user)
 			} else {
-                return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
-            };
-
-            UserId::parse_with_server_name(username, services().globals.server_name()).map_err(
-                |e| {
-                    warn!("Failed to parse username from appservice logging in: {}", e);
-                    Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
-                },
-            )?
+				warn!("Bad login type: {:?}", &body.login_info);
+				return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
 			}
+			.map_err(|e| {
+				warn!("Failed to parse username from appservice logging in: {e}");
+				Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+			})?;
+
+			if let Some(ref info) = body.appservice_info {
+				if !info.is_user_match(&user_id) {
+					return Err(Error::BadRequest(ErrorKind::Exclusive, "User is not in namespace."));
+				}
+			} else {
+				return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing appservice token."));
+			}
+
+			user_id
+		},
 		_ => {
 			warn!("Unsupported or unknown login type: {:?}", &body.login_info);
 			debug!("JSON body: {:?}", &body.json_body);
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unsupported or unknown login type.",
-            ));
-        }
+			return Err(Error::BadRequest(ErrorKind::Unknown, "Unsupported or unknown login type."));
+		},
 	};

 	// Generate new device id if the user didn't specify one
@@ -201,39 +197,29 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 	if device_exists {
 		services().users.set_token(&user_id, &device_id, &token)?;
 	} else {
-        services().users.create_device(
-            &user_id,
-            &device_id,
-            &token,
-            body.initial_device_display_name.clone(),
-        )?;
+		services()
+			.users
+			.create_device(&user_id, &device_id, &token, body.initial_device_display_name.clone())?;
 	}

 	// send client well-known if specified so the client knows to reconfigure itself
-    let client_discovery_info = DiscoveryInfo::new(HomeserverInfo::new(
-        services()
+	let client_discovery_info: Option<DiscoveryInfo> = services()
 		.globals
 		.well_known_client()
-            .to_owned()
-            .unwrap_or("".to_owned()),
-    ));
+		.as_ref()
+		.map(|server| DiscoveryInfo::new(HomeserverInfo::new(server.to_string())));

-    info!("{} logged in", user_id);
+	info!("{user_id} logged in");

-    // home_server is deprecated but apparently must still be sent despite it being deprecated over 6 years ago.
-    // initially i thought this macro was unnecessary, but ruma uses this same macro for the same reason so...
+	// home_server is deprecated but apparently must still be sent despite it being
+	// deprecated over 6 years ago. initially i thought this macro was unnecessary,
+	// but ruma uses this same macro for the same reason so...
 	#[allow(deprecated)]
 	Ok(login::v3::Response {
 		user_id,
 		access_token: token,
 		device_id,
-        well_known: {
-            if client_discovery_info.homeserver.base_url.as_str() == "" {
-                None
-            } else {
-                Some(client_discovery_info)
-            }
-        },
+		well_known: client_discovery_info,
 		expires_in: None,
 		home_server: Some(services().globals.server_name().to_owned()),
 		refresh_token: None,
@@ -245,7 +231,8 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 /// Log out the current device.
 ///
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
 pub async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3::Response> {
@@ -265,15 +252,15 @@ pub async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3:
 /// Log out all devices of this user.
 ///
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes all device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets all to-device events
 /// - Triggers device list updates
 ///
-/// Note: This is equivalent to calling [`GET /_matrix/client/r0/logout`](fn.logout_route.html)
-/// from each device of this user.
-pub async fn logout_all_route(
-    body: Ruma<logout_all::v3::Request>,
-) -> Result<logout_all::v3::Response> {
+/// Note: This is equivalent to calling [`GET
+/// /_matrix/client/r0/logout`](fn.logout_route.html) from each device of this
+/// user.
+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() {
@@ -1,33 +1,53 @@
-use crate::{services, Result, Ruma};
-use ruma::api::client::space::get_hierarchy;
+use std::str::FromStr;

-/// # `GET /_matrix/client/v1/rooms/{room_id}/hierarchy``
+use ruma::{
+	api::client::{error::ErrorKind, space::get_hierarchy},
+	UInt,
+};
+
+use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Ruma};
+
+/// # `GET /_matrix/client/v1/rooms/{room_id}/hierarchy`
 ///
-/// Paginates over the space tree in a depth-first manner to locate child rooms of a given space.
-pub async fn get_hierarchy_route(
-    body: Ruma<get_hierarchy::v1::Request>,
-) -> Result<get_hierarchy::v1::Response> {
+/// Paginates over the space tree in a depth-first manner to locate child rooms
+/// of a given space.
+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 skip = body
+	let limit = body
+		.limit
+		.unwrap_or_else(|| UInt::from(10_u32))
+		.min(UInt::from(100_u32));
+
+	let max_depth = body
+		.max_depth
+		.unwrap_or_else(|| UInt::from(3_u32))
+		.min(UInt::from(10_u32));
+
+	let key = body
 		.from
 		.as_ref()
-        .and_then(|s| s.parse::<usize>().ok())
-        .unwrap_or(0);
+		.and_then(|s| PagnationToken::from_str(s).ok());

-    let limit = body.limit.map_or(10, u64::from).min(100) as usize;
-
-    let max_depth = body.max_depth.map_or(3, u64::from).min(10) as usize + 1; // +1 to skip the space room itself
+	// Should prevent unexpeded behaviour in (bad) clients
+	if let Some(ref token) = key {
+		if token.suggested_only != body.suggested_only || token.max_depth != max_depth {
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"suggested_only and max_depth cannot change on paginated requests",
+			));
+		}
+	}

 	services()
 		.rooms
 		.spaces
-        .get_hierarchy(
+		.get_client_hierarchy(
 			sender_user,
 			&body.room_id,
-            limit,
-            skip,
-            max_depth,
+			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
@@ -1,26 +1,35 @@
 use std::sync::Arc;

-use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma, RumaResponse};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		state::{get_state_events, get_state_events_for_key, send_state_event},
 	},
 	events::{
-        room::canonical_alias::RoomCanonicalAliasEventContent, AnyStateEventContent, StateEventType,
+		room::{
+			canonical_alias::RoomCanonicalAliasEventContent,
+			join_rules::{JoinRule, RoomJoinRulesEventContent},
+		},
+		AnyStateEventContent, StateEventType,
 	},
 	serde::Raw,
 	EventId, RoomId, UserId,
 };
 use tracing::{error, log::warn};

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`
+use crate::{
+	service::{self, pdu::PduBuilder},
+	services, Error, Result, Ruma, RumaResponse,
+};
+
+/// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}/{stateKey}`
 ///
 /// Sends a state event into the room.
 ///
 /// - 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
-/// - If event is new canonical_alias: Rejects if alias is incorrect
+/// - 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 async fn send_state_event_for_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<send_state_event::v3::Response> {
@@ -31,52 +40,51 @@ pub async fn send_state_event_for_key_route(
 		&body.room_id,
 		&body.event_type,
 		&body.body.body, // Yes, I hate it too
-        body.state_key.to_owned(),
+		body.state_key.clone(),
 	)
 	.await?;

 	let event_id = (*event_id).to_owned();
-    Ok(send_state_event::v3::Response { event_id })
+	Ok(send_state_event::v3::Response {
+		event_id,
+	})
 }

-/// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}`
+/// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}`
 ///
 /// Sends a state event into the room.
 ///
 /// - 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
-/// - If event is new canonical_alias: Rejects if alias is incorrect
+/// - 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 async fn send_state_event_for_empty_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<RumaResponse<send_state_event::v3::Response>> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-    // Forbid m.room.encryption if encryption is disabled
-    if body.event_type == StateEventType::RoomEncryption && !services().globals.allow_encryption() {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
-        ));
-    }
-
 	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.to_owned(),
+		body.state_key.clone(),
 	)
 	.await?;

 	let event_id = (*event_id).to_owned();
-    Ok(send_state_event::v3::Response { event_id }.into())
+	Ok(send_state_event::v3::Response {
+		event_id,
+	}
+	.into())
 }

-/// # `GET /_matrix/client/r0/rooms/{roomid}/state`
+/// # `GET /_matrix/client/v3/rooms/{roomid}/state`
 ///
 /// Get all state events for a room.
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 pub async fn get_state_events_route(
 	body: Ruma<get_state_events::v3::Request>,
 ) -> Result<get_state_events::v3::Response> {
@@ -88,7 +96,7 @@ pub async fn get_state_events_route(
 		.user_can_see_state_events(sender_user, &body.room_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view the room state.",
 		));
 	}
@@ -108,10 +116,11 @@ pub async fn get_state_events_route(
 /// # `GET /_matrix/client/v3/rooms/{roomid}/state/{eventType}/{stateKey}`
 ///
 /// Get single state event of a room with the specified state key.
-/// The optional query parameter `?format=event|content` allows returning the full room state event
-/// or just the state event's content (default behaviour)
+/// The optional query parameter `?format=event|content` allows returning the
+/// full room state event or just the state event's content (default behaviour)
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 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> {
@@ -123,7 +132,7 @@ pub async fn get_state_events_for_key_route(
 		.user_can_see_state_events(sender_user, &body.room_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view the room state.",
 		));
 	}
@@ -133,10 +142,7 @@ pub async fn get_state_events_for_key_route(
 		.state_accessor
 		.room_state_get(&body.room_id, &body.event_type, &body.state_key)?
 		.ok_or_else(|| {
-            warn!(
-                "State event {:?} not found in room {:?}",
-                &body.event_type, &body.room_id
-            );
+			warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
 			Error::BadRequest(ErrorKind::NotFound, "State event not found.")
 		})?;
 	if body
@@ -165,10 +171,11 @@ pub async fn get_state_events_for_key_route(
 /// # `GET /_matrix/client/v3/rooms/{roomid}/state/{eventType}`
 ///
 /// Get single state event of a room.
-/// The optional query parameter `?format=event|content` allows returning the full room state event
-/// or just the state event's content (default behaviour)
+/// The optional query parameter `?format=event|content` allows returning the
+/// full room state event or just the state event's content (default behaviour)
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 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>> {
@@ -180,7 +187,7 @@ pub async fn get_state_events_for_empty_key_route(
 		.user_can_see_state_events(sender_user, &body.room_id)?
 	{
 		return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+			ErrorKind::forbidden(),
 			"You don't have permission to view the room state.",
 		));
 	}
@@ -190,10 +197,7 @@ pub async fn get_state_events_for_empty_key_route(
 		.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
-            );
+			warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
 			Error::BadRequest(ErrorKind::NotFound, "State event not found.")
 		})?;

@@ -223,19 +227,33 @@ pub async fn get_state_events_for_empty_key_route(
 }

 async fn send_state_event_for_key_helper(
-    sender: &UserId,
-    room_id: &RoomId,
-    event_type: &StateEventType,
-    json: &Raw<AnyStateEventContent>,
-    state_key: String,
+	sender: &UserId, room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>, state_key: String,
 ) -> Result<Arc<EventId>> {
-    let sender_user = sender;
-
-    // TODO: Review this check, error if event is unparsable, use event type, allow alias if it
-    // previously existed
-    if let Ok(canonical_alias) =
-        serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get())
-    {
+	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 {
@@ -252,20 +270,22 @@ async fn send_state_event_for_key_helper(
                        .is_none()
 					{
 						return Err(Error::BadRequest(
-                    ErrorKind::Forbidden,
-                    "You are only allowed to send canonical_alias \
-                    events when it's aliases already exists",
+							ErrorKind::forbidden(),
+							"You are only allowed to send canonical_alias events when its aliases already exist",
 						));
 					}
 				}
 			}
+		},
+		_ => {},
+	}

 	let mutex_state = Arc::clone(
 		services()
 			.globals
 			.roomid_mutex_state
 			.write()
-            .unwrap()
+			.await
 			.entry(room_id.to_owned())
 			.or_default(),
 	);
@@ -282,7 +302,7 @@ async fn send_state_event_for_key_helper(
 				state_key: Some(state_key),
 				redacts: None,
 			},
-            sender_user,
+			sender,
 			room_id,
 			&state_lock,
 		)
@@ -1,4 +1,5 @@
-use crate::{services, Error, Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::{
 	api::client::tag::{create_tag, delete_tag, get_tags},
 	events::{
@@ -6,36 +7,31 @@ use ruma::{
 		RoomAccountDataEventType,
 	},
 };
-use std::collections::BTreeMap;
+
+use crate::{services, Error, Result, Ruma};

 /// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
 ///
 /// Adds a tag to the room.
 ///
 /// - Inserts the tag into the tag event of the room account data.
-pub 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().account_data.get(
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
+	let event = services()
+		.account_data
+		.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;

-    let mut tags_event = event
-        .map(|e| {
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
-        .unwrap_or_else(|| {
+	let mut tags_event = event.map_or_else(
+		|| {
 			Ok(TagEvent {
 				content: TagEventContent {
 					tags: BTreeMap::new(),
 				},
 			})
-        })?;
+		},
+		|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")),
+	)?;

 	tags_event
 		.content
@@ -57,29 +53,23 @@ pub async fn update_tag_route(
 /// Deletes a tag from the room.
 ///
 /// - Removes the tag from the tag event of the room account data.
-pub 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().account_data.get(
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
+	let event = services()
+		.account_data
+		.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;

-    let mut tags_event = event
-        .map(|e| {
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
-        .unwrap_or_else(|| {
+	let mut tags_event = event.map_or_else(
+		|| {
 			Ok(TagEvent {
 				content: TagEventContent {
 					tags: BTreeMap::new(),
 				},
 			})
-        })?;
+		},
+		|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")),
+	)?;

 	tags_event.content.tags.remove(&body.tag.clone().into());

@@ -101,24 +91,20 @@ pub async fn delete_tag_route(
 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().account_data.get(
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
+	let event = services()
+		.account_data
+		.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;

-    let tags_event = event
-        .map(|e| {
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
-        .unwrap_or_else(|| {
+	let tags_event = event.map_or_else(
+		|| {
 			Ok(TagEvent {
 				content: TagEventContent {
 					tags: BTreeMap::new(),
 				},
 			})
-        })?;
+		},
+		|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")),
+	)?;

 	Ok(get_tags::v3::Response {
 		tags: tags_event.content.tags,
@@ -1,14 +1,13 @@
-use crate::{Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::api::client::thirdparty::get_protocols;

-use std::collections::BTreeMap;
+use crate::{Result, Ruma};

 /// # `GET /_matrix/client/r0/thirdparty/protocols`
 ///
 /// TODO: Fetches all metadata about protocols supported by the homeserver.
-pub 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(),
@@ -3,9 +3,7 @@ use ruma::api::client::{error::ErrorKind, threads::get_threads};
 use crate::{services, Error, Result, Ruma};

 /// # `GET /_matrix/client/r0/rooms/{roomId}/threads`
-pub 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
@@ -27,7 +25,7 @@ pub async fn get_threads_route(
 		.threads
 		.threads_until(sender_user, &body.room_id, from, &body.include)?
 		.take(limit)
-        .filter_map(|r| r.ok())
+		.filter_map(Result::ok)
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;

-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::{
 		client::{error::ErrorKind, to_device::send_event_to_device},
@@ -9,6 +8,8 @@ use ruma::{
 	to_device::DeviceIdOrAllDevices,
 };

+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
 /// Send a to-device event to a set of client devices.
@@ -36,18 +37,15 @@ pub async fn send_event_to_device_route(
 				messages.insert(target_user_id.clone(), map);
 				let count = services().globals.next_count()?;

-                services().sending.send_reliable_edu(
+				services().sending.send_edu_server(
 					target_user_id.server_name(),
-                    serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(
-                        DirectDeviceContent {
+					serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(DirectDeviceContent {
 						sender: sender_user.clone(),
 						ev_type: body.event_type.clone(),
 						message_id: count.to_string().into(),
 						messages,
-                        },
-                    ))
+					}))
 					.expect("DirectToDevice EDU can be serialized"),
-                    count,
 				)?;

 				continue;
@@ -60,11 +58,11 @@ pub async fn send_event_to_device_route(
 						target_user_id,
 						target_device_id,
 						&body.event_type.to_string(),
-                        event.deserialize_as().map_err(|_| {
-                            Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
-                        })?,
-                    )?
-                }
+						event
+							.deserialize_as()
+							.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid"))?,
+					)?;
+				},

 				DeviceIdOrAllDevices::AllDevices => {
 					for target_device_id in services().users.all_device_ids(target_user_id) {
@@ -73,12 +71,12 @@ pub async fn send_event_to_device_route(
 							target_user_id,
 							&target_device_id?,
 							&body.event_type.to_string(),
-                            event.deserialize_as().map_err(|_| {
-                                Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
-                            })?,
+							event
+								.deserialize_as()
+								.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid"))?,
 						)?;
 					}
-                }
+				},
 			}
 		}
 	}
@@ -1,6 +1,7 @@
-use crate::{services, utils, Error, Result, Ruma};
 use ruma::api::client::{error::ErrorKind, typing::create_typing_event};

+use crate::{services, utils, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
 /// Sets the typing state of the sender user.
@@ -16,24 +17,26 @@ pub async fn create_typing_event_route(
 		.state_cache
 		.is_joined(sender_user, &body.room_id)?
 	{
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "You are not in this room.",
-        ));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "You are not in this room."));
 	}

 	if let Typing::Yes(duration) = body.state {
-        services().rooms.edus.typing.typing_add(
-            sender_user,
-            &body.room_id,
-            duration.as_millis() as u64 + utils::millis_since_unix_epoch(),
-        )?;
+		let duration = utils::clamp(
+			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() + duration)
+			.await?;
 	} else {
 		services()
 			.rooms
-            .edus
 			.typing
-            .typing_remove(sender_user, &body.room_id)?;
+			.typing_remove(sender_user, &body.room_id)
+			.await?;
 	}

 	Ok(create_typing_event::v3::Response {})
@@ -0,0 +1,45 @@
+use ruma::{
+	api::client::{error::ErrorKind, membership::mutual_rooms},
+	OwnedRoomId,
+};
+
+use crate::{services, Error, Result, Ruma};
+
+/// # `GET /_matrix/client/unstable/uk.half-shot.msc2666/user/mutual_rooms`
+///
+/// Gets all the rooms the sender shares with the specified user.
+///
+/// TODO: Implement pagination, currently this just returns everything
+///
+/// An implementation of [MSC2666](https://github.com/matrix-org/matrix-spec-proposals/pull/2666)
+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");
+
+	if sender_user == &body.user_id {
+		return Err(Error::BadRequest(
+			ErrorKind::Unknown,
+			"You cannot request rooms in common with yourself.",
+		));
+	}
+
+	if !services().users.exists(&body.user_id)? {
+		return Ok(mutual_rooms::unstable::Response {
+			joined: vec![],
+			next_batch_token: None,
+		});
+	}
+
+	let mutual_rooms: Vec<OwnedRoomId> = services()
+		.rooms
+		.user
+		.get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])?
+		.filter_map(Result::ok)
+		.collect();
+
+	Ok(mutual_rooms::unstable::Response {
+		joined: mutual_rooms,
+		next_batch_token: None,
+	})
+}
@@ -1,20 +1,29 @@
-use std::{collections::BTreeMap, iter::FromIterator};
+use std::collections::BTreeMap;

 use axum::{response::IntoResponse, Json};
-use ruma::api::client::{discovery::get_supported_versions, error::ErrorKind};
+use ruma::api::client::{
+	discovery::{
+		discover_homeserver::{self, HomeserverInfo, SlidingSyncProxyInfo},
+		discover_support::{self, Contact},
+		get_supported_versions,
+	},
+	error::ErrorKind,
+};

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

 /// # `GET /_matrix/client/versions`
 ///
-/// Get the versions of the specification and unstable features supported by this server.
+/// Get the versions of the specification and unstable features supported by
+/// this server.
 ///
 /// - Versions take the form MAJOR.MINOR.PATCH
 /// - Only the latest PATCH release will be reported for each MAJOR.MINOR value
-/// - Unstable features are namespaced and may include version information in their name
+/// - Unstable features are namespaced and may include version information in
+///   their name
 ///
-/// Note: Unstable features are used while developing new features. Clients should avoid using
-/// unstable features in their stable releases
+/// Note: Unstable features are used while developing new features. Clients
+/// should avoid using unstable features in their stable releases
 pub async fn get_supported_versions_route(
 	_body: Ruma<get_supported_versions::Request>,
 ) -> Result<get_supported_versions::Response> {
@@ -36,9 +45,12 @@ pub async fn get_supported_versions_route(
 		],
 		unstable_features: BTreeMap::from_iter([
 			("org.matrix.e2e_cross_signing".to_owned(), true),
+			("org.matrix.msc2285.stable".to_owned(), true),
+			("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true),
 			("org.matrix.msc2836".to_owned(), true),
-            ("org.matrix.msc3827".to_owned(), true),
 			("org.matrix.msc2946".to_owned(), true),
+			("org.matrix.msc3026.busy_presence".to_owned(), true),
+			("org.matrix.msc3827".to_owned(), true),
 		]),
 	};

@@ -46,33 +58,111 @@ pub async fn get_supported_versions_route(
 }

 /// # `GET /.well-known/matrix/client`
-pub async fn well_known_client_route() -> Result<impl IntoResponse> {
+///
+/// Returns the .well-known URL if it is configured, otherwise returns 404.
+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.clone(),
+		Some(url) => url.to_string(),
 		None => return Err(Error::BadRequest(ErrorKind::NotFound, "Not found.")),
 	};

-    Ok(Json(serde_json::json!({
-        "m.homeserver": {"base_url": client_url},
-        "org.matrix.msc3575.proxy": {"url": client_url}
-    })))
+	Ok(discover_homeserver::Response {
+		homeserver: HomeserverInfo {
+			base_url: client_url.clone(),
+		},
+		identity_server: None,
+		sliding_sync_proxy: Some(SlidingSyncProxyInfo {
+			url: client_url,
+		}),
+		tile_server: None,
+	})
+}
+
+/// # `GET /.well-known/matrix/support`
+///
+/// Server support contact and support page of a homeserver's domain.
+pub async fn well_known_support(_body: Ruma<discover_support::Request>) -> Result<discover_support::Response> {
+	let support_page = services()
+		.globals
+		.well_known_support_page()
+		.as_ref()
+		.map(ToString::to_string);
+
+	let role = services().globals.well_known_support_role().clone();
+
+	// support page or role must be either defined for this to be valid
+	if support_page.is_none() && role.is_none() {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Not found."));
+	}
+
+	let email_address = services().globals.well_known_support_email().clone();
+	let matrix_id = services().globals.well_known_support_mxid().clone();
+
+	// if a role is specified, an email address or matrix id is required
+	if role.is_some() && (email_address.is_none() && matrix_id.is_none()) {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Not found."));
+	}
+
+	// TOOD: support defining multiple contacts in the config
+	let mut contacts: Vec<Contact> = vec![];
+
+	if let Some(role) = role {
+		let contact = Contact {
+			role,
+			email_address,
+			matrix_id,
+		};
+
+		contacts.push(contact);
+	}
+
+	// support page or role+contacts must be either defined for this to be valid
+	if contacts.is_empty() && support_page.is_none() {
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Not found."));
+	}
+
+	Ok(discover_support::Response {
+		contacts,
+		support_page,
+	})
 }

 /// # `GET /client/server.json`
 ///
-/// Endpoint provided by sliding sync proxy used by some clients such as Element Web
-/// as a non-standard health check.
+/// Endpoint provided by sliding sync proxy used by some clients such as Element
+/// Web as a non-standard health check.
 pub async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 	let server_url = match services().globals.well_known_client() {
-        Some(url) => url.clone(),
+		Some(url) => url.to_string(),
 		None => match services().globals.well_known_server() {
-            Some(url) => url.clone(),
+			Some(url) => url.to_string(),
 			None => return Err(Error::BadRequest(ErrorKind::NotFound, "Not found.")),
 		},
 	};

+	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": format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"))
+		"version": version,
+	})))
+}
+
+/// # `GET /_conduwuit/server_version`
+///
+/// Conduwuit-specific API to get the server version, results akin to
+/// `/_matrix/federation/v1/version`
+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": version,
 	})))
 }
@@ -1,4 +1,3 @@
-use crate::{services, Result, Ruma};
 use ruma::{
 	api::client::user_directory::search_users,
 	events::{
@@ -7,15 +6,16 @@ use ruma::{
 	},
 };

+use crate::{services, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/user_directory/search`
 ///
 /// Searches all known users for a match.
 ///
-/// - Hides any local users that aren't in any public rooms (i.e. those that have the join rule set to public)
+/// - 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 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 = u64::from(body.limit) as usize;

@@ -48,11 +48,14 @@ pub async fn search_users_route(
 			return None;
 		}

+		// It's a matching user, but is the sender allowed to see them?
+		let mut user_visible = false;
+
 		let user_is_in_public_rooms = services()
 			.rooms
 			.state_cache
 			.rooms_joined(&user_id)
-            .filter_map(|r| r.ok())
+			.filter_map(Result::ok)
 			.any(|room| {
 				services()
 					.rooms
@@ -61,17 +64,14 @@ pub async fn search_users_route(
 					.map_or(false, |event| {
 						event.map_or(false, |event| {
 							serde_json::from_str(event.content.get())
-                                .map_or(false, |r: RoomJoinRulesEventContent| {
-                                    r.join_rule == JoinRule::Public
-                                })
+								.map_or(false, |r: RoomJoinRulesEventContent| r.join_rule == JoinRule::Public)
 						})
 					})
 			});

 		if user_is_in_public_rooms {
-            return Some(user);
-        }
-
+			user_visible = true;
+		} else {
 			let user_is_in_shared_rooms = services()
 				.rooms
 				.user
@@ -81,14 +81,22 @@ pub async fn search_users_route(
 				.is_some();

 			if user_is_in_shared_rooms {
-            return Some(user);
+				user_visible = true;
+			}
 		}

-        None
+		if !user_visible {
+			return None;
+		}
+
+		Some(user)
 	});

 	let results = users.by_ref().take(limit).collect();
 	let limited = users.next().is_some();

-    Ok(search_users::v3::Response { results, limited })
+	Ok(search_users::v3::Response {
+		results,
+		limited,
+	})
 }
@@ -1,9 +1,11 @@
-use crate::{services, Result, Ruma};
+use std::time::{Duration, SystemTime};
+
 use base64::{engine::general_purpose, Engine as _};
 use hmac::{Hmac, Mac};
 use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch};
 use sha1::Sha1;
-use std::time::{Duration, SystemTime};
+
+use crate::{services, Result, Ruma};

 type HmacSha1 = Hmac<Sha1>;

@@ -25,8 +27,7 @@ pub async fn turn_server_route(

 		let username: String = format!("{}:{}", expiry.get(), sender_user);

-        let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes())
-            .expect("HMAC can take key of any size");
+		let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes()).expect("HMAC can take key of any size");
 		mac.update(username.as_bytes());

 		let password: String = general_purpose::STANDARD.encode(mac.finalize().into_bytes());
@@ -1,4 +1,3 @@
-pub mod appservice_server;
 pub mod client_server;
 pub mod ruma_wrapper;
 pub mod server_server;
@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, iter::FromIterator, str};
+use std::{collections::BTreeMap, str};

 use axum::{
 	async_trait,
@@ -12,16 +12,23 @@ use axum::{
 	BoxError, RequestExt, RequestPartsExt,
 };
 use bytes::{Buf, BufMut, Bytes, BytesMut};
-use http::{Request, StatusCode};
+use http::{uri::PathAndQuery, Request, StatusCode};
 use ruma::{
 	api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
-    CanonicalJsonValue, OwnedDeviceId, OwnedServerName, UserId,
+	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
 };
 use serde::Deserialize;
-use tracing::{debug, error, warn};
+use tracing::{debug, error, trace, warn};

 use super::{Ruma, RumaResponse};
-use crate::{services, Error, Result};
+use crate::{service::appservice::RegistrationInfo, services, Error, Result};
+
+enum Token {
+	Appservice(Box<RegistrationInfo>),
+	User((OwnedUserId, OwnedDeviceId)),
+	Invalid,
+	None,
+}

 #[derive(Deserialize)]
 struct QueryParams {
@@ -39,6 +46,7 @@ where
 {
 	type Rejection = Error;

+	#[allow(unused_qualifications)] // async traits
 	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) => {
@@ -47,14 +55,14 @@ where
 					.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;
@@ -65,12 +73,9 @@ where
 		let query_params: QueryParams = match serde_html_form::from_str(query) {
 			Ok(params) => params,
 			Err(e) => {
-                error!(%query, "Failed to deserialize query parameters: {}", e);
-                return Err(Error::BadRequest(
-                    ErrorKind::Unknown,
-                    "Failed to read query parameters",
-                ));
-            }
+				error!(%query, "Failed to deserialize query parameters: {e}");
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to read query parameters"));
+			},
 		};

 		let token = match &auth_header {
@@ -78,132 +83,143 @@ where
 			None => query_params.access_token.as_deref(),
 		};

-        let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
-
-        let appservices = services().appservice.all().unwrap();
-        let appservice_registration = appservices
-            .iter()
-            .find(|(_id, registration)| Some(registration.as_token.as_str()) == token);
-
-        let (sender_user, sender_device, sender_servername, from_appservice) =
-            if let Some((_id, registration)) = appservice_registration {
-                match metadata.authentication {
-                    AuthScheme::AccessToken => {
-                        let user_id = query_params.user_id.map_or_else(
-                            || {
-                                UserId::parse_with_server_name(
-                                    registration.sender_localpart.as_str(),
-                                    services().globals.server_name(),
-                                )
-                                .unwrap()
-                            },
-                            |s| UserId::parse(s).unwrap(),
-                        );
-
-                        if !services().users.exists(&user_id).unwrap() {
-                            return Err(Error::BadRequest(
-                                ErrorKind::Forbidden,
-                                "User does not exist.",
-                            ));
-                        }
-
-                        // TODO: Check if appservice is allowed to be that user
-                        (Some(user_id), None, None, true)
-                    }
-                    AuthScheme::ServerSignatures => (None, None, None, true),
-                    AuthScheme::None => (None, None, None, true),
+		let token = if let Some(token) = token {
+			if let Some(reg_info) = services().appservice.find_from_token(token).await {
+				Token::Appservice(Box::new(reg_info))
+			} else if let Some((user_id, device_id)) = services().users.find_from_token(token)? {
+				Token::User((user_id, OwnedDeviceId::from(device_id)))
+			} else {
+				Token::Invalid
 			}
 		} else {
-                match metadata.authentication {
-                    AuthScheme::AccessToken => {
-                        let token = match token {
-                            Some(token) => token,
-                            _ => {
-                                return Err(Error::BadRequest(
-                                    ErrorKind::MissingToken,
-                                    "Missing access token.",
-                                ))
-                            }
+			Token::None
 		};

-                        match services().users.find_from_token(token).unwrap() {
-                            None => {
+		if metadata.authentication == AuthScheme::None {
+			match parts.uri.path() {
+				// TODO: can we check this better?
+				"/_matrix/client/v3/publicRooms" | "/_matrix/client/r0/publicRooms" => {
+					if !services()
+						.globals
+						.config
+						.allow_public_room_directory_without_auth
+					{
+						match token {
+							Token::Appservice(_) | Token::User(_) => {
+								// we should have validated the token above
+								// already
+							},
+							Token::None | Token::Invalid => {
 								return Err(Error::BadRequest(
-                                    ErrorKind::UnknownToken { soft_logout: false },
+									ErrorKind::MissingToken,
+									"Missing or invalid access token.",
+								));
+							},
+						}
+					}
+				},
+				_ => {},
+			};
+		}
+
+		let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
+
+		let (sender_user, sender_device, sender_servername, appservice_info) = match (metadata.authentication, token) {
+			(_, Token::Invalid) => {
+				return Err(Error::BadRequest(
+					ErrorKind::UnknownToken {
+						soft_logout: false,
+					},
 					"Unknown access token.",
 				))
+			},
+			(AuthScheme::AccessToken | AuthScheme::AccessTokenOptional, Token::Appservice(info)) => {
+				let user_id = query_params
+					.user_id
+					.map_or_else(
+						|| {
+							UserId::parse_with_server_name(
+								info.registration.sender_localpart.as_str(),
+								services().globals.server_name(),
+							)
+						},
+						UserId::parse,
+					)
+					.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
+
+				if !info.is_user_match(&user_id) {
+					return Err(Error::BadRequest(ErrorKind::Exclusive, "User is not in namespace."));
 				}
-                            Some((user_id, device_id)) => (
-                                Some(user_id),
-                                Some(OwnedDeviceId::from(device_id)),
-                                None,
-                                false,
-                            ),
+
+				if !services().users.exists(&user_id)? {
+					return Err(Error::BadRequest(ErrorKind::forbidden(), "User does not exist."));
 				}
+
+				(Some(user_id), 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."));
+			},
+			(
+				AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::None,
+				Token::User((user_id, device_id)),
+			) => (Some(user_id), Some(device_id), None, None),
+			(AuthScheme::ServerSignatures, Token::None) => {
+				if !services().globals.allow_federation() {
+					return Err(Error::bad_config("Federation is disabled."));
 				}
-                    AuthScheme::ServerSignatures => {
+
 				let TypedHeader(Authorization(x_matrix)) = parts
 					.extract::<TypedHeader<Authorization<XMatrix>>>()
 					.await
 					.map_err(|e| {
-                                warn!("Missing or invalid Authorization header: {}", e);
+						warn!("Missing or invalid Authorization header: {e}");

 						let msg = match e.reason() {
-                                    TypedHeaderRejectionReason::Missing => {
-                                        "Missing Authorization header."
-                                    }
-                                    TypedHeaderRejectionReason::Error(_) => {
-                                        "Invalid X-Matrix signatures."
-                                    }
+							TypedHeaderRejectionReason::Missing => "Missing Authorization header.",
+							TypedHeaderRejectionReason::Error(_) => "Invalid X-Matrix signatures.",
 							_ => "Unknown header-related error",
 						};

-                                Error::BadRequest(ErrorKind::Forbidden, msg)
+						Error::BadRequest(ErrorKind::forbidden(), msg)
 					})?;

-                        let origin_signatures = BTreeMap::from_iter([(
-                            x_matrix.key.clone(),
-                            CanonicalJsonValue::String(x_matrix.sig),
-                        )]);
+				let origin_signatures =
+					BTreeMap::from_iter([(x_matrix.key.clone(), CanonicalJsonValue::String(x_matrix.sig))]);

 				let signatures = BTreeMap::from_iter([(
 					x_matrix.origin.as_str().to_owned(),
 					CanonicalJsonValue::Object(origin_signatures),
 				)]);

-                        let server_destination =
-                            services().globals.server_name().as_str().to_owned();
+				let server_destination = services().globals.server_name().as_str().to_owned();

 				if let Some(destination) = x_matrix.destination.as_ref() {
 					if destination != &server_destination {
-                                return Err(Error::BadRequest(
-                                    ErrorKind::Forbidden,
-                                    "Invalid authorization.",
-                                ));
+						return Err(Error::BadRequest(ErrorKind::forbidden(), "Invalid authorization."));
 					}
 				}

+				let signature_uri = CanonicalJsonValue::String(
+					parts
+						.uri
+						.path_and_query()
+						.unwrap_or(&PathAndQuery::from_static("/"))
+						.to_string(),
+				);
+
 				let mut request_map = BTreeMap::from_iter([
-                            (
-                                "method".to_owned(),
-                                CanonicalJsonValue::String(parts.method.to_string()),
-                            ),
-                            (
-                                "uri".to_owned(),
-                                CanonicalJsonValue::String(parts.uri.to_string()),
-                            ),
+					("method".to_owned(), CanonicalJsonValue::String(parts.method.to_string())),
+					("uri".to_owned(), signature_uri),
 					(
 						"origin".to_owned(),
 						CanonicalJsonValue::String(x_matrix.origin.as_str().to_owned()),
 					),
-                            (
-                                "destination".to_owned(),
-                                CanonicalJsonValue::String(server_destination),
-                            ),
-                            (
-                                "signatures".to_owned(),
-                                CanonicalJsonValue::Object(signatures),
-                            ),
+					("destination".to_owned(), CanonicalJsonValue::String(server_destination)),
+					("signatures".to_owned(), CanonicalJsonValue::Object(signatures)),
 				]);

 				if let Some(json_body) = &json_body {
@@ -213,97 +229,58 @@ where
 				let keys_result = services()
 					.rooms
 					.event_handler
-                            .fetch_signing_keys_for_server(
-                                &x_matrix.origin,
-                                vec![x_matrix.key.to_owned()],
-                            )
+					.fetch_signing_keys_for_server(&x_matrix.origin, vec![x_matrix.key.clone()])
 					.await;

-                        let keys = match keys_result {
-                            Ok(b) => b,
-                            Err(e) => {
-                                warn!("Failed to fetch signing keys: {}", e);
-                                return Err(Error::BadRequest(
-                                    ErrorKind::Forbidden,
-                                    "Failed to fetch signing keys.",
-                                ));
-                            }
-                        };
+				let keys = keys_result.map_err(|e| {
+					warn!("Failed to fetch signing keys: {e}");
+					Error::BadRequest(ErrorKind::forbidden(), "Failed to fetch signing keys.")
+				})?;

-                        let pub_key_map =
-                            BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);
+				let pub_key_map = BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);

 				match ruma::signatures::verify_json(&pub_key_map, &request_map) {
-                            Ok(()) => (None, None, Some(x_matrix.origin), false),
+					Ok(()) => (None, None, Some(x_matrix.origin), None),
 					Err(e) => {
-                                warn!(
-                                    "Failed to verify json request from {}: {}\n{:?}",
-                                    x_matrix.origin, e, request_map
-                                );
+						warn!("Failed to verify json request from {}: {e}\n{request_map:?}", x_matrix.origin);

 						if parts.uri.to_string().contains('@') {
 							warn!(
-                                        "Request uri contained '@' character. Make sure your \
-                                         reverse proxy gives Conduit the raw uri (apache: use \
-                                         nocanon)"
+								"Request uri contained '@' character. Make sure your reverse proxy gives Conduit the \
+								 raw uri (apache: use nocanon)"
 							);
 						}

 						return Err(Error::BadRequest(
-                                    ErrorKind::Forbidden,
+							ErrorKind::forbidden(),
 							"Failed to verify X-Matrix signatures.",
 						));
-                            }
-                        }
-                    }
-                    AuthScheme::None => match parts.uri.path() {
-                        // allow_public_room_directory_without_auth
-                        "/_matrix/client/v3/publicRooms" | "/_matrix/client/r0/publicRooms" => {
-                            if !services()
-                                .globals
-                                .config
-                                .allow_public_room_directory_without_auth
-                            {
-                                let token = match token {
-                                    Some(token) => token,
-                                    _ => {
-                                        return Err(Error::BadRequest(
-                                            ErrorKind::MissingToken,
-                                            "Missing access token.",
-                                        ))
-                                    }
-                                };
-
-                                match services().users.find_from_token(token).unwrap() {
-                                    None => {
-                                        return Err(Error::BadRequest(
-                                            ErrorKind::UnknownToken { soft_logout: false },
-                                            "Unknown access token.",
-                                        ))
-                                    }
-                                    Some((user_id, device_id)) => (
-                                        Some(user_id),
-                                        Some(OwnedDeviceId::from(device_id)),
-                                        None,
-                                        false,
-                                    ),
-                                }
-                            } else {
-                                (None, None, None, false)
-                            }
-                        }
-                        _ => (None, None, None, false),
 					},
 				}
+			},
+			(AuthScheme::None | AuthScheme::AppserviceToken | AuthScheme::AccessTokenOptional, Token::None) => {
+				(None, None, None, None)
+			},
+			(AuthScheme::ServerSignatures, Token::Appservice(_) | Token::User(_)) => {
+				return Err(Error::BadRequest(
+					ErrorKind::Unauthorized,
+					"Only server signatures should be used on this endpoint.",
+				));
+			},
+			(AuthScheme::AppserviceToken, Token::User(_)) => {
+				return Err(Error::BadRequest(
+					ErrorKind::Unauthorized,
+					"Only appservice access tokens should be used on this endpoint.",
+				));
+			},
 		};

-        let mut http_request = http::Request::builder().uri(parts.uri).method(parts.method);
+		let mut http_request = Request::builder().uri(parts.uri).method(parts.method);
 		*http_request.headers_mut().unwrap() = parts.headers;

 		if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {
 			let user_id = sender_user.clone().unwrap_or_else(|| {
-                UserId::parse_with_server_name("", services().globals.server_name())
-                    .expect("we know this is valid")
+				UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid")
 			});

 			let uiaa_request = json_body
@@ -331,11 +308,16 @@ where
 		}

 		let http_request = http_request.body(&*body).unwrap();
+		debug!(
+			"{:?} {:?} {:?}",
+			http_request.method(),
+			http_request.uri(),
+			http_request.headers()
+		);

-        debug!("{:?}", http_request);
-
+		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);
+			warn!("try_from_http_request failed: {e:?}\nPath parameters: {path_params:?}",);
 			debug!("JSON body: {:?}", json_body);
 			Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
 		})?;
@@ -345,8 +327,8 @@ where
 			sender_user,
 			sender_device,
 			sender_servername,
-            from_appservice,
 			json_body,
+			appservice_info,
 		})
 	}
 }
@@ -392,10 +374,7 @@ impl Credentials for XMatrix {
 				"key" => key = Some(value.to_owned()),
 				"sig" => sig = Some(value.to_owned()),
 				"destination" => destination = Some(value.to_owned()),
-                _ => debug!(
-                    "Unexpected field `{}` in X-Matrix Authorization header",
-                    name
-                ),
+				_ => debug!("Unexpected field `{name}` in X-Matrix Authorization header"),
 			}
 		}

@@ -407,9 +386,7 @@ impl Credentials for XMatrix {
 		})
 	}

-    fn encode(&self) -> http::HeaderValue {
-        todo!()
-    }
+	fn encode(&self) -> http::HeaderValue { todo!() }
 }

 impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
@@ -1,11 +1,9 @@
-use crate::Error;
-use ruma::{
-    api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName,
-    OwnedUserId,
-};
 use std::ops::Deref;

-#[cfg(feature = "conduit_bin")]
+use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId};
+
+use crate::{service::appservice::RegistrationInfo, Error};
+
 mod axum;

 /// Extractor for Ruma request structs
@@ -16,28 +14,22 @@ pub struct Ruma<T> {
 	pub sender_servername: Option<OwnedServerName>,
 	// This is None when body is not a valid string
 	pub json_body: Option<CanonicalJsonValue>,
-    pub from_appservice: bool,
+	pub appservice_info: Option<RegistrationInfo>,
 }

 impl<T> Deref for Ruma<T> {
 	type Target = T;

-    fn deref(&self) -> &Self::Target {
-        &self.body
-    }
+	fn deref(&self) -> &Self::Target { &self.body }
 }

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

 impl<T> From<T> for RumaResponse<T> {
-    fn from(t: T) -> Self {
-        Self(t)
-    }
+	fn from(t: T) -> Self { Self(t) }
 }

 impl From<Error> for RumaResponse<UiaaResponse> {
-    fn from(t: Error) -> Self {
-        t.to_response()
-    }
+	fn from(t: Error) -> Self { t.to_response() }
 }
@@ -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() }
@@ -0,0 +1,166 @@
+#[cfg(unix)]
+use std::path::Path; // not unix specific, just only for UNIX sockets stuff and *nix container checks
+
+use tracing::{debug, error, info, warn};
+
+use crate::{utils::error::Error, Config};
+
+pub fn check(config: &Config) -> Result<(), Error> {
+	config.warn_deprecated();
+	config.warn_unknown_key();
+
+	if cfg!(feature = "hardened_malloc") && cfg!(feature = "jemalloc") {
+		warn!(
+			"hardened_malloc and jemalloc were built together, this causes neither to be used. Conduwuit will still \
+			 function, but consider rebuilding and pick one as this is now no-op."
+		);
+	}
+
+	if config.unix_socket_path.is_some() && !cfg!(unix) {
+		return Err(Error::bad_config(
+			"UNIX socket support is only available on *nix platforms. Please remove \"unix_socket_path\" from your \
+			 config.",
+		));
+	}
+
+	if config.address.is_loopback() && cfg!(unix) {
+		debug!(
+			"Found loopback listening address {}, running checks if we're in a container.",
+			config.address
+		);
+
+		#[cfg(unix)]
+		if Path::new("/proc/vz").exists() /* Guest */ && !Path::new("/proc/bz").exists()
+		/* Host */
+		{
+			error!(
+				"You are detected using OpenVZ with a loopback/localhost listening address of {}. If you are using \
+				 OpenVZ for containers and you use NAT-based networking to communicate with the host and guest, this \
+				 will NOT work. Please change this to \"0.0.0.0\". If this is expected, you can ignore.",
+				config.address
+			);
+		}
+
+		#[cfg(unix)]
+		if Path::new("/.dockerenv").exists() {
+			error!(
+				"You are detected using Docker with a loopback/localhost listening address of {}. If you are using a \
+				 reverse proxy on the host and require communication to conduwuit in the Docker container via \
+				 NAT-based networking, this will NOT work. Please change this to \"0.0.0.0\". If this is expected, \
+				 you can ignore.",
+				config.address
+			);
+		}
+
+		#[cfg(unix)]
+		if Path::new("/run/.containerenv").exists() {
+			error!(
+				"You are detected using Podman with a loopback/localhost listening address of {}. If you are using a \
+				 reverse proxy on the host and require communication to conduwuit in the Podman container via \
+				 NAT-based networking, this will NOT work. Please change this to \"0.0.0.0\". If this is expected, \
+				 you can ignore.",
+				config.address
+			);
+		}
+	}
+
+	// rocksdb does not allow max_log_files to be 0
+	if config.rocksdb_max_log_files == 0 && cfg!(feature = "rocksdb") {
+		return Err(Error::bad_config(
+			"When using RocksDB, rocksdb_max_log_files cannot be 0. Please set a value at least 1.",
+		));
+	}
+
+	// yeah, unless the user built a debug build hopefully for local testing only
+	if config.server_name == "your.server.name" && !cfg!(debug_assertions) {
+		return Err(Error::bad_config(
+			"You must specify a valid server name for production usage of conduwuit.",
+		));
+	}
+
+	if cfg!(debug_assertions) {
+		info!("Note: conduwuit was built without optimisations (i.e. debug build)");
+	}
+
+	// check if the user specified a registration token as `""`
+	if config.registration_token == Some(String::new()) {
+		return Err(Error::bad_config("Registration token was specified but is empty (\"\")"));
+	}
+
+	if config.max_request_size < 16384 {
+		return Err(Error::bad_config("Max request size is less than 16KB. Please increase it."));
+	}
+
+	// check if user specified valid IP CIDR ranges on startup
+	for cidr in &config.ip_range_denylist {
+		if let Err(e) = ipaddress::IPAddress::parse(cidr) {
+			error!("Error parsing specified IP CIDR range from string: {e}");
+			return Err(Error::bad_config("Error parsing specified IP CIDR ranges from strings"));
+		}
+	}
+
+	if config.allow_registration
+		&& !config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
+		&& config.registration_token.is_none()
+	{
+		return Err(Error::bad_config(
+			"!! You have `allow_registration` enabled without a token configured in your config which means you are \
+			 allowing ANYONE to register on your conduwuit instance without any 2nd-step (e.g. registration token).\n
+If this is not the intended behaviour, please set a registration token with the `registration_token` config option.\n
+For security and safety reasons, conduwuit will shut down. If you are extra sure this is the desired behaviour you \
+			 want, please set the following config option to true:
+`yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse`",
+		));
+	}
+
+	if config.allow_registration
+		&& config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
+		&& config.registration_token.is_none()
+	{
+		warn!(
+			"Open registration is enabled via setting \
+			 `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` and `allow_registration` to \
+			 true without a registration token configured. You are expected to be aware of the risks now.\n
+    If this is not the desired behaviour, please set a registration token."
+		);
+	}
+
+	if config.allow_outgoing_presence && !config.allow_local_presence {
+		return Err(Error::bad_config(
+			"Outgoing presence requires allowing local presence. Please enable \"allow_local_presence\".",
+		));
+	}
+
+	if config
+		.url_preview_domain_contains_allowlist
+		.contains(&"*".to_owned())
+	{
+		warn!(
+			"All URLs are allowed for URL previews via setting \"url_preview_domain_contains_allowlist\" to \"*\". \
+			 This opens up significant attack surface to your server. You are expected to be aware of the risks by \
+			 doing this."
+		);
+	}
+	if config
+		.url_preview_domain_explicit_allowlist
+		.contains(&"*".to_owned())
+	{
+		warn!(
+			"All URLs are allowed for URL previews via setting \"url_preview_domain_explicit_allowlist\" to \"*\". \
+			 This opens up significant attack surface to your server. You are expected to be aware of the risks by \
+			 doing this."
+		);
+	}
+	if config
+		.url_preview_url_contains_allowlist
+		.contains(&"*".to_owned())
+	{
+		warn!(
+			"All URLs are allowed for URL previews via setting \"url_preview_url_contains_allowlist\" to \"*\". This \
+			 opens up significant attack surface to your server. You are expected to be aware of the risks by doing \
+			 this."
+		);
+	}
+
+	Ok(())
+}
@@ -24,9 +24,10 @@ use crate::Result;
 /// ## Include vs. Exclude
 /// If include is an empty list, it is assumed to be `["*"]`.
 ///
-/// If a domain matches both the exclude and include list, the proxy will only be used if it was
-/// included because of a more specific rule than it was excluded. In the above example, the proxy
-/// would be used for `ordinary.onion`, `matrix.myspecial.onion`, but not `hello.myspecial.onion`.
+/// If a domain matches both the exclude and include list, the proxy will only
+/// be used if it was included because of a more specific rule than it was
+/// excluded. In the above example, the proxy would be used for
+/// `ordinary.onion`, `matrix.myspecial.onion`, but not `hello.myspecial.onion`.
 #[derive(Clone, Default, Debug, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ProxyConfig {
@@ -42,9 +43,12 @@ impl ProxyConfig {
 	pub fn to_proxy(&self) -> Result<Option<Proxy>> {
 		Ok(match self.clone() {
 			ProxyConfig::None => None,
-            ProxyConfig::Global { url } => Some(Proxy::all(url)?),
+			ProxyConfig::Global {
+				url,
+			} => Some(Proxy::all(url)?),
 			ProxyConfig::ByDomain(proxies) => Some(Proxy::custom(move |url| {
-                proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching proxy
+				proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching
+				                                             // proxy
 			})),
 		})
 	}
@@ -66,7 +70,7 @@ impl PartialProxyConfig {
 		let mut excluded_because = None; // most specific reason it was excluded
 		if self.include.is_empty() {
 			// treat empty include list as `*`
-            included_because = Some(&WildCardedDomain::WildCard)
+			included_because = Some(&WildCardedDomain::WildCard);
 		}
 		for wc_domain in &self.include {
 			if wc_domain.matches(domain) {
@@ -85,7 +89,8 @@ impl PartialProxyConfig {
 			}
 		}
 		match (included_because, excluded_because) {
-            (Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url), // included for a more specific reason than excluded
+			(Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url), /* included for a more specific reason */
+			// than excluded
 			(Some(_), None) => Some(&self.url),
 			_ => None,
 		}
@@ -107,26 +112,26 @@ impl WildCardedDomain {
 			WildCardedDomain::Exact(d) => domain == d,
 		}
 	}
+
 	fn more_specific_than(&self, other: &Self) -> bool {
 		match (self, other) {
 			(WildCardedDomain::WildCard, WildCardedDomain::WildCard) => false,
 			(_, WildCardedDomain::WildCard) => true,
 			(WildCardedDomain::Exact(a), WildCardedDomain::WildCarded(_)) => other.matches(a),
-            (WildCardedDomain::WildCarded(a), WildCardedDomain::WildCarded(b)) => {
-                a != b && a.ends_with(b)
-            }
+			(WildCardedDomain::WildCarded(a), WildCardedDomain::WildCarded(b)) => a != b && a.ends_with(b),
 			_ => false,
 		}
 	}
 }
 impl std::str::FromStr for WildCardedDomain {
 	type Err = std::convert::Infallible;
+
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		// maybe do some domain validation?
 		Ok(if s.starts_with("*.") {
 			WildCardedDomain::WildCarded(s[1..].to_owned())
 		} else if s == "*" {
-            WildCardedDomain::WildCarded("".to_owned())
+			WildCardedDomain::WildCarded(String::new())
 		} else {
 			WildCardedDomain::Exact(s.to_owned())
 		})
@@ -1,63 +0,0 @@
-use super::Config;
-use crate::Result;
-
-use std::{future::Future, pin::Pin, sync::Arc};
-
-#[cfg(feature = "sqlite")]
-pub mod sqlite;
-
-#[cfg(feature = "rocksdb")]
-pub(crate) mod rocksdb;
-
-#[cfg(any(feature = "sqlite", feature = "rocksdb"))]
-pub(crate) mod watchers;
-
-pub(crate) trait KeyValueDatabaseEngine: Send + Sync {
-    fn open(config: &Config) -> Result<Self>
-    where
-        Self: Sized;
-    fn open_tree(&self, name: &'static str) -> Result<Arc<dyn KvTree>>;
-    fn flush(&self) -> Result<()>;
-    fn cleanup(&self) -> Result<()> {
-        Ok(())
-    }
-    fn memory_usage(&self) -> Result<String> {
-        Ok("Current database engine does not support memory usage reporting.".to_owned())
-    }
-    fn clear_caches(&self) {}
-}
-
-pub(crate) trait KvTree: Send + Sync {
-    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>>;
-
-    fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;
-    fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;
-
-    fn remove(&self, key: &[u8]) -> Result<()>;
-
-    fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
-
-    fn iter_from<'a>(
-        &'a self,
-        from: &[u8],
-        backwards: bool,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
-
-    fn increment(&self, key: &[u8]) -> Result<Vec<u8>>;
-    fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;
-
-    fn scan_prefix<'a>(
-        &'a self,
-        prefix: Vec<u8>,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
-
-    fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>>;
-
-    fn clear(&self) -> Result<()> {
-        for (key, _) in self.iter() {
-            self.remove(&key)?;
-        }
-
-        Ok(())
-    }
-}
@@ -1,282 +0,0 @@
-use super::{super::Config, watchers::Watchers, KeyValueDatabaseEngine, KvTree};
-use crate::{utils, Result};
-use std::{
-    future::Future,
-    pin::Pin,
-    sync::{Arc, RwLock},
-};
-
-use rocksdb::LogLevel::{Debug, Error, Fatal, Info, Warn};
-use tracing::{debug, info};
-
-pub(crate) struct Engine {
-    rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
-    cache: rocksdb::Cache,
-    old_cfs: Vec<String>,
-    config: Config,
-}
-
-struct RocksDbEngineTree<'a> {
-    db: Arc<Engine>,
-    name: &'a str,
-    watchers: Watchers,
-    write_lock: RwLock<()>,
-}
-
-fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Options {
-    // block-based options: https://docs.rs/rocksdb/latest/rocksdb/struct.BlockBasedOptions.html#
-    let mut block_based_options = rocksdb::BlockBasedOptions::default();
-
-    block_based_options.set_block_cache(rocksdb_cache);
-
-    // "Difference of spinning disk"
-    // https://zhangyuchi.gitbooks.io/rocksdbbook/content/RocksDB-Tuning-Guide.html
-    block_based_options.set_block_size(64 * 1024);
-    block_based_options.set_cache_index_and_filter_blocks(true);
-
-    // database options: https://docs.rs/rocksdb/latest/rocksdb/struct.Options.html#
-    let mut db_opts = rocksdb::Options::default();
-
-    let rocksdb_log_level = match config.rocksdb_log_level.as_ref() {
-        "debug" => Debug,
-        "info" => Info,
-        "warn" => Warn,
-        "error" => Error,
-        "fatal" => Fatal,
-        _ => Warn,
-    };
-
-    db_opts.set_log_level(rocksdb_log_level);
-    db_opts.set_max_log_file_size(config.rocksdb_max_log_file_size);
-    db_opts.set_log_file_time_to_roll(config.rocksdb_log_time_to_roll);
-
-    if config.rocksdb_optimize_for_spinning_disks {
-        // useful for hard drives but on literally any half-decent SSD this is not useful
-        // and the benefits of improved compaction based on up to date stats are good.
-        // current conduwut users have NVMe/SSDs.
-        db_opts.set_skip_stats_update_on_db_open(true);
-
-        db_opts.set_compaction_readahead_size(2 * 1024 * 1024); // default compaction_readahead_size is 0 which is good for SSDs
-        db_opts.set_target_file_size_base(256 * 1024 * 1024); // default target_file_size is 64MB which is good for SSDs
-        db_opts.set_optimize_filters_for_hits(true); // doesn't really seem useful for fast storage
-    } else {
-        db_opts.set_skip_stats_update_on_db_open(false);
-        db_opts.set_max_bytes_for_level_base(512 * 1024 * 1024);
-        db_opts.set_use_direct_reads(true);
-        db_opts.set_use_direct_io_for_flush_and_compaction(true);
-    }
-
-    db_opts.set_block_based_table_factory(&block_based_options);
-    db_opts.set_level_compaction_dynamic_level_bytes(true);
-    db_opts.create_if_missing(true);
-    db_opts.increase_parallelism(num_cpus::get() as i32);
-    //db_opts.set_max_open_files(config.rocksdb_max_open_files);
-    db_opts.set_compression_type(rocksdb::DBCompressionType::Zstd);
-    db_opts.set_compaction_style(rocksdb::DBCompactionStyle::Level);
-    db_opts.optimize_level_style_compaction(10 * 1024 * 1024);
-
-    // https://github.com/facebook/rocksdb/wiki/Setup-Options-and-Basic-Tuning
-    db_opts.set_max_background_jobs(6);
-    db_opts.set_bytes_per_sync(1048576);
-
-    // https://github.com/facebook/rocksdb/wiki/WAL-Recovery-Modes#ktoleratecorruptedtailrecords
-    //
-    // Unclean shutdowns of a Matrix homeserver are likely to be fine when
-    // recovered in this manner as it's likely any lost information will be
-    // restored via federation.
-    db_opts.set_wal_recovery_mode(rocksdb::DBRecoveryMode::TolerateCorruptedTailRecords);
-
-    let prefix_extractor = rocksdb::SliceTransform::create_fixed_prefix(1);
-    db_opts.set_prefix_extractor(prefix_extractor);
-
-    db_opts
-}
-
-impl KeyValueDatabaseEngine for Arc<Engine> {
-    fn open(config: &Config) -> Result<Self> {
-        let cache_capacity_bytes = (config.db_cache_capacity_mb * 1024.0 * 1024.0) as usize;
-        let rocksdb_cache = rocksdb::Cache::new_lru_cache(cache_capacity_bytes);
-
-        let db_opts = db_options(&rocksdb_cache, config);
-
-        debug!("Listing column families in database");
-        let cfs = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::list_cf(
-            &db_opts,
-            &config.database_path,
-        )
-        .unwrap_or_default();
-
-        debug!("Opening column family descriptors in database");
-        info!("RocksDB database compaction will take place now, a delay in startup is expected");
-        let db = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::open_cf_descriptors(
-            &db_opts,
-            &config.database_path,
-            cfs.iter().map(|name| {
-                rocksdb::ColumnFamilyDescriptor::new(name, db_options(&rocksdb_cache, config))
-            }),
-        )?;
-
-        Ok(Arc::new(Engine {
-            rocks: db,
-            cache: rocksdb_cache,
-            old_cfs: cfs,
-            config: config.clone(),
-        }))
-    }
-
-    fn open_tree(&self, name: &'static str) -> Result<Arc<dyn KvTree>> {
-        if !self.old_cfs.contains(&name.to_owned()) {
-            // Create if it didn't exist
-            debug!("Creating new column family in database: {}", name);
-            let _ = self
-                .rocks
-                .create_cf(name, &db_options(&self.cache, &self.config));
-        }
-
-        Ok(Arc::new(RocksDbEngineTree {
-            name,
-            db: Arc::clone(self),
-            watchers: Watchers::default(),
-            write_lock: RwLock::new(()),
-        }))
-    }
-
-    fn flush(&self) -> Result<()> {
-        // TODO?
-        Ok(())
-    }
-
-    fn memory_usage(&self) -> Result<String> {
-        let stats =
-            rocksdb::perf::get_memory_usage_stats(Some(&[&self.rocks]), Some(&[&self.cache]))?;
-        Ok(format!(
-            "Approximate memory usage of all the mem-tables: {:.3} MB\n\
-             Approximate memory usage of un-flushed mem-tables: {:.3} MB\n\
-             Approximate memory usage of all the table readers: {:.3} MB\n\
-             Approximate memory usage by cache: {:.3} MB\n\
-             Approximate memory usage by cache pinned: {:.3} MB\n\
-             ",
-            stats.mem_table_total as f64 / 1024.0 / 1024.0,
-            stats.mem_table_unflushed as f64 / 1024.0 / 1024.0,
-            stats.mem_table_readers_total as f64 / 1024.0 / 1024.0,
-            stats.cache_total as f64 / 1024.0 / 1024.0,
-            self.cache.get_pinned_usage() as f64 / 1024.0 / 1024.0,
-        ))
-    }
-
-    fn clear_caches(&self) {}
-}
-
-impl RocksDbEngineTree<'_> {
-    fn cf(&self) -> Arc<rocksdb::BoundColumnFamily<'_>> {
-        self.db.rocks.cf_handle(self.name).unwrap()
-    }
-}
-
-impl KvTree for RocksDbEngineTree<'_> {
-    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        Ok(self.db.rocks.get_cf(&self.cf(), key)?)
-    }
-
-    fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
-        let lock = self.write_lock.read().unwrap();
-        self.db.rocks.put_cf(&self.cf(), key, value)?;
-        drop(lock);
-
-        self.watchers.wake(key);
-
-        Ok(())
-    }
-
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
-        for (key, value) in iter {
-            self.db.rocks.put_cf(&self.cf(), key, value)?;
-        }
-
-        Ok(())
-    }
-
-    fn remove(&self, key: &[u8]) -> Result<()> {
-        Ok(self.db.rocks.delete_cf(&self.cf(), key)?)
-    }
-
-    fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
-        Box::new(
-            self.db
-                .rocks
-                .iterator_cf(&self.cf(), rocksdb::IteratorMode::Start)
-                .map(|r| r.unwrap())
-                .map(|(k, v)| (Vec::from(k), Vec::from(v))),
-        )
-    }
-
-    fn iter_from<'a>(
-        &'a self,
-        from: &[u8],
-        backwards: bool,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
-        Box::new(
-            self.db
-                .rocks
-                .iterator_cf(
-                    &self.cf(),
-                    rocksdb::IteratorMode::From(
-                        from,
-                        if backwards {
-                            rocksdb::Direction::Reverse
-                        } else {
-                            rocksdb::Direction::Forward
-                        },
-                    ),
-                )
-                .map(|r| r.unwrap())
-                .map(|(k, v)| (Vec::from(k), Vec::from(v))),
-        )
-    }
-
-    fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
-        let lock = self.write_lock.write().unwrap();
-
-        let old = self.db.rocks.get_cf(&self.cf(), key)?;
-        let new = utils::increment(old.as_deref()).unwrap();
-        self.db.rocks.put_cf(&self.cf(), key, &new)?;
-
-        drop(lock);
-        Ok(new)
-    }
-
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
-        let lock = self.write_lock.write().unwrap();
-
-        for key in iter {
-            let old = self.db.rocks.get_cf(&self.cf(), &key)?;
-            let new = utils::increment(old.as_deref()).unwrap();
-            self.db.rocks.put_cf(&self.cf(), key, new)?;
-        }
-
-        drop(lock);
-
-        Ok(())
-    }
-
-    fn scan_prefix<'a>(
-        &'a self,
-        prefix: Vec<u8>,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
-        Box::new(
-            self.db
-                .rocks
-                .iterator_cf(
-                    &self.cf(),
-                    rocksdb::IteratorMode::From(&prefix, rocksdb::Direction::Forward),
-                )
-                .map(|r| r.unwrap())
-                .map(|(k, v)| (Vec::from(k), Vec::from(v)))
-                .take_while(move |(k, _)| k.starts_with(&prefix)),
-        )
-    }
-
-    fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        self.watchers.watch(prefix)
-    }
-}
@@ -1,340 +0,0 @@
-use super::{watchers::Watchers, KeyValueDatabaseEngine, KvTree};
-use crate::{database::Config, Result};
-use parking_lot::{Mutex, MutexGuard};
-use rusqlite::{Connection, DatabaseName::Main, OptionalExtension};
-use std::{
-    cell::RefCell,
-    future::Future,
-    path::{Path, PathBuf},
-    pin::Pin,
-    sync::Arc,
-};
-use thread_local::ThreadLocal;
-use tracing::debug;
-
-thread_local! {
-    static READ_CONNECTION: RefCell<Option<&'static Connection>> = RefCell::new(None);
-    static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = RefCell::new(None);
-}
-
-struct PreparedStatementIterator<'a> {
-    pub iterator: Box<dyn Iterator<Item = TupleOfBytes> + 'a>,
-    pub _statement_ref: NonAliasingBox<rusqlite::Statement<'a>>,
-}
-
-impl Iterator for PreparedStatementIterator<'_> {
-    type Item = TupleOfBytes;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iterator.next()
-    }
-}
-
-struct NonAliasingBox<T>(*mut T);
-impl<T> Drop for NonAliasingBox<T> {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = Box::from_raw(self.0);
-        };
-    }
-}
-
-pub struct Engine {
-    writer: Mutex<Connection>,
-    read_conn_tls: ThreadLocal<Connection>,
-    read_iterator_conn_tls: ThreadLocal<Connection>,
-
-    path: PathBuf,
-    cache_size_per_thread: u32,
-}
-
-impl Engine {
-    fn prepare_conn(path: &Path, cache_size_kb: u32) -> Result<Connection> {
-        let conn = Connection::open(path)?;
-
-        conn.pragma_update(Some(Main), "page_size", 2048)?;
-        conn.pragma_update(Some(Main), "journal_mode", "WAL")?;
-        conn.pragma_update(Some(Main), "synchronous", "NORMAL")?;
-        conn.pragma_update(Some(Main), "cache_size", -i64::from(cache_size_kb))?;
-        conn.pragma_update(Some(Main), "wal_autocheckpoint", 0)?;
-
-        Ok(conn)
-    }
-
-    fn write_lock(&self) -> MutexGuard<'_, Connection> {
-        self.writer.lock()
-    }
-
-    fn read_lock(&self) -> &Connection {
-        self.read_conn_tls
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
-    }
-
-    fn read_lock_iterator(&self) -> &Connection {
-        self.read_iterator_conn_tls
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
-    }
-
-    pub fn flush_wal(self: &Arc<Self>) -> Result<()> {
-        self.write_lock()
-            .pragma_update(Some(Main), "wal_checkpoint", "RESTART")?;
-        Ok(())
-    }
-}
-
-impl KeyValueDatabaseEngine for Arc<Engine> {
-    fn open(config: &Config) -> Result<Self> {
-        let path = Path::new(&config.database_path).join("conduit.db");
-
-        // calculates cache-size per permanent connection
-        // 1. convert MB to KiB
-        // 2. divide by permanent connections + permanent iter connections + write connection
-        // 3. round down to nearest integer
-        let cache_size_per_thread: u32 = ((config.db_cache_capacity_mb * 1024.0)
-            / ((num_cpus::get().max(1) * 2) + 1) as f64)
-            as u32;
-
-        let writer = Mutex::new(Engine::prepare_conn(&path, cache_size_per_thread)?);
-
-        let arc = Arc::new(Engine {
-            writer,
-            read_conn_tls: ThreadLocal::new(),
-            read_iterator_conn_tls: ThreadLocal::new(),
-            path,
-            cache_size_per_thread,
-        });
-
-        Ok(arc)
-    }
-
-    fn open_tree(&self, name: &str) -> Result<Arc<dyn KvTree>> {
-        self.write_lock().execute(&format!("CREATE TABLE IF NOT EXISTS {name} ( \"key\" BLOB PRIMARY KEY, \"value\" BLOB NOT NULL )"), [])?;
-
-        Ok(Arc::new(SqliteTable {
-            engine: Arc::clone(self),
-            name: name.to_owned(),
-            watchers: Watchers::default(),
-        }))
-    }
-
-    fn flush(&self) -> Result<()> {
-        // we enabled PRAGMA synchronous=normal, so this should not be necessary
-        Ok(())
-    }
-
-    fn cleanup(&self) -> Result<()> {
-        self.flush_wal()
-    }
-}
-
-pub struct SqliteTable {
-    engine: Arc<Engine>,
-    name: String,
-    watchers: Watchers,
-}
-
-type TupleOfBytes = (Vec<u8>, Vec<u8>);
-
-impl SqliteTable {
-    fn get_with_guard(&self, guard: &Connection, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        Ok(guard
-            .prepare(format!("SELECT value FROM {} WHERE key = ?", self.name).as_str())?
-            .query_row([key], |row| row.get(0))
-            .optional()?)
-    }
-
-    fn insert_with_guard(&self, guard: &Connection, key: &[u8], value: &[u8]) -> Result<()> {
-        guard.execute(
-            format!(
-                "INSERT OR REPLACE INTO {} (key, value) VALUES (?, ?)",
-                self.name
-            )
-            .as_str(),
-            [key, value],
-        )?;
-        Ok(())
-    }
-
-    pub fn iter_with_guard<'a>(
-        &'a self,
-        guard: &'a Connection,
-    ) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        let statement = Box::leak(Box::new(
-            guard
-                .prepare(&format!(
-                    "SELECT key, value FROM {} ORDER BY key ASC",
-                    &self.name
-                ))
-                .unwrap(),
-        ));
-
-        let statement_ref = NonAliasingBox(statement);
-
-        //let name = self.name.clone();
-
-        let iterator = Box::new(
-            statement
-                .query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
-                .unwrap()
-                .map(move |r| r.unwrap()),
-        );
-
-        Box::new(PreparedStatementIterator {
-            iterator,
-            _statement_ref: statement_ref,
-        })
-    }
-}
-
-impl KvTree for SqliteTable {
-    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        self.get_with_guard(self.engine.read_lock(), key)
-    }
-
-    fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
-        let guard = self.engine.write_lock();
-        self.insert_with_guard(&guard, key, value)?;
-        drop(guard);
-        self.watchers.wake(key);
-        Ok(())
-    }
-
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
-        let guard = self.engine.write_lock();
-
-        guard.execute("BEGIN", [])?;
-        for (key, value) in iter {
-            self.insert_with_guard(&guard, &key, &value)?;
-        }
-        guard.execute("COMMIT", [])?;
-
-        drop(guard);
-
-        Ok(())
-    }
-
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
-        let guard = self.engine.write_lock();
-
-        guard.execute("BEGIN", [])?;
-        for key in iter {
-            let old = self.get_with_guard(&guard, &key)?;
-            let new = crate::utils::increment(old.as_deref())
-                .expect("utils::increment always returns Some");
-            self.insert_with_guard(&guard, &key, &new)?;
-        }
-        guard.execute("COMMIT", [])?;
-
-        drop(guard);
-
-        Ok(())
-    }
-
-    fn remove(&self, key: &[u8]) -> Result<()> {
-        let guard = self.engine.write_lock();
-
-        guard.execute(
-            format!("DELETE FROM {} WHERE key = ?", self.name).as_str(),
-            [key],
-        )?;
-
-        Ok(())
-    }
-
-    fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        let guard = self.engine.read_lock_iterator();
-
-        self.iter_with_guard(guard)
-    }
-
-    fn iter_from<'a>(
-        &'a self,
-        from: &[u8],
-        backwards: bool,
-    ) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        let guard = self.engine.read_lock_iterator();
-        let from = from.to_vec(); // TODO change interface?
-
-        //let name = self.name.clone();
-
-        if backwards {
-            let statement = Box::leak(Box::new(
-                guard
-                    .prepare(&format!(
-                        "SELECT key, value FROM {} WHERE key <= ? ORDER BY key DESC",
-                        &self.name
-                    ))
-                    .unwrap(),
-            ));
-
-            let statement_ref = NonAliasingBox(statement);
-
-            let iterator = Box::new(
-                statement
-                    .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
-                    .unwrap()
-                    .map(move |r| r.unwrap()),
-            );
-            Box::new(PreparedStatementIterator {
-                iterator,
-                _statement_ref: statement_ref,
-            })
-        } else {
-            let statement = Box::leak(Box::new(
-                guard
-                    .prepare(&format!(
-                        "SELECT key, value FROM {} WHERE key >= ? ORDER BY key ASC",
-                        &self.name
-                    ))
-                    .unwrap(),
-            ));
-
-            let statement_ref = NonAliasingBox(statement);
-
-            let iterator = Box::new(
-                statement
-                    .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
-                    .unwrap()
-                    .map(move |r| r.unwrap()),
-            );
-
-            Box::new(PreparedStatementIterator {
-                iterator,
-                _statement_ref: statement_ref,
-            })
-        }
-    }
-
-    fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
-        let guard = self.engine.write_lock();
-
-        let old = self.get_with_guard(&guard, key)?;
-
-        let new =
-            crate::utils::increment(old.as_deref()).expect("utils::increment always returns Some");
-
-        self.insert_with_guard(&guard, key, &new)?;
-
-        Ok(new)
-    }
-
-    fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        Box::new(
-            self.iter_from(&prefix, false)
-                .take_while(move |(key, _)| key.starts_with(&prefix)),
-        )
-    }
-
-    fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        self.watchers.watch(prefix)
-    }
-
-    fn clear(&self) -> Result<()> {
-        debug!("clear: running");
-        self.engine
-            .write_lock()
-            .execute(format!("DELETE FROM {}", self.name).as_str(), [])?;
-        debug!("clear: ran");
-        Ok(())
-    }
-}
@@ -1,56 +0,0 @@
-use std::{
-    collections::{hash_map, HashMap},
-    future::Future,
-    pin::Pin,
-    sync::RwLock,
-};
-use tokio::sync::watch;
-
-type Watcher = RwLock<HashMap<Vec<u8>, (watch::Sender<()>, watch::Receiver<()>)>>;
-
-#[derive(Default)]
-pub(super) struct Watchers {
-    watchers: Watcher,
-}
-
-impl Watchers {
-    pub(super) fn watch<'a>(
-        &'a self,
-        prefix: &[u8],
-    ) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        let mut rx = match self.watchers.write().unwrap().entry(prefix.to_vec()) {
-            hash_map::Entry::Occupied(o) => o.get().1.clone(),
-            hash_map::Entry::Vacant(v) => {
-                let (tx, rx) = tokio::sync::watch::channel(());
-                v.insert((tx, rx.clone()));
-                rx
-            }
-        };
-
-        Box::pin(async move {
-            // Tx is never destroyed
-            rx.changed().await.unwrap();
-        })
-    }
-    pub(super) fn wake(&self, key: &[u8]) {
-        let watchers = self.watchers.read().unwrap();
-        let mut triggered = Vec::new();
-
-        for length in 0..=key.len() {
-            if watchers.contains_key(&key[..length]) {
-                triggered.push(&key[..length]);
-            }
-        }
-
-        drop(watchers);
-
-        if !triggered.is_empty() {
-            let mut watchers = self.watchers.write().unwrap();
-            for prefix in triggered {
-                if let Some(tx) = watchers.remove(prefix) {
-                    let _ = tx.0.send(());
-                }
-            }
-        };
-    }
-}
@@ -0,0 +1,32 @@
+use std::sync::Arc;
+
+use super::KeyValueDatabaseEngine;
+
+pub struct Cork {
+	db: Arc<dyn KeyValueDatabaseEngine>,
+	flush: bool,
+	sync: bool,
+}
+
+impl Cork {
+	pub(crate) fn new(db: &Arc<dyn KeyValueDatabaseEngine>, flush: bool, sync: bool) -> Self {
+		db.cork().unwrap();
+		Cork {
+			db: db.clone(),
+			flush,
+			sync,
+		}
+	}
+}
+
+impl Drop for Cork {
+	fn drop(&mut self) {
+		self.db.uncork().ok();
+		if self.flush {
+			self.db.flush().ok();
+		}
+		if self.sync {
+			self.db.sync().ok();
+		}
+	}
+}
@@ -11,27 +11,25 @@ use tracing::warn;
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};

 impl service::account_data::Data for KeyValueDatabase {
-    /// Places one event in the account data of the user and removes the previous entry.
+	/// Places one event in the account data of the user and removes the
+	/// previous entry.
 	#[tracing::instrument(skip(self, room_id, user_id, event_type, data))]
 	fn update(
-        &self,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        event_type: RoomAccountDataEventType,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, event_type: RoomAccountDataEventType,
 		data: &serde_json::Value,
 	) -> Result<()> {
 		let mut prefix = room_id
-            .map(|r| r.to_string())
+			.map(ToString::to_string)
 			.unwrap_or_default()
 			.as_bytes()
 			.to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(user_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);

 		let mut roomuserdataid = prefix.clone();
 		roomuserdataid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
-        roomuserdataid.push(0xff);
+		roomuserdataid.push(0xFF);
 		roomuserdataid.extend_from_slice(event_type.to_string().as_bytes());

 		let mut key = prefix;
@@ -65,19 +63,16 @@ impl service::account_data::Data for KeyValueDatabase {
 	/// Searches the account data for a specific kind.
 	#[tracing::instrument(skip(self, room_id, user_id, kind))]
 	fn get(
-        &self,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        kind: RoomAccountDataEventType,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, kind: RoomAccountDataEventType,
 	) -> Result<Option<Box<serde_json::value::RawValue>>> {
 		let mut key = room_id
-            .map(|r| r.to_string())
+			.map(ToString::to_string)
 			.unwrap_or_default()
 			.as_bytes()
 			.to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(kind.to_string().as_bytes());

 		self.roomusertype_roomuserdataid
@@ -88,31 +83,25 @@ impl service::account_data::Data for KeyValueDatabase {
 					.transpose()
 			})
 			.transpose()?
-            .map(|data| {
-                serde_json::from_slice(&data)
-                    .map_err(|_| Error::bad_database("could not deserialize"))
-            })
+			.map(|data| serde_json::from_slice(&data).map_err(|_| Error::bad_database("could not deserialize")))
 			.transpose()
 	}

 	/// Returns all changes to the account data that happened after `since`.
 	#[tracing::instrument(skip(self, room_id, user_id, since))]
 	fn changes_since(
-        &self,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        since: u64,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, since: u64,
 	) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {
 		let mut userdata = HashMap::new();

 		let mut prefix = room_id
-            .map(|r| r.to_string())
+			.map(ToString::to_string)
 			.unwrap_or_default()
 			.as_bytes()
 			.to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(user_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);

 		// Skip the data that's exactly at since, because we sent that last time
 		let mut first_possible = prefix.clone();
@@ -125,20 +114,20 @@ impl service::account_data::Data for KeyValueDatabase {
 			.map(|(k, v)| {
 				Ok::<_, Error>((
 					RoomAccountDataEventType::from(
-                        utils::string_from_bytes(k.rsplit(|&b| b == 0xff).next().ok_or_else(
-                            || Error::bad_database("RoomUserData ID in db is invalid."),
-                        )?)
+						utils::string_from_bytes(
+							k.rsplit(|&b| b == 0xFF)
+								.next()
+								.ok_or_else(|| Error::bad_database("RoomUserData ID in db is invalid."))?,
+						)
 						.map_err(|e| {
 							warn!("RoomUserData ID in database is invalid: {}", e);
 							Error::bad_database("RoomUserData ID in db is invalid.")
 						})?,
 					),
-                    serde_json::from_slice::<Raw<AnyEphemeralRoomEvent>>(&v).map_err(|_| {
-                        Error::bad_database("Database contains invalid account data.")
-                    })?,
+					serde_json::from_slice::<Raw<AnyEphemeralRoomEvent>>(&v)
+						.map_err(|_| Error::bad_database("Database contains invalid account data."))?,
 				))
-            })
-        {
+			}) {
 			let (kind, data) = r?;
 			userdata.insert(kind, data);
 		}
@@ -6,14 +6,8 @@ impl service::appservice::Data for KeyValueDatabase {
 	/// Registers an appservice and returns the ID to the caller
 	fn register_appservice(&self, yaml: Registration) -> Result<String> {
 		let id = yaml.id.as_str();
-        self.id_appserviceregistrations.insert(
-            id.as_bytes(),
-            serde_yaml::to_string(&yaml).unwrap().as_bytes(),
-        )?;
-        self.cached_registrations
-            .write()
-            .unwrap()
-            .insert(id.to_owned(), yaml.to_owned());
+		self.id_appserviceregistrations
+			.insert(id.as_bytes(), serde_yaml::to_string(&yaml).unwrap().as_bytes())?;

 		Ok(id.to_owned())
 	}
@@ -26,48 +20,29 @@ impl service::appservice::Data for KeyValueDatabase {
 	fn unregister_appservice(&self, service_name: &str) -> Result<()> {
 		self.id_appserviceregistrations
 			.remove(service_name.as_bytes())?;
-        self.cached_registrations
-            .write()
-            .unwrap()
-            .remove(service_name);
 		Ok(())
 	}

 	fn get_registration(&self, id: &str) -> Result<Option<Registration>> {
-        self.cached_registrations
-            .read()
-            .unwrap()
-            .get(id)
-            .map_or_else(
-                || {
 		self.id_appserviceregistrations
 			.get(id.as_bytes())?
 			.map(|bytes| {
-                            serde_yaml::from_slice(&bytes).map_err(|_| {
-                                Error::bad_database(
-                                    "Invalid registration bytes in id_appserviceregistrations.",
-                                )
-                            })
+				serde_yaml::from_slice(&bytes)
+					.map_err(|_| Error::bad_database("Invalid registration bytes in id_appserviceregistrations."))
 			})
 			.transpose()
-                },
-                |r| Ok(Some(r.clone())),
-            )
 	}

 	fn iter_ids<'a>(&'a self) -> Result<Box<dyn Iterator<Item = Result<String>> + 'a>> {
-        Ok(Box::new(self.id_appserviceregistrations.iter().map(
-            |(id, _)| {
-                utils::string_from_bytes(&id).map_err(|_| {
-                    Error::bad_database("Invalid id bytes in id_appserviceregistrations.")
-                })
-            },
-        )))
+		Ok(Box::new(self.id_appserviceregistrations.iter().map(|(id, _)| {
+			utils::string_from_bytes(&id)
+				.map_err(|_| Error::bad_database("Invalid id bytes in id_appserviceregistrations."))
+		})))
 	}

 	fn all(&self) -> Result<Vec<(String, Registration)>> {
 		self.iter_ids()?
-            .filter_map(|id| id.ok())
+			.filter_map(Result::ok)
 			.map(move |id| {
 				Ok((
 					id.clone(),
@@ -9,7 +9,10 @@ use ruma::{
 	DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, UserId,
 };

-use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
+use crate::{
+	database::{Cork, KeyValueDatabase},
+	service, services, utils, Error, Result,
+};

 const COUNTER: &[u8] = b"c";
 const LAST_CHECK_FOR_UPDATES_COUNT: &[u8] = b"u";
@@ -23,8 +26,7 @@ impl service::globals::Data for KeyValueDatabase {

 	fn current_count(&self) -> Result<u64> {
 		self.global.get(COUNTER)?.map_or(Ok(0_u64), |bytes| {
-            utils::u64_from_bytes(&bytes)
-                .map_err(|_| Error::bad_database("Count has invalid bytes."))
+			utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Count has invalid bytes."))
 		})
 	}

@@ -32,9 +34,8 @@ impl service::globals::Data for KeyValueDatabase {
 		self.global
 			.get(LAST_CHECK_FOR_UPDATES_COUNT)?
 			.map_or(Ok(0_u64), |bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
-                    Error::bad_database("last check for updates count has invalid bytes.")
-                })
+				utils::u64_from_bytes(&bytes)
+					.map_err(|_| Error::bad_database("last check for updates count has invalid bytes."))
 			})
 	}

@@ -45,18 +46,19 @@ impl service::globals::Data for KeyValueDatabase {
 		Ok(())
 	}

+	#[allow(unused_qualifications)] // async traits
 	async fn watch(&self, user_id: &UserId, device_id: &DeviceId) -> Result<()> {
 		let userid_bytes = user_id.as_bytes().to_vec();
 		let mut userid_prefix = userid_bytes.clone();
-        userid_prefix.push(0xff);
+		userid_prefix.push(0xFF);

 		let mut userdeviceid_prefix = userid_prefix.clone();
 		userdeviceid_prefix.extend_from_slice(device_id.as_bytes());
-        userdeviceid_prefix.push(0xff);
+		userdeviceid_prefix.push(0xFF);

 		let mut futures = FuturesUnordered::new();

-        // Return when *any* user changed his key
+		// Return when *any* user changed their key
 		// TODO: only send for user they share a room with
 		futures.push(self.todeviceid_events.watch_prefix(&userdeviceid_prefix));

@@ -74,7 +76,7 @@ impl service::globals::Data for KeyValueDatabase {
 			.rooms
 			.state_cache
 			.rooms_joined(user_id)
-            .filter_map(|r| r.ok())
+			.filter_map(Result::ok)
 		{
 			let short_roomid = services()
 				.rooms
@@ -88,13 +90,15 @@ impl service::globals::Data for KeyValueDatabase {

 			let roomid_bytes = room_id.as_bytes().to_vec();
 			let mut roomid_prefix = roomid_bytes.clone();
-            roomid_prefix.push(0xff);
+			roomid_prefix.push(0xFF);

 			// PDUs
 			futures.push(self.pduid_pdu.watch_prefix(&short_roomid));

 			// EDUs
-            futures.push(self.roomid_lasttypingupdate.watch_prefix(&roomid_bytes));
+			futures.push(Box::pin(async move {
+				let _result = services().rooms.typing.wait_for_update(&room_id).await;
+			}));

 			futures.push(self.readreceiptid_readreceipt.watch_prefix(&roomid_prefix));

@@ -111,7 +115,7 @@ impl service::globals::Data for KeyValueDatabase {
 			);
 		}

-        let mut globaluserdata_prefix = vec![0xff];
+		let mut globaluserdata_prefix = vec![0xFF];
 		globaluserdata_prefix.extend_from_slice(&userid_prefix);

 		futures.push(
@@ -133,32 +137,35 @@ impl service::globals::Data for KeyValueDatabase {
 		Ok(())
 	}

-    fn cleanup(&self) -> Result<()> {
-        self._db.cleanup()
-    }
+	fn cleanup(&self) -> Result<()> { self.db.cleanup() }
+
+	fn flush(&self) -> Result<()> { self.db.flush() }
+
+	fn cork(&self) -> Result<Cork> { Ok(Cork::new(&self.db, false, false)) }
+
+	fn cork_and_flush(&self) -> Result<Cork> { Ok(Cork::new(&self.db, true, false)) }
+
+	fn cork_and_sync(&self) -> Result<Cork> { Ok(Cork::new(&self.db, true, true)) }

 	fn memory_usage(&self) -> String {
-        let pdu_cache = self.pdu_cache.lock().unwrap().len();
-        let shorteventid_cache = self.shorteventid_cache.lock().unwrap().len();
 		let auth_chain_cache = self.auth_chain_cache.lock().unwrap().len();
-        let eventidshort_cache = self.eventidshort_cache.lock().unwrap().len();
-        let statekeyshort_cache = self.statekeyshort_cache.lock().unwrap().len();
 		let our_real_users_cache = self.our_real_users_cache.read().unwrap().len();
 		let appservice_in_room_cache = self.appservice_in_room_cache.read().unwrap().len();
 		let lasttimelinecount_cache = self.lasttimelinecount_cache.lock().unwrap().len();

+		let max_auth_chain_cache = self.auth_chain_cache.lock().unwrap().capacity();
+		let max_our_real_users_cache = self.our_real_users_cache.read().unwrap().capacity();
+		let max_appservice_in_room_cache = self.appservice_in_room_cache.read().unwrap().capacity();
+		let max_lasttimelinecount_cache = self.lasttimelinecount_cache.lock().unwrap().capacity();
+
 		let mut response = format!(
 			"\
-pdu_cache: {pdu_cache}
-shorteventid_cache: {shorteventid_cache}
-auth_chain_cache: {auth_chain_cache}
-eventidshort_cache: {eventidshort_cache}
-statekeyshort_cache: {statekeyshort_cache}
-our_real_users_cache: {our_real_users_cache}
-appservice_in_room_cache: {appservice_in_room_cache}
-lasttimelinecount_cache: {lasttimelinecount_cache}\n"
+auth_chain_cache: {auth_chain_cache} / {max_auth_chain_cache}
+our_real_users_cache: {our_real_users_cache} / {max_our_real_users_cache}
+appservice_in_room_cache: {appservice_in_room_cache} / {max_appservice_in_room_cache}
+lasttimelinecount_cache: {lasttimelinecount_cache} / {max_lasttimelinecount_cache}\n\n"
 		);
-        if let Ok(db_stats) = self._db.memory_usage() {
+		if let Ok(db_stats) = self.db.memory_usage() {
 			response += &db_stats;
 		}

@@ -166,35 +173,19 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 	}

 	fn clear_caches(&self, amount: u32) {
-        if amount > 0 {
-            let c = &mut *self.pdu_cache.lock().unwrap();
-            *c = LruCache::new(c.capacity());
-        }
 		if amount > 1 {
-            let c = &mut *self.shorteventid_cache.lock().unwrap();
-            *c = LruCache::new(c.capacity());
-        }
-        if amount > 2 {
 			let c = &mut *self.auth_chain_cache.lock().unwrap();
 			*c = LruCache::new(c.capacity());
 		}
-        if amount > 3 {
-            let c = &mut *self.eventidshort_cache.lock().unwrap();
-            *c = LruCache::new(c.capacity());
-        }
-        if amount > 4 {
-            let c = &mut *self.statekeyshort_cache.lock().unwrap();
-            *c = LruCache::new(c.capacity());
-        }
-        if amount > 5 {
+		if amount > 2 {
 			let c = &mut *self.our_real_users_cache.write().unwrap();
 			*c = HashMap::new();
 		}
-        if amount > 6 {
+		if amount > 3 {
 			let c = &mut *self.appservice_in_room_cache.write().unwrap();
 			*c = HashMap::new();
 		}
-        if amount > 7 {
+		if amount > 4 {
 			let c = &mut *self.lasttimelinecount_cache.lock().unwrap();
 			*c = HashMap::new();
 		}
@@ -207,10 +198,10 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 				self.global.insert(b"keypair", &keypair)?;
 				Ok::<_, Error>(keypair)
 			},
-            |s| Ok(s.to_vec()),
+			Ok,
 		)?;

-        let mut parts = keypair_bytes.splitn(2, |&b| b == 0xff);
+		let mut parts = keypair_bytes.splitn(2, |&b| b == 0xFF);

 		utils::string_from_bytes(
 			// 1. version
@@ -231,14 +222,11 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 				.map_err(|_| Error::bad_database("Private or public keys are invalid."))
 		})
 	}
-    fn remove_keypair(&self) -> Result<()> {
-        self.global.remove(b"keypair")
-    }
+
+	fn remove_keypair(&self) -> Result<()> { self.global.remove(b"keypair") }

 	fn add_signing_key(
-        &self,
-        origin: &ServerName,
-        new_keys: ServerSigningKeys,
+		&self, origin: &ServerName, new_keys: ServerSigningKeys,
 	) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
 		// Not atomic, but this is not critical
 		let signingkeys = self.server_signingkeys.get(origin.as_bytes())?;
@@ -274,16 +262,14 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 		Ok(tree)
 	}

-    /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found for the server.
-    fn signing_keys_for(
-        &self,
-        origin: &ServerName,
-    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+	/// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
+	/// for the server.
+	fn signing_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
 		let signingkeys = self
 			.server_signingkeys
 			.get(origin.as_bytes())?
 			.and_then(|bytes| serde_json::from_slice(&bytes).ok())
-            .map(|keys: ServerSigningKeys| {
+			.map_or_else(BTreeMap::new, |keys: ServerSigningKeys| {
 				let mut tree = keys.verify_keys;
 				tree.extend(
 					keys.old_verify_keys
@@ -291,16 +277,14 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 						.map(|old| (old.0, VerifyKey::new(old.1.key))),
 				);
 				tree
-            })
-            .unwrap_or_else(BTreeMap::new);
+			});

 		Ok(signingkeys)
 	}

 	fn database_version(&self) -> Result<u64> {
 		self.global.get(b"version")?.map_or(Ok(0), |version| {
-            utils::u64_from_bytes(&version)
-                .map_err(|_| Error::bad_database("Database version id is invalid."))
+			utils::u64_from_bytes(&version).map_err(|_| Error::bad_database("Database version id is invalid."))
 		})
 	}

@@ -308,4 +292,10 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 		self.global.insert(b"version", &new_version.to_be_bytes())?;
 		Ok(())
 	}
+
+	fn backup(&self) -> Result<(), Box<dyn std::error::Error>> { self.db.backup() }
+
+	fn backup_list(&self) -> Result<String> { self.db.backup_list() }
+
+	fn file_list(&self) -> Result<String> { self.db.file_list() }
 }
@@ -12,15 +12,11 @@ use ruma::{
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};

 impl service::key_backups::Data for KeyValueDatabase {
-    fn create_backup(
-        &self,
-        user_id: &UserId,
-        backup_metadata: &Raw<BackupAlgorithm>,
-    ) -> Result<String> {
+	fn create_backup(&self, user_id: &UserId, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
 		let version = services().globals.next_count()?.to_string();

 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		self.backupid_algorithm.insert(
@@ -34,13 +30,13 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		self.backupid_algorithm.remove(&key)?;
 		self.backupid_etag.remove(&key)?;

-        key.push(0xff);
+		key.push(0xFF);

 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -49,21 +45,13 @@ impl service::key_backups::Data for KeyValueDatabase {
 		Ok(())
 	}

-    fn update_backup(
-        &self,
-        user_id: &UserId,
-        version: &str,
-        backup_metadata: &Raw<BackupAlgorithm>,
-    ) -> Result<String> {
+	fn update_backup(&self, user_id: &UserId, version: &str, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		if self.backupid_algorithm.get(&key)?.is_none() {
-            return Err(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Tried to update nonexistent backup.",
-            ));
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
 		}

 		self.backupid_algorithm
@@ -75,7 +63,7 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		let mut last_possible_key = prefix.clone();
 		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());

@@ -85,7 +73,7 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.next()
 			.map(|(key, _)| {
 				utils::string_from_bytes(
-                    key.rsplit(|&b| b == 0xff)
+					key.rsplit(|&b| b == 0xFF)
 						.next()
 						.expect("rsplit always returns an element"),
 				)
@@ -94,12 +82,9 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.transpose()
 	}

-    fn get_latest_backup(
-        &self,
-        user_id: &UserId,
-    ) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
+	fn get_latest_backup(&self, user_id: &UserId) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		let mut last_possible_key = prefix.clone();
 		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());

@@ -109,7 +94,7 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.next()
 			.map(|(key, value)| {
 				let version = utils::string_from_bytes(
-                    key.rsplit(|&b| b == 0xff)
+					key.rsplit(|&b| b == 0xFF)
 						.next()
 						.expect("rsplit always returns an element"),
 				)
@@ -117,9 +102,8 @@ impl service::key_backups::Data for KeyValueDatabase {

 				Ok((
 					version,
-                    serde_json::from_slice(&value).map_err(|_| {
-                        Error::bad_database("Algorithm in backupid_algorithm is invalid.")
-                    })?,
+					serde_json::from_slice(&value)
+						.map_err(|_| Error::bad_database("Algorithm in backupid_algorithm is invalid."))?,
 				))
 			})
 			.transpose()
@@ -127,7 +111,7 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Option<Raw<BackupAlgorithm>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		self.backupid_algorithm
@@ -139,30 +123,22 @@ impl service::key_backups::Data for KeyValueDatabase {
 	}

 	fn add_key(
-        &self,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
-        key_data: &Raw<KeyBackupData>,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str, key_data: &Raw<KeyBackupData>,
 	) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		if self.backupid_algorithm.get(&key)?.is_none() {
-            return Err(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Tried to update nonexistent backup.",
-            ));
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
 		}

 		self.backupid_etag
 			.insert(&key, &services().globals.next_count()?.to_be_bytes())?;

-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());

 		self.backupkeyid_backup
@@ -173,7 +149,7 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn count_keys(&self, user_id: &UserId, version: &str) -> Result<usize> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());

 		Ok(self.backupkeyid_backup.scan_prefix(prefix).count())
@@ -181,7 +157,7 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());

 		Ok(utils::u64_from_bytes(
@@ -194,15 +170,11 @@ impl service::key_backups::Data for KeyValueDatabase {
 		.to_string())
 	}

-    fn get_all(
-        &self,
-        user_id: &UserId,
-        version: &str,
-    ) -> Result<BTreeMap<OwnedRoomId, RoomKeyBackup>> {
+	fn get_all(&self, user_id: &UserId, version: &str) -> Result<BTreeMap<OwnedRoomId, RoomKeyBackup>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);

 		let mut rooms = BTreeMap::<OwnedRoomId, RoomKeyBackup>::new();

@@ -210,33 +182,30 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.backupkeyid_backup
 			.scan_prefix(prefix)
 			.map(|(key, value)| {
-                let mut parts = key.rsplit(|&b| b == 0xff);
+				let mut parts = key.rsplit(|&b| b == 0xFF);

-                let session_id =
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
-                        Error::bad_database("backupkeyid_backup key is invalid.")
-                    })?)
-                    .map_err(|_| {
-                        Error::bad_database("backupkeyid_backup session_id is invalid.")
-                    })?;
+				let session_id = utils::string_from_bytes(
+					parts
+						.next()
+						.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+				)
+				.map_err(|_| Error::bad_database("backupkeyid_backup session_id is invalid."))?;

 				let room_id = RoomId::parse(
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
-                        Error::bad_database("backupkeyid_backup key is invalid.")
-                    })?)
+					utils::string_from_bytes(
+						parts
+							.next()
+							.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+					)
 					.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid."))?,
 				)
-                .map_err(|_| {
-                    Error::bad_database("backupkeyid_backup room_id is invalid room id.")
-                })?;
+				.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid room id."))?;

-                let key_data = serde_json::from_slice(&value).map_err(|_| {
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
-                })?;
+				let key_data = serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;

 				Ok::<_, Error>((room_id, session_id, key_data))
-            })
-        {
+			}) {
 			let (room_id, session_id, key_data) = result?;
 			rooms
 				.entry(room_id)
@@ -251,72 +220,62 @@ impl service::key_backups::Data for KeyValueDatabase {
 	}

 	fn get_room(
-        &self,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId,
 	) -> Result<BTreeMap<String, Raw<KeyBackupData>>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(room_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);

 		Ok(self
 			.backupkeyid_backup
 			.scan_prefix(prefix)
 			.map(|(key, value)| {
-                let mut parts = key.rsplit(|&b| b == 0xff);
+				let mut parts = key.rsplit(|&b| b == 0xFF);

-                let session_id =
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
-                        Error::bad_database("backupkeyid_backup key is invalid.")
-                    })?)
-                    .map_err(|_| {
-                        Error::bad_database("backupkeyid_backup session_id is invalid.")
-                    })?;
+				let session_id = utils::string_from_bytes(
+					parts
+						.next()
+						.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+				)
+				.map_err(|_| Error::bad_database("backupkeyid_backup session_id is invalid."))?;

-                let key_data = serde_json::from_slice(&value).map_err(|_| {
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
-                })?;
+				let key_data = serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;

 				Ok::<_, Error>((session_id, key_data))
 			})
-            .filter_map(|r| r.ok())
+			.filter_map(Result::ok)
 			.collect())
 	}

 	fn get_session(
-        &self,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str,
 	) -> Result<Option<Raw<KeyBackupData>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());

 		self.backupkeyid_backup
 			.get(&key)?
 			.map(|value| {
-                serde_json::from_slice(&value).map_err(|_| {
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
-                })
+				serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))
 			})
 			.transpose()
 	}

 	fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);

 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -327,11 +286,11 @@ impl service::key_backups::Data for KeyValueDatabase {

 	fn delete_room_keys(&self, user_id: &UserId, version: &str, room_id: &RoomId) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);

 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -340,19 +299,13 @@ impl service::key_backups::Data for KeyValueDatabase {
 		Ok(())
 	}

-    fn delete_room_key(
-        &self,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
-    ) -> Result<()> {
+	fn delete_room_key(&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());

 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
--- a/Show More
+++ b/Show More