add almost complete valgrind support to complement

Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
2025-01-28 19:09:22 -05:00
409 changed files with 10635 additions and 16863 deletions
--- a/.cargo/audit.toml
+++ b/.cargo/audit.toml
@ -1,27 +0,0 @@
-[advisories]
-ignore = ["RUSTSEC-2024-0436", "RUSTSEC-2025-0014"] # advisory IDs to ignore e.g. ["RUSTSEC-2019-0001", ...]
-informational_warnings = [] # warn for categories of informational advisories
-severity_threshold = "none" # CVSS severity ("none", "low", "medium", "high", "critical")
-
-# Advisory Database Configuration
-[database]
-path = "~/.cargo/advisory-db" # Path where advisory git repo will be cloned
-url = "https://github.com/RustSec/advisory-db.git" # URL to git repo
-fetch = true # Perform a `git fetch` before auditing (default: true)
-stale = false # Allow stale advisory DB (i.e. no commits for 90 days, default: false)
-
-# Output Configuration
-[output]
-deny = ["warnings", "unmaintained", "unsound", "yanked"] # exit on error if unmaintained dependencies are found
-format = "terminal" # "terminal" (human readable report) or "json"
-quiet = false # Only print information on error
-show_tree = true # Show inverse dependency trees along with advisories (default: true)
-
-# Target Configuration
-[target]
-arch = ["x86_64", "aarch64"] # Ignore advisories for CPU architectures other than these
-os = ["linux", "windows", "macos"] # Ignore advisories for operating systems other than these
-
-[yanked]
-enabled = true # Warn for yanked crates in Cargo.lock (default: true)
-update_index = true # Auto-update the crates.io index (default: true)
--- a/.gitattributes
+++ b/.gitattributes
@ -1,87 +0,0 @@
-# taken from https://github.com/gitattributes/gitattributes/blob/46a8961ad73f5bd4d8d193708840fbc9e851d702/Rust.gitattributes
-# Auto detect text files and perform normalization
-*          text=auto
-
-*.rs       text diff=rust
-*.toml     text diff=toml
-Cargo.lock text
-
-# taken from https://github.com/gitattributes/gitattributes/blob/46a8961ad73f5bd4d8d193708840fbc9e851d702/Common.gitattributes
-# Documents
-*.bibtex   text diff=bibtex
-*.doc      diff=astextplain
-*.DOC      diff=astextplain
-*.docx     diff=astextplain
-*.DOCX     diff=astextplain
-*.dot      diff=astextplain
-*.DOT      diff=astextplain
-*.pdf      diff=astextplain
-*.PDF      diff=astextplain
-*.rtf      diff=astextplain
-*.RTF      diff=astextplain
-*.md       text diff=markdown
-*.mdx      text diff=markdown
-*.tex      text diff=tex
-*.adoc     text
-*.textile  text
-*.mustache text
-*.csv      text eol=crlf
-*.tab      text
-*.tsv      text
-*.txt      text
-*.sql      text
-*.epub     diff=astextplain
-
-# Graphics
-*.png      binary
-*.jpg      binary
-*.jpeg     binary
-*.gif      binary
-*.tif      binary
-*.tiff     binary
-*.ico      binary
-# SVG treated as text by default.
-*.svg      text
-*.eps      binary
-
-# Scripts
-*.bash     text eol=lf
-*.fish     text eol=lf
-*.ksh      text eol=lf
-*.sh       text eol=lf
-*.zsh      text eol=lf
-# These are explicitly windows files and should use crlf
-*.bat      text eol=crlf
-*.cmd      text eol=crlf
-*.ps1      text eol=crlf
-
-# Serialisation
-*.json     text
-*.toml     text
-*.xml      text
-*.yaml     text
-*.yml      text
-
-# Archives
-*.7z       binary
-*.bz       binary
-*.bz2      binary
-*.bzip2    binary
-*.gz       binary
-*.lz       binary
-*.lzma     binary
-*.rar      binary
-*.tar      binary
-*.taz      binary
-*.tbz      binary
-*.tbz2     binary
-*.tgz      binary
-*.tlz      binary
-*.txz      binary
-*.xz       binary
-*.Z        binary
-*.zip      binary
-*.zst      binary
-
-# Text files where line endings should be preserved
-*.patch    -text
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -21,6 +21,16 @@ concurrency:
    cancel-in-progress: true

 env:
+    # sccache only on main repo
+    SCCACHE_GHA_ENABLED: "${{ !startsWith(github.ref, 'refs/tags/') && (github.event.pull_request.draft != true) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '') && (vars.SCCACHE_ENDPOINT != '') && (github.event.pull_request.user.login != 'renovate[bot]') && 'true' || 'false' }}"
+    RUSTC_WRAPPER: "${{ !startsWith(github.ref, 'refs/tags/') && (github.event.pull_request.draft != true) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '') && (vars.SCCACHE_ENDPOINT != '') && (github.event.pull_request.user.login != 'renovate[bot]') && 'sccache' || '' }}"
+    SCCACHE_BUCKET: "${{ (github.event.pull_request.draft != true) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '') && (vars.SCCACHE_ENDPOINT != '') && (github.event.pull_request.user.login != 'renovate[bot]') && 'sccache' || '' }}"
+    SCCACHE_S3_USE_SSL: ${{ vars.SCCACHE_S3_USE_SSL }}
+    SCCACHE_REGION: ${{ vars.SCCACHE_REGION }}
+    SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }}
+    SCCACHE_CACHE_MULTIARCH: ${{ vars.SCCACHE_CACHE_MULTIARCH }}
+    AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+    AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
    # Required to make some things output color
    TERM: ansi
    # Publishing to my nix binary cache
@ -35,8 +45,8 @@ env:
    # Get error output from nix that we can actually use, and use our binary caches for the earlier CI steps
    NIX_CONFIG: |
      show-trace = true
-      extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net https://nix-community.cachix.org https://crane.cachix.org
-      extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
+      extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net
+      extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
      experimental-features = nix-command flakes
      extra-experimental-features = nix-command flakes
      accept-flake-config = true
@ -49,7 +59,7 @@ permissions: {}
 jobs:
    tests:
        name: Test
-        runs-on: self-hosted
+        runs-on: ubuntu-24.04
        steps:
            - name: Setup SSH web publish
              env:
@ -83,6 +93,19 @@ jobs:

                  echo "SSH_WEBSITE=1" >> "$GITHUB_ENV"

+            - name: Install liburing
+              run: |
+                  sudo apt install liburing-dev -y
+
+            - name: Free up a bit of runner space
+              run: |
+                  set +o pipefail
+                  sudo docker image prune --all --force || true
+                  sudo apt purge -y 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-cloud-cli google-chrome-stable firefox powershell microsoft-edge-stable || true
+                  sudo apt clean
+                  sudo rm -rf /usr/local/lib/android /usr/local/julia* /usr/local/games /usr/local/sqlpackage /usr/local/share/powershell /usr/local/share/edge_driver /usr/local/share/gecko_driver /usr/local/share/chromium /usr/local/share/chromedriver-linux64 /usr/lib/google-cloud-sdk /usr/lib/jvm /usr/lib/mono /usr/local/lib/heroku /usr/lib/heroku /usr/local/share/boost /usr/share/dotnet /usr/local/bin/cmake* /usr/local/bin/stack /usr/local/bin/terraform /opt/microsoft/powershell /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/go /opt/hostedtoolcache/PyPy /usr/local/bin/sam || true
+                  set -o pipefail
+
            - name: Sync repository
              uses: actions/checkout@v4
              with:
@ -100,9 +123,60 @@ jobs:
                    exit 1
                  fi

+            - uses: nixbuild/nix-quick-install-action@master
+
+            - name: Restore and cache Nix store
+              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+              # releases and tags
+              if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+              uses: nix-community/cache-nix-action@v5.1.0
+              with:
+                # restore and save a cache using this key
+                primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/.lock') }}
+                # if there's no cache hit, restore a cache by this prefix
+                restore-prefixes-first-match: nix-${{ runner.os }}-
+                # collect garbage until Nix store size (in bytes) is at most this number
+                # before trying to save a new cache
+                gc-max-store-size-linux: 2073741824
+                # do purge caches
+                purge: true
+                # purge all versions of the cache
+                purge-prefixes: nix-${{ runner.os }}-
+                # created more than this number of seconds ago relative to the start of the `Post Restore` phase
+                purge-last-accessed: 86400
+                # except the version with the `primary-key`, if it exists
+                purge-primary-key: never
+                # always save the cache
+                save-always: true
+
+            - name: Enable Cachix binary cache
+              run: |
+                  nix profile install nixpkgs#cachix
+                  cachix use crane
+                  cachix use nix-community
+
+            - name: Apply Nix binary cache configuration
+              run: |
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+                  extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net
+                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
+                  experimental-features = nix-command flakes
+                  extra-experimental-features = nix-command flakes
+                  accept-flake-config = true
+                  EOF
+
+            - name: Use alternative Nix binary caches if specified
+              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
+              run: |
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+                  extra-substituters = ${ATTIC_ENDPOINT}
+                  extra-trusted-public-keys = ${ATTIC_PUBLIC_KEY}
+                  EOF
+
            - name: Prepare build environment
              run: |
                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
+                  nix profile install --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                  direnv allow
                  nix develop .#all-features --command true

@ -113,11 +187,18 @@ jobs:
                  bin/nix-build-and-cache just '.#devShells.x86_64-linux.all-features'
                  bin/nix-build-and-cache just '.#devShells.x86_64-linux.dynamic'

+            # use sccache for Rust
+            - name: Run sccache-cache
+              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+              # releases and tags
+              if: ${{ (env.SCCACHE_GHA_ENABLED == 'true') && !startsWith(github.ref, 'refs/tags/') }}
+              uses: mozilla-actions/sccache-action@main
+
            # use rust-cache
            - uses: Swatinem/rust-cache@v2
              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
              # releases and tags
-              #if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+              if: ${{ !startsWith(github.ref, 'refs/tags/') }}
              with:
                cache-all-crates: "true"
                cache-on-failure: "true"
@ -169,28 +250,41 @@ jobs:
              if: success() || failure()
              run: |
                  if [ ${GH_JOB_STATUS} == 'success' ]; then
-                      echo '# ✅ CI completed suwuccessfully' >> $GITHUB_STEP_SUMMARY
+                      echo '# ✅ completed suwuccessfully' >> $GITHUB_STEP_SUMMARY
                  else
-                      echo '# ❌ CI failed (last 100 lines of output)' >> $GITHUB_STEP_SUMMARY
+                      echo '# CI failure' >> $GITHUB_STEP_SUMMARY
                      echo '```' >> $GITHUB_STEP_SUMMARY
-                      tail -n 100 test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
+                      tail -n 40 test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
                      echo '```' >> $GITHUB_STEP_SUMMARY

-                      echo '# Complement diff results (last 100 lines)' >> $GITHUB_STEP_SUMMARY
+                      echo '# Complement diff results' >> $GITHUB_STEP_SUMMARY
                      echo '```diff' >> $GITHUB_STEP_SUMMARY
-                      tail -n 100 complement_diff_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
+                      tail -n 100 complement_diff_output.log | sed 's/\x1b\[[0-9;]*m//g' >>     $GITHUB_STEP_SUMMARY
                      echo '```' >> $GITHUB_STEP_SUMMARY
                  fi

+            - name: Run cargo clean test artifacts to free up space
+              run: |
+                  cargo clean --profile test
+
    build:
        name: Build
-        runs-on: self-hosted
+        runs-on: ubuntu-24.04
        strategy:
            matrix:
                include:
                    - target: aarch64-linux-musl
                    - target: x86_64-linux-musl
        steps:
+            - name: Free up a bit of runner space
+              run: |
+                  set +o pipefail
+                  sudo docker image prune --all --force || true
+                  sudo apt purge -y 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-cloud-cli google-chrome-stable firefox powershell microsoft-edge-stable || true
+                  sudo apt clean
+                  sudo rm -rf /usr/local/lib/android /usr/local/julia* /usr/local/games /usr/local/sqlpackage /usr/local/share/powershell /usr/local/share/edge_driver /usr/local/share/gecko_driver /usr/local/share/chromium /usr/local/share/chromedriver-linux64 /usr/lib/google-cloud-sdk /usr/lib/jvm /usr/lib/mono /usr/local/lib/heroku /usr/lib/heroku /usr/local/share/boost /usr/share/dotnet /usr/local/bin/cmake* /usr/local/bin/stack /usr/local/bin/terraform /opt/microsoft/powershell /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/go /opt/hostedtoolcache/PyPy /usr/local/bin/sam || true
+                  set -o pipefail
+
            - name: Sync repository
              uses: actions/checkout@v4
              with:
@ -224,17 +318,75 @@ jobs:

                  echo "SSH_WEBSITE=1" >> "$GITHUB_ENV"

+            - uses: nixbuild/nix-quick-install-action@master
+
+            - name: Restore and cache Nix store
+              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+              # releases and tags
+              if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+              uses: nix-community/cache-nix-action@v5.1.0
+              with:
+                # restore and save a cache using this key
+                primary-key: nix-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**/*.nix', '**/.lock') }}
+                # if there's no cache hit, restore a cache by this prefix
+                restore-prefixes-first-match: nix-${{ runner.os }}-
+                # collect garbage until Nix store size (in bytes) is at most this number
+                # before trying to save a new cache
+                gc-max-store-size-linux: 2073741824
+                # do purge caches
+                purge: true
+                # purge all versions of the cache
+                purge-prefixes: nix-${{ runner.os }}-
+                # created more than this number of seconds ago relative to the start of the `Post Restore` phase
+                purge-last-accessed: 86400
+                # except the version with the `primary-key`, if it exists
+                purge-primary-key: never
+                # always save the cache
+                save-always: true
+
+            - name: Enable Cachix binary cache
+              run: |
+                  nix profile install nixpkgs#cachix
+                  cachix use crane
+                  cachix use nix-community
+
+            - name: Apply Nix binary cache configuration
+              run: |
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+                  extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net
+                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
+                  experimental-features = nix-command flakes
+                  extra-experimental-features = nix-command flakes
+                  accept-flake-config = true
+                  EOF
+
+            - name: Use alternative Nix binary caches if specified
+              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
+              run: |
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+                  extra-substituters = ${ATTIC_ENDPOINT}
+                  extra-trusted-public-keys = ${ATTIC_PUBLIC_KEY}
+                  EOF
+
            - name: Prepare build environment
              run: |
                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
+                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                  direnv allow
                  nix develop .#all-features --command true --impure

+            # use sccache for Rust
+            - name: Run sccache-cache
+              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+              # releases and tags
+              if: ${{ (env.SCCACHE_GHA_ENABLED == 'true') && !startsWith(github.ref, 'refs/tags/') }}
+              uses: mozilla-actions/sccache-action@main
+
            # use rust-cache
            - uses: Swatinem/rust-cache@v2
              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
              # releases and tags
-              #if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+              if: ${{ !startsWith(github.ref, 'refs/tags/') }}
              with:
                cache-all-crates: "true"
                cache-on-failure: "true"
@ -471,10 +623,136 @@ jobs:
                    scp oci-image-${{ matrix.target }}-debug.tar.gz website:/var/www/girlboss.ceo/~strawberry/conduwuit/ci-bins/${WEBSERVER_DIR_NAME}/oci-image-${{ matrix.target }}-debug.tar.gz
                  fi

+    build_mac_binaries:
+        name: Build MacOS Binaries
+        strategy:
+          matrix:
+            os: [macos-latest, macos-13]
+        runs-on: ${{ matrix.os }}
+        steps:
+            - name: Sync repository
+              uses: actions/checkout@v4
+              with:
+                persist-credentials: false
+
+            - name: Setup SSH web publish
+              env:
+                web_upload_ssh_private_key: ${{ secrets.WEB_UPLOAD_SSH_PRIVATE_KEY }}
+              if: (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || (github.event.pull_request.draft != true)) && (env.web_upload_ssh_private_key != '') && github.event.pull_request.user.login != 'renovate[bot]'
+              run: |
+                  mkdir -p -v ~/.ssh
+
+                  echo "${{ secrets.WEB_UPLOAD_SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
+                  echo "${{ secrets.WEB_UPLOAD_SSH_PRIVATE_KEY }}" >> ~/.ssh/id_ed25519
+
+                  chmod 600 ~/.ssh/id_ed25519
+
+                  cat >>~/.ssh/config <<END
+                  Host website
+                    HostName ${{ secrets.WEB_UPLOAD_SSH_HOSTNAME }}
+                    User ${{ secrets.WEB_UPLOAD_SSH_USERNAME }}
+                    IdentityFile ~/.ssh/id_ed25519
+                    StrictHostKeyChecking yes
+                    AddKeysToAgent no
+                    ForwardX11 no
+                    BatchMode yes
+                  END
+
+                  echo "Checking connection"
+                  ssh -q website "echo test" || ssh -q website "echo test"
+
+                  echo "SSH_WEBSITE=1" >> "$GITHUB_ENV"
+
+            - name: Tag comparison check
+              if: ${{ startsWith(github.ref, 'refs/tags/v') && !endsWith(github.ref, '-rc') }}
+              run: |
+                  # Tag mismatch with latest repo tag check to prevent potential downgrades
+                  LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
+
+                  if [ ${LATEST_TAG} != ${GH_REF_NAME} ]; then
+                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.'
+                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.' >> $GITHUB_STEP_SUMMARY
+                    exit 1
+                  fi
+
+            # use sccache for Rust
+            - name: Run sccache-cache
+              # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+              # releases and tags
+              if: ${{ (env.SCCACHE_GHA_ENABLED == 'true') && !startsWith(github.ref, 'refs/tags/') }}
+              uses: mozilla-actions/sccache-action@main
+
+            # use rust-cache
+            - uses: Swatinem/rust-cache@v2
+              with:
+                cache-all-crates: "true"
+                cache-on-failure: "true"
+                cache-targets: "true"
+
+            # Nix can't do portable macOS builds yet
+            - name: Build macOS x86_64 binary
+              if: ${{ matrix.os == 'macos-13' }}
+              run: |
+                  CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release --locked --features=perf_measurements,sentry_telemetry,direct_tls
+                  cp -v -f target/release/conduwuit conduwuit-macos-x86_64
+                  otool -L conduwuit-macos-x86_64
+
+            # quick smoke test of the x86_64 macOS binary
+            - name: Run x86_64 macOS release binary
+              if: ${{ matrix.os == 'macos-13' }}
+              run: |
+                  ./conduwuit-macos-x86_64 --help
+                  ./conduwuit-macos-x86_64 --version
+
+            - name: Build macOS arm64 binary
+              if: ${{ matrix.os == 'macos-latest' }}
+              run: |
+                  CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release --locked --features=perf_measurements,sentry_telemetry,direct_tls
+                  cp -v -f target/release/conduwuit conduwuit-macos-arm64
+                  otool -L conduwuit-macos-arm64
+
+            # quick smoke test of the arm64 macOS binary
+            - name: Run arm64 macOS release binary
+              if: ${{ matrix.os == 'macos-latest' }}
+              run: |
+                  ./conduwuit-macos-arm64 --help
+                  ./conduwuit-macos-arm64 --version
+
+            - name: Upload macOS x86_64 binary to webserver
+              if: ${{ matrix.os == 'macos-13' }}
+              run: |
+                  if [ ! -z $SSH_WEBSITE ]; then
+                    chmod +x conduwuit-macos-x86_64
+                    scp conduwuit-macos-x86_64 website:/var/www/girlboss.ceo/~strawberry/conduwuit/ci-bins/${WEBSERVER_DIR_NAME}/conduwuit-macos-x86_64
+                  fi
+
+            - name: Upload macOS arm64 binary to webserver
+              if: ${{ matrix.os == 'macos-latest' }}
+              run: |
+                  if [ ! -z $SSH_WEBSITE ]; then
+                    chmod +x conduwuit-macos-arm64
+                    scp conduwuit-macos-arm64 website:/var/www/girlboss.ceo/~strawberry/conduwuit/ci-bins/${WEBSERVER_DIR_NAME}/conduwuit-macos-arm64
+                  fi
+
+            - name: Upload macOS x86_64 binary
+              if: ${{ matrix.os == 'macos-13' }}
+              uses: actions/upload-artifact@v4
+              with:
+                  name: conduwuit-macos-x86_64
+                  path: conduwuit-macos-x86_64
+                  if-no-files-found: error
+
+            - name: Upload macOS arm64 binary
+              if: ${{ matrix.os == 'macos-latest' }}
+              uses: actions/upload-artifact@v4
+              with:
+                  name: conduwuit-macos-arm64
+                  path: conduwuit-macos-arm64
+                  if-no-files-found: error
    variables: 
      outputs:
        github_repository: ${{ steps.var.outputs.github_repository }}
-      runs-on: self-hosted
+      runs-on: "ubuntu-latest"
      steps:
        - name: Setting global variables
          uses: actions/github-script@v7
@ -484,7 +762,7 @@ jobs:
              core.setOutput('github_repository', '${{ github.repository }}'.toLowerCase())
    docker:
        name: Docker publish
-        runs-on: self-hosted
+        runs-on: ubuntu-24.04
        needs: [build, variables, tests]
        permissions:
          packages: write
@ -526,8 +804,6 @@ jobs:

            - name: Download artifacts
              uses: actions/download-artifact@v4
-              with:
-                pattern: "oci*"

            - name: Move OCI images into position
              run: |
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@ -24,8 +24,8 @@ env:
  # Get error output from nix that we can actually use, and use our binary caches for the earlier CI steps
  NIX_CONFIG: |
    show-trace = true
-    extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net https://nix-community.cachix.org https://crane.cachix.org
-    extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
+    extra-substituters = extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net
+    extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
    experimental-features = nix-command flakes
    extra-experimental-features = nix-command flakes
    accept-flake-config = true
@ -41,7 +41,7 @@ permissions: {}
 jobs:
  docs:
    name: Documentation and GitHub Pages
-    runs-on: self-hosted
+    runs-on: ubuntu-24.04

    permissions:
      pages: write
@ -52,6 +52,15 @@ jobs:
      url: ${{ steps.deployment.outputs.page_url }}

    steps:
+      - name: Free up a bit of runner space
+        run: |
+            set +o pipefail
+            sudo docker image prune --all --force || true
+            sudo apt purge -y 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-cloud-cli google-chrome-stable firefox powershell microsoft-edge-stable || true
+            sudo apt clean
+            sudo rm -v -rf /usr/local/games /usr/local/sqlpackage /usr/local/share/powershell /usr/local/share/edge_driver /usr/local/share/gecko_driver /usr/local/share/chromium /usr/local/share/chromedriver-linux64 /usr/lib/google-cloud-sdk /usr/lib/jvm /usr/lib/mono /usr/lib/heroku
+            set -o pipefail
+
      - name: Sync repository
        uses: actions/checkout@v4
        with:
@ -61,9 +70,60 @@ jobs:
        if: (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') && (github.event_name != 'pull_request')
        uses: actions/configure-pages@v5

+      - uses: nixbuild/nix-quick-install-action@master
+
+      - name: Restore and cache Nix store
+        # we want a fresh-state when we do releases/tags to avoid potential cache poisoning attacks impacting
+        # releases and tags
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        uses: nix-community/cache-nix-action@v5.1.0
+        with:
+          # restore and save a cache using this key
+          primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/.lock') }}
+          # if there's no cache hit, restore a cache by this prefix
+          restore-prefixes-first-match: nix-${{ runner.os }}-
+          # collect garbage until Nix store size (in bytes) is at most this number
+          # before trying to save a new cache
+          gc-max-store-size-linux: 2073741824
+          # do purge caches
+          purge: true
+          # purge all versions of the cache
+          purge-prefixes: nix-${{ runner.os }}-
+          # created more than this number of seconds ago relative to the start of the `Post Restore` phase
+          purge-last-accessed: 86400
+          # except the version with the `primary-key`, if it exists
+          purge-primary-key: never
+          # always save the cache
+          save-always: true
+
+      - name: Enable Cachix binary cache
+        run: |
+            nix profile install nixpkgs#cachix
+            cachix use crane
+            cachix use nix-community
+
+      - name: Apply Nix binary cache configuration
+        run: |
+            sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+            extra-substituters = https://attic.kennel.juneis.dog/conduwuit https://attic.kennel.juneis.dog/conduit https://conduwuit.cachix.org https://aseipp-nix-cache.freetls.fastly.net
+            extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
+            experimental-features = nix-command flakes
+            extra-experimental-features = nix-command flakes
+            accept-flake-config = true
+            EOF
+
+      - name: Use alternative Nix binary caches if specified
+        if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
+        run: |
+            sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
+            extra-substituters = ${ATTIC_ENDPOINT}
+            extra-trusted-public-keys = ${ATTIC_PUBLIC_KEY}
+            EOF
+
      - name: Prepare build environment
        run: |
            echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
+            nix profile install --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
            direnv allow
            nix develop --command true

@ -81,7 +141,6 @@ jobs:
            bin/nix-build-and-cache just .#book

            cp -r --dereference result public
-            chmod u+w -R public

      - name: Upload generated documentation (book) as normal artifact
        uses: actions/upload-artifact@v4
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -13,25 +13,25 @@ authors = [
 ]
 categories = ["network-programming"]
 description = "a very cool Matrix chat homeserver written in Rust"
-edition = "2024"
+edition = "2021"
 homepage = "https://conduwuit.puppyirl.gay/"
 keywords = ["chat", "matrix", "networking", "server", "uwu"]
 license = "Apache-2.0"
 # See also `rust-toolchain.toml`
 readme = "README.md"
 repository = "https://github.com/girlbossceo/conduwuit"
-rust-version = "1.86.0"
+rust-version = "1.84.0"
 version = "0.5.0"

 [workspace.metadata.crane]
 name = "conduwuit"

 [workspace.dependencies.arrayvec]
-version = "0.7.6"
+version = "0.7.4"
 features = ["serde"]

 [workspace.dependencies.smallvec]
-version = "1.14.0"
+version = "1.13.2"
 features = [
 	"const_generics",
 	"const_new",
@ -40,12 +40,8 @@ features = [
 	"write",
 ]

-[workspace.dependencies.smallstr]
-version = "0.3"
-features = ["ffi", "std", "union"]
-
 [workspace.dependencies.const-str]
-version = "0.6.2"
+version = "0.5.7"

 [workspace.dependencies.ctor]
 version = "0.2.9"
@ -81,13 +77,13 @@ version = "0.8.5"

 # Used for the http request / response body type for Ruma endpoints used with reqwest
 [workspace.dependencies.bytes]
-version = "1.10.1"
+version = "1.9.0"

 [workspace.dependencies.http-body-util]
-version = "0.1.3"
+version = "0.1.2"

 [workspace.dependencies.http]
-version = "1.3.1"
+version = "1.2.0"

 [workspace.dependencies.regex]
 version = "1.11.1"
@ -111,7 +107,7 @@ default-features = false
 features = ["typed-header", "tracing"]

 [workspace.dependencies.axum-server]
-version = "0.7.2"
+version = "0.7.1"
 default-features = false

 # to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
@ -122,7 +118,7 @@ version = "0.7"
 version = "0.6.1"

 [workspace.dependencies.tower]
-version = "0.5.2"
+version = "0.5.1"
 default-features = false
 features = ["util"]

@ -131,22 +127,21 @@ version = "0.6.2"
 default-features = false
 features = [
    "add-extension",
-    "catch-panic",
    "cors",
    "sensitive-headers",
    "set-header",
-    "timeout",
    "trace",
    "util",
+    "catch-panic",
 ]

 [workspace.dependencies.rustls]
-version = "0.23.25"
+version = "0.23.19"
 default-features = false
 features = ["aws_lc_rs"]

 [workspace.dependencies.reqwest]
-version = "0.12.15"
+version = "0.12.9"
 default-features = false
 features = [
 	"rustls-tls-native-roots",
@ -156,12 +151,12 @@ features = [
 ]

 [workspace.dependencies.serde]
-version = "1.0.219"
+version = "1.0.216"
 default-features = false
 features = ["rc"]

 [workspace.dependencies.serde_json]
-version = "1.0.140"
+version = "1.0.133"
 default-features = false
 features = ["raw_value"]

@ -183,7 +178,7 @@ version = "0.5.3"
 features = ["alloc", "rand"]
 default-features = false

-# Used to generate thumbnails for images & blurhashes
+# Used to generate thumbnails for images
 [workspace.dependencies.image]
 version = "0.25.5"
 default-features = false
@ -194,23 +189,15 @@ features = [
 	"webp",
 ]

-[workspace.dependencies.blurhash]
-version = "0.2.3"
-default-features = false
-features = [
-	"fast-linear-to-srgb",
-	"image",
-]
-
 # logging
 [workspace.dependencies.log]
-version = "0.4.27"
+version = "0.4.22"
 default-features = false
 [workspace.dependencies.tracing]
 version = "0.1.41"
 default-features = false
 [workspace.dependencies.tracing-subscriber]
-version = "0.3.19"
+version = "=0.3.18"
 default-features = false
 features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"]
 [workspace.dependencies.tracing-core]
@ -224,7 +211,7 @@ default-features = false

 # used for conduwuit's CLI and admin room command parsing
 [workspace.dependencies.clap]
-version = "4.5.35"
+version = "4.5.23"
 default-features = false
 features = [
 	"derive",
@ -237,12 +224,12 @@ features = [
 ]

 [workspace.dependencies.futures]
-version = "0.3.31"
+version = "0.3.30"
 default-features = false
 features = ["std", "async-await"]

 [workspace.dependencies.tokio]
-version = "1.44.2"
+version = "1.42.0"
 default-features = false
 features = [
 	"fs",
@ -275,7 +262,7 @@ features = ["alloc", "std"]
 default-features = false

 [workspace.dependencies.hyper]
-version = "1.6.0"
+version = "1.5.1"
 default-features = false
 features = [
 	"server",
@ -284,7 +271,8 @@ features = [
 ]

 [workspace.dependencies.hyper-util]
-version = "0.1.11"
+# hyper-util >=0.1.9 seems to have DNS issues
+version = "=0.1.8"
 default-features = false
 features = [
 	"server-auto",
@ -294,7 +282,7 @@ features = [

 # to support multiple variations of setting a config option
 [workspace.dependencies.either]
-version = "1.15.0"
+version = "1.13.0"
 default-features = false
 features = ["serde"]

@ -305,27 +293,22 @@ default-features = false
 features = ["env", "toml"]

 [workspace.dependencies.hickory-resolver]
-version = "0.25.1"
+version = "0.24.2"
 default-features = false
-features = [
-	"serde",
-	"system-config",
-	"tokio",
-]

 # Used for conduwuit::Error type
 [workspace.dependencies.thiserror]
-version = "2.0.12"
+version = "2.0.7"
 default-features = false

 # Used when hashing the state
 [workspace.dependencies.ring]
-version = "0.17.14"
+version = "0.17.8"
 default-features = false

 # Used to make working with iterators easier, was already a transitive depdendency
 [workspace.dependencies.itertools]
-version = "0.14.0"
+version = "0.13.0"

 # to parse user-friendly time durations in admin commands
 #TODO: overlaps chrono?
@ -341,7 +324,7 @@ version = "0.4.0"
 version = "2.3.1"

 [workspace.dependencies.async-trait]
-version = "0.1.88"
+version = "0.1.83"

 [workspace.dependencies.lru-cache]
 version = "0.1.2"
@ -350,7 +333,7 @@ version = "0.1.2"
 [workspace.dependencies.ruma]
 git = "https://github.com/girlbossceo/ruwuma"
 #branch = "conduwuit-changes"
-rev = "920148dca1076454ca0ca5d43b5ce1aa708381d4"
+rev = "b560338b2a50dbf61ecfe80808b9b095ad4cec00"
 features = [
    "compat",
    "rand",
@ -359,6 +342,8 @@ features = [
    "federation-api",
    "markdown",
    "push-gateway-api-c",
+    "state-res",
+    "server-util",
    "unstable-exhaustive-types",
    "ring-compat",
    "compat-upload-signatures",
@ -375,27 +360,24 @@ features = [
    "unstable-msc3381", # polls
    "unstable-msc3489", # beacon / live location
    "unstable-msc3575",
-    "unstable-msc3930", # polls push rules
    "unstable-msc4075",
-    "unstable-msc4095",
    "unstable-msc4121",
    "unstable-msc4125",
    "unstable-msc4186",
    "unstable-msc4203", # sending to-device events to appservices 
    "unstable-msc4210", # remove legacy mentions
    "unstable-extensible-events",
-    "unstable-pdu",
 ]

 [workspace.dependencies.rust-rocksdb]
-git = "https://github.com/girlbossceo/rust-rocksdb-zaidoon1"
-rev = "1c267e0bf0cc7b7702e9a329deccd89de79ef4c3"
-default-features = false
+path = "deps/rust-rocksdb"
+package = "rust-rocksdb-uwu"
 features = [
 	"multi-threaded-cf",
 	"mt_static",
 	"lz4",
 	"zstd",
+	"zlib",
 	"bzip2",
 ]

@ -427,7 +409,7 @@ features = ["rt-tokio"]

 # optional sentry metrics for crash/panic reporting
 [workspace.dependencies.sentry]
-version = "0.37.0"
+version = "0.35.0"
 default-features = false
 features = [
    "backtrace",
@ -443,9 +425,9 @@ features = [
 ]

 [workspace.dependencies.sentry-tracing]
-version = "0.37.0"
+version = "0.35.0"
 [workspace.dependencies.sentry-tower]
-version = "0.37.0"
+version = "0.35.0"

 # jemalloc usage
 [workspace.dependencies.tikv-jemalloc-sys]
@ -479,7 +461,7 @@ default-features = false
 features = ["resource"]

 [workspace.dependencies.sd-notify]
-version = "0.4.5"
+version = "0.4.3"
 default-features = false

 [workspace.dependencies.hardened_malloc-rs]
@ -496,25 +478,25 @@ version = "0.4.3"
 default-features = false

 [workspace.dependencies.termimad]
-version = "0.31.2"
+version = "0.31.1"
 default-features = false

 [workspace.dependencies.checked_ops]
 version = "0.1"

 [workspace.dependencies.syn]
-version = "2.0"
+version = "2.0.90"
 default-features = false
 features = ["full", "extra-traits"]

 [workspace.dependencies.quote]
-version = "1.0"
+version = "1.0.37"

 [workspace.dependencies.proc-macro2]
-version = "1.0"
+version = "1.0.89"

 [workspace.dependencies.bytesize]
-version = "2.0"
+version = "1.3.0"

 [workspace.dependencies.core_affinity]
 version = "0.8.1"
@ -526,16 +508,13 @@ version = "0.2"
 version = "0.2"

 [workspace.dependencies.minicbor]
-version = "0.26.3"
+version = "0.25.1"
 features = ["std"]

 [workspace.dependencies.minicbor-serde]
-version = "0.4.1"
+version = "0.3.2"
 features = ["std"]

-[workspace.dependencies.maplit]
-version = "1.0.2"
-
 #
 # Patches
 #
@ -545,16 +524,16 @@ version = "1.0.2"
 # https://github.com/girlbossceo/tracing/commit/b348dca742af641c47bc390261f60711c2af573c
 [patch.crates-io.tracing-subscriber]
 git = "https://github.com/girlbossceo/tracing"
-rev = "1e64095a8051a1adf0d1faa307f9f030889ec2aa"
+rev = "05825066a6d0e9ad6b80dcf29457eb179ff4768c"
 [patch.crates-io.tracing]
 git = "https://github.com/girlbossceo/tracing"
-rev = "1e64095a8051a1adf0d1faa307f9f030889ec2aa"
+rev = "05825066a6d0e9ad6b80dcf29457eb179ff4768c"
 [patch.crates-io.tracing-core]
 git = "https://github.com/girlbossceo/tracing"
-rev = "1e64095a8051a1adf0d1faa307f9f030889ec2aa"
+rev = "05825066a6d0e9ad6b80dcf29457eb179ff4768c"
 [patch.crates-io.tracing-log]
 git = "https://github.com/girlbossceo/tracing"
-rev = "1e64095a8051a1adf0d1faa307f9f030889ec2aa"
+rev = "05825066a6d0e9ad6b80dcf29457eb179ff4768c"

 # adds a tab completion callback: https://github.com/girlbossceo/rustyline-async/commit/de26100b0db03e419a3d8e1dd26895d170d1fe50
 # adds event for CTRL+\: https://github.com/girlbossceo/rustyline-async/commit/67d8c49aeac03a5ef4e818f663eaa94dd7bf339b
@ -570,23 +549,10 @@ rev = "fe4aebeeaae435af60087ddd56b573a2e0be671d"
 git = "https://github.com/girlbossceo/async-channel"
 rev = "92e5e74063bf2a3b10414bcc8a0d68b235644280"

-# adds affinity masks for selecting more than one core at a time
 [patch.crates-io.core_affinity]
 git = "https://github.com/girlbossceo/core_affinity_rs"
 rev = "9c8e51510c35077df888ee72a36b4b05637147da"

-# reverts hyperium#148 conflicting with our delicate federation resolver hooks
-[patch.crates-io.hyper-util]
-git = "https://github.com/girlbossceo/hyper-util"
-rev = "e4ae7628fe4fcdacef9788c4c8415317a4489941"
-
-# allows no-aaaa option in resolv.conf
-# bumps rust edition and toolchain to 1.86.0 and 2024
-# use sat_add on line number errors
-[patch.crates-io.resolv-conf]
-git = "https://github.com/girlbossceo/resolv-conf"
-rev = "200e958941d522a70c5877e3d846f55b5586c68d"
-
 #
 # Our crates
 #
@ -703,7 +669,7 @@ inherits = "release"

 # To enable hot-reloading:
 # 1. Uncomment all of the rustflags here.
-# 2. Uncomment crate-type=dylib in src/*/Cargo.toml
+# 2. Uncomment crate-type=dylib in src/*/Cargo.toml and deps/rust-rocksdb/Cargo.toml
 #
 # opt-level, mir-opt-level, validate-mir are not known to interfere with reloading
 # and can be raised if build times are tolerable.
@ -771,6 +737,27 @@ inherits = "dev"
 #	'-Clink-arg=-Wl,-z,lazy',
 #]

+[profile.dev.package.rust-rocksdb-uwu]
+inherits = "dev"
+debug = 'limited'
+incremental = false
+codegen-units = 1
+opt-level = 'z'
+#rustflags = [
+#	'--cfg', 'conduwuit_mods',
+#	'-Ztls-model=initial-exec',
+#	'-Cprefer-dynamic=true',
+#	'-Zstaticlib-prefer-dynamic=true',
+#	'-Zstaticlib-allow-rdylib-deps=true',
+#	'-Zpacked-bundled-libs=true',
+#	'-Zplt=true',
+#	'-Clink-arg=-Wl,--no-as-needed',
+#	'-Clink-arg=-Wl,--allow-shlib-undefined',
+#	'-Clink-arg=-Wl,-z,lazy',
+#	'-Clink-arg=-Wl,-z,nodlopen',
+#	'-Clink-arg=-Wl,-z,nodelete',
+#]
+
 [profile.dev.package.'*']
 inherits = "dev"
 debug = 'limited'
@ -858,9 +845,6 @@ unused_crate_dependencies = "allow"
 unsafe_code = "allow"
 variant_size_differences = "allow"

-# we check nightly clippy lints
-unknown_lints = "allow"
-
 #######################################
 #
 # Clippy lints
@ -905,11 +889,9 @@ missing_docs_in_private_items = { level = "allow", priority = 1 }
 missing_errors_doc = { level = "allow", priority = 1 }
 missing_panics_doc = { level = "allow", priority = 1 }
 module_name_repetitions = { level = "allow", priority = 1 }
-needless_continue = { level = "allow", priority = 1 }
 no_effect_underscore_binding = { level = "allow", priority = 1 }
 similar_names = { level = "allow", priority = 1 }
 single_match_else = { level = "allow", priority = 1 }
-struct_excessive_bools = { level = "allow", priority = 1 }
 struct_field_names = { level = "allow", priority = 1 }
 unnecessary_wraps = { level = "allow", priority = 1 }
 unused_async = { level = "allow", priority = 1 }
@ -971,13 +953,9 @@ style = { level = "warn", priority = -1 }
 # trivial assertions are quite alright
 assertions_on_constants = { level = "allow", priority = 1 }
 module_inception = { level = "allow", priority = 1 }
-obfuscated_if_else = { level = "allow", priority = 1 }

 ###################
 suspicious = { level = "warn", priority = -1 }

 ## some sadness
 let_underscore_future = { level = "allow", priority = 1 }
-
-# rust doesnt understand conduwuit's custom log macros
-literal_string_with_formatting_args = { level = "allow", priority = 1 }
--- a/README.md
+++ b/README.md
@ -1,16 +1,6 @@
 # conduwuit

-[![conduwuit main room](https://img.shields.io/matrix/conduwuit%3Apuppygock.gay?server_fqdn=matrix.transfem.dev&style=flat&logo=matrix&logoColor=%23f5b3ff&label=%23conduwuit%3Apuppygock.gay&color=%23f652ff)](https://matrix.to/#/#conduwuit:puppygock.gay) [![conduwuit space](https://img.shields.io/matrix/conduwuit-space%3Apuppygock.gay?server_fqdn=matrix.transfem.dev&style=flat&logo=matrix&logoColor=%23f5b3ff&label=%23conduwuit-space%3Apuppygock.gay&color=%23f652ff)](https://matrix.to/#/#conduwuit-space:puppygock.gay)
-
-[![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)
-
-![GitHub Repo stars](https://img.shields.io/github/stars/girlbossceo/conduwuit?style=flat&color=%23fcba03&link=https%3A%2F%2Fgithub.com%2Fgirlbossceo%2Fconduwuit) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/girlbossceo/conduwuit?style=flat&color=%2303fcb1&link=https%3A%2F%2Fgithub.com%2Fgirlbossceo%2Fconduwuit%2Fpulse%2Fmonthly) ![GitHub Created At](https://img.shields.io/github/created-at/girlbossceo/conduwuit) ![GitHub Sponsors](https://img.shields.io/github/sponsors/girlbossceo?color=%23fc03ba&link=https%3A%2F%2Fgithub.com%2Fsponsors%2Fgirlbossceo) ![GitHub License](https://img.shields.io/github/license/girlbossceo/conduwuit)
-
-
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/girlbossceo/conduwuit/latest?label=image%20size%20(latest)&link=https%3A%2F%2Fhub.docker.com%2Frepository%2Fdocker%2Fgirlbossceo%2Fconduwuit%2Ftags%3Fname%3Dlatest) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/girlbossceo/conduwuit/main?label=image%20size%20(main)&link=https%3A%2F%2Fhub.docker.com%2Frepository%2Fdocker%2Fgirlbossceo%2Fconduwuit%2Ftags%3Fname%3Dmain)
-
-
+[![conduwuit main room](https://img.shields.io/matrix/conduwuit%3Apuppygock.gay?server_fqdn=matrix.transfem.dev&style=flat&logo=matrix&logoColor=%23f5b3ff&label=%23conduwuit%3Apuppygock.gay&color=%23f652ff)](https://matrix.to/#/#conduwuit:puppygock.gay) [![conduwuit space](https://img.shields.io/matrix/conduwuit-space%3Apuppygock.gay?server_fqdn=matrix.transfem.dev&style=flat&logo=matrix&logoColor=%23f5b3ff&label=%23conduwuit-space%3Apuppygock.gay&color=%23f652ff)](https://matrix.to/#/#conduwuit-space:puppygock.gay) [![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 -->

@ -63,19 +53,6 @@ A lot of critical stability and performance issues have been fixed, and a lot of
 necessary groundwork has finished; making this project way better than it was
 back in the start at ~early 2024.

-#### Where is the differences page?
-
-conduwuit historically had a "differences" page that listed each and every single
-different thing about conduwuit from Conduit, as a way to promote and advertise
-conduwuit by showing significant amounts of work done. While this was feasible to
-maintain back when the project was new in early-2024, this became impossible
-very quickly and has unfortunately became heavily outdated, missing tons of things, etc.
-
-It's difficult to list out what we do differently, what are our notable features, etc
-when there's so many things and features and bug fixes and performance optimisations, 
-the list goes on. We simply recommend folks to just try out conduwuit, or ask us
-what features you are looking for and if they're implemented in conduwuit.
-
 #### How is conduwuit funded? Is conduwuit sustainable?

 conduwuit has no external funding. This is made possible purely in my freetime with
@ -87,15 +64,17 @@ and we have no plans in stopping or slowing down any time soon!

 #### Can I migrate or switch from Conduit?

-conduwuit had drop-in migration/replacement support for Conduit for about 12 months before
-bugs somewhere along the line broke it. Maintaining this has been difficult and
-the majority of Conduit users have already migrated, additionally debugging Conduit
-is not one of our interests, and so Conduit migration no longer works. We also
-feel that 12 months has been plenty of time for people to seamlessly migrate.
+conduwuit is a complete drop-in replacement for Conduit. As long as you are using RocksDB,
+the only "migration" you need to do is replace the binary or container image. There
+is no harm or additional steps required for using conduwuit. See the
+[Migrating from Conduit](https://conduwuit.puppyirl.gay/deploying/generic.html#migrating-from-conduit) section
+on the generic deploying guide.

-If you are a Conduit user looking to migrate, you will have to wipe and reset
-your database. We may fix seamless migration support at some point, but it's not an interest
-from us.
+Note that as of conduwuit version 0.5.0, backwards compatibility with Conduit is
+no longer supported. We only support migrating *from* Conduit, not back to
+Conduit like before. If you are truly finding yourself wanting to migrate back
+to Conduit, we would appreciate all your feedback and if we can assist with
+any issues or concerns.

 #### Can I migrate from Synapse or Dendrite?

@ -119,10 +98,9 @@ is the official project Matrix room. You can get support here, ask questions or
 concerns, get assistance setting up conduwuit, etc.

 This room should stay relevant and focused on conduwuit. An offtopic general
-chatter room can be found in the room topic there as well.
-
-Please keep the issue trackers focused on *actual* bug reports and enhancement requests.
+chatter room can be found there as well.

+Please keep the issue trackers focused on bug reports and enhancement requests.
 General support is extremely difficult to be offered over an issue tracker, and
 simple questions should be asked directly in an interactive platform like our
 Matrix room above as they can turn into a relevant discussion and/or may not be
@ -130,34 +108,24 @@ simple to answer. If you're not sure, just ask in the Matrix room.

 If you have a bug or feature to request: [Open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new)

-If you need to contact the primary maintainer, my contact methods are on my website: https://girlboss.ceo
-
 #### Donate

 conduwuit development is purely made possible by myself and contributors. I do
 not get paid to work on this, and I work on it in my free time. Donations are
 heavily appreciated! 💜🥺

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

 I do not and will not accept cryptocurrency donations, including things related.

-Note that donations will NOT guarantee you or give you any kind of tangible product,
-feature prioritisation, etc. By donating, you are agreeing that conduwuit is NOT
-going to provide you any goods or services as part of your donation, and this
-donation is purely a generous donation. We will not provide things like paid
-personal/direct support, feature request priority, merchandise, etc.
-
 #### Logo

 Original repo and Matrix room picture was from bran (<3). Current banner image
 and logo is directly from [this cohost
 post](https://web.archive.org/web/20241126004041/https://cohost.org/RatBaby/post/1028290-finally-a-flag-for).

-An SVG logo made by [@nktnet1](https://github.com/nktnet1) is available here: <https://github.com/girlbossceo/conduwuit/blob/main/docs/assets/>
-
 #### Is it conduwuit or Conduwuit?

 Both, but I prefer conduwuit.
--- a/arch/conduwuit.service
+++ b/arch/conduwuit.service
@ -4,24 +4,10 @@ Wants=network-online.target
 After=network-online.target
 Documentation=https://conduwuit.puppyirl.gay/
 RequiresMountsFor=/var/lib/private/conduwuit
-Alias=matrix-conduwuit.service

 [Service]
 DynamicUser=yes
-Type=notify-reload
-ReloadSignal=SIGUSR1
-
-TTYPath=/dev/tty25
-DeviceAllow=char-tty
-StandardInput=tty-force
-StandardOutput=tty
-StandardError=journal+console
-TTYReset=yes
-# uncomment to allow buffer to be cleared every restart
-TTYVTDisallocate=no
-
-TTYColumns=120
-TTYRows=40
+Type=notify

 AmbientCapabilities=
 CapabilityBoundingSet=
--- a/bin/complement
+++ b/bin/complement
@ -10,15 +10,15 @@ set -euo pipefail
 COMPLEMENT_SRC="${COMPLEMENT_SRC:-$1}"

 # A `.jsonl` file to write test logs to
-LOG_FILE="${2:-complement_test_logs.jsonl}"
+LOG_FILE="$2"

 # A `.jsonl` file to write test results to
-RESULTS_FILE="${3:-complement_test_results.jsonl}"
+RESULTS_FILE="$3"

-COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-complement-conduwuit:main}"
+OCI_IMAGE="complement-conduwuit:main"

-# Complement tests that are skipped due to flakiness/reliability issues or we don't implement such features and won't for a long time
-SKIPPED_COMPLEMENT_TESTS='TestPartialStateJoin.*|TestRoomDeleteAlias/Parallel/Regular_users_can_add_and_delete_aliases_when_m.*|TestRoomDeleteAlias/Parallel/Can_delete_canonical_alias|TestUnbanViaInvite.*|TestRoomState/Parallel/GET_/publicRooms_lists.*"|TestRoomDeleteAlias/Parallel/Users_with_sufficient_power-level_can_delete_other.*'
+# Complement tests that are skipped due to flakiness/reliability issues
+SKIPPED_COMPLEMENT_TESTS='-skip=TestClientSpacesSummary.*|TestJoinFederatedRoomFromApplicationServiceBridgeUser.*|TestJumpToDateEndpoint.*|TestUnbanViaInvite.*'

 # $COMPLEMENT_SRC needs to be a directory to Complement source code
 if [ -f "$COMPLEMENT_SRC" ]; then
@ -34,41 +34,19 @@ toplevel="$(git rev-parse --show-toplevel)"

 pushd "$toplevel" > /dev/null

-if [ ! -f "complement_oci_image.tar.gz" ]; then
-    echo "building complement conduwuit image"
+#bin/nix-build-and-cache just .#linux-complement
+bin/nix-build-and-cache just .#complement
+#nom build .#complement

-    # if using macOS, use linux-complement
-    #bin/nix-build-and-cache just .#linux-complement
-    bin/nix-build-and-cache just .#complement
-    #nix build -L .#complement
-
-    echo "complement conduwuit image tar.gz built at \"result\""
-
-    echo "loading into docker"
-    docker load < result
-    popd > /dev/null
-else
-    echo "skipping building a complement conduwuit image as complement_oci_image.tar.gz was already found, loading this"
-
-    docker load < complement_oci_image.tar.gz
-    popd > /dev/null
-fi
-
-echo ""
-echo "running go test with:"
-echo "\$COMPLEMENT_SRC: $COMPLEMENT_SRC"
-echo "\$COMPLEMENT_BASE_IMAGE: $COMPLEMENT_BASE_IMAGE"
-echo "\$RESULTS_FILE: $RESULTS_FILE"
-echo "\$LOG_FILE: $LOG_FILE"
-echo ""
+docker load < result
+popd > /dev/null

 # It's okay (likely, even) that `go test` exits nonzero
-# `COMPLEMENT_ENABLE_DIRTY_RUNS=1`  reuses the same complement container for faster complement, at the possible expense of test environment pollution
 set +o pipefail
 env \
    -C "$COMPLEMENT_SRC" \
-    COMPLEMENT_BASE_IMAGE="$COMPLEMENT_BASE_IMAGE" \
-    go test -tags="conduwuit_blacklist" -skip="$SKIPPED_COMPLEMENT_TESTS" -v -timeout 1h -json ./tests/... | tee "$LOG_FILE"
+    COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
+    go test -tags="conduwuit_blacklist" "$SKIPPED_COMPLEMENT_TESTS" -v -timeout 1h -json ./tests | tee "$LOG_FILE"
 set -o pipefail

 # Post-process the results into an easy-to-compare format, sorted by Test name for reproducible results
@ -78,18 +56,3 @@ cat "$LOG_FILE" | jq -s -c 'sort_by(.Test)[]' | jq -c '
        and .Test != null
    ) | {Action: .Action, Test: .Test}
    ' > "$RESULTS_FILE"
-
-#if command -v gotestfmt &> /dev/null; then
-#    echo "using gotestfmt on $LOG_FILE"
-#    grep '{"Time":' "$LOG_FILE" | gotestfmt > "complement_test_logs_gotestfmt.log"
-#fi
-
-echo ""
-echo ""
-echo "complement logs saved at $LOG_FILE"
-echo "complement results saved at $RESULTS_FILE"
-#if command -v gotestfmt &> /dev/null; then
-#    echo "complement logs in gotestfmt pretty format outputted at complement_test_logs_gotestfmt.log (use an editor/terminal/pager that interprets ANSI colours and UTF-8 emojis)"
-#fi
-echo ""
-echo ""
--- a/book.toml
+++ b/book.toml
@ -13,15 +13,12 @@ create-missing = true
 extra-watch-dirs = ["debian", "docs"]

 [rust]
-edition = "2024"
+edition = "2021"

 [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.redirect]
-"/differences.html" = "https://conduwuit.puppyirl.gay/#where-is-the-differences-page"
-
 [output.html.search]
 limit-results = 15
--- a/clippy.toml
+++ b/clippy.toml
@ -2,10 +2,9 @@ array-size-threshold = 4096
 cognitive-complexity-threshold = 94         # TODO reduce me ALARA
 excessive-nesting-threshold = 11            # TODO reduce me to 4 or 5
 future-size-threshold = 7745                # TODO reduce me ALARA
-stack-size-threshold = 196608               # TODO reduce me ALARA
+stack-size-threshold = 196608               # reduce me ALARA
 too-many-lines-threshold = 780              # TODO reduce me to <= 100
 type-complexity-threshold = 250             # reduce me to ~200
-large-error-threshold = 256                 # TODO reduce me ALARA

 disallowed-macros = [
 	{ path = "log::error", reason = "use conduwuit_core::error" },
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@ -195,6 +195,14 @@
 #
 #servernameevent_data_cache_capacity = varies by system

+# This item is undocumented. Please contribute documentation for it.
+#
+#server_visibility_cache_capacity = varies by system
+
+# This item is undocumented. Please contribute documentation for it.
+#
+#user_visibility_cache_capacity = varies by system
+
 # This item is undocumented. Please contribute documentation for it.
 #
 #stateinfo_cache_capacity = varies by system
@ -369,26 +377,6 @@
 #
 #pusher_idle_timeout = 15

-# Maximum time to receive a request from a client (seconds).
-#
-#client_receive_timeout = 75
-
-# Maximum time to process a request received from a client (seconds).
-#
-#client_request_timeout = 180
-
-# Maximum time to transmit a response to a client (seconds)
-#
-#client_response_timeout = 120
-
-# Grace period for clean shutdown of client requests (seconds).
-#
-#client_shutdown_timeout = 10
-
-# Grace period for clean shutdown of federation requests (seconds).
-#
-#sender_shutdown_timeout = 5
-
 # Enables registration. If set to false, no users can register on this
 # server.
 #
@ -418,9 +406,8 @@
 #
 #registration_token =

-# Path to a file on the system that gets read for additional registration
-# tokens. Multiple tokens can be added if you separate them with
-# whitespace
+# Path to a file on the system that gets read for the registration token.
+# this config option takes precedence/priority over "registration_token".
 #
 # conduwuit must be able to access the file, and it must not be empty
 #
@ -437,19 +424,10 @@
 #
 #allow_federation = true

-# Allows federation requests to be made to itself
-#
-# This isn't intended and is very likely a bug if federation requests are
-# being sent to yourself. This currently mainly exists for development
-# purposes.
+# This item is undocumented. Please contribute documentation for it.
 #
 #federation_loopback = false

-# Always calls /forget on behalf of the user if leaving a room. This is a
-# part of MSC4267 "Automatically forgetting rooms on leave"
-#
-#forget_forced_upon_leave = false
-
 # Set this to true to require authentication on the normally
 # unauthenticated profile retrieval endpoints (GET)
 # "/_matrix/client/v3/profile/{userId}".
@ -527,9 +505,9 @@

 # Default room version conduwuit will create rooms with.
 #
-# Per spec, room version 11 is the default.
+# Per spec, room version 10 is the default.
 #
-#default_room_version = 11
+#default_room_version = 10

 # This item is undocumented. Please contribute documentation for it.
 #
@ -594,7 +572,7 @@
 # Currently, conduwuit doesn't support inbound batched key requests, so
 # this list should only contain other Synapse servers.
 #
-# example: ["matrix.org", "tchncs.de"]
+# example: ["matrix.org", "envs.net", "constellatory.net", "tchncs.de"]
 #
 #trusted_servers = ["matrix.org"]

@ -822,7 +800,7 @@

 # Type of RocksDB database compression to use.
 #
-# Available options are "zstd", "bz2", "lz4", or "none".
+# Available options are "zstd", "zlib", "bz2", "lz4", or "none".
 #
 # It is best to use ZSTD as an overall good balance between
 # speed/performance, storage, IO amplification, and CPU usage. For more
@ -919,20 +897,6 @@
 #
 #rocksdb_paranoid_file_checks = false

-# Enables or disables checksum verification in rocksdb at runtime.
-# Checksums are usually hardware accelerated with low overhead; they are
-# enabled in rocksdb by default. Older or slower platforms may see gains
-# from disabling.
-#
-#rocksdb_checksums = true
-
-# Enables the "atomic flush" mode in rocksdb. This option is not intended
-# for users. It may be removed or ignored in future versions. Atomic flush
-# may be enabled by the paranoid to possibly improve database integrity at
-# the cost of performance.
-#
-#rocksdb_atomic_flush = false
-
 # Database repair mode (for RocksDB SST corruption).
 #
 # Use this option when the server reports corruption while running or
@ -1186,16 +1150,13 @@
 #
 #prune_missing_media = false

-# Vector list of regex patterns of server names that conduwuit will refuse
-# to download remote media from.
-#
-# example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"]
+# Vector list of servers that conduwuit will refuse to download remote
+# media from.
 #
 #prevent_media_downloads_from = []

-# List of forbidden server names via regex patterns that we will block
-# incoming AND outgoing federation with, and block client room joins /
-# remote user invites.
+# List of forbidden server names that we will block incoming AND outgoing
+# federation with, and block client room joins / remote user invites.
 #
 # This check is applied on the room ID, room alias, sender server name,
 # sender user's server name, inbound federation X-Matrix origin, and
@ -1203,15 +1164,11 @@
 #
 # Basically "global" ACLs.
 #
-# example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"]
-#
 #forbidden_remote_server_names = []

-# List of forbidden server names via regex patterns that we will block all
-# outgoing federated room directory requests for. Useful for preventing
-# our users from wandering into bad servers or spaces.
-#
-# example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"]
+# 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.
 #
 #forbidden_remote_room_directory_server_names = []

@ -1322,7 +1279,7 @@
 # used, and startup as warnings if any room aliases in your database have
 # a forbidden room alias/ID.
 #
-# example: ["19dollarfortnitecards", "b[4a]droom", "badphrase"]
+# example: ["19dollarfortnitecards", "b[4a]droom"]
 #
 #forbidden_alias_names = []

@ -1335,7 +1292,7 @@
 # startup as warnings if any local users in your database have a forbidden
 # username.
 #
-# example: ["administrator", "b[a4]dusernam[3e]", "badphrase"]
+# example: ["administrator", "b[a4]dusernam[3e]"]
 #
 #forbidden_usernames = []

@ -1398,13 +1355,6 @@
 #
 #admin_execute_errors_ignore = false

-# List of admin commands to execute on SIGUSR2.
-#
-# Similar to admin_execute, but these commands are executed when the
-# server receives SIGUSR2 on supporting platforms.
-#
-#admin_signal_execute = []
-
 # Controls the max log level for admin command log captures (logs
 # generated from running admin commands). Defaults to "info" on release
 # builds, else "debug" on debug builds.
@ -1567,11 +1517,6 @@
 #
 #listening = true

-# Enables configuration reload when the server receives SIGUSR1 on
-# supporting platforms.
-#
-#config_reload_signal = true
-
 [global.tls]

 # Path to a valid TLS certificate file.
@ -1622,21 +1567,3 @@
 # This item is undocumented. Please contribute documentation for it.
 #
 #support_mxid =
-
-[global.blurhashing]
-
-# blurhashing x component, 4 is recommended by https://blurha.sh/
-#
-#components_x = 4
-
-# blurhashing y component, 3 is recommended by https://blurha.sh/
-#
-#components_y = 3
-
-# Max raw size that the server will blurhash, this is the size of the
-# image after converting it to raw data, it should be higher than the
-# upload limit but not too high. The higher it is the higher the
-# potential load will be for clients requesting blurhashes. The default
-# is 33.55MB. Setting it to 0 disables blurhashing.
-#
-#blurhash_max_raw_size = 33554432
--- a/debian/conduwuit.service
+++ b/debian/conduwuit.service
@ -2,7 +2,6 @@
 Description=conduwuit Matrix homeserver
 Wants=network-online.target
 After=network-online.target
-Alias=matrix-conduwuit.service
 Documentation=https://conduwuit.puppyirl.gay/

 [Service]
--- a/deps/rust-rocksdb/Cargo.toml
+++ b/deps/rust-rocksdb/Cargo.toml
@ -0,0 +1,42 @@
+[package]
+name = "rust-rocksdb-uwu"
+categories.workspace = true
+description = "dylib wrapper for rust-rocksdb"
+edition = "2021"
+keywords.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+version = "0.0.1"
+
+[features]
+default = ["lz4", "zstd", "zlib", "bzip2"]
+jemalloc = ["rust-rocksdb/jemalloc"]
+io-uring = ["rust-rocksdb/io-uring"]
+valgrind = ["rust-rocksdb/valgrind"]
+snappy = ["rust-rocksdb/snappy"]
+lz4 = ["rust-rocksdb/lz4"]
+zstd = ["rust-rocksdb/zstd"]
+zlib = ["rust-rocksdb/zlib"]
+bzip2 = ["rust-rocksdb/bzip2"]
+rtti = ["rust-rocksdb/rtti"]
+mt_static = ["rust-rocksdb/mt_static"]
+multi-threaded-cf = ["rust-rocksdb/multi-threaded-cf"]
+serde1 = ["rust-rocksdb/serde1"]
+malloc-usable-size = ["rust-rocksdb/malloc-usable-size"]
+
+[dependencies.rust-rocksdb]
+git = "https://github.com/girlbossceo/rust-rocksdb-zaidoon1"
+rev = "1f032427d3a0e7b0f13c04b4e34712bd8610291b"
+#branch = "master"
+default-features = false
+
+[lib]
+path = "lib.rs"
+crate-type = [
+	"rlib",
+#	"dylib"
+]
+
+[lints]
+workspace = true
--- a/deps/rust-rocksdb/lib.rs
+++ b/deps/rust-rocksdb/lib.rs
@ -0,0 +1,62 @@
+pub use rust_rocksdb::*;
+
+#[cfg_attr(not(conduwuit_mods), link(name = "rocksdb"))]
+#[cfg_attr(conduwuit_mods, link(name = "rocksdb", kind = "static"))]
+unsafe extern "C" {
+	pub unsafe fn rocksdb_list_column_families();
+	pub unsafe fn rocksdb_logger_create_stderr_logger();
+	pub unsafe fn rocksdb_logger_create_callback_logger();
+	pub unsafe fn rocksdb_options_set_info_log();
+	pub unsafe fn rocksdb_get_options_from_string();
+	pub unsafe fn rocksdb_writebatch_create();
+	pub unsafe fn rocksdb_writebatch_destroy();
+	pub unsafe fn rocksdb_writebatch_put_cf();
+	pub unsafe fn rocksdb_writebatch_delete_cf();
+	pub unsafe fn rocksdb_iter_value();
+	pub unsafe fn rocksdb_iter_seek_to_last();
+	pub unsafe fn rocksdb_iter_seek_for_prev();
+	pub unsafe fn rocksdb_iter_seek_to_first();
+	pub unsafe fn rocksdb_iter_next();
+	pub unsafe fn rocksdb_iter_prev();
+	pub unsafe fn rocksdb_iter_seek();
+	pub unsafe fn rocksdb_iter_valid();
+	pub unsafe fn rocksdb_iter_get_error();
+	pub unsafe fn rocksdb_iter_key();
+	pub unsafe fn rocksdb_iter_destroy();
+	pub unsafe fn rocksdb_livefiles();
+	pub unsafe fn rocksdb_livefiles_count();
+	pub unsafe fn rocksdb_livefiles_destroy();
+	pub unsafe fn rocksdb_livefiles_column_family_name();
+	pub unsafe fn rocksdb_livefiles_name();
+	pub unsafe fn rocksdb_livefiles_size();
+	pub unsafe fn rocksdb_livefiles_level();
+	pub unsafe fn rocksdb_livefiles_smallestkey();
+	pub unsafe fn rocksdb_livefiles_largestkey();
+	pub unsafe fn rocksdb_livefiles_entries();
+	pub unsafe fn rocksdb_livefiles_deletions();
+	pub unsafe fn rocksdb_put_cf();
+	pub unsafe fn rocksdb_delete_cf();
+	pub unsafe fn rocksdb_get_pinned_cf();
+	pub unsafe fn rocksdb_create_column_family();
+	pub unsafe fn rocksdb_get_latest_sequence_number();
+	pub unsafe fn rocksdb_batched_multi_get_cf();
+	pub unsafe fn rocksdb_cancel_all_background_work();
+	pub unsafe fn rocksdb_repair_db();
+	pub unsafe fn rocksdb_list_column_families_destroy();
+	pub unsafe fn rocksdb_flush();
+	pub unsafe fn rocksdb_flush_wal();
+	pub unsafe fn rocksdb_open_column_families();
+	pub unsafe fn rocksdb_open_for_read_only_column_families();
+	pub unsafe fn rocksdb_open_as_secondary_column_families();
+	pub unsafe fn rocksdb_open_column_families_with_ttl();
+	pub unsafe fn rocksdb_open();
+	pub unsafe fn rocksdb_open_for_read_only();
+	pub unsafe fn rocksdb_open_with_ttl();
+	pub unsafe fn rocksdb_open_as_secondary();
+	pub unsafe fn rocksdb_write();
+	pub unsafe fn rocksdb_create_iterator_cf();
+	pub unsafe fn rocksdb_backup_engine_create_new_backup_flush();
+	pub unsafe fn rocksdb_backup_engine_options_create();
+	pub unsafe fn rocksdb_write_buffer_manager_destroy();
+	pub unsafe fn rocksdb_options_set_ttl();
+}
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -1,6 +1,7 @@
 # Summary

 - [Introduction](introduction.md)
+- [Differences from upstream Conduit](differences.md)
 - [Configuration](configuration.md)
  - [Examples](configuration/examples.md)
 - [Deploying](deploying.md)
--- a/docs/assets/conduwuit_logo.svg
+++ b/docs/assets/conduwuit_logo.svg
@ -1,36 +0,0 @@
-<svg
-  version="1.1"
-  id="Layer_1"
-  xmlns="http://www.w3.org/2000/svg"
-  x="0px"
-  y="0px"
-  width="100%"
-  viewBox="0 0 864 864"
-  enableBackground="new 0 0 864 864"
-  xmlSpace="preserve"
->
-  <path
-    fill="#EC008C"
-    opacity="1.000000"
-    stroke="none"
-    d="M0.999997,649.000000 C1.000000,433.052795 1.000000,217.105591 1.000000,1.079198 C288.876801,1.079198 576.753601,1.079198 865.000000,1.079198 C865.000000,73.025414 865.000000,145.051453 864.634888,217.500671 C852.362488,223.837280 840.447632,229.735275 828.549438,235.666794 C782.143677,258.801056 735.743225,281.945923 688.998657,304.980469 C688.122009,304.476532 687.580750,304.087708 687.053894,303.680206 C639.556946,266.944733 573.006775,291.446869 560.804199,350.179443 C560.141357,353.369446 559.717590,356.609131 559.195374,359.748962 C474.522705,359.748962 390.283478,359.748962 306.088135,359.748962 C298.804138,318.894806 265.253357,295.206024 231.834442,293.306793 C201.003021,291.554596 169.912033,310.230042 156.935104,338.792725 C149.905151,354.265930 147.884064,370.379944 151.151794,387.034515 C155.204453,407.689667 166.300507,423.954224 183.344437,436.516663 C181.938263,437.607025 180.887405,438.409576 179.849426,439.228516 C147.141953,465.032562 139.918045,510.888947 163.388611,545.322632 C167.274551,551.023804 172.285187,555.958313 176.587341,561.495728 C125.846893,587.012817 75.302292,612.295532 24.735992,637.534790 C16.874903,641.458496 8.914484,645.183228 0.999997,649.000000 z"
-  />
-  <path
-    fill="#000000"
-    opacity="1.000000"
-    stroke="none"
-    d="M689.340759,305.086823 C735.743225,281.945923 782.143677,258.801056 828.549438,235.666794 C840.447632,229.735275 852.362488,223.837280 864.634888,217.961929 C865.000000,433.613190 865.000000,649.226379 865.000000,864.919800 C577.000000,864.919800 289.000000,864.919800 1.000000,864.919800 C1.000000,793.225708 1.000000,721.576721 0.999997,649.463867 C8.914484,645.183228 16.874903,641.458496 24.735992,637.534790 C75.302292,612.295532 125.846893,587.012817 176.939667,561.513062 C178.543060,562.085083 179.606812,562.886414 180.667526,563.691833 C225.656799,597.853394 291.232574,574.487244 304.462524,519.579773 C304.989105,517.394409 305.501068,515.205505 305.984619,513.166748 C391.466370,513.166748 476.422729,513.166748 561.331177,513.166748 C573.857727,555.764343 608.978149,572.880920 638.519897,572.672791 C671.048340,572.443665 700.623230,551.730408 711.658752,520.910583 C722.546875,490.502106 715.037842,453.265564 682.776733,429.447052 C683.966064,428.506866 685.119507,427.602356 686.265320,426.688232 C712.934143,405.412262 723.011475,370.684631 711.897339,338.686676 C707.312805,325.487671 699.185303,314.725128 689.340759,305.086823 z"
-  />
-  <path
-    fill="#FEFBFC"
-    opacity="1.000000"
-    stroke="none"
-    d="M688.998657,304.980469 C699.185303,314.725128 707.312805,325.487671 711.897339,338.686676 C723.011475,370.684631 712.934143,405.412262 686.265320,426.688232 C685.119507,427.602356 683.966064,428.506866 682.776733,429.447052 C715.037842,453.265564 722.546875,490.502106 711.658752,520.910583 C700.623230,551.730408 671.048340,572.443665 638.519897,572.672791 C608.978149,572.880920 573.857727,555.764343 561.331177,513.166748 C476.422729,513.166748 391.466370,513.166748 305.984619,513.166748 C305.501068,515.205505 304.989105,517.394409 304.462524,519.579773 C291.232574,574.487244 225.656799,597.853394 180.667526,563.691833 C179.606812,562.886414 178.543060,562.085083 177.128418,561.264465 C172.285187,555.958313 167.274551,551.023804 163.388611,545.322632 C139.918045,510.888947 147.141953,465.032562 179.849426,439.228516 C180.887405,438.409576 181.938263,437.607025 183.344437,436.516663 C166.300507,423.954224 155.204453,407.689667 151.151794,387.034515 C147.884064,370.379944 149.905151,354.265930 156.935104,338.792725 C169.912033,310.230042 201.003021,291.554596 231.834442,293.306793 C265.253357,295.206024 298.804138,318.894806 306.088135,359.748962 C390.283478,359.748962 474.522705,359.748962 559.195374,359.748962 C559.717590,356.609131 560.141357,353.369446 560.804199,350.179443 C573.006775,291.446869 639.556946,266.944733 687.053894,303.680206 C687.580750,304.087708 688.122009,304.476532 688.998657,304.980469 M703.311279,484.370789 C698.954468,457.053253 681.951416,440.229645 656.413696,429.482330 C673.953552,421.977875 688.014709,412.074219 696.456482,395.642365 C704.862061,379.280853 706.487793,362.316345 700.947998,344.809204 C691.688965,315.548492 664.183716,296.954437 633.103516,298.838257 C618.467957,299.725372 605.538086,305.139557 594.588501,314.780121 C577.473999,329.848511 570.185486,349.121399 571.838501,371.750854 C479.166595,371.750854 387.082886,371.750854 294.582672,371.750854 C293.993011,354.662048 288.485260,339.622314 276.940491,327.118439 C265.392609,314.611176 251.082092,307.205322 234.093262,305.960541 C203.355347,303.708374 176.337585,320.898438 166.089890,348.816620 C159.557541,366.613007 160.527206,384.117401 168.756042,401.172516 C177.054779,418.372589 191.471954,428.832886 207.526581,435.632172 C198.407059,442.272583 188.815598,448.302246 180.383728,455.660675 C171.685028,463.251984 166.849655,473.658661 163.940216,484.838684 C161.021744,496.053375 161.212982,507.259705 164.178833,518.426208 C171.577927,546.284302 197.338104,566.588867 226.001465,567.336853 C240.828415,567.723816 254.357819,563.819092 266.385468,555.199646 C284.811554,541.994751 293.631104,523.530579 294.687347,501.238312 C387.354828,501.238312 479.461304,501.238312 571.531799,501.238312 C577.616638,543.189026 615.312866,566.342102 651.310059,559.044739 C684.973938,552.220398 708.263306,519.393127 703.311279,484.370789 z"
-  />
-  <path
-    fill="#EC008C"
-    opacity="1.000000"
-    stroke="none"
-    d="M703.401855,484.804718 C708.263306,519.393127 684.973938,552.220398 651.310059,559.044739 C615.312866,566.342102 577.616638,543.189026 571.531799,501.238312 C479.461304,501.238312 387.354828,501.238312 294.687347,501.238312 C293.631104,523.530579 284.811554,541.994751 266.385468,555.199646 C254.357819,563.819092 240.828415,567.723816 226.001465,567.336853 C197.338104,566.588867 171.577927,546.284302 164.178833,518.426208 C161.212982,507.259705 161.021744,496.053375 163.940216,484.838684 C166.849655,473.658661 171.685028,463.251984 180.383728,455.660675 C188.815598,448.302246 198.407059,442.272583 207.526581,435.632172 C191.471954,428.832886 177.054779,418.372589 168.756042,401.172516 C160.527206,384.117401 159.557541,366.613007 166.089890,348.816620 C176.337585,320.898438 203.355347,303.708374 234.093262,305.960541 C251.082092,307.205322 265.392609,314.611176 276.940491,327.118439 C288.485260,339.622314 293.993011,354.662048 294.582672,371.750854 C387.082886,371.750854 479.166595,371.750854 571.838501,371.750854 C570.185486,349.121399 577.473999,329.848511 594.588501,314.780121 C605.538086,305.139557 618.467957,299.725372 633.103516,298.838257 C664.183716,296.954437 691.688965,315.548492 700.947998,344.809204 C706.487793,362.316345 704.862061,379.280853 696.456482,395.642365 C688.014709,412.074219 673.953552,421.977875 656.413696,429.482330 C681.951416,440.229645 698.954468,457.053253 703.401855,484.804718 z"
-  />
-</svg>
--- a/docs/assets/gay
+++ b/docs/assets/gay
--- a/docs/deploying/generic.md
+++ b/docs/deploying/generic.md
@ -53,6 +53,28 @@ If wanting to build using standard Rust toolchains, make sure you install:

 You can build conduwuit using `cargo build --release --all-features`

+## Migrating from Conduit
+
+As mentioned in the README, there is little to no steps needed to migrate
+from Conduit. As long as you are using the RocksDB database backend, just
+replace the binary / container image / etc.
+
+**WARNING**: As of conduwuit 0.5.0, all database and backwards compatibility
+with Conduit is no longer supported. We only support migrating *from* Conduit,
+not back to Conduit like before. If you are truly finding yourself wanting to
+migrate back to Conduit, we would appreciate all your feedback and if we can
+assist with any issues or concerns.
+
+**Note**: If you are relying on Conduit's "automatic delegation" feature,
+this will **NOT** work on conduwuit and you must configure delegation manually.
+This is not a mistake and no support for this feature will be added.
+
+If you are using SQLite, you **MUST** migrate to RocksDB. You can use this
+tool to migrate from SQLite to RocksDB: <https://github.com/ShadowJonathan/conduit_toolbox/>
+
+See the `[global.well_known]` config section, or configure your web server
+appropriately to send the delegation responses.
+
 ## Adding a conduwuit user

 While conduwuit can run as any user it is better to use dedicated users for
@ -145,32 +167,25 @@ sudo chmod 700 /var/lib/conduwuit/

 ## Setting up the Reverse Proxy

-We recommend Caddy as a reverse proxy, as it is trivial to use, handling TLS certificates, reverse proxy headers, etc transparently with proper defaults.
-For other software, please refer to their respective documentation or online guides.
+Refer to the documentation or various guides online of your chosen reverse proxy
+software. There are many examples of basic Apache/Nginx reverse proxy setups
+out there.

-### Caddy
+A [Caddy](https://caddyserver.com/) example will be provided as this
+is the recommended reverse proxy for new users and is very trivial to use
+(handles TLS, reverse proxy headers, etc transparently with proper defaults).

-After installing Caddy via your preferred method, create `/etc/caddy/conf.d/conduwuit_caddyfile`
-and enter this (substitute for your server name).
+Lighttpd is not supported as it seems to mess with the `X-Matrix` Authorization
+header, making federation non-functional. If a workaround is found, feel free to share to get it added to the documentation here.

-```caddyfile
-your.server.name, your.server.name:8448 {
-    # TCP reverse_proxy
-    reverse_proxy 127.0.0.1:6167
-    # UNIX socket
-    #reverse_proxy unix//run/conduwuit/conduwuit.sock
-}
-```
+If using Apache, you need to use `nocanon` in your `ProxyPass` directive to prevent this (note that Apache isn't very good as a general reverse proxy and we discourage the usage of it if you can).

-That's it! Just start and enable the service and you're set.
+If using Nginx, you need to give conduwuit the request URI using `$request_uri`, or like so:
+- `proxy_pass http://127.0.0.1:6167$request_uri;`
+- `proxy_pass http://127.0.0.1:6167;`

-```bash
-sudo systemctl enable --now caddy
-```
-
-### Other Reverse Proxies
-
-As we would prefer our users to use Caddy, we will not provide configuration files for other proxys.
+Nginx users need to increase `client_max_body_size` (default is 1M) to match
+`max_request_size` defined in conduwuit.toml.

 You will need to reverse proxy everything under following routes:
 - `/_matrix/` - core Matrix C-S and S-S APIs
@ -193,19 +208,25 @@ Examples of delegation:
 - <https://puppygock.gay/.well-known/matrix/server>
 - <https://puppygock.gay/.well-known/matrix/client>

-For Apache and Nginx there are many examples available online.
+### Caddy

-Lighttpd is not supported as it seems to mess with the `X-Matrix` Authorization
-header, making federation non-functional. If a workaround is found, feel free to share to get it added to the documentation here.
+Create `/etc/caddy/conf.d/conduwuit_caddyfile` and enter this (substitute for
+your server name).

-If using Apache, you need to use `nocanon` in your `ProxyPass` directive to prevent httpd from messing with the `X-Matrix` header (note that Apache isn't very good as a general reverse proxy and we discourage the usage of it if you can).
+```caddyfile
+your.server.name, your.server.name:8448 {
+    # TCP reverse_proxy
+    127.0.0.1:6167
+    # UNIX socket
+    #reverse_proxy unix//run/conduwuit/conduwuit.sock
+}
+```

-If using Nginx, you need to give conduwuit the request URI using `$request_uri`, or like so:
- `proxy_pass http://127.0.0.1:6167$request_uri;`
- `proxy_pass http://127.0.0.1:6167;`
+That's it! Just start and enable the service and you're set.

-Nginx users need to increase `client_max_body_size` (default is 1M) to match
-`max_request_size` defined in conduwuit.toml.
+```bash
+sudo systemctl enable --now caddy
+```

 ## You're done

--- a/docs/development/hot_reload.md
+++ b/docs/development/hot_reload.md
@ -1,8 +1,5 @@
 # Hot Reloading ("Live" Development)

-Note that hot reloading has not been refactored in quite a while and is not
-guaranteed to work at this time.
-
 ### Summary

 When developing in debug-builds with the nightly toolchain, conduwuit is modular
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@ -5,11 +5,12 @@
 Have a look at [Complement's repository][complement] for an explanation of what
 it is.

-To test against Complement, with Nix (or [Lix](https://lix.systems) and
-[direnv installed and set up][direnv] (run `direnv allow` after setting up the hook), you can:
+To test against Complement, with Nix (or [Lix](https://lix.systems) and direnv
+installed and set up, you can:

-* Run `./bin/complement "$COMPLEMENT_SRC"` to build a Complement image, run
-the tests, and output the logs and results to the specified paths. This will also output the OCI image
+* Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl
+./path/to/results.jsonl` to build a Complement image, run the tests, and output
+the logs and results to the specified paths. This will also output the OCI image
 at `result`
 * Run `nix build .#complement` from the root of the repository to just build a
 Complement OCI image outputted to `result` (it's a `.tar.gz` file)
@ -17,15 +18,5 @@ Complement OCI image outputted to `result` (it's a `.tar.gz` file)
 output from the commit/revision you want to test (e.g. from main)
 [here][ci-workflows]

-If you want to use your own prebuilt OCI image (such as from our CI) without needing
-Nix installed, put the image at `complement_oci_image.tar.gz` in the root of the repo
-and run the script.
-
-If you're on macOS and need to build an image, run `nix build .#linux-complement`.
-
-We have a Complement fork as some tests have needed to be fixed. This can be found
-at: <https://github.com/girlbossceo/complement>
-
 [ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
 [complement]: https://github.com/matrix-org/complement
-[direnv]: https://direnv.net/docs/hook.html
--- a/docs/differences.md
+++ b/docs/differences.md
@ -0,0 +1,379 @@
+#### **Note: This list may not up to date. There are rapidly more and more
+improvements, fixes, changes, etc being made that it is becoming more difficult
+to maintain this list. I recommend that you give conduwuit a try and see the
+differences for yourself. If you have any concerns, feel free to join the
+conduwuit Matrix room and ask any pre-usage questions.**
+
+### list of features, bug fixes, etc that conduwuit does that Conduit does not
+
+Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
+
+## Performance
+
+- Concurrency support for individual homeserver key fetching for faster remote
+room joins and room joins that will error less frequently
+- Send `Cache-Control` response header with `immutable` and 1 year cache length
+for all media requests (download and thumbnail) to instruct clients to cache
+media, and reduce server load from media requests that could be otherwise cached
+- Add feature flags and config options to enable/build with zstd, brotli, and/or
+gzip HTTP body compression (response and request)
+- Eliminate all usage of the thread-blocking `getaddrinfo(3)` call upon DNS
+queries, significantly improving federation latency/ping and cache DNS results
+(NXDOMAINs, successful queries, etc) using hickory-dns / hickory-resolver
+- Enable HTTP/2 support on all requests
+- Vastly improve RocksDB default settings to use new features that help with
+performance significantly, uses settings tailored to SSDs, various ways to tweak
+RocksDB, and a conduwuit setting to tell RocksDB to use settings that are
+tailored to HDDs or slow spinning rust storage or buggy filesystems.
+- Implement database flush and cleanup conduwuit operations when using RocksDB
+- Implement RocksDB write buffer corking and coalescing in database write-heavy
+areas
+- Perform connection pooling and keepalives where necessary to significantly
+improve federation performance and latency
+- Various config options to tweak connection pooling, request timeouts,
+connection timeouts, DNS timeouts and settings, etc with good defaults which
+also help huge with performance via reusing connections and retrying where
+needed
+- Properly get and use the amount of parallelism / tokio workers
+- Implement building conduwuit with jemalloc (which extends to the RocksDB
+jemalloc feature for maximum gains) or hardened_malloc light variant, and
+io_uring support, and produce CI builds with jemalloc and io_uring by default
+for performance (Nix doesn't seem to build
+[hardened_malloc-rs](https://github.com/girlbossceo/hardened_malloc-rs)
+properly)
+- Add support for caching DNS results with hickory-dns / hickory-resolver in
+conduwuit (not a replacement for a proper resolver cache, but still far better
+than nothing), also properly falls back on TCP for UDP errors or if a SRV
+response is too large
+- Add config option for using DNS over TCP, and config option for controlling
+A/AAAA record lookup strategy (e.g. don't query AAAA records if you don't have
+IPv6 connectivity)
+- Overall significant database, Client-Server, and federation performance and
+latency improvements (check out the ping room leaderboards if you don't believe
+me :>)
+- Add config options for RocksDB compression and bottommost compression,
+including choosing the algorithm and compression level
+- Use [loole](https://github.com/mahdi-shojaee/loole) MPSC channels instead of
+tokio MPSC channels for huge performance boosts in sending channels (mainly
+relevant for federation) and presence channels
+- Use `tracing`/`log`'s `release_max_level_info` feature to improve performance,
+build speeds, binary size, and CPU usage in release builds by avoid compiling
+debug/trace log level macros that users will generally never use (can be
+disabled with a build-time feature flag)
+- Remove some unnecessary checks on EDU handling for incoming transactions,
+effectively speeding them up
+- Simplify, dedupe, etc huge chunks of the codebase, including some that were
+unnecessary overhead, binary bloats, or preventing compiler/linker optimisations
+- Implement zero-copy RocksDB database accessors, substantially improving
+performance caused by unnecessary memory allocations
+
+## General Fixes/Features
+
+- Add legacy Element client hack fixing password changes and deactivations on
+legacy Element Android/iOS due to usage of an unspecced `user` field for UIAA
+- Raise and improve all the various request timeouts making some things like
+room joins and client bugs error less or none at all than they should, and make
+them all user configurable
+- Add missing `reason` field to user ban events (`/ban`)
+- Safer and cleaner shutdowns across incoming/outgoing requests (graceful
+shutdown) and the database
+- Stop sending `make_join` requests on room joins if 15 servers respond with
+`M_UNSUPPORTED_ROOM_VERSION` or `M_INVALID_ROOM_VERSION`
+- Stop sending `make_join` requests if 50 servers cannot provide `make_join` for
+us
+- Respect *most* client parameters for `/media/` requests (`allow_redirect`
+still needs work)
+- Return joined member count of rooms for push rules/conditions instead of a
+hardcoded value of 10
+- Make `CONDUIT_CONFIG` optional, relevant for container users that configure
+only by environment variables and no longer need to set `CONDUIT_CONFIG` to an
+empty string.
+- Allow HEAD and PATCH (MSC4138) HTTP requests in CORS for clients (despite not
+being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need
+to behave the same as GET requests, Synapse supports HEAD requests)
+- Fix using conduwuit with flake-compat on NixOS
+- Resolve and remove some "features" from upstream that result in concurrency
+hazards, exponential backoff issues, or arbitrary performance limiters
+- Find more servers for outbound federation `/hierarchy` requests instead of
+just the room ID server name
+- Support for suggesting servers to join through at
+`/_matrix/client/v3/directory/room/{roomAlias}`
+- Support for suggesting servers to join through us at
+`/_matrix/federation/v1/query/directory`
+- Misc edge-case search fixes (e.g. potentially missing some events)
+- Misc `/sync` fixes (e.g. returning unnecessary data or incorrect/invalid
+responses)
+- Add `replaces_state` and `prev_sender` in `unsigned` for state event changes
+which primarily makes Element's "See history" button on a state event functional
+- Fix Conduit not allowing incoming federation requests for various world
+readable rooms
+- Fix Conduit not respecting the client-requested file name on media requests
+- Prevent sending junk / non-membership events to `/send_join` and `/send_leave`
+endpoints
+- Only allow the requested membership type on `/send_join` and `/send_leave`
+endpoints (e.g. don't allow leave memberships on join endpoints)
+- Prevent state key impersonation on `/send_join` and `/send_leave` endpoints
+- Validate `X-Matrix` origin and request body `"origin"` field on incoming
+transactions
+- Add `GET /_matrix/client/v1/register/m.login.registration_token/validity`
+endpoint
+- Explicitly define support for sliding sync at `/_matrix/client/versions`
+(`org.matrix.msc3575`)
+- Fix seeing empty status messages on user presences
+
+## Moderation
+
+- (Also see [Admin Room](#admin-room) for all the admin commands pertaining to
+moderation, there's a lot!)
+- Add support for room banning/blocking by ID using admin command
+- Add support for serving `support` well-known from `[global.well_known]`
+(MSC1929) (`/.well-known/matrix/support`)
+- Config option to forbid publishing rooms to the room directory
+(`lockdown_public_room_directory`) except for admins
+- Admin commands to delete room aliases and unpublish rooms from our room
+directory
+- For all
+[`/report`](https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3roomsroomidreporteventid)
+requests: check if the reported event ID belongs to the reported room ID, raise
+report reasoning character limit to 750, fix broken formatting, make a small
+delayed random response per spec suggestion on privacy, and check if the sender
+user is in the reported room.
+- Support blocking servers from downloading remote media from, returning a 404
+- Don't allow `m.call.invite` events to be sent in public rooms (prevents
+calling the entire room)
+- On new public room creations, only allow moderators to send `m.call.invite`,
+`org.matrix.msc3401.call`, and `org.matrix.msc3401.call.member` events to
+prevent unprivileged users from calling the entire room
+- Add support for a "global ACLs" feature (`forbidden_remote_server_names`) that
+blocks inbound remote room invites, room joins by room ID on server name, room
+joins by room alias on server name, incoming federated joins, and incoming
+federated room directory requests. This is very helpful for blocking servers
+that are purely toxic/bad and serve no value in allowing our users to suffer
+from things like room invite spam or such. Please note that this is not a
+substitute for room ACLs.
+- Add support for a config option to forbid our local users from sending
+federated room directory requests for
+(`forbidden_remote_room_directory_server_names`). Similar to above, useful for
+blocking servers that help prevent our users from wandering into bad areas of
+Matrix via room directories of those malicious servers.
+- Add config option for auto remediating/deactivating local non-admin users who
+attempt to join bad/forbidden rooms (`auto_deactivate_banned_room_attempts`)
+- Deactivating users will remove their profile picture, blurhash, display name,
+and leave all rooms by default just like Synapse and for additional privacy
+- Reject some EDUs from ACL'd users such as read receipts and typing indicators
+
+## Privacy/Security
+
+- Add config option for device name federation with a privacy-friendly default
+(disabled)
+- Add config option for requiring authentication to the `/publicRooms` endpoint
+(room directory) with a default enabled for privacy
+- Add config option for federating `/publicRooms` endpoint (room directory) to
+other servers with a default disabled for privacy
+- Uses proper `argon2` crate by RustCrypto instead of questionable `rust-argon2`
+crate
+- Generate passwords with 25 characters instead of 15
+- Config option `ip_range_denylist` to support refusing to send requests
+(typically federation) to specific IP ranges, typically RFC 1918, non-routable,
+testnet, etc addresses like Synapse for security (note: this is not a guaranteed
+protection, and you should be using a firewall with zones if you want guaranteed
+protection as doing this on the application level is prone to bypasses).
+- Config option to block non-admin users from sending room invites or receiving
+remote room invites. Admin users are still allowed.
+- Config option to disable incoming and/or outgoing remote read receipts
+- Config option to disable incoming and/or outgoing remote typing indicators
+- Config option to disable incoming, outgoing, and/or local presence and for
+timing out remote users
+- Sanitise file names for the `Content-Disposition` header for all media
+requests (thumbnails, downloads, uploads)
+- Media repository on handling `Content-Disposition` and `Content-Type` is fully
+spec compliant and secured
+- Send secure default HTTP headers such as a strong restrictive CSP (see
+MSC4149), deny iframes, disable `X-XSS-Protection`, disable interest cohort in
+`Permission-Policy`, etc to mitigate any potential attack surface such as from
+untrusted media
+
+## Administration/Logging
+
+- Commandline argument to specify the path to a config file instead of relying
+on `CONDUIT_CONFIG`
+- Revamped admin room infrastructure and commands
+- Substantially clean up, improve, and fix logging (less noisy dead server
+logging, registration attempts, more useful troubleshooting logging, proper
+error propagation, etc)
+- Configurable RocksDB logging (`LOG` files) with proper defaults (rotate, max
+size, verbosity, etc) to stop LOG files from accumulating so much
+- Explicit startup error if your configuration allows open registration without
+a token or such like Synapse with a way to bypass it if needed
+- Replace the lightning bolt emoji option with support for setting any arbitrary
+text (e.g. another emoji) to suffix to all new user registrations, with a
+conduwuit default of "🏳️‍⚧️"
+- Implement config option to auto join rooms upon registration
+- Warn on unknown config options specified
+- Add `/_conduwuit/server_version` route to return the version of conduwuit
+without relying on the federation API `/_matrix/federation/v1/version`
+- Add `/_conduwuit/local_user_count` route to return the amount of registered
+active local users on your homeserver *if federation is enabled*
+- Add configurable RocksDB recovery modes to aid in recovering corrupted RocksDB
+databases
+- Support config options via `CONDUWUIT_` prefix and accessing non-global struct
+config options with the `__` split (e.g. `CONDUWUIT_WELL_KNOWN__SERVER`)
+- Add support for listening on multiple TCP ports and multiple addresses
+- **Opt-in** Sentry.io telemetry and metrics, mainly used for crash reporting
+- Log the client IP on various requests such as registrations, banned room join
+attempts, logins, deactivations, federation transactions, etc
+- Fix Conduit dropping some remote server federation response errors
+
+## Maintenance/Stability
+
+- GitLab CI ported to GitHub Actions
+- Add support for the Matrix spec compliance test suite
+[Complement](https://github.com/matrix-org/complement/) via the Nix flake and
+various other fixes for it
+- Implement running and diff'ing Complement results in CI and error if any
+mismatch occurs to prevent large cases of conduwuit regressions
+- Repo is (officially) mirrored to GitHub, GitLab, git.gay, git.girlcock.ceo,
+sourcehut, and Codeberg (see README.md for their links)
+- Docker container images published to GitLab Container Registry, GitHub
+Container Registry, and Dockerhub
+- Extensively revamp the example config to be extremely helpful and useful to
+both new users and power users
+- Fixed every single clippy (default lints) and rustc warnings, including some
+that were performance related or potential safety issues / unsoundness
+- Add a **lot** of other clippy and rustc lints and a rustfmt.toml file
+- Repo uses [Renovate](https://docs.renovatebot.com/) and keeps ALL
+dependencies as up to date as possible
+- Purge unmaintained/irrelevant/broken database backends (heed, sled, persy) and
+other unnecessary code or overhead
+- webp support for images
+- Add cargo audit support to CI
+- Add documentation lints via lychee and markdownlint-cli to CI
+- CI tests for all sorts of feature matrixes (jemalloc, non-defaullt, all
+features, etc)
+- Add static and dynamic linking smoke tests in CI to prevent any potential
+linking regressions for Complement, static binaries, Nix devshells, etc
+- Add timestamp by commit date when building OCI images for keeping image build
+reproducibility and still have a meaningful "last modified date" for OCI image
+- Add timestamp by commit date via `SOURCE_DATE_EPOCH` for Debian packages
+- Startup check if conduwuit running in a container and is listening on
+127.0.0.1 (generally containers are using NAT networking and 0.0.0.0 is the
+intended listening address)
+- Add a panic catcher layer to return panic messages in HTTP responses if a
+panic occurs
+- Add full compatibility support for SHA256 media file names instead of base64
+file names to overcome filesystem file name length limitations (OS error file
+name too long) while still retaining upstream database compatibility
+- Remove SQLite support due to being very poor performance, difficult to
+maintain against RocksDB, and is a blocker to significantly improved database
+code
+
+## Admin Room
+
+- Add support for a console CLI interface that can issue admin commands and
+output them in your terminal
+- Add support for an admin-user-only commandline admin room interface that can
+be issued in any room with the `\\!admin` or `\!admin` prefix and returns the
+response as yourself in the same room
+- Add admin commands for uptime, server startup, server shutdown, and server
+restart
+- Fix admin room handler to not panic/crash if the admin room command response
+fails (e.g. too large message)
+- Add command to dynamically change conduwuit's tracing log level filter on the
+fly
+- Add admin command to fetch a server's `/.well-known/matrix/support` file
+- Add debug admin command to force update user device lists (could potentially
+resolve some E2EE flukes)
+- Implement **RocksDB online backups**, listing RocksDB backups, and listing
+database file counts all via admin commands
+- Add various database visibility commands such as being able to query the
+getters and iterators used in conduwuit, a very helpful online debugging utility
+- Forbid the admin room from being made public or world readable history
+- Add `!admin` as a way to call the admin bot
+- Extend clear cache admin command to support clearing more caches such as DNS
+and TLS name overrides
+- Admin debug command to send a federation request/ping to a server's
+`/_matrix/federation/v1/version` endpoint and measures the latency it took
+- 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 command to list all the rooms a local user is joined in
+- Add admin command to list joined members in a room
+- Add admin command to view the room topic of a room
+- 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, a `--force` flag to ignore errors, and support for reading `last
+modified time` instead of `creation time` for filesystems that don't support
+file created metadata
+- Add admin command to return a room's full/complete state
+- Admin debug command to fetch a PDU from a remote server and inserts it into
+our database/timeline as backfill
+- Add admin command to delete media via a specific MXC. This deletes the MXC
+from our database, and the file locally.
+- Add admin commands for banning (blocking) room IDs from our local users
+joining (admins are always allowed) and evicts all our local users from that
+room, in addition to bulk room banning support, and blocks room invites (remote
+and local) to the banned room, as a moderation feature
+- Add admin commands to output jemalloc memory stats and memory usage
+- Add admin command to get rooms a *remote* user shares with us
+- Add debug admin commands to get the earliest and latest PDU in a room
+- Add debug admin command to echo a message
+- Add admin command to insert rooms tags for a user, most useful for inserting
+the `m.server_notice` tag on your admin room to make it "persistent" in the
+"System Alerts" section of Element
+- Add experimental admin debug command for Dendrite's `AdminDownloadState`
+(`/admin/downloadState/{serverName}/{roomID}`) admin API endpoint to download
+and use a remote server's room state in the room
+- Disable URL previews by default in the admin room due to various command
+outputs having "URLs" in them that clients may needlessly render/request
+- Extend memory usage admin server command to support showing memory allocator
+stats such as jemalloc's
+- Add admin debug command to see memory allocator's full extended debug
+statistics such as jemalloc's
+
+## Misc
+
+- Add guest support for accessing TURN servers via `turn_allow_guests` like
+Synapse
+- Support for creating rooms with custom room IDs like Maunium Synapse
+(`room_id` request body field to `/createRoom`)
+- Query parameter `?format=event|content` for returning either the room state
+event's content (default) for the full room state event on
+`/_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see
+<https://github.com/matrix-org/matrix-spec/issues/1047>)
+- Send a User-Agent on all of our requests
+- Send `avatar_url` on invite room membership events/changes
+- Support sending [`well_known` response to client login
+responses](https://spec.matrix.org/v1.10/client-server-api/#post_matrixclientv3login)
+if using config option `[well_known.client]`
+- Implement `include_state` search criteria support for `/search` requests
+(response now can include room states)
+- Declare various missing Matrix versions and features at
+`/_matrix/client/versions`
+- Implement legacy Matrix `/v1/` media endpoints that some clients and servers
+may still call
+- Config option to change Conduit's behaviour of homeserver key fetching
+(`query_trusted_key_servers_first`). This option sets whether conduwuit will
+query trusted notary key servers first before the individual homeserver(s), or
+vice versa which may help in joining certain rooms.
+- Implement unstable MSC2666 support for querying mutual rooms with a user
+- Implement unstable MSC3266 room summary API support
+- Implement unstable MSC4125 support for specifying servers to join via on
+federated invites
+- Make conduwuit build and be functional under Nix + macOS
+- Log out all sessions after unsetting the emergency password
+- Assume well-knowns are broken if they exceed past 12288 characters.
+- Add support for listening on both HTTP and HTTPS if using direct TLS with
+conduwuit for usecases such as Complement
+- Add config option for disabling RocksDB Direct IO if needed
+- Add various documentation on maintaining conduwuit, using RocksDB online
+backups, some troubleshooting, using admin commands, moderation documentation,
+etc
+- (Developers): Add support for [hot reloadable/"live" modular
+development](development/hot_reload.md)
+- (Developers): Add support for tokio-console
+- (Developers): Add support for tracing flame graphs
+- No cryptocurrency donations allowed, conduwuit is fully maintained by
+independent queer maintainers, and with a strong priority on inclusitivity and
+comfort for protected groups 🏳️‍⚧️
+- [Add a community Code of Conduct for all conduwuit community spaces, primarily
+the Matrix space](https://conduwuit.puppyirl.gay/conduwuit_coc.html)
--- a/docs/introduction.md
+++ b/docs/introduction.md
@ -4,6 +4,10 @@

 {{#include ../README.md:body}}

+#### What's different about your fork than upstream Conduit?
+
+See the [differences](differences.md) page
+
 #### How can I deploy my own?

 - [Deployment options](deploying.md)
--- a/engage.toml
+++ b/engage.toml
@ -18,12 +18,12 @@ script = "direnv --version"
 [[task]]
 name = "rustc"
 group = "versions"
-script = "rustc --version -v"
+script = "rustc --version"

 [[task]]
 name = "cargo"
 group = "versions"
-script = "cargo --version -v"
+script = "cargo --version"

 [[task]]
 name = "cargo-fmt"
@ -60,10 +60,15 @@ name = "markdownlint"
 group = "versions"
 script = "markdownlint --version"

+[[task]]
+name = "dpkg"
+group = "versions"
+script = "dpkg --version"
+
 [[task]]
 name = "cargo-audit"
 group = "security"
-script = "cargo audit --color=always -D warnings -D unmaintained -D unsound -D yanked"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"

 [[task]]
 name = "cargo-fmt"
@ -81,7 +86,6 @@ env DIRENV_DEVSHELL=all-features \
    direnv exec . \
    cargo doc \
        --workspace \
-        --locked \
        --profile test \
        --all-features \
        --no-deps \
@ -96,8 +100,8 @@ script = """
 direnv exec . \
 cargo clippy \
    --workspace \
-    --locked \
    --profile test \
+    --all-targets \
    --color=always \
    -- \
    -D warnings
@ -111,8 +115,8 @@ env DIRENV_DEVSHELL=all-features \
    direnv exec . \
    cargo clippy \
        --workspace \
-        --locked \
        --profile test \
+        --all-targets \
        --all-features \
        --color=always \
        -- \
@ -120,37 +124,33 @@ env DIRENV_DEVSHELL=all-features \
 """

 [[task]]
-name = "clippy/no-features"
-group = "lints"
-script = """
-env DIRENV_DEVSHELL=no-features \
-    direnv exec . \
-    cargo clippy \
-        --workspace \
-        --locked \
-        --profile test \
-        --no-default-features \
-        --color=always \
-        -- \
-        -D warnings
-"""
-
-[[task]]
-name = "clippy/other-features"
+name = "clippy/jemalloc"
 group = "lints"
 script = """
 direnv exec . \
 cargo clippy \
    --workspace \
-    --locked \
    --profile test \
-    --no-default-features \
-    --features=console,systemd,element_hacks,direct_tls,perf_measurements,brotli_compression,blurhashing \
+    --features jemalloc \
+    --all-targets \
    --color=always \
    -- \
    -D warnings
 """

+#[[task]]
+#name = "clippy/hardened_malloc"
+#group = "lints"
+#script = """
+#cargo clippy \
+#    --workspace \
+#    --features hardened_malloc \
+#    --all-targets \
+#    --color=always \
+#    -- \
+#    -D warnings
+#"""
+
 [[task]]
 name = "lychee"
 group = "lints"
@ -161,6 +161,22 @@ name = "markdownlint"
 group = "lints"
 script = "markdownlint docs *.md || true" # TODO: fix the ton of markdown lints so we can drop `|| true`

+[[task]]
+name = "cargo/all"
+group = "tests"
+script = """
+env DIRENV_DEVSHELL=all-features \
+    direnv exec . \
+    cargo test \
+        --workspace \
+        --profile test \
+        --all-targets \
+        --all-features \
+        --color=always \
+        -- \
+        --color=always
+"""
+
 [[task]]
 name = "cargo/default"
 group = "tests"
@ -169,10 +185,8 @@ env DIRENV_DEVSHELL=default \
    direnv exec . \
    cargo test \
        --workspace \
-        --locked \
        --profile test \
        --all-targets \
-        --no-fail-fast \
        --color=always \
        -- \
        --color=always
@ -187,3 +201,22 @@ depends = ["cargo/default"]
 script = """
 git diff --exit-code conduwuit-example.toml
 """
+
+# Ensure that the flake's default output can build and run without crashing
+#
+# This is a dynamically-linked jemalloc build, which is a case not covered by
+# our other tests. We've had linking problems in the past with dynamic
+# jemalloc builds that usually show up as an immediate segfault or "invalid free"
+[[task]]
+name = "nix-default"
+group = "tests"
+script = """
+env DIRENV_DEVSHELL=dynamic \
+    CARGO_PROFILE="test" \
+    direnv exec . \
+    bin/nix-build-and-cache just .#default-test
+env DIRENV_DEVSHELL=dynamic \
+    CARGO_PROFILE="test" \
+    direnv exec . \
+    nix run -L .#default-test -- --help && nix run -L .#default-test -- --version
+"""
--- a/flake.lock
+++ b/flake.lock
@ -10,11 +10,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1738524606,
-        "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=",
+        "lastModified": 1731270564,
+        "narHash": "sha256-6KMC/NH/VWP5Eb+hA56hz0urel3jP6Y6cF2PX6xaTkk=",
        "owner": "zhaofengli",
        "repo": "attic",
-        "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e",
+        "rev": "47752427561f1c34debb16728a210d378f0ece36",
        "type": "github"
      },
      "original": {
@ -80,11 +80,11 @@
    "complement": {
      "flake": false,
      "locked": {
-        "lastModified": 1741891349,
-        "narHash": "sha256-YvrzOWcX7DH1drp5SGa+E/fc7wN3hqFtPbqPjZpOu1Q=",
+        "lastModified": 1734303596,
+        "narHash": "sha256-HjDRyLR4MBqQ3IjfMM6eE+8ayztXlbz3gXdyDmFla68=",
        "owner": "girlbossceo",
        "repo": "complement",
-        "rev": "e587b3df569cba411aeac7c20b6366d03c143745",
+        "rev": "14cc5be797b774f1a2b9f826f38181066d4952b8",
        "type": "github"
      },
      "original": {
@ -117,11 +117,11 @@
    },
    "crane_2": {
      "locked": {
-        "lastModified": 1739936662,
-        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
+        "lastModified": 1737689766,
+        "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
+        "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527",
        "type": "github"
      },
      "original": {
@ -170,11 +170,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1740724364,
-        "narHash": "sha256-D1jLIueJx1dPrP09ZZwTrPf4cubV+TsFMYbpYYTVj6A=",
+        "lastModified": 1737786656,
+        "narHash": "sha256-ubCW9Jy7ZUOF354bWxTgLDpVnTvIpNr6qR4H/j7I0oo=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "edf7d9e431cda8782e729253835f178a356d3aab",
+        "rev": "2f721f527886f801403f389a9cabafda8f1e3b7f",
        "type": "github"
      },
      "original": {
@ -364,11 +364,11 @@
    "liburing": {
      "flake": false,
      "locked": {
-        "lastModified": 1740613216,
-        "narHash": "sha256-NpPOBqNND3Qe9IwqYs0mJLGTmIx7e6FgUEBAnJ+1ZLA=",
+        "lastModified": 1737600516,
+        "narHash": "sha256-EKyLQ3pbcjoU5jH5atge59F4fzuhTsb6yalUj6Ve2t8=",
        "owner": "axboe",
        "repo": "liburing",
-        "rev": "e1003e496e66f9b0ae06674869795edf772d5500",
+        "rev": "6c509e2b0c881a13b83b259a221bf15fc9b3f681",
        "type": "github"
      },
      "original": {
@ -550,11 +550,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1740547748,
-        "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
+        "lastModified": 1737717945,
+        "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3a05eebede89661660945da1f151959900903b6a",
+        "rev": "ecd26a469ac56357fd333946a99086e992452b6a",
        "type": "github"
      },
      "original": {
@ -567,16 +567,16 @@
    "rocksdb": {
      "flake": false,
      "locked": {
-        "lastModified": 1741308171,
-        "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=",
+        "lastModified": 1737828695,
+        "narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=",
        "owner": "girlbossceo",
        "repo": "rocksdb",
-        "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986",
+        "rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c",
        "type": "github"
      },
      "original": {
        "owner": "girlbossceo",
-        "ref": "v9.11.1",
+        "ref": "v9.9.3",
        "repo": "rocksdb",
        "type": "github"
      }
@ -599,11 +599,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1740691488,
-        "narHash": "sha256-Fs6vBrByuiOf2WO77qeMDMTXcTGzrIMqLBv+lNeywwM=",
+        "lastModified": 1737728869,
+        "narHash": "sha256-U4pl3Hi0lT6GP4ecN3q9wdD2sdaKMbmD/5NJ1NdJ9AM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "fe3eda77d3a7ce212388bda7b6cec8bffcc077e5",
+        "rev": "6e4c29f7ce18cea7d3d31237a4661ab932eab636",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -9,7 +9,7 @@
    flake-utils.url = "github:numtide/flake-utils?ref=main";
    nix-filter.url = "github:numtide/nix-filter?ref=main";
    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable";
-    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.11.1"; flake = false; };
+    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.9.3"; flake = false; };
    liburing = { url = "github:axboe/liburing?ref=master"; flake = false; };
  };

@ -26,7 +26,7 @@
        file = ./rust-toolchain.toml;

        # See also `rust-toolchain.toml`
-        sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
+        sha256 = "sha256-lMLAupxng4Fd9F1oDw8gx+qA0RuF7ou7xhNU8wgs0PU=";
      };

      mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
@ -64,10 +64,8 @@
          patches = [];
          cmakeFlags = pkgs.lib.subtractLists
            [
-              # no real reason to have snappy or zlib, no one uses this
+              # no real reason to have snappy, no one uses this
              "-DWITH_SNAPPY=1"
-              "-DZLIB=1"
-              "-DWITH_ZLIB=1"
              # we dont need to use ldb or sst_dump (core_tools)
              "-DWITH_CORE_TOOLS=1"
              # we dont need to build rocksdb tests
@ -84,8 +82,6 @@
            ++ [
              # no real reason to have snappy, no one uses this
              "-DWITH_SNAPPY=0"
-              "-DZLIB=0"
-              "-DWITH_ZLIB=0"
              # we dont need to use ldb or sst_dump (core_tools)
              "-DWITH_CORE_TOOLS=0"
              # we dont need trace tools
@ -144,26 +140,23 @@
          toolchain
        ]
        ++ (with pkgsHost.pkgs; [
+          engage
+          cargo-audit
+
          # Required by hardened-malloc.rs dep
          binutils

-          cargo-audit
-          cargo-auditable
-
          # Needed for producing Debian packages
          cargo-deb

          # Needed for CI to check validity of produced Debian packages (dpkg-deb)
          dpkg

-	  engage
-
          # Needed for Complement
          go

          # Needed for our script for Complement
          jq
-          gotestfmt

          # Needed for finding broken markdown links
          lychee
@ -177,9 +170,20 @@
          # used for rust caching in CI to speed it up
          sccache
        ]
+        # valgrind is unavailable in static contexts
+        # used for CI and complement
+        ++ (if !stdenv.hostPlatform.isStatic then [ "valgrind" ] else [])
        # liburing is Linux-exclusive
        ++ lib.optional stdenv.hostPlatform.isLinux liburing
-        ++ lib.optional stdenv.hostPlatform.isLinux numactl)
+        # needed to build Rust applications on macOS
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+            # https://github.com/NixOS/nixpkgs/issues/206242
+            # ld: library not found for -liconv
+            libiconv
+            # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell
+            # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612
+            pkgsBuildHost.darwin.apple_sdk.frameworks.Security
+            ])
        ++ scope.main.buildInputs
        ++ scope.main.propagatedBuildInputs
        ++ scope.main.nativeBuildInputs;
--- a/nix/pkgs/complement/certificate.crt
+++ b/nix/pkgs/complement/certificate.crt
@ -1,21 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDfzCCAmegAwIBAgIUcrZdSPmCh33Evys/U6mTPpShqdcwDQYJKoZIhvcNAQEL
-BQAwPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQKDAx3b29mZXJz
-IGluYy4xDDAKBgNVBAMMA2hzMTAgFw0yNTAzMTMxMjU4NTFaGA8yMDUyMDcyODEy
-NTg1MVowPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQKDAx3b29m
-ZXJzIGluYy4xDDAKBgNVBAMMA2hzMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANL+h2ZmK/FqN5uLJPtIy6Feqcyb6EX7MQBEtxuJ56bTAbjHuCLZLpYt
-/wOWJ91drHqZ7Xd5iTisGdMu8YS803HSnHkzngf4VXKhVrdzW2YDrpZRxmOhtp88
-awOHmP7mqlJyBbCOQw8aDVrT0KmEIWzA7g+nFRQ5Ff85MaP+sQrHGKZbo61q8HBp
-L0XuaqNckruUKtxnEqrm5xx5sYyYKg7rrSFE5JMFoWKB1FNWJxyWT42BhGtnJZsK
-K5c+NDSOU4TatxoN6mpNSBpCz/a11PiQHMEfqRk6JA4g3911dqPTfZBevUdBh8gl
-8maIzqeZGhvyeKTmull1Y0781yyuj98CAwEAAaNxMG8wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBPAwNgYDVR0RBC8wLYIRKi5kb2NrZXIuaW50ZXJuYWyCA2hzMYIDaHMy
-ggNoczOCA2hzNIcEfwAAATAdBgNVHQ4EFgQUr4VYrmW1d+vjBTJewvy7fJYhLDYw
-DQYJKoZIhvcNAQELBQADggEBADkYqkjNYxjWX8hUUAmFHNdCwzT1CpYe/5qzLiyJ
-irDSdMlC5g6QqMUSrpu7nZxo1lRe1dXGroFVfWpoDxyCjSQhplQZgtYqtyLfOIx+
-HQ7cPE/tUU/KsTGc0aL61cETB6u8fj+rQKUGdfbSlm0Rpu4v0gC8RnDj06X/hZ7e
-VkWU+dOBzxlqHuLlwFFtVDgCyyTatIROx5V+GpMHrVqBPO7HcHhwqZ30k2kMM8J3
-y1CWaliQM85jqtSZV+yUHKQV8EksSowCFJuguf+Ahz0i0/koaI3i8m4MRN/1j13d
-jbTaX5a11Ynm3A27jioZdtMRty6AJ88oCp18jxVzqTxNNO4=
-----END CERTIFICATE-----
--- a/nix/pkgs/complement/config.toml
+++ b/nix/pkgs/complement/config.toml
@ -6,7 +6,7 @@ allow_public_room_directory_over_federation = true
 allow_public_room_directory_without_auth = true
 allow_registration = true
 database_path = "/database"
-log = "trace,h2=debug,hyper=debug"
+log = "trace,h2=warn,hyper=warn"
 port = [8008, 8448]
 trusted_servers = []
 only_query_trusted_key_servers = false
@ -19,20 +19,16 @@ url_preview_domain_explicit_denylist = ["*"]
 media_compat_file_link = false
 media_startup_check = true
 prune_missing_media = true
-log_colors = true
+log_colors = false
 admin_room_notices = false
 allow_check_for_updates = false
-intentionally_unknown_config_option_for_testing = true
-rocksdb_log_level = "info"
+rocksdb_log_level = "debug"
 rocksdb_max_log_files = 1
 rocksdb_recovery_mode = 0
 rocksdb_paranoid_file_checks = true
 log_guest_registrations = false
 allow_legacy_media = true
 startup_netburst = true
-startup_netburst_keep = -1
-
-allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure = true

 # valgrind makes things so slow
 dns_timeout = 60
@ -47,4 +43,6 @@ sender_idle_timeout = 300
 sender_retry_backoff_limit = 300

 [global.tls]
+certs = "/certificate.crt"
 dual_protocol = true
+key = "/private_key.key"
--- a/nix/pkgs/complement/default.nix
+++ b/nix/pkgs/complement/default.nix
@ -3,25 +3,36 @@
 , buildEnv
 , coreutils
 , dockerTools
+, gawk
 , lib
 , main
+, openssl
 , stdenv
 , tini
+, valgrind
 , writeShellScriptBin
 }:

 let
  main' = main.override {
-    profile = "test";
+    #profile = "test";
+    profile = "release-debuginfo";
    all_features = true;
    disable_release_max_log_level = true;
    disable_features = [
+        "jemalloc"
+        "jemalloc_stats"
+        "jemalloc_prof"
+        "jemalloc_conf"
+        "io_uring"
        # console/CLI stuff isn't used or relevant for complement
        "console"
        "tokio_console"
        # sentry telemetry isn't useful for complement, disabled by default anyways
        "sentry_telemetry"
        "perf_measurements"
+        # the containers don't use or need systemd signal support
+        #"systemd"
        # this is non-functional on nix for some reason
        "hardened_malloc"
        # dont include experimental features
@ -36,10 +47,74 @@ let
        "url_preview"
    ];
  };
+        # TODO: figure out why a suspicious amounnt of complement tests fail with valgrind only under complement.
+        # maybe issue with direct TLS mode?
+        #${lib.getExe' valgrind "valgrind"} \
+        #--leak-check=no \
+        #--undef-value-errors=no \
+        #--exit-on-first-error=yes \
+        #--error-exitcode=1 \

-  start = writeShellScriptBin "start" ''
+  # valgrind only works in non-static ocntexts
+  start = if !stdenv.hostPlatform.isStatic then writeShellScriptBin "start" ''
    set -euxo pipefail

+    ${lib.getExe openssl} genrsa -out private_key.key 2048
+    ${lib.getExe openssl} req \
+      -new \
+      -sha256 \
+      -key private_key.key \
+      -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=$SERVER_NAME" \
+      -out signing_request.csr
+    cp ${./v3.ext} v3.ext
+    echo "DNS.1 = $SERVER_NAME" >> v3.ext
+    echo "IP.1 = $(${lib.getExe gawk} 'END{print $1}' /etc/hosts)" \
+      >> v3.ext
+    ${lib.getExe openssl} x509 \
+      -req \
+      -extfile v3.ext \
+      -in signing_request.csr \
+      -CA /complement/ca/ca.crt \
+      -CAkey /complement/ca/ca.key \
+      -CAcreateserial \
+      -out certificate.crt \
+      -days 1 \
+      -sha256
+
+    ${lib.getExe' coreutils "env"} \
+      CONDUWUIT_SERVER_NAME="$SERVER_NAME" \
+      TMPDIR="/" \
+        ${lib.getExe' valgrind "valgrind"} \
+          --leak-check=no \
+          --undef-value-errors=no \
+          --exit-on-first-error=yes \
+          --error-exitcode=1 \
+            ${lib.getExe main'}
+  '' else writeShellScriptBin "start" ''
+    set -euxo pipefail
+
+    ${lib.getExe openssl} genrsa -out private_key.key 2048
+    ${lib.getExe openssl} req \
+      -new \
+      -sha256 \
+      -key private_key.key \
+      -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=$SERVER_NAME" \
+      -out signing_request.csr
+    cp ${./v3.ext} v3.ext
+    echo "DNS.1 = $SERVER_NAME" >> v3.ext
+    echo "IP.1 = $(${lib.getExe gawk} 'END{print $1}' /etc/hosts)" \
+      >> v3.ext
+    ${lib.getExe openssl} x509 \
+      -req \
+      -extfile v3.ext \
+      -in signing_request.csr \
+      -CA /complement/ca/ca.crt \
+      -CAkey /complement/ca/ca.key \
+      -CAcreateserial \
+      -out certificate.crt \
+      -days 1 \
+      -sha256
+
    ${lib.getExe' coreutils "env"} \
      CONDUWUIT_SERVER_NAME="$SERVER_NAME" \
      ${lib.getExe main'}
@ -60,6 +135,7 @@ dockerTools.buildImage {
      coreutils
      main'
      start
+      valgrind
    ];
  };

@ -75,8 +151,7 @@ dockerTools.buildImage {
      else [];

    Env = [
-      "CONDUWUIT_TLS__KEY=${./private_key.key}"
-      "CONDUWUIT_TLS__CERTS=${./certificate.crt}"
+      "SSL_CERT_FILE=/complement/ca/ca.crt"
      "CONDUWUIT_CONFIG=${./config.toml}"
      "RUST_BACKTRACE=full"
    ];
--- a/nix/pkgs/complement/private_key.key
+++ b/nix/pkgs/complement/private_key.key
@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDS/odmZivxajeb
-iyT7SMuhXqnMm+hF+zEARLcbieem0wG4x7gi2S6WLf8DlifdXax6me13eYk4rBnT
-LvGEvNNx0px5M54H+FVyoVa3c1tmA66WUcZjobafPGsDh5j+5qpScgWwjkMPGg1a
-09CphCFswO4PpxUUORX/OTGj/rEKxximW6OtavBwaS9F7mqjXJK7lCrcZxKq5ucc
-ebGMmCoO660hROSTBaFigdRTVicclk+NgYRrZyWbCiuXPjQ0jlOE2rcaDepqTUga
-Qs/2tdT4kBzBH6kZOiQOIN/ddXaj032QXr1HQYfIJfJmiM6nmRob8nik5rpZdWNO
-/Ncsro/fAgMBAAECggEAITCCkfv+a5I+vwvrPE/eIDso0JOxvNhfg+BLQVy3AMnu
-WmeoMmshZeREWgcTrEGg8QQnk4Sdrjl8MnkO6sddJ2luza3t7OkGX+q7Hk5aETkB
-DIo+f8ufU3sIhlydF3OnVSK0fGpUaBq8AQ6Soyeyrk3G5NVufmjgae5QPbDBnqUb
-piOGyfcwagL4JtCbZsMk8AT7vQSynLm6zaWsVzWNd71jummLqtVV063K95J9PqVN
-D8meEcP3WR5kQrvf+mgy9RVgWLRtVWN8OLZfJ9yrnl4Efj62elrldUj4jaCFezGQ
-8f0W+d8jjt038qhmEdymw2MWQ+X/b0R79lJar1Up8QKBgQD1DtHxauhl+JUoI3y+
-3eboqXl7YPJt1/GTnChb4b6D1Z1hvLsOKUa7hjGEfruYGbsWXBCRMICdfzp+iWcq
-/lEOp7/YU9OaW4lQMoG4sXMoBWd9uLgg0E+aH6VDJOBvxsfafqM4ufmtspzwEm90
-FU1cq6oImomFnPChSq4X+3+YpwKBgQDcalaK9llCcscWA8HAP8WVVNTjCOqiDp9q
-td61E9IO/FIB/gW5y+JkaFRrA2CN1zY3s3K92uveLTNYTArecWlDcPNNFDuaYu2M
-Roz4bC104HGh+zztJ0iPVzELL81Lgg6wHhLONN+eVi4gTftJxzJFXybyb+xVT25A
-91ynKXB+CQKBgQC+Ub43MoI+/6pHvBfb3FbDByvz6D0flgBmVXb6tP3TQYmzKHJV
-8zSd2wCGGC71V7Z3DRVIzVR1/SOetnPLbivhp+JUzfWfAcxI3pDksdvvjxLrDxTh
-VycbWcxtsywjY0w/ou581eLVRcygnpC0pP6qJCAwAmUfwd0YRvmiYo6cLQKBgHIW
-UIlJDdaJFmdctnLOD3VGHZMOUHRlYTqYvJe5lKbRD5mcZFZRI/OY1Ok3LEj+tj+K
-kL+YizHK76KqaY3N4hBYbHbfHCLDRfWvptQHGlg+vFJ9eoG+LZ6UIPyLV5XX0cZz
-KoS1dXG9Zc6uznzXsDucDsq6B/f4TzctUjXsCyARAoGAOKb4HtuNyYAW0jUlujR7
-IMHwUesOGlhSXqFtP9aTvk6qJgvV0+3CKcWEb4y02g+uYftP8BLNbJbIt9qOqLYh
-tOVyzCoamAi8araAhjA0w4dXvqDCDK7k/gZFkojmKQtRijoxTHnWcDc3vAjYCgaM
-9MVtdgSkuh2gwkD/mMoAJXM=
-----END PRIVATE KEY-----
--- a/nix/pkgs/complement/signing_request.csr
+++ b/nix/pkgs/complement/signing_request.csr
@ -1,16 +0,0 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIIChDCCAWwCAQAwPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQK
-DAx3b29mZXJzIGluYy4xDDAKBgNVBAMMA2hzMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANL+h2ZmK/FqN5uLJPtIy6Feqcyb6EX7MQBEtxuJ56bTAbjH
-uCLZLpYt/wOWJ91drHqZ7Xd5iTisGdMu8YS803HSnHkzngf4VXKhVrdzW2YDrpZR
-xmOhtp88awOHmP7mqlJyBbCOQw8aDVrT0KmEIWzA7g+nFRQ5Ff85MaP+sQrHGKZb
-o61q8HBpL0XuaqNckruUKtxnEqrm5xx5sYyYKg7rrSFE5JMFoWKB1FNWJxyWT42B
-hGtnJZsKK5c+NDSOU4TatxoN6mpNSBpCz/a11PiQHMEfqRk6JA4g3911dqPTfZBe
-vUdBh8gl8maIzqeZGhvyeKTmull1Y0781yyuj98CAwEAAaAAMA0GCSqGSIb3DQEB
-CwUAA4IBAQDR/gjfxN0IID1MidyhZB4qpdWn3m6qZnEQqoTyHHdWalbfNXcALC79
-ffS+Smx40N5hEPvqy6euR89N5YuYvt8Hs+j7aWNBn7Wus5Favixcm2JcfCTJn2R3
-r8FefuSs2xGkoyGsPFFcXE13SP/9zrZiwvOgSIuTdz/Pbh6GtEx7aV4DqHJsrXnb
-XuPxpQleoBqKvQgSlmaEBsJg13TQB+Fl2foBVUtqAFDQiv+RIuircf0yesMCKJaK
-MPH4Oo+r3pR8lI8ewfJPreRhCoV+XrGYMubaakz003TJ1xlOW8M+N9a6eFyMVh76
-U1nY/KP8Ua6Lgaj9PRz7JCRzNoshZID/
-----END CERTIFICATE REQUEST-----
--- a/nix/pkgs/complement/v3.ext
+++ b/nix/pkgs/complement/v3.ext
@ -4,9 +4,3 @@ keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
 subjectAltName = @alt_names

 [alt_names]
-DNS.1 = *.docker.internal
-DNS.2 = hs1
-DNS.3 = hs2
-DNS.4 = hs3
-DNS.5 = hs4
-IP.1 = 127.0.0.1
--- a/nix/pkgs/main/default.nix
+++ b/nix/pkgs/main/default.nix
@ -103,7 +103,6 @@ buildDepsOnlyEnv =
      ++ [ "-DPORTABLE=haswell" ]) else ([ "-DPORTABLE=1" ])
      )
      ++ old.cmakeFlags;
-
      # outputs has "tools" which we dont need or use
      outputs = [ "out" ];

@ -155,19 +154,25 @@ commonAttrs = {

      # Keep sorted
      include = [
-        ".cargo"
        "Cargo.lock"
        "Cargo.toml"
+        "deps"
        "src"
      ];
    };

-    doCheck = true;
+    # This is redundant with CI
+    doCheck = false;

+    cargoTestCommand = "cargo test --locked ";
    cargoExtraArgs = "--no-default-features --locked "
      + lib.optionalString
        (features'' != [])
        "--features " + (builtins.concatStringsSep "," features'');
+    cargoTestExtraArgs = "--no-default-features --locked "
+      + lib.optionalString
+        (features'' != [])
+        "--features " + (builtins.concatStringsSep "," features'');

    dontStrip = profile == "dev" || profile == "test";
    dontPatchELF = profile == "dev" || profile == "test";
@ -194,7 +199,17 @@ commonAttrs = {
      # differing values for `NIX_CFLAGS_COMPILE`, which contributes to spurious
      # rebuilds of bindgen and its depedents.
      jq
-  ];
+  ]
+  # needed to build Rust applications on macOS
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # https://github.com/NixOS/nixpkgs/issues/206242
+      # ld: library not found for -liconv
+      libiconv
+
+      # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell
+      # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612
+      pkgsBuildHost.darwin.apple_sdk.frameworks.Security
+    ];
 };
 in

@ -203,12 +218,18 @@ craneLib.buildPackage ( commonAttrs // {
    env = buildDepsOnlyEnv;
  });

-  doCheck = true;
+  # This is redundant with CI
+  doCheck = false;

+  cargoTestCommand = "cargo test --locked ";
  cargoExtraArgs = "--no-default-features --locked "
    + lib.optionalString
      (features'' != [])
      "--features " + (builtins.concatStringsSep "," features'');
+  cargoTestExtraArgs = "--no-default-features --locked "
+    + lib.optionalString
+      (features'' != [])
+      "--features " + (builtins.concatStringsSep "," features'');

  env = buildPackageEnv;

--- a/nix/pkgs/oci-image/default.nix
+++ b/nix/pkgs/oci-image/default.nix
@ -36,7 +36,6 @@ dockerTools.buildLayeredImage {
      "org.opencontainers.image.documentation" = "https://conduwuit.puppyirl.gay/";
      "org.opencontainers.image.licenses" = "Apache-2.0";
      "org.opencontainers.image.revision" = inputs.self.rev or inputs.self.dirtyRev or "";
-      "org.opencontainers.image.source" = "https://github.com/girlbossceo/conduwuit";
      "org.opencontainers.image.title" = main.pname;
      "org.opencontainers.image.url" = "https://conduwuit.puppyirl.gay/";
      "org.opencontainers.image.vendor" = "girlbossceo";
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@ -9,7 +9,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.

 [toolchain]
-channel = "1.86.0"
+channel = "1.84.0"
 profile = "minimal"
 components = [
    # For rust-analyzer
@ -24,6 +24,5 @@ targets = [
    "x86_64-unknown-linux-gnu",
    "x86_64-unknown-linux-musl",
    "aarch64-unknown-linux-musl",
-    "aarch64-unknown-linux-gnu",
    #"aarch64-apple-darwin",
 ]
--- a/rustfmt.toml
+++ b/rustfmt.toml
@ -2,7 +2,7 @@ array_width = 80
 chain_width = 60
 comment_width = 80
 condense_wildcard_suffixes = true
-style_edition = "2024"
+edition = "2024"
 fn_call_width = 80
 fn_single_line = true
 format_code_in_doc_comments = true
--- a/src/admin/admin.rs
+++ b/src/admin/admin.rs
@ -62,7 +62,7 @@ pub(super) async fn process(command: AdminCommand, context: &Command<'_>) -> Res
 		| Debug(command) => debug::process(command, context).await?,
 		| Query(command) => query::process(command, context).await?,
 		| Check(command) => check::process(command, context).await?,
-	}
+	};

 	Ok(())
 }
--- a/src/admin/appservice/commands.rs
+++ b/src/admin/appservice/commands.rs
@ -1,6 +1,6 @@
 use ruma::{api::appservice::Registration, events::room::message::RoomMessageEventContent};

-use crate::{Result, admin_command};
+use crate::{admin_command, Result};

 #[admin_command]
 pub(super) async fn register(&self) -> Result<RoomMessageEventContent> {
--- a/src/admin/command.rs
+++ b/src/admin/command.rs
@ -3,9 +3,9 @@ use std::{fmt, time::SystemTime};
 use conduwuit::Result;
 use conduwuit_service::Services;
 use futures::{
-	Future, FutureExt,
 	io::{AsyncWriteExt, BufWriter},
 	lock::Mutex,
+	Future, FutureExt,
 };
 use ruma::EventId;

@ -21,7 +21,7 @@ impl Command<'_> {
 	pub(crate) fn write_fmt(
 		&self,
 		arguments: fmt::Arguments<'_>,
-	) -> impl Future<Output = Result> + Send + '_ + use<'_> {
+	) -> impl Future<Output = Result> + Send + '_ {
 		let buf = format!("{arguments}");
 		self.output.lock().then(|mut output| async move {
 			output.write_all(buf.as_bytes()).await.map_err(Into::into)
--- a/src/admin/debug/commands.rs
+++ b/src/admin/debug/commands.rs
@ -6,21 +6,15 @@ use std::{
 };

 use conduwuit::{
-	Error, Result, debug_error, err, info,
-	matrix::pdu::{PduEvent, PduId, RawPduId},
-	trace, utils,
-	utils::{
-		stream::{IterStream, ReadyExt},
-		string::EMPTY,
-	},
-	warn,
+	debug_error, err, info, trace, utils, utils::string::EMPTY, warn, Error, PduEvent, PduId,
+	RawPduId, Result,
 };
-use futures::{FutureExt, StreamExt, TryStreamExt};
+use futures::{FutureExt, StreamExt};
 use ruma::{
-	CanonicalJsonObject, EventId, OwnedEventId, OwnedRoomOrAliasId, RoomId, RoomVersionId,
-	ServerName,
 	api::{client::error::ErrorKind, federation::event::get_room_state},
 	events::room::message::RoomMessageEventContent,
+	CanonicalJsonObject, EventId, OwnedEventId, OwnedRoomOrAliasId, RoomId, RoomVersionId,
+	ServerName,
 };
 use service::rooms::{
 	short::{ShortEventId, ShortRoomId},
@ -60,7 +54,7 @@ pub(super) async fn get_auth_chain(
 		.rooms
 		.auth_chain
 		.event_ids_iter(room_id, once(event_id.as_ref()))
-		.ready_filter_map(Result::ok)
+		.await?
 		.count()
 		.await;

@ -211,21 +205,18 @@ pub(super) async fn get_remote_pdu_list(

 	for pdu in list {
 		if force {
-			match self.get_remote_pdu(Box::from(pdu), server.clone()).await {
-				| Err(e) => {
-					failed_count = failed_count.saturating_add(1);
-					self.services
-						.admin
-						.send_message(RoomMessageEventContent::text_plain(format!(
-							"Failed to get remote PDU, ignoring error: {e}"
-						)))
-						.await
-						.ok();
-					warn!("Failed to get remote PDU, ignoring error: {e}");
-				},
-				| _ => {
-					success_count = success_count.saturating_add(1);
-				},
+			if let Err(e) = self.get_remote_pdu(Box::from(pdu), server.clone()).await {
+				failed_count = failed_count.saturating_add(1);
+				self.services
+					.admin
+					.send_message(RoomMessageEventContent::text_plain(format!(
+						"Failed to get remote PDU, ignoring error: {e}"
+					)))
+					.await
+					.ok();
+				warn!("Failed to get remote PDU, ignoring error: {e}");
+			} else {
+				success_count = success_count.saturating_add(1);
 			}
 		} else {
 			self.get_remote_pdu(Box::from(pdu), server.clone()).await?;
@ -336,10 +327,11 @@ pub(super) async fn get_room_state(
 		.services
 		.rooms
 		.state_accessor
-		.room_state_full_pdus(&room_id)
-		.map_ok(PduEvent::into_state_event)
-		.try_collect()
-		.await?;
+		.room_state_full(&room_id)
+		.await?
+		.values()
+		.map(PduEvent::to_state_event)
+		.collect();

 	if room_state.is_empty() {
 		return Ok(RoomMessageEventContent::text_plain(
@ -562,7 +554,7 @@ pub(super) async fn first_pdu_in_room(
 		.services
 		.rooms
 		.state_cache
-		.server_in_room(&self.services.server.name, &room_id)
+		.server_in_room(&self.services.server.config.server_name, &room_id)
 		.await
 	{
 		return Ok(RoomMessageEventContent::text_plain(
@ -591,7 +583,7 @@ pub(super) async fn latest_pdu_in_room(
 		.services
 		.rooms
 		.state_cache
-		.server_in_room(&self.services.server.name, &room_id)
+		.server_in_room(&self.services.server.config.server_name, &room_id)
 		.await
 	{
 		return Ok(RoomMessageEventContent::text_plain(
@ -621,7 +613,7 @@ pub(super) async fn force_set_room_state_from_server(
 		.services
 		.rooms
 		.state_cache
-		.server_in_room(&self.services.server.name, &room_id)
+		.server_in_room(&self.services.server.config.server_name, &room_id)
 		.await
 	{
 		return Ok(RoomMessageEventContent::text_plain(
@ -648,7 +640,6 @@ pub(super) async fn force_set_room_state_from_server(
 			room_id: room_id.clone().into(),
 			event_id: first_pdu.event_id.clone(),
 		})
-		.boxed()
 		.await?;

 	for pdu in remote_state_response.pdus.clone() {
@ -657,7 +648,6 @@ pub(super) async fn force_set_room_state_from_server(
 			.rooms
 			.event_handler
 			.parse_incoming_pdu(&pdu)
-			.boxed()
 			.await
 		{
 			| Ok(t) => t,
@ -721,7 +711,6 @@ pub(super) async fn force_set_room_state_from_server(
 		.rooms
 		.event_handler
 		.resolve_state(&room_id, &room_version, state)
-		.boxed()
 		.await?;

 	info!("Forcing new room state");
@ -767,7 +756,8 @@ pub(super) async fn get_signing_keys(
 	notary: Option<Box<ServerName>>,
 	query: bool,
 ) -> Result<RoomMessageEventContent> {
-	let server_name = server_name.unwrap_or_else(|| self.services.server.name.clone().into());
+	let server_name =
+		server_name.unwrap_or_else(|| self.services.server.config.server_name.clone().into());

 	if let Some(notary) = notary {
 		let signing_keys = self
@ -803,7 +793,8 @@ pub(super) async fn get_verify_keys(
 	&self,
 	server_name: Option<Box<ServerName>>,
 ) -> Result<RoomMessageEventContent> {
-	let server_name = server_name.unwrap_or_else(|| self.services.server.name.clone().into());
+	let server_name =
+		server_name.unwrap_or_else(|| self.services.server.config.server_name.clone().into());

 	let keys = self
 		.services
@ -833,7 +824,7 @@ pub(super) async fn resolve_true_destination(
 		));
 	}

-	if server_name == self.services.server.name {
+	if server_name == self.services.server.config.server_name {
 		return Ok(RoomMessageEventContent::text_plain(
 			"Not allowed to send federation requests to ourselves. Please use `get-pdu` for \
 			 fetching local PDUs.",
@ -957,57 +948,21 @@ pub(super) async fn database_stats(
 	property: Option<String>,
 	map: Option<String>,
 ) -> Result<RoomMessageEventContent> {
-	let map_name = map.as_ref().map_or(EMPTY, String::as_str);
 	let property = property.unwrap_or_else(|| "rocksdb.stats".to_owned());
-	self.services
-		.db
-		.iter()
-		.filter(|&(&name, _)| map_name.is_empty() || map_name == name)
-		.try_stream()
-		.try_for_each(|(&name, map)| {
-			let res = map.property(&property).expect("invalid property");
-			writeln!(self, "##### {name}:\n```\n{}\n```", res.trim())
-		})
-		.await?;
+	let map_name = map.as_ref().map_or(EMPTY, String::as_str);

-	Ok(RoomMessageEventContent::notice_plain(""))
-}
+	let mut out = String::new();
+	for (&name, map) in self.services.db.iter() {
+		if !map_name.is_empty() && map_name != name {
+			continue;
+		}

-#[admin_command]
-pub(super) async fn database_files(
-	&self,
-	map: Option<String>,
-	level: Option<i32>,
-) -> Result<RoomMessageEventContent> {
-	let mut files: Vec<_> = self.services.db.db.file_list().collect::<Result<_>>()?;
+		let res = map.property(&property)?;
+		let res = res.trim();
+		writeln!(out, "##### {name}:\n```\n{res}\n```")?;
+	}

-	files.sort_by_key(|f| f.name.clone());
-
-	writeln!(self, "| lev  | sst  | keys | dels | size | column |").await?;
-	writeln!(self, "| ---: | :--- | ---: | ---: | ---: | :---   |").await?;
-	files
-		.into_iter()
-		.filter(|file| {
-			map.as_deref()
-				.is_none_or(|map| map == file.column_family_name)
-		})
-		.filter(|file| level.as_ref().is_none_or(|&level| level == file.level))
-		.try_stream()
-		.try_for_each(|file| {
-			writeln!(
-				self,
-				"| {} | {:<13} | {:7}+ | {:4}- | {:9} | {} |",
-				file.level,
-				file.name,
-				file.num_entries,
-				file.num_deletions,
-				file.size,
-				file.column_family_name,
-			)
-		})
-		.await?;
-
-	Ok(RoomMessageEventContent::notice_plain(""))
+	Ok(RoomMessageEventContent::notice_markdown(out))
 }

 #[admin_command]
--- a/src/admin/debug/mod.rs
+++ b/src/admin/debug/mod.rs
@ -226,14 +226,6 @@ pub(super) enum DebugCommand {
 	/// - Trim memory usage
 	TrimMemory,

-	/// - List database files
-	DatabaseFiles {
-		map: Option<String>,
-
-		#[arg(long)]
-		level: Option<i32>,
-	},
-
 	/// - Developer test stubs
 	#[command(subcommand)]
 	#[allow(non_snake_case)]
--- a/src/admin/debug/tester.rs
+++ b/src/admin/debug/tester.rs
@ -1,7 +1,7 @@
 use conduwuit::Err;
 use ruma::events::room::message::RoomMessageEventContent;

-use crate::{Result, admin_command, admin_command_dispatch};
+use crate::{admin_command, admin_command_dispatch, Result};

 #[admin_command_dispatch]
 #[derive(Debug, clap::Subcommand)]
--- a/src/admin/federation/commands.rs
+++ b/src/admin/federation/commands.rs
@ -3,7 +3,7 @@ use std::fmt::Write;
 use conduwuit::Result;
 use futures::StreamExt;
 use ruma::{
-	OwnedRoomId, RoomId, ServerName, UserId, events::room::message::RoomMessageEventContent,
+	events::room::message::RoomMessageEventContent, OwnedRoomId, RoomId, ServerName, UserId,
 };

 use crate::{admin_command, get_room_info};
@ -92,7 +92,7 @@ pub(super) async fn remote_user_in_rooms(
 	&self,
 	user_id: Box<UserId>,
 ) -> Result<RoomMessageEventContent> {
-	if user_id.server_name() == self.services.server.name {
+	if user_id.server_name() == self.services.server.config.server_name {
 		return Ok(RoomMessageEventContent::text_plain(
 			"User belongs to our server, please use `list-joined-rooms` user admin command \
 			 instead.",
--- a/src/admin/media/commands.rs
+++ b/src/admin/media/commands.rs
@ -1,12 +1,12 @@
 use std::time::Duration;

 use conduwuit::{
-	Result, debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago,
+	debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago, Result,
 };
 use conduwuit_service::media::Dim;
 use ruma::{
-	EventId, Mxc, MxcUri, OwnedMxcUri, OwnedServerName, ServerName,
-	events::room::message::RoomMessageEventContent,
+	events::room::message::RoomMessageEventContent, EventId, Mxc, MxcUri, OwnedMxcUri,
+	OwnedServerName, ServerName,
 };

 use crate::{admin_command, utils::parse_local_user_id};
@ -41,106 +41,103 @@ pub(super) async fn delete(
 		let mut mxc_urls = Vec::with_capacity(4);

 		// parsing the PDU for any MXC URLs begins here
-		match self.services.rooms.timeline.get_pdu_json(&event_id).await {
-			| Ok(event_json) => {
-				if let Some(content_key) = event_json.get("content") {
-					debug!("Event ID has \"content\".");
-					let content_obj = content_key.as_object();
+		if let Ok(event_json) = self.services.rooms.timeline.get_pdu_json(&event_id).await {
+			if let Some(content_key) = event_json.get("content") {
+				debug!("Event ID has \"content\".");
+				let content_obj = content_key.as_object();

-					if let Some(content) = content_obj {
-						// 1. attempts to parse the "url" key
-						debug!("Attempting to go into \"url\" key for main media file");
-						if let Some(url) = content.get("url") {
-							debug!("Got a URL in the event ID {event_id}: {url}");
+				if let Some(content) = content_obj {
+					// 1. attempts to parse the "url" key
+					debug!("Attempting to go into \"url\" key for main media file");
+					if let Some(url) = content.get("url") {
+						debug!("Got a URL in the event ID {event_id}: {url}");

-							if url.to_string().starts_with("\"mxc://") {
-								debug!("Pushing URL {url} to list of MXCs to delete");
-								let final_url = url.to_string().replace('"', "");
-								mxc_urls.push(final_url);
+						if url.to_string().starts_with("\"mxc://") {
+							debug!("Pushing URL {url} to list of MXCs to delete");
+							let final_url = url.to_string().replace('"', "");
+							mxc_urls.push(final_url);
+						} else {
+							info!(
+								"Found a URL in the event ID {event_id} but did not start with \
+								 mxc://, ignoring"
+							);
+						}
+					}
+
+					// 2. attempts to parse the "info" key
+					debug!("Attempting to go into \"info\" key for thumbnails");
+					if let Some(info_key) = content.get("info") {
+						debug!("Event ID has \"info\".");
+						let info_obj = info_key.as_object();
+
+						if let Some(info) = info_obj {
+							if let Some(thumbnail_url) = info.get("thumbnail_url") {
+								debug!("Found a thumbnail_url in info key: {thumbnail_url}");
+
+								if thumbnail_url.to_string().starts_with("\"mxc://") {
+									debug!(
+										"Pushing thumbnail URL {thumbnail_url} to list of MXCs \
+										 to delete"
+									);
+									let final_thumbnail_url =
+										thumbnail_url.to_string().replace('"', "");
+									mxc_urls.push(final_thumbnail_url);
+								} else {
+									info!(
+										"Found a thumbnail URL in the event ID {event_id} but \
+										 did not start with mxc://, ignoring"
+									);
+								}
 							} else {
 								info!(
-									"Found a URL in the event ID {event_id} but did not start \
-									 with mxc://, ignoring"
+									"No \"thumbnail_url\" key in \"info\" key, assuming no \
+									 thumbnails."
 								);
 							}
 						}
+					}

-						// 2. attempts to parse the "info" key
-						debug!("Attempting to go into \"info\" key for thumbnails");
-						if let Some(info_key) = content.get("info") {
-							debug!("Event ID has \"info\".");
-							let info_obj = info_key.as_object();
+					// 3. attempts to parse the "file" key
+					debug!("Attempting to go into \"file\" key");
+					if let Some(file_key) = content.get("file") {
+						debug!("Event ID has \"file\".");
+						let file_obj = file_key.as_object();

-							if let Some(info) = info_obj {
-								if let Some(thumbnail_url) = info.get("thumbnail_url") {
-									debug!("Found a thumbnail_url in info key: {thumbnail_url}");
+						if let Some(file) = file_obj {
+							if let Some(url) = file.get("url") {
+								debug!("Found url in file key: {url}");

-									if thumbnail_url.to_string().starts_with("\"mxc://") {
-										debug!(
-											"Pushing thumbnail URL {thumbnail_url} to list of \
-											 MXCs to delete"
-										);
-										let final_thumbnail_url =
-											thumbnail_url.to_string().replace('"', "");
-										mxc_urls.push(final_thumbnail_url);
-									} else {
-										info!(
-											"Found a thumbnail URL in the event ID {event_id} \
-											 but did not start with mxc://, ignoring"
-										);
-									}
+								if url.to_string().starts_with("\"mxc://") {
+									debug!("Pushing URL {url} to list of MXCs to delete");
+									let final_url = url.to_string().replace('"', "");
+									mxc_urls.push(final_url);
 								} else {
 									info!(
-										"No \"thumbnail_url\" key in \"info\" key, assuming no \
-										 thumbnails."
+										"Found a URL in the event ID {event_id} but did not \
+										 start with mxc://, ignoring"
 									);
 								}
+							} else {
+								info!("No \"url\" key in \"file\" key.");
 							}
 						}
-
-						// 3. attempts to parse the "file" key
-						debug!("Attempting to go into \"file\" key");
-						if let Some(file_key) = content.get("file") {
-							debug!("Event ID has \"file\".");
-							let file_obj = file_key.as_object();
-
-							if let Some(file) = file_obj {
-								if let Some(url) = file.get("url") {
-									debug!("Found url in file key: {url}");
-
-									if url.to_string().starts_with("\"mxc://") {
-										debug!("Pushing URL {url} to list of MXCs to delete");
-										let final_url = url.to_string().replace('"', "");
-										mxc_urls.push(final_url);
-									} else {
-										info!(
-											"Found a URL in the event ID {event_id} but did not \
-											 start with mxc://, ignoring"
-										);
-									}
-								} else {
-									info!("No \"url\" key in \"file\" key.");
-								}
-							}
-						}
-					} else {
-						return Ok(RoomMessageEventContent::text_plain(
-							"Event ID does not have a \"content\" key or failed parsing the \
-							 event ID JSON.",
-						));
 					}
 				} else {
 					return Ok(RoomMessageEventContent::text_plain(
-						"Event ID does not have a \"content\" key, this is not a message or an \
-						 event type that contains media.",
+						"Event ID does not have a \"content\" key or failed parsing the event \
+						 ID JSON.",
 					));
 				}
-			},
-			| _ => {
+			} else {
 				return Ok(RoomMessageEventContent::text_plain(
-					"Event ID does not exist or is not known to us.",
+					"Event ID does not have a \"content\" key, this is not a message or an \
+					 event type that contains media.",
 				));
-			},
+			}
+		} else {
+			return Ok(RoomMessageEventContent::text_plain(
+				"Event ID does not exist or is not known to us.",
+			));
 		}

 		if mxc_urls.is_empty() {
--- a/src/admin/media/mod.rs
+++ b/src/admin/media/mod.rs
@ -1,4 +1,3 @@
-#![allow(rustdoc::broken_intra_doc_links)]
 mod commands;

 use clap::Subcommand;
@ -28,18 +27,18 @@ pub(super) enum MediaCommand {
 	DeleteList,

 	/// - Deletes all remote (and optionally local) media created before or
-	///   after [duration] time using filesystem metadata first created at date,
-	///   or fallback to last modified date. This will always ignore errors by
-	///   default.
+	///   after \[duration] time using filesystem metadata first created at
+	///   date, or fallback to last modified date. This will always ignore
+	///   errors by default.
 	DeletePastRemoteMedia {
 		/// - The relative time (e.g. 30s, 5m, 7d) within which to search
 		duration: String,

-		/// - Only delete media created before [duration] ago
+		/// - Only delete media created more recently than \[duration] ago
 		#[arg(long, short)]
 		before: bool,

-		/// - Only delete media created after [duration] ago
+		/// - Only delete media created after \[duration] ago
 		#[arg(long, short)]
 		after: bool,

--- a/src/admin/processor.rs
+++ b/src/admin/processor.rs
@ -8,7 +8,7 @@ use std::{

 use clap::{CommandFactory, Parser};
 use conduwuit::{
-	Error, Result, debug, error,
+	debug, error,
 	log::{
 		capture,
 		capture::Capture,
@ -16,24 +16,24 @@ use conduwuit::{
 	},
 	trace,
 	utils::string::{collect_stream, common_prefix},
-	warn,
+	warn, Error, Result,
 };
-use futures::{AsyncWriteExt, future::FutureExt, io::BufWriter};
+use futures::{future::FutureExt, io::BufWriter, AsyncWriteExt};
 use ruma::{
-	EventId,
 	events::{
 		relation::InReplyTo,
 		room::message::{Relation::Reply, RoomMessageEventContent},
 	},
+	EventId,
 };
 use service::{
-	Services,
 	admin::{CommandInput, CommandOutput, ProcessorFuture, ProcessorResult},
+	Services,
 };
 use tracing::Level;
-use tracing_subscriber::{EnvFilter, filter::LevelFilter};
+use tracing_subscriber::{filter::LevelFilter, EnvFilter};

-use crate::{Command, admin, admin::AdminCommand};
+use crate::{admin, admin::AdminCommand, Command};

 #[must_use]
 pub(super) fn complete(line: &str) -> String { complete_command(AdminCommand::command(), line) }
@ -91,7 +91,6 @@ async fn process_command(services: Arc<Services>, input: &CommandInput) -> Proce
 	}
 }

-#[allow(clippy::result_large_err)]
 fn handle_panic(error: &Error, command: &CommandInput) -> ProcessorResult {
 	let link =
 		"Please submit a [bug report](https://github.com/girlbossceo/conduwuit/issues/new). 🥺";
@ -101,7 +100,7 @@ fn handle_panic(error: &Error, command: &CommandInput) -> ProcessorResult {
 	Err(reply(content, command.reply_id.as_deref()))
 }

-/// Parse and process a message from the admin room
+// Parse and process a message from the admin room
 async fn process(
 	context: &Command<'_>,
 	command: AdminCommand,
@ -165,8 +164,7 @@ fn capture_create(context: &Command<'_>) -> (Arc<Capture>, Arc<Mutex<String>>) {
 	(capture, logs)
 }

-/// Parse chat messages from the admin room into an AdminCommand object
-#[allow(clippy::result_large_err)]
+// Parse chat messages from the admin room into an AdminCommand object
 fn parse<'a>(
 	services: &Arc<Services>,
 	input: &'a CommandInput,
@ -234,7 +232,7 @@ fn complete_command(mut cmd: clap::Command, line: &str) -> String {
 	ret.join(" ")
 }

-/// Parse chat messages from the admin room into an AdminCommand object
+// Parse chat messages from the admin room into an AdminCommand object
 fn parse_line(command_line: &str) -> Vec<String> {
 	let mut argv = command_line
 		.split_whitespace()
--- a/src/admin/query/account_data.rs
+++ b/src/admin/query/account_data.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
 use conduwuit::Result;
 use futures::StreamExt;
-use ruma::{RoomId, UserId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, RoomId, UserId};

 use crate::{admin_command, admin_command_dispatch};

@ -41,7 +41,7 @@ async fn changes_since(
 	let results: Vec<_> = self
 		.services
 		.account_data
-		.changes_since(room_id.as_deref(), &user_id, since, None)
+		.changes_since(room_id.as_deref(), &user_id, since)
 		.collect()
 		.await;
 	let query_time = timer.elapsed();
--- a/src/admin/query/raw.rs
+++ b/src/admin/query/raw.rs
@ -1,16 +1,16 @@
-use std::{borrow::Cow, collections::BTreeMap, ops::Deref, sync::Arc};
+use std::{borrow::Cow, collections::BTreeMap, ops::Deref};

 use clap::Subcommand;
 use conduwuit::{
-	Err, Result, apply, at, is_zero,
+	apply, at, is_zero,
 	utils::{
-		stream::{IterStream, ReadyExt, TryIgnore, TryParallelExt},
+		stream::{ReadyExt, TryIgnore, TryParallelExt},
 		string::EMPTY,
+		IterStream,
 	},
+	Err, Result,
 };
-use conduwuit_database::Map;
-use conduwuit_service::Services;
-use futures::{FutureExt, Stream, StreamExt, TryStreamExt};
+use futures::{FutureExt, StreamExt, TryStreamExt};
 use ruma::events::room::message::RoomMessageEventContent;
 use tokio::time::Instant;

@ -173,18 +173,22 @@ pub(super) async fn compact(
 ) -> Result<RoomMessageEventContent> {
 	use conduwuit_database::compact::Options;

-	let default_all_maps: Option<_> = map.is_none().then(|| {
-		self.services
-			.db
-			.keys()
-			.map(Deref::deref)
-			.map(ToOwned::to_owned)
-	});
+	let default_all_maps = map
+		.is_none()
+		.then(|| {
+			self.services
+				.db
+				.keys()
+				.map(Deref::deref)
+				.map(ToOwned::to_owned)
+		})
+		.into_iter()
+		.flatten();

 	let maps: Vec<_> = map
 		.unwrap_or_default()
 		.into_iter()
-		.chain(default_all_maps.into_iter().flatten())
+		.chain(default_all_maps)
 		.map(|map| self.services.db.get(&map))
 		.filter_map(Result::ok)
 		.cloned()
@ -234,8 +238,25 @@ pub(super) async fn raw_count(
 ) -> Result<RoomMessageEventContent> {
 	let prefix = prefix.as_deref().unwrap_or(EMPTY);

+	let default_all_maps = map
+		.is_none()
+		.then(|| self.services.db.keys().map(Deref::deref))
+		.into_iter()
+		.flatten();
+
+	let maps: Vec<_> = map
+		.iter()
+		.map(String::as_str)
+		.chain(default_all_maps)
+		.map(|map| self.services.db.get(map))
+		.filter_map(Result::ok)
+		.cloned()
+		.collect();
+
 	let timer = Instant::now();
-	let count = with_maps_or(map.as_deref(), self.services)
+	let count = maps
+		.iter()
+		.stream()
 		.then(|map| map.raw_count_prefix(&prefix))
 		.ready_fold(0_usize, usize::saturating_add)
 		.await;
@ -280,8 +301,25 @@ pub(super) async fn raw_keys_sizes(
 ) -> Result<RoomMessageEventContent> {
 	let prefix = prefix.as_deref().unwrap_or(EMPTY);

+	let default_all_maps = map
+		.is_none()
+		.then(|| self.services.db.keys().map(Deref::deref))
+		.into_iter()
+		.flatten();
+
+	let maps: Vec<_> = map
+		.iter()
+		.map(String::as_str)
+		.chain(default_all_maps)
+		.map(|map| self.services.db.get(map))
+		.filter_map(Result::ok)
+		.cloned()
+		.collect();
+
 	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
+	let result = maps
+		.iter()
+		.stream()
 		.map(|map| map.raw_keys_prefix(&prefix))
 		.flatten()
 		.ignore_err()
@ -308,8 +346,25 @@ pub(super) async fn raw_keys_total(
 ) -> Result<RoomMessageEventContent> {
 	let prefix = prefix.as_deref().unwrap_or(EMPTY);

+	let default_all_maps = map
+		.is_none()
+		.then(|| self.services.db.keys().map(Deref::deref))
+		.into_iter()
+		.flatten();
+
+	let maps: Vec<_> = map
+		.iter()
+		.map(String::as_str)
+		.chain(default_all_maps)
+		.map(|map| self.services.db.get(map))
+		.filter_map(Result::ok)
+		.cloned()
+		.collect();
+
 	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
+	let result = maps
+		.iter()
+		.stream()
 		.map(|map| map.raw_keys_prefix(&prefix))
 		.flatten()
 		.ignore_err()
@ -333,8 +388,25 @@ pub(super) async fn raw_vals_sizes(
 ) -> Result<RoomMessageEventContent> {
 	let prefix = prefix.as_deref().unwrap_or(EMPTY);

+	let default_all_maps = map
+		.is_none()
+		.then(|| self.services.db.keys().map(Deref::deref))
+		.into_iter()
+		.flatten();
+
+	let maps: Vec<_> = map
+		.iter()
+		.map(String::as_str)
+		.chain(default_all_maps)
+		.map(|map| self.services.db.get(map))
+		.filter_map(Result::ok)
+		.cloned()
+		.collect();
+
 	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
+	let result = maps
+		.iter()
+		.stream()
 		.map(|map| map.raw_stream_prefix(&prefix))
 		.flatten()
 		.ignore_err()
@ -362,8 +434,25 @@ pub(super) async fn raw_vals_total(
 ) -> Result<RoomMessageEventContent> {
 	let prefix = prefix.as_deref().unwrap_or(EMPTY);

+	let default_all_maps = map
+		.is_none()
+		.then(|| self.services.db.keys().map(Deref::deref))
+		.into_iter()
+		.flatten();
+
+	let maps: Vec<_> = map
+		.iter()
+		.map(String::as_str)
+		.chain(default_all_maps)
+		.map(|map| self.services.db.get(map))
+		.filter_map(Result::ok)
+		.cloned()
+		.collect();
+
 	let timer = Instant::now();
-	let result = with_maps_or(map.as_deref(), self.services)
+	let result = maps
+		.iter()
+		.stream()
 		.map(|map| map.raw_stream_prefix(&prefix))
 		.flatten()
 		.ignore_err()
@ -485,20 +574,3 @@ pub(super) async fn raw_maps(&self) -> Result<RoomMessageEventContent> {

 	Ok(RoomMessageEventContent::notice_markdown(format!("{list:#?}")))
 }
-
-fn with_maps_or<'a>(
-	map: Option<&'a str>,
-	services: &'a Services,
-) -> impl Stream<Item = &'a Arc<Map>> + Send + 'a {
-	let default_all_maps = map
-		.is_none()
-		.then(|| services.db.keys().map(Deref::deref))
-		.into_iter()
-		.flatten();
-
-	map.into_iter()
-		.chain(default_all_maps)
-		.map(|map| services.db.get(map))
-		.filter_map(Result::ok)
-		.stream()
-}
--- a/src/admin/query/resolver.rs
+++ b/src/admin/query/resolver.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
-use conduwuit::{Result, utils::time};
+use conduwuit::{utils::time, Result};
 use futures::StreamExt;
-use ruma::{OwnedServerName, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, OwnedServerName};

 use crate::{admin_command, admin_command_dispatch};

--- a/src/admin/query/room_state_cache.rs
+++ b/src/admin/query/room_state_cache.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
 use conduwuit::{Error, Result};
 use futures::StreamExt;
-use ruma::{RoomId, ServerName, UserId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName, UserId};

 use crate::Command;

--- a/src/admin/query/room_timeline.rs
+++ b/src/admin/query/room_timeline.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
-use conduwuit::{PduCount, Result, utils::stream::TryTools};
+use conduwuit::{utils::stream::TryTools, PduCount, Result};
 use futures::TryStreamExt;
-use ruma::{OwnedRoomOrAliasId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomOrAliasId};

 use crate::{admin_command, admin_command_dispatch};

--- a/src/admin/query/sending.rs
+++ b/src/admin/query/sending.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
 use conduwuit::Result;
 use futures::StreamExt;
-use ruma::{ServerName, UserId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, ServerName, UserId};
 use service::sending::Destination;

 use crate::Command;
--- a/src/admin/query/short.rs
+++ b/src/admin/query/short.rs
@ -1,6 +1,6 @@
 use clap::Subcommand;
 use conduwuit::Result;
-use ruma::{OwnedEventId, OwnedRoomOrAliasId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, OwnedEventId, OwnedRoomOrAliasId};

 use crate::{admin_command, admin_command_dispatch};

--- a/src/admin/query/users.rs
+++ b/src/admin/query/users.rs
@ -2,7 +2,7 @@ use clap::Subcommand;
 use conduwuit::Result;
 use futures::stream::StreamExt;
 use ruma::{
-	OwnedDeviceId, OwnedRoomId, OwnedUserId, events::room::message::RoomMessageEventContent,
+	events::room::message::RoomMessageEventContent, OwnedDeviceId, OwnedRoomId, OwnedUserId,
 };

 use crate::{admin_command, admin_command_dispatch};
@ -413,7 +413,7 @@ async fn get_to_device_events(
 	let result = self
 		.services
 		.users
-		.get_to_device_events(&user_id, &device_id, None, None)
+		.get_to_device_events(&user_id, &device_id)
 		.collect::<Vec<_>>()
 		.await;
 	let query_time = timer.elapsed();
--- a/src/admin/room/alias.rs
+++ b/src/admin/room/alias.rs
@ -4,10 +4,10 @@ use clap::Subcommand;
 use conduwuit::Result;
 use futures::StreamExt;
 use ruma::{
-	OwnedRoomAliasId, OwnedRoomId, RoomId, events::room::message::RoomMessageEventContent,
+	events::room::message::RoomMessageEventContent, OwnedRoomAliasId, OwnedRoomId, RoomId,
 };

-use crate::{Command, escape_html};
+use crate::{escape_html, Command};

 #[derive(Debug, Subcommand)]
 pub(crate) enum RoomAliasCommand {
@ -66,14 +66,13 @@ pub(super) async fn reprocess(
 				format!("#{}:{}", room_alias_localpart, services.globals.server_name());
 			let room_alias = match OwnedRoomAliasId::parse(room_alias_str) {
 				| Ok(alias) => alias,
-				| Err(err) => {
+				| Err(err) =>
 					return Ok(RoomMessageEventContent::text_plain(format!(
 						"Failed to parse alias: {err}"
-					)));
-				},
+					))),
 			};
 			match command {
-				| RoomAliasCommand::Set { force, room_id, .. } => {
+				| RoomAliasCommand::Set { force, room_id, .. } =>
 					match (force, services.rooms.alias.resolve_local_alias(&room_alias).await) {
 						| (true, Ok(id)) => {
 							match services.rooms.alias.set_alias(
@ -107,9 +106,8 @@ pub(super) async fn reprocess(
 								))),
 							}
 						},
-					}
-				},
-				| RoomAliasCommand::Remove { .. } => {
+					},
+				| RoomAliasCommand::Remove { .. } =>
 					match services.rooms.alias.resolve_local_alias(&room_alias).await {
 						| Ok(id) => match services
 							.rooms
@ -126,17 +124,15 @@ pub(super) async fn reprocess(
 						},
 						| Err(_) =>
 							Ok(RoomMessageEventContent::text_plain("Alias isn't in use.")),
-					}
-				},
-				| RoomAliasCommand::Which { .. } => {
+					},
+				| RoomAliasCommand::Which { .. } =>
 					match services.rooms.alias.resolve_local_alias(&room_alias).await {
 						| Ok(id) => Ok(RoomMessageEventContent::text_plain(format!(
 							"Alias resolves to {id}"
 						))),
 						| Err(_) =>
 							Ok(RoomMessageEventContent::text_plain("Alias isn't in use.")),
-					}
-				},
+					},
 				| RoomAliasCommand::List { .. } => unreachable!(),
 			}
 		},
--- a/src/admin/room/commands.rs
+++ b/src/admin/room/commands.rs
@ -1,8 +1,8 @@
 use conduwuit::Result;
 use futures::StreamExt;
-use ruma::{OwnedRoomId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId};

-use crate::{PAGE_SIZE, admin_command, get_room_info};
+use crate::{admin_command, get_room_info, PAGE_SIZE};

 #[admin_command]
 pub(super) async fn list_rooms(
@ -42,7 +42,7 @@ pub(super) async fn list_rooms(

 	if rooms.is_empty() {
 		return Ok(RoomMessageEventContent::text_plain("No more rooms."));
-	}
+	};

 	let output_plain = format!(
 		"Rooms ({}):\n```\n{}\n```",
--- a/src/admin/room/directory.rs
+++ b/src/admin/room/directory.rs
@ -1,9 +1,9 @@
 use clap::Subcommand;
 use conduwuit::Result;
 use futures::StreamExt;
-use ruma::{RoomId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, RoomId};

-use crate::{Command, PAGE_SIZE, get_room_info};
+use crate::{get_room_info, Command, PAGE_SIZE};

 #[derive(Debug, Subcommand)]
 pub(crate) enum RoomDirectoryCommand {
@ -67,7 +67,7 @@ pub(super) async fn reprocess(

 			if rooms.is_empty() {
 				return Ok(RoomMessageEventContent::text_plain("No more rooms."));
-			}
+			};

 			let output = format!(
 				"Rooms (page {page}):\n```\n{}\n```",
--- a/src/admin/room/info.rs
+++ b/src/admin/room/info.rs
@ -1,7 +1,7 @@
 use clap::Subcommand;
-use conduwuit::{Result, utils::ReadyExt};
+use conduwuit::{utils::ReadyExt, Result};
 use futures::StreamExt;
-use ruma::{RoomId, events::room::message::RoomMessageEventContent};
+use ruma::{events::room::message::RoomMessageEventContent, RoomId};

 use crate::{admin_command, admin_command_dispatch};

--- a/src/admin/room/moderation.rs
+++ b/src/admin/room/moderation.rs
@ -1,14 +1,14 @@
 use api::client::leave_room;
 use clap::Subcommand;
 use conduwuit::{
-	Result, debug,
+	debug, error, info,
 	utils::{IterStream, ReadyExt},
-	warn,
+	warn, Result,
 };
 use futures::StreamExt;
 use ruma::{
-	OwnedRoomId, RoomAliasId, RoomId, RoomOrAliasId,
-	events::room::message::RoomMessageEventContent,
+	events::room::message::RoomMessageEventContent, OwnedRoomId, RoomAliasId, RoomId,
+	RoomOrAliasId,
 };

 use crate::{admin_command, admin_command_dispatch, get_room_info};
@ -17,23 +17,51 @@ use crate::{admin_command, admin_command_dispatch, get_room_info};
 #[derive(Debug, Subcommand)]
 pub(crate) enum RoomModerationCommand {
 	/// - Bans a room from local users joining and evicts all our local users
-	///   (including server
-	/// admins)
 	///   from the room. Also blocks any invites (local and remote) for the
-	///   banned room, and disables federation entirely with it.
+	///   banned room.
+	///
+	/// Server admins (users in the conduwuit admin room) will not be evicted
+	/// and server admins can still join the room. To evict admins too, use
+	/// --force (also ignores errors) To disable incoming federation of the
+	/// room, use --disable-federation
 	BanRoom {
+		#[arg(short, long)]
+		/// Evicts admins out of the room and ignores any potential errors when
+		/// making our local users leave the room
+		force: bool,
+
+		#[arg(long)]
+		/// Disables incoming federation of the room after banning and evicting
+		/// users
+		disable_federation: bool,
+
 		/// The room in the format of `!roomid:example.com` or a room alias in
 		/// the format of `#roomalias:example.com`
 		room: Box<RoomOrAliasId>,
 	},

 	/// - Bans a list of rooms (room IDs and room aliases) from a newline
-	///   delimited codeblock similar to `user deactivate-all`. Applies the same
-	///   steps as ban-room
-	BanListOfRooms,
+	///   delimited codeblock similar to `user deactivate-all`
+	BanListOfRooms {
+		#[arg(short, long)]
+		/// Evicts admins out of the room and ignores any potential errors when
+		/// making our local users leave the room
+		force: bool,
+
+		#[arg(long)]
+		/// Disables incoming federation of the room after banning and evicting
+		/// users
+		disable_federation: bool,
+	},

 	/// - Unbans a room to allow local users to join again
+	///
+	/// To re-enable incoming federation of the room, use --enable-federation
 	UnbanRoom {
+		#[arg(long)]
+		/// Enables incoming federation of the room after unbanning
+		enable_federation: bool,
+
 		/// The room in the format of `!roomid:example.com` or a room alias in
 		/// the format of `#roomalias:example.com`
 		room: Box<RoomOrAliasId>,
@ -49,7 +77,12 @@ pub(crate) enum RoomModerationCommand {
 }

 #[admin_command]
-async fn ban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventContent> {
+async fn ban_room(
+	&self,
+	force: bool,
+	disable_federation: bool,
+	room: Box<RoomOrAliasId>,
+) -> Result<RoomMessageEventContent> {
 	debug!("Got room alias or ID: {}", room);

 	let admin_room_alias = &self.services.globals.admin_alias;
@ -63,13 +96,12 @@ async fn ban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventCon
 	let room_id = if room.is_room_id() {
 		let room_id = match RoomId::parse(&room) {
 			| Ok(room_id) => room_id,
-			| Err(e) => {
+			| Err(e) =>
 				return Ok(RoomMessageEventContent::text_plain(format!(
 					"Failed to parse room ID {room}. Please note that this requires a full room \
 					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
 					 (`#roomalias:example.com`): {e}"
-				)));
-			},
+				))),
 		};

 		debug!("Room specified is a room ID, banning room ID");
@ -79,13 +111,12 @@ async fn ban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventCon
 	} else if room.is_room_alias_id() {
 		let room_alias = match RoomAliasId::parse(&room) {
 			| Ok(room_alias) => room_alias,
-			| Err(e) => {
+			| Err(e) =>
 				return Ok(RoomMessageEventContent::text_plain(format!(
 					"Failed to parse room ID {room}. Please note that this requires a full room \
 					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
 					 (`#roomalias:example.com`): {e}"
-				)));
-			},
+				))),
 		};

 		debug!(
@ -93,42 +124,41 @@ async fn ban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventCon
 			 locally, if not using get_alias_helper to fetch room ID remotely"
 		);

-		let room_id = match self
+		let room_id = if let Ok(room_id) = self
 			.services
 			.rooms
 			.alias
 			.resolve_local_alias(room_alias)
 			.await
 		{
-			| Ok(room_id) => room_id,
-			| _ => {
-				debug!(
-					"We don't have this room alias to a room ID locally, attempting to fetch \
-					 room ID over federation"
-				);
+			room_id
+		} else {
+			debug!(
+				"We don't have this room alias to a room ID locally, attempting to fetch room \
+				 ID over federation"
+			);

-				match self
-					.services
-					.rooms
-					.alias
-					.resolve_alias(room_alias, None)
-					.await
-				{
-					| Ok((room_id, servers)) => {
-						debug!(
-							?room_id,
-							?servers,
-							"Got federation response fetching room ID for {room_id}"
-						);
-						room_id
-					},
-					| Err(e) => {
-						return Ok(RoomMessageEventContent::notice_plain(format!(
-							"Failed to resolve room alias {room_alias} to a room ID: {e}"
-						)));
-					},
-				}
-			},
+			match self
+				.services
+				.rooms
+				.alias
+				.resolve_alias(room_alias, None)
+				.await
+			{
+				| Ok((room_id, servers)) => {
+					debug!(
+						?room_id,
+						?servers,
+						"Got federation response fetching room ID for {room_id}"
+					);
+					room_id
+				},
+				| Err(e) => {
+					return Ok(RoomMessageEventContent::notice_plain(format!(
+						"Failed to resolve room alias {room_alias} to a room ID: {e}"
+					)));
+				},
+			}
 		};

 		self.services.rooms.metadata.ban_room(&room_id, true);
@ -142,56 +172,98 @@ async fn ban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventCon
 		));
 	};

-	debug!("Making all users leave the room {room_id} and forgetting it");
-	let mut users = self
-		.services
-		.rooms
-		.state_cache
-		.room_members(&room_id)
-		.map(ToOwned::to_owned)
-		.ready_filter(|user| self.services.globals.user_is_local(user))
-		.boxed();
+	debug!("Making all users leave the room {}", &room);
+	if force {
+		let mut users = self
+			.services
+			.rooms
+			.state_cache
+			.room_members(&room_id)
+			.ready_filter(|user| self.services.globals.user_is_local(user))
+			.boxed();

-	while let Some(ref user_id) = users.next().await {
-		debug!(
-			"Attempting leave for user {user_id} in room {room_id} (ignoring all errors, \
-			 evicting admins too)",
-		);
+		while let Some(local_user) = users.next().await {
+			debug!(
+				"Attempting leave for user {local_user} in room {room_id} (forced, ignoring all \
+				 errors, evicting admins too)",
+			);

-		if let Err(e) = leave_room(self.services, user_id, &room_id, None).await {
-			warn!("Failed to leave room: {e}");
+			if let Err(e) = leave_room(self.services, local_user, &room_id, None).await {
+				warn!(%e, "Failed to leave room");
+			}
 		}
+	} else {
+		let mut users = self
+			.services
+			.rooms
+			.state_cache
+			.room_members(&room_id)
+			.ready_filter(|user| self.services.globals.user_is_local(user))
+			.boxed();

-		self.services.rooms.state_cache.forget(&room_id, user_id);
+		while let Some(local_user) = users.next().await {
+			if self.services.users.is_admin(local_user).await {
+				continue;
+			}
+
+			debug!("Attempting leave for user {} in room {}", &local_user, &room_id);
+			if let Err(e) = leave_room(self.services, local_user, &room_id, None).await {
+				error!(
+					"Error attempting to make local user {} leave room {} during room banning: \
+					 {}",
+					&local_user, &room_id, e
+				);
+				return Ok(RoomMessageEventContent::text_plain(format!(
+					"Error attempting to make local user {} leave room {} during room banning \
+					 (room is still banned but not removing any more users): {}\nIf you would \
+					 like to ignore errors, use --force",
+					&local_user, &room_id, e
+				)));
+			}
+		}
 	}

-	self.services
+	// remove any local aliases, ignore errors
+	for local_alias in &self
+		.services
 		.rooms
 		.alias
 		.local_aliases_for_room(&room_id)
 		.map(ToOwned::to_owned)
-		.for_each(|local_alias| async move {
-			self.services
-				.rooms
-				.alias
-				.remove_alias(&local_alias, &self.services.globals.server_user)
-				.await
-				.ok();
-		})
-		.await;
+		.collect::<Vec<_>>()
+		.await
+	{
+		_ = self
+			.services
+			.rooms
+			.alias
+			.remove_alias(local_alias, &self.services.globals.server_user)
+			.await;
+	}

-	// unpublish from room directory
+	// unpublish from room directory, ignore errors
 	self.services.rooms.directory.set_not_public(&room_id);

-	self.services.rooms.metadata.disable_room(&room_id, true);
+	if disable_federation {
+		self.services.rooms.metadata.disable_room(&room_id, true);
+		return Ok(RoomMessageEventContent::text_plain(
+			"Room banned, removed all our local users, and disabled incoming federation with \
+			 room.",
+		));
+	}

 	Ok(RoomMessageEventContent::text_plain(
-		"Room banned, removed all our local users, and disabled incoming federation with room.",
+		"Room banned and removed all our local users, use `!admin federation disable-room` to \
+		 stop receiving new inbound federation events as well if needed.",
 	))
 }

 #[admin_command]
-async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
+async fn ban_list_of_rooms(
+	&self,
+	force: bool,
+	disable_federation: bool,
+) -> Result<RoomMessageEventContent> {
 	if self.body.len() < 2
 		|| !self.body[0].trim().starts_with("```")
 		|| self.body.last().unwrap_or(&"").trim() != "```"
@ -218,7 +290,7 @@ async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
 				if let Ok(admin_room_id) = self.services.admin.get_admin_room().await {
 					if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(admin_room_alias)
 					{
-						warn!("User specified admin room in bulk ban list, ignoring");
+						info!("User specified admin room in bulk ban list, ignoring");
 						continue;
 					}
 				}
@ -227,12 +299,19 @@ async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
 					let room_id = match RoomId::parse(room_alias_or_id) {
 						| Ok(room_id) => room_id,
 						| Err(e) => {
-							// ignore rooms we failed to parse
-							warn!(
-								"Error parsing room \"{room}\" during bulk room banning, \
-								 ignoring error and logging here: {e}"
-							);
-							continue;
+							if force {
+								// ignore rooms we failed to parse if we're force banning
+								warn!(
+									"Error parsing room \"{room}\" during bulk room banning, \
+									 ignoring error and logging here: {e}"
+								);
+								continue;
+							}
+
+							return Ok(RoomMessageEventContent::text_plain(format!(
+								"{room} is not a valid room ID or room alias, please fix the \
+								 list and try again: {e}"
+							)));
 						},
 					};

@ -242,65 +321,87 @@ async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
 				if room_alias_or_id.is_room_alias_id() {
 					match RoomAliasId::parse(room_alias_or_id) {
 						| Ok(room_alias) => {
-							let room_id = match self
+							let room_id = if let Ok(room_id) = self
 								.services
 								.rooms
 								.alias
 								.resolve_local_alias(room_alias)
 								.await
 							{
-								| Ok(room_id) => room_id,
-								| _ => {
-									debug!(
-										"We don't have this room alias to a room ID locally, \
-										 attempting to fetch room ID over federation"
-									);
+								room_id
+							} else {
+								debug!(
+									"We don't have this room alias to a room ID locally, \
+									 attempting to fetch room ID over federation"
+								);

-									match self
-										.services
-										.rooms
-										.alias
-										.resolve_alias(room_alias, None)
-										.await
-									{
-										| Ok((room_id, servers)) => {
-											debug!(
-												?room_id,
-												?servers,
-												"Got federation response fetching room ID for \
-												 {room}",
-											);
-											room_id
-										},
-										| Err(e) => {
+								match self
+									.services
+									.rooms
+									.alias
+									.resolve_alias(room_alias, None)
+									.await
+								{
+									| Ok((room_id, servers)) => {
+										debug!(
+											?room_id,
+											?servers,
+											"Got federation response fetching room ID for {room}",
+										);
+										room_id
+									},
+									| Err(e) => {
+										// don't fail if force blocking
+										if force {
 											warn!(
 												"Failed to resolve room alias {room} to a room \
 												 ID: {e}"
 											);
 											continue;
-										},
-									}
-								},
+										}
+
+										return Ok(RoomMessageEventContent::text_plain(format!(
+											"Failed to resolve room alias {room} to a room ID: \
+											 {e}"
+										)));
+									},
+								}
 							};

 							room_ids.push(room_id);
 						},
 						| Err(e) => {
-							warn!(
-								"Error parsing room \"{room}\" during bulk room banning, \
-								 ignoring error and logging here: {e}"
-							);
-							continue;
+							if force {
+								// ignore rooms we failed to parse if we're force deleting
+								error!(
+									"Error parsing room \"{room}\" during bulk room banning, \
+									 ignoring error and logging here: {e}"
+								);
+								continue;
+							}
+
+							return Ok(RoomMessageEventContent::text_plain(format!(
+								"{room} is not a valid room ID or room alias, please fix the \
+								 list and try again: {e}"
+							)));
 						},
 					}
 				}
 			},
 			| Err(e) => {
-				warn!(
-					"Error parsing room \"{room}\" during bulk room banning, ignoring error and \
-					 logging here: {e}"
-				);
-				continue;
+				if force {
+					// ignore rooms we failed to parse if we're force deleting
+					error!(
+						"Error parsing room \"{room}\" during bulk room banning, ignoring error \
+						 and logging here: {e}"
+					);
+					continue;
+				}
+
+				return Ok(RoomMessageEventContent::text_plain(format!(
+					"{room} is not a valid room ID or room alias, please fix the list and try \
+					 again: {e}"
+				)));
 			},
 		}
 	}
@ -311,27 +412,56 @@ async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
 		debug!("Banned {room_id} successfully");
 		room_ban_count = room_ban_count.saturating_add(1);

-		debug!("Making all users leave the room {room_id} and forgetting it");
-		let mut users = self
-			.services
-			.rooms
-			.state_cache
-			.room_members(&room_id)
-			.map(ToOwned::to_owned)
-			.ready_filter(|user| self.services.globals.user_is_local(user))
-			.boxed();
+		debug!("Making all users leave the room {}", &room_id);
+		if force {
+			let mut users = self
+				.services
+				.rooms
+				.state_cache
+				.room_members(&room_id)
+				.ready_filter(|user| self.services.globals.user_is_local(user))
+				.boxed();

-		while let Some(ref user_id) = users.next().await {
-			debug!(
-				"Attempting leave for user {user_id} in room {room_id} (ignoring all errors, \
-				 evicting admins too)",
-			);
+			while let Some(local_user) = users.next().await {
+				debug!(
+					"Attempting leave for user {local_user} in room {room_id} (forced, ignoring \
+					 all errors, evicting admins too)",
+				);

-			if let Err(e) = leave_room(self.services, user_id, &room_id, None).await {
-				warn!("Failed to leave room: {e}");
+				if let Err(e) = leave_room(self.services, local_user, &room_id, None).await {
+					warn!(%e, "Failed to leave room");
+				}
 			}
+		} else {
+			let mut users = self
+				.services
+				.rooms
+				.state_cache
+				.room_members(&room_id)
+				.ready_filter(|user| self.services.globals.user_is_local(user))
+				.boxed();

-			self.services.rooms.state_cache.forget(&room_id, user_id);
+			while let Some(local_user) = users.next().await {
+				if self.services.users.is_admin(local_user).await {
+					continue;
+				}
+
+				debug!("Attempting leave for user {local_user} in room {room_id}");
+				if let Err(e) = leave_room(self.services, local_user, &room_id, None).await {
+					error!(
+						"Error attempting to make local user {local_user} leave room {room_id} \
+						 during bulk room banning: {e}",
+					);
+
+					return Ok(RoomMessageEventContent::text_plain(format!(
+						"Error attempting to make local user {} leave room {} during room \
+						 banning (room is still banned but not removing any more users and not \
+						 banning any more rooms): {}\nIf you would like to ignore errors, use \
+						 --force",
+						&local_user, &room_id, e
+					)));
+				}
+			}
 		}

 		// remove any local aliases, ignore errors
@ -353,27 +483,38 @@ async fn ban_list_of_rooms(&self) -> Result<RoomMessageEventContent> {
 		// unpublish from room directory, ignore errors
 		self.services.rooms.directory.set_not_public(&room_id);

-		self.services.rooms.metadata.disable_room(&room_id, true);
+		if disable_federation {
+			self.services.rooms.metadata.disable_room(&room_id, true);
+		}
 	}

-	Ok(RoomMessageEventContent::text_plain(format!(
-		"Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, and \
-		 disabled incoming federation with the room."
-	)))
+	if disable_federation {
+		Ok(RoomMessageEventContent::text_plain(format!(
+			"Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, \
+			 and disabled incoming federation with the room."
+		)))
+	} else {
+		Ok(RoomMessageEventContent::text_plain(format!(
+			"Finished bulk room ban, banned {room_ban_count} total rooms and evicted all users."
+		)))
+	}
 }

 #[admin_command]
-async fn unban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventContent> {
+async fn unban_room(
+	&self,
+	enable_federation: bool,
+	room: Box<RoomOrAliasId>,
+) -> Result<RoomMessageEventContent> {
 	let room_id = if room.is_room_id() {
 		let room_id = match RoomId::parse(&room) {
 			| Ok(room_id) => room_id,
-			| Err(e) => {
+			| Err(e) =>
 				return Ok(RoomMessageEventContent::text_plain(format!(
 					"Failed to parse room ID {room}. Please note that this requires a full room \
 					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
 					 (`#roomalias:example.com`): {e}"
-				)));
-			},
+				))),
 		};

 		debug!("Room specified is a room ID, unbanning room ID");
@ -383,13 +524,12 @@ async fn unban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventC
 	} else if room.is_room_alias_id() {
 		let room_alias = match RoomAliasId::parse(&room) {
 			| Ok(room_alias) => room_alias,
-			| Err(e) => {
+			| Err(e) =>
 				return Ok(RoomMessageEventContent::text_plain(format!(
 					"Failed to parse room ID {room}. Please note that this requires a full room \
 					 ID (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias \
 					 (`#roomalias:example.com`): {e}"
-				)));
-			},
+				))),
 		};

 		debug!(
@ -397,42 +537,41 @@ async fn unban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventC
 			 locally, if not using get_alias_helper to fetch room ID remotely"
 		);

-		let room_id = match self
+		let room_id = if let Ok(room_id) = self
 			.services
 			.rooms
 			.alias
 			.resolve_local_alias(room_alias)
 			.await
 		{
-			| Ok(room_id) => room_id,
-			| _ => {
-				debug!(
-					"We don't have this room alias to a room ID locally, attempting to fetch \
-					 room ID over federation"
-				);
+			room_id
+		} else {
+			debug!(
+				"We don't have this room alias to a room ID locally, attempting to fetch room \
+				 ID over federation"
+			);

-				match self
-					.services
-					.rooms
-					.alias
-					.resolve_alias(room_alias, None)
-					.await
-				{
-					| Ok((room_id, servers)) => {
-						debug!(
-							?room_id,
-							?servers,
-							"Got federation response fetching room ID for room {room}"
-						);
-						room_id
-					},
-					| Err(e) => {
-						return Ok(RoomMessageEventContent::text_plain(format!(
-							"Failed to resolve room alias {room} to a room ID: {e}"
-						)));
-					},
-				}
-			},
+			match self
+				.services
+				.rooms
+				.alias
+				.resolve_alias(room_alias, None)
+				.await
+			{
+				| Ok((room_id, servers)) => {
+					debug!(
+						?room_id,
+						?servers,
+						"Got federation response fetching room ID for room {room}"
+					);
+					room_id
+				},
+				| Err(e) => {
+					return Ok(RoomMessageEventContent::text_plain(format!(
+						"Failed to resolve room alias {room} to a room ID: {e}"
+					)));
+				},
+			}
 		};

 		self.services.rooms.metadata.ban_room(&room_id, false);
@ -446,8 +585,15 @@ async fn unban_room(&self, room: Box<RoomOrAliasId>) -> Result<RoomMessageEventC
 		));
 	};

-	self.services.rooms.metadata.disable_room(&room_id, false);
-	Ok(RoomMessageEventContent::text_plain("Room unbanned and federation re-enabled."))
+	if enable_federation {
+		self.services.rooms.metadata.disable_room(&room_id, false);
+		return Ok(RoomMessageEventContent::text_plain("Room unbanned."));
+	}
+
+	Ok(RoomMessageEventContent::text_plain(
+		"Room unbanned, you may need to re-enable federation with the room using enable-room if \
+		 this is a remote room to make it fully functional.",
+	))
 }

 #[admin_command]
--- a/src/admin/server/commands.rs
+++ b/src/admin/server/commands.rs
@ -1,6 +1,6 @@
 use std::{fmt::Write, path::PathBuf, sync::Arc};

-use conduwuit::{Err, Result, info, utils::time, warn};
+use conduwuit::{info, utils::time, warn, Config, Err, Result};
 use ruma::events::room::message::RoomMessageEventContent;

 use crate::admin_command;
@ -33,7 +33,12 @@ pub(super) async fn reload_config(
 	path: Option<PathBuf>,
 ) -> Result<RoomMessageEventContent> {
 	let path = path.as_deref().into_iter();
-	self.services.config.reload(path)?;
+	let config = Config::load(path).and_then(|raw| Config::new(&raw))?;
+	if config.server_name != self.services.server.config.server_name {
+		return Err!("You can't change the server name.");
+	}
+
+	let _old = self.services.server.config.update(config)?;

 	Ok(RoomMessageEventContent::text_plain("Successfully reconfigured."))
 }
@ -92,7 +97,7 @@ pub(super) async fn clear_caches(&self) -> Result<RoomMessageEventContent> {

 #[admin_command]
 pub(super) async fn list_backups(&self) -> Result<RoomMessageEventContent> {
-	let result = self.services.db.db.backup_list()?;
+	let result = self.services.globals.db.backup_list()?;

 	if result.is_empty() {
 		Ok(RoomMessageEventContent::text_plain("No backups found."))
@ -103,24 +108,31 @@ pub(super) async fn list_backups(&self) -> Result<RoomMessageEventContent> {

 #[admin_command]
 pub(super) async fn backup_database(&self) -> Result<RoomMessageEventContent> {
-	let db = Arc::clone(&self.services.db);
+	let globals = Arc::clone(&self.services.globals);
 	let mut result = self
 		.services
 		.server
 		.runtime()
-		.spawn_blocking(move || match db.db.backup() {
+		.spawn_blocking(move || match globals.db.backup() {
 			| Ok(()) => String::new(),
 			| Err(e) => e.to_string(),
 		})
 		.await?;

 	if result.is_empty() {
-		result = self.services.db.db.backup_list()?;
+		result = self.services.globals.db.backup_list()?;
 	}

 	Ok(RoomMessageEventContent::notice_markdown(result))
 }

+#[admin_command]
+pub(super) async fn list_database_files(&self) -> Result<RoomMessageEventContent> {
+	let result = self.services.globals.db.file_list()?;
+
+	Ok(RoomMessageEventContent::notice_markdown(result))
+}
+
 #[admin_command]
 pub(super) async fn admin_notice(&self, message: Vec<String>) -> Result<RoomMessageEventContent> {
 	let message = message.join(" ");
--- a/src/admin/server/mod.rs
+++ b/src/admin/server/mod.rs
@ -46,6 +46,9 @@ pub(super) enum ServerCommand {
 	/// - List database backups
 	ListBackups,

+	/// - List database files
+	ListDatabaseFiles,
+
 	/// - Send a message to the admin room.
 	AdminNotice {
 		message: Vec<String>,
--- a/src/admin/user/commands.rs
+++ b/src/admin/user/commands.rs
@ -2,24 +2,23 @@ use std::{collections::BTreeMap, fmt::Write as _};

 use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room};
 use conduwuit::{
-	Result, debug, debug_warn, error, info, is_equal_to,
-	matrix::pdu::PduBuilder,
+	debug_warn, error, info, is_equal_to,
 	utils::{self, ReadyExt},
-	warn,
+	warn, PduBuilder, Result,
 };
 use conduwuit_api::client::{leave_all_rooms, update_avatar_url, update_displayname};
 use futures::StreamExt;
 use ruma::{
-	EventId, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId, RoomId, UserId,
 	events::{
-		RoomAccountDataEventType, StateEventType,
 		room::{
 			message::RoomMessageEventContent,
 			power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
 			redaction::RoomRedactionEventContent,
 		},
 		tag::{TagEvent, TagEventContent, TagInfo},
+		RoomAccountDataEventType, StateEventType,
 	},
+	EventId, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId, RoomId, UserId,
 };

 use crate::{
@ -58,16 +57,16 @@ pub(super) async fn create_user(
 	// Validate user id
 	let user_id = parse_local_user_id(self.services, &username)?;

-	if let Err(e) = user_id.validate_strict() {
-		if self.services.config.emergency_password.is_none() {
-			return Ok(RoomMessageEventContent::text_plain(format!(
-				"Username {user_id} contains disallowed characters or spaces: {e}"
-			)));
-		}
+	if self.services.users.exists(&user_id).await {
+		return Ok(RoomMessageEventContent::text_plain(format!(
+			"Userid {user_id} already exists"
+		)));
 	}

-	if self.services.users.exists(&user_id).await {
-		return Ok(RoomMessageEventContent::text_plain(format!("User {user_id} already exists")));
+	if user_id.is_historical() {
+		return Ok(RoomMessageEventContent::text_plain(format!(
+			"User ID {user_id} does not conform to new Matrix identifier spec"
+		)));
 	}

 	let password = password.unwrap_or_else(|| utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
@ -167,7 +166,7 @@ pub(super) async fn create_user(
 							"Failed to automatically join room {room} for user {user_id}: {e}"
 						);
 					},
-				}
+				};
 			}
 		}
 	}
@ -186,12 +185,12 @@ pub(super) async fn create_user(
 			.is_ok_and(is_equal_to!(1))
 		{
 			self.services.admin.make_user_admin(&user_id).await?;
+
 			warn!("Granting {user_id} admin privileges as the first user");
 		}
-	} else {
-		debug!("create_user admin command called without an admin room being available");
 	}

+	// Inhibit login does not work for guests
 	Ok(RoomMessageEventContent::text_plain(format!(
 		"Created user with user_id: {user_id} and password: `{password}`"
 	)))
@ -551,7 +550,7 @@ pub(super) async fn force_join_list_of_local_users(
 				debug_warn!("Failed force joining {user_id} to {room_id} during bulk join: {e}");
 				failed_joins = failed_joins.saturating_add(1);
 			},
-		}
+		};
 	}

 	Ok(RoomMessageEventContent::notice_markdown(format!(
@ -647,7 +646,7 @@ pub(super) async fn force_join_all_local_users(
 				debug_warn!("Failed force joining {user_id} to {room_id} during bulk join: {e}");
 				failed_joins = failed_joins.saturating_add(1);
 			},
-		}
+		};
 	}

 	Ok(RoomMessageEventContent::notice_markdown(format!(
@ -695,19 +694,6 @@ pub(super) async fn force_leave_room(
 		self.services.globals.user_is_local(&user_id),
 		"Parsed user_id must be a local user"
 	);
-
-	if !self
-		.services
-		.rooms
-		.state_cache
-		.is_joined(&user_id, &room_id)
-		.await
-	{
-		return Ok(RoomMessageEventContent::notice_markdown(format!(
-			"{user_id} is not joined in the room"
-		)));
-	}
-
 	leave_room(self.services, &user_id, &room_id, None).await?;

 	Ok(RoomMessageEventContent::notice_markdown(format!(
--- a/src/admin/utils.rs
+++ b/src/admin/utils.rs
@ -1,4 +1,4 @@
-use conduwuit_core::{Err, Result, err};
+use conduwuit_core::{err, Err, Result};
 use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId};
 use service::Services;

--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@ -35,7 +35,6 @@ brotli_compression = [
 ]

 [dependencies]
-async-trait.workspace = true
 axum-client-ip.workspace = true
 axum-extra.workspace = true
 axum.workspace = true
@ -51,7 +50,6 @@ http.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 ipaddress.workspace = true
-itertools.workspace = true
 log.workspace = true
 rand.workspace = true
 reqwest.workspace = true
--- a/src/api/client/account.rs
+++ b/src/api/client/account.rs
@ -3,38 +3,34 @@ use std::fmt::Write;
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Error, Result, debug_info, err, error, info, is_equal_to,
-	matrix::pdu::PduBuilder,
-	utils,
-	utils::{ReadyExt, stream::BroadbandExt},
-	warn,
+	debug_info, error, info, is_equal_to, utils, utils::ReadyExt, warn, Error, PduBuilder, Result,
 };
-use conduwuit_service::Services;
 use futures::{FutureExt, StreamExt};
 use register::RegistrationKind;
 use ruma::{
-	OwnedRoomId, UserId,
 	api::client::{
 		account::{
-			ThirdPartyIdRemovalStatus, change_password, check_registration_token_validity,
-			deactivate, get_3pids, get_username_availability,
+			change_password, check_registration_token_validity, deactivate, get_3pids,
+			get_username_availability,
 			register::{self, LoginType},
 			request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn,
-			whoami,
+			whoami, ThirdPartyIdRemovalStatus,
 		},
+		error::ErrorKind,
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
 	},
 	events::{
-		GlobalAccountDataEventType, StateEventType,
 		room::{
 			message::RoomMessageEventContent,
 			power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
 		},
+		GlobalAccountDataEventType, StateEventType,
 	},
-	push,
+	push, OwnedRoomId, UserId,
 };
+use service::Services;

-use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH, join_room_by_id_helper};
+use super::{join_room_by_id_helper, DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::Ruma;

 const RANDOM_USER_ID_LENGTH: usize = 10;
@ -63,14 +59,6 @@ pub(crate) async fn get_register_available_route(
 			|| appservice.registration.id.contains("matrix_appservice_irc")
 	});

-	if services
-		.globals
-		.forbidden_usernames()
-		.is_match(&body.username)
-	{
-		return Err!(Request(Forbidden("Username is forbidden")));
-	}
-
 	// don't force the username lowercase if it's from matrix-appservice-irc
 	let body_username = if is_matrix_appservice_irc {
 		body.username.clone()
@ -79,45 +67,30 @@ pub(crate) async fn get_register_available_route(
 	};

 	// Validate user id
-	let user_id =
-		match UserId::parse_with_server_name(&body_username, services.globals.server_name()) {
-			| Ok(user_id) => {
-				if let Err(e) = user_id.validate_strict() {
-					// unless the username is from the broken matrix appservice IRC bridge, we
-					// should follow synapse's behaviour on not allowing things like spaces
-					// and UTF-8 characters in usernames
-					if !is_matrix_appservice_irc {
-						return Err!(Request(InvalidUsername(debug_warn!(
-							"Username {body_username} contains disallowed characters or spaces: \
-							 {e}"
-						))));
-					}
-				}
-
-				user_id
-			},
-			| Err(e) => {
-				return Err!(Request(InvalidUsername(debug_warn!(
-					"Username {body_username} is not valid: {e}"
-				))));
-			},
-		};
+	let user_id = UserId::parse_with_server_name(body_username, services.globals.server_name())
+		.ok()
+		.filter(|user_id| {
+			(!user_id.is_historical() || is_matrix_appservice_irc)
+				&& services.globals.user_is_local(user_id)
+		})
+		.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

 	// Check if username is creative enough
 	if services.users.exists(&user_id).await {
-		return Err!(Request(UserInUse("User ID is not available.")));
+		return Err(Error::BadRequest(ErrorKind::UserInUse, "Desired user ID is already taken."));
 	}

-	if let Some(ref info) = body.appservice_info {
-		if !info.is_user_match(&user_id) {
-			return Err!(Request(Exclusive("Username is not in an appservice namespace.")));
-		}
+	if services
+		.globals
+		.forbidden_usernames()
+		.is_match(user_id.localpart())
+	{
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
 	}

-	if services.appservice.is_exclusive_user_id(&user_id).await {
-		return Err!(Request(Exclusive("Username is reserved by an appservice.")));
-	}
+	// 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 })
 }

@ -145,31 +118,20 @@ pub(crate) async fn register_route(
 	InsecureClientIp(client): InsecureClientIp,
 	body: Ruma<register::v3::Request>,
 ) -> Result<register::v3::Response> {
-	let is_guest = body.kind == RegistrationKind::Guest;
-	let emergency_mode_enabled = services.config.emergency_password.is_some();
-
-	if !services.config.allow_registration && body.appservice_info.is_none() {
-		match (body.username.as_ref(), body.initial_device_display_name.as_ref()) {
-			| (Some(username), Some(device_display_name)) => {
-				info!(%is_guest, user = %username, device_name = %device_display_name, "Rejecting registration attempt as registration is disabled");
-			},
-			| (Some(username), _) => {
-				info!(%is_guest, user = %username, "Rejecting registration attempt as registration is disabled");
-			},
-			| (_, Some(device_display_name)) => {
-				info!(%is_guest, device_name = %device_display_name, "Rejecting registration attempt as registration is disabled");
-			},
-			| (None, _) => {
-				info!(%is_guest, "Rejecting registration attempt as registration is disabled");
-			},
-		}
-
-		return Err!(Request(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.as_deref().unwrap_or("")
+		);
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Registration has been disabled."));
 	}

+	let is_guest = body.kind == RegistrationKind::Guest;
+
 	if is_guest
-		&& (!services.config.allow_guest_registration
-			|| (services.config.allow_registration
+		&& (!services.globals.allow_guest_registration()
+			|| (services.globals.allow_registration()
 				&& services.globals.registration_token.is_some()))
 	{
 		info!(
@ -177,7 +139,10 @@ pub(crate) async fn register_route(
 			 rejecting guest registration attempt, initial device name: \"{}\"",
 			body.initial_device_display_name.as_deref().unwrap_or("")
 		);
-		return Err!(Request(GuestAccessForbidden("Guest registration is disabled.")));
+		return Err(Error::BadRequest(
+			ErrorKind::GuestAccessForbidden,
+			"Guest registration is disabled.",
+		));
 	}

 	// forbid guests from registering if there is not a real admin user yet. give
@ -188,10 +153,13 @@ pub(crate) async fn register_route(
 			 rejecting registration. Guest's initial device name: \"{}\"",
 			body.initial_device_display_name.as_deref().unwrap_or("")
 		);
-		return Err!(Request(Forbidden("Registration is temporarily disabled.")));
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"Registration temporarily disabled.",
+		));
 	}

-	let user_id = match (body.username.as_ref(), is_guest) {
+	let user_id = match (&body.username, is_guest) {
 		| (Some(username), false) => {
 			// workaround for https://github.com/matrix-org/matrix-appservice-irc/issues/1780 due to inactivity of fixing the issue
 			let is_matrix_appservice_irc =
@ -201,12 +169,6 @@ pub(crate) async fn register_route(
 						|| appservice.registration.id.contains("matrix_appservice_irc")
 				});

-			if services.globals.forbidden_usernames().is_match(username)
-				&& !emergency_mode_enabled
-			{
-				return Err!(Request(Forbidden("Username is forbidden")));
-			}
-
 			// don't force the username lowercase if it's from matrix-appservice-irc
 			let body_username = if is_matrix_appservice_irc {
 				username.clone()
@ -214,34 +176,31 @@ pub(crate) async fn register_route(
 				username.to_lowercase()
 			};

-			let proposed_user_id = match UserId::parse_with_server_name(
-				&body_username,
-				services.globals.server_name(),
-			) {
-				| Ok(user_id) => {
-					if let Err(e) = user_id.validate_strict() {
-						// unless the username is from the broken matrix appservice IRC bridge, or
-						// we are in emergency mode, we should follow synapse's behaviour on
-						// not allowing things like spaces and UTF-8 characters in usernames
-						if !is_matrix_appservice_irc && !emergency_mode_enabled {
-							return Err!(Request(InvalidUsername(debug_warn!(
-								"Username {body_username} contains disallowed characters or \
-								 spaces: {e}"
-							))));
-						}
-					}
-
-					user_id
-				},
-				| Err(e) => {
-					return Err!(Request(InvalidUsername(debug_warn!(
-						"Username {body_username} is not valid: {e}"
-					))));
-				},
-			};
+			let proposed_user_id =
+				UserId::parse_with_server_name(body_username, services.globals.server_name())
+					.ok()
+					.filter(|user_id| {
+						(!user_id.is_historical() || is_matrix_appservice_irc)
+							&& services.globals.user_is_local(user_id)
+					})
+					.ok_or(Error::BadRequest(
+						ErrorKind::InvalidUsername,
+						"Username is invalid.",
+					))?;

 			if services.users.exists(&proposed_user_id).await {
-				return Err!(Request(UserInUse("User ID is not available.")));
+				return Err(Error::BadRequest(
+					ErrorKind::UserInUse,
+					"Desired user ID is already taken.",
+				));
+			}
+
+			if services
+				.globals
+				.forbidden_usernames()
+				.is_match(proposed_user_id.localpart())
+			{
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
 			}

 			proposed_user_id
@ -259,20 +218,15 @@ pub(crate) async fn register_route(
 	};

 	if body.body.login_type == Some(LoginType::ApplicationService) {
-		match body.appservice_info {
-			| Some(ref info) =>
-				if !info.is_user_match(&user_id) && !emergency_mode_enabled {
-					return Err!(Request(Exclusive(
-						"Username is not in an appservice namespace."
-					)));
-				},
-			| _ => {
-				return Err!(Request(MissingToken("Missing appservice token.")));
-			},
+		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 && !emergency_mode_enabled
-	{
-		return Err!(Request(Exclusive("Username is reserved by an appservice.")));
+	} else if services.appservice.is_exclusive_user_id(&user_id).await {
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
 	}

 	// UIAA
@ -302,39 +256,33 @@ pub(crate) async fn register_route(
 	};

 	if !skip_auth {
-		match &body.auth {
-			| Some(auth) => {
-				let (worked, uiaainfo) = services
-					.uiaa
-					.try_auth(
-						&UserId::parse_with_server_name("", services.globals.server_name())
-							.unwrap(),
-						"".into(),
-						auth,
-						&uiaainfo,
-					)
-					.await?;
-				if !worked {
-					return Err(Error::Uiaa(uiaainfo));
-				}
-				// Success!
-			},
-			| _ => match body.json_body {
-				| Some(ref json) => {
-					uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-					services.uiaa.create(
-						&UserId::parse_with_server_name("", services.globals.server_name())
-							.unwrap(),
-						"".into(),
-						&uiaainfo,
-						json,
-					);
-					return Err(Error::Uiaa(uiaainfo));
-				},
-				| _ => {
-					return Err!(Request(NotJson("JSON body is not valid")));
-				},
-			},
+		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"),
+					"".into(),
+					auth,
+					&uiaainfo,
+				)
+				.await?;
+			if !worked {
+				return Err(Error::Uiaa(uiaainfo));
+			}
+		// Success!
+		} 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"),
+				"".into(),
+				&uiaainfo,
+				&json,
+			);
+			return Err(Error::Uiaa(uiaainfo));
+		} else {
+			return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 		}
 	}

@ -375,12 +323,8 @@ pub(crate) async fn register_route(
 		)
 		.await?;

-	if (!is_guest && body.inhibit_login)
-		|| body
-			.appservice_info
-			.as_ref()
-			.is_some_and(|appservice| appservice.registration.device_management)
-	{
+	// Inhibit login does not work for guests
+	if !is_guest && body.inhibit_login {
 		return Ok(register::v3::Response {
 			access_token: None,
 			user_id,
@ -447,8 +391,8 @@ pub(crate) async fn register_route(
 	}

 	// log in conduit admin channel if a guest registered
-	if body.appservice_info.is_none() && is_guest && services.config.log_guest_registrations {
-		debug_info!("New guest user \"{user_id}\" registered on this server.");
+	if body.appservice_info.is_none() && is_guest && services.globals.log_guest_registrations() {
+		info!("New guest user \"{user_id}\" registered on this server.");

 		if !device_display_name.is_empty() {
 			if services.server.config.admin_room_notices {
@ -477,8 +421,7 @@ pub(crate) async fn register_route(
 	}

 	// If this is the first real user, grant them admin privileges except for guest
-	// users
-	// Note: the server user is generated first
+	// users Note: the server user, @conduit:servername, is generated first
 	if !is_guest {
 		if let Ok(admin_room) = services.admin.get_admin_room().await {
 			if services
@ -496,7 +439,7 @@ pub(crate) async fn register_route(

 	if body.appservice_info.is_none()
 		&& !services.server.config.auto_join_rooms.is_empty()
-		&& (services.config.allow_guests_auto_join_rooms || !is_guest)
+		&& (services.globals.allow_guests_auto_join_rooms() || !is_guest)
 	{
 		for room in &services.server.config.auto_join_rooms {
 			let Ok(room_id) = services.rooms.alias.resolve(room).await else {
@ -520,7 +463,7 @@ pub(crate) async fn register_route(
 			}

 			if let Some(room_server_name) = room.server_name() {
-				match join_room_by_id_helper(
+				if let Err(e) = join_room_by_id_helper(
 					&services,
 					&user_id,
 					&room_id,
@ -532,16 +475,11 @@ pub(crate) async fn register_route(
 				.boxed()
 				.await
 				{
-					| Err(e) => {
-						// don't return this error so we don't fail registrations
-						error!(
-							"Failed to automatically join room {room} for user {user_id}: {e}"
-						);
-					},
-					| _ => {
-						info!("Automatically joined room {room} for user {user_id}");
-					},
-				}
+					// 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}");
+				};
 			}
 		}
 	}
@ -583,8 +521,8 @@ pub(crate) async fn change_password_route(
 	let sender_user = body
 		.sender_user
 		.as_ref()
-		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))?;
-	let sender_device = body.sender_device();
+		.ok_or_else(|| Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))?;
+	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

 	let mut uiaainfo = UiaaInfo {
 		flows: vec![AuthFlow { stages: vec![AuthType::Password] }],
@ -594,32 +532,26 @@ pub(crate) async fn change_password_route(
 		auth_error: None,
 	};

-	match &body.auth {
-		| Some(auth) => {
-			let (worked, uiaainfo) = services
-				.uiaa
-				.try_auth(sender_user, sender_device, auth, &uiaainfo)
-				.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-			if !worked {
-				return Err(Error::Uiaa(uiaainfo));
-			}
+		if !worked {
+			return Err(Error::Uiaa(uiaainfo));
+		}

-			// Success!
-		},
-		| _ => match body.json_body {
-			| Some(ref json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-				services
-					.uiaa
-					.create(sender_user, sender_device, &uiaainfo, json);
+		// Success!
+	} else if let Some(json) = body.json_body {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, &json);

-				return Err(Error::Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err!(Request(NotJson("JSON body is not valid")));
-			},
-		},
+		return Err(Error::Uiaa(uiaainfo));
+	} else {
+		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}

 	services
@ -631,29 +563,9 @@ pub(crate) async fn change_password_route(
 		services
 			.users
 			.all_device_ids(sender_user)
-			.ready_filter(|id| *id != sender_device)
+			.ready_filter(|id| id != sender_device)
 			.for_each(|id| services.users.remove_device(sender_user, id))
 			.await;
-
-		// Remove all pushers except the ones associated with this session
-		services
-			.pusher
-			.get_pushkeys(sender_user)
-			.map(ToOwned::to_owned)
-			.broad_filter_map(|pushkey| async move {
-				services
-					.pusher
-					.get_pusher_device(&pushkey)
-					.await
-					.ok()
-					.filter(|pusher_device| pusher_device != sender_device)
-					.is_some()
-					.then_some(pushkey)
-			})
-			.for_each(|pushkey| async move {
-				services.pusher.delete_pusher(sender_user, &pushkey).await;
-			})
-			.await;
 	}

 	info!("User {sender_user} changed their password.");
@ -713,8 +625,8 @@ pub(crate) async fn deactivate_route(
 	let sender_user = body
 		.sender_user
 		.as_ref()
-		.ok_or_else(|| err!(Request(MissingToken("Missing access token."))))?;
-	let sender_device = body.sender_device();
+		.ok_or_else(|| Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))?;
+	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

 	let mut uiaainfo = UiaaInfo {
 		flows: vec![AuthFlow { stages: vec![AuthType::Password] }],
@ -724,31 +636,25 @@ pub(crate) async fn deactivate_route(
 		auth_error: None,
 	};

-	match &body.auth {
-		| Some(auth) => {
-			let (worked, uiaainfo) = services
-				.uiaa
-				.try_auth(sender_user, sender_device, auth, &uiaainfo)
-				.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-			if !worked {
-				return Err(Error::Uiaa(uiaainfo));
-			}
-			// Success!
-		},
-		| _ => match body.json_body {
-			| Some(ref json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-				services
-					.uiaa
-					.create(sender_user, sender_device, &uiaainfo, json);
+		if !worked {
+			return Err(Error::Uiaa(uiaainfo));
+		}
+	// Success!
+	} else if let Some(json) = body.json_body {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, &json);

-				return Err(Error::Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err!(Request(NotJson("JSON body is not valid")));
-			},
-		},
+		return Err(Error::Uiaa(uiaainfo));
+	} else {
+		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}

 	// Remove profile pictures and display name
@ -805,7 +711,10 @@ pub(crate) async fn third_party_route(
 pub(crate) async fn request_3pid_management_token_via_email_route(
 	_body: Ruma<request_3pid_management_token_via_email::v3::Request>,
 ) -> Result<request_3pid_management_token_via_email::v3::Response> {
-	Err!(Request(ThreepidDenied("Third party identifiers are not implemented")))
+	Err(Error::BadRequest(
+		ErrorKind::ThreepidDenied,
+		"Third party identifier is not allowed",
+	))
 }

 /// # `POST /_matrix/client/v3/account/3pid/msisdn/requestToken`
@ -818,7 +727,10 @@ pub(crate) async fn request_3pid_management_token_via_email_route(
 pub(crate) async fn request_3pid_management_token_via_msisdn_route(
 	_body: Ruma<request_3pid_management_token_via_msisdn::v3::Request>,
 ) -> Result<request_3pid_management_token_via_msisdn::v3::Response> {
-	Err!(Request(ThreepidDenied("Third party identifiers are not implemented")))
+	Err(Error::BadRequest(
+		ErrorKind::ThreepidDenied,
+		"Third party identifier is not allowed",
+	))
 }

 /// # `GET /_matrix/client/v1/register/m.login.registration_token/validity`
@ -832,7 +744,10 @@ pub(crate) async fn check_registration_token_validity(
 	body: Ruma<check_registration_token_validity::v1::Request>,
 ) -> Result<check_registration_token_validity::v1::Response> {
 	let Some(reg_token) = services.globals.registration_token.clone() else {
-		return Err!(Request(Forbidden("Server does not allow token registration")));
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"Server does not allow token registration.",
+		));
 	};

 	Ok(check_registration_token_validity::v1::Response { valid: reg_token == body.token })
@ -894,7 +809,7 @@ pub async fn full_user_deactivate(
 			power_levels_content.users.remove(user_id);

 			// ignore errors so deactivation doesn't fail
-			match services
+			if let Err(e) = services
 				.rooms
 				.timeline
 				.build_and_append_pdu(
@ -905,12 +820,9 @@ pub async fn full_user_deactivate(
 				)
 				.await
 			{
-				| Err(e) => {
-					warn!(%room_id, %user_id, "Failed to demote user's own power level: {e}");
-				},
-				| _ => {
-					info!("Demoted {user_id} in {room_id} as part of account deactivation");
-				},
+				warn!(%room_id, %user_id, "Failed to demote user's own power level: {e}");
+			} else {
+				info!("Demoted {user_id} in {room_id} as part of account deactivation");
 			}
 		}
 	}
--- a/src/api/client/account_data.rs
+++ b/src/api/client/account_data.rs
@ -1,8 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
-use conduwuit_service::Services;
+use conduwuit::{err, Err};
 use ruma::{
-	RoomId, UserId,
 	api::client::config::{
 		get_global_account_data, get_room_account_data, set_global_account_data,
 		set_room_account_data,
@ -12,11 +10,12 @@ use ruma::{
 		GlobalAccountDataEventType, RoomAccountDataEventType,
 	},
 	serde::Raw,
+	RoomId, UserId,
 };
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};

-use crate::Ruma;
+use crate::{service::Services, Result, Ruma};

 /// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
--- a/src/api/client/alias.rs
+++ b/src/api/client/alias.rs
@ -1,12 +1,12 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, debug};
-use conduwuit_service::Services;
+use conduwuit::{debug, Err, Result};
 use futures::StreamExt;
 use rand::seq::SliceRandom;
 use ruma::{
-	OwnedServerName, RoomAliasId, RoomId,
 	api::client::alias::{create_alias, delete_alias, get_alias},
+	OwnedServerName, RoomAliasId, RoomId,
 };
+use service::Services;

 use crate::Ruma;

@ -128,26 +128,18 @@ async fn room_available_servers(

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

 	servers
--- a/src/api/client/appservice.rs
+++ b/src/api/client/appservice.rs
@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
+use conduwuit::{err, Err, Result};
 use ruma::api::{appservice::ping, client::appservice::request_ping};

 use crate::Ruma;
@ -22,13 +22,7 @@ pub(crate) async fn appservice_ping(
 		)));
 	}

-	if appservice_info.registration.url.is_none()
-		|| appservice_info
-			.registration
-			.url
-			.as_ref()
-			.is_some_and(|url| url.is_empty() || url == "null")
-	{
+	if appservice_info.registration.url.is_none() {
 		return Err!(Request(UrlNotSet(
 			"Appservice does not have a URL set, there is nothing to ping."
 		)));
--- a/src/api/client/backup.rs
+++ b/src/api/client/backup.rs
@ -1,9 +1,6 @@
-use std::cmp::Ordering;
-
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
+use conduwuit::{err, Err};
 use ruma::{
-	UInt,
 	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,
@ -11,9 +8,10 @@ use ruma::{
 		get_backup_keys_for_room, get_backup_keys_for_session, get_latest_backup_info,
 		update_backup_version,
 	},
+	UInt,
 };

-use crate::Ruma;
+use crate::{Result, Ruma};

 /// # `POST /_matrix/client/r0/room_keys/version`
 ///
@ -234,77 +232,16 @@ pub(crate) async fn add_backup_keys_for_session_route(
 		)));
 	}

-	// Check if we already have a better key
-	let mut ok_to_replace = true;
-	if let Some(old_key) = &services
+	services
 		.key_backups
-		.get_session(body.sender_user(), &body.version, &body.room_id, &body.session_id)
-		.await
-		.ok()
-	{
-		let old_is_verified = old_key
-			.get_field::<bool>("is_verified")?
-			.unwrap_or_default();
-
-		let new_is_verified = body
-			.session_data
-			.get_field::<bool>("is_verified")?
-			.ok_or_else(|| err!(Request(BadJson("`is_verified` field should exist"))))?;
-
-		// Prefer key that `is_verified`
-		if old_is_verified != new_is_verified {
-			if old_is_verified {
-				ok_to_replace = false;
-			}
-		} else {
-			// If both have same `is_verified`, prefer the one with lower
-			// `first_message_index`
-			let old_first_message_index = old_key
-				.get_field::<UInt>("first_message_index")?
-				.unwrap_or(UInt::MAX);
-
-			let new_first_message_index = body
-				.session_data
-				.get_field::<UInt>("first_message_index")?
-				.ok_or_else(|| {
-					err!(Request(BadJson("`first_message_index` field should exist")))
-				})?;
-
-			ok_to_replace = match new_first_message_index.cmp(&old_first_message_index) {
-				| Ordering::Less => true,
-				| Ordering::Greater => false,
-				| Ordering::Equal => {
-					// If both have same `first_message_index`, prefer the one with lower
-					// `forwarded_count`
-					let old_forwarded_count = old_key
-						.get_field::<UInt>("forwarded_count")?
-						.unwrap_or(UInt::MAX);
-
-					let new_forwarded_count = body
-						.session_data
-						.get_field::<UInt>("forwarded_count")?
-						.ok_or_else(|| {
-							err!(Request(BadJson("`forwarded_count` field should exist")))
-						})?;
-
-					new_forwarded_count < old_forwarded_count
-				},
-			};
-		}
-	}
-
-	if ok_to_replace {
-		services
-			.key_backups
-			.add_key(
-				body.sender_user(),
-				&body.version,
-				&body.room_id,
-				&body.session_id,
-				&body.session_data,
-			)
-			.await?;
-	}
+		.add_key(
+			body.sender_user(),
+			&body.version,
+			&body.room_id,
+			&body.session_id,
+			&body.session_data,
+		)
+		.await?;

 	Ok(add_backup_keys_for_session::v3::Response {
 		count: services
--- a/src/api/client/capabilities.rs
+++ b/src/api/client/capabilities.rs
@ -3,11 +3,11 @@ use std::collections::BTreeMap;
 use axum::extract::State;
 use conduwuit::{Result, Server};
 use ruma::{
-	RoomVersionId,
 	api::client::discovery::get_capabilities::{
 		self, Capabilities, GetLoginTokenCapability, RoomVersionStability,
 		RoomVersionsCapability, ThirdPartyIdChangesCapability,
 	},
+	RoomVersionId,
 };
 use serde_json::json;

@ -42,12 +42,5 @@ pub(crate) async fn get_capabilities_route(
 		.set("uk.tcpip.msc4133.profile_fields", json!({"enabled": true}))
 		.expect("this is valid JSON we created");

-	capabilities
-		.set(
-			"org.matrix.msc4267.forget_forced_upon_leave",
-			json!({"enabled": services.config.forget_forced_upon_leave}),
-		)
-		.expect("valid JSON we created");
-
 	Ok(get_capabilities::v3::Response { capabilities })
 }
--- a/src/api/client/context.rs
+++ b/src/api/client/context.rs
@ -1,24 +1,23 @@
 use axum::extract::State;
 use conduwuit::{
-	Err, Result, at, debug_warn, err,
-	matrix::pdu::PduEvent,
-	ref_at,
+	at, deref_at, err, ref_at,
 	utils::{
-		IterStream,
 		future::TryExtExt,
 		stream::{BroadbandExt, ReadyExt, TryIgnore, WidebandExt},
+		IterStream,
 	},
+	Err, PduEvent, Result,
 };
-use conduwuit_service::rooms::{lazy_loading, lazy_loading::Options, short::ShortStateKey};
 use futures::{
-	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
-	future::{OptionFuture, join, join3, try_join3},
+	future::{join, join3, try_join3, OptionFuture},
+	FutureExt, StreamExt, TryFutureExt,
 };
-use ruma::{OwnedEventId, UserId, api::client::context::get_context, events::StateEventType};
+use ruma::{api::client::context::get_context, events::StateEventType, OwnedEventId, UserId};
+use service::rooms::{lazy_loading, lazy_loading::Options};

 use crate::{
-	Ruma,
 	client::message::{event_filter, ignored_filter, lazy_loading_witness, visibility_filter},
+	Ruma,
 };

 const LIMIT_MAX: usize = 100;
@ -37,13 +36,8 @@ pub(crate) async fn get_context_route(
 	let sender = body.sender();
 	let (sender_user, sender_device) = sender;
 	let room_id = &body.room_id;
-	let event_id = &body.event_id;
 	let filter = &body.filter;

-	if !services.rooms.metadata.exists(room_id).await {
-		return Err!(Request(Forbidden("Room does not exist to this server")));
-	}
-
 	// Use limit or else 10, with maximum 100
 	let limit: usize = body
 		.limit
@ -54,30 +48,29 @@ pub(crate) async fn get_context_route(
 	let base_id = services
 		.rooms
 		.timeline
-		.get_pdu_id(event_id)
+		.get_pdu_id(&body.event_id)
 		.map_err(|_| err!(Request(NotFound("Event not found."))));

 	let base_pdu = services
 		.rooms
 		.timeline
-		.get_pdu(event_id)
+		.get_pdu(&body.event_id)
 		.map_err(|_| err!(Request(NotFound("Base event not found."))));

 	let visible = services
 		.rooms
 		.state_accessor
-		.user_can_see_event(sender_user, room_id, event_id)
+		.user_can_see_event(sender_user, &body.room_id, &body.event_id)
 		.map(Ok);

 	let (base_id, base_pdu, visible) = try_join3(base_id, base_pdu, visible).await?;

-	if base_pdu.room_id != *room_id || base_pdu.event_id != *event_id {
+	if base_pdu.room_id != body.room_id || base_pdu.event_id != body.event_id {
 		return Err!(Request(NotFound("Base event not found.")));
 	}

 	if !visible {
-		debug_warn!(req_evt = ?event_id, ?base_id, ?room_id, "Event requested by {sender_user} but is not allowed to see it, returning 404");
-		return Err!(Request(NotFound("Event not found.")));
+		return Err!(Request(Forbidden("You don't have permission to view this event.")));
 	}

 	let base_count = base_id.pdu_count();
@ -107,7 +100,7 @@ pub(crate) async fn get_context_route(
 		.collect();

 	let (base_event, events_before, events_after): (_, Vec<_>, Vec<_>) =
-		join3(base_event, events_before, events_after).boxed().await;
+		join3(base_event, events_before, events_after).await;

 	let lazy_loading_context = lazy_loading::Context {
 		user_id: sender_user,
@ -139,29 +132,21 @@ pub(crate) async fn get_context_route(
 		.state_accessor
 		.pdu_shortstatehash(state_at)
 		.or_else(|_| services.rooms.state.get_room_shortstatehash(room_id))
-		.map_ok(|shortstatehash| {
-			services
-				.rooms
-				.state_accessor
-				.state_full_ids(shortstatehash)
-				.map(Ok)
-		})
+		.and_then(|shortstatehash| services.rooms.state_accessor.state_full_ids(shortstatehash))
 		.map_err(|e| err!(Database("State not found: {e}")))
-		.try_flatten_stream()
-		.try_collect()
 		.boxed();

 	let (lazy_loading_witnessed, state_ids) = join(lazy_loading_witnessed, state_ids).await;

-	let state_ids: Vec<(ShortStateKey, OwnedEventId)> = state_ids?;
-	let shortstatekeys = state_ids.iter().map(at!(0)).stream();
-	let shorteventids = state_ids.iter().map(ref_at!(1)).stream();
+	let state_ids = state_ids?;
 	let lazy_loading_witnessed = lazy_loading_witnessed.unwrap_or_default();
+	let shortstatekeys = state_ids.iter().stream().map(deref_at!(0));
+
 	let state: Vec<_> = services
 		.rooms
 		.short
 		.multi_get_statekey_from_short(shortstatekeys)
-		.zip(shorteventids)
+		.zip(state_ids.iter().stream().map(at!(1)))
 		.ready_filter_map(|item| Some((item.0.ok()?, item.1)))
 		.ready_filter_map(|((event_type, state_key), event_id)| {
 			if filter.lazy_load_options.is_enabled()
@ -177,14 +162,14 @@ pub(crate) async fn get_context_route(
 			Some(event_id)
 		})
 		.broad_filter_map(|event_id: &OwnedEventId| {
-			services.rooms.timeline.get_pdu(event_id.as_ref()).ok()
+			services.rooms.timeline.get_pdu(event_id).ok()
 		})
-		.map(PduEvent::into_state_event)
+		.map(|pdu| pdu.to_state_event())
 		.collect()
 		.await;

 	Ok(get_context::v3::Response {
-		event: base_event.map(at!(1)).map(PduEvent::into_room_event),
+		event: base_event.map(at!(1)).as_ref().map(PduEvent::to_room_event),

 		start: events_before
 			.last()
@ -203,13 +188,13 @@ pub(crate) async fn get_context_route(
 		events_before: events_before
 			.into_iter()
 			.map(at!(1))
-			.map(PduEvent::into_room_event)
+			.map(|pdu| pdu.to_room_event())
 			.collect(),

 		events_after: events_after
 			.into_iter()
 			.map(at!(1))
-			.map(PduEvent::into_room_event)
+			.map(|pdu| pdu.to_room_event())
 			.collect(),

 		state,
--- a/src/api/client/device.rs
+++ b/src/api/client/device.rs
@ -1,18 +1,18 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Error, Result, debug, err, utils};
+use conduwuit::{err, Err};
 use futures::StreamExt;
 use ruma::{
-	MilliSecondsSinceUnixEpoch, OwnedDeviceId,
 	api::client::{
 		device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
 		error::ErrorKind,
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
 	},
+	MilliSecondsSinceUnixEpoch,
 };

 use super::SESSION_ID_LENGTH;
-use crate::{Ruma, client::DEVICE_ID_LENGTH};
+use crate::{utils, Error, Result, Ruma};

 /// # `GET /_matrix/client/r0/devices`
 ///
@ -59,58 +59,26 @@ pub(crate) async fn update_device_route(
 	InsecureClientIp(client): InsecureClientIp,
 	body: Ruma<update_device::v3::Request>,
 ) -> Result<update_device::v3::Response> {
-	let sender_user = body.sender_user();
-	let appservice = body.appservice_info.as_ref();
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

-	match services
+	let mut device = services
 		.users
 		.get_device_metadata(sender_user, &body.device_id)
 		.await
-	{
-		| Ok(mut device) => {
-			device.display_name.clone_from(&body.display_name);
-			device.last_seen_ip.clone_from(&Some(client.to_string()));
-			device
-				.last_seen_ts
-				.clone_from(&Some(MilliSecondsSinceUnixEpoch::now()));
+		.map_err(|_| err!(Request(NotFound("Device not found."))))?;

-			services
-				.users
-				.update_device_metadata(sender_user, &body.device_id, &device)
-				.await?;
+	device.display_name.clone_from(&body.display_name);
+	device.last_seen_ip.clone_from(&Some(client.to_string()));
+	device
+		.last_seen_ts
+		.clone_from(&Some(MilliSecondsSinceUnixEpoch::now()));

-			Ok(update_device::v3::Response {})
-		},
-		| Err(_) => {
-			let Some(appservice) = appservice else {
-				return Err!(Request(NotFound("Device not found.")));
-			};
-			if !appservice.registration.device_management {
-				return Err!(Request(NotFound("Device not found.")));
-			}
+	services
+		.users
+		.update_device_metadata(sender_user, &body.device_id, &device)
+		.await?;

-			debug!(
-				"Creating new device for {sender_user} from appservice {} as MSC4190 is enabled \
-				 and device ID does not exist",
-				appservice.registration.id
-			);
-
-			let device_id = OwnedDeviceId::from(utils::random_string(DEVICE_ID_LENGTH));
-
-			services
-				.users
-				.create_device(
-					sender_user,
-					&device_id,
-					&appservice.registration.as_token,
-					None,
-					Some(client.to_string()),
-				)
-				.await?;
-
-			return Ok(update_device::v3::Response {});
-		},
-	}
+	Ok(update_device::v3::Response {})
 }

 /// # `DELETE /_matrix/client/r0/devices/{deviceId}`
@ -127,21 +95,8 @@ pub(crate) async fn delete_device_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_device::v3::Request>,
 ) -> Result<delete_device::v3::Response> {
-	let (sender_user, sender_device) = body.sender();
-	let appservice = body.appservice_info.as_ref();
-
-	if appservice.is_some_and(|appservice| appservice.registration.device_management) {
-		debug!(
-			"Skipping UIAA for {sender_user} as this is from an appservice and MSC4190 is \
-			 enabled"
-		);
-		services
-			.users
-			.remove_device(sender_user, &body.device_id)
-			.await;
-
-		return Ok(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");

 	// UIAA
 	let mut uiaainfo = UiaaInfo {
@ -152,31 +107,25 @@ pub(crate) async fn delete_device_route(
 		auth_error: None,
 	};

-	match &body.auth {
-		| Some(auth) => {
-			let (worked, uiaainfo) = services
-				.uiaa
-				.try_auth(sender_user, sender_device, auth, &uiaainfo)
-				.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-			if !worked {
-				return Err!(Uiaa(uiaainfo));
-			}
-			// Success!
-		},
-		| _ => match body.json_body {
-			| Some(ref json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-				services
-					.uiaa
-					.create(sender_user, sender_device, &uiaainfo, json);
+		if !worked {
+			return Err!(Uiaa(uiaainfo));
+		}
+	// Success!
+	} else if let Some(json) = body.json_body {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, &json);

-				return Err!(Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err!(Request(NotJson("Not json.")));
-			},
-		},
+		return Err!(Uiaa(uiaainfo));
+	} else {
+		return Err!(Request(NotJson("Not json.")));
 	}

 	services
@ -187,12 +136,11 @@ pub(crate) async fn delete_device_route(
 	Ok(delete_device::v3::Response {})
 }

-/// # `POST /_matrix/client/v3/delete_devices`
+/// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
-/// Deletes the given list of devices.
+/// Deletes the given device.
 ///
-/// - Requires UIAA to verify user password unless from an appservice with
-///   MSC4190 enabled.
+/// - Requires UIAA to verify user password
 ///
 /// For each device:
 /// - Invalidates access token
@ -204,20 +152,8 @@ pub(crate) async fn delete_devices_route(
 	State(services): State<crate::State>,
 	body: Ruma<delete_devices::v3::Request>,
 ) -> Result<delete_devices::v3::Response> {
-	let (sender_user, sender_device) = body.sender();
-	let appservice = body.appservice_info.as_ref();
-
-	if appservice.is_some_and(|appservice| appservice.registration.device_management) {
-		debug!(
-			"Skipping UIAA for {sender_user} as this is from an appservice and MSC4190 is \
-			 enabled"
-		);
-		for device_id in &body.devices {
-			services.users.remove_device(sender_user, device_id).await;
-		}
-
-		return Ok(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");

 	// UIAA
 	let mut uiaainfo = UiaaInfo {
@ -228,31 +164,25 @@ pub(crate) async fn delete_devices_route(
 		auth_error: None,
 	};

-	match &body.auth {
-		| Some(auth) => {
-			let (worked, uiaainfo) = services
-				.uiaa
-				.try_auth(sender_user, sender_device, auth, &uiaainfo)
-				.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-			if !worked {
-				return Err(Error::Uiaa(uiaainfo));
-			}
-			// Success!
-		},
-		| _ => match body.json_body {
-			| Some(ref json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-				services
-					.uiaa
-					.create(sender_user, sender_device, &uiaainfo, json);
+		if !worked {
+			return Err(Error::Uiaa(uiaainfo));
+		}
+	// Success!
+	} else if let Some(json) = body.json_body {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, &json);

-				return Err(Error::Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
-			},
-		},
+		return Err(Error::Uiaa(uiaainfo));
+	} else {
+		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}

 	for device_id in &body.devices {
--- a/src/api/client/directory.rs
+++ b/src/api/client/directory.rs
@ -1,41 +1,30 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, err, info,
-	utils::{
-		TryFutureExtExt,
-		math::Expected,
-		result::FlatOk,
-		stream::{ReadyExt, WidebandExt},
-	},
-};
-use conduwuit_service::Services;
-use futures::{
-	FutureExt, StreamExt, TryFutureExt,
-	future::{join, join4, join5},
-};
+use conduwuit::{info, warn, Err, Error, Result};
+use futures::{StreamExt, TryFutureExt};
 use ruma::{
-	OwnedRoomId, RoomId, ServerName, UInt, UserId,
 	api::{
 		client::{
 			directory::{
 				get_public_rooms, get_public_rooms_filtered, get_room_visibility,
 				set_room_visibility,
 			},
+			error::ErrorKind,
 			room,
 		},
 		federation,
 	},
-	directory::{Filter, PublicRoomJoinRule, PublicRoomsChunk, RoomNetwork, RoomTypeFilter},
+	directory::{Filter, PublicRoomJoinRule, PublicRoomsChunk, RoomNetwork},
 	events::{
-		StateEventType,
 		room::{
 			join_rules::{JoinRule, RoomJoinRulesEventContent},
 			power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
 		},
+		StateEventType,
 	},
-	uint,
+	uint, OwnedRoomId, RoomId, ServerName, UInt, UserId,
 };
+use service::Services;

 use crate::Ruma;

@ -52,13 +41,10 @@ pub(crate) async fn get_public_rooms_filtered_route(
 ) -> Result<get_public_rooms_filtered::v3::Response> {
 	if let Some(server) = &body.server {
 		if services
+			.server
 			.config
 			.forbidden_remote_room_directory_server_names
-			.is_match(server.host())
-			|| services
-				.config
-				.forbidden_remote_server_names
-				.is_match(server.host())
+			.contains(server)
 		{
 			return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 		}
@ -74,7 +60,11 @@ pub(crate) async fn get_public_rooms_filtered_route(
 	)
 	.await
 	.map_err(|e| {
-		err!(Request(Unknown(warn!(?body.server, "Failed to return /publicRooms: {e}"))))
+		warn!(?body.server, "Failed to return /publicRooms: {e}");
+		Error::BadRequest(
+			ErrorKind::Unknown,
+			"Failed to return the requested server's public room list.",
+		)
 	})?;

 	Ok(response)
@ -93,13 +83,10 @@ pub(crate) async fn get_public_rooms_route(
 ) -> Result<get_public_rooms::v3::Response> {
 	if let Some(server) = &body.server {
 		if services
+			.server
 			.config
 			.forbidden_remote_room_directory_server_names
-			.is_match(server.host())
-			|| services
-				.config
-				.forbidden_remote_server_names
-				.is_match(server.host())
+			.contains(server)
 		{
 			return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 		}
@ -115,7 +102,11 @@ pub(crate) async fn get_public_rooms_route(
 	)
 	.await
 	.map_err(|e| {
-		err!(Request(Unknown(warn!(?body.server, "Failed to return /publicRooms: {e}"))))
+		warn!(?body.server, "Failed to return /publicRooms: {e}");
+		Error::BadRequest(
+			ErrorKind::Unknown,
+			"Failed to return the requested server's public room list.",
+		)
 	})?;

 	Ok(get_public_rooms::v3::Response {
@ -135,11 +126,11 @@ pub(crate) async fn set_room_visibility_route(
 	InsecureClientIp(client): InsecureClientIp,
 	body: Ruma<set_room_visibility::v3::Request>,
 ) -> Result<set_room_visibility::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services.rooms.metadata.exists(&body.room_id).await {
 		// Return 404 if the room doesn't exist
-		return Err!(Request(NotFound("Room not found")));
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Room not found"));
 	}

 	if services
@ -153,7 +144,10 @@ pub(crate) async fn set_room_visibility_route(
 	}

 	if !user_can_publish_room(&services, sender_user, &body.room_id).await? {
-		return Err!(Request(Forbidden("User is not allowed to publish this room")));
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"User is not allowed to publish this room",
+		));
 	}

 	match &body.visibility {
@ -179,9 +173,10 @@ pub(crate) async fn set_room_visibility_route(
 						.await;
 				}

-				return Err!(Request(Forbidden(
+				return Err(Error::BadRequest(
+					ErrorKind::forbidden(),
 					"Publishing rooms to the room directory is not allowed",
-				)));
+				));
 			}

 			services.rooms.directory.set_public(&body.room_id);
@ -199,7 +194,10 @@ pub(crate) async fn set_room_visibility_route(
 		},
 		| room::Visibility::Private => services.rooms.directory.set_not_public(&body.room_id),
 		| _ => {
-			return Err!(Request(InvalidParam("Room visibility type is not supported.",)));
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"Room visibility type is not supported.",
+			));
 		},
 	}

@ -215,7 +213,7 @@ pub(crate) async fn get_room_visibility_route(
 ) -> Result<get_room_visibility::v3::Response> {
 	if !services.rooms.metadata.exists(&body.room_id).await {
 		// Return 404 if the room doesn't exist
-		return Err!(Request(NotFound("Room not found")));
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Room not found"));
 	}

 	Ok(get_room_visibility::v3::Response {
@ -263,23 +261,22 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 	}

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

 	if let Some(s) = &since {
 		let mut characters = s.chars();
 		let backwards = match characters.next() {
 			| Some('n') => false,
 			| Some('p') => true,
-			| _ => {
-				return Err!(Request(InvalidParam("Invalid `since` token")));
-			},
+			| _ =>
+				return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid `since` token")),
 		};

 		num_since = characters
 			.collect::<String>()
 			.parse()
-			.map_err(|_| err!(Request(InvalidParam("Invalid `since` token."))))?;
+			.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `since` token."))?;

 		if backwards {
 			num_since = num_since.saturating_sub(limit);
@ -291,12 +288,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		.directory
 		.public_rooms()
 		.map(ToOwned::to_owned)
-		.wide_then(|room_id| public_rooms_chunk(services, room_id))
-		.ready_filter_map(|chunk| {
-			if !filter.room_types.is_empty() && !filter.room_types.contains(&RoomTypeFilter::from(chunk.room_type.clone())) {
-				return None;
-			}
-
+		.then(|room_id| public_rooms_chunk(services, room_id))
+		.filter_map(|chunk| async move {
 			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) {
@ -328,24 +321,40 @@ pub(crate) async fn get_public_rooms_filtered_helper(

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

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

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

-	let prev_batch = num_since.ne(&0).then_some(format!("p{num_since}"));
+	let prev_batch = if num_since == 0 {
+		None
+	} else {
+		Some(format!("p{num_since}"))
+	};

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

 	Ok(get_public_rooms_filtered::v3::Response {
 		chunk,
 		prev_batch,
 		next_batch,
-		total_room_count_estimate,
+		total_room_count_estimate: Some(total_room_count_estimate),
 	})
 }

@ -356,88 +365,88 @@ async fn user_can_publish_room(
 	user_id: &UserId,
 	room_id: &RoomId,
 ) -> Result<bool> {
-	match services
+	if let Ok(event) = services
 		.rooms
 		.state_accessor
 		.room_state_get(room_id, &StateEventType::RoomPowerLevels, "")
 		.await
 	{
-		| Ok(event) => serde_json::from_str(event.content.get())
-			.map_err(|_| err!(Database("Invalid event content for m.room.power_levels")))
+		serde_json::from_str(event.content.get())
+			.map_err(|_| Error::bad_database("Invalid event content for m.room.power_levels"))
 			.map(|content: RoomPowerLevelsEventContent| {
 				RoomPowerLevels::from(content)
 					.user_can_send_state(user_id, StateEventType::RoomHistoryVisibility)
-			}),
-		| _ => {
-			match services
-				.rooms
-				.state_accessor
-				.room_state_get(room_id, &StateEventType::RoomCreate, "")
-				.await
-			{
-				| Ok(event) => Ok(event.sender == user_id),
-				| _ => Err!(Request(Forbidden("User is not allowed to publish this room"))),
-			}
-		},
+			})
+	} else if let Ok(event) = services
+		.rooms
+		.state_accessor
+		.room_state_get(room_id, &StateEventType::RoomCreate, "")
+		.await
+	{
+		Ok(event.sender == user_id)
+	} else {
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"User is not allowed to publish this room",
+		));
 	}
 }

 async fn public_rooms_chunk(services: &Services, room_id: OwnedRoomId) -> PublicRoomsChunk {
-	let name = services.rooms.state_accessor.get_name(&room_id).ok();
-
-	let room_type = services.rooms.state_accessor.get_room_type(&room_id).ok();
-
-	let canonical_alias = services
-		.rooms
-		.state_accessor
-		.get_canonical_alias(&room_id)
-		.ok();
-
-	let avatar_url = services.rooms.state_accessor.get_avatar(&room_id);
-
-	let topic = services.rooms.state_accessor.get_room_topic(&room_id).ok();
-
-	let world_readable = services.rooms.state_accessor.is_world_readable(&room_id);
-
-	let join_rule = services
-		.rooms
-		.state_accessor
-		.room_state_get_content(&room_id, &StateEventType::RoomJoinRules, "")
-		.map_ok(|c: RoomJoinRulesEventContent| match c.join_rule {
-			| JoinRule::Public => PublicRoomJoinRule::Public,
-			| JoinRule::Knock => "knock".into(),
-			| JoinRule::KnockRestricted(_) => "knock_restricted".into(),
-			| _ => "invite".into(),
-		});
-
-	let guest_can_join = services.rooms.state_accessor.guest_can_join(&room_id);
-
-	let num_joined_members = services.rooms.state_cache.room_joined_count(&room_id);
-
-	let (
-		(avatar_url, canonical_alias, guest_can_join, join_rule, name),
-		(num_joined_members, room_type, topic, world_readable),
-	) = join(
-		join5(avatar_url, canonical_alias, guest_can_join, join_rule, name),
-		join4(num_joined_members, room_type, topic, world_readable),
-	)
-	.boxed()
-	.await;
-
 	PublicRoomsChunk {
-		avatar_url: avatar_url.into_option().unwrap_or_default().url,
-		canonical_alias,
-		guest_can_join,
-		join_rule: join_rule.unwrap_or_default(),
-		name,
-		num_joined_members: num_joined_members
-			.map(TryInto::try_into)
-			.map(Result::ok)
-			.flat_ok()
-			.unwrap_or_else(|| uint!(0)),
+		canonical_alias: services
+			.rooms
+			.state_accessor
+			.get_canonical_alias(&room_id)
+			.await
+			.ok(),
+		name: services.rooms.state_accessor.get_name(&room_id).await.ok(),
+		num_joined_members: services
+			.rooms
+			.state_cache
+			.room_joined_count(&room_id)
+			.await
+			.unwrap_or(0)
+			.try_into()
+			.expect("joined count overflows ruma UInt"),
+		topic: services
+			.rooms
+			.state_accessor
+			.get_room_topic(&room_id)
+			.await
+			.ok(),
+		world_readable: services
+			.rooms
+			.state_accessor
+			.is_world_readable(&room_id)
+			.await,
+		guest_can_join: services.rooms.state_accessor.guest_can_join(&room_id).await,
+		avatar_url: services
+			.rooms
+			.state_accessor
+			.get_avatar(&room_id)
+			.await
+			.into_option()
+			.unwrap_or_default()
+			.url,
+		join_rule: services
+			.rooms
+			.state_accessor
+			.room_state_get_content(&room_id, &StateEventType::RoomJoinRules, "")
+			.map_ok(|c: RoomJoinRulesEventContent| match c.join_rule {
+				| JoinRule::Public => PublicRoomJoinRule::Public,
+				| JoinRule::Knock => "knock".into(),
+				| JoinRule::KnockRestricted(_) => "knock_restricted".into(),
+				| _ => "invite".into(),
+			})
+			.await
+			.unwrap_or_default(),
+		room_type: services
+			.rooms
+			.state_accessor
+			.get_room_type(&room_id)
+			.await
+			.ok(),
 		room_id,
-		room_type,
-		topic,
-		world_readable,
 	}
 }
--- a/src/api/client/filter.rs
+++ b/src/api/client/filter.rs
@ -1,8 +1,8 @@
 use axum::extract::State;
-use conduwuit::{Result, err};
+use conduwuit::err;
 use ruma::api::client::filter::{create_filter, get_filter};

-use crate::Ruma;
+use crate::{Result, Ruma};

 /// # `GET /_matrix/client/r0/user/{userId}/filter/{filterId}`
 ///
--- a/src/api/client/keys.rs
+++ b/src/api/client/keys.rs
@ -1,30 +1,30 @@
 use std::collections::{BTreeMap, HashMap, HashSet};

 use axum::extract::State;
-use conduwuit::{Err, Error, Result, debug, debug_warn, err, result::NotFound, utils};
-use conduwuit_service::{Services, users::parse_master_key};
-use futures::{StreamExt, stream::FuturesUnordered};
+use conduwuit::{err, utils, Error, Result};
+use futures::{stream::FuturesUnordered, StreamExt};
 use ruma::{
-	OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 	api::{
 		client::{
 			error::ErrorKind,
 			keys::{
-				claim_keys, get_key_changes, get_keys, upload_keys,
-				upload_signatures::{self},
+				claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
 				upload_signing_keys,
 			},
 			uiaa::{AuthFlow, AuthType, UiaaInfo},
 		},
 		federation,
 	},
-	encryption::CrossSigningKey,
 	serde::Raw,
+	OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde_json::json;

 use super::SESSION_ID_LENGTH;
-use crate::Ruma;
+use crate::{
+	service::{users::parse_master_key, Services},
+	Ruma,
+};

 /// # `POST /_matrix/client/r0/keys/upload`
 ///
@ -40,20 +40,6 @@ pub(crate) async fn upload_keys_route(
 	let (sender_user, sender_device) = body.sender();

 	for (key_id, one_time_key) in &body.one_time_keys {
-		if one_time_key
-			.deserialize()
-			.inspect_err(|e| {
-				debug_warn!(
-					?key_id,
-					?one_time_key,
-					"Invalid one time key JSON submitted by client, skipping: {e}"
-				);
-			})
-			.is_err()
-		{
-			continue;
-		}
-
 		services
 			.users
 			.add_one_time_key(sender_user, sender_device, key_id, one_time_key)
@ -61,44 +47,14 @@ pub(crate) async fn upload_keys_route(
 	}

 	if let Some(device_keys) = &body.device_keys {
-		let deser_device_keys = device_keys.deserialize().map_err(|e| {
-			err!(Request(BadJson(debug_warn!(
-				?device_keys,
-				"Invalid device keys JSON uploaded by client: {e}"
-			))))
-		})?;
-
-		if deser_device_keys.user_id != sender_user {
-			return Err!(Request(Unknown(
-				"User ID in keys uploaded does not match your own user ID"
-			)));
-		}
-		if deser_device_keys.device_id != sender_device {
-			return Err!(Request(Unknown(
-				"Device ID in keys uploaded does not match your own device ID"
-			)));
-		}
-
-		if let Ok(existing_keys) = services
+		// TODO: merge this and the existing event?
+		// This check is needed to assure that signatures are kept
+		if services
 			.users
 			.get_device_keys(sender_user, sender_device)
 			.await
+			.is_err()
 		{
-			if existing_keys.json().get() == device_keys.json().get() {
-				debug!(
-					?sender_user,
-					?sender_device,
-					?device_keys,
-					"Ignoring user uploaded keys as they are an exact copy already in the \
-					 database"
-				);
-			} else {
-				services
-					.users
-					.add_device_keys(sender_user, sender_device, device_keys)
-					.await;
-			}
-		} else {
 			services
 				.users
 				.add_device_keys(sender_user, sender_device, device_keys)
@ -169,198 +125,93 @@ pub(crate) async fn upload_signing_keys_route(
 		auth_error: None,
 	};

-	match check_for_new_keys(
-		services,
-		sender_user,
-		body.self_signing_key.as_ref(),
-		body.user_signing_key.as_ref(),
-		body.master_key.as_ref(),
-	)
-	.await
-	.inspect_err(|e| debug!(?e))
-	{
-		| Ok(exists) => {
-			if let Some(result) = exists {
-				// No-op, they tried to reupload the same set of keys
-				// (lost connection for example)
-				return Ok(result);
-			}
-			debug!(
-				"Skipping UIA in accordance with MSC3967, the user didn't have any existing keys"
-			);
-			// Some of the keys weren't found, so we let them upload
-		},
-		| _ => {
-			match &body.auth {
-				| Some(auth) => {
-					let (worked, uiaainfo) = services
-						.uiaa
-						.try_auth(sender_user, sender_device, auth, &uiaainfo)
-						.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-					if !worked {
-						return Err(Error::Uiaa(uiaainfo));
-					}
-					// Success!
-				},
-				| _ => match body.json_body {
-					| Some(json) => {
-						uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-						services
-							.uiaa
-							.create(sender_user, sender_device, &uiaainfo, &json);
+		if !worked {
+			return Err(Error::Uiaa(uiaainfo));
+		}
+	// Success!
+	} else if let Some(json) = body.json_body {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, &json);

-						return Err(Error::Uiaa(uiaainfo));
-					},
-					| _ => {
-						return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
-					},
-				},
-			}
-		},
+		return Err(Error::Uiaa(uiaainfo));
+	} else {
+		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}

-	services
-		.users
-		.add_cross_signing_keys(
-			sender_user,
-			&body.master_key,
-			&body.self_signing_key,
-			&body.user_signing_key,
-			true, // notify so that other users see the new keys
-		)
-		.await?;
+	if let Some(master_key) = &body.master_key {
+		services
+			.users
+			.add_cross_signing_keys(
+				sender_user,
+				master_key,
+				&body.self_signing_key,
+				&body.user_signing_key,
+				true, // notify so that other users see the new keys
+			)
+			.await?;
+	}

 	Ok(upload_signing_keys::v3::Response {})
 }

-async fn check_for_new_keys(
-	services: crate::State,
-	user_id: &UserId,
-	self_signing_key: Option<&Raw<CrossSigningKey>>,
-	user_signing_key: Option<&Raw<CrossSigningKey>>,
-	master_signing_key: Option<&Raw<CrossSigningKey>>,
-) -> Result<Option<upload_signing_keys::v3::Response>> {
-	debug!("checking for existing keys");
-	let mut empty = false;
-	if let Some(master_signing_key) = master_signing_key {
-		let (key, value) = parse_master_key(user_id, master_signing_key)?;
-		let result = services
-			.users
-			.get_master_key(None, user_id, &|_| true)
-			.await;
-		if result.is_not_found() {
-			empty = true;
-		} else {
-			let existing_master_key = result?;
-			let (existing_key, existing_value) = parse_master_key(user_id, &existing_master_key)?;
-			if existing_key != key || existing_value != value {
-				return Err!(Request(Forbidden(
-					"Tried to change an existing master key, UIA required"
-				)));
-			}
-		}
-	}
-	if let Some(user_signing_key) = user_signing_key {
-		let key = services.users.get_user_signing_key(user_id).await;
-		if key.is_not_found() && !empty {
-			return Err!(Request(Forbidden(
-				"Tried to update an existing user signing key, UIA required"
-			)));
-		}
-		if !key.is_not_found() {
-			let existing_signing_key = key?.deserialize()?;
-			if existing_signing_key != user_signing_key.deserialize()? {
-				return Err!(Request(Forbidden(
-					"Tried to change an existing user signing key, UIA required"
-				)));
-			}
-		}
-	}
-	if let Some(self_signing_key) = self_signing_key {
-		let key = services
-			.users
-			.get_self_signing_key(None, user_id, &|_| true)
-			.await;
-		if key.is_not_found() && !empty {
-			debug!(?key);
-			return Err!(Request(Forbidden(
-				"Tried to add a new signing key independently from the master key"
-			)));
-		}
-		if !key.is_not_found() {
-			let existing_signing_key = key?.deserialize()?;
-			if existing_signing_key != self_signing_key.deserialize()? {
-				return Err!(Request(Forbidden(
-					"Tried to update an existing self signing key, UIA required"
-				)));
-			}
-		}
-	}
-	if empty {
-		return Ok(None);
-	}
-
-	Ok(Some(upload_signing_keys::v3::Response {}))
-}
-
 /// # `POST /_matrix/client/r0/keys/signatures/upload`
 ///
 /// Uploads end-to-end key signatures from the sender user.
-///
-/// TODO: clean this timo-code up more and integrate failures. tried to improve
-/// it a bit to stop exploding the entire request on bad sigs, but needs way
-/// more work.
 pub(crate) async fn upload_signatures_route(
 	State(services): State<crate::State>,
 	body: Ruma<upload_signatures::v3::Request>,
 ) -> Result<upload_signatures::v3::Response> {
-	if body.signed_keys.is_empty() {
-		debug!("Empty signed_keys sent in key signature upload");
-		return Ok(upload_signatures::v3::Response::new());
-	}
-
-	let sender_user = body.sender_user();
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	for (user_id, keys) in &body.signed_keys {
 		for (key_id, key) in keys {
-			let Ok(key) = serde_json::to_value(key)
-				.inspect_err(|e| debug_warn!(?key_id, "Invalid \"key\" JSON: {e}"))
-			else {
-				continue;
-			};
+			let key = serde_json::to_value(key)
+				.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid key JSON"))?;

-			let Some(signatures) = key.get("signatures") else {
-				continue;
-			};
+			for signature in key
+				.get("signatures")
+				.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.",
+				))?
+				.as_object()
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature."))?
+				.clone()
+			{
+				// Signature validation?
+				let signature = (
+					signature.0,
+					signature
+						.1
+						.as_str()
+						.ok_or(Error::BadRequest(
+							ErrorKind::InvalidParam,
+							"Invalid signature value.",
+						))?
+						.to_owned(),
+				);

-			let Some(sender_user_val) = signatures.get(sender_user.to_string()) else {
-				continue;
-			};
-
-			let Some(sender_user_object) = sender_user_val.as_object() else {
-				continue;
-			};
-
-			for (signature, val) in sender_user_object.clone() {
-				let Some(val) = val.as_str().map(ToOwned::to_owned) else {
-					continue;
-				};
-				let signature = (signature, val);
-
-				if let Err(_e) = services
+				services
 					.users
 					.sign_key(user_id, key_id, signature, sender_user)
-					.await
-					.inspect_err(|e| debug_warn!("{e}"))
-				{
-					continue;
-				}
+					.await?;
 			}
 		}
 	}

-	Ok(upload_signatures::v3::Response { failures: BTreeMap::new() })
+	Ok(upload_signatures::v3::Response {
+		failures: BTreeMap::new(), // TODO: integrate
+	})
 }

 /// # `POST /_matrix/client/r0/keys/changes`
@ -534,40 +385,35 @@ where
 		.collect();

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

-					if let Ok(our_master_key) = services
-						.users
-						.get_key(&master_key_id, sender_user, &user, &allowed_signatures)
-						.await
-					{
-						let (_, mut our_master_key) = parse_master_key(&user, &our_master_key)?;
-						master_key.signatures.append(&mut 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 */
-						)
-						.await?;
-					if let Some(raw) = raw {
-						master_keys.insert(user.clone(), raw);
-					}
+				if let Ok(our_master_key) = services
+					.users
+					.get_key(&master_key_id, sender_user, &user, &allowed_signatures)
+					.await
+				{
+					let (_, mut our_master_key) = parse_master_key(&user, &our_master_key)?;
+					master_key.signatures.append(&mut 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 */
+					)
+					.await?;
+				master_keys.insert(user.clone(), raw);
+			}

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

--- a/src/api/client/media.rs
+++ b/src/api/client/media.rs
@ -3,16 +3,16 @@ use std::time::Duration;
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Result, err,
+	err,
 	utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize},
+	Err, Result,
 };
 use conduwuit_service::{
+	media::{Dim, FileMeta, CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, MXC_LENGTH},
 	Services,
-	media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta, MXC_LENGTH},
 };
 use reqwest::Url;
 use ruma::{
-	Mxc, UserId,
 	api::client::{
 		authenticated_media::{
 			get_content, get_content_as_filename, get_content_thumbnail, get_media_config,
@ -20,6 +20,7 @@ use ruma::{
 		},
 		media::create_content,
 	},
+	Mxc, UserId,
 };

 use crate::Ruma;
@ -56,28 +57,19 @@ pub(crate) async fn create_content_route(
 	let filename = body.filename.as_deref();
 	let content_type = body.content_type.as_deref();
 	let content_disposition = make_content_disposition(None, content_type, filename);
-	let ref mxc = Mxc {
+	let mxc = Mxc {
 		server_name: services.globals.server_name(),
 		media_id: &utils::random_string(MXC_LENGTH),
 	};

 	services
 		.media
-		.create(mxc, Some(user), Some(&content_disposition), content_type, &body.file)
-		.await?;
-
-	let blurhash = body.generate_blurhash.then(|| {
-		services
-			.media
-			.create_blurhash(&body.file, content_type, filename)
-			.ok()
-			.flatten()
-	});
-
-	Ok(create_content::v3::Response {
-		content_uri: mxc.to_string().into(),
-		blurhash: blurhash.flatten(),
-	})
+		.create(&mxc, Some(user), Some(&content_disposition), content_type, &body.file)
+		.await
+		.map(|()| create_content::v3::Response {
+			content_uri: mxc.to_string().into(),
+			blurhash: None,
+		})
 }

 /// # `GET /_matrix/client/v1/media/thumbnail/{serverName}/{mediaId}`
--- a/src/api/client/media_legacy.rs
+++ b/src/api/client/media_legacy.rs
@ -3,20 +3,21 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Result, err,
+	err,
 	utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
+	Err, Result,
 };
-use conduwuit_service::media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta};
+use conduwuit_service::media::{Dim, FileMeta, CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN};
 use reqwest::Url;
 use ruma::{
-	Mxc,
 	api::client::media::{
 		create_content, get_content, get_content_as_filename, get_content_thumbnail,
 		get_media_config, get_media_preview,
 	},
+	Mxc,
 };

-use crate::{Ruma, RumaResponse, client::create_content_route};
+use crate::{client::create_content_route, Ruma, RumaResponse};

 /// # `GET /_matrix/media/v3/config`
 ///
@ -141,52 +142,46 @@ pub(crate) async fn get_content_legacy_route(
 		media_id: &body.media_id,
 	};

-	match services.media.get(&mxc).await? {
-		| Some(FileMeta {
-			content,
-			content_type,
-			content_disposition,
-		}) => {
-			let content_disposition = make_content_disposition(
-				content_disposition.as_ref(),
-				content_type.as_deref(),
-				None,
-			);
+	if let Some(FileMeta {
+		content,
+		content_type,
+		content_disposition,
+	}) = services.media.get(&mxc).await?
+	{
+		let content_disposition =
+			make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);

-			Ok(get_content::v3::Response {
-				file: content.expect("entire file contents"),
-				content_type: content_type.map(Into::into),
-				content_disposition: Some(content_disposition),
-				cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-				cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-			})
-		},
-		| _ =>
-			if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
-				let response = services
-					.media
-					.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
-					.await
-					.map_err(|e| {
-						err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
-					})?;
+		Ok(get_content::v3::Response {
+			file: content.expect("entire file contents"),
+			content_type: content_type.map(Into::into),
+			content_disposition: Some(content_disposition),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+		})
+	} else if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
+		let response = services
+			.media
+			.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
+			.await
+			.map_err(|e| {
+				err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
+			})?;

-				let content_disposition = make_content_disposition(
-					response.content_disposition.as_ref(),
-					response.content_type.as_deref(),
-					None,
-				);
+		let content_disposition = make_content_disposition(
+			response.content_disposition.as_ref(),
+			response.content_type.as_deref(),
+			None,
+		);

-				Ok(get_content::v3::Response {
-					file: response.file,
-					content_type: response.content_type,
-					content_disposition: Some(content_disposition),
-					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-					cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-				})
-			} else {
-				Err!(Request(NotFound("Media not found.")))
-			},
+		Ok(get_content::v3::Response {
+			file: response.file,
+			content_type: response.content_type,
+			content_disposition: Some(content_disposition),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+		})
+	} else {
+		Err!(Request(NotFound("Media not found.")))
 	}
 }

@ -232,52 +227,49 @@ pub(crate) async fn get_content_as_filename_legacy_route(
 		media_id: &body.media_id,
 	};

-	match services.media.get(&mxc).await? {
-		| Some(FileMeta {
-			content,
-			content_type,
-			content_disposition,
-		}) => {
-			let content_disposition = make_content_disposition(
-				content_disposition.as_ref(),
-				content_type.as_deref(),
-				Some(&body.filename),
-			);
+	if let Some(FileMeta {
+		content,
+		content_type,
+		content_disposition,
+	}) = services.media.get(&mxc).await?
+	{
+		let content_disposition = make_content_disposition(
+			content_disposition.as_ref(),
+			content_type.as_deref(),
+			Some(&body.filename),
+		);

-			Ok(get_content_as_filename::v3::Response {
-				file: content.expect("entire file contents"),
-				content_type: content_type.map(Into::into),
-				content_disposition: Some(content_disposition),
-				cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-				cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-			})
-		},
-		| _ =>
-			if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
-				let response = services
-					.media
-					.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
-					.await
-					.map_err(|e| {
-						err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
-					})?;
+		Ok(get_content_as_filename::v3::Response {
+			file: content.expect("entire file contents"),
+			content_type: content_type.map(Into::into),
+			content_disposition: Some(content_disposition),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+		})
+	} else if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
+		let response = services
+			.media
+			.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
+			.await
+			.map_err(|e| {
+				err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
+			})?;

-				let content_disposition = make_content_disposition(
-					response.content_disposition.as_ref(),
-					response.content_type.as_deref(),
-					None,
-				);
+		let content_disposition = make_content_disposition(
+			response.content_disposition.as_ref(),
+			response.content_type.as_deref(),
+			None,
+		);

-				Ok(get_content_as_filename::v3::Response {
-					content_disposition: Some(content_disposition),
-					content_type: response.content_type,
-					file: response.file,
-					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-					cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-				})
-			} else {
-				Err!(Request(NotFound("Media not found.")))
-			},
+		Ok(get_content_as_filename::v3::Response {
+			content_disposition: Some(content_disposition),
+			content_type: response.content_type,
+			file: response.file,
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+		})
+	} else {
+		Err!(Request(NotFound("Media not found.")))
 	}
 }

@ -323,52 +315,46 @@ pub(crate) async fn get_content_thumbnail_legacy_route(
 	};

 	let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
-	match services.media.get_thumbnail(&mxc, &dim).await? {
-		| Some(FileMeta {
-			content,
-			content_type,
-			content_disposition,
-		}) => {
-			let content_disposition = make_content_disposition(
-				content_disposition.as_ref(),
-				content_type.as_deref(),
-				None,
-			);
+	if let Some(FileMeta {
+		content,
+		content_type,
+		content_disposition,
+	}) = services.media.get_thumbnail(&mxc, &dim).await?
+	{
+		let content_disposition =
+			make_content_disposition(content_disposition.as_ref(), content_type.as_deref(), None);

-			Ok(get_content_thumbnail::v3::Response {
-				file: content.expect("entire file contents"),
-				content_type: content_type.map(Into::into),
-				cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-				cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-				content_disposition: Some(content_disposition),
-			})
-		},
-		| _ =>
-			if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
-				let response = services
-					.media
-					.fetch_remote_thumbnail_legacy(&body)
-					.await
-					.map_err(|e| {
-						err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
-					})?;
+		Ok(get_content_thumbnail::v3::Response {
+			file: content.expect("entire file contents"),
+			content_type: content_type.map(Into::into),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+			content_disposition: Some(content_disposition),
+		})
+	} else if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
+		let response = services
+			.media
+			.fetch_remote_thumbnail_legacy(&body)
+			.await
+			.map_err(|e| {
+				err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
+			})?;

-				let content_disposition = make_content_disposition(
-					response.content_disposition.as_ref(),
-					response.content_type.as_deref(),
-					None,
-				);
+		let content_disposition = make_content_disposition(
+			response.content_disposition.as_ref(),
+			response.content_type.as_deref(),
+			None,
+		);

-				Ok(get_content_thumbnail::v3::Response {
-					file: response.file,
-					content_type: response.content_type,
-					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
-					cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
-					content_disposition: Some(content_disposition),
-				})
-			} else {
-				Err!(Request(NotFound("Media not found.")))
-			},
+		Ok(get_content_thumbnail::v3::Response {
+			file: response.file,
+			content_type: response.content_type,
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
+			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+			content_disposition: Some(content_disposition),
+		})
+	} else {
+		Err!(Request(NotFound("Media not found.")))
 	}
 }

--- a/src/api/client/membership.rs
+++ b/src/api/client/membership.rs
@ -1,7 +1,6 @@
 use std::{
 	borrow::Borrow,
 	collections::{BTreeMap, HashMap, HashSet},
-	iter::once,
 	net::IpAddr,
 	sync::Arc,
 };
@ -9,55 +8,48 @@ use std::{
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Result, at, debug, debug_info, debug_warn, err, error, info,
-	matrix::{
-		StateKey,
-		pdu::{PduBuilder, PduEvent, gen_event_id, gen_event_id_canonical_json},
-		state_res,
-	},
-	result::{FlatOk, NotFound},
+	debug, debug_info, debug_warn, err, info,
+	pdu::{gen_event_id_canonical_json, PduBuilder},
+	result::FlatOk,
 	trace,
-	utils::{self, IterStream, ReadyExt, shuffle},
-	warn,
+	utils::{self, shuffle, IterStream, ReadyExt},
+	warn, Err, PduEvent, Result,
 };
-use conduwuit_service::{
-	Services,
-	appservice::RegistrationInfo,
-	rooms::{
-		state::RoomMutexGuard,
-		state_compressor::{CompressedState, HashSetCompressStateEvent},
-	},
-};
-use futures::{FutureExt, StreamExt, TryFutureExt, future::join4, join};
+use futures::{join, FutureExt, StreamExt};
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName,
-	OwnedUserId, RoomId, RoomVersionId, ServerName, UserId,
 	api::{
 		client::{
 			error::ErrorKind,
 			knock::knock_room,
 			membership::{
-				ThirdPartySigned, ban_user, forget_room,
-				get_member_events::{self, v3::MembershipEventFilter},
-				invite_user, join_room_by_id, join_room_by_id_or_alias,
+				ban_user, forget_room, get_member_events, invite_user, join_room_by_id,
+				join_room_by_id_or_alias,
 				joined_members::{self, v3::RoomMember},
-				joined_rooms, kick_user, leave_room, unban_user,
+				joined_rooms, kick_user, leave_room, unban_user, ThirdPartySigned,
 			},
 		},
 		federation::{self, membership::create_invite},
 	},
 	canonical_json::to_canonical_value,
 	events::{
-		StateEventType,
 		room::{
 			join_rules::{AllowRule, JoinRule, RoomJoinRulesEventContent},
 			member::{MembershipState, RoomMemberEventContent},
 			message::RoomMessageEventContent,
 		},
+		StateEventType,
 	},
+	state_res, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId,
+	OwnedServerName, OwnedUserId, RoomId, RoomVersionId, ServerName, UserId,
+};
+use service::{
+	appservice::RegistrationInfo,
+	pdu::gen_event_id,
+	rooms::{state::RoomMutexGuard, state_compressor::HashSetCompressStateEvent},
+	Services,
 };

-use crate::{Ruma, client::full_user_deactivate};
+use crate::{client::full_user_deactivate, Ruma};

 /// Checks if the room is banned in any way possible and the sender user is not
 /// an admin.
@ -79,9 +71,10 @@ async fn banned_room_check(
 	if let Some(room_id) = room_id {
 		if services.rooms.metadata.is_banned(room_id).await
 			|| services
+				.server
 				.config
 				.forbidden_remote_server_names
-				.is_match(room_id.server_name().unwrap().host())
+				.contains(&room_id.server_name().unwrap().to_owned())
 		{
 			warn!(
 				"User {user_id} who is not an admin attempted to send an invite for or \
@ -119,9 +112,10 @@ async fn banned_room_check(
 		}
 	} else if let Some(server_name) = server_name {
 		if services
+			.server
 			.config
 			.forbidden_remote_server_names
-			.is_match(server_name.host())
+			.contains(&server_name.to_owned())
 		{
 			warn!(
 				"User {user_id} who is not an admin tried joining a room which has the server \
@ -476,9 +470,9 @@ pub(crate) async fn leave_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<leave_room::v3::Request>,
 ) -> Result<leave_room::v3::Response> {
-	leave_room(&services, body.sender_user(), &body.room_id, body.reason.clone())
-		.await
-		.map(|()| leave_room::v3::Response::new())
+	leave_room(&services, body.sender_user(), &body.room_id, body.reason.clone()).await?;
+
+	Ok(leave_room::v3::Response::new())
 }

 /// # `POST /_matrix/client/r0/rooms/{roomId}/invite`
@ -492,7 +486,7 @@ pub(crate) async fn invite_user_route(
 ) -> Result<invite_user::v3::Response> {
 	let sender_user = body.sender_user();

-	if !services.users.is_admin(sender_user).await && services.config.block_non_admin_invites {
+	if !services.users.is_admin(sender_user).await && services.globals.block_non_admin_invites() {
 		info!(
 			"User {sender_user} is not an admin and attempted to send an invite to room {}",
 			&body.room_id
@ -509,52 +503,43 @@ pub(crate) async fn invite_user_route(
 	)
 	.await?;

-	match &body.recipient {
-		| invite_user::v3::InvitationRecipient::UserId { user_id } => {
-			let sender_ignored_recipient = services.users.user_is_ignored(sender_user, user_id);
-			let recipient_ignored_by_sender =
-				services.users.user_is_ignored(user_id, sender_user);
+	if let invite_user::v3::InvitationRecipient::UserId { user_id } = &body.recipient {
+		let sender_ignored_recipient = services.users.user_is_ignored(sender_user, user_id);
+		let recipient_ignored_by_sender = services.users.user_is_ignored(user_id, sender_user);

-			let (sender_ignored_recipient, recipient_ignored_by_sender) =
-				join!(sender_ignored_recipient, recipient_ignored_by_sender);
+		let (sender_ignored_recipient, recipient_ignored_by_sender) =
+			join!(sender_ignored_recipient, recipient_ignored_by_sender);

-			if sender_ignored_recipient {
-				return Ok(invite_user::v3::Response {});
+		if sender_ignored_recipient {
+			return Err!(Request(Forbidden(
+				"You cannot invite users you have ignored to rooms."
+			)));
+		}
+
+		if let Ok(target_user_membership) = services
+			.rooms
+			.state_accessor
+			.get_member(&body.room_id, user_id)
+			.await
+		{
+			if target_user_membership.membership == MembershipState::Ban {
+				return Err!(Request(Forbidden("User is banned from this room.")));
 			}
+		}

-			if let Ok(target_user_membership) = services
-				.rooms
-				.state_accessor
-				.get_member(&body.room_id, user_id)
-				.await
-			{
-				if target_user_membership.membership == MembershipState::Ban {
-					return Err!(Request(Forbidden("User is banned from this room.")));
-				}
-			}
+		if recipient_ignored_by_sender {
+			// silently drop the invite to the recipient if they've been ignored by the
+			// sender, pretend it worked
+			return Ok(invite_user::v3::Response {});
+		}

-			if recipient_ignored_by_sender {
-				// silently drop the invite to the recipient if they've been ignored by the
-				// sender, pretend it worked
-				return Ok(invite_user::v3::Response {});
-			}
-
-			invite_helper(
-				&services,
-				sender_user,
-				user_id,
-				&body.room_id,
-				body.reason.clone(),
-				false,
-			)
+		invite_helper(&services, sender_user, user_id, &body.room_id, body.reason.clone(), false)
 			.boxed()
 			.await?;

-			Ok(invite_user::v3::Response {})
-		},
-		| _ => {
-			Err!(Request(NotFound("User not found.")))
-		},
+		Ok(invite_user::v3::Response {})
+	} else {
+		Err!(Request(NotFound("User not found.")))
 	}
 }

@ -717,37 +702,21 @@ pub(crate) async fn forget_room_route(
 	State(services): State<crate::State>,
 	body: Ruma<forget_room::v3::Request>,
 ) -> Result<forget_room::v3::Response> {
-	let user_id = body.sender_user();
-	let room_id = &body.room_id;
+	let sender_user = body.sender_user();

-	let joined = services.rooms.state_cache.is_joined(user_id, room_id);
-	let knocked = services.rooms.state_cache.is_knocked(user_id, room_id);
-	let left = services.rooms.state_cache.is_left(user_id, room_id);
-	let invited = services.rooms.state_cache.is_invited(user_id, room_id);
-
-	let (joined, knocked, left, invited) = join4(joined, knocked, left, invited).await;
-
-	if joined || knocked || invited {
+	if services
+		.rooms
+		.state_cache
+		.is_joined(sender_user, &body.room_id)
+		.await
+	{
 		return Err!(Request(Unknown("You must leave the room before forgetting it")));
 	}

-	let membership = services
+	services
 		.rooms
-		.state_accessor
-		.get_member(room_id, user_id)
-		.await;
-
-	if membership.is_not_found() {
-		return Err!(Request(Unknown("No membership event was found, room was never joined")));
-	}
-
-	if left
-		|| membership.is_ok_and(|member| {
-			member.membership == MembershipState::Leave
-				|| member.membership == MembershipState::Ban
-		}) {
-		services.rooms.state_cache.forget(room_id, user_id);
-	}
+		.state_cache
+		.forget(&body.room_id, sender_user);

 	Ok(forget_room::v3::Response::new())
 }
@ -770,54 +739,6 @@ pub(crate) async fn joined_rooms_route(
 	})
 }

-fn membership_filter(
-	pdu: PduEvent,
-	for_membership: Option<&MembershipEventFilter>,
-	not_membership: Option<&MembershipEventFilter>,
-) -> Option<PduEvent> {
-	let membership_state_filter = match for_membership {
-		| Some(MembershipEventFilter::Ban) => MembershipState::Ban,
-		| Some(MembershipEventFilter::Invite) => MembershipState::Invite,
-		| Some(MembershipEventFilter::Knock) => MembershipState::Knock,
-		| Some(MembershipEventFilter::Leave) => MembershipState::Leave,
-		| Some(_) | None => MembershipState::Join,
-	};
-
-	let not_membership_state_filter = match not_membership {
-		| Some(MembershipEventFilter::Ban) => MembershipState::Ban,
-		| Some(MembershipEventFilter::Invite) => MembershipState::Invite,
-		| Some(MembershipEventFilter::Join) => MembershipState::Join,
-		| Some(MembershipEventFilter::Knock) => MembershipState::Knock,
-		| Some(_) | None => MembershipState::Leave,
-	};
-
-	let evt_membership = pdu.get_content::<RoomMemberEventContent>().ok()?.membership;
-
-	if for_membership.is_some() && not_membership.is_some() {
-		if membership_state_filter != evt_membership
-			|| not_membership_state_filter == evt_membership
-		{
-			None
-		} else {
-			Some(pdu)
-		}
-	} else if for_membership.is_some() && not_membership.is_none() {
-		if membership_state_filter != evt_membership {
-			None
-		} else {
-			Some(pdu)
-		}
-	} else if not_membership.is_some() && for_membership.is_none() {
-		if not_membership_state_filter == evt_membership {
-			None
-		} else {
-			Some(pdu)
-		}
-	} else {
-		Some(pdu)
-	}
-}
-
 /// # `POST /_matrix/client/r0/rooms/{roomId}/members`
 ///
 /// Lists all joined users in a room (TODO: at a specific point in time, with a
@ -829,8 +750,6 @@ pub(crate) async fn get_member_events_route(
 	body: Ruma<get_member_events::v3::Request>,
 ) -> Result<get_member_events::v3::Response> {
 	let sender_user = body.sender_user();
-	let membership = body.membership.as_ref();
-	let not_membership = body.not_membership.as_ref();

 	if !services
 		.rooms
@ -846,13 +765,11 @@ pub(crate) async fn get_member_events_route(
 			.rooms
 			.state_accessor
 			.room_state_full(&body.room_id)
-			.ready_filter_map(Result::ok)
-			.ready_filter(|((ty, _), _)| *ty == StateEventType::RoomMember)
-			.map(at!(1))
-			.ready_filter_map(|pdu| membership_filter(pdu, membership, not_membership))
-			.map(PduEvent::into_member_event)
-			.collect()
-			.await,
+			.await?
+			.iter()
+			.filter(|(key, _)| key.0 == StateEventType::RoomMember)
+			.map(|(_, pdu)| pdu.to_member_event())
+			.collect(),
 	})
 }

@ -1060,7 +977,7 @@ async fn join_room_by_id_helper_remote(
 		| _ => {
 			join_event_stub.remove("event_id");
 		},
-	}
+	};

 	// In order to create a compatible ref hash (EventID) the `hashes` field needs
 	// to be present
@ -1089,17 +1006,10 @@ async fn join_room_by_id_helper_remote(
 			.await,
 	};

-	let send_join_response = match services
+	let send_join_response = services
 		.sending
 		.send_synapse_request(&remote_server, send_join_request)
-		.await
-	{
-		| Ok(response) => response,
-		| Err(e) => {
-			error!("send_join failed: {e}");
-			return Err(e);
-		},
-	};
+		.await?;

 	info!("send_join finished");

@ -1236,8 +1146,8 @@ async fn join_room_by_id_helper_remote(

 	debug!("Running send_join auth check");
 	let fetch_state = &state;
-	let state_fetch = |k: StateEventType, s: StateKey| async move {
-		let shortstatekey = services.rooms.short.get_shortstatekey(&k, &s).await.ok()?;
+	let state_fetch = |k: &'static StateEventType, s: String| async move {
+		let shortstatekey = services.rooms.short.get_shortstatekey(k, &s).await.ok()?;

 		let event_id = fetch_state.get(&shortstatekey)?;
 		services.rooms.timeline.get_pdu(event_id).await.ok()
@ -1247,7 +1157,7 @@ async fn join_room_by_id_helper_remote(
 		&state_res::RoomVersion::new(&room_version_id)?,
 		&parsed_join_pdu,
 		None, // TODO: third party invite
-		|k, s| state_fetch(k.clone(), s.into()),
+		|k, s| state_fetch(k, s.to_owned()),
 	)
 	.await
 	.map_err(|e| err!(Request(Forbidden(warn!("Auth check failed: {e:?}")))))?;
@ -1257,7 +1167,7 @@ async fn join_room_by_id_helper_remote(
 	}

 	info!("Compressing state from send_join");
-	let compressed: CompressedState = services
+	let compressed: HashSet<_> = services
 		.rooms
 		.state_compressor
 		.compress_state_events(state.iter().map(|(ssk, eid)| (ssk, eid.borrow())))
@ -1305,7 +1215,7 @@ async fn join_room_by_id_helper_remote(
 		.append_pdu(
 			&parsed_join_pdu,
 			join_event,
-			once(parsed_join_pdu.event_id.borrow()),
+			vec![(*parsed_join_pdu.event_id).to_owned()],
 			&state_lock,
 		)
 		.await?;
@ -1487,7 +1397,7 @@ async fn join_room_by_id_helper_local(
 		| _ => {
 			join_event_stub.remove("event_id");
 		},
-	}
+	};

 	// In order to create a compatible ref hash (EventID) the `hashes` field needs
 	// to be present
@ -1629,7 +1539,7 @@ pub(crate) async fn invite_helper(
 	reason: Option<String>,
 	is_direct: bool,
 ) -> Result {
-	if !services.users.is_admin(sender_user).await && services.config.block_non_admin_invites {
+	if !services.users.is_admin(sender_user).await && services.globals.block_non_admin_invites() {
 		info!(
 			"User {sender_user} is not an admin and attempted to send an invite to room \
 			 {room_id}"
@ -1764,8 +1674,8 @@ pub(crate) async fn invite_helper(
 	Ok(())
 }

-// Make a user leave all their joined rooms, rescinds knocks, forgets all rooms,
-// and ignores errors
+// Make a user leave all their joined rooms, forgets all rooms, and ignores
+// errors
 pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
 	let rooms_joined = services
 		.rooms
@ -1779,17 +1689,7 @@ pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
 		.rooms_invited(user_id)
 		.map(|(r, _)| r);

-	let rooms_knocked = services
-		.rooms
-		.state_cache
-		.rooms_knocked(user_id)
-		.map(|(r, _)| r);
-
-	let all_rooms: Vec<_> = rooms_joined
-		.chain(rooms_invited)
-		.chain(rooms_knocked)
-		.collect()
-		.await;
+	let all_rooms: Vec<_> = rooms_joined.chain(rooms_invited).collect().await;

 	for room_id in all_rooms {
 		// ignore errors
@ -1806,39 +1706,9 @@ pub async fn leave_room(
 	user_id: &UserId,
 	room_id: &RoomId,
 	reason: Option<String>,
-) -> Result {
-	let default_member_content = RoomMemberEventContent {
-		membership: MembershipState::Leave,
-		reason: reason.clone(),
-		join_authorized_via_users_server: None,
-		is_direct: None,
-		avatar_url: None,
-		displayname: None,
-		third_party_invite: None,
-		blurhash: None,
-	};
-
-	if services.rooms.metadata.is_banned(room_id).await
-		|| services.rooms.metadata.is_disabled(room_id).await
-	{
-		// the room is banned/disabled, the room must be rejected locally since we
-		// cant/dont want to federate with this server
-		services
-			.rooms
-			.state_cache
-			.update_membership(
-				room_id,
-				user_id,
-				default_member_content,
-				user_id,
-				None,
-				None,
-				true,
-			)
-			.await?;
-
-		return Ok(());
-	}
+) -> Result<()> {
+	//use conduwuit::utils::stream::OptionStream;
+	use futures::TryFutureExt;

 	// Ask a remote server if we don't have this room and are not knocking on it
 	if !services
@ -1872,7 +1742,7 @@ pub async fn leave_room(
 			.update_membership(
 				room_id,
 				user_id,
-				default_member_content,
+				RoomMemberEventContent::new(MembershipState::Leave),
 				user_id,
 				last_state,
 				None,
@ -1892,23 +1762,26 @@ pub async fn leave_room(
 			)
 			.await
 		else {
-			debug_warn!(
+			// Fix for broken rooms
+			warn!(
 				"Trying to leave a room you are not a member of, marking room as left locally."
 			);

-			return services
+			services
 				.rooms
 				.state_cache
 				.update_membership(
 					room_id,
 					user_id,
-					default_member_content,
+					RoomMemberEventContent::new(MembershipState::Leave),
 					user_id,
 					None,
 					None,
 					true,
 				)
-				.await;
+				.await?;
+
+			return Ok(());
 		};

 		services
@ -1938,7 +1811,7 @@ async fn remote_leave_room(
 	room_id: &RoomId,
 ) -> Result<()> {
 	let mut make_leave_response_and_server =
-		Err!(BadServerResponse("No remote server available to assist in leaving {room_id}."));
+		Err!(BadServerResponse("No server available to assist in leaving."));

 	let mut servers: HashSet<OwnedServerName> = services
 		.rooms
@ -1948,46 +1821,38 @@ async fn remote_leave_room(
 		.collect()
 		.await;

-	match services
+	if let Ok(invite_state) = services
 		.rooms
 		.state_cache
 		.invite_state(user_id, room_id)
 		.await
 	{
-		| Ok(invite_state) => {
-			servers.extend(
-				invite_state
-					.iter()
-					.filter_map(|event| event.get_field("sender").ok().flatten())
-					.filter_map(|sender: &str| UserId::parse(sender).ok())
-					.map(|user| user.server_name().to_owned()),
-			);
-		},
-		| _ => {
-			match services
-				.rooms
-				.state_cache
-				.knock_state(user_id, room_id)
-				.await
-			{
-				| Ok(knock_state) => {
-					servers.extend(
-						knock_state
-							.iter()
-							.filter_map(|event| event.get_field("sender").ok().flatten())
-							.filter_map(|sender: &str| UserId::parse(sender).ok())
-							.filter_map(|sender| {
-								if !services.globals.user_is_local(sender) {
-									Some(sender.server_name().to_owned())
-								} else {
-									None
-								}
-							}),
-					);
-				},
-				| _ => {},
-			}
-		},
+		servers.extend(
+			invite_state
+				.iter()
+				.filter_map(|event| event.get_field("sender").ok().flatten())
+				.filter_map(|sender: &str| UserId::parse(sender).ok())
+				.map(|user| user.server_name().to_owned()),
+		);
+	} else if let Ok(knock_state) = services
+		.rooms
+		.state_cache
+		.knock_state(user_id, room_id)
+		.await
+	{
+		servers.extend(
+			knock_state
+				.iter()
+				.filter_map(|event| event.get_field("sender").ok().flatten())
+				.filter_map(|sender: &str| UserId::parse(sender).ok())
+				.filter_map(|sender| {
+					if !services.globals.user_is_local(sender) {
+						Some(sender.server_name().to_owned())
+					} else {
+						None
+					}
+				}),
+		);
 	}

 	if let Some(room_id_server_name) = room_id.server_name() {
@ -2018,25 +1883,20 @@ async fn remote_leave_room(
 	let (make_leave_response, remote_server) = make_leave_response_and_server?;

 	let Some(room_version_id) = make_leave_response.room_version else {
-		return Err!(BadServerResponse(warn!(
-			"No room version was returned by {remote_server} for {room_id}, room version is \
-			 likely not supported by conduwuit"
-		)));
+		return Err!(BadServerResponse("Remote room version is not supported by conduwuit"));
 	};

 	if !services.server.supported_room_version(&room_version_id) {
-		return Err!(BadServerResponse(warn!(
-			"Remote room version {room_version_id} for {room_id} is not supported by conduwuit",
-		)));
+		return Err!(BadServerResponse(
+			"Remote room version {room_version_id} is not supported by conduwuit"
+		));
 	}

 	let mut leave_event_stub = serde_json::from_str::<CanonicalJsonObject>(
 		make_leave_response.event.get(),
 	)
 	.map_err(|e| {
-		err!(BadServerResponse(warn!(
-			"Invalid make_leave event json received from {remote_server} for {room_id}: {e:?}"
-		)))
+		err!(BadServerResponse("Invalid make_leave event json received from server: {e:?}"))
 	})?;

 	// TODO: Is origin needed?
@ -2059,7 +1919,7 @@ async fn remote_leave_room(
 		| _ => {
 			leave_event_stub.remove("event_id");
 		},
-	}
+	};

 	// In order to create a compatible ref hash (EventID) the `hashes` field needs
 	// to be present
@ -2337,7 +2197,7 @@ async fn knock_room_helper_local(
 		.append_pdu(
 			&parsed_knock_pdu,
 			knock_event,
-			once(parsed_knock_pdu.event_id.borrow()),
+			vec![(*parsed_knock_pdu.event_id).to_owned()],
 			&state_lock,
 		)
 		.await?;
@ -2481,7 +2341,7 @@ async fn knock_room_helper_remote(
 	}

 	info!("Compressing state from send_knock");
-	let compressed: CompressedState = services
+	let compressed: HashSet<_> = services
 		.rooms
 		.state_compressor
 		.compress_state_events(state_map.iter().map(|(ssk, eid)| (ssk, eid.borrow())))
@ -2536,7 +2396,7 @@ async fn knock_room_helper_remote(
 		.append_pdu(
 			&parsed_knock_pdu,
 			knock_event,
-			once(parsed_knock_pdu.event_id.borrow()),
+			vec![(*parsed_knock_pdu.event_id).to_owned()],
 			&state_lock,
 		)
 		.await?;
--- a/src/api/client/message.rs
+++ b/src/api/client/message.rs
@ -1,39 +1,36 @@
 use axum::extract::State;
 use conduwuit::{
-	Err, Result, at,
-	matrix::{
-		Event,
-		pdu::{PduCount, PduEvent},
-	},
+	at, is_equal_to,
 	utils::{
-		IterStream, ReadyExt,
 		result::{FlatOk, LogErr},
 		stream::{BroadbandExt, TryIgnore, WidebandExt},
+		IterStream, ReadyExt,
 	},
+	Event, PduCount, Result,
 };
-use conduwuit_service::{
-	Services,
+use futures::{future::OptionFuture, pin_mut, FutureExt, StreamExt};
+use ruma::{
+	api::{
+		client::{filter::RoomEventFilter, message::get_message_events},
+		Direction,
+	},
+	events::{AnyStateEvent, StateEventType, TimelineEventType, TimelineEventType::*},
+	serde::Raw,
+	RoomId, UserId,
+};
+use service::{
 	rooms::{
 		lazy_loading,
 		lazy_loading::{Options, Witness},
 		timeline::PdusIterItem,
 	},
-};
-use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
-use ruma::{
-	RoomId, UserId,
-	api::{
-		Direction,
-		client::{filter::RoomEventFilter, message::get_message_events},
-	},
-	events::{AnyStateEvent, StateEventType, TimelineEventType, TimelineEventType::*},
-	serde::Raw,
+	Services,
 };

 use crate::Ruma;

 /// list of safe and common non-state events to ignore if the user is ignored
-const IGNORED_MESSAGE_TYPES: &[TimelineEventType] = &[
+const IGNORED_MESSAGE_TYPES: &[TimelineEventType; 17] = &[
 	Audio,
 	CallInvite,
 	Emote,
@ -72,10 +69,6 @@ pub(crate) async fn get_message_events_route(
 	let room_id = &body.room_id;
 	let filter = &body.filter;

-	if !services.rooms.metadata.exists(room_id).await {
-		return Err!(Request(Forbidden("Room does not exist to this server")));
-	}
-
 	let from: PduCount = body
 		.from
 		.as_deref()
@ -161,7 +154,7 @@ pub(crate) async fn get_message_events_route(
 	let chunk = events
 		.into_iter()
 		.map(at!(1))
-		.map(PduEvent::into_room_event)
+		.map(|pdu| pdu.to_room_event())
 		.collect();

 	Ok(get_message_events::v3::Response {
@ -227,54 +220,39 @@ async fn get_member_event(
 		.rooms
 		.state_accessor
 		.room_state_get(room_id, &StateEventType::RoomMember, user_id.as_str())
-		.map_ok(PduEvent::into_state_event)
 		.await
+		.map(|member_event| member_event.to_state_event())
 		.ok()
 }

-#[inline]
 pub(crate) async fn ignored_filter(
 	services: &Services,
 	item: PdusIterItem,
 	user_id: &UserId,
 ) -> Option<PdusIterItem> {
-	let (_, ref pdu) = item;
+	let (_, pdu) = &item;

-	is_ignored_pdu(services, pdu, user_id)
-		.await
-		.eq(&false)
-		.then_some(item)
-}
-
-#[inline]
-pub(crate) async fn is_ignored_pdu(
-	services: &Services,
-	pdu: &PduEvent,
-	user_id: &UserId,
-) -> bool {
 	// exclude Synapse's dummy events from bloating up response bodies. clients
 	// don't need to see this.
 	if pdu.kind.to_cow_str() == "org.matrix.dummy_event" {
-		return true;
+		return None;
 	}

-	let ignored_type = IGNORED_MESSAGE_TYPES.binary_search(&pdu.kind).is_ok();
-
-	let ignored_server = services
-		.config
-		.forbidden_remote_server_names
-		.is_match(pdu.sender().server_name().host());
-
-	if ignored_type
-		&& (ignored_server || services.users.user_is_ignored(&pdu.sender, user_id).await)
+	if IGNORED_MESSAGE_TYPES.binary_search(&pdu.kind).is_ok()
+		&& (services.users.user_is_ignored(&pdu.sender, user_id).await
+			|| services
+				.server
+				.config
+				.forbidden_remote_server_names
+				.iter()
+				.any(is_equal_to!(pdu.sender().server_name())))
 	{
-		return true;
+		return None;
 	}

-	false
+	Some(item)
 }

-#[inline]
 pub(crate) async fn visibility_filter(
 	services: &Services,
 	item: PdusIterItem,
@ -290,16 +268,7 @@ pub(crate) async fn visibility_filter(
 		.then_some(item)
 }

-#[inline]
 pub(crate) fn event_filter(item: PdusIterItem, filter: &RoomEventFilter) -> Option<PdusIterItem> {
 	let (_, pdu) = &item;
 	pdu.matches(filter).then_some(item)
 }
-
-#[cfg_attr(debug_assertions, conduwuit::ctor)]
-fn _is_sorted() {
-	debug_assert!(
-		IGNORED_MESSAGE_TYPES.is_sorted(),
-		"IGNORED_MESSAGE_TYPES must be sorted by the developer"
-	);
-}
--- a/src/api/client/openid.rs
+++ b/src/api/client/openid.rs
@ -1,14 +1,14 @@
 use std::time::Duration;

 use axum::extract::State;
-use conduwuit::{Error, Result, utils};
+use conduwuit::utils;
 use ruma::{
 	api::client::{account, error::ErrorKind},
 	authentication::TokenType,
 };

 use super::TOKEN_LENGTH;
-use crate::Ruma;
+use crate::{Error, Result, Ruma};

 /// # `POST /_matrix/client/v3/user/{userId}/openid/request_token`
 ///
@ -37,7 +37,7 @@ pub(crate) async fn create_openid_token_route(
 	Ok(account::request_openid_token::v3::Response {
 		access_token,
 		token_type: TokenType::Bearer,
-		matrix_server_name: services.server.name.clone(),
+		matrix_server_name: services.server.config.server_name.clone(),
 		expires_in: Duration::from_secs(expires_in),
 	})
 }
--- a/src/api/client/presence.rs
+++ b/src/api/client/presence.rs
@ -1,10 +1,12 @@
 use std::time::Duration;

 use axum::extract::State;
-use conduwuit::{Err, Result};
-use ruma::api::client::presence::{get_presence, set_presence};
+use ruma::api::client::{
+	error::ErrorKind,
+	presence::{get_presence, set_presence},
+};

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

 /// # `PUT /_matrix/client/r0/presence/{userId}/status`
 ///
@ -13,17 +15,24 @@ pub(crate) async fn set_presence_route(
 	State(services): State<crate::State>,
 	body: Ruma<set_presence::v3::Request>,
 ) -> Result<set_presence::v3::Response> {
-	if !services.config.allow_local_presence {
-		return Err!(Request(Forbidden("Presence is disabled on this server")));
+	if !services.globals.allow_local_presence() {
+		return Err(Error::BadRequest(
+			ErrorKind::forbidden(),
+			"Presence is disabled on this server",
+		));
 	}

-	if body.sender_user() != body.user_id && body.appservice_info.is_none() {
-		return Err!(Request(InvalidParam("Not allowed to set presence of other users")));
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	if sender_user != &body.user_id && body.appservice_info.is_none() {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Not allowed to set presence of other users",
+		));
 	}

 	services
 		.presence
-		.set_presence(body.sender_user(), &body.presence, None, None, body.status_msg.clone())
+		.set_presence(sender_user, &body.presence, None, None, body.status_msg.clone())
 		.await?;

 	Ok(set_presence::v3::Response {})
@ -38,15 +47,21 @@ pub(crate) async fn get_presence_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_presence::v3::Request>,
 ) -> Result<get_presence::v3::Response> {
-	if !services.config.allow_local_presence {
-		return Err!(Request(Forbidden("Presence is disabled on this server",)));
+	if !services.globals.allow_local_presence() {
+		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;
+
 	let has_shared_rooms = services
 		.rooms
 		.state_cache
-		.user_sees_user(body.sender_user(), &body.user_id)
+		.user_sees_user(sender_user, &body.user_id)
 		.await;

 	if has_shared_rooms {
@ -55,35 +70,37 @@ pub(crate) async fn get_presence_route(
 		}
 	}

-	match presence_event {
-		| Some(presence) => {
-			let status_msg = if presence
+	if let Some(presence) = presence_event {
+		let status_msg = if presence
+			.content
+			.status_msg
+			.as_ref()
+			.is_some_and(String::is_empty)
+		{
+			None
+		} else {
+			presence.content.status_msg
+		};
+
+		let last_active_ago = match presence.content.currently_active {
+			| Some(true) => None,
+			| _ => presence
 				.content
-				.status_msg
-				.as_ref()
-				.is_some_and(String::is_empty)
-			{
-				None
-			} else {
-				presence.content.status_msg
-			};
+				.last_active_ago
+				.map(|millis| Duration::from_millis(millis.into())),
+		};

-			let last_active_ago = match presence.content.currently_active {
-				| Some(true) => None,
-				| _ => presence
-					.content
-					.last_active_ago
-					.map(|millis| Duration::from_millis(millis.into())),
-			};
-
-			Ok(get_presence::v3::Response {
-				// TODO: Should ruma just use the presenceeventcontent type here?
-				status_msg,
-				currently_active: presence.content.currently_active,
-				last_active_ago,
-				presence: presence.content.presence,
-			})
-		},
-		| _ => Err!(Request(NotFound("Presence state for this user was not found"))),
+		Ok(get_presence::v3::Response {
+			// TODO: Should ruma just use the presenceeventcontent type here?
+			status_msg,
+			currently_active: presence.content.currently_active,
+			last_active_ago,
+			presence: presence.content.presence,
+		})
+	} else {
+		Err(Error::BadRequest(
+			ErrorKind::NotFound,
+			"Presence state for this user was not found",
+		))
 	}
 }
--- a/src/api/client/profile.rs
+++ b/src/api/client/profile.rs
@ -2,15 +2,12 @@ use std::collections::BTreeMap;

 use axum::extract::State;
 use conduwuit::{
-	Err, Error, Result,
-	matrix::pdu::PduBuilder,
-	utils::{IterStream, stream::TryIgnore},
-	warn,
+	pdu::PduBuilder,
+	utils::{stream::TryIgnore, IterStream},
+	warn, Err, Error, Result,
 };
-use conduwuit_service::Services;
-use futures::{StreamExt, TryStreamExt, future::join3};
+use futures::{future::join3, StreamExt, TryStreamExt};
 use ruma::{
-	OwnedMxcUri, OwnedRoomId, UserId,
 	api::{
 		client::{
 			error::ErrorKind,
@ -22,7 +19,9 @@ use ruma::{
 	},
 	events::room::member::{MembershipState, RoomMemberEventContent},
 	presence::PresenceState,
+	OwnedMxcUri, OwnedRoomId, UserId,
 };
+use service::Services;

 use crate::Ruma;

@ -52,7 +51,7 @@ pub(crate) async fn set_displayname_route(
 	update_displayname(&services, &body.user_id, body.displayname.clone(), &all_joined_rooms)
 		.await;

-	if services.config.allow_local_presence {
+	if services.globals.allow_local_presence() {
 		// Presence update
 		services
 			.presence
@ -147,7 +146,7 @@ pub(crate) async fn set_avatar_url_route(
 	)
 	.await;

-	if services.config.allow_local_presence {
+	if services.globals.allow_local_presence() {
 		// Presence update
 		services
 			.presence
--- a/src/api/client/push.rs
+++ b/src/api/client/push.rs
@ -1,8 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Err, Error, Result, err};
-use conduwuit_service::Services;
+use conduwuit::{err, Err};
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue,
 	api::client::{
 		error::ErrorKind,
 		push::{
@ -12,16 +10,18 @@ use ruma::{
 		},
 	},
 	events::{
-		GlobalAccountDataEventType,
 		push_rules::{PushRulesEvent, PushRulesEventContent},
+		GlobalAccountDataEventType,
 	},
 	push::{
 		InsertPushRuleError, PredefinedContentRuleId, PredefinedOverrideRuleId,
 		RemovePushRuleError, Ruleset,
 	},
+	CanonicalJsonObject, CanonicalJsonValue,
 };
+use service::Services;

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

 /// # `GET /_matrix/client/r0/pushrules/`
 ///
@ -503,7 +503,7 @@ pub(crate) async fn set_pushers_route(

 	services
 		.pusher
-		.set_pusher(sender_user, body.sender_device(), &body.action)
+		.set_pusher(sender_user, &body.action)
 		.await?;

 	Ok(set_pusher::v3::Response::new())
--- a/src/api/client/read_marker.rs
+++ b/src/api/client/read_marker.rs
@ -1,17 +1,17 @@
 use std::collections::BTreeMap;

 use axum::extract::State;
-use conduwuit::{Err, PduCount, Result, err};
+use conduwuit::{err, Err, PduCount};
 use ruma::{
-	MilliSecondsSinceUnixEpoch,
 	api::client::{read_marker::set_read_marker, receipt::create_receipt},
 	events::{
-		RoomAccountDataEventType,
 		receipt::{ReceiptThread, ReceiptType},
+		RoomAccountDataEventType,
 	},
+	MilliSecondsSinceUnixEpoch,
 };

-use crate::Ruma;
+use crate::{Result, Ruma};

 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
@ -50,7 +50,7 @@ pub(crate) async fn set_read_marker_route(
 	}

 	// ping presence
-	if services.config.allow_local_presence {
+	if services.globals.allow_local_presence() {
 		services
 			.presence
 			.ping_presence(sender_user, &ruma::presence::PresenceState::Online)
@ -126,7 +126,7 @@ pub(crate) async fn create_receipt_route(
 	}

 	// ping presence
-	if services.config.allow_local_presence {
+	if services.globals.allow_local_presence() {
 		services
 			.presence
 			.ping_presence(sender_user, &ruma::presence::PresenceState::Online)
@ -197,12 +197,11 @@ pub(crate) async fn create_receipt_route(
 				.read_receipt
 				.private_read_set(&body.room_id, sender_user, count);
 		},
-		| _ => {
+		| _ =>
 			return Err!(Request(InvalidParam(warn!(
 				"Received unknown read receipt type: {}",
 				&body.receipt_type
-			))));
-		},
+			)))),
 	}

 	Ok(create_receipt::v3::Response {})
--- a/src/api/client/redact.rs
+++ b/src/api/client/redact.rs
@ -1,10 +1,9 @@
 use axum::extract::State;
-use conduwuit::{Result, matrix::pdu::PduBuilder};
 use ruma::{
 	api::client::redact::redact_event, events::room::redaction::RoomRedactionEventContent,
 };

-use crate::Ruma;
+use crate::{service::pdu::PduBuilder, Result, Ruma};

 /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
 ///
--- a/src/api/client/relations.rs
+++ b/src/api/client/relations.rs
@ -1,22 +1,22 @@
 use axum::extract::State;
 use conduwuit::{
-	Result, at,
-	matrix::pdu::PduCount,
-	utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
+	at,
+	utils::{result::FlatOk, stream::WidebandExt, IterStream, ReadyExt},
+	PduCount, Result,
 };
-use conduwuit_service::{Services, rooms::timeline::PdusIterItem};
 use futures::StreamExt;
 use ruma::{
-	EventId, RoomId, UInt, UserId,
 	api::{
-		Direction,
 		client::relations::{
 			get_relating_events, get_relating_events_with_rel_type,
 			get_relating_events_with_rel_type_and_event_type,
 		},
+		Direction,
 	},
-	events::{TimelineEventType, relation::RelationType},
+	events::{relation::RelationType, TimelineEventType},
+	EventId, RoomId, UInt, UserId,
 };
+use service::{rooms::timeline::PdusIterItem, Services};

 use crate::Ruma;

--- a/src/api/client/report.rs
+++ b/src/api/client/report.rs
@ -2,21 +2,23 @@ use std::time::Duration;

 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Error, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt};
-use conduwuit_service::Services;
+use conduwuit::{info, utils::ReadyExt, Err};
 use rand::Rng;
 use ruma::{
-	EventId, RoomId, UserId,
 	api::client::{
 		error::ErrorKind,
 		room::{report_content, report_room},
 	},
 	events::room::message,
-	int,
+	int, EventId, RoomId, UserId,
 };
 use tokio::time::sleep;

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

 /// # `POST /_matrix/client/v3/rooms/{roomId}/report`
 ///
@ -41,14 +43,14 @@ pub(crate) async fn report_room_route(
 			ErrorKind::InvalidParam,
 			"Reason too long, should be 750 characters or fewer",
 		));
-	}
+	};

 	delay_response().await;

 	if !services
 		.rooms
 		.state_cache
-		.server_in_room(&services.server.name, &body.room_id)
+		.server_in_room(&services.server.config.server_name, &body.room_id)
 		.await
 	{
 		return Err!(Request(NotFound(
@ -162,14 +164,14 @@ async fn is_event_report_valid(
 			ErrorKind::InvalidParam,
 			"Invalid score, must be within 0 to -100",
 		));
-	}
+	};

 	if reason.as_ref().is_some_and(|s| s.len() > 750) {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Reason too long, should be 750 characters or fewer",
 		));
-	}
+	};

 	if !services
 		.rooms
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@ -2,20 +2,15 @@ use std::collections::BTreeMap;

 use axum::extract::State;
 use conduwuit::{
-	Err, Error, Result, debug_info, debug_warn, err, error, info,
-	matrix::{StateKey, pdu::PduBuilder},
-	warn,
+	debug_info, debug_warn, err, error, info, pdu::PduBuilder, warn, Err, Error, Result,
 };
-use conduwuit_service::{Services, appservice::RegistrationInfo};
 use futures::FutureExt;
 use ruma::{
-	CanonicalJsonObject, Int, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomId, RoomVersionId,
 	api::client::{
 		error::ErrorKind,
 		room::{self, create_room},
 	},
 	events::{
-		TimelineEventType,
 		room::{
 			canonical_alias::RoomCanonicalAliasEventContent,
 			create::RoomCreateEventContent,
@ -27,13 +22,16 @@ use ruma::{
 			power_levels::RoomPowerLevelsEventContent,
 			topic::RoomTopicEventContent,
 		},
+		TimelineEventType,
 	},
 	int,
 	serde::{JsonObject, Raw},
+	CanonicalJsonObject, Int, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomId, RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};
+use service::{appservice::RegistrationInfo, Services};

-use crate::{Ruma, client::invite_helper};
+use crate::{client::invite_helper, Ruma};

 /// # `POST /_matrix/client/v3/createRoom`
 ///
@ -70,9 +68,10 @@ pub(crate) async fn create_room_route(
 		));
 	}

-	let room_id: OwnedRoomId = match &body.room_id {
-		| Some(custom_room_id) => custom_room_id_check(&services, custom_room_id)?,
-		| _ => RoomId::new(&services.server.name),
+	let room_id: OwnedRoomId = if let Some(custom_room_id) = &body.room_id {
+		custom_room_id_check(&services, custom_room_id)?
+	} else {
+		RoomId::new(&services.server.config.server_name)
 	};

 	// check if room ID doesn't already exist instead of erroring on auth check
@ -115,10 +114,10 @@ pub(crate) async fn create_room_route(
 		.await;
 	let state_lock = services.rooms.state.mutex.lock(&room_id).await;

-	let alias: Option<OwnedRoomAliasId> = match body.room_alias_name.as_ref() {
-		| Some(alias) =>
-			Some(room_alias_check(&services, alias, body.appservice_info.as_ref()).await?),
-		| _ => None,
+	let alias: Option<OwnedRoomAliasId> = if let Some(alias) = body.room_alias_name.as_ref() {
+		Some(room_alias_check(&services, alias, body.appservice_info.as_ref()).await?)
+	} else {
+		None
 	};

 	let room_version = match body.room_version.clone() {
@ -199,7 +198,7 @@ pub(crate) async fn create_room_route(
 				event_type: TimelineEventType::RoomCreate,
 				content: to_raw_value(&create_content)
 					.expect("create event content serialization"),
-				state_key: Some(StateKey::new()),
+				state_key: Some(String::new()),
 				..Default::default()
 			},
 			sender_user,
@ -241,7 +240,9 @@ pub(crate) async fn create_room_route(
 	if preset == RoomPreset::TrustedPrivateChat {
 		for invite in &body.invite {
 			if services.users.user_is_ignored(sender_user, invite).await {
-				continue;
+				return Err!(Request(Forbidden(
+					"You cannot invite users you have ignored to rooms."
+				)));
 			} else if services.users.user_is_ignored(invite, sender_user).await {
 				// silently drop the invite to the recipient if they've been ignored by the
 				// sender, pretend it worked
@ -266,7 +267,7 @@ pub(crate) async fn create_room_route(
 				event_type: TimelineEventType::RoomPowerLevels,
 				content: to_raw_value(&power_levels_content)
 					.expect("serialized power_levels event content"),
-				state_key: Some(StateKey::new()),
+				state_key: Some(String::new()),
 				..Default::default()
 			},
 			sender_user,
@ -370,11 +371,11 @@ pub(crate) async fn create_room_route(
 		}

 		// Implicit state key defaults to ""
-		pdu_builder.state_key.get_or_insert_with(StateKey::new);
+		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.config.allow_encryption
+			&& !services.globals.allow_encryption()
 		{
 			continue;
 		}
@ -420,7 +421,9 @@ pub(crate) async fn create_room_route(
 	drop(state_lock);
 	for user_id in &body.invite {
 		if services.users.user_is_ignored(sender_user, user_id).await {
-			continue;
+			return Err!(Request(Forbidden(
+				"You cannot invite users you have ignored to rooms."
+			)));
 		} else if services.users.user_is_ignored(user_id, sender_user).await {
 			// silently drop the invite to the recipient if they've been ignored by the
 			// sender, pretend it worked
--- a/src/api/client/room/event.rs
+++ b/src/api/client/room/event.rs
@ -1,44 +1,52 @@
 use axum::extract::State;
-use conduwuit::{Err, Event, Result, err};
-use futures::{FutureExt, TryFutureExt, future::try_join};
+use conduwuit::{err, Err, Event, Result};
+use futures::{try_join, FutureExt, TryFutureExt};
 use ruma::api::client::room::get_room_event;

-use crate::{Ruma, client::is_ignored_pdu};
+use crate::{client::ignored_filter, Ruma};

 /// # `GET /_matrix/client/r0/rooms/{roomId}/event/{eventId}`
 ///
 /// Gets a single event.
 pub(crate) async fn get_room_event_route(
-	State(ref services): State<crate::State>,
+	State(services): State<crate::State>,
 	ref body: Ruma<get_room_event::v3::Request>,
 ) -> Result<get_room_event::v3::Response> {
-	let event_id = &body.event_id;
-	let room_id = &body.room_id;
-
 	let event = services
 		.rooms
 		.timeline
-		.get_pdu(event_id)
-		.map_err(|_| err!(Request(NotFound("Event {} not found.", event_id))));
+		.get_pdu(&body.event_id)
+		.map_err(|_| err!(Request(NotFound("Event {} not found.", &body.event_id))));
+
+	let token = services
+		.rooms
+		.timeline
+		.get_pdu_count(&body.event_id)
+		.map_err(|_| err!(Request(NotFound("Event not found."))));

 	let visible = services
 		.rooms
 		.state_accessor
-		.user_can_see_event(body.sender_user(), room_id, event_id)
+		.user_can_see_event(body.sender_user(), &body.room_id, &body.event_id)
 		.map(Ok);

-	let (mut event, visible) = try_join(event, visible).await?;
+	let (token, mut event, visible) = try_join!(token, event, visible)?;

-	if !visible || is_ignored_pdu(services, &event, body.sender_user()).await {
+	if !visible
+		|| ignored_filter(&services, (token, event.clone()), body.sender_user())
+			.await
+			.is_none()
+	{
 		return Err!(Request(Forbidden("You don't have permission to view this event.")));
 	}

-	debug_assert!(
-		event.event_id() == event_id && event.room_id() == room_id,
-		"Fetched PDU must match requested"
-	);
+	if event.event_id() != &body.event_id || event.room_id() != body.room_id {
+		return Err!(Request(NotFound("Event not found")));
+	}

 	event.add_age().ok();

-	Ok(get_room_event::v3::Response { event: event.into_room_event() })
+	let event = event.to_room_event();
+
+	Ok(get_room_event::v3::Response { event })
 }
--- a/src/api/client/room/initial_sync.rs
+++ b/src/api/client/room/initial_sync.rs
@ -1,7 +1,8 @@
 use axum::extract::State;
 use conduwuit::{
-	Err, PduEvent, Result, at,
-	utils::{BoolExt, stream::TryTools},
+	at,
+	utils::{stream::TryTools, BoolExt},
+	Err, Result,
 };
 use futures::TryStreamExt;
 use ruma::api::client::room::initial_sync::v3::{PaginationChunk, Request, Response};
@ -38,9 +39,10 @@ pub(crate) async fn room_initial_sync_route(
 		.rooms
 		.state_accessor
 		.room_state_full_pdus(room_id)
-		.map_ok(PduEvent::into_state_event)
-		.try_collect()
-		.await?;
+		.await?
+		.into_iter()
+		.map(|pdu| pdu.to_state_event())
+		.collect();

 	let messages = PaginationChunk {
 		start: events.last().map(at!(0)).as_ref().map(ToString::to_string),
@ -55,7 +57,7 @@ pub(crate) async fn room_initial_sync_route(
 		chunk: events
 			.into_iter()
 			.map(at!(1))
-			.map(PduEvent::into_room_event)
+			.map(|pdu| pdu.to_room_event())
 			.collect(),
 	};

--- a/src/api/client/room/mod.rs
+++ b/src/api/client/room/mod.rs
@ -2,14 +2,9 @@ mod aliases;
 mod create;
 mod event;
 mod initial_sync;
-mod summary;
 mod upgrade;

 pub(crate) use self::{
-	aliases::get_room_aliases_route,
-	create::create_room_route,
-	event::get_room_event_route,
-	initial_sync::room_initial_sync_route,
-	summary::{get_room_summary, get_room_summary_legacy},
-	upgrade::upgrade_room_route,
+	aliases::get_room_aliases_route, create::create_room_route, event::get_room_event_route,
+	initial_sync::room_initial_sync_route, upgrade::upgrade_room_route,
 };
--- a/src/api/client/room/summary.rs
+++ b/src/api/client/room/summary.rs
@ -1,330 +0,0 @@
-use axum::extract::State;
-use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, debug_warn, trace,
-	utils::{IterStream, future::TryExtExt},
-};
-use futures::{
-	FutureExt, StreamExt,
-	future::{OptionFuture, join3},
-	stream::FuturesUnordered,
-};
-use ruma::{
-	OwnedServerName, RoomId, UserId,
-	api::{
-		client::room::get_summary,
-		federation::space::{SpaceHierarchyParentSummary, get_hierarchy},
-	},
-	events::room::member::MembershipState,
-	space::SpaceRoomJoinRule::{self, *},
-};
-use service::Services;
-
-use crate::{Ruma, RumaResponse};
-
-/// # `GET /_matrix/client/unstable/im.nheko.summary/rooms/{roomIdOrAlias}/summary`
-///
-/// Returns a short description of the state of a room.
-///
-/// This is the "wrong" endpoint that some implementations/clients may use
-/// according to the MSC. Request and response bodies are the same as
-/// `get_room_summary`.
-///
-/// An implementation of [MSC3266](https://github.com/matrix-org/matrix-spec-proposals/pull/3266)
-pub(crate) async fn get_room_summary_legacy(
-	State(services): State<crate::State>,
-	InsecureClientIp(client): InsecureClientIp,
-	body: Ruma<get_summary::msc3266::Request>,
-) -> Result<RumaResponse<get_summary::msc3266::Response>> {
-	get_room_summary(State(services), InsecureClientIp(client), body)
-		.boxed()
-		.await
-		.map(RumaResponse)
-}
-
-/// # `GET /_matrix/client/unstable/im.nheko.summary/summary/{roomIdOrAlias}`
-///
-/// Returns a short description of the state of a room.
-///
-/// An implementation of [MSC3266](https://github.com/matrix-org/matrix-spec-proposals/pull/3266)
-#[tracing::instrument(skip_all, fields(%client), name = "room_summary")]
-pub(crate) async fn get_room_summary(
-	State(services): State<crate::State>,
-	InsecureClientIp(client): InsecureClientIp,
-	body: Ruma<get_summary::msc3266::Request>,
-) -> Result<get_summary::msc3266::Response> {
-	let (room_id, servers) = services
-		.rooms
-		.alias
-		.resolve_with_servers(&body.room_id_or_alias, Some(body.via.clone()))
-		.await?;
-
-	if services.rooms.metadata.is_banned(&room_id).await {
-		return Err!(Request(Forbidden("This room is banned on this homeserver.")));
-	}
-
-	room_summary_response(&services, &room_id, &servers, body.sender_user.as_deref())
-		.boxed()
-		.await
-}
-
-async fn room_summary_response(
-	services: &Services,
-	room_id: &RoomId,
-	servers: &[OwnedServerName],
-	sender_user: Option<&UserId>,
-) -> Result<get_summary::msc3266::Response> {
-	if services
-		.rooms
-		.state_cache
-		.server_in_room(services.globals.server_name(), room_id)
-		.await
-	{
-		return local_room_summary_response(services, room_id, sender_user)
-			.boxed()
-			.await;
-	}
-
-	let room =
-		remote_room_summary_hierarchy_response(services, room_id, servers, sender_user).await?;
-
-	Ok(get_summary::msc3266::Response {
-		room_id: room_id.to_owned(),
-		canonical_alias: room.canonical_alias,
-		avatar_url: room.avatar_url,
-		guest_can_join: room.guest_can_join,
-		name: room.name,
-		num_joined_members: room.num_joined_members,
-		topic: room.topic,
-		world_readable: room.world_readable,
-		join_rule: room.join_rule,
-		room_type: room.room_type,
-		room_version: room.room_version,
-		encryption: room.encryption,
-		allowed_room_ids: room.allowed_room_ids,
-		membership: sender_user.is_some().then_some(MembershipState::Leave),
-	})
-}
-
-async fn local_room_summary_response(
-	services: &Services,
-	room_id: &RoomId,
-	sender_user: Option<&UserId>,
-) -> Result<get_summary::msc3266::Response> {
-	trace!(?sender_user, "Sending local room summary response for {room_id:?}");
-	let join_rule = services.rooms.state_accessor.get_join_rules(room_id);
-	let world_readable = services.rooms.state_accessor.is_world_readable(room_id);
-	let guest_can_join = services.rooms.state_accessor.guest_can_join(room_id);
-
-	let (join_rule, world_readable, guest_can_join) =
-		join3(join_rule, world_readable, guest_can_join).await;
-	trace!("{join_rule:?}, {world_readable:?}, {guest_can_join:?}");
-
-	user_can_see_summary(
-		services,
-		room_id,
-		&join_rule.clone().into(),
-		guest_can_join,
-		world_readable,
-		join_rule.allowed_rooms(),
-		sender_user,
-	)
-	.await?;
-
-	let canonical_alias = services
-		.rooms
-		.state_accessor
-		.get_canonical_alias(room_id)
-		.ok();
-
-	let name = services.rooms.state_accessor.get_name(room_id).ok();
-
-	let topic = services.rooms.state_accessor.get_room_topic(room_id).ok();
-
-	let room_type = services.rooms.state_accessor.get_room_type(room_id).ok();
-
-	let avatar_url = services
-		.rooms
-		.state_accessor
-		.get_avatar(room_id)
-		.map(|res| res.into_option().unwrap_or_default().url);
-
-	let room_version = services.rooms.state.get_room_version(room_id).ok();
-
-	let encryption = services
-		.rooms
-		.state_accessor
-		.get_room_encryption(room_id)
-		.ok();
-
-	let num_joined_members = services
-		.rooms
-		.state_cache
-		.room_joined_count(room_id)
-		.unwrap_or(0);
-
-	let membership: OptionFuture<_> = sender_user
-		.map(|sender_user| {
-			services
-				.rooms
-				.state_accessor
-				.get_member(room_id, sender_user)
-				.map_ok_or(MembershipState::Leave, |content| content.membership)
-		})
-		.into();
-
-	let (
-		canonical_alias,
-		name,
-		num_joined_members,
-		topic,
-		avatar_url,
-		room_type,
-		room_version,
-		encryption,
-		membership,
-	) = futures::join!(
-		canonical_alias,
-		name,
-		num_joined_members,
-		topic,
-		avatar_url,
-		room_type,
-		room_version,
-		encryption,
-		membership,
-	);
-
-	Ok(get_summary::msc3266::Response {
-		room_id: room_id.to_owned(),
-		canonical_alias,
-		avatar_url,
-		guest_can_join,
-		name,
-		num_joined_members: num_joined_members.try_into().unwrap_or_default(),
-		topic,
-		world_readable,
-		room_type,
-		room_version,
-		encryption,
-		membership,
-		allowed_room_ids: join_rule.allowed_rooms().map(Into::into).collect(),
-		join_rule: join_rule.into(),
-	})
-}
-
-/// used by MSC3266 to fetch a room's info if we do not know about it
-async fn remote_room_summary_hierarchy_response(
-	services: &Services,
-	room_id: &RoomId,
-	servers: &[OwnedServerName],
-	sender_user: Option<&UserId>,
-) -> Result<SpaceHierarchyParentSummary> {
-	trace!(?sender_user, ?servers, "Sending remote room summary response for {room_id:?}");
-	if !services.config.allow_federation {
-		return Err!(Request(Forbidden("Federation is disabled.")));
-	}
-
-	if services.rooms.metadata.is_disabled(room_id).await {
-		return Err!(Request(Forbidden(
-			"Federaton of room {room_id} is currently disabled on this server."
-		)));
-	}
-
-	let request = get_hierarchy::v1::Request::new(room_id.to_owned());
-
-	let mut requests: FuturesUnordered<_> = servers
-		.iter()
-		.map(|server| {
-			services
-				.sending
-				.send_federation_request(server, request.clone())
-		})
-		.collect();
-
-	while let Some(Ok(response)) = requests.next().await {
-		trace!("{response:?}");
-		let room = response.room.clone();
-		if room.room_id != room_id {
-			debug_warn!(
-				"Room ID {} returned does not belong to the requested room ID {}",
-				room.room_id,
-				room_id
-			);
-			continue;
-		}
-
-		return user_can_see_summary(
-			services,
-			room_id,
-			&room.join_rule,
-			room.guest_can_join,
-			room.world_readable,
-			room.allowed_room_ids.iter().map(AsRef::as_ref),
-			sender_user,
-		)
-		.await
-		.map(|()| room);
-	}
-
-	Err!(Request(NotFound(
-		"Room is unknown to this server and was unable to fetch over federation with the \
-		 provided servers available"
-	)))
-}
-
-async fn user_can_see_summary<'a, I>(
-	services: &Services,
-	room_id: &RoomId,
-	join_rule: &SpaceRoomJoinRule,
-	guest_can_join: bool,
-	world_readable: bool,
-	allowed_room_ids: I,
-	sender_user: Option<&UserId>,
-) -> Result
-where
-	I: Iterator<Item = &'a RoomId> + Send,
-{
-	let is_public_room = matches!(join_rule, Public | Knock | KnockRestricted);
-	match sender_user {
-		| Some(sender_user) => {
-			let user_can_see_state_events = services
-				.rooms
-				.state_accessor
-				.user_can_see_state_events(sender_user, room_id);
-			let is_guest = services.users.is_deactivated(sender_user).unwrap_or(false);
-			let user_in_allowed_restricted_room = allowed_room_ids
-				.stream()
-				.any(|room| services.rooms.state_cache.is_joined(sender_user, room));
-
-			let (user_can_see_state_events, is_guest, user_in_allowed_restricted_room) =
-				join3(user_can_see_state_events, is_guest, user_in_allowed_restricted_room)
-					.boxed()
-					.await;
-
-			if user_can_see_state_events
-				|| (is_guest && guest_can_join)
-				|| is_public_room
-				|| user_in_allowed_restricted_room
-			{
-				return Ok(());
-			}
-
-			Err!(Request(Forbidden(
-				"Room is not world readable, not publicly accessible/joinable, restricted room \
-				 conditions not met, and guest access is forbidden. Not allowed to see details \
-				 of this room."
-			)))
-		},
-		| None => {
-			if is_public_room || world_readable {
-				return Ok(());
-			}
-
-			Err!(Request(Forbidden(
-				"Room is not world readable or publicly accessible/joinable, authentication is \
-				 required"
-			)))
-		},
-	}
-}
--- a/src/api/client/room/upgrade.rs
+++ b/src/api/client/room/upgrade.rs
@ -1,23 +1,19 @@
 use std::cmp::max;

 use axum::extract::State;
-use conduwuit::{
-	Error, Result, err, info,
-	matrix::{StateKey, pdu::PduBuilder},
-};
+use conduwuit::{err, info, pdu::PduBuilder, Error, Result};
 use futures::StreamExt;
 use ruma::{
-	CanonicalJsonObject, RoomId, RoomVersionId,
 	api::client::{error::ErrorKind, room::upgrade_room},
 	events::{
-		StateEventType, TimelineEventType,
 		room::{
 			member::{MembershipState, RoomMemberEventContent},
 			power_levels::RoomPowerLevelsEventContent,
 			tombstone::RoomTombstoneEventContent,
 		},
+		StateEventType, TimelineEventType,
 	},
-	int,
+	int, CanonicalJsonObject, RoomId, RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};

@ -81,7 +77,7 @@ pub(crate) async fn upgrade_room_route(
 		.rooms
 		.timeline
 		.build_and_append_pdu(
-			PduBuilder::state(StateKey::new(), &RoomTombstoneEventContent {
+			PduBuilder::state(String::new(), &RoomTombstoneEventContent {
 				body: "This room has been replaced".to_owned(),
 				replacement_room: replacement_room.clone(),
 			}),
@ -106,7 +102,7 @@ pub(crate) async fn upgrade_room_route(
 	// Use the m.room.tombstone event as the predecessor
 	let predecessor = Some(ruma::events::room::create::PreviousRoom::new(
 		body.room_id.clone(),
-		Some(tombstone_event_id),
+		(*tombstone_event_id).to_owned(),
 	));

 	// Send a m.room.create event containing a predecessor field and the applicable
@ -163,7 +159,7 @@ pub(crate) async fn upgrade_room_route(
 				content: to_raw_value(&create_event_content)
 					.expect("event is valid, we just created it"),
 				unsigned: None,
-				state_key: Some(StateKey::new()),
+				state_key: Some(String::new()),
 				redacts: None,
 				timestamp: None,
 			},
@ -192,7 +188,7 @@ pub(crate) async fn upgrade_room_route(
 				})
 				.expect("event is valid, we just created it"),
 				unsigned: None,
-				state_key: Some(sender_user.as_str().into()),
+				state_key: Some(sender_user.to_string()),
 				redacts: None,
 				timestamp: None,
 			},
@ -221,7 +217,7 @@ pub(crate) async fn upgrade_room_route(
 				PduBuilder {
 					event_type: event_type.to_string().into(),
 					content: event_content,
-					state_key: Some(StateKey::new()),
+					state_key: Some(String::new()),
 					..Default::default()
 				},
 				sender_user,
@ -276,7 +272,7 @@ pub(crate) async fn upgrade_room_route(
 		.rooms
 		.timeline
 		.build_and_append_pdu(
-			PduBuilder::state(StateKey::new(), &RoomPowerLevelsEventContent {
+			PduBuilder::state(String::new(), &RoomPowerLevelsEventContent {
 				events_default: new_level,
 				invite: new_level,
 				..power_levels_event_content
--- a/src/api/client/search.rs
+++ b/src/api/client/search.rs
@ -2,23 +2,23 @@ use std::collections::BTreeMap;

 use axum::extract::State;
 use conduwuit::{
-	Err, Result, at, is_true,
-	matrix::pdu::PduEvent,
+	at, is_true,
 	result::FlatOk,
-	utils::{IterStream, stream::ReadyExt},
+	utils::{stream::ReadyExt, IterStream},
+	Err, PduEvent, Result,
 };
-use conduwuit_service::{Services, rooms::search::RoomQuery};
-use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt, future::OptionFuture};
+use futures::{future::OptionFuture, FutureExt, StreamExt, TryFutureExt};
 use ruma::{
-	OwnedRoomId, RoomId, UInt, UserId,
 	api::client::search::search_events::{
 		self,
 		v3::{Criteria, EventContextResult, ResultCategories, ResultRoomEvents, SearchResult},
 	},
 	events::AnyStateEvent,
 	serde::Raw,
+	OwnedRoomId, RoomId, UInt, UserId,
 };
 use search_events::v3::{Request, Response};
+use service::{rooms::search::RoomQuery, Services};

 use crate::Ruma;

@ -144,7 +144,7 @@ async fn category_room_events(
 		.map(at!(2))
 		.flatten()
 		.stream()
-		.map(PduEvent::into_room_event)
+		.map(|pdu| pdu.to_room_event())
 		.map(|result| SearchResult {
 			rank: None,
 			result: Some(result),
@ -181,15 +181,15 @@ async fn category_room_events(
 }

 async fn procure_room_state(services: &Services, room_id: &RoomId) -> Result<RoomState> {
-	let state = services
+	let state_map = services
 		.rooms
 		.state_accessor
-		.room_state_full_pdus(room_id)
-		.map_ok(PduEvent::into_state_event)
-		.try_collect()
+		.room_state_full(room_id)
 		.await?;

-	Ok(state)
+	let state_events = state_map.values().map(PduEvent::to_state_event).collect();
+
+	Ok(state_events)
 }

 async fn check_room_visible(
--- a/src/api/client/send.rs
+++ b/src/api/client/send.rs
@ -1,11 +1,11 @@
 use std::collections::BTreeMap;

 use axum::extract::State;
-use conduwuit::{Err, Result, err, matrix::pdu::PduBuilder, utils};
+use conduwuit::{err, Err};
 use ruma::{api::client::message::send_message_event, events::MessageLikeEventType};
 use serde_json::from_str;

-use crate::Ruma;
+use crate::{service::pdu::PduBuilder, utils, Result, Ruma};

 /// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
@ -25,7 +25,8 @@ pub(crate) async fn send_message_event_route(
 	let appservice_info = body.appservice_info.as_ref();

 	// Forbid m.room.encrypted if encryption is disabled
-	if MessageLikeEventType::RoomEncrypted == body.event_type && !services.config.allow_encryption
+	if MessageLikeEventType::RoomEncrypted == body.event_type
+		&& !services.globals.allow_encryption()
 	{
 		return Err!(Request(Forbidden("Encryption has been disabled")));
 	}
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@ -2,15 +2,11 @@ use std::time::Duration;

 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Error, Result, debug, err, info, utils,
-	utils::{ReadyExt, hash},
-};
-use conduwuit_service::uiaa::SESSION_ID_LENGTH;
+use conduwuit::{debug, err, info, utils::ReadyExt, warn, Err};
 use futures::StreamExt;
 use ruma::{
-	UserId,
 	api::client::{
+		error::ErrorKind,
 		session::{
 			get_login_token,
 			get_login_types::{
@ -25,10 +21,12 @@ use ruma::{
 		},
 		uiaa,
 	},
+	OwnedUserId, UserId,
 };
+use service::uiaa::SESSION_ID_LENGTH;

 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::Ruma;
+use crate::{utils, utils::hash, Error, Result, Ruma};

 /// # `GET /_matrix/client/v3/login`
 ///
@ -69,8 +67,6 @@ pub(crate) async fn login_route(
 	InsecureClientIp(client): InsecureClientIp,
 	body: Ruma<login::v3::Request>,
 ) -> Result<login::v3::Response> {
-	let emergency_mode_enabled = services.config.emergency_password.is_some();
-
 	// Validate login method
 	// TODO: Other login methods
 	let user_id = match &body.login_info {
@ -82,67 +78,36 @@ pub(crate) async fn login_route(
 			..
 		}) => {
 			debug!("Got password login type");
-			let user_id =
-				if let Some(uiaa::UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
-					UserId::parse_with_server_name(user_id, &services.config.server_name)
-				} else if let Some(user) = user {
-					UserId::parse_with_server_name(user, &services.config.server_name)
-				} else {
-					return Err!(Request(Unknown(
-						debug_warn!(?body.login_info, "Valid identifier or username was not provided (invalid or unsupported login type?)")
-					)));
-				}
-				.map_err(|e| err!(Request(InvalidUsername(warn!("Username is invalid: {e}")))))?;
-
-			let lowercased_user_id = UserId::parse_with_server_name(
-				user_id.localpart().to_lowercase(),
-				&services.config.server_name,
-			)?;
-
-			if !services.globals.user_is_local(&user_id)
-				|| !services.globals.user_is_local(&lowercased_user_id)
+			let user_id = if let Some(uiaa::UserIdentifier::UserIdOrLocalpart(user_id)) =
+				identifier
 			{
-				return Err!(Request(Unknown("User ID does not belong to this homeserver")));
+				UserId::parse_with_server_name(
+					user_id.to_lowercase(),
+					services.globals.server_name(),
+				)
+			} else if let Some(user) = user {
+				OwnedUserId::parse(user)
+			} else {
+				warn!("Bad login type: {:?}", &body.login_info);
+				return Err!(Request(Forbidden("Bad login type.")));
 			}
+			.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;

-			// first try the username as-is
 			let hash = services
 				.users
 				.password_hash(&user_id)
 				.await
-				.inspect_err(|e| debug!("{e}"));
+				.map_err(|_| err!(Request(Forbidden("Wrong username or password."))))?;

-			match hash {
-				| Ok(hash) => {
-					if hash.is_empty() {
-						return Err!(Request(UserDeactivated("The user has been deactivated")));
-					}
-
-					hash::verify_password(password, &hash)
-						.inspect_err(|e| debug!("{e}"))
-						.map_err(|_| err!(Request(Forbidden("Wrong username or password."))))?;
-
-					user_id
-				},
-				| Err(_e) => {
-					let hash_lowercased_user_id = services
-						.users
-						.password_hash(&lowercased_user_id)
-						.await
-						.inspect_err(|e| debug!("{e}"))
-						.map_err(|_| err!(Request(Forbidden("Wrong username or password."))))?;
-
-					if hash_lowercased_user_id.is_empty() {
-						return Err!(Request(UserDeactivated("The user has been deactivated")));
-					}
-
-					hash::verify_password(password, &hash_lowercased_user_id)
-						.inspect_err(|e| debug!("{e}"))
-						.map_err(|_| err!(Request(Forbidden("Wrong username or password."))))?;
-
-					lowercased_user_id
-				},
+			if hash.is_empty() {
+				return Err!(Request(UserDeactivated("The user has been deactivated")));
 			}
+
+			if hash::verify_password(password, &hash).is_err() {
+				return Err!(Request(Forbidden("Wrong username or password.")));
+			}
+
+			user_id
 		},
 		| login::v3::LoginInfo::Token(login::v3::Token { token }) => {
 			debug!("Got token login type");
@ -157,38 +122,46 @@ pub(crate) async fn login_route(
 			user,
 		}) => {
 			debug!("Got appservice login type");
-
-			let Some(ref info) = body.appservice_info else {
-				return Err!(Request(MissingToken("Missing appservice token.")));
-			};
-
 			let user_id =
 				if let Some(uiaa::UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
-					UserId::parse_with_server_name(user_id, &services.config.server_name)
+					UserId::parse_with_server_name(
+						user_id.to_lowercase(),
+						services.globals.server_name(),
+					)
 				} else if let Some(user) = user {
-					UserId::parse_with_server_name(user, &services.config.server_name)
+					OwnedUserId::parse(user)
 				} else {
-					return Err!(Request(Unknown(
-						debug_warn!(?body.login_info, "Valid identifier or username was not provided (invalid or unsupported login type?)")
-					)));
+					warn!("Bad login type: {:?}", &body.login_info);
+					return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
 				}
-				.map_err(|e| err!(Request(InvalidUsername(warn!("Username is invalid: {e}")))))?;
+				.map_err(|e| {
+					warn!("Failed to parse username from appservice logging in: {e}");
+					Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+				})?;

-			if !services.globals.user_is_local(&user_id) {
-				return Err!(Request(Unknown("User ID does not belong to this homeserver")));
-			}
-
-			if !info.is_user_match(&user_id) && !emergency_mode_enabled {
-				return Err!(Request(Exclusive("Username is not in an appservice namespace.")));
+			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
 		},
 		| _ => {
-			debug!("/login json_body: {:?}", &body.json_body);
-			return Err!(Request(Unknown(
-				debug_warn!(?body.login_info, "Invalid or unsupported login type")
-			)));
+			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.",
+			));
 		},
 	};

@ -241,6 +214,9 @@ pub(crate) async fn login_route(

 	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...
 	#[allow(deprecated)]
 	Ok(login::v3::Response {
 		user_id,
@ -248,7 +224,7 @@ pub(crate) async fn login_route(
 		device_id,
 		well_known: client_discovery_info,
 		expires_in: None,
-		home_server: Some(services.config.server_name.clone()),
+		home_server: Some(services.globals.server_name().to_owned()),
 		refresh_token: None,
 	})
 }
@ -283,32 +259,26 @@ pub(crate) async fn login_token_route(
 		auth_error: None,
 	};

-	match &body.auth {
-		| Some(auth) => {
-			let (worked, uiaainfo) = services
-				.uiaa
-				.try_auth(sender_user, sender_device, auth, &uiaainfo)
-				.await?;
+	if let Some(auth) = &body.auth {
+		let (worked, uiaainfo) = services
+			.uiaa
+			.try_auth(sender_user, sender_device, auth, &uiaainfo)
+			.await?;

-			if !worked {
-				return Err(Error::Uiaa(uiaainfo));
-			}
+		if !worked {
+			return Err(Error::Uiaa(uiaainfo));
+		}

-			// Success!
-		},
-		| _ => match body.json_body.as_ref() {
-			| Some(json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-				services
-					.uiaa
-					.create(sender_user, sender_device, &uiaainfo, json);
+		// Success!
+	} else if let Some(json) = body.json_body.as_ref() {
+		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+		services
+			.uiaa
+			.create(sender_user, sender_device, &uiaainfo, json);

-				return Err(Error::Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err!(Request(NotJson("No JSON body was sent when required.")));
-			},
-		},
+		return Err(Error::Uiaa(uiaainfo));
+	} else {
+		return Err!(Request(NotJson("No JSON body was sent when required.")));
 	}

 	let login_token = utils::random_string(TOKEN_LENGTH);
--- a/src/api/client/space.rs
+++ b/src/api/client/space.rs
@ -1,25 +1,12 @@
-use std::{
-	collections::{BTreeSet, VecDeque},
-	str::FromStr,
-};
+use std::str::FromStr;

 use axum::extract::State;
-use conduwuit::{
-	Err, Result,
-	utils::{future::TryExtExt, stream::IterStream},
-};
-use conduwuit_service::{
-	Services,
-	rooms::spaces::{
-		PaginationToken, SummaryAccessibility, get_parent_children_via, summary_to_chunk,
-	},
-};
-use futures::{StreamExt, TryFutureExt, future::OptionFuture};
 use ruma::{
-	OwnedRoomId, OwnedServerName, RoomId, UInt, UserId, api::client::space::get_hierarchy,
+	api::client::{error::ErrorKind, space::get_hierarchy},
+	UInt,
 };

-use crate::Ruma;
+use crate::{service::rooms::spaces::PaginationToken, Error, Result, Ruma};

 /// # `GET /_matrix/client/v1/rooms/{room_id}/hierarchy`
 ///
@ -29,6 +16,8 @@ pub(crate) async fn get_hierarchy_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_hierarchy::v1::Request>,
 ) -> Result<get_hierarchy::v1::Response> {
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
 	let limit = body
 		.limit
 		.unwrap_or_else(|| UInt::from(10_u32))
@ -47,149 +36,23 @@ pub(crate) async fn get_hierarchy_route(
 	// 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!(Request(InvalidParam(
-				"suggested_only and max_depth cannot change on paginated requests"
-			)));
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"suggested_only and max_depth cannot change on paginated requests",
+			));
 		}
 	}

-	get_client_hierarchy(
-		&services,
-		body.sender_user(),
-		&body.room_id,
-		limit.try_into().unwrap_or(10),
-		max_depth.try_into().unwrap_or(usize::MAX),
-		body.suggested_only,
-		key.as_ref()
-			.into_iter()
-			.flat_map(|t| t.short_room_ids.iter()),
-	)
-	.await
-}
-
-async fn get_client_hierarchy<'a, ShortRoomIds>(
-	services: &Services,
-	sender_user: &UserId,
-	room_id: &RoomId,
-	limit: usize,
-	max_depth: usize,
-	suggested_only: bool,
-	short_room_ids: ShortRoomIds,
-) -> Result<get_hierarchy::v1::Response>
-where
-	ShortRoomIds: Iterator<Item = &'a u64> + Clone + Send + Sync + 'a,
-{
-	type Via = Vec<OwnedServerName>;
-	type Entry = (OwnedRoomId, Via);
-	type Rooms = VecDeque<Entry>;
-
-	let mut queue: Rooms = [(
-		room_id.to_owned(),
-		room_id
-			.server_name()
-			.map(ToOwned::to_owned)
-			.into_iter()
-			.collect(),
-	)]
-	.into();
-
-	let mut rooms = Vec::with_capacity(limit);
-	let mut parents = BTreeSet::new();
-	while let Some((current_room, via)) = queue.pop_front() {
-		let summary = services
-			.rooms
-			.spaces
-			.get_summary_and_children_client(&current_room, suggested_only, sender_user, &via)
-			.await?;
-
-		match (summary, current_room == room_id) {
-			| (None | Some(SummaryAccessibility::Inaccessible), false) => {
-				// Just ignore other unavailable rooms
-			},
-			| (None, true) => {
-				return Err!(Request(Forbidden("The requested room was not found")));
-			},
-			| (Some(SummaryAccessibility::Inaccessible), true) => {
-				return Err!(Request(Forbidden("The requested room is inaccessible")));
-			},
-			| (Some(SummaryAccessibility::Accessible(summary)), _) => {
-				let populate = parents.len() >= short_room_ids.clone().count();
-
-				let mut children: Vec<Entry> = get_parent_children_via(&summary, suggested_only)
-					.filter(|(room, _)| !parents.contains(room))
-					.rev()
-					.map(|(key, val)| (key, val.collect()))
-					.collect();
-
-				if !populate {
-					children = children
-						.iter()
-						.rev()
-						.stream()
-						.skip_while(|(room, _)| {
-							services
-								.rooms
-								.short
-								.get_shortroomid(room)
-								.map_ok(|short| {
-									Some(&short) != short_room_ids.clone().nth(parents.len())
-								})
-								.unwrap_or_else(|_| false)
-						})
-						.map(Clone::clone)
-						.collect::<Vec<Entry>>()
-						.await
-						.into_iter()
-						.rev()
-						.collect();
-				}
-
-				if populate {
-					rooms.push(summary_to_chunk(summary.clone()));
-				} else if queue.is_empty() && children.is_empty() {
-					return Err!(Request(InvalidParam("Room IDs in token were not found.")));
-				}
-
-				parents.insert(current_room.clone());
-				if rooms.len() >= limit {
-					break;
-				}
-
-				if parents.len() > max_depth {
-					continue;
-				}
-
-				queue.extend(children);
-			},
-		}
-	}
-
-	let next_batch: OptionFuture<_> = queue
-		.pop_front()
-		.map(|(room, _)| async move {
-			parents.insert(room);
-
-			let next_short_room_ids: Vec<_> = parents
-				.iter()
-				.stream()
-				.filter_map(|room_id| services.rooms.short.get_shortroomid(room_id).ok())
-				.collect()
-				.await;
-
-			(next_short_room_ids.iter().ne(short_room_ids) && !next_short_room_ids.is_empty())
-				.then_some(PaginationToken {
-					short_room_ids: next_short_room_ids,
-					limit: max_depth.try_into().ok()?,
-					max_depth: max_depth.try_into().ok()?,
-					suggested_only,
-				})
-				.as_ref()
-				.map(PaginationToken::to_string)
-		})
-		.into();
-
-	Ok(get_hierarchy::v1::Response {
-		next_batch: next_batch.await.flatten(),
-		rooms,
-	})
+	services
+		.rooms
+		.spaces
+		.get_client_hierarchy(
+			sender_user,
+			&body.room_id,
+			limit.try_into().unwrap_or(10),
+			key.map_or(vec![], |token| token.short_room_ids),
+			max_depth.into(),
+			body.suggested_only,
+		)
+		.await
 }
--- a/src/api/client/state.rs
+++ b/src/api/client/state.rs
@ -1,26 +1,20 @@
 use axum::extract::State;
-use conduwuit::{
-	Err, Result, err,
-	matrix::pdu::{PduBuilder, PduEvent},
-	utils::BoolExt,
-};
-use conduwuit_service::Services;
-use futures::TryStreamExt;
+use conduwuit::{err, pdu::PduBuilder, utils::BoolExt, Err, PduEvent, Result};
 use ruma::{
-	OwnedEventId, RoomId, UserId,
 	api::client::state::{get_state_events, get_state_events_for_key, send_state_event},
 	events::{
-		AnyStateEventContent, StateEventType,
 		room::{
 			canonical_alias::RoomCanonicalAliasEventContent,
 			history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
 			join_rules::{JoinRule, RoomJoinRulesEventContent},
 			member::{MembershipState, RoomMemberEventContent},
-			server_acl::RoomServerAclEventContent,
 		},
+		AnyStateEventContent, StateEventType,
 	},
 	serde::Raw,
+	OwnedEventId, RoomId, UserId,
 };
+use service::Services;

 use crate::{Ruma, RumaResponse};

@ -31,7 +25,7 @@ pub(crate) async fn send_state_event_for_key_route(
 	State(services): State<crate::State>,
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<send_state_event::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	Ok(send_state_event::v3::Response {
 		event_id: send_state_event_for_key_helper(
@ -88,10 +82,11 @@ pub(crate) async fn get_state_events_route(
 		room_state: services
 			.rooms
 			.state_accessor
-			.room_state_full_pdus(&body.room_id)
-			.map_ok(PduEvent::into_state_event)
-			.try_collect()
-			.await?,
+			.room_state_full(&body.room_id)
+			.await?
+			.values()
+			.map(PduEvent::to_state_event)
+			.collect(),
 	})
 }

@ -107,7 +102,7 @@ pub(crate) async fn get_state_events_for_key_route(
 	State(services): State<crate::State>,
 	body: Ruma<get_state_events_for_key::v3::Request>,
 ) -> Result<get_state_events_for_key::v3::Response> {
-	let sender_user = body.sender_user();
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

 	if !services
 		.rooms
@ -115,9 +110,7 @@ pub(crate) async fn get_state_events_for_key_route(
 		.user_can_see_state_events(sender_user, &body.room_id)
 		.await
 	{
-		return Err!(Request(NotFound(debug_warn!(
-			"You don't have permission to view the room state."
-		))));
+		return Err!(Request(Forbidden("You don't have permission to view the room state.")));
 	}

 	let event = services
@ -140,7 +133,7 @@ pub(crate) async fn get_state_events_for_key_route(

 	Ok(get_state_events_for_key::v3::Response {
 		content: event_format.or(|| event.get_content_as_value()),
-		event: event_format.then(|| event.into_state_event_value()),
+		event: event_format.then(|| event.to_state_event_value()),
 	})
 }

@ -179,7 +172,7 @@ async fn send_state_event_for_key_helper(
 			PduBuilder {
 				event_type: event_type.to_string().into(),
 				content: serde_json::from_str(json.json().get())?,
-				state_key: Some(state_key.into()),
+				state_key: Some(String::from(state_key)),
 				timestamp,
 				..Default::default()
 			},
@ -201,200 +194,134 @@ async fn allowed_to_send_state_event(
 ) -> Result {
 	match event_type {
 		| StateEventType::RoomCreate => {
-			return Err!(Request(BadJson(debug_warn!(
-				?room_id,
+			return Err!(Request(BadJson(
 				"You cannot update m.room.create after a room has been created."
-			))));
+			)));
 		},
-		| StateEventType::RoomServerAcl => {
-			// prevents common ACL paw-guns as ACL management is difficult and prone to
-			// irreversible mistakes
-			match json.deserialize_as::<RoomServerAclEventContent>() {
-				| Ok(acl_content) => {
-					if acl_content.allow_is_empty() {
-						return Err!(Request(BadJson(debug_warn!(
-							?room_id,
-							"Sending an ACL event with an empty allow key will permanently \
-							 brick the room for non-conduwuit's as this equates to no servers \
-							 being allowed to participate in this room."
-						))));
-					}
-
-					if acl_content.deny_contains("*") && acl_content.allow_contains("*") {
-						return Err!(Request(BadJson(debug_warn!(
-							?room_id,
-							"Sending an ACL event with a deny and allow key value of \"*\" will \
-							 permanently brick the room for non-conduwuit's as this equates to \
-							 no servers being allowed to participate in this room."
-						))));
-					}
-
-					if acl_content.deny_contains("*")
-						&& !acl_content.is_allowed(services.globals.server_name())
-						&& !acl_content.allow_contains(services.globals.server_name().as_str())
-					{
-						return Err!(Request(BadJson(debug_warn!(
-							?room_id,
-							"Sending an ACL event with a deny key value of \"*\" and without \
-							 your own server name in the allow key will result in you being \
-							 unable to participate in this room."
-						))));
-					}
-
-					if !acl_content.allow_contains("*")
-						&& !acl_content.is_allowed(services.globals.server_name())
-						&& !acl_content.allow_contains(services.globals.server_name().as_str())
-					{
-						return Err!(Request(BadJson(debug_warn!(
-							?room_id,
-							"Sending an ACL event for an allow key without \"*\" and without \
-							 your own server name in the allow key will result in you being \
-							 unable to participate in this room."
-						))));
-					}
-				},
-				| Err(e) => {
-					return Err!(Request(BadJson(debug_warn!(
-						"Room server ACL event is invalid: {e}"
-					))));
-				},
-			}
-		},
-		| StateEventType::RoomEncryption =>
 		// Forbid m.room.encryption if encryption is disabled
-			if !services.config.allow_encryption {
+		| StateEventType::RoomEncryption =>
+			if !services.globals.allow_encryption() {
 				return Err!(Request(Forbidden("Encryption is disabled on this homeserver.")));
 			},
+		// admin room is a sensitive room, it should not ever be made public
 		| StateEventType::RoomJoinRules => {
-			// admin room is a sensitive room, it should not ever be made public
 			if let Ok(admin_room_id) = services.admin.get_admin_room().await {
 				if admin_room_id == room_id {
-					match json.deserialize_as::<RoomJoinRulesEventContent>() {
-						| Ok(join_rule) =>
-							if join_rule.join_rule == JoinRule::Public {
-								return Err!(Request(Forbidden(
-									"Admin room is a sensitive room, it cannot be made public"
-								)));
-							},
-						| Err(e) => {
-							return Err!(Request(BadJson(debug_warn!(
-								"Room join rules event is invalid: {e}"
-							))));
-						},
+					if let Ok(join_rule) =
+						serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get())
+					{
+						if join_rule.join_rule == JoinRule::Public {
+							return Err!(Request(Forbidden(
+								"Admin room is a sensitive room, it cannot be made public"
+							)));
+						}
 					}
 				}
 			}
 		},
+		// admin room is a sensitive room, it should not ever be made world readable
 		| StateEventType::RoomHistoryVisibility => {
-			// admin room is a sensitive room, it should not ever be made world readable
-			if let Ok(admin_room_id) = services.admin.get_admin_room().await {
-				match json.deserialize_as::<RoomHistoryVisibilityEventContent>() {
-					| Ok(visibility_content) => {
-						if admin_room_id == room_id
-							&& visibility_content.history_visibility
-								== HistoryVisibility::WorldReadable
-						{
-							return Err!(Request(Forbidden(
-								"Admin room is a sensitive room, it cannot be made world \
-								 readable (public room history)."
-							)));
-						}
-					},
-					| Err(e) => {
-						return Err!(Request(BadJson(debug_warn!(
-							"Room history visibility event is invalid: {e}"
-						))));
-					},
+			if let Ok(visibility_content) =
+				serde_json::from_str::<RoomHistoryVisibilityEventContent>(json.json().get())
+			{
+				if let Ok(admin_room_id) = services.admin.get_admin_room().await {
+					if admin_room_id == room_id
+						&& visibility_content.history_visibility
+							== HistoryVisibility::WorldReadable
+					{
+						return Err!(Request(Forbidden(
+							"Admin room is a sensitive room, it cannot be made world readable \
+							 (public room history)."
+						)));
+					}
 				}
 			}
 		},
 		| StateEventType::RoomCanonicalAlias => {
-			match json.deserialize_as::<RoomCanonicalAliasEventContent>() {
-				| Ok(canonical_alias_content) => {
-					let mut aliases = canonical_alias_content.alt_aliases.clone();
+			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_content.alias {
-						aliases.push(alias);
-					}
+				if let Some(alias) = canonical_alias.alias {
+					aliases.push(alias);
+				}

-					for alias in aliases {
-						let (alias_room_id, _servers) = services
-							.rooms
-							.alias
-							.resolve_alias(&alias, None)
-							.await
-							.map_err(|e| {
-								err!(Request(Unknown("Failed resolving alias \"{alias}\": {e}")))
-							})?;
-
-						if alias_room_id != room_id {
-							return Err!(Request(BadAlias(
-								"Room alias {alias} does not belong to room {room_id}"
-							)));
-						}
-					}
-				},
-				| Err(e) => {
-					return Err!(Request(InvalidParam(debug_warn!(
-						"Room canonical alias event is invalid: {e}"
-					))));
-				},
-			}
-		},
-		| StateEventType::RoomMember => match json.deserialize_as::<RoomMemberEventContent>() {
-			| Ok(membership_content) => {
-				let Ok(state_key) = UserId::parse(state_key) else {
-					return Err!(Request(BadJson(
-						"Membership event has invalid or non-existent state key"
-					)));
-				};
-
-				if let Some(authorising_user) =
-					membership_content.join_authorized_via_users_server
-				{
-					if membership_content.membership != MembershipState::Join {
-						return Err!(Request(BadJson(
-							"join_authorised_via_users_server is only for member joins"
-						)));
-					}
-
-					if services
-						.rooms
-						.state_cache
-						.is_joined(state_key, room_id)
-						.await
-					{
-						return Err!(Request(InvalidParam(
-							"{state_key} is already joined, an authorising user is not required."
-						)));
-					}
-
-					if !services.globals.user_is_local(&authorising_user) {
-						return Err!(Request(InvalidParam(
-							"Authorising user {authorising_user} does not belong to this \
-							 homeserver"
+				for alias in aliases {
+					if !services.globals.server_is_ours(alias.server_name()) {
+						return Err!(Request(Forbidden(
+							"canonical_alias must be for this server"
 						)));
 					}

 					if !services
 						.rooms
-						.state_cache
-						.is_joined(&authorising_user, room_id)
+						.alias
+						.resolve_local_alias(&alias)
 						.await
+						.is_ok_and(|room| room == room_id)
+					// Make sure it's the right room
 					{
-						return Err!(Request(InvalidParam(
-							"Authorising user {authorising_user} is not in the room, they \
-							 cannot authorise the join."
+						return Err!(Request(Forbidden(
+							"You are only allowed to send canonical_alias events when its \
+							 aliases already exist"
 						)));
 					}
 				}
-			},
-			| Err(e) => {
+			}
+		},
+		| StateEventType::RoomMember => {
+			let Ok(membership_content) =
+				serde_json::from_str::<RoomMemberEventContent>(json.json().get())
+			else {
 				return Err!(Request(BadJson(
 					"Membership content must have a valid JSON body with at least a valid \
-					 membership state: {e}"
+					 membership state."
 				)));
-			},
+			};
+
+			let Ok(state_key) = UserId::parse(state_key) else {
+				return Err!(Request(BadJson(
+					"Membership event has invalid or non-existent state key"
+				)));
+			};
+
+			if let Some(authorising_user) = membership_content.join_authorized_via_users_server {
+				if membership_content.membership != MembershipState::Join {
+					return Err!(Request(BadJson(
+						"join_authorised_via_users_server is only for member joins"
+					)));
+				}
+
+				if services
+					.rooms
+					.state_cache
+					.is_joined(state_key, room_id)
+					.await
+				{
+					return Err!(Request(InvalidParam(
+						"{state_key} is already joined, an authorising user is not required."
+					)));
+				}
+
+				if !services.globals.user_is_local(&authorising_user) {
+					return Err!(Request(InvalidParam(
+						"Authorising user {authorising_user} does not belong to this homeserver"
+					)));
+				}
+
+				if !services
+					.rooms
+					.state_cache
+					.is_joined(&authorising_user, room_id)
+					.await
+				{
+					return Err!(Request(InvalidParam(
+						"Authorising user {authorising_user} is not in the room, they cannot \
+						 authorise the join."
+					)));
+				}
+			}
 		},
 		| _ => (),
 	}
--- a/src/api/client/sync/mod.rs
+++ b/src/api/client/sync/mod.rs
@ -3,26 +3,25 @@ mod v4;
 mod v5;

 use conduwuit::{
-	Error, PduCount, Result,
-	matrix::pdu::PduEvent,
 	utils::{
-		IterStream,
 		stream::{BroadbandExt, ReadyExt, TryIgnore},
+		IterStream,
 	},
+	PduCount,
 };
-use conduwuit_service::Services;
-use futures::{StreamExt, pin_mut};
+use futures::{pin_mut, StreamExt};
 use ruma::{
-	RoomId, UserId,
 	directory::RoomTypeFilter,
 	events::TimelineEventType::{
 		self, Beacon, CallInvite, PollStart, RoomEncrypted, RoomMessage, Sticker,
 	},
+	RoomId, UserId,
 };

 pub(crate) use self::{
 	v3::sync_events_route, v4::sync_events_v4_route, v5::sync_events_v5_route,
 };
+use crate::{service::Services, Error, PduEvent, Result};

 pub(crate) const DEFAULT_BUMP_TYPES: &[TimelineEventType; 6] =
 	&[CallInvite, PollStart, Beacon, RoomEncrypted, RoomMessage, Sticker];
@ -77,13 +76,11 @@ async fn share_encrypted_room(
 		.state_cache
 		.get_shared_rooms(sender_user, user_id)
 		.ready_filter(|&room_id| Some(room_id) != ignore_room)
-		.map(ToOwned::to_owned)
-		.broad_any(|other_room_id| async move {
+		.broad_any(|other_room_id| {
 			services
 				.rooms
 				.state_accessor
-				.is_encrypted_room(&other_room_id)
-				.await
+				.is_encrypted_room(other_room_id)
 		})
 		.await
 }
--- a/src/api/client/sync/v3.rs
+++ b/src/api/client/sync/v3.rs
@ -1,77 +1,72 @@
 use std::{
 	cmp::{self},
-	collections::{BTreeMap, HashMap, HashSet},
+	collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
 	time::Duration,
 };

 use axum::extract::State;
 use conduwuit::{
-	Result, at, err, error, extract_variant, is_equal_to,
-	matrix::{
-		Event,
-		pdu::{EventHash, PduCount, PduEvent},
-	},
-	pair_of, ref_at,
+	at, err, error, extract_variant, is_equal_to,
+	pdu::EventHash,
 	result::FlatOk,
 	utils::{
-		self, BoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		future::OptionStream,
+		self,
+		future::OptionExt,
 		math::ruma_from_u64,
-		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
+		stream::{BroadbandExt, Tools, WidebandExt},
+		BoolExt, IterStream, ReadyExt, TryFutureExtExt,
 	},
-	warn,
+	Error, PduCount, PduEvent, Result,
 };
 use conduwuit_service::{
-	Services,
 	rooms::{
 		lazy_loading,
 		lazy_loading::{Options, Witness},
 		short::ShortStateHash,
 	},
+	Services,
 };
 use futures::{
-	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
-	future::{OptionFuture, join, join3, join4, join5, try_join, try_join4},
+	future::{join, join3, join4, join5, try_join, try_join4, OptionFuture},
+	FutureExt, StreamExt, TryFutureExt,
 };
 use ruma::{
-	DeviceId, EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId,
 	api::client::{
 		filter::FilterDefinition,
 		sync::sync_events::{
-			self, DeviceLists, UnreadNotificationsCount,
+			self,
 			v3::{
 				Ephemeral, Filter, GlobalAccountData, InviteState, InvitedRoom, JoinedRoom,
 				KnockState, KnockedRoom, LeftRoom, Presence, RoomAccountData, RoomSummary, Rooms,
 				State as RoomState, Timeline, ToDevice,
 			},
+			DeviceLists, UnreadNotificationsCount,
 		},
 		uiaa::UiaaResponse,
 	},
 	events::{
+		presence::PresenceEvent,
+		room::member::{MembershipState, RoomMemberEventContent},
 		AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType,
 		TimelineEventType::*,
-		presence::{PresenceEvent, PresenceEventContent},
-		room::member::{MembershipState, RoomMemberEventContent},
 	},
 	serde::Raw,
-	uint,
+	uint, DeviceId, EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId,
 };
-use service::rooms::short::{ShortEventId, ShortStateKey};

 use super::{load_timeline, share_encrypted_room};
-use crate::{Ruma, RumaResponse, client::ignored_filter};
+use crate::{client::ignored_filter, Ruma, RumaResponse};

 #[derive(Default)]
 struct StateChanges {
 	heroes: Option<Vec<OwnedUserId>>,
 	joined_member_count: Option<u64>,
 	invited_member_count: Option<u64>,
+	joined_since_last_sync: bool,
 	state_events: Vec<PduEvent>,
-	device_list_updates: HashSet<OwnedUserId>,
-	left_encrypted_users: HashSet<OwnedUserId>,
 }

-type PresenceUpdates = HashMap<OwnedUserId, PresenceEventContent>;
+type PresenceUpdates = HashMap<OwnedUserId, PresenceEvent>;

 /// # `GET /_matrix/client/r0/sync`
 ///
@ -123,7 +118,7 @@ pub(crate) async fn sync_events_route(
 	let (sender_user, sender_device) = body.sender();

 	// Presence update
-	if services.config.allow_local_presence {
+	if services.globals.allow_local_presence() {
 		services
 			.presence
 			.ping_presence(sender_user, &body.body.set_presence)
@ -171,8 +166,8 @@ pub(crate) async fn build_sync_events(
 	let full_state = body.body.full_state;
 	let filter = match body.body.filter.as_ref() {
 		| None => FilterDefinition::default(),
-		| Some(Filter::FilterDefinition(filter)) => filter.clone(),
-		| Some(Filter::FilterId(filter_id)) => services
+		| Some(Filter::FilterDefinition(ref filter)) => filter.clone(),
+		| Some(Filter::FilterId(ref filter_id)) => services
 			.users
 			.get_filter(sender_user, filter_id)
 			.await
@ -224,7 +219,6 @@ pub(crate) async fn build_sync_events(
 				sender_user,
 				next_batch,
 				full_state,
-				filter.room.include_leave,
 				&filter,
 			)
 			.map_ok(move |left_room| (room_id, left_room))
@ -284,27 +278,27 @@ pub(crate) async fn build_sync_events(
 		});

 	let presence_updates: OptionFuture<_> = services
-		.config
-		.allow_local_presence
+		.globals
+		.allow_local_presence()
 		.then(|| process_presence_updates(services, since, sender_user))
 		.into();

 	let account_data = services
 		.account_data
-		.changes_since(None, sender_user, since, Some(next_batch))
+		.changes_since(None, sender_user, since)
 		.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
 		.collect();

 	// Look for device list updates of this account
 	let keys_changed = services
 		.users
-		.keys_changed(sender_user, since, Some(next_batch))
+		.keys_changed(sender_user, since, None)
 		.map(ToOwned::to_owned)
 		.collect::<HashSet<_>>();

 	let to_device_events = services
 		.users
-		.get_to_device_events(sender_user, sender_device, Some(since), Some(next_batch))
+		.get_to_device_events(sender_user, sender_device)
 		.collect::<Vec<_>>();

 	let device_one_time_keys_count = services
@ -331,16 +325,18 @@ pub(crate) async fn build_sync_events(

 	// If the user doesn't share an encrypted room with the target anymore, we need
 	// to tell them
-	let device_list_left: HashSet<_> = left_encrypted_users
+	let device_list_left = left_encrypted_users
 		.into_iter()
 		.stream()
 		.broad_filter_map(|user_id| async move {
-			share_encrypted_room(services, sender_user, &user_id, None)
-				.await
-				.eq(&false)
-				.then_some(user_id)
+			let no_shared_encrypted_room =
+				!share_encrypted_room(services, sender_user, &user_id, None).await;
+			no_shared_encrypted_room.then_some(user_id)
+		})
+		.ready_fold(HashSet::new(), |mut device_list_left, user_id| {
+			device_list_left.insert(user_id);
+			device_list_left
 		})
-		.collect()
 		.await;

 	let response = sync_events::v3::Response {
@ -355,11 +351,9 @@ pub(crate) async fn build_sync_events(
 		next_batch: next_batch.to_string(),
 		presence: Presence {
 			events: presence_updates
-				.into_iter()
-				.flat_map(IntoIterator::into_iter)
-				.map(|(sender, content)| PresenceEvent { content, sender })
-				.map(|ref event| Raw::new(event))
-				.filter_map(Result::ok)
+				.unwrap_or_default()
+				.into_values()
+				.map(|v| Raw::new(&v).expect("PresenceEvent always serializes successfully"))
 				.collect(),
 		},
 		rooms: Rooms {
@ -396,8 +390,45 @@ async fn process_presence_updates(
 				.map_ok(move |event| (user_id, event))
 				.ok()
 		})
-		.map(|(user_id, event)| (user_id.to_owned(), event.content))
-		.collect()
+		.ready_fold(PresenceUpdates::new(), |mut updates, (user_id, event)| {
+			match updates.entry(user_id.into()) {
+				| Entry::Vacant(slot) => {
+					let mut new_event = event;
+					new_event.content.last_active_ago = match new_event.content.currently_active {
+						| Some(true) => None,
+						| _ => new_event.content.last_active_ago,
+					};
+
+					slot.insert(new_event);
+				},
+				| Entry::Occupied(mut slot) => {
+					let curr_event = slot.get_mut();
+					let curr_content = &mut curr_event.content;
+					let new_content = event.content;
+
+					// Update existing presence event with more info
+					curr_content.presence = new_content.presence;
+					curr_content.status_msg = new_content
+						.status_msg
+						.or_else(|| curr_content.status_msg.take());
+					curr_content.displayname = new_content
+						.displayname
+						.or_else(|| curr_content.displayname.take());
+					curr_content.avatar_url = new_content
+						.avatar_url
+						.or_else(|| curr_content.avatar_url.take());
+					curr_content.currently_active = new_content
+						.currently_active
+						.or(curr_content.currently_active);
+					curr_content.last_active_ago = match curr_content.currently_active {
+						| Some(true) => None,
+						| _ => new_content.last_active_ago.or(curr_content.last_active_ago),
+					};
+				},
+			};
+
+			updates
+		})
 		.await
 }

@ -418,7 +449,6 @@ async fn handle_left_room(
 	sender_user: &UserId,
 	next_batch: u64,
 	full_state: bool,
-	include_leave: bool,
 	filter: &FilterDefinition,
 ) -> Result<Option<LeftRoom>> {
 	let left_count = services
@ -433,12 +463,9 @@ async fn handle_left_room(
 		return Ok(None);
 	}

-	if !services.rooms.metadata.exists(room_id).await
-		|| services.rooms.metadata.is_disabled(room_id).await
-		|| services.rooms.metadata.is_banned(room_id).await
-	{
+	if !services.rooms.metadata.exists(room_id).await {
 		// This is just a rejected invite, not a room we know
-		// Insert a leave event anyways for the client
+		// Insert a leave event anyways
 		let event = PduEvent {
 			event_id: EventId::new(services.globals.server_name()),
 			sender: sender_user.to_owned(),
@ -449,7 +476,7 @@ async fn handle_left_room(
 			kind: RoomMember,
 			content: serde_json::from_str(r#"{"membership":"leave"}"#)
 				.expect("this is valid JSON"),
-			state_key: Some(sender_user.as_str().into()),
+			state_key: Some(sender_user.to_string()),
 			unsigned: None,
 			// The following keys are dropped on conversion
 			room_id: room_id.clone(),
@ -469,27 +496,23 @@ async fn handle_left_room(
 				events: Vec::new(),
 			},
 			state: RoomState {
-				events: vec![event.into_sync_state_event()],
+				events: vec![event.to_sync_state_event()],
 			},
 		}));
 	}

 	let mut left_state_events = Vec::new();

-	let since_shortstatehash = services.rooms.user.get_token_shortstatehash(room_id, since);
+	let since_shortstatehash = services
+		.rooms
+		.user
+		.get_token_shortstatehash(room_id, since)
+		.await;

-	let since_state_ids: HashMap<_, OwnedEventId> = since_shortstatehash
-		.map_ok(|since_shortstatehash| {
-			services
-				.rooms
-				.state_accessor
-				.state_full_ids(since_shortstatehash)
-				.map(Ok)
-		})
-		.try_flatten_stream()
-		.try_collect()
-		.await
-		.unwrap_or_default();
+	let since_state_ids = match since_shortstatehash {
+		| Ok(s) => services.rooms.state_accessor.state_full_ids(s).await?,
+		| Err(_) => HashMap::new(),
+	};

 	let Ok(left_event_id): Result<OwnedEventId> = services
 		.rooms
@ -497,7 +520,7 @@ async fn handle_left_room(
 		.room_state_get_id(room_id, &StateEventType::RoomMember, sender_user.as_str())
 		.await
 	else {
-		warn!("Left {room_id} but no left state event");
+		error!("Left room but no left state event");
 		return Ok(None);
 	};

@ -507,16 +530,15 @@ async fn handle_left_room(
 		.pdu_shortstatehash(&left_event_id)
 		.await
 	else {
-		warn!(event_id = %left_event_id, "Leave event has no state in {room_id}");
+		error!(event_id = %left_event_id, "Leave event has no state");
 		return Ok(None);
 	};

-	let mut left_state_ids: HashMap<_, _> = services
+	let mut left_state_ids = services
 		.rooms
 		.state_accessor
 		.state_full_ids(left_shortstatehash)
-		.collect()
-		.await;
+		.await?;

 	let leave_shortstatekey = services
 		.rooms
@ -550,11 +572,7 @@ async fn handle_left_room(
 				continue;
 			};

-			if !include_leave && pdu.sender == sender_user {
-				continue;
-			}
-
-			left_state_events.push(pdu.into_sync_state_event());
+			left_state_events.push(pdu.to_sync_state_event());
 		}
 	}

@ -634,40 +652,6 @@ async fn load_joined_room(
 			.await?;

 	let (timeline_pdus, limited) = timeline;
-	let initial = since_shortstatehash.is_none();
-	let lazy_loading_enabled = filter.room.state.lazy_load_options.is_enabled()
-		|| filter.room.timeline.lazy_load_options.is_enabled();
-
-	let lazy_loading_context = &lazy_loading::Context {
-		user_id: sender_user,
-		device_id: sender_device,
-		room_id,
-		token: Some(since),
-		options: Some(&filter.room.state.lazy_load_options),
-	};
-
-	// Reset lazy loading because this is an initial sync
-	let lazy_load_reset: OptionFuture<_> = initial
-		.then(|| services.rooms.lazy_loading.reset(lazy_loading_context))
-		.into();
-
-	lazy_load_reset.await;
-	let witness: OptionFuture<_> = lazy_loading_enabled
-		.then(|| {
-			let witness: Witness = timeline_pdus
-				.iter()
-				.map(ref_at!(1))
-				.map(Event::sender)
-				.map(Into::into)
-				.chain(receipt_events.keys().map(Into::into))
-				.collect();
-
-			services
-				.rooms
-				.lazy_loading
-				.witness_retain(witness, lazy_loading_context)
-		})
-		.into();

 	let last_notification_read: OptionFuture<_> = timeline_pdus
 		.is_empty()
@ -679,6 +663,10 @@ async fn load_joined_room(
 		})
 		.into();

+	let no_state_changes = timeline_pdus.is_empty()
+		&& (since_shortstatehash.is_none()
+			|| since_shortstatehash.is_some_and(is_equal_to!(current_shortstatehash)));
+
 	let since_sender_member: OptionFuture<_> = since_shortstatehash
 		.map(|short| {
 			services
@ -689,85 +677,125 @@ async fn load_joined_room(
 		})
 		.into();

-	let (last_notification_read, since_sender_member, witness) =
-		join3(last_notification_read, since_sender_member, witness).await;
-
 	let joined_since_last_sync =
 		since_sender_member
+			.await
 			.flatten()
 			.is_none_or(|content: RoomMemberEventContent| {
 				content.membership != MembershipState::Join
 			});

+	let lazy_loading_enabled = filter.room.state.lazy_load_options.is_enabled()
+		|| filter.room.timeline.lazy_load_options.is_enabled();
+
+	let generate_witness =
+		lazy_loading_enabled && (since_shortstatehash.is_none() || joined_since_last_sync);
+
+	let lazy_reset = lazy_loading_enabled && since_shortstatehash.is_none();
+
+	let lazy_loading_context = &lazy_loading::Context {
+		user_id: sender_user,
+		device_id: sender_device,
+		room_id,
+		token: None,
+		options: Some(&filter.room.state.lazy_load_options),
+	};
+
+	// Reset lazy loading because this is an initial sync
+	let lazy_load_reset: OptionFuture<_> = lazy_reset
+		.then(|| services.rooms.lazy_loading.reset(lazy_loading_context))
+		.into();
+
+	lazy_load_reset.await;
+	let witness: Option<Witness> = generate_witness.then(|| {
+		timeline_pdus
+			.iter()
+			.map(|(_, pdu)| pdu.sender.clone())
+			.chain(receipt_events.keys().cloned())
+			.collect()
+	});
+
+	let witness: OptionFuture<_> = witness
+		.map(|witness| {
+			services
+				.rooms
+				.lazy_loading
+				.witness_retain(witness, lazy_loading_context)
+		})
+		.into();
+
+	let witness = witness.await;
+	let mut device_list_updates = HashSet::<OwnedUserId>::new();
+	let mut left_encrypted_users = HashSet::<OwnedUserId>::new();
 	let StateChanges {
 		heroes,
 		joined_member_count,
 		invited_member_count,
-		mut state_events,
-		mut device_list_updates,
-		left_encrypted_users,
-	} = calculate_state_changes(
-		services,
-		sender_user,
-		room_id,
-		full_state,
-		filter,
-		since_shortstatehash,
-		current_shortstatehash,
 		joined_since_last_sync,
-		witness.as_ref(),
-	)
-	.boxed()
-	.await?;
-
-	let is_sender_membership = |pdu: &PduEvent| {
-		pdu.kind == StateEventType::RoomMember.into()
-			&& pdu
-				.state_key
-				.as_deref()
-				.is_some_and(is_equal_to!(sender_user.as_str()))
+		state_events,
+	} = if no_state_changes {
+		StateChanges::default()
+	} else {
+		calculate_state_changes(
+			services,
+			sender_user,
+			room_id,
+			full_state,
+			filter,
+			&mut device_list_updates,
+			&mut left_encrypted_users,
+			since_shortstatehash,
+			current_shortstatehash,
+			joined_since_last_sync,
+			witness.as_ref(),
+		)
+		.boxed()
+		.await?
 	};

-	let joined_sender_member: Option<_> = (joined_since_last_sync && timeline_pdus.is_empty())
-		.then(|| {
-			state_events
-				.iter()
-				.position(is_sender_membership)
-				.map(|pos| state_events.swap_remove(pos))
-		})
-		.flatten();
-
-	let prev_batch = timeline_pdus.first().map(at!(0)).or_else(|| {
-		joined_sender_member
-			.is_some()
-			.then_some(since)
-			.map(Into::into)
-	});
-
-	let room_events = timeline_pdus
-		.into_iter()
-		.stream()
-		.wide_filter_map(|item| ignored_filter(services, item, sender_user))
-		.map(at!(1))
-		.chain(joined_sender_member.into_iter().stream())
-		.map(|pdu| pdu.to_sync_room_event())
-		.collect::<Vec<_>>();
-
 	let account_data_events = services
 		.account_data
-		.changes_since(Some(room_id), sender_user, since, Some(next_batch))
+		.changes_since(Some(room_id), sender_user, since)
 		.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
 		.collect();

 	// Look for device list updates in this room
 	let device_updates = services
 		.users
-		.room_keys_changed(room_id, since, Some(next_batch))
+		.room_keys_changed(room_id, since, None)
 		.map(|(user_id, _)| user_id)
 		.map(ToOwned::to_owned)
 		.collect::<Vec<_>>();

-	let send_notification_counts = last_notification_read.is_none_or(|count| count > since);
+	let room_events = timeline_pdus
+		.iter()
+		.stream()
+		.wide_filter_map(|item| ignored_filter(services, item.clone(), sender_user))
+		.map(|(_, pdu)| pdu.to_sync_room_event())
+		.collect();
+
+	let typing_events = services
+		.rooms
+		.typing
+		.last_typing_update(room_id)
+		.and_then(|count| async move {
+			if count <= since {
+				return Ok(Vec::<Raw<AnySyncEphemeralRoomEvent>>::new());
+			}
+
+			let typings = services
+				.rooms
+				.typing
+				.typings_all(room_id, sender_user)
+				.await?;
+
+			Ok(vec![serde_json::from_str(&serde_json::to_string(&typings)?)?])
+		})
+		.unwrap_or(Vec::new());
+
+	let send_notification_counts = last_notification_read
+		.is_none_or(|&count| count > since)
+		.await;

 	let notification_count: OptionFuture<_> = send_notification_counts
 		.then(|| {
@ -791,27 +819,8 @@ async fn load_joined_room(
 		})
 		.into();

-	let typing_events = services
-		.rooms
-		.typing
-		.last_typing_update(room_id)
-		.and_then(|count| async move {
-			if count <= since {
-				return Ok(Vec::<Raw<AnySyncEphemeralRoomEvent>>::new());
-			}
-
-			let typings = services
-				.rooms
-				.typing
-				.typings_all(room_id, sender_user)
-				.await?;
-
-			Ok(vec![serde_json::from_str(&serde_json::to_string(&typings)?)?])
-		})
-		.unwrap_or(Vec::new());
-
-	let unread_notifications = join(notification_count, highlight_count);
 	let events = join3(room_events, account_data_events, typing_events);
+	let unread_notifications = join(notification_count, highlight_count);
 	let (unread_notifications, events, device_updates) =
 		join3(unread_notifications, events, device_updates)
 			.boxed()
@ -868,13 +877,17 @@ async fn load_joined_room(
 		unread_notifications: UnreadNotificationsCount { highlight_count, notification_count },
 		timeline: Timeline {
 			limited: limited || joined_since_last_sync,
-			prev_batch: prev_batch.as_ref().map(ToString::to_string),
 			events: room_events,
+			prev_batch: timeline_pdus
+				.first()
+				.map(at!(0))
+				.as_ref()
+				.map(ToString::to_string),
 		},
 		state: RoomState {
 			events: state_events
-				.into_iter()
-				.map(PduEvent::into_sync_state_event)
+				.iter()
+				.map(PduEvent::to_sync_state_event)
 				.collect(),
 		},
 		ephemeral: Ephemeral { events: edus },
@ -901,12 +914,14 @@ async fn calculate_state_changes(
 	room_id: &RoomId,
 	full_state: bool,
 	filter: &FilterDefinition,
+	device_list_updates: &mut HashSet<OwnedUserId>,
+	left_encrypted_users: &mut HashSet<OwnedUserId>,
 	since_shortstatehash: Option<ShortStateHash>,
 	current_shortstatehash: ShortStateHash,
 	joined_since_last_sync: bool,
 	witness: Option<&Witness>,
 ) -> Result<StateChanges> {
-	if since_shortstatehash.is_none() {
+	if since_shortstatehash.is_none() || joined_since_last_sync {
 		calculate_state_initial(
 			services,
 			sender_user,
@ -924,10 +939,11 @@ async fn calculate_state_changes(
 			room_id,
 			full_state,
 			filter,
+			device_list_updates,
+			left_encrypted_users,
 			since_shortstatehash,
 			current_shortstatehash,
 			joined_since_last_sync,
-			witness,
 		)
 		.await
 	}
@ -940,32 +956,39 @@ async fn calculate_state_initial(
 	sender_user: &UserId,
 	room_id: &RoomId,
 	full_state: bool,
-	_filter: &FilterDefinition,
+	filter: &FilterDefinition,
 	current_shortstatehash: ShortStateHash,
 	witness: Option<&Witness>,
 ) -> Result<StateChanges> {
-	let (shortstatekeys, event_ids): (Vec<_>, Vec<_>) = services
+	let state_events = services
 		.rooms
 		.state_accessor
 		.state_full_ids(current_shortstatehash)
-		.unzip()
-		.await;
+		.await?;
+
+	let shortstatekeys = state_events.keys().copied().stream();

 	let state_events = services
 		.rooms
 		.short
-		.multi_get_statekey_from_short(shortstatekeys.into_iter().stream())
-		.zip(event_ids.into_iter().stream())
+		.multi_get_statekey_from_short(shortstatekeys)
+		.zip(state_events.values().cloned().stream())
 		.ready_filter_map(|item| Some((item.0.ok()?, item.1)))
 		.ready_filter_map(|((event_type, state_key), event_id)| {
-			let lazy = !full_state
+			let lazy_load_enabled = filter.room.state.lazy_load_options.is_enabled()
+				|| filter.room.timeline.lazy_load_options.is_enabled();
+
+			if lazy_load_enabled
 				&& event_type == StateEventType::RoomMember
+				&& !full_state
 				&& state_key.as_str().try_into().is_ok_and(|user_id: &UserId| {
 					sender_user != user_id
 						&& witness.is_some_and(|witness| !witness.contains(user_id))
-				});
+				}) {
+				return None;
+			}

-			lazy.or_some(event_id)
+			Some(event_id)
 		})
 		.broad_filter_map(|event_id: OwnedEventId| async move {
 			services.rooms.timeline.get_pdu(&event_id).await.ok()
@ -984,137 +1007,128 @@ async fn calculate_state_initial(
 		heroes,
 		joined_member_count,
 		invited_member_count,
+		joined_since_last_sync: true,
 		state_events,
-		..Default::default()
 	})
 }

 #[tracing::instrument(name = "incremental", level = "trace", skip_all)]
 #[allow(clippy::too_many_arguments)]
-async fn calculate_state_incremental<'a>(
+async fn calculate_state_incremental(
 	services: &Services,
-	sender_user: &'a UserId,
+	sender_user: &UserId,
 	room_id: &RoomId,
 	full_state: bool,
 	_filter: &FilterDefinition,
+	device_list_updates: &mut HashSet<OwnedUserId>,
+	left_encrypted_users: &mut HashSet<OwnedUserId>,
 	since_shortstatehash: Option<ShortStateHash>,
 	current_shortstatehash: ShortStateHash,
 	joined_since_last_sync: bool,
-	witness: Option<&'a Witness>,
 ) -> Result<StateChanges> {
-	let since_shortstatehash = since_shortstatehash.unwrap_or(current_shortstatehash);
+	// Incremental /sync
+	let since_shortstatehash =
+		since_shortstatehash.expect("missing since_shortstatehash on incremental sync");

-	let state_changed = since_shortstatehash != current_shortstatehash;
+	let mut delta_state_events = Vec::new();
+
+	if since_shortstatehash != current_shortstatehash {
+		let current_state_ids = services
+			.rooms
+			.state_accessor
+			.state_full_ids(current_shortstatehash);
+
+		let since_state_ids = services
+			.rooms
+			.state_accessor
+			.state_full_ids(since_shortstatehash);
+
+		let (current_state_ids, since_state_ids): (
+			HashMap<_, OwnedEventId>,
+			HashMap<_, OwnedEventId>,
+		) = try_join(current_state_ids, since_state_ids).await?;
+
+		current_state_ids
+			.iter()
+			.stream()
+			.ready_filter(|(key, id)| full_state || since_state_ids.get(key) != Some(id))
+			.wide_filter_map(|(_, id)| services.rooms.timeline.get_pdu(id).ok())
+			.ready_for_each(|pdu| delta_state_events.push(pdu))
+			.await;
+	}

 	let encrypted_room = services
 		.rooms
 		.state_accessor
 		.state_get(current_shortstatehash, &StateEventType::RoomEncryption, "")
-		.is_ok()
-		.await;
+		.is_ok();

-	let state_get_shorteventid = |user_id: &'a UserId| {
-		services
-			.rooms
-			.state_accessor
-			.state_get_shortid(
-				current_shortstatehash,
-				&StateEventType::RoomMember,
-				user_id.as_str(),
-			)
-			.ok()
-	};
+	let since_encryption = services
+		.rooms
+		.state_accessor
+		.state_get(since_shortstatehash, &StateEventType::RoomEncryption, "")
+		.is_ok();

-	let lazy_state_ids: OptionFuture<_> = witness
-		.filter(|_| !full_state && !encrypted_room)
-		.map(|witness| {
-			StreamExt::into_future(
-				witness
-					.iter()
-					.stream()
-					.broad_filter_map(|user_id| state_get_shorteventid(user_id)),
-			)
-		})
-		.into();
+	let (encrypted_room, since_encryption) = join(encrypted_room, since_encryption).await;

-	let state_diff_ids: OptionFuture<_> = (!full_state && state_changed)
-		.then(|| {
-			StreamExt::into_future(
-				services
-					.rooms
-					.state_accessor
-					.state_added((since_shortstatehash, current_shortstatehash))
-					.boxed(),
-			)
-		})
-		.into();
+	// Calculations:
+	let new_encrypted_room = encrypted_room && !since_encryption;

-	let current_state_ids: OptionFuture<_> = full_state
-		.then(|| {
-			StreamExt::into_future(
-				services
-					.rooms
-					.state_accessor
-					.state_full_shortids(current_shortstatehash)
-					.expect_ok()
-					.boxed(),
-			)
-		})
-		.into();
+	let send_member_count = delta_state_events
+		.iter()
+		.any(|event| event.kind == RoomMember);

-	let state_events = current_state_ids
-		.stream()
-		.chain(state_diff_ids.stream())
-		.broad_filter_map(|(shortstatekey, shorteventid)| async move {
-			if witness.is_none() || encrypted_room {
-				return Some(shorteventid);
+	if encrypted_room {
+		for state_event in &delta_state_events {
+			if state_event.kind != RoomMember {
+				continue;
 			}

-			lazy_filter(services, sender_user, shortstatekey, shorteventid).await
-		})
-		.chain(lazy_state_ids.stream())
-		.broad_filter_map(|shorteventid| {
-			services
-				.rooms
-				.short
-				.get_eventid_from_short(shorteventid)
-				.ok()
-		})
-		.broad_filter_map(|event_id: OwnedEventId| async move {
-			services.rooms.timeline.get_pdu(&event_id).await.ok()
-		})
-		.collect::<Vec<_>>()
-		.await;
+			if let Some(state_key) = &state_event.state_key {
+				let user_id = UserId::parse(state_key)
+					.map_err(|_| Error::bad_database("Invalid UserId in member PDU."))?;

-	let (device_list_updates, left_encrypted_users) = state_events
-		.iter()
-		.stream()
-		.ready_filter(|_| encrypted_room)
-		.ready_filter(|state_event| state_event.kind == RoomMember)
-		.ready_filter_map(|state_event| {
-			let content: RoomMemberEventContent = state_event.get_content().ok()?;
-			let user_id: OwnedUserId = state_event.state_key.as_ref()?.parse().ok()?;
+				if user_id == sender_user {
+					continue;
+				}

-			Some((content, user_id))
-		})
-		.fold_default(|(mut dlu, mut leu): pair_of!(HashSet<_>), (content, user_id)| async move {
-			use MembershipState::*;
+				let content: RoomMemberEventContent = state_event.get_content()?;

-			let shares_encrypted_room =
-				|user_id| share_encrypted_room(services, sender_user, user_id, Some(room_id));
+				match content.membership {
+					| MembershipState::Join => {
+						// A new user joined an encrypted room
+						if !share_encrypted_room(services, sender_user, user_id, Some(room_id))
+							.await
+						{
+							device_list_updates.insert(user_id.into());
+						}
+					},
+					| MembershipState::Leave => {
+						// Write down users that have left encrypted rooms we are in
+						left_encrypted_users.insert(user_id.into());
+					},
+					| _ => {},
+				}
+			}
+		}
+	}

-			match content.membership {
-				| Leave => leu.insert(user_id),
-				| Join if joined_since_last_sync || !shares_encrypted_room(&user_id).await =>
-					dlu.insert(user_id),
-				| _ => false,
-			};
+	if joined_since_last_sync && encrypted_room || new_encrypted_room {
+		let updates: Vec<OwnedUserId> = services
+			.rooms
+			.state_cache
+			.room_members(room_id)
+			.ready_filter(|user_id| sender_user != *user_id)
+			.filter_map(|user_id| {
+				share_encrypted_room(services, sender_user, user_id, Some(room_id))
+					.map(|res| res.or_some(user_id.to_owned()))
+			})
+			.collect()
+			.await;

-			(dlu, leu)
-		})
-		.await;
-
-	let send_member_count = state_events.iter().any(|event| event.kind == RoomMember);
+		// If the user is in a new encrypted room, give them all joined users
+		device_list_updates.extend(updates);
+	}

 	let (joined_member_count, invited_member_count, heroes) = if send_member_count {
 		calculate_counts(services, room_id, sender_user).await?
@ -1126,29 +1140,11 @@ async fn calculate_state_incremental<'a>(
 		heroes,
 		joined_member_count,
 		invited_member_count,
-		state_events,
-		device_list_updates,
-		left_encrypted_users,
+		joined_since_last_sync,
+		state_events: delta_state_events,
 	})
 }

-async fn lazy_filter(
-	services: &Services,
-	sender_user: &UserId,
-	shortstatekey: ShortStateKey,
-	shorteventid: ShortEventId,
-) -> Option<ShortEventId> {
-	let (event_type, state_key) = services
-		.rooms
-		.short
-		.get_statekey_from_short(shortstatekey)
-		.await
-		.ok()?;
-
-	(event_type != StateEventType::RoomMember || state_key == sender_user.as_str())
-		.then_some(shorteventid)
-}
-
 async fn calculate_counts(
 	services: &Services,
 	room_id: &RoomId,
--- a/Show more
+++ b/Show more