experiment with coroutines/folly https://github.com/girlbossceo/rust-rocksdb-zaidoon1/commit/9ecb597d966efb37ed96f4cfe3f09165013fd14a

Signed-off-by: strawberry <strawberry@puppygock.gay>
2026-05-26 20:49:55 +00:00 · 2024-05-11 03:27:43 -04:00
320 changed files with 16976 additions and 20808 deletions
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

-dotenv_if_exists
-
-use flake ".#${DIRENV_DEVSHELL:-default}"
+use flake

 PATH_add bin
+
+dotenv_if_exists
@@ -35,11 +35,6 @@ env:
    # Custom nix binary cache if fork is being used
    ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
    ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
-    # Use the all-features devshell instead of default, to ensure that features
-    # match between nix and cargo
-    DIRENV_DEVSHELL: all-features
-    # Get error output from nix that we can actually use
-    NIX_CONFIG: show-trace = true

 permissions:
    packages: write
@@ -54,7 +49,7 @@ jobs:
              uses: actions/checkout@v4

            - name: Tag comparison check
-              if: startsWith(github.ref, 'refs/tags/v')
+              if: startsWith('refs/tags/v', github.ref)
              run: |
                  # Tag mismatch with latest repo tag check to prevent potential downgrades
                  LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
@@ -80,8 +75,8 @@ jobs:
            - name: Apply Nix binary cache configuration
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems
-                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
+                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                  EOF

            - name: Use alternative Nix binary caches if specified
@@ -97,11 +92,7 @@ jobs:
                  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
-
-            - name: Cache CI dependencies
-              run: |
-                  bin/nix-build-and-cache ci
+                  nix develop --command true

            - name: Run CI tests
              run: |
@@ -116,14 +107,6 @@ jobs:
            - name: Run Complement tests
              run: |
                  direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
-                  cp -v -f result complement_oci_image.tar.gz
-
-            - name: Upload Complement OCI image
-              uses: actions/upload-artifact@v4
-              with:
-                name: complement_oci_image.tar.gz
-                path: complement_oci_image.tar.gz
-                if-no-files-found: error

            - name: Upload Complement logs
              uses: actions/upload-artifact@v4
@@ -140,14 +123,16 @@ jobs:
                if-no-files-found: error

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

            - name: Add Complement diff result to Job Summary
              run: |
                  echo '# Complement diff results' >> $GITHUB_STEP_SUMMARY
                  echo '```diff' >> $GITHUB_STEP_SUMMARY
-                  tail -n 100 complement_test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
+                  tail -n 50 complement_test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
                  echo '```' >> $GITHUB_STEP_SUMMARY

            - name: Update Job Summary
@@ -165,12 +150,14 @@ jobs:
        name: Build
        runs-on: ubuntu-latest
        needs: tests
-        if: github.event.pull_request.draft != true
+        if: startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
        strategy:
            matrix:
                include:
                    - target: aarch64-unknown-linux-musl
+                    - target: aarch64-unknown-linux-musl-jemalloc
                    - target: x86_64-unknown-linux-musl
+                    - target: x86_64-unknown-linux-musl-jemalloc
        steps:
            - name: Sync repository
              uses: actions/checkout@v4
@@ -190,8 +177,8 @@ jobs:
            - name: Apply Nix binary cache configuration
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems
-                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
+                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                  EOF

            - name: Use alternative Nix binary caches if specified
@@ -207,21 +194,15 @@ jobs:
                  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
+                  nix develop --command true

            - name: Build static ${{ matrix.target }}
              run: |
-                  CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
-
                  bin/nix-build-and-cache just .#static-${{ matrix.target }}
-                  mkdir -v -p target/release/
-                  mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
-                  cp -v -f result/bin/conduit target/release/conduwuit
-                  cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
-                  # -p conduit is the main crate name
-                  direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb
-                  mv -v target/release/conduwuit static-${{ matrix.target }}
-                  mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb
+                  mkdir -p target/release
+                  cp -v -f result/bin/conduit target/release/
+                  direnv exec . cargo deb --no-build --no-strip --output target/debian/${{ matrix.target }}.deb
+                  mv target/release/conduit static-${{ matrix.target }}

            - name: Upload static-${{ matrix.target }}
              uses: actions/upload-artifact@v4
@@ -234,9 +215,8 @@ jobs:
              uses: actions/upload-artifact@v4
              with:
                  name: deb-${{ matrix.target }}
-                  path: ${{ matrix.target }}.deb
+                  path: target/debian/${{ matrix.target }}.deb
                  if-no-files-found: error
-                  compression-level: 0

            - name: Build OCI image ${{ matrix.target }}
              run: |
@@ -255,20 +235,20 @@ jobs:
        name: Docker publish
        runs-on: ubuntu-latest
        needs: build
-        if: (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || (github.event.pull_request.draft != true)) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '')
+        if: (startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '')
        env:
            DOCKER_ARM64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            DOCKER_AMD64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            DOCKER_TAG: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
+            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
            GHCR_ARM64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            GHCR_AMD64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            GHCR_TAG: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
+            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
            GLCR_ARM64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            GLCR_AMD64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            GLCR_TAG: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
-            GLCR_BRANCH: registry.gitlab.com/conduwuit/conduwuit:${{ (startsWith(github.ref, 'refs/tags/v') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
+            GLCR_BRANCH: registry.gitlab.com/conduwuit/conduwuit:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}

            DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
            GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
@@ -301,8 +281,8 @@ jobs:

            - name: Move OCI images into position
              run: |
-                  mv -v oci-image-x86_64-*/*.tar.gz oci-image-amd64.tar.gz
-                  mv -v oci-image-aarch64-*/*.tar.gz oci-image-arm64v8.tar.gz
+                  mv oci-image-x86_64-*-jemalloc/*.tar.gz oci-image-amd64.tar.gz
+                  mv oci-image-aarch64-*-jemalloc/*.tar.gz oci-image-arm64v8.tar.gz

            - name: Load and push amd64 image
              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
@@ -49,7 +49,7 @@ jobs:
        uses: actions/configure-pages@v5

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

@@ -61,9 +61,9 @@ jobs:
            extra-substituters = https://crane.cachix.org
            extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
            extra-substituters = https://attic.kennel.juneis.dog/conduit
-            extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=
+            extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
            extra-substituters = https://attic.kennel.juneis.dog/conduwuit
-            extra-trusted-public-keys = conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE=
+            extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=

      - name: Add alternative Nix binary caches if specified
        if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
@@ -26,7 +26,7 @@ jobs:
        uses: actions/checkout@v4

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

      - name: Run Trivy code and vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@0.22.0
+        uses: aquasecurity/trivy-action@0.20.0
        with:
          scan-type: fs
          format: sarif
@@ -26,19 +26,15 @@ before_script:

  # Add conduwuit binary cache
  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduwuit" >> /etc/nix/nix.conf; fi
-  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE=" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=" >> /etc/nix/nix.conf; fi

  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduit" >> /etc/nix/nix.conf; fi
-  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=" >> /etc/nix/nix.conf; fi

  # Add alternate binary cache
  - if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null && [ -n "$ATTIC_PUBLIC_KEY" ]; then echo "extra-trusted-public-keys = $ATTIC_PUBLIC_KEY" >> /etc/nix/nix.conf; fi

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

 ci:
  stage: ci
-  image: nixos/nix:2.22.1
+  image: nixos/nix:2.22.0
  script:
    # Cache CI dependencies
    - ./bin/nix-build-and-cache ci
@@ -83,7 +79,7 @@ ci:

 artifacts:
  stage: artifacts
-  image: nixos/nix:2.22.1
+  image: nixos/nix:2.22.0
  script:
    - ./bin/nix-build-and-cache just .#static-x86_64-unknown-linux-musl
    - cp result/bin/conduit x86_64-unknown-linux-musl
@@ -0,0 +1,2 @@
+[advisories]
+ignore = ["RUSTSEC-2020-0016"]
@@ -15,19 +15,13 @@ LOG_FILE="$2"
 # A `.jsonl` file to write test results to
 RESULTS_FILE="$3"

-OCI_IMAGE="complement-conduit:main"
-
-# Complement tests that are skipped due to flakiness/reliability issues (likely
-# Complement itself induced based on various open issues)
-#
-# According to Go docs, these are separated by forward slashes and not pipes (why)
-SKIPPED_COMPLEMENT_TESTS='-skip=TestJumpToDateEndpoint.*|TestJoinFederatedRoomFromApplicationServiceBridgeUser.*|TestFederationRoomsInvite.*|TestClientSpacesSummary.*'
+OCI_IMAGE="complement-conduit:dev"

 toplevel="$(git rev-parse --show-toplevel)"

 pushd "$toplevel" > /dev/null

-bin/nix-build-and-cache just .#static-complement
+bin/nix-build-and-cache just .#complement

 docker load < result
 popd > /dev/null
@@ -37,7 +31,7 @@ set +o pipefail
 env \
    -C "$COMPLEMENT_SRC" \
    COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
-    go test -tags="conduwuit_blacklist" "$SKIPPED_COMPLEMENT_TESTS" -v -timeout 1h -json ./tests | tee "$LOG_FILE"
+    go test -vet=off -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
@@ -71,7 +71,6 @@ ci() {

        # Keep sorted
        "$toplevel#devShells.x86_64-linux.default"
-        "$toplevel#devShells.x86_64-linux.all-features"
        attic#default
        nixpkgs#direnv
        nixpkgs#jq
@@ -1,7 +1 @@
-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 = 144000               # reduce me ALARA
-too-many-lines-threshold = 700              # TODO reduce me to <= 100
-type-complexity-threshold = 250             # reduce me to ~200
+too-many-lines-threshold = 700
@@ -60,9 +60,8 @@

 ### Database configuration

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

 # Database backend: Only rocksdb and sqlite are supported. Please note that sqlite
 # will perform significantly worse than rocksdb as it is not intended to be used the
@@ -77,16 +76,11 @@ database_backend = "rocksdb"
 # forwarded to the conduwuit instance running on this port
 # Docker users: Don't change this, you'll need to map an external port to this.
 # To listen on multiple ports, specify a vector e.g. [8080, 8448]
-#
-# default if unspecified is 8008
 port = 6167

 # default address (IPv4 or IPv6) conduwuit will listen on. Generally you want this to be
 # localhost (127.0.0.1 / ::1). If you are using Docker or a container NAT networking setup, you
 # likely need this to be 0.0.0.0.
-# To listen multiple addresses, specify a vector e.g. ["127.0.0.1", "::1"]
-#
-# default if unspecified is both IPv4 and IPv6 localhost: ["127.0.0.1", "::1"]
 address = "127.0.0.1"

 # Max request size for file uploads
@@ -380,6 +374,15 @@ allow_profile_lookup_federation_requests = true
 # Defaults to 256.0
 #db_cache_capacity_mb = 256.0

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

 ### RocksDB options

@@ -488,6 +491,11 @@ allow_profile_lookup_federation_requests = true
 # Defaults to 1 (TolerateCorruptedTailRecords)
 #rocksdb_recovery_mode = 1

+# Controls whether memory buffers are written to storage at the fixed interval set by `cleanup_period_interval`
+# even when they are not full. Setting this will increase load on the storage backplane and is never advised
+# under normal circumstances.
+#rocksdb_periodic_cleanup = false
+

 ### Domain Name Resolution and Caching

@@ -702,44 +710,6 @@ allow_profile_lookup_federation_requests = true
 #typing_client_timeout_max_s = 45


-### TURN / VoIP
-
-# vector list of TURN URIs/servers to use
-#
-# No default
-#turn_uris = ["turn:example.turn.uri?transport=udp", "turn:example.turn.uri?transport=tcp"]
-
-# TURN secret to use for generating the HMAC-SHA1 hash apart of username and password generation
-#
-# this is more secure, but if needed you can use traditional username/password below.
-#
-# no default
-#turn_secret = ""
-
-# TURN username to provide the client
-#
-# no default
-#turn_username = ""
-
-# TURN password to provide the client
-#
-# no default
-#turn_password = ""
-
-# TURN TTL
-#
-# Default is 86400 seconds
-#turn_ttl = 86400
-
-# allow guests/unauthenticated users to access TURN credentials
-#
-# this is the equivalent of Synapse's `turn_allow_guests` config option. this allows
-# any unauthenticated user to call `/_matrix/client/v3/voip/turnServer`.
-#
-# defaults to false
-#turn_allow_guests = false
-
-
 # Other options not in [global]:
 #
 #
@@ -1,22 +1,33 @@
 # conduwuit for Debian

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

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

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

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

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

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

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

-The package uses the [`conduwuit.service`](../configuration.md#example-systemd-unit-file) systemd unit file to start and stop conduwuit. The binary is installed at `/usr/sbin/conduwuit`.
-
-This package assumes by default that conduwuit will be placed behind a reverse proxy. The default config options apply (listening on `localhost` and TCP port `6167`). Matrix federation requires a valid domain name and TLS, so you will need to set up TLS certificates and renewal for it to work properly if you intend to federate.
-
-Consult various online documentation and guides on setting up a reverse proxy and TLS. Caddy is documented at the [generic deployment guide](../deploying/generic.md#setting-up-the-reverse-proxy) as it's the easiest and most user friendly.
+This package assumes by default that conduwuit will be placed behind a reverse
+proxy. This default deployment entails just listening
+on `127.0.0.1` and the free port `6167` and is reachable via a client using the URL
+<http://localhost:6167>. Matrix federation requires TLS, so you will need to set up
+some certificates and renewal, for it to work properly.
@@ -13,8 +13,6 @@ Environment="CONDUWUIT_CONFIG=/etc/conduwuit/conduwuit.toml"

 ExecStart=/usr/sbin/conduwuit

-ReadWritePaths=/var/lib/conduwuit /etc/conduwuit
-
 AmbientCapabilities=
 CapabilityBoundingSet=

@@ -46,16 +44,16 @@ SystemCallArchitectures=native
 SystemCallFilter=@system-service @resources
 SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc
 SystemCallErrorNumber=EPERM
-#StateDirectory=conduwuit
+StateDirectory=conduwuit

-RuntimeDirectory=conduwuit
+RuntimeDirectory=conduit
 RuntimeDirectoryMode=0750

 Restart=on-failure
 RestartSec=5

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

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

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

 exit 0
@@ -1,12 +1,9 @@
 #!/bin/sh
 set -e

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

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

 case "$1" in
  configure)
@@ -17,29 +14,15 @@ case "$1" in
        --home "$CONDUWUIT_DATABASE_PATH" \
        --disabled-login \
        --shell "/usr/sbin/nologin" \
-        --verbose \
+        --force-badname \
        conduwuit
    fi

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

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

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

 CONDUWUIT_CONFIG_PATH=/etc/conduwuit
 CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
-CONDUWUIT_DATABASE_PATH_SYMLINK=/var/lib/matrix-conduit

 case $1 in
  purge)
@@ -16,15 +15,11 @@ case $1 in
    # "configuration files must be preserved when the package is removed, and
    #  only deleted when the package is purged."
    if [ -d "$CONDUWUIT_CONFIG_PATH" ]; then
-      rm -v -r "$CONDUWUIT_CONFIG_PATH"
+      rm -r "$CONDUWUIT_CONFIG_PATH"
    fi

    if [ -d "$CONDUWUIT_DATABASE_PATH" ]; then
-      rm -v -r "$CONDUWUIT_DATABASE_PATH"
-    fi
-
-    if [ -d "$CONDUWUIT_DATABASE_PATH_SYMLINK" ]; then
-      rm -v -r "$CONDUWUIT_DATABASE_PATH_SYMLINK"
+      rm -r "$CONDUWUIT_DATABASE_PATH"
    fi
    ;;
 esac
@@ -0,0 +1,21 @@
+Template: conduwuit/hostname
+Type: string
+Default: localhost
+Description: The server (host)name of the Matrix homeserver
+ This is the hostname the homeserver will be reachable at via a client.
+ .
+ If set to "localhost", you can connect with a client locally and clients
+ from other hosts and also other homeservers will not be able to reach you!
+
+Template: conduwuit/address
+Type: string
+Default: 127.0.0.1
+Description: The listen address of the Matrix homeserver
+ This is the address the homeserver will listen on. Leave it set to 127.0.0.1
+ when using a reverse proxy.
+
+Template: conduwuit/port
+Type: string
+Default: 6167
+Description: The port of the Matrix homeserver
+ This port is most often just accessed by a reverse proxy.
@@ -1,42 +0,0 @@
-[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 = ["snappy", "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/zaidoon1/rust-rocksdb"
-rev = "e9e1cb5ba92a44ea225fe8d13b31aa23621b9035"
-#branch = "master"
-default-features = false
-
-[lib]
-path = "lib.rs"
-crate-type = [
-	"rlib",
-#	"dylib"
-]
-
-[lints]
-workspace = true
@@ -1,61 +0,0 @@
-pub use rust_rocksdb::*;
-
-#[cfg_attr(not(conduit_mods), link(name = "rocksdb"))]
-#[cfg_attr(conduit_mods, link(name = "rocksdb", kind = "static"))]
-extern "C" {
-	pub fn rocksdb_list_column_families();
-	pub fn rocksdb_logger_create_stderr_logger();
-	pub fn rocksdb_options_set_info_log();
-	pub fn rocksdb_get_options_from_string();
-	pub fn rocksdb_writebatch_create();
-	pub fn rocksdb_writebatch_destroy();
-	pub fn rocksdb_writebatch_put_cf();
-	pub fn rocksdb_writebatch_delete_cf();
-	pub fn rocksdb_iter_value();
-	pub fn rocksdb_iter_seek_to_last();
-	pub fn rocksdb_iter_seek_for_prev();
-	pub fn rocksdb_iter_seek_to_first();
-	pub fn rocksdb_iter_next();
-	pub fn rocksdb_iter_prev();
-	pub fn rocksdb_iter_seek();
-	pub fn rocksdb_iter_valid();
-	pub fn rocksdb_iter_get_error();
-	pub fn rocksdb_iter_key();
-	pub fn rocksdb_iter_destroy();
-	pub fn rocksdb_livefiles();
-	pub fn rocksdb_livefiles_count();
-	pub fn rocksdb_livefiles_destroy();
-	pub fn rocksdb_livefiles_column_family_name();
-	pub fn rocksdb_livefiles_name();
-	pub fn rocksdb_livefiles_size();
-	pub fn rocksdb_livefiles_level();
-	pub fn rocksdb_livefiles_smallestkey();
-	pub fn rocksdb_livefiles_largestkey();
-	pub fn rocksdb_livefiles_entries();
-	pub fn rocksdb_livefiles_deletions();
-	pub fn rocksdb_put_cf();
-	pub fn rocksdb_delete_cf();
-	pub fn rocksdb_get_pinned_cf();
-	pub fn rocksdb_create_column_family();
-	pub fn rocksdb_get_latest_sequence_number();
-	pub fn rocksdb_batched_multi_get_cf();
-	pub fn rocksdb_cancel_all_background_work();
-	pub fn rocksdb_repair_db();
-	pub fn rocksdb_list_column_families_destroy();
-	pub fn rocksdb_flush();
-	pub fn rocksdb_flush_wal();
-	pub fn rocksdb_open_column_families();
-	pub fn rocksdb_open_for_read_only_column_families();
-	pub fn rocksdb_open_as_secondary_column_families();
-	pub fn rocksdb_open_column_families_with_ttl();
-	pub fn rocksdb_open();
-	pub fn rocksdb_open_for_read_only();
-	pub fn rocksdb_open_with_ttl();
-	pub fn rocksdb_open_as_secondary();
-	pub fn rocksdb_write();
-	pub fn rocksdb_create_iterator_cf();
-	pub fn rocksdb_backup_engine_create_new_backup_flush();
-	pub fn rocksdb_backup_engine_options_create();
-	pub fn rocksdb_write_buffer_manager_destroy();
-	pub fn rocksdb_options_set_ttl();
-}
@@ -16,5 +16,3 @@
 - [Development](development.md)
    - [Contributing](contributing.md)
    - [Testing](development/testing.md)
-    - [Hot Reloading ("Live" Development)](development/hot_reload.md)
- [conduwuit Community Code of Conduct](conduwuit_coc.md)
@@ -12,9 +12,9 @@ and later starting it.

 At some point the appservice guide should ask you to add a registration yaml
 file to the homeserver. In Synapse you would do this by adding the path to the
-homeserver.yaml, but in conduwuit you can do this from within Matrix:
+homeserver.yaml, but in Conduit you can do this from within Matrix:

-First, go into the `#admins` room of your homeserver. The first person that
+First, go into the #admins room of your homeserver. The first person that
 registered on the homeserver automatically joins it. Then send a message into
 the room like this:

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

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

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

-Then you are done. conduwuit will send messages to the appservices and the
+Then you are done. Conduit will send messages to the appservices and the
 appservice can send requests to the homeserver. You don't need to restart
-conduwuit, but if it doesn't work, restarting while the appservice is running
+Conduit, but if it doesn't work, restarting while the appservice is running
 could help.

 ## Appservice-specific instructions
@@ -46,6 +46,16 @@ could help.

 To remove an appservice go to your admin room and execute

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

 where `<name>` one of the output of `appservices list`.
+
+### Tested appservices
+
+These appservices have been tested and work with Conduit without any extra steps:
+
+- [matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord)
+- [mautrix-hangouts](https://github.com/mautrix/hangouts/)
+- [mautrix-telegram](https://github.com/mautrix/telegram/)
+- [mautrix-signal](https://github.com/mautrix/signal/) from version `0.2.2` forward.
+- [heisenbridge](https://github.com/hifi/heisenbridge/)
@@ -1,77 +0,0 @@
-# Conduwuit Community Code of Conduct
-
-Welcome to the conduwuit community! We’re excited to have you here. Conduwuit is a hard-fork of the Conduit homeserver,
-aimed at making Matrix more accessible and inclusive for everyone.
-
-This space is dedicated to fostering a positive, supportive, and inclusive environment for everyone. This Code of
-Conduct applies to all conduwuit spaces, including any further community rooms that reference this CoC. Here are our
-guidelines to help maintain the welcoming atmosphere that sets conduwuit apart.
-
-For the foundational rules, please refer to the [Matrix.org Code of Conduct](https://matrix.org/legal/code-of-conduct/)
-and the [Contributor's Covenant](https://github.com/girlbossceo/conduwuit/blob/main/CODE_OF_CONDUCT.md). Below are
-additional guidelines specific to the conduwuit community.
-
-## Our Values and Guidelines
-
-1. **Respect and Inclusivity**: We are committed to maintaining a community where everyone feels safe and respected.
-   Discrimination, harassment, or hate speech of any kind will not be tolerated. Recognise that each community member
-   experiences the world differently based on their past experiences, background, and identity. Share your own
-   experiences and be open to learning about others' diverse perspectives.
-
-2. **Positivity and Constructiveness**: Engage in constructive discussions and support each other. If you feel angry,
-   negative, or aggressive, take a break until you can participate in a positive and constructive manner. Process
-   intense feelings with a friend or in a private setting before engaging in community conversations to help maintain
-   a supportive and focused environment.
-
-3. **Clarity and Understanding**: Our community includes neurodivergent individuals and those who may not appreciate
-   sarcasm or subtlety. Communicate clearly and kindly, avoiding sarcasm and ensuring your messages are easily
-   understood by all. Additionally, avoid putting the burden of education on marginalized groups by doing your own
-   research before asking for explanations.
-
-4. **Be Open to Inclusivity**: Actively engage in conversations about making our community more inclusive. Report
-   discriminatory behavior to the moderators and be open to constructive feedback that aims to improve our community.
-   Understand that discussing discrimination and negative experiences can be emotionally taxing, so focus on the
-   message rather than critiquing the tone used.
-
-5. **Commit to Inclusivity**: Building an inclusive community requires time, energy, and resources. Recognise that
-   addressing discrimination and bias is an ongoing process that necessitates commitment and action from all community
-   members.
-
-## Matrix Community
-
-This Code of Conduct applies to the entire [Conduwuit Matrix Space](https://matrix.to/#/#conduwuit-space:puppygock.gay)
-and its rooms, including:
-
-### [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay)
-
-This room is for support and discussions about conduwuit. Ask questions, share insights, and help each other out.
-
-### [#conduwuit-offtopic:girlboss.ceo](https://matrix.to/#/#conduwuit-offtopic:girlboss.ceo)
-
-For off-topic community conversations about any subject. While this room allows for a wide range of topics, the same
-CoC applies. Keep discussions respectful and inclusive, and avoid divisive subjects like country/world politics.
-General topics, such as world events, are welcome as long as they follow the CoC.
-
-### [#conduwuit-dev:puppygock.gay](https://matrix.to/#/#conduwuit-dev:puppygock.gay)
-
-This room is dedicated to discussing active development of conduwuit. Posting requires an elevated power level, which
-can be requested in one of the other rooms. Use this space to collaborate and innovate.
-
-## Enforcement
-
-We have a zero-tolerance policy for violations of this Code of Conduct. If someone’s behavior makes you uncomfortable,
-please report it to the moderators. Actions we may take include:
-
-1. **Warning**: A warning given directly in the room or via a private message from the moderators, identifying
-   the violation and requesting corrective action.
-2. **Temporary Mute**: Temporary restriction from participating in discussions for a specified period to allow for
-   reflection and cooling off.
-3. **Kick or Ban**: Egregious behavior may result in an immediate kick or ban to protect other community members.
-   Bans are considered permanent and will only be reversed in exceptional circumstances after proven good behavior.
-
-Please highlight issues directly in rooms when possible, but if you don't feel comfortable doing that, then please send
-a DM to one of the moderators directly.
-
-Together, let’s build a community where everyone feels valued and respected.
-
- The Conduwuit Moderation Team
@@ -3,9 +3,3 @@
 ``` toml
 {{#include ../conduwuit-example.toml}}
 ```
-
-# Example systemd unit file
-
-```
-{{#include ../debian/conduwuit.service}}
-```
@@ -1,30 +1,40 @@
-# conduwuit - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset

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

    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
@@ -38,7 +48,7 @@ services:
            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and conduwuit
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@@ -1,4 +1,4 @@
-# conduwuit - Traefik Reverse Proxy Labels
+# Conduit - Traefik Reverse Proxy Labels
 version: '2.4' # uses '2.4' for cpuset

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

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

            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
@@ -1,33 +1,44 @@
-# conduwuit - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset

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

    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
@@ -42,7 +53,7 @@ services:

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

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

 ## Setting up a systemd service

-The systemd unit for conduwuit can be found [here](../configuration.md#example-systemd-unit-file). You may need to change the `ExecStart=` path to where you placed the conduwuit binary.
+The systemd unit for conduwuit can be found [here](../../debian/conduwuit.service). You may need to change the `ExecStart=` path to where you placed the conduwuit binary.

 ## Creating the conduwuit configuration file

 Now we need to create the conduwuit's config file in `/etc/conduwuit/conduwuit.toml`. The example config can be found at [conduwuit-example.toml](../configuration.md).**Please take a moment to read it. You need to change at least the server name.**

-RocksDB is the only supported database backend. SQLite only exists for historical reasons, is not recommended, and will be removed soon (likely in v0.5.0). Any performance issues, storage issues, database issues, etc will not be assisted if using SQLite and you will be asked to migrate to RocksDB first.
+RocksDB (`rocksdb`) is the only supported database backend. SQLite only exists for historical reasons and is not recommended. Any performance issues, storage issues, database issues, etc will not be assisted if using SQLite and you will be asked to migrate to RocksDB first.

 ## Setting the correct file permissions

@@ -74,8 +74,6 @@ sudo chmod 700 /var/lib/conduwuit/

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

-Lighttpd is not supported as it seems to mess with the `X-Matrix` Authorization header, making federation non-functional. If using Apache, you need to use `nocanon` to prevent this.
-
 ### Caddy

 Create `/etc/caddy/conf.d/conduwuit_caddyfile` and enter this (substitute for your server name).
@@ -1,6 +1,6 @@
 # conduwuit for NixOS

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

 * The `flake.nix` at the root of the repo
 * The `default.nix` at the root of the repo
@@ -10,17 +10,9 @@ A binary cache for conduwuit that the CI/CD publishes to is available at the
 following places (both are the same just different names):
 ```
 https://attic.kennel.juneis.dog/conduit
-conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=
-
-https://attic.kennel.juneis.dog/conduwuit
-conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE=
-```
-
-The binary caches have been recreated recently due to attic issues. The old public keys were:
-
-```
 conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=

+https://attic.kennel.juneis.dog/conduwuit
 conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
 ```

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

-[lix]: https://lix.systems/
 [module]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit
 [package]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit.package
@@ -16,7 +16,8 @@ look like this:
 RUSTFLAGS="--cfg tokio_unstable" cargo build \
    --release \
    --no-default-features \
-    --features=rocksdb,systemd,element_hacks,sentry_telemetry,gzip_compression,brotli_compression,zstd_compression,tokio_console
+    --features
+    backend_rocksdb,systemd,element_hacks,sentry_telemetry,gzip_compression,brotli_compression,zstd_compression,tokio_console
 ```

 [1]: https://docs.rs/tokio-console/latest/tokio_console/
@@ -1,93 +0,0 @@
-# Hot Reloading ("Live" Development)
-
-### Summary
-
-When developing in debug-builds with the nightly toolchain, conduwuit is modular using dynamic libraries and various parts of the application are hot-reloadable while the server is running: http api handlers, admin commands, services, database, etc. These are all split up into individual workspace crates as seen in the `src/` directory. Changes to sourcecode in a crate rebuild that crate and subsequent crates depending on it. Reloading then occurs for the changed crates.
-
-Release builds still produce static binaries which are unaffected. Rust's soundness guarantees are in full force. Thus you cannot hot-reload release binaries.
-
-### Requirements
-
-Currently, this development setup only works on x86_64 and aarch64 Linux glibc. [musl explicitly does not support hot reloadable libraries, and does not implement `dlclose`][2]. macOS does not fully support our usage of `RTLD_GLOBAL` possibly due to some thread-local issues. [This Rust issue][3] may be of relevance, specifically [this comment][4]. It may be possible to get it working on only very modern macOS versions such as at least Sonoma, as currently loading dylibs is supported, but not unloading them in our setup, and the cited comment mentions an Apple WWDC confirming there have been TLS changes to somewhat make this possible.
-
-As mentioned above this requires the nightly toolchain. This is due to reliance on various Cargo.toml features that are only available on nightly, most specifically `RUSTFLAGS` in Cargo.toml. Some of the implementation could also be simpler based on other various nightly features. We hope lots of nightly features start making it out of nightly sooner as there have been dozens of very helpful features that have been stuck in nightly ("unstable") for at least 5+ years that would make this simpler. We encourage greater community consensus to move these features into stability.
-
-This currently only works on x86_64/aarch64 Linux with a glibc C library. musl C library, macOS, and likely other host architectures are not supported (if other architectures work, feel free to let us know and/or make a PR updating this). This should work on GNU ld and lld (rust-lld) and gcc/clang, however if you happen to have linker issues it's recommended to try using `mold` or `gold` linkers, and please let us know in the [conduwuit Matrix room][7] the linker error and what linker solved this issue so we can figure out a solution. Ideally there should be minimal friction to using this, and in the future a build script (`build.rs`) may be suitable to making this easier to use if the capabilities allow us.
-
-### Usage
-
-As of 19 May 2024, the instructions for using this are:
-
-0. Have patience. Don't hesitate to join the [conduwuit Matrix room][7] to receive help using this. As indicated by the various rustflags used and some of the interesting issues linked at the bottom, this is definitely not something the Rust ecosystem or toolchain is used to doing.
-
-1. Install the nightly toolchain using rustup. You may need to use `rustup override set nightly` in your local conduwuit directory, or use `cargo +nightly` for all actions.
-
-2. Uncomment `cargo-features` at the top level / root Cargo.toml
-
-3. Scroll down to the `# Developer profile` section and uncomment ALL the rustflags for each dev profile and their respective packages.
-
-4. In each workspace crate's Cargo.toml (everything under `src/*` AND `deps/rust-rocksdb/Cargo.toml`), uncomment the `dylib` crate type under `[lib]`.
-
-5. Due to [this rpath issue][5], you must export the `LD_LIBRARY_PATH` environment variable to your nightly Rust toolchain library directory. If using rustup (hopefully), use this: `export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/`
-
-6. Start the server. You can use `cargo +nightly run` for this along with the standard.
-
-7. Make some changes where you need to.
-
-8. In a separate terminal window in the same directory (or using a terminal multiplexer like tmux), run the *build* Cargo command `cargo +nightly build`. Cargo should only rebuild what was changed / what's necessary, so it should not be rebuilding all the crates.
-
-9. In your conduwuit server terminal, hit/send `CTRL+C` signal. This will tell conduwuit to find which libraries need to be reloaded, and reloads them as necessary.
-
-10. If there were no errors, it will tell you it successfully reloaded `#` modules, and your changes should now be visible. Repeat 7 - 9 as needed.
-
-To shutdown conduwuit in this setup, hit/send `CTRL+\`. Normal builds still shutdown with `CTRL+C` as usual.
-
-Steps 1 - 5 are the initial first-time steps for using this. To remove the hot reload setup, revert/comment all the Cargo.toml changes.
-
-As mentioned in the requirements section, if you happen to have some linker issues, try using the `-fuse-ld=` rustflag and specify mold or gold in all the `rustflags` definitions in the top level Cargo.toml, and please let us know in the [conduwuit Matrix room][7] the problem. mold can be installed typically through your distro, and gold is provided by the binutils package.
-
-It's possible a helper script can be made to do all of this, or most preferably a specially made build script (build.rs). `cargo watch` support will be implemented soon which will eliminate the need to manually run `cargo build` all together.
-
-### Addendum
-
-Conduit was inherited as a single crate without modularity or reloading in its design. Reasonable partitioning and abstraction allowed a split into several crates, though many circular dependencies had to be corrected. The resulting crates now form a directed graph as depicted in figures below. The interfacing between these crates is still extremely broad which is not mitigable.
-
-Initially [hot_lib_reload][6] was investigated but found appropriate for a project designed with modularity through limited interfaces, not a large and complex existing codebase. Instead a bespoke solution built directly on [libloading][8] satisfied our constraints. This required relatively minimal modifications and zero maintenance burden compared to what would be required otherwise. The technical difference lies with relocation processing: we leverage global bindings (`RTLD_GLOBAL`) in a very intentional way. Most libraries and off-the-shelf module systems (such as [hot_lib_reload][6]) restrict themselves to local bindings (`RTLD_LOCAL`). This allows them to release software to multiple platforms with much greater consistency, but at the cost of burdening applications to explicitly manage these bindings. In our case with an optional feature for developers, we shrug any such requirement to enjoy the cost/benefit on platforms where global relocations are properly cooperative.
-
-To make use of `RTLD_GLOBAL` the application has to be oriented as a directed acyclic graph. The primary rule is simple and illustrated in the figure below: **no crate is allowed to call a function or use a variable from a crate below it.**
-
-![conduwuit's dynamic library setup diagram - created by Jason Volk](assets/libraries.png)
-
-When a symbol is referenced between crates they become bound: **crates cannot be unloaded until their calling crates are first unloaded.** Thus we start the reloading process from the crate which has no callers. There is a small problem though: the first crate is called by the base executable itself! This is solved by using an `RTLD_LOCAL` binding for just one link between the main executable and the first crate, freeing the executable from all modules as no global binding ever occurs between them.
-
-![conduwuit's reload and load order diagram - created by Jason Volk](assets/reload_order.png)
-
-Proper resource management is essential for reliable reloading to occur. This is a very basic ask in RAII-idiomatic Rust and the exposure to reloading hazards is remarkably low, generally stemming from poor patterns and practices. Unfortunately static analysis doesn't enforce reload-safety programmatically (though it could one day), for now hazards can be avoided by knowing a few basic do's and dont's:
-
-1. Understand that code is memory. Just like one is forbidden from referencing free'd memory, one must not transfer control to free'd code. Exposure to this is primarily from two things:
- Callbacks, which this project makes very little use of.
- Async tasks, which are addressed below.
-
-2. Tie all resources to a scope or object lifetime with greatest possible symmetry (locality). For our purposes this applies to code resources, which means async blocks and tokio tasks.
- **Never spawn a task without receiving and storing its JoinHandle**.
- **Always wait on join handles** before leaving a scope or in another cleanup function called by an owning scope.
-
-3. Know any minor specific quirks documented in code or here:
- Don't use `tokio::spawn`, instead use our `Handle` in `core/server.rs`, which is reachable in most of the codebase via `services()` or other state. This is due to some bugs or assumptions made in tokio, as it happens in `unsafe {}` blocks, which are mitigated by circumventing some thread-local variables. Using runtime handles is good practice in any case.
-
-The initial implementation PR is available [here][1].
-
-### Interesting related issues/bugs
-
- [DT_RUNPATH produced in binary with rpath = true is wrong (cargo)][5]
- [Disabling MIR Optimization in Rust Compilation (cargo)](https://internals.rust-lang.org/t/disabling-mir-optimization-in-rust-compilation/19066/5)
- [Workspace-level metadata (cargo-deb)](https://github.com/kornelski/cargo-deb/issues/68)
-
-[1]: https://github.com/girlbossceo/conduwuit/pull/387
-[2]: https://wiki.musl-libc.org/functional-differences-from-glibc.html#Unloading-libraries
-[3]: https://github.com/rust-lang/rust/issues/28794
-[4]: https://github.com/rust-lang/rust/issues/28794#issuecomment-368693049
-[5]: https://github.com/rust-lang/cargo/issues/12746
-[6]: https://crates.io/crates/hot-lib-reloader/
-[7]: https://matrix.to/#/#conduwuit:puppygock.gay
-[8]: https://crates.io/crates/libloading
@@ -5,16 +5,13 @@
 Have a look at [Complement's repository][complement] for an explanation of what
 it is.

-To test against Complement, with [Lix][lix] and direnv installed and set up, you can:
+To test against Complement, with Nix and direnv installed and set up, you can
+either:

 * 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`
+  to the specified paths
 * Run `nix build .#complement` from the root of the repository to just build a
-  Complement OCI image outputted to `result` (it's a `.tar.gz` file)
-* Or download the latest Complement OCI image from the CI workflow artifacts output
-  from the commit/revision you want to test (e.g. from main) [here][ci-workflows]
+  Complement image

-[lix]: https://lix.systems/
-[ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
 [complement]: https://github.com/matrix-org/complement
@@ -153,7 +153,6 @@ Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 - Interest in supporting other operating systems such as macOS, BSDs, and Windows, and getting them added into CI and doing builds for them
 - Add config option for disabling RocksDB Direct IO if needed
 - Add various documentation on maintaining conduwuit, using RocksDB online backups, some troubleshooting, using admin commands, etc
- (Developers): Add support for [hot reloadable/"live" modular development](development/hot_reload.md)
 - (Developers): Add support for tokio-console
 - (Developers): Add support for tracing flame graphs
 - Add `release-debuginfo` Cargo build profile
@@ -59,4 +59,4 @@ conduwuit can ping other servers using `!admin debug ping`. This takes a server

 #### Allocator memory stats

-When using jemalloc with jemallocator's `stats` feature, you can see conduwuit's jemalloc memory stats by using `!admin debug memory-stats`
+If using jemalloc (for now) and built with jemallocator's `stats` feature, you can see conduwuit's jemalloc memory stats by using `!admin debug memory-stats`
@@ -58,7 +58,7 @@ script = "lychee --version"
 [[task]]
 name = "cargo-audit"
 group = "security"
-script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked --ignore RUSTSEC-2020-0016"

 [[task]]
 name = "cargo-fmt"
@@ -69,15 +69,12 @@ script = "cargo fmt --check -- --color=always"
 name = "cargo-doc"
 group = "lints"
 script = """
-env DIRENV_DEVSHELL=all-features \
-    RUSTDOCFLAGS="-D warnings" \
-    direnv exec . \
-    cargo doc \
-        --workspace \
-        --all-features \
-        --no-deps \
-        --document-private-items \
-        --color always
+RUSTDOCFLAGS="-D warnings" cargo doc \
+    --workspace \
+    --all-features \
+    --no-deps \
+    --document-private-items \
+    --color always
 """

 [[task]]
@@ -96,15 +93,13 @@ cargo clippy \
 name = "clippy/all"
 group = "lints"
 script = """
-env DIRENV_DEVSHELL=all-features \
-    direnv exec . \
-    cargo clippy \
-        --workspace \
-        --all-targets \
-        --all-features \
-        --color=always \
-        -- \
-        -D warnings
+cargo clippy \
+    --workspace \
+    --all-targets \
+    --all-features \
+    --color=always \
+    -- \
+    -D warnings
 """

 [[task]]
@@ -120,18 +115,18 @@ cargo clippy \
    -D warnings
 """

-#[[task]]
-#name = "clippy/hardened_malloc"
-#group = "lints"
-#script = """
-#cargo clippy \
-#    --workspace \
-#    --features hardened_malloc \
-#    --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"
@@ -139,40 +134,14 @@ group = "lints"
 script = "lychee --verbose --offline docs *.md"

 [[task]]
-name = "cargo/all"
-group = "tests"
-script = """
-env DIRENV_DEVSHELL=all-features \
-    direnv exec . \
-    cargo test \
-        --workspace \
-        --all-targets \
-        --all-features \
-        --color=always \
-        -- \
-        --color=always
-"""
-
-[[task]]
-name = "cargo/default"
+name = "cargo"
 group = "tests"
 script = """
 cargo test \
    --workspace \
    --all-targets \
+    --all-features \
    --color=always \
    -- \
    --color=always
 """
-
-# 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 = """
-nix run .#default -- --help
-"""
@@ -26,11 +26,11 @@
    "complement": {
      "flake": false,
      "locked": {
-        "lastModified": 1715700731,
-        "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=",
+        "lastModified": 1714472853,
+        "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=",
        "owner": "matrix-org",
        "repo": "complement",
-        "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5",
+        "rev": "891d18872c153d39a9ce63b545045efddb845738",
        "type": "github"
      },
      "original": {
@@ -68,11 +68,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716569590,
-        "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=",
+        "lastModified": 1713738183,
+        "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "109987da061a1bf452f435f1653c47511587d919",
+        "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11",
        "type": "github"
      },
      "original": {
@@ -90,11 +90,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1716359173,
-        "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=",
+        "lastModified": 1714544767,
+        "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6",
+        "rev": "73124e1356bde9411b163d636b39fe4804b7ca45",
        "type": "github"
      },
      "original": {
@@ -171,23 +171,6 @@
        "type": "github"
      }
    },
-    "liburing": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716565485,
-        "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=",
-        "owner": "axboe",
-        "repo": "liburing",
-        "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "axboe",
-        "ref": "master",
-        "repo": "liburing",
-        "type": "github"
-      }
-    },
    "nix-filter": {
      "locked": {
        "lastModified": 1710156097,
@@ -238,11 +221,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1716330097,
-        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+        "lastModified": 1713537308,
+        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
        "type": "github"
      },
      "original": {
@@ -255,16 +238,16 @@
    "rocksdb": {
      "flake": false,
      "locked": {
-        "lastModified": 1716773462,
-        "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=",
+        "lastModified": 1714770052,
+        "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=",
        "owner": "girlbossceo",
        "repo": "rocksdb",
-        "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc",
+        "rev": "db6df0b185774778457dabfcbd822cb81760cade",
        "type": "github"
      },
      "original": {
        "owner": "girlbossceo",
-        "ref": "v9.2.1",
+        "ref": "v9.1.1",
        "repo": "rocksdb",
        "type": "github"
      }
@@ -277,7 +260,6 @@
        "fenix": "fenix",
        "flake-compat": "flake-compat_2",
        "flake-utils": "flake-utils_2",
-        "liburing": "liburing",
        "nix-filter": "nix-filter",
        "nixpkgs": "nixpkgs_2",
        "rocksdb": "rocksdb"
@@ -286,11 +268,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1716107283,
-        "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=",
+        "lastModified": 1713628977,
+        "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd",
+        "rev": "55d9a533b309119c8acd13061581b43ae8840823",
        "type": "github"
      },
      "original": {
@@ -9,15 +9,13 @@
    nix-filter.url = "github:numtide/nix-filter?ref=main";
    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
    # https://github.com/girlbossceo/rocksdb/commit/db6df0b185774778457dabfcbd822cb81760cade
-    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.2.1"; flake = false; };
-    liburing = { url = "github:axboe/liburing?ref=master"; flake = false; };
+    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.1.1"; flake = false; };
  };

  outputs = inputs:
    inputs.flake-utils.lib.eachDefaultSystem (system:
    let
      pkgsHost = inputs.nixpkgs.legacyPackages.${system};
-      pkgsHostStatic = pkgsHost.pkgsStatic;

      # The Rust toolchain to use
      toolchain = inputs.fenix.packages.${system}.fromToolchainFile {
@@ -27,8 +25,7 @@
        sha256 = "sha256-+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8";
      };

-      mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
-        inherit pkgs;
+      scope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
        book = self.callPackage ./nix/pkgs/book {};
        complement = self.callPackage ./nix/pkgs/complement {};
        craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain toolchain);
@@ -42,87 +39,22 @@
            (builtins.fromJSON (builtins.readFile ./flake.lock))
              .nodes.rocksdb.original.ref;
        });
-        # TODO: remove once https://github.com/NixOS/nixpkgs/pull/314945 is available
-        liburing = pkgs.liburing.overrideAttrs (old: {
-          # the configure script doesn't support these, and unconditionally
-          # builds both static and dynamic libraries.
-          configureFlags = pkgs.lib.subtractLists
-            [ "--enable-static" "--disable-shared" ]
-            old.configureFlags;
-
-          postInstall = old.postInstall + ''
-            # we remove the extra outputs
-            #
-            # we need to do this to prevent rocksdb from trying to link the
-            # static library in a dynamic stdenv
-            rm $out/lib/liburing*${
-              if pkgs.stdenv.hostPlatform.isStatic then ".so*" else ".a"
-            }
-          '';
-        });
      });

-      scopeHost = mkScope pkgsHost;
-      scopeHostStatic = mkScope pkgsHostStatic;
-
-      mkDevShell = scope: scope.pkgs.mkShell {
-        env = scope.main.env // {
-          # Rust Analyzer needs to be able to find the path to default crate
-          # sources, and it can read this environment variable to do so. The
-          # `rust-src` component is required in order for this to work.
-          RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
-
-          # Convenient way to access a pinned version of Complement's source
-          # code.
-          COMPLEMENT_SRC = inputs.complement.outPath;
-
-          # Needed for Complement
-          CGO_CFLAGS = "-I${scope.pkgs.olm}/include";
-          CGO_LDFLAGS = "-L${scope.pkgs.olm}/lib";
-        };
-
-        # Development tools
-        packages = [
-          # Always use nightly rustfmt because most of its options are unstable
-          #
-          # This needs to come before `toolchain` in this list, otherwise
-          # `$PATH` will have stable rustfmt instead.
-          inputs.fenix.packages.${system}.latest.rustfmt
-
-          toolchain
-        ]
-        ++ (with pkgsHost.pkgs; [
-          engage
-          cargo-audit
-
-          # Needed for producing Debian packages
-          cargo-deb
-
-          # Needed for Complement
-          go
-
-          # Needed for our script for Complement
-          jq
-
-          # Needed for finding broken markdown links
-          lychee
-
-          # Useful for editing the book locally
-          mdbook
-        ])
-        ++ scope.main.buildInputs
-        ++ scope.main.propagatedBuildInputs
-        ++ scope.main.nativeBuildInputs;
-
-        meta.broken = scope.main.meta.broken;
-      };
+      scopeHost = (scope pkgsHost);
    in
    {
      packages = {
        default = scopeHost.main;
+        jemalloc = scopeHost.main.override { features = ["jemalloc"]; };
        hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; };

        oci-image = scopeHost.oci-image;
+        oci-image-jemalloc = scopeHost.oci-image.override {
+          main = scopeHost.main.override {
+            features = ["jemalloc"];
+          };
+        };
        oci-image-hmalloc = scopeHost.oci-image.override {
          main = scopeHost.main.override {
            features = ["hardened_malloc"];
@@ -132,7 +64,6 @@
        book = scopeHost.book;

        complement = scopeHost.complement;
-        static-complement = scopeHostStatic.complement;
      }
      //
      builtins.listToAttrs
@@ -148,7 +79,7 @@
                      config = crossSystem;
                    };
                  }).pkgsStatic;
-                scopeCrossStatic = mkScope pkgsCrossStatic;
+                scopeCrossStatic = scope pkgsCrossStatic;
              in
              [
                # An output for a statically-linked binary
@@ -157,6 +88,14 @@
                  value = scopeCrossStatic.main;
                }

+                # An output for a statically-linked binary with jemalloc
+                {
+                  name = "${binaryName}-jemalloc";
+                  value = scopeCrossStatic.main.override {
+                    features = ["jemalloc"];
+                  };
+                }
+
                # An output for a statically-linked binary with hardened_malloc
                {
                  name = "${binaryName}-hmalloc";
@@ -171,6 +110,16 @@
                  value = scopeCrossStatic.oci-image;
                }

+                # An output for an OCI image based on that binary with jemalloc
+                {
+                  name = "oci-image-${crossSystem}-jemalloc";
+                  value = scopeCrossStatic.oci-image.override {
+                    main = scopeCrossStatic.main.override {
+                      features = ["jemalloc"];
+                    };
+                  };
+                }
+
                # An output for an OCI image based on that binary with hardened_malloc
                {
                  name = "oci-image-${crossSystem}-hmalloc";
@@ -189,15 +138,54 @@
          )
        );

-      devShells.default = mkDevShell scopeHostStatic;
-      devShells.all-features = mkDevShell
-        (scopeHostStatic.overrideScope (final: prev: {
-          main = prev.main.override { all_features = true; };
-        }));
-      devShells.no-features = mkDevShell
-        (scopeHostStatic.overrideScope (final: prev: {
-          main = prev.main.override { default_features = false; };
-        }));
-      devShells.dynamic = mkDevShell scopeHost;
+      devShells.default = pkgsHost.mkShell {
+        env = scopeHost.main.env // {
+          # Rust Analyzer needs to be able to find the path to default crate
+          # sources, and it can read this environment variable to do so. The
+          # `rust-src` component is required in order for this to work.
+          RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
+
+          # Convenient way to access a pinned version of Complement's source
+          # code.
+          COMPLEMENT_SRC = inputs.complement.outPath;
+        };
+
+        # Development tools
+        packages = [
+          # Always use nightly rustfmt because most of its options are unstable
+          #
+          # This needs to come before `toolchain` in this list, otherwise
+          # `$PATH` will have stable rustfmt instead.
+          inputs.fenix.packages.${system}.latest.rustfmt
+
+          toolchain
+        ]
+        ++ (with pkgsHost; [
+          engage
+          cargo-audit
+
+          # Needed for producing Debian packages
+          cargo-deb
+
+          # Needed for Complement
+          go
+          olm
+
+          # Needed for our script for Complement
+          jq
+
+          # Needed for finding broken markdown links
+          lychee
+
+          # Useful for editing the book locally
+          mdbook
+        ])
+        ++ (if !pkgsHost.stdenv.isDarwin then [
+            # Needed for building with io_uring
+            pkgsHost.liburing
+        ] else [])
+        ++
+        scopeHost.main.nativeBuildInputs;
+      };
    });
 }
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
      "conduwuit-example.toml"
      "CONTRIBUTING.md"
      "README.md"
-      "debian/conduwuit.service"
      "debian/README.md"
      "docs"
    ];
@@ -44,14 +44,16 @@ let
      -sha256

    ${lib.getExe' coreutils "env"} \
-      CONDUWUIT_SERVER_NAME="$SERVER_NAME" \
+      CONDUIT_SERVER_NAME="$SERVER_NAME" \
+      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8448" \
+      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8008" \
      ${lib.getExe main'}
  '';
 in

 dockerTools.buildImage {
  name = "complement-${main.pname}";
-  tag = "main";
+  tag = "dev";

  copyToRoot = buildEnv {
    name = "root";
@@ -79,7 +81,7 @@ dockerTools.buildImage {

    Env = [
      "SSL_CERT_FILE=/complement/ca/ca.crt"
-      "CONDUWUIT_CONFIG=${./config.toml}"
+      "CONDUIT_CONFIG=${./config.toml}"
    ];

    ExposedPorts = {
@@ -1,87 +1,27 @@
 # Dependencies (keep sorted)
 { craneLib
 , inputs
-, jq
 , lib
 , libiconv
-, liburing
 , pkgsBuildHost
 , rocksdb
 , rust
-, rust-jemalloc-sys
 , stdenv

 # Options (keep sorted)
 , default_features ? true
-, disable_release_max_log_level ? false
-, all_features ? false
-, disable_features ? []
 , features ? []
 , profile ? "release"
 }:

 let
-# We perform default-feature unification in nix, because some of the dependencies
-# on the nix side depend on feature values.
-crateFeatures = path:
-  let manifest = lib.importTOML "${path}/Cargo.toml"; in
-  lib.remove "default" (lib.attrNames manifest.features) ++
-  lib.attrNames
-    (lib.filterAttrs
-      (_: dependency: dependency.optional or false)
-      manifest.dependencies);
-crateDefaultFeatures = path:
-  (lib.importTOML "${path}/Cargo.toml").features.default;
-allDefaultFeatures = crateDefaultFeatures "${inputs.self}/src/main";
-allFeatures = crateFeatures "${inputs.self}/src/main";
-features' = lib.unique
-  (features ++
-    lib.optionals default_features allDefaultFeatures ++
-    lib.optionals all_features allFeatures);
-disable_features' = disable_features ++ lib.optionals disable_release_max_log_level ["release_max_log_level"];
-features'' = lib.subtractLists disable_features' features';
-
-featureEnabled = feature : builtins.elem feature features'';
-
-enableLiburing = featureEnabled "io_uring" && stdenv.isLinux;
-
-# This derivation will set the JEMALLOC_OVERRIDE variable, causing the
-# tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's
-# own. In order for this to work, we need to set flags on the build that match
-# whatever flags tikv-jemalloc-sys was going to use. These are dependent on
-# which features we enable in tikv-jemalloc-sys.
-rust-jemalloc-sys' = (rust-jemalloc-sys.override {
-  # tikv-jemalloc-sys/unprefixed_malloc_on_supported_platforms feature
-  unprefixed = true;
-}).overrideAttrs (old: {
-  configureFlags = old.configureFlags ++
-    # tikv-jemalloc-sys/profiling feature
-    lib.optional (featureEnabled "jemalloc_prof") "--enable-prof";
-});
-
 buildDepsOnlyEnv =
  let
-    rocksdb' = (rocksdb.override {
-      jemalloc = rust-jemalloc-sys';
-      # rocksdb fails to build with prefixed jemalloc, which is required on
-      # darwin due to [1]. In this case, fall back to building rocksdb with
-      # libc malloc. This should not cause conflicts, because all of the
-      # jemalloc symbols are prefixed.
-      #
-      # [1]: https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs#L17
-      enableJemalloc = featureEnabled "jemalloc" && !stdenv.isDarwin;
-    }).overrideAttrs (old: {
-      # TODO: static rocksdb fails to build on darwin
-      # build log at <https://girlboss.ceo/~strawberry/pb/JjGH>
-      meta.broken = stdenv.hostPlatform.isStatic && stdenv.isDarwin;
-      # TODO: switch to enableUring option once https://github.com/NixOS/nixpkgs/pull/314945 is available
-      buildInputs = old.buildInputs ++ lib.optional enableLiburing liburing;
-    });
+    rocksdb' = rocksdb.override {
+      enableJemalloc = builtins.elem "jemalloc" features;
+    };
  in
  {
-    # https://crane.dev/faq/rebuilds-bindgen.html
-    NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
-
    CARGO_PROFILE = profile;
    ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
    ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
@@ -98,14 +38,7 @@ buildDepsOnlyEnv =

 buildPackageEnv = {
  CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
-} // buildDepsOnlyEnv // {
-  # Only needed in static stdenv because these are transitive dependencies of rocksdb
-  CARGO_BUILD_RUSTFLAGS = buildDepsOnlyEnv.CARGO_BUILD_RUSTFLAGS
-    + lib.optionalString (enableLiburing && stdenv.hostPlatform.isStatic)
-      " -L${lib.getLib liburing}/lib -luring";
-};
-
-
+} // buildDepsOnlyEnv;

 commonAttrs = {
  inherit
@@ -122,33 +55,18 @@ commonAttrs = {
      include = [
        "Cargo.lock"
        "Cargo.toml"
-        "deps"
+        "hot_lib"
        "src"
      ];
    };

-    buildInputs = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys';
-
    nativeBuildInputs = [
      # bindgen needs the build platform's libclang. Apparently due to "splicing
      # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
      # right thing here.
      pkgsBuildHost.rustPlatform.bindgenHook
-
-      # We don't actually depend on `jq`, but crane's `buildPackage` does, but
-      # its `buildDepsOnly` doesn't. This causes those two derivations to have
-      # differing values for `NIX_CFLAGS_COMPILE`, which contributes to spurious
-      # rebuilds of bindgen and its depedents.
-      jq
  ]
-  ++ lib.optionals stdenv.isDarwin [
-      # https://github.com/NixOS/nixpkgs/issues/206242
-      libiconv
-
-      # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell
-      # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612
-      pkgsBuildHost.darwin.apple_sdk.frameworks.Security
-    ];
+  ++ lib.optionals stdenv.isDarwin [ libiconv ];
 };
 in

@@ -157,16 +75,23 @@ craneLib.buildPackage ( commonAttrs // {
    env = buildDepsOnlyEnv;
  });

-  cargoExtraArgs = "--no-default-features "
+  cargoExtraArgs = ""
    + lib.optionalString
-      (features'' != [])
-      "--features " + (builtins.concatStringsSep "," features'');
+      (!default_features)
+      "--no-default-features "
+    + lib.optionalString
+      (features != [])
+      "--features " + (builtins.concatStringsSep "," features);

  # This is redundant with CI
  cargoTestCommand = "";
-  cargoCheckCommand = "";
+
+  # This is redundant with CI
  doCheck = false;

+  # https://crane.dev/faq/rebuilds-bindgen.html
+  NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
+
  env = buildPackageEnv;

  passthru = {
@@ -11,6 +11,5 @@
  },
  "nix": {
    "enabled": true
-  },
-  "labels": ["dependencies", "github_actions"]
+  }
 }
@@ -1,61 +0,0 @@
-[package]
-name = "conduit_admin"
-categories.workspace = true
-description.workspace = true
-edition.workspace = true
-keywords.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
-version.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-dev_release_log_level = []
-release_max_log_level = [
-	"tracing/max_level_trace",
-	"tracing/release_max_level_info",
-	"log/max_level_trace",
-	"log/release_max_level_info",
-]
-rocksdb = [
-	"dep:rust-rocksdb",
-]
-jemalloc = [
-	"rust-rocksdb/jemalloc",
-]
-io_uring = [
-	"rust-rocksdb/io-uring",
-]
-zstd_compression = [
-	"rust-rocksdb/zstd",
-]
-
-[dependencies]
-clap.workspace = true
-conduit-api.workspace = true
-conduit-core.workspace = true
-conduit-database.workspace = true
-conduit-service.workspace = true
-futures-util.workspace = true
-log.workspace = true
-loole.workspace = true
-regex.workspace = true
-ruma.workspace = true
-rust-rocksdb.optional = true
-rust-rocksdb.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-serde_yaml.workspace = true
-tokio.workspace = true
-tracing-subscriber.workspace = true
-tracing.workspace = true
-
-[lints]
-workspace = true
@@ -1,306 +0,0 @@
-use std::sync::Arc;
-
-use clap::Parser;
-use regex::Regex;
-use ruma::{
-	events::{
-		relation::InReplyTo,
-		room::message::{Relation::Reply, RoomMessageEventContent},
-		TimelineEventType,
-	},
-	OwnedRoomId, OwnedUserId, RoomId, ServerName, UserId,
-};
-use serde_json::value::to_raw_value;
-use tokio::sync::MutexGuard;
-use tracing::error;
-
-extern crate conduit_service as service;
-
-use conduit::{Error, Result};
-pub(crate) use service::admin::{AdminRoomEvent, Service};
-use service::{admin::HandlerResult, pdu::PduBuilder};
-
-use self::{fsck::FsckCommand, tester::TesterCommands};
-use crate::{
-	appservice, appservice::AppserviceCommand, debug, debug::DebugCommand, escape_html, federation,
-	federation::FederationCommand, fsck, media, media::MediaCommand, query, query::QueryCommand, room,
-	room::RoomCommand, server, server::ServerCommand, services, tester, user, user::UserCommand,
-};
-pub(crate) const PAGE_SIZE: usize = 100;
-
-#[cfg_attr(test, derive(Debug))]
-#[derive(Parser)]
-#[command(name = "@conduit:server.name:", version = env!("CARGO_PKG_VERSION"))]
-pub(crate) enum AdminCommand {
-	#[command(subcommand)]
-	/// - Commands for managing appservices
-	Appservices(AppserviceCommand),
-
-	#[command(subcommand)]
-	/// - Commands for managing local users
-	Users(UserCommand),
-
-	#[command(subcommand)]
-	/// - Commands for managing rooms
-	Rooms(RoomCommand),
-
-	#[command(subcommand)]
-	/// - Commands for managing federation
-	Federation(FederationCommand),
-
-	#[command(subcommand)]
-	/// - Commands for managing the server
-	Server(ServerCommand),
-
-	#[command(subcommand)]
-	/// - Commands for managing media
-	Media(MediaCommand),
-
-	#[command(subcommand)]
-	/// - Commands for debugging things
-	Debug(DebugCommand),
-
-	#[command(subcommand)]
-	/// - Query all the database getters and iterators
-	Query(QueryCommand),
-
-	#[command(subcommand)]
-	/// - Query all the database getters and iterators
-	Fsck(FsckCommand),
-
-	#[command(subcommand)]
-	Tester(TesterCommands),
-}
-
-#[must_use]
-pub fn handle(event: AdminRoomEvent, room: OwnedRoomId, user: OwnedUserId) -> HandlerResult {
-	Box::pin(handle_event(event, room, user))
-}
-
-async fn handle_event(event: AdminRoomEvent, admin_room: OwnedRoomId, server_user: OwnedUserId) -> Result<()> {
-	let (mut message_content, reply) = match event {
-		AdminRoomEvent::SendMessage(content) => (content, None),
-		AdminRoomEvent::ProcessMessage(room_message, reply_id) => {
-			// This future is ~8 KiB so it's better to start it off the stack.
-			(Box::pin(process_admin_message(room_message)).await, Some(reply_id))
-		},
-	};
-
-	let mutex_state = Arc::clone(
-		services()
-			.globals
-			.roomid_mutex_state
-			.write()
-			.await
-			.entry(admin_room.clone())
-			.or_default(),
-	);
-	let state_lock = mutex_state.lock().await;
-
-	if let Some(reply) = reply {
-		message_content.relates_to = Some(Reply {
-			in_reply_to: InReplyTo {
-				event_id: reply.into(),
-			},
-		});
-	}
-
-	let response_pdu = PduBuilder {
-		event_type: TimelineEventType::RoomMessage,
-		content: to_raw_value(&message_content).expect("event is valid, we just created it"),
-		unsigned: None,
-		state_key: None,
-		redacts: None,
-	};
-
-	if let Err(e) = services()
-		.rooms
-		.timeline
-		.build_and_append_pdu(response_pdu, &server_user, &admin_room, &state_lock)
-		.await
-	{
-		handle_response_error(&e, &admin_room, &server_user, &state_lock).await?;
-	}
-
-	Ok(())
-}
-
-async fn handle_response_error(
-	e: &Error, admin_room: &RoomId, server_user: &UserId, state_lock: &MutexGuard<'_, ()>,
-) -> Result<()> {
-	error!("Failed to build and append admin room response PDU: \"{e}\"");
-	let error_room_message = RoomMessageEventContent::text_plain(format!(
-		"Failed to build and append admin room PDU: \"{e}\"\n\nThe original admin command may have finished \
-		 successfully, but we could not return the output."
-	));
-
-	let response_pdu = PduBuilder {
-		event_type: TimelineEventType::RoomMessage,
-		content: to_raw_value(&error_room_message).expect("event is valid, we just created it"),
-		unsigned: None,
-		state_key: None,
-		redacts: None,
-	};
-
-	services()
-		.rooms
-		.timeline
-		.build_and_append_pdu(response_pdu, server_user, admin_room, state_lock)
-		.await?;
-
-	Ok(())
-}
-
-// Parse and process a message from the admin room
-async fn process_admin_message(room_message: String) -> RoomMessageEventContent {
-	let mut lines = room_message.lines().filter(|l| !l.trim().is_empty());
-	let command_line = lines.next().expect("each string has at least one line");
-	let body = lines.collect::<Vec<_>>();
-
-	let admin_command = match parse_admin_command(command_line) {
-		Ok(command) => command,
-		Err(error) => {
-			let server_name = services().globals.server_name();
-			let message = error.replace("server.name", server_name.as_str());
-			let html_message = usage_to_html(&message, server_name);
-
-			return RoomMessageEventContent::text_html(message, html_message);
-		},
-	};
-
-	match process_admin_command(admin_command, body).await {
-		Ok(reply_message) => reply_message,
-		Err(error) => {
-			let markdown_message = format!("Encountered an error while handling the command:\n```\n{error}\n```",);
-			let html_message = format!("Encountered an error while handling the command:\n<pre>\n{error}\n</pre>",);
-
-			RoomMessageEventContent::text_html(markdown_message, html_message)
-		},
-	}
-}
-
-// Parse chat messages from the admin room into an AdminCommand object
-fn parse_admin_command(command_line: &str) -> Result<AdminCommand, String> {
-	// Note: argv[0] is `@conduit:servername:`, which is treated as the main command
-	let mut argv = command_line.split_whitespace().collect::<Vec<_>>();
-
-	// Replace `help command` with `command --help`
-	// Clap has a help subcommand, but it omits the long help description.
-	if argv.len() > 1 && argv[1] == "help" {
-		argv.remove(1);
-		argv.push("--help");
-	}
-
-	// Backwards compatibility with `register_appservice`-style commands
-	let command_with_dashes_argv1;
-	if argv.len() > 1 && argv[1].contains('_') {
-		command_with_dashes_argv1 = argv[1].replace('_', "-");
-		argv[1] = &command_with_dashes_argv1;
-	}
-
-	// Backwards compatibility with `register_appservice`-style commands
-	let command_with_dashes_argv2;
-	if argv.len() > 2 && argv[2].contains('_') {
-		command_with_dashes_argv2 = argv[2].replace('_', "-");
-		argv[2] = &command_with_dashes_argv2;
-	}
-
-	// if the user is using the `query` command (argv[1]), replace the database
-	// function/table calls with underscores to match the codebase
-	let command_with_dashes_argv3;
-	if argv.len() > 3 && argv[1].eq("query") {
-		command_with_dashes_argv3 = argv[3].replace('_', "-");
-		argv[3] = &command_with_dashes_argv3;
-	}
-
-	AdminCommand::try_parse_from(argv).map_err(|error| error.to_string())
-}
-
-async fn process_admin_command(command: AdminCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	let reply_message_content = match command {
-		AdminCommand::Appservices(command) => appservice::process(command, body).await?,
-		AdminCommand::Media(command) => media::process(command, body).await?,
-		AdminCommand::Users(command) => user::process(command, body).await?,
-		AdminCommand::Rooms(command) => room::process(command, body).await?,
-		AdminCommand::Federation(command) => federation::process(command, body).await?,
-		AdminCommand::Server(command) => server::process(command, body).await?,
-		AdminCommand::Debug(command) => debug::process(command, body).await?,
-		AdminCommand::Query(command) => query::process(command, body).await?,
-		AdminCommand::Fsck(command) => fsck::process(command, body).await?,
-		AdminCommand::Tester(command) => tester::process(command, body).await?,
-	};
-
-	Ok(reply_message_content)
-}
-
-// Utility to turn clap's `--help` text to HTML.
-fn usage_to_html(text: &str, server_name: &ServerName) -> String {
-	// Replace `@conduit:servername:-subcmdname` with `@conduit:servername:
-	// subcmdname`
-	let text = text.replace(&format!("@conduit:{server_name}:-"), &format!("@conduit:{server_name}: "));
-
-	// For the conduit admin room, subcommands become main commands
-	let text = text.replace("SUBCOMMAND", "COMMAND");
-	let text = text.replace("subcommand", "command");
-
-	// Escape option names (e.g. `<element-id>`) since they look like HTML tags
-	let text = escape_html(&text);
-
-	// Italicize the first line (command name and version text)
-	let re = Regex::new("^(.*?)\n").expect("Regex compilation should not fail");
-	let text = re.replace_all(&text, "<em>$1</em>\n");
-
-	// Unmerge wrapped lines
-	let text = text.replace("\n            ", "  ");
-
-	// Wrap option names in backticks. The lines look like:
-	//     -V, --version  Prints version information
-	// And are converted to:
-	// <code>-V, --version</code>: Prints version information
-	// (?m) enables multi-line mode for ^ and $
-	let re = Regex::new("(?m)^ {4}(([a-zA-Z_&;-]+(, )?)+)  +(.*)$").expect("Regex compilation should not fail");
-	let text = re.replace_all(&text, "<code>$1</code>: $4");
-
-	// Look for a `[commandbody]` tag. If it exists, use all lines below it that
-	// start with a `#` in the USAGE section.
-	let mut text_lines = text.lines().collect::<Vec<&str>>();
-	let mut command_body = String::new();
-
-	if let Some(line_index) = text_lines.iter().position(|line| *line == "[commandbody]") {
-		text_lines.remove(line_index);
-
-		while text_lines
-			.get(line_index)
-			.is_some_and(|line| line.starts_with('#'))
-		{
-			command_body += if text_lines[line_index].starts_with("# ") {
-				&text_lines[line_index][2..]
-			} else {
-				&text_lines[line_index][1..]
-			};
-			command_body += "[nobr]\n";
-			text_lines.remove(line_index);
-		}
-	}
-
-	let text = text_lines.join("\n");
-
-	// Improve the usage section
-	let text = if command_body.is_empty() {
-		// Wrap the usage line in code tags
-		let re = Regex::new("(?m)^USAGE:\n {4}(@conduit:.*)$").expect("Regex compilation should not fail");
-		re.replace_all(&text, "USAGE:\n<code>$1</code>").to_string()
-	} else {
-		// Wrap the usage line in a code block, and add a yaml block example
-		// This makes the usage of e.g. `register-appservice` more accurate
-		let re = Regex::new("(?m)^USAGE:\n {4}(.*?)\n\n").expect("Regex compilation should not fail");
-		re.replace_all(&text, "USAGE:\n<pre>$1[nobr]\n[commandbodyblock]</pre>")
-			.replace("[commandbodyblock]", &command_body)
-	};
-
-	// Add HTML line-breaks
-
-	text.replace("\n\n\n", "\n\n")
-		.replace('\n', "<br>\n")
-		.replace("[nobr]<br>", "")
-}
@@ -1,55 +0,0 @@
-pub(crate) mod appservice;
-pub(crate) mod debug;
-pub(crate) mod federation;
-pub(crate) mod fsck;
-pub(crate) mod handler;
-pub(crate) mod media;
-pub(crate) mod query;
-pub(crate) mod room;
-pub(crate) mod server;
-pub(crate) mod tester;
-pub(crate) mod user;
-pub(crate) mod utils;
-
-extern crate conduit_api as api;
-extern crate conduit_core as conduit;
-extern crate conduit_service as service;
-
-pub(crate) use conduit::{mod_ctor, mod_dtor, Result};
-pub use handler::handle;
-pub(crate) use service::{services, user_is_local};
-
-pub(crate) use crate::{
-	handler::Service,
-	utils::{escape_html, get_room_info},
-};
-
-mod_ctor! {}
-mod_dtor! {}
-
-#[cfg(test)]
-mod test {
-	use clap::Parser;
-
-	use crate::handler::AdminCommand;
-
-	#[test]
-	fn get_help_short() { get_help_inner("-h"); }
-
-	#[test]
-	fn get_help_long() { get_help_inner("--help"); }
-
-	#[test]
-	fn get_help_subcommand() { get_help_inner("help"); }
-
-	fn get_help_inner(input: &str) {
-		let error = AdminCommand::try_parse_from(["argv[0] doesn't matter", input])
-			.unwrap_err()
-			.to_string();
-
-		// Search for a handful of keywords that suggest the help printed properly
-		assert!(error.contains("Usage:"));
-		assert!(error.contains("Commands:"));
-		assert!(error.contains("Options:"));
-	}
-}
@@ -1,249 +0,0 @@
-use ruma::events::room::message::RoomMessageEventContent;
-
-use super::RoomStateCache;
-use crate::{services, Result};
-
-pub(crate) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomMessageEventContent> {
-	match subcommand {
-		RoomStateCache::ServerInRoom {
-			server,
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let result = services()
-				.rooms
-				.state_cache
-				.server_in_room(&server, &room_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{result:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{result:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomServers {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.room_servers(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::ServerRooms {
-			server,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services().rooms.state_cache.server_rooms(&server).collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomMembers {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.room_members(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::LocalUsersInRoom {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Vec<_> = services()
-				.rooms
-				.state_cache
-				.local_users_in_room(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::ActiveLocalUsersInRoom {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Vec<_> = services()
-				.rooms
-				.state_cache
-				.active_local_users_in_room(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomJoinedCount {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results = services().rooms.state_cache.room_joined_count(&room_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomInvitedCount {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results = services().rooms.state_cache.room_invited_count(&room_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomUserOnceJoined {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.room_useroncejoined(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomMembersInvited {
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.room_members_invited(&room_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::GetInviteCount {
-			room_id,
-			user_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results = services()
-				.rooms
-				.state_cache
-				.get_invite_count(&room_id, &user_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::GetLeftCount {
-			room_id,
-			user_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results = services()
-				.rooms
-				.state_cache
-				.get_left_count(&room_id, &user_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomsJoined {
-			user_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.rooms_joined(&user_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomsInvited {
-			user_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services()
-				.rooms
-				.state_cache
-				.rooms_invited(&user_id)
-				.collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::RoomsLeft {
-			user_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results: Result<Vec<_>> = services().rooms.state_cache.rooms_left(&user_id).collect();
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-		RoomStateCache::InviteState {
-			user_id,
-			room_id,
-		} => {
-			let timer = tokio::time::Instant::now();
-			let results = services()
-				.rooms
-				.state_cache
-				.invite_state(&user_id, &room_id);
-			let query_time = timer.elapsed();
-
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
-		},
-	}
-}
@@ -1,93 +0,0 @@
-use std::fmt::Write;
-
-use ruma::{events::room::message::RoomMessageEventContent, RoomId};
-use service::services;
-
-use super::RoomInfoCommand;
-use crate::{escape_html, Result};
-
-pub(crate) async fn process(command: RoomInfoCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	match command {
-		RoomInfoCommand::ListJoinedMembers {
-			room_id,
-		} => list_joined_members(body, room_id).await,
-		RoomInfoCommand::ViewRoomTopic {
-			room_id,
-		} => view_room_topic(body, room_id).await,
-	}
-}
-
-async fn list_joined_members(_body: Vec<&str>, room_id: Box<RoomId>) -> Result<RoomMessageEventContent> {
-	let room_name = services()
-		.rooms
-		.state_accessor
-		.get_name(&room_id)
-		.ok()
-		.flatten()
-		.unwrap_or_else(|| room_id.to_string());
-
-	let members = services()
-		.rooms
-		.state_cache
-		.room_members(&room_id)
-		.filter_map(Result::ok);
-
-	let member_info = members
-		.into_iter()
-		.map(|user_id| {
-			(
-				user_id.clone(),
-				services()
-					.users
-					.displayname(&user_id)
-					.unwrap_or(None)
-					.unwrap_or_else(|| user_id.to_string()),
-			)
-		})
-		.collect::<Vec<_>>();
-
-	let output_plain = format!(
-		"{} Members in Room \"{}\":\n```\n{}\n```",
-		member_info.len(),
-		room_name,
-		member_info
-			.iter()
-			.map(|(mxid, displayname)| format!("{mxid} | {displayname}"))
-			.collect::<Vec<_>>()
-			.join("\n")
-	);
-
-	let output_html = format!(
-		"<table><caption>{} Members in Room \"{}\" </caption>\n<tr><th>MXID</th>\t<th>Display \
-		 Name</th></tr>\n{}</table>",
-		member_info.len(),
-		room_name,
-		member_info
-			.iter()
-			.fold(String::new(), |mut output, (mxid, displayname)| {
-				writeln!(
-					output,
-					"<tr><td>{}</td>\t<td>{}</td></tr>",
-					mxid,
-					escape_html(displayname.as_ref())
-				)
-				.expect("should be able to write to string buffer");
-				output
-			})
-	);
-
-	Ok(RoomMessageEventContent::text_html(output_plain, output_html))
-}
-
-async fn view_room_topic(_body: Vec<&str>, room_id: Box<RoomId>) -> Result<RoomMessageEventContent> {
-	let Some(room_topic) = services().rooms.state_accessor.get_room_topic(&room_id)? else {
-		return Ok(RoomMessageEventContent::text_plain("Room does not have a room topic set."));
-	};
-
-	let output_html = format!("<p>Room topic:</p>\n<hr>\n{}<hr>", escape_html(&room_topic));
-
-	Ok(RoomMessageEventContent::text_html(
-		format!("Room topic:\n\n```{room_topic}\n```"),
-		output_html,
-	))
-}
@@ -1,522 +0,0 @@
-use std::fmt::Write;
-
-use api::client::{get_alias_helper, leave_room};
-use ruma::{
-	events::room::message::RoomMessageEventContent, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId,
-};
-use tracing::{debug, error, info, warn};
-
-use super::{super::Service, RoomModerationCommand};
-use crate::{escape_html, get_room_info, services, user_is_local, Result};
-
-pub(crate) async fn process(command: RoomModerationCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	match command {
-		RoomModerationCommand::BanRoom {
-			force,
-			room,
-			disable_federation,
-		} => ban_room(body, force, room, disable_federation).await,
-		RoomModerationCommand::BanListOfRooms {
-			force,
-			disable_federation,
-		} => ban_list_of_rooms(body, force, disable_federation).await,
-		RoomModerationCommand::UnbanRoom {
-			room,
-			enable_federation,
-		} => unban_room(body, room, enable_federation).await,
-		RoomModerationCommand::ListBannedRooms => list_banned_rooms(body).await,
-	}
-}
-
-async fn ban_room(
-	_body: Vec<&str>, force: bool, room: Box<RoomOrAliasId>, disable_federation: bool,
-) -> Result<RoomMessageEventContent> {
-	debug!("Got room alias or ID: {}", room);
-
-	let admin_room_alias = &services().globals.admin_alias;
-
-	if let Some(admin_room_id) = Service::get_admin_room()? {
-		if room.to_string().eq(&admin_room_id) || room.to_string().eq(admin_room_alias) {
-			return Ok(RoomMessageEventContent::text_plain("Not allowed to ban the admin room."));
-		}
-	}
-
-	let room_id = if room.is_room_id() {
-		let room_id = match RoomId::parse(&room) {
-			Ok(room_id) => room_id,
-			Err(e) => {
-				return 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");
-
-		services().rooms.metadata.ban_room(&room_id, true)?;
-
-		room_id
-	} else if room.is_room_alias_id() {
-		let room_alias = match RoomAliasId::parse(&room) {
-			Ok(room_alias) => room_alias,
-			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 not a room ID, attempting to resolve room alias to a room ID locally, if not using \
-			 get_alias_helper to fetch room ID remotely"
-		);
-
-		let room_id = if let Some(room_id) = services().rooms.alias.resolve_local_alias(&room_alias)? {
-			room_id
-		} else {
-			debug!("We don't have this room alias to a room ID locally, attempting to fetch room ID over federation");
-
-			match get_alias_helper(room_alias, None).await {
-				Ok(response) => {
-					debug!("Got federation response fetching room ID for room {room}: {:?}", response);
-					response.room_id
-				},
-				Err(e) => {
-					return Ok(RoomMessageEventContent::text_plain(format!(
-						"Failed to resolve room alias {room} to a room ID: {e}"
-					)));
-				},
-			}
-		};
-
-		services().rooms.metadata.ban_room(&room_id, true)?;
-
-		room_id
-	} else {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Room specified is not a room ID or room alias. Please note that this requires a full room ID \
-			 (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias (`#roomalias:example.com`)",
-		));
-	};
-
-	debug!("Making all users leave the room {}", &room);
-	if force {
-		for local_user in services()
-			.rooms
-			.state_cache
-			.room_members(&room_id)
-			.filter_map(|user| {
-				user.ok().filter(|local_user| {
-					user_is_local(local_user)
-								// additional wrapped check here is to avoid adding remote users
-								// who are in the admin room to the list of local users (would fail auth check)
-								&& (user_is_local(local_user)
-									&& services()
-										.users
-										.is_admin(local_user)
-										.unwrap_or(true)) // since this is a force
-					 // operation, assume user
-					 // is an admin if somehow
-					 // this fails
-				})
-			})
-			.collect::<Vec<OwnedUserId>>()
-		{
-			debug!(
-				"Attempting leave for user {} in room {} (forced, ignoring all errors, evicting admins too)",
-				&local_user, &room_id
-			);
-
-			if let Err(e) = leave_room(&local_user, &room_id, None).await {
-				warn!(%e, "Failed to leave room");
-			}
-		}
-	} else {
-		for local_user in services()
-			.rooms
-			.state_cache
-			.room_members(&room_id)
-			.filter_map(|user| {
-				user.ok().filter(|local_user| {
-					local_user.server_name() == services().globals.server_name()
-								// additional wrapped check here is to avoid adding remote users
-								// who are in the admin room to the list of local users (would fail auth check)
-								&& (local_user.server_name()
-									== services().globals.server_name()
-									&& !services()
-										.users
-										.is_admin(local_user)
-										.unwrap_or(false))
-				})
-			})
-			.collect::<Vec<OwnedUserId>>()
-		{
-			debug!("Attempting leave for user {} in room {}", &local_user, &room_id);
-			if let Err(e) = leave_room(&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
-				)));
-			}
-		}
-	}
-
-	if disable_federation {
-		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 and removed all our local users, use `!admin federation disable-room` to stop receiving new \
-		 inbound federation events as well if needed.",
-	))
-}
-
-async fn ban_list_of_rooms(body: Vec<&str>, force: bool, disable_federation: bool) -> Result<RoomMessageEventContent> {
-	if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Expected code block in command body. Add --help for details.",
-		));
-	}
-
-	let rooms_s = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
-
-	let admin_room_alias = &services().globals.admin_alias;
-
-	let mut room_ban_count: usize = 0;
-	let mut room_ids: Vec<OwnedRoomId> = Vec::new();
-
-	for &room in &rooms_s {
-		match <&RoomOrAliasId>::try_from(room) {
-			Ok(room_alias_or_id) => {
-				if let Some(admin_room_id) = Service::get_admin_room()? {
-					if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(admin_room_alias) {
-						info!("User specified admin room in bulk ban list, ignoring");
-						continue;
-					}
-				}
-
-				if room_alias_or_id.is_room_id() {
-					let room_id = match RoomId::parse(room_alias_or_id) {
-						Ok(room_id) => room_id,
-						Err(e) => {
-							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}"
-							)));
-						},
-					};
-
-					room_ids.push(room_id);
-				}
-
-				if room_alias_or_id.is_room_alias_id() {
-					match RoomAliasId::parse(room_alias_or_id) {
-						Ok(room_alias) => {
-							let room_id =
-								if let Some(room_id) = services().rooms.alias.resolve_local_alias(&room_alias)? {
-									room_id
-								} else {
-									debug!(
-										"We don't have this room alias to a room ID locally, attempting to fetch room \
-										 ID over federation"
-									);
-
-									match get_alias_helper(room_alias, None).await {
-										Ok(response) => {
-											debug!(
-												"Got federation response fetching room ID for room {room}: {:?}",
-												response
-											);
-											response.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) => {
-							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) => {
-				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}"
-				)));
-			},
-		}
-	}
-
-	for room_id in room_ids {
-		if services().rooms.metadata.ban_room(&room_id, true).is_ok() {
-			debug!("Banned {room_id} successfully");
-			room_ban_count = room_ban_count.saturating_add(1);
-		}
-
-		debug!("Making all users leave the room {}", &room_id);
-		if force {
-			for local_user in services()
-				.rooms
-				.state_cache
-				.room_members(&room_id)
-				.filter_map(|user| {
-					user.ok().filter(|local_user| {
-						local_user.server_name() == services().globals.server_name()
-										// additional wrapped check here is to avoid adding remote users
-										// who are in the admin room to the list of local users (would fail auth check)
-										&& (local_user.server_name()
-											== services().globals.server_name()
-											&& services()
-												.users
-												.is_admin(local_user)
-												.unwrap_or(true)) // since this is a
-						 // force operation,
-						 // assume user is
-						 // an admin if
-						 // somehow this
-						 // fails
-					})
-				})
-				.collect::<Vec<OwnedUserId>>()
-			{
-				debug!(
-					"Attempting leave for user {} in room {} (forced, ignoring all errors, evicting admins too)",
-					&local_user, room_id
-				);
-				if let Err(e) = leave_room(&local_user, &room_id, None).await {
-					warn!(%e, "Failed to leave room");
-				}
-			}
-		} else {
-			for local_user in services()
-				.rooms
-				.state_cache
-				.room_members(&room_id)
-				.filter_map(|user| {
-					user.ok().filter(|local_user| {
-						local_user.server_name() == services().globals.server_name()
-										// additional wrapped check here is to avoid adding remote users
-										// who are in the admin room to the list of local users (would fail auth check)
-										&& (local_user.server_name()
-											== services().globals.server_name()
-											&& !services()
-												.users
-												.is_admin(local_user)
-												.unwrap_or(false))
-					})
-				})
-				.collect::<Vec<OwnedUserId>>()
-			{
-				debug!("Attempting leave for user {} in room {}", &local_user, &room_id);
-				if let Err(e) = leave_room(&local_user, &room_id, None).await {
-					error!(
-						"Error attempting to make local user {} leave room {} during bulk 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 and not banning any more rooms): {}\nIf you would \
-						 like to ignore errors, use --force",
-						&local_user, &room_id, e
-					)));
-				}
-			}
-		}
-
-		if disable_federation {
-			services().rooms.metadata.disable_room(&room_id, true)?;
-		}
-	}
-
-	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."
-		)))
-	}
-}
-
-async fn unban_room(
-	_body: Vec<&str>, room: Box<RoomOrAliasId>, enable_federation: bool,
-) -> Result<RoomMessageEventContent> {
-	let room_id = if room.is_room_id() {
-		let room_id = match RoomId::parse(&room) {
-			Ok(room_id) => room_id,
-			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");
-
-		services().rooms.metadata.ban_room(&room_id, false)?;
-
-		room_id
-	} else if room.is_room_alias_id() {
-		let room_alias = match RoomAliasId::parse(&room) {
-			Ok(room_alias) => room_alias,
-			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 not a room ID, attempting to resolve room alias to a room ID locally, if not using \
-			 get_alias_helper to fetch room ID remotely"
-		);
-
-		let room_id = if let Some(room_id) = services().rooms.alias.resolve_local_alias(&room_alias)? {
-			room_id
-		} else {
-			debug!("We don't have this room alias to a room ID locally, attempting to fetch room ID over federation");
-
-			match get_alias_helper(room_alias, None).await {
-				Ok(response) => {
-					debug!("Got federation response fetching room ID for room {room}: {:?}", response);
-					response.room_id
-				},
-				Err(e) => {
-					return Ok(RoomMessageEventContent::text_plain(format!(
-						"Failed to resolve room alias {room} to a room ID: {e}"
-					)));
-				},
-			}
-		};
-
-		services().rooms.metadata.ban_room(&room_id, false)?;
-
-		room_id
-	} else {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Room specified is not a room ID or room alias. Please note that this requires a full room ID \
-			 (`!awIh6gGInaS5wLQJwa:example.com`) or a room alias (`#roomalias:example.com`)",
-		));
-	};
-
-	if enable_federation {
-		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.",
-	))
-}
-
-async fn list_banned_rooms(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	let rooms = services()
-		.rooms
-		.metadata
-		.list_banned_rooms()
-		.collect::<Result<Vec<_>, _>>();
-
-	match rooms {
-		Ok(room_ids) => {
-			if room_ids.is_empty() {
-				return Ok(RoomMessageEventContent::text_plain("No rooms are banned."));
-			}
-
-			let mut rooms = room_ids
-				.into_iter()
-				.map(|room_id| get_room_info(&room_id))
-				.collect::<Vec<_>>();
-			rooms.sort_by_key(|r| r.1);
-			rooms.reverse();
-
-			let output_plain = format!(
-				"Rooms Banned ({}):\n```\n{}```",
-				rooms.len(),
-				rooms
-					.iter()
-					.map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}"))
-					.collect::<Vec<_>>()
-					.join("\n")
-			);
-
-			let output_html = format!(
-				"<table><caption>Rooms Banned ({}) \
-				 </caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
-				rooms.len(),
-				rooms
-					.iter()
-					.fold(String::new(), |mut output, (id, members, name)| {
-						writeln!(
-							output,
-							"<tr><td>{}</td>\t<td>{}</td>\t<td>{}</td></tr>",
-							id,
-							members,
-							escape_html(name.as_ref())
-						)
-						.expect("should be able to write to string buffer");
-						output
-					})
-			);
-
-			Ok(RoomMessageEventContent::text_html(output_plain, output_html))
-		},
-		Err(e) => {
-			error!("Failed to list banned rooms: {}", e);
-			Ok(RoomMessageEventContent::text_plain(format!("Unable to list banned rooms: {e}")))
-		},
-	}
-}
@@ -1,427 +0,0 @@
-use std::{collections::BTreeMap, fmt::Write as _};
-
-use api::client::{join_room_by_id_helper, leave_all_rooms, update_avatar_url, update_displayname};
-use conduit::utils;
-use ruma::{
-	events::{
-		room::message::RoomMessageEventContent,
-		tag::{TagEvent, TagEventContent, TagInfo},
-		RoomAccountDataEventType,
-	},
-	OwnedRoomId, OwnedUserId, RoomId,
-};
-use tracing::{error, info, warn};
-
-use crate::{
-	escape_html, get_room_info, services,
-	utils::{parse_active_local_user_id, parse_local_user_id},
-	Result,
-};
-
-const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
-
-pub(crate) async fn list(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	match services().users.list_local_users() {
-		Ok(users) => {
-			let mut plain_msg = format!("Found {} local user account(s):\n```\n", users.len());
-			plain_msg += &users.join("\n");
-			plain_msg += "\n```";
-
-			let mut html_msg = format!("<p>Found {} local user account(s):</p><pre><code>", users.len());
-			html_msg += &users.join("\n");
-			html_msg += "\n</code></pre>";
-			Ok(RoomMessageEventContent::text_html(&plain_msg, &html_msg))
-		},
-		Err(e) => Ok(RoomMessageEventContent::text_plain(e.to_string())),
-	}
-}
-
-pub(crate) async fn create(
-	_body: Vec<&str>, username: String, password: Option<String>,
-) -> Result<RoomMessageEventContent> {
-	// Validate user id
-	let user_id = parse_local_user_id(&username)?;
-
-	if services().users.exists(&user_id)? {
-		return Ok(RoomMessageEventContent::text_plain(format!("Userid {user_id} already exists")));
-	}
-
-	let password = password.unwrap_or_else(|| utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
-
-	// Create user
-	services().users.create(&user_id, Some(password.as_str()))?;
-
-	// Default to pretty displayname
-	let mut displayname = user_id.localpart().to_owned();
-
-	// If `new_user_displayname_suffix` is set, registration will push whatever
-	// content is set to the user's display name with a space before it
-	if !services()
-		.globals
-		.config
-		.new_user_displayname_suffix
-		.is_empty()
-	{
-		write!(displayname, " {}", services().globals.config.new_user_displayname_suffix)
-			.expect("should be able to write to string buffer");
-	}
-
-	services()
-		.users
-		.set_displayname(&user_id, Some(displayname))
-		.await?;
-
-	// Initial account data
-	services().account_data.update(
-		None,
-		&user_id,
-		ruma::events::GlobalAccountDataEventType::PushRules
-			.to_string()
-			.into(),
-		&serde_json::to_value(ruma::events::push_rules::PushRulesEvent {
-			content: ruma::events::push_rules::PushRulesEventContent {
-				global: ruma::push::Ruleset::server_default(&user_id),
-			},
-		})
-		.expect("to json value always works"),
-	)?;
-
-	if !services().globals.config.auto_join_rooms.is_empty() {
-		for room in &services().globals.config.auto_join_rooms {
-			if !services()
-				.rooms
-				.state_cache
-				.server_in_room(services().globals.server_name(), room)?
-			{
-				warn!("Skipping room {room} to automatically join as we have never joined before.");
-				continue;
-			}
-
-			if let Some(room_id_server_name) = room.server_name() {
-				match join_room_by_id_helper(
-					Some(&user_id),
-					room,
-					Some("Automatically joining this room upon registration".to_owned()),
-					&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],
-					None,
-				)
-				.await
-				{
-					Ok(_response) => {
-						info!("Automatically joined room {room} for user {user_id}");
-					},
-					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}");
-					},
-				};
-			}
-		}
-	}
-
-	// we dont add a device since we're not the user, just the creator
-
-	// Inhibit login does not work for guests
-	Ok(RoomMessageEventContent::text_plain(format!(
-		"Created user with user_id: {user_id} and password: `{password}`"
-	)))
-}
-
-pub(crate) async fn deactivate(
-	_body: Vec<&str>, no_leave_rooms: bool, user_id: String,
-) -> Result<RoomMessageEventContent> {
-	// Validate user id
-	let user_id = parse_local_user_id(&user_id)?;
-
-	// don't deactivate the server service account
-	if user_id == services().globals.server_user {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Not allowed to deactivate the server service account.",
-		));
-	}
-
-	services().users.deactivate_account(&user_id)?;
-
-	if !no_leave_rooms {
-		services()
-			.admin
-			.send_message(RoomMessageEventContent::text_plain(format!(
-				"Making {user_id} leave all rooms after deactivation..."
-			)))
-			.await;
-
-		let all_joined_rooms: Vec<OwnedRoomId> = services()
-			.rooms
-			.state_cache
-			.rooms_joined(&user_id)
-			.filter_map(Result::ok)
-			.collect();
-		update_displayname(user_id.clone(), None, all_joined_rooms.clone()).await?;
-		update_avatar_url(user_id.clone(), None, None, all_joined_rooms).await?;
-		leave_all_rooms(&user_id).await;
-	}
-
-	Ok(RoomMessageEventContent::text_plain(format!(
-		"User {user_id} has been deactivated"
-	)))
-}
-
-pub(crate) async fn reset_password(_body: Vec<&str>, username: String) -> Result<RoomMessageEventContent> {
-	let user_id = parse_local_user_id(&username)?;
-
-	if user_id == services().globals.server_user {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Not allowed to set the password for the server account. Please use the emergency password config option.",
-		));
-	}
-
-	let new_password = utils::random_string(AUTO_GEN_PASSWORD_LENGTH);
-
-	match services()
-		.users
-		.set_password(&user_id, Some(new_password.as_str()))
-	{
-		Ok(()) => Ok(RoomMessageEventContent::text_plain(format!(
-			"Successfully reset the password for user {user_id}: `{new_password}`"
-		))),
-		Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
-			"Couldn't reset the password for user {user_id}: {e}"
-		))),
-	}
-}
-
-pub(crate) async fn deactivate_all(
-	body: Vec<&str>, no_leave_rooms: bool, force: bool,
-) -> Result<RoomMessageEventContent> {
-	if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
-		return Ok(RoomMessageEventContent::text_plain(
-			"Expected code block in command body. Add --help for details.",
-		));
-	}
-
-	let usernames = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
-
-	let mut user_ids: Vec<OwnedUserId> = Vec::with_capacity(usernames.len());
-	let mut admins = Vec::new();
-
-	for username in usernames {
-		match parse_active_local_user_id(username) {
-			Ok(user_id) => {
-				if services().users.is_admin(&user_id)? && !force {
-					services()
-						.admin
-						.send_message(RoomMessageEventContent::text_plain(format!(
-							"{username} is an admin and --force is not set, skipping over"
-						)))
-						.await;
-					admins.push(username);
-					continue;
-				}
-
-				// don't deactivate the server service account
-				if user_id == services().globals.server_user {
-					services()
-						.admin
-						.send_message(RoomMessageEventContent::text_plain(format!(
-							"{username} is the server service account, skipping over"
-						)))
-						.await;
-					continue;
-				}
-
-				user_ids.push(user_id);
-			},
-			Err(e) => {
-				services()
-					.admin
-					.send_message(RoomMessageEventContent::text_plain(format!(
-						"{username} is not a valid username, skipping over: {e}"
-					)))
-					.await;
-				continue;
-			},
-		}
-	}
-
-	let mut deactivation_count: usize = 0;
-
-	for user_id in user_ids {
-		match services().users.deactivate_account(&user_id) {
-			Ok(()) => {
-				deactivation_count = deactivation_count.saturating_add(1);
-				if !no_leave_rooms {
-					info!("Forcing user {user_id} to leave all rooms apart of deactivate-all");
-					let all_joined_rooms: Vec<OwnedRoomId> = services()
-						.rooms
-						.state_cache
-						.rooms_joined(&user_id)
-						.filter_map(Result::ok)
-						.collect();
-					update_displayname(user_id.clone(), None, all_joined_rooms.clone()).await?;
-					update_avatar_url(user_id.clone(), None, None, all_joined_rooms).await?;
-					leave_all_rooms(&user_id).await;
-				}
-			},
-			Err(e) => {
-				services()
-					.admin
-					.send_message(RoomMessageEventContent::text_plain(format!("Failed deactivating user: {e}")))
-					.await;
-			},
-		}
-	}
-
-	if admins.is_empty() {
-		Ok(RoomMessageEventContent::text_plain(format!(
-			"Deactivated {deactivation_count} accounts."
-		)))
-	} else {
-		Ok(RoomMessageEventContent::text_plain(format!(
-			"Deactivated {deactivation_count} accounts.\nSkipped admin accounts: {}. Use --force to deactivate admin \
-			 accounts",
-			admins.join(", ")
-		)))
-	}
-}
-
-pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Result<RoomMessageEventContent> {
-	// Validate user id
-	let user_id = parse_local_user_id(&user_id)?;
-
-	let mut rooms: Vec<(OwnedRoomId, u64, String)> = services()
-		.rooms
-		.state_cache
-		.rooms_joined(&user_id)
-		.filter_map(Result::ok)
-		.map(|room_id| get_room_info(&room_id))
-		.collect();
-
-	if rooms.is_empty() {
-		return Ok(RoomMessageEventContent::text_plain("User is not in any rooms."));
-	}
-
-	rooms.sort_by_key(|r| r.1);
-	rooms.reverse();
-
-	let output_plain = format!(
-		"Rooms {user_id} Joined ({}):\n{}",
-		rooms.len(),
-		rooms
-			.iter()
-			.map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}"))
-			.collect::<Vec<_>>()
-			.join("\n")
-	);
-
-	let output_html = format!(
-		"<table><caption>Rooms {user_id} Joined \
-		 ({})</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
-		rooms.len(),
-		rooms
-			.iter()
-			.fold(String::new(), |mut output, (id, members, name)| {
-				writeln!(
-					output,
-					"<tr><td>{}</td>\t<td>{}</td>\t<td>{}</td></tr>",
-					escape_html(id.as_ref()),
-					members,
-					escape_html(name)
-				)
-				.unwrap();
-				output
-			})
-	);
-
-	Ok(RoomMessageEventContent::text_html(output_plain, output_html))
-}
-
-pub(crate) async fn put_room_tag(
-	_body: Vec<&str>, user_id: String, room_id: Box<RoomId>, tag: String,
-) -> Result<RoomMessageEventContent> {
-	let user_id = parse_active_local_user_id(&user_id)?;
-
-	let event = services()
-		.account_data
-		.get(Some(&room_id), &user_id, RoomAccountDataEventType::Tag)?;
-
-	let mut tags_event = event.map_or_else(
-		|| TagEvent {
-			content: TagEventContent {
-				tags: BTreeMap::new(),
-			},
-		},
-		|e| serde_json::from_str(e.get()).expect("Bad account data in database for user {user_id}"),
-	);
-
-	tags_event
-		.content
-		.tags
-		.insert(tag.clone().into(), TagInfo::new());
-
-	services().account_data.update(
-		Some(&room_id),
-		&user_id,
-		RoomAccountDataEventType::Tag,
-		&serde_json::to_value(tags_event).expect("to json value always works"),
-	)?;
-
-	Ok(RoomMessageEventContent::text_plain(format!(
-		"Successfully updated room account data for {user_id} and room {room_id} with tag {tag}"
-	)))
-}
-
-pub(crate) async fn delete_room_tag(
-	_body: Vec<&str>, user_id: String, room_id: Box<RoomId>, tag: String,
-) -> Result<RoomMessageEventContent> {
-	let user_id = parse_active_local_user_id(&user_id)?;
-
-	let event = services()
-		.account_data
-		.get(Some(&room_id), &user_id, RoomAccountDataEventType::Tag)?;
-
-	let mut tags_event = event.map_or_else(
-		|| TagEvent {
-			content: TagEventContent {
-				tags: BTreeMap::new(),
-			},
-		},
-		|e| serde_json::from_str(e.get()).expect("Bad account data in database for user {user_id}"),
-	);
-
-	tags_event.content.tags.remove(&tag.clone().into());
-
-	services().account_data.update(
-		Some(&room_id),
-		&user_id,
-		RoomAccountDataEventType::Tag,
-		&serde_json::to_value(tags_event).expect("to json value always works"),
-	)?;
-
-	Ok(RoomMessageEventContent::text_plain(format!(
-		"Successfully updated room account data for {user_id} and room {room_id}, deleting room tag {tag}"
-	)))
-}
-
-pub(crate) async fn get_room_tags(
-	_body: Vec<&str>, user_id: String, room_id: Box<RoomId>,
-) -> Result<RoomMessageEventContent> {
-	let user_id = parse_active_local_user_id(&user_id)?;
-
-	let event = services()
-		.account_data
-		.get(Some(&room_id), &user_id, RoomAccountDataEventType::Tag)?;
-
-	let tags_event = event.map_or_else(
-		|| TagEvent {
-			content: TagEventContent {
-				tags: BTreeMap::new(),
-			},
-		},
-		|e| serde_json::from_str(e.get()).expect("Bad account data in database for user {user_id}"),
-	);
-
-	Ok(RoomMessageEventContent::text_html(
-		format!("<pre><code>\n{:?}\n</code></pre>", tags_event.content.tags),
-		format!("```\n{:?}\n```", tags_event.content.tags),
-	))
-}
@@ -1,64 +0,0 @@
-pub(crate) use conduit::utils::HtmlEscape;
-use conduit_core::Error;
-use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId};
-use service::user_is_local;
-
-use crate::{services, Result};
-
-pub(crate) fn escape_html(s: &str) -> String {
-	s.replace('&', "&amp;")
-		.replace('<', "&lt;")
-		.replace('>', "&gt;")
-}
-
-pub(crate) fn get_room_info(id: &RoomId) -> (OwnedRoomId, u64, String) {
-	(
-		id.into(),
-		services()
-			.rooms
-			.state_cache
-			.room_joined_count(id)
-			.ok()
-			.flatten()
-			.unwrap_or(0),
-		services()
-			.rooms
-			.state_accessor
-			.get_name(id)
-			.ok()
-			.flatten()
-			.unwrap_or_else(|| id.to_string()),
-	)
-}
-
-/// Parses user ID
-pub(crate) fn parse_user_id(user_id: &str) -> Result<OwnedUserId> {
-	UserId::parse_with_server_name(user_id.to_lowercase(), services().globals.server_name())
-		.map_err(|e| Error::Err(format!("The supplied username is not a valid username: {e}")))
-}
-
-/// Parses user ID as our local user
-pub(crate) fn parse_local_user_id(user_id: &str) -> Result<OwnedUserId> {
-	let user_id = parse_user_id(user_id)?;
-
-	if !user_is_local(&user_id) {
-		return Err(Error::Err(String::from("User does not belong to our server.")));
-	}
-
-	Ok(user_id)
-}
-
-/// Parses user ID that is an active (not guest or deactivated) local user
-pub(crate) fn parse_active_local_user_id(user_id: &str) -> Result<OwnedUserId> {
-	let user_id = parse_local_user_id(user_id)?;
-
-	if !services().users.exists(&user_id)? {
-		return Err(Error::Err(String::from("User does not exist on this server.")));
-	}
-
-	if services().users.is_deactivated(&user_id)? {
-		return Err(Error::Err(String::from("User is deactivated.")));
-	}
-
-	Ok(user_id)
-}
@@ -0,0 +1,7 @@
+//! Default allocator with no special features
+
+/// Always returns the empty string
+pub(crate) fn memory_stats() -> String { Default::default() }
+
+/// Always returns the empty string
+pub(crate) fn memory_usage() -> String { Default::default() }
@@ -0,0 +1,8 @@
+#[global_allocator]
+static HMALLOC: hardened_malloc_rs::HardenedMalloc = hardened_malloc_rs::HardenedMalloc;
+
+pub(crate) fn memory_usage() -> String {
+	String::default() //TODO: get usage
+}
+
+pub(crate) fn memory_stats() -> String { "Extended statistics are not available from hardened_malloc.".to_owned() }
@@ -7,8 +7,7 @@ use tikv_jemallocator as jemalloc;
 #[global_allocator]
 static JEMALLOC: jemalloc::Jemalloc = jemalloc::Jemalloc;

-#[must_use]
-pub fn memory_usage() -> String {
+pub(crate) fn memory_usage() -> String {
 	use mallctl::stats;
 	let allocated = stats::allocated::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
 	let active = stats::active::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
@@ -22,18 +21,14 @@ pub fn memory_usage() -> String {
 	)
 }

-#[must_use]
-pub fn memory_stats() -> String {
+pub(crate) fn memory_stats() -> String {
 	const MAX_LENGTH: usize = 65536 - 4096;

 	let opts_s = "d";
 	let mut str = String::new();

 	let opaque = std::ptr::from_mut(&mut str).cast::<c_void>();
-	let opts_p: *const c_char = std::ffi::CString::new(opts_s)
-		.expect("cstring")
-		.into_raw()
-		.cast_const();
+	let opts_p: *const c_char = std::ffi::CString::new(opts_s).expect("cstring").into_raw() as *const c_char;

 	// SAFETY: calls malloc_stats_print() with our string instance which must remain
 	// in this frame. https://docs.rs/tikv-jemalloc-sys/latest/tikv_jemalloc_sys/fn.malloc_stats_print.html
@@ -2,24 +2,24 @@

 // jemalloc
 #[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
-pub mod je;
+mod je;
 #[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
-pub use je::{memory_stats, memory_usage};
+pub(crate) use je::{memory_stats, memory_usage};

 // hardened_malloc
 #[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
-pub mod hardened;
+mod hardened;
 #[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
-pub use hardened::{memory_stats, memory_usage};
+pub(crate) use hardened::{memory_stats, memory_usage};

 // default, enabled when none or multiple of the above are enabled
 #[cfg(any(
 	not(any(feature = "jemalloc", feature = "hardened_malloc")),
 	all(feature = "jemalloc", feature = "hardened_malloc"),
 ))]
-pub mod default;
+mod default;
 #[cfg(any(
 	not(any(feature = "jemalloc", feature = "hardened_malloc")),
 	all(feature = "jemalloc", feature = "hardened_malloc"),
 ))]
-pub use default::{memory_stats, memory_usage};
+pub(crate) use default::{memory_stats, memory_usage};
@@ -1,65 +0,0 @@
-[package]
-name = "conduit_api"
-categories.workspace = true
-description.workspace = true
-edition.workspace = true
-keywords.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
-version.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-element_hacks = []
-dev_release_log_level = []
-release_max_log_level = [
-	"tracing/max_level_trace",
-	"tracing/release_max_level_info",
-	"log/max_level_trace",
-	"log/release_max_level_info",
-]
-gzip_compression = [
-	"reqwest/gzip",
-]
-brotli_compression = [
-	"reqwest/brotli",
-]
-
-[dependencies]
-axum-client-ip.workspace = true
-axum-extra.workspace = true
-axum.workspace = true
-base64.workspace = true
-bytes.workspace = true
-conduit-core.workspace = true
-conduit-database.workspace = true
-conduit-service.workspace = true
-futures-util.workspace = true
-hmac.workspace = true
-http.workspace = true
-hyper.workspace = true
-image.workspace = true
-ipaddress.workspace = true
-jsonwebtoken.workspace = true
-log.workspace = true
-rand.workspace = true
-reqwest.workspace = true
-ruma.workspace = true
-serde_html_form.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-sha-1.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-tracing.workspace = true
-webpage.workspace = true
-
-[lints]
-workspace = true
@@ -1,83 +0,0 @@
-pub(super) mod account;
-pub(super) mod alias;
-pub(super) mod backup;
-pub(super) mod capabilities;
-pub(super) mod config;
-pub(super) mod context;
-pub(super) mod device;
-pub(super) mod directory;
-pub(super) mod filter;
-pub(super) mod keys;
-pub(super) mod media;
-pub(super) mod membership;
-pub(super) mod message;
-pub(super) mod presence;
-pub(super) mod profile;
-pub(super) mod push;
-pub(super) mod read_marker;
-pub(super) mod redact;
-pub(super) mod relations;
-pub(super) mod report;
-pub(super) mod room;
-pub(super) mod search;
-pub(super) mod session;
-pub(super) mod space;
-pub(super) mod state;
-pub(super) mod sync;
-pub(super) mod tag;
-pub(super) mod thirdparty;
-pub(super) mod threads;
-pub(super) mod to_device;
-pub(super) mod typing;
-pub(super) mod unstable;
-pub(super) mod unversioned;
-pub(super) mod user_directory;
-pub(super) mod voip;
-
-pub(super) use account::*;
-pub use alias::get_alias_helper;
-pub(super) use alias::*;
-pub(super) use backup::*;
-pub(super) use capabilities::*;
-pub(super) use config::*;
-pub(super) use context::*;
-pub(super) use device::*;
-pub(super) use directory::*;
-pub(super) use filter::*;
-pub(super) use keys::*;
-pub(super) use media::*;
-pub(super) use membership::*;
-pub use membership::{join_room_by_id_helper, leave_all_rooms, leave_room, validate_and_add_event_id};
-pub(super) use message::*;
-pub(super) use presence::*;
-pub(super) use profile::*;
-pub use profile::{update_all_rooms, update_avatar_url, update_displayname};
-pub(super) use push::*;
-pub(super) use read_marker::*;
-pub(super) use redact::*;
-pub(super) use relations::*;
-pub(super) use report::*;
-pub(super) use room::*;
-pub(super) use search::*;
-pub(super) use session::*;
-pub(super) use space::*;
-pub(super) use state::*;
-pub(super) use sync::*;
-pub(super) use tag::*;
-pub(super) use thirdparty::*;
-pub(super) use threads::*;
-pub(super) use to_device::*;
-pub(super) use typing::*;
-pub(super) use unstable::*;
-pub(super) use unversioned::*;
-pub(super) use user_directory::*;
-pub(super) use voip::*;
-
-/// generated device ID length
-const DEVICE_ID_LENGTH: usize = 10;
-
-/// generated user access token length
-const TOKEN_LENGTH: usize = 32;
-
-/// generated user session ID length
-const SESSION_ID_LENGTH: usize = service::uiaa::SESSION_ID_LENGTH;
@@ -1,12 +1,10 @@
-use std::fmt::Write;
+use std::fmt::Write as _;

-use axum_client_ip::InsecureClientIp;
-use conduit::debug_info;
 use register::RegistrationKind;
 use ruma::{
 	api::client::{
 		account::{
-			change_password, check_registration_token_validity, deactivate, get_3pids, get_username_availability,
+			change_password, deactivate, get_3pids, get_username_availability,
 			register::{self, LoginType},
 			request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn, whoami,
 			ThirdPartyIdRemovalStatus,
@@ -15,15 +13,15 @@ use ruma::{
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
 	},
 	events::{room::message::RoomMessageEventContent, GlobalAccountDataEventType},
-	push, OwnedRoomId, UserId,
+	push, UserId,
 };
 use tracing::{error, info, warn};

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

@@ -40,9 +38,8 @@ const RANDOM_USER_ID_LENGTH: usize = 10;
 ///
 /// Note: This will not reserve the username, so the username might become
 /// invalid when trying to register
-#[tracing::instrument(skip_all, fields(%client_ip))]
 pub(crate) async fn get_register_available_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<get_username_availability::v3::Request>,
+	body: Ruma<get_username_availability::v3::Request>,
 ) -> Result<get_username_availability::v3::Response> {
 	// Validate user id
 	let user_id = UserId::parse_with_server_name(body.username.to_lowercase(), services().globals.server_name())
@@ -89,10 +86,7 @@ pub(crate) async fn get_register_available_route(
 /// - If `inhibit_login` is false: Creates a device and returns device id and
 ///   access_token
 #[allow(clippy::doc_markdown)]
-#[tracing::instrument(skip_all, fields(%client_ip))]
-pub(crate) async fn register_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<register::v3::Request>,
-) -> Result<register::v3::Response> {
+pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
 	if !services().globals.allow_registration() && body.appservice_info.is_none() {
 		info!(
 			"Registration disabled and request not from known appservice, rejecting registration attempt for username \
@@ -109,8 +103,8 @@ pub(crate) async fn register_route(
 			|| (services().globals.allow_registration() && services().globals.config.registration_token.is_some()))
 	{
 		info!(
-			"Guest registration disabled / registration enabled with token configured, rejecting guest registration \
-			 attempt, initial device name: {:?}",
+			"Guest registration disabled / registration enabled with token configured, rejecting guest registration, \
+			 initial device name: {:?}",
 			body.initial_device_display_name
 		);
 		return Err(Error::BadRequest(
@@ -178,7 +172,8 @@ pub(crate) async fn register_route(

 	// UIAA
 	let mut uiaainfo;
-	let skip_auth = if services().globals.config.registration_token.is_some() {
+	let skip_auth;
+	if services().globals.config.registration_token.is_some() {
 		// Registration token required
 		uiaainfo = UiaaInfo {
 			flows: vec![AuthFlow {
@@ -189,7 +184,7 @@ pub(crate) async fn register_route(
 			session: None,
 			auth_error: None,
 		};
-		body.appservice_info.is_some()
+		skip_auth = body.appservice_info.is_some();
 	} else {
 		// No registration token necessary, but clients must still go through the flow
 		uiaainfo = UiaaInfo {
@@ -201,8 +196,8 @@ pub(crate) async fn register_route(
 			session: None,
 			auth_error: None,
 		};
-		body.appservice_info.is_some() || is_guest
-	};
+		skip_auth = body.appservice_info.is_some() || is_guest;
+	}

 	if !skip_auth {
 		if let Some(auth) = &body.auth {
@@ -245,8 +240,7 @@ pub(crate) async fn register_route(
 	// If `new_user_displayname_suffix` is set, registration will push whatever
 	// content is set to the user's display name with a space before it
 	if !services().globals.new_user_displayname_suffix().is_empty() {
-		write!(displayname, " {}", services().globals.config.new_user_displayname_suffix)
-			.expect("should be able to write to string buffer");
+		_ = write!(displayname, " {}", services().globals.config.new_user_displayname_suffix);
 	}

 	services()
@@ -294,23 +288,20 @@ pub(crate) async fn register_route(
 		.users
 		.create_device(&user_id, &device_id, &token, body.initial_device_display_name.clone())?;

-	debug_info!(%user_id, %device_id, "User account was created");
+	info!("New user \"{}\" registered on this server.", user_id);

 	// log in conduit admin channel if a non-guest user registered
 	if body.appservice_info.is_none() && !is_guest {
-		info!("New user \"{user_id}\" registered on this server.");
 		services()
 			.admin
 			.send_message(RoomMessageEventContent::notice_plain(format!(
-				"New user \"{user_id}\" registered on this server from IP {client_ip}."
+				"New user \"{user_id}\" registered on this server."
 			)))
 			.await;
 	}

 	// log in conduit admin channel if a guest registered
 	if body.appservice_info.is_none() && is_guest && services().globals.log_guest_registrations() {
-		info!("New guest user \"{user_id}\" registered on this server from IP.");
-
 		if let Some(device_display_name) = &body.initial_device_display_name {
 			if body
 				.initial_device_display_name
@@ -321,15 +312,14 @@ pub(crate) async fn register_route(
 					.admin
 					.send_message(RoomMessageEventContent::notice_plain(format!(
 						"Guest user \"{user_id}\" with device display name `{device_display_name}` registered on this \
-						 server from IP {client_ip}."
+						 server."
 					)))
 					.await;
 			} else {
 				services()
 					.admin
 					.send_message(RoomMessageEventContent::notice_plain(format!(
-						"Guest user \"{user_id}\" with no device display name registered on this server from IP \
-						 {client_ip}.",
+						"Guest user \"{user_id}\" with no device display name registered on this server.",
 					)))
 					.await;
 			}
@@ -337,8 +327,7 @@ pub(crate) async fn register_route(
 			services()
 				.admin
 				.send_message(RoomMessageEventContent::notice_plain(format!(
-					"Guest user \"{user_id}\" with no device display name registered on this server from IP \
-					 {client_ip}.",
+					"Guest user \"{user_id}\" with no device display name registered on this server.",
 				)))
 				.await;
 		}
@@ -347,7 +336,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, @conduit:servername, is generated first
 	if !is_guest {
-		if let Some(admin_room) = service::admin::Service::get_admin_room()? {
+		if let Some(admin_room) = service::admin::Service::get_admin_room().await? {
 			if services()
 				.rooms
 				.state_cache
@@ -359,7 +348,7 @@ pub(crate) async fn register_route(
 					.make_user_admin(&user_id, displayname)
 					.await?;

-				warn!("Granting {user_id} admin privileges as the first user");
+				warn!("Granting {} admin privileges as the first user", user_id);
 			}
 		}
 	}
@@ -423,9 +412,8 @@ pub(crate) async fn register_route(
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[tracing::instrument(skip_all, fields(%client_ip))]
 pub(crate) async fn change_password_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<change_password::v3::Request>,
+	body: Ruma<change_password::v3::Request>,
 ) -> Result<change_password::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
@@ -474,7 +462,7 @@ pub(crate) async fn change_password_route(
 		}
 	}

-	info!("User {sender_user} changed their password.");
+	info!("User {} changed their password.", sender_user);
 	services()
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
@@ -512,10 +500,7 @@ pub(crate) async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoa
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-#[tracing::instrument(skip_all, fields(%client_ip))]
-pub(crate) async fn deactivate_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<deactivate::v3::Request>,
-) -> Result<deactivate::v3::Response> {
+pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Result<deactivate::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");

@@ -547,23 +532,13 @@ pub(crate) async fn deactivate_route(
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}

+	// Make the user leave all rooms before deactivation
+	client_server::leave_all_rooms(sender_user).await;
+
 	// Remove devices and mark account as deactivated
 	services().users.deactivate_account(sender_user)?;

-	// Remove profile pictures and display name
-	let all_joined_rooms: Vec<OwnedRoomId> = services()
-		.rooms
-		.state_cache
-		.rooms_joined(sender_user)
-		.filter_map(Result::ok)
-		.collect();
-	super::update_displayname(sender_user.clone(), None, all_joined_rooms.clone()).await?;
-	super::update_avatar_url(sender_user.clone(), None, None, all_joined_rooms).await?;
-
-	// Make the user leave all rooms before deactivation
-	super::leave_all_rooms(sender_user).await;
-
-	info!("User {sender_user} deactivated their account.");
+	info!("User {} deactivated their account.", sender_user);
 	services()
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
@@ -618,24 +593,3 @@ pub(crate) async fn request_3pid_management_token_via_msisdn_route(
 		"Third party identifier is not allowed",
 	))
 }
-
-/// # `GET /_matrix/client/v1/register/m.login.registration_token/validity`
-///
-/// Checks if the provided registration token is valid at the time of checking
-///
-/// Currently does not have any ratelimiting, and this isn't very practical as
-/// there is only one registration token allowed.
-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.config.registration_token.clone() else {
-		return Err(Error::BadRequest(
-			ErrorKind::forbidden(),
-			"Server does not allow token registration.",
-		));
-	};
-
-	Ok(check_registration_token_validity::v1::Response {
-		valid: reg_token == body.token,
-	})
-}
@@ -8,22 +8,19 @@ use ruma::{
 		},
 		federation,
 	},
-	OwnedRoomAliasId, OwnedServerName, RoomAliasId, RoomId,
+	OwnedRoomAliasId, OwnedRoomId, OwnedServerName,
 };
 use tracing::debug;

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

 /// # `PUT /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
 pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) -> Result<create_alias::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-
 	alias_checks(&body.room_alias, &body.appservice_info).await?;

 	// this isn't apart of alias_checks or delete alias route because we should
@@ -45,10 +42,17 @@ pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) ->
 		return Err(Error::Conflict("Alias already exists."));
 	}

-	services()
+	if services()
 		.rooms
 		.alias
-		.set_alias(&body.room_alias, &body.room_id, sender_user)?;
+		.set_alias(&body.room_alias, &body.room_id)
+		.is_err()
+	{
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Invalid room alias. Alias must be in the form of '#localpart:server_name'",
+		));
+	};

 	Ok(create_alias::v3::Response::new())
 }
@@ -57,10 +61,9 @@ pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) ->
 ///
 /// Deletes a room alias from this server.
 ///
+/// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
 pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-
 	alias_checks(&body.room_alias, &body.appservice_info).await?;

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

-	services()
+	if services()
 		.rooms
 		.alias
-		.remove_alias(&body.room_alias, sender_user)
-		.await?;
+		.remove_alias(&body.room_alias)
+		.is_err()
+	{
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Invalid room alias. Alias must be in the form of '#localpart:server_name'",
+		));
+	};

 	// TODO: update alt_aliases?

@@ -90,7 +99,7 @@ pub(crate) async fn get_alias_route(body: Ruma<get_alias::v3::Request>) -> Resul
 	get_alias_helper(body.body.room_alias, None).await
 }

-pub async fn get_alias_helper(
+pub(crate) async fn get_alias_helper(
 	room_alias: OwnedRoomAliasId, servers: Option<Vec<OwnedServerName>>,
 ) -> Result<get_alias::v3::Response> {
 	debug!("get_alias_helper servers: {servers:?}");
@@ -110,7 +119,7 @@ pub async fn get_alias_helper(
 			)
 			.await;

-		debug!("room alias server_name get_alias_helper response: {response:?}");
+		debug_info!("room alias server_name get_alias_helper response: {response:?}");

 		if let Err(ref e) = response {
 			debug_info!(
@@ -131,7 +140,7 @@ pub async fn get_alias_helper(
 							},
 						)
 						.await;
-					debug!("Got response from server {server} for room aliases: {response:?}");
+					debug_info!("Got response from server {server} for room aliases: {response:?}");

 					if let Ok(ref response) = response {
 						if !response.servers.is_empty() {
@@ -153,7 +162,7 @@ pub async fn get_alias_helper(
 			pre_servers.push(room_alias.server_name().into());

 			let servers = room_available_servers(&room_id, &room_alias, &Some(pre_servers));
-			debug!(
+			debug_warn!(
 				"room alias servers from federation response for room ID {room_id} and room alias {room_alias}: \
 				 {servers:?}"
 			);
@@ -204,13 +213,13 @@ pub async fn get_alias_helper(

 	let servers = room_available_servers(&room_id, &room_alias, &None);

-	debug!("room alias servers for room ID {room_id} and room alias {room_alias}");
+	debug_warn!("room alias servers for room ID {room_id} and room alias {room_alias}");

 	Ok(get_alias::v3::Response::new(room_id, servers))
 }

 fn room_available_servers(
-	room_id: &RoomId, room_alias: &RoomAliasId, pre_servers: &Option<Vec<OwnedServerName>>,
+	room_id: &OwnedRoomId, room_alias: &OwnedRoomAliasId, pre_servers: &Option<Vec<OwnedServerName>>,
 ) -> Vec<OwnedServerName> {
 	// find active servers in room state cache to suggest
 	let mut servers: Vec<OwnedServerName> = services()
@@ -238,20 +247,20 @@ fn room_available_servers(
 		.iter()
 		.position(|server_name| server_is_ours(server_name))
 	{
-		servers.swap_remove(server_index);
+		servers.remove(server_index);
 		servers.insert(0, services().globals.server_name().to_owned());
 	} else if let Some(alias_server_index) = servers
 		.iter()
 		.position(|server| server == room_alias.server_name())
 	{
-		servers.swap_remove(alias_server_index);
+		servers.remove(alias_server_index);
 		servers.insert(0, room_alias.server_name().into());
 	}

 	servers
 }

-async fn alias_checks(room_alias: &RoomAliasId, appservice_info: &Option<RegistrationInfo>) -> Result<()> {
+async fn alias_checks(room_alias: &OwnedRoomAliasId, appservice_info: &Option<RegistrationInfo>) -> Result<()> {
 	if !server_is_ours(room_alias.server_name()) {
 		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
 	}
@@ -163,7 +163,7 @@ pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> R
 		.map(|(_, pdu)| pdu.to_room_event())
 		.collect();

-	let mut state = Vec::with_capacity(state_ids.len());
+	let mut state = Vec::new();

 	for (shortstatekey, id) in state_ids {
 		let (event_type, state_key) = services()
@@ -1,4 +1,3 @@
-use axum_client_ip::InsecureClientIp;
 use ruma::{
 	api::{
 		client::{
@@ -12,8 +11,12 @@ use ruma::{
 	events::{
 		room::{
 			avatar::RoomAvatarEventContent,
+			canonical_alias::RoomCanonicalAliasEventContent,
 			create::RoomCreateEventContent,
+			guest_access::{GuestAccess, RoomGuestAccessEventContent},
+			history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
 			join_rules::{JoinRule, RoomJoinRulesEventContent},
+			topic::RoomTopicEventContent,
 		},
 		StateEventType,
 	},
@@ -21,16 +24,15 @@ use ruma::{
 };
 use tracing::{error, info, warn};

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

 /// # `POST /_matrix/client/v3/publicRooms`
 ///
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[tracing::instrument(skip_all, fields(%client_ip))]
 pub(crate) async fn get_public_rooms_filtered_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<get_public_rooms_filtered::v3::Request>,
+	body: Ruma<get_public_rooms_filtered::v3::Request>,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
 	if let Some(server) = &body.server {
 		if services()
@@ -54,8 +56,8 @@ pub(crate) async fn get_public_rooms_filtered_route(
 	)
 	.await
 	.map_err(|e| {
-		warn!(?body.server, "Failed to return /publicRooms: {e}");
-		Error::BadRequest(ErrorKind::Unknown, "Failed to return the requested server's public room list.")
+		warn!("Failed to return our /publicRooms: {e}");
+		Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list.")
 	})?;

 	Ok(response)
@@ -66,9 +68,8 @@ pub(crate) async fn get_public_rooms_filtered_route(
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[tracing::instrument(skip_all, fields(%client_ip))]
 pub(crate) async fn get_public_rooms_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<get_public_rooms::v3::Request>,
+	body: Ruma<get_public_rooms::v3::Request>,
 ) -> Result<get_public_rooms::v3::Response> {
 	if let Some(server) = &body.server {
 		if services()
@@ -92,8 +93,8 @@ pub(crate) async fn get_public_rooms_route(
 	)
 	.await
 	.map_err(|e| {
-		warn!(?body.server, "Failed to return /publicRooms: {e}");
-		Error::BadRequest(ErrorKind::Unknown, "Failed to return the requested server's public room list.")
+		warn!("Failed to return our /publicRooms: {e}");
+		Error::BadRequest(ErrorKind::Unknown, "Failed to return this server's public room list.")
 	})?;

 	Ok(get_public_rooms::v3::Response {
@@ -109,9 +110,8 @@ pub(crate) async fn get_public_rooms_route(
 /// Sets the visibility of a given room in the room directory.
 ///
 /// - TODO: Access control checks
-#[tracing::instrument(skip_all, fields(%client_ip))]
 pub(crate) async fn set_room_visibility_route(
-	InsecureClientIp(client_ip): InsecureClientIp, body: Ruma<set_room_visibility::v3::Request>,
+	body: Ruma<set_room_visibility::v3::Request>,
 ) -> Result<set_room_visibility::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");

@@ -231,7 +231,12 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 				canonical_alias: services()
 					.rooms
 					.state_accessor
-					.get_canonical_alias(&room_id)?,
+					.room_state_get(&room_id, &StateEventType::RoomCanonicalAlias, "")?
+					.map_or(Ok(None), |s| {
+						serde_json::from_str(s.content.get())
+							.map(|c: RoomCanonicalAliasEventContent| c.alias)
+							.map_err(|_| Error::bad_database("Invalid canonical alias event in database."))
+					})?,
 				name: services().rooms.state_accessor.get_name(&room_id)?,
 				num_joined_members: services()
 					.rooms
@@ -246,13 +251,40 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 				topic: services()
 					.rooms
 					.state_accessor
-					.get_room_topic(&room_id)
+					.room_state_get(&room_id, &StateEventType::RoomTopic, "")?
+					.map_or(Ok(None), |s| {
+						serde_json::from_str(s.content.get())
+							.map(|c: RoomTopicEventContent| Some(c.topic))
+							.map_err(|e| {
+								error!("Invalid room topic event in database for room {room_id}: {e}");
+								Error::bad_database("Invalid room topic event in database.")
+							})
+					})
 					.unwrap_or(None),
-				world_readable: services().rooms.state_accessor.is_world_readable(&room_id)?,
+				world_readable: services()
+					.rooms
+					.state_accessor
+					.room_state_get(&room_id, &StateEventType::RoomHistoryVisibility, "")?
+					.map_or(Ok(false), |s| {
+						serde_json::from_str(s.content.get())
+							.map(|c: RoomHistoryVisibilityEventContent| {
+								c.history_visibility == HistoryVisibility::WorldReadable
+							})
+                            .map_err(|e| {
+                                error!(
+                                    "Invalid room history visibility event in database for room {room_id}, assuming is \"shared\": {e}",
+                                );
+                                Error::bad_database("Invalid room history visibility event in database.")
+                            })}).unwrap_or(false),
 				guest_can_join: services()
 					.rooms
 					.state_accessor
-					.guest_can_join(&room_id)?,
+					.room_state_get(&room_id, &StateEventType::RoomGuestAccess, "")?
+					.map_or(Ok(false), |s| {
+						serde_json::from_str(s.content.get())
+							.map(|c: RoomGuestAccessEventContent| c.guest_access == GuestAccess::CanJoin)
+							.map_err(|_| Error::bad_database("Invalid room guest access event in database."))
+					})?,
 				avatar_url: services()
 					.rooms
 					.state_accessor
@@ -22,9 +22,8 @@ use tracing::debug;

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

@@ -248,7 +247,7 @@ pub(crate) async fn get_key_changes_route(
 	})
 }

-pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool + Send>(
+pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 	sender_user: Option<&UserId>, device_keys_input: &BTreeMap<OwnedUserId, Vec<OwnedDeviceId>>, allowed_signatures: F,
 	include_display_names: bool,
 ) -> Result<get_keys::v3::Response> {
@@ -15,14 +15,12 @@ use webpage::HTML;

 use crate::{
 	debug_warn,
-	service::{
-		media::{FileMeta, UrlPreviewData},
-		server_is_ours,
-	},
+	service::media::{FileMeta, UrlPreviewData},
 	services,
 	utils::{
 		self,
 		content_disposition::{content_disposition_type, make_content_disposition, sanitise_filename},
+		server_name::server_is_ours,
 	},
 	Error, Result, Ruma, RumaResponse,
 };
@@ -139,7 +137,7 @@ pub(crate) async fn create_content_route(
 				.map(|filename| {
 					format!(
 						"{}; filename={}",
-						content_disposition_type(&body.content_type),
+						content_disposition_type(&body.file, &body.content_type),
 						sanitise_filename(filename.to_owned())
 					)
 				})
@@ -149,8 +147,10 @@ pub(crate) async fn create_content_route(
 		)
 		.await?;

+	let content_uri = mxc.into();
+
 	Ok(create_content::v3::Response {
-		content_uri: mxc.into(),
+		content_uri,
 		blurhash: None,
 	})
 }
@@ -188,7 +188,7 @@ pub(crate) async fn get_content_route(body: Ruma<get_content::v3::Request>) -> R
 		content_disposition,
 	}) = services().media.get(mxc.clone()).await?
 	{
-		let content_disposition = Some(make_content_disposition(&content_type, content_disposition, None));
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content::v3::Response {
 			file,
@@ -212,9 +212,9 @@ pub(crate) async fn get_content_route(body: Ruma<get_content::v3::Request>) -> R
 		})?;

 		let content_disposition = Some(make_content_disposition(
+			&response.file,
 			&response.content_type,
 			response.content_disposition,
-			None,
 		));

 		Ok(get_content::v3::Response {
@@ -266,11 +266,7 @@ pub(crate) async fn get_content_as_filename_route(
 		content_disposition,
 	}) = services().media.get(mxc.clone()).await?
 	{
-		let content_disposition = Some(make_content_disposition(
-			&content_type,
-			content_disposition,
-			Some(body.filename.clone()),
-		));
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content_as_filename::v3::Response {
 			file,
@@ -291,9 +287,9 @@ pub(crate) async fn get_content_as_filename_route(
 		{
 			Ok(remote_content_response) => {
 				let content_disposition = Some(make_content_disposition(
+					&remote_content_response.file,
 					&remote_content_response.content_type,
 					remote_content_response.content_disposition,
-					None,
 				));

 				Ok(get_content_as_filename::v3::Response {
@@ -362,7 +358,7 @@ pub(crate) async fn get_content_thumbnail_route(
 		)
 		.await?
 	{
-		let content_disposition = Some(make_content_disposition(&content_type, content_disposition, None));
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content_thumbnail::v3::Response {
 			file,
@@ -375,7 +371,7 @@ pub(crate) async fn get_content_thumbnail_route(
 		if services()
 			.globals
 			.prevent_media_downloads_from()
-			.contains(&body.server_name)
+			.contains(&body.server_name.clone())
 		{
 			// we'll lie to the client and say the blocked server's media was not found and
 			// log. the client has no way of telling anyways so this is a security bonus.
@@ -415,9 +411,9 @@ pub(crate) async fn get_content_thumbnail_route(
 					.await?;

 				let content_disposition = Some(make_content_disposition(
+					&get_thumbnail_response.file,
 					&get_thumbnail_response.content_type,
 					get_thumbnail_response.content_disposition,
-					None,
 				));

 				Ok(get_content_thumbnail::v3::Response {
@@ -485,9 +481,9 @@ async fn get_remote_content(
 		.await?;

 	let content_disposition = Some(make_content_disposition(
+		&content_response.file,
 		&content_response.content_type,
 		content_response.content_disposition,
-		None,
 	));

 	services()
@@ -3,7 +3,6 @@ use std::{
 	sync::Arc,
 };

-use conduit::PduCount;
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -15,7 +14,10 @@ use ruma::{
 };
 use serde_json::{from_str, Value};

-use crate::{service::pdu::PduBuilder, services, utils, Error, PduEvent, Result, Ruma};
+use crate::{
+	service::{pdu::PduBuilder, rooms::timeline::PduCount},
+	services, utils, Error, PduEvent, Result, Ruma,
+};

 /// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
@@ -0,0 +1,83 @@
+mod account;
+mod alias;
+mod backup;
+mod capabilities;
+mod config;
+mod context;
+mod device;
+mod directory;
+mod filter;
+mod keys;
+mod media;
+mod membership;
+mod message;
+mod presence;
+mod profile;
+mod push;
+mod read_marker;
+mod redact;
+mod relations;
+mod report;
+mod room;
+mod search;
+mod session;
+mod space;
+mod state;
+mod sync;
+mod tag;
+mod thirdparty;
+mod threads;
+mod to_device;
+mod typing;
+mod unstable;
+mod unversioned;
+mod user_directory;
+mod voip;
+
+pub(crate) use account::*;
+pub(crate) use alias::*;
+pub(crate) use backup::*;
+pub(crate) use capabilities::*;
+pub(crate) use config::*;
+pub(crate) use context::*;
+pub(crate) use device::*;
+pub(crate) use directory::*;
+pub(crate) use filter::*;
+pub(crate) use keys::*;
+pub(crate) use media::*;
+pub(crate) use membership::*;
+pub(crate) use message::*;
+pub(crate) use presence::*;
+pub(crate) use profile::*;
+pub(crate) use push::*;
+pub(crate) use read_marker::*;
+pub(crate) use redact::*;
+pub(crate) use relations::*;
+pub(crate) use report::*;
+pub(crate) use room::*;
+pub(crate) use search::*;
+pub(crate) use session::*;
+pub(crate) use space::*;
+pub(crate) use state::*;
+pub(crate) use sync::*;
+pub(crate) use tag::*;
+pub(crate) use thirdparty::*;
+pub(crate) use threads::*;
+pub(crate) use to_device::*;
+pub(crate) use typing::*;
+pub(crate) use unstable::*;
+pub(crate) use unversioned::*;
+pub(crate) use user_directory::*;
+pub(crate) use voip::*;
+
+/// generated device ID length
+const DEVICE_ID_LENGTH: usize = 10;
+
+/// generated user access token length
+const TOKEN_LENGTH: usize = 32;
+
+/// generated user session ID length
+pub(crate) const SESSION_ID_LENGTH: usize = 32;
+
+/// auto-generated password length
+pub(crate) const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
@@ -10,15 +10,10 @@ use ruma::{
 	},
 	events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType},
 	presence::PresenceState,
-	OwnedMxcUri, OwnedRoomId, OwnedUserId,
 };
 use serde_json::value::to_raw_value;
-use tracing::warn;

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

 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
@@ -29,14 +24,67 @@ pub(crate) async fn set_displayname_route(
 	body: Ruma<set_display_name::v3::Request>,
 ) -> Result<set_display_name::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-	let all_joined_rooms: Vec<OwnedRoomId> = services()
+
+	services()
+		.users
+		.set_displayname(sender_user, body.displayname.clone())
+		.await?;
+
+	// Send a new membership event and presence update into all joined rooms
+	let all_rooms_joined: Vec<_> = services()
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
 		.filter_map(Result::ok)
+		.map(|room_id| {
+			Ok::<_, Error>((
+				PduBuilder {
+					event_type: TimelineEventType::RoomMember,
+					content: to_raw_value(&RoomMemberEventContent {
+						displayname: body.displayname.clone(),
+						join_authorized_via_users_server: None,
+						..serde_json::from_str(
+							services()
+								.rooms
+								.state_accessor
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
+								.ok_or_else(|| {
+									Error::bad_database("Tried to send displayname update for user not in the room.")
+								})?
+								.content
+								.get(),
+						)
+						.map_err(|_| Error::bad_database("Database contains invalid PDU."))?
+					})
+					.expect("event is valid, we just created it"),
+					unsigned: None,
+					state_key: Some(sender_user.to_string()),
+					redacts: None,
+				},
+				room_id,
+			))
+		})
+		.filter_map(Result::ok)
 		.collect();

-	update_displayname(sender_user.clone(), body.displayname.clone(), all_joined_rooms).await?;
+	for (pdu_builder, room_id) in all_rooms_joined {
+		let mutex_state = Arc::clone(
+			services()
+				.globals
+				.roomid_mutex_state
+				.write()
+				.await
+				.entry(room_id.clone())
+				.or_default(),
+		);
+		let state_lock = mutex_state.lock().await;
+
+		_ = services()
+			.rooms
+			.timeline
+			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
+			.await;
+	}

 	if services().globals.allow_local_presence() {
 		// Presence update
@@ -113,20 +161,72 @@ pub(crate) async fn set_avatar_url_route(
 	body: Ruma<set_avatar_url::v3::Request>,
 ) -> Result<set_avatar_url::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-	let all_joined_rooms: Vec<OwnedRoomId> = services()
+
+	services()
+		.users
+		.set_avatar_url(sender_user, body.avatar_url.clone())
+		.await?;
+
+	services()
+		.users
+		.set_blurhash(sender_user, body.blurhash.clone())
+		.await?;
+
+	// Send a new membership event and presence update into all joined rooms
+	let all_joined_rooms: Vec<_> = services()
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
 		.filter_map(Result::ok)
+		.map(|room_id| {
+			Ok::<_, Error>((
+				PduBuilder {
+					event_type: TimelineEventType::RoomMember,
+					content: to_raw_value(&RoomMemberEventContent {
+						avatar_url: body.avatar_url.clone(),
+						join_authorized_via_users_server: None,
+						..serde_json::from_str(
+							services()
+								.rooms
+								.state_accessor
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
+								.ok_or_else(|| {
+									Error::bad_database("Tried to send displayname update for user not in the room.")
+								})?
+								.content
+								.get(),
+						)
+						.map_err(|_| Error::bad_database("Database contains invalid PDU."))?
+					})
+					.expect("event is valid, we just created it"),
+					unsigned: None,
+					state_key: Some(sender_user.to_string()),
+					redacts: None,
+				},
+				room_id,
+			))
+		})
+		.filter_map(Result::ok)
 		.collect();

-	update_avatar_url(
-		sender_user.clone(),
-		body.avatar_url.clone(),
-		body.blurhash.clone(),
-		all_joined_rooms,
-	)
-	.await?;
+	for (pdu_builder, room_id) in all_joined_rooms {
+		let mutex_state = Arc::clone(
+			services()
+				.globals
+				.roomid_mutex_state
+				.write()
+				.await
+				.entry(room_id.clone())
+				.or_default(),
+		);
+		let state_lock = mutex_state.lock().await;
+
+		_ = services()
+			.rooms
+			.timeline
+			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
+			.await;
+	}

 	if services().globals.allow_local_presence() {
 		// Presence update
@@ -253,126 +353,3 @@ pub(crate) async fn get_profile_route(body: Ruma<get_profile::v3::Request>) -> R
 		displayname: services().users.displayname(&body.user_id)?,
 	})
 }
-
-pub async fn update_displayname(
-	user_id: OwnedUserId, displayname: Option<String>, all_joined_rooms: Vec<OwnedRoomId>,
-) -> Result<()> {
-	services()
-		.users
-		.set_displayname(&user_id, displayname.clone())
-		.await?;
-
-	// Send a new join membership event into all joined rooms
-	let all_joined_rooms: Vec<_> = all_joined_rooms
-		.iter()
-		.map(|room_id| {
-			Ok::<_, Error>((
-				PduBuilder {
-					event_type: TimelineEventType::RoomMember,
-					content: to_raw_value(&RoomMemberEventContent {
-						displayname: displayname.clone(),
-						join_authorized_via_users_server: None,
-						..serde_json::from_str(
-							services()
-								.rooms
-								.state_accessor
-								.room_state_get(room_id, &StateEventType::RoomMember, user_id.as_str())?
-								.ok_or_else(|| {
-									Error::bad_database("Tried to send display name update for user not in the room.")
-								})?
-								.content
-								.get(),
-						)
-						.map_err(|_| Error::bad_database("Database contains invalid PDU."))?
-					})
-					.expect("event is valid, we just created it"),
-					unsigned: None,
-					state_key: Some(user_id.to_string()),
-					redacts: None,
-				},
-				room_id,
-			))
-		})
-		.filter_map(Result::ok)
-		.collect();
-
-	update_all_rooms(all_joined_rooms, user_id).await;
-
-	Ok(())
-}
-
-pub async fn update_avatar_url(
-	user_id: OwnedUserId, avatar_url: Option<OwnedMxcUri>, blurhash: Option<String>, all_joined_rooms: Vec<OwnedRoomId>,
-) -> Result<()> {
-	services()
-		.users
-		.set_avatar_url(&user_id, avatar_url.clone())
-		.await?;
-	services()
-		.users
-		.set_blurhash(&user_id, blurhash.clone())
-		.await?;
-
-	// Send a new join membership event into all joined rooms
-	let all_joined_rooms: Vec<_> = all_joined_rooms
-		.iter()
-		.map(|room_id| {
-			Ok::<_, Error>((
-				PduBuilder {
-					event_type: TimelineEventType::RoomMember,
-					content: to_raw_value(&RoomMemberEventContent {
-						avatar_url: avatar_url.clone(),
-						blurhash: blurhash.clone(),
-						join_authorized_via_users_server: None,
-						..serde_json::from_str(
-							services()
-								.rooms
-								.state_accessor
-								.room_state_get(room_id, &StateEventType::RoomMember, user_id.as_str())?
-								.ok_or_else(|| {
-									Error::bad_database("Tried to send avatar URL update for user not in the room.")
-								})?
-								.content
-								.get(),
-						)
-						.map_err(|_| Error::bad_database("Database contains invalid PDU."))?
-					})
-					.expect("event is valid, we just created it"),
-					unsigned: None,
-					state_key: Some(user_id.to_string()),
-					redacts: None,
-				},
-				room_id,
-			))
-		})
-		.filter_map(Result::ok)
-		.collect();
-
-	update_all_rooms(all_joined_rooms, user_id).await;
-
-	Ok(())
-}
-
-pub async fn update_all_rooms(all_joined_rooms: Vec<(PduBuilder, &OwnedRoomId)>, user_id: OwnedUserId) {
-	for (pdu_builder, room_id) in all_joined_rooms {
-		let mutex_state = Arc::clone(
-			services()
-				.globals
-				.roomid_mutex_state
-				.write()
-				.await
-				.entry(room_id.clone())
-				.or_default(),
-		);
-		let state_lock = mutex_state.lock().await;
-
-		if let Err(e) = services()
-			.rooms
-			.timeline
-			.build_and_append_pdu(pdu_builder, &user_id, room_id, &state_lock)
-			.await
-		{
-			warn!(%user_id, %room_id, %e, "Failed to update/send new profile join membership update in room");
-		}
-	}
-}
@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;

-use conduit::PduCount;
 use ruma::{
 	api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
 	events::{
@@ -10,7 +9,7 @@ use ruma::{
 	MilliSecondsSinceUnixEpoch,
 };

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

 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
@@ -104,14 +104,14 @@ fn is_report_valid(
 		));
 	}

-	if score.map(|s| s > int!(0) || s < int!(-100)) == Some(true) {
+	if let Some(true) = score.map(|s| s > int!(0) || s < int!(-100)) {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Invalid score, must be within 0 to -100",
 		));
 	};

-	if reason.clone().map(|s| s.len() >= 750) == Some(true) {
+	if let Some(true) = reason.clone().map(|s| s.len() >= 750) {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Reason too long, should be 750 characters or fewer",
@@ -1,6 +1,5 @@
 use std::{cmp::max, collections::BTreeMap, sync::Arc};

-use conduit::{debug_info, debug_warn};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -28,8 +27,9 @@ use ruma::{
 use serde_json::{json, value::to_raw_value};
 use tracing::{error, info, warn};

-use super::invite_helper;
 use crate::{
+	api::client_server::invite_helper,
+	debug_info, debug_warn,
 	service::{appservice::RegistrationInfo, pdu::PduBuilder},
 	services, Error, Result, Ruma,
 };
@@ -388,7 +388,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 			Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event.")
 		})?;

-		debug_info!("Room creation initial state event: {event:?}");
+		debug_warn!("initial state event: {event:?}");

 		// client/appservice workaround: if a user sends an initial_state event with a
 		// state event in there with the content of literally `{}` (not null or empty
@@ -460,17 +460,12 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 	// 8. Events implied by invite (and TODO: invite_3pid)
 	drop(state_lock);
 	for user_id in &body.invite {
-		if let Err(e) = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await {
-			warn!(%e, "Failed to send invite");
-		}
+		_ = invite_helper(sender_user, user_id, &room_id, None, body.is_direct).await;
 	}

 	// Homeserver specific stuff
 	if let Some(alias) = alias {
-		services()
-			.rooms
-			.alias
-			.set_alias(&alias, &room_id, sender_user)?;
+		services().rooms.alias.set_alias(&alias, &room_id)?;
 	}

 	if body.visibility == room::Visibility::Public {
@@ -790,7 +785,7 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 		services()
 			.rooms
 			.alias
-			.set_alias(&alias, &replacement_room, sender_user)?;
+			.set_alias(&alias, &replacement_room)?;
 	}

 	// Get the old room power levels
@@ -820,7 +815,7 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->

 	// Modify the power levels in the old room to prevent sending of events and
 	// inviting new users
-	services()
+	_ = services()
 		.rooms
 		.timeline
 		.build_and_append_pdu(
@@ -889,7 +884,7 @@ fn default_power_levels_content(

 /// if a room is being created with a room alias, run our checks
 async fn room_alias_check(
-	room_alias_name: &str, appservice_info: &Option<RegistrationInfo>,
+	room_alias_name: &String, appservice_info: &Option<RegistrationInfo>,
 ) -> Result<OwnedRoomAliasId> {
 	// Basic checks on the room alias validity
 	if room_alias_name.contains(':') {
@@ -903,6 +898,20 @@ async fn room_alias_check(
 			ErrorKind::InvalidParam,
 			"Room alias contained spaces which is not a valid room alias.",
 		));
+	} else if room_alias_name.len() > 255 {
+		// there is nothing spec-wise saying to check the limit of this,
+		// however absurdly long room aliases are guaranteed to be unreadable or done
+		// maliciously. there is no reason a room alias should even exceed 100
+		// characters as is. generally in spec, 255 is matrix's fav number
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
+		));
+	} else if room_alias_name.contains('"') {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Room alias contained `\"` which is not allowed.",
+		));
 	}

 	// check if room alias is forbidden
@@ -947,7 +956,7 @@ async fn room_alias_check(
 }

 /// if a room is being created with a custom room ID, run our checks against it
-fn custom_room_id_check(custom_room_id: &str) -> Result<OwnedRoomId> {
+fn custom_room_id_check(custom_room_id: &String) -> Result<OwnedRoomId> {
 	// apply forbidden room alias checks to custom room IDs too
 	if services()
 		.globals
@@ -968,6 +977,8 @@ fn custom_room_id_check(custom_room_id: &str) -> Result<OwnedRoomId> {
 			ErrorKind::InvalidParam,
 			"Custom room ID contained spaces which is not valid.",
 		));
+	} else if custom_room_id.len() > 255 {
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
 	}

 	let full_room_id = format!("!{}:{}", custom_room_id, services().globals.config.server_name);
@@ -133,7 +133,6 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)

 	let results: Vec<_> = results
 		.iter()
-		.skip(skip)
 		.filter_map(|result| {
 			services()
 				.rooms
@@ -141,12 +140,11 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 				.get_pdu_from_id(result)
 				.ok()?
 				.filter(|pdu| {
-					!pdu.is_redacted()
-						&& services()
-							.rooms
-							.state_accessor
-							.user_can_see_event(sender_user, &pdu.room_id, &pdu.event_id)
-							.unwrap_or(false)
+					services()
+						.rooms
+						.state_accessor
+						.user_can_see_event(sender_user, &pdu.room_id, &pdu.event_id)
+						.unwrap_or(false)
 				})
 				.map(|pdu| pdu.to_room_event())
 		})
@@ -164,11 +162,15 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 			})
 		})
 		.filter_map(Result::ok)
+		.skip(skip)
 		.take(limit)
 		.collect();

-	let more_unloaded_results = searches.iter_mut().any(|s| s.peek().is_some());
-	let next_batch = more_unloaded_results.then(|| next_batch.to_string());
+	let next_batch = if results.len() < limit {
+		None
+	} else {
+		Some(next_batch.to_string())
+	};

 	Ok(search_events::v3::Response::new(ResultCategories {
 		room_events: ResultRoomEvents {
@@ -1,3 +1,4 @@
+use argon2::{PasswordHash, PasswordVerifier};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -17,10 +18,10 @@ use ruma::{
 	UserId,
 };
 use serde::Deserialize;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};

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

 #[derive(Debug, Deserialize)]
 struct Claims {
@@ -75,7 +76,14 @@ pub(crate) async fn login_route(body: Ruma<login::v3::Request>) -> Result<login:
 				warn!("Bad login type: {:?}", &body.login_info);
 				return Err(Error::BadRequest(ErrorKind::forbidden(), "Bad login type."));
 			}
-			.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
+			.map_err(|e| {
+				warn!("Failed to parse username from user logging in: {e}");
+				Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+			})?;
+
+			if services().appservice.is_exclusive_user_id(&user_id).await {
+				return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
+			}

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

-			if hash::verify_password(password, &hash).is_err() {
+			let Ok(parsed_hash) = PasswordHash::new(&hash) else {
+				error!("error while hashing user {}", user_id);
+				return Err(Error::BadServerResponse("could not hash"));
+			};
+
+			let hash_matches = services()
+				.globals
+				.argon
+				.verify_password(password.as_bytes(), &parsed_hash)
+				.is_ok();
+
+			if !hash_matches {
 				return Err(Error::BadRequest(ErrorKind::forbidden(), "Wrong username or password."));
 			}

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

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

-				UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
-					warn!("Failed to parse username from user logging in: {e}");
-					Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
-				})?
+				let user_id =
+					UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
+						warn!("Failed to parse username from user logging in: {e}");
+						Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+					})?;
+
+				if services().appservice.is_exclusive_user_id(&user_id).await {
+					return Err(Error::BadRequest(ErrorKind::Exclusive, "User ID reserved by appservice."));
+				}
+
+				user_id
 			} else {
 				return Err(Error::BadRequest(
 					ErrorKind::Unknown,
@@ -19,8 +19,10 @@ use ruma::{
 use tracing::{error, log::warn};

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

 /// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}/{stateKey}`
@@ -216,7 +218,7 @@ async fn allowed_to_send_state_event(
 		},
 		// admin room is a sensitive room, it should not ever be made public
 		StateEventType::RoomJoinRules => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room()? {
+			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
 				if admin_room_id == room_id {
 					if let Ok(join_rule) = serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get()) {
 						if join_rule.join_rule == JoinRule::Public {
@@ -231,7 +233,7 @@ async fn allowed_to_send_state_event(
 		},
 		// admin room is a sensitive room, it should not ever be made world readable
 		StateEventType::RoomHistoryVisibility => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room()? {
+			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
 				if admin_room_id == room_id {
 					if let Ok(visibility_content) =
 						serde_json::from_str::<RoomHistoryVisibilityEventContent>(json.json().get())
@@ -5,7 +5,6 @@ use std::{
 	time::Duration,
 };

-use conduit::PduCount;
 use ruma::{
 	api::client::{
 		filter::{FilterDefinition, LazyLoadOptions},
@@ -26,11 +25,15 @@ use ruma::{
 		StateEventType, TimelineEventType,
 	},
 	serde::Raw,
-	uint, DeviceId, EventId, OwnedUserId, RoomId, UInt, UserId,
+	uint, DeviceId, EventId, OwnedDeviceId, OwnedUserId, RoomId, UInt, UserId,
 };
-use tracing::{error, Instrument as _, Span};
+use tokio::sync::watch::Sender;
+use tracing::{debug, error, Instrument as _, Span};

-use crate::{service::pdu::EventHash, services, utils, Error, PduEvent, Result, Ruma, RumaResponse};
+use crate::{
+	service::{pdu::EventHash, rooms::timeline::PduCount},
+	services, utils, Error, PduEvent, Result, Ruma, RumaResponse,
+};

 /// # `GET /_matrix/client/r0/sync`
 ///
@@ -70,6 +73,10 @@ use crate::{service::pdu::EventHash, services, utils, Error, PduEvent, Result, R
 /// For left rooms:
 /// - If the user left after `since`: `prev_batch` token, empty state (TODO:
 ///   subset of the state at the point of the leave)
+///
+/// - Sync is handled in an async task, multiple requests from the same device
+///   with the same
+/// `since` will be cached
 pub(crate) async fn sync_events_route(
 	body: Ruma<sync_events::v3::Request>,
 ) -> Result<sync_events::v3::Response, RumaResponse<UiaaResponse>> {
@@ -77,6 +84,95 @@ pub(crate) async fn sync_events_route(
 	let sender_device = body.sender_device.expect("user is authenticated");
 	let body = body.body;

+	let mut rx = match services()
+		.globals
+		.sync_receivers
+		.write()
+		.await
+		.entry((sender_user.clone(), sender_device.clone()))
+	{
+		Entry::Vacant(v) => {
+			let (tx, rx) = tokio::sync::watch::channel(None);
+
+			v.insert((body.since.clone(), rx.clone()));
+
+			tokio::spawn(sync_helper_wrapper(sender_user.clone(), sender_device.clone(), body, tx));
+
+			rx
+		},
+		Entry::Occupied(mut o) => {
+			if o.get().0 != body.since {
+				let (tx, rx) = tokio::sync::watch::channel(None);
+
+				o.insert((body.since.clone(), rx.clone()));
+
+				debug!("Sync started for {sender_user}");
+
+				tokio::spawn(sync_helper_wrapper(sender_user.clone(), sender_device.clone(), body, tx));
+
+				rx
+			} else {
+				o.get().1.clone()
+			}
+		},
+	};
+
+	let we_have_to_wait = rx.borrow().is_none();
+	if we_have_to_wait {
+		if let Err(e) = rx.changed().await {
+			error!("Error waiting for sync: {}", e);
+		}
+	}
+
+	let result = match rx
+		.borrow()
+		.as_ref()
+		.expect("When sync channel changes it's always set to some")
+	{
+		Ok(response) => Ok(response.clone()),
+		Err(error) => Err(error.to_response()),
+	};
+
+	result
+}
+
+async fn sync_helper_wrapper(
+	sender_user: OwnedUserId, sender_device: OwnedDeviceId, body: sync_events::v3::Request,
+	tx: Sender<Option<Result<sync_events::v3::Response>>>,
+) {
+	let since = body.since.clone();
+
+	let r = sync_helper(sender_user.clone(), sender_device.clone(), body).await;
+
+	if let Ok((_, caching_allowed)) = r {
+		if !caching_allowed {
+			match services()
+				.globals
+				.sync_receivers
+				.write()
+				.await
+				.entry((sender_user, sender_device))
+			{
+				Entry::Occupied(o) => {
+					// Only remove if the device didn't start a different /sync already
+					if o.get().0 == since {
+						o.remove();
+					}
+				},
+				Entry::Vacant(_) => {},
+			}
+		}
+	}
+
+	_ = tx.send(Some(r.map(|(r, _)| r)));
+}
+
+async fn sync_helper(
+	sender_user: OwnedUserId,
+	sender_device: OwnedDeviceId,
+	body: sync_events::v3::Request,
+	// bool = caching allowed
+) -> Result<(sync_events::v3::Response, bool), Error> {
 	// Presence update
 	if services().globals.allow_local_presence() {
 		services()
@@ -142,7 +238,7 @@ pub(crate) async fn sync_events_route(
 		.collect::<Vec<_>>();

 	// Coalesce database writes for the remainder of this scope.
-	let _cork = services().globals.db.cork_and_flush();
+	let _cork = services().globals.db.cork_and_flush()?;

 	for room_id in all_joined_rooms {
 		let room_id = room_id?;
@@ -317,14 +413,11 @@ pub(crate) async fn sync_events_route(
 		if duration.as_secs() > 30 {
 			duration = Duration::from_secs(30);
 		}
-
-		#[allow(clippy::let_underscore_must_use)]
-		{
-			_ = tokio::time::timeout(duration, watcher).await;
-		}
+		_ = tokio::time::timeout(duration, watcher).await;
+		Ok((response, false))
+	} else {
+		Ok((response, since != next_batch)) // Only cache if we made progress
 	}
-
-	Ok(response)
 }

 #[tracing::instrument(skip_all, fields(user_id = %sender_user, room_id = %room_id))]
@@ -492,10 +585,8 @@ async fn handle_left_room(
 }

 async fn process_presence_updates(
-	presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, since: u64, syncing_user: &UserId,
+	presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, since: u64, syncing_user: &OwnedUserId,
 ) -> Result<()> {
-	use crate::service::presence::Presence;
-
 	// Take presence updates
 	for (user_id, _, presence_bytes) in services().presence.presence_since(since) {
 		if !services()
@@ -506,6 +597,7 @@ async fn process_presence_updates(
 			continue;
 		}

+		use crate::service::presence::Presence;
 		let presence_event = Presence::from_json_bytes_to_event(&presence_bytes, &user_id)?;
 		match presence_updates.entry(user_id) {
 			Entry::Vacant(slot) => {
@@ -611,7 +703,7 @@ async fn load_joined_room(
 					.unwrap_or(0);

 				// Recalculate heroes (first 5 members)
-				let mut heroes: Vec<OwnedUserId> = Vec::with_capacity(5);
+				let mut heroes = Vec::new();

 				if joined_member_count.saturating_add(invited_member_count) <= 5 {
 					// Go through all PDUs and for each member event, check if the user is still
@@ -636,7 +728,7 @@ async fn load_joined_room(
 								&& (services().rooms.state_cache.is_joined(&user_id, room_id)?
 									|| services().rooms.state_cache.is_invited(&user_id, room_id)?)
 							{
-								Ok::<_, Error>(Some(user_id))
+								Ok::<_, Error>(Some(state_key.clone()))
 							} else {
 								Ok(None)
 							}
@@ -644,11 +736,12 @@ async fn load_joined_room(
 							Ok(None)
 						}
 					})
+					// Filter out buggy users
 					.filter_map(Result::ok)
 					// Filter for possible heroes
 					.flatten()
 					{
-						if heroes.contains(&hero) || hero == sender_user {
+						if heroes.contains(&hero) || hero == sender_user.as_str() {
 							continue;
 						}

@@ -752,7 +845,8 @@ async fn load_joined_room(
 				// Incremental /sync
 				let since_shortstatehash = since_shortstatehash.unwrap();

-				let mut delta_state_events = Vec::new();
+				let mut state_events = Vec::new();
+				let mut lazy_loaded = HashSet::new();

 				if since_shortstatehash != current_shortstatehash {
 					let current_state_ids = services()
@@ -773,12 +867,55 @@ async fn load_joined_room(
 								continue;
 							};

-							delta_state_events.push(pdu);
+							if pdu.kind == TimelineEventType::RoomMember {
+								match UserId::parse(
+									pdu.state_key
+										.as_ref()
+										.expect("State event has state key")
+										.clone(),
+								) {
+									Ok(state_key_userid) => {
+										lazy_loaded.insert(state_key_userid);
+									},
+									Err(e) => error!("Invalid state key for member event: {}", e),
+								}
+							}
+
+							state_events.push(pdu);
 							tokio::task::yield_now().await;
 						}
 					}
 				}

+				for (_, event) in &timeline_pdus {
+					if lazy_loaded.contains(&event.sender) {
+						continue;
+					}
+
+					if !services().rooms.lazy_loading.lazy_load_was_sent_before(
+						sender_user,
+						sender_device,
+						room_id,
+						&event.sender,
+					)? || lazy_load_send_redundant
+					{
+						if let Some(member_event) = services().rooms.state_accessor.room_state_get(
+							room_id,
+							&StateEventType::RoomMember,
+							event.sender.as_str(),
+						)? {
+							lazy_loaded.insert(event.sender.clone());
+							state_events.push(member_event);
+						}
+					}
+				}
+
+				services()
+					.rooms
+					.lazy_loading
+					.lazy_load_mark_sent(sender_user, sender_device, room_id, lazy_loaded, next_batchcount)
+					.await;
+
 				let encrypted_room = services()
 					.rooms
 					.state_accessor
@@ -794,12 +931,12 @@ async fn load_joined_room(
 				// Calculations:
 				let new_encrypted_room = encrypted_room && since_encryption.is_none();

-				let send_member_count = delta_state_events
+				let send_member_count = state_events
 					.iter()
 					.any(|event| event.kind == TimelineEventType::RoomMember);

 				if encrypted_room {
-					for state_event in &delta_state_events {
+					for state_event in &state_events {
 						if state_event.kind != TimelineEventType::RoomMember {
 							continue;
 						}
@@ -860,57 +997,6 @@ async fn load_joined_room(
 					(None, None, Vec::new())
 				};

-				let mut state_events = delta_state_events;
-				let mut lazy_loaded = HashSet::new();
-
-				// Mark all member events we're returning as lazy-loaded
-				for pdu in &state_events {
-					if pdu.kind == TimelineEventType::RoomMember {
-						match UserId::parse(
-							pdu.state_key
-								.as_ref()
-								.expect("State event has state key")
-								.clone(),
-						) {
-							Ok(state_key_userid) => {
-								lazy_loaded.insert(state_key_userid);
-							},
-							Err(e) => error!("Invalid state key for member event: {}", e),
-						}
-					}
-				}
-
-				// Fetch contextual member state events for events from the timeline, and
-				// mark them as lazy-loaded as well.
-				for (_, event) in &timeline_pdus {
-					if lazy_loaded.contains(&event.sender) {
-						continue;
-					}
-
-					if !services().rooms.lazy_loading.lazy_load_was_sent_before(
-						sender_user,
-						sender_device,
-						room_id,
-						&event.sender,
-					)? || lazy_load_send_redundant
-					{
-						if let Some(member_event) = services().rooms.state_accessor.room_state_get(
-							room_id,
-							&StateEventType::RoomMember,
-							event.sender.as_str(),
-						)? {
-							lazy_loaded.insert(event.sender.clone());
-							state_events.push(member_event);
-						}
-					}
-				}
-
-				services()
-					.rooms
-					.lazy_loading
-					.lazy_load_mark_sent(sender_user, sender_device, room_id, lazy_loaded, next_batchcount)
-					.await;
-
 				(
 					heroes,
 					joined_member_count,
@@ -1041,7 +1127,8 @@ fn load_timeline(
 	sender_user: &UserId, room_id: &RoomId, roomsincecount: PduCount, limit: u64,
 ) -> Result<(Vec<(PduCount, PduEvent)>, bool), Error> {
 	let timeline_pdus;
-	let limited = if services()
+	let limited;
+	if services()
 		.rooms
 		.timeline
 		.last_timeline_count(sender_user, room_id)?
@@ -1071,11 +1158,11 @@ fn load_timeline(

 		// They /sync response doesn't always return all messages, so we say the output
 		// is limited unless there are events in non_timeline_pdus
-		non_timeline_pdus.next().is_some()
+		limited = non_timeline_pdus.next().is_some();
 	} else {
 		timeline_pdus = Vec::new();
-		false
-	};
+		limited = false;
+	}
 	Ok((timeline_pdus, limited))
 }

@@ -1583,7 +1670,6 @@ pub(crate) async fn sync_events_v4_route(
 				),
 				num_live: None, // Count events in timeline greater than global sync counter
 				timestamp: None,
-				heroes: None,
 			},
 		);
 	}
@@ -1598,10 +1684,7 @@ pub(crate) async fn sync_events_v4_route(
 		if duration.as_secs() > 30 {
 			duration = Duration::from_secs(30);
 		}
-		#[allow(clippy::let_underscore_must_use)]
-		{
-			_ = tokio::time::timeout(duration, watcher).await;
-		}
+		_ = tokio::time::timeout(duration, watcher).await;
 	}

 	Ok(sync_events::v4::Response {
@@ -8,7 +8,7 @@ use ruma::{
 	to_device::DeviceIdOrAllDevices,
 };

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

 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
@@ -10,7 +10,7 @@ use ruma::api::client::{
 	error::ErrorKind,
 };

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

 /// # `GET /_matrix/client/versions`
 ///
@@ -45,13 +45,12 @@ pub(crate) async fn get_supported_versions_route(
 		],
 		unstable_features: BTreeMap::from_iter([
 			("org.matrix.e2e_cross_signing".to_owned(), true),
-			("org.matrix.msc2285.stable".to_owned(), true), /* private read receipts (https://github.com/matrix-org/matrix-spec-proposals/pull/2285) */
-			("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true), /* query mutual rooms (https://github.com/matrix-org/matrix-spec-proposals/pull/2666) */
-			("org.matrix.msc2836".to_owned(), true), /* threading/threads (https://github.com/matrix-org/matrix-spec-proposals/pull/2836) */
-			("org.matrix.msc2946".to_owned(), true), /* spaces/hierarchy summaries (https://github.com/matrix-org/matrix-spec-proposals/pull/2946) */
-			("org.matrix.msc3026.busy_presence".to_owned(), true), /* busy presence status (https://github.com/matrix-org/matrix-spec-proposals/pull/3026) */
-			("org.matrix.msc3827".to_owned(), true), /* filtering of /publicRooms by room type (https://github.com/matrix-org/matrix-spec-proposals/pull/3827) */
-			("org.matrix.msc3575".to_owned(), true), /* sliding sync (https://github.com/matrix-org/matrix-spec-proposals/pull/3575/files#r1588877046) */
+			("org.matrix.msc2285.stable".to_owned(), true),
+			("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true),
+			("org.matrix.msc2836".to_owned(), true),
+			("org.matrix.msc2946".to_owned(), true),
+			("org.matrix.msc3026.busy_presence".to_owned(), true),
+			("org.matrix.msc3827".to_owned(), true),
 		]),
 	};

@@ -145,7 +144,7 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {

 	Ok(Json(serde_json::json!({
 		"server": server_url,
-		"version": conduit::version::conduwuit(),
+		"version": conduwuit_version(),
 	})))
 }

@@ -155,20 +154,7 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 /// `/_matrix/federation/v1/version`
 pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
 	Ok(Json(serde_json::json!({
-		"name": "conduwuit",
-		"version": conduit::version::conduwuit(),
-	})))
-}
-
-/// # `GET /_conduwuit/local_user_count`
-///
-/// conduwuit-specific API to return the amount of users registered on this
-/// homeserver. Endpoint is disabled if federation is disabled for privacy. This
-/// only includes active users (not deactivated, no guests, etc)
-pub(crate) async fn conduwuit_local_user_count() -> Result<impl IntoResponse> {
-	let user_count = services().users.list_local_users()?.len();
-
-	Ok(Json(serde_json::json!({
-		"count": user_count
+		"name": "Conduwuit",
+		"version": conduwuit_version(),
 	})))
 }
@@ -1,15 +1,12 @@
 use std::time::{Duration, SystemTime};

 use base64::{engine::general_purpose, Engine as _};
-use conduit::utils;
 use hmac::{Hmac, Mac};
-use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch, UserId};
+use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch};
 use sha1::Sha1;

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

-const RANDOM_USER_ID_LENGTH: usize = 10;
-
 type HmacSha1 = Hmac<Sha1>;

 /// # `GET /_matrix/client/r0/voip/turnServer`
@@ -18,6 +15,8 @@ type HmacSha1 = Hmac<Sha1>;
 pub(crate) async fn turn_server_route(
 	body: Ruma<get_turn_server_info::v3::Request>,
 ) -> Result<get_turn_server_info::v3::Response> {
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
 	let turn_secret = services().globals.turn_secret().clone();

 	let (username, password) = if !turn_secret.is_empty() {
@@ -28,15 +27,7 @@ pub(crate) async fn turn_server_route(
 		)
 		.expect("time is valid");

-		let user = body.sender_user.unwrap_or_else(|| {
-			UserId::parse_with_server_name(
-				utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
-				&services().globals.config.server_name,
-			)
-			.unwrap()
-		});
-
-		let username: String = format!("{}:{}", expiry.get(), user);
+		let username: String = format!("{}:{}", expiry.get(), sender_user);

 		let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes()).expect("HMAC can take key of any size");
 		mac.update(username.as_bytes());
@@ -1,14 +1,3 @@
-pub mod client;
-pub mod router;
-mod ruma_wrapper;
-pub mod server;
-
-extern crate conduit_core as conduit;
-extern crate conduit_service as service;
-
-pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result};
-pub(crate) use ruma_wrapper::{Ruma, RumaResponse};
-pub(crate) use service::{pdu::PduEvent, services, user_is_local};
-
-conduit::mod_ctor! {}
-conduit::mod_dtor! {}
+pub(crate) mod client_server;
+pub(crate) mod ruma_wrapper;
+pub(crate) mod server_server;
@@ -1,231 +0,0 @@
-use axum::{
-	response::IntoResponse,
-	routing::{any, get, post},
-	Router,
-};
-use conduit::{Error, Server};
-use http::Uri;
-use ruma::api::client::error::ErrorKind;
-
-use crate::{client, ruma_wrapper::RouterExt, server};
-
-pub fn build(router: Router, server: &Server) -> Router {
-	let config = &server.config;
-	let router = router
-		.ruma_route(client::get_supported_versions_route)
-		.ruma_route(client::get_register_available_route)
-		.ruma_route(client::register_route)
-		.ruma_route(client::get_login_types_route)
-		.ruma_route(client::login_route)
-		.ruma_route(client::whoami_route)
-		.ruma_route(client::logout_route)
-		.ruma_route(client::logout_all_route)
-		.ruma_route(client::change_password_route)
-		.ruma_route(client::deactivate_route)
-		.ruma_route(client::third_party_route)
-		.ruma_route(client::request_3pid_management_token_via_email_route)
-		.ruma_route(client::request_3pid_management_token_via_msisdn_route)
-		.ruma_route(client::check_registration_token_validity)
-		.ruma_route(client::get_capabilities_route)
-		.ruma_route(client::get_pushrules_all_route)
-		.ruma_route(client::set_pushrule_route)
-		.ruma_route(client::get_pushrule_route)
-		.ruma_route(client::set_pushrule_enabled_route)
-		.ruma_route(client::get_pushrule_enabled_route)
-		.ruma_route(client::get_pushrule_actions_route)
-		.ruma_route(client::set_pushrule_actions_route)
-		.ruma_route(client::delete_pushrule_route)
-		.ruma_route(client::get_room_event_route)
-		.ruma_route(client::get_room_aliases_route)
-		.ruma_route(client::get_filter_route)
-		.ruma_route(client::create_filter_route)
-		.ruma_route(client::set_global_account_data_route)
-		.ruma_route(client::set_room_account_data_route)
-		.ruma_route(client::get_global_account_data_route)
-		.ruma_route(client::get_room_account_data_route)
-		.ruma_route(client::set_displayname_route)
-		.ruma_route(client::get_displayname_route)
-		.ruma_route(client::set_avatar_url_route)
-		.ruma_route(client::get_avatar_url_route)
-		.ruma_route(client::get_profile_route)
-		.ruma_route(client::set_presence_route)
-		.ruma_route(client::get_presence_route)
-		.ruma_route(client::upload_keys_route)
-		.ruma_route(client::get_keys_route)
-		.ruma_route(client::claim_keys_route)
-		.ruma_route(client::create_backup_version_route)
-		.ruma_route(client::update_backup_version_route)
-		.ruma_route(client::delete_backup_version_route)
-		.ruma_route(client::get_latest_backup_info_route)
-		.ruma_route(client::get_backup_info_route)
-		.ruma_route(client::add_backup_keys_route)
-		.ruma_route(client::add_backup_keys_for_room_route)
-		.ruma_route(client::add_backup_keys_for_session_route)
-		.ruma_route(client::delete_backup_keys_for_room_route)
-		.ruma_route(client::delete_backup_keys_for_session_route)
-		.ruma_route(client::delete_backup_keys_route)
-		.ruma_route(client::get_backup_keys_for_room_route)
-		.ruma_route(client::get_backup_keys_for_session_route)
-		.ruma_route(client::get_backup_keys_route)
-		.ruma_route(client::set_read_marker_route)
-		.ruma_route(client::create_receipt_route)
-		.ruma_route(client::create_typing_event_route)
-		.ruma_route(client::create_room_route)
-		.ruma_route(client::redact_event_route)
-		.ruma_route(client::report_event_route)
-		.ruma_route(client::create_alias_route)
-		.ruma_route(client::delete_alias_route)
-		.ruma_route(client::get_alias_route)
-		.ruma_route(client::join_room_by_id_route)
-		.ruma_route(client::join_room_by_id_or_alias_route)
-		.ruma_route(client::joined_members_route)
-		.ruma_route(client::leave_room_route)
-		.ruma_route(client::forget_room_route)
-		.ruma_route(client::joined_rooms_route)
-		.ruma_route(client::kick_user_route)
-		.ruma_route(client::ban_user_route)
-		.ruma_route(client::unban_user_route)
-		.ruma_route(client::invite_user_route)
-		.ruma_route(client::set_room_visibility_route)
-		.ruma_route(client::get_room_visibility_route)
-		.ruma_route(client::get_public_rooms_route)
-		.ruma_route(client::get_public_rooms_filtered_route)
-		.ruma_route(client::search_users_route)
-		.ruma_route(client::get_member_events_route)
-		.ruma_route(client::get_protocols_route)
-		.ruma_route(client::send_message_event_route)
-		.ruma_route(client::send_state_event_for_key_route)
-		.ruma_route(client::get_state_events_route)
-		.ruma_route(client::get_state_events_for_key_route)
-		// Ruma doesn't have support for multiple paths for a single endpoint yet, and these routes
-		// share one Ruma request / response type pair with {get,send}_state_event_for_key_route
-		.route(
-			"/_matrix/client/r0/rooms/:room_id/state/:event_type",
-			get(client::get_state_events_for_empty_key_route)
-				.put(client::send_state_event_for_empty_key_route),
-		)
-		.route(
-			"/_matrix/client/v3/rooms/:room_id/state/:event_type",
-			get(client::get_state_events_for_empty_key_route)
-				.put(client::send_state_event_for_empty_key_route),
-		)
-		// These two endpoints allow trailing slashes
-		.route(
-			"/_matrix/client/r0/rooms/:room_id/state/:event_type/",
-			get(client::get_state_events_for_empty_key_route)
-				.put(client::send_state_event_for_empty_key_route),
-		)
-		.route(
-			"/_matrix/client/v3/rooms/:room_id/state/:event_type/",
-			get(client::get_state_events_for_empty_key_route)
-				.put(client::send_state_event_for_empty_key_route),
-		)
-		.ruma_route(client::sync_events_route)
-		.ruma_route(client::sync_events_v4_route)
-		.ruma_route(client::get_context_route)
-		.ruma_route(client::get_message_events_route)
-		.ruma_route(client::search_events_route)
-		.ruma_route(client::turn_server_route)
-		.ruma_route(client::send_event_to_device_route)
-		.ruma_route(client::get_media_config_route)
-		.ruma_route(client::get_media_preview_route)
-		.ruma_route(client::create_content_route)
-		// legacy v1 media routes
-		.route(
-			"/_matrix/media/v1/preview_url",
-			get(client::get_media_preview_v1_route)
-		)
-		.route(
-			"/_matrix/media/v1/config",
-			get(client::get_media_config_v1_route)
-		)
-		.route(
-			"/_matrix/media/v1/upload",
-			post(client::create_content_v1_route)
-		)
-		.route(
-			"/_matrix/media/v1/download/:server_name/:media_id",
-			get(client::get_content_v1_route)
-		)
-		.route(
-			"/_matrix/media/v1/download/:server_name/:media_id/:file_name",
-			get(client::get_content_as_filename_v1_route)
-		)
-		.route(
-			"/_matrix/media/v1/thumbnail/:server_name/:media_id",
-			get(client::get_content_thumbnail_v1_route)
-		)
-		.ruma_route(client::get_content_route)
-		.ruma_route(client::get_content_as_filename_route)
-		.ruma_route(client::get_content_thumbnail_route)
-		.ruma_route(client::get_devices_route)
-		.ruma_route(client::get_device_route)
-		.ruma_route(client::update_device_route)
-		.ruma_route(client::delete_device_route)
-		.ruma_route(client::delete_devices_route)
-		.ruma_route(client::get_tags_route)
-		.ruma_route(client::update_tag_route)
-		.ruma_route(client::delete_tag_route)
-		.ruma_route(client::upload_signing_keys_route)
-		.ruma_route(client::upload_signatures_route)
-		.ruma_route(client::get_key_changes_route)
-		.ruma_route(client::get_pushers_route)
-		.ruma_route(client::set_pushers_route)
-		// .ruma_route(client::third_party_route)
-		.ruma_route(client::upgrade_room_route)
-		.ruma_route(client::get_threads_route)
-		.ruma_route(client::get_relating_events_with_rel_type_and_event_type_route)
-		.ruma_route(client::get_relating_events_with_rel_type_route)
-		.ruma_route(client::get_relating_events_route)
-		.ruma_route(client::get_hierarchy_route)
-        .ruma_route(client::get_mutual_rooms_route)
-        .ruma_route(client::well_known_support)
-        .ruma_route(client::well_known_client)
-        .route("/_conduwuit/server_version", get(client::conduwuit_server_version))
-		.route("/_matrix/client/r0/rooms/:room_id/initialSync", get(initial_sync))
-		.route("/_matrix/client/v3/rooms/:room_id/initialSync", get(initial_sync))
-		.route("/client/server.json", get(client::syncv3_client_server_json));
-
-	if config.allow_federation {
-		router
-			.ruma_route(server::get_server_version_route)
-			.route("/_matrix/key/v2/server", get(server::get_server_keys_route))
-			.route("/_matrix/key/v2/server/:key_id", get(server::get_server_keys_deprecated_route))
-			.ruma_route(server::get_public_rooms_route)
-			.ruma_route(server::get_public_rooms_filtered_route)
-			.ruma_route(server::send_transaction_message_route)
-			.ruma_route(server::get_event_route)
-			.ruma_route(server::get_backfill_route)
-			.ruma_route(server::get_missing_events_route)
-			.ruma_route(server::get_event_authorization_route)
-			.ruma_route(server::get_room_state_route)
-			.ruma_route(server::get_room_state_ids_route)
-			.ruma_route(server::create_leave_event_template_route)
-			.ruma_route(server::create_leave_event_v1_route)
-			.ruma_route(server::create_leave_event_v2_route)
-			.ruma_route(server::create_join_event_template_route)
-			.ruma_route(server::create_join_event_v1_route)
-			.ruma_route(server::create_join_event_v2_route)
-			.ruma_route(server::create_invite_route)
-			.ruma_route(server::get_devices_route)
-			.ruma_route(server::get_room_information_route)
-			.ruma_route(server::get_profile_information_route)
-			.ruma_route(server::get_keys_route)
-			.ruma_route(server::claim_keys_route)
-			.ruma_route(server::get_hierarchy_route)
-			.ruma_route(server::well_known_server)
-			.route("/_conduwuit/local_user_count", get(client::conduwuit_local_user_count))
-	} else {
-		router
-			.route("/_matrix/federation/*path", any(federation_disabled))
-			.route("/.well-known/matrix/server", any(federation_disabled))
-			.route("/_matrix/key/*path", any(federation_disabled))
-			.route("/_conduwuit/local_user_count", any(federation_disabled))
-	}
-}
-
-async fn initial_sync(_uri: Uri) -> impl IntoResponse {
-	Error::BadRequest(ErrorKind::GuestAccessForbidden, "Guest access not implemented")
-}
-
-async fn federation_disabled() -> impl IntoResponse { Error::bad_config("Federation is disabled.") }
@@ -1,261 +0,0 @@
-use std::collections::BTreeMap;
-
-use axum::RequestPartsExt;
-use axum_extra::{
-	headers::{authorization::Bearer, Authorization},
-	typed_header::TypedHeaderRejectionReason,
-	TypedHeader,
-};
-use http::uri::PathAndQuery;
-use ruma::{
-	api::{client::error::ErrorKind, AuthScheme, Metadata},
-	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
-};
-use tracing::warn;
-
-use super::{request::Request, xmatrix::XMatrix};
-use crate::{service::appservice::RegistrationInfo, services, Error, Result};
-
-enum Token {
-	Appservice(Box<RegistrationInfo>),
-	User((OwnedUserId, OwnedDeviceId)),
-	Invalid,
-	None,
-}
-
-pub(super) struct Auth {
-	pub(super) origin: Option<OwnedServerName>,
-	pub(super) sender_user: Option<OwnedUserId>,
-	pub(super) sender_device: Option<OwnedDeviceId>,
-	pub(super) appservice_info: Option<RegistrationInfo>,
-}
-
-pub(super) async fn auth(
-	request: &mut Request, json_body: &Option<CanonicalJsonValue>, metadata: &Metadata,
-) -> Result<Auth> {
-	let bearer: Option<TypedHeader<Authorization<Bearer>>> = request.parts.extract().await?;
-	let token = match &bearer {
-		Some(TypedHeader(Authorization(bearer))) => Some(bearer.token()),
-		None => request.query.access_token.as_deref(),
-	};
-
-	let token = if let Some(token) = token {
-		if let Some(reg_info) = services().appservice.find_from_token(token).await {
-			Token::Appservice(Box::new(reg_info))
-		} else if let Some((user_id, device_id)) = services().users.find_from_token(token)? {
-			Token::User((user_id, OwnedDeviceId::from(device_id)))
-		} else {
-			Token::Invalid
-		}
-	} else {
-		Token::None
-	};
-
-	if metadata.authentication == AuthScheme::None {
-		match request.parts.uri.path() {
-			// TODO: can we check this better?
-			"/_matrix/client/v3/publicRooms" | "/_matrix/client/r0/publicRooms" => {
-				if !services()
-					.globals
-					.config
-					.allow_public_room_directory_without_auth
-				{
-					match token {
-						Token::Appservice(_) | Token::User(_) => {
-							// we should have validated the token above
-							// already
-						},
-						Token::None | Token::Invalid => {
-							return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing or invalid access token."));
-						},
-					}
-				}
-			},
-			_ => {},
-		};
-	}
-
-	match (metadata.authentication, token) {
-		(_, Token::Invalid) => Err(Error::BadRequest(
-			ErrorKind::UnknownToken {
-				soft_logout: false,
-			},
-			"Unknown access token.",
-		)),
-		(AuthScheme::AccessToken, Token::Appservice(info)) => Ok(auth_appservice(request, info)?),
-		(AuthScheme::None | AuthScheme::AccessTokenOptional | AuthScheme::AppserviceToken, Token::Appservice(info)) => {
-			Ok(Auth {
-				origin: None,
-				sender_user: None,
-				sender_device: None,
-				appservice_info: Some(*info),
-			})
-		},
-		(AuthScheme::AccessToken, Token::None) => match request.parts.uri.path() {
-			// TODO: can we check this better?
-			"/_matrix/client/v3/voip/turnServer" | "/_matrix/client/r0/voip/turnServer" => {
-				if services().globals.config.turn_allow_guests {
-					Ok(Auth {
-						origin: None,
-						sender_user: None,
-						sender_device: None,
-						appservice_info: None,
-					})
-				} else {
-					Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))
-				}
-			},
-			_ => Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token.")),
-		},
-		(
-			AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::None,
-			Token::User((user_id, device_id)),
-		) => Ok(Auth {
-			origin: None,
-			sender_user: Some(user_id),
-			sender_device: Some(device_id),
-			appservice_info: None,
-		}),
-		(AuthScheme::ServerSignatures, Token::None) => Ok(auth_server(request, json_body).await?),
-		(AuthScheme::None | AuthScheme::AppserviceToken | AuthScheme::AccessTokenOptional, Token::None) => Ok(Auth {
-			sender_user: None,
-			sender_device: None,
-			origin: None,
-			appservice_info: None,
-		}),
-		(AuthScheme::ServerSignatures, Token::Appservice(_) | Token::User(_)) => Err(Error::BadRequest(
-			ErrorKind::Unauthorized,
-			"Only server signatures should be used on this endpoint.",
-		)),
-		(AuthScheme::AppserviceToken, Token::User(_)) => Err(Error::BadRequest(
-			ErrorKind::Unauthorized,
-			"Only appservice access tokens should be used on this endpoint.",
-		)),
-	}
-}
-
-fn auth_appservice(request: &Request, info: Box<RegistrationInfo>) -> Result<Auth> {
-	let user_id = request
-		.query
-		.user_id
-		.clone()
-		.map_or_else(
-			|| {
-				UserId::parse_with_server_name(
-					info.registration.sender_localpart.as_str(),
-					services().globals.server_name(),
-				)
-			},
-			UserId::parse,
-		)
-		.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
-
-	if !info.is_user_match(&user_id) {
-		return Err(Error::BadRequest(ErrorKind::Exclusive, "User is not in namespace."));
-	}
-
-	if !services().users.exists(&user_id)? {
-		return Err(Error::BadRequest(ErrorKind::forbidden(), "User does not exist."));
-	}
-
-	Ok(Auth {
-		origin: None,
-		sender_user: Some(user_id),
-		sender_device: None,
-		appservice_info: Some(*info),
-	})
-}
-
-async fn auth_server(request: &mut Request, json_body: &Option<CanonicalJsonValue>) -> Result<Auth> {
-	if !services().globals.allow_federation() {
-		return Err(Error::bad_config("Federation is disabled."));
-	}
-
-	let TypedHeader(Authorization(x_matrix)) = request
-		.parts
-		.extract::<TypedHeader<Authorization<XMatrix>>>()
-		.await
-		.map_err(|e| {
-			warn!("Missing or invalid Authorization header: {e}");
-
-			let msg = match e.reason() {
-				TypedHeaderRejectionReason::Missing => "Missing Authorization header.",
-				TypedHeaderRejectionReason::Error(_) => "Invalid X-Matrix signatures.",
-				_ => "Unknown header-related error",
-			};
-
-			Error::BadRequest(ErrorKind::forbidden(), msg)
-		})?;
-
-	let origin = &x_matrix.origin;
-	let signatures = BTreeMap::from_iter([(x_matrix.key.clone(), CanonicalJsonValue::String(x_matrix.sig))]);
-	let signatures = BTreeMap::from_iter([(origin.as_str().to_owned(), CanonicalJsonValue::Object(signatures))]);
-
-	let server_destination = services().globals.server_name().as_str().to_owned();
-	if let Some(destination) = x_matrix.destination.as_ref() {
-		if destination != &server_destination {
-			return Err(Error::BadRequest(ErrorKind::forbidden(), "Invalid authorization."));
-		}
-	}
-
-	let signature_uri = CanonicalJsonValue::String(
-		request
-			.parts
-			.uri
-			.path_and_query()
-			.unwrap_or(&PathAndQuery::from_static("/"))
-			.to_string(),
-	);
-
-	let mut request_map = BTreeMap::from_iter([
-		(
-			"method".to_owned(),
-			CanonicalJsonValue::String(request.parts.method.to_string()),
-		),
-		("uri".to_owned(), signature_uri),
-		("origin".to_owned(), CanonicalJsonValue::String(origin.as_str().to_owned())),
-		("destination".to_owned(), CanonicalJsonValue::String(server_destination)),
-		("signatures".to_owned(), CanonicalJsonValue::Object(signatures)),
-	]);
-
-	if let Some(json_body) = json_body {
-		request_map.insert("content".to_owned(), json_body.clone());
-	};
-
-	let keys_result = services()
-		.rooms
-		.event_handler
-		.fetch_signing_keys_for_server(origin, vec![x_matrix.key.clone()])
-		.await;
-
-	let keys = keys_result.map_err(|e| {
-		warn!("Failed to fetch signing keys: {e}");
-		Error::BadRequest(ErrorKind::forbidden(), "Failed to fetch signing keys.")
-	})?;
-
-	let pub_key_map = BTreeMap::from_iter([(origin.as_str().to_owned(), keys)]);
-
-	match ruma::signatures::verify_json(&pub_key_map, &request_map) {
-		Ok(()) => Ok(Auth {
-			origin: Some(origin.clone()),
-			sender_user: None,
-			sender_device: None,
-			appservice_info: None,
-		}),
-		Err(e) => {
-			warn!("Failed to verify json request from {origin}: {e}\n{request_map:?}");
-
-			if request.parts.uri.to_string().contains('@') {
-				warn!(
-					"Request uri contained '@' character. Make sure your reverse proxy gives Conduit the raw uri \
-					 (apache: use nocanon)"
-				);
-			}
-
-			Err(Error::BadRequest(
-				ErrorKind::forbidden(),
-				"Failed to verify X-Matrix signatures.",
-			))
-		},
-	}
-}
@@ -0,0 +1,399 @@
+use std::{collections::BTreeMap, str};
+
+use axum::{
+	async_trait,
+	extract::{FromRequest, Path},
+	response::{IntoResponse, Response},
+	RequestExt, RequestPartsExt,
+};
+use axum_extra::{
+	headers::{
+		authorization::{Bearer, Credentials},
+		Authorization,
+	},
+	typed_header::TypedHeaderRejectionReason,
+	TypedHeader,
+};
+use bytes::{BufMut, BytesMut};
+use http::{uri::PathAndQuery, StatusCode};
+use http_body_util::Full;
+use hyper::Request;
+use ruma::{
+	api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
+	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
+};
+use serde::Deserialize;
+use tracing::{debug, error, trace, warn};
+
+use super::{Ruma, RumaResponse};
+use crate::{debug_warn, service::appservice::RegistrationInfo, services, Error, Result};
+
+enum Token {
+	Appservice(Box<RegistrationInfo>),
+	User((OwnedUserId, OwnedDeviceId)),
+	Invalid,
+	None,
+}
+
+#[derive(Deserialize)]
+struct QueryParams {
+	access_token: Option<String>,
+	user_id: Option<String>,
+}
+
+#[async_trait]
+impl<T, S> FromRequest<S, axum::body::Body> for Ruma<T>
+where
+	T: IncomingRequest,
+{
+	type Rejection = Error;
+
+	#[allow(unused_qualifications)] // async traits
+	async fn from_request(req: Request<axum::body::Body>, _state: &S) -> Result<Self, Self::Rejection> {
+		let limited = req.with_limited_body();
+		let (mut parts, body) = limited.into_parts();
+		let mut body = axum::body::to_bytes(
+			body,
+			services()
+				.globals
+				.config
+				.max_request_size
+				.try_into()
+				.expect("failed to convert max request size"),
+		)
+		.await
+		.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
+
+		let metadata = T::METADATA;
+		let auth_header: Option<TypedHeader<Authorization<Bearer>>> = parts.extract().await?;
+		let path_params: Path<Vec<String>> = parts.extract().await?;
+
+		let query = parts.uri.query().unwrap_or_default();
+		let query_params: QueryParams = match serde_html_form::from_str(query) {
+			Ok(params) => params,
+			Err(e) => {
+				error!(%query, "Failed to deserialize query parameters: {e}");
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to read query parameters"));
+			},
+		};
+
+		let token = match &auth_header {
+			Some(TypedHeader(Authorization(bearer))) => Some(bearer.token()),
+			None => query_params.access_token.as_deref(),
+		};
+
+		let token = if let Some(token) = token {
+			if let Some(reg_info) = services().appservice.find_from_token(token).await {
+				Token::Appservice(Box::new(reg_info))
+			} else if let Some((user_id, device_id)) = services().users.find_from_token(token)? {
+				Token::User((user_id, OwnedDeviceId::from(device_id)))
+			} else {
+				Token::Invalid
+			}
+		} else {
+			Token::None
+		};
+
+		if metadata.authentication == AuthScheme::None {
+			match parts.uri.path() {
+				// TODO: can we check this better?
+				"/_matrix/client/v3/publicRooms" | "/_matrix/client/r0/publicRooms" => {
+					if !services()
+						.globals
+						.config
+						.allow_public_room_directory_without_auth
+					{
+						match token {
+							Token::Appservice(_) | Token::User(_) => {
+								// we should have validated the token above
+								// already
+							},
+							Token::None | Token::Invalid => {
+								return Err(Error::BadRequest(
+									ErrorKind::MissingToken,
+									"Missing or invalid access token.",
+								));
+							},
+						}
+					}
+				},
+				_ => {},
+			};
+		}
+
+		let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
+
+		let (sender_user, sender_device, sender_servername, appservice_info) = match (metadata.authentication, token) {
+			(_, Token::Invalid) => {
+				return Err(Error::BadRequest(
+					ErrorKind::UnknownToken {
+						soft_logout: false,
+					},
+					"Unknown access token.",
+				))
+			},
+			(AuthScheme::AccessToken, Token::Appservice(info)) => {
+				let user_id = query_params
+					.user_id
+					.map_or_else(
+						|| {
+							UserId::parse_with_server_name(
+								info.registration.sender_localpart.as_str(),
+								services().globals.server_name(),
+							)
+						},
+						UserId::parse,
+					)
+					.map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
+
+				if !info.is_user_match(&user_id) {
+					return Err(Error::BadRequest(ErrorKind::Exclusive, "User is not in namespace."));
+				}
+
+				if !services().users.exists(&user_id)? {
+					return Err(Error::BadRequest(ErrorKind::forbidden(), "User does not exist."));
+				}
+
+				(Some(user_id), None, None, Some(*info))
+			},
+			(
+				AuthScheme::None | AuthScheme::AccessTokenOptional | AuthScheme::AppserviceToken,
+				Token::Appservice(info),
+			) => (None, None, None, Some(*info)),
+			(AuthScheme::AccessToken, Token::None) => {
+				return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token."));
+			},
+			(
+				AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::None,
+				Token::User((user_id, device_id)),
+			) => (Some(user_id), Some(device_id), None, None),
+			(AuthScheme::ServerSignatures, Token::None) => {
+				if !services().globals.allow_federation() {
+					return Err(Error::bad_config("Federation is disabled."));
+				}
+
+				let TypedHeader(Authorization(x_matrix)) = parts
+					.extract::<TypedHeader<Authorization<XMatrix>>>()
+					.await
+					.map_err(|e| {
+						warn!("Missing or invalid Authorization header: {e}");
+
+						let msg = match e.reason() {
+							TypedHeaderRejectionReason::Missing => "Missing Authorization header.",
+							TypedHeaderRejectionReason::Error(_) => "Invalid X-Matrix signatures.",
+							_ => "Unknown header-related error",
+						};
+
+						Error::BadRequest(ErrorKind::forbidden(), msg)
+					})?;
+
+				let origin_signatures =
+					BTreeMap::from_iter([(x_matrix.key.clone(), CanonicalJsonValue::String(x_matrix.sig))]);
+
+				let signatures = BTreeMap::from_iter([(
+					x_matrix.origin.as_str().to_owned(),
+					CanonicalJsonValue::Object(origin_signatures),
+				)]);
+
+				let server_destination = services().globals.server_name().as_str().to_owned();
+
+				if let Some(destination) = x_matrix.destination.as_ref() {
+					if destination != &server_destination {
+						return Err(Error::BadRequest(ErrorKind::forbidden(), "Invalid authorization."));
+					}
+				}
+
+				let signature_uri = CanonicalJsonValue::String(
+					parts
+						.uri
+						.path_and_query()
+						.unwrap_or(&PathAndQuery::from_static("/"))
+						.to_string(),
+				);
+
+				let mut request_map = BTreeMap::from_iter([
+					("method".to_owned(), CanonicalJsonValue::String(parts.method.to_string())),
+					("uri".to_owned(), signature_uri),
+					(
+						"origin".to_owned(),
+						CanonicalJsonValue::String(x_matrix.origin.as_str().to_owned()),
+					),
+					("destination".to_owned(), CanonicalJsonValue::String(server_destination)),
+					("signatures".to_owned(), CanonicalJsonValue::Object(signatures)),
+				]);
+
+				if let Some(json_body) = &json_body {
+					request_map.insert("content".to_owned(), json_body.clone());
+				};
+
+				let keys_result = services()
+					.rooms
+					.event_handler
+					.fetch_signing_keys_for_server(&x_matrix.origin, vec![x_matrix.key.clone()])
+					.await;
+
+				let keys = keys_result.map_err(|e| {
+					warn!("Failed to fetch signing keys: {e}");
+					Error::BadRequest(ErrorKind::forbidden(), "Failed to fetch signing keys.")
+				})?;
+
+				let pub_key_map = BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);
+
+				match ruma::signatures::verify_json(&pub_key_map, &request_map) {
+					Ok(()) => (None, None, Some(x_matrix.origin), None),
+					Err(e) => {
+						warn!("Failed to verify json request from {}: {e}\n{request_map:?}", x_matrix.origin);
+
+						if parts.uri.to_string().contains('@') {
+							warn!(
+								"Request uri contained '@' character. Make sure your reverse proxy gives Conduit the \
+								 raw uri (apache: use nocanon)"
+							);
+						}
+
+						return Err(Error::BadRequest(
+							ErrorKind::forbidden(),
+							"Failed to verify X-Matrix signatures.",
+						));
+					},
+				}
+			},
+			(AuthScheme::None | AuthScheme::AppserviceToken | AuthScheme::AccessTokenOptional, Token::None) => {
+				(None, None, None, None)
+			},
+			(AuthScheme::ServerSignatures, Token::Appservice(_) | Token::User(_)) => {
+				return Err(Error::BadRequest(
+					ErrorKind::Unauthorized,
+					"Only server signatures should be used on this endpoint.",
+				));
+			},
+			(AuthScheme::AppserviceToken, Token::User(_)) => {
+				return Err(Error::BadRequest(
+					ErrorKind::Unauthorized,
+					"Only appservice access tokens should be used on this endpoint.",
+				));
+			},
+		};
+
+		let mut http_request = Request::builder().uri(parts.uri).method(parts.method);
+		*http_request.headers_mut().unwrap() = parts.headers;
+
+		if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {
+			let user_id = sender_user.clone().unwrap_or_else(|| {
+				UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid")
+			});
+
+			let uiaa_request = json_body
+				.get("auth")
+				.and_then(|auth| auth.as_object())
+				.and_then(|auth| auth.get("session"))
+				.and_then(|session| session.as_str())
+				.and_then(|session| {
+					services().uiaa.get_uiaa_request(
+						&user_id,
+						&sender_device.clone().unwrap_or_else(|| "".into()),
+						session,
+					)
+				});
+
+			if let Some(CanonicalJsonValue::Object(initial_request)) = uiaa_request {
+				for (key, value) in initial_request {
+					json_body.entry(key).or_insert(value);
+				}
+			}
+
+			let mut buf = BytesMut::new().writer();
+			serde_json::to_writer(&mut buf, json_body).expect("value serialization can't fail");
+			body = buf.into_inner().freeze();
+		}
+
+		let http_request = http_request.body(&*body).unwrap();
+		debug!(
+			"{:?} {:?} {:?}",
+			http_request.method(),
+			http_request.uri(),
+			http_request.headers()
+		);
+
+		trace!("{:?} {:?} {:?}", http_request.method(), http_request.uri(), json_body);
+		let body = T::try_from_http_request(http_request, &path_params).map_err(|e| {
+			warn!("try_from_http_request failed: {e:?}",);
+			debug_warn!("JSON body: {:?}", json_body);
+			Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
+		})?;
+
+		Ok(Ruma {
+			body,
+			sender_user,
+			sender_device,
+			sender_servername,
+			json_body,
+			appservice_info,
+		})
+	}
+}
+
+struct XMatrix {
+	origin: OwnedServerName,
+	destination: Option<String>,
+	key: String, // KeyName?
+	sig: String,
+}
+
+impl Credentials for XMatrix {
+	const SCHEME: &'static str = "X-Matrix";
+
+	fn decode(value: &http::HeaderValue) -> Option<Self> {
+		debug_assert!(
+			value.as_bytes().starts_with(b"X-Matrix "),
+			"HeaderValue to decode should start with \"X-Matrix ..\", received = {value:?}",
+		);
+
+		let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..])
+			.ok()?
+			.trim_start();
+
+		let mut origin = None;
+		let mut destination = None;
+		let mut key = None;
+		let mut sig = None;
+
+		for entry in parameters.split_terminator(',') {
+			let (name, value) = entry.split_once('=')?;
+
+			// It's not at all clear why some fields are quoted and others not in the spec,
+			// let's simply accept either form for every field.
+			let value = value
+				.strip_prefix('"')
+				.and_then(|rest| rest.strip_suffix('"'))
+				.unwrap_or(value);
+
+			// FIXME: Catch multiple fields of the same name
+			match name {
+				"origin" => origin = Some(value.try_into().ok()?),
+				"key" => key = Some(value.to_owned()),
+				"sig" => sig = Some(value.to_owned()),
+				"destination" => destination = Some(value.to_owned()),
+				_ => debug!("Unexpected field `{name}` in X-Matrix Authorization header"),
+			}
+		}
+
+		Some(Self {
+			origin: origin?,
+			key: key?,
+			sig: sig?,
+			destination,
+		})
+	}
+
+	fn encode(&self) -> http::HeaderValue { todo!() }
+}
+
+impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
+	fn into_response(self) -> Response {
+		match self.0.try_into_http_response::<BytesMut>() {
+			Ok(res) => res.map(BytesMut::freeze).map(Full::new).into_response(),
+			Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
+		}
+	}
+}
@@ -1,81 +0,0 @@
-use std::future::Future;
-
-use axum::{
-	extract::FromRequestParts,
-	response::IntoResponse,
-	routing::{on, MethodFilter},
-	Router,
-};
-use conduit::Result;
-use http::Method;
-use ruma::api::IncomingRequest;
-
-use super::{Ruma, RumaResponse};
-
-pub(in super::super) trait RouterExt {
-	fn ruma_route<H, T>(self, handler: H) -> Self
-	where
-		H: RumaHandler<T>;
-}
-
-impl RouterExt for Router {
-	fn ruma_route<H, T>(self, handler: H) -> Self
-	where
-		H: RumaHandler<T>,
-	{
-		handler.add_routes(self)
-	}
-}
-
-pub(in super::super) trait RumaHandler<T> {
-	fn add_routes(&self, router: Router) -> Router;
-
-	fn add_route(&self, router: Router, path: &str) -> Router;
-}
-
-macro_rules! ruma_handler {
-	( $($tx:ident),* $(,)? ) => {
-		#[allow(non_snake_case)]
-		impl<Req, Ret, Fut, Fun, $($tx,)*> RumaHandler<($($tx,)* Ruma<Req>,)> for Fun
-		where
-			Req: IncomingRequest + Send + 'static,
-			Ret: IntoResponse,
-			Fut: Future<Output = Result<Req::OutgoingResponse, Ret>> + Send,
-			Fun: FnOnce($($tx,)* Ruma<Req>) -> Fut + Clone + Send + Sync + 'static,
-			$( $tx: FromRequestParts<()> + Send + 'static, )*
-		{
-			fn add_routes(&self, router: Router) -> Router {
-				Req::METADATA
-					.history
-					.all_paths()
-					.fold(router, |router, path| self.add_route(router, path))
-			}
-
-			fn add_route(&self, router: Router, path: &str) -> Router {
-				let handle = self.clone();
-				let method = method_to_filter(&Req::METADATA.method);
-				let action = |$($tx,)* req| async { handle($($tx,)* req).await.map(RumaResponse) };
-				router.route(path, on(method, action))
-			}
-		}
-	}
-}
-ruma_handler!();
-ruma_handler!(T1);
-ruma_handler!(T1, T2);
-ruma_handler!(T1, T2, T3);
-ruma_handler!(T1, T2, T3, T4);
-
-const fn method_to_filter(method: &Method) -> MethodFilter {
-	match *method {
-		Method::DELETE => MethodFilter::DELETE,
-		Method::GET => MethodFilter::GET,
-		Method::HEAD => MethodFilter::HEAD,
-		Method::OPTIONS => MethodFilter::OPTIONS,
-		Method::PATCH => MethodFilter::PATCH,
-		Method::POST => MethodFilter::POST,
-		Method::PUT => MethodFilter::PUT,
-		Method::TRACE => MethodFilter::TRACE,
-		_ => panic!("Unsupported HTTP method"),
-	}
-}
@@ -1,69 +1,19 @@
-mod auth;
-mod handler;
-mod request;
-mod xmatrix;
+use std::ops::Deref;

-use std::{mem, ops::Deref};
+use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId};

-use axum::{async_trait, body::Body, extract::FromRequest};
-use bytes::{BufMut, BytesMut};
-pub(super) use conduit::error::RumaResponse;
-use conduit::{debug, debug_warn, trace, warn};
-use ruma::{
-	api::{client::error::ErrorKind, IncomingRequest},
-	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
-};
+use crate::{service::appservice::RegistrationInfo, Error};

-pub(super) use self::handler::RouterExt;
-use self::{auth::Auth, request::Request};
-use crate::{service::appservice::RegistrationInfo, services, Error, Result};
+mod axum;

 /// Extractor for Ruma request structs
 pub(crate) struct Ruma<T> {
-	/// Request struct body
 	pub(crate) body: T,
-
-	/// Federation server authentication: X-Matrix origin
-	/// None when not a federation server.
-	pub(crate) origin: Option<OwnedServerName>,
-
-	/// Local user authentication: user_id.
-	/// None when not an authenticated local user.
 	pub(crate) sender_user: Option<OwnedUserId>,
-
-	/// Local user authentication: device_id.
-	/// None when not an authenticated local user or no device.
 	pub(crate) sender_device: Option<OwnedDeviceId>,
-
-	/// Appservice authentication; registration info.
-	/// None when not an appservice.
+	pub(crate) sender_servername: Option<OwnedServerName>,
+	pub(crate) json_body: Option<CanonicalJsonValue>, // This is None when body is not a valid string
 	pub(crate) appservice_info: Option<RegistrationInfo>,
-
-	/// Parsed JSON content.
-	/// None when body is not a valid string
-	pub(crate) json_body: Option<CanonicalJsonValue>,
-}
-
-#[async_trait]
-impl<T, S> FromRequest<S, Body> for Ruma<T>
-where
-	T: IncomingRequest,
-{
-	type Rejection = Error;
-
-	async fn from_request(request: hyper::Request<Body>, _: &S) -> Result<Self, Self::Rejection> {
-		let mut request = request::from(request).await?;
-		let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&request.body).ok();
-		let auth = auth::auth(&mut request, &json_body, &T::METADATA).await?;
-		Ok(Self {
-			body: make_body::<T>(&mut request, &mut json_body, &auth)?,
-			origin: auth.origin,
-			sender_user: auth.sender_user,
-			sender_device: auth.sender_device,
-			appservice_info: auth.appservice_info,
-			json_body,
-		})
-	}
 }

 impl<T> Deref for Ruma<T> {
@@ -72,59 +22,13 @@ impl<T> Deref for Ruma<T> {
 	fn deref(&self) -> &Self::Target { &self.body }
 }

-fn make_body<T>(request: &mut Request, json_body: &mut Option<CanonicalJsonValue>, auth: &Auth) -> Result<T>
-where
-	T: IncomingRequest,
-{
-	let body = if let Some(CanonicalJsonValue::Object(json_body)) = json_body {
-		let user_id = auth.sender_user.clone().unwrap_or_else(|| {
-			UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid")
-		});
+#[derive(Clone)]
+pub(crate) struct RumaResponse<T>(pub(crate) T);

-		let uiaa_request = json_body
-			.get("auth")
-			.and_then(|auth| auth.as_object())
-			.and_then(|auth| auth.get("session"))
-			.and_then(|session| session.as_str())
-			.and_then(|session| {
-				services().uiaa.get_uiaa_request(
-					&user_id,
-					&auth.sender_device.clone().unwrap_or_else(|| "".into()),
-					session,
-				)
-			});
-
-		if let Some(CanonicalJsonValue::Object(initial_request)) = uiaa_request {
-			for (key, value) in initial_request {
-				json_body.entry(key).or_insert(value);
-			}
-		}
-
-		let mut buf = BytesMut::new().writer();
-		serde_json::to_writer(&mut buf, &json_body).expect("value serialization can't fail");
-		buf.into_inner().freeze()
-	} else {
-		mem::take(&mut request.body)
-	};
-
-	let mut http_request = hyper::Request::builder()
-		.uri(request.parts.uri.clone())
-		.method(request.parts.method.clone());
-	*http_request.headers_mut().unwrap() = request.parts.headers.clone();
-	let http_request = http_request.body(body).unwrap();
-	debug!(
-		"{:?} {:?} {:?}",
-		http_request.method(),
-		http_request.uri(),
-		http_request.headers()
-	);
-
-	trace!("{:?} {:?} {:?}", http_request.method(), http_request.uri(), json_body);
-	let body = T::try_from_http_request(http_request, &request.path).map_err(|e| {
-		warn!("try_from_http_request failed: {e:?}",);
-		debug_warn!("JSON body: {:?}", json_body);
-		Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
-	})?;
-
-	Ok(body)
+impl<T> From<T> for RumaResponse<T> {
+	fn from(t: T) -> Self { Self(t) }
+}
+
+impl From<Error> for RumaResponse<UiaaResponse> {
+	fn from(t: Error) -> Self { t.to_response() }
 }
--- a/Show More
+++ b/Show More