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
256 changed files with 10610 additions and 12490 deletions
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

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

 PATH_add bin

@@ -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.21.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.21.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
@@ -1,94 +1,112 @@
-#cargo-features = ["profile-rustflags"]
-
-[workspace]
-resolver = "2"
-members = ["src/*"]
-default-members = ["src/*"]
-
-[workspace.package]
+[package]
+# TODO: when can we rename to conduwuit?
+name = "conduit"
 description = "a very cool fork of Conduit, a Matrix homeserver written in Rust"
 license = "Apache-2.0"
 authors = [
    "strawberry <strawberry@puppygock.gay>",
    "timokoesters <timo@koesters.xyz>",
 ]
-version = "0.4.1"
-edition = "2021"
-# See also `rust-toolchain.toml`
-rust-version = "1.77.0"
 homepage = "https://conduwuit.puppyirl.gay/"
 repository = "https://github.com/girlbossceo/conduwuit"
 readme = "README.md"
+version = "0.3.3"
+edition = "2021"

-[workspace.metadata.crane]
-name = "conduit"
+# See also `rust-toolchain.toml`
+rust-version = "1.77.0"

-[workspace.dependencies.sanitize-filename]
-version = "0.5.0"
+[dependencies]
+console-subscriber = { version = "0.2", optional = true }

-[workspace.dependencies.infer]
-version = "0.15"
-default-features = false
+infer = { version = "0.15", default-features = false }

-[workspace.dependencies.jsonwebtoken]
-version = "9.3.0"
+# for hot lib reload
+hot-lib-reloader = { version = "^0.7", optional = true }

-[workspace.dependencies.base64]
-version = "0.22.1"
+# Used for secure identifiers
+rand = "0.8.5"
+
+# Used for conduit::Error type
+thiserror = "1.0.60"
+
+# Used to encode server public key
+base64 = "0.22.1"
+
+# Used when hashing the state
+ring = "0.17.8"
+
+# Used to find matching events for appservices
+regex = "1.10.4"
+
+# Used to load forbidden room/user regex from config
+serde_regex = "1.1.0"
+
+# Used to make working with iterators easier, was already a transitive depdendency
+itertools = "0.12.1"
+
+# jwt jsonwebtokens
+jsonwebtoken = "9.3.0"
+
+# Used for ruma wrapper
+serde_html_form = "0.2.6"

 # used for TURN server authentication
-[workspace.dependencies.hmac]
-version = "0.12.1"
-
-[workspace.dependencies.sha-1]
-version = "0.10.1"
+hmac = "0.12.1"
+sha-1 = "0.10.1"

 # used for checking if an IP is in specific subnets / CIDR ranges easier
-[workspace.dependencies.ipaddress]
-version = "0.1.3"
+ipaddress = "0.1.3"

-[workspace.dependencies.rand]
-version = "0.8.5"
+# to get the client IP address of requests
+#axum-client-ip = "0.4.2"

+# to parse user-friendly time durations in admin commands
+cyborgtime = "2.1.1"
+
+# all the web/HTTP dependencies
 # Used for the http request / response body type for Ruma endpoints used with reqwest
-[workspace.dependencies.bytes]
-version = "1.6.0"
+bytes = "1.6.0"
+http = "1.1.0"
+http-body-util = "0.1.1"

-[workspace.dependencies.http-body-util]
-version = "0.1.1"
+# used to replace the channels of the tokio runtime
+loole = "0.3.0"

-[workspace.dependencies.http]
-version = "1.1.0"
+# Validating urls in config, was already a transitive dependency
+url = { version = "2.5.0", features = ["serde"] }

-[workspace.dependencies.regex]
-version = "1.10.4"
+async-trait = "0.1.80"

-[workspace.dependencies.axum]
+lru-cache = "0.1.2"
+sanitize-filename = "0.5.0"
+
+# standard date and time tools
+[dependencies.chrono]
+version = "0.4.38"
+features = ["alloc"]
+default-features = false
+
+# Web framework
+[dependencies.axum]
 version = "0.7.5"
 default-features = false
-features = [
-	"form",
-	"http1",
-	"http2",
-	"json",
-	"matched-path",
-	"tokio",
-]
+features = ["form", "http1", "http2", "json", "matched-path"]

-[workspace.dependencies.axum-extra]
+[dependencies.axum-extra]
 version = "0.9.3"
 default-features = false
 features = ["typed-header"]

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

-[workspace.dependencies.tower]
+[dependencies.tower]
 version = "0.4.13"
 features = ["util"]

-[workspace.dependencies.tower-http]
+[dependencies.tower-http]
 version = "0.5.2"
 features = [
    "add-extension",
@@ -100,168 +118,153 @@ features = [
    "catch-panic",
 ]

-[workspace.dependencies.reqwest]
+[dependencies.hyper]
+version = "1.3.1"
+features = ["server", "http1", "http2"]
+
+[dependencies.hyper-util]
+version = "0.1.3"
+
+[dependencies.reqwest]
 version = "0.12.4"
 default-features = false
-features = [
-	"rustls-tls-native-roots",
-	"socks",
-	"hickory-dns",
-	"http2",
-]
+features = ["rustls-tls-native-roots", "socks", "hickory-dns"]

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

-# Used for appservice registration files
-[workspace.dependencies.serde_yaml]
-version = "0.9.34"
-
-# Used to load forbidden room/user regex from config
-[workspace.dependencies.serde_regex]
-version = "1.1.0"
-
-# Used for ruma wrapper
-[workspace.dependencies.serde_html_form]
-version = "0.2.6"

 # Used for password hashing
-[workspace.dependencies.argon2]
+[dependencies.argon2]
 version = "0.5.3"
 features = ["alloc", "rand"]
 default-features = false

 # Used to generate thumbnails for images
-[workspace.dependencies.image]
+[dependencies.image]
 version = "0.25.1"
 default-features = false
-features = [
-	"jpeg",
-	"png",
-	"gif",
-	"webp",
-]
+features = ["jpeg", "png", "gif", "webp"]

 # logging
-[workspace.dependencies.log]
+[dependencies.log]
 version = "0.4.21"
 default-features = false
-[workspace.dependencies.tracing]
+[dependencies.tracing]
 version = "0.1.40"
 default-features = false
-[workspace.dependencies.tracing-subscriber]
+[dependencies.tracing-subscriber]
 version = "0.3.18"
 features = ["env-filter"]

+# optional SHA256 media keys feature
+[dependencies.sha2]
+version = "0.10.8"
+optional = true
+
+# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
+[dependencies.opentelemetry]
+version = "0.21.0"
+optional = true
+[dependencies.tracing-flame]
+version = "0.2.0"
+optional = true
+[dependencies.tracing-opentelemetry]
+version = "0.22.0"
+optional = true
+[dependencies.opentelemetry_sdk]
+version = "0.21.2"
+optional = true
+features = ["rt-tokio"]
+[dependencies.opentelemetry-jaeger]
+version = "0.20.0"
+optional = true
+features = ["rt-tokio"]
+
+# optional sentry metrics for crash/panic reporting
+[dependencies.sentry]
+version = "0.32.3"
+optional = true
+default-features = false
+features = [
+    "backtrace",
+    "contexts",
+    "debug-images",
+    "panic",
+    "rustls",
+    "tower",
+    "tower-http",
+    "tracing",
+    "reqwest",
+    "log",
+]
+[dependencies.sentry-tracing]
+version = "0.32.3"
+optional = true
+[dependencies.sentry-tower]
+version = "0.32.3"
+optional = true
+
+# optional jemalloc usage
+[dependencies.tikv-jemalloc-sys]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["stats", "unprefixed_malloc_on_supported_platforms"]
+[dependencies.tikv-jemallocator]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["stats", "unprefixed_malloc_on_supported_platforms"]
+[dependencies.tikv-jemalloc-ctl]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["use_std"]
+
 # for URL previews
-[workspace.dependencies.webpage]
+[dependencies.webpage]
 version = "2.0.1"
 default-features = false

-# used for conduit's CLI and admin room command parsing
-[workspace.dependencies.clap]
-version = "4.5.4"
-default-features = false
-features = [
-	"std",
-	"derive",
-	"help",
-	"usage",
-	"error-context",
-	"string",
-]
-
-[workspace.dependencies.futures-util]
-version = "0.3.30"
-default-features = false
-
-[workspace.dependencies.tokio]
-version = "1.37.0"
-features = [
-	"fs",
-	"net",
-	"macros",
-	"sync",
-	"signal",
-	"time",
-	"rt-multi-thread",
-	"io-util",
-]
-
-[workspace.dependencies.libloading]
-version = "0.8.3"
-
-# Validating urls in config, was already a transitive dependency
-[workspace.dependencies.url]
-version = "2.5.0"
-features = ["serde"]
-
-# standard date and time tools
-[workspace.dependencies.chrono]
-version = "0.4.38"
-features = ["alloc"]
-default-features = false
-
-[workspace.dependencies.hyper]
-version = "1.3.1"
-features = [
-	"server",
-	"http1",
-	"http2",
-]
-
-[workspace.dependencies.hyper-util]
-version = "0.1.4"
-
 # to support multiple variations of setting a config option
-[workspace.dependencies.either]
+[dependencies.either]
 version = "1.11.0"
 features = ["serde"]

+# to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
+[dependencies.axum-server-dual-protocol]
+version = "0.6"
+optional = true
+
+# used for conduit's CLI and admin room command parsing
+[dependencies.clap]
+version = "4.5.4"
+default-features = false
+features = ["std", "derive", "help", "usage", "error-context", "string"]
+
+[dependencies.futures-util]
+version = "0.3.30"
+default-features = false
+
 # Used for reading the configuration from conduwuit.toml & environment variables
-[workspace.dependencies.figment]
+[dependencies.figment]
 version = "0.10.18"
 features = ["env", "toml"]

-[workspace.dependencies.hickory-resolver]
-version = "0.24.1"
-default-features = false
-
-# Used for conduit::Error type
-[workspace.dependencies.thiserror]
-version = "1.0.61"
-
-# Used when hashing the state
-[workspace.dependencies.ring]
-version = "0.17.8"
-
-# Used to make working with iterators easier, was already a transitive depdendency
-[workspace.dependencies.itertools]
-version = "0.13.0"
-
-# to parse user-friendly time durations in admin commands
-#TODO: overlaps chrono?
-[workspace.dependencies.cyborgtime]
-version = "2.1.1"
-
-# used to replace the channels of the tokio runtime
-[workspace.dependencies.loole]
-version = "0.3.0"
-
-[workspace.dependencies.async-trait]
-version = "0.1.80"
-
-[workspace.dependencies.lru-cache]
-version = "0.1.2"
-
 # Used for matrix spec type definitions and helpers
-[workspace.dependencies.ruma]
-git = "https://github.com/girlbossceo/ruwuma"
+[dependencies.ruma]
+git = "https://github.com/girlbossceo/ruma"
 branch = "conduwuit-changes"
 features = [
    "compat",
@@ -286,128 +289,61 @@ features = [
    "unstable-extensible-events",
 ]

-[workspace.dependencies.ruma-identifiers-validation]
-git = "https://github.com/girlbossceo/ruwuma"
+[dependencies.ruma-identifiers-validation]
+git = "https://github.com/girlbossceo/ruma"
 branch = "conduwuit-changes"

-[workspace.dependencies.rust-rocksdb]
-path = "deps/rust-rocksdb"
-package = "rust-rocksdb-uwu"
-features = [
-	"multi-threaded-cf",
-	"mt_static",
-	"snappy",
-	"lz4",
-	"zstd",
-	"zlib",
-	"bzip2",
-]
-
-[workspace.dependencies.zstd]
-version = "0.13.1"
-
-# to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
-[workspace.dependencies.axum-server-dual-protocol]
-version = "0.6"
-
-# optional SHA256 media keys feature
-[workspace.dependencies.sha2]
-version = "0.10.8"
-
-# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
-[workspace.dependencies.opentelemetry]
-version = "0.21.0"
-
-[workspace.dependencies.tracing-flame]
-version = "0.2.0"
-
-[workspace.dependencies.tracing-opentelemetry]
-version = "0.22.0"
-
-[workspace.dependencies.opentelemetry_sdk]
-version = "0.21.2"
-features = ["rt-tokio"]
-
-[workspace.dependencies.opentelemetry-jaeger]
-version = "0.20.0"
-features = ["rt-tokio"]
-
-# optional sentry metrics for crash/panic reporting
-[workspace.dependencies.sentry]
-version = "0.32.3"
+[dependencies.hickory-resolver]
+version = "0.24.1"
 default-features = false
-features = [
-    "backtrace",
-    "contexts",
-    "debug-images",
-    "panic",
-    "rustls",
-    "tower",
-    "tower-http",
-    "tracing",
-    "reqwest",
-    "log",
-]

-[workspace.dependencies.sentry-tracing]
-version = "0.32.3"
-[workspace.dependencies.sentry-tower]
-version = "0.32.3"
+[dependencies.rust-rocksdb]
+git = "https://github.com/girlbossceo/rust-rocksdb-zaidoon1"
+rev = "9ecb597d966efb37ed96f4cfe3f09165013fd14a"
+#branch = "master"
+optional = true
+default-features = true
+features = ["multi-threaded-cf", "zstd"]

-# jemalloc usage
-[workspace.dependencies.tikv-jemalloc-sys]
-version = "0.5.4"
-default-features = false
-features = ["stats", "unprefixed_malloc_on_supported_platforms"]
-[workspace.dependencies.tikv-jemallocator]
-version = "0.5.4"
-default-features = false
-features = ["stats", "unprefixed_malloc_on_supported_platforms"]
-[workspace.dependencies.tikv-jemalloc-ctl]
-version = "0.5.4"
-default-features = false
-features = ["use_std"]
-
-[workspace.dependencies.rusqlite]
+[dependencies.rusqlite]
 git = "https://github.com/rusqlite/rusqlite"
 #branch = "master"
 rev = "e00b626e2b1c67347d789fb7f600281705c89381"
+optional = true
 features = ["bundled"]

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

 # used only by rusqlite
-[workspace.dependencies.thread_local]
+[dependencies.thread_local]
 version = "1.1.8"
+optional = true

-[workspace.dependencies.tokio-metrics]
-version = "0.3.1"
-default-features = false
+# used only by rusqlite and rust-rocksdb
+[dependencies.num_cpus]
+version = "1.16.0"

-[workspace.dependencies.console-subscriber]
-version = "0.2"
+[dependencies.tokio]
+version = "1.37.0"
+features = ["fs", "macros", "sync", "signal"]

-[workspace.dependencies.nix]
-version = "0.28.0"
-features = ["resource"]
+# *nix-specific dependencies
+[target.'cfg(unix)'.dependencies]
+nix = { version = "0.28.0", features = ["resource"] }
+sd-notify = { version = "0.4.1", optional = true }    # systemd is only available/relevant on *nix platforms

-[workspace.dependencies.sd-notify]
-version = "0.4.1"

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

-#
-# Patches
-#

 # backport of [https://github.com/tokio-rs/tracing/pull/2956] to the 0.1.x branch of tracing.
 # we can switch back to upstream if #2956 is merged and backported in the upstream repo.
@@ -421,219 +357,166 @@ branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
 git = "https://github.com/girlbossceo/tracing"
 branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"

+[features]
+default = [
+    "backend_rocksdb",
+    "systemd",
+    "element_hacks",
+    "sentry_telemetry",
+    "gzip_compression",
+    "brotli_compression",
+    "zstd_compression",
+    "release_max_log_level",
+    "io_uring",
+]
+backend_sqlite = ["sqlite"]
+backend_rocksdb = ["rocksdb"]
+rocksdb = ["dep:rust-rocksdb"]
+jemalloc = [
+    "dep:tikv-jemalloc-sys",
+    "dep:tikv-jemalloc-ctl",
+    "dep:tikv-jemallocator",
+    "rust-rocksdb/jemalloc",
+]
+jemalloc_prof = ["tikv-jemalloc-sys/profiling"]
+sqlite = ["dep:rusqlite", "dep:parking_lot", "dep:thread_local"]
+systemd = ["dep:sd-notify"]
+sentry_telemetry = ["dep:sentry", "dep:sentry-tracing", "dep:sentry-tower"]
+
+gzip_compression = ["tower-http/compression-gzip", "reqwest/gzip"]
+zstd_compression = ["tower-http/compression-zstd"]
+brotli_compression = ["tower-http/compression-br", "reqwest/brotli"]
+
+sha256_media = ["dep:sha2"]
+io_uring = ["rust-rocksdb/io-uring"]
+axum_dual_protocol = ["dep:axum-server-dual-protocol"]
+
+perf_measurements = [
+    "dep:opentelemetry",
+    "dep:tracing-flame",
+    "dep:tracing-opentelemetry",
+    "dep:opentelemetry_sdk",
+    "dep:opentelemetry-jaeger",
+]
+
+# enable the tokio_console server
+# incompatible with release_max_log_level
+tokio_console = ["dep:console-subscriber", "tokio/tracing"]
+
+hot_reload = ["dep:hot-lib-reloader"]
+
+hardened_malloc = ["dep:hardened_malloc-rs"]
+
+# increases performance, reduces build times, and reduces binary size by not compiling or
+# genreating code for log level filters that users will generally not use (debug and trace) only in release builds
 #
-# Our crates
+# the expense is obviously losing those log level filters for usage at runtime. debug builds will still have all log levels
+release_max_log_level = [
+    "tracing/max_level_trace",
+    "tracing/release_max_level_info",
+    "log/max_level_trace",
+    "log/release_max_level_info",
+]
+
+# developer feature useful only in debug builds.
+dev_release_log_level = []
+
+# client/server interopability hacks
 #
+## element has various non-spec compliant behaviour
+element_hacks = []

-[workspace.dependencies.conduit-router]
-package = "conduit_router"
-path = "src/router"
-default-features = false

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

-[workspace.dependencies.conduit-api]
-package = "conduit_api"
-path = "src/api"
-default-features = false

-[workspace.dependencies.conduit-service]
-package = "conduit_service"
-path = "src/service"
-default-features = false
+[profile.dev]
+#debug = 0
+lto = 'off'
+codegen-units = 512
+incremental = true
+overflow-checks = true
+#panic = "abort"

-[workspace.dependencies.conduit-database]
-package = "conduit_database"
-path = "src/database"
-default-features = false
-
-[workspace.dependencies.conduit-core]
-package = "conduit_core"
-path = "src/core"
-default-features = false
-
-###############################################################################
-#
-# Release profiles
-#
+# seems to speed up continuous debug compilations
+[profile.dev.build-override]
+opt-level = 3
+[profile.dev.package."*"] # external dependencies
+opt-level = 1
+[profile.dev.package."tokio"]
+opt-level = 3

+# default release profile
 [profile.release]
+lto = 'thin'
+incremental = false
+opt-level = 3
 strip = "symbols"
-lto = "thin"
+control-flow-guard = true # Windows only
+debug = 0

 # release profile with debug symbols
 [profile.release-debuginfo]
 inherits = "release"
-debug = "full"
 strip = "none"
+debug = "full"

+
+# high performance release profile which uses fat LTO across all crates, 1 codegen unit, max opt-level, and optimises across all crates
 [profile.release-high-perf]
 inherits = "release"
-lto = "fat"
+lto = 'fat'
 codegen-units = 1
 panic = "abort"

-# do not use without profile-rustflags enabled
-[profile.release-max-perf]
-inherits = "release"
-strip = "symbols"
-lto = "fat"
-#rustflags = [
-#	'-Ctarget-cpu=native',
-#	'-Ztune-cpu=native',
-#	'-Ctarget-feature=+crt-static',
-#	'-Crelocation-model=static',
-#	'-Ztls-model=local-exec',
-#	'-Zinline-in-all-cgus=true',
-#	'-Zinline-mir=true',
-#	'-Zmir-opt-level=3',
-#	'-Clink-arg=-fuse-ld=gold',
-#	'-Clink-arg=-Wl,--threads',
-#	'-Clink-arg=-Wl,--gc-sections',
-#	'-Clink-arg=-luring',
-#	'-Clink-arg=-lstdc++',
-#	'-Clink-arg=-lc',
-#	'-Ztime-passes',
-#	'-Ztime-llvm-passes',
-#]
-
-[profile.release-max-perf.build-override]
-inherits = "release-max-perf"
-opt-level = 0
-#rustflags = [
-#	'-Ctarget-feature=-crt-static',
-#]
-
-[profile.bench]
-inherits = "release"
-#rustflags = [
-#	"-Cremark=all",
-#	'-Ztime-passes',
-#	'-Ztime-llvm-passes',
-#]
-
-###############################################################################
-#
-# Developer profile
-#
-
-# To enable hot-reloading:
-# 1. Uncomment all of the rustflags here.
-# 2. Uncomment crate-type=dylib in src/*/Cargo.toml and deps/rust-rocksdb/Cargo.toml
-#
-# opt-level, mir-opt-level, validate-mir are not known to interfere with reloading
-# and can be raised if build times are tolerable.
-
-[profile.dev]
-debug = 1
-opt-level = 0
-panic = "unwind"
-debug-assertions = true
-incremental = true
-codegen-units = 64
-#rustflags = [
-#	'--cfg', 'conduit_mods',
-#	'-Ztime-passes',
-#	'-Zmir-opt-level=0',
-#	'-Zvalidate-mir=false',
-#	'-Ztls-model=global-dynamic',
-#	'-Cprefer-dynamic=true',
-#	'-Zstaticlib-prefer-dynamic=true',
-#	'-Zstaticlib-allow-rdylib-deps=true',
-#	'-Zpacked-bundled-libs=false',
-#	'-Zplt=true',
-#	'-Crpath=true',
-#	'-Clink-arg=-Wl,--as-needed',
-#	'-Clink-arg=-Wl,--allow-shlib-undefined',
-#	'-Clink-arg=-Wl,-z,keep-text-section-prefix',
-#	'-Clink-arg=-Wl,-z,lazy',
-#]
-
-[profile.dev.package.conduit_core]
-inherits = "dev"
-incremental = false
-#rustflags = [
-#	'--cfg', 'conduit_mods',
-#	'-Ztime-passes',
-#	'-Zmir-opt-level=0',
-#	'-Ztls-model=initial-exec',
-#	'-Cprefer-dynamic=true',
-#	'-Zstaticlib-prefer-dynamic=true',
-#	'-Zstaticlib-allow-rdylib-deps=true',
-#	'-Zpacked-bundled-libs=false',
-#	'-Zplt=true',
-#	'-Clink-arg=-Wl,--as-needed',
-#	'-Clink-arg=-Wl,--allow-shlib-undefined',
-#	'-Clink-arg=-Wl,-z,lazy',
-#	'-Clink-arg=-Wl,-z,unique',
-#	'-Clink-arg=-Wl,-z,nodlopen',
-#	'-Clink-arg=-Wl,-z,nodelete',
-#]
-
-[profile.dev.package.conduit]
-inherits = "dev"
-incremental = false
-#rustflags = [
-#	'--cfg', 'conduit_mods',
-#	'-Ztime-passes',
-#	'-Zmir-opt-level=0',
-#	'-Zvalidate-mir=false',
-#	'-Ztls-model=global-dynamic',
-#	'-Cprefer-dynamic=true',
-#	'-Zexport-executable-symbols=true',
-#	'-Zplt=true',
-#	'-Crpath=true',
-#	'-Clink-arg=-Wl,--as-needed',
-#	'-Clink-arg=-Wl,--allow-shlib-undefined',
-#	'-Clink-arg=-Wl,--export-dynamic',
-#	'-Clink-arg=-Wl,-z,lazy',
-#]
-
-[profile.dev.package.rust-rocksdb-uwu]
-inherits = "dev"
-debug = 'limited'
-incremental = false
+# For releases also try to max optimizations for dependencies:
+[profile.release-high-perf.build-override]
+debug = 0
+opt-level = 3
 codegen-units = 1
-opt-level = 'z'
-#rustflags = [
-#	'--cfg', 'conduit_mods',
-#	'-Ztls-model=initial-exec',
-#	'-Cprefer-dynamic=true',
-#	'-Zstaticlib-prefer-dynamic=true',
-#	'-Zstaticlib-allow-rdylib-deps=true',
-#	'-Zpacked-bundled-libs=true',
-#	'-Zplt=true',
-#	'-Clink-arg=-Wl,--no-as-needed',
-#	'-Clink-arg=-Wl,--allow-shlib-undefined',
-#	'-Clink-arg=-Wl,-z,lazy',
-#	'-Clink-arg=-Wl,-z,nodlopen',
-#	'-Clink-arg=-Wl,-z,nodelete',
-#]

-[profile.dev.package.'*']
-inherits = "dev"
-debug = 'limited'
-incremental = false
+[profile.release-high-perf.package."*"]
+debug = 0
+opt-level = 3
 codegen-units = 1
-opt-level = 'z'
-#rustflags = [
-#	'--cfg', 'conduit_mods',
-#	'-Ztls-model=global-dynamic',
-#	'-Cprefer-dynamic=true',
-#	'-Zstaticlib-prefer-dynamic=true',
-#	'-Zstaticlib-allow-rdylib-deps=true',
-#	'-Zpacked-bundled-libs=true',
-#	'-Zplt=true',
-#	'-Clink-arg=-Wl,--as-needed',
-#	'-Clink-arg=-Wl,-z,lazy',
-#	'-Clink-arg=-Wl,-z,nodelete',
-#]

-[profile.test]
-incremental = false
+
+[lints]
+workspace = true

 [workspace.lints.rust]
 missing_abi = "warn"
@@ -655,14 +538,10 @@ unreachable_pub = "warn"
 # this seems to suggest broken code and is not working correctly
 unused_braces = "allow"

-# cfgs cannot be limited to features or cargo build --all-features panics for unsuspecting users.
-# cfgs cannot be limited to expected cfgs or their de facto non-transitive/opt-in use-case e.g.
-# tokio_unstable will warn.
-unexpected_cfgs = "allow"
-
 # some sadness
 missing_docs = "allow"

+
 [workspace.lints.clippy]
 # pedantic = "warn"

@@ -734,6 +613,7 @@ unnecessary_box_returns = "warn"
 map_unwrap_or = "warn"
 implicit_clone = "warn"
 match_wildcard_for_single_variants = "warn"
+unnecessary_wraps = "warn"
 match_same_arms = "warn"
 ignored_unit_patterns = "warn"
 redundant_else = "warn"
@@ -750,7 +630,6 @@ manual_let_else = "warn"
 trivially_copy_pass_by_ref = "warn"
 wildcard_imports = "warn"
 checked_conversions = "warn"
-let_underscore_must_use = "warn"
 #integer_arithmetic = "warn"
 #as_conversions = "warn"

@@ -768,7 +647,7 @@ mod_module_files = "allow"
 unwrap_used = "allow"
 expect_used = "allow"
 if_then_some_else_none = "allow"
-let_underscore_future = "allow"
+let_underscore_must_use = "allow"
 map_err_ignore = "allow"
 missing_docs_in_private_items = "allow"
 multiple_inherent_impl = "allow"
@@ -776,4 +655,3 @@ error_impl_error = "allow"
 string_add = "allow"
 string_slice = "allow"
 ref_patterns = "allow"
-unnecessary_wraps = "allow"
@@ -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
@@ -70,7 +70,7 @@ ci() {
        --inputs-from "$toplevel"

        # Keep sorted
-        "$toplevel#devShells.x86_64-linux.all-features"
+        "$toplevel#devShells.x86_64-linux.default"
        attic#default
        nixpkgs#direnv
        nixpkgs#jq
@@ -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
@@ -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,27 +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
-    ln -s -v "$CONDUWUIT_DATABASE_PATH" "/var/lib/matrix-conduit"
-
-    chown -v conduwuit:conduwuit -R "$CONDUWUIT_DATABASE_PATH"
-    chown -v conduwuit:conduwuit -R "$CONDUWUIT_CONFIG_PATH"
-
-    chmod -v 740 "$CONDUWUIT_DATABASE_PATH"
-
-    echo ''
-    echo 'Make sure you edit the example config at /etc/conduwuit/conduwuit.toml before starting!'
-    echo 'To start the server, run: systemctl start conduwuit.service'
-    echo ''
-
+    # and permissions.
+    mkdir -p "$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,35 +0,0 @@
-[package]
-name = "rust-rocksdb-uwu"
-version = "0.0.1"
-edition = "2021"
-
-[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"
-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,4 +16,3 @@
 - [Development](development.md)
    - [Contributing](contributing.md)
    - [Testing](development/testing.md)
-    - [Hot Reloading ("Live" Development)](development/hot_reload.md)
@@ -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,7 +43,7 @@ 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

@@ -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"
@@ -145,15 +145,3 @@ cargo test \
    -- \
    --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,91 +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.
-workspaceMembers = builtins.map (member: "${inputs.self}/src/${member}")
-  (builtins.attrNames (builtins.readDir "${inputs.self}/src"));
-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 = lib.unique
-  (lib.flatten (builtins.map crateDefaultFeatures workspaceMembers));
-allFeatures = lib.unique
-  (lib.flatten (builtins.map crateFeatures workspaceMembers));
-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";
@@ -102,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
@@ -126,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

@@ -161,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,63 +0,0 @@
-[package]
-name = "conduit_admin"
-version.workspace = true
-edition.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"zstd_compression",
-	"release_max_log_level",
-]
-
-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,305 +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, 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) => {
-			(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: &OwnedRoomId, 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,30 +0,0 @@
-pub(crate) use conduit::utils::HtmlEscape;
-use ruma::OwnedRoomId;
-
-use crate::services;
-
-pub(crate) fn escape_html(s: &str) -> String {
-	s.replace('&', "&amp;")
-		.replace('<', "&lt;")
-		.replace('>', "&gt;")
-}
-
-pub(crate) fn get_room_info(id: &OwnedRoomId) -> (OwnedRoomId, u64, String) {
-	(
-		id.clone(),
-		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()),
-	)
-}
@@ -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,8 +21,7 @@ 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";
@@ -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,66 +0,0 @@
-[package]
-name = "conduit_api"
-version.workspace = true
-edition.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-default = [
-	"element_hacks",
-	"gzip_compression",
-	"brotli_compression",
-	"release_max_log_level",
-]
-
-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]
-argon2.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,11 +1,10 @@
-use std::fmt::Write;
+use std::fmt::Write as _;

-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,
@@ -20,10 +19,9 @@ use tracing::{error, info, warn};

 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
-	client_server::{self, join_room_by_id_helper},
-	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,
 };

@@ -242,8 +240,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 	// If `new_user_displayname_suffix` is set, registration will push whatever
 	// content is set to the user's display name with a space before it
 	if !services().globals.new_user_displayname_suffix().is_empty() {
-		write!(displayname, " {}", services().globals.config.new_user_displayname_suffix)
-			.expect("should be able to write to string buffer");
+		_ = write!(displayname, " {}", services().globals.config.new_user_displayname_suffix);
 	}

 	services()
@@ -291,11 +288,10 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 		.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!(
@@ -306,8 +302,6 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<

 	// 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.");
-
 		if let Some(device_display_name) = &body.initial_device_display_name {
 			if body
 				.initial_device_display_name
@@ -599,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,
-	})
-}
@@ -13,9 +13,8 @@ use ruma::{
 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}`
@@ -66,6 +65,7 @@ pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) ->
 /// - TODO: Update canonical alias event
 pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
 	alias_checks(&body.room_alias, &body.appservice_info).await?;
+
 	if services()
 		.rooms
 		.alias
@@ -99,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:?}");
@@ -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()
@@ -24,7 +24,7 @@ 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`
 ///
@@ -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,
 };

@@ -15,16 +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, make_content_type, sanitise_filename,
-		},
+		content_disposition::{content_disposition_type, make_content_disposition, sanitise_filename},
+		server_name::server_is_ours,
 	},
 	Error, Result, Ruma, RumaResponse,
 };
@@ -131,8 +127,6 @@ pub(crate) async fn create_content_route(
 		utils::random_string(MXC_LENGTH)
 	);

-	let content_type = Some(make_content_type(&body.file, &body.content_type).to_owned());
-
 	services()
 		.media
 		.create(
@@ -143,18 +137,20 @@ pub(crate) async fn create_content_route(
 				.map(|filename| {
 					format!(
 						"{}; filename={}",
-						content_disposition_type(&body.file, &content_type),
+						content_disposition_type(&body.file, &body.content_type),
 						sanitise_filename(filename.to_owned())
 					)
 				})
 				.as_deref(),
-			content_type.as_deref(),
+			body.content_type.as_deref(),
 			&body.file,
 		)
 		.await?;

+	let content_uri = mxc.into();
+
 	Ok(create_content::v3::Response {
-		content_uri: mxc.into(),
+		content_uri,
 		blurhash: None,
 	})
 }
@@ -192,8 +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(&file, &content_type, content_disposition, None));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content::v3::Response {
 			file,
@@ -220,13 +215,11 @@ pub(crate) async fn get_content_route(body: Ruma<get_content::v3::Request>) -> R
 			&response.file,
 			&response.content_type,
 			response.content_disposition,
-			None,
 		));
-		let content_type = Some(make_content_type(&response.file, &response.content_type).to_owned());

 		Ok(get_content::v3::Response {
 			file: response.file,
-			content_type,
+			content_type: response.content_type,
 			content_disposition,
 			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 			cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
@@ -273,13 +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(
-			&file,
-			&content_type,
-			content_disposition,
-			Some(body.filename.clone()),
-		));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content_as_filename::v3::Response {
 			file,
@@ -303,15 +290,11 @@ pub(crate) async fn get_content_as_filename_route(
 					&remote_content_response.file,
 					&remote_content_response.content_type,
 					remote_content_response.content_disposition,
-					None,
 				));
-				let content_type = Some(
-					make_content_type(&remote_content_response.file, &remote_content_response.content_type).to_owned(),
-				);

 				Ok(get_content_as_filename::v3::Response {
 					content_disposition,
-					content_type,
+					content_type: remote_content_response.content_type,
 					file: remote_content_response.file,
 					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 					cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
@@ -375,8 +358,7 @@ pub(crate) async fn get_content_thumbnail_route(
 		)
 		.await?
 	{
-		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition, None));
-		let content_type = Some(make_content_type(&file, &content_type).to_owned());
+		let content_disposition = Some(make_content_disposition(&file, &content_type, content_disposition));

 		Ok(get_content_thumbnail::v3::Response {
 			file,
@@ -389,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.
@@ -432,15 +414,11 @@ pub(crate) async fn get_content_thumbnail_route(
 					&get_thumbnail_response.file,
 					&get_thumbnail_response.content_type,
 					get_thumbnail_response.content_disposition,
-					None,
 				));
-				let content_type = Some(
-					make_content_type(&get_thumbnail_response.file, &get_thumbnail_response.content_type).to_owned(),
-				);

 				Ok(get_content_thumbnail::v3::Response {
 					file: get_thumbnail_response.file,
-					content_type,
+					content_type: get_thumbnail_response.content_type,
 					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 					cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
 					content_disposition,
@@ -506,25 +484,22 @@ async fn get_remote_content(
 		&content_response.file,
 		&content_response.content_type,
 		content_response.content_disposition,
-		None,
 	));

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

 	Ok(get_content::v3::Response {
 		file: content_response.file,
-		content_type,
+		content_type: content_response.content_type,
 		content_disposition,
 		cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 		cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
@@ -35,12 +35,9 @@ use tracing::{debug, error, info, trace, warn};

 use super::get_alias_helper;
 use crate::{
-	service::{
-		pdu::{gen_event_id_canonical_json, PduBuilder},
-		server_is_ours, user_is_local,
-	},
+	service::pdu::{gen_event_id_canonical_json, PduBuilder},
 	services,
-	utils::{self},
+	utils::{self, server_name::server_is_ours, user_id::user_is_local},
 	Error, PduEvent, Result, Ruma,
 };

@@ -80,9 +77,7 @@ async fn banned_room_check(user_id: &UserId, room_id: Option<&RoomId>, server_na

 					// ignore errors
 					leave_all_rooms(user_id).await;
-					if let Err(e) = services().users.deactivate_account(user_id) {
-						warn!(%e, "Failed to deactivate account");
-					}
+					_ = services().users.deactivate_account(user_id);
 				}

 				return Err(Error::BadRequest(
@@ -117,9 +112,7 @@ async fn banned_room_check(user_id: &UserId, room_id: Option<&RoomId>, server_na

 					// ignore errors
 					leave_all_rooms(user_id).await;
-					if let Err(e) = services().users.deactivate_account(user_id) {
-						warn!(%e, "Failed to deactivate account");
-					}
+					_ = services().users.deactivate_account(user_id);
 				}

 				return Err(Error::BadRequest(
@@ -614,7 +607,7 @@ pub(crate) async fn joined_members_route(
 	})
 }

-pub async fn join_room_by_id_helper(
+pub(crate) async fn join_room_by_id_helper(
 	sender_user: Option<&UserId>, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName],
 	_third_party_signed: Option<&ThirdPartySigned>,
 ) -> Result<join_room_by_id::v3::Response> {
@@ -1532,7 +1525,7 @@ pub(crate) async fn invite_helper(

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

 		// ignore errors
-		if let Err(e) = services().rooms.state_cache.forget(&room_id, user_id) {
-			warn!(%e, "Failed to forget room");
-		}
-		if let Err(e) = leave_room(user_id, &room_id, None).await {
-			warn!(%e, "Failed to leave room");
-		}
+		_ = services().rooms.state_cache.forget(&room_id, user_id);
+		_ = leave_room(user_id, &room_id, None).await;
 	}
 }

-pub async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<String>) -> Result<()> {
+pub(crate) async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<String>) -> Result<()> {
 	// Ask a remote server if we don't have this room
 	if !services()
 		.rooms
@@ -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}`
 ///
@@ -1,41 +1,40 @@
-pub(crate) mod account;
-pub(crate) mod alias;
-pub(crate) mod backup;
-pub(crate) mod capabilities;
-pub(crate) mod config;
-pub(crate) mod context;
-pub(crate) mod device;
-pub(crate) mod directory;
-pub(crate) mod filter;
-pub(crate) mod keys;
-pub(crate) mod media;
-pub(crate) mod membership;
-pub(crate) mod message;
-pub(crate) mod presence;
-pub(crate) mod profile;
-pub(crate) mod push;
-pub(crate) mod read_marker;
-pub(crate) mod redact;
-pub(crate) mod relations;
-pub(crate) mod report;
-pub(crate) mod room;
-pub(crate) mod search;
-pub(crate) mod session;
-pub(crate) mod space;
-pub(crate) mod state;
-pub(crate) mod sync;
-pub(crate) mod tag;
-pub(crate) mod thirdparty;
-pub(crate) mod threads;
-pub(crate) mod to_device;
-pub(crate) mod typing;
-pub(crate) mod unstable;
-pub(crate) mod unversioned;
-pub(crate) mod user_directory;
-pub(crate) mod voip;
+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 use alias::get_alias_helper;
 pub(crate) use alias::*;
 pub(crate) use backup::*;
 pub(crate) use capabilities::*;
@@ -47,7 +46,6 @@ pub(crate) use filter::*;
 pub(crate) use keys::*;
 pub(crate) use media::*;
 pub(crate) use membership::*;
-pub use membership::{join_room_by_id_helper, leave_all_rooms, leave_room};
 pub(crate) use message::*;
 pub(crate) use presence::*;
 pub(crate) use profile::*;
@@ -79,4 +77,7 @@ const DEVICE_ID_LENGTH: usize = 10;
 const TOKEN_LENGTH: usize = 32;

 /// generated user session ID length
-const SESSION_ID_LENGTH: usize = service::uiaa::SESSION_ID_LENGTH;
+pub(crate) const SESSION_ID_LENGTH: usize = 32;
+
+/// auto-generated password length
+pub(crate) const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
@@ -12,12 +12,8 @@ use ruma::{
 	presence::PresenceState,
 };
 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`
 ///
@@ -83,14 +79,11 @@ pub(crate) async fn set_displayname_route(
 		);
 		let state_lock = mutex_state.lock().await;

-		if let Err(e) = services()
+		_ = services()
 			.rooms
 			.timeline
 			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
-			.await
-		{
-			warn!(%e, "Failed to update/send new display name in room");
-		}
+			.await;
 	}

 	if services().globals.allow_local_presence() {
@@ -228,14 +221,11 @@ pub(crate) async fn set_avatar_url_route(
 		);
 		let state_lock = mutex_state.lock().await;

-		if let Err(e) = services()
+		_ = services()
 			.rooms
 			.timeline
 			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
-			.await
-		{
-			warn!(%e, "Failed to set/update room with new avatar URL / pfp");
-		}
+			.await;
 	}

 	if services().globals.allow_local_presence() {
@@ -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`
 ///
@@ -1,6 +1,5 @@
 use std::{cmp::max, collections::BTreeMap, sync::Arc};

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

 use crate::{
-	client_server::invite_helper,
+	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,9 +460,7 @@ 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
@@ -817,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(
@@ -18,7 +18,7 @@ use ruma::{
 	UserId,
 };
 use serde::Deserialize;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};

 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::{services, utils, Error, Result, Ruma};
@@ -76,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
@@ -87,15 +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"));
 			}

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

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

@@ -115,10 +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}`
@@ -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.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))]
@@ -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,
@@ -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}`
 ///
@@ -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),
 		]),
 	};

@@ -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",
+		"name": "Conduwuit",
 		"version": conduwuit_version(),
 	})))
 }
-
-/// # `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
-	})))
-}
@@ -1,15 +1,3 @@
-pub mod client_server;
-pub mod router;
-mod ruma_wrapper;
-pub mod server_server;
-
-extern crate conduit_core as conduit;
-extern crate conduit_service as service;
-
-pub use client_server::membership::{join_room_by_id_helper, leave_all_rooms};
-pub(crate) use conduit::{debug_error, debug_info, debug_warn, error::RumaResponse, utils, Error, Result};
-pub(crate) use ruma_wrapper::Ruma;
-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,252 +0,0 @@
-use std::collections::BTreeMap;
-
-use axum::RequestPartsExt;
-use axum_extra::{headers::Authorization, typed_header::TypedHeaderRejectionReason, TypedHeader};
-use http::uri::PathAndQuery;
-use ruma::{
-	api::{client::error::ErrorKind, AuthScheme, IncomingRequest},
-	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) sender_user: Option<OwnedUserId>,
-	pub(super) sender_device: Option<OwnedDeviceId>,
-	pub(super) origin: Option<OwnedServerName>,
-	pub(super) appservice_info: Option<RegistrationInfo>,
-}
-
-pub(super) async fn auth<T>(request: &mut Request) -> Result<Auth>
-where
-	T: IncomingRequest,
-{
-	let metadata = T::METADATA;
-	let token = match &request.auth {
-		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 {
-				sender_user: None,
-				sender_device: None,
-				origin: None,
-				appservice_info: Some(*info),
-			})
-		},
-		(AuthScheme::AccessToken, Token::None) => {
-			Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token."))
-		},
-		(
-			AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::None,
-			Token::User((user_id, device_id)),
-		) => Ok(Auth {
-			sender_user: Some(user_id),
-			sender_device: Some(device_id),
-			origin: None,
-			appservice_info: None,
-		}),
-		(AuthScheme::ServerSignatures, Token::None) => Ok(auth_server(request).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: &mut 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 {
-		sender_user: Some(user_id),
-		sender_device: None,
-		origin: None,
-		appservice_info: Some(*info),
-	})
-}
-
-async fn auth_server(request: &mut Request) -> 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_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(
-		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(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) = &request.json {
-		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(()) => Ok(Auth {
-			sender_user: None,
-			sender_device: None,
-			origin: Some(x_matrix.origin),
-			appservice_info: None,
-		}),
-		Err(e) => {
-			warn!("Failed to verify json request from {}: {e}\n{request_map:?}", x_matrix.origin);
-
-			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,21 +1,17 @@
-mod auth;
-mod request;
-mod xmatrix;
-
 use std::ops::Deref;

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

-use crate::service::appservice::RegistrationInfo;
+use crate::{service::appservice::RegistrationInfo, Error};
+
+mod axum;

 /// Extractor for Ruma request structs
 pub(crate) struct Ruma<T> {
-	/// Request struct body
 	pub(crate) body: T,
 	pub(crate) sender_user: Option<OwnedUserId>,
 	pub(crate) sender_device: Option<OwnedDeviceId>,
-	/// X-Matrix origin/server
-	pub(crate) origin: Option<OwnedServerName>,
+	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>,
 }
@@ -25,3 +21,14 @@ impl<T> Deref for Ruma<T> {

 	fn deref(&self) -> &Self::Target { &self.body }
 }
+
+#[derive(Clone)]
+pub(crate) struct RumaResponse<T>(pub(crate) T);
+
+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() }
+}
@@ -1,149 +0,0 @@
-use std::{mem, str};
-
-use axum::{
-	async_trait,
-	extract::{FromRequest, Path},
-	RequestExt, RequestPartsExt,
-};
-use axum_extra::{
-	headers::{authorization::Bearer, Authorization},
-	TypedHeader,
-};
-use bytes::{BufMut, Bytes, BytesMut};
-use conduit::debug_warn;
-use http::request::Parts;
-use ruma::{
-	api::{client::error::ErrorKind, IncomingRequest},
-	CanonicalJsonValue, UserId,
-};
-use serde::Deserialize;
-use tracing::{debug, trace, warn};
-
-use super::{auth, auth::Auth, Ruma};
-use crate::{services, Error, Result};
-
-#[derive(Deserialize)]
-pub(super) struct QueryParams {
-	pub(super) access_token: Option<String>,
-	pub(super) user_id: Option<String>,
-}
-
-pub(super) struct Request {
-	pub(super) auth: Option<TypedHeader<Authorization<Bearer>>>,
-	pub(super) path: Path<Vec<String>>,
-	pub(super) query: QueryParams,
-	pub(super) json: Option<CanonicalJsonValue>,
-	pub(super) body: Bytes,
-	pub(super) parts: Parts,
-}
-
-#[async_trait]
-impl<T, S> FromRequest<S, axum::body::Body> for Ruma<T>
-where
-	T: IncomingRequest,
-{
-	type Rejection = Error;
-
-	async fn from_request(request: hyper::Request<axum::body::Body>, _state: &S) -> Result<Self, Self::Rejection> {
-		let mut request: Request = extract(request).await?;
-		let auth: Auth = auth::auth::<T>(&mut request).await?;
-		let body = make_body::<T>(&mut request, &auth)?;
-		Ok(Ruma {
-			body,
-			sender_user: auth.sender_user,
-			sender_device: auth.sender_device,
-			origin: auth.origin,
-			json_body: request.json,
-			appservice_info: auth.appservice_info,
-		})
-	}
-}
-
-fn make_body<T>(request: &mut Request, auth: &Auth) -> Result<T>
-where
-	T: IncomingRequest,
-{
-	let body = if let Some(CanonicalJsonValue::Object(json_body)) = &mut request.json {
-		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")
-		});
-
-		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, &request.json).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(), request.json);
-	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: {:?}", request.json);
-		Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
-	})?;
-
-	Ok(body)
-}
-
-async fn extract(request: hyper::Request<axum::body::Body>) -> Result<Request> {
-	let limited = request.with_limited_body();
-	let (mut parts, body) = limited.into_parts();
-
-	let auth = parts.extract().await?;
-	let path = parts.extract().await?;
-	let query = serde_html_form::from_str(parts.uri.query().unwrap_or_default())
-		.map_err(|_| Error::BadRequest(ErrorKind::Unknown, "Failed to read query parameters"))?;
-
-	let max_body_size = services()
-		.globals
-		.config
-		.max_request_size
-		.try_into()
-		.expect("failed to convert max request size");
-
-	let body = axum::body::to_bytes(body, max_body_size)
-		.await
-		.map_err(|_| Error::BadRequest(ErrorKind::TooLarge, "Request body too large"))?;
-
-	let json = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
-
-	Ok(Request {
-		auth,
-		path,
-		query,
-		json,
-		body,
-		parts,
-	})
-}
@@ -1,61 +0,0 @@
-use std::str;
-
-use axum_extra::headers::authorization::Credentials;
-use ruma::OwnedServerName;
-use tracing::debug;
-
-pub(crate) struct XMatrix {
-	pub(crate) origin: OwnedServerName,
-	pub(crate) destination: Option<String>,
-	pub(crate) key: String, // KeyName?
-	pub(crate) 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!() }
-}
@@ -3,9 +3,9 @@ use std::path::Path; // not unix specific, just only for UNIX sockets stuff and

 use tracing::{debug, error, info, warn};

-use crate::{error::Error, Config};
+use crate::{utils::error::Error, Config};

-pub fn check(config: &Config) -> Result<(), Error> {
+pub(crate) fn check(config: &Config) -> Result<(), Error> {
 	config.warn_deprecated();
 	config.warn_unknown_key();

@@ -1,7 +1,7 @@
 use std::{
 	collections::BTreeMap,
 	fmt::{self, Write as _},
-	net::{IpAddr, Ipv6Addr, SocketAddr},
+	net::{IpAddr, Ipv4Addr, SocketAddr},
 	path::PathBuf,
 };

@@ -22,12 +22,11 @@ use serde::{de::IgnoredAny, Deserialize};
 use tracing::{debug, error, warn};
 use url::Url;

-pub use self::check::check;
-use self::proxy::ProxyConfig;
-use crate::error::Error;
+use self::{check::check, proxy::ProxyConfig};
+use crate::utils::error::Error;

-pub mod check;
-pub mod proxy;
+pub(crate) mod check;
+mod proxy;

 #[derive(Deserialize, Clone, Debug)]
 #[serde(transparent)]
@@ -39,310 +38,310 @@ struct ListeningPort {
 /// all the config options for conduwuit
 #[derive(Clone, Debug, Deserialize)]
 #[allow(clippy::struct_excessive_bools)]
-pub struct Config {
+pub(crate) struct Config {
 	/// [`IpAddr`] conduwuit will listen on (can be IPv4 or IPv6)
 	#[serde(default = "default_address")]
-	pub address: IpAddr,
+	pub(crate) address: IpAddr,
 	/// default TCP port(s) conduwuit will listen on
 	#[serde(default = "default_port")]
 	port: ListeningPort,
-	pub tls: Option<TlsConfig>,
-	pub unix_socket_path: Option<PathBuf>,
+	pub(crate) tls: Option<TlsConfig>,
+	pub(crate) unix_socket_path: Option<PathBuf>,
 	#[serde(default = "default_unix_socket_perms")]
-	pub unix_socket_perms: u32,
-	pub server_name: OwnedServerName,
+	pub(crate) unix_socket_perms: u32,
+	pub(crate) server_name: OwnedServerName,
 	#[serde(default = "default_database_backend")]
-	pub database_backend: String,
-	pub database_path: PathBuf,
-	pub database_backup_path: Option<PathBuf>,
+	pub(crate) database_backend: String,
+	pub(crate) database_path: PathBuf,
+	pub(crate) database_backup_path: Option<PathBuf>,
 	#[serde(default = "default_database_backups_to_keep")]
-	pub database_backups_to_keep: i16,
+	pub(crate) database_backups_to_keep: i16,
 	#[serde(default = "default_db_cache_capacity_mb")]
-	pub db_cache_capacity_mb: f64,
+	pub(crate) db_cache_capacity_mb: f64,
 	#[serde(default = "default_new_user_displayname_suffix")]
-	pub new_user_displayname_suffix: String,
+	pub(crate) new_user_displayname_suffix: String,
 	#[serde(default)]
-	pub allow_check_for_updates: bool,
+	pub(crate) allow_check_for_updates: bool,

 	#[serde(default = "default_pdu_cache_capacity")]
-	pub pdu_cache_capacity: u32,
+	pub(crate) pdu_cache_capacity: u32,
 	#[serde(default = "default_conduit_cache_capacity_modifier")]
-	pub conduit_cache_capacity_modifier: f64,
+	pub(crate) conduit_cache_capacity_modifier: f64,
 	#[serde(default = "default_auth_chain_cache_capacity")]
-	pub auth_chain_cache_capacity: u32,
+	pub(crate) auth_chain_cache_capacity: u32,
 	#[serde(default = "default_shorteventid_cache_capacity")]
-	pub shorteventid_cache_capacity: u32,
+	pub(crate) shorteventid_cache_capacity: u32,
 	#[serde(default = "default_eventidshort_cache_capacity")]
-	pub eventidshort_cache_capacity: u32,
+	pub(crate) eventidshort_cache_capacity: u32,
 	#[serde(default = "default_shortstatekey_cache_capacity")]
-	pub shortstatekey_cache_capacity: u32,
+	pub(crate) shortstatekey_cache_capacity: u32,
 	#[serde(default = "default_statekeyshort_cache_capacity")]
-	pub statekeyshort_cache_capacity: u32,
+	pub(crate) statekeyshort_cache_capacity: u32,
 	#[serde(default = "default_server_visibility_cache_capacity")]
-	pub server_visibility_cache_capacity: u32,
+	pub(crate) server_visibility_cache_capacity: u32,
 	#[serde(default = "default_user_visibility_cache_capacity")]
-	pub user_visibility_cache_capacity: u32,
+	pub(crate) user_visibility_cache_capacity: u32,
 	#[serde(default = "default_stateinfo_cache_capacity")]
-	pub stateinfo_cache_capacity: u32,
+	pub(crate) stateinfo_cache_capacity: u32,
 	#[serde(default = "default_roomid_spacehierarchy_cache_capacity")]
-	pub roomid_spacehierarchy_cache_capacity: u32,
+	pub(crate) roomid_spacehierarchy_cache_capacity: u32,

 	#[serde(default = "default_cleanup_second_interval")]
-	pub cleanup_second_interval: u32,
+	pub(crate) cleanup_second_interval: u32,

 	#[serde(default = "default_dns_cache_entries")]
-	pub dns_cache_entries: u32,
+	pub(crate) dns_cache_entries: u32,
 	#[serde(default = "default_dns_min_ttl")]
-	pub dns_min_ttl: u64,
+	pub(crate) dns_min_ttl: u64,
 	#[serde(default = "default_dns_min_ttl_nxdomain")]
-	pub dns_min_ttl_nxdomain: u64,
+	pub(crate) dns_min_ttl_nxdomain: u64,
 	#[serde(default = "default_dns_attempts")]
-	pub dns_attempts: u16,
+	pub(crate) dns_attempts: u16,
 	#[serde(default = "default_dns_timeout")]
-	pub dns_timeout: u64,
+	pub(crate) dns_timeout: u64,
 	#[serde(default = "true_fn")]
-	pub dns_tcp_fallback: bool,
+	pub(crate) dns_tcp_fallback: bool,
 	#[serde(default = "true_fn")]
-	pub query_all_nameservers: bool,
+	pub(crate) query_all_nameservers: bool,
 	#[serde(default)]
-	pub query_over_tcp_only: bool,
+	pub(crate) query_over_tcp_only: bool,
 	#[serde(default = "default_ip_lookup_strategy")]
-	pub ip_lookup_strategy: u8,
+	pub(crate) ip_lookup_strategy: u8,

 	#[serde(default = "default_max_request_size")]
-	pub max_request_size: u32,
+	pub(crate) max_request_size: u32,
 	#[serde(default = "default_max_fetch_prev_events")]
-	pub max_fetch_prev_events: u16,
+	pub(crate) max_fetch_prev_events: u16,

 	#[serde(default = "default_request_conn_timeout")]
-	pub request_conn_timeout: u64,
+	pub(crate) request_conn_timeout: u64,
 	#[serde(default = "default_request_timeout")]
-	pub request_timeout: u64,
+	pub(crate) request_timeout: u64,
 	#[serde(default = "default_request_total_timeout")]
-	pub request_total_timeout: u64,
+	pub(crate) request_total_timeout: u64,
 	#[serde(default = "default_request_idle_timeout")]
-	pub request_idle_timeout: u64,
+	pub(crate) request_idle_timeout: u64,
 	#[serde(default = "default_request_idle_per_host")]
-	pub request_idle_per_host: u16,
+	pub(crate) request_idle_per_host: u16,
 	#[serde(default = "default_well_known_conn_timeout")]
-	pub well_known_conn_timeout: u64,
+	pub(crate) well_known_conn_timeout: u64,
 	#[serde(default = "default_well_known_timeout")]
-	pub well_known_timeout: u64,
+	pub(crate) well_known_timeout: u64,
 	#[serde(default = "default_federation_timeout")]
-	pub federation_timeout: u64,
+	pub(crate) federation_timeout: u64,
 	#[serde(default = "default_federation_idle_timeout")]
-	pub federation_idle_timeout: u64,
+	pub(crate) federation_idle_timeout: u64,
 	#[serde(default = "default_federation_idle_per_host")]
-	pub federation_idle_per_host: u16,
+	pub(crate) federation_idle_per_host: u16,
 	#[serde(default = "default_sender_timeout")]
-	pub sender_timeout: u64,
+	pub(crate) sender_timeout: u64,
 	#[serde(default = "default_sender_idle_timeout")]
-	pub sender_idle_timeout: u64,
+	pub(crate) sender_idle_timeout: u64,
 	#[serde(default = "default_sender_retry_backoff_limit")]
-	pub sender_retry_backoff_limit: u64,
+	pub(crate) sender_retry_backoff_limit: u64,
 	#[serde(default = "default_appservice_timeout")]
-	pub appservice_timeout: u64,
+	pub(crate) appservice_timeout: u64,
 	#[serde(default = "default_appservice_idle_timeout")]
-	pub appservice_idle_timeout: u64,
+	pub(crate) appservice_idle_timeout: u64,
 	#[serde(default = "default_pusher_idle_timeout")]
-	pub pusher_idle_timeout: u64,
+	pub(crate) pusher_idle_timeout: u64,

 	#[serde(default)]
-	pub allow_registration: bool,
+	pub(crate) allow_registration: bool,
 	#[serde(default)]
-	pub yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse: bool,
-	pub registration_token: Option<String>,
+	pub(crate) yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse: bool,
+	pub(crate) registration_token: Option<String>,
 	#[serde(default = "true_fn")]
-	pub allow_encryption: bool,
+	pub(crate) allow_encryption: bool,
 	#[serde(default = "true_fn")]
-	pub allow_federation: bool,
+	pub(crate) allow_federation: bool,
 	#[serde(default)]
-	pub allow_public_room_directory_over_federation: bool,
+	pub(crate) allow_public_room_directory_over_federation: bool,
 	#[serde(default)]
-	pub allow_public_room_directory_without_auth: bool,
+	pub(crate) allow_public_room_directory_without_auth: bool,
 	#[serde(default)]
-	pub lockdown_public_room_directory: bool,
+	pub(crate) lockdown_public_room_directory: bool,
 	#[serde(default)]
-	pub allow_device_name_federation: bool,
+	pub(crate) allow_device_name_federation: bool,
 	#[serde(default = "true_fn")]
-	pub allow_profile_lookup_federation_requests: bool,
+	pub(crate) allow_profile_lookup_federation_requests: bool,
 	#[serde(default = "true_fn")]
-	pub allow_room_creation: bool,
+	pub(crate) allow_room_creation: bool,
 	#[serde(default = "true_fn")]
-	pub allow_unstable_room_versions: bool,
+	pub(crate) allow_unstable_room_versions: bool,
 	#[serde(default = "default_default_room_version")]
-	pub default_room_version: RoomVersionId,
+	pub(crate) default_room_version: RoomVersionId,
 	#[serde(default)]
-	pub well_known: WellKnownConfig,
+	pub(crate) well_known: WellKnownConfig,
 	#[serde(default)]
 	#[cfg(feature = "perf_measurements")]
-	pub allow_jaeger: bool,
+	pub(crate) allow_jaeger: bool,
 	#[serde(default)]
 	#[cfg(feature = "perf_measurements")]
-	pub tracing_flame: bool,
+	pub(crate) tracing_flame: bool,
 	#[serde(default = "default_tracing_flame_filter")]
 	#[cfg(feature = "perf_measurements")]
-	pub tracing_flame_filter: String,
+	pub(crate) tracing_flame_filter: String,
 	#[serde(default = "default_tracing_flame_output_path")]
 	#[cfg(feature = "perf_measurements")]
-	pub tracing_flame_output_path: String,
+	pub(crate) tracing_flame_output_path: String,
 	#[serde(default)]
-	pub proxy: ProxyConfig,
-	pub jwt_secret: Option<String>,
+	pub(crate) proxy: ProxyConfig,
+	pub(crate) jwt_secret: Option<String>,
 	#[serde(default = "default_trusted_servers")]
-	pub trusted_servers: Vec<OwnedServerName>,
+	pub(crate) trusted_servers: Vec<OwnedServerName>,
 	#[serde(default = "true_fn")]
-	pub query_trusted_key_servers_first: bool,
+	pub(crate) query_trusted_key_servers_first: bool,
 	#[serde(default = "default_log")]
-	pub log: String,
+	pub(crate) log: String,
 	#[serde(default)]
-	pub turn_username: String,
+	pub(crate) turn_username: String,
 	#[serde(default)]
-	pub turn_password: String,
+	pub(crate) turn_password: String,
 	#[serde(default = "Vec::new")]
-	pub turn_uris: Vec<String>,
+	pub(crate) turn_uris: Vec<String>,
 	#[serde(default)]
-	pub turn_secret: String,
+	pub(crate) turn_secret: String,
 	#[serde(default = "default_turn_ttl")]
-	pub turn_ttl: u64,
+	pub(crate) turn_ttl: u64,

 	#[serde(default = "Vec::new")]
-	pub auto_join_rooms: Vec<OwnedRoomId>,
+	pub(crate) auto_join_rooms: Vec<OwnedRoomId>,
 	#[serde(default)]
-	pub auto_deactivate_banned_room_attempts: bool,
+	pub(crate) auto_deactivate_banned_room_attempts: bool,

 	#[serde(default = "default_rocksdb_log_level")]
-	pub rocksdb_log_level: String,
+	pub(crate) rocksdb_log_level: String,
 	#[serde(default)]
-	pub rocksdb_log_stderr: bool,
+	pub(crate) rocksdb_log_stderr: bool,
 	#[serde(default = "default_rocksdb_max_log_file_size")]
-	pub rocksdb_max_log_file_size: usize,
+	pub(crate) rocksdb_max_log_file_size: usize,
 	#[serde(default = "default_rocksdb_log_time_to_roll")]
-	pub rocksdb_log_time_to_roll: usize,
+	pub(crate) rocksdb_log_time_to_roll: usize,
 	#[serde(default)]
-	pub rocksdb_optimize_for_spinning_disks: bool,
+	pub(crate) rocksdb_optimize_for_spinning_disks: bool,
 	#[serde(default = "true_fn")]
-	pub rocksdb_direct_io: bool,
+	pub(crate) rocksdb_direct_io: bool,
 	#[serde(default = "default_rocksdb_parallelism_threads")]
-	pub rocksdb_parallelism_threads: usize,
+	pub(crate) rocksdb_parallelism_threads: usize,
 	#[serde(default = "default_rocksdb_max_log_files")]
-	pub rocksdb_max_log_files: usize,
+	pub(crate) rocksdb_max_log_files: usize,
 	#[serde(default = "default_rocksdb_compression_algo")]
-	pub rocksdb_compression_algo: String,
+	pub(crate) rocksdb_compression_algo: String,
 	#[serde(default = "default_rocksdb_compression_level")]
-	pub rocksdb_compression_level: i32,
+	pub(crate) rocksdb_compression_level: i32,
 	#[serde(default = "default_rocksdb_bottommost_compression_level")]
-	pub rocksdb_bottommost_compression_level: i32,
+	pub(crate) rocksdb_bottommost_compression_level: i32,
 	#[serde(default)]
-	pub rocksdb_bottommost_compression: bool,
+	pub(crate) rocksdb_bottommost_compression: bool,
 	#[serde(default = "default_rocksdb_recovery_mode")]
-	pub rocksdb_recovery_mode: u8,
+	pub(crate) rocksdb_recovery_mode: u8,
 	#[serde(default)]
-	pub rocksdb_repair: bool,
+	pub(crate) rocksdb_repair: bool,
 	#[serde(default)]
-	pub rocksdb_read_only: bool,
+	pub(crate) rocksdb_read_only: bool,
 	#[serde(default)]
-	pub rocksdb_periodic_cleanup: bool,
+	pub(crate) rocksdb_periodic_cleanup: bool,
 	#[serde(default)]
-	pub rocksdb_compaction_prio_idle: bool,
+	pub(crate) rocksdb_compaction_prio_idle: bool,
 	#[serde(default = "true_fn")]
-	pub rocksdb_compaction_ioprio_idle: bool,
+	pub(crate) rocksdb_compaction_ioprio_idle: bool,

-	pub emergency_password: Option<String>,
+	pub(crate) emergency_password: Option<String>,

 	#[serde(default = "default_notification_push_path")]
-	pub notification_push_path: String,
+	pub(crate) notification_push_path: String,

 	#[serde(default = "true_fn")]
-	pub allow_local_presence: bool,
+	pub(crate) allow_local_presence: bool,
 	#[serde(default = "true_fn")]
-	pub allow_incoming_presence: bool,
+	pub(crate) allow_incoming_presence: bool,
 	#[serde(default = "true_fn")]
-	pub allow_outgoing_presence: bool,
+	pub(crate) allow_outgoing_presence: bool,
 	#[serde(default = "default_presence_idle_timeout_s")]
-	pub presence_idle_timeout_s: u64,
+	pub(crate) presence_idle_timeout_s: u64,
 	#[serde(default = "default_presence_offline_timeout_s")]
-	pub presence_offline_timeout_s: u64,
+	pub(crate) presence_offline_timeout_s: u64,
 	#[serde(default = "true_fn")]
-	pub presence_timeout_remote_users: bool,
+	pub(crate) presence_timeout_remote_users: bool,

 	#[serde(default = "true_fn")]
-	pub allow_incoming_read_receipts: bool,
+	pub(crate) allow_incoming_read_receipts: bool,
 	#[serde(default = "true_fn")]
-	pub allow_outgoing_read_receipts: bool,
+	pub(crate) allow_outgoing_read_receipts: bool,

 	#[serde(default = "true_fn")]
-	pub allow_outgoing_typing: bool,
+	pub(crate) allow_outgoing_typing: bool,
 	#[serde(default = "true_fn")]
-	pub allow_incoming_typing: bool,
+	pub(crate) allow_incoming_typing: bool,
 	#[serde(default = "default_typing_federation_timeout_s")]
-	pub typing_federation_timeout_s: u64,
+	pub(crate) typing_federation_timeout_s: u64,
 	#[serde(default = "default_typing_client_timeout_min_s")]
-	pub typing_client_timeout_min_s: u64,
+	pub(crate) typing_client_timeout_min_s: u64,
 	#[serde(default = "default_typing_client_timeout_max_s")]
-	pub typing_client_timeout_max_s: u64,
+	pub(crate) typing_client_timeout_max_s: u64,

 	#[serde(default)]
-	pub zstd_compression: bool,
+	pub(crate) zstd_compression: bool,
 	#[serde(default)]
-	pub gzip_compression: bool,
+	pub(crate) gzip_compression: bool,
 	#[serde(default)]
-	pub brotli_compression: bool,
+	pub(crate) brotli_compression: bool,

 	#[serde(default)]
-	pub allow_guest_registration: bool,
+	pub(crate) allow_guest_registration: bool,
 	#[serde(default)]
-	pub log_guest_registrations: bool,
+	pub(crate) log_guest_registrations: bool,
 	#[serde(default)]
-	pub allow_guests_auto_join_rooms: bool,
+	pub(crate) allow_guests_auto_join_rooms: bool,

 	#[serde(default = "Vec::new")]
-	pub prevent_media_downloads_from: Vec<OwnedServerName>,
+	pub(crate) prevent_media_downloads_from: Vec<OwnedServerName>,
 	#[serde(default = "Vec::new")]
-	pub forbidden_remote_server_names: Vec<OwnedServerName>,
+	pub(crate) forbidden_remote_server_names: Vec<OwnedServerName>,
 	#[serde(default = "Vec::new")]
-	pub forbidden_remote_room_directory_server_names: Vec<OwnedServerName>,
+	pub(crate) forbidden_remote_room_directory_server_names: Vec<OwnedServerName>,

 	#[serde(default = "default_ip_range_denylist")]
-	pub ip_range_denylist: Vec<String>,
+	pub(crate) ip_range_denylist: Vec<String>,

 	#[serde(default = "Vec::new")]
-	pub url_preview_domain_contains_allowlist: Vec<String>,
+	pub(crate) url_preview_domain_contains_allowlist: Vec<String>,
 	#[serde(default = "Vec::new")]
-	pub url_preview_domain_explicit_allowlist: Vec<String>,
+	pub(crate) url_preview_domain_explicit_allowlist: Vec<String>,
 	#[serde(default = "Vec::new")]
-	pub url_preview_domain_explicit_denylist: Vec<String>,
+	pub(crate) url_preview_domain_explicit_denylist: Vec<String>,
 	#[serde(default = "Vec::new")]
-	pub url_preview_url_contains_allowlist: Vec<String>,
+	pub(crate) url_preview_url_contains_allowlist: Vec<String>,
 	#[serde(default = "default_url_preview_max_spider_size")]
-	pub url_preview_max_spider_size: usize,
+	pub(crate) url_preview_max_spider_size: usize,
 	#[serde(default)]
-	pub url_preview_check_root_domain: bool,
+	pub(crate) url_preview_check_root_domain: bool,

 	#[serde(default = "RegexSet::empty")]
 	#[serde(with = "serde_regex")]
-	pub forbidden_alias_names: RegexSet,
+	pub(crate) forbidden_alias_names: RegexSet,

 	#[serde(default = "RegexSet::empty")]
 	#[serde(with = "serde_regex")]
-	pub forbidden_usernames: RegexSet,
+	pub(crate) forbidden_usernames: RegexSet,

 	#[serde(default = "true_fn")]
-	pub startup_netburst: bool,
+	pub(crate) startup_netburst: bool,
 	#[serde(default = "default_startup_netburst_keep")]
-	pub startup_netburst_keep: i64,
+	pub(crate) startup_netburst_keep: i64,

 	#[serde(default)]
-	pub block_non_admin_invites: bool,
+	pub(crate) block_non_admin_invites: bool,

 	#[serde(default)]
-	pub sentry: bool,
+	pub(crate) sentry: bool,
 	#[serde(default = "default_sentry_endpoint")]
-	pub sentry_endpoint: Option<Url>,
+	pub(crate) sentry_endpoint: Option<Url>,
 	#[serde(default)]
-	pub sentry_send_server_name: bool,
+	pub(crate) sentry_send_server_name: bool,
 	#[serde(default = "default_sentry_traces_sample_rate")]
-	pub sentry_traces_sample_rate: f32,
+	pub(crate) sentry_traces_sample_rate: f32,

 	#[serde(flatten)]
 	#[allow(clippy::zero_sized_map_values)] // this is a catchall, the map shouldn't be zero at runtime
@@ -350,24 +349,24 @@ pub struct Config {
 }

 #[derive(Clone, Debug, Deserialize)]
-pub struct TlsConfig {
-	pub certs: String,
-	pub key: String,
+pub(crate) struct TlsConfig {
+	pub(crate) certs: String,
+	pub(crate) key: String,
 	#[serde(default)]
 	/// Whether to listen and allow for HTTP and HTTPS connections (insecure!)
 	/// Only works / does something if the `axum_dual_protocol` feature flag was
 	/// built
-	pub dual_protocol: bool,
+	pub(crate) dual_protocol: bool,
 }

 #[derive(Clone, Debug, Deserialize, Default)]
-pub struct WellKnownConfig {
-	pub client: Option<Url>,
-	pub server: Option<OwnedServerName>,
-	pub support_page: Option<Url>,
-	pub support_role: Option<ContactRole>,
-	pub support_email: Option<String>,
-	pub support_mxid: Option<OwnedUserId>,
+pub(crate) struct WellKnownConfig {
+	pub(crate) client: Option<Url>,
+	pub(crate) server: Option<OwnedServerName>,
+	pub(crate) support_page: Option<Url>,
+	pub(crate) support_role: Option<ContactRole>,
+	pub(crate) support_email: Option<String>,
+	pub(crate) support_mxid: Option<OwnedUserId>,
 }

 const DEPRECATED_KEYS: &[&str] = &[
@@ -383,7 +382,7 @@ const DEPRECATED_KEYS: &[&str] = &[

 impl Config {
 	/// Initialize config
-	pub fn new(path: Option<PathBuf>) -> Result<Self, Error> {
+	pub(crate) fn new(path: Option<PathBuf>) -> Result<Self, Error> {
 		let raw_config = if let Some(config_file_env) = Env::var("CONDUIT_CONFIG") {
 			Figment::new()
 				.merge(Toml::file(config_file_env).nested())
@@ -470,7 +469,7 @@ impl Config {
 	}

 	#[must_use]
-	pub fn get_bind_addrs(&self) -> Vec<SocketAddr> {
+	pub(crate) fn get_bind_addrs(&self) -> Vec<SocketAddr> {
 		match &self.port.ports {
 			Left(port) => {
 				// Left is only 1 value, so make a vec with 1 value only
@@ -490,7 +489,7 @@ impl Config {
 		}
 	}

-	pub fn check(&self) -> Result<(), Error> { check(self) }
+	pub(crate) fn check(&self) -> Result<(), Error> { check(self) }
 }

 impl fmt::Display for Config {
@@ -866,7 +865,7 @@ impl fmt::Display for Config {
 		let mut msg: String = "Active config values:\n\n".to_owned();

 		for line in lines.into_iter().enumerate() {
-			writeln!(msg, "{}: {}", line.1 .0, line.1 .1).expect("should be able to write to string buffer");
+			let _ = writeln!(msg, "{}: {}", line.1 .0, line.1 .1);
 		}

 		write!(f, "{msg}")
@@ -875,7 +874,7 @@ impl fmt::Display for Config {

 fn true_fn() -> bool { true }

-fn default_address() -> IpAddr { Ipv6Addr::LOCALHOST.into() }
+fn default_address() -> IpAddr { Ipv4Addr::LOCALHOST.into() }

 fn default_port() -> ListeningPort {
 	ListeningPort {
@@ -1028,8 +1027,7 @@ fn default_rocksdb_compression_level() -> i32 { 32767 }
 fn default_rocksdb_bottommost_compression_level() -> i32 { 32767 }

 // I know, it's a great name
-#[must_use]
-pub fn default_default_room_version() -> RoomVersionId { RoomVersionId::V10 }
+pub(crate) fn default_default_room_version() -> RoomVersionId { RoomVersionId::V10 }

 fn default_ip_range_denylist() -> Vec<String> {
 	vec![
@@ -30,7 +30,7 @@ use crate::Result;
 /// `ordinary.onion`, `matrix.myspecial.onion`, but not `hello.myspecial.onion`.
 #[derive(Clone, Default, Debug, Deserialize)]
 #[serde(rename_all = "snake_case")]
-pub enum ProxyConfig {
+pub(crate) enum ProxyConfig {
 	#[default]
 	None,
 	Global {
@@ -40,7 +40,7 @@ pub enum ProxyConfig {
 	ByDomain(Vec<PartialProxyConfig>),
 }
 impl ProxyConfig {
-	pub fn to_proxy(&self) -> Result<Option<Proxy>> {
+	pub(crate) fn to_proxy(&self) -> Result<Option<Proxy>> {
 		Ok(match self.clone() {
 			ProxyConfig::None => None,
 			ProxyConfig::Global {
@@ -55,7 +55,7 @@ impl ProxyConfig {
 }

 #[derive(Clone, Debug, Deserialize)]
-pub struct PartialProxyConfig {
+pub(crate) struct PartialProxyConfig {
 	#[serde(deserialize_with = "crate::utils::deserialize_from_str")]
 	url: Url,
 	#[serde(default)]
@@ -64,8 +64,7 @@ pub struct PartialProxyConfig {
 	exclude: Vec<WildCardedDomain>,
 }
 impl PartialProxyConfig {
-	#[must_use]
-	pub fn for_url(&self, url: &Url) -> Option<&Url> {
+	pub(crate) fn for_url(&self, url: &Url) -> Option<&Url> {
 		let domain = url.domain()?;
 		let mut included_because = None; // most specific reason it was included
 		let mut excluded_because = None; // most specific reason it was excluded
@@ -1,128 +0,0 @@
-[package]
-name = "conduit_core"
-version.workspace = true
-edition.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"gzip_compression",
-	"zstd_compression",
-	"brotli_compression",
-	"sentry_telemetry",
-	"release_max_log_level",
-]
-
-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",
-]
-sqlite = [
-	"dep:rusqlite",
-	"dep:parking_lot",
-	"dep:thread_local",
-]
-rocksdb = [
-	"dep:rust-rocksdb",
-]
-jemalloc = [
-	"dep:tikv-jemalloc-sys",
-	"dep:tikv-jemalloc-ctl",
-	"dep:tikv-jemallocator",
-	"rust-rocksdb/jemalloc",
-]
-jemalloc_prof = [
-	"tikv-jemalloc-sys/profiling",
-]
-hardened_malloc = [
-	"dep:hardened_malloc-rs"
-]
-io_uring = [
-	"rust-rocksdb/io-uring",
-]
-zstd_compression = [
-	"rust-rocksdb/zstd",
-]
-gzip_compression = [
-	"reqwest/gzip",
-]
-brotli_compression = [
-	"reqwest/brotli",
-]
-perf_measurements = []
-sentry_telemetry = []
-
-[dependencies]
-async-trait.workspace = true
-axum-server.workspace = true
-axum.workspace = true
-base64.workspace = true
-bytes.workspace = true
-clap.workspace = true
-cyborgtime.workspace = true
-either.workspace = true
-figment.workspace = true
-futures-util.workspace = true
-http-body-util.workspace = true
-http.workspace = true
-image.workspace = true
-infer.workspace = true
-ipaddress.workspace = true
-itertools.workspace = true
-libloading.workspace = true
-log.workspace = true
-lru-cache.workspace = true
-parking_lot.optional = true
-parking_lot.workspace = true
-rand.workspace = true
-regex.workspace = true
-reqwest.workspace = true
-ring.workspace = true
-ruma.workspace = true
-rusqlite.optional = true
-rusqlite.workspace = true
-rust-rocksdb.optional = true
-rust-rocksdb.workspace = true
-sanitize-filename.workspace = true
-serde_json.workspace = true
-serde_regex.workspace = true
-serde.workspace = true
-serde_yaml.workspace = true
-sha-1.workspace = true
-thiserror.workspace = true
-thread_local.optional = true
-thread_local.workspace = true
-tikv-jemallocator.optional = true
-tikv-jemallocator.workspace = true
-tikv-jemalloc-ctl.optional = true
-tikv-jemalloc-ctl.workspace = true
-tikv-jemalloc-sys.optional = true
-tikv-jemalloc-sys.workspace = true
-tokio.workspace = true
-tracing-subscriber.workspace = true
-tracing.workspace = true
-url.workspace = true
-zstd.optional = true
-zstd.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-nix.workspace = true
-
-[target.'cfg(all(not(target_env = "msvc"), target_os = "linux"))'.dependencies]
-hardened_malloc-rs.workspace = true
-hardened_malloc-rs.optional = true
-
-[lints]
-workspace = true
@@ -1,9 +0,0 @@
-//! Default allocator with no special features
-
-/// Always returns the empty string
-#[must_use]
-pub fn memory_stats() -> String { Default::default() }
-
-/// Always returns the empty string
-#[must_use]
-pub fn memory_usage() -> String { Default::default() }
@@ -1,10 +0,0 @@
-#[global_allocator]
-static HMALLOC: hardened_malloc_rs::HardenedMalloc = hardened_malloc_rs::HardenedMalloc;
-
-#[must_use]
-pub fn memory_usage() -> String {
-	String::default() //TODO: get usage
-}
-
-#[must_use]
-pub fn memory_stats() -> String { "Extended statistics are not available from hardened_malloc.".to_owned() }
@@ -1,79 +0,0 @@
-use std::sync::Arc;
-
-use tracing_subscriber::{reload, EnvFilter};
-
-/// We need to store a reload::Handle value, but can't name it's type explicitly
-/// because the S type parameter depends on the subscriber's previous layers. In
-/// our case, this includes unnameable 'impl Trait' types.
-///
-/// This is fixed[1] in the unreleased tracing-subscriber from the master
-/// branch, which removes the S parameter. Unfortunately can't use it without
-/// pulling in a version of tracing that's incompatible with the rest of our
-/// deps.
-///
-/// To work around this, we define an trait without the S paramter that forwards
-/// to the reload::Handle::reload method, and then store the handle as a trait
-/// object.
-///
-/// [1]: <https://github.com/tokio-rs/tracing/pull/1035/commits/8a87ea52425098d3ef8f56d92358c2f6c144a28f>
-pub trait ReloadHandle<L> {
-	fn reload(&self, new_value: L) -> Result<(), reload::Error>;
-}
-
-impl<L, S> ReloadHandle<L> for reload::Handle<L, S> {
-	fn reload(&self, new_value: L) -> Result<(), reload::Error> { reload::Handle::reload(self, new_value) }
-}
-
-struct LogLevelReloadHandlesInner {
-	handles: Vec<Box<dyn ReloadHandle<EnvFilter> + Send + Sync>>,
-}
-
-/// Wrapper to allow reloading the filter on several several
-/// [`tracing_subscriber::reload::Handle`]s at once, with the same value.
-#[derive(Clone)]
-pub struct LogLevelReloadHandles {
-	inner: Arc<LogLevelReloadHandlesInner>,
-}
-
-impl LogLevelReloadHandles {
-	#[must_use]
-	pub fn new(handles: Vec<Box<dyn ReloadHandle<EnvFilter> + Send + Sync>>) -> LogLevelReloadHandles {
-		LogLevelReloadHandles {
-			inner: Arc::new(LogLevelReloadHandlesInner {
-				handles,
-			}),
-		}
-	}
-
-	pub fn reload(&self, new_value: &EnvFilter) -> Result<(), reload::Error> {
-		for handle in &self.inner.handles {
-			handle.reload(new_value.clone())?;
-		}
-		Ok(())
-	}
-}
-
-#[macro_export]
-macro_rules! error {
-    ( $($x:tt)+ ) => { tracing::error!( $($x)+ ); }
-}
-
-#[macro_export]
-macro_rules! warn {
-    ( $($x:tt)+ ) => { tracing::warn!( $($x)+ ); }
-}
-
-#[macro_export]
-macro_rules! info {
-    ( $($x:tt)+ ) => { tracing::info!( $($x)+ ); }
-}
-
-#[macro_export]
-macro_rules! debug {
-    ( $($x:tt)+ ) => { tracing::debug!( $($x)+ ); }
-}
-
-#[macro_export]
-macro_rules! trace {
-    ( $($x:tt)+ ) => { tracing::trace!( $($x)+ ); }
-}
@@ -1,27 +0,0 @@
-pub mod alloc;
-pub mod config;
-pub mod debug;
-pub mod error;
-pub mod log;
-pub mod mods;
-pub mod pducount;
-pub mod server;
-pub mod utils;
-
-pub use config::Config;
-pub use error::{Error, Result, RumaResponse};
-pub use pducount::PduCount;
-pub use server::Server;
-pub use utils::conduwuit_version;
-
-#[cfg(not(conduit_mods))]
-pub mod mods {
-	#[macro_export]
-	macro_rules! mod_ctor {
-		() => {};
-	}
-	#[macro_export]
-	macro_rules! mod_dtor {
-		() => {};
-	}
-}
@@ -1,28 +0,0 @@
-use std::sync::atomic::{AtomicI32, Ordering};
-
-const ORDERING: Ordering = Ordering::Relaxed;
-static STATIC_DTORS: AtomicI32 = AtomicI32::new(0);
-
-/// Called by Module::unload() to indicate module is about to be unloaded and
-/// static destruction is intended. This will allow verifying it actually took
-/// place.
-pub(crate) fn prepare() {
-	let count = STATIC_DTORS.fetch_sub(1, ORDERING);
-	debug_assert!(count <= 0, "STATIC_DTORS should not be greater than zero.");
-}
-
-/// Called by static destructor of a module. This call should only be found
-/// inside a mod_fini! macro. Do not call from anywhere else.
-#[inline(always)]
-pub fn report() { let _count = STATIC_DTORS.fetch_add(1, ORDERING); }
-
-/// Called by Module::unload() (see check()) with action in case a check()
-/// failed. This can allow a stuck module to be noted while allowing for other
-/// independent modules to be diagnosed.
-pub(crate) fn check_and_reset() -> bool { STATIC_DTORS.swap(0, ORDERING) == 0 }
-
-/// Called by Module::unload() after unload to verify static destruction took
-/// place. A call to prepare() must be made prior to Module::unload() and making
-/// this call.
-#[allow(dead_code)]
-pub(crate) fn check() -> bool { STATIC_DTORS.load(ORDERING) == 0 }
@@ -1,44 +0,0 @@
-#[macro_export]
-macro_rules! mod_ctor {
-	( $($body:block)? ) => {
-		$crate::mod_init! {{
-			$crate::debug_info!("Module loaded");
-			$($body)?
-		}}
-	}
-}
-
-#[macro_export]
-macro_rules! mod_dtor {
-	( $($body:block)? ) => {
-		$crate::mod_fini! {{
-			$crate::debug_info!("Module unloading");
-			$($body)?
-			$crate::mods::canary::report();
-		}}
-	}
-}
-
-#[macro_export]
-macro_rules! mod_init {
-	($body:block) => {
-		#[used]
-		#[cfg_attr(target_family = "unix", link_section = ".init_array")]
-		static MOD_INIT: extern "C" fn() = { _mod_init };
-
-		#[cfg_attr(target_family = "unix", link_section = ".text.startup")]
-		extern "C" fn _mod_init() -> () $body
-	};
-}
-
-#[macro_export]
-macro_rules! mod_fini {
-	($body:block) => {
-		#[used]
-		#[cfg_attr(target_family = "unix", link_section = ".fini_array")]
-		static MOD_FINI: extern "C" fn() = { _mod_fini };
-
-		#[cfg_attr(target_family = "unix", link_section = ".text.startup")]
-		extern "C" fn _mod_fini() -> () $body
-	};
-}
@@ -1,11 +0,0 @@
-#![cfg(conduit_mods)]
-
-pub(crate) use libloading::os::unix::{Library, Symbol};
-
-pub mod canary;
-pub mod macros;
-pub mod module;
-pub mod new;
-pub mod path;
-
-pub use module::Module;
@@ -1,74 +0,0 @@
-use std::{
-	ffi::{CString, OsString},
-	time::SystemTime,
-};
-
-use super::{canary, new, path, Library, Symbol};
-use crate::{error, Result};
-
-pub struct Module {
-	handle: Option<Library>,
-	loaded: SystemTime,
-	path: OsString,
-}
-
-impl Module {
-	pub fn from_name(name: &str) -> Result<Self> { Self::from_path(path::from_name(name)?) }
-
-	pub fn from_path(path: OsString) -> Result<Self> {
-		Ok(Self {
-			handle: Some(new::from_path(&path)?),
-			loaded: SystemTime::now(),
-			path,
-		})
-	}
-
-	pub fn unload(&mut self) {
-		canary::prepare();
-		self.close();
-		if !canary::check_and_reset() {
-			let name = self.name().expect("Module is named");
-			error!("Module {name:?} is stuck and failed to unload.");
-		}
-	}
-
-	pub(crate) fn close(&mut self) {
-		if let Some(handle) = self.handle.take() {
-			handle.close().expect("Module handle closed");
-		}
-	}
-
-	pub fn get<Prototype>(&self, name: &str) -> Result<Symbol<Prototype>> {
-		let cname = CString::new(name.to_owned()).expect("terminated string from provided name");
-		let handle = self
-			.handle
-			.as_ref()
-			.expect("backing library loaded by this instance");
-		// SAFETY: Calls dlsym(3) on unix platforms. This might not have to be unsafe
-		// if wrapped in libloading with_dlerror().
-		let sym = unsafe { handle.get::<Prototype>(cname.as_bytes()) };
-		let sym = sym.expect("symbol found; binding successful");
-
-		Ok(sym)
-	}
-
-	pub fn deleted(&self) -> Result<bool> {
-		let mtime = path::mtime(self.path())?;
-		let res = mtime > self.loaded;
-
-		Ok(res)
-	}
-
-	pub fn name(&self) -> Result<String> { path::to_name(self.path()) }
-
-	#[must_use]
-	pub fn path(&self) -> &OsString { &self.path }
-}
-
-impl Drop for Module {
-	fn drop(&mut self) {
-		if self.handle.is_some() {
-			self.unload();
-		}
-	}
-}
@@ -1,23 +0,0 @@
-use std::ffi::OsStr;
-
-use super::{path, Library};
-use crate::{Error, Result};
-
-const OPEN_FLAGS: i32 = libloading::os::unix::RTLD_LAZY | libloading::os::unix::RTLD_GLOBAL;
-
-pub fn from_name(name: &str) -> Result<Library> {
-	let path = path::from_name(name)?;
-	from_path(&path)
-}
-
-pub fn from_path(path: &OsStr) -> Result<Library> {
-	//SAFETY: Calls dlopen(3) on unix platforms. This might not have to be unsafe
-	// if wrapped in with_dlerror.
-	let lib = unsafe { Library::open(Some(path), OPEN_FLAGS) };
-	if let Err(e) = lib {
-		let name = path::to_name(path)?;
-		return Err(Error::Err(format!("Loading module {name:?} failed: {e}")));
-	}
-
-	Ok(lib.expect("module loaded"))
-}
@@ -1,40 +0,0 @@
-use std::{
-	env::current_exe,
-	ffi::{OsStr, OsString},
-	path::{Path, PathBuf},
-	time::SystemTime,
-};
-
-use libloading::library_filename;
-
-use crate::Result;
-
-pub fn from_name(name: &str) -> Result<OsString> {
-	let root = PathBuf::new();
-	let exe_path = current_exe()?;
-	let exe_dir = exe_path.parent().unwrap_or(&root);
-	let mut mod_path = exe_dir.to_path_buf();
-	let mod_file = library_filename(name);
-	mod_path.push(mod_file);
-
-	Ok(mod_path.into_os_string())
-}
-
-pub fn to_name(path: &OsStr) -> Result<String> {
-	let path = Path::new(path);
-	let name = path
-		.file_stem()
-		.expect("path file stem")
-		.to_str()
-		.expect("name string");
-	let name = name.strip_prefix("lib").unwrap_or(name).to_owned();
-
-	Ok(name)
-}
-
-pub fn mtime(path: &OsStr) -> Result<SystemTime> {
-	let meta = std::fs::metadata(path)?;
-	let mtime = meta.modified()?;
-
-	Ok(mtime)
-}
@@ -1,51 +0,0 @@
-use std::cmp::Ordering;
-
-use ruma::api::client::error::ErrorKind;
-
-use crate::{Error, Result};
-
-#[derive(Hash, PartialEq, Eq, Clone, Copy, Debug)]
-pub enum PduCount {
-	Backfilled(u64),
-	Normal(u64),
-}
-
-impl PduCount {
-	#[must_use]
-	pub fn min() -> Self { Self::Backfilled(u64::MAX) }
-
-	#[must_use]
-	pub fn max() -> Self { Self::Normal(u64::MAX) }
-
-	pub fn try_from_string(token: &str) -> Result<Self> {
-		if let Some(stripped_token) = token.strip_prefix('-') {
-			stripped_token.parse().map(PduCount::Backfilled)
-		} else {
-			token.parse().map(PduCount::Normal)
-		}
-		.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid pagination token."))
-	}
-
-	#[must_use]
-	pub fn stringify(&self) -> String {
-		match self {
-			PduCount::Backfilled(x) => format!("-{x}"),
-			PduCount::Normal(x) => x.to_string(),
-		}
-	}
-}
-
-impl PartialOrd for PduCount {
-	fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some(self.cmp(other)) }
-}
-
-impl Ord for PduCount {
-	fn cmp(&self, other: &Self) -> Ordering {
-		match (self, other) {
-			(PduCount::Normal(s), PduCount::Normal(o)) => s.cmp(o),
-			(PduCount::Backfilled(s), PduCount::Backfilled(o)) => o.cmp(s),
-			(PduCount::Normal(_), PduCount::Backfilled(_)) => Ordering::Greater,
-			(PduCount::Backfilled(_), PduCount::Normal(_)) => Ordering::Less,
-		}
-	}
-}
@@ -1,72 +0,0 @@
-use std::{
-	sync::{
-		atomic::{AtomicBool, AtomicU32},
-		Mutex,
-	},
-	time::SystemTime,
-};
-
-use tokio::runtime;
-
-use crate::{config::Config, log::LogLevelReloadHandles};
-
-/// Server runtime state; public portion
-pub struct Server {
-	/// Server-wide configuration instance
-	pub config: Config,
-
-	/// Timestamp server was started; used for uptime.
-	pub started: SystemTime,
-
-	/// Reload/shutdown signal channel. Called from the signal handler or admin
-	/// command to initiate shutdown.
-	pub shutdown: Mutex<Option<axum_server::Handle>>,
-
-	/// Reload/shutdown desired indicator; when false, shutdown is desired. This
-	/// is an observable used on shutdown and modifying is not recommended.
-	pub reload: AtomicBool,
-
-	/// Reload/shutdown pending indicator; server is shutting down. This is an
-	/// observable used on shutdown and should not be modified.
-	pub interrupt: AtomicBool,
-
-	/// Handle to the runtime
-	pub runtime: Option<runtime::Handle>,
-
-	/// Log level reload handles.
-	pub tracing_reload_handle: LogLevelReloadHandles,
-
-	/// TODO: move stats
-	pub requests_spawn_active: AtomicU32,
-	pub requests_spawn_finished: AtomicU32,
-	pub requests_handle_active: AtomicU32,
-	pub requests_handle_finished: AtomicU32,
-	pub requests_panic: AtomicU32,
-}
-
-impl Server {
-	#[must_use]
-	pub fn new(config: Config, runtime: Option<runtime::Handle>, tracing_reload_handle: LogLevelReloadHandles) -> Self {
-		Self {
-			config,
-			started: SystemTime::now(),
-			shutdown: Mutex::new(None),
-			reload: AtomicBool::new(false),
-			interrupt: AtomicBool::new(false),
-			runtime,
-			tracing_reload_handle,
-			requests_spawn_active: AtomicU32::new(0),
-			requests_spawn_finished: AtomicU32::new(0),
-			requests_handle_active: AtomicU32::new(0),
-			requests_handle_finished: AtomicU32::new(0),
-			requests_panic: AtomicU32::new(0),
-		}
-	}
-
-	#[inline]
-	pub fn runtime(&self) -> &runtime::Handle {
-		self.runtime
-			.as_ref()
-			.expect("runtime handle available in Server")
-	}
-}
@@ -1,22 +0,0 @@
-#[macro_export]
-macro_rules! defer {
-	($body:block) => {
-		struct _Defer_<F>
-		where
-			F: FnMut(),
-		{
-			closure: F,
-		}
-
-		impl<F> Drop for _Defer_<F>
-		where
-			F: FnMut(),
-		{
-			fn drop(&mut self) { (self.closure)(); }
-		}
-
-		let _defer_ = _Defer_ {
-			closure: || $body,
-		};
-	};
-}
@@ -1,80 +0,0 @@
-[package]
-name = "conduit_database"
-version.workspace = true
-edition.workspace = true
-
-[lib]
-path = "mod.rs"
-crate-type = [
-	"rlib",
-#	"dylib",
-]
-
-[features]
-default = [
-	"rocksdb",
-	"io_uring",
-	"jemalloc",
-	"zstd_compression",
-	"release_max_log_level",
-]
-
-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",
-]
-sqlite = [
-	"dep:rusqlite",
-	"dep:parking_lot",
-	"dep:thread_local",
-]
-rocksdb = [
-	"dep:rust-rocksdb",
-]
-jemalloc = [
-	"dep:tikv-jemalloc-sys",
-	"dep:tikv-jemalloc-ctl",
-	"dep:tikv-jemallocator",
-	"rust-rocksdb/jemalloc",
-]
-jemalloc_prof = [
-	"tikv-jemalloc-sys/profiling",
-]
-io_uring = [
-	"rust-rocksdb/io-uring",
-]
-zstd_compression = [
-	"rust-rocksdb/zstd",
-]
-
-[dependencies]
-chrono.workspace = true
-conduit-core.workspace = true
-futures-util.workspace = true
-log.workspace = true
-lru-cache.workspace = true
-parking_lot.optional = true
-parking_lot.workspace = true
-ruma.workspace = true
-rusqlite.optional = true
-rusqlite.workspace = true
-rust-rocksdb.optional = true
-rust-rocksdb.workspace = true
-thread_local.optional = true
-thread_local.workspace = true
-tikv-jemallocator.optional = true
-tikv-jemallocator.workspace = true
-tikv-jemalloc-ctl.optional = true
-tikv-jemalloc-ctl.workspace = true
-tikv-jemalloc-sys.optional = true
-tikv-jemalloc-sys.workspace = true
-tokio.workspace = true
-tracing.workspace = true
-zstd.optional = true
-zstd.workspace = true
-
-[lints]
-workspace = true
@@ -2,14 +2,14 @@ use std::sync::Arc;

 use super::KeyValueDatabaseEngine;

-pub struct Cork {
+pub(crate) struct Cork {
 	db: Arc<dyn KeyValueDatabaseEngine>,
 	flush: bool,
 	sync: bool,
 }

 impl Cork {
-	pub fn new(db: &Arc<dyn KeyValueDatabaseEngine>, flush: bool, sync: bool) -> Self {
+	pub(crate) fn new(db: &Arc<dyn KeyValueDatabaseEngine>, flush: bool, sync: bool) -> Self {
 		db.cork().unwrap();
 		Cork {
 			db: db.clone(),
@@ -0,0 +1,137 @@
+use std::collections::HashMap;
+
+use ruma::{
+	api::client::error::ErrorKind,
+	events::{AnyEphemeralRoomEvent, RoomAccountDataEventType},
+	serde::Raw,
+	RoomId, UserId,
+};
+use tracing::warn;
+
+use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
+
+impl service::account_data::Data for KeyValueDatabase {
+	/// Places one event in the account data of the user and removes the
+	/// previous entry.
+	#[tracing::instrument(skip(self, room_id, user_id, event_type, data))]
+	fn update(
+		&self, room_id: Option<&RoomId>, user_id: &UserId, event_type: RoomAccountDataEventType,
+		data: &serde_json::Value,
+	) -> Result<()> {
+		let mut prefix = room_id
+			.map(ToString::to_string)
+			.unwrap_or_default()
+			.as_bytes()
+			.to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(user_id.as_bytes());
+		prefix.push(0xFF);
+
+		let mut roomuserdataid = prefix.clone();
+		roomuserdataid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
+		roomuserdataid.push(0xFF);
+		roomuserdataid.extend_from_slice(event_type.to_string().as_bytes());
+
+		let mut key = prefix;
+		key.extend_from_slice(event_type.to_string().as_bytes());
+
+		if data.get("type").is_none() || data.get("content").is_none() {
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"Account data doesn't have all required fields.",
+			));
+		}
+
+		self.roomuserdataid_accountdata.insert(
+			&roomuserdataid,
+			&serde_json::to_vec(&data).expect("to_vec always works on json values"),
+		)?;
+
+		let prev = self.roomusertype_roomuserdataid.get(&key)?;
+
+		self.roomusertype_roomuserdataid
+			.insert(&key, &roomuserdataid)?;
+
+		// Remove old entry
+		if let Some(prev) = prev {
+			self.roomuserdataid_accountdata.remove(&prev)?;
+		}
+
+		Ok(())
+	}
+
+	/// Searches the account data for a specific kind.
+	#[tracing::instrument(skip(self, room_id, user_id, kind))]
+	fn get(
+		&self, room_id: Option<&RoomId>, user_id: &UserId, kind: RoomAccountDataEventType,
+	) -> Result<Option<Box<serde_json::value::RawValue>>> {
+		let mut key = room_id
+			.map(ToString::to_string)
+			.unwrap_or_default()
+			.as_bytes()
+			.to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(user_id.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(kind.to_string().as_bytes());
+
+		self.roomusertype_roomuserdataid
+			.get(&key)?
+			.and_then(|roomuserdataid| {
+				self.roomuserdataid_accountdata
+					.get(&roomuserdataid)
+					.transpose()
+			})
+			.transpose()?
+			.map(|data| serde_json::from_slice(&data).map_err(|_| Error::bad_database("could not deserialize")))
+			.transpose()
+	}
+
+	/// Returns all changes to the account data that happened after `since`.
+	#[tracing::instrument(skip(self, room_id, user_id, since))]
+	fn changes_since(
+		&self, room_id: Option<&RoomId>, user_id: &UserId, since: u64,
+	) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {
+		let mut userdata = HashMap::new();
+
+		let mut prefix = room_id
+			.map(ToString::to_string)
+			.unwrap_or_default()
+			.as_bytes()
+			.to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(user_id.as_bytes());
+		prefix.push(0xFF);
+
+		// Skip the data that's exactly at since, because we sent that last time
+		let mut first_possible = prefix.clone();
+		first_possible.extend_from_slice(&(since.saturating_add(1)).to_be_bytes());
+
+		for r in self
+			.roomuserdataid_accountdata
+			.iter_from(&first_possible, false)
+			.take_while(move |(k, _)| k.starts_with(&prefix))
+			.map(|(k, v)| {
+				Ok::<_, Error>((
+					RoomAccountDataEventType::from(
+						utils::string_from_bytes(
+							k.rsplit(|&b| b == 0xFF)
+								.next()
+								.ok_or_else(|| Error::bad_database("RoomUserData ID in db is invalid."))?,
+						)
+						.map_err(|e| {
+							warn!("RoomUserData ID in database is invalid: {}", e);
+							Error::bad_database("RoomUserData ID in db is invalid.")
+						})?,
+					),
+					serde_json::from_slice::<Raw<AnyEphemeralRoomEvent>>(&v)
+						.map_err(|_| Error::bad_database("Database contains invalid account data."))?,
+				))
+			}) {
+			let (kind, data) = r?;
+			userdata.insert(kind, data);
+		}
+
+		Ok(userdata)
+	}
+}
@@ -0,0 +1,55 @@
+use ruma::api::appservice::Registration;
+
+use crate::{database::KeyValueDatabase, service, utils, Error, Result};
+
+impl service::appservice::Data for KeyValueDatabase {
+	/// Registers an appservice and returns the ID to the caller
+	fn register_appservice(&self, yaml: Registration) -> Result<String> {
+		let id = yaml.id.as_str();
+		self.id_appserviceregistrations
+			.insert(id.as_bytes(), serde_yaml::to_string(&yaml).unwrap().as_bytes())?;
+
+		Ok(id.to_owned())
+	}
+
+	/// Remove an appservice registration
+	///
+	/// # Arguments
+	///
+	/// * `service_name` - the name you send to register the service previously
+	fn unregister_appservice(&self, service_name: &str) -> Result<()> {
+		self.id_appserviceregistrations
+			.remove(service_name.as_bytes())?;
+		Ok(())
+	}
+
+	fn get_registration(&self, id: &str) -> Result<Option<Registration>> {
+		self.id_appserviceregistrations
+			.get(id.as_bytes())?
+			.map(|bytes| {
+				serde_yaml::from_slice(&bytes)
+					.map_err(|_| Error::bad_database("Invalid registration bytes in id_appserviceregistrations."))
+			})
+			.transpose()
+	}
+
+	fn iter_ids<'a>(&'a self) -> Result<Box<dyn Iterator<Item = Result<String>> + 'a>> {
+		Ok(Box::new(self.id_appserviceregistrations.iter().map(|(id, _)| {
+			utils::string_from_bytes(&id)
+				.map_err(|_| Error::bad_database("Invalid id bytes in id_appserviceregistrations."))
+		})))
+	}
+
+	fn all(&self) -> Result<Vec<(String, Registration)>> {
+		self.iter_ids()?
+			.filter_map(Result::ok)
+			.map(move |id| {
+				Ok((
+					id.clone(),
+					self.get_registration(&id)?
+						.expect("iter_ids only returns appservices that exist"),
+				))
+			})
+			.collect()
+	}
+}
@@ -0,0 +1,298 @@
+use std::collections::{BTreeMap, HashMap};
+
+use async_trait::async_trait;
+use futures_util::{stream::FuturesUnordered, StreamExt};
+use lru_cache::LruCache;
+use ruma::{
+	api::federation::discovery::{ServerSigningKeys, VerifyKey},
+	signatures::Ed25519KeyPair,
+	DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, UserId,
+};
+
+use crate::{
+	database::{Cork, KeyValueDatabase},
+	service, services, utils, Error, Result,
+};
+
+const COUNTER: &[u8] = b"c";
+const LAST_CHECK_FOR_UPDATES_COUNT: &[u8] = b"u";
+
+#[async_trait]
+impl service::globals::Data for KeyValueDatabase {
+	fn next_count(&self) -> Result<u64> {
+		utils::u64_from_bytes(&self.global.increment(COUNTER)?)
+			.map_err(|_| Error::bad_database("Count has invalid bytes."))
+	}
+
+	fn current_count(&self) -> Result<u64> {
+		self.global.get(COUNTER)?.map_or(Ok(0_u64), |bytes| {
+			utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Count has invalid bytes."))
+		})
+	}
+
+	fn last_check_for_updates_id(&self) -> Result<u64> {
+		self.global
+			.get(LAST_CHECK_FOR_UPDATES_COUNT)?
+			.map_or(Ok(0_u64), |bytes| {
+				utils::u64_from_bytes(&bytes)
+					.map_err(|_| Error::bad_database("last check for updates count has invalid bytes."))
+			})
+	}
+
+	fn update_check_for_updates_id(&self, id: u64) -> Result<()> {
+		self.global
+			.insert(LAST_CHECK_FOR_UPDATES_COUNT, &id.to_be_bytes())?;
+
+		Ok(())
+	}
+
+	#[allow(unused_qualifications)] // async traits
+	async fn watch(&self, user_id: &UserId, device_id: &DeviceId) -> Result<()> {
+		let userid_bytes = user_id.as_bytes().to_vec();
+		let mut userid_prefix = userid_bytes.clone();
+		userid_prefix.push(0xFF);
+
+		let mut userdeviceid_prefix = userid_prefix.clone();
+		userdeviceid_prefix.extend_from_slice(device_id.as_bytes());
+		userdeviceid_prefix.push(0xFF);
+
+		let mut futures = FuturesUnordered::new();
+
+		// Return when *any* user changed their key
+		// TODO: only send for user they share a room with
+		futures.push(self.todeviceid_events.watch_prefix(&userdeviceid_prefix));
+
+		futures.push(self.userroomid_joined.watch_prefix(&userid_prefix));
+		futures.push(self.userroomid_invitestate.watch_prefix(&userid_prefix));
+		futures.push(self.userroomid_leftstate.watch_prefix(&userid_prefix));
+		futures.push(
+			self.userroomid_notificationcount
+				.watch_prefix(&userid_prefix),
+		);
+		futures.push(self.userroomid_highlightcount.watch_prefix(&userid_prefix));
+
+		// Events for rooms we are in
+		for room_id in services()
+			.rooms
+			.state_cache
+			.rooms_joined(user_id)
+			.filter_map(Result::ok)
+		{
+			let short_roomid = services()
+				.rooms
+				.short
+				.get_shortroomid(&room_id)
+				.ok()
+				.flatten()
+				.expect("room exists")
+				.to_be_bytes()
+				.to_vec();
+
+			let roomid_bytes = room_id.as_bytes().to_vec();
+			let mut roomid_prefix = roomid_bytes.clone();
+			roomid_prefix.push(0xFF);
+
+			// PDUs
+			futures.push(self.pduid_pdu.watch_prefix(&short_roomid));
+
+			// EDUs
+			futures.push(Box::pin(async move {
+				let _result = services().rooms.typing.wait_for_update(&room_id).await;
+			}));
+
+			futures.push(self.readreceiptid_readreceipt.watch_prefix(&roomid_prefix));
+
+			// Key changes
+			futures.push(self.keychangeid_userid.watch_prefix(&roomid_prefix));
+
+			// Room account data
+			let mut roomuser_prefix = roomid_prefix.clone();
+			roomuser_prefix.extend_from_slice(&userid_prefix);
+
+			futures.push(
+				self.roomusertype_roomuserdataid
+					.watch_prefix(&roomuser_prefix),
+			);
+		}
+
+		let mut globaluserdata_prefix = vec![0xFF];
+		globaluserdata_prefix.extend_from_slice(&userid_prefix);
+
+		futures.push(
+			self.roomusertype_roomuserdataid
+				.watch_prefix(&globaluserdata_prefix),
+		);
+
+		// More key changes (used when user is not joined to any rooms)
+		futures.push(self.keychangeid_userid.watch_prefix(&userid_prefix));
+
+		// One time keys
+		futures.push(self.userid_lastonetimekeyupdate.watch_prefix(&userid_bytes));
+
+		futures.push(Box::pin(services().globals.rotate.watch()));
+
+		// Wait until one of them finds something
+		futures.next().await;
+
+		Ok(())
+	}
+
+	fn cleanup(&self) -> Result<()> { self.db.cleanup() }
+
+	fn flush(&self) -> Result<()> { self.db.flush() }
+
+	fn cork(&self) -> Result<Cork> { Ok(Cork::new(&self.db, false, false)) }
+
+	fn cork_and_flush(&self) -> Result<Cork> { Ok(Cork::new(&self.db, true, false)) }
+
+	fn cork_and_sync(&self) -> Result<Cork> { Ok(Cork::new(&self.db, true, true)) }
+
+	fn memory_usage(&self) -> String {
+		let auth_chain_cache = self.auth_chain_cache.lock().unwrap().len();
+		let our_real_users_cache = self.our_real_users_cache.read().unwrap().len();
+		let appservice_in_room_cache = self.appservice_in_room_cache.read().unwrap().len();
+		let lasttimelinecount_cache = self.lasttimelinecount_cache.lock().unwrap().len();
+
+		let max_auth_chain_cache = self.auth_chain_cache.lock().unwrap().capacity();
+		let max_our_real_users_cache = self.our_real_users_cache.read().unwrap().capacity();
+		let max_appservice_in_room_cache = self.appservice_in_room_cache.read().unwrap().capacity();
+		let max_lasttimelinecount_cache = self.lasttimelinecount_cache.lock().unwrap().capacity();
+
+		format!(
+			"\
+auth_chain_cache: {auth_chain_cache} / {max_auth_chain_cache}
+our_real_users_cache: {our_real_users_cache} / {max_our_real_users_cache}
+appservice_in_room_cache: {appservice_in_room_cache} / {max_appservice_in_room_cache}
+lasttimelinecount_cache: {lasttimelinecount_cache} / {max_lasttimelinecount_cache}\n\n
+{}",
+			self.db.memory_usage().unwrap_or_default()
+		)
+	}
+
+	fn clear_caches(&self, amount: u32) {
+		if amount > 1 {
+			let c = &mut *self.auth_chain_cache.lock().unwrap();
+			*c = LruCache::new(c.capacity());
+		}
+		if amount > 2 {
+			let c = &mut *self.our_real_users_cache.write().unwrap();
+			*c = HashMap::new();
+		}
+		if amount > 3 {
+			let c = &mut *self.appservice_in_room_cache.write().unwrap();
+			*c = HashMap::new();
+		}
+		if amount > 4 {
+			let c = &mut *self.lasttimelinecount_cache.lock().unwrap();
+			*c = HashMap::new();
+		}
+	}
+
+	fn load_keypair(&self) -> Result<Ed25519KeyPair> {
+		let keypair_bytes = self.global.get(b"keypair")?.map_or_else(
+			|| {
+				let keypair = utils::generate_keypair();
+				self.global.insert(b"keypair", &keypair)?;
+				Ok::<_, Error>(keypair)
+			},
+			Ok,
+		)?;
+
+		let mut parts = keypair_bytes.splitn(2, |&b| b == 0xFF);
+
+		utils::string_from_bytes(
+			// 1. version
+			parts
+				.next()
+				.expect("splitn always returns at least one element"),
+		)
+		.map_err(|_| Error::bad_database("Invalid version bytes in keypair."))
+		.and_then(|version| {
+			// 2. key
+			parts
+				.next()
+				.ok_or_else(|| Error::bad_database("Invalid keypair format in database."))
+				.map(|key| (version, key))
+		})
+		.and_then(|(version, key)| {
+			Ed25519KeyPair::from_der(key, version)
+				.map_err(|_| Error::bad_database("Private or public keys are invalid."))
+		})
+	}
+
+	fn remove_keypair(&self) -> Result<()> { self.global.remove(b"keypair") }
+
+	fn add_signing_key(
+		&self, origin: &ServerName, new_keys: ServerSigningKeys,
+	) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+		// Not atomic, but this is not critical
+		let signingkeys = self.server_signingkeys.get(origin.as_bytes())?;
+
+		let mut keys = signingkeys
+			.and_then(|keys| serde_json::from_slice(&keys).ok())
+			.unwrap_or_else(|| {
+				// Just insert "now", it doesn't matter
+				ServerSigningKeys::new(origin.to_owned(), MilliSecondsSinceUnixEpoch::now())
+			});
+
+		let ServerSigningKeys {
+			verify_keys,
+			old_verify_keys,
+			..
+		} = new_keys;
+
+		keys.verify_keys.extend(verify_keys);
+		keys.old_verify_keys.extend(old_verify_keys);
+
+		self.server_signingkeys.insert(
+			origin.as_bytes(),
+			&serde_json::to_vec(&keys).expect("serversigningkeys can be serialized"),
+		)?;
+
+		let mut tree = keys.verify_keys;
+		tree.extend(
+			keys.old_verify_keys
+				.into_iter()
+				.map(|old| (old.0, VerifyKey::new(old.1.key))),
+		);
+
+		Ok(tree)
+	}
+
+	/// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
+	/// for the server.
+	fn signing_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
+		let signingkeys = self
+			.server_signingkeys
+			.get(origin.as_bytes())?
+			.and_then(|bytes| serde_json::from_slice(&bytes).ok())
+			.map_or_else(BTreeMap::new, |keys: ServerSigningKeys| {
+				let mut tree = keys.verify_keys;
+				tree.extend(
+					keys.old_verify_keys
+						.into_iter()
+						.map(|old| (old.0, VerifyKey::new(old.1.key))),
+				);
+				tree
+			});
+
+		Ok(signingkeys)
+	}
+
+	fn database_version(&self) -> Result<u64> {
+		self.global.get(b"version")?.map_or(Ok(0), |version| {
+			utils::u64_from_bytes(&version).map_err(|_| Error::bad_database("Database version id is invalid."))
+		})
+	}
+
+	fn bump_database_version(&self, new_version: u64) -> Result<()> {
+		self.global.insert(b"version", &new_version.to_be_bytes())?;
+		Ok(())
+	}
+
+	fn backup(&self) -> Result<(), Box<dyn std::error::Error>> { self.db.backup() }
+
+	fn backup_list(&self) -> Result<String> { self.db.backup_list() }
+
+	fn file_list(&self) -> Result<String> { self.db.file_list() }
+}
@@ -0,0 +1,317 @@
+use std::collections::BTreeMap;
+
+use ruma::{
+	api::client::{
+		backup::{BackupAlgorithm, KeyBackupData, RoomKeyBackup},
+		error::ErrorKind,
+	},
+	serde::Raw,
+	OwnedRoomId, RoomId, UserId,
+};
+
+use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
+
+impl service::key_backups::Data for KeyValueDatabase {
+	fn create_backup(&self, user_id: &UserId, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
+		let version = services().globals.next_count()?.to_string();
+
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		self.backupid_algorithm.insert(
+			&key,
+			&serde_json::to_vec(backup_metadata).expect("BackupAlgorithm::to_vec always works"),
+		)?;
+		self.backupid_etag
+			.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
+		Ok(version)
+	}
+
+	fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		self.backupid_algorithm.remove(&key)?;
+		self.backupid_etag.remove(&key)?;
+
+		key.push(0xFF);
+
+		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
+			self.backupkeyid_backup.remove(&outdated_key)?;
+		}
+
+		Ok(())
+	}
+
+	fn update_backup(&self, user_id: &UserId, version: &str, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		if self.backupid_algorithm.get(&key)?.is_none() {
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
+		}
+
+		self.backupid_algorithm
+			.insert(&key, backup_metadata.json().get().as_bytes())?;
+		self.backupid_etag
+			.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
+		Ok(version.to_owned())
+	}
+
+	fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>> {
+		let mut prefix = user_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+		let mut last_possible_key = prefix.clone();
+		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
+
+		self.backupid_algorithm
+			.iter_from(&last_possible_key, true)
+			.take_while(move |(k, _)| k.starts_with(&prefix))
+			.next()
+			.map(|(key, _)| {
+				utils::string_from_bytes(
+					key.rsplit(|&b| b == 0xFF)
+						.next()
+						.expect("rsplit always returns an element"),
+				)
+				.map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))
+			})
+			.transpose()
+	}
+
+	fn get_latest_backup(&self, user_id: &UserId) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
+		let mut prefix = user_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+		let mut last_possible_key = prefix.clone();
+		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
+
+		self.backupid_algorithm
+			.iter_from(&last_possible_key, true)
+			.take_while(move |(k, _)| k.starts_with(&prefix))
+			.next()
+			.map(|(key, value)| {
+				let version = utils::string_from_bytes(
+					key.rsplit(|&b| b == 0xFF)
+						.next()
+						.expect("rsplit always returns an element"),
+				)
+				.map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))?;
+
+				Ok((
+					version,
+					serde_json::from_slice(&value)
+						.map_err(|_| Error::bad_database("Algorithm in backupid_algorithm is invalid."))?,
+				))
+			})
+			.transpose()
+	}
+
+	fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Option<Raw<BackupAlgorithm>>> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		self.backupid_algorithm
+			.get(&key)?
+			.map_or(Ok(None), |bytes| {
+				serde_json::from_slice(&bytes)
+					.map_err(|_| Error::bad_database("Algorithm in backupid_algorithm is invalid."))
+			})
+	}
+
+	fn add_key(
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str, key_data: &Raw<KeyBackupData>,
+	) -> Result<()> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		if self.backupid_algorithm.get(&key)?.is_none() {
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
+		}
+
+		self.backupid_etag
+			.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
+
+		key.push(0xFF);
+		key.extend_from_slice(room_id.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(session_id.as_bytes());
+
+		self.backupkeyid_backup
+			.insert(&key, key_data.json().get().as_bytes())?;
+
+		Ok(())
+	}
+
+	fn count_keys(&self, user_id: &UserId, version: &str) -> Result<usize> {
+		let mut prefix = user_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(version.as_bytes());
+
+		Ok(self.backupkeyid_backup.scan_prefix(prefix).count())
+	}
+
+	fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+
+		Ok(utils::u64_from_bytes(
+			&self
+				.backupid_etag
+				.get(&key)?
+				.ok_or_else(|| Error::bad_database("Backup has no etag."))?,
+		)
+		.map_err(|_| Error::bad_database("etag in backupid_etag invalid."))?
+		.to_string())
+	}
+
+	fn get_all(&self, user_id: &UserId, version: &str) -> Result<BTreeMap<OwnedRoomId, RoomKeyBackup>> {
+		let mut prefix = user_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(version.as_bytes());
+		prefix.push(0xFF);
+
+		let mut rooms = BTreeMap::<OwnedRoomId, RoomKeyBackup>::new();
+
+		for result in self
+			.backupkeyid_backup
+			.scan_prefix(prefix)
+			.map(|(key, value)| {
+				let mut parts = key.rsplit(|&b| b == 0xFF);
+
+				let session_id = utils::string_from_bytes(
+					parts
+						.next()
+						.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+				)
+				.map_err(|_| Error::bad_database("backupkeyid_backup session_id is invalid."))?;
+
+				let room_id = RoomId::parse(
+					utils::string_from_bytes(
+						parts
+							.next()
+							.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+					)
+					.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid."))?,
+				)
+				.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid room id."))?;
+
+				let key_data = serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;
+
+				Ok::<_, Error>((room_id, session_id, key_data))
+			}) {
+			let (room_id, session_id, key_data) = result?;
+			rooms
+				.entry(room_id)
+				.or_insert_with(|| RoomKeyBackup {
+					sessions: BTreeMap::new(),
+				})
+				.sessions
+				.insert(session_id, key_data);
+		}
+
+		Ok(rooms)
+	}
+
+	fn get_room(
+		&self, user_id: &UserId, version: &str, room_id: &RoomId,
+	) -> Result<BTreeMap<String, Raw<KeyBackupData>>> {
+		let mut prefix = user_id.as_bytes().to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(version.as_bytes());
+		prefix.push(0xFF);
+		prefix.extend_from_slice(room_id.as_bytes());
+		prefix.push(0xFF);
+
+		Ok(self
+			.backupkeyid_backup
+			.scan_prefix(prefix)
+			.map(|(key, value)| {
+				let mut parts = key.rsplit(|&b| b == 0xFF);
+
+				let session_id = utils::string_from_bytes(
+					parts
+						.next()
+						.ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
+				)
+				.map_err(|_| Error::bad_database("backupkeyid_backup session_id is invalid."))?;
+
+				let key_data = serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;
+
+				Ok::<_, Error>((session_id, key_data))
+			})
+			.filter_map(Result::ok)
+			.collect())
+	}
+
+	fn get_session(
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str,
+	) -> Result<Option<Raw<KeyBackupData>>> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(room_id.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(session_id.as_bytes());
+
+		self.backupkeyid_backup
+			.get(&key)?
+			.map(|value| {
+				serde_json::from_slice(&value)
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))
+			})
+			.transpose()
+	}
+
+	fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+		key.push(0xFF);
+
+		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
+			self.backupkeyid_backup.remove(&outdated_key)?;
+		}
+
+		Ok(())
+	}
+
+	fn delete_room_keys(&self, user_id: &UserId, version: &str, room_id: &RoomId) -> Result<()> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(room_id.as_bytes());
+		key.push(0xFF);
+
+		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
+			self.backupkeyid_backup.remove(&outdated_key)?;
+		}
+
+		Ok(())
+	}
+
+	fn delete_room_key(&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str) -> Result<()> {
+		let mut key = user_id.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(version.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(room_id.as_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(session_id.as_bytes());
+
+		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
+			self.backupkeyid_backup.remove(&outdated_key)?;
+		}
+
+		Ok(())
+	}
+}
@@ -0,0 +1,247 @@
+use ruma::api::client::error::ErrorKind;
+use tracing::debug;
+
+use crate::{
+	database::KeyValueDatabase,
+	service::{self, media::UrlPreviewData},
+	utils::string_from_bytes,
+	Error, Result,
+};
+
+impl service::media::Data for KeyValueDatabase {
+	fn create_file_metadata(
+		&self, sender_user: Option<&str>, mxc: String, width: u32, height: u32, content_disposition: Option<&str>,
+		content_type: Option<&str>,
+	) -> Result<Vec<u8>> {
+		let mut key = mxc.as_bytes().to_vec();
+		key.push(0xFF);
+		key.extend_from_slice(&width.to_be_bytes());
+		key.extend_from_slice(&height.to_be_bytes());
+		key.push(0xFF);
+		key.extend_from_slice(
+			content_disposition
+				.as_ref()
+				.map(|f| f.as_bytes())
+				.unwrap_or_default(),
+		);
+		key.push(0xFF);
+		key.extend_from_slice(
+			content_type
+				.as_ref()
+				.map(|c| c.as_bytes())
+				.unwrap_or_default(),
+		);
+
+		self.mediaid_file.insert(&key, &[])?;
+
+		if let Some(user) = sender_user {
+			let key = mxc.as_bytes().to_vec();
+			let user = user.as_bytes().to_vec();
+			self.mediaid_user.insert(&key, &user)?;
+		}
+
+		Ok(key)
+	}
+
+	fn delete_file_mxc(&self, mxc: String) -> Result<()> {
+		debug!("MXC URI: {:?}", mxc);
+
+		let mut prefix = mxc.as_bytes().to_vec();
+		prefix.push(0xFF);
+
+		debug!("MXC db prefix: {prefix:?}");
+
+		for (key, _) in self.mediaid_file.scan_prefix(prefix) {
+			debug!("Deleting key: {:?}", key);
+			self.mediaid_file.remove(&key)?;
+		}
+
+		for (key, value) in self.mediaid_user.scan_prefix(mxc.as_bytes().to_vec()) {
+			if key == mxc.as_bytes().to_vec() {
+				let user = string_from_bytes(&value).unwrap_or_default();
+
+				debug!("Deleting key \"{key:?}\" which was uploaded by user {user}");
+				self.mediaid_user.remove(&key)?;
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Searches for all files with the given MXC
+	fn search_mxc_metadata_prefix(&self, mxc: String) -> Result<Vec<Vec<u8>>> {
+		debug!("MXC URI: {:?}", mxc);
+
+		let mut prefix = mxc.as_bytes().to_vec();
+		prefix.push(0xFF);
+
+		let mut keys: Vec<Vec<u8>> = vec![];
+
+		for (key, _) in self.mediaid_file.scan_prefix(prefix) {
+			keys.push(key);
+		}
+
+		if keys.is_empty() {
+			return Err(Error::bad_database(
+				"Failed to find any keys in database with the provided MXC.",
+			));
+		}
+
+		debug!("Got the following keys: {:?}", keys);
+
+		Ok(keys)
+	}
+
+	fn search_file_metadata(
+		&self, mxc: String, width: u32, height: u32,
+	) -> Result<(Option<String>, Option<String>, Vec<u8>)> {
+		let mut prefix = mxc.as_bytes().to_vec();
+		prefix.push(0xFF);
+		prefix.extend_from_slice(&width.to_be_bytes());
+		prefix.extend_from_slice(&height.to_be_bytes());
+		prefix.push(0xFF);
+
+		let (key, _) = self
+			.mediaid_file
+			.scan_prefix(prefix)
+			.next()
+			.ok_or(Error::BadRequest(ErrorKind::NotFound, "Media not found"))?;
+
+		let mut parts = key.rsplit(|&b| b == 0xFF);
+
+		let content_type = parts
+			.next()
+			.map(|bytes| {
+				string_from_bytes(bytes)
+					.map_err(|_| Error::bad_database("Content type in mediaid_file is invalid unicode."))
+			})
+			.transpose()?;
+
+		let content_disposition_bytes = parts
+			.next()
+			.ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?;
+
+		let content_disposition = if content_disposition_bytes.is_empty() {
+			None
+		} else {
+			Some(
+				string_from_bytes(content_disposition_bytes)
+					.map_err(|_| Error::bad_database("Content Disposition in mediaid_file is invalid unicode."))?,
+			)
+		};
+		Ok((content_disposition, content_type, key))
+	}
+
+	/// Gets all the media keys in our database (this includes all the metadata
+	/// associated with it such as width, height, content-type, etc)
+	fn get_all_media_keys(&self) -> Result<Vec<Vec<u8>>> {
+		let mut keys: Vec<Vec<u8>> = vec![];
+
+		for (key, _) in self.mediaid_file.iter() {
+			keys.push(key);
+		}
+
+		Ok(keys)
+	}
+
+	fn remove_url_preview(&self, url: &str) -> Result<()> { self.url_previews.remove(url.as_bytes()) }
+
+	fn set_url_preview(&self, url: &str, data: &UrlPreviewData, timestamp: std::time::Duration) -> Result<()> {
+		let mut value = Vec::<u8>::new();
+		value.extend_from_slice(&timestamp.as_secs().to_be_bytes());
+		value.push(0xFF);
+		value.extend_from_slice(
+			data.title
+				.as_ref()
+				.map(String::as_bytes)
+				.unwrap_or_default(),
+		);
+		value.push(0xFF);
+		value.extend_from_slice(
+			data.description
+				.as_ref()
+				.map(String::as_bytes)
+				.unwrap_or_default(),
+		);
+		value.push(0xFF);
+		value.extend_from_slice(
+			data.image
+				.as_ref()
+				.map(String::as_bytes)
+				.unwrap_or_default(),
+		);
+		value.push(0xFF);
+		value.extend_from_slice(&data.image_size.unwrap_or(0).to_be_bytes());
+		value.push(0xFF);
+		value.extend_from_slice(&data.image_width.unwrap_or(0).to_be_bytes());
+		value.push(0xFF);
+		value.extend_from_slice(&data.image_height.unwrap_or(0).to_be_bytes());
+
+		self.url_previews.insert(url.as_bytes(), &value)
+	}
+
+	fn get_url_preview(&self, url: &str) -> Option<UrlPreviewData> {
+		let values = self.url_previews.get(url.as_bytes()).ok()??;
+
+		let mut values = values.split(|&b| b == 0xFF);
+
+		let _ts = values.next();
+		/* if we ever decide to use timestamp, this is here.
+		match values.next().map(|b| u64::from_be_bytes(b.try_into().expect("valid BE array"))) {
+			Some(0) => None,
+			x => x,
+		};*/
+
+		let title = match values
+			.next()
+			.and_then(|b| String::from_utf8(b.to_vec()).ok())
+		{
+			Some(s) if s.is_empty() => None,
+			x => x,
+		};
+		let description = match values
+			.next()
+			.and_then(|b| String::from_utf8(b.to_vec()).ok())
+		{
+			Some(s) if s.is_empty() => None,
+			x => x,
+		};
+		let image = match values
+			.next()
+			.and_then(|b| String::from_utf8(b.to_vec()).ok())
+		{
+			Some(s) if s.is_empty() => None,
+			x => x,
+		};
+		let image_size = match values
+			.next()
+			.map(|b| usize::from_be_bytes(b.try_into().unwrap_or_default()))
+		{
+			Some(0) => None,
+			x => x,
+		};
+		let image_width = match values
+			.next()
+			.map(|b| u32::from_be_bytes(b.try_into().unwrap_or_default()))
+		{
+			Some(0) => None,
+			x => x,
+		};
+		let image_height = match values
+			.next()
+			.map(|b| u32::from_be_bytes(b.try_into().unwrap_or_default()))
+		{
+			Some(0) => None,
+			x => x,
+		};
+
+		Some(UrlPreviewData {
+			title,
+			description,
+			image,
+			image_size,
+			image_width,
+			image_height,
+		})
+	}
+}
@@ -0,0 +1,14 @@
+mod account_data;
+//mod admin;
+mod appservice;
+mod globals;
+mod key_backups;
+mod media;
+//mod pdu;
+mod presence;
+mod pusher;
+mod rooms;
+mod sending;
+mod transaction_ids;
+mod uiaa;
+mod users;
@@ -0,0 +1,128 @@
+use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, UInt, UserId};
+
+use crate::{
+	database::KeyValueDatabase,
+	debug_info,
+	service::{self, presence::Presence},
+	services,
+	utils::{self, user_id_from_bytes},
+	Error, Result,
+};
+
+impl service::presence::Data for KeyValueDatabase {
+	fn get_presence(&self, user_id: &UserId) -> Result<Option<(u64, PresenceEvent)>> {
+		if let Some(count_bytes) = self.userid_presenceid.get(user_id.as_bytes())? {
+			let count = utils::u64_from_bytes(&count_bytes)
+				.map_err(|_e| Error::bad_database("No 'count' bytes in presence key"))?;
+
+			let key = presenceid_key(count, user_id);
+			self.presenceid_presence
+				.get(&key)?
+				.map(|presence_bytes| -> Result<(u64, PresenceEvent)> {
+					Ok((count, Presence::from_json_bytes(&presence_bytes)?.to_presence_event(user_id)?))
+				})
+				.transpose()
+		} else {
+			Ok(None)
+		}
+	}
+
+	fn set_presence(
+		&self, user_id: &UserId, presence_state: &PresenceState, currently_active: Option<bool>,
+		last_active_ago: Option<UInt>, status_msg: Option<String>,
+	) -> Result<()> {
+		let last_presence = self.get_presence(user_id)?;
+		let state_changed = match last_presence {
+			None => true,
+			Some(ref presence) => presence.1.content.presence != *presence_state,
+		};
+
+		let now = utils::millis_since_unix_epoch();
+		let last_last_active_ts = match last_presence {
+			None => 0,
+			Some((_, ref presence)) => now.saturating_sub(presence.content.last_active_ago.unwrap_or_default().into()),
+		};
+
+		let last_active_ts = match last_active_ago {
+			None => now,
+			Some(last_active_ago) => now.saturating_sub(last_active_ago.into()),
+		};
+
+		// tighten for state flicker?
+		if !state_changed && last_active_ts <= last_last_active_ts {
+			debug_info!(
+				"presence spam {:?} last_active_ts:{:?} <= {:?}",
+				user_id,
+				last_active_ts,
+				last_last_active_ts
+			);
+			return Ok(());
+		}
+
+		let status_msg = if status_msg.as_ref().is_some_and(String::is_empty) {
+			None
+		} else {
+			status_msg
+		};
+
+		let presence = Presence::new(
+			presence_state.to_owned(),
+			currently_active.unwrap_or(false),
+			last_active_ts,
+			status_msg,
+		);
+		let count = services().globals.next_count()?;
+		let key = presenceid_key(count, user_id);
+
+		self.presenceid_presence
+			.insert(&key, &presence.to_json_bytes()?)?;
+
+		self.userid_presenceid
+			.insert(user_id.as_bytes(), &count.to_be_bytes())?;
+
+		if let Some((last_count, _)) = last_presence {
+			let key = presenceid_key(last_count, user_id);
+			self.presenceid_presence.remove(&key)?;
+		}
+
+		Ok(())
+	}
+
+	fn remove_presence(&self, user_id: &UserId) -> Result<()> {
+		if let Some(count_bytes) = self.userid_presenceid.get(user_id.as_bytes())? {
+			let count = utils::u64_from_bytes(&count_bytes)
+				.map_err(|_e| Error::bad_database("No 'count' bytes in presence key"))?;
+			let key = presenceid_key(count, user_id);
+			self.presenceid_presence.remove(&key)?;
+			self.userid_presenceid.remove(user_id.as_bytes())?;
+		}
+
+		Ok(())
+	}
+
+	fn presence_since<'a>(&'a self, since: u64) -> Box<dyn Iterator<Item = (OwnedUserId, u64, Vec<u8>)> + 'a> {
+		Box::new(
+			self.presenceid_presence
+				.iter()
+				.flat_map(|(key, presence_bytes)| -> Result<(OwnedUserId, u64, Vec<u8>)> {
+					let (count, user_id) = presenceid_parse(&key)?;
+					Ok((user_id, count, presence_bytes))
+				})
+				.filter(move |(_, count, _)| *count > since),
+		)
+	}
+}
+
+#[inline]
+fn presenceid_key(count: u64, user_id: &UserId) -> Vec<u8> {
+	[count.to_be_bytes().to_vec(), user_id.as_bytes().to_vec()].concat()
+}
+
+#[inline]
+fn presenceid_parse(key: &[u8]) -> Result<(u64, OwnedUserId)> {
+	let (count, user_id) = key.split_at(8);
+	let user_id = user_id_from_bytes(user_id)?;
+	let count = utils::u64_from_bytes(count).unwrap();
+
+	Ok((count, user_id))
+}
--- a/Show More
+++ b/Show More