a

Signed-off-by: strawberry <strawberry@puppygock.gay>

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+tab_width = 4
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+
+[*.nix]
+indent_size = 2

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# adds a proper rustfmt.toml and formats the entire codebase
+1d1ac065141181438e744e7d8abd0e45f75a2f91

.github/workflows/ci.yml

@@ -10,6 +10,12 @@ env:
   # Required to make some things output color
   TERM: ansi
   ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+  CARGO_INCREMENTAL: 0
+  ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
+  ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
+
+permissions:
+  packages: write
 
 jobs:
   ci:
@@ -22,11 +28,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix (with flakes and nix-command enabled)
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-          # Add the `nix-community` cachix to speed up things that leverage it
+          # Add `nix-community`, Crane, upstream Conduit, and conduwuit binary caches
           extra_nix_config: |
             experimental-features = nix-command flakes
             extra-substituters = https://nix-community.cachix.org
@@ -40,6 +46,12 @@ jobs:
             extra-substituters = https://attic.kennel.juneis.dog/conduwuit
             extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
 
+      - name: Add alternative Nix binary caches if specified
+        if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
+        run: |
+          echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf
+          echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf
+
       - name: Pop/push Magic Nix Cache
         uses: DeterminateSystems/magic-nix-cache-action@main
 
@@ -66,14 +78,24 @@ jobs:
       - name: Populate `/nix/store`
         run: nix develop --command true
 
-      - name: Perform continuous integration
+      - name: Allow direnv
-        run: |
+        run: direnv allow
-          direnv allow
-          direnv exec . engage
 
-      - name: Build static-x86_64-unknown-linux-musl
+      - name: Cache x86_64 inputs for devShell
+        run: |
+          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+
+
+      - name: Perform continuous integration
+        run: direnv exec . engage
+
+
+      - name: Build static-x86_64-unknown-linux-musl and Create static deb-x86_64-unknown-linux-musl
         run: |
           ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
+          mkdir -p target/release
+          cp -v -f result/bin/conduit target/release
+          direnv exec . cargo deb --no-build
 
       - name: Upload artifact static-x86_64-unknown-linux-musl
         uses: actions/upload-artifact@v4
@@ -82,6 +104,14 @@ jobs:
           path: result/bin/conduit
           if-no-files-found: error
 
+      - name: Upload artifact deb-x86_64-unknown-linux-musl
+        uses: actions/upload-artifact@v4
+        with:
+          name: x86_64-unknown-linux-musl.deb
+          path: target/debian/*.deb
+          if-no-files-found: error
+
+
       - name: Build static-aarch64-unknown-linux-musl
         run: |
           ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
@@ -93,23 +123,26 @@ jobs:
           path: result/bin/conduit
           if-no-files-found: error
 
+
       - name: Build oci-image-x86_64-unknown-linux-gnu
         run: |
           ./bin/nix-build-and-cache .#oci-image
-          cp -f result oci-image-amd64.tar.gz
+          cp -v -f result oci-image-amd64.tar.gz
 
       - name: Upload artifact oci-image-x86_64-unknown-linux-gnu
         uses: actions/upload-artifact@v4
         with:
           name: oci-image-x86_64-unknown-linux-gnu
           path: oci-image-amd64.tar.gz
+          if-no-files-found: error
           # don't compress again
           compression-level: 0
 
+
       - name: Build oci-image-aarch64-unknown-linux-musl
         run: |
           ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
-          cp -f result oci-image-arm64v8.tar.gz
+          cp -v -f result oci-image-arm64v8.tar.gz
 
       - name: Upload artifact oci-image-aarch64-unknown-linux-musl
         uses: actions/upload-artifact@v4
@@ -120,18 +153,6 @@ jobs:
           # don't compress again
           compression-level: 0
 
-      - name: Build deb-x86_64-unknown-linux-gnu
-        run: |
-          sudo apt-get update && sudo apt-get install -y --no-install-recommends libclang-dev
-          cargo install cargo-deb
-          cargo deb
-
-      - name: Upload artifact deb-x86_64-unknown-linux-gnu
-        uses: actions/upload-artifact@v4
-        with:
-          name: deb-x86_64-unknown-linux-gnu
-          path: target/debian/*.deb
-          if-no-files-found: error
 
       - name: Extract metadata for Dockerhub
         env:
@@ -151,6 +172,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+
       - name: Login to Dockerhub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
@@ -168,6 +190,7 @@ jobs:
           username: girlbossceo
           password: ${{ secrets.GITHUB_TOKEN }}
 
+
       - name: Publish to Dockerhub
         if: github.event_name != 'pull_request'
         env:

.github/workflows/trivy.yml

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

.gitignore

@@ -74,3 +74,6 @@ test-conduit.toml
 
 # Gitlab CI cache
 /.gitlab-ci.d
+
+# macOS
+.DS_Store

.gitlab-ci.yml

@@ -6,22 +6,45 @@ stages:
 variables:
   # Makes some things print in color
   TERM: ansi
-  NIX_CONFIG: |
+
-    experimental-features = nix-command flake
+# Avoid duplicate pipelines
-    extra-substituters = https://nix.computer.surgery/conduit
+# See: https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
-    extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
+workflow:
-    extra-substituters = https://crane.cachix.org
+  rules:
-    extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    extra-substituters = https://nix-community.cachix.org
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
-    extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+      when: never
-    extra-substituters = https://attic.kennel.juneis.dog/conduit
+    - if: $CI
-    extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
-    extra-substituters = https://attic.kennel.juneis.dog/conduwuit
-    extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
 
 before_script:
+  # Enable nix-command and flakes
+  - if command -v nix > /dev/null; then echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf; fi
+
+  # Add conduwuit binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduwuit" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=" >> /etc/nix/nix.conf; fi
+
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduit" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=" >> /etc/nix/nix.conf; fi
+
+  # Add upstream Conduit binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://nix.computer.surgery/conduit" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=" >> /etc/nix/nix.conf; fi
+  
+  # Add alternate binary cache
+  - if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null && [ -n "$ATTIC_PUBLIC_KEY" ]; then echo "extra-trusted-public-keys = $ATTIC_PUBLIC_KEY" >> /etc/nix/nix.conf; fi
+
+  # Add crane binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://crane.cachix.org" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=" >> /etc/nix/nix.conf; fi
+
+  # Add nix-community binary cache
+  - if command -v nix > /dev/null; then echo "extra-substituters = https://nix-community.cachix.org" >> /etc/nix/nix.conf; fi
+  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" >> /etc/nix/nix.conf; fi
+
   # Install direnv and nix-direnv
-  - if command -v nix > /dev/null; then nix-env -iA nixpkgs.direnv nixpkgs.nix-direnv nixpkgs.engage; fi
+  - if command -v nix > /dev/null; then nix-env -iA nixpkgs.direnv nixpkgs.nix-direnv; fi
 
   # Allow .envrc
   - if command -v nix > /dev/null; then direnv allow; fi
@@ -31,109 +54,82 @@ before_script:
 
 ci:
   stage: ci
-  image: nixos/nix:2.20.2
+  image: nixos/nix:2.21.0
   script:
+    # Cache the inputs required for the devShell
+    - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+
     - direnv exec . engage
   cache:
     key: nix
     paths:
       - target
       - .gitlab-ci.d
+  rules:
+    # CI on upstream runners (only available for maintainers)
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $IS_UPSTREAM_CI == "true"
+    # Manual CI on unprotected branches that are not MRs
+    - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_PROTECTED == "false"
+      when: manual
+    # Manual CI on forks
+    - if: $IS_UPSTREAM_CI != "true"
+      when: manual
+    - if: $CI
+  interruptible: true
 
-static:x86_64-unknown-linux-musl:
+artifacts:
   stage: artifacts
-  image: nixos/nix:2.20.2
+  image: nixos/nix:2.21.0
   script:
-    # Push artifacts and build requirements to binary cache
     - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
+    - cp result/bin/conduit x86_64-unknown-linux-musl
 
-    # Make the output less difficult to find
+    - mkdir -p target/release
-    - cp result/bin/conduit conduit
+    - cp result/bin/conduit target/release
-  artifacts:
+    - direnv exec . cargo deb --no-build
-    paths:
+    - mv target/debian/*.deb x86_64-unknown-linux-musl.deb
-      - conduit
 
-static:aarch64-unknown-linux-musl:
-  stage: artifacts
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
-    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
-
-    # Make the output less difficult to find
-    - cp result/bin/conduit conduit
-  artifacts:
-    paths:
-      - conduit
-
-# Note that although we have an `oci-image-x86_64-unknown-linux-musl` output,
-# we don't build it because it would be largely redundant to this one since it's
-# all containerized anyway.
-oci-image:x86_64-unknown-linux-gnu:
-  stage: artifacts
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
-    #
     # Since the OCI image package is based on the binary package, this has the
     # fun side effect of uploading the normal binary too. Conduit users who are
     # deploying with Nix can leverage this fact by adding our binary cache to
     # their systems.
+    #
+    # Note that although we have an `oci-image-x86_64-unknown-linux-musl`
+    # output, we don't build it because it would be largely redundant to this
+    # one since it's all containerized anyway.
     - ./bin/nix-build-and-cache .#oci-image
-
-    # Make the output less difficult to find
     - cp result oci-image-amd64.tar.gz
-  artifacts:
-    paths:
-      - oci-image-amd64.tar.gz
 
-oci-image:aarch64-unknown-linux-musl:
+    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
-  stage: artifacts
+    - cp result/bin/conduit aarch64-unknown-linux-musl
-  needs:
+
-    # Wait for the static binary job to finish before starting so we don't have
-    # to build that twice for no reason
-    - static:aarch64-unknown-linux-musl
-  image: nixos/nix:2.20.2
-  script:
-    # Push artifacts and build requirements to binary cache
     - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
-
-    # Make the output less difficult to find
     - cp result oci-image-arm64v8.tar.gz
   artifacts:
     paths:
+      - x86_64-unknown-linux-musl
+      - aarch64-unknown-linux-musl
+      - x86_64-unknown-linux-musl.deb
+      - oci-image-amd64.tar.gz
       - oci-image-arm64v8.tar.gz
+  rules:
+    # CI required for all MRs
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # Optional CI on forks
+    - if: $IS_UPSTREAM_CI != "true"
+      when: manual
+      allow_failure: true
+    - if: $CI
+  interruptible: true
 
-debian:x86_64-unknown-linux-gnu:
+.push-oci-image:
-  stage: artifacts
-  # See also `rust-toolchain.toml`
-  image: rust:1.75.0
-  script:
-    - cargo install cargo-deb
-    - cargo deb
-
-    # Make the output less difficult to find
-    - mv target/debian/*.deb conduit.deb
-  artifacts:
-    paths:
-      - conduit.deb
-  cache:
-    key: debian
-    paths:
-      - target
-      - .gitlab-ci.d
-
-docker-publish:
   stage: publish
-  image: docker:25.0.3
+  image: docker:25.0.4
   services:
-    - docker:25.0.3-dind
+    - docker:25.0.4-dind
   variables:
-    IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
     IMAGE_SUFFIX_AMD64: amd64
     IMAGE_SUFFIX_ARM64V8: arm64v8
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
     - docker load -i oci-image-amd64.tar.gz
     - IMAGE_ID_AMD64=$(docker images -q conduit:main)
@@ -157,8 +153,14 @@ docker-publish:
         docker manifest push $IMAGE_NAME:latest
       fi
   dependencies:
-    - oci-image:x86_64-unknown-linux-gnu
+    - artifacts
-    - oci-image:aarch64-unknown-linux-musl
   only:
     - main
     - tags
+
+oci-image:push-gitlab:
+  extends: .push-oci-image
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

Cargo.toml

@@ -6,124 +6,324 @@ authors = ["strawberry <strawberry@puppygock.gay>", "timokoesters <timo@koesters
 homepage = "https://puppygock.gay/conduwuit"
 repository = "https://gitlab.com/girlbossceo/conduwuit"
 readme = "README.md"
-version = "0.7.0-alpha+conduwuit-0.1.3"
+version = "0.7.0-alpha+conduwuit-0.1.8"
 edition = "2021"
 
 # See also `rust-toolchain.toml`
 rust-version = "1.75.0"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+# Used for secure identifiers
+rand = "0.8.5"
+
+# Used for conduit::Error type
+thiserror = "1.0.58"
+
+# Used to encode server public key
+base64 = "0.22.0"
+
+# Used when hashing the state
+ring = "0.17.8"
+
+# Used when querying the SRV record of other servers
+trust-dns-resolver = "0.23.2"
+
+# Used to find matching events for appservices
+regex = "1.10.3"
+
+# Used to load forbidden room/user regex from config
+serde_regex = "1.1.0"
+itertools = "0.12.1"
+
+# jwt jsonwebtokens
+jsonwebtoken = "9.2.0"
+
+lru-cache = "0.1.2"
+
+# Used for ruma wrapper
+serde_html_form = "0.2.5"
+
+# used for TURN server authentication
+hmac = "0.12.1"
+sha-1 = "0.10.1"
+
+async-trait = "0.1.78"
+
+# used for checking if an IP is in specific subnets / CIDR ranges easier
+ipaddress = "0.1.3"
+
+# to encode/decode percent URIs when conduwuit is running without a reverse proxy
+#urlencoding = "2.1.3"
+
+# to get the client IP address of requests
+#axum-client-ip = "0.4.2"
+
+# to parse user-friendly time durations in admin commands
+cyborgtime = "2.1.1"
+
+# all the web/HTTP dependencies
+# Used for the http request / response body type for Ruma endpoints used with reqwest
+bytes = "1.5.0"
+http = "0.2.12"
+
 # Web framework
-axum = { version = "0.6.20", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true }
+[dependencies.axum]
-axum-server = { version = "0.5.1", features = ["tls-rustls"] }
+version = "0.6.20"
-tower = { version = "0.4.13", features = ["util"] }
+default-features = false
-tower-http = { version = "0.4.4", features = ["add-extension", "cors", "sensitive-headers", "trace", "util", "compression-zstd"] }
+features = ["form", "headers", "http1", "http2", "json", "matched-path"]
+optional = true
+
+[dependencies.axum-server]
+version = "0.5.1"
+features = ["tls-rustls"]
+
+[dependencies.tower]
+version = "0.4.13"
+features = ["util"]
+
+[dependencies.tower-http]
+version = "0.4.4"
+features = [
+  "add-extension",
+  "cors",
+  "sensitive-headers",
+  "trace",
+  "util",
+]
+
+[dependencies.hyper]
+version = "0.14"
+features = [
+  "server",
+  "http1",
+  "http2",
+]
+
+[dependencies.reqwest]
+version = "0.11.26"
+default-features = false
+features = [
+  "rustls-tls-native-roots",
+  "socks",
+  "trust-dns",
+]
+
+# all the serde stuff
+# Used for pdu definition
+[dependencies.serde]
+version = "1.0.197"
+features = ["rc"]
+# Used for appservice registration files
+[dependencies.serde_yaml]
+version = "0.9.32"
+# Used for ruma wrapper
+[dependencies.serde_json]
+version = "1.0.114"
+features = ["raw_value"]
+
+
+# Used for password hashing
+[dependencies.argon2]
+version = "0.5.3"
+features = [
+  "alloc",
+  "rand",
+]
+default-features = false
+
+# Used to generate thumbnails for images
+[dependencies.image]
+version = "0.25.0"
+default-features = false
+features = [
+  "jpeg",
+  "png",
+  "gif",
+  "webp",
+]
+
+# logging
+[dependencies.tracing]
+version = "0.1.40"
+default-features = false
+[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 jemalloc usage
+[dependencies.tikv-jemallocator]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["unprefixed_malloc_on_supported_platforms"]
+[dependencies.tikv-jemalloc-ctl]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["use_std"]
+
+# for URL previews
+[dependencies.webpage]
+version = "2.0"
+default-features = false
+
+# to support multiple variations of setting a config option
+[dependencies.either]
+version = "1.10.0"
+features = ["serde"]
+
+# to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest
+[dependencies.axum-server-dual-protocol]
+version = "0.5.2"
+optional = true
+
+# used for conduit's CLI and admin room command parsing
+[dependencies.clap]
+version = "4.5.3"
+default-features = false
+features = [
+  "std",
+  "derive",
+  "help",
+  "usage",
+  "error-context",
+]
+
+[dependencies.futures-util]
+version = "0.3.30"
+default-features = false
+
+# Used for reading the configuration from conduit.toml & environment variables
+[dependencies.figment]
+version = "0.10.15"
+features = [
+  "env",
+  "toml",
+]
 
 # Used for matrix spec type definitions and helpers
 #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { git = "https://github.com/ruma/ruma", rev = "4d9f754657a099df8e61533787b8eebd12946435", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] }
-ruma = { git = "https://github.com/girlbossceo/ruma", rev = "788ea6b00fab49b04a17d88caa0c840b7d74aa13", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] }
 #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
+[dependencies.ruma]
+git = "https://github.com/girlbossceo/ruma"
+branch = "conduwuit-changes"
+features = [
+  "compat",
+  "rand",
+  "appservice-api-c",
+  "client-api",
+  "federation-api",
+  "push-gateway-api-c",
+  "state-res",
+  "unstable-msc2448",
+  "unstable-msc3575",
+  "unstable-exhaustive-types",
+  "ring-compat",
+  "unstable-unspecified",
+  "unstable-msc2870",
+  "unstable-msc3061",
+  "unstable-msc2867",
+  "unstable-extensible-events",
+]
 
-# Async runtime and utilities
+[dependencies.rust-rocksdb]
-hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d149644600d326559af0d2b235c945b05c04", features = [
+git = "https://github.com/zaidoon1/rust-rocksdb"
-  "server",
+#branch = "master"
-] }
+rev = "3e4a0f632a8c0c2839c7d183725c53895110d907"
-hyper = { version = "0.14", features = ["server", "http1", "http2"] }
+optional = true
-tokio = { version = "1.36.0", features = ["fs", "macros", "signal", "sync"] }
+default-features = true
+features = [
+    "multi-threaded-cf",
+    "zstd",
+]
 
-# Used for the http request / response body type for Ruma endpoints used with reqwest
+[dependencies.rusqlite]
-bytes = "1.5.0"
+git = "https://github.com/rusqlite/rusqlite"
-http = "0.2.11"
+branch = "master"
-# Used for ruma wrapper
+#rev = "def8e9460d8376a5c0c9f4f9846d413a9cd4581a"
-serde_json = { version = "1.0.114", features = ["raw_value"] }
+optional = true
-# Used for appservice registration files
+features = ["bundled"]
-serde_yaml = "0.9.32"
-# Used for pdu definition
-serde = { version = "1.0.197", features = ["rc"] }
-# Used for secure identifiers
-rand = "0.8.5"
-# Used to hash passwords
-argon2 = "0.5.3"
-reqwest = { version = "0.11.24", default-features = false, features = ["rustls-tls-native-roots", "socks"] }
-# Used for conduit::Error type
-thiserror = "1.0.57"
-# Used to generate thumbnails for images
-image = { version = "0.24.8", default-features = false, features = ["jpeg", "png", "gif", "webp"] }
-# Used to encode server public key
-base64 = "0.21.7"
-# Used when hashing the state
-ring = "0.17.8"
-# Used when querying the SRV record of other servers
-trust-dns-resolver = "0.23.2"
-# Used to find matching events for appservices
-regex = "1.10.3"
-# Used to load forbidden room/user regex from config
-serde_regex = "1.1.0"
-itertools = "0.12.1"
-# jwt jsonwebtokens
-jsonwebtoken = "9.2.0"
-# Performance measurements
-tracing = { version = "0.1.40", features = [] }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tracing-flame = "0.2.0"
-opentelemetry = "0.21.0"
-opentelemetry_sdk = { version = "0.21.2", features = ["rt-tokio"] }
-opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio"] }
-tracing-opentelemetry = "0.22.0"
-lru-cache = "0.1.2"
-rusqlite = { git = "https://github.com/rusqlite/rusqlite", rev = "ccfbc28ae1edc3090fb1b331fdc145f052ec73b9", optional = true, features = ["bundled"] }
-parking_lot = { version = "0.12.1", optional = true }
-num_cpus = "1.16.0"
-threadpool = "1.8.1"
-# Used for ruma wrapper
-serde_html_form = "0.2.4"
 
-thread_local = "1.1.7"
+# used only by rusqlite
-# used for TURN server authentication
+[dependencies.parking_lot]
-hmac = "0.12.1"
+version = "0.12.1"
-sha-1 = "0.10.1"
+optional = true
-sha2 = { version = "0.10.8" }
-# used for conduit's CLI and admin room command parsing
-clap = { version = "4.5.1", default-features = false, features = ["std", "derive", "help", "usage", "error-context"] }
-futures-util = { version = "0.3.30", default-features = false }
-# Used for reading the configuration from conduit.toml & environment variables
-figment = { version = "0.10.14", features = ["env", "toml"] }
 
-tikv-jemalloc-ctl = { version = "0.5.4", features = ["use_std"], optional = true }
+# used only by rusqlite
-tikv-jemallocator = { version = "0.5.4", features = ["unprefixed_malloc_on_supported_platforms"], optional = true }
+[dependencies.thread_local]
-lazy_static = "1.4.0"
+version = "1.1.8"
-async-trait = "0.1.77"
+optional = true
 
-# used for checking if an IP is in specific subnets / CIDR ranges
+# used only by rusqlite and rust-rocksdb
-ipaddress = "0.1.3"
+[dependencies.num_cpus]
-
+version = "1.16.0"
-sd-notify = { version = "0.4.1", optional = true }
+optional = true
-
-webpage = { version = "2.0", default-features = false }
-
-rocksdb = { version = "0.22.0", default-features = true, features = ["multi-threaded-cf", "zstd"], optional = true }
 
+[dependencies.tokio]
+version = "1.36.0"
+features = [
+  "fs",
+  "macros",
+  "sync",
+  "signal",
+]
 
+# *nix-specific dependencies
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.27.1", features = ["resource"] }
+nix = { version = "0.28.0", features = ["resource"] }
+sd-notify = { version = "0.4.1", optional = true } # systemd is only available/relevant on *nix platforms
+hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d149644600d326559af0d2b235c945b05c04", features = ["server"] } # unix socket support
+
+
 
 [features]
-default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"]
+default = ["conduit_bin", "backend_rocksdb", "systemd"]
+conduit_bin = ["axum"]
 backend_sqlite = ["sqlite"]
 backend_rocksdb = ["rocksdb"]
+rocksdb = ["rust-rocksdb", "num_cpus"]
 jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
-sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
+sqlite = ["rusqlite", "parking_lot", "thread_local", "num_cpus"]
-conduit_bin = ["axum"]
 systemd = ["sd-notify"]
+
 #gzip_compression = ["tower-http/compression-gzip"]
-zstd_compression = []
+zstd_compression = ["tower-http/compression-zstd"]
 #brotli_compression = ["tower-http/compression-br"]
-#compression = ["tower-http/compression-full"]
+#all_compression = ["tower-http/compression-full"] # all compression algos
-sha256_media = []
+
-io_uring = ["rocksdb/io-uring"]
+sha256_media = ["sha2"]
+io_uring = ["rust-rocksdb/io-uring"]
+axum_dual_protocol = ["axum-server-dual-protocol"]
+
+perf_measurements = ["opentelemetry", "tracing-flame", "tracing-opentelemetry", "opentelemetry_sdk", "opentelemetry-jaeger"]
+
+
 
 [[bin]]
 name = "conduit"
@@ -148,6 +348,7 @@ assets = [
   ["debian/README.md", "usr/share/doc/matrix-conduit/README.Debian", "644"],
   ["README.md", "usr/share/doc/matrix-conduit/", "644"],
   ["target/release/conduit", "usr/sbin/matrix-conduit", "755"],
+  ["conduwuit-example.toml", "etc/matrix-conduit/conduit.toml", "640"],
 ]
 conf-files = [
   "/etc/matrix-conduit/conduit.toml"
@@ -155,10 +356,20 @@ conf-files = [
 maintainer-scripts = "debian/"
 systemd-units = { unit-name = "matrix-conduit" }
 
+
+
 [profile.dev]
 debug = 0
 lto = 'off'
+codegen-units = 512
 incremental = true
+# seems to speed up continuous debug compilations
+[profile.dev.build-override]
+opt-level = 3
+[profile.dev.package."*"] # external dependencies
+opt-level = 1
+[profile.dev.package."tokio"]
+opt-level = 3
 
 # default release profile
 [profile.release]
@@ -168,6 +379,7 @@ opt-level = 3
 overflow-checks = true
 strip = "symbols"
 panic = "abort"
+control-flow-guard = true # Windows only
 debug = 0
 
 # high performance release profile which uses fat LTO across all crates, 1 codegen unit, max opt-level, and optimises across all crates
@@ -187,6 +399,8 @@ debug = 0
 opt-level = 3
 codegen-units = 1
 
+
+
 [lints]
 workspace = true
 
@@ -199,17 +413,30 @@ explicit_outlives_requirements = "warn"
 # unreachable_pub = "warn"
 unused_extern_crates = "warn"
 unused_import_braces = "warn"
-# unused_lifetimes = "warn"
+unused_lifetimes = "warn"
 unused_qualifications = "warn"
+unused_macro_rules = "warn"
 dead_code = "warn"
+elided_lifetimes_in_paths = "warn"
+macro_use_extern_crate = "warn"
+single_use_lifetimes = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+
+# not in rust 1.75.0 (doesn't break CI but won't check for it)
+unit_bindings = "warn"
+
+# this seems to suggest broken code and is not working correctly
+unused_braces = "allow"
 
 [workspace.lints.clippy]
+# pedantic = "warn"
+
 suspicious = "warn" # assume deny in practice
 perf = "warn" # assume deny in practice
+
 redundant_clone = "warn"
 cloned_instead_of_copied = "warn"
 expl_impl_clone_on_copy = "warn"
-# pedantic = "warn"
 unnecessary_cast = "warn"
 cast_lossless = "warn"
 ptr_as_ptr = "warn"
@@ -241,5 +468,43 @@ unseparated_literal_suffix = "warn"
 # unwrap_used = "warn"
 # expect_used = "warn"
 wildcard_dependencies = "warn"
-# or_fun_call = "warn"
+or_fun_call = "warn"
 unnecessary_lazy_evaluations = "warn"
+# as_conversions = "warn"
+assertions_on_result_states = "warn"
+default_union_representation = "warn"
+deref_by_slicing = "warn"
+empty_drop = "warn"
+# error_impl_error = "warn"
+exit = "warn"
+filetype_is_file = "warn"
+float_cmp_const = "warn"
+format_push_string = "warn"
+impl_trait_in_params = "warn"
+ref_to_mut = "warn"
+# let_underscore_untyped = "warn"
+lossy_float_literal = "warn"
+mem_forget = "warn"
+missing_assert_message = "warn"
+# mod_module_files = "warn"
+# multiple_inherent_impl = "warn"
+mutex_atomic = "warn"
+# same_name_method = "warn"
+semicolon_outside_block = "warn"
+fn_to_numeric_cast = "warn"
+fn_to_numeric_cast_with_truncation = "warn"
+string_lit_chars_any = "warn"
+suspicious_xor_used_as_pow = "warn"
+try_err = "warn"
+unnecessary_safety_comment = "warn"
+unnecessary_safety_doc = "warn"
+unnecessary_self_imports = "warn"
+verbose_file_reads = "warn"
+# cast_precision_loss = "warn"
+cast_possible_wrap = "warn"
+# cast_possible_truncation = "warn"
+redundant_closure_for_method_calls = "warn"
+large_futures = "warn"
+
+# not in rust 1.75.0 (breaks CI)
+# infinite_loop = "warn"

DEPLOY.md

@@ -9,32 +9,9 @@
 
 ## Installing conduwuit
 
-You may simply download the binary that fits your machine. Run `uname -m` to see what you need. Now copy the appropriate URL:
+You may simply download the binary that fits your machine. Run `uname -m` to see what you need.
 
-**Stable versions:**
+Prebuilt binaries can be downloaded from the latest successful CI workflow on the main branch here: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=branch%3Amain+actor%3Agirlbossceo
-
-| CPU Architecture                            | Download stable version                                         |
-| ------------------------------------------- | --------------------------------------------------------------- |
-| x84_64 / amd64 (Most servers and computers) | [Binary][x84_64-glibc-master] / [.deb][x84_64-glibc-master-deb] |
-| armv7 (e.g. Raspberry Pi by default)        | [Binary][armv7-glibc-master] / [.deb][armv7-glibc-master-deb]   |
-| armv8 / aarch64                             | [Binary][armv8-glibc-master] / [.deb][armv8-glibc-master-deb]   |
-
-[x84_64-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_amd64/conduit?job=docker:master
-[armv7-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm_v7/conduit?job=docker:master
-[armv8-glibc-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm64/conduit?job=docker:master
-[x84_64-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_amd64/conduit.deb?job=docker:master
-[armv7-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm_v7/conduit.deb?job=docker:master
-[armv8-glibc-master-deb]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm64/conduit.deb?job=docker:master
-
-**Latest versions:**
-
-| Target | Type | Download |
-|-|-|-|
-| `x86_64-unknown-linux-gnu` | Dynamically linked Debian package | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit.deb?job=debian:x86_64-unknown-linux-gnu) |
-| `x86_64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit?job=static:x86_64-unknown-linux-musl) |
-| `aarch64-unknown-linux-musl` | Statically linked binary | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/conduit?job=static:aarch64-unknown-linux-musl) |
-| `x86_64-unknown-linux-musl` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/oci-image-amd64.tar.gz?job=oci-image:x86_64-unknown-linux-musl) |
-| `aarch64-unknown-linux-musl` | OCI image | [link](https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/oci-image-arm64v8.tar.gz?job=oci-image:aarch64-unknown-linux-musl) |
 
 ```bash
 $ sudo wget -O /usr/local/bin/matrix-conduit <url>
@@ -248,7 +225,7 @@ server {
 
     location /_matrix/ {
         # TCP
-        proxy_pass http://127.0.0.1:6167$request_uri;
+        proxy_pass http://127.0.0.1:6167;
 
         # UNIX socket
         #proxy_pass http://backend;

DIFFERENCES.md

@@ -2,6 +2,7 @@
 
 - GitLab CI ported to GitHub Actions
 - Fixed every single clippy (default lints) and rustc warnings, including some that were performance related or potential safety issues / unsoundness
+- Add a **lot** of other clippy and rustc lints and a rustfmt.toml file
 - Has Renovate and significantly updates all dependencies possible
 - Uses proper argon2 crate instead of questionable rust-argon2 crate
 - Improved and cleaned up logging (less noisy dead server logging, registration attempts, more useful troubleshooting logging, etc)
@@ -10,17 +11,14 @@
 - Configurable RocksDB logging (`LOG` files) with proper defaults (rotate, max size, verbosity, etc) to stop LOG files from accumulating so much
 - Federated presence support and configurable local presence (via upstream MR)
 - Concurrency support for key fetching for faster remote room joins and room joins that will error less frequently (via upstream MR)
-- Experimental room version 11 support (via upstream MR)
+- Room version 11 support (via upstream MR)
-- Enabled all non-officially-supported room versions as experimental so we can at least attempt to join them
+- Config option to allow guest registrations
-- Configurable guest registration including forbidding guest registrations if no admin user is created yet, respects allow registration setting, and an optional override setting with a default of no guest registrations allowed.
 - Explicit startup error/warning if your configuration allows open registration without a token or such like Synapse
-- Improved RocksDB defaults to use new features that help with performance significantly, uses settings tailored to SSDs, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage.
+- Improved RocksDB defaults to use new features that help with performance significantly, uses settings tailored to SSDs, various ways to tweak RocksDB, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage.
 - Updated Ruma to latest commit where possible, and add some unstable MSCs (some still require an implementation though)
-- conduwuit allows MXIDs with `+` in them (thanks to Ruma update)
 - Revamped admin room infrastructure and commands (via upstream MR)
 - Admin room commands to delete room aliases and unpublish rooms from our room directory (via upstream MR)
 - Make spaces/hierarchy cache use cache_capacity_modifier instead of hardcoded small value
-- Make PDU appending, building, etc asynchronous
 - Add *optional* feature flag to use SHA256 key names for media instead of base64 to overcome filesystem file name length limitations (OS error file name too long) (via upstream MR) 
 - Add *optional* feature flag to enable zstd HTTP body compression
 - Add support for querying both Matrix SRV records, the deprecated `_matrix` record and `_matrix-fed` record if necessary
@@ -29,7 +27,6 @@
 - Add config option for federating `/publicRooms` endpoint (room directory) to other servers with a default disabled for privacy
 - Add support for listening on a UNIX socket for performance and host security with proper default permissions (660)
 - Add missing `destination` key to all `X-Matrix` `Authorization` requests (spec compliance issue)
-- Fix spec compliance issue with servers being able to fetch remote user profiles over federation for users who don't belong to our server (`/_matrix/federation/v1/query/profile`)
 - Use aggressive build-time performance optimisations for release builds (1 codegen unit, no debug, fat LTO, etc, and optimise all crates with same)
 - Raise various hardcoded timeouts in codebase that were way too short, making some things like room joins and client bugs error less or none at all than they should
 - Add debug admin command to force update user device lists (could potentially resolve some E2EE flukes) (`ForceDeviceListUpdates`)
@@ -38,7 +35,6 @@
 - Add non-standard sliding sync proxy health check (?) endpoint at `/client/server.json` that some clients such as Element Web query using the `well_known_client` or `well_known_server` config options
 - Send a User-Agent on all of our requests (`conduwuit/0.7.0-alpha+conduwuit-0.1.1`) which strangely was not done upstream since forever. Some providers consider no User-Agent suspicious and block said requests.
 - Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic
-- Basic binary commands like `conduwuit --version` work (interested in expanding it more)
 - Allow HEAD HTTP requests in CORS for clients (despite not being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need to behave the same as GET requests, Synapse supports HEAD requests)
 - Purge unmaintained/irrelevant/broken database backends (heed, sled, persy)
 - webp support for images
@@ -56,7 +52,7 @@
 - Revamp example config, adding a lot of config options available (still some missing)
 - Return joined member count of rooms for push rules/conditions instead of a hardcoded value of 10
 - Respect *most* client parameters for `/media/` requests (`allow_redirect` still needs work)
-- Config option `ip_range_denylist` to support refusing to send requests (typically federation) to specific IP ranges, typically RFC 1918, non-routable, testnet, etc addresses like Synapse for security.
+- Config option `ip_range_denylist` to support refusing to send requests (typically federation) to specific IP ranges, typically RFC 1918, non-routable, testnet, etc addresses like Synapse for security (note: this is not a guaranteed protection, and you should be using a firewall with zones if you want guaranteed protection as doing this on the application level is prone to bypasses).
 - Support for creating rooms with custom room IDs like Maunium Synapse (`room_id` request body field to `/createRoom`)
 - Assume well-knowns are broken if they exceed past 10000 characters.
 - Basic validation/checks on user-specified room aliases and custom room ID creations
@@ -66,6 +62,23 @@
 - URL preview support (via upstream MR) with various improvements
 - Increased graceful shutdown timeout from a low 60 seconds to 180 seconds to avoid killing connections and let the remaining ones finish processing, and ask systemd for more time to shutdown if needed to prevent systemd's default [`TimeoutStopSec=`](https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#TimeoutStopSec=) of 90 seconds from killing conduwuit
 - Bumped default max_concurrent_requests to 500
-- Add support for the deprecated `user` identifier field for all `/login` requests
 - Query parameter `?format=event|content` for returning either the room state event's content (default) for the full room state event on ` /_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see https://github.com/matrix-org/matrix-spec/issues/1047)
-- Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, as a moderation feature
+- Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, and blocks room invites (remote and local) to the banned room, as a moderation feature
+- Add admin command to delete media via a specific MXC. This deletes the MXC from our database, and the file locally.
+- Replace the lightning bolt emoji option with support for setting any arbitrary text (e.g. another emoji) to suffix to all new user registrations
+- Add admin command to bulk delete media via a codeblock list of MXC URLs.
+- Add admin command to delete both the thumbnail and media MXC URLs from an event ID (e.g. from an abuse report)
+- Add `!admin` as a way to call the Conduit admin bot
+- Add support for listening on multiple TCP ports
+- Add admin command to list all the rooms a local user is joined in
+- Add admin command to delete all remote media in the past X minutes as a form of deleting media that you don't want on your server that a remote user posted in a room
+- Config option to block non-admin users from sending room invites or receiving remote room invites. Admin users are still allowed.
+- Startup check if conduwuit running in a container and is listening on 127.0.0.1
+- Make `CONDUIT_CONFIG` optional, relevant for container users that configure only by environment variables and no longer need to set `CONDUIT_CONFIG` to an empty string.
+- Config option to change Conduit's behaviour of homeserver key fetching (`query_trusted_key_servers_first`). This option sets whether conduwuit will query trusted notary key servers first before the individual homeserver(s), or vice versa.
+- Implement database flush and cleanup Conduit operations when using RocksDB
+- Implement legacy Matrix `/v1/` media endpoints that some clients and servers may still call
+- Commandline argument to specify the path to a config file
+- Admin debug command to fetch a PDU from a remote server and inserts it into our database/timeline
+- Update rusqlite/sqlite (not that you should be using it)
+- Disable update check by default as it's not useful for conduwuit

README.md

@@ -1,10 +1,12 @@
 # conduwuit
 ### a well maintained fork of [Conduit](https://conduit.rs/)
 
+[![CI and Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)
+
 #### What is Matrix?
 [Matrix](https://matrix.org) is an open network for secure and decentralized
 communication. Users from every Matrix homeserver can chat with users from all
-other Matrix servers. You can even use bridges (also called Matrix appservices)
+other Matrix servers. You can even use bridges (also called Matrix Appservices)
 to communicate with users outside of Matrix, like a community on Discord.
 
 #### What is the goal?
@@ -15,15 +17,13 @@ friends or company.
 
 #### Can I try it out?
 
-There are no public conduwuit homeservers available, however conduwuit is incredibly simple to install. It's just a binary, a config file, and a database path.
+An official conduwuit server ran by me is available at transfem.dev ([element.transfem.dev](https://element.transfem.dev) / [cinny.transfem.dev](https://cinny.transfem.dev))
 
 #### What is the current status?
 
 conduwuit is a fork of Conduit which is in beta, meaning you can join and participate in most
 Matrix rooms, but not all features are supported and you might run into bugs
-from time to time. conduwuit attempts to fix and improve the majority of upstream Conduit bugs
+from time to time.
-or UX issues that are taking too long to be resolved, or unnecessary Matrix or developer
-politics halting simple things from being merged or fixed, and general inactivity.
 
 There are still a few nice to have features missing that some users may notice:
 
@@ -35,23 +35,23 @@ See [DIFFERENCES.md](DIFFERENCES.md)
 
 #### Why does this fork exist? Why don't you contribute back upstream?
 
-I have tried, but:
+I now intend on contributing back as time and mental energy sees fit, but my fork still exists as a way to:
-- unnecessary Matrix / developer politics
+- avoid unnecessary Matrix and general developer politics
-- bikeshedding unnecessary or irrelevant things in MRs
+- avoid bikeshedding unnecessary or irrelevant things in upstream MRs
-- disagreement with how the upstream project is maintained including the codebase
+- Fast tracked bug fixes, performance improvements, security improvements, and new features
-- upstream maintainer inactivity
+- Have early access to MRs that may not be suitable/acceptable for Conduit (e.g. too niche, too advanced for general users, only being blocked due to pending on contributor actions that we can fix ourselves downstream, pending Matrix spec stuff, etc)
-- questionable community members
+- Support unspecced or WIP features
-- lack of MR reviews or issue triaging and no upstream maintainer interest in receiving help
+- Have official support for other OS's like Windows, macOS, and BSD.
-- severe bugs, including denial of service and other likely vulnerabilities, not being merged due to things mentioned above
+- Have a **stable** testing ground for some MRs or new features and bug fixes
-- no interest in adding co-maintainers to help out
 
-are what are keeping me from contributing. If the state of the upstream project improves, I'm
+And various other reasons that may not be listed here.
-willing to start contributing again. As is, I think if folks want a more polished and well-kept version of Conduit, conduwuit exists for that.
 
 #### How can I deploy my own?
 
+conduwuit officially supports Linux, macOS, BSD, and Windows.
+
 - Simple install (this was tested the most): [DEPLOY.md](DEPLOY.md)
-- Nix/NixOS: [nix/README.md](nix/README.md)
+- Nix/NixOS (and binary cache): [nix/README.md](nix/README.md)
 
 If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md](APPSERVICES.md).
 
@@ -62,8 +62,7 @@ If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md]
 2. Ask someone to assign the issue to you (comment on the issue or chat in
    [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay))
 3. Fork the repo and work on the issue.
-4. Submit a PR (please keep contributions to the GitHub repo, main development is done here,
+4. Submit a PR (please keep contributions to the GitHub repo, main development is done here, not the GitLab repo which exists just as a mirror. If you are avoiding GitHub, feel free to join our Matrix chat to get your patch in.)
-not the GitLab repo which exists just as a mirror.)
 
 #### Contact
 
@@ -81,10 +80,14 @@ GitHub Sponsors: <https://github.com/sponsors/girlbossceo>
 
 No official conduwuit logo exists. Repo and Matrix room picture is from bran (<3).
 
+#### Is it conduwuit or Conduwuit?
+
+Both.
+
 #### Mirrors of conduwuit
 
-GitHub: https://github.com/girlbossceo/conduwuit
+GitHub: <https://github.com/girlbossceo/conduwuit>\
-GitLab: https://gitlab.com/girlbossceo/conduwuit
+GitLab: <https://gitlab.com/girlbossceo/conduwuit>\
-git.gay: https://git.gay/june/conduwuit
+git.gay: <https://git.gay/june/conduwuit>\
-Codeberg: https://codeberg.org/girlbossceo/conduwuit
+Codeberg: <https://codeberg.org/girlbossceo/conduwuit>\
-sourcehut: https://git.sr.ht/~girlbossceo/conduwuit
+sourcehut: <https://git.sr.ht/~girlbossceo/conduwuit>

bin/nix-build-and-cache

@@ -8,43 +8,34 @@ INSTALLABLE="$1"
 # Build the installable and forward any other arguments too
 nix build -L "$@"
 
-if [ ! -z ${ATTIC_TOKEN+x} ]; then
+if [ ! -z "$ATTIC_TOKEN" ]; then
-
+    nix run --inputs-from . attic -- \
-nix run --inputs-from . attic -- login \
+        login \
         conduit \
-        https://attic.kennel.juneis.dog/conduit \
+        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduit}" \
         "$ATTIC_TOKEN"
 
-    push_args=(
+    # Push the target installable and its build dependencies
-        # Attic and its build dependencies
+    nix run --inputs-from . attic -- \
-        "$(nix path-info --inputs-from . attic)"
+        push \
-        "$(nix path-info --inputs-from . attic --derivation)"
+        conduit \
-
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
-        # The target installable and its build dependencies
-        "$(nix path-info "$INSTALLABLE" --derivation)"
         "$(nix path-info "$INSTALLABLE")"
-    )
 
-    nix run --inputs-from . attic -- push conduit "${push_args[@]}"
 
     # push to "conduwuit" too
-nix run --inputs-from . attic -- login \
+    nix run --inputs-from . attic -- \
+        login \
         conduwuit \
-        https://attic.kennel.juneis.dog/conduwuit \
+        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \
         "$ATTIC_TOKEN"
 
-    push_args=(
+    # Push the target installable and its build dependencies
-        # Attic and its build dependencies
+    nix run --inputs-from . attic -- \
-        "$(nix path-info --inputs-from . attic)"
+        push \
-        "$(nix path-info --inputs-from . attic --derivation)"
+        conduwuit \
-
+        "$(nix path-info "$INSTALLABLE" --derivation)" \
-        # The target installable and its build dependencies
-        "$(nix path-info "$INSTALLABLE" --derivation)"
         "$(nix path-info "$INSTALLABLE")"
-    )
-
-    nix run --inputs-from . attic -- push conduwuit "${push_args[@]}"
-
 else
     echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
 fi

complement/Dockerfile

@@ -8,39 +8,57 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY Cargo.toml Cargo.toml
 COPY Cargo.lock Cargo.lock
 COPY src src
-RUN cargo build --release \
+RUN cargo build --release --features=axum_dual_protocol \
     && mv target/release/conduit conduit \
     && rm -rf target
 
-# Install caddy
+COPY conduwuit-example.toml conduit.toml
-RUN apt-get update \
-    && apt-get install -y \
-    debian-keyring \
-    debian-archive-keyring \
-    apt-transport-https \
-    curl \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/gpg.key' \
-    | gpg --dearmor -o /usr/share/keyrings/caddy-testing-archive-keyring.gpg \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/testing/debian.deb.txt' \
-    | tee /etc/apt/sources.list.d/caddy-testing.list \
-    && apt-get update \
-    && apt-get install -y caddy
-
-COPY conduit-example.toml conduit.toml
-COPY complement/caddy.json caddy.json
 
 ENV SERVER_NAME=localhost
 ENV CONDUIT_CONFIG=/workdir/conduit.toml
 
-RUN sed -i "s/port = 6167/port = 8008/g" conduit.toml
+RUN sed -i "s/port = 6167/port = [8448, 8008]/g" conduit.toml
-RUN echo "log = \"warn,_=off,sled=off\"" >> conduit.toml
+RUN sed -i "s/allow_registration = false/allow_registration = true/g" conduit.toml
+RUN sed -i "s/registration_token/#registration_token/g" conduit.toml
+RUN sed -i "s/allow_guest_registration = false/allow_guest_registration = true/g" conduit.toml
+RUN sed -i "s/allow_public_room_directory_over_federation = false/allow_public_room_directory_over_federation = true/g" conduit.toml
+RUN sed -i "s/allow_public_room_directory_without_auth = false/allow_public_room_directory_without_auth = true/g" conduit.toml
+RUN sed -i "s/allow_device_name_federation = false/allow_device_name_federation = true/g" conduit.toml
+RUN sed -i "/\"127.0.0.0/d" conduit.toml
+RUN sed -i "/\"10.0.0.0/d" conduit.toml
+RUN sed -i "/\"172.16.0.0/d" conduit.toml
+RUN sed -i "/\"::1/d" conduit.toml
+RUN sed -i "s/#log = \"warn\"/log = \"debug\"/g" conduit.toml
+RUN sed -i 's/#\strusted_servers\s=\s\["matrix.org"\]/trusted_servers = []/g' conduit.toml
+RUN sed -i 's/# `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` to/yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true/g' conduit.toml
+RUN sed -i "s/allow_outgoing_presence = false/allow_outgoing_presence = true/g" conduit.toml
+RUN sed -i "s/allow_incoming_presence = false/allow_incoming_presence = true/g" conduit.toml
+RUN sed -i "s/allow_local_presence = false/allow_local_presence = true/g" conduit.toml
 RUN sed -i "s/address = \"127.0.0.1\"/address = \"0.0.0.0\"/g" conduit.toml
 
+# https://stackoverflow.com/questions/76049656/unexpected-notvalidforname-with-rusts-tonic-with-tls
+RUN echo "authorityKeyIdentifier=keyid,issuer" >> extensions.ext
+RUN echo "basicConstraints=CA:FALSE" >> extensions.ext
+RUN echo 'subjectAltName = @alt_names' >> extensions.ext
+RUN echo '[alt_names]' >> extensions.ext
+RUN echo "DNS.1 = servername" >> extensions.ext
+RUN echo "IP.1 = ipaddress" >> extensions.ext
+
+
 EXPOSE 8008 8448
 
 CMD uname -a && \
+    cp -f -v /complement/ca/ca.crt /usr/local/share/ca-certificates/complement.crt && \
+    update-ca-certificates && \
+    sed -i "s/servername/${SERVER_NAME}/g" extensions.ext && \
+    sed -i "s/ipaddress/`hostname -i`/g" extensions.ext && \
+    openssl req -newkey rsa:2048 -noenc -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=$SERVER_NAME" -keyout $SERVER_NAME.key -out $SERVER_NAME.csr && \
+    openssl x509 -signkey $SERVER_NAME.key -in $SERVER_NAME.csr -req -days 2 -out $SERVER_NAME.crt && \
+    openssl x509 -req -CA /complement/ca/ca.crt -CAkey /complement/ca/ca.key -in $SERVER_NAME.csr -out $SERVER_NAME.crt -days 2 -CAcreateserial -extfile extensions.ext && \
     sed -i "s/#server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" conduit.toml && \
-    sed -i "s/your.server.name/${SERVER_NAME}/g" caddy.json && \
+    sed -i 's/#\s\[global.tls\]/\[global.tls\]/g' conduit.toml && \
-    caddy start --config caddy.json > /dev/null && \
+    sed -i "s/# certs = \"\/path\/to\/my\/certificate.crt\"/certs = \"${SERVER_NAME}.crt\"/g" conduit.toml && \
+    sed -i "s/# key = \"\/path\/to\/my\/private_key.key\"/key = \"${SERVER_NAME}.key\"/g" conduit.toml && \
+    sed -i "s/#dual_protocol = false/dual_protocol = true/g" conduit.toml && \
     /workdir/conduit
 

complement/caddy.json

@@ -1,72 +0,0 @@
-{
-    "logging": {
-        "logs": {
-            "default": {
-                "level": "WARN"
-            }
-        }
-    },
-    "apps": {
-        "http": {
-            "https_port": 8448,
-            "servers": {
-                "srv0": {
-                    "listen": [":8448"],
-                    "routes": [{
-                        "match": [{
-                            "host": ["your.server.name"]
-                        }],
-                        "handle": [{
-                            "handler": "subroute",
-                            "routes": [{
-                                "handle": [{
-                                    "handler": "reverse_proxy",
-                                    "upstreams": [{
-                                        "dial": "127.0.0.1:8008"
-                                    }]
-                                }]
-                            }]
-                        }],
-                        "terminal": true
-                    }],
-                    "tls_connection_policies": [{
-                        "match": {
-                            "sni": ["your.server.name"]
-                        }
-                    }]
-                }
-            }
-        },
-        "pki": {
-            "certificate_authorities": {
-                "local": {
-                    "name": "Complement CA",
-                    "root": {
-                        "certificate": "/complement/ca/ca.crt",
-                        "private_key": "/complement/ca/ca.key"
-                    },
-                    "intermediate": {
-                        "certificate": "/complement/ca/ca.crt",
-                        "private_key": "/complement/ca/ca.key"
-                    }
-                }
-            }
-        },
-        "tls": {
-            "automation": {
-                "policies": [{
-                    "subjects": ["your.server.name"],
-                    "issuers": [{
-                        "module": "internal"
-                    }],
-                    "on_demand": true
-                }, {
-                    "issuers": [{
-                        "module": "internal",
-                        "ca": "local"
-                    }]
-                }]
-            }
-        }
-    }
-}

conduwuit-example.toml

@@ -22,10 +22,14 @@
 # YOU NEED TO EDIT THIS
 #server_name = "your.server.name"
 
-# Servers listed here will be used to gather public keys of other servers.
+# Servers listed here will be used to gather public keys of other servers (notary trusted key servers).
-# Generally, copying this exactly should be enough. (Currently, conduwuit doesn't
+#
-# support batched key requests, so this list should only contain Synapse
+# The default behaviour for conduwuit is to attempt to query trusted key servers before querying the individual servers.
-# servers.) Defaults to `matrix.org`
+# This is done for performance reasons, but if you would like to query individual servers before the notary servers
+# configured below, set to
+#
+# (Currently, conduwuit doesn't support batched key requests, so this list should only contain Synapse servers)
+# Defaults to `matrix.org`
 # trusted_servers = ["matrix.org"]
 
 
@@ -33,7 +37,7 @@
 ### Database configuration
 
 # This is the only directory where conduwuit will save its data, including media
-database_path = "/var/lib/conduwuit/"
+database_path = "/var/lib/matrix-conduit/"
 
 # Database backend: Only rocksdb and sqlite are supported. Please note that sqlite
 # will perform significantly worse than rocksdb as it is not intended to be used the
@@ -44,10 +48,11 @@ database_backend = "rocksdb"
 
 ### Network
 
-# The port conduwuit will be running on. You need to set up a reverse proxy such as
+# The port(s) conduwuit will be running on. You need to set up a reverse proxy such as
 # Caddy or Nginx so all requests to /_matrix on port 443 and 8448 will be
 # forwarded to the conduwuit instance running on this port
 # Docker users: Don't change this, you'll need to map an external port to this.
+# To listen on multiple ports, specify a vector e.g. [8080, 8448]
 port = 6167
 
 # default address (IPv4 or IPv6) conduwuit will listen on. Generally you want this to be
@@ -80,6 +85,7 @@ max_request_size = 20_000_000 # in bytes
 #unix_socket_perms = 660
 
 # Set this to true for conduwuit to compress HTTP response bodies using zstd.
+# This option does nothing if conduwuit was not built with `zstd_compression` feature.
 # Please be aware that enabling HTTP compression may weaken or even defeat TLS.
 # Most users should not need to enable this.
 # See https://breachattack.com/ and https://wikipedia.org/wiki/BREACH before deciding to enable this.
@@ -89,6 +95,7 @@ zstd_compression = false
 # Defaults to RFC1918, unroutable, loopback, multicast, and testnet addresses for security.
 #
 # To disable, set this to be an empty vector (`[]`).
+# Please be aware that this is *not* a guarantee. You should be using a firewall with zones as doing this on the application layer may have bypasses.
 #
 # Currently this does not account for proxies in use like Synapse does.
 ip_range_denylist = [
@@ -125,7 +132,7 @@ allow_guest_registration = false
 # No default.
 # prevent_media_downloads_from = ["example.com", "example.local"]
 
-# Enables open registration. If set to false, no users can register on this
+# Enables registration. If set to false, no users can register on this
 # server.
 # If set to true without a token configured, users can register with no form of 2nd-
 # step only if you set
@@ -151,6 +158,23 @@ registration_token = "change this token for something specific to your server"
 # defaults to true
 # allow_room_creation = true
 
+# controls whether non-admin local users are forbidden from sending room invites (local and remote),
+# and if non-admin users can receive remote room invites. admins are always allowed to send and receive all room invites.
+# defaults to false
+# block_non_admin_invites = false
+
+# List of forbidden username patterns/strings. Values in this list are matched as *contains*.
+# This is checked upon username availability check, registration, and startup as warnings if any local users in your database
+# have a forbidden username.
+# No default.
+# forbidden_usernames = []
+
+# List of forbidden room aliases and room IDs as patterns/strings. Values in this list are matched as *contains*.
+# This is checked upon room alias creation, custom room ID creation if used, and startup as warnings if any room aliases
+# in your database have a forbidden room alias/ID.
+# No default.
+# forbidden_room_names = []
+
 # Set this to true to allow your server's public room directory to be federated.
 # Set this to false to protect against /publicRooms spiders, but will forbid external users
 # from viewing your server's public room directory. If federation is disabled entirely
@@ -193,20 +217,18 @@ url_preview_check_root_domain = false
 ### Misc
 
 # max log level for conduwuit. allows debug, info, warn, or error
+# see also: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives
+# Defaults to "warn"
 #log = "warn"
 
 # controls whether encrypted rooms and events are allowed (default true)
 #allow_encryption = false
 
-# conduwuit will send a simple GET request periodically to `https://pupbrain.dev/check-for-updates/stable`
+# if enabled, conduwuit will send a simple GET request periodically to `https://pupbrain.dev/check-for-updates/stable`
 # for any new announcements made. Despite the name, this is not an update check
-# endpoint, it is simply an announcement check endpoint. I don't plan on using
+# endpoint, it is simply an announcement check endpoint.
-# this so feel free to disable it.
+# Defaults to false.
-allow_check_for_updates = true
+#allow_check_for_updates = false
-
-# Enables adding the lightning bolt emoji (⚡️) to all newly registered users'
-# initial display names. 
-enable_lightning_bolt = false
 
 # If you are using delegation via well-known files and you cannot serve them from your reverse proxy, you can
 # uncomment these to serve them directly from conduwuit. This requires proxying all requests to conduwuit, not just `/_matrix` to work.
@@ -215,10 +237,36 @@ enable_lightning_bolt = false
 # Note that whatever you put will show up in the well-known JSON values.
 
 # Set to false to disable users from joining or creating room versions that aren't 100% officially supported by conduwuit.
-# conduwuit officially supports room versions 6 - 10. conduwuit has experimental/unstable support for 1 - 5, and 11.
+# conduwuit officially supports room versions 6 - 10. conduwuit has experimental/unstable support for 3 - 5, and 11.
 # Defaults to true.
 #allow_unstable_room_versions = true
 
+# Option to control adding arbitrary text to the end of the user's displayname upon registration with a space before the text.
+# This was the lightning bolt emoji option, just replaced with support for adding your own custom text or emojis.
+# To disable, set this to "" (an empty string)
+# Defaults to "🏳️‍⚧️" (trans pride flag)
+#new_user_displayname_suffix = "🏳️‍⚧️"
+
+# Option to control whether conduwuit will query your list of trusted notary key servers (`trusted_servers`) for
+# remote homeserver signing keys it doesn't know *first*, or query the individual servers first before falling back to the trusted
+# key servers.
+#
+# The former/default behaviour makes federated/remote rooms joins generally faster because we're querying a single (or list of) server
+# that we know works, is reasonably fast, and is reliable for just about all the homeserver signing keys in the room. Querying individual
+# servers may take longer depending on the general infrastructure of everyone in there, how many dead servers there are, etc.
+#
+# However, this does create an increased reliance on one single or multiple large entities as `trusted_servers` should generally
+# contain long-term and large servers who know a very large number of homeservers.
+#
+# If you don't know what any of this means, leave this and `trusted_servers` alone to their defaults.
+#
+# Defaults to true as this is the fastest option for federation.
+#query_trusted_key_servers_first = true
+
+
+
+### Generic database options
+
 # Set this to any float value to multiply conduwuit's in-memory LRU caches with.
 # May be useful if you have significant memory to spare to increase performance.
 # Defaults to 1.0.
@@ -229,16 +277,33 @@ enable_lightning_bolt = false
 # Defaults to 300.0
 #db_cache_capacity_mb = 300.0
 
+# Interval in seconds when conduwuit will run database cleanup operations.
+#
+# For SQLite: this will flush the WAL by executing `PRAGMA wal_checkpoint(RESTART)` (https://www.sqlite.org/pragma.html#pragma_wal_checkpoint)
+# For RocksDB: this will run `flush_opt` to flush database memtables to SST files on disk (https://docs.rs/rocksdb/latest/rocksdb/struct.DBCommon.html#method.flush_opt)
+# These operations always run on shutdown.
+#
+# Defaults to 30 minutes (1800 seconds) to avoid IO amplification from too frequent cleanups
+#cleanup_second_interval = 1800
+
 
 
 ### RocksDB options
 
 # Set this to true to use RocksDB config options that are tailored to HDDs (slower device storage)
+#
+# It is worth noting that by default, conduwuit will use RocksDB with Direct IO enabled. *Generally* speaking this improves performance as it bypasses buffered I/O (system page cache).
+# However there is a potential chance that Direct IO may cause issues with database operations if your setup is uncommon. This has been observed with FUSE filesystems, and possibly ZFS filesystem.
+# RocksDB generally deals/corrects these issues but it cannot account for all setups.
+# If you experience any weird RocksDB issues, try enabling this option as it turns off Direct IO and feel free to report in the conduwuit Matrix room if this option fixes your DB issues.
+# See https://github.com/facebook/rocksdb/wiki/Direct-IO for more information.
+#
+# Defaults to false
 #rocksdb_optimize_for_spinning_disks = false
 
-# RocksDB log level. This is not the same as conduwuit's log level. This is the log level for RocksDB itself
+# RocksDB log level. This is not the same as conduwuit's log level. This is the log level for the RocksDB engine/library
-# which show up in your database folder/path as `LOG` files. Defaults to warn. conduwuit will typically log RocksDB errors. 
+# which show up in your database folder/path as `LOG` files. Defaults to error. conduwuit will typically log RocksDB errors as normal.
-#rocksdb_log_level = "warn"
+#rocksdb_log_level = "error"
 
 # Max RocksDB `LOG` file size before rotating in bytes. Defaults to 4MB.
 #rocksdb_max_log_file_size = 4194304
@@ -246,9 +311,53 @@ enable_lightning_bolt = false
 # Time in seconds before RocksDB will forcibly rotate logs. Defaults to 0.
 #rocksdb_log_time_to_roll = 0
 
+# Amount of threads that RocksDB will use for parallelism. Set to 0 to use all your physical cores.
+# Conduit eagerly spawns threads mainly for federation, so it may not be desirable to use all your cores / logical threads.
+#
+# Defaults to your CPU physical core count (not logical threads) count divided by 2 (half)
+#rocksdb_parallelism_threads = 0
+
+# Maximum number of LOG files RocksDB will keep. This must *not* be set to 0. It must be at least 1.
+# Defaults to 3 as these are not very useful.
+#rocksdb_max_log_files = 3
+
+# Type of RocksDB database compression to use.
+# Available options are "zstd", "zlib", "bz2" and "lz4"
+# It is best to use ZSTD as an overall good balance between speed/performance, storage, IO amplification, and CPU usage.
+# For more performance but less compression (more storage used) and less CPU usage, use LZ4.
+# See https://github.com/facebook/rocksdb/wiki/Compression for more details.
+#
+# Defaults to "zstd"
+#rocksdb_compression_algo = "zstd"
+
+# Level of compression the specified compression algorithm for RocksDB to use.
+# Default is 32767, which is internally read by RocksDB as the default magic number and
+# translated to the library's default compression level as they all differ.
+# See their `kDefaultCompressionLevel`.
+#
+#rocksdb_compression_level = 32767
+
+# Level of compression the specified compression algorithm for the bottommost level/data for RocksDB to use.
+# Default is 32767, which is internally read by RocksDB as the default magic number and
+# translated to the library's default compression level as they all differ.
+# See their `kDefaultCompressionLevel`.
+#
+# Since this is the bottommost level (generally old and least used data), it may be desirable to have a very
+# high compression level here as it's lesss likely for this data to be used. Research your chosen compression algorithm.
+#
+#rocksdb_bottommost_compression_level = 32767
+
+# Whether to enable RocksDB "bottommost_compression".
+# At the expense of more CPU usage, this will further compress the database to reduce more storage.
+# It is recommended to use ZSTD compression with this for best compression results.
+# See https://github.com/facebook/rocksdb/wiki/Compression for more details.
+#
+# Defaults to false as this uses more CPU when compressing.
+#rocksdb_bottommost_compression = false
 
 
-### Presence
+
+### Presence / Typing Indicators / Read Receipts
 
 # Config option to control local (your server only) presence updates/requests. Defaults to false.
 # Note that presence on conduwuit is very fast unlike Synapse's.
@@ -275,3 +384,22 @@ enable_lightning_bolt = false
 
 # Config option to control how many seconds before presence updates that you are offline. Defaults to 30 minutes.
 #presence_offline_timeout_s = 1800
+
+# Config option to control whether we should receive remote incoming read receipts.
+# Defaults to true.
+#allow_incoming_read_receipts = true
+
+
+# Other options not in [global]:
+#
+#
+# Enables running conduwuit with direct TLS support
+# It is strongly recommended you use a reverse proxy instead. This is primarily relevant for test suites like complement that require a private CA setup.
+# [global.tls]
+# certs = "/path/to/my/certificate.crt"
+# key = "/path/to/my/private_key.key"
+#
+# Whether to listen and allow for HTTP and HTTPS connections (insecure!)
+# This config option is only available if conduwuit was built with `axum_dual_protocol` feature (not default feature)
+# Defaults to false
+#dual_protocol = false

debian/matrix-conduit.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Conduit Matrix homeserver
+Description=conduwuit Matrix homeserver
 After=network-online.target
 
 [Service]
@@ -50,6 +50,9 @@ ExecStart=/usr/sbin/matrix-conduit
 Restart=on-failure
 RestartSec=5
 
+TimeoutStopSec=4m
+TimeoutStartSec=4m
+
 StartLimitInterval=1m
 StartLimitBurst=5
 

debian/postinst

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

docker/README.md

@@ -70,7 +70,7 @@ docker run -d -p 8448:6167 \
 
 or you can use [docker-compose](#docker-compose).
 
-The `-d` flag lets the container run in detached mode. You now need to supply a `conduit.toml` config file, an example can be found [here](../conduit-example.toml).
+The `-d` flag lets the container run in detached mode. You now need to supply a `conduit.toml` config file, an example can be found [here](../conduwuit-example.toml).
 You can pass in different env vars to change config values on the fly. You can even configure Conduit completely by using env vars, but for that you need
 to pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file.
 
@@ -131,7 +131,7 @@ So...step by step:
 1. Copy [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or
 [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and [`docker-compose.override.yml`](docker-compose.override.yml) from the repository and remove `.for-traefik` (or `.with-traefik`) from the filename.
 2. Open both files and modify/adjust them to your needs. Meaning, change the `CONDUIT_SERVER_NAME` and the volume host mappings according to your needs.
-3. Create the `conduit.toml` config file, an example can be found [here](../conduit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars.
+3. Create the `conduit.toml` config file, an example can be found [here](../conduwuit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars.
 4. Uncomment the `element-web` service if you want to host your own Element Web Client and create a `element_config.json`.
 5. Create the files needed by the `well-known` service.
 

docker/docker-compose.for-traefik.yml

@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -18,12 +18,13 @@ services:
         #         GIT_REF: origin/master
         restart: unless-stopped
         volumes:
-            - db:/var/lib/matrix-conduit/
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
         networks:
             - proxy
         environment:
             CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
             CONDUIT_DATABASE_BACKEND: rocksdb
             CONDUIT_PORT: 6167
             CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
@@ -34,7 +35,8 @@ services:
             #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
             #CONDUIT_LOG: warn,state_res=warn
             CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Ignore this
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
 
     # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
     # to serve those two as static files. If you want to use a different way, delete or comment the below service, here

docker/docker-compose.override.yml

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

docker/docker-compose.with-traefik.yml

@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -19,19 +19,17 @@ services:
         restart: unless-stopped
         volumes:
             - db:/srv/conduit/.local/share/conduit
-            ### Uncomment if you want to use conduit.toml to configure Conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
-            ### Note: Set env vars will override conduit.toml values
-            # - ./conduit.toml:/srv/conduit/conduit.toml
         networks:
             - proxy
         environment:
-            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
             CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
             CONDUIT_ALLOW_REGISTRATION : 'true'
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
             ### Uncomment and change values as desired
             # CONDUIT_ADDRESS: 0.0.0.0
             # CONDUIT_PORT: 6167
-            # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
             # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
             # CONDUIT_LOG: info  # default is: "warn,state_res=warn"
             # CONDUIT_ALLOW_JAEGER: 'false'
@@ -41,6 +39,7 @@ services:
             # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
             # CONDUIT_WORKERS: 10
             # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
 
     # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
     # to serve those two as static files. If you want to use a different way, delete or comment the below service, here

docker/docker-compose.yml

@@ -1,5 +1,5 @@
 # Conduit
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -20,10 +20,11 @@ services:
         ports:
             - 8448:6167
         volumes:
-            - db:/var/lib/matrix-conduit/
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
         environment:
             CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
             CONDUIT_DATABASE_BACKEND: rocksdb
             CONDUIT_PORT: 6167
             CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
@@ -34,7 +35,8 @@ services:
             #CONDUIT_MAX_CONCURRENT_REQUESTS: 400
             #CONDUIT_LOG: warn,state_res=warn
             CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Ignore this
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
     #
     ### Uncomment if you want to use your own Element-Web App.
     ### Note: You need to provide a config.json for Element and you also need a second

engage.toml

@@ -40,6 +40,21 @@ name = "cargo-clippy"
 group = "versions"
 script = "cargo clippy -- --version"
 
+[[task]]
+name = "cargo-audit"
+group = "versions"
+script = "cargo audit --version"
+
+[[task]]
+name = "cargo-deb"
+group = "versions"
+script = "cargo deb --version"
+
+[[task]]
+name = "cargo-audit"
+group = "security"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"
+
 [[task]]
 name = "cargo-fmt"
 group = "lints"
@@ -51,6 +66,7 @@ group = "lints"
 script = """
 RUSTDOCFLAGS="-D warnings" cargo doc \
     --workspace \
+    --all-features \
     --no-deps \
     --document-private-items \
     --color always
@@ -59,7 +75,7 @@ RUSTDOCFLAGS="-D warnings" cargo doc \
 [[task]]
 name = "cargo-clippy"
 group = "lints"
-script = "cargo clippy --workspace --all-targets --color=always -- -D warnings"
+script = "cargo clippy --workspace --all-targets --all-features --color=always -- -D warnings"
 
 [[task]]
 name = "cargo"
@@ -68,12 +84,8 @@ script = """
 cargo test \
     --workspace \
     --all-targets \
+    --all-features \
     --color=always \
     -- \
     --color=always
 """
-
-[[task]]
-name = "cargo-audit"
-group = "security"
-script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"

flake.lock

@@ -60,8 +60,8 @@
       },
       "original": {
         "owner": "ipetkov",
-        "ref": "master",
         "repo": "crane",
+        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
         "type": "github"
       }
     },
@@ -73,11 +73,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1707891749,
+        "lastModified": 1709619709,
-        "narHash": "sha256-SeikNYElHgv8uVMbiA9/pU3Cce7ssIsiM8CnEiwd1Nc=",
+        "narHash": "sha256-l6EPVJfwfelWST7qWQeP6t/TDK3HHv5uUB1b2vw4mOQ=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "3115aab064ef38cccd792c45429af8df43d6d277",
+        "rev": "c8943ea9e98d41325ff57d4ec14736d330b321b2",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1709126324,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1707689078,
+        "lastModified": 1709479366,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
+        "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
+        "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1707849817,
+        "lastModified": 1709571018,
-        "narHash": "sha256-If6T0MDErp3/z7DBlpG4bV46IPP+7BWSlgTI88cmbw0=",
+        "narHash": "sha256-ISFrxHxE0J5g7lDAscbK88hwaT5uewvWoma9TlFmRzM=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "a02a219773629686bd8ff123ca1aa995fa50d976",
+        "rev": "9f14343f9ee24f53f17492c5f9b653427e2ad15e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -13,7 +13,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     crane = {
-      url = "github:ipetkov/crane?ref=master";
+      # Pin latest crane that's not affected by the following bugs:
+      #
+      # * <https://github.com/ipetkov/crane/issues/527#issuecomment-1978079140>
+      # * <https://github.com/toml-rs/toml/issues/691>
+      # * <https://github.com/toml-rs/toml/issues/267>
+      url = "github:ipetkov/crane?rev=2c653e4478476a52c6aa3ac0495e4dea7449ea0e";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     attic.url = "github:zhaofengli/attic?ref=main";
@@ -32,13 +37,17 @@
     let
       pkgsHost = nixpkgs.legacyPackages.${system};
 
-      rocksdb' = pkgs: pkgs.rocksdb.overrideAttrs (old:
+      rocksdb' = pkgs:
-              {
+        let
+          version = "8.11.3";
+        in
+        pkgs.rocksdb.overrideAttrs (old: {
+          inherit version;
           src = pkgs.fetchFromGitHub {
             owner = "facebook";
             repo = "rocksdb";
-                  rev = "v8.10.0";
+            rev = "v${version}";
-                  hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
+            hash = "sha256-OpEiMwGxZuxb9o3RQuSrwZMQGLhe9xLT1aa3HpI4KPs=";
           };
         });
 
@@ -60,7 +69,7 @@
         # bindgen needs the build platform's libclang. Apparently due to
         # "splicing weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't
         # quite do the right thing here.
-        pkgs.buildPackages.rustPlatform.bindgenHook
+        pkgs.pkgsBuildHost.rustPlatform.bindgenHook
       ];
 
       env = pkgs: {
@@ -72,23 +81,23 @@
       }
       // {
         CARGO_BUILD_RUSTFLAGS = let inherit (pkgs) lib stdenv; in
-          lib.concatStringsSep " " ([]
+          lib.concatStringsSep " " ([ ]
             ++ lib.optionals
             # This disables PIE for static builds, which isn't great in terms
             # of security. Unfortunately, my hand is forced because nixpkgs'
             # `libstdc++.a` is built without `-fPIE`, which precludes us from
             # leaving PIE enabled.
             stdenv.hostPlatform.isStatic
-              ["-C" "relocation-model=static"]
+            [ "-C" "relocation-model=static" ]
             ++ lib.optionals
             (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
-              ["-l" "c"]
+            [ "-l" "c" ]
             ++ lib.optionals
             # This check has to match the one [here][0]. We only need to set
             # these flags when using a different linker. Don't ask me why,
             # though, because I don't know. All I know is it breaks otherwise.
             #
-              # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
+            # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L37-L40
             (
               # Nixpkgs doesn't check for x86_64 here but we do, because I
               # observed a failure building statically for x86_64 without
@@ -112,7 +121,7 @@
       # even covers the case of build scripts that need native code compiled and
       # run on the build platform (I think).
       #
-      # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L64-L78
+      # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
       // (
         let
           inherit (pkgs.rust.lib) envVars;
@@ -150,10 +159,11 @@
             "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
             "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
             "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;
-          HOST_CC = "${pkgs.buildPackages.stdenv.cc}/bin/cc";
+            HOST_CC = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/cc";
-          HOST_CXX = "${pkgs.buildPackages.stdenv.cc}/bin/c++";
+            HOST_CXX = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/c++";
           }
-      ));
+        )
+      );
 
       package = pkgs: builder pkgs {
         src = nix-filter {
@@ -257,6 +267,9 @@
         ] ++ (with pkgsHost; [
           engage
 
+          # Needed for producing Debian packages
+          cargo-deb
+
           # Needed for Complement
           go
           olm

nix/README.md

@@ -5,8 +5,18 @@ This guide assumes you have a recent version of Nix (^2.4) installed.
 Since Conduit ships as a Nix flake, you'll first need to [enable
 flakes][enable_flakes].
 
-You can now use the usual Nix commands to interact with Conduit's flake. For
+A binary cache for conduwuit that the CI/CD publishes to is available at the
-example, `nix run gitlab:famedly/conduit` will run Conduit (though you'll need
+following places (both are the same just different names):
+```
+https://attic.kennel.juneis.dog/conduit
+conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
+
+https://attic.kennel.juneis.dog/conduwuit
+conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
+```
+
+You can now use the usual Nix commands to interact with conduwuit's flake. For
+example, `nix run github:girlbossceo/conduwuit` will run conduwuit (though you'll need
 to provide configuration and such manually as usual).
 
 If your NixOS configuration is defined as a flake, you can depend on this flake
@@ -15,7 +25,7 @@ add the following to your `inputs`:
 
 ```nix
 conduit = {
-    url = "gitlab:famedly/conduit";
+    url = "github:girlbossceo/conduwuit";
 
     # Assuming you have an input for nixpkgs called `nixpkgs`. If you experience
     # build failures while using this, try commenting/deleting this line. This
@@ -28,7 +38,7 @@ Next, make sure you're passing your flake inputs to the `specialArgs` argument
 of `nixpkgs.lib.nixosSystem` [as explained here][specialargs]. This guide will
 assume you've named the group `flake-inputs`.
 
-Now you can configure Conduit and a reverse proxy for it. Add the following to
+Now you can configure conduwuit and a reverse proxy for it. Add the following to
 a new Nix file and include it in your configuration:
 
 ```nix
@@ -134,7 +144,7 @@ in
         ];
 
         locations."/_matrix/" = {
-          proxyPass = "http://backend_conduit$request_uri";
+          proxyPass = "http://backend_conduit";
           proxyWebsockets = true;
           extraConfig = ''
             proxy_set_header Host $host;

rust-toolchain.toml

@@ -3,6 +3,7 @@
 # Other files that need upkeep when this changes:
 #
 # * `.gitlab-ci.yml`
+# * `.github/workflows/ci.yml`
 # * `Cargo.toml`
 # * `flake.nix`
 #

rustfmt.toml

@@ -1,2 +1,27 @@
-unstable_features = true
+edition = "2021"
-imports_granularity="Crate"
+
+condense_wildcard_suffixes = true
+format_code_in_doc_comments = true
+format_macro_bodies = true
+format_macro_matchers = true
+format_strings = true
+hex_literal_case = "Upper"
+max_width = 120
+tab_spaces = 4
+array_width = 80
+comment_width = 80
+wrap_comments = true
+fn_params_layout = "Compressed"
+fn_call_width = 80
+fn_single_line = true
+hard_tabs = true
+match_block_trailing_comma = true
+imports_granularity = "Crate"
+normalize_comments = false
+reorder_impl_items = true
+reorder_imports = true
+group_imports = "StdExternalCrate"
+newline_style = "Unix"
+use_field_init_shorthand = true
+use_small_heuristics = "Off"
+use_try_shorthand = true

src/api/appservice_server.rs

@@ -1,20 +1,18 @@
-use crate::{services, utils, Error, Result};
-use bytes::BytesMut;
-use ruma::api::{
-    appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
-};
 use std::{fmt::Debug, mem, time::Duration};
+
+use bytes::BytesMut;
+use ruma::api::{appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken};
 use tracing::warn;
 
+use crate::{services, utils, Error, Result};
+
 /// Sends a request to an appservice
 ///
-/// Only returns None if there is no url specified in the appservice registration file
+/// Only returns None if there is no url specified in the appservice
-pub(crate) async fn send_request<T: OutgoingRequest>(
+/// registration file
-    registration: Registration,
+pub(crate) async fn send_request<T>(registration: Registration, request: T) -> Option<Result<T::IncomingResponse>>
-    request: T,
-) -> Option<Result<T::IncomingResponse>>
 where
-    T: Debug,
+	T: OutgoingRequest + Debug,
 {
 	if let Some(destination) = registration.url {
 		let hs_token = registration.hs_token.as_str();
@@ -30,7 +28,7 @@ where
 				Error::BadServerResponse("Invalid destination")
 			})
 			.unwrap()
-            .map(|body| body.freeze());
+			.map(BytesMut::freeze);
 
 		let mut parts = http_request.uri().clone().into_parts();
 		let old_path_and_query = parts.path_and_query.unwrap().as_str().to_owned();
@@ -40,25 +38,16 @@ where
 			"?"
 		};
 
-        parts.path_and_query = Some(
+		parts.path_and_query = Some((old_path_and_query + symbol + "access_token=" + hs_token).parse().unwrap());
-            (old_path_and_query + symbol + "access_token=" + hs_token)
-                .parse()
-                .unwrap(),
-        );
 		*http_request.uri_mut() = parts.try_into().expect("our manipulation is always valid");
 
-        let mut reqwest_request = reqwest::Request::try_from(http_request)
+		let mut reqwest_request =
-            .expect("all http requests are valid reqwest requests");
+			reqwest::Request::try_from(http_request).expect("all http requests are valid reqwest requests");
 
 		*reqwest_request.timeout_mut() = Some(Duration::from_secs(120));
 
 		let url = reqwest_request.url().clone();
-        let mut response = match services()
+		let mut response = match services().globals.default_client().execute(reqwest_request).await {
-            .globals
-            .default_client()
-            .execute(reqwest_request)
-            .await
-        {
 			Ok(r) => r,
 			Err(e) => {
 				warn!(
@@ -66,19 +55,15 @@ where
 					registration.id, destination, e
 				);
 				return Some(Err(e.into()));
-            }
+			},
 		};
 
 		// reqwest::Response -> http::Response conversion
 		let status = response.status();
-        let mut http_response_builder = http::Response::builder()
+		let mut http_response_builder = http::Response::builder().status(status).version(response.version());
-            .status(status)
-            .version(response.version());
 		mem::swap(
 			response.headers_mut(),
-            http_response_builder
+			http_response_builder.headers_mut().expect("http::response::Builder is usable"),
-                .headers_mut()
-                .expect("http::response::Builder is usable"),
 		);
 
 		let body = response.bytes().await.unwrap_or_else(|e| {
@@ -97,15 +82,10 @@ where
 		}
 
 		let response = T::IncomingResponse::try_from_http_response(
-            http_response_builder
+			http_response_builder.body(body).expect("reqwest body is valid http body"),
-                .body(body)
-                .expect("reqwest body is valid http body"),
 		);
 		Some(response.map_err(|_| {
-            warn!(
+			warn!("Appservice returned invalid response bytes {}\n{}", destination, url);
-                "Appservice returned invalid response bytes {}\n{}",
-                destination, url
-            );
 			Error::BadServerResponse("Server returned bad response.")
 		}))
 	} else {

src/api/client_server/account.rs

@@ -1,11 +1,10 @@
-use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
+use register::RegistrationKind;
-use crate::{api::client_server, services, utils, Error, Result, Ruma};
 use ruma::{
 	api::client::{
 		account::{
 			change_password, deactivate, get_3pids, get_username_availability, register,
-            request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn,
+			request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn, whoami,
-            whoami, ThirdPartyIdRemovalStatus,
+			ThirdPartyIdRemovalStatus,
 		},
 		error::ErrorKind,
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
@@ -15,7 +14,8 @@ use ruma::{
 };
 use tracing::{info, warn};
 
-use register::RegistrationKind;
+use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
+use crate::{api::client_server, services, utils, Error, Result, Ruma};
 
 const RANDOM_USER_ID_LENGTH: usize = 10;
 
@@ -28,130 +28,109 @@ const RANDOM_USER_ID_LENGTH: usize = 10;
 /// - The server name of the user id matches this server
 /// - No user or appservice on this server already claimed this username
 ///
-/// Note: This will not reserve the username, so the username might become invalid when trying to register
+/// Note: This will not reserve the username, so the username might become
+/// invalid when trying to register
 pub async fn get_register_available_route(
 	body: Ruma<get_username_availability::v3::Request>,
 ) -> Result<get_username_availability::v3::Response> {
 	// Validate user id
-    let user_id = UserId::parse_with_server_name(
+	let user_id = UserId::parse_with_server_name(body.username.to_lowercase(), services().globals.server_name())
-        body.username.to_lowercase(),
-        services().globals.server_name(),
-    )
 		.ok()
-    .filter(|user_id| {
+		.filter(|user_id| !user_id.is_historical() && user_id.server_name() == services().globals.server_name())
-        !user_id.is_historical() && user_id.server_name() == services().globals.server_name()
+		.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
-    })
-    .ok_or(Error::BadRequest(
-        ErrorKind::InvalidUsername,
-        "Username is invalid.",
-    ))?;
 
 	// Check if username is creative enough
 	if services().users.exists(&user_id)? {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::UserInUse, "Desired user ID is already taken."));
-            ErrorKind::UserInUse,
-            "Desired user ID is already taken.",
-        ));
 	}
 
-    if services()
+	if services().globals.forbidden_usernames().is_match(user_id.localpart()) {
-        .globals
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
-        .forbidden_usernames()
-        .is_match(user_id.localpart())
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::Unknown,
-            "Username is forbidden.",
-        ));
 	}
 
 	// TODO add check for appservice namespaces
 
 	// If no if check is true we have an username that's available to be used.
-    Ok(get_username_availability::v3::Response { available: true })
+	Ok(get_username_availability::v3::Response {
+		available: true,
+	})
 }
 
 /// # `POST /_matrix/client/v3/register`
 ///
 /// Register an account on this homeserver.
 ///
-/// You can use [`GET /_matrix/client/v3/register/available`](fn.get_register_available_route.html)
+/// You can use [`GET
-/// to check if the user id is valid and available.
+/// /_matrix/client/v3/register/available`](fn.get_register_available_route.
+/// html) to check if the user id is valid and available.
 ///
 /// - Only works if registration is enabled
-/// - If type is guest: ignores all parameters except initial_device_display_name
+/// - If type is guest: ignores all parameters except
+///   initial_device_display_name
 /// - If sender is not appservice: Requires UIAA (but we only use a dummy stage)
-/// - If type is not guest and no username is given: Always fails after UIAA check
+/// - If type is not guest and no username is given: Always fails after UIAA
+///   check
 /// - Creates a new account and populates it with default account data
-/// - If `inhibit_login` is false: Creates a device and returns device id and access_token
+/// - If `inhibit_login` is false: Creates a device and returns device id and
+///   access_token
 pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<register::v3::Response> {
 	if !services().globals.allow_registration() && !body.from_appservice {
-        info!("Registration disabled and request not from known appservice, rejecting registration attempt for username {:?}", body.username);
+		info!(
-        return Err(Error::BadRequest(
+			"Registration disabled and request not from known appservice, rejecting registration attempt for username \
-            ErrorKind::Forbidden,
+			 {:?}",
-            "Registration has been disabled.",
+			body.username
-        ));
+		);
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Registration has been disabled."));
 	}
 
 	let is_guest = body.kind == RegistrationKind::Guest;
 
 	if is_guest
 		&& (!services().globals.allow_guest_registration()
-            || (services().globals.allow_registration()
+			|| (services().globals.allow_registration() && services().globals.config.registration_token.is_some()))
-                && services().globals.config.registration_token.is_some()))
 	{
-        info!("Guest registration disabled / registration enabled with token configured, rejecting guest registration, initial device name: {:?}", body.initial_device_display_name);
+		info!(
+			"Guest registration disabled / registration enabled with token configured, rejecting guest registration, \
+			 initial device name: {:?}",
+			body.initial_device_display_name
+		);
 		return Err(Error::BadRequest(
 			ErrorKind::GuestAccessForbidden,
 			"Guest registration is disabled.",
 		));
 	}
 
-    // forbid guests from registering if there is not a real admin user yet. give generic user error.
+	// forbid guests from registering if there is not a real admin user yet. give
+	// generic user error.
 	if is_guest && services().users.count()? < 2 {
-        warn!("Guest account attempted to register before a real admin user has been registered, rejecting registration. Guest's initial device name: {:?}", body.initial_device_display_name);
+		warn!(
-        return Err(Error::BadRequest(
+			"Guest account attempted to register before a real admin user has been registered, rejecting \
-            ErrorKind::Forbidden,
+			 registration. Guest's initial device name: {:?}",
-            "Registration temporarily disabled.",
+			body.initial_device_display_name
-        ));
+		);
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Registration temporarily disabled."));
 	}
 
 	let user_id = match (&body.username, is_guest) {
 		(Some(username), false) => {
-            let proposed_user_id = UserId::parse_with_server_name(
+			let proposed_user_id =
-                username.to_lowercase(),
+				UserId::parse_with_server_name(username.to_lowercase(), services().globals.server_name())
-                services().globals.server_name(),
-            )
 					.ok()
 					.filter(|user_id| {
-                !user_id.is_historical()
+						!user_id.is_historical() && user_id.server_name() == services().globals.server_name()
-                    && user_id.server_name() == services().globals.server_name()
 					})
-            .ok_or(Error::BadRequest(
+					.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
-                ErrorKind::InvalidUsername,
-                "Username is invalid.",
-            ))?;
 
 			if services().users.exists(&proposed_user_id)? {
-                return Err(Error::BadRequest(
+				return Err(Error::BadRequest(ErrorKind::UserInUse, "Desired user ID is already taken."));
-                    ErrorKind::UserInUse,
-                    "Desired user ID is already taken.",
-                ));
 			}
 
-            if services()
+			if services().globals.forbidden_usernames().is_match(proposed_user_id.localpart()) {
-                .globals
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Username is forbidden."));
-                .forbidden_usernames()
-                .is_match(proposed_user_id.localpart())
-            {
-                return Err(Error::BadRequest(
-                    ErrorKind::Unknown,
-                    "Username is forbidden.",
-                ));
 			}
 
 			proposed_user_id
-        }
+		},
 		_ => loop {
 			let proposed_user_id = UserId::parse_with_server_name(
 				utils::random_string(RANDOM_USER_ID_LENGTH).to_lowercase(),
@@ -174,7 +153,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 				stages: vec![AuthType::RegistrationToken],
 			}],
 			completed: Vec::new(),
-            params: Default::default(),
+			params: Box::default(),
 			session: None,
 			auth_error: None,
 		};
@@ -186,7 +165,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 				stages: vec![AuthType::Dummy],
 			}],
 			completed: Vec::new(),
-            params: Default::default(),
+			params: Box::default(),
 			session: None,
 			auth_error: None,
 		};
@@ -196,8 +175,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	if !skip_auth {
 		if let Some(auth) = &body.auth {
 			let (worked, uiaainfo) = services().uiaa.try_auth(
-                &UserId::parse_with_server_name("", services().globals.server_name())
+				&UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid"),
-                    .expect("we know this is valid"),
 				"".into(),
 				auth,
 				&uiaainfo,
@@ -209,8 +187,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 		} else if let Some(json) = body.json_body {
 			uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
 			services().uiaa.create(
-                &UserId::parse_with_server_name("", services().globals.server_name())
+				&UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid"),
-                    .expect("we know this is valid"),
 				"".into(),
 				&uiaainfo,
 				&json,
@@ -233,15 +210,13 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	// Default to pretty displayname
 	let mut displayname = user_id.localpart().to_owned();
 
-    // If enabled append lightning bolt to display name (default true)
+	// If `new_user_displayname_suffix` is set, registration will push whatever
-    if services().globals.enable_lightning_bolt() {
+	// content is set to the user's display name with a space before it
-        displayname.push_str(" ⚡️");
+	if !services().globals.new_user_displayname_suffix().is_empty() {
+		displayname.push_str(&(" ".to_owned() + services().globals.new_user_displayname_suffix()));
 	}
 
-    services()
+	services().users.set_displayname(&user_id, Some(displayname.clone())).await?;
-        .users
-        .set_displayname(&user_id, Some(displayname.clone()))
-        .await?;
 
 	// Initial account data
 	services().account_data.update(
@@ -279,44 +254,36 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 	let token = utils::random_string(TOKEN_LENGTH);
 
 	// Create device for this account
-    services().users.create_device(
+	services().users.create_device(&user_id, &device_id, &token, body.initial_device_display_name.clone())?;
-        &user_id,
-        &device_id,
-        &token,
-        body.initial_device_display_name.clone(),
-    )?;
 
 	info!("New user \"{}\" registered on this server.", user_id);
 
 	// log in conduit admin channel if a non-guest user registered
 	if !body.from_appservice && !is_guest {
-        services()
+		services().admin.send_message(RoomMessageEventContent::notice_plain(format!(
-            .admin
-            .send_message(RoomMessageEventContent::notice_plain(format!(
 			"New user \"{user_id}\" registered on this server."
 		)));
 	}
 
 	// log in conduit admin channel if a guest registered
 	if !body.from_appservice && is_guest {
-        services()
+		services().admin.send_message(RoomMessageEventContent::notice_plain(format!(
-            .admin
-            .send_message(RoomMessageEventContent::notice_plain(format!(
 			"Guest user \"{user_id}\" with device display name `{:?}` registered on this server.",
 			body.initial_device_display_name
 		)));
 	}
 
-    // If this is the first real user, grant them admin privileges except for guest users
+	// If this is the first real user, grant them admin privileges except for guest
-    // Note: the server user, @conduit:servername, is generated first
+	// users Note: the server user, @conduit:servername, is generated first
-    if services().users.count()? == 2 && !is_guest {
+	if !is_guest {
-        services()
+		if let Some(admin_room) = services().admin.get_admin_room()? {
-            .admin
+			if services().rooms.state_cache.room_joined_count(&admin_room)? == Some(1) {
-            .make_user_admin(&user_id, displayname)
+				services().admin.make_user_admin(&user_id, displayname).await?;
-            .await?;
 
 				warn!("Granting {} admin privileges as the first user", user_id);
 			}
+		}
+	}
 
 	Ok(register::v3::Response {
 		access_token: Some(token),
@@ -333,17 +300,18 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
 ///
 /// - Requires UIAA to verify user password
 /// - Changes the password of the sender user
-/// - The password hash is calculated using argon2 with 32 character salt, the plain password is
+/// - The password hash is calculated using argon2 with 32 character salt, the
+///   plain password is
 /// not saved
 ///
-/// If logout_devices is true it does the following for each device except the sender device:
+/// If logout_devices is true it does the following for each device except the
+/// sender device:
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub async fn change_password_route(
+pub async fn change_password_route(body: Ruma<change_password::v3::Request>) -> Result<change_password::v3::Response> {
-    body: Ruma<change_password::v3::Request>,
-) -> Result<change_password::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -352,40 +320,33 @@ pub async fn change_password_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};
 
 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
+		let (worked, uiaainfo) = services().uiaa.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
-            services()
-                .uiaa
-                .try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
 			return Err(Error::Uiaa(uiaainfo));
 		}
 	// Success!
 	} else if let Some(json) = body.json_body {
 		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        services()
+		services().uiaa.create(sender_user, sender_device, &uiaainfo, &json)?;
-            .uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
 		return Err(Error::Uiaa(uiaainfo));
 	} else {
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}
 
-    services()
+	services().users.set_password(sender_user, Some(&body.new_password))?;
-        .users
-        .set_password(sender_user, Some(&body.new_password))?;
 
 	if body.logout_devices {
 		// Logout all devices except the current one
 		for id in services()
 			.users
 			.all_device_ids(sender_user)
-            .filter_map(|id| id.ok())
+			.filter_map(std::result::Result::ok)
 			.filter(|id| id != sender_device)
 		{
 			services().users.remove_device(sender_user, &id)?;
@@ -393,9 +354,7 @@ pub async fn change_password_route(
 	}
 
 	info!("User {} changed their password.", sender_user);
-    services()
+	services().admin.send_message(RoomMessageEventContent::notice_plain(format!(
-        .admin
-        .send_message(RoomMessageEventContent::notice_plain(format!(
 		"User {sender_user} changed their password."
 	)));
 
@@ -409,7 +368,7 @@ pub async fn change_password_route(
 /// Note: Also works for Application Services
 pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    let device_id = body.sender_device.as_ref().cloned();
+	let device_id = body.sender_device.clone();
 
 	Ok(whoami::v3::Response {
 		user_id: sender_user.clone(),
@@ -424,13 +383,12 @@ pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3:
 ///
 /// - Leaves all rooms and rejects all invitations
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes all device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-pub async fn deactivate_route(
+pub async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Result<deactivate::v3::Response> {
-    body: Ruma<deactivate::v3::Request>,
-) -> Result<deactivate::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -439,25 +397,20 @@ pub async fn deactivate_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};
 
 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
+		let (worked, uiaainfo) = services().uiaa.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
-            services()
-                .uiaa
-                .try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
 			return Err(Error::Uiaa(uiaainfo));
 		}
 	// Success!
 	} else if let Some(json) = body.json_body {
 		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        services()
+		services().uiaa.create(sender_user, sender_device, &uiaainfo, &json)?;
-            .uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
 		return Err(Error::Uiaa(uiaainfo));
 	} else {
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
@@ -470,9 +423,7 @@ pub async fn deactivate_route(
 	services().users.deactivate_account(sender_user)?;
 
 	info!("User {} deactivated their account.", sender_user);
-    services()
+	services().admin.send_message(RoomMessageEventContent::notice_plain(format!(
-        .admin
-        .send_message(RoomMessageEventContent::notice_plain(format!(
 		"User {sender_user} deactivated their account."
 	)));
 
@@ -486,9 +437,7 @@ pub async fn deactivate_route(
 /// Get a list of third party identifiers associated with this account.
 ///
 /// - Currently always returns empty list
-pub async fn third_party_route(
+pub async fn third_party_route(body: Ruma<get_3pids::v3::Request>) -> Result<get_3pids::v3::Response> {
-    body: Ruma<get_3pids::v3::Request>,
-) -> Result<get_3pids::v3::Response> {
 	let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	Ok(get_3pids::v3::Response::new(Vec::new()))
@@ -496,9 +445,11 @@ pub async fn third_party_route(
 
 /// # `POST /_matrix/client/v3/account/3pid/email/requestToken`
 ///
-/// "This API should be used to request validation tokens when adding an email address to an account"
+/// "This API should be used to request validation tokens when adding an email
+/// address to an account"
 ///
-/// - 403 signals that The homeserver does not allow the third party identifier as a contact option.
+/// - 403 signals that The homeserver does not allow the third party identifier
+///   as a contact option.
 pub async fn request_3pid_management_token_via_email_route(
 	_body: Ruma<request_3pid_management_token_via_email::v3::Request>,
 ) -> Result<request_3pid_management_token_via_email::v3::Response> {
@@ -510,9 +461,11 @@ pub async fn request_3pid_management_token_via_email_route(
 
 /// # `POST /_matrix/client/v3/account/3pid/msisdn/requestToken`
 ///
-/// "This API should be used to request validation tokens when adding an phone number to an account"
+/// "This API should be used to request validation tokens when adding an phone
+/// number to an account"
 ///
-/// - 403 signals that The homeserver does not allow the third party identifier as a contact option.
+/// - 403 signals that The homeserver does not allow the third party identifier
+///   as a contact option.
 pub async fn request_3pid_management_token_via_msisdn_route(
 	_body: Ruma<request_3pid_management_token_via_msisdn::v3::Request>,
 ) -> Result<request_3pid_management_token_via_msisdn::v3::Response> {

src/api/client_server/alias.rs

@@ -1,6 +1,4 @@
-use crate::{services, Error, Result, Ruma};
 use rand::seq::SliceRandom;
-use regex::Regex;
 use ruma::{
 	api::{
 		appservice,
@@ -13,45 +11,25 @@ use ruma::{
 	OwnedRoomAliasId, OwnedServerName,
 };
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
-pub async fn create_alias_route(
+pub async fn create_alias_route(body: Ruma<create_alias::v3::Request>) -> Result<create_alias::v3::Response> {
-    body: Ruma<create_alias::v3::Request>,
-) -> Result<create_alias::v3::Response> {
 	if body.room_alias.server_name() != services().globals.server_name() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
-            ErrorKind::InvalidParam,
-            "Alias is from another server.",
-        ));
 	}
 
-    if services()
+	if services().globals.forbidden_room_names().is_match(body.room_alias.alias()) {
-        .globals
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias is forbidden."));
-        .forbidden_room_names()
-        .is_match(body.room_alias.alias())
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::Unknown,
-            "Room alias is forbidden.",
-        ));
 	}
 
-    if services()
+	if services().rooms.alias.resolve_local_alias(&body.room_alias)?.is_some() {
-        .rooms
-        .alias
-        .resolve_local_alias(&body.room_alias)?
-        .is_some()
-    {
 		return Err(Error::Conflict("Alias already exists."));
 	}
 
-    if services()
+	if services().rooms.alias.set_alias(&body.room_alias, &body.room_id).is_err() {
-        .rooms
-        .alias
-        .set_alias(&body.room_alias, &body.room_id)
-        .is_err()
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Invalid room alias. Alias must be in the form of '#localpart:server_name'",
@@ -67,34 +45,16 @@ pub async fn create_alias_route(
 ///
 /// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
-pub async fn delete_alias_route(
+pub async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
-    body: Ruma<delete_alias::v3::Request>,
-) -> Result<delete_alias::v3::Response> {
 	if body.room_alias.server_name() != services().globals.server_name() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
-            ErrorKind::InvalidParam,
-            "Alias is from another server.",
-        ));
 	}
 
-    if services()
+	if services().rooms.alias.resolve_local_alias(&body.room_alias)?.is_none() {
-        .rooms
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Alias does not exist."));
-        .alias
-        .resolve_local_alias(&body.room_alias)?
-        .is_none()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Alias does not exist.",
-        ));
 	}
 
-    if services()
+	if services().rooms.alias.remove_alias(&body.room_alias).is_err() {
-        .rooms
-        .alias
-        .remove_alias(&body.room_alias)
-        .is_err()
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Invalid room alias. Alias must be in the form of '#localpart:server_name'",
@@ -109,22 +69,18 @@ pub async fn delete_alias_route(
 /// # `GET /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Resolve an alias locally or over federation.
-pub async fn get_alias_route(
+pub async fn get_alias_route(body: Ruma<get_alias::v3::Request>) -> Result<get_alias::v3::Response> {
-    body: Ruma<get_alias::v3::Request>,
-) -> Result<get_alias::v3::Response> {
 	get_alias_helper(body.body.room_alias).await
 }
 
-pub(crate) async fn get_alias_helper(
+pub(crate) async fn get_alias_helper(room_alias: OwnedRoomAliasId) -> Result<get_alias::v3::Response> {
-    room_alias: OwnedRoomAliasId,
-) -> Result<get_alias::v3::Response> {
 	if room_alias.server_name() != services().globals.server_name() {
 		let response = services()
 			.sending
 			.send_federation_request(
 				room_alias.server_name(),
 				federation::query::get_room_information::v1::Request {
-                    room_alias: room_alias.to_owned(),
+					room_alias: room_alias.clone(),
 				},
 			)
 			.await?;
@@ -134,20 +90,13 @@ pub(crate) async fn get_alias_helper(
 		let mut servers = response.servers;
 
 		// find active servers in room state cache to suggest
-        for extra_servers in services()
+		for extra_servers in services().rooms.state_cache.room_servers(&room_id).filter_map(std::result::Result::ok) {
-            .rooms
-            .state_cache
-            .room_servers(&room_id)
-            .filter_map(|r| r.ok())
-        {
 			servers.push(extra_servers);
 		}
 
 		// insert our server as the very first choice if in list
-        if let Some(server_index) = servers
+		if let Some(server_index) =
-            .clone()
+			servers.clone().into_iter().position(|server| server == services().globals.server_name())
-            .into_iter()
-            .position(|server| server == services().globals.server_name())
 		{
 			servers.remove(server_index);
 			servers.insert(0, services().globals.server_name().to_owned());
@@ -166,21 +115,12 @@ pub(crate) async fn get_alias_helper(
 	match services().rooms.alias.resolve_local_alias(&room_alias)? {
 		Some(r) => room_id = Some(r),
 		None => {
-            for (_id, registration) in services().appservice.all()? {
+			for appservice in services().appservice.registration_info.read().await.values() {
-                let aliases = registration
+				if appservice.aliases.is_match(room_alias.as_str())
-                    .namespaces
-                    .aliases
-                    .iter()
-                    .filter_map(|alias| Regex::new(alias.regex.as_str()).ok())
-                    .collect::<Vec<_>>();
-
-                if aliases
-                    .iter()
-                    .any(|aliases| aliases.is_match(room_alias.as_str()))
 					&& if let Some(opt_result) = services()
 						.sending
 						.send_appservice_request(
-                            registration,
+							appservice.registration.clone(),
 							appservice::query::query_room_alias::v1::Request {
 								room_alias: room_alias.clone(),
 							},
@@ -190,50 +130,35 @@ pub(crate) async fn get_alias_helper(
 						opt_result.is_ok()
 					} else {
 						false
-                    }
+					} {
-                {
 					room_id = Some(
 						services()
 							.rooms
 							.alias
 							.resolve_local_alias(&room_alias)?
-                            .ok_or_else(|| {
+							.ok_or_else(|| Error::bad_config("Room does not exist."))?,
-                                Error::bad_config("Appservice lied to us. Room does not exist.")
-                            })?,
 					);
 					break;
 				}
 			}
-        }
+		},
 	};
 
 	let room_id = match room_id {
 		Some(room_id) => room_id,
-        None => {
+		None => return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found.")),
-            return Err(Error::BadRequest(
-                ErrorKind::NotFound,
-                "Room with alias not found.",
-            ))
-        }
 	};
 
 	let mut servers: Vec<OwnedServerName> = Vec::new();
 
 	// find active servers in room state cache to suggest
-    for extra_servers in services()
+	for extra_servers in services().rooms.state_cache.room_servers(&room_id).filter_map(std::result::Result::ok) {
-        .rooms
-        .state_cache
-        .room_servers(&room_id)
-        .filter_map(|r| r.ok())
-    {
 		servers.push(extra_servers);
 	}
 
 	// insert our server as the very first choice if in list
-    if let Some(server_index) = servers
+	if let Some(server_index) =
-        .clone()
+		servers.clone().into_iter().position(|server| server == services().globals.server_name())
-        .into_iter()
-        .position(|server| server == services().globals.server_name())
 	{
 		servers.remove(server_index);
 		servers.insert(0, services().globals.server_name().to_owned());

src/api/client_server/backup.rs

@@ -1,15 +1,15 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::api::client::{
 	backup::{
-        add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session,
+		add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,
-        create_backup_version, delete_backup_keys, delete_backup_keys_for_room,
+		delete_backup_keys, delete_backup_keys_for_room, delete_backup_keys_for_session, delete_backup_version,
-        delete_backup_keys_for_session, delete_backup_version, get_backup_info, get_backup_keys,
+		get_backup_info, get_backup_keys, get_backup_keys_for_room, get_backup_keys_for_session,
-        get_backup_keys_for_room, get_backup_keys_for_session, get_latest_backup_info,
+		get_latest_backup_info, update_backup_version,
-        update_backup_version,
 	},
 	error::ErrorKind,
 };
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/room_keys/version`
 ///
 /// Creates a new backup.
@@ -17,23 +17,22 @@ pub async fn create_backup_version_route(
 	body: Ruma<create_backup_version::v3::Request>,
 ) -> Result<create_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    let version = services()
+	let version = services().key_backups.create_backup(sender_user, &body.algorithm)?;
-        .key_backups
-        .create_backup(sender_user, &body.algorithm)?;
 
-    Ok(create_backup_version::v3::Response { version })
+	Ok(create_backup_version::v3::Response {
+		version,
+	})
 }
 
 /// # `PUT /_matrix/client/r0/room_keys/version/{version}`
 ///
-/// Update information about an existing backup. Only `auth_data` can be modified.
+/// Update information about an existing backup. Only `auth_data` can be
+/// modified.
 pub async fn update_backup_version_route(
 	body: Ruma<update_backup_version::v3::Request>,
 ) -> Result<update_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-    services()
+	services().key_backups.update_backup(sender_user, &body.version, &body.algorithm)?;
-        .key_backups
-        .update_backup(sender_user, &body.version, &body.algorithm)?;
 
 	Ok(update_backup_version::v3::Response {})
 }
@@ -49,10 +48,7 @@ pub async fn get_latest_backup_info_route(
 	let (version, algorithm) = services()
 		.key_backups
 		.get_latest_backup(sender_user)?
-        .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
-            ErrorKind::NotFound,
-            "Key backup does not exist.",
-        ))?;
 
 	Ok(get_latest_backup_info::v3::Response {
 		algorithm,
@@ -65,28 +61,18 @@ pub async fn get_latest_backup_info_route(
 /// # `GET /_matrix/client/r0/room_keys/version`
 ///
 /// Get information about an existing backup.
-pub async fn get_backup_info_route(
+pub async fn get_backup_info_route(body: Ruma<get_backup_info::v3::Request>) -> Result<get_backup_info::v3::Response> {
-    body: Ruma<get_backup_info::v3::Request>,
-) -> Result<get_backup_info::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let algorithm = services()
 		.key_backups
 		.get_backup(sender_user, &body.version)?
-        .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
-            ErrorKind::NotFound,
-            "Key backup does not exist.",
-        ))?;
 
 	Ok(get_backup_info::v3::Response {
 		algorithm,
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
+		version: body.version.clone(),
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
-        version: body.version.to_owned(),
 	})
 }
 
@@ -94,15 +80,14 @@ pub async fn get_backup_info_route(
 ///
 /// Delete an existing key backup.
 ///
-/// - Deletes both information about the backup, as well as all key data related to the backup
+/// - Deletes both information about the backup, as well as all key data related
+///   to the backup
 pub async fn delete_backup_version_route(
 	body: Ruma<delete_backup_version::v3::Request>,
 ) -> Result<delete_backup_version::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().key_backups.delete_backup(sender_user, &body.version)?;
-        .key_backups
-        .delete_backup(sender_user, &body.version)?;
 
 	Ok(delete_backup_version::v3::Response {})
 }
@@ -111,20 +96,14 @@ pub async fn delete_backup_version_route(
 ///
 /// Add the received backup keys to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
-pub async fn add_backup_keys_route(
+pub async fn add_backup_keys_route(body: Ruma<add_backup_keys::v3::Request>) -> Result<add_backup_keys::v3::Response> {
-    body: Ruma<add_backup_keys::v3::Request>,
-) -> Result<add_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if Some(&body.version)
+	if Some(&body.version) != services().key_backups.get_latest_backup_version(sender_user)?.as_ref() {
-        != services()
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"You may only manipulate the most recently created version of the backup.",
@@ -133,24 +112,13 @@ pub async fn add_backup_keys_route(
 
 	for (room_id, room) in &body.rooms {
 		for (session_id, key_data) in &room.sessions {
-            services().key_backups.add_key(
+			services().key_backups.add_key(sender_user, &body.version, room_id, session_id, key_data)?;
-                sender_user,
-                &body.version,
-                room_id,
-                session_id,
-                key_data,
-            )?
 		}
 	}
 
 	Ok(add_backup_keys::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }
 
@@ -158,7 +126,8 @@ pub async fn add_backup_keys_route(
 ///
 /// Add the received backup keys to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
 pub async fn add_backup_keys_for_room_route(
@@ -166,12 +135,7 @@ pub async fn add_backup_keys_for_room_route(
 ) -> Result<add_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if Some(&body.version)
+	if Some(&body.version) != services().key_backups.get_latest_backup_version(sender_user)?.as_ref() {
-        != services()
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"You may only manipulate the most recently created version of the backup.",
@@ -179,23 +143,12 @@ pub async fn add_backup_keys_for_room_route(
 	}
 
 	for (session_id, key_data) in &body.sessions {
-        services().key_backups.add_key(
+		services().key_backups.add_key(sender_user, &body.version, &body.room_id, session_id, key_data)?;
-            sender_user,
-            &body.version,
-            &body.room_id,
-            session_id,
-            key_data,
-        )?
 	}
 
 	Ok(add_backup_keys_for_room::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }
 
@@ -203,7 +156,8 @@ pub async fn add_backup_keys_for_room_route(
 ///
 /// Add the received backup key to the database.
 ///
-/// - Only manipulating the most recently created version of the backup is allowed
+/// - Only manipulating the most recently created version of the backup is
+///   allowed
 /// - Adds the keys to the backup
 /// - Returns the new number of keys in this backup and the etag
 pub async fn add_backup_keys_for_session_route(
@@ -211,48 +165,32 @@ pub async fn add_backup_keys_for_session_route(
 ) -> Result<add_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if Some(&body.version)
+	if Some(&body.version) != services().key_backups.get_latest_backup_version(sender_user)?.as_ref() {
-        != services()
-            .key_backups
-            .get_latest_backup_version(sender_user)?
-            .as_ref()
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"You may only manipulate the most recently created version of the backup.",
 		));
 	}
 
-    services().key_backups.add_key(
+	services().key_backups.add_key(sender_user, &body.version, &body.room_id, &body.session_id, &body.session_data)?;
-        sender_user,
-        &body.version,
-        &body.room_id,
-        &body.session_id,
-        &body.session_data,
-    )?;
 
 	Ok(add_backup_keys_for_session::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys`
 ///
 /// Retrieves all keys from the backup.
-pub async fn get_backup_keys_route(
+pub async fn get_backup_keys_route(body: Ruma<get_backup_keys::v3::Request>) -> Result<get_backup_keys::v3::Response> {
-    body: Ruma<get_backup_keys::v3::Request>,
-) -> Result<get_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let rooms = services().key_backups.get_all(sender_user, &body.version)?;
 
-    Ok(get_backup_keys::v3::Response { rooms })
+	Ok(get_backup_keys::v3::Response {
+		rooms,
+	})
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}`
@@ -263,11 +201,11 @@ pub async fn get_backup_keys_for_room_route(
 ) -> Result<get_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let sessions = services()
+	let sessions = services().key_backups.get_room(sender_user, &body.version, &body.room_id)?;
-        .key_backups
-        .get_room(sender_user, &body.version, &body.room_id)?;
 
-    Ok(get_backup_keys_for_room::v3::Response { sessions })
+	Ok(get_backup_keys_for_room::v3::Response {
+		sessions,
+	})
 }
 
 /// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
@@ -278,15 +216,14 @@ pub async fn get_backup_keys_for_session_route(
 ) -> Result<get_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let key_data = services()
+	let key_data =
-        .key_backups
+		services().key_backups.get_session(sender_user, &body.version, &body.room_id, &body.session_id)?.ok_or(
-        .get_session(sender_user, &body.version, &body.room_id, &body.session_id)?
+			Error::BadRequest(ErrorKind::NotFound, "Backup key not found for this user's session."),
-        .ok_or(Error::BadRequest(
+		)?;
-            ErrorKind::NotFound,
-            "Backup key not found for this user's session.",
-        ))?;
 
-    Ok(get_backup_keys_for_session::v3::Response { key_data })
+	Ok(get_backup_keys_for_session::v3::Response {
+		key_data,
+	})
 }
 
 /// # `DELETE /_matrix/client/r0/room_keys/keys`
@@ -297,18 +234,11 @@ pub async fn delete_backup_keys_route(
 ) -> Result<delete_backup_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().key_backups.delete_all_keys(sender_user, &body.version)?;
-        .key_backups
-        .delete_all_keys(sender_user, &body.version)?;
 
 	Ok(delete_backup_keys::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }
 
@@ -320,18 +250,11 @@ pub async fn delete_backup_keys_for_room_route(
 ) -> Result<delete_backup_keys_for_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().key_backups.delete_room_keys(sender_user, &body.version, &body.room_id)?;
-        .key_backups
-        .delete_room_keys(sender_user, &body.version, &body.room_id)?;
 
 	Ok(delete_backup_keys_for_room::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }
 
@@ -343,20 +266,10 @@ pub async fn delete_backup_keys_for_session_route(
 ) -> Result<delete_backup_keys_for_session::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services().key_backups.delete_room_key(
+	services().key_backups.delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)?;
-        sender_user,
-        &body.version,
-        &body.room_id,
-        &body.session_id,
-    )?;
 
 	Ok(delete_backup_keys_for_session::v3::Response {
-        count: (services()
+		count: (services().key_backups.count_keys(sender_user, &body.version)? as u32).into(),
-            .key_backups
+		etag: services().key_backups.get_etag(sender_user, &body.version)?,
-            .count_keys(sender_user, &body.version)? as u32)
-            .into(),
-        etag: services()
-            .key_backups
-            .get_etag(sender_user, &body.version)?,
 	})
 }

src/api/client_server/capabilities.rs

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

src/api/client_server/config.rs

@@ -1,10 +1,6 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::client::{
-        config::{
+		config::{get_global_account_data, get_room_account_data, set_global_account_data, set_room_account_data},
-            get_global_account_data, get_room_account_data, set_global_account_data,
-            set_room_account_data,
-        },
 		error::ErrorKind,
 	},
 	events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
@@ -13,6 +9,8 @@ use ruma::{
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/user/{userId}/account_data/{type}`
 ///
 /// Sets some account data for the sender user.
@@ -82,7 +80,9 @@ pub async fn get_global_account_data_route(
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 		.content;
 
-    Ok(get_global_account_data::v3::Response { account_data })
+	Ok(get_global_account_data::v3::Response {
+		account_data,
+	})
 }
 
 /// # `GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}`
@@ -102,7 +102,9 @@ pub async fn get_room_account_data_route(
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 		.content;
 
-    Ok(get_room_account_data::v3::Response { account_data })
+	Ok(get_room_account_data::v3::Response {
+		account_data,
+	})
 }
 
 #[derive(Deserialize)]

src/api/client_server/context.rs

@@ -1,20 +1,21 @@
-use crate::{services, Error, Result, Ruma};
+use std::collections::HashSet;
+
 use ruma::{
 	api::client::{context::get_context, error::ErrorKind, filter::LazyLoadOptions},
 	events::StateEventType,
 };
-use std::collections::HashSet;
 use tracing::error;
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `GET /_matrix/client/r0/rooms/{roomId}/context`
 ///
 /// Allows loading room history around an event.
 ///
-/// - Only works if the user is joined (TODO: always allow, but only show events if the user was
+/// - Only works if the user is joined (TODO: always allow, but only show events
+///   if the user was
 /// joined, depending on history_visibility)
-pub async fn get_context_route(
+pub async fn get_context_route(body: Ruma<get_context::v3::Request>) -> Result<get_context::v3::Response> {
-    body: Ruma<get_context::v3::Request>,
-) -> Result<get_context::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -22,7 +23,7 @@ pub async fn get_context_route(
 		LazyLoadOptions::Enabled {
 			include_redundant_members,
 		} => (true, *include_redundant_members),
-        _ => (false, false),
+		LazyLoadOptions::Disabled => (false, false),
 	};
 
 	let mut lazy_loaded = HashSet::new();
@@ -31,28 +32,17 @@ pub async fn get_context_route(
 		.rooms
 		.timeline
 		.get_pdu_count(&body.event_id)?
-        .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Base event id not found."))?;
-            ErrorKind::NotFound,
-            "Base event id not found.",
-        ))?;
 
-    let base_event =
+	let base_event = services()
-        services()
 		.rooms
 		.timeline
 		.get_pdu(&body.event_id)?
-            .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Base event not found."))?;
-                ErrorKind::NotFound,
-                "Base event not found.",
-            ))?;
 
 	let room_id = base_event.room_id.clone();
 
-    if !services()
+	if !services().rooms.state_accessor.user_can_see_event(sender_user, &room_id, &body.event_id)? {
-        .rooms
-        .state_accessor
-        .user_can_see_event(sender_user, &room_id, &body.event_id)?
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view this event.",
@@ -79,7 +69,7 @@ pub async fn get_context_route(
 		.timeline
 		.pdus_until(sender_user, &room_id, base_token)?
 		.take(limit / 2)
-        .filter_map(|r| r.ok()) // Remove buggy events
+		.filter_map(std::result::Result::ok) // Remove buggy events
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -101,22 +91,17 @@ pub async fn get_context_route(
 		}
 	}
 
-    let start_token = events_before
+	let start_token =
-        .last()
+		events_before.last().map(|(count, _)| count.stringify()).unwrap_or_else(|| base_token.stringify());
-        .map(|(count, _)| count.stringify())
-        .unwrap_or_else(|| base_token.stringify());
 
-    let events_before: Vec<_> = events_before
+	let events_before: Vec<_> = events_before.into_iter().map(|(_, pdu)| pdu.to_room_event()).collect();
-        .into_iter()
-        .map(|(_, pdu)| pdu.to_room_event())
-        .collect();
 
 	let events_after: Vec<_> = services()
 		.rooms
 		.timeline
 		.pdus_after(sender_user, &room_id, base_token)?
 		.take(limit / 2)
-        .filter_map(|r| r.ok()) // Remove buggy events
+		.filter_map(std::result::Result::ok) // Remove buggy events
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -138,42 +123,25 @@ pub async fn get_context_route(
 		}
 	}
 
-    let shortstatehash = match services().rooms.state_accessor.pdu_shortstatehash(
+	let shortstatehash = match services()
-        events_after
-            .last()
-            .map_or(&*body.event_id, |(_, e)| &*e.event_id),
-    )? {
-        Some(s) => s,
-        None => services()
-            .rooms
-            .state
-            .get_room_shortstatehash(&room_id)?
-            .expect("All rooms have state"),
-    };
-
-    let state_ids = services()
 		.rooms
 		.state_accessor
-        .state_full_ids(shortstatehash)
+		.pdu_shortstatehash(events_after.last().map_or(&*body.event_id, |(_, e)| &*e.event_id))?
-        .await?;
+	{
+		Some(s) => s,
+		None => services().rooms.state.get_room_shortstatehash(&room_id)?.expect("All rooms have state"),
+	};
 
-    let end_token = events_after
+	let state_ids = services().rooms.state_accessor.state_full_ids(shortstatehash).await?;
-        .last()
-        .map(|(count, _)| count.stringify())
-        .unwrap_or_else(|| base_token.stringify());
 
-    let events_after: Vec<_> = events_after
+	let end_token = events_after.last().map(|(count, _)| count.stringify()).unwrap_or_else(|| base_token.stringify());
-        .into_iter()
+
-        .map(|(_, pdu)| pdu.to_room_event())
+	let events_after: Vec<_> = events_after.into_iter().map(|(_, pdu)| pdu.to_room_event()).collect();
-        .collect();
 
 	let mut state = Vec::new();
 
 	for (shortstatekey, id) in state_ids {
-        let (event_type, state_key) = services()
+		let (event_type, state_key) = services().rooms.short.get_statekey_from_short(shortstatekey)?;
-            .rooms
-            .short
-            .get_statekey_from_short(shortstatekey)?;
 
 		if event_type != StateEventType::RoomMember {
 			let pdu = match services().rooms.timeline.get_pdu(&id)? {
@@ -181,7 +149,7 @@ pub async fn get_context_route(
 				None => {
 					error!("Pdu in state not found: {}", id);
 					continue;
-                }
+				},
 			};
 			state.push(pdu.to_state_event());
 		} else if !lazy_load_enabled || lazy_loaded.contains(&state_key) {
@@ -190,7 +158,7 @@ pub async fn get_context_route(
 				None => {
 					error!("Pdu in state not found: {}", id);
 					continue;
-                }
+				},
 			};
 			state.push(pdu.to_state_event());
 		}

src/api/client_server/device.rs

@@ -1,4 +1,3 @@
-use crate::{services, utils, Error, Result, Ruma};
 use ruma::api::client::{
 	device::{self, delete_device, delete_devices, get_device, get_devices, update_device},
 	error::ErrorKind,
@@ -6,30 +5,29 @@ use ruma::api::client::{
 };
 
 use super::SESSION_ID_LENGTH;
+use crate::{services, utils, Error, Result, Ruma};
 
 /// # `GET /_matrix/client/r0/devices`
 ///
 /// Get metadata on all devices of the sender user.
-pub async fn get_devices_route(
+pub async fn get_devices_route(body: Ruma<get_devices::v3::Request>) -> Result<get_devices::v3::Response> {
-    body: Ruma<get_devices::v3::Request>,
-) -> Result<get_devices::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let devices: Vec<device::Device> = services()
 		.users
 		.all_devices_metadata(sender_user)
-        .filter_map(|r| r.ok()) // Filter out buggy devices
+		.filter_map(std::result::Result::ok) // Filter out buggy devices
 		.collect();
 
-    Ok(get_devices::v3::Response { devices })
+	Ok(get_devices::v3::Response {
+		devices,
+	})
 }
 
 /// # `GET /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Get metadata on a single device of the sender user.
-pub async fn get_device_route(
+pub async fn get_device_route(body: Ruma<get_device::v3::Request>) -> Result<get_device::v3::Response> {
-    body: Ruma<get_device::v3::Request>,
-) -> Result<get_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let device = services()
@@ -37,15 +35,15 @@ pub async fn get_device_route(
 		.get_device_metadata(sender_user, &body.body.device_id)?
 		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;
 
-    Ok(get_device::v3::Response { device })
+	Ok(get_device::v3::Response {
+		device,
+	})
 }
 
 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Updates the metadata on a given device of the sender user.
-pub async fn update_device_route(
+pub async fn update_device_route(body: Ruma<update_device::v3::Request>) -> Result<update_device::v3::Response> {
-    body: Ruma<update_device::v3::Request>,
-) -> Result<update_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let mut device = services()
@@ -53,11 +51,9 @@ pub async fn update_device_route(
 		.get_device_metadata(sender_user, &body.device_id)?
 		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?;
 
-    device.display_name = body.display_name.clone();
+	device.display_name.clone_from(&body.display_name);
 
-    services()
+	services().users.update_device_metadata(sender_user, &body.device_id, &device)?;
-        .users
-        .update_device_metadata(sender_user, &body.device_id, &device)?;
 
 	Ok(update_device::v3::Response {})
 }
@@ -68,12 +64,11 @@ pub async fn update_device_route(
 ///
 /// - Requires UIAA to verify user password
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub async fn delete_device_route(
+pub async fn delete_device_route(body: Ruma<delete_device::v3::Request>) -> Result<delete_device::v3::Response> {
-    body: Ruma<delete_device::v3::Request>,
-) -> Result<delete_device::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -83,33 +78,26 @@ pub async fn delete_device_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};
 
 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
+		let (worked, uiaainfo) = services().uiaa.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
-            services()
-                .uiaa
-                .try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
 			return Err(Error::Uiaa(uiaainfo));
 		}
 	// Success!
 	} else if let Some(json) = body.json_body {
 		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        services()
+		services().uiaa.create(sender_user, sender_device, &uiaainfo, &json)?;
-            .uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
 		return Err(Error::Uiaa(uiaainfo));
 	} else {
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}
 
-    services()
+	services().users.remove_device(sender_user, &body.device_id)?;
-        .users
-        .remove_device(sender_user, &body.device_id)?;
 
 	Ok(delete_device::v3::Response {})
 }
@@ -122,12 +110,11 @@ pub async fn delete_device_route(
 ///
 /// For each device:
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-pub async fn delete_devices_route(
+pub async fn delete_devices_route(body: Ruma<delete_devices::v3::Request>) -> Result<delete_devices::v3::Response> {
-    body: Ruma<delete_devices::v3::Request>,
-) -> Result<delete_devices::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
@@ -137,32 +124,27 @@ pub async fn delete_devices_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};
 
 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
+		let (worked, uiaainfo) = services().uiaa.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
-            services()
-                .uiaa
-                .try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
 			return Err(Error::Uiaa(uiaainfo));
 		}
 	// Success!
 	} else if let Some(json) = body.json_body {
 		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        services()
+		services().uiaa.create(sender_user, sender_device, &uiaainfo, &json)?;
-            .uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
 		return Err(Error::Uiaa(uiaainfo));
 	} else {
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
 	}
 
 	for device_id in &body.devices {
-        services().users.remove_device(sender_user, device_id)?
+		services().users.remove_device(sender_user, device_id)?;
 	}
 
 	Ok(delete_devices::v3::Response {})

src/api/client_server/directory.rs

@@ -1,11 +1,7 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::{
 		client::{
-            directory::{
+			directory::{get_public_rooms, get_public_rooms_filtered, get_room_visibility, set_room_visibility},
-                get_public_rooms, get_public_rooms_filtered, get_room_visibility,
-                set_room_visibility,
-            },
 			error::ErrorKind,
 			room,
 		},
@@ -28,6 +24,8 @@ use ruma::{
 };
 use tracing::{error, info, warn};
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/publicRooms`
 ///
 /// Lists the public rooms on this server.
@@ -36,11 +34,7 @@ use tracing::{error, info, warn};
 pub async fn get_public_rooms_filtered_route(
 	body: Ruma<get_public_rooms_filtered::v3::Request>,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
-    if !services()
+	if !services().globals.config.allow_public_room_directory_without_auth {
-        .globals
-        .config
-        .allow_public_room_directory_without_auth
-    {
 		let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	}
 
@@ -62,11 +56,7 @@ pub async fn get_public_rooms_filtered_route(
 pub async fn get_public_rooms_route(
 	body: Ruma<get_public_rooms::v3::Request>,
 ) -> Result<get_public_rooms::v3::Response> {
-    if !services()
+	if !services().globals.config.allow_public_room_directory_without_auth {
-        .globals
-        .config
-        .allow_public_room_directory_without_auth
-    {
 		let _sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	}
 
@@ -106,14 +96,14 @@ pub async fn set_room_visibility_route(
 		room::Visibility::Public => {
 			services().rooms.directory.set_public(&body.room_id)?;
 			info!("{} made {} public", sender_user, body.room_id);
-        }
+		},
 		room::Visibility::Private => services().rooms.directory.set_not_public(&body.room_id)?,
 		_ => {
 			return Err(Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Room visibility type is not supported.",
 			));
-        }
+		},
 	}
 
 	Ok(set_room_visibility::v3::Response {})
@@ -140,15 +130,9 @@ pub async fn get_room_visibility_route(
 }
 
 pub(crate) async fn get_public_rooms_filtered_helper(
-    server: Option<&ServerName>,
+	server: Option<&ServerName>, limit: Option<UInt>, since: Option<&str>, filter: &Filter, _network: &RoomNetwork,
-    limit: Option<UInt>,
-    since: Option<&str>,
-    filter: &Filter,
-    _network: &RoomNetwork,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
-    if let Some(other_server) =
+	if let Some(other_server) = server.filter(|server| *server != services().globals.server_name().as_str()) {
-        server.filter(|server| *server != services().globals.server_name().as_str())
-    {
 		let response = services()
 			.sending
 			.send_federation_request(
@@ -181,12 +165,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		let backwards = match characters.next() {
 			Some('n') => false,
 			Some('p') => true,
-            _ => {
+			_ => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid `since` token")),
-                return Err(Error::BadRequest(
-                    ErrorKind::InvalidParam,
-                    "Invalid `since` token",
-                ))
-            }
 		};
 
 		num_since = characters
@@ -214,9 +193,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.map_or(Ok(None), |s| {
 						serde_json::from_str(s.content.get())
 							.map(|c: RoomCanonicalAliasEventContent| c.alias)
-                            .map_err(|_| {
+							.map_err(|_| Error::bad_database("Invalid canonical alias event in database."))
-                                Error::bad_database("Invalid canonical alias event in database.")
-                            })
 					})?,
 				name: services().rooms.state_accessor.get_name(&room_id)?,
 				num_joined_members: services()
@@ -251,11 +228,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 							.map(|c: RoomHistoryVisibilityEventContent| {
 								c.history_visibility == HistoryVisibility::WorldReadable
 							})
-                            .map_err(|_| {
+							.map_err(|_| Error::bad_database("Invalid room history visibility event in database."))
-                                Error::bad_database(
-                                    "Invalid room history visibility event in database.",
-                                )
-                            })
 					})?,
 				guest_can_join: services()
 					.rooms
@@ -263,12 +236,8 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.room_state_get(&room_id, &StateEventType::RoomGuestAccess, "")?
 					.map_or(Ok(false), |s| {
 						serde_json::from_str(s.content.get())
-                            .map(|c: RoomGuestAccessEventContent| {
+							.map(|c: RoomGuestAccessEventContent| c.guest_access == GuestAccess::CanJoin)
-                                c.guest_access == GuestAccess::CanJoin
+							.map_err(|_| Error::bad_database("Invalid room guest access event in database."))
-                            })
-                            .map_err(|_| {
-                                Error::bad_database("Invalid room guest access event in database.")
-                            })
 					})?,
 				avatar_url: services()
 					.rooms
@@ -277,9 +246,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.map(|s| {
 						serde_json::from_str(s.content.get())
 							.map(|c: RoomAvatarEventContent| c.url)
-                            .map_err(|_| {
+							.map_err(|_| Error::bad_database("Invalid room avatar event in database."))
-                                Error::bad_database("Invalid room avatar event in database.")
-                            })
 					})
 					.transpose()?
 					// url is now an Option<String> so we must flatten
@@ -308,12 +275,10 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 					.state_accessor
 					.room_state_get(&room_id, &StateEventType::RoomCreate, "")?
 					.map(|s| {
-                        serde_json::from_str::<RoomCreateEventContent>(s.content.get()).map_err(
+						serde_json::from_str::<RoomCreateEventContent>(s.content.get()).map_err(|e| {
-                            |e| {
 							error!("Invalid room create event in database: {}", e);
 							Error::BadDatabase("Invalid room create event in database.")
-                            },
+						})
-                        )
 					})
 					.transpose()?
 					.and_then(|e| e.room_type),
@@ -323,11 +288,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		})
 		.filter_map(|r: Result<_>| r.ok()) // Filter out buggy rooms
 		.filter(|chunk| {
-            if let Some(query) = filter
+			if let Some(query) = filter.generic_search_term.as_ref().map(|q| q.to_lowercase()) {
-                .generic_search_term
-                .as_ref()
-                .map(|q| q.to_lowercase())
-            {
 				if let Some(name) = &chunk.name {
 					if name.as_str().to_lowercase().contains(&query) {
 						return true;
@@ -359,11 +320,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 
 	let total_room_count_estimate = (all_rooms.len() as u32).into();
 
-    let chunk: Vec<_> = all_rooms
+	let chunk: Vec<_> = all_rooms.into_iter().skip(num_since as usize).take(limit as usize).collect();
-        .into_iter()
-        .skip(num_since as usize)
-        .take(limit as usize)
-        .collect();
 
 	let prev_batch = if num_since == 0 {
 		None

src/api/client_server/filter.rs

@@ -1,17 +1,16 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::api::client::{
 	error::ErrorKind,
 	filter::{create_filter, get_filter},
 };
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `GET /_matrix/client/r0/user/{userId}/filter/{filterId}`
 ///
 /// Loads a filter that was previously created.
 ///
 /// - A user can only access their own filters
-pub async fn get_filter_route(
+pub async fn get_filter_route(body: Ruma<get_filter::v3::Request>) -> Result<get_filter::v3::Response> {
-    body: Ruma<get_filter::v3::Request>,
-) -> Result<get_filter::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let filter = match services().users.get_filter(sender_user, &body.filter_id)? {
 		Some(filter) => filter,
@@ -24,9 +23,7 @@ pub async fn get_filter_route(
 /// # `PUT /_matrix/client/r0/user/{userId}/filter`
 ///
 /// Creates a new filter to be used by other endpoints.
-pub async fn create_filter_route(
+pub async fn create_filter_route(body: Ruma<create_filter::v3::Request>) -> Result<create_filter::v3::Response> {
-    body: Ruma<create_filter::v3::Request>,
-) -> Result<create_filter::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	Ok(create_filter::v3::Response::new(
 		services().users.create_filter(sender_user, &body.filter)?,

src/api/client_server/keys.rs

@@ -1,14 +1,14 @@
-use super::SESSION_ID_LENGTH;
+use std::{
-use crate::{services, utils, Error, Result, Ruma};
+	collections::{hash_map, BTreeMap, HashMap, HashSet},
+	time::{Duration, Instant},
+};
+
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use ruma::{
 	api::{
 		client::{
 			error::ErrorKind,
-            keys::{
+			keys::{claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures, upload_signing_keys},
-                claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures,
-                upload_signing_keys,
-            },
 			uiaa::{AuthFlow, AuthType, UiaaInfo},
 		},
 		federation,
@@ -17,48 +17,36 @@ use ruma::{
 	DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde_json::json;
-use std::{
-    collections::{hash_map, BTreeMap, HashMap, HashSet},
-    time::{Duration, Instant},
-};
 use tracing::{debug, error};
 
+use super::SESSION_ID_LENGTH;
+use crate::{services, utils, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/keys/upload`
 ///
 /// Publish end-to-end encryption keys for the sender device.
 ///
 /// - Adds one time keys
-/// - If there are no device keys yet: Adds device keys (TODO: merge with existing keys?)
+/// - If there are no device keys yet: Adds device keys (TODO: merge with
-pub async fn upload_keys_route(
+///   existing keys?)
-    body: Ruma<upload_keys::v3::Request>,
+pub async fn upload_keys_route(body: Ruma<upload_keys::v3::Request>) -> Result<upload_keys::v3::Response> {
-) -> Result<upload_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_ref().expect("user is authenticated");
 
 	for (key_key, key_value) in &body.one_time_keys {
-        services()
+		services().users.add_one_time_key(sender_user, sender_device, key_key, key_value)?;
-            .users
-            .add_one_time_key(sender_user, sender_device, key_key, key_value)?;
 	}
 
 	if let Some(device_keys) = &body.device_keys {
 		// TODO: merge this and the existing event?
 		// This check is needed to assure that signatures are kept
-        if services()
+		if services().users.get_device_keys(sender_user, sender_device)?.is_none() {
-            .users
+			services().users.add_device_keys(sender_user, sender_device, device_keys)?;
-            .get_device_keys(sender_user, sender_device)?
-            .is_none()
-        {
-            services()
-                .users
-                .add_device_keys(sender_user, sender_device, device_keys)?;
 		}
 	}
 
 	Ok(upload_keys::v3::Response {
-        one_time_key_counts: services()
+		one_time_key_counts: services().users.count_one_time_keys(sender_user, sender_device)?,
-            .users
-            .count_one_time_keys(sender_user, sender_device)?,
 	})
 }
 
@@ -68,7 +56,8 @@ pub async fn upload_keys_route(
 ///
 /// - Always fetches users from other servers over federation
 /// - Gets master keys, self-signing keys, user signing keys and device keys.
-/// - The master and self-signing keys contain signatures that the user is allowed to see
+/// - The master and self-signing keys contain signatures that the user is
+///   allowed to see
 pub async fn get_keys_route(body: Ruma<get_keys::v3::Request>) -> Result<get_keys::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
@@ -86,9 +75,7 @@ pub async fn get_keys_route(body: Ruma<get_keys::v3::Request>) -> Result<get_key
 /// # `POST /_matrix/client/r0/keys/claim`
 ///
 /// Claims one-time keys
-pub async fn claim_keys_route(
+pub async fn claim_keys_route(body: Ruma<claim_keys::v3::Request>) -> Result<claim_keys::v3::Response> {
-    body: Ruma<claim_keys::v3::Request>,
-) -> Result<claim_keys::v3::Response> {
 	let response = claim_keys_helper(&body.one_time_keys).await?;
 
 	Ok(response)
@@ -111,25 +98,20 @@ pub async fn upload_signing_keys_route(
 			stages: vec![AuthType::Password],
 		}],
 		completed: Vec::new(),
-        params: Default::default(),
+		params: Box::default(),
 		session: None,
 		auth_error: None,
 	};
 
 	if let Some(auth) = &body.auth {
-        let (worked, uiaainfo) =
+		let (worked, uiaainfo) = services().uiaa.try_auth(sender_user, sender_device, auth, &uiaainfo)?;
-            services()
-                .uiaa
-                .try_auth(sender_user, sender_device, auth, &uiaainfo)?;
 		if !worked {
 			return Err(Error::Uiaa(uiaainfo));
 		}
 	// Success!
 	} else if let Some(json) = body.json_body {
 		uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
-        services()
+		services().uiaa.create(sender_user, sender_device, &uiaainfo, &json)?;
-            .uiaa
-            .create(sender_user, sender_device, &uiaainfo, &json)?;
 		return Err(Error::Uiaa(uiaainfo));
 	} else {
 		return Err(Error::BadRequest(ErrorKind::NotJson, "Not json."));
@@ -163,20 +145,11 @@ pub async fn upload_signatures_route(
 
 			for signature in key
 				.get("signatures")
-                .ok_or(Error::BadRequest(
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Missing signatures field."))?
-                    ErrorKind::InvalidParam,
-                    "Missing signatures field.",
-                ))?
 				.get(sender_user.to_string())
-                .ok_or(Error::BadRequest(
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid user in signatures field."))?
-                    ErrorKind::InvalidParam,
-                    "Invalid user in signatures field.",
-                ))?
 				.as_object()
-                .ok_or(Error::BadRequest(
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature."))?
-                    ErrorKind::InvalidParam,
-                    "Invalid signature.",
-                ))?
 				.clone()
 				.into_iter()
 			{
@@ -186,15 +159,10 @@ pub async fn upload_signatures_route(
 					signature
 						.1
 						.as_str()
-                        .ok_or(Error::BadRequest(
+						.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Invalid signature value."))?
-                            ErrorKind::InvalidParam,
-                            "Invalid signature value.",
-                        ))?
 						.to_owned(),
 				);
-                services()
+				services().users.sign_key(user_id, key_id, signature, sender_user)?;
-                    .users
-                    .sign_key(user_id, key_id, signature, sender_user)?;
 			}
 		}
 	}
@@ -206,12 +174,11 @@ pub async fn upload_signatures_route(
 
 /// # `POST /_matrix/client/r0/keys/changes`
 ///
-/// Gets a list of users who have updated their device identity keys since the previous sync token.
+/// Gets a list of users who have updated their device identity keys since the
+/// previous sync token.
 ///
 /// - TODO: left users
-pub async fn get_key_changes_route(
+pub async fn get_key_changes_route(body: Ruma<get_key_changes::v3::Request>) -> Result<get_key_changes::v3::Response> {
-    body: Ruma<get_key_changes::v3::Request>,
-) -> Result<get_key_changes::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let mut device_list_updates = HashSet::new();
@@ -221,37 +188,22 @@ pub async fn get_key_changes_route(
 			.users
 			.keys_changed(
 				sender_user.as_str(),
-                body.from
+				body.from.parse().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`."))?,
-                    .parse()
+				Some(body.to.parse().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?),
-                    .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`."))?,
-                Some(
-                    body.to
-                        .parse()
-                        .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?,
-                ),
 			)
-            .filter_map(|r| r.ok()),
+			.filter_map(std::result::Result::ok),
 	);
 
-    for room_id in services()
+	for room_id in services().rooms.state_cache.rooms_joined(sender_user).filter_map(std::result::Result::ok) {
-        .rooms
-        .state_cache
-        .rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
-    {
 		device_list_updates.extend(
 			services()
 				.users
 				.keys_changed(
 					room_id.as_ref(),
-                    body.from.parse().map_err(|_| {
+					body.from.parse().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`."))?,
-                        Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`.")
+					Some(body.to.parse().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`."))?),
-                    })?,
-                    Some(body.to.parse().map_err(|_| {
-                        Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`.")
-                    })?),
 				)
-                .filter_map(|r| r.ok()),
+				.filter_map(std::result::Result::ok),
 		);
 	}
 	Ok(get_key_changes::v3::Response {
@@ -261,9 +213,7 @@ pub async fn get_key_changes_route(
 }
 
 pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
-    sender_user: Option<&UserId>,
+	sender_user: Option<&UserId>, device_keys_input: &BTreeMap<OwnedUserId, Vec<OwnedDeviceId>>, allowed_signatures: F,
-    device_keys_input: &BTreeMap<OwnedUserId, Vec<OwnedDeviceId>>,
-    allowed_signatures: F,
 	include_display_names: bool,
 ) -> Result<get_keys::v3::Response> {
 	let mut master_keys = BTreeMap::new();
@@ -277,10 +227,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 		let user_id: &UserId = user_id;
 
 		if user_id.server_name() != services().globals.server_name() {
-            get_over_federation
+			get_over_federation.entry(user_id.server_name()).or_insert_with(Vec::new).push((user_id, device_ids));
-                .entry(user_id.server_name())
-                .or_insert_with(Vec::new)
-                .push((user_id, device_ids));
 			continue;
 		}
 
@@ -292,9 +239,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 					let metadata = services()
 						.users
 						.get_device_metadata(user_id, &device_id)?
-                        .ok_or_else(|| {
+						.ok_or_else(|| Error::bad_database("all_device_keys contained nonexistent device."))?;
-                            Error::bad_database("all_device_keys contained nonexistent device.")
-                        })?;
 
 					add_unsigned_device_display_name(&mut keys, metadata, include_display_names)
 						.map_err(|_| Error::bad_database("invalid device keys in database"))?;
@@ -307,13 +252,9 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			for device_id in device_ids {
 				let mut container = BTreeMap::new();
 				if let Some(mut keys) = services().users.get_device_keys(user_id, device_id)? {
-                    let metadata = services()
+					let metadata = services().users.get_device_metadata(user_id, device_id)?.ok_or(
-                        .users
+						Error::BadRequest(ErrorKind::InvalidParam, "Tried to get keys for nonexistent device."),
-                        .get_device_metadata(user_id, device_id)?
+					)?;
-                        .ok_or(Error::BadRequest(
-                            ErrorKind::InvalidParam,
-                            "Tried to get keys for nonexistent device.",
-                        ))?;
 
 					add_unsigned_device_display_name(&mut keys, metadata, include_display_names)
 						.map_err(|_| Error::bad_database("invalid device keys in database"))?;
@@ -323,17 +264,11 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			}
 		}
 
-        if let Some(master_key) =
+		if let Some(master_key) = services().users.get_master_key(sender_user, user_id, &allowed_signatures)? {
-            services()
-                .users
-                .get_master_key(sender_user, user_id, &allowed_signatures)?
-        {
 			master_keys.insert(user_id.to_owned(), master_key);
 		}
 		if let Some(self_signing_key) =
-            services()
+			services().users.get_self_signing_key(sender_user, user_id, &allowed_signatures)?
-                .users
-                .get_self_signing_key(sender_user, user_id, &allowed_signatures)?
 		{
 			self_signing_keys.insert(user_id.to_owned(), self_signing_key);
 		}
@@ -346,29 +281,19 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 
 	let mut failures = BTreeMap::new();
 
-    let back_off = |id| match services()
+	let back_off = |id| async {
-        .globals
+		match services().globals.bad_query_ratelimiter.write().await.entry(id) {
-        .bad_query_ratelimiter
-        .write()
-        .unwrap()
-        .entry(id)
-    {
 			hash_map::Entry::Vacant(e) => {
 				e.insert((Instant::now(), 1));
-        }
+			},
 			hash_map::Entry::Occupied(mut e) => *e.get_mut() = (Instant::now(), e.get().1 + 1),
+		}
 	};
 
 	let mut futures: FuturesUnordered<_> = get_over_federation
 		.into_iter()
 		.map(|(server, vec)| async move {
-            if let Some((time, tries)) = services()
+			if let Some((time, tries)) = services().globals.bad_query_ratelimiter.read().await.get(server) {
-                .globals
-                .bad_query_ratelimiter
-                .read()
-                .unwrap()
-                .get(server)
-            {
 				// Exponential backoff
 				let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
 				if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
@@ -377,10 +302,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 
 				if time.elapsed() < min_elapsed_duration {
 					debug!("Backing off query from {:?}", server);
-                    return (
+					return (server, Err(Error::BadServerResponse("bad query, still backing off")));
-                        server,
-                        Err(Error::BadServerResponse("bad query, still backing off")),
-                    );
 				}
 			}
 
@@ -412,35 +334,31 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 		match response {
 			Ok(Ok(response)) => {
 				for (user, masterkey) in response.master_keys {
-                    let (master_key_id, mut master_key) =
+					let (master_key_id, mut master_key) = services().users.parse_master_key(&user, &masterkey)?;
-                        services().users.parse_master_key(&user, &masterkey)?;
 
-                    if let Some(our_master_key) = services().users.get_key(
+					if let Some(our_master_key) =
-                        &master_key_id,
+						services().users.get_key(&master_key_id, sender_user, &user, &allowed_signatures)?
-                        sender_user,
+					{
-                        &user,
+						let (_, our_master_key) = services().users.parse_master_key(&user, &our_master_key)?;
-                        &allowed_signatures,
-                    )? {
-                        let (_, our_master_key) =
-                            services().users.parse_master_key(&user, &our_master_key)?;
 						master_key.signatures.extend(our_master_key.signatures);
 					}
 					let json = serde_json::to_value(master_key).expect("to_value always works");
 					let raw = serde_json::from_value(json).expect("Raw::from_value always works");
 					services().users.add_cross_signing_keys(
 						&user, &raw, &None, &None,
-                        false, // Dont notify. A notification would trigger another key request resulting in an endless loop
+						false, /* Dont notify. A notification would trigger another key request resulting in an
+						       * endless loop */
 					)?;
 					master_keys.insert(user, raw);
 				}
 
 				self_signing_keys.extend(response.self_signing_keys);
 				device_keys.extend(response.device_keys);
-            }
+			},
 			_ => {
-                back_off(server.to_owned());
+				back_off(server.to_owned()).await;
 				failures.insert(server.to_string(), json!({}));
-            }
+			},
 		}
 	}
 
@@ -454,8 +372,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 }
 
 fn add_unsigned_device_display_name(
-    keys: &mut Raw<ruma::encryption::DeviceKeys>,
+	keys: &mut Raw<ruma::encryption::DeviceKeys>, metadata: ruma::api::client::device::Device,
-    metadata: ruma::api::client::device::Device,
 	include_display_names: bool,
 ) -> serde_json::Result<()> {
 	if let Some(display_name) = metadata.display_name {
@@ -488,19 +405,12 @@ pub(crate) async fn claim_keys_helper(
 
 	for (user_id, map) in one_time_keys_input {
 		if user_id.server_name() != services().globals.server_name() {
-            get_over_federation
+			get_over_federation.entry(user_id.server_name()).or_insert_with(Vec::new).push((user_id, map));
-                .entry(user_id.server_name())
-                .or_insert_with(Vec::new)
-                .push((user_id, map));
 		}
 
 		let mut container = BTreeMap::new();
 		for (device_id, key_algorithm) in map {
-            if let Some(one_time_keys) =
+			if let Some(one_time_keys) = services().users.take_one_time_key(user_id, device_id, key_algorithm)? {
-                services()
-                    .users
-                    .take_one_time_key(user_id, device_id, key_algorithm)?
-            {
 				let mut c = BTreeMap::new();
 				c.insert(one_time_keys.0, one_time_keys.1);
 				container.insert(device_id.clone(), c);
@@ -537,10 +447,10 @@ pub(crate) async fn claim_keys_helper(
 		match response {
 			Ok(keys) => {
 				one_time_keys.extend(keys.one_time_keys);
-            }
+			},
 			Err(_e) => {
 				failures.insert(server.to_string(), json!({}));
-            }
+			},
 		}
 	}
 

src/api/client_server/media.rs

@@ -1,22 +1,22 @@
 use std::{io::Cursor, net::IpAddr, sync::Arc, time::Duration};
 
-use crate::{
-    service::media::{FileMeta, UrlPreviewData},
-    services, utils, Error, Result, Ruma,
-};
 use image::io::Reader as ImgReader;
-
 use reqwest::Url;
 use ruma::api::client::{
 	error::ErrorKind,
 	media::{
-        create_content, get_content, get_content_as_filename, get_content_thumbnail,
+		create_content, get_content, get_content_as_filename, get_content_thumbnail, get_media_config,
-        get_media_config, get_media_preview,
+		get_media_preview,
 	},
 };
 use tracing::{debug, error, info, warn};
 use webpage::HTML;
 
+use crate::{
+	service::media::{FileMeta, UrlPreviewData},
+	services, utils, Error, Result, Ruma, RumaResponse,
+};
+
 /// generated MXC ID (`media-id`) length
 const MXC_LENGTH: usize = 32;
 
@@ -31,6 +31,22 @@ pub async fn get_media_config_route(
 	})
 }
 
+/// # `GET /_matrix/media/v1/config`
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// Returns max upload size.
+pub async fn get_media_config_v1_route(
+	_body: Ruma<get_media_config::v3::Request>,
+) -> Result<RumaResponse<get_media_config::v3::Response>> {
+	Ok(get_media_config::v3::Response {
+		upload_size: services().globals.max_request_size().into(),
+	}
+	.into())
+}
+
 /// # `GET /_matrix/media/v3/preview_url`
 ///
 /// Returns URL preview.
@@ -39,33 +55,80 @@ pub async fn get_media_preview_route(
 ) -> Result<get_media_preview::v3::Response> {
 	let url = &body.url;
 	if !url_preview_allowed(url) {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "URL is not allowed to be previewed"));
-            ErrorKind::Forbidden,
-            "URL is not allowed to be previewed",
-        ));
 	}
 
-    if let Ok(preview) = get_url_preview(url).await {
+	match get_url_preview(url).await {
+		Ok(preview) => {
 			let res = serde_json::value::to_raw_value(&preview).map_err(|e| {
-            error!(
+				error!("Failed to convert UrlPreviewData into a serde json value: {}", e);
-                "Failed to convert UrlPreviewData into a serde json value: {}",
-                e
-            );
 				Error::BadRequest(
-                ErrorKind::Unknown,
+					ErrorKind::LimitExceeded {
-                "Unknown error occurred parsing URL preview",
+						retry_after_ms: Some(Duration::from_secs(5)),
+					},
+					"Failed to generate a URL preview, try again later.",
 				)
 			})?;
 
-        return Ok(get_media_preview::v3::Response::from_raw_value(res));
+			Ok(get_media_preview::v3::Response::from_raw_value(res))
-    }
+		},
+		Err(e) => {
+			warn!("Failed to generate a URL preview: {e}");
 
+			// there doesn't seem to be an agreed-upon error code in the spec.
+			// the only response codes in the preview_url spec page are 200 and 429.
 			Err(Error::BadRequest(
 				ErrorKind::LimitExceeded {
 					retry_after_ms: Some(Duration::from_secs(5)),
 				},
-        "Retry later",
+				"Failed to generate a URL preview, try again later.",
 			))
+		},
+	}
+}
+
+/// # `GET /_matrix/media/v1/preview_url`
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// Returns URL preview.
+pub async fn get_media_preview_v1_route(
+	body: Ruma<get_media_preview::v3::Request>,
+) -> Result<RumaResponse<get_media_preview::v3::Response>> {
+	let url = &body.url;
+	if !url_preview_allowed(url) {
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "URL is not allowed to be previewed"));
+	}
+
+	match get_url_preview(url).await {
+		Ok(preview) => {
+			let res = serde_json::value::to_raw_value(&preview).map_err(|e| {
+				error!("Failed to convert UrlPreviewData into a serde json value: {}", e);
+				Error::BadRequest(
+					ErrorKind::LimitExceeded {
+						retry_after_ms: Some(Duration::from_secs(5)),
+					},
+					"Failed to generate a URL preview, try again later.",
+				)
+			})?;
+
+			Ok(get_media_preview::v3::Response::from_raw_value(res).into())
+		},
+		Err(e) => {
+			warn!("Failed to generate a URL preview: {e}");
+
+			// there doesn't seem to be an agreed-upon error code in the spec.
+			// the only response codes in the preview_url spec page are 200 and 429.
+			Err(Error::BadRequest(
+				ErrorKind::LimitExceeded {
+					retry_after_ms: Some(Duration::from_secs(5)),
+				},
+				"Failed to generate a URL preview, try again later.",
+			))
+		},
+	}
 }
 
 /// # `POST /_matrix/media/v3/upload`
@@ -74,9 +137,9 @@ pub async fn get_media_preview_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
-pub async fn create_content_route(
+pub async fn create_content_route(body: Ruma<create_content::v3::Request>) -> Result<create_content::v3::Response> {
-    body: Ruma<create_content::v3::Request>,
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-) -> Result<create_content::v3::Response> {
+
 	let mxc = format!(
 		"mxc://{}/{}",
 		services().globals.server_name(),
@@ -86,11 +149,9 @@ pub async fn create_content_route(
 	services()
 		.media
 		.create(
+			Some(sender_user.clone()),
 			mxc.clone(),
-            body.filename
+			body.filename.as_ref().map(|filename| "inline; filename=".to_owned() + filename).as_deref(),
-                .as_ref()
-                .map(|filename| "inline; filename=".to_owned() + filename)
-                .as_deref(),
 			body.content_type.as_deref(),
 			&body.file,
 		)
@@ -104,22 +165,58 @@ pub async fn create_content_route(
 	})
 }
 
+/// # `POST /_matrix/media/v1/upload`
+///
+/// Permanently save media in the server.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Some metadata will be saved in the database
+/// - Media will be saved in the media/ directory
+pub async fn create_content_v1_route(
+	body: Ruma<create_content::v3::Request>,
+) -> Result<RumaResponse<create_content::v3::Response>> {
+	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	let mxc = format!(
+		"mxc://{}/{}",
+		services().globals.server_name(),
+		utils::random_string(MXC_LENGTH)
+	);
+
+	services()
+		.media
+		.create(
+			Some(sender_user.clone()),
+			mxc.clone(),
+			body.filename.as_ref().map(|filename| "inline; filename=".to_owned() + filename).as_deref(),
+			body.content_type.as_deref(),
+			&body.file,
+		)
+		.await?;
+
+	let content_uri = mxc.into();
+
+	Ok(create_content::v3::Response {
+		content_uri,
+		blurhash: None,
+	}
+	.into())
+}
+
 /// helper method to fetch remote media from other servers over federation
 pub async fn get_remote_content(
-    mxc: &str,
+	mxc: &str, server_name: &ruma::ServerName, media_id: String, allow_redirect: bool, timeout_ms: Duration,
-    server_name: &ruma::ServerName,
-    media_id: String,
-    allow_redirect: bool,
-    timeout_ms: Duration,
 ) -> Result<get_content::v3::Response, Error> {
-    // we'll lie to the client and say the blocked server's media was not found and log.
+	// we'll lie to the client and say the blocked server's media was not found and
-    // the client has no way of telling anyways so this is a security bonus.
+	// log. the client has no way of telling anyways so this is a security bonus.
-    if services()
+	if services().globals.prevent_media_downloads_from().contains(&server_name.to_owned()) {
-        .globals
+		info!(
-        .prevent_media_downloads_from()
+			"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
-        .contains(&server_name.to_owned())
+			mxc
-    {
+		);
-        info!("Received request for remote media `{}` but server is in our media server blocklist. Returning 404.", mxc);
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
 	}
 
@@ -140,6 +237,7 @@ pub async fn get_remote_content(
 	services()
 		.media
 		.create(
+			None,
 			mxc.to_owned(),
 			content_response.content_disposition.as_deref(),
 			content_response.content_type.as_deref(),
@@ -156,10 +254,9 @@ pub async fn get_remote_content(
 ///
 /// - Only allows federation if `allow_remote` is true
 /// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20 seconds
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
-pub async fn get_content_route(
+///   seconds
-    body: Ruma<get_content::v3::Request>,
+pub async fn get_content_route(body: Ruma<get_content::v3::Request>) -> Result<get_content::v3::Response> {
-) -> Result<get_content::v3::Response> {
 	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
 	if let Some(FileMeta {
@@ -189,20 +286,68 @@ pub async fn get_content_route(
 	}
 }
 
+/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}`
+///
+/// Load media from our server or over federation.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_v1_route(
+	body: Ruma<get_content::v3::Request>,
+) -> Result<RumaResponse<get_content::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_disposition,
+		content_type,
+		file,
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content::v3::Response {
+			file,
+			content_type,
+			content_disposition,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+		Ok(remote_content_response.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
 /// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}/{fileName}`
 ///
 /// Load media from our server or over federation, permitting desired filename.
 ///
 /// - Only allows federation if `allow_remote` is true
 /// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20 seconds
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
 pub async fn get_content_as_filename_route(
 	body: Ruma<get_content_as_filename::v3::Request>,
 ) -> Result<get_content_as_filename::v3::Response> {
 	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
 	if let Some(FileMeta {
-        content_type, file, ..
+		content_type,
+		file,
+		..
 	}) = services().media.get(mxc.clone()).await?
 	{
 		Ok(get_content_as_filename::v3::Response {
@@ -232,30 +377,81 @@ pub async fn get_content_as_filename_route(
 	}
 }
 
+/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}/{fileName}`
+///
+/// Load media from our server or over federation, permitting desired filename.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_as_filename_v1_route(
+	body: Ruma<get_content_as_filename::v3::Request>,
+) -> Result<RumaResponse<get_content_as_filename::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services().media.get(mxc.clone()).await?
+	{
+		Ok(get_content_as_filename::v3::Response {
+			file,
+			content_type,
+			content_disposition: Some(format!("inline; filename={}", body.filename)),
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		let remote_content_response = get_remote_content(
+			&mxc,
+			&body.server_name,
+			body.media_id.clone(),
+			body.allow_redirect,
+			body.timeout_ms,
+		)
+		.await?;
+
+		Ok(get_content_as_filename::v3::Response {
+			content_disposition: Some(format!("inline: filename={}", body.filename)),
+			content_type: remote_content_response.content_type,
+			file: remote_content_response.file,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+		}
+		.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
 /// # `GET /_matrix/media/v3/thumbnail/{serverName}/{mediaId}`
 ///
 /// Load media thumbnail from our server or over federation.
 ///
 /// - Only allows federation if `allow_remote` is true
 /// - Only redirects if `allow_redirect` is true
-/// - Uses client-provided `timeout_ms` if available, else defaults to 20 seconds
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
 pub async fn get_content_thumbnail_route(
 	body: Ruma<get_content_thumbnail::v3::Request>,
 ) -> Result<get_content_thumbnail::v3::Response> {
 	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
 
 	if let Some(FileMeta {
-        content_type, file, ..
+		content_type,
+		file,
+		..
 	}) = services()
 		.media
 		.get_thumbnail(
 			mxc.clone(),
-            body.width
+			body.width.try_into().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
-                .try_into()
+			body.height.try_into().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
-                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
-            body.height
-                .try_into()
-                .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
 		)
 		.await?
 	{
@@ -265,14 +461,13 @@ pub async fn get_content_thumbnail_route(
 			cross_origin_resource_policy: Some("cross-origin".to_owned()),
 		})
 	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
-        // we'll lie to the client and say the blocked server's media was not found and log.
+		// we'll lie to the client and say the blocked server's media was not found and
-        // the client has no way of telling anyways so this is a security bonus.
+		// log. the client has no way of telling anyways so this is a security bonus.
-        if services()
+		if services().globals.prevent_media_downloads_from().contains(&body.server_name.clone()) {
-            .globals
+			info!(
-            .prevent_media_downloads_from()
+				"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
-            .contains(&body.server_name.to_owned())
+				mxc
-        {
+			);
-            info!("Received request for remote media `{}` but server is in our media server blocklist. Returning 404.", mxc);
 			return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
 		}
 
@@ -296,6 +491,7 @@ pub async fn get_content_thumbnail_route(
 		services()
 			.media
 			.upload_thumbnail(
+				None,
 				mxc,
 				None,
 				get_thumbnail_response.content_type.as_deref(),
@@ -311,6 +507,89 @@ pub async fn get_content_thumbnail_route(
 	}
 }
 
+/// # `GET /_matrix/media/v1/thumbnail/{serverName}/{mediaId}`
+///
+/// Load media thumbnail from our server or over federation.
+///
+/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
+/// clients may call. conduwuit adds these for compatibility purposes.
+/// See <https://spec.matrix.org/legacy/legacy/#id27>
+///
+/// - Only allows federation if `allow_remote` is true
+/// - Only redirects if `allow_redirect` is true
+/// - Uses client-provided `timeout_ms` if available, else defaults to 20
+///   seconds
+pub async fn get_content_thumbnail_v1_route(
+	body: Ruma<get_content_thumbnail::v3::Request>,
+) -> Result<RumaResponse<get_content_thumbnail::v3::Response>> {
+	let mxc = format!("mxc://{}/{}", body.server_name, body.media_id);
+
+	if let Some(FileMeta {
+		content_type,
+		file,
+		..
+	}) = services()
+		.media
+		.get_thumbnail(
+			mxc.clone(),
+			body.width.try_into().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
+			body.height.try_into().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Height is invalid."))?,
+		)
+		.await?
+	{
+		Ok(get_content_thumbnail::v3::Response {
+			file,
+			content_type,
+			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+		}
+		.into())
+	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+		// we'll lie to the client and say the blocked server's media was not found and
+		// log. the client has no way of telling anyways so this is a security bonus.
+		if services().globals.prevent_media_downloads_from().contains(&body.server_name.clone()) {
+			info!(
+				"Received request for remote media `{}` but server is in our media server blocklist. Returning 404.",
+				mxc
+			);
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
+		}
+
+		let get_thumbnail_response = services()
+			.sending
+			.send_federation_request(
+				&body.server_name,
+				get_content_thumbnail::v3::Request {
+					allow_remote: body.allow_remote,
+					height: body.height,
+					width: body.width,
+					method: body.method.clone(),
+					server_name: body.server_name.clone(),
+					media_id: body.media_id.clone(),
+					timeout_ms: body.timeout_ms,
+					allow_redirect: body.allow_redirect,
+				},
+			)
+			.await?;
+
+		services()
+			.media
+			.upload_thumbnail(
+				None,
+				mxc,
+				None,
+				get_thumbnail_response.content_type.as_deref(),
+				body.width.try_into().expect("all UInts are valid u32s"),
+				body.height.try_into().expect("all UInts are valid u32s"),
+				&get_thumbnail_response.file,
+			)
+			.await?;
+
+		Ok(get_thumbnail_response.into())
+	} else {
+		Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."))
+	}
+}
+
 async fn download_image(client: &reqwest::Client, url: &str) -> Result<UrlPreviewData> {
 	let image = client.get(url).send().await?.bytes().await?;
 	let mxc = format!(
@@ -319,10 +598,7 @@ async fn download_image(client: &reqwest::Client, url: &str) -> Result<UrlPrevie
 		utils::random_string(MXC_LENGTH)
 	);
 
-    services()
+	services().media.create(None, mxc.clone(), None, None, &image).await?;
-        .media
-        .create(mxc.clone(), None, None, &image)
-        .await?;
 
 	let (width, height) = match ImgReader::new(Cursor::new(&image)).with_guessed_format() {
 		Err(_) => (None, None),
@@ -348,19 +624,19 @@ async fn download_html(client: &reqwest::Client, url: &str) -> Result<UrlPreview
 	while let Some(chunk) = response.chunk().await? {
 		bytes.extend_from_slice(&chunk);
 		if bytes.len() > services().globals.url_preview_max_spider_size() {
-            debug!("Response body from URL {} exceeds url_preview_max_spider_size ({}), not processing the rest of the response body and assuming our necessary data is in this range.", url, services().globals.url_preview_max_spider_size());
+			debug!(
+				"Response body from URL {} exceeds url_preview_max_spider_size ({}), not processing the rest of the \
+				 response body and assuming our necessary data is in this range.",
+				url,
+				services().globals.url_preview_max_spider_size()
+			);
 			break;
 		}
 	}
 	let body = String::from_utf8_lossy(&bytes);
 	let html = match HTML::from_string(body.to_string(), Some(url.to_owned())) {
 		Ok(html) => html,
-        Err(_) => {
+		Err(_) => return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to parse HTML")),
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Failed to parse HTML",
-            ))
-        }
 	};
 
 	let mut data = match html.opengraph.images.first() {
@@ -399,7 +675,7 @@ fn url_request_allowed(addr: &IpAddr) -> bool {
                 || (ip4.octets()[0] == 198 && (ip4.octets()[1] & 0xfe) == 18) // is_benchmarking()
                 || (ip4.octets()[0] & 240 == 240 && !ip4.is_broadcast()) // is_reserved()
                 || ip4.is_broadcast())
-        }
+		},
 		IpAddr::V6(ip6) => {
 			!(ip6.is_unspecified()
                 || ip6.is_loopback()
@@ -426,7 +702,7 @@ fn url_request_allowed(addr: &IpAddr) -> bool {
                 || ((ip6.segments()[0] == 0x2001) && (ip6.segments()[1] == 0xdb8)) // is_documentation()
                 || ((ip6.segments()[0] & 0xfe00) == 0xfc00) // is_unique_local()
                 || ((ip6.segments()[0] & 0xffc0) == 0xfe80)) // is_unicast_link_local
-        }
+		},
 	}
 }
 
@@ -434,38 +710,21 @@ async fn request_url_preview(url: &str) -> Result<UrlPreviewData> {
 	let client = services().globals.url_preview_client();
 	let response = client.head(url).send().await?;
 
-    if !response
+	if !response.remote_addr().map_or(false, |a| url_request_allowed(&a.ip())) {
-        .remote_addr()
-        .map_or(false, |a| url_request_allowed(&a.ip()))
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"Requesting from this address is forbidden",
 		));
 	}
 
-    let content_type = match response
+	let content_type = match response.headers().get(reqwest::header::CONTENT_TYPE).and_then(|x| x.to_str().ok()) {
-        .headers()
-        .get(reqwest::header::CONTENT_TYPE)
-        .and_then(|x| x.to_str().ok())
-    {
 		Some(ct) => ct,
-        None => {
+		None => return Err(Error::BadRequest(ErrorKind::Unknown, "Unknown Content-Type")),
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unknown Content-Type",
-            ))
-        }
 	};
 	let data = match content_type {
 		html if html.starts_with("text/html") => download_html(&client, url).await?,
 		img if img.starts_with("image/") => download_image(&client, url).await?,
-        _ => {
+		_ => return Err(Error::BadRequest(ErrorKind::Unknown, "Unsupported Content-Type")),
-            return Err(Error::BadRequest(
-                ErrorKind::Unknown,
-                "Unsupported Content-Type",
-            ))
-        }
 	};
 
 	services().media.set_url_preview(url, &data).await?;
@@ -479,15 +738,7 @@ async fn get_url_preview(url: &str) -> Result<UrlPreviewData> {
 	}
 
 	// ensure that only one request is made per URL
-    let mutex_request = Arc::clone(
+	let mutex_request = Arc::clone(services().media.url_preview_mutex.write().await.entry(url.to_owned()).or_default());
-        services()
-            .media
-            .url_preview_mutex
-            .write()
-            .unwrap()
-            .entry(url.to_owned())
-            .or_default(),
-    );
 	let _request_lock = mutex_request.lock().await;
 
 	match services().media.get_url_preview(url).await {
@@ -502,25 +753,19 @@ fn url_preview_allowed(url_str: &str) -> bool {
 		Err(e) => {
 			warn!("Failed to parse URL from a str: {}", e);
 			return false;
-        }
+		},
 	};
 
-    if ["http", "https"]
+	if ["http", "https"].iter().all(|&scheme| scheme != url.scheme().to_lowercase()) {
-        .iter()
-        .all(|&scheme| scheme != url.scheme().to_lowercase())
-    {
 		debug!("Ignoring non-HTTP/HTTPS URL to preview: {}", url);
 		return false;
 	}
 
 	let host = match url.host_str() {
 		None => {
-            debug!(
+			debug!("Ignoring URL preview for a URL that does not have a host (?): {}", url);
-                "Ignoring URL preview for a URL that does not have a host (?): {}",
-                url
-            );
 			return false;
-        }
+		},
 		Some(h) => h.to_owned(),
 	};
 
@@ -532,41 +777,23 @@ fn url_preview_allowed(url_str: &str) -> bool {
 		|| allowlist_domain_explicit.contains(&"*".to_owned())
 		|| allowlist_url_contains.contains(&"*".to_owned())
 	{
-        debug!(
+		debug!("Config key contains * which is allowing all URL previews. Allowing URL {}", url);
-            "Config key contains * which is allowing all URL previews. Allowing URL {}",
-            url
-        );
 		return true;
 	}
 
 	if !host.is_empty() {
 		if allowlist_domain_explicit.contains(&host) {
-            debug!(
+			debug!("Host {} is allowed by url_preview_domain_explicit_allowlist (check 1/3)", &host);
-                "Host {} is allowed by url_preview_domain_explicit_allowlist (check 1/3)",
-                &host
-            );
 			return true;
 		}
 
-        if allowlist_domain_contains
+		if allowlist_domain_contains.iter().any(|domain_s| domain_s.contains(&host.clone())) {
-            .iter()
+			debug!("Host {} is allowed by url_preview_domain_contains_allowlist (check 2/3)", &host);
-            .any(|domain_s| domain_s.contains(&host.clone()))
-        {
-            debug!(
-                "Host {} is allowed by url_preview_domain_contains_allowlist (check 2/3)",
-                &host
-            );
 			return true;
 		}
 
-        if allowlist_url_contains
+		if allowlist_url_contains.iter().any(|url_s| url.to_string().contains(&url_s.to_string())) {
-            .iter()
+			debug!("URL {} is allowed by url_preview_url_contains_allowlist (check 3/3)", &host);
-            .any(|url_s| url.to_string().contains(&url_s.to_string()))
-        {
-            debug!(
-                "URL {} is allowed by url_preview_url_contains_allowlist (check 3/3)",
-                &host
-            );
 			return true;
 		}
 
@@ -584,17 +811,14 @@ fn url_preview_allowed(url_str: &str) -> bool {
 						return true;
 					}
 
-                    if allowlist_domain_contains
+					if allowlist_domain_contains.iter().any(|domain_s| domain_s.contains(&root_domain.to_owned())) {
-                        .iter()
-                        .any(|domain_s| domain_s.contains(&root_domain.to_owned()))
-                    {
 						debug!(
 							"Root domain {} is allowed by url_preview_domain_contains_allowlist (check 2/3)",
 							&root_domain
 						);
 						return true;
 					}
-                }
+				},
 			}
 		}
 	}

src/api/client_server/message.rs

@@ -1,7 +1,8 @@
-use crate::{
+use std::{
-    service::{pdu::PduBuilder, rooms::timeline::PduCount},
+	collections::{BTreeMap, HashSet},
-    services, utils, Error, Result, Ruma,
+	sync::Arc,
 };
+
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -10,47 +11,40 @@ use ruma::{
 	events::{StateEventType, TimelineEventType},
 };
 use serde_json::from_str;
-use std::{
+
-    collections::{BTreeMap, HashSet},
+use crate::{
-    sync::Arc,
+	service::{pdu::PduBuilder, rooms::timeline::PduCount},
+	services, utils, Error, Result, Ruma,
 };
 
 /// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
 /// Send a message event into the room.
 ///
-/// - Is a NOOP if the txn id was already used before and returns the same event id again
+/// - Is a NOOP if the txn id was already used before and returns the same event
+///   id again
 /// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
+/// - Tries to send the event into the room, auth rules will determine if it is
+///   allowed
 pub async fn send_message_event_route(
 	body: Ruma<send_message_event::v3::Request>,
 ) -> Result<send_message_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let sender_device = body.sender_device.as_deref();
 
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(body.room_id.clone()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(body.room_id.clone())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
 	// Forbid m.room.encrypted if encryption is disabled
-    if TimelineEventType::RoomEncrypted == body.event_type.to_string().into()
+	if TimelineEventType::RoomEncrypted == body.event_type.to_string().into() && !services().globals.allow_encryption()
-        && !services().globals.allow_encryption()
 	{
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Encryption has been disabled"));
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
-        ));
 	}
 
 	// certain event types require certain fields to be valid in request bodies.
-    // this helps prevent attempting to handle events that we can't deserialise later so don't waste resources on it.
+	// this helps prevent attempting to handle events that we can't deserialise
+	// later so don't waste resources on it.
 	//
 	// see https://spec.matrix.org/v1.9/client-server-api/#events-2 for what's required per event type.
 	match body.event_type.to_string().into() {
@@ -71,7 +65,7 @@ pub async fn send_message_event_route(
 					"'msgtype' field in JSON request is invalid",
 				));
 			}
-        }
+		},
 		TimelineEventType::RoomName => {
 			let name_field = body.body.body.get_field::<String>("name");
 
@@ -81,7 +75,7 @@ pub async fn send_message_event_route(
 					"'name' field in JSON request is invalid",
 				));
 			}
-        }
+		},
 		TimelineEventType::RoomTopic => {
 			let topic_field = body.body.body.get_field::<String>("topic");
 
@@ -91,16 +85,12 @@ pub async fn send_message_event_route(
 					"'topic' field in JSON request is invalid",
 				));
 			}
-        }
+		},
-        _ => {} // event may be custom/experimental or can be empty don't do anything with it
+		_ => {}, // event may be custom/experimental or can be empty don't do anything with it
 	};
 
 	// Check if this is a new transaction id
-    if let Some(response) =
+	if let Some(response) = services().transaction_ids.existing_txnid(sender_user, sender_device, &body.txn_id)? {
-        services()
-            .transaction_ids
-            .existing_txnid(sender_user, sender_device, &body.txn_id)?
-    {
 		// The client might have sent a txnid of the /sendToDevice endpoint
 		// This txnid has no response associated with it
 		if response.is_empty() {
@@ -114,7 +104,9 @@ pub async fn send_message_event_route(
 			.map_err(|_| Error::bad_database("Invalid txnid bytes in database."))?
 			.try_into()
 			.map_err(|_| Error::bad_database("Invalid event id in txnid data."))?;
-        return Ok(send_message_event::v3::Response { event_id });
+		return Ok(send_message_event::v3::Response {
+			event_id,
+		});
 	}
 
 	let mut unsigned = BTreeMap::new();
@@ -138,25 +130,19 @@ pub async fn send_message_event_route(
 		)
 		.await?;
 
-    services().transaction_ids.add_txnid(
+	services().transaction_ids.add_txnid(sender_user, sender_device, &body.txn_id, event_id.as_bytes())?;
-        sender_user,
-        sender_device,
-        &body.txn_id,
-        event_id.as_bytes(),
-    )?;
 
 	drop(state_lock);
 
-    Ok(send_message_event::v3::Response::new(
+	Ok(send_message_event::v3::Response::new((*event_id).to_owned()))
-        (*event_id).to_owned(),
-    ))
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/messages`
 ///
 /// Allows paginating through room history.
 ///
-/// - Only works if the user is joined (TODO: always allow, but only show events where the user was
+/// - Only works if the user is joined (TODO: always allow, but only show events
+///   where the user was
 /// joined, depending on history_visibility)
 pub async fn get_message_events_route(
 	body: Ruma<get_message_events::v3::Request>,
@@ -172,17 +158,9 @@ pub async fn get_message_events_route(
 		},
 	};
 
-    let to = body
+	let to = body.to.as_ref().and_then(|t| PduCount::try_from_string(t).ok());
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
 
-    services().rooms.lazy_loading.lazy_load_confirm_delivery(
+	services().rooms.lazy_loading.lazy_load_confirm_delivery(sender_user, sender_device, &body.room_id, from).await?;
-        sender_user,
-        sender_device,
-        &body.room_id,
-        from,
-    )?;
 
 	let limit = u64::from(body.limit).min(100) as usize;
 
@@ -199,7 +177,7 @@ pub async fn get_message_events_route(
 				.timeline
 				.pdus_after(sender_user, &body.room_id, from)?
 				.take(limit)
-                .filter_map(|r| r.ok()) // Filter out buggy events
+				.filter_map(std::result::Result::ok) // Filter out buggy events
 				.filter(|(_, pdu)| {
 					services()
 						.rooms
@@ -228,27 +206,20 @@ pub async fn get_message_events_route(
 
 			next_token = events_after.last().map(|(count, _)| count).copied();
 
-            let events_after: Vec<_> = events_after
+			let events_after: Vec<_> = events_after.into_iter().map(|(_, pdu)| pdu.to_room_event()).collect();
-                .into_iter()
-                .map(|(_, pdu)| pdu.to_room_event())
-                .collect();
 
 			resp.start = from.stringify();
 			resp.end = next_token.map(|count| count.stringify());
 			resp.chunk = events_after;
-        }
+		},
 		ruma::api::Direction::Backward => {
-            services()
+			services().rooms.timeline.backfill_if_required(&body.room_id, from).await?;
-                .rooms
-                .timeline
-                .backfill_if_required(&body.room_id, from)
-                .await?;
 			let events_before: Vec<_> = services()
 				.rooms
 				.timeline
 				.pdus_until(sender_user, &body.room_id, from)?
 				.take(limit)
-                .filter_map(|r| r.ok()) // Filter out buggy events
+				.filter_map(std::result::Result::ok) // Filter out buggy events
 				.filter(|(_, pdu)| {
 					services()
 						.rooms
@@ -277,15 +248,12 @@ pub async fn get_message_events_route(
 
 			next_token = events_before.last().map(|(count, _)| count).copied();
 
-            let events_before: Vec<_> = events_before
+			let events_before: Vec<_> = events_before.into_iter().map(|(_, pdu)| pdu.to_room_event()).collect();
-                .into_iter()
-                .map(|(_, pdu)| pdu.to_room_event())
-                .collect();
 
 			resp.start = from.stringify();
 			resp.end = next_token.map(|count| count.stringify());
 			resp.chunk = events_before;
-        }
+		},
 	}
 
 	resp.state = Vec::new();
@@ -308,7 +276,7 @@ pub async fn get_message_events_route(
 			&body.room_id,
 			lazy_loaded,
 			next_token,
-        );
+		).await;
 	}
 	*/
 

src/api/client_server/presence.rs

@@ -1,21 +1,18 @@
-use crate::{services, Error, Result, Ruma};
+use std::time::Duration;
+
 use ruma::api::client::{
 	error::ErrorKind,
 	presence::{get_presence, set_presence},
 };
-use std::time::Duration;
+
+use crate::{services, Error, Result, Ruma};
 
 /// # `PUT /_matrix/client/r0/presence/{userId}/status`
 ///
 /// Sets the presence state of the sender user.
-pub async fn set_presence_route(
+pub async fn set_presence_route(body: Ruma<set_presence::v3::Request>) -> Result<set_presence::v3::Response> {
-    body: Ruma<set_presence::v3::Request>,
-) -> Result<set_presence::v3::Response> {
 	if !services().globals.allow_local_presence() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Presence is disabled on this server"));
-            ErrorKind::Forbidden,
-            "Presence is disabled on this server",
-        ));
 	}
 
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
@@ -40,33 +37,19 @@ pub async fn set_presence_route(
 /// Gets the presence state of the given user.
 ///
 /// - Only works if you share a room with the user
-pub async fn get_presence_route(
+pub async fn get_presence_route(body: Ruma<get_presence::v3::Request>) -> Result<get_presence::v3::Response> {
-    body: Ruma<get_presence::v3::Request>,
-) -> Result<get_presence::v3::Response> {
 	if !services().globals.allow_local_presence() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Presence is disabled on this server"));
-            ErrorKind::Forbidden,
-            "Presence is disabled on this server",
-        ));
 	}
 
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let mut presence_event = None;
 
-    for room_id in services()
+	for room_id in services().rooms.user.get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])? {
-        .rooms
-        .user
-        .get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])?
-    {
 		let room_id = room_id?;
 
-        if let Some(presence) = services()
+		if let Some(presence) = services().rooms.edus.presence.get_presence(&room_id, sender_user)? {
-            .rooms
-            .edus
-            .presence
-            .get_presence(&room_id, sender_user)?
-        {
 			presence_event = Some(presence);
 			break;
 		}
@@ -77,10 +60,7 @@ pub async fn get_presence_route(
 			// TODO: Should ruma just use the presenceeventcontent type here?
 			status_msg: presence.content.status_msg,
 			currently_active: presence.content.currently_active,
-            last_active_ago: presence
+			last_active_ago: presence.content.last_active_ago.map(|millis| Duration::from_millis(millis.into())),
-                .content
-                .last_active_ago
-                .map(|millis| Duration::from_millis(millis.into())),
 			presence: presence.content.presence,
 		})
 	} else {

src/api/client_server/profile.rs

@@ -1,19 +1,19 @@
-use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
+use std::sync::Arc;
+
 use ruma::{
 	api::{
 		client::{
 			error::ErrorKind,
-            profile::{
+			profile::{get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name},
-                get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name,
 		},
-        },
+		federation,
-        federation::{self, query::get_profile_information::v1::ProfileField},
 	},
 	events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType},
 	presence::PresenceState,
 };
 use serde_json::value::to_raw_value;
-use std::sync::Arc;
+
+use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
 
 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
@@ -25,17 +25,14 @@ pub async fn set_displayname_route(
 ) -> Result<set_display_name::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().users.set_displayname(sender_user, body.displayname.clone()).await?;
-        .users
-        .set_displayname(sender_user, body.displayname.clone())
-        .await?;
 
 	// Send a new membership event and presence update into all joined rooms
 	let all_rooms_joined: Vec<_> = services()
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.map(|room_id| {
 			Ok::<_, Error>((
 				PduBuilder {
@@ -46,16 +43,9 @@ pub async fn set_displayname_route(
 							services()
 								.rooms
 								.state_accessor
-                                .room_state_get(
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
-                                    &room_id,
-                                    &StateEventType::RoomMember,
-                                    sender_user.as_str(),
-                                )?
 								.ok_or_else(|| {
-                                    Error::bad_database(
+									Error::bad_database("Tried to send displayname update for user not in the room.")
-                                        "Tried to send displayname update for user not in the \
-                                     room.",
-                                    )
 								})?
 								.content
 								.get(),
@@ -70,35 +60,20 @@ pub async fn set_displayname_route(
 				room_id,
 			))
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.collect();
 
 	for (pdu_builder, room_id) in all_rooms_joined {
-        let mutex_state = Arc::clone(
+		let mutex_state =
-            services()
+			Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.clone()).or_default());
-                .globals
-                .roomid_mutex_state
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
 		let state_lock = mutex_state.lock().await;
 
-        let _ = services()
+		let _ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
-            .rooms
-            .timeline
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
-            .await;
 	}
 
 	if services().globals.allow_local_presence() {
 		// Presence update
-        services()
+		services().rooms.edus.presence.ping_presence(sender_user, PresenceState::Online)?;
-            .rooms
-            .edus
-            .presence
-            .ping_presence(sender_user, PresenceState::Online)?;
 	}
 
 	Ok(set_display_name::v3::Response {})
@@ -113,44 +88,38 @@ pub async fn set_displayname_route(
 pub async fn get_displayname_route(
 	body: Ruma<get_display_name::v3::Request>,
 ) -> Result<get_display_name::v3::Response> {
-    if (services().users.exists(&body.user_id)?)
+	if body.user_id.server_name() != services().globals.server_name() {
-        && (body.user_id.server_name() != services().globals.server_name())
+		// Create and update our local copy of the user
-    {
+		if let Ok(response) = services()
-        let response = services()
 			.sending
 			.send_federation_request(
 				body.user_id.server_name(),
 				federation::query::get_profile_information::v1::Request {
 					user_id: body.user_id.clone(),
-                    field: Some(ProfileField::DisplayName),
+					field: None, // we want the full user's profile to update locally too
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}
 
-        /*
+			services().users.set_displayname(&body.user_id, response.displayname.clone()).await?;
-            TODO: ignore errors properly?
+			services().users.set_avatar_url(&body.user_id, response.avatar_url.clone()).await?;
-        // Create and update our local copy of the user
+			services().users.set_blurhash(&body.user_id, response.blurhash.clone()).await?;
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
-            .users
-            .set_displayname(&body.user_id, response.displayname.clone())
-            .await;
-        let _ = services()
-            .users
-            .set_avatar_url(&body.user_id, response.avatar_url)
-            .await;
-        let _ = services()
-            .users
-            .set_blurhash(&body.user_id, response.blurhash)
-            .await;
-        */
 
 			return Ok(get_display_name::v3::Response {
 				displayname: response.displayname,
 			});
 		}
+	}
+
+	if !services().users.exists(&body.user_id)? {
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
+		// federation
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
+	}
 
 	Ok(get_display_name::v3::Response {
 		displayname: services().users.displayname(&body.user_id)?,
@@ -162,27 +131,19 @@ pub async fn get_displayname_route(
 /// Updates the avatar_url and blurhash.
 ///
 /// - Also makes sure other users receive the update using presence EDUs
-pub async fn set_avatar_url_route(
+pub async fn set_avatar_url_route(body: Ruma<set_avatar_url::v3::Request>) -> Result<set_avatar_url::v3::Response> {
-    body: Ruma<set_avatar_url::v3::Request>,
-) -> Result<set_avatar_url::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().users.set_avatar_url(sender_user, body.avatar_url.clone()).await?;
-        .users
-        .set_avatar_url(sender_user, body.avatar_url.clone())
-        .await?;
 
-    services()
+	services().users.set_blurhash(sender_user, body.blurhash.clone()).await?;
-        .users
-        .set_blurhash(sender_user, body.blurhash.clone())
-        .await?;
 
 	// Send a new membership event and presence update into all joined rooms
 	let all_joined_rooms: Vec<_> = services()
 		.rooms
 		.state_cache
 		.rooms_joined(sender_user)
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.map(|room_id| {
 			Ok::<_, Error>((
 				PduBuilder {
@@ -193,16 +154,9 @@ pub async fn set_avatar_url_route(
 							services()
 								.rooms
 								.state_accessor
-                                .room_state_get(
+								.room_state_get(&room_id, &StateEventType::RoomMember, sender_user.as_str())?
-                                    &room_id,
-                                    &StateEventType::RoomMember,
-                                    sender_user.as_str(),
-                                )?
 								.ok_or_else(|| {
-                                    Error::bad_database(
+									Error::bad_database("Tried to send displayname update for user not in the room.")
-                                        "Tried to send displayname update for user not in the \
-                                     room.",
-                                    )
 								})?
 								.content
 								.get(),
@@ -217,35 +171,20 @@ pub async fn set_avatar_url_route(
 				room_id,
 			))
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.collect();
 
 	for (pdu_builder, room_id) in all_joined_rooms {
-        let mutex_state = Arc::clone(
+		let mutex_state =
-            services()
+			Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.clone()).or_default());
-                .globals
-                .roomid_mutex_state
-                .write()
-                .unwrap()
-                .entry(room_id.clone())
-                .or_default(),
-        );
 		let state_lock = mutex_state.lock().await;
 
-        let _ = services()
+		let _ = services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await;
-            .rooms
-            .timeline
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
-            .await;
 	}
 
 	if services().globals.allow_local_presence() {
 		// Presence update
-        services()
+		services().rooms.edus.presence.ping_presence(sender_user, PresenceState::Online)?;
-            .rooms
-            .edus
-            .presence
-            .ping_presence(sender_user, PresenceState::Online)?;
 	}
 
 	Ok(set_avatar_url::v3::Response {})
@@ -257,48 +196,40 @@ pub async fn set_avatar_url_route(
 ///
 /// - If user is on another server and we do not have a local copy already
 /// fetch avatar_url and blurhash over federation
-pub async fn get_avatar_url_route(
+pub async fn get_avatar_url_route(body: Ruma<get_avatar_url::v3::Request>) -> Result<get_avatar_url::v3::Response> {
-    body: Ruma<get_avatar_url::v3::Request>,
+	if body.user_id.server_name() != services().globals.server_name() {
-) -> Result<get_avatar_url::v3::Response> {
+		// Create and update our local copy of the user
-    if (services().users.exists(&body.user_id)?)
+		if let Ok(response) = services()
-        && (body.user_id.server_name() != services().globals.server_name())
-    {
-        let response = services()
 			.sending
 			.send_federation_request(
 				body.user_id.server_name(),
 				federation::query::get_profile_information::v1::Request {
 					user_id: body.user_id.clone(),
-                    field: Some(ProfileField::AvatarUrl),
+					field: None, // we want the full user's profile to update locally as well
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}
 
-        /*
+			services().users.set_displayname(&body.user_id, response.displayname.clone()).await?;
-            TODO: ignore errors properly?
+			services().users.set_avatar_url(&body.user_id, response.avatar_url.clone()).await?;
-        // Create and update our local copy of the user
+			services().users.set_blurhash(&body.user_id, response.blurhash.clone()).await?;
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
-            .users
-            .set_displayname(&body.user_id, response.displayname)
-            .await;
-        let _ = services()
-            .users
-            .set_avatar_url(&body.user_id, response.avatar_url.clone())
-            .await;
-        let _ = services()
-            .users
-            .set_blurhash(&body.user_id, response.blurhash.clone())
-            .await;
-        */
 
 			return Ok(get_avatar_url::v3::Response {
 				avatar_url: response.avatar_url,
 				blurhash: response.blurhash,
 			});
 		}
+	}
+
+	if !services().users.exists(&body.user_id)? {
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
+		// federation
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
+	}
 
 	Ok(get_avatar_url::v3::Response {
 		avatar_url: services().users.avatar_url(&body.user_id)?,
@@ -312,13 +243,10 @@ pub async fn get_avatar_url_route(
 ///
 /// - If user is on another server and we do not have a local copy already,
 /// fetch profile over federation.
-pub async fn get_profile_route(
+pub async fn get_profile_route(body: Ruma<get_profile::v3::Request>) -> Result<get_profile::v3::Response> {
-    body: Ruma<get_profile::v3::Request>,
+	if body.user_id.server_name() != services().globals.server_name() {
-) -> Result<get_profile::v3::Response> {
+		// Create and update our local copy of the user
-    if (services().users.exists(&body.user_id)?)
+		if let Ok(response) = services()
-        && (body.user_id.server_name() != services().globals.server_name())
-    {
-        let response = services()
 			.sending
 			.send_federation_request(
 				body.user_id.server_name(),
@@ -327,27 +255,15 @@ pub async fn get_profile_route(
 					field: None,
 				},
 			)
-            .await?;
+			.await
+		{
+			if !services().users.exists(&body.user_id)? {
+				services().users.create(&body.user_id, None)?;
+			}
 
-        /*
+			services().users.set_displayname(&body.user_id, response.displayname.clone()).await?;
-            TODO: ignore errors properly?
+			services().users.set_avatar_url(&body.user_id, response.avatar_url.clone()).await?;
-        // Create and update our local copy of the user
+			services().users.set_blurhash(&body.user_id, response.blurhash.clone()).await?;
-        // these are `let _` because it's fine if we can't find these for the user.
-        // also these requests are sent on room join so dead servers will make room joins annoying again
-        let _ = services().users.create(&body.user_id, None);
-        let _ = services()
-            .users
-            .set_displayname(&body.user_id, response.displayname.clone())
-            .await;
-        let _ = services()
-            .users
-            .set_avatar_url(&body.user_id, response.avatar_url.clone())
-            .await;
-        let _ = services()
-            .users
-            .set_blurhash(&body.user_id, response.blurhash.clone())
-            .await;
-        */
 
 			return Ok(get_profile::v3::Response {
 				displayname: response.displayname,
@@ -355,13 +271,12 @@ pub async fn get_profile_route(
 				blurhash: response.blurhash,
 			});
 		}
+	}
 
 	if !services().users.exists(&body.user_id)? {
-        // Return 404 if this user doesn't exist and we couldn't fetch it over federation
+		// Return 404 if this user doesn't exist and we couldn't fetch it over
-        return Err(Error::BadRequest(
+		// federation
-            ErrorKind::NotFound,
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Profile was not found."));
-            "Profile was not found.",
-        ));
 	}
 
 	Ok(get_profile::v3::Response {

src/api/client_server/push.rs

@@ -1,17 +1,17 @@
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		push::{
-            delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled,
+			delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled, get_pushrules_all,
-            get_pushrules_all, set_pusher, set_pushrule, set_pushrule_actions,
+			set_pusher, set_pushrule, set_pushrule_actions, set_pushrule_enabled, RuleScope,
-            set_pushrule_enabled, RuleScope,
 		},
 	},
 	events::{push_rules::PushRulesEvent, GlobalAccountDataEventType},
 	push::{InsertPushRuleError, RemovePushRuleError},
 };
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `GET /_matrix/client/r0/pushrules`
 ///
 /// Retrieves the push rules event for this user.
@@ -22,15 +22,8 @@ pub async fn get_pushrules_all_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -44,48 +37,33 @@ pub async fn get_pushrules_all_route(
 /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Retrieves a single specified push rule for this user.
-pub async fn get_pushrule_route(
+pub async fn get_pushrule_route(body: Ruma<get_pushrule::v3::Request>) -> Result<get_pushrule::v3::Response> {
-    body: Ruma<get_pushrule::v3::Request>,
-) -> Result<get_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
 		.content;
 
-    let rule = account_data
+	let rule = account_data.global.get(body.kind.clone(), &body.rule_id).map(Into::into);
-        .global
-        .get(body.kind.clone(), &body.rule_id)
-        .map(Into::into);
 
 	if let Some(rule) = rule {
-        Ok(get_pushrule::v3::Response { rule })
+		Ok(get_pushrule::v3::Response {
+			rule,
+		})
 	} else {
-        Err(Error::BadRequest(
+		Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))
 	}
 }
 
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Creates a single specified push rule for this user.
-pub async fn set_pushrule_route(
+pub async fn set_pushrule_route(body: Ruma<set_pushrule::v3::Request>) -> Result<set_pushrule::v3::Response> {
-    body: Ruma<set_pushrule::v3::Request>,
-) -> Result<set_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let body = body.body;
 
@@ -98,41 +76,30 @@ pub async fn set_pushrule_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
 
-    if let Err(error) = account_data.content.global.insert(
+	if let Err(error) =
-        body.rule.clone(),
+		account_data.content.global.insert(body.rule.clone(), body.after.as_deref(), body.before.as_deref())
-        body.after.as_deref(),
+	{
-        body.before.as_deref(),
-    ) {
 		let err = match error {
 			InsertPushRuleError::ServerDefaultRuleId => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Rule IDs starting with a dot are reserved for server-default rules.",
 			),
-            InsertPushRuleError::InvalidRuleId => Error::BadRequest(
+			InsertPushRuleError::InvalidRuleId => {
-                ErrorKind::InvalidParam,
+				Error::BadRequest(ErrorKind::InvalidParam, "Rule ID containing invalid characters.")
-                "Rule ID containing invalid characters.",
+			},
-            ),
 			InsertPushRuleError::RelativeToServerDefaultRule => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Can't place a push rule relatively to a server-default rule.",
 			),
-            InsertPushRuleError::UnknownRuleId => Error::BadRequest(
+			InsertPushRuleError::UnknownRuleId => {
-                ErrorKind::NotFound,
+				Error::BadRequest(ErrorKind::NotFound, "The before or after rule could not be found.")
-                "The before or after rule could not be found.",
+			},
-            ),
 			InsertPushRuleError::BeforeHigherThanAfter => Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"The before rule has a higher priority than the after rule.",
@@ -170,15 +137,8 @@ pub async fn get_pushrule_actions_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -188,12 +148,11 @@ pub async fn get_pushrule_actions_route(
 	let actions = global
 		.get(body.kind.clone(), &body.rule_id)
 		.map(|rule| rule.actions().to_owned())
-        .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))?;
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))?;
 
-    Ok(get_pushrule_actions::v3::Response { actions })
+	Ok(get_pushrule_actions::v3::Response {
+		actions,
+	})
 }
 
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions`
@@ -213,29 +172,14 @@ pub async fn set_pushrule_actions_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
 
-    if account_data
+	if account_data.content.global.set_actions(body.kind.clone(), &body.rule_id, body.actions.clone()).is_err() {
-        .content
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."));
-        .global
-        .set_actions(body.kind.clone(), &body.rule_id, body.actions.clone())
-        .is_err()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ));
 	}
 
 	services().account_data.update(
@@ -265,15 +209,8 @@ pub async fn get_pushrule_enabled_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
@@ -281,13 +218,12 @@ pub async fn get_pushrule_enabled_route(
 	let global = account_data.content.global;
 	let enabled = global
 		.get(body.kind.clone(), &body.rule_id)
-        .map(|r| r.enabled())
+		.map(ruma::push::AnyPushRuleRef::enabled)
-        .ok_or(Error::BadRequest(
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))?;
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ))?;
 
-    Ok(get_pushrule_enabled::v3::Response { enabled })
+	Ok(get_pushrule_enabled::v3::Response {
+		enabled,
+	})
 }
 
 /// # `PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/enabled`
@@ -307,29 +243,14 @@ pub async fn set_pushrule_enabled_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
 
-    if account_data
+	if account_data.content.global.set_enabled(body.kind.clone(), &body.rule_id, body.enabled).is_err() {
-        .content
+		return Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."));
-        .global
-        .set_enabled(body.kind.clone(), &body.rule_id, body.enabled)
-        .is_err()
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::NotFound,
-            "Push rule not found.",
-        ));
 	}
 
 	services().account_data.update(
@@ -345,9 +266,7 @@ pub async fn set_pushrule_enabled_route(
 /// # `DELETE /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`
 ///
 /// Deletes a single specified push rule for this user.
-pub async fn delete_pushrule_route(
+pub async fn delete_pushrule_route(body: Ruma<delete_pushrule::v3::Request>) -> Result<delete_pushrule::v3::Response> {
-    body: Ruma<delete_pushrule::v3::Request>,
-) -> Result<delete_pushrule::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	if body.scope != RuleScope::Global {
@@ -359,32 +278,18 @@ pub async fn delete_pushrule_route(
 
 	let event = services()
 		.account_data
-        .get(
+		.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?
-            None,
+		.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?;
-            sender_user,
-            GlobalAccountDataEventType::PushRules.to_string().into(),
-        )?
-        .ok_or(Error::BadRequest(
-            ErrorKind::NotFound,
-            "PushRules event not found.",
-        ))?;
 
 	let mut account_data = serde_json::from_str::<PushRulesEvent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?;
 
-    if let Err(error) = account_data
+	if let Err(error) = account_data.content.global.remove(body.kind.clone(), &body.rule_id) {
-        .content
-        .global
-        .remove(body.kind.clone(), &body.rule_id)
-    {
 		let err = match error {
-            RemovePushRuleError::ServerDefault => Error::BadRequest(
+			RemovePushRuleError::ServerDefault => {
-                ErrorKind::InvalidParam,
+				Error::BadRequest(ErrorKind::InvalidParam, "Cannot delete a server-default pushrule.")
-                "Cannot delete a server-default pushrule.",
+			},
-            ),
+			RemovePushRuleError::NotFound => Error::BadRequest(ErrorKind::NotFound, "Push rule not found."),
-            RemovePushRuleError::NotFound => {
-                Error::BadRequest(ErrorKind::NotFound, "Push rule not found.")
-            }
 			_ => Error::BadRequest(ErrorKind::InvalidParam, "Invalid data."),
 		};
 
@@ -404,9 +309,7 @@ pub async fn delete_pushrule_route(
 /// # `GET /_matrix/client/r0/pushers`
 ///
 /// Gets all currently active pushers for the sender user.
-pub async fn get_pushers_route(
+pub async fn get_pushers_route(body: Ruma<get_pushers::v3::Request>) -> Result<get_pushers::v3::Response> {
-    body: Ruma<get_pushers::v3::Request>,
-) -> Result<get_pushers::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	Ok(get_pushers::v3::Response {
@@ -419,14 +322,10 @@ pub async fn get_pushers_route(
 /// Adds a pusher for the sender user.
 ///
 /// - TODO: Handle `append`
-pub async fn set_pushers_route(
+pub async fn set_pushers_route(body: Ruma<set_pusher::v3::Request>) -> Result<set_pusher::v3::Response> {
-    body: Ruma<set_pusher::v3::Request>,
-) -> Result<set_pusher::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    services()
+	services().pusher.set_pusher(sender_user, body.action.clone())?;
-        .pusher
-        .set_pusher(sender_user, body.action.clone())?;
 
 	Ok(set_pusher::v3::Response::default())
 }

src/api/client_server/read_marker.rs

@@ -1,4 +1,5 @@
-use crate::{service::rooms::timeline::PduCount, services, Error, Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::{
 	api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
 	events::{
@@ -7,17 +8,17 @@ use ruma::{
 	},
 	MilliSecondsSinceUnixEpoch,
 };
-use std::collections::BTreeMap;
+
+use crate::{service::rooms::timeline::PduCount, services, Error, Result, Ruma};
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
 /// Sets different types of read markers.
 ///
 /// - Updates fully-read account data event to `fully_read`
-/// - If `read_receipt` is set: Update private marker and public read receipt EDU
+/// - If `read_receipt` is set: Update private marker and public read receipt
-pub async fn set_read_marker_route(
+///   EDU
-    body: Ruma<set_read_marker::v3::Request>,
+pub async fn set_read_marker_route(body: Ruma<set_read_marker::v3::Request>) -> Result<set_read_marker::v3::Response> {
-) -> Result<set_read_marker::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	if let Some(fully_read) = &body.fully_read {
@@ -35,10 +36,7 @@ pub async fn set_read_marker_route(
 	}
 
 	if body.private_read_receipt.is_some() || body.read_receipt.is_some() {
-        services()
+		services().rooms.user.reset_notification_counts(sender_user, &body.room_id)?;
-            .rooms
-            .user
-            .reset_notification_counts(sender_user, &body.room_id)?;
 	}
 
 	if let Some(event) = &body.private_read_receipt {
@@ -46,24 +44,17 @@ pub async fn set_read_marker_route(
 			.rooms
 			.timeline
 			.get_pdu_count(event)?
-            .ok_or(Error::BadRequest(
+			.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Event does not exist."))?;
-                ErrorKind::InvalidParam,
-                "Event does not exist.",
-            ))?;
 		let count = match count {
 			PduCount::Backfilled(_) => {
 				return Err(Error::BadRequest(
 					ErrorKind::InvalidParam,
 					"Read receipt is in backfilled timeline",
 				))
-            }
+			},
 			PduCount::Normal(c) => c,
 		};
-        services()
+		services().rooms.edus.read_receipt.private_read_set(&body.room_id, sender_user, count)?;
-            .rooms
-            .edus
-            .read_receipt
-            .private_read_set(&body.room_id, sender_user, count)?;
 	}
 
 	if let Some(event) = &body.read_receipt {
@@ -90,6 +81,8 @@ pub async fn set_read_marker_route(
 				room_id: body.room_id.clone(),
 			},
 		)?;
+
+		services().sending.flush_room(&body.room_id)?;
 	}
 
 	Ok(set_read_marker::v3::Response {})
@@ -98,19 +91,14 @@ pub async fn set_read_marker_route(
 /// # `POST /_matrix/client/r0/rooms/{roomId}/receipt/{receiptType}/{eventId}`
 ///
 /// Sets private read marker and public read receipt EDU.
-pub async fn create_receipt_route(
+pub async fn create_receipt_route(body: Ruma<create_receipt::v3::Request>) -> Result<create_receipt::v3::Response> {
-    body: Ruma<create_receipt::v3::Request>,
-) -> Result<create_receipt::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	if matches!(
 		&body.receipt_type,
 		create_receipt::v3::ReceiptType::Read | create_receipt::v3::ReceiptType::ReadPrivate
 	) {
-        services()
+		services().rooms.user.reset_notification_counts(sender_user, &body.room_id)?;
-            .rooms
-            .user
-            .reset_notification_counts(sender_user, &body.room_id)?;
 	}
 
 	match body.receipt_type {
@@ -126,7 +114,7 @@ pub async fn create_receipt_route(
 				RoomAccountDataEventType::FullyRead,
 				&serde_json::to_value(fully_read_event).expect("to json value always works"),
 			)?;
-        }
+		},
 		create_receipt::v3::ReceiptType::Read => {
 			let mut user_receipts = BTreeMap::new();
 			user_receipts.insert(
@@ -140,7 +128,7 @@ pub async fn create_receipt_route(
 			receipts.insert(ReceiptType::Read, user_receipts);
 
 			let mut receipt_content = BTreeMap::new();
-            receipt_content.insert(body.event_id.to_owned(), receipts);
+			receipt_content.insert(body.event_id.clone(), receipts);
 
 			services().rooms.edus.read_receipt.readreceipt_update(
 				sender_user,
@@ -150,31 +138,26 @@ pub async fn create_receipt_route(
 					room_id: body.room_id.clone(),
 				},
 			)?;
-        }
+
+			services().sending.flush_room(&body.room_id)?;
+		},
 		create_receipt::v3::ReceiptType::ReadPrivate => {
 			let count = services()
 				.rooms
 				.timeline
 				.get_pdu_count(&body.event_id)?
-                .ok_or(Error::BadRequest(
+				.ok_or(Error::BadRequest(ErrorKind::InvalidParam, "Event does not exist."))?;
-                    ErrorKind::InvalidParam,
-                    "Event does not exist.",
-                ))?;
 			let count = match count {
 				PduCount::Backfilled(_) => {
 					return Err(Error::BadRequest(
 						ErrorKind::InvalidParam,
 						"Read receipt is in backfilled timeline",
 					))
-                }
+				},
 				PduCount::Normal(c) => c,
 			};
-            services().rooms.edus.read_receipt.private_read_set(
+			services().rooms.edus.read_receipt.private_read_set(&body.room_id, sender_user, count)?;
-                &body.room_id,
+		},
-                sender_user,
-                count,
-            )?;
-        }
 		_ => return Err(Error::bad_database("Unsupported receipt type")),
 	}
 

src/api/client_server/redact.rs

@@ -1,33 +1,24 @@
 use std::sync::Arc;
 
-use crate::{service::pdu::PduBuilder, services, Result, Ruma};
 use ruma::{
 	api::client::redact::redact_event,
 	events::{room::redaction::RoomRedactionEventContent, TimelineEventType},
 };
-
 use serde_json::value::to_raw_value;
 
+use crate::{service::pdu::PduBuilder, services, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
 ///
 /// Tries to send a redaction event into the room.
 ///
 /// - TODO: Handle txn id
-pub async fn redact_event_route(
+pub async fn redact_event_route(body: Ruma<redact_event::v3::Request>) -> Result<redact_event::v3::Response> {
-    body: Ruma<redact_event::v3::Request>,
-) -> Result<redact_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let body = body.body;
 
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(body.room_id.clone()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(body.room_id.clone())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
 	let event_id = services()
@@ -54,5 +45,7 @@ pub async fn redact_event_route(
 	drop(state_lock);
 
 	let event_id = (*event_id).to_owned();
-    Ok(redact_event::v3::Response { event_id })
+	Ok(redact_event::v3::Response {
+		event_id,
+	})
 }

src/api/client_server/relations.rs

@@ -1,6 +1,5 @@
 use ruma::api::client::relations::{
-    get_relating_events, get_relating_events_with_rel_type,
+	get_relating_events, get_relating_events_with_rel_type, get_relating_events_with_rel_type_and_event_type,
-    get_relating_events_with_rel_type_and_event_type,
 };
 
 use crate::{service::rooms::timeline::PduCount, services, Result, Ruma};
@@ -20,39 +19,27 @@ pub async fn get_relating_events_with_rel_type_and_event_type_route(
 		},
 	};
 
-    let to = body
+	let to = body.to.as_ref().and_then(|t| PduCount::try_from_string(t).ok());
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
 
 	// Use limit or else 10, with maximum 100
-    let limit = body
+	let limit = body.limit.and_then(|u| u32::try_from(u).ok()).map_or(10_usize, |u| u as usize).min(100);
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
 
-    let res = services()
+	let res = services().rooms.pdu_metadata.paginate_relations_with_filter(
-        .rooms
-        .pdu_metadata
-        .paginate_relations_with_filter(
 		sender_user,
 		&body.room_id,
 		&body.event_id,
-            Some(body.event_type.clone()),
+		&Some(body.event_type.clone()),
-            Some(body.rel_type.clone()),
+		&Some(body.rel_type.clone()),
 		from,
 		to,
 		limit,
 	)?;
 
-    Ok(
+	Ok(get_relating_events_with_rel_type_and_event_type::v1::Response {
-        get_relating_events_with_rel_type_and_event_type::v1::Response {
 		chunk: res.chunk,
 		next_batch: res.next_batch,
 		prev_batch: res.prev_batch,
-        },
+	})
-    )
 }
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/relations/{eventId}/{relType}`
@@ -70,27 +57,17 @@ pub async fn get_relating_events_with_rel_type_route(
 		},
 	};
 
-    let to = body
+	let to = body.to.as_ref().and_then(|t| PduCount::try_from_string(t).ok());
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
 
 	// Use limit or else 10, with maximum 100
-    let limit = body
+	let limit = body.limit.and_then(|u| u32::try_from(u).ok()).map_or(10_usize, |u| u as usize).min(100);
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
 
-    let res = services()
+	let res = services().rooms.pdu_metadata.paginate_relations_with_filter(
-        .rooms
-        .pdu_metadata
-        .paginate_relations_with_filter(
 		sender_user,
 		&body.room_id,
 		&body.event_id,
-            None,
+		&None,
-            Some(body.rel_type.clone()),
+		&Some(body.rel_type.clone()),
 		from,
 		to,
 		limit,
@@ -118,27 +95,17 @@ pub async fn get_relating_events_route(
 		},
 	};
 
-    let to = body
+	let to = body.to.as_ref().and_then(|t| PduCount::try_from_string(t).ok());
-        .to
-        .as_ref()
-        .and_then(|t| PduCount::try_from_string(t).ok());
 
 	// Use limit or else 10, with maximum 100
-    let limit = body
+	let limit = body.limit.and_then(|u| u32::try_from(u).ok()).map_or(10_usize, |u| u as usize).min(100);
-        .limit
-        .and_then(|u| u32::try_from(u).ok())
-        .map_or(10_usize, |u| u as usize)
-        .min(100);
 
-    services()
+	services().rooms.pdu_metadata.paginate_relations_with_filter(
-        .rooms
-        .pdu_metadata
-        .paginate_relations_with_filter(
 		sender_user,
 		&body.room_id,
 		&body.event_id,
-            None,
+		&None,
-            None,
+		&None,
 		from,
 		to,
 		limit,

src/api/client_server/report.rs

@@ -1,6 +1,5 @@
 use std::time::Duration;
 
-use crate::{services, utils::HtmlEscape, Error, Result, Ruma};
 use rand::Rng;
 use ruma::{
 	api::client::{error::ErrorKind, room::report_content},
@@ -10,13 +9,12 @@ use ruma::{
 use tokio::time::sleep;
 use tracing::{debug, info};
 
+use crate::{services, utils::HtmlEscape, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/rooms/{roomId}/report/{eventId}`
 ///
 /// Reports an inappropriate event to homeserver admins
-///
+pub async fn report_event_route(body: Ruma<report_content::v3::Request>) -> Result<report_content::v3::Response> {
-pub async fn report_event_route(
-    body: Ruma<report_content::v3::Request>,
-) -> Result<report_content::v3::Response> {
 	// user authentication
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
@@ -30,7 +28,7 @@ pub async fn report_event_route(
 				ErrorKind::NotFound,
 				"Event ID is not known to us or Event ID is invalid",
 			))
-        }
+		},
 	};
 
 	// check if the room ID from the URI matches the PDU's room ID
@@ -46,7 +44,7 @@ pub async fn report_event_route(
 		.rooms
 		.state_cache
 		.room_members(&pdu.room_id)
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.any(|user_id| user_id == *sender_user)
 	{
 		return Err(Error::BadRequest(
@@ -71,22 +69,17 @@ pub async fn report_event_route(
 		));
 	};
 
-    // send admin room message that we received the report with an @room ping for urgency
+	// send admin room message that we received the report with an @room ping for
-    services()
+	// urgency
-        .admin
+	services().admin.send_message(message::RoomMessageEventContent::text_html(
-        .send_message(message::RoomMessageEventContent::text_html(
 		format!(
-                "@room Report received from: {}\n\n\
+			"@room Report received from: {}\n\nEvent ID: {}\nRoom ID: {}\nSent By: {}\n\nReport Score: {}\nReport \
-                Event ID: {}\n\
+			 Reason: {}",
-                Room ID: {}\n\
-                Sent By: {}\n\n\
-                Report Score: {}\n\
-                Report Reason: {}",
 			sender_user.to_owned(),
 			pdu.event_id,
 			pdu.room_id,
-                pdu.sender.to_owned(),
+			pdu.sender.clone(),
-                body.score.unwrap_or(ruma::Int::from(0)),
+			body.score.unwrap_or_else(|| ruma::Int::from(0)),
 			body.reason.as_deref().unwrap_or("")
 		),
 		format!(
@@ -97,16 +90,17 @@ pub async fn report_event_route(
                 Report Info<ul><li>Report Score: {4}</li><li>Report Reason: {5}</li></ul></li>\
                 </ul></details>",
 				sender_user.to_owned(),
-            pdu.event_id.to_owned(),
+				pdu.event_id.clone(),
-            pdu.room_id.to_owned(),
+				pdu.room_id.clone(),
-            pdu.sender.to_owned(),
+				pdu.sender.clone(),
-            body.score.unwrap_or(ruma::Int::from(0)),
+				body.score.unwrap_or_else(|| ruma::Int::from(0)),
 				HtmlEscape(body.reason.as_deref().unwrap_or(""))
 			),
 	));
 
-    // even though this is kinda security by obscurity, let's still make a small random delay sending a successful response
+	// even though this is kinda security by obscurity, let's still make a small
-    // per spec suggestion regarding enumerating for potential events existing in our server.
+	// random delay sending a successful response per spec suggestion regarding
+	// enumerating for potential events existing in our server.
 	let time_to_wait = rand::thread_rng().gen_range(8..21);
 	debug!(
 		"Got successful /report request, waiting {} seconds before sending successful response.",

src/api/client_server/room.rs

@@ -1,6 +1,5 @@
-use crate::{
+use std::{cmp::max, collections::BTreeMap, sync::Arc};
-    api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma,
+
-};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
@@ -23,13 +22,13 @@ use ruma::{
 	},
 	int,
 	serde::JsonObject,
-    CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId,
+	CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId,
-    RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};
-use std::{cmp::max, collections::BTreeMap, sync::Arc};
 use tracing::{debug, error, info, warn};
 
+use crate::{api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma};
+
 /// # `POST /_matrix/client/v3/createRoom`
 ///
 /// Creates a new room.
@@ -46,27 +45,19 @@ use tracing::{debug, error, info, warn};
 /// - Send events listed in initial state
 /// - Send events implied by `name` and `topic`
 /// - Send invite events
-pub async fn create_room_route(
+pub async fn create_room_route(body: Ruma<create_room::v3::Request>) -> Result<create_room::v3::Response> {
-    body: Ruma<create_room::v3::Request>,
-) -> Result<create_room::v3::Response> {
 	use create_room::v3::RoomPreset;
 
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services().globals.allow_room_creation()
+	if !services().globals.allow_room_creation() && !&body.from_appservice && !services().users.is_admin(sender_user)? {
-        && !&body.from_appservice
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Room creation has been disabled."));
-        && !services().users.is_admin(sender_user)?
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "Room creation has been disabled.",
-        ));
 	}
 
 	let room_id: OwnedRoomId;
 
-    // checks if the user specified an explicit (custom) room_id to be created with in request body.
+	// checks if the user specified an explicit (custom) room_id to be created with
-    // falls back to normal generated room ID if not specified.
+	// in request body. falls back to normal generated room ID if not specified.
 	if let Some(CanonicalJsonValue::Object(json_body)) = &body.json_body {
 		match json_body.get("room_id") {
 			Some(custom_room_id) => {
@@ -76,7 +67,8 @@ pub async fn create_room_route(
 				if custom_room_id_s.contains(':') {
 					return Err(Error::BadRequest(
 						ErrorKind::InvalidParam,
-                        "Custom room ID contained `:` which is not allowed. Please note that this expects a localpart, not the full room ID.",
+						"Custom room ID contained `:` which is not allowed. Please note that this expects a \
+						 localpart, not the full room ID.",
 					));
 				} else if custom_room_id_s.contains(char::is_whitespace) {
 					return Err(Error::BadRequest(
@@ -84,45 +76,28 @@ pub async fn create_room_route(
 						"Custom room ID contained spaces which is not valid.",
 					));
 				} else if custom_room_id_s.len() > 255 {
-                    return Err(Error::BadRequest(
+					return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
-                        ErrorKind::InvalidParam,
-                        "Custom room ID is too long.",
-                    ));
 				}
 
 				// apply forbidden room alias checks to custom room IDs too
-                if services()
+				if services().globals.forbidden_room_names().is_match(&custom_room_id_s) {
-                    .globals
+					return Err(Error::BadRequest(ErrorKind::Unknown, "Custom room ID is forbidden."));
-                    .forbidden_room_names()
-                    .is_match(&custom_room_id_s)
-                {
-                    return Err(Error::BadRequest(
-                        ErrorKind::Unknown,
-                        "Custom room ID is forbidden.",
-                    ));
 				}
 
 				let full_room_id = "!".to_owned()
 					+ &custom_room_id_s.replace('"', "")
-                    + ":"
+					+ ":" + services().globals.server_name().as_ref();
-                    + services().globals.server_name().as_ref();
 				debug!("Full room ID: {}", full_room_id);
 
 				room_id = RoomId::parse(full_room_id).map_err(|e| {
-                    info!(
+					info!("User attempted to create room with custom room ID but failed parsing: {}", e);
-                        "User attempted to create room with custom room ID but failed parsing: {}",
+					Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID could not be parsed")
-                        e
-                    );
-                    Error::BadRequest(
-                        ErrorKind::InvalidParam,
-                        "Custom room ID could not be parsed",
-                    )
 				})?;
-            }
+			},
 			None => room_id = RoomId::new(services().globals.server_name()),
 		}
 	} else {
-        room_id = RoomId::new(services().globals.server_name())
+		room_id = RoomId::new(services().globals.server_name());
 	}
 
 	// check if room ID doesn't already exist instead of erroring on auth check
@@ -135,27 +110,17 @@ pub async fn create_room_route(
 
 	services().rooms.short.get_or_create_shortroomid(&room_id)?;
 
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.clone()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(room_id.clone())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
-    let alias: Option<OwnedRoomAliasId> =
+	let alias: Option<OwnedRoomAliasId> = body.room_alias_name.as_ref().map_or(Ok(None), |localpart| {
-        body.room_alias_name
-            .as_ref()
-            .map_or(Ok(None), |localpart| {
-
 		// Basic checks on the room alias validity
 		if localpart.contains(':') {
 			return Err(Error::BadRequest(
 				ErrorKind::InvalidParam,
-                        "Room alias contained `:` which is not allowed. Please note that this expects a localpart, not the full room alias.",
+				"Room alias contained `:` which is not allowed. Please note that this expects a localpart, not the \
+				 full room alias.",
 			));
 		} else if localpart.contains(char::is_whitespace) {
 			return Err(Error::BadRequest(
@@ -164,9 +129,9 @@ pub async fn create_room_route(
 			));
 		} else if localpart.len() > 255 {
 			// there is nothing spec-wise saying to check the limit of this,
-                    // however absurdly long room aliases are guaranteed to be unreadable or done maliciously.
+			// however absurdly long room aliases are guaranteed to be unreadable or done
-                    // there is no reason a room alias should even exceed 100 characters as is. 
+			// maliciously. there is no reason a room alias should even exceed 100
-                    // generally in spec, 255 is matrix's fav number 
+			// characters as is. generally in spec, 255 is matrix's fav number
 			return Err(Error::BadRequest(
 				ErrorKind::InvalidParam,
 				"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
@@ -179,37 +144,18 @@ pub async fn create_room_route(
 		}
 
 		// check if room alias is forbidden
-                if services()
+		if services().globals.forbidden_room_names().is_match(localpart) {
-                    .globals
+			return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
-                    .forbidden_room_names()
-                    .is_match(localpart)
-                {
-                    return Err(Error::BadRequest(
-                        ErrorKind::Unknown,
-                        "Room alias name is forbidden.",
-                    ));
 		}
 
-                let alias = RoomAliasId::parse(format!(
+		let alias =
-                    "#{}:{}",
+			RoomAliasId::parse(format!("#{}:{}", localpart, services().globals.server_name())).map_err(|e| {
-                    localpart,
-                    services().globals.server_name()
-                ))
-                .map_err(|e| {
 				warn!("Failed to parse room alias for room ID {}: {e}", room_id);
 				Error::BadRequest(ErrorKind::InvalidParam, "Invalid room alias specified.")
 			})?;
 
-                if services()
+		if services().rooms.alias.resolve_local_alias(&alias)?.is_some() {
-                    .rooms
+			Err(Error::BadRequest(ErrorKind::RoomInUse, "Room alias already exists."))
-                    .alias
-                    .resolve_local_alias(&alias)?
-                    .is_some()
-                {
-                    Err(Error::BadRequest(
-                        ErrorKind::RoomInUse,
-                        "Room alias already exists.",
-                    ))
 		} else {
 			Ok(Some(alias))
 		}
@@ -217,11 +163,7 @@ pub async fn create_room_route(
 
 	let room_version = match body.room_version.clone() {
 		Some(room_version) => {
-            if services()
+			if services().globals.supported_room_versions().contains(&room_version) {
-                .globals
-                .supported_room_versions()
-                .contains(&room_version)
-            {
 				room_version
 			} else {
 				return Err(Error::BadRequest(
@@ -229,15 +171,13 @@ pub async fn create_room_route(
 					"This server does not support that room version.",
 				));
 			}
-        }
+		},
 		None => services().globals.default_room_version(),
 	};
 
 	let content = match &body.creation_content {
 		Some(content) => {
-            let mut content = content
+			let mut content = content.deserialize_as::<CanonicalJsonObject>().map_err(|e| {
-                .deserialize_as::<CanonicalJsonObject>()
-                .map_err(|e| {
 				error!("Failed to deserialise content as canonical JSON: {}", e);
 				Error::bad_database("Failed to deserialise content as canonical JSON.")
 			})?;
@@ -259,25 +199,25 @@ pub async fn create_room_route(
 							Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
 						})?,
 					);
-                }
+				},
-                RoomVersionId::V11 => {} // V11 removed the "creator" key
+				RoomVersionId::V11 => {}, // V11 removed the "creator" key
 				_ => {
 					warn!("Unexpected or unsupported room version {}", room_version);
 					return Err(Error::BadRequest(
 						ErrorKind::BadJson,
 						"Unexpected or unsupported room version found",
 					));
-                }
+				},
 			}
 
 			content.insert(
 				"room_version".into(),
-                json!(room_version.as_str()).try_into().map_err(|_| {
+				json!(room_version.as_str())
-                    Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
+					.try_into()
-                })?,
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
 			);
 			content
-        }
+		},
 		None => {
 			// TODO: Add correct value for v11
 			let content = match room_version {
@@ -298,7 +238,7 @@ pub async fn create_room_route(
 						ErrorKind::BadJson,
 						"Unexpected or unsupported room version found",
 					));
-                }
+				},
 			};
 			let mut content = serde_json::from_str::<CanonicalJsonObject>(
 				to_raw_value(&content)
@@ -308,26 +248,20 @@ pub async fn create_room_route(
 			.unwrap();
 			content.insert(
 				"room_version".into(),
-                json!(room_version.as_str()).try_into().map_err(|_| {
+				json!(room_version.as_str())
-                    Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
+					.try_into()
-                })?,
+					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
 			);
 			content
-        }
+		},
 	};
 
 	// Validate creation content
-    let de_result = serde_json::from_str::<CanonicalJsonObject>(
+	let de_result =
-        to_raw_value(&content)
+		serde_json::from_str::<CanonicalJsonObject>(to_raw_value(&content).expect("Invalid creation content").get());
-            .expect("Invalid creation content")
-            .get(),
-    );
 
 	if de_result.is_err() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"));
-            ErrorKind::BadJson,
-            "Invalid creation content",
-        ));
 	}
 
 	// 1. The room create event
@@ -380,7 +314,6 @@ pub async fn create_room_route(
 
 	// Figure out preset. We need it for preset specific events
 	let preset = body.preset.clone().unwrap_or(match &body.visibility {
-        room::Visibility::Private => RoomPreset::PrivateChat,
 		room::Visibility::Public => RoomPreset::PublicChat,
 		_ => RoomPreset::PrivateChat, // Room visibility should not be custom
 	});
@@ -402,9 +335,7 @@ pub async fn create_room_route(
 
 	if let Some(power_level_content_override) = &body.power_level_content_override {
 		let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
-            .map_err(|_| {
+			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;
-                Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override.")
-            })?;
 
 		for (key, value) in json {
 			power_levels_content[key] = value;
@@ -417,8 +348,7 @@ pub async fn create_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomPowerLevels,
-                content: to_raw_value(&power_levels_content)
+				content: to_raw_value(&power_levels_content).expect("to_raw_value always works on serde_json::Value"),
-                    .expect("to_raw_value always works on serde_json::Value"),
 				unsigned: None,
 				state_key: Some("".to_owned()),
 				redacts: None,
@@ -485,9 +415,7 @@ pub async fn create_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomHistoryVisibility,
-                content: to_raw_value(&RoomHistoryVisibilityEventContent::new(
+				content: to_raw_value(&RoomHistoryVisibilityEventContent::new(HistoryVisibility::Shared))
-                    HistoryVisibility::Shared,
-                ))
 					.expect("event is valid, we just created it"),
 				unsigned: None,
 				state_key: Some("".to_owned()),
@@ -532,17 +460,11 @@ pub async fn create_room_route(
 		pdu_builder.state_key.get_or_insert_with(|| "".to_owned());
 
 		// Silently skip encryption events if they are not allowed
-        if pdu_builder.event_type == TimelineEventType::RoomEncryption
+		if pdu_builder.event_type == TimelineEventType::RoomEncryption && !services().globals.allow_encryption() {
-            && !services().globals.allow_encryption()
-        {
 			continue;
 		}
 
-        services()
+		services().rooms.timeline.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock).await?;
-            .rooms
-            .timeline
-            .build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
-            .await?;
 	}
 
 	// 7. Events implied by name and topic
@@ -612,26 +534,17 @@ pub async fn create_room_route(
 ///
 /// Gets a single event.
 ///
-/// - You have to currently be joined to the room (TODO: Respect history visibility)
+/// - You have to currently be joined to the room (TODO: Respect history
-pub async fn get_room_event_route(
+///   visibility)
-    body: Ruma<get_room_event::v3::Request>,
+pub async fn get_room_event_route(body: Ruma<get_room_event::v3::Request>) -> Result<get_room_event::v3::Response> {
-) -> Result<get_room_event::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let event = services()
+	let event = services().rooms.timeline.get_pdu(&body.event_id)?.ok_or_else(|| {
-        .rooms
-        .timeline
-        .get_pdu(&body.event_id)?
-        .ok_or_else(|| {
 		warn!("Event not found, event ID: {:?}", &body.event_id);
 		Error::BadRequest(ErrorKind::NotFound, "Event not found.")
 	})?;
 
-    if !services().rooms.state_accessor.user_can_see_event(
+	if !services().rooms.state_accessor.user_can_see_event(sender_user, &event.room_id, &body.event_id)? {
-        sender_user,
-        &event.room_id,
-        &body.event_id,
-    )? {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view this event.",
@@ -650,17 +563,12 @@ pub async fn get_room_event_route(
 ///
 /// Lists all aliases of the room.
 ///
-/// - Only users joined to the room are allowed to call this TODO: Allow any user to call it if history_visibility is world readable
+/// - Only users joined to the room are allowed to call this TODO: Allow any
-pub async fn get_room_aliases_route(
+///   user to call it if history_visibility is world readable
-    body: Ruma<aliases::v3::Request>,
+pub async fn get_room_aliases_route(body: Ruma<aliases::v3::Request>) -> Result<aliases::v3::Response> {
-) -> Result<aliases::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().rooms.state_cache.is_joined(sender_user, &body.room_id)? {
-        .rooms
-        .state_cache
-        .is_joined(sender_user, &body.room_id)?
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view this room.",
@@ -672,7 +580,7 @@ pub async fn get_room_aliases_route(
 			.rooms
 			.alias
 			.local_aliases_for_room(&body.room_id)
-            .filter_map(|a| a.ok())
+			.filter_map(std::result::Result::ok)
 			.collect(),
 	})
 }
@@ -687,16 +595,10 @@ pub async fn get_room_aliases_route(
 /// - Transfers some state events
 /// - Moves local aliases
 /// - Modifies old room power levels to prevent users from speaking
-pub async fn upgrade_room_route(
+pub async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) -> Result<upgrade_room::v3::Response> {
-    body: Ruma<upgrade_room::v3::Request>,
-) -> Result<upgrade_room::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().globals.supported_room_versions().contains(&body.new_version) {
-        .globals
-        .supported_room_versions()
-        .contains(&body.new_version)
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::UnsupportedRoomVersion,
 			"This server does not support that room version.",
@@ -705,24 +607,15 @@ pub async fn upgrade_room_route(
 
 	// Create a replacement room
 	let replacement_room = RoomId::new(services().globals.server_name());
-    services()
+	services().rooms.short.get_or_create_shortroomid(&replacement_room)?;
-        .rooms
-        .short
-        .get_or_create_shortroomid(&replacement_room)?;
 
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(body.room_id.clone()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(body.room_id.clone())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
-    // Send a m.room.tombstone event to the old room to indicate that it is not intended to be used any further
+	// Send a m.room.tombstone event to the old room to indicate that it is not
-    // Fail if the sender does not have the required permissions
+	// intended to be used any further Fail if the sender does not have the required
+	// permissions
 	let tombstone_event_id = services()
 		.rooms
 		.timeline
@@ -746,15 +639,8 @@ pub async fn upgrade_room_route(
 
 	// Change lock to replacement room
 	drop(state_lock);
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(replacement_room.clone()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(replacement_room.clone())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
 	// Get the old room creation event
@@ -775,7 +661,8 @@ pub async fn upgrade_room_route(
 		(*tombstone_event_id).to_owned(),
 	));
 
-    // Send a m.room.create event containing a predecessor field and the applicable room_version
+	// Send a m.room.create event containing a predecessor field and the applicable
+	// room_version
 	match body.new_version {
 		RoomVersionId::V1
 		| RoomVersionId::V2
@@ -794,21 +681,18 @@ pub async fn upgrade_room_route(
 					Error::BadRequest(ErrorKind::BadJson, "Error forming creation event")
 				})?,
 			);
-        }
+		},
 		RoomVersionId::V11 => {
 			// "creator" key no longer exists in V11 rooms
 			create_event_content.remove("creator");
-        }
+		},
 		_ => {
-            warn!(
+			warn!("Unexpected or unsupported room version {}", body.new_version);
-                "Unexpected or unsupported room version {}",
-                body.new_version
-            );
 			return Err(Error::BadRequest(
 				ErrorKind::BadJson,
 				"Unexpected or unsupported room version found",
 			));
-        }
+		},
 	}
 
 	create_event_content.insert(
@@ -826,16 +710,11 @@ pub async fn upgrade_room_route(
 
 	// Validate creation event content
 	let de_result = serde_json::from_str::<CanonicalJsonObject>(
-        to_raw_value(&create_event_content)
+		to_raw_value(&create_event_content).expect("Error forming creation event").get(),
-            .expect("Error forming creation event")
-            .get(),
 	);
 
 	if de_result.is_err() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"));
-            ErrorKind::BadJson,
-            "Error forming creation event",
-        ));
 	}
 
 	services()
@@ -844,8 +723,7 @@ pub async fn upgrade_room_route(
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomCreate,
-                content: to_raw_value(&create_event_content)
+				content: to_raw_value(&create_event_content).expect("event is valid, we just created it"),
-                    .expect("event is valid, we just created it"),
 				unsigned: None,
 				state_key: Some("".to_owned()),
 				redacts: None,
@@ -899,12 +777,7 @@ pub async fn upgrade_room_route(
 
 	// Replicate transferable state events to the new room
 	for event_type in transferable_state_events {
-        let event_content =
+		let event_content = match services().rooms.state_accessor.room_state_get(&body.room_id, &event_type, "")? {
-            match services()
-                .rooms
-                .state_accessor
-                .room_state_get(&body.room_id, &event_type, "")?
-            {
 			Some(v) => v.content.clone(),
 			None => continue, // Skipping missing events.
 		};
@@ -928,16 +801,8 @@ pub async fn upgrade_room_route(
 	}
 
 	// Moves any local aliases to the new room
-    for alias in services()
+	for alias in services().rooms.alias.local_aliases_for_room(&body.room_id).filter_map(std::result::Result::ok) {
-        .rooms
+		services().rooms.alias.set_alias(&alias, &replacement_room)?;
-        .alias
-        .local_aliases_for_room(&body.room_id)
-        .filter_map(|r| r.ok())
-    {
-        services()
-            .rooms
-            .alias
-            .set_alias(&alias, &replacement_room)?;
 	}
 
 	// Get the old room power levels
@@ -957,15 +822,15 @@ pub async fn upgrade_room_route(
 	power_levels_event_content.events_default = new_level;
 	power_levels_event_content.invite = new_level;
 
-    // Modify the power levels in the old room to prevent sending of events and inviting new users
+	// Modify the power levels in the old room to prevent sending of events and
+	// inviting new users
 	let _ = services()
 		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
 				event_type: TimelineEventType::RoomPowerLevels,
-                content: to_raw_value(&power_levels_event_content)
+				content: to_raw_value(&power_levels_event_content).expect("event is valid, we just created it"),
-                    .expect("event is valid, we just created it"),
 				unsigned: None,
 				state_key: Some("".to_owned()),
 				redacts: None,
@@ -979,5 +844,7 @@ pub async fn upgrade_room_route(
 	drop(state_lock);
 
 	// Return the replacement room id
-    Ok(upgrade_room::v3::Response { replacement_room })
+	Ok(upgrade_room::v3::Response {
+		replacement_room,
+	})
 }

src/api/client_server/search.rs

@@ -1,4 +1,5 @@
-use crate::{services, Error, Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::api::client::{
 	error::ErrorKind,
 	search::search_events::{
@@ -7,28 +8,22 @@ use ruma::api::client::{
 	},
 };
 
-use std::collections::BTreeMap;
+use crate::{services, Error, Result, Ruma};
 
 /// # `POST /_matrix/client/r0/search`
 ///
 /// Searches rooms for messages.
 ///
-/// - Only works if the user is currently joined to the room (TODO: Respect history visibility)
+/// - Only works if the user is currently joined to the room (TODO: Respect
-pub async fn search_events_route(
+///   history visibility)
-    body: Ruma<search_events::v3::Request>,
+pub async fn search_events_route(body: Ruma<search_events::v3::Request>) -> Result<search_events::v3::Response> {
-) -> Result<search_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	let search_criteria = body.search_categories.room_events.as_ref().unwrap();
 	let filter = &search_criteria.filter;
 
 	let room_ids = filter.rooms.clone().unwrap_or_else(|| {
-        services()
+		services().rooms.state_cache.rooms_joined(sender_user).filter_map(std::result::Result::ok).collect()
-            .rooms
-            .state_cache
-            .rooms_joined(sender_user)
-            .filter_map(|r| r.ok())
-            .collect()
 	});
 
 	// Use limit or else 10, with maximum 100
@@ -37,34 +32,21 @@ pub async fn search_events_route(
 	let mut searches = Vec::new();
 
 	for room_id in room_ids {
-        if !services()
+		if !services().rooms.state_cache.is_joined(sender_user, &room_id)? {
-            .rooms
-            .state_cache
-            .is_joined(sender_user, &room_id)?
-        {
 			return Err(Error::BadRequest(
 				ErrorKind::Forbidden,
 				"You don't have permission to view this room.",
 			));
 		}
 
-        if let Some(search) = services()
+		if let Some(search) = services().rooms.search.search_pdus(&room_id, &search_criteria.search_term)? {
-            .rooms
-            .search
-            .search_pdus(&room_id, &search_criteria.search_term)?
-        {
 			searches.push(search.0.peekable());
 		}
 	}
 
 	let skip = match body.next_batch.as_ref().map(|s| s.parse()) {
 		Some(Ok(s)) => s,
-        Some(Err(_)) => {
+		Some(Err(_)) => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid next_batch token.")),
-            return Err(Error::BadRequest(
-                ErrorKind::InvalidParam,
-                "Invalid next_batch token.",
-            ))
-        }
 		None => 0, // Default to the start
 	};
 
@@ -110,7 +92,7 @@ pub async fn search_events_route(
 				result: Some(result),
 			})
 		})
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.skip(skip)
 		.take(limit)
 		.collect();

src/api/client_server/session.rs

@@ -1,11 +1,12 @@
-use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::{services, utils, Error, Result, Ruma};
 use argon2::{PasswordHash, PasswordVerifier};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		session::{
-            get_login_types,
+			get_login_types::{
+				self,
+				v3::{ApplicationServiceLoginType, PasswordLoginType},
+			},
 			login::{
 				self,
 				v3::{DiscoveryInfo, HomeserverInfo},
@@ -19,6 +20,9 @@ use ruma::{
 use serde::Deserialize;
 use tracing::{debug, error, info, warn};
 
+use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
+use crate::{services, utils, Error, Result, Ruma};
+
 #[derive(Debug, Deserialize)]
 struct Claims {
 	sub: String,
@@ -27,27 +31,28 @@ struct Claims {
 
 /// # `GET /_matrix/client/v3/login`
 ///
-/// Get the supported login types of this server. One of these should be used as the `type` field
+/// Get the supported login types of this server. One of these should be used as
-/// when logging in.
+/// the `type` field when logging in.
-pub async fn get_login_types_route(
+pub async fn get_login_types_route(_body: Ruma<get_login_types::v3::Request>) -> Result<get_login_types::v3::Response> {
-    _body: Ruma<get_login_types::v3::Request>,
-) -> Result<get_login_types::v3::Response> {
 	Ok(get_login_types::v3::Response::new(vec![
-        get_login_types::v3::LoginType::Password(Default::default()),
+		get_login_types::v3::LoginType::Password(PasswordLoginType::default()),
-        get_login_types::v3::LoginType::ApplicationService(Default::default()),
+		get_login_types::v3::LoginType::ApplicationService(ApplicationServiceLoginType::default()),
 	]))
 }
 
 /// # `POST /_matrix/client/v3/login`
 ///
-/// Authenticates the user and returns an access token it can use in subsequent requests.
+/// Authenticates the user and returns an access token it can use in subsequent
+/// requests.
 ///
-/// - The user needs to authenticate using their password (or if enabled using a json web token)
+/// - The user needs to authenticate using their password (or if enabled using a
+///   json web token)
 /// - If `device_id` is known: invalidates old access token of that device
 /// - If `device_id` is unknown: creates a new device
 /// - Returns access token that is associated with the user and device
 ///
-/// Note: You can use [`GET /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
+/// Note: You can use [`GET
+/// /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
 pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Response> {
 	// Validate login method
@@ -65,16 +70,19 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 				debug!("Using username from identifier field");
 				user_id.to_lowercase()
 			} else if let Some(user_id) = user {
-                warn!("User \"{}\" is attempting to login with the deprecated \"user\" field at \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is destined to be removed in a future Matrix release.", user_id);
+				warn!(
+					"User \"{}\" is attempting to login with the deprecated \"user\" field at \
+					 \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is \
+					 destined to be removed in a future Matrix release.",
+					user_id
+				);
 				user_id.to_lowercase()
 			} else {
 				warn!("Bad login type: {:?}", &body.login_info);
 				return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
 			};
 
-            let user_id =
+			let user_id = UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
-                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.")
 			})?;
@@ -82,16 +90,10 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 			let hash = services()
 				.users
 				.password_hash(&user_id)?
-                .ok_or(Error::BadRequest(
+				.ok_or(Error::BadRequest(ErrorKind::Forbidden, "Wrong username or password."))?;
-                    ErrorKind::Forbidden,
-                    "Wrong username or password.",
-                ))?;
 
 			if hash.is_empty() {
-                return Err(Error::BadRequest(
+				return Err(Error::BadRequest(ErrorKind::UserDeactivated, "The user has been deactivated"));
-                    ErrorKind::UserDeactivated,
-                    "The user has been deactivated",
-                ));
 			}
 
 			let Ok(parsed_hash) = PasswordHash::new(&hash) else {
@@ -99,29 +101,21 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 				return Err(Error::BadServerResponse("could not hash"));
 			};
 
-            let hash_matches = services()
+			let hash_matches = services().globals.argon.verify_password(password.as_bytes(), &parsed_hash).is_ok();
-                .globals
-                .argon
-                .verify_password(password.as_bytes(), &parsed_hash)
-                .is_ok();
 
 			if !hash_matches {
-                return Err(Error::BadRequest(
+				return Err(Error::BadRequest(ErrorKind::Forbidden, "Wrong username or password."));
-                    ErrorKind::Forbidden,
-                    "Wrong username or password.",
-                ));
 			}
 
 			user_id
-        }
+		},
-        login::v3::LoginInfo::Token(login::v3::Token { token }) => {
+		login::v3::LoginInfo::Token(login::v3::Token {
+			token,
+		}) => {
 			debug!("Got token login type");
 			if let Some(jwt_decoding_key) = services().globals.jwt_decoding_key() {
-                let token = jsonwebtoken::decode::<Claims>(
+				let token =
-                    token,
+					jsonwebtoken::decode::<Claims>(token, jwt_decoding_key, &jsonwebtoken::Validation::default())
-                    jwt_decoding_key,
-                    &jsonwebtoken::Validation::default(),
-                )
 						.map_err(|e| {
 							warn!("Failed to parse JWT token from user logging in: {}", e);
 							Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid.")
@@ -129,19 +123,17 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 
 				let username = token.claims.sub.to_lowercase();
 
-                UserId::parse_with_server_name(username, services().globals.server_name()).map_err(
+				UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
-                    |e| {
 					warn!("Failed to parse username from user logging in: {}", e);
 					Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
-                    },
+				})?
-                )?
 			} else {
 				return Err(Error::BadRequest(
 					ErrorKind::Unknown,
 					"Token login is not supported (server has no jwt decoding key).",
 				));
 			}
-        }
+		},
 		#[allow(deprecated)]
 		login::v3::LoginInfo::ApplicationService(login::v3::ApplicationService {
 			identifier,
@@ -149,79 +141,65 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 		}) => {
 			debug!("Got appservice login type");
 			if !body.from_appservice {
-                info!("User tried logging in as an appservice, but request body is not from a known/registered appservice");
+				info!(
-                return Err(Error::BadRequest(
+					"User tried logging in as an appservice, but request body is not from a known/registered \
-                    ErrorKind::Forbidden,
+					 appservice"
-                    "Forbidden login type.",
+				);
-                ));
+				return Err(Error::BadRequest(ErrorKind::Forbidden, "Forbidden login type."));
 			};
 			let username = if let Some(UserIdentifier::UserIdOrLocalpart(user_id)) = identifier {
 				user_id.to_lowercase()
 			} else if let Some(user_id) = user {
-                warn!("Appservice \"{}\" is attempting to login with the deprecated \"user\" field at \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is destined to be removed in a future Matrix release.", user_id);
+				warn!(
+					"Appservice \"{}\" is attempting to login with the deprecated \"user\" field at \
+					 \"/_matrix/client/v3/login\". conduwuit implements this deprecated behaviour, but this is \
+					 destined to be removed in a future Matrix release.",
+					user_id
+				);
 				user_id.to_lowercase()
 			} else {
 				return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
 			};
 
-            UserId::parse_with_server_name(username, services().globals.server_name()).map_err(
+			UserId::parse_with_server_name(username, services().globals.server_name()).map_err(|e| {
-                |e| {
 				warn!("Failed to parse username from appservice logging in: {}", e);
 				Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+			})?
 		},
-            )?
-        }
 		_ => {
 			warn!("Unsupported or unknown login type: {:?}", &body.login_info);
 			debug!("JSON body: {:?}", &body.json_body);
-            return Err(Error::BadRequest(
+			return Err(Error::BadRequest(ErrorKind::Unknown, "Unsupported or unknown login type."));
-                ErrorKind::Unknown,
+		},
-                "Unsupported or unknown login type.",
-            ));
-        }
 	};
 
 	// Generate new device id if the user didn't specify one
-    let device_id = body
+	let device_id = body.device_id.clone().unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
-        .device_id
-        .clone()
-        .unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
 
 	// Generate a new token for the device
 	let token = utils::random_string(TOKEN_LENGTH);
 
 	// Determine if device_id was provided and exists in the db for this user
 	let device_exists = body.device_id.as_ref().map_or(false, |device_id| {
-        services()
+		services().users.all_device_ids(&user_id).any(|x| x.as_ref().map_or(false, |v| v == device_id))
-            .users
-            .all_device_ids(&user_id)
-            .any(|x| x.as_ref().map_or(false, |v| v == device_id))
 	});
 
 	if device_exists {
 		services().users.set_token(&user_id, &device_id, &token)?;
 	} else {
-        services().users.create_device(
+		services().users.create_device(&user_id, &device_id, &token, body.initial_device_display_name.clone())?;
-            &user_id,
-            &device_id,
-            &token,
-            body.initial_device_display_name.clone(),
-        )?;
 	}
 
 	// send client well-known if specified so the client knows to reconfigure itself
 	let client_discovery_info = DiscoveryInfo::new(HomeserverInfo::new(
-        services()
+		services().globals.well_known_client().to_owned().unwrap_or_else(|| "".to_owned()),
-            .globals
-            .well_known_client()
-            .to_owned()
-            .unwrap_or("".to_owned()),
 	));
 
 	info!("{} logged in", user_id);
 
-    // home_server is deprecated but apparently must still be sent despite it being deprecated over 6 years ago.
+	// home_server is deprecated but apparently must still be sent despite it being
-    // initially i thought this macro was unnecessary, but ruma uses this same macro for the same reason so...
+	// deprecated over 6 years ago. initially i thought this macro was unnecessary,
+	// but ruma uses this same macro for the same reason so...
 	#[allow(deprecated)]
 	Ok(login::v3::Response {
 		user_id,
@@ -245,7 +223,8 @@ pub async fn login_route(body: Ruma<login::v3::Request>) -> Result<login::v3::Re
 /// Log out the current device.
 ///
 /// - Invalidates access token
-/// - Deletes device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
 pub async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3::Response> {
@@ -265,15 +244,15 @@ pub async fn logout_route(body: Ruma<logout::v3::Request>) -> Result<logout::v3:
 /// Log out all devices of this user.
 ///
 /// - Invalidates all access tokens
-/// - Deletes all device metadata (device id, device display name, last seen ip, last seen ts)
+/// - Deletes all device metadata (device id, device display name, last seen ip,
+///   last seen ts)
 /// - Forgets all to-device events
 /// - Triggers device list updates
 ///
-/// Note: This is equivalent to calling [`GET /_matrix/client/r0/logout`](fn.logout_route.html)
+/// Note: This is equivalent to calling [`GET
-/// from each device of this user.
+/// /_matrix/client/r0/logout`](fn.logout_route.html) from each device of this
-pub async fn logout_all_route(
+/// user.
-    body: Ruma<logout_all::v3::Request>,
+pub async fn logout_all_route(body: Ruma<logout_all::v3::Request>) -> Result<logout_all::v3::Response> {
-) -> Result<logout_all::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	for device_id in services().users.all_device_ids(sender_user).flatten() {

src/api/client_server/space.rs

@@ -1,33 +1,44 @@
-use crate::{services, Result, Ruma};
+use std::str::FromStr;
-use ruma::api::client::space::get_hierarchy;
+
+use ruma::{
+	api::client::{error::ErrorKind, space::get_hierarchy},
+	UInt,
+};
+
+use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Ruma};
 
 /// # `GET /_matrix/client/v1/rooms/{room_id}/hierarchy``
 ///
-/// Paginates over the space tree in a depth-first manner to locate child rooms of a given space.
+/// Paginates over the space tree in a depth-first manner to locate child rooms
-pub async fn get_hierarchy_route(
+/// of a given space.
-    body: Ruma<get_hierarchy::v1::Request>,
+pub async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
-) -> Result<get_hierarchy::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let skip = body
+	let limit = body.limit.unwrap_or_else(|| UInt::from(10_u32)).min(UInt::from(100_u32));
-        .from
-        .as_ref()
-        .and_then(|s| s.parse::<usize>().ok())
-        .unwrap_or(0);
 
-    let limit = body.limit.map_or(10, u64::from).min(100) as usize;
+	let max_depth = body.max_depth.unwrap_or_else(|| UInt::from(3_u32)).min(UInt::from(10_u32));
 
-    let max_depth = body.max_depth.map_or(3, u64::from).min(10) as usize + 1; // +1 to skip the space room itself
+	let key = body.from.as_ref().and_then(|s| PagnationToken::from_str(s).ok());
+
+	// Should prevent unexpeded behaviour in (bad) clients
+	if let Some(ref token) = key {
+		if token.suggested_only != body.suggested_only || token.max_depth != max_depth {
+			return Err(Error::BadRequest(
+				ErrorKind::InvalidParam,
+				"suggested_only and max_depth cannot change on paginated requests",
+			));
+		}
+	}
 
 	services()
 		.rooms
 		.spaces
-        .get_hierarchy(
+		.get_client_hierarchy(
 			sender_user,
 			&body.room_id,
-            limit,
+			u64::from(limit) as usize,
-            skip,
+			key.map_or(0, |token| u64::from(token.skip) as usize),
-            max_depth,
+			u64::from(max_depth) as usize,
 			body.suggested_only,
 		)
 		.await

src/api/client_server/state.rs

@@ -1,25 +1,25 @@
 use std::sync::Arc;
 
-use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma, RumaResponse};
 use ruma::{
 	api::client::{
 		error::ErrorKind,
 		state::{get_state_events, get_state_events_for_key, send_state_event},
 	},
-    events::{
+	events::{room::canonical_alias::RoomCanonicalAliasEventContent, AnyStateEventContent, StateEventType},
-        room::canonical_alias::RoomCanonicalAliasEventContent, AnyStateEventContent, StateEventType,
-    },
 	serde::Raw,
 	EventId, RoomId, UserId,
 };
 use tracing::{error, log::warn};
 
+use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma, RumaResponse};
+
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}`
 ///
 /// Sends a state event into the room.
 ///
 /// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
+/// - Tries to send the event into the room, auth rules will determine if it is
+///   allowed
 /// - If event is new canonical_alias: Rejects if alias is incorrect
 pub async fn send_state_event_for_key_route(
 	body: Ruma<send_state_event::v3::Request>,
@@ -31,12 +31,14 @@ pub async fn send_state_event_for_key_route(
 		&body.room_id,
 		&body.event_type,
 		&body.body.body, // Yes, I hate it too
-        body.state_key.to_owned(),
+		body.state_key.clone(),
 	)
 	.await?;
 
 	let event_id = (*event_id).to_owned();
-    Ok(send_state_event::v3::Response { event_id })
+	Ok(send_state_event::v3::Response {
+		event_id,
+	})
 }
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}`
@@ -44,7 +46,8 @@ pub async fn send_state_event_for_key_route(
 /// Sends a state event into the room.
 ///
 /// - The only requirement for the content is that it has to be valid json
-/// - Tries to send the event into the room, auth rules will determine if it is allowed
+/// - Tries to send the event into the room, auth rules will determine if it is
+///   allowed
 /// - If event is new canonical_alias: Rejects if alias is incorrect
 pub async fn send_state_event_for_empty_key_route(
 	body: Ruma<send_state_event::v3::Request>,
@@ -53,10 +56,7 @@ pub async fn send_state_event_for_empty_key_route(
 
 	// Forbid m.room.encryption if encryption is disabled
 	if body.event_type == StateEventType::RoomEncryption && !services().globals.allow_encryption() {
-        return Err(Error::BadRequest(
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "Encryption has been disabled"));
-            ErrorKind::Forbidden,
-            "Encryption has been disabled",
-        ));
 	}
 
 	let event_id = send_state_event_for_key_helper(
@@ -64,29 +64,29 @@ pub async fn send_state_event_for_empty_key_route(
 		&body.room_id,
 		&body.event_type.to_string().into(),
 		&body.body.body,
-        body.state_key.to_owned(),
+		body.state_key.clone(),
 	)
 	.await?;
 
 	let event_id = (*event_id).to_owned();
-    Ok(send_state_event::v3::Response { event_id }.into())
+	Ok(send_state_event::v3::Response {
+		event_id,
+	}
+	.into())
 }
 
-/// # `GET /_matrix/client/r0/rooms/{roomid}/state`
+/// # `GET /_matrix/client/v3/rooms/{roomid}/state`
 ///
 /// Get all state events for a room.
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 pub async fn get_state_events_route(
 	body: Ruma<get_state_events::v3::Request>,
 ) -> Result<get_state_events::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().rooms.state_accessor.user_can_see_state_events(sender_user, &body.room_id)? {
-        .rooms
-        .state_accessor
-        .user_can_see_state_events(sender_user, &body.room_id)?
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view the room state.",
@@ -108,42 +108,31 @@ pub async fn get_state_events_route(
 /// # `GET /_matrix/client/v3/rooms/{roomid}/state/{eventType}/{stateKey}`
 ///
 /// Get single state event of a room with the specified state key.
-/// The optional query parameter `?format=event|content` allows returning the full room state event
+/// The optional query parameter `?format=event|content` allows returning the
-/// or just the state event's content (default behaviour)
+/// full room state event or just the state event's content (default behaviour)
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 pub async fn get_state_events_for_key_route(
 	body: Ruma<get_state_events_for_key::v3::Request>,
 ) -> Result<get_state_events_for_key::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().rooms.state_accessor.user_can_see_state_events(sender_user, &body.room_id)? {
-        .rooms
-        .state_accessor
-        .user_can_see_state_events(sender_user, &body.room_id)?
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view the room state.",
 		));
 	}
 
-    let event = services()
+	let event =
-        .rooms
+		services().rooms.state_accessor.room_state_get(&body.room_id, &body.event_type, &body.state_key)?.ok_or_else(
-        .state_accessor
+			|| {
-        .room_state_get(&body.room_id, &body.event_type, &body.state_key)?
+				warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
-        .ok_or_else(|| {
-            warn!(
-                "State event {:?} not found in room {:?}",
-                &body.event_type, &body.room_id
-            );
 				Error::BadRequest(ErrorKind::NotFound, "State event not found.")
-        })?;
+			},
-    if body
+		)?;
-        .format
+	if body.format.as_ref().is_some_and(|f| f.to_lowercase().eq("event")) {
-        .as_ref()
-        .is_some_and(|f| f.to_lowercase().eq("event"))
-    {
 		Ok(get_state_events_for_key::v3::Response {
 			content: None,
 			event: serde_json::from_str(event.to_state_event().json().get()).map_err(|e| {
@@ -165,43 +154,30 @@ pub async fn get_state_events_for_key_route(
 /// # `GET /_matrix/client/v3/rooms/{roomid}/state/{eventType}`
 ///
 /// Get single state event of a room.
-/// The optional query parameter `?format=event|content` allows returning the full room state event
+/// The optional query parameter `?format=event|content` allows returning the
-/// or just the state event's content (default behaviour)
+/// full room state event or just the state event's content (default behaviour)
 ///
-/// - If not joined: Only works if current room history visibility is world readable
+/// - If not joined: Only works if current room history visibility is world
+///   readable
 pub async fn get_state_events_for_empty_key_route(
 	body: Ruma<get_state_events_for_key::v3::Request>,
 ) -> Result<RumaResponse<get_state_events_for_key::v3::Response>> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().rooms.state_accessor.user_can_see_state_events(sender_user, &body.room_id)? {
-        .rooms
-        .state_accessor
-        .user_can_see_state_events(sender_user, &body.room_id)?
-    {
 		return Err(Error::BadRequest(
 			ErrorKind::Forbidden,
 			"You don't have permission to view the room state.",
 		));
 	}
 
-    let event = services()
+	let event =
-        .rooms
+		services().rooms.state_accessor.room_state_get(&body.room_id, &body.event_type, "")?.ok_or_else(|| {
-        .state_accessor
+			warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
-        .room_state_get(&body.room_id, &body.event_type, "")?
-        .ok_or_else(|| {
-            warn!(
-                "State event {:?} not found in room {:?}",
-                &body.event_type, &body.room_id
-            );
 			Error::BadRequest(ErrorKind::NotFound, "State event not found.")
 		})?;
 
-    if body
+	if body.format.as_ref().is_some_and(|f| f.to_lowercase().eq("event")) {
-        .format
-        .as_ref()
-        .is_some_and(|f| f.to_lowercase().eq("event"))
-    {
 		Ok(get_state_events_for_key::v3::Response {
 			content: None,
 			event: serde_json::from_str(event.to_state_event().json().get()).map_err(|e| {
@@ -223,19 +199,13 @@ pub async fn get_state_events_for_empty_key_route(
 }
 
 async fn send_state_event_for_key_helper(
-    sender: &UserId,
+	sender: &UserId, room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>, state_key: String,
-    room_id: &RoomId,
-    event_type: &StateEventType,
-    json: &Raw<AnyStateEventContent>,
-    state_key: String,
 ) -> Result<Arc<EventId>> {
 	let sender_user = sender;
 
-    // TODO: Review this check, error if event is unparsable, use event type, allow alias if it
+	// TODO: Review this check, error if event is unparsable, use event type, allow
-    // previously existed
+	// alias if it previously existed
-    if let Ok(canonical_alias) =
+	if let Ok(canonical_alias) = serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get()) {
-        serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get())
-    {
 		let mut aliases = canonical_alias.alt_aliases.clone();
 
 		if let Some(alias) = canonical_alias.alias {
@@ -253,22 +223,14 @@ async fn send_state_event_for_key_helper(
 			{
 				return Err(Error::BadRequest(
 					ErrorKind::Forbidden,
-                    "You are only allowed to send canonical_alias \
+					"You are only allowed to send canonical_alias events when it's aliases already exists",
-                    events when it's aliases already exists",
 				));
 			}
 		}
 	}
 
-    let mutex_state = Arc::clone(
+	let mutex_state =
-        services()
+		Arc::clone(services().globals.roomid_mutex_state.write().await.entry(room_id.to_owned()).or_default());
-            .globals
-            .roomid_mutex_state
-            .write()
-            .unwrap()
-            .entry(room_id.to_owned())
-            .or_default(),
-    );
 	let state_lock = mutex_state.lock().await;
 
 	let event_id = services()

src/api/client_server/tag.rs

@@ -1,4 +1,5 @@
-use crate::{services, Error, Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::{
 	api::client::tag::{create_tag, delete_tag, get_tags},
 	events::{
@@ -6,29 +7,21 @@ use ruma::{
 		RoomAccountDataEventType,
 	},
 };
-use std::collections::BTreeMap;
+
+use crate::{services, Error, Result, Ruma};
 
 /// # `PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}`
 ///
 /// Adds a tag to the room.
 ///
 /// - Inserts the tag into the tag event of the room account data.
-pub async fn update_tag_route(
+pub async fn update_tag_route(body: Ruma<create_tag::v3::Request>) -> Result<create_tag::v3::Response> {
-    body: Ruma<create_tag::v3::Request>,
-) -> Result<create_tag::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let event = services().account_data.get(
+	let event = services().account_data.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
 
 	let mut tags_event = event
-        .map(|e| {
+		.map(|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")))
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
 		.unwrap_or_else(|| {
 			Ok(TagEvent {
 				content: TagEventContent {
@@ -37,10 +30,7 @@ pub async fn update_tag_route(
 			})
 		})?;
 
-    tags_event
+	tags_event.content.tags.insert(body.tag.clone().into(), body.tag_info.clone());
-        .content
-        .tags
-        .insert(body.tag.clone().into(), body.tag_info.clone());
 
 	services().account_data.update(
 		Some(&body.room_id),
@@ -57,22 +47,13 @@ pub async fn update_tag_route(
 /// Deletes a tag from the room.
 ///
 /// - Removes the tag from the tag event of the room account data.
-pub async fn delete_tag_route(
+pub async fn delete_tag_route(body: Ruma<delete_tag::v3::Request>) -> Result<delete_tag::v3::Response> {
-    body: Ruma<delete_tag::v3::Request>,
-) -> Result<delete_tag::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let event = services().account_data.get(
+	let event = services().account_data.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
 
 	let mut tags_event = event
-        .map(|e| {
+		.map(|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")))
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
 		.unwrap_or_else(|| {
 			Ok(TagEvent {
 				content: TagEventContent {
@@ -101,17 +82,10 @@ pub async fn delete_tag_route(
 pub async fn get_tags_route(body: Ruma<get_tags::v3::Request>) -> Result<get_tags::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    let event = services().account_data.get(
+	let event = services().account_data.get(Some(&body.room_id), sender_user, RoomAccountDataEventType::Tag)?;
-        Some(&body.room_id),
-        sender_user,
-        RoomAccountDataEventType::Tag,
-    )?;
 
 	let tags_event = event
-        .map(|e| {
+		.map(|e| serde_json::from_str(e.get()).map_err(|_| Error::bad_database("Invalid account data event in db.")))
-            serde_json::from_str(e.get())
-                .map_err(|_| Error::bad_database("Invalid account data event in db."))
-        })
 		.unwrap_or_else(|| {
 			Ok(TagEvent {
 				content: TagEventContent {

src/api/client_server/thirdparty.rs

@@ -1,14 +1,13 @@
-use crate::{Result, Ruma};
+use std::collections::BTreeMap;
+
 use ruma::api::client::thirdparty::get_protocols;
 
-use std::collections::BTreeMap;
+use crate::{Result, Ruma};
 
 /// # `GET /_matrix/client/r0/thirdparty/protocols`
 ///
 /// TODO: Fetches all metadata about protocols supported by the homeserver.
-pub async fn get_protocols_route(
+pub async fn get_protocols_route(_body: Ruma<get_protocols::v3::Request>) -> Result<get_protocols::v3::Response> {
-    _body: Ruma<get_protocols::v3::Request>,
-) -> Result<get_protocols::v3::Response> {
 	// TODO
 	Ok(get_protocols::v3::Response {
 		protocols: BTreeMap::new(),

src/api/client_server/threads.rs

@@ -3,21 +3,14 @@ use ruma::api::client::{error::ErrorKind, threads::get_threads};
 use crate::{services, Error, Result, Ruma};
 
 /// # `GET /_matrix/client/r0/rooms/{roomId}/threads`
-pub async fn get_threads_route(
+pub async fn get_threads_route(body: Ruma<get_threads::v1::Request>) -> Result<get_threads::v1::Response> {
-    body: Ruma<get_threads::v1::Request>,
-) -> Result<get_threads::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
 	// Use limit or else 10, with maximum 100
-    let limit = body
+	let limit = body.limit.and_then(|l| l.try_into().ok()).unwrap_or(10).min(100);
-        .limit
-        .and_then(|l| l.try_into().ok())
-        .unwrap_or(10)
-        .min(100);
 
 	let from = if let Some(from) = &body.from {
-        from.parse()
+		from.parse().map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, ""))?
-            .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, ""))?
 	} else {
 		u64::MAX
 	};
@@ -27,7 +20,7 @@ pub async fn get_threads_route(
 		.threads
 		.threads_until(sender_user, &body.room_id, from, &body.include)?
 		.take(limit)
-        .filter_map(|r| r.ok())
+		.filter_map(std::result::Result::ok)
 		.filter(|(_, pdu)| {
 			services()
 				.rooms
@@ -40,10 +33,7 @@ pub async fn get_threads_route(
 	let next_batch = threads.last().map(|(count, _)| count.to_string());
 
 	Ok(get_threads::v1::Response {
-        chunk: threads
+		chunk: threads.into_iter().map(|(_, pdu)| pdu.to_room_event()).collect(),
-            .into_iter()
-            .map(|(_, pdu)| pdu.to_room_event())
-            .collect(),
 		next_batch,
 	})
 }

src/api/client_server/to_device.rs

@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 
-use crate::{services, Error, Result, Ruma};
 use ruma::{
 	api::{
 		client::{error::ErrorKind, to_device::send_event_to_device},
@@ -9,6 +8,8 @@ use ruma::{
 	to_device::DeviceIdOrAllDevices,
 };
 
+use crate::{services, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
 /// Send a to-device event to a set of client devices.
@@ -19,11 +20,7 @@ pub async fn send_event_to_device_route(
 	let sender_device = body.sender_device.as_deref();
 
 	// Check if this is a new transaction id
-    if services()
+	if services().transaction_ids.existing_txnid(sender_user, sender_device, &body.txn_id)?.is_some() {
-        .transaction_ids
-        .existing_txnid(sender_user, sender_device, &body.txn_id)?
-        .is_some()
-    {
 		return Ok(send_event_to_device::v3::Response {});
 	}
 
@@ -38,14 +35,12 @@ pub async fn send_event_to_device_route(
 
 				services().sending.send_reliable_edu(
 					target_user_id.server_name(),
-                    serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(
+					serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(DirectDeviceContent {
-                        DirectDeviceContent {
 						sender: sender_user.clone(),
 						ev_type: body.event_type.clone(),
 						message_id: count.to_string().into(),
 						messages,
-                        },
+					}))
-                    ))
 					.expect("DirectToDevice EDU can be serialized"),
 					count,
 				)?;
@@ -60,11 +55,11 @@ pub async fn send_event_to_device_route(
 						target_user_id,
 						target_device_id,
 						&body.event_type.to_string(),
-                        event.deserialize_as().map_err(|_| {
+						event
-                            Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
+							.deserialize_as()
-                        })?,
+							.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid"))?,
-                    )?
+					)?;
-                }
+				},
 
 				DeviceIdOrAllDevices::AllDevices => {
 					for target_device_id in services().users.all_device_ids(target_user_id) {
@@ -73,20 +68,18 @@ pub async fn send_event_to_device_route(
 							target_user_id,
 							&target_device_id?,
 							&body.event_type.to_string(),
-                            event.deserialize_as().map_err(|_| {
+							event
-                                Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
+								.deserialize_as()
-                            })?,
+								.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid"))?,
 						)?;
 					}
-                }
+				},
 			}
 		}
 	}
 
 	// Save transaction id with empty data
-    services()
+	services().transaction_ids.add_txnid(sender_user, sender_device, &body.txn_id, &[])?;
-        .transaction_ids
-        .add_txnid(sender_user, sender_device, &body.txn_id, &[])?;
 
 	Ok(send_event_to_device::v3::Response {})
 }

src/api/client_server/typing.rs

@@ -1,6 +1,7 @@
-use crate::{services, utils, Error, Result, Ruma};
 use ruma::api::client::{error::ErrorKind, typing::create_typing_event};
 
+use crate::{services, utils, Error, Result, Ruma};
+
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
 /// Sets the typing state of the sender user.
@@ -11,29 +12,23 @@ pub async fn create_typing_event_route(
 
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    if !services()
+	if !services().rooms.state_cache.is_joined(sender_user, &body.room_id)? {
-        .rooms
+		return Err(Error::BadRequest(ErrorKind::Forbidden, "You are not in this room."));
-        .state_cache
-        .is_joined(sender_user, &body.room_id)?
-    {
-        return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
-            "You are not in this room.",
-        ));
 	}
 
 	if let Typing::Yes(duration) = body.state {
-        services().rooms.edus.typing.typing_add(
-            sender_user,
-            &body.room_id,
-            duration.as_millis() as u64 + utils::millis_since_unix_epoch(),
-        )?;
-    } else {
 		services()
 			.rooms
 			.edus
 			.typing
-            .typing_remove(sender_user, &body.room_id)?;
+			.typing_add(
+				sender_user,
+				&body.room_id,
+				duration.as_millis() as u64 + utils::millis_since_unix_epoch(),
+			)
+			.await?;
+	} else {
+		services().rooms.edus.typing.typing_remove(sender_user, &body.room_id).await?;
 	}
 
 	Ok(create_typing_event::v3::Response {})

src/api/client_server/unversioned.rs

@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, iter::FromIterator};
+use std::collections::BTreeMap;
 
 use axum::{response::IntoResponse, Json};
 use ruma::api::client::{discovery::get_supported_versions, error::ErrorKind};
@@ -7,14 +7,16 @@ use crate::{services, Error, Result, Ruma};
 
 /// # `GET /_matrix/client/versions`
 ///
-/// Get the versions of the specification and unstable features supported by this server.
+/// Get the versions of the specification and unstable features supported by
+/// this server.
 ///
 /// - Versions take the form MAJOR.MINOR.PATCH
 /// - Only the latest PATCH release will be reported for each MAJOR.MINOR value
-/// - Unstable features are namespaced and may include version information in their name
+/// - Unstable features are namespaced and may include version information in
+///   their name
 ///
-/// Note: Unstable features are used while developing new features. Clients should avoid using
+/// Note: Unstable features are used while developing new features. Clients
-/// unstable features in their stable releases
+/// should avoid using unstable features in their stable releases
 pub async fn get_supported_versions_route(
 	_body: Ruma<get_supported_versions::Request>,
 ) -> Result<get_supported_versions::Response> {
@@ -60,8 +62,8 @@ pub async fn well_known_client_route() -> Result<impl IntoResponse> {
 
 /// # `GET /client/server.json`
 ///
-/// Endpoint provided by sliding sync proxy used by some clients such as Element Web
+/// Endpoint provided by sliding sync proxy used by some clients such as Element
-/// as a non-standard health check.
+/// Web as a non-standard health check.
 pub async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 	let server_url = match services().globals.well_known_client() {
 		Some(url) => url.clone(),

src/api/client_server/user_directory.rs

@@ -1,4 +1,3 @@
-use crate::{services, Result, Ruma};
 use ruma::{
 	api::client::user_directory::search_users,
 	events::{
@@ -7,15 +6,16 @@ use ruma::{
 	},
 };
 
+use crate::{services, Result, Ruma};
+
 /// # `POST /_matrix/client/r0/user_directory/search`
 ///
 /// Searches all known users for a match.
 ///
-/// - Hides any local users that aren't in any public rooms (i.e. those that have the join rule set to public)
+/// - Hides any local users that aren't in any public rooms (i.e. those that
+///   have the join rule set to public)
 /// and don't share a room with the sender
-pub async fn search_users_route(
+pub async fn search_users_route(body: Ruma<search_users::v3::Request>) -> Result<search_users::v3::Response> {
-    body: Ruma<search_users::v3::Request>,
-) -> Result<search_users::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 	let limit = u64::from(body.limit) as usize;
 
@@ -29,66 +29,57 @@ pub async fn search_users_route(
 			avatar_url: services().users.avatar_url(&user_id).ok()?,
 		};
 
-        let user_id_matches = user
+		let user_id_matches = user.user_id.to_string().to_lowercase().contains(&body.search_term.to_lowercase());
-            .user_id
-            .to_string()
-            .to_lowercase()
-            .contains(&body.search_term.to_lowercase());
 
 		let user_displayname_matches = user
 			.display_name
 			.as_ref()
-            .filter(|name| {
+			.filter(|name| name.to_lowercase().contains(&body.search_term.to_lowercase()))
-                name.to_lowercase()
-                    .contains(&body.search_term.to_lowercase())
-            })
 			.is_some();
 
 		if !user_id_matches && !user_displayname_matches {
 			return None;
 		}
 
-        let user_is_in_public_rooms = services()
+		// It's a matching user, but is the sender allowed to see them?
-            .rooms
+		let mut user_visible = false;
-            .state_cache
+
-            .rooms_joined(&user_id)
+		let user_is_in_public_rooms =
-            .filter_map(|r| r.ok())
+			services().rooms.state_cache.rooms_joined(&user_id).filter_map(std::result::Result::ok).any(|room| {
-            .any(|room| {
+				services().rooms.state_accessor.room_state_get(&room, &StateEventType::RoomJoinRules, "").map_or(
-                services()
+					false,
-                    .rooms
+					|event| {
-                    .state_accessor
-                    .room_state_get(&room, &StateEventType::RoomJoinRules, "")
-                    .map_or(false, |event| {
 						event.map_or(false, |event| {
 							serde_json::from_str(event.content.get())
-                                .map_or(false, |r: RoomJoinRulesEventContent| {
+								.map_or(false, |r: RoomJoinRulesEventContent| r.join_rule == JoinRule::Public)
-                                    r.join_rule == JoinRule::Public
-                                })
-                        })
 						})
+					},
+				)
 			});
 
 		if user_is_in_public_rooms {
-            return Some(user);
+			user_visible = true;
-        }
+		} else {
-
+			let user_is_in_shared_rooms =
-        let user_is_in_shared_rooms = services()
+				services().rooms.user.get_shared_rooms(vec![sender_user.clone(), user_id]).ok()?.next().is_some();
-            .rooms
-            .user
-            .get_shared_rooms(vec![sender_user.clone(), user_id])
-            .ok()?
-            .next()
-            .is_some();
 
 			if user_is_in_shared_rooms {
-            return Some(user);
+				user_visible = true;
+			}
 		}
 
-        None
+		if !user_visible {
+			return None;
+		}
+
+		Some(user)
 	});
 
 	let results = users.by_ref().take(limit).collect();
 	let limited = users.next().is_some();
 
-    Ok(search_users::v3::Response { results, limited })
+	Ok(search_users::v3::Response {
+		results,
+		limited,
+	})
 }

src/api/client_server/voip.rs

@@ -1,9 +1,11 @@
-use crate::{services, Result, Ruma};
+use std::time::{Duration, SystemTime};
+
 use base64::{engine::general_purpose, Engine as _};
 use hmac::{Hmac, Mac};
 use ruma::{api::client::voip::get_turn_server_info, SecondsSinceUnixEpoch};
 use sha1::Sha1;
-use std::time::{Duration, SystemTime};
+
+use crate::{services, Result, Ruma};
 
 type HmacSha1 = Hmac<Sha1>;
 
@@ -25,8 +27,7 @@ pub async fn turn_server_route(
 
 		let username: String = format!("{}:{}", expiry.get(), sender_user);
 
-        let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes())
+		let mut mac = HmacSha1::new_from_slice(turn_secret.as_bytes()).expect("HMAC can take key of any size");
-            .expect("HMAC can take key of any size");
 		mac.update(username.as_bytes());
 
 		let password: String = general_purpose::STANDARD.encode(mac.finalize().into_bytes());

src/api/ruma_wrapper/axum.rs

@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, iter::FromIterator, str};
+use std::{collections::BTreeMap, str};
 
 use axum::{
 	async_trait,
@@ -39,22 +39,21 @@ where
 {
 	type Rejection = Error;
 
+	#[allow(unused_qualifications)] // async traits
 	async fn from_request(req: Request<B>, _state: &S) -> Result<Self, Self::Rejection> {
 		let (mut parts, mut body) = match req.with_limited_body() {
 			Ok(limited_req) => {
 				let (parts, body) = limited_req.into_parts();
-                let body = to_bytes(body)
+				let body =
-                    .await
+					to_bytes(body).await.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
-                    .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
 				(parts, body)
-            }
+			},
 			Err(original_req) => {
 				let (parts, body) = original_req.into_parts();
-                let body = to_bytes(body)
+				let body =
-                    .await
+					to_bytes(body).await.map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
-                    .map_err(|_| Error::BadRequest(ErrorKind::MissingToken, "Missing token."))?;
 				(parts, body)
-            }
+			},
 		};
 
 		let metadata = T::METADATA;
@@ -66,11 +65,8 @@ where
 			Ok(params) => params,
 			Err(e) => {
 				error!(%query, "Failed to deserialize query parameters: {}", e);
-                return Err(Error::BadRequest(
+				return Err(Error::BadRequest(ErrorKind::Unknown, "Failed to read query parameters"));
-                    ErrorKind::Unknown,
+			},
-                    "Failed to read query parameters",
-                ));
-            }
 		};
 
 		let token = match &auth_header {
@@ -81,14 +77,15 @@ where
 		let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
 
 		let appservices = services().appservice.all().unwrap();
-        let appservice_registration = appservices
+		let appservice_registration =
-            .iter()
+			appservices.iter().find(|(_id, registration)| Some(registration.as_token.as_str()) == token);
-            .find(|(_id, registration)| Some(registration.as_token.as_str()) == token);
 
-        let (sender_user, sender_device, sender_servername, from_appservice) =
+		let (sender_user, sender_device, sender_servername, from_appservice) = if let Some((_id, registration)) =
-            if let Some((_id, registration)) = appservice_registration {
+			appservice_registration
+		{
 			match metadata.authentication {
-                    AuthScheme::AccessToken => {
+				// TODO: verify if just or'ing `AuthScheme::AppserviceToken` is correct here
+				AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::AppserviceToken => {
 					let user_id = query_params.user_id.map_or_else(
 						|| {
 							UserId::parse_with_server_name(
@@ -100,16 +97,13 @@ where
 						|s| UserId::parse(s).unwrap(),
 					);
 
-                        if !services().users.exists(&user_id).unwrap() {
+					if !services().users.exists(&user_id)? {
-                            return Err(Error::BadRequest(
+						return Err(Error::BadRequest(ErrorKind::Forbidden, "User does not exist."));
-                                ErrorKind::Forbidden,
-                                "User does not exist.",
-                            ));
 					}
 
 					// TODO: Check if appservice is allowed to be that user
 					(Some(user_id), None, None, true)
-                    }
+				},
 				AuthScheme::ServerSignatures => (None, None, None, true),
 				AuthScheme::None => (None, None, None, true),
 			}
@@ -118,92 +112,89 @@ where
 				AuthScheme::AccessToken => {
 					let token = match token {
 						Some(token) => token,
-                            _ => {
+						_ => return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token.")),
-                                return Err(Error::BadRequest(
-                                    ErrorKind::MissingToken,
-                                    "Missing access token.",
-                                ))
-                            }
 					};
 
-                        match services().users.find_from_token(token).unwrap() {
+					match services().users.find_from_token(token)? {
 						None => {
 							return Err(Error::BadRequest(
-                                    ErrorKind::UnknownToken { soft_logout: false },
+								ErrorKind::UnknownToken {
+									soft_logout: false,
+								},
 								"Unknown access token.",
 							))
+						},
+						Some((user_id, device_id)) => {
+							(Some(user_id), Some(OwnedDeviceId::from(device_id)), None, false)
+						},
 					}
-                            Some((user_id, device_id)) => (
+				},
-                                Some(user_id),
+				AuthScheme::AccessTokenOptional => {
-                                Some(OwnedDeviceId::from(device_id)),
+					let token = token.unwrap_or("");
-                                None,
+
-                                false,
+					if token.is_empty() {
-                            ),
+						(None, None, None, false)
+					} else {
+						match services().users.find_from_token(token)? {
+							None => {
+								return Err(Error::BadRequest(
+									ErrorKind::UnknownToken {
+										soft_logout: false,
+									},
+									"Unknown access token.",
+								))
+							},
+							Some((user_id, device_id)) => {
+								(Some(user_id), Some(OwnedDeviceId::from(device_id)), None, false)
+							},
 						}
 					}
+				},
+				// treat non-appservice registrations as None authentication
+				AuthScheme::AppserviceToken => (None, None, None, false),
 				AuthScheme::ServerSignatures => {
-                        let TypedHeader(Authorization(x_matrix)) = parts
+					if !services().globals.allow_federation() {
-                            .extract::<TypedHeader<Authorization<XMatrix>>>()
+						return Err(Error::bad_config("Federation is disabled."));
-                            .await
+					}
-                            .map_err(|e| {
+
+					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 => {
+								TypedHeaderRejectionReason::Missing => "Missing Authorization header.",
-                                        "Missing Authorization header."
+								TypedHeaderRejectionReason::Error(_) => "Invalid X-Matrix signatures.",
-                                    }
-                                    TypedHeaderRejectionReason::Error(_) => {
-                                        "Invalid X-Matrix signatures."
-                                    }
 								_ => "Unknown header-related error",
 							};
 
 							Error::BadRequest(ErrorKind::Forbidden, msg)
 						})?;
 
-                        let origin_signatures = BTreeMap::from_iter([(
+					let origin_signatures =
-                            x_matrix.key.clone(),
+						BTreeMap::from_iter([(x_matrix.key.clone(), CanonicalJsonValue::String(x_matrix.sig))]);
-                            CanonicalJsonValue::String(x_matrix.sig),
-                        )]);
 
 					let signatures = BTreeMap::from_iter([(
 						x_matrix.origin.as_str().to_owned(),
 						CanonicalJsonValue::Object(origin_signatures),
 					)]);
 
-                        let server_destination =
+					let server_destination = services().globals.server_name().as_str().to_owned();
-                            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(
+							return Err(Error::BadRequest(ErrorKind::Forbidden, "Invalid authorization."));
-                                    ErrorKind::Forbidden,
-                                    "Invalid authorization.",
-                                ));
 						}
 					}
 
 					let mut request_map = BTreeMap::from_iter([
-                            (
+						("method".to_owned(), CanonicalJsonValue::String(parts.method.to_string())),
-                                "method".to_owned(),
+						("uri".to_owned(), CanonicalJsonValue::String(parts.uri.to_string())),
-                                CanonicalJsonValue::String(parts.method.to_string()),
-                            ),
-                            (
-                                "uri".to_owned(),
-                                CanonicalJsonValue::String(parts.uri.to_string()),
-                            ),
 						(
 							"origin".to_owned(),
 							CanonicalJsonValue::String(x_matrix.origin.as_str().to_owned()),
 						),
-                            (
+						("destination".to_owned(), CanonicalJsonValue::String(server_destination)),
-                                "destination".to_owned(),
+						("signatures".to_owned(), CanonicalJsonValue::Object(signatures)),
-                                CanonicalJsonValue::String(server_destination),
-                            ),
-                            (
-                                "signatures".to_owned(),
-                                CanonicalJsonValue::Object(signatures),
-                            ),
 					]);
 
 					if let Some(json_body) = &json_body {
@@ -213,25 +204,18 @@ where
 					let keys_result = services()
 						.rooms
 						.event_handler
-                            .fetch_signing_keys_for_server(
+						.fetch_signing_keys_for_server(&x_matrix.origin, vec![x_matrix.key.clone()])
-                                &x_matrix.origin,
-                                vec![x_matrix.key.to_owned()],
-                            )
 						.await;
 
 					let keys = match keys_result {
 						Ok(b) => b,
 						Err(e) => {
 							warn!("Failed to fetch signing keys: {}", e);
-                                return Err(Error::BadRequest(
+							return Err(Error::BadRequest(ErrorKind::Forbidden, "Failed to fetch signing keys."));
-                                    ErrorKind::Forbidden,
+						},
-                                    "Failed to fetch signing keys.",
-                                ));
-                            }
 					};
 
-                        let pub_key_map =
+					let pub_key_map = BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);
-                            BTreeMap::from_iter([(x_matrix.origin.as_str().to_owned(), keys)]);
 
 					match ruma::signatures::verify_json(&pub_key_map, &request_map) {
 						Ok(()) => (None, None, Some(x_matrix.origin), false),
@@ -243,9 +227,8 @@ where
 
 							if parts.uri.to_string().contains('@') {
 								warn!(
-                                        "Request uri contained '@' character. Make sure your \
+									"Request uri contained '@' character. Make sure your reverse proxy gives Conduit \
-                                         reverse proxy gives Conduit the raw uri (apache: use \
+									 the raw uri (apache: use nocanon)"
-                                         nocanon)"
 								);
 							}
 
@@ -253,57 +236,46 @@ where
 								ErrorKind::Forbidden,
 								"Failed to verify X-Matrix signatures.",
 							));
+						},
 					}
-                        }
+				},
-                    }
 				AuthScheme::None => match parts.uri.path() {
 					// allow_public_room_directory_without_auth
 					"/_matrix/client/v3/publicRooms" | "/_matrix/client/r0/publicRooms" => {
-                            if !services()
+						if !services().globals.config.allow_public_room_directory_without_auth {
-                                .globals
-                                .config
-                                .allow_public_room_directory_without_auth
-                            {
 							let token = match token {
 								Some(token) => token,
-                                    _ => {
+								_ => return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token.")),
-                                        return Err(Error::BadRequest(
-                                            ErrorKind::MissingToken,
-                                            "Missing access token.",
-                                        ))
-                                    }
 							};
 
-                                match services().users.find_from_token(token).unwrap() {
+							match services().users.find_from_token(token)? {
 								None => {
 									return Err(Error::BadRequest(
-                                            ErrorKind::UnknownToken { soft_logout: false },
+										ErrorKind::UnknownToken {
+											soft_logout: false,
+										},
 										"Unknown access token.",
 									))
-                                    }
+								},
-                                    Some((user_id, device_id)) => (
+								Some((user_id, device_id)) => {
-                                        Some(user_id),
+									(Some(user_id), Some(OwnedDeviceId::from(device_id)), None, false)
-                                        Some(OwnedDeviceId::from(device_id)),
+								},
-                                        None,
-                                        false,
-                                    ),
 							}
 						} else {
 							(None, None, None, false)
 						}
-                        }
+					},
 					_ => (None, None, None, false),
 				},
 			}
 		};
 
-        let mut http_request = http::Request::builder().uri(parts.uri).method(parts.method);
+		let mut http_request = Request::builder().uri(parts.uri).method(parts.method);
 		*http_request.headers_mut().unwrap() = parts.headers;
 
 		if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {
 			let user_id = sender_user.clone().unwrap_or_else(|| {
-                UserId::parse_with_server_name("", services().globals.server_name())
+				UserId::parse_with_server_name("", services().globals.server_name()).expect("we know this is valid")
-                    .expect("we know this is valid")
 			});
 
 			let uiaa_request = json_body
@@ -367,9 +339,7 @@ impl Credentials for XMatrix {
 			"HeaderValue to decode should start with \"X-Matrix ..\", received = {value:?}",
 		);
 
-        let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..])
+		let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..]).ok()?.trim_start();
-            .ok()?
-            .trim_start();
 
 		let mut origin = None;
 		let mut destination = None;
@@ -381,10 +351,7 @@ impl Credentials for XMatrix {
 
 			// 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
+			let value = value.strip_prefix('"').and_then(|rest| rest.strip_suffix('"')).unwrap_or(value);
-                .strip_prefix('"')
-                .and_then(|rest| rest.strip_suffix('"'))
-                .unwrap_or(value);
 
 			// FIXME: Catch multiple fields of the same name
 			match name {
@@ -392,10 +359,7 @@ impl Credentials for XMatrix {
 				"key" => key = Some(value.to_owned()),
 				"sig" => sig = Some(value.to_owned()),
 				"destination" => destination = Some(value.to_owned()),
-                _ => debug!(
+				_ => debug!("Unexpected field `{}` in X-Matrix Authorization header", name),
-                    "Unexpected field `{}` in X-Matrix Authorization header",
-                    name
-                ),
 			}
 		}
 
@@ -407,9 +371,7 @@ impl Credentials for XMatrix {
 		})
 	}
 
-    fn encode(&self) -> http::HeaderValue {
+	fn encode(&self) -> http::HeaderValue { todo!() }
-        todo!()
-    }
 }
 
 impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {

src/api/ruma_wrapper/mod.rs

@@ -1,10 +1,9 @@
-use crate::Error;
-use ruma::{
-    api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName,
-    OwnedUserId,
-};
 use std::ops::Deref;
 
+use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId};
+
+use crate::Error;
+
 #[cfg(feature = "conduit_bin")]
 mod axum;
 
@@ -22,22 +21,16 @@ pub struct Ruma<T> {
 impl<T> Deref for Ruma<T> {
 	type Target = T;
 
-    fn deref(&self) -> &Self::Target {
+	fn deref(&self) -> &Self::Target { &self.body }
-        &self.body
-    }
 }
 
 #[derive(Clone)]
 pub struct RumaResponse<T>(pub T);
 
 impl<T> From<T> for RumaResponse<T> {
-    fn from(t: T) -> Self {
+	fn from(t: T) -> Self { Self(t) }
-        Self(t)
-    }
 }
 
 impl From<Error> for RumaResponse<UiaaResponse> {
-    fn from(t: Error) -> Self {
+	fn from(t: Error) -> Self { t.to_response() }
-        t.to_response()
-    }
 }

src/clap.rs

@@ -0,0 +1,54 @@
+//! Integration with `clap`
+
+use std::path::PathBuf;
+
+use clap::{Parser, Subcommand};
+
+/// Commandline arguments
+#[derive(Parser, Debug)]
+#[clap(version, about, long_about = None)]
+pub struct Args {
+	#[arg(short, long)]
+	/// Optional argument to the path of a conduwuit config TOML file
+	pub config: Option<PathBuf>,
+
+	#[clap(subcommand)]
+	/// Optional subcommand to export the homeserver signing key and exit
+	pub signing_key: Option<SigningKey>,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum SigningKey {
+	/// Filesystem path to export the homeserver signing key to.
+	/// The output will be: `ed25519 <version> <keypair base64 encoded>` which
+	/// is Synapse's format
+	ExportPath {
+		path: PathBuf,
+	},
+
+	/// Filesystem path for conduwuit to attempt to read and import the
+	/// homeserver signing key. The expected format is Synapse's format:
+	/// `ed25519 <version> <keypair base64 encoded>`
+	ImportPath {
+		path: PathBuf,
+
+		#[arg(long)]
+		/// Optional argument to import the key but don't overwrite our signing
+		/// key, and instead add it to `old_verify_keys`. This field tells other
+		/// servers that this is our old public key that can still be used to
+		/// sign old events.
+		///
+		/// See https://spec.matrix.org/v1.9/server-server-api/#get_matrixkeyv2server for more details.
+		add_to_old_public_keys: bool,
+
+		#[arg(long)]
+		/// Timestamp (`expired_ts`) in seconds since UNIX epoch that the old
+		/// homeserver signing key stopped being used.
+		///
+		/// See https://spec.matrix.org/v1.9/server-server-api/#get_matrixkeyv2server for more details.
+		timestamp: u64,
+	},
+}
+
+/// Parse commandline arguments into structured data
+pub fn parse() -> Args { Args::parse() }

src/config/mod.rs

@@ -1,21 +1,29 @@
 use std::{
 	collections::BTreeMap,
 	fmt,
+	fmt::Write as _,
 	net::{IpAddr, Ipv4Addr},
 	path::PathBuf,
 };
 
+use either::Either;
 use figment::Figment;
-
 use itertools::Itertools;
 use regex::RegexSet;
 use ruma::{OwnedServerName, RoomVersionId};
 use serde::{de::IgnoredAny, Deserialize};
 use tracing::{debug, error, warn};
 
+use self::proxy::ProxyConfig;
+
 mod proxy;
 
-use self::proxy::ProxyConfig;
+#[derive(Deserialize, Clone, Debug)]
+#[serde(transparent)]
+pub struct ListeningPort {
+	#[serde(with = "either::serde_untagged")]
+	pub ports: Either<u16, Vec<u16>>,
+}
 
 /// all the config options for conduwuit
 #[derive(Clone, Debug, Deserialize)]
@@ -23,9 +31,9 @@ pub struct Config {
 	/// [`IpAddr`] conduwuit will listen on (can be IPv4 or IPv6)
 	#[serde(default = "default_address")]
 	pub address: IpAddr,
-    /// default TCP port conduwuit will listen on
+	/// default TCP port(s) conduwuit will listen on
 	#[serde(default = "default_port")]
-    pub port: u16,
+	pub port: ListeningPort,
 	pub tls: Option<TlsConfig>,
 	pub unix_socket_path: Option<PathBuf>,
 	#[serde(default = "default_unix_socket_perms")]
@@ -36,9 +44,9 @@ pub struct Config {
 	pub database_path: String,
 	#[serde(default = "default_db_cache_capacity_mb")]
 	pub db_cache_capacity_mb: f64,
-    #[serde(default = "true_fn")]
+	#[serde(default = "default_new_user_displayname_suffix")]
-    pub enable_lightning_bolt: bool,
+	pub new_user_displayname_suffix: String,
-    #[serde(default = "true_fn")]
+	#[serde(default)]
 	pub allow_check_for_updates: bool,
 	#[serde(default = "default_conduit_cache_capacity_modifier")]
 	pub conduit_cache_capacity_modifier: f64,
@@ -84,6 +92,8 @@ pub struct Config {
 	pub jwt_secret: Option<String>,
 	#[serde(default = "default_trusted_servers")]
 	pub trusted_servers: Vec<OwnedServerName>,
+	#[serde(default = "true_fn")]
+	pub query_trusted_key_servers_first: bool,
 	#[serde(default = "default_log")]
 	pub log: String,
 	#[serde(default)]
@@ -105,6 +115,18 @@ pub struct Config {
 	pub rocksdb_log_time_to_roll: usize,
 	#[serde(default)]
 	pub rocksdb_optimize_for_spinning_disks: bool,
+	#[serde(default = "default_rocksdb_parallelism_threads")]
+	pub rocksdb_parallelism_threads: usize,
+	#[serde(default = "default_rocksdb_max_log_files")]
+	pub rocksdb_max_log_files: usize,
+	#[serde(default = "default_rocksdb_compression_algo")]
+	pub rocksdb_compression_algo: String,
+	#[serde(default = "default_rocksdb_compression_level")]
+	pub rocksdb_compression_level: i32,
+	#[serde(default = "default_rocksdb_bottommost_compression_level")]
+	pub rocksdb_bottommost_compression_level: i32,
+	#[serde(default)]
+	pub rocksdb_bottommost_compression: bool,
 
 	pub emergency_password: Option<String>,
 
@@ -122,6 +144,9 @@ pub struct Config {
 	#[serde(default = "default_presence_offline_timeout_s")]
 	pub presence_offline_timeout_s: u64,
 
+	#[serde(default = "true_fn")]
+	pub allow_incoming_read_receipts: bool,
+
 	#[serde(default)]
 	pub zstd_compression: bool,
 
@@ -153,6 +178,9 @@ pub struct Config {
 	#[serde(with = "serde_regex")]
 	pub forbidden_usernames: RegexSet,
 
+	#[serde(default)]
+	pub block_non_admin_invites: bool,
+
 	#[serde(flatten)]
 	pub catchall: BTreeMap<String, IgnoredAny>,
 }
@@ -161,48 +189,53 @@ pub struct Config {
 pub struct TlsConfig {
 	pub certs: String,
 	pub 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,
 }
 
 const DEPRECATED_KEYS: &[&str] = &["cache_capacity"];
 
 impl Config {
-    /// Iterates over all the keys in the config file and warns if there is a deprecated key specified
+	/// Iterates over all the keys in the config file and warns if there is a
+	/// deprecated key specified
 	pub fn warn_deprecated(&self) {
 		debug!("Checking for deprecated config keys");
 		let mut was_deprecated = false;
-        for key in self
+		for key in self.catchall.keys().filter(|key| DEPRECATED_KEYS.iter().any(|s| s == key)) {
-            .catchall
-            .keys()
-            .filter(|key| DEPRECATED_KEYS.iter().any(|s| s == key))
-        {
 			warn!("Config parameter \"{}\" is deprecated, ignoring.", key);
 			was_deprecated = true;
 		}
 
 		if was_deprecated {
-            warn!("Read conduit documentation and check your configuration if any new configuration parameters should be adjusted");
-        }
-    }
-
-    /// iterates over all the catchall keys (unknown config options) and warns if there are any.
-    pub fn warn_unknown_key(&self) {
-        debug!("Checking for unknown config keys");
-        for key in self.catchall.keys().filter(
-            |key| "config".to_owned().ne(key.to_owned()), /* "config" is expected */
-        ) {
 			warn!(
-                "Config parameter \"{}\" is unknown to conduwuit, ignoring.",
+				"Read conduit documentation and check your configuration if any new configuration parameters should \
-                key
+				 be adjusted"
 			);
 		}
 	}
 
-    /// Checks the presence of the `address` and `unix_socket_path` keys in the raw_config, exiting the process if both keys were detected.
+	/// iterates over all the catchall keys (unknown config options) and warns
-    pub fn is_dual_listening(&self, raw_config: Figment) -> bool {
+	/// if there are any.
+	pub fn warn_unknown_key(&self) {
+		debug!("Checking for unknown config keys");
+		for key in
+			self.catchall.keys().filter(|key| "config".to_owned().ne(key.to_owned()) /* "config" is expected */)
+		{
+			warn!("Config parameter \"{}\" is unknown to conduwuit, ignoring.", key);
+		}
+	}
+
+	/// Checks the presence of the `address` and `unix_socket_path` keys in the
+	/// raw_config, exiting the process if both keys were detected.
+	pub fn is_dual_listening(&self, raw_config: &Figment) -> bool {
 		let check_address = raw_config.find_value("address");
 		let check_unix_socket = raw_config.find_value("unix_socket_path");
 
-        // are the check_address and check_unix_socket keys both Ok (specified) at the same time?
+		// are the check_address and check_unix_socket keys both Ok (specified) at the
+		// same time?
 		if check_address.is_ok() && check_unix_socket.is_ok() {
 			error!("TOML keys \"address\" and \"unix_socket_path\" were both defined. Please specify only one option.");
 			return true;
@@ -219,36 +252,25 @@ impl fmt::Display for Config {
 			("Server name", self.server_name.host()),
 			("Database backend", &self.database_backend),
 			("Database path", &self.database_path),
-            (
+			("Database cache capacity (MB)", &self.db_cache_capacity_mb.to_string()),
-                "Database cache capacity (MB)",
+			("Cache capacity modifier", &self.conduit_cache_capacity_modifier.to_string()),
-                &self.db_cache_capacity_mb.to_string(),
-            ),
-            (
-                "Cache capacity modifier",
-                &self.conduit_cache_capacity_modifier.to_string(),
-            ),
 			("PDU cache capacity", &self.pdu_cache_capacity.to_string()),
+			("Cleanup interval in seconds", &self.cleanup_second_interval.to_string()),
+			("Maximum request size (bytes)", &self.max_request_size.to_string()),
+			("Maximum concurrent requests", &self.max_concurrent_requests.to_string()),
+			("Allow registration", &self.allow_registration.to_string()),
 			(
-                "Cleanup interval in seconds",
+				"Registration token",
-                &self.cleanup_second_interval.to_string(),
+				match self.registration_token {
-            ),
+					Some(_) => "set",
-            ("Maximum request size", &self.max_request_size.to_string()),
+					None => "not set (open registration!)",
-            (
+				},
-                "Maximum concurrent requests",
-                &self.max_concurrent_requests.to_string(),
 			),
 			(
-                "Allow registration (open registration)",
+				"Allow guest registration (inherently false if allow registration is false)",
-                &self.allow_registration.to_string(),
-            ),
-            (
-                "Allow guest registration",
 				&self.allow_guest_registration.to_string(),
 			),
-            (
+			("New user display name suffix", &self.new_user_displayname_suffix),
-                "Enabled lightning bolt",
-                &self.enable_lightning_bolt.to_string(),
-            ),
 			("Allow encryption", &self.allow_encryption.to_string()),
 			("Allow federation", &self.allow_federation.to_string()),
 			(
@@ -264,9 +286,14 @@ impl fmt::Display for Config {
 				&self.allow_local_presence.to_string(),
 			),
 			(
-                "Allow device name federation",
+				"Allow incoming remote read receipts",
-                &self.allow_device_name_federation.to_string(),
+				&self.allow_incoming_read_receipts.to_string(),
 			),
+			(
+				"Block non-admin room invites (local and remote, admins can still send and receive invites)",
+				&self.block_non_admin_invites.to_string(),
+			),
+			("Allow device name federation", &self.allow_device_name_federation.to_string()),
 			("Notification push path", &self.notification_push_path),
 			("Allow room creation", &self.allow_room_creation.to_string()),
 			(
@@ -284,13 +311,17 @@ impl fmt::Display for Config {
 					None => "not set",
 				},
 			),
-            ("Trusted servers", {
+			("Trusted key servers", {
 				let mut lst = vec![];
 				for server in &self.trusted_servers {
 					lst.push(server.host());
 				}
 				&lst.join(", ")
 			}),
+			(
+				"Query Trusted Key Servers First",
+				&self.query_trusted_key_servers_first.to_string(),
+			),
 			(
 				"TURN username",
 				if self.turn_username.is_empty() {
@@ -322,23 +353,40 @@ impl fmt::Display for Config {
 				}
 				&lst.join(", ")
 			}),
-            (
+			#[cfg(feature = "compression-zstd")]
-                "zstd Response Body Compression",
+			("zstd Response Body Compression", &self.zstd_compression.to_string()),
-                &self.zstd_compression.to_string(),
+			#[cfg(feature = "rocksdb")]
-            ),
 			("RocksDB database log level", &self.rocksdb_log_level),
-            (
+			#[cfg(feature = "rocksdb")]
-                "RocksDB database log time-to-roll",
+			("RocksDB database log time-to-roll", &self.rocksdb_log_time_to_roll.to_string()),
-                &self.rocksdb_log_time_to_roll.to_string(),
+			#[cfg(feature = "rocksdb")]
-            ),
+			("RocksDB Max LOG Files", &self.rocksdb_max_log_files.to_string()),
+			#[cfg(feature = "rocksdb")]
 			(
 				"RocksDB database max log file size",
 				&self.rocksdb_max_log_file_size.to_string(),
 			),
+			#[cfg(feature = "rocksdb")]
 			(
 				"RocksDB database optimize for spinning disks",
 				&self.rocksdb_optimize_for_spinning_disks.to_string(),
 			),
+			#[cfg(feature = "rocksdb")]
+			("RocksDB Parallelism Threads", &self.rocksdb_parallelism_threads.to_string()),
+			#[cfg(feature = "rocksdb")]
+			("RocksDB Compression Algorithm", &self.rocksdb_compression_algo),
+			#[cfg(feature = "rocksdb")]
+			("RocksDB Compression Level", &self.rocksdb_compression_level.to_string()),
+			#[cfg(feature = "rocksdb")]
+			(
+				"RocksDB Bottommost Compression Level",
+				&self.rocksdb_bottommost_compression_level.to_string(),
+			),
+			#[cfg(feature = "rocksdb")]
+			(
+				"RocksDB Bottommost Level Compression",
+				&self.rocksdb_bottommost_compression.to_string(),
+			),
 			("Prevent Media Downloads From", {
 				let mut lst = vec![];
 				for domain in &self.prevent_media_downloads_from {
@@ -372,116 +420,92 @@ impl fmt::Display for Config {
 				"URL preview URL contains allowlist",
 				&self.url_preview_url_contains_allowlist.join(", "),
 			),
-            (
+			("URL preview maximum spider size", &self.url_preview_max_spider_size.to_string()),
-                "URL preview maximum spider size",
+			("URL preview check root domain", &self.url_preview_check_root_domain.to_string()),
-                &self.url_preview_max_spider_size.to_string(),
-            ),
-            (
-                "URL preview check root domain",
-                &self.url_preview_check_root_domain.to_string(),
-            ),
 		];
 
 		let mut msg: String = "Active config values:\n\n".to_owned();
 
 		for line in lines.into_iter().enumerate() {
-            msg += &format!("{}: {}\n", line.1 .0, line.1 .1);
+			let _ = writeln!(msg, "{}: {}", line.1 .0, line.1 .1);
 		}
 
 		write!(f, "{msg}")
 	}
 }
 
-fn true_fn() -> bool {
+fn true_fn() -> bool { true }
-    true
+
+fn default_address() -> IpAddr { Ipv4Addr::LOCALHOST.into() }
+
+fn default_port() -> ListeningPort {
+	ListeningPort {
+		ports: Either::Left(8008),
+	}
 }
 
-fn default_address() -> IpAddr {
+fn default_unix_socket_perms() -> u32 { 660 }
-    Ipv4Addr::LOCALHOST.into()
-}
 
-fn default_port() -> u16 {
+fn default_database_backend() -> String { "rocksdb".to_owned() }
-    8000
-}
 
-fn default_unix_socket_perms() -> u32 {
+fn default_db_cache_capacity_mb() -> f64 { 300.0 }
-    660
-}
 
-fn default_database_backend() -> String {
+fn default_conduit_cache_capacity_modifier() -> f64 { 1.0 }
-    "rocksdb".to_owned()
-}
 
-fn default_db_cache_capacity_mb() -> f64 {
+fn default_pdu_cache_capacity() -> u32 { 150_000 }
-    300.0
-}
-
-fn default_conduit_cache_capacity_modifier() -> f64 {
-    1.0
-}
-
-fn default_pdu_cache_capacity() -> u32 {
-    150_000
-}
 
 fn default_cleanup_second_interval() -> u32 {
-    60 // every minute
+	1800 // every 30 minutes
 }
 
 fn default_max_request_size() -> u32 {
 	20 * 1024 * 1024 // Default to 20 MB
 }
 
-fn default_max_concurrent_requests() -> u16 {
+fn default_max_concurrent_requests() -> u16 { 500 }
-    500
-}
 
-fn default_max_fetch_prev_events() -> u16 {
+fn default_max_fetch_prev_events() -> u16 { 100_u16 }
-    100_u16
-}
 
-fn default_trusted_servers() -> Vec<OwnedServerName> {
+fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] }
-    vec![OwnedServerName::try_from("matrix.org").unwrap()]
-}
 
-fn default_log() -> String {
+fn default_log() -> String { "warn,state_res=warn".to_owned() }
-    "warn,state_res=warn".to_owned()
-}
 
-fn default_notification_push_path() -> String {
+fn default_notification_push_path() -> String { "/_matrix/push/v1/notify".to_owned() }
-    "/_matrix/push/v1/notify".to_owned()
-}
 
-fn default_turn_ttl() -> u64 {
+fn default_turn_ttl() -> u64 { 60 * 60 * 24 }
-    60 * 60 * 24
-}
 
-fn default_presence_idle_timeout_s() -> u64 {
+fn default_presence_idle_timeout_s() -> u64 { 5 * 60 }
-    5 * 60
-}
 
-fn default_presence_offline_timeout_s() -> u64 {
+fn default_presence_offline_timeout_s() -> u64 { 30 * 60 }
-    30 * 60
-}
 
-fn default_rocksdb_log_level() -> String {
+fn default_rocksdb_log_level() -> String { "error".to_owned() }
-    "warn".to_owned()
-}
 
-fn default_rocksdb_log_time_to_roll() -> usize {
+fn default_rocksdb_log_time_to_roll() -> usize { 0 }
-    0
-}
 
-// I know, it's a great name
+fn default_rocksdb_max_log_files() -> usize { 3 }
-pub(crate) fn default_default_room_version() -> RoomVersionId {
-    RoomVersionId::V10
-}
 
 fn default_rocksdb_max_log_file_size() -> usize {
 	// 4 megabytes
 	4 * 1024 * 1024
 }
 
+fn default_rocksdb_parallelism_threads() -> usize { num_cpus::get_physical() / 2 }
+
+fn default_rocksdb_compression_algo() -> String { "zstd".to_owned() }
+
+/// Default RocksDB compression level is 32767, which is internally read by
+/// RocksDB as the default magic number and translated to the library's default
+/// compression level as they all differ. See their `kDefaultCompressionLevel`.
+fn default_rocksdb_compression_level() -> i32 { 32767 }
+
+/// Default RocksDB compression level is 32767, which is internally read by
+/// RocksDB as the default magic number and translated to the library's default
+/// compression level as they all differ. See their `kDefaultCompressionLevel`.
+fn default_rocksdb_bottommost_compression_level() -> i32 { 32767 }
+
+// I know, it's a great name
+pub(crate) fn default_default_room_version() -> RoomVersionId { RoomVersionId::V10 }
+
 fn default_ip_range_denylist() -> Vec<String> {
 	vec![
 		"127.0.0.0/8".to_owned(),
@@ -509,3 +533,5 @@ fn default_ip_range_denylist() -> Vec<String> {
 fn default_url_preview_max_spider_size() -> usize {
 	1_000_000 // 1MB
 }
+
+fn default_new_user_displayname_suffix() -> String { "🏳️‍⚧️".to_owned() }

src/config/proxy.rs

@@ -24,9 +24,10 @@ use crate::Result;
 /// ## Include vs. Exclude
 /// If include is an empty list, it is assumed to be `["*"]`.
 ///
-/// If a domain matches both the exclude and include list, the proxy will only be used if it was
+/// If a domain matches both the exclude and include list, the proxy will only
-/// included because of a more specific rule than it was excluded. In the above example, the proxy
+/// be used if it was included because of a more specific rule than it was
-/// would be used for `ordinary.onion`, `matrix.myspecial.onion`, but not `hello.myspecial.onion`.
+/// excluded. In the above example, the proxy would be used for
+/// `ordinary.onion`, `matrix.myspecial.onion`, but not `hello.myspecial.onion`.
 #[derive(Clone, Default, Debug, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ProxyConfig {
@@ -42,9 +43,12 @@ impl ProxyConfig {
 	pub fn to_proxy(&self) -> Result<Option<Proxy>> {
 		Ok(match self.clone() {
 			ProxyConfig::None => None,
-            ProxyConfig::Global { url } => Some(Proxy::all(url)?),
+			ProxyConfig::Global {
+				url,
+			} => Some(Proxy::all(url)?),
 			ProxyConfig::ByDomain(proxies) => Some(Proxy::custom(move |url| {
-                proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching proxy
+				proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching
+				                                             // proxy
 			})),
 		})
 	}
@@ -66,7 +70,7 @@ impl PartialProxyConfig {
 		let mut excluded_because = None; // most specific reason it was excluded
 		if self.include.is_empty() {
 			// treat empty include list as `*`
-            included_because = Some(&WildCardedDomain::WildCard)
+			included_because = Some(&WildCardedDomain::WildCard);
 		}
 		for wc_domain in &self.include {
 			if wc_domain.matches(domain) {
@@ -85,7 +89,8 @@ impl PartialProxyConfig {
 			}
 		}
 		match (included_because, excluded_because) {
-            (Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url), // included for a more specific reason than excluded
+			(Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url), /* included for a more specific reason */
+			// than excluded
 			(Some(_), None) => Some(&self.url),
 			_ => None,
 		}
@@ -107,20 +112,20 @@ impl WildCardedDomain {
 			WildCardedDomain::Exact(d) => domain == d,
 		}
 	}
+
 	fn more_specific_than(&self, other: &Self) -> bool {
 		match (self, other) {
 			(WildCardedDomain::WildCard, WildCardedDomain::WildCard) => false,
 			(_, WildCardedDomain::WildCard) => true,
 			(WildCardedDomain::Exact(a), WildCardedDomain::WildCarded(_)) => other.matches(a),
-            (WildCardedDomain::WildCarded(a), WildCardedDomain::WildCarded(b)) => {
+			(WildCardedDomain::WildCarded(a), WildCardedDomain::WildCarded(b)) => a != b && a.ends_with(b),
-                a != b && a.ends_with(b)
-            }
 			_ => false,
 		}
 	}
 }
 impl std::str::FromStr for WildCardedDomain {
 	type Err = std::convert::Infallible;
+
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		// maybe do some domain validation?
 		Ok(if s.starts_with("*.") {

src/database/abstraction.rs

@@ -1,8 +1,8 @@
+use std::{future::Future, pin::Pin, sync::Arc};
+
 use super::Config;
 use crate::Result;
 
-use std::{future::Future, pin::Pin, sync::Arc};
-
 #[cfg(feature = "sqlite")]
 pub mod sqlite;
 
@@ -18,38 +18,43 @@ pub(crate) trait KeyValueDatabaseEngine: Send + Sync {
 		Self: Sized;
 	fn open_tree(&self, name: &'static str) -> Result<Arc<dyn KvTree>>;
 	fn flush(&self) -> Result<()>;
-    fn cleanup(&self) -> Result<()> {
+	fn cleanup(&self) -> Result<()> { Ok(()) }
-        Ok(())
-    }
 	fn memory_usage(&self) -> Result<String> {
 		Ok("Current database engine does not support memory usage reporting.".to_owned())
 	}
+
+	#[allow(dead_code)]
 	fn clear_caches(&self) {}
 }
 
 pub(crate) trait KvTree: Send + Sync {
 	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>>;
 
+	#[allow(dead_code)]
+	#[cfg(feature = "rocksdb")]
+	fn multi_get(
+		&self, _iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
+	) -> Vec<std::result::Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
+		unimplemented!()
+	}
+
 	fn insert(&self, key: &[u8], value: &[u8]) -> Result<()>;
 	fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()>;
 
 	fn remove(&self, key: &[u8]) -> Result<()>;
 
+	#[allow(dead_code)]
+	#[cfg(feature = "rocksdb")]
+	fn remove_batch(&self, _iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> { unimplemented!() }
+
 	fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
 
-    fn iter_from<'a>(
+	fn iter_from<'a>(&'a self, from: &[u8], backwards: bool) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
-        &'a self,
-        from: &[u8],
-        backwards: bool,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
 
 	fn increment(&self, key: &[u8]) -> Result<Vec<u8>>;
 	fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()>;
 
-    fn scan_prefix<'a>(
+	fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
-        &'a self,
-        prefix: Vec<u8>,
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a>;
 
 	fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>>;
 

src/database/abstraction/rocksdb.rs

@@ -1,17 +1,21 @@
-use super::{super::Config, watchers::Watchers, KeyValueDatabaseEngine, KvTree};
-use crate::{utils, Result};
 use std::{
 	future::Future,
 	pin::Pin,
 	sync::{Arc, RwLock},
 };
 
-use rocksdb::LogLevel::{Debug, Error, Fatal, Info, Warn};
+use rust_rocksdb::{
+	LogLevel::{Debug, Error, Fatal, Info, Warn},
+	WriteBatchWithTransaction,
+};
 use tracing::{debug, info};
 
+use super::{super::Config, watchers::Watchers, KeyValueDatabaseEngine, KvTree};
+use crate::{utils, Result};
+
 pub(crate) struct Engine {
-    rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
+	rocks: rust_rocksdb::DBWithThreadMode<rust_rocksdb::MultiThreaded>,
-    cache: rocksdb::Cache,
+	cache: rust_rocksdb::Cache,
 	old_cfs: Vec<String>,
 	config: Config,
 }
@@ -23,9 +27,9 @@ struct RocksDbEngineTree<'a> {
 	write_lock: RwLock<()>,
 }
 
-fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Options {
+fn db_options(rocksdb_cache: &rust_rocksdb::Cache, config: &Config) -> rust_rocksdb::Options {
 	// block-based options: https://docs.rs/rocksdb/latest/rocksdb/struct.BlockBasedOptions.html#
-    let mut block_based_options = rocksdb::BlockBasedOptions::default();
+	let mut block_based_options = rust_rocksdb::BlockBasedOptions::default();
 
 	block_based_options.set_block_cache(rocksdb_cache);
 
@@ -34,59 +38,84 @@ fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Optio
 	block_based_options.set_block_size(64 * 1024);
 	block_based_options.set_cache_index_and_filter_blocks(true);
 
+	block_based_options.set_bloom_filter(10.0, false);
+	block_based_options.set_pin_l0_filter_and_index_blocks_in_cache(true);
+	block_based_options.set_optimize_filters_for_memory(true);
+
 	// database options: https://docs.rs/rocksdb/latest/rocksdb/struct.Options.html#
-    let mut db_opts = rocksdb::Options::default();
+	let mut db_opts = rust_rocksdb::Options::default();
 
 	let rocksdb_log_level = match config.rocksdb_log_level.as_ref() {
 		"debug" => Debug,
 		"info" => Info,
 		"warn" => Warn,
-        "error" => Error,
 		"fatal" => Fatal,
-        _ => Warn,
+		_ => Error,
+	};
+
+	let rocksdb_compression_algo = match config.rocksdb_compression_algo.as_ref() {
+		"zstd" => rust_rocksdb::DBCompressionType::Zstd,
+		"zlib" => rust_rocksdb::DBCompressionType::Zlib,
+		"lz4" => rust_rocksdb::DBCompressionType::Lz4,
+		"bz2" => rust_rocksdb::DBCompressionType::Bz2,
+		_ => rust_rocksdb::DBCompressionType::Zstd,
+	};
+
+	let threads = if config.rocksdb_parallelism_threads == 0 {
+		num_cpus::get_physical() // max cores if user specified 0
+	} else {
+		config.rocksdb_parallelism_threads
 	};
 
 	db_opts.set_log_level(rocksdb_log_level);
 	db_opts.set_max_log_file_size(config.rocksdb_max_log_file_size);
 	db_opts.set_log_file_time_to_roll(config.rocksdb_log_time_to_roll);
+	db_opts.set_keep_log_file_num(config.rocksdb_max_log_files);
 
 	if config.rocksdb_optimize_for_spinning_disks {
-        // useful for hard drives but on literally any half-decent SSD this is not useful
+		db_opts.set_skip_stats_update_on_db_open(true); // speeds up opening DB on hard drives
-        // and the benefits of improved compaction based on up to date stats are good.
+		db_opts.set_compaction_readahead_size(4 * 1024 * 1024); // "If you’re running RocksDB on spinning disks, you should set this to at least
-        // current conduwut users have NVMe/SSDs.
+														// 2MB. That way RocksDB’s compaction is doing sequential instead of random
-        db_opts.set_skip_stats_update_on_db_open(true);
+														// reads."
-
+		db_opts.set_target_file_size_base(256 * 1024 * 1024);
-        db_opts.set_compaction_readahead_size(2 * 1024 * 1024); // default compaction_readahead_size is 0 which is good for SSDs
-        db_opts.set_target_file_size_base(256 * 1024 * 1024); // default target_file_size is 64MB which is good for SSDs
-        db_opts.set_optimize_filters_for_hits(true); // doesn't really seem useful for fast storage
 	} else {
-        db_opts.set_skip_stats_update_on_db_open(false);
 		db_opts.set_max_bytes_for_level_base(512 * 1024 * 1024);
 		db_opts.set_use_direct_reads(true);
 		db_opts.set_use_direct_io_for_flush_and_compaction(true);
 	}
 
+	if config.rocksdb_bottommost_compression {
+		db_opts.set_bottommost_compression_type(rocksdb_compression_algo);
+		db_opts.set_bottommost_zstd_max_train_bytes(0, true);
+
+		// -14 w_bits is only read by zlib.
+		db_opts.set_bottommost_compression_options(-14, config.rocksdb_bottommost_compression_level, 0, 0, true);
+	}
+
+	// -14 w_bits is only read by zlib.
+	db_opts.set_compression_options(-14, config.rocksdb_compression_level, 0, 0);
+
 	db_opts.set_block_based_table_factory(&block_based_options);
-    db_opts.set_level_compaction_dynamic_level_bytes(true);
 	db_opts.create_if_missing(true);
-    db_opts.increase_parallelism(num_cpus::get() as i32);
+	db_opts.increase_parallelism(
-    //db_opts.set_max_open_files(config.rocksdb_max_open_files);
+		threads.try_into().expect("Failed to convert \"rocksdb_parallelism_threads\" usize into i32"),
-    db_opts.set_compression_type(rocksdb::DBCompressionType::Zstd);
+	);
-    db_opts.set_compaction_style(rocksdb::DBCompactionStyle::Level);
+	db_opts.set_compression_type(rocksdb_compression_algo);
-    db_opts.optimize_level_style_compaction(10 * 1024 * 1024);
 
 	// https://github.com/facebook/rocksdb/wiki/Setup-Options-and-Basic-Tuning
+	db_opts.set_level_compaction_dynamic_level_bytes(true);
 	db_opts.set_max_background_jobs(6);
-    db_opts.set_bytes_per_sync(1048576);
+	db_opts.set_bytes_per_sync(1_048_576);
 
 	// https://github.com/facebook/rocksdb/wiki/WAL-Recovery-Modes#ktoleratecorruptedtailrecords
 	//
 	// Unclean shutdowns of a Matrix homeserver are likely to be fine when
 	// recovered in this manner as it's likely any lost information will be
 	// restored via federation.
-    db_opts.set_wal_recovery_mode(rocksdb::DBRecoveryMode::TolerateCorruptedTailRecords);
+	db_opts.set_wal_recovery_mode(rust_rocksdb::DBRecoveryMode::TolerateCorruptedTailRecords);
 
-    let prefix_extractor = rocksdb::SliceTransform::create_fixed_prefix(1);
+	// TODO: remove me? https://gitlab.com/famedly/conduit/-/merge_requests/602/diffs#a3a261d6a9014330581b5bdecd586dab5ae00245_62_54
+	let prefix_extractor = rust_rocksdb::SliceTransform::create_fixed_prefix(1);
 	db_opts.set_prefix_extractor(prefix_extractor);
 
 	db_opts
@@ -95,25 +124,21 @@ fn db_options(rocksdb_cache: &rocksdb::Cache, config: &Config) -> rocksdb::Optio
 impl KeyValueDatabaseEngine for Arc<Engine> {
 	fn open(config: &Config) -> Result<Self> {
 		let cache_capacity_bytes = (config.db_cache_capacity_mb * 1024.0 * 1024.0) as usize;
-        let rocksdb_cache = rocksdb::Cache::new_lru_cache(cache_capacity_bytes);
+		let rocksdb_cache = rust_rocksdb::Cache::new_lru_cache(cache_capacity_bytes);
 
 		let db_opts = db_options(&rocksdb_cache, config);
 
 		debug!("Listing column families in database");
-        let cfs = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::list_cf(
+		let cfs =
-            &db_opts,
+			rust_rocksdb::DBWithThreadMode::<rust_rocksdb::MultiThreaded>::list_cf(&db_opts, &config.database_path)
-            &config.database_path,
-        )
 				.unwrap_or_default();
 
 		debug!("Opening column family descriptors in database");
 		info!("RocksDB database compaction will take place now, a delay in startup is expected");
-        let db = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::open_cf_descriptors(
+		let db = rust_rocksdb::DBWithThreadMode::<rust_rocksdb::MultiThreaded>::open_cf_descriptors(
 			&db_opts,
 			&config.database_path,
-            cfs.iter().map(|name| {
+			cfs.iter().map(|name| rust_rocksdb::ColumnFamilyDescriptor::new(name, db_options(&rocksdb_cache, config))),
-                rocksdb::ColumnFamilyDescriptor::new(name, db_options(&rocksdb_cache, config))
-            }),
 		)?;
 
 		Ok(Arc::new(Engine {
@@ -128,9 +153,7 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 		if !self.old_cfs.contains(&name.to_owned()) {
 			// Create if it didn't exist
 			debug!("Creating new column family in database: {}", name);
-            let _ = self
+			let _ = self.rocks.create_cf(name, &db_options(&self.cache, &self.config));
-                .rocks
-                .create_cf(name, &db_options(&self.cache, &self.config));
 		}
 
 		Ok(Arc::new(RocksDbEngineTree {
@@ -142,20 +165,18 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 	}
 
 	fn flush(&self) -> Result<()> {
-        // TODO?
+		debug!("Running flush_wal (no sync)");
+		rust_rocksdb::DBCommon::flush_wal(&self.rocks, false)?;
+
 		Ok(())
 	}
 
 	fn memory_usage(&self) -> Result<String> {
-        let stats =
+		let stats = rust_rocksdb::perf::get_memory_usage_stats(Some(&[&self.rocks]), Some(&[&self.cache]))?;
-            rocksdb::perf::get_memory_usage_stats(Some(&[&self.rocks]), Some(&[&self.cache]))?;
 		Ok(format!(
-            "Approximate memory usage of all the mem-tables: {:.3} MB\n\
+			"Approximate memory usage of all the mem-tables: {:.3} MB\nApproximate memory usage of un-flushed \
-             Approximate memory usage of un-flushed mem-tables: {:.3} MB\n\
+			 mem-tables: {:.3} MB\nApproximate memory usage of all the table readers: {:.3} MB\nApproximate memory \
-             Approximate memory usage of all the table readers: {:.3} MB\n\
+			 usage by cache: {:.3} MB\nApproximate memory usage by cache pinned: {:.3} MB\n",
-             Approximate memory usage by cache: {:.3} MB\n\
-             Approximate memory usage by cache pinned: {:.3} MB\n\
-             ",
 			stats.mem_table_total as f64 / 1024.0 / 1024.0,
 			stats.mem_table_unflushed as f64 / 1024.0 / 1024.0,
 			stats.mem_table_readers_total as f64 / 1024.0 / 1024.0,
@@ -164,23 +185,47 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 		))
 	}
 
+	fn cleanup(&self) -> Result<()> {
+		debug!("Running flush_opt");
+		let flushoptions = rust_rocksdb::FlushOptions::default();
+
+		rust_rocksdb::DBCommon::flush_opt(&self.rocks, &flushoptions)?;
+
+		Ok(())
+	}
+
+	// TODO: figure out if this is needed for rocksdb
+	#[allow(dead_code)]
 	fn clear_caches(&self) {}
 }
 
 impl RocksDbEngineTree<'_> {
-    fn cf(&self) -> Arc<rocksdb::BoundColumnFamily<'_>> {
+	fn cf(&self) -> Arc<rust_rocksdb::BoundColumnFamily<'_>> { self.db.rocks.cf_handle(self.name).unwrap() }
-        self.db.rocks.cf_handle(self.name).unwrap()
-    }
 }
 
 impl KvTree for RocksDbEngineTree<'_> {
 	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        Ok(self.db.rocks.get_cf(&self.cf(), key)?)
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
+		readoptions.set_total_order_seek(true);
+
+		Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?)
+	}
+
+	fn multi_get(
+		&self, iter: Vec<(&Arc<rust_rocksdb::BoundColumnFamily<'_>>, Vec<u8>)>,
+	) -> Vec<std::result::Result<Option<Vec<u8>>, rust_rocksdb::Error>> {
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
+		readoptions.set_total_order_seek(true);
+
+		self.db.rocks.multi_get_cf_opt(iter, &readoptions)
 	}
 
 	fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
+		let writeoptions = rust_rocksdb::WriteOptions::default();
 		let lock = self.write_lock.read().unwrap();
-        self.db.rocks.put_cf(&self.cf(), key, value)?;
+
+		self.db.rocks.put_cf_opt(&self.cf(), key, value, &writeoptions)?;
+
 		drop(lock);
 
 		self.watchers.wake(key);
@@ -188,89 +233,123 @@ impl KvTree for RocksDbEngineTree<'_> {
 		Ok(())
 	}
 
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+	fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+		let writeoptions = rust_rocksdb::WriteOptions::default();
+
+		let mut batch = WriteBatchWithTransaction::<false>::default();
+
 		for (key, value) in iter {
-            self.db.rocks.put_cf(&self.cf(), key, value)?;
+			batch.put_cf(&self.cf(), key, value);
 		}
 
-        Ok(())
+		Ok(self.db.rocks.write_opt(batch, &writeoptions)?)
 	}
 
 	fn remove(&self, key: &[u8]) -> Result<()> {
-        Ok(self.db.rocks.delete_cf(&self.cf(), key)?)
+		let writeoptions = rust_rocksdb::WriteOptions::default();
+
+		Ok(self.db.rocks.delete_cf_opt(&self.cf(), key, &writeoptions)?)
+	}
+
+	fn remove_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+		let writeoptions = rust_rocksdb::WriteOptions::default();
+
+		let mut batch = WriteBatchWithTransaction::<false>::default();
+
+		for key in iter {
+			batch.delete_cf(&self.cf(), key);
+		}
+
+		Ok(self.db.rocks.write_opt(batch, &writeoptions)?)
 	}
 
 	fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
+		readoptions.set_total_order_seek(true);
+
 		Box::new(
 			self.db
 				.rocks
-                .iterator_cf(&self.cf(), rocksdb::IteratorMode::Start)
+				.iterator_cf_opt(&self.cf(), readoptions, rust_rocksdb::IteratorMode::Start)
-                .map(|r| r.unwrap())
+				.map(std::result::Result::unwrap)
 				.map(|(k, v)| (Vec::from(k), Vec::from(v))),
 		)
 	}
 
-    fn iter_from<'a>(
+	fn iter_from<'a>(&'a self, from: &[u8], backwards: bool) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
-        &'a self,
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
-        from: &[u8],
+		readoptions.set_total_order_seek(true);
-        backwards: bool,
+
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
 		Box::new(
 			self.db
 				.rocks
-                .iterator_cf(
+				.iterator_cf_opt(
 					&self.cf(),
-                    rocksdb::IteratorMode::From(
+					readoptions,
+					rust_rocksdb::IteratorMode::From(
 						from,
 						if backwards {
-                            rocksdb::Direction::Reverse
+							rust_rocksdb::Direction::Reverse
 						} else {
-                            rocksdb::Direction::Forward
+							rust_rocksdb::Direction::Forward
 						},
 					),
 				)
-                .map(|r| r.unwrap())
+				.map(std::result::Result::unwrap)
 				.map(|(k, v)| (Vec::from(k), Vec::from(v))),
 		)
 	}
 
 	fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
+		readoptions.set_total_order_seek(true);
+		let writeoptions = rust_rocksdb::WriteOptions::default();
+
 		let lock = self.write_lock.write().unwrap();
 
-        let old = self.db.rocks.get_cf(&self.cf(), key)?;
+		let old = self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?;
 		let new = utils::increment(old.as_deref()).unwrap();
-        self.db.rocks.put_cf(&self.cf(), key, &new)?;
+		self.db.rocks.put_cf_opt(&self.cf(), key, &new, &writeoptions)?;
 
 		drop(lock);
 		Ok(new)
 	}
 
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+	fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
+		readoptions.set_total_order_seek(true);
+		let writeoptions = rust_rocksdb::WriteOptions::default();
+
+		let mut batch = WriteBatchWithTransaction::<false>::default();
+
 		let lock = self.write_lock.write().unwrap();
 
 		for key in iter {
-            let old = self.db.rocks.get_cf(&self.cf(), &key)?;
+			let old = self.db.rocks.get_cf_opt(&self.cf(), &key, &readoptions)?;
 			let new = utils::increment(old.as_deref()).unwrap();
-            self.db.rocks.put_cf(&self.cf(), key, new)?;
+			batch.put_cf(&self.cf(), key, new);
 		}
 
+		self.db.rocks.write_opt(batch, &writeoptions)?;
+
 		drop(lock);
 
 		Ok(())
 	}
 
-    fn scan_prefix<'a>(
+	fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
-        &'a self,
+		let mut readoptions = rust_rocksdb::ReadOptions::default();
-        prefix: Vec<u8>,
+		readoptions.set_total_order_seek(true);
-    ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+
 		Box::new(
 			self.db
 				.rocks
-                .iterator_cf(
+				.iterator_cf_opt(
 					&self.cf(),
-                    rocksdb::IteratorMode::From(&prefix, rocksdb::Direction::Forward),
+					readoptions,
+					rust_rocksdb::IteratorMode::From(&prefix, rust_rocksdb::Direction::Forward),
 				)
-                .map(|r| r.unwrap())
+				.map(std::result::Result::unwrap)
 				.map(|(k, v)| (Vec::from(k), Vec::from(v)))
 				.take_while(move |(k, _)| k.starts_with(&prefix)),
 		)

src/database/abstraction/sqlite.rs

@@ -1,7 +1,3 @@
-use super::{watchers::Watchers, KeyValueDatabaseEngine, KvTree};
-use crate::{database::Config, Result};
-use parking_lot::{Mutex, MutexGuard};
-use rusqlite::{Connection, DatabaseName::Main, OptionalExtension};
 use std::{
 	cell::RefCell,
 	future::Future,
@@ -9,12 +5,18 @@ use std::{
 	pin::Pin,
 	sync::Arc,
 };
+
+use parking_lot::{Mutex, MutexGuard};
+use rusqlite::{Connection, DatabaseName::Main, OptionalExtension};
 use thread_local::ThreadLocal;
 use tracing::debug;
 
+use super::{watchers::Watchers, KeyValueDatabaseEngine, KvTree};
+use crate::{database::Config, Result};
+
 thread_local! {
-    static READ_CONNECTION: RefCell<Option<&'static Connection>> = RefCell::new(None);
+	static READ_CONNECTION: RefCell<Option<&'static Connection>> = const { RefCell::new(None) };
-    static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = RefCell::new(None);
+	static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = const { RefCell::new(None) };
 }
 
 struct PreparedStatementIterator<'a> {
@@ -25,14 +27,16 @@ struct PreparedStatementIterator<'a> {
 impl Iterator for PreparedStatementIterator<'_> {
 	type Item = TupleOfBytes;
 
-    fn next(&mut self) -> Option<Self::Item> {
+	fn next(&mut self) -> Option<Self::Item> { self.iterator.next() }
-        self.iterator.next()
-    }
 }
 
 struct NonAliasingBox<T>(*mut T);
 impl<T> Drop for NonAliasingBox<T> {
 	fn drop(&mut self) {
+		// TODO: figure out why this is necessary, but also this is sqlite so dont think
+		// i care that much. i tried checking commit history but couldn't find out why
+		// this was done.
+		#[allow(clippy::undocumented_unsafe_blocks)]
 		unsafe {
 			let _ = Box::from_raw(self.0);
 		};
@@ -61,23 +65,18 @@ impl Engine {
 		Ok(conn)
 	}
 
-    fn write_lock(&self) -> MutexGuard<'_, Connection> {
+	fn write_lock(&self) -> MutexGuard<'_, Connection> { self.writer.lock() }
-        self.writer.lock()
-    }
 
 	fn read_lock(&self) -> &Connection {
-        self.read_conn_tls
+		self.read_conn_tls.get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
 	}
 
 	fn read_lock_iterator(&self) -> &Connection {
-        self.read_iterator_conn_tls
+		self.read_iterator_conn_tls.get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
-            .get_or(|| Self::prepare_conn(&self.path, self.cache_size_per_thread).unwrap())
 	}
 
 	pub fn flush_wal(self: &Arc<Self>) -> Result<()> {
-        self.write_lock()
+		self.write_lock().pragma_update(Some(Main), "wal_checkpoint", "RESTART")?;
-            .pragma_update(Some(Main), "wal_checkpoint", "RESTART")?;
 		Ok(())
 	}
 }
@@ -88,11 +87,11 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 
 		// calculates cache-size per permanent connection
 		// 1. convert MB to KiB
-        // 2. divide by permanent connections + permanent iter connections + write connection
+		// 2. divide by permanent connections + permanent iter connections + write
+		//    connection
 		// 3. round down to nearest integer
-        let cache_size_per_thread: u32 = ((config.db_cache_capacity_mb * 1024.0)
+		let cache_size_per_thread: u32 =
-            / ((num_cpus::get().max(1) * 2) + 1) as f64)
+			((config.db_cache_capacity_mb * 1024.0) / ((num_cpus::get().max(1) * 2) + 1) as f64) as u32;
-            as u32;
 
 		let writer = Mutex::new(Engine::prepare_conn(&path, cache_size_per_thread)?);
 
@@ -108,7 +107,10 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 	}
 
 	fn open_tree(&self, name: &str) -> Result<Arc<dyn KvTree>> {
-        self.write_lock().execute(&format!("CREATE TABLE IF NOT EXISTS {name} ( \"key\" BLOB PRIMARY KEY, \"value\" BLOB NOT NULL )"), [])?;
+		self.write_lock().execute(
+			&format!("CREATE TABLE IF NOT EXISTS {name} ( \"key\" BLOB PRIMARY KEY, \"value\" BLOB NOT NULL )"),
+			[],
+		)?;
 
 		Ok(Arc::new(SqliteTable {
 			engine: Arc::clone(self),
@@ -122,9 +124,7 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 		Ok(())
 	}
 
-    fn cleanup(&self) -> Result<()> {
+	fn cleanup(&self) -> Result<()> { self.flush_wal() }
-        self.flush_wal()
-    }
 }
 
 pub struct SqliteTable {
@@ -145,27 +145,15 @@ impl SqliteTable {
 
 	fn insert_with_guard(&self, guard: &Connection, key: &[u8], value: &[u8]) -> Result<()> {
 		guard.execute(
-            format!(
+			format!("INSERT OR REPLACE INTO {} (key, value) VALUES (?, ?)", self.name).as_str(),
-                "INSERT OR REPLACE INTO {} (key, value) VALUES (?, ?)",
-                self.name
-            )
-            .as_str(),
 			[key, value],
 		)?;
 		Ok(())
 	}
 
-    pub fn iter_with_guard<'a>(
+	pub fn iter_with_guard<'a>(&'a self, guard: &'a Connection) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        &'a self,
-        guard: &'a Connection,
-    ) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
 		let statement = Box::leak(Box::new(
-            guard
+			guard.prepare(&format!("SELECT key, value FROM {} ORDER BY key ASC", &self.name)).unwrap(),
-                .prepare(&format!(
-                    "SELECT key, value FROM {} ORDER BY key ASC",
-                    &self.name
-                ))
-                .unwrap(),
 		));
 
 		let statement_ref = NonAliasingBox(statement);
@@ -176,7 +164,7 @@ impl SqliteTable {
 			statement
 				.query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
 				.unwrap()
-                .map(move |r| r.unwrap()),
+				.map(std::result::Result::unwrap),
 		);
 
 		Box::new(PreparedStatementIterator {
@@ -187,9 +175,7 @@ impl SqliteTable {
 }
 
 impl KvTree for SqliteTable {
-    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
+	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> { self.get_with_guard(self.engine.read_lock(), key) }
-        self.get_with_guard(self.engine.read_lock(), key)
-    }
 
 	fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
 		let guard = self.engine.write_lock();
@@ -199,7 +185,7 @@ impl KvTree for SqliteTable {
 		Ok(())
 	}
 
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+	fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
 		let guard = self.engine.write_lock();
 
 		guard.execute("BEGIN", [])?;
@@ -213,14 +199,13 @@ impl KvTree for SqliteTable {
 		Ok(())
 	}
 
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+	fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
 		let guard = self.engine.write_lock();
 
 		guard.execute("BEGIN", [])?;
 		for key in iter {
 			let old = self.get_with_guard(&guard, &key)?;
-            let new = crate::utils::increment(old.as_deref())
+			let new = crate::utils::increment(old.as_deref()).expect("utils::increment always returns Some");
-                .expect("utils::increment always returns Some");
 			self.insert_with_guard(&guard, &key, &new)?;
 		}
 		guard.execute("COMMIT", [])?;
@@ -233,10 +218,7 @@ impl KvTree for SqliteTable {
 	fn remove(&self, key: &[u8]) -> Result<()> {
 		let guard = self.engine.write_lock();
 
-        guard.execute(
+		guard.execute(format!("DELETE FROM {} WHERE key = ?", self.name).as_str(), [key])?;
-            format!("DELETE FROM {} WHERE key = ?", self.name).as_str(),
-            [key],
-        )?;
 
 		Ok(())
 	}
@@ -247,11 +229,7 @@ impl KvTree for SqliteTable {
 		self.iter_with_guard(guard)
 	}
 
-    fn iter_from<'a>(
+	fn iter_from<'a>(&'a self, from: &[u8], backwards: bool) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        &'a self,
-        from: &[u8],
-        backwards: bool,
-    ) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
 		let guard = self.engine.read_lock_iterator();
 		let from = from.to_vec(); // TODO change interface?
 
@@ -273,7 +251,7 @@ impl KvTree for SqliteTable {
 				statement
 					.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
 					.unwrap()
-                    .map(move |r| r.unwrap()),
+					.map(std::result::Result::unwrap),
 			);
 			Box::new(PreparedStatementIterator {
 				iterator,
@@ -295,7 +273,7 @@ impl KvTree for SqliteTable {
 				statement
 					.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
 					.unwrap()
-                    .map(move |r| r.unwrap()),
+					.map(std::result::Result::unwrap),
 			);
 
 			Box::new(PreparedStatementIterator {
@@ -310,8 +288,7 @@ impl KvTree for SqliteTable {
 
 		let old = self.get_with_guard(&guard, key)?;
 
-        let new =
+		let new = crate::utils::increment(old.as_deref()).expect("utils::increment always returns Some");
-            crate::utils::increment(old.as_deref()).expect("utils::increment always returns Some");
 
 		self.insert_with_guard(&guard, key, &new)?;
 
@@ -319,10 +296,7 @@ impl KvTree for SqliteTable {
 	}
 
 	fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = TupleOfBytes> + 'a> {
-        Box::new(
+		Box::new(self.iter_from(&prefix, false).take_while(move |(key, _)| key.starts_with(&prefix)))
-            self.iter_from(&prefix, false)
-                .take_while(move |(key, _)| key.starts_with(&prefix)),
-        )
 	}
 
 	fn watch_prefix<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
@@ -331,9 +305,7 @@ impl KvTree for SqliteTable {
 
 	fn clear(&self) -> Result<()> {
 		debug!("clear: running");
-        self.engine
+		self.engine.write_lock().execute(format!("DELETE FROM {}", self.name).as_str(), [])?;
-            .write_lock()
-            .execute(format!("DELETE FROM {}", self.name).as_str(), [])?;
 		debug!("clear: ran");
 		Ok(())
 	}

src/database/abstraction/watchers.rs

@@ -4,6 +4,7 @@ use std::{
 	pin::Pin,
 	sync::RwLock,
 };
+
 use tokio::sync::watch;
 
 type Watcher = RwLock<HashMap<Vec<u8>, (watch::Sender<()>, watch::Receiver<()>)>>;
@@ -14,17 +15,14 @@ pub(super) struct Watchers {
 }
 
 impl Watchers {
-    pub(super) fn watch<'a>(
+	pub(super) fn watch<'a>(&'a self, prefix: &[u8]) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
-        &'a self,
-        prefix: &[u8],
-    ) -> Pin<Box<dyn Future<Output = ()> + Send + 'a>> {
 		let mut rx = match self.watchers.write().unwrap().entry(prefix.to_vec()) {
 			hash_map::Entry::Occupied(o) => o.get().1.clone(),
 			hash_map::Entry::Vacant(v) => {
-                let (tx, rx) = tokio::sync::watch::channel(());
+				let (tx, rx) = watch::channel(());
 				v.insert((tx, rx.clone()));
 				rx
-            }
+			},
 		};
 
 		Box::pin(async move {
@@ -32,6 +30,7 @@ impl Watchers {
 			rx.changed().await.unwrap();
 		})
 	}
+
 	pub(super) fn wake(&self, key: &[u8]) {
 		let watchers = self.watchers.read().unwrap();
 		let mut triggered = Vec::new();

src/database/key_value/account_data.rs

@@ -11,27 +11,21 @@ use tracing::warn;
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::account_data::Data for KeyValueDatabase {
-    /// Places one event in the account data of the user and removes the previous entry.
+	/// Places one event in the account data of the user and removes the
+	/// previous entry.
 	#[tracing::instrument(skip(self, room_id, user_id, event_type, data))]
 	fn update(
-        &self,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, event_type: RoomAccountDataEventType,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        event_type: RoomAccountDataEventType,
 		data: &serde_json::Value,
 	) -> Result<()> {
-        let mut prefix = room_id
+		let mut prefix = room_id.map(ToString::to_string).unwrap_or_default().as_bytes().to_vec();
-            .map(|r| r.to_string())
+		prefix.push(0xFF);
-            .unwrap_or_default()
-            .as_bytes()
-            .to_vec();
-        prefix.push(0xff);
 		prefix.extend_from_slice(user_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let mut roomuserdataid = prefix.clone();
 		roomuserdataid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
-        roomuserdataid.push(0xff);
+		roomuserdataid.push(0xFF);
 		roomuserdataid.extend_from_slice(event_type.to_string().as_bytes());
 
 		let mut key = prefix;
@@ -51,8 +45,7 @@ impl service::account_data::Data for KeyValueDatabase {
 
 		let prev = self.roomusertype_roomuserdataid.get(&key)?;
 
-        self.roomusertype_roomuserdataid
+		self.roomusertype_roomuserdataid.insert(&key, &roomuserdataid)?;
-            .insert(&key, &roomuserdataid)?;
 
 		// Remove old entry
 		if let Some(prev) = prev {
@@ -65,54 +58,33 @@ impl service::account_data::Data for KeyValueDatabase {
 	/// Searches the account data for a specific kind.
 	#[tracing::instrument(skip(self, room_id, user_id, kind))]
 	fn get(
-        &self,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, kind: RoomAccountDataEventType,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        kind: RoomAccountDataEventType,
 	) -> Result<Option<Box<serde_json::value::RawValue>>> {
-        let mut key = room_id
+		let mut key = room_id.map(ToString::to_string).unwrap_or_default().as_bytes().to_vec();
-            .map(|r| r.to_string())
+		key.push(0xFF);
-            .unwrap_or_default()
-            .as_bytes()
-            .to_vec();
-        key.push(0xff);
 		key.extend_from_slice(user_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(kind.to_string().as_bytes());
 
 		self.roomusertype_roomuserdataid
 			.get(&key)?
-            .and_then(|roomuserdataid| {
+			.and_then(|roomuserdataid| self.roomuserdataid_accountdata.get(&roomuserdataid).transpose())
-                self.roomuserdataid_accountdata
-                    .get(&roomuserdataid)
-                    .transpose()
-            })
 			.transpose()?
-            .map(|data| {
+			.map(|data| serde_json::from_slice(&data).map_err(|_| Error::bad_database("could not deserialize")))
-                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,
+		&self, room_id: Option<&RoomId>, user_id: &UserId, since: u64,
-        room_id: Option<&RoomId>,
-        user_id: &UserId,
-        since: u64,
 	) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {
 		let mut userdata = HashMap::new();
 
-        let mut prefix = room_id
+		let mut prefix = room_id.map(ToString::to_string).unwrap_or_default().as_bytes().to_vec();
-            .map(|r| r.to_string())
+		prefix.push(0xFF);
-            .unwrap_or_default()
-            .as_bytes()
-            .to_vec();
-        prefix.push(0xff);
 		prefix.extend_from_slice(user_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		// Skip the data that's exactly at since, because we sent that last time
 		let mut first_possible = prefix.clone();
@@ -125,20 +97,20 @@ impl service::account_data::Data for KeyValueDatabase {
 			.map(|(k, v)| {
 				Ok::<_, Error>((
 					RoomAccountDataEventType::from(
-                        utils::string_from_bytes(k.rsplit(|&b| b == 0xff).next().ok_or_else(
+						utils::string_from_bytes(
-                            || Error::bad_database("RoomUserData ID in db is invalid."),
+							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(|_| {
+					serde_json::from_slice::<Raw<AnyEphemeralRoomEvent>>(&v)
-                        Error::bad_database("Database contains invalid account data.")
+						.map_err(|_| Error::bad_database("Database contains invalid account data."))?,
-                    })?,
 				))
-            })
+			}) {
-        {
 			let (kind, data) = r?;
 			userdata.insert(kind, data);
 		}

src/database/key_value/appservice.rs

@@ -6,14 +6,8 @@ impl service::appservice::Data for KeyValueDatabase {
 	/// Registers an appservice and returns the ID to the caller
 	fn register_appservice(&self, yaml: Registration) -> Result<String> {
 		let id = yaml.id.as_str();
-        self.id_appserviceregistrations.insert(
+		self.id_appserviceregistrations.insert(id.as_bytes(), serde_yaml::to_string(&yaml).unwrap().as_bytes())?;
-            id.as_bytes(),
+		self.cached_registrations.write().unwrap().insert(id.to_owned(), yaml.clone());
-            serde_yaml::to_string(&yaml).unwrap().as_bytes(),
-        )?;
-        self.cached_registrations
-            .write()
-            .unwrap()
-            .insert(id.to_owned(), yaml.to_owned());
 
 		Ok(id.to_owned())
 	}
@@ -24,29 +18,19 @@ impl service::appservice::Data for KeyValueDatabase {
 	///
 	/// * `service_name` - the name you send to register the service previously
 	fn unregister_appservice(&self, service_name: &str) -> Result<()> {
-        self.id_appserviceregistrations
+		self.id_appserviceregistrations.remove(service_name.as_bytes())?;
-            .remove(service_name.as_bytes())?;
+		self.cached_registrations.write().unwrap().remove(service_name);
-        self.cached_registrations
-            .write()
-            .unwrap()
-            .remove(service_name);
 		Ok(())
 	}
 
 	fn get_registration(&self, id: &str) -> Result<Option<Registration>> {
-        self.cached_registrations
+		self.cached_registrations.read().unwrap().get(id).map_or_else(
-            .read()
-            .unwrap()
-            .get(id)
-            .map_or_else(
 			|| {
 				self.id_appserviceregistrations
 					.get(id.as_bytes())?
 					.map(|bytes| {
 						serde_yaml::from_slice(&bytes).map_err(|_| {
-                                Error::bad_database(
+							Error::bad_database("Invalid registration bytes in id_appserviceregistrations.")
-                                    "Invalid registration bytes in id_appserviceregistrations.",
-                                )
 						})
 					})
 					.transpose()
@@ -56,23 +40,19 @@ impl service::appservice::Data for KeyValueDatabase {
 	}
 
 	fn iter_ids<'a>(&'a self) -> Result<Box<dyn Iterator<Item = Result<String>> + 'a>> {
-        Ok(Box::new(self.id_appserviceregistrations.iter().map(
+		Ok(Box::new(self.id_appserviceregistrations.iter().map(|(id, _)| {
-            |(id, _)| {
+			utils::string_from_bytes(&id)
-                utils::string_from_bytes(&id).map_err(|_| {
+				.map_err(|_| Error::bad_database("Invalid id bytes in id_appserviceregistrations."))
-                    Error::bad_database("Invalid id bytes in id_appserviceregistrations.")
+		})))
-                })
-            },
-        )))
 	}
 
 	fn all(&self) -> Result<Vec<(String, Registration)>> {
 		self.iter_ids()?
-            .filter_map(|id| id.ok())
+			.filter_map(std::result::Result::ok)
 			.map(move |id| {
 				Ok((
 					id.clone(),
-                    self.get_registration(&id)?
+					self.get_registration(&id)?.expect("iter_ids only returns appservices that exist"),
-                        .expect("iter_ids only returns appservices that exist"),
 				))
 			})
 			.collect()

src/database/key_value/globals.rs

@@ -8,6 +8,7 @@ use ruma::{
 	signatures::Ed25519KeyPair,
 	DeviceId, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, ServerName, UserId,
 };
+use tracing::debug;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
@@ -23,36 +24,32 @@ impl service::globals::Data for KeyValueDatabase {
 
 	fn current_count(&self) -> Result<u64> {
 		self.global.get(COUNTER)?.map_or(Ok(0_u64), |bytes| {
-            utils::u64_from_bytes(&bytes)
+			utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Count has invalid bytes."))
-                .map_err(|_| Error::bad_database("Count has invalid bytes."))
 		})
 	}
 
 	fn last_check_for_updates_id(&self) -> Result<u64> {
-        self.global
+		self.global.get(LAST_CHECK_FOR_UPDATES_COUNT)?.map_or(Ok(0_u64), |bytes| {
-            .get(LAST_CHECK_FOR_UPDATES_COUNT)?
+			utils::u64_from_bytes(&bytes)
-            .map_or(Ok(0_u64), |bytes| {
+				.map_err(|_| Error::bad_database("last check for updates count has invalid bytes."))
-                utils::u64_from_bytes(&bytes).map_err(|_| {
-                    Error::bad_database("last check for updates count has invalid bytes.")
-                })
 		})
 	}
 
 	fn update_check_for_updates_id(&self, id: u64) -> Result<()> {
-        self.global
+		self.global.insert(LAST_CHECK_FOR_UPDATES_COUNT, &id.to_be_bytes())?;
-            .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);
+		userid_prefix.push(0xFF);
 
 		let mut userdeviceid_prefix = userid_prefix.clone();
 		userdeviceid_prefix.extend_from_slice(device_id.as_bytes());
-        userdeviceid_prefix.push(0xff);
+		userdeviceid_prefix.push(0xFF);
 
 		let mut futures = FuturesUnordered::new();
 
@@ -63,19 +60,11 @@ impl service::globals::Data for KeyValueDatabase {
 		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(
+		futures.push(self.userroomid_notificationcount.watch_prefix(&userid_prefix));
-            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()
+		for room_id in services().rooms.state_cache.rooms_joined(user_id).filter_map(Result::ok) {
-            .rooms
-            .state_cache
-            .rooms_joined(user_id)
-            .filter_map(|r| r.ok())
-        {
 			let short_roomid = services()
 				.rooms
 				.short
@@ -88,7 +77,7 @@ impl service::globals::Data for KeyValueDatabase {
 
 			let roomid_bytes = room_id.as_bytes().to_vec();
 			let mut roomid_prefix = roomid_bytes.clone();
-            roomid_prefix.push(0xff);
+			roomid_prefix.push(0xFF);
 
 			// PDUs
 			futures.push(self.pduid_pdu.watch_prefix(&short_roomid));
@@ -105,19 +94,13 @@ impl service::globals::Data for KeyValueDatabase {
 			let mut roomuser_prefix = roomid_prefix.clone();
 			roomuser_prefix.extend_from_slice(&userid_prefix);
 
-            futures.push(
+			futures.push(self.roomusertype_roomuserdataid.watch_prefix(&roomuser_prefix));
-                self.roomusertype_roomuserdataid
-                    .watch_prefix(&roomuser_prefix),
-            );
 		}
 
-        let mut globaluserdata_prefix = vec![0xff];
+		let mut globaluserdata_prefix = vec![0xFF];
 		globaluserdata_prefix.extend_from_slice(&userid_prefix);
 
-        futures.push(
+		futures.push(self.roomusertype_roomuserdataid.watch_prefix(&globaluserdata_prefix));
-            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));
@@ -133,9 +116,9 @@ impl service::globals::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn cleanup(&self) -> Result<()> {
+	fn cleanup(&self) -> Result<()> { self.db.cleanup() }
-        self._db.cleanup()
+
-    }
+	fn flush(&self) -> Result<()> { self.db.flush() }
 
 	fn memory_usage(&self) -> String {
 		let pdu_cache = self.pdu_cache.lock().unwrap().len();
@@ -158,7 +141,7 @@ our_real_users_cache: {our_real_users_cache}
 appservice_in_room_cache: {appservice_in_room_cache}
 lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 		);
-        if let Ok(db_stats) = self._db.memory_usage() {
+		if let Ok(db_stats) = self.db.memory_usage() {
 			response += &db_stats;
 		}
 
@@ -203,23 +186,24 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 	fn load_keypair(&self) -> Result<Ed25519KeyPair> {
 		let keypair_bytes = self.global.get(b"keypair")?.map_or_else(
 			|| {
+				debug!("No keypair found in database, assuming this is a new deployment and generating one.");
 				let keypair = utils::generate_keypair();
+				debug!("Generated keypair bytes: {:?}", keypair);
 				self.global.insert(b"keypair", &keypair)?;
 				Ok::<_, Error>(keypair)
 			},
-            |s| Ok(s.to_vec()),
+			Ok,
 		)?;
 
-        let mut parts = keypair_bytes.splitn(2, |&b| b == 0xff);
+		let mut parts = keypair_bytes.splitn(2, |&b| b == 0xFF);
 
 		utils::string_from_bytes(
 			// 1. version
-            parts
+			parts.next().expect("splitn always returns at least one element"),
-                .next()
-                .expect("splitn always returns at least one element"),
 		)
 		.map_err(|_| Error::bad_database("Invalid version bytes in keypair."))
 		.and_then(|version| {
+			debug!("Keypair version: {version}");
 			// 2. key
 			parts
 				.next()
@@ -227,25 +211,23 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 				.map(|key| (version, key))
 		})
 		.and_then(|(version, key)| {
-            Ed25519KeyPair::from_der(key, version)
+			debug!("Keypair bytes: {:?}", key);
-                .map_err(|_| Error::bad_database("Private or public keys are invalid."))
+			let keypair = Ed25519KeyPair::from_der(key, version)
+				.map_err(|_| Error::bad_database("Private or public keys are invalid."));
+			debug!("Private and public key: {keypair:?}");
+			keypair
 		})
 	}
-    fn remove_keypair(&self) -> Result<()> {
+
-        self.global.remove(b"keypair")
+	fn remove_keypair(&self) -> Result<()> { self.global.remove(b"keypair") }
-    }
 
 	fn add_signing_key(
-        &self,
+		&self, origin: &ServerName, new_keys: ServerSigningKeys,
-        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
+		let mut keys = signingkeys.and_then(|keys| serde_json::from_slice(&keys).ok()).unwrap_or_else(|| {
-            .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())
 		});
@@ -265,31 +247,21 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 		)?;
 
 		let mut tree = keys.verify_keys;
-        tree.extend(
+		tree.extend(keys.old_verify_keys.into_iter().map(|old| (old.0, VerifyKey::new(old.1.key))));
-            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.
+	/// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
-    fn signing_keys_for(
+	/// for the server.
-        &self,
+	fn signing_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
-        origin: &ServerName,
-    ) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
 		let signingkeys = self
 			.server_signingkeys
 			.get(origin.as_bytes())?
 			.and_then(|bytes| serde_json::from_slice(&bytes).ok())
 			.map(|keys: ServerSigningKeys| {
 				let mut tree = keys.verify_keys;
-                tree.extend(
+				tree.extend(keys.old_verify_keys.into_iter().map(|old| (old.0, VerifyKey::new(old.1.key))));
-                    keys.old_verify_keys
-                        .into_iter()
-                        .map(|old| (old.0, VerifyKey::new(old.1.key))),
-                );
 				tree
 			})
 			.unwrap_or_else(BTreeMap::new);
@@ -299,8 +271,7 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n"
 
 	fn database_version(&self) -> Result<u64> {
 		self.global.get(b"version")?.map_or(Ok(0), |version| {
-            utils::u64_from_bytes(&version)
+			utils::u64_from_bytes(&version).map_err(|_| Error::bad_database("Database version id is invalid."))
-                .map_err(|_| Error::bad_database("Database version id is invalid."))
 		})
 	}
 

src/database/key_value/key_backups.rs

@@ -12,35 +12,30 @@ use ruma::{
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::key_backups::Data for KeyValueDatabase {
-    fn create_backup(
+	fn create_backup(&self, user_id: &UserId, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
-        &self,
-        user_id: &UserId,
-        backup_metadata: &Raw<BackupAlgorithm>,
-    ) -> Result<String> {
 		let version = services().globals.next_count()?.to_string();
 
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
 		self.backupid_algorithm.insert(
 			&key,
 			&serde_json::to_vec(backup_metadata).expect("BackupAlgorithm::to_vec always works"),
 		)?;
-        self.backupid_etag
+		self.backupid_etag.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
-            .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.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
 		self.backupid_algorithm.remove(&key)?;
 		self.backupid_etag.remove(&key)?;
 
-        key.push(0xff);
+		key.push(0xFF);
 
 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -49,33 +44,23 @@ impl service::key_backups::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn update_backup(
+	fn update_backup(&self, user_id: &UserId, version: &str, backup_metadata: &Raw<BackupAlgorithm>) -> Result<String> {
-        &self,
-        user_id: &UserId,
-        version: &str,
-        backup_metadata: &Raw<BackupAlgorithm>,
-    ) -> Result<String> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
 		if self.backupid_algorithm.get(&key)?.is_none() {
-            return Err(Error::BadRequest(
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
-                ErrorKind::NotFound,
-                "Tried to update nonexistent backup.",
-            ));
 		}
 
-        self.backupid_algorithm
+		self.backupid_algorithm.insert(&key, backup_metadata.json().get().as_bytes())?;
-            .insert(&key, backup_metadata.json().get().as_bytes())?;
+		self.backupid_etag.insert(&key, &services().globals.next_count()?.to_be_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);
+		prefix.push(0xFF);
 		let mut last_possible_key = prefix.clone();
 		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
 
@@ -84,22 +69,15 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.take_while(move |(k, _)| k.starts_with(&prefix))
 			.next()
 			.map(|(key, _)| {
-                utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                    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(
+	fn get_latest_backup(&self, user_id: &UserId) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
-        &self,
-        user_id: &UserId,
-    ) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		let mut last_possible_key = prefix.clone();
 		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
 
@@ -109,17 +87,14 @@ impl service::key_backups::Data for KeyValueDatabase {
 			.next()
 			.map(|(key, value)| {
 				let version = utils::string_from_bytes(
-                    key.rsplit(|&b| b == 0xff)
+					key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"),
-                        .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(|_| {
+					serde_json::from_slice(&value)
-                        Error::bad_database("Algorithm in backupid_algorithm is invalid.")
+						.map_err(|_| Error::bad_database("Algorithm in backupid_algorithm is invalid."))?,
-                    })?,
 				))
 			})
 			.transpose()
@@ -127,53 +102,41 @@ impl service::key_backups::Data for KeyValueDatabase {
 
 	fn get_backup(&self, user_id: &UserId, version: &str) -> Result<Option<Raw<BackupAlgorithm>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
-        self.backupid_algorithm
+		self.backupid_algorithm.get(&key)?.map_or(Ok(None), |bytes| {
-            .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,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str, key_data: &Raw<KeyBackupData>,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
-        key_data: &Raw<KeyBackupData>,
 	) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
 		if self.backupid_algorithm.get(&key)?.is_none() {
-            return Err(Error::BadRequest(
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Tried to update nonexistent backup."));
-                ErrorKind::NotFound,
-                "Tried to update nonexistent backup.",
-            ));
 		}
 
-        self.backupid_etag
+		self.backupid_etag.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
-            .insert(&key, &services().globals.next_count()?.to_be_bytes())?;
 
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());
 
-        self.backupkeyid_backup
+		self.backupkeyid_backup.insert(&key, key_data.json().get().as_bytes())?;
-            .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.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());
 
 		Ok(self.backupkeyid_backup.scan_prefix(prefix).count())
@@ -181,62 +144,45 @@ impl service::key_backups::Data for KeyValueDatabase {
 
 	fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
 
 		Ok(utils::u64_from_bytes(
-            &self
+			&self.backupid_etag.get(&key)?.ok_or_else(|| Error::bad_database("Backup has no etag."))?,
-                .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(
+	fn get_all(&self, user_id: &UserId, version: &str) -> Result<BTreeMap<OwnedRoomId, RoomKeyBackup>> {
-        &self,
-        user_id: &UserId,
-        version: &str,
-    ) -> Result<BTreeMap<OwnedRoomId, RoomKeyBackup>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let mut rooms = BTreeMap::<OwnedRoomId, RoomKeyBackup>::new();
 
-        for result in self
+		for result in self.backupkeyid_backup.scan_prefix(prefix).map(|(key, value)| {
-            .backupkeyid_backup
+			let mut parts = key.rsplit(|&b| b == 0xFF);
-            .scan_prefix(prefix)
-            .map(|(key, value)| {
-                let mut parts = key.rsplit(|&b| b == 0xff);
 
-                let session_id =
+			let session_id = utils::string_from_bytes(
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
+				parts.next().ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
-                        Error::bad_database("backupkeyid_backup key is invalid.")
+			)
-                    })?)
+			.map_err(|_| Error::bad_database("backupkeyid_backup session_id 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(|| {
+				utils::string_from_bytes(
-                        Error::bad_database("backupkeyid_backup key is invalid.")
+					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(|_| {
+			.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid room id."))?;
-                    Error::bad_database("backupkeyid_backup room_id is invalid room id.")
-                })?;
 
-                let key_data = serde_json::from_slice(&value).map_err(|_| {
+			let key_data = serde_json::from_slice(&value)
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
+				.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;
-                })?;
 
 			Ok::<_, Error>((room_id, session_id, key_data))
-            })
+		}) {
-        {
 			let (room_id, session_id, key_data) = result?;
 			rooms
 				.entry(room_id)
@@ -251,72 +197,60 @@ impl service::key_backups::Data for KeyValueDatabase {
 	}
 
 	fn get_room(
-        &self,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
 	) -> Result<BTreeMap<String, Raw<KeyBackupData>>> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(version.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(room_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Ok(self
 			.backupkeyid_backup
 			.scan_prefix(prefix)
 			.map(|(key, value)| {
-                let mut parts = key.rsplit(|&b| b == 0xff);
+				let mut parts = key.rsplit(|&b| b == 0xFF);
 
-                let session_id =
+				let session_id = utils::string_from_bytes(
-                    utils::string_from_bytes(parts.next().ok_or_else(|| {
+					parts.next().ok_or_else(|| Error::bad_database("backupkeyid_backup key is invalid."))?,
-                        Error::bad_database("backupkeyid_backup key is invalid.")
+				)
-                    })?)
+				.map_err(|_| Error::bad_database("backupkeyid_backup session_id is invalid."))?;
-                    .map_err(|_| {
-                        Error::bad_database("backupkeyid_backup session_id is invalid.")
-                    })?;
 
-                let key_data = serde_json::from_slice(&value).map_err(|_| {
+				let key_data = serde_json::from_slice(&value)
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))?;
-                })?;
 
 				Ok::<_, Error>((session_id, key_data))
 			})
-            .filter_map(|r| r.ok())
+			.filter_map(std::result::Result::ok)
 			.collect())
 	}
 
 	fn get_session(
-        &self,
+		&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
 	) -> Result<Option<Raw<KeyBackupData>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());
 
 		self.backupkeyid_backup
 			.get(&key)?
 			.map(|value| {
-                serde_json::from_slice(&value).map_err(|_| {
+				serde_json::from_slice(&value)
-                    Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
+					.map_err(|_| Error::bad_database("KeyBackupData in backupkeyid_backup is invalid."))
-                })
 			})
 			.transpose()
 	}
 
 	fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 
 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -327,11 +261,11 @@ impl service::key_backups::Data for KeyValueDatabase {
 
 	fn delete_room_keys(&self, user_id: &UserId, version: &str, room_id: &RoomId) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 
 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
 			self.backupkeyid_backup.remove(&outdated_key)?;
@@ -340,19 +274,13 @@ impl service::key_backups::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn delete_room_key(
+	fn delete_room_key(&self, user_id: &UserId, version: &str, room_id: &RoomId, session_id: &str) -> Result<()> {
-        &self,
-        user_id: &UserId,
-        version: &str,
-        room_id: &RoomId,
-        session_id: &str,
-    ) -> Result<()> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(version.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(session_id.as_bytes());
 
 		for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {

src/database/key_value/media.rs

@@ -1,55 +1,95 @@
 use ruma::api::client::error::ErrorKind;
+use tracing::debug;
 
 use crate::{
 	database::KeyValueDatabase,
 	service::{self, media::UrlPreviewData},
-    utils, Error, Result,
+	utils::string_from_bytes,
+	Error, Result,
 };
 
 impl service::media::Data for KeyValueDatabase {
 	fn create_file_metadata(
-        &self,
+		&self, sender_user: Option<&str>, mxc: String, width: u32, height: u32, content_disposition: 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.push(0xFF);
 		key.extend_from_slice(&width.to_be_bytes());
 		key.extend_from_slice(&height.to_be_bytes());
-        key.push(0xff);
+		key.push(0xFF);
-        key.extend_from_slice(
+		key.extend_from_slice(content_disposition.as_ref().map(|f| f.as_bytes()).unwrap_or_default());
-            content_disposition
+		key.push(0xFF);
-                .as_ref()
+		key.extend_from_slice(content_type.as_ref().map(|c| c.as_bytes()).unwrap_or_default());
-                .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,
+		&self, mxc: String, width: u32, height: u32,
-        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.push(0xFF);
 		prefix.extend_from_slice(&width.to_be_bytes());
 		prefix.extend_from_slice(&height.to_be_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let (key, _) = self
 			.mediaid_file
@@ -57,71 +97,58 @@ impl service::media::Data for KeyValueDatabase {
 			.next()
 			.ok_or(Error::BadRequest(ErrorKind::NotFound, "Media not found"))?;
 
-        let mut parts = key.rsplit(|&b| b == 0xff);
+		let mut parts = key.rsplit(|&b| b == 0xFF);
 
 		let content_type = parts
 			.next()
 			.map(|bytes| {
-                utils::string_from_bytes(bytes).map_err(|_| {
+				string_from_bytes(bytes)
-                    Error::bad_database("Content type in mediaid_file is invalid unicode.")
+					.map_err(|_| Error::bad_database("Content type in mediaid_file is invalid unicode."))
-                })
 			})
 			.transpose()?;
 
-        let content_disposition_bytes = parts
+		let content_disposition_bytes =
-            .next()
+			parts.next().ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?;
-            .ok_or_else(|| Error::bad_database("Media ID in db is invalid."))?;
 
 		let content_disposition = if content_disposition_bytes.is_empty() {
 			None
 		} else {
 			Some(
-                utils::string_from_bytes(content_disposition_bytes).map_err(|_| {
+				string_from_bytes(content_disposition_bytes)
-                    Error::bad_database("Content Disposition in mediaid_file is invalid unicode.")
+					.map_err(|_| Error::bad_database("Content Disposition in mediaid_file is invalid unicode."))?,
-                })?,
 			)
 		};
 		Ok((content_disposition, content_type, key))
 	}
 
-    fn remove_url_preview(&self, url: &str) -> Result<()> {
+	/// Gets all the media keys in our database (this includes all the metadata
-        self.url_previews.remove(url.as_bytes())
+	/// 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);
 		}
 
-    fn set_url_preview(
+		Ok(keys)
-        &self,
+	}
-        url: &str,
+
-        data: &UrlPreviewData,
+	fn remove_url_preview(&self, url: &str) -> Result<()> { self.url_previews.remove(url.as_bytes()) }
-        timestamp: std::time::Duration,
+
-    ) -> Result<()> {
+	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.push(0xFF);
-        value.extend_from_slice(
+		value.extend_from_slice(data.title.as_ref().map(String::as_bytes).unwrap_or_default());
-            data.title
+		value.push(0xFF);
-                .as_ref()
+		value.extend_from_slice(data.description.as_ref().map(String::as_bytes).unwrap_or_default());
-                .map(|t| t.as_bytes())
+		value.push(0xFF);
-                .unwrap_or_default(),
+		value.extend_from_slice(data.image.as_ref().map(String::as_bytes).unwrap_or_default());
-        );
+		value.push(0xFF);
-        value.push(0xff);
-        value.extend_from_slice(
-            data.description
-                .as_ref()
-                .map(|d| d.as_bytes())
-                .unwrap_or_default(),
-        );
-        value.push(0xff);
-        value.extend_from_slice(
-            data.image
-                .as_ref()
-                .map(|i| i.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.push(0xFF);
 		value.extend_from_slice(&data.image_width.unwrap_or(0).to_be_bytes());
-        value.push(0xff);
+		value.push(0xFF);
 		value.extend_from_slice(&data.image_height.unwrap_or(0).to_be_bytes());
 
 		self.url_previews.insert(url.as_bytes(), &value)
@@ -130,54 +157,36 @@ impl service::media::Data for KeyValueDatabase {
 	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 mut values = values.split(|&b| b == 0xFF);
 
-        let _ts = match values
+		let _ts = values.next();
-            .next()
+		/* if we ever decide to use timestamp, this is here.
-            .map(|b| u64::from_be_bytes(b.try_into().expect("valid BE array")))
+		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()
+		let title = match values.next().and_then(|b| String::from_utf8(b.to_vec()).ok()) {
-            .and_then(|b| String::from_utf8(b.to_vec()).ok())
-        {
 			Some(s) if s.is_empty() => None,
 			x => x,
 		};
-        let description = match values
+		let description = match values.next().and_then(|b| String::from_utf8(b.to_vec()).ok()) {
-            .next()
-            .and_then(|b| String::from_utf8(b.to_vec()).ok())
-        {
 			Some(s) if s.is_empty() => None,
 			x => x,
 		};
-        let image = match values
+		let image = match values.next().and_then(|b| String::from_utf8(b.to_vec()).ok()) {
-            .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
+		let image_size = match values.next().map(|b| usize::from_be_bytes(b.try_into().unwrap_or_default())) {
-            .next()
-            .map(|b| usize::from_be_bytes(b.try_into().expect("valid BE array")))
-        {
 			Some(0) => None,
 			x => x,
 		};
-        let image_width = match values
+		let image_width = match values.next().map(|b| u32::from_be_bytes(b.try_into().unwrap_or_default())) {
-            .next()
-            .map(|b| u32::from_be_bytes(b.try_into().expect("valid BE array")))
-        {
 			Some(0) => None,
 			x => x,
 		};
-        let image_height = match values
+		let image_height = match values.next().map(|b| u32::from_be_bytes(b.try_into().unwrap_or_default())) {
-            .next()
-            .map(|b| u32::from_be_bytes(b.try_into().expect("valid BE array")))
-        {
 			Some(0) => None,
 			x => x,
 		};

src/database/key_value/pusher.rs

@@ -10,66 +10,50 @@ impl service::pusher::Data for KeyValueDatabase {
 		match &pusher {
 			set_pusher::v3::PusherAction::Post(data) => {
 				let mut key = sender.as_bytes().to_vec();
-                key.push(0xff);
+				key.push(0xFF);
 				key.extend_from_slice(data.pusher.ids.pushkey.as_bytes());
-                self.senderkey_pusher.insert(
+				self.senderkey_pusher
-                    &key,
+					.insert(&key, &serde_json::to_vec(&pusher).expect("Pusher is valid JSON value"))?;
-                    &serde_json::to_vec(&pusher).expect("Pusher is valid JSON value"),
-                )?;
 				Ok(())
-            }
+			},
 			set_pusher::v3::PusherAction::Delete(ids) => {
 				let mut key = sender.as_bytes().to_vec();
-                key.push(0xff);
+				key.push(0xFF);
 				key.extend_from_slice(ids.pushkey.as_bytes());
-                self.senderkey_pusher
+				self.senderkey_pusher.remove(&key).map(|_| ()).map_err(Into::into)
-                    .remove(&key)
+			},
-                    .map(|_| ())
-                    .map_err(Into::into)
-            }
 		}
 	}
 
 	fn get_pusher(&self, sender: &UserId, pushkey: &str) -> Result<Option<Pusher>> {
 		let mut senderkey = sender.as_bytes().to_vec();
-        senderkey.push(0xff);
+		senderkey.push(0xFF);
 		senderkey.extend_from_slice(pushkey.as_bytes());
 
 		self.senderkey_pusher
 			.get(&senderkey)?
-            .map(|push| {
+			.map(|push| serde_json::from_slice(&push).map_err(|_| Error::bad_database("Invalid Pusher in db.")))
-                serde_json::from_slice(&push)
-                    .map_err(|_| Error::bad_database("Invalid Pusher in db."))
-            })
 			.transpose()
 	}
 
 	fn get_pushers(&self, sender: &UserId) -> Result<Vec<Pusher>> {
 		let mut prefix = sender.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		self.senderkey_pusher
 			.scan_prefix(prefix)
-            .map(|(_, push)| {
+			.map(|(_, push)| serde_json::from_slice(&push).map_err(|_| Error::bad_database("Invalid Pusher in db.")))
-                serde_json::from_slice(&push)
-                    .map_err(|_| Error::bad_database("Invalid Pusher in db."))
-            })
 			.collect()
 	}
 
-    fn get_pushkeys<'a>(
+	fn get_pushkeys<'a>(&'a self, sender: &UserId) -> Box<dyn Iterator<Item = Result<String>> + 'a> {
-        &'a self,
-        sender: &UserId,
-    ) -> Box<dyn Iterator<Item = Result<String>> + 'a> {
 		let mut prefix = sender.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Box::new(self.senderkey_pusher.scan_prefix(prefix).map(|(k, _)| {
-            let mut parts = k.splitn(2, |&b| b == 0xff);
+			let mut parts = k.splitn(2, |&b| b == 0xFF);
 			let _senderkey = parts.next();
-            let push_key = parts
+			let push_key = parts.next().ok_or_else(|| Error::bad_database("Invalid senderkey_pusher in db"))?;
-                .next()
-                .ok_or_else(|| Error::bad_database("Invalid senderkey_pusher in db"))?;
 			let push_key_string = utils::string_from_bytes(push_key)
 				.map_err(|_| Error::bad_database("Invalid pusher bytes in senderkey_pusher"))?;
 

src/database/key_value/rooms/alias.rs

@@ -4,10 +4,9 @@ use crate::{database::KeyValueDatabase, service, services, utils, Error, Result}
 
 impl service::rooms::alias::Data for KeyValueDatabase {
 	fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId) -> Result<()> {
-        self.alias_roomid
+		self.alias_roomid.insert(alias.alias().as_bytes(), room_id.as_bytes())?;
-            .insert(alias.alias().as_bytes(), room_id.as_bytes())?;
 		let mut aliasid = room_id.as_bytes().to_vec();
-        aliasid.push(0xff);
+		aliasid.push(0xFF);
 		aliasid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
 		self.aliasid_alias.insert(&aliasid, alias.as_bytes())?;
 		Ok(())
@@ -15,18 +14,15 @@ impl service::rooms::alias::Data for KeyValueDatabase {
 
 	fn remove_alias(&self, alias: &RoomAliasId) -> Result<()> {
 		if let Some(room_id) = self.alias_roomid.get(alias.alias().as_bytes())? {
-            let mut prefix = room_id.to_vec();
+			let mut prefix = room_id;
-            prefix.push(0xff);
+			prefix.push(0xFF);
 
 			for (key, _) in self.aliasid_alias.scan_prefix(prefix) {
 				self.aliasid_alias.remove(&key)?;
 			}
 			self.alias_roomid.remove(alias.alias().as_bytes())?;
 		} else {
-            return Err(Error::BadRequest(
+			return Err(Error::BadRequest(ErrorKind::NotFound, "Alias does not exist."));
-                ErrorKind::NotFound,
-                "Alias does not exist.",
-            ));
 		}
 		Ok(())
 	}
@@ -35,20 +31,20 @@ impl service::rooms::alias::Data for KeyValueDatabase {
 		self.alias_roomid
 			.get(alias.alias().as_bytes())?
 			.map(|bytes| {
-                RoomId::parse(utils::string_from_bytes(&bytes).map_err(|_| {
+				RoomId::parse(
-                    Error::bad_database("Room ID in alias_roomid is invalid unicode.")
+					utils::string_from_bytes(&bytes)
-                })?)
+						.map_err(|_| Error::bad_database("Room ID in alias_roomid is invalid unicode."))?,
+				)
 				.map_err(|_| Error::bad_database("Room ID in alias_roomid is invalid."))
 			})
 			.transpose()
 	}
 
 	fn local_aliases_for_room<'a>(
-        &'a self,
+		&'a self, room_id: &RoomId,
-        room_id: &RoomId,
 	) -> Box<dyn Iterator<Item = Result<OwnedRoomAliasId>> + 'a> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Box::new(self.aliasid_alias.scan_prefix(prefix).map(|(_, bytes)| {
 			utils::string_from_bytes(&bytes)
@@ -58,27 +54,17 @@ impl service::rooms::alias::Data for KeyValueDatabase {
 		}))
 	}
 
-    fn all_local_aliases<'a>(
+	fn all_local_aliases<'a>(&'a self) -> Box<dyn Iterator<Item = Result<(OwnedRoomId, String)>> + 'a> {
-        &'a self,
+		Box::new(self.alias_roomid.iter().map(|(room_alias_bytes, room_id_bytes)| {
-    ) -> Box<dyn Iterator<Item = Result<(OwnedRoomId, String)>> + 'a> {
-        Box::new(
-            self.alias_roomid
-                .iter()
-                .map(|(room_alias_bytes, room_id_bytes)| {
 			let room_alias_localpart = utils::string_from_bytes(&room_alias_bytes)
-                        .map_err(|_| {
+				.map_err(|_| Error::bad_database("Invalid alias bytes in aliasid_alias."))?;
-                            Error::bad_database("Invalid alias bytes in aliasid_alias.")
-                        })?;
 
 			let room_id = utils::string_from_bytes(&room_id_bytes)
-                        .map_err(|_| {
+				.map_err(|_| Error::bad_database("Invalid room_id bytes in aliasid_alias."))?
-                            Error::bad_database("Invalid room_id bytes in aliasid_alias.")
-                        })?
 				.try_into()
 				.map_err(|_| Error::bad_database("Invalid room_id in aliasid_alias."))?;
 
 			Ok((room_id, room_alias_localpart))
-                }),
+		}))
-        )
 	}
 }

src/database/key_value/rooms/auth_chain.rs

@@ -12,10 +12,7 @@ impl service::rooms::auth_chain::Data for KeyValueDatabase {
 		// We only save auth chains for single events in the db
 		if key.len() == 1 {
 			// Check DB cache
-            let chain = self
+			let chain = self.shorteventid_authchain.get(&key[0].to_be_bytes())?.map(|chain| {
-                .shorteventid_authchain
-                .get(&key[0].to_be_bytes())?
-                .map(|chain| {
 				chain
 					.chunks_exact(size_of::<u64>())
 					.map(|chunk| utils::u64_from_bytes(chunk).expect("byte length is correct"))
@@ -26,10 +23,7 @@ impl service::rooms::auth_chain::Data for KeyValueDatabase {
 				let chain = Arc::new(chain);
 
 				// Cache in RAM
-                self.auth_chain_cache
+				self.auth_chain_cache.lock().unwrap().insert(vec![key[0]], Arc::clone(&chain));
-                    .lock()
-                    .unwrap()
-                    .insert(vec![key[0]], Arc::clone(&chain));
 
 				return Ok(Some(chain));
 			}
@@ -43,18 +37,12 @@ impl service::rooms::auth_chain::Data for KeyValueDatabase {
 		if key.len() == 1 {
 			self.shorteventid_authchain.insert(
 				&key[0].to_be_bytes(),
-                &auth_chain
+				&auth_chain.iter().flat_map(|s| s.to_be_bytes().to_vec()).collect::<Vec<u8>>(),
-                    .iter()
-                    .flat_map(|s| s.to_be_bytes().to_vec())
-                    .collect::<Vec<u8>>(),
 			)?;
 		}
 
 		// Cache in RAM
-        self.auth_chain_cache
+		self.auth_chain_cache.lock().unwrap().insert(key, auth_chain);
-            .lock()
-            .unwrap()
-            .insert(key, auth_chain);
 
 		Ok(())
 	}

src/database/key_value/rooms/directory.rs

@@ -3,13 +3,9 @@ use ruma::{OwnedRoomId, RoomId};
 use crate::{database::KeyValueDatabase, service, utils, Error, Result};
 
 impl service::rooms::directory::Data for KeyValueDatabase {
-    fn set_public(&self, room_id: &RoomId) -> Result<()> {
+	fn set_public(&self, room_id: &RoomId) -> Result<()> { self.publicroomids.insert(room_id.as_bytes(), &[]) }
-        self.publicroomids.insert(room_id.as_bytes(), &[])
-    }
 
-    fn set_not_public(&self, room_id: &RoomId) -> Result<()> {
+	fn set_not_public(&self, room_id: &RoomId) -> Result<()> { self.publicroomids.remove(room_id.as_bytes()) }
-        self.publicroomids.remove(room_id.as_bytes())
-    }
 
 	fn is_public_room(&self, room_id: &RoomId) -> Result<bool> {
 		Ok(self.publicroomids.get(room_id.as_bytes())?.is_some())
@@ -18,9 +14,8 @@ impl service::rooms::directory::Data for KeyValueDatabase {
 	fn public_rooms<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
 		Box::new(self.publicroomids.iter().map(|(bytes, _)| {
 			RoomId::parse(
-                utils::string_from_bytes(&bytes).map_err(|_| {
+				utils::string_from_bytes(&bytes)
-                    Error::bad_database("Room ID in publicroomids is invalid unicode.")
+					.map_err(|_| Error::bad_database("Room ID in publicroomids is invalid unicode."))?,
-                })?,
 			)
 			.map_err(|_| Error::bad_database("Room ID in publicroomids is invalid."))
 		}))

src/database/key_value/rooms/edus/presence.rs

@@ -1,8 +1,6 @@
 use std::time::Duration;
 
-use ruma::{
+use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, RoomId, UInt, UserId};
-    events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, RoomId, UInt, UserId,
-};
 use tracing::error;
 
 use crate::{
@@ -63,18 +61,11 @@ impl service::rooms::edus::presence::Data for KeyValueDatabase {
 					presence.last_count = count;
 
 					presence
-                }
+				},
-                None => Presence::new(
+				None => Presence::new(new_state.clone(), new_state == PresenceState::Online, now, count, None),
-                    new_state.clone(),
-                    new_state == PresenceState::Online,
-                    now,
-                    count,
-                    None,
-                ),
 			};
 
-            self.roomuserid_presence
+			self.roomuserid_presence.insert(&key, &new_presence.to_json_bytes()?)?;
-                .insert(&key, &new_presence.to_json_bytes()?)?;
 		}
 
 		let timeout = match new_state {
@@ -82,22 +73,15 @@ impl service::rooms::edus::presence::Data for KeyValueDatabase {
 			_ => services().globals.config.presence_offline_timeout_s,
 		};
 
-        self.presence_timer_sender
+		self.presence_timer_sender.send((user_id.to_owned(), Duration::from_secs(timeout))).map_err(|e| {
-            .send((user_id.to_owned(), Duration::from_secs(timeout)))
-            .map_err(|e| {
 			error!("Failed to add presence timer: {}", e);
 			Error::bad_database("Failed to add presence timer")
 		})
 	}
 
 	fn set_presence(
-        &self,
+		&self, room_id: &RoomId, user_id: &UserId, presence_state: PresenceState, currently_active: Option<bool>,
-        room_id: &RoomId,
+		last_active_ago: Option<UInt>, status_msg: Option<String>,
-        user_id: &UserId,
-        presence_state: PresenceState,
-        currently_active: Option<bool>,
-        last_active_ago: Option<UInt>,
-        status_msg: Option<String>,
 	) -> Result<()> {
 		let now = utils::millis_since_unix_epoch();
 		let last_active_ts = match last_active_ago {
@@ -120,15 +104,12 @@ impl service::rooms::edus::presence::Data for KeyValueDatabase {
 			_ => services().globals.config.presence_offline_timeout_s,
 		};
 
-        self.presence_timer_sender
+		self.presence_timer_sender.send((user_id.to_owned(), Duration::from_secs(timeout))).map_err(|e| {
-            .send((user_id.to_owned(), Duration::from_secs(timeout)))
-            .map_err(|e| {
 			error!("Failed to add presence timer: {}", e);
 			Error::bad_database("Failed to add presence timer")
 		})?;
 
-        self.roomuserid_presence
+		self.roomuserid_presence.insert(&key, &presence.to_json_bytes()?)?;
-            .insert(&key, &presence.to_json_bytes()?)?;
 
 		Ok(())
 	}
@@ -144,29 +125,25 @@ impl service::rooms::edus::presence::Data for KeyValueDatabase {
 	}
 
 	fn presence_since<'a>(
-        &'a self,
+		&'a self, room_id: &RoomId, since: u64,
-        room_id: &RoomId,
-        since: u64,
 	) -> Box<dyn Iterator<Item = (OwnedUserId, u64, PresenceEvent)> + 'a> {
-        let prefix = [room_id.as_bytes(), &[0xff]].concat();
+		let prefix = [room_id.as_bytes(), &[0xFF]].concat();
 
 		Box::new(
 			self.roomuserid_presence
 				.scan_prefix(prefix)
-                .flat_map(
+				.flat_map(|(key, presence_bytes)| -> Result<(OwnedUserId, u64, PresenceEvent)> {
-                    |(key, presence_bytes)| -> Result<(OwnedUserId, u64, PresenceEvent)> {
 					let user_id = user_id_from_bytes(
-                            key.rsplit(|byte| *byte == 0xff).next().ok_or_else(|| {
+						key.rsplit(|byte| *byte == 0xFF)
-                                Error::bad_database("No UserID bytes in presence key")
+							.next()
-                            })?,
+							.ok_or_else(|| Error::bad_database("No UserID bytes in presence key"))?,
 					)?;
 
 					let presence = Presence::from_json_bytes(&presence_bytes)?;
 					let presence_event = presence.to_presence_event(&user_id)?;
 
 					Ok((user_id, presence.last_count, presence_event))
-                    },
+				})
-                )
 				.filter(move |(_, count, _)| *count > since),
 		)
 	}
@@ -174,5 +151,5 @@ impl service::rooms::edus::presence::Data for KeyValueDatabase {
 
 #[inline]
 fn presence_key(room_id: &RoomId, user_id: &UserId) -> Vec<u8> {
-    [room_id.as_bytes(), &[0xff], user_id.as_bytes()].concat()
+	[room_id.as_bytes(), &[0xFF], user_id.as_bytes()].concat()
 }

src/database/key_value/rooms/edus/read_receipt.rs

@@ -1,21 +1,13 @@
 use std::mem;
 
-use ruma::{
+use ruma::{events::receipt::ReceiptEvent, serde::Raw, CanonicalJsonObject, OwnedUserId, RoomId, UserId};
-    events::receipt::ReceiptEvent, serde::Raw, CanonicalJsonObject, OwnedUserId, RoomId, UserId,
-};
-use tracing::debug;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
-    fn readreceipt_update(
+	fn readreceipt_update(&self, user_id: &UserId, room_id: &RoomId, event: ReceiptEvent) -> Result<()> {
-        &self,
-        user_id: &UserId,
-        room_id: &RoomId,
-        event: ReceiptEvent,
-    ) -> Result<()> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let mut last_possible_key = prefix.clone();
 		last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
@@ -26,19 +18,15 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
 			.iter_from(&last_possible_key, true)
 			.take_while(|(key, _)| key.starts_with(&prefix))
 			.find(|(key, _)| {
-                key.rsplit(|&b| b == 0xff)
+				key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element") == user_id.as_bytes()
-                    .next()
+			}) {
-                    .expect("rsplit always returns an element")
-                    == user_id.as_bytes()
-            })
-        {
 			// This is the old room_latest
 			self.readreceiptid_readreceipt.remove(&old)?;
 		}
 
 		let mut room_latest_id = prefix;
 		room_latest_id.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
-        room_latest_id.push(0xff);
+		room_latest_id.push(0xFF);
 		room_latest_id.extend_from_slice(user_id.as_bytes());
 
 		self.readreceiptid_readreceipt.insert(
@@ -50,20 +38,10 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
 	}
 
 	fn readreceipts_since<'a>(
-        &'a self,
+		&'a self, room_id: &RoomId, since: u64,
-        room_id: &RoomId,
+	) -> Box<dyn Iterator<Item = Result<(OwnedUserId, u64, Raw<ruma::events::AnySyncEphemeralRoomEvent>)>> + 'a> {
-        since: u64,
-    ) -> Box<
-        dyn Iterator<
-                Item = Result<(
-                    OwnedUserId,
-                    u64,
-                    Raw<ruma::events::AnySyncEphemeralRoomEvent>,
-                )>,
-            > + 'a,
-    > {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		let prefix2 = prefix.clone();
 
 		let mut first_possible_edu = prefix.clone();
@@ -74,33 +52,22 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
 				.iter_from(&first_possible_edu, false)
 				.take_while(move |(k, _)| k.starts_with(&prefix2))
 				.map(move |(k, v)| {
-                    let count = utils::u64_from_bytes(
+					let count = utils::u64_from_bytes(&k[prefix.len()..prefix.len() + mem::size_of::<u64>()])
-                        &k[prefix.len()..prefix.len() + mem::size_of::<u64>()],
-                    )
 						.map_err(|_| Error::bad_database("Invalid readreceiptid count in db."))?;
 					let user_id = UserId::parse(
 						utils::string_from_bytes(&k[prefix.len() + mem::size_of::<u64>() + 1..])
-                            .map_err(|_| {
+							.map_err(|_| Error::bad_database("Invalid readreceiptid userid bytes in db."))?,
-                                Error::bad_database("Invalid readreceiptid userid bytes in db.")
-                            })?,
 					)
 					.map_err(|_| Error::bad_database("Invalid readreceiptid userid in db."))?;
 
-                    let mut json =
+					let mut json = serde_json::from_slice::<CanonicalJsonObject>(&v)
-                        serde_json::from_slice::<CanonicalJsonObject>(&v).map_err(|_| {
+						.map_err(|_| Error::bad_database("Read receipt in roomlatestid_roomlatest is invalid json."))?;
-                            Error::bad_database(
-                                "Read receipt in roomlatestid_roomlatest is invalid json.",
-                            )
-                        })?;
 					json.remove("room_id");
 
 					Ok((
 						user_id,
 						count,
-                        Raw::from_json(
+						Raw::from_json(serde_json::value::to_raw_value(&json).expect("json is valid raw value")),
-                            serde_json::value::to_raw_value(&json)
-                                .expect("json is valid raw value"),
-                        ),
 					))
 				}),
 		)
@@ -108,59 +75,37 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
 
 	fn private_read_set(&self, room_id: &RoomId, user_id: &UserId, count: u64) -> Result<()> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
-        self.roomuserid_privateread
+		self.roomuserid_privateread.insert(&key, &count.to_be_bytes())?;
-            .insert(&key, &count.to_be_bytes())?;
 
-        self.roomuserid_lastprivatereadupdate
+		self.roomuserid_lastprivatereadupdate.insert(&key, &services().globals.next_count()?.to_be_bytes())
-            .insert(&key, &services().globals.next_count()?.to_be_bytes())
-    }
-
-    fn delete_all_private_read_receipts(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.roomuserid_privateread.scan_prefix(prefix.clone()) {
-            debug!("Removing key {:?}", key);
-            self.roomuserid_privateread.remove(&key)?;
-        }
-
-        for (key, _) in self.roomuserid_lastprivatereadupdate.scan_prefix(prefix) {
-            debug!("Removing key {:?}", key);
-            self.roomuserid_lastprivatereadupdate.remove(&key)?;
-        }
-
-        Ok(())
 	}
 
 	fn private_read_get(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<u64>> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
-        self.roomuserid_privateread
+		self.roomuserid_privateread.get(&key)?.map_or(Ok(None), |v| {
-            .get(&key)?
+			Ok(Some(
-            .map_or(Ok(None), |v| {
+				utils::u64_from_bytes(&v).map_err(|_| Error::bad_database("Invalid private read marker bytes"))?,
-                Ok(Some(utils::u64_from_bytes(&v).map_err(|_| {
+			))
-                    Error::bad_database("Invalid private read marker bytes")
-                })?))
 		})
 	}
 
 	fn last_privateread_update(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
 		Ok(self
 			.roomuserid_lastprivatereadupdate
 			.get(&key)?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+				utils::u64_from_bytes(&bytes)
-                    Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid.")
+					.map_err(|_| Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid."))
-                })
 			})
 			.transpose()?
 			.unwrap_or(0))

src/database/key_value/rooms/edus/typing.rs

@@ -1,54 +1,44 @@
 use std::{collections::HashSet, mem};
 
 use ruma::{OwnedUserId, RoomId, UserId};
-use tracing::debug;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::rooms::edus::typing::Data for KeyValueDatabase {
 	fn typing_add(&self, user_id: &UserId, room_id: &RoomId, timeout: u64) -> Result<()> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let count = services().globals.next_count()?.to_be_bytes();
 
 		let mut room_typing_id = prefix;
 		room_typing_id.extend_from_slice(&timeout.to_be_bytes());
-        room_typing_id.push(0xff);
+		room_typing_id.push(0xFF);
 		room_typing_id.extend_from_slice(&count);
 
-        self.typingid_userid
+		self.typingid_userid.insert(&room_typing_id, user_id.as_bytes())?;
-            .insert(&room_typing_id, user_id.as_bytes())?;
 
-        self.roomid_lasttypingupdate
+		self.roomid_lasttypingupdate.insert(room_id.as_bytes(), &count)?;
-            .insert(room_id.as_bytes(), &count)?;
 
 		Ok(())
 	}
 
 	fn typing_remove(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let user_id = user_id.to_string();
 
 		let mut found_outdated = false;
 
 		// Maybe there are multiple ones from calling roomtyping_add multiple times
-        for outdated_edu in self
+		for outdated_edu in self.typingid_userid.scan_prefix(prefix).filter(|(_, v)| &**v == user_id.as_bytes()) {
-            .typingid_userid
-            .scan_prefix(prefix)
-            .filter(|(_, v)| &**v == user_id.as_bytes())
-        {
 			self.typingid_userid.remove(&outdated_edu.0)?;
 			found_outdated = true;
 		}
 
 		if found_outdated {
-            self.roomid_lasttypingupdate.insert(
+			self.roomid_lasttypingupdate.insert(room_id.as_bytes(), &services().globals.next_count()?.to_be_bytes())?;
-                room_id.as_bytes(),
-                &services().globals.next_count()?.to_be_bytes(),
-            )?;
 		}
 
 		Ok(())
@@ -56,7 +46,7 @@ impl service::rooms::edus::typing::Data for KeyValueDatabase {
 
 	fn typings_maintain(&self, room_id: &RoomId) -> Result<()> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let current_timestamp = utils::millis_since_unix_epoch();
 
@@ -70,14 +60,14 @@ impl service::rooms::edus::typing::Data for KeyValueDatabase {
 				Ok::<_, Error>((
 					key.clone(),
 					utils::u64_from_bytes(
-                        &key.splitn(2, |&b| b == 0xff).nth(1).ok_or_else(|| {
+						&key.splitn(2, |&b| b == 0xFF)
-                            Error::bad_database("RoomTyping has invalid timestamp or delimiters.")
+							.nth(1)
-                        })?[0..mem::size_of::<u64>()],
+							.ok_or_else(|| Error::bad_database("RoomTyping has invalid timestamp or delimiters."))?[0..mem::size_of::<u64>()],
 					)
 					.map_err(|_| Error::bad_database("RoomTyping has invalid timestamp bytes."))?,
 				))
 			})
-            .filter_map(|r| r.ok())
+			.filter_map(std::result::Result::ok)
 			.take_while(|&(_, timestamp)| timestamp < current_timestamp)
 		{
 			// This is an outdated edu (time > timestamp)
@@ -86,10 +76,7 @@ impl service::rooms::edus::typing::Data for KeyValueDatabase {
 		}
 
 		if found_outdated {
-            self.roomid_lasttypingupdate.insert(
+			self.roomid_lasttypingupdate.insert(room_id.as_bytes(), &services().globals.next_count()?.to_be_bytes())?;
-                room_id.as_bytes(),
-                &services().globals.next_count()?.to_be_bytes(),
-            )?;
 		}
 
 		Ok(())
@@ -100,36 +87,24 @@ impl service::rooms::edus::typing::Data for KeyValueDatabase {
 			.roomid_lasttypingupdate
 			.get(room_id.as_bytes())?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+				utils::u64_from_bytes(&bytes)
-                    Error::bad_database("Count in roomid_lastroomactiveupdate is invalid.")
+					.map_err(|_| Error::bad_database("Count in roomid_lastroomactiveupdate is invalid."))
-                })
 			})
 			.transpose()?
 			.unwrap_or(0))
 	}
 
-    fn delete_all_typing_updates(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.roomid_lasttypingupdate.scan_prefix(prefix) {
-            debug!("Removing key {:?}", key);
-            self.roomid_lasttypingupdate.remove(&key)?;
-        }
-
-        Ok(())
-    }
-
 	fn typings_all(&self, room_id: &RoomId) -> Result<HashSet<OwnedUserId>> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		let mut user_ids = HashSet::new();
 
 		for (_, user_id) in self.typingid_userid.scan_prefix(prefix) {
-            let user_id = UserId::parse(utils::string_from_bytes(&user_id).map_err(|_| {
+			let user_id = UserId::parse(
-                Error::bad_database("User ID in typingid_userid is invalid unicode.")
+				utils::string_from_bytes(&user_id)
-            })?)
+					.map_err(|_| Error::bad_database("User ID in typingid_userid is invalid unicode."))?,
+			)
 			.map_err(|_| Error::bad_database("User ID in typingid_userid is invalid."))?;
 
 			user_ids.insert(user_id);

src/database/key_value/rooms/lazy_load.rs

@@ -4,35 +4,28 @@ use crate::{database::KeyValueDatabase, service, Result};
 
 impl service::rooms::lazy_loading::Data for KeyValueDatabase {
 	fn lazy_load_was_sent_before(
-        &self,
+		&self, user_id: &UserId, device_id: &DeviceId, room_id: &RoomId, ll_user: &UserId,
-        user_id: &UserId,
-        device_id: &DeviceId,
-        room_id: &RoomId,
-        ll_user: &UserId,
 	) -> Result<bool> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(device_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(ll_user.as_bytes());
 		Ok(self.lazyloadedids.get(&key)?.is_some())
 	}
 
 	fn lazy_load_confirm_delivery(
-        &self,
+		&self, user_id: &UserId, device_id: &DeviceId, room_id: &RoomId,
-        user_id: &UserId,
-        device_id: &DeviceId,
-        room_id: &RoomId,
 		confirmed_user_ids: &mut dyn Iterator<Item = &UserId>,
 	) -> Result<()> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(device_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(room_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		for ll_id in confirmed_user_ids {
 			let mut key = prefix.clone();
@@ -43,18 +36,13 @@ impl service::rooms::lazy_loading::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn lazy_load_reset(
+	fn lazy_load_reset(&self, user_id: &UserId, device_id: &DeviceId, room_id: &RoomId) -> Result<()> {
-        &self,
-        user_id: &UserId,
-        device_id: &DeviceId,
-        room_id: &RoomId,
-    ) -> Result<()> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(device_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 		prefix.extend_from_slice(room_id.as_bytes());
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		for (key, _) in self.lazyloadedids.scan_prefix(prefix) {
 			self.lazyloadedids.remove(&key)?;

src/database/key_value/rooms/metadata.rs

@@ -11,20 +11,14 @@ impl service::rooms::metadata::Data for KeyValueDatabase {
 		};
 
 		// Look for PDUs in that room.
-        Ok(self
+		Ok(self.pduid_pdu.iter_from(&prefix, false).next().filter(|(k, _)| k.starts_with(&prefix)).is_some())
-            .pduid_pdu
-            .iter_from(&prefix, false)
-            .next()
-            .filter(|(k, _)| k.starts_with(&prefix))
-            .is_some())
 	}
 
 	fn iter_ids<'a>(&'a self) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
 		Box::new(self.roomid_shortroomid.iter().map(|(bytes, _)| {
 			RoomId::parse(
-                utils::string_from_bytes(&bytes).map_err(|_| {
+				utils::string_from_bytes(&bytes)
-                    Error::bad_database("Room ID in publicroomids is invalid unicode.")
+					.map_err(|_| Error::bad_database("Room ID in publicroomids is invalid unicode."))?,
-                })?,
 			)
 			.map_err(|_| Error::bad_database("Room ID in roomid_shortroomid is invalid."))
 		}))
@@ -44,9 +38,7 @@ impl service::rooms::metadata::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn is_banned(&self, room_id: &RoomId) -> Result<bool> {
+	fn is_banned(&self, room_id: &RoomId) -> Result<bool> { Ok(self.bannedroomids.get(room_id.as_bytes())?.is_some()) }
-        Ok(self.bannedroomids.get(room_id.as_bytes())?.is_some())
-    }
 
 	fn ban_room(&self, room_id: &RoomId, banned: bool) -> Result<()> {
 		if banned {

src/database/key_value/rooms/outlier.rs

@@ -4,17 +4,13 @@ use crate::{database::KeyValueDatabase, service, Error, PduEvent, Result};
 
 impl service::rooms::outlier::Data for KeyValueDatabase {
 	fn get_outlier_pdu_json(&self, event_id: &EventId) -> Result<Option<CanonicalJsonObject>> {
-        self.eventid_outlierpdu
+		self.eventid_outlierpdu.get(event_id.as_bytes())?.map_or(Ok(None), |pdu| {
-            .get(event_id.as_bytes())?
-            .map_or(Ok(None), |pdu| {
 			serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
 		})
 	}
 
 	fn get_outlier_pdu(&self, event_id: &EventId) -> Result<Option<PduEvent>> {
-        self.eventid_outlierpdu
+		self.eventid_outlierpdu.get(event_id.as_bytes())?.map_or(Ok(None), |pdu| {
-            .get(event_id.as_bytes())?
-            .map_or(Ok(None), |pdu| {
 			serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
 		})
 	}

src/database/key_value/rooms/pdu_metadata.rs

@@ -1,15 +1,11 @@
 use std::{mem, sync::Arc};
 
 use ruma::{EventId, RoomId, UserId};
-use tracing::debug;
 
 use crate::{
 	database::KeyValueDatabase,
-    service::{
+	service::{self, rooms::timeline::PduCount},
-        self,
+	services, utils, Error, PduEvent, Result,
-        rooms::timeline::{data::PduData, PduCount},
-    },
-    services, utils, Error, Result,
 };
 
 impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
@@ -21,12 +17,8 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 	}
 
 	fn relations_until<'a>(
-        &'a self,
+		&'a self, user_id: &'a UserId, shortroomid: u64, target: u64, until: PduCount,
-        user_id: &'a UserId,
+	) -> Result<Box<dyn Iterator<Item = Result<(PduCount, PduEvent)>> + 'a>> {
-        shortroomid: u64,
-        target: u64,
-        until: PduCount,
-    ) -> PduData<'a> {
 		let prefix = target.to_be_bytes().to_vec();
 		let mut current = prefix.clone();
 
@@ -35,15 +27,13 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 			PduCount::Backfilled(x) => {
 				current.extend_from_slice(&0_u64.to_be_bytes());
 				u64::MAX - x - 1
-            }
+			},
 		};
 		current.extend_from_slice(&count_raw.to_be_bytes());
 
 		Ok(Box::new(
-            self.tofrom_relation
+			self.tofrom_relation.iter_from(&current, true).take_while(move |(k, _)| k.starts_with(&prefix)).map(
-                .iter_from(&current, true)
+				move |(tofrom, _data)| {
-                .take_while(move |(k, _)| k.starts_with(&prefix))
-                .map(move |(tofrom, _data)| {
 					let from = utils::u64_from_bytes(&tofrom[(mem::size_of::<u64>())..])
 						.map_err(|_| Error::bad_database("Invalid count in tofrom_relation."))?;
 
@@ -59,7 +49,8 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 						pdu.remove_transaction_id()?;
 					}
 					Ok((PduCount::Normal(from), pdu))
-                }),
+				},
+			),
 		))
 	}
 
@@ -73,18 +64,6 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn delete_all_referenced_for_room(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.referencedevents.scan_prefix(prefix) {
-            debug!("Removing key: {:?}", key);
-            self.referencedevents.remove(&key)?;
-        }
-
-        Ok(())
-    }
-
 	fn is_event_referenced(&self, room_id: &RoomId, event_id: &EventId) -> Result<bool> {
 		let mut key = room_id.as_bytes().to_vec();
 		key.extend_from_slice(event_id.as_bytes());
@@ -96,8 +75,6 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 	}
 
 	fn is_event_soft_failed(&self, event_id: &EventId) -> Result<bool> {
-        self.softfailedeventids
+		self.softfailedeventids.get(event_id.as_bytes()).map(|o| o.is_some())
-            .get(event_id.as_bytes())
-            .map(|o| o.is_some())
 	}
 }

src/database/key_value/rooms/search.rs

@@ -1,12 +1,11 @@
 use ruma::RoomId;
-use tracing::debug;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Result};
 
 type SearchPdusResult<'a> = Result<Option<(Box<dyn Iterator<Item = Vec<u8>> + 'a>, Vec<String>)>>;
 
 impl service::rooms::search::Data for KeyValueDatabase {
-    fn index_pdu<'a>(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
+	fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
 		let mut batch = message_body
 			.split_terminator(|c: char| !c.is_alphanumeric())
 			.filter(|s| !s.is_empty())
@@ -15,7 +14,7 @@ impl service::rooms::search::Data for KeyValueDatabase {
 			.map(|word| {
 				let mut key = shortroomid.to_be_bytes().to_vec();
 				key.extend_from_slice(word.as_bytes());
-                key.push(0xff);
+				key.push(0xFF);
 				key.extend_from_slice(pdu_id); // TODO: currently we save the room id a second time here
 				(key, Vec::new())
 			});
@@ -23,26 +22,8 @@ impl service::rooms::search::Data for KeyValueDatabase {
 		self.tokenids.insert_batch(&mut batch)
 	}
 
-    fn delete_all_search_tokenids_for_room(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.tokenids.scan_prefix(prefix) {
-            debug!("Removing key: {:?}", key);
-            self.tokenids.remove(&key)?;
-        }
-
-        Ok(())
-    }
-
 	fn search_pdus<'a>(&'a self, room_id: &RoomId, search_string: &str) -> SearchPdusResult<'a> {
-        let prefix = services()
+		let prefix = services().rooms.short.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
-            .rooms
-            .short
-            .get_shortroomid(room_id)?
-            .expect("room exists")
-            .to_be_bytes()
-            .to_vec();
 
 		let words: Vec<_> = search_string
 			.split_terminator(|c: char| !c.is_alphanumeric())
@@ -53,7 +34,7 @@ impl service::rooms::search::Data for KeyValueDatabase {
 		let iterators = words.clone().into_iter().map(move |word| {
 			let mut prefix2 = prefix.clone();
 			prefix2.extend_from_slice(word.as_bytes());
-            prefix2.push(0xff);
+			prefix2.push(0xFF);
 			let prefix3 = prefix2.clone();
 
 			let mut last_possible_id = prefix2.clone();

src/database/key_value/rooms/short.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use ruma::{events::StateEventType, EventId, RoomId};
-use tracing::{error, warn};
+use tracing::warn;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
@@ -12,109 +12,77 @@ impl service::rooms::short::Data for KeyValueDatabase {
 		}
 
 		let short = match self.eventid_shorteventid.get(event_id.as_bytes())? {
-            Some(shorteventid) => utils::u64_from_bytes(&shorteventid)
+			Some(shorteventid) => {
-                .map_err(|_| Error::bad_database("Invalid shorteventid in db."))?,
+				utils::u64_from_bytes(&shorteventid).map_err(|_| Error::bad_database("Invalid shorteventid in db."))?
+			},
 			None => {
 				let shorteventid = services().globals.next_count()?;
-                self.eventid_shorteventid
+				self.eventid_shorteventid.insert(event_id.as_bytes(), &shorteventid.to_be_bytes())?;
-                    .insert(event_id.as_bytes(), &shorteventid.to_be_bytes())?;
+				self.shorteventid_eventid.insert(&shorteventid.to_be_bytes(), event_id.as_bytes())?;
-                self.shorteventid_eventid
-                    .insert(&shorteventid.to_be_bytes(), event_id.as_bytes())?;
 				shorteventid
-            }
+			},
 		};
 
-        self.eventidshort_cache
+		self.eventidshort_cache.lock().unwrap().insert(event_id.to_owned(), short);
-            .lock()
-            .unwrap()
-            .insert(event_id.to_owned(), short);
 
 		Ok(short)
 	}
 
-    fn get_shortstatekey(
+	fn get_shortstatekey(&self, event_type: &StateEventType, state_key: &str) -> Result<Option<u64>> {
-        &self,
+		if let Some(short) =
-        event_type: &StateEventType,
+			self.statekeyshort_cache.lock().unwrap().get_mut(&(event_type.clone(), state_key.to_owned()))
-        state_key: &str,
-    ) -> Result<Option<u64>> {
-        if let Some(short) = self
-            .statekeyshort_cache
-            .lock()
-            .unwrap()
-            .get_mut(&(event_type.clone(), state_key.to_owned()))
 		{
 			return Ok(Some(*short));
 		}
 
-        let mut statekey = event_type.to_string().as_bytes().to_vec();
+		let mut statekey_vec = event_type.to_string().as_bytes().to_vec();
-        statekey.push(0xff);
+		statekey_vec.push(0xFF);
-        statekey.extend_from_slice(state_key.as_bytes());
+		statekey_vec.extend_from_slice(state_key.as_bytes());
 
 		let short = self
 			.statekey_shortstatekey
-            .get(&statekey)?
+			.get(&statekey_vec)?
 			.map(|shortstatekey| {
-                utils::u64_from_bytes(&shortstatekey)
+				utils::u64_from_bytes(&shortstatekey).map_err(|_| Error::bad_database("Invalid shortstatekey in db."))
-                    .map_err(|_| Error::bad_database("Invalid shortstatekey in db."))
 			})
 			.transpose()?;
 
 		if let Some(s) = short {
-            self.statekeyshort_cache
+			self.statekeyshort_cache.lock().unwrap().insert((event_type.clone(), state_key.to_owned()), s);
-                .lock()
-                .unwrap()
-                .insert((event_type.clone(), state_key.to_owned()), s);
 		}
 
 		Ok(short)
 	}
 
-    fn get_or_create_shortstatekey(
+	fn get_or_create_shortstatekey(&self, event_type: &StateEventType, state_key: &str) -> Result<u64> {
-        &self,
+		if let Some(short) =
-        event_type: &StateEventType,
+			self.statekeyshort_cache.lock().unwrap().get_mut(&(event_type.clone(), state_key.to_owned()))
-        state_key: &str,
-    ) -> Result<u64> {
-        if let Some(short) = self
-            .statekeyshort_cache
-            .lock()
-            .unwrap()
-            .get_mut(&(event_type.clone(), state_key.to_owned()))
 		{
 			return Ok(*short);
 		}
 
-        let mut statekey = event_type.to_string().as_bytes().to_vec();
+		let mut statekey_vec = event_type.to_string().as_bytes().to_vec();
-        statekey.push(0xff);
+		statekey_vec.push(0xFF);
-        statekey.extend_from_slice(state_key.as_bytes());
+		statekey_vec.extend_from_slice(state_key.as_bytes());
 
-        let short = match self.statekey_shortstatekey.get(&statekey)? {
+		let short = match self.statekey_shortstatekey.get(&statekey_vec)? {
 			Some(shortstatekey) => utils::u64_from_bytes(&shortstatekey)
 				.map_err(|_| Error::bad_database("Invalid shortstatekey in db."))?,
 			None => {
 				let shortstatekey = services().globals.next_count()?;
-                self.statekey_shortstatekey
+				self.statekey_shortstatekey.insert(&statekey_vec, &shortstatekey.to_be_bytes())?;
-                    .insert(&statekey, &shortstatekey.to_be_bytes())?;
+				self.shortstatekey_statekey.insert(&shortstatekey.to_be_bytes(), &statekey_vec)?;
-                self.shortstatekey_statekey
-                    .insert(&shortstatekey.to_be_bytes(), &statekey)?;
 				shortstatekey
-            }
+			},
 		};
 
-        self.statekeyshort_cache
+		self.statekeyshort_cache.lock().unwrap().insert((event_type.clone(), state_key.to_owned()), short);
-            .lock()
-            .unwrap()
-            .insert((event_type.clone(), state_key.to_owned()), short);
 
 		Ok(short)
 	}
 
 	fn get_eventid_from_short(&self, shorteventid: u64) -> Result<Arc<EventId>> {
-        if let Some(id) = self
+		if let Some(id) = self.shorteventid_cache.lock().unwrap().get_mut(&shorteventid) {
-            .shorteventid_cache
-            .lock()
-            .unwrap()
-            .get_mut(&shorteventid)
-        {
 			return Ok(Arc::clone(id));
 		}
 
@@ -123,26 +91,19 @@ impl service::rooms::short::Data for KeyValueDatabase {
 			.get(&shorteventid.to_be_bytes())?
 			.ok_or_else(|| Error::bad_database("Shorteventid does not exist"))?;
 
-        let event_id = EventId::parse_arc(utils::string_from_bytes(&bytes).map_err(|_| {
+		let event_id = EventId::parse_arc(
-            Error::bad_database("EventID in shorteventid_eventid is invalid unicode.")
+			utils::string_from_bytes(&bytes)
-        })?)
+				.map_err(|_| Error::bad_database("EventID in shorteventid_eventid is invalid unicode."))?,
+		)
 		.map_err(|_| Error::bad_database("EventId in shorteventid_eventid is invalid."))?;
 
-        self.shorteventid_cache
+		self.shorteventid_cache.lock().unwrap().insert(shorteventid, Arc::clone(&event_id));
-            .lock()
-            .unwrap()
-            .insert(shorteventid, Arc::clone(&event_id));
 
 		Ok(event_id)
 	}
 
 	fn get_statekey_from_short(&self, shortstatekey: u64) -> Result<(StateEventType, String)> {
-        if let Some(id) = self
+		if let Some(id) = self.shortstatekey_cache.lock().unwrap().get_mut(&shortstatekey) {
-            .shortstatekey_cache
-            .lock()
-            .unwrap()
-            .get_mut(&shortstatekey)
-        {
 			return Ok(id.clone());
 		}
 
@@ -151,28 +112,22 @@ impl service::rooms::short::Data for KeyValueDatabase {
 			.get(&shortstatekey.to_be_bytes())?
 			.ok_or_else(|| Error::bad_database("Shortstatekey does not exist"))?;
 
-        let mut parts = bytes.splitn(2, |&b| b == 0xff);
+		let mut parts = bytes.splitn(2, |&b| b == 0xFF);
 		let eventtype_bytes = parts.next().expect("split always returns one entry");
-        let statekey_bytes = parts
+		let statekey_bytes =
-            .next()
+			parts.next().ok_or_else(|| Error::bad_database("Invalid statekey in shortstatekey_statekey."))?;
-            .ok_or_else(|| Error::bad_database("Invalid statekey in shortstatekey_statekey."))?;
 
-        let event_type =
+		let event_type = StateEventType::from(utils::string_from_bytes(eventtype_bytes).map_err(|e| {
-            StateEventType::from(utils::string_from_bytes(eventtype_bytes).map_err(|e| {
 			warn!("Event type in shortstatekey_statekey is invalid: {}", e);
 			Error::bad_database("Event type in shortstatekey_statekey is invalid.")
 		})?);
 
-        let state_key = utils::string_from_bytes(statekey_bytes).map_err(|_| {
+		let state_key = utils::string_from_bytes(statekey_bytes)
-            Error::bad_database("Statekey in shortstatekey_statekey is invalid unicode.")
+			.map_err(|_| Error::bad_database("Statekey in shortstatekey_statekey is invalid unicode."))?;
-        })?;
 
 		let result = (event_type, state_key);
 
-        self.shortstatekey_cache
+		self.shortstatekey_cache.lock().unwrap().insert(shortstatekey, result.clone());
-            .lock()
-            .unwrap()
-            .insert(shortstatekey, result.clone());
 
 		Ok(result)
 	}
@@ -187,52 +142,29 @@ impl service::rooms::short::Data for KeyValueDatabase {
 			),
 			None => {
 				let shortstatehash = services().globals.next_count()?;
-                self.statehash_shortstatehash
+				self.statehash_shortstatehash.insert(state_hash, &shortstatehash.to_be_bytes())?;
-                    .insert(state_hash, &shortstatehash.to_be_bytes())?;
 				(shortstatehash, false)
-            }
+			},
 		})
 	}
 
 	fn get_shortroomid(&self, room_id: &RoomId) -> Result<Option<u64>> {
 		self.roomid_shortroomid
 			.get(room_id.as_bytes())?
-            .map(|bytes| {
+			.map(|bytes| utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid shortroomid in db.")))
-                utils::u64_from_bytes(&bytes)
-                    .map_err(|_| Error::bad_database("Invalid shortroomid in db."))
-            })
 			.transpose()
 	}
 
 	fn get_or_create_shortroomid(&self, room_id: &RoomId) -> Result<u64> {
 		Ok(match self.roomid_shortroomid.get(room_id.as_bytes())? {
-            Some(short) => utils::u64_from_bytes(&short)
+			Some(short) => {
-                .map_err(|_| Error::bad_database("Invalid shortroomid in db."))?,
+				utils::u64_from_bytes(&short).map_err(|_| Error::bad_database("Invalid shortroomid in db."))?
+			},
 			None => {
 				let short = services().globals.next_count()?;
-                self.roomid_shortroomid
+				self.roomid_shortroomid.insert(room_id.as_bytes(), &short.to_be_bytes())?;
-                    .insert(room_id.as_bytes(), &short.to_be_bytes())?;
 				short
-            }
+			},
 		})
 	}
-
-    /// Attempts to delete a shortroomid from the kv database
-    fn delete_shortroomid(&self, room_id: &RoomId) -> Result<()> {
-        match self.roomid_shortroomid.get(room_id.as_bytes())? {
-            Some(short) => {
-                self.roomid_shortroomid.remove(&short).map_err(|e| {
-                    error!("Failed to remove shortroomid in database: {e}");
-                    Error::bad_database("Failed to remove shortroomid in database")
-                })?;
-            }
-            None => {
-                return Err(Error::bad_database(
-                    "Invalid or non-existent shortroomid in db.",
-                ))?
-            }
-        }
-
-        Ok(())
-    }
 }

src/database/key_value/rooms/state.rs

@@ -1,17 +1,13 @@
-use ruma::{EventId, OwnedEventId, RoomId};
+use std::{collections::HashSet, sync::Arc};
-use std::collections::HashSet;
-use tracing::debug;
 
-use std::sync::Arc;
+use ruma::{EventId, OwnedEventId, RoomId};
 use tokio::sync::MutexGuard;
 
 use crate::{database::KeyValueDatabase, service, utils, Error, Result};
 
 impl service::rooms::state::Data for KeyValueDatabase {
 	fn get_room_shortstatehash(&self, room_id: &RoomId) -> Result<Option<u64>> {
-        self.roomid_shortstatehash
+		self.roomid_shortstatehash.get(room_id.as_bytes())?.map_or(Ok(None), |bytes| {
-            .get(room_id.as_bytes())?
-            .map_or(Ok(None), |bytes| {
 			Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
 				Error::bad_database("Invalid shortstatehash in roomid_shortstatehash")
 			})?))
@@ -24,72 +20,50 @@ impl service::rooms::state::Data for KeyValueDatabase {
 		new_shortstatehash: u64,
 		_mutex_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
 	) -> Result<()> {
-        self.roomid_shortstatehash
+		self.roomid_shortstatehash.insert(room_id.as_bytes(), &new_shortstatehash.to_be_bytes())?;
-            .insert(room_id.as_bytes(), &new_shortstatehash.to_be_bytes())?;
-        Ok(())
-    }
-
-    fn delete_room_shortstatehash(
-        &self,
-        room_id: &RoomId,
-        _mutex_lock: &MutexGuard<'_, ()>,
-    ) -> Result<()> {
-        self.roomid_shortstatehash.remove(room_id.as_bytes())?;
 		Ok(())
 	}
 
 	fn set_event_state(&self, shorteventid: u64, shortstatehash: u64) -> Result<()> {
-        self.shorteventid_shortstatehash
+		self.shorteventid_shortstatehash.insert(&shorteventid.to_be_bytes(), &shortstatehash.to_be_bytes())?;
-            .insert(&shorteventid.to_be_bytes(), &shortstatehash.to_be_bytes())?;
 		Ok(())
 	}
 
 	fn get_forward_extremities(&self, room_id: &RoomId) -> Result<HashSet<Arc<EventId>>> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		self.roomid_pduleaves
 			.scan_prefix(prefix)
 			.map(|(_, bytes)| {
-                EventId::parse_arc(utils::string_from_bytes(&bytes).map_err(|_| {
+				EventId::parse_arc(
-                    Error::bad_database("EventID in roomid_pduleaves is invalid unicode.")
+					utils::string_from_bytes(&bytes)
-                })?)
+						.map_err(|_| Error::bad_database("EventID in roomid_pduleaves is invalid unicode."))?,
+				)
 				.map_err(|_| Error::bad_database("EventId in roomid_pduleaves is invalid."))
 			})
 			.collect()
 	}
 
-    fn set_forward_extremities<'a>(
+	fn set_forward_extremities(
 		&self,
 		room_id: &RoomId,
 		event_ids: Vec<OwnedEventId>,
 		_mutex_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
 	) -> Result<()> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		for (key, _) in self.roomid_pduleaves.scan_prefix(prefix.clone()) {
 			self.roomid_pduleaves.remove(&key)?;
 		}
 
 		for event_id in event_ids {
-            let mut key = prefix.to_owned();
+			let mut key = prefix.clone();
 			key.extend_from_slice(event_id.as_bytes());
 			self.roomid_pduleaves.insert(&key, event_id.as_bytes())?;
 		}
 
 		Ok(())
 	}
-
-    fn delete_all_rooms_forward_extremities(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.roomid_pduleaves.scan_prefix(prefix) {
-            debug!("Removing key: {:?}", key);
-            self.roomid_pduleaves.remove(&key)?;
-        }
-
-        Ok(())
-    }
 }

src/database/key_value/rooms/state_accessor.rs

@@ -1,11 +1,13 @@
 use std::{collections::HashMap, sync::Arc};
 
-use crate::{database::KeyValueDatabase, service, services, utils, Error, PduEvent, Result};
 use async_trait::async_trait;
 use ruma::{events::StateEventType, EventId, RoomId};
 
+use crate::{database::KeyValueDatabase, service, services, utils, Error, PduEvent, Result};
+
 #[async_trait]
 impl service::rooms::state_accessor::Data for KeyValueDatabase {
+	#[allow(unused_qualifications)] // async traits
 	async fn state_full_ids(&self, shortstatehash: u64) -> Result<HashMap<u64, Arc<EventId>>> {
 		let full_state = services()
 			.rooms
@@ -17,10 +19,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 		let mut result = HashMap::new();
 		let mut i = 0;
 		for compressed in full_state.iter() {
-            let parsed = services()
+			let parsed = services().rooms.state_compressor.parse_compressed_state_event(compressed)?;
-                .rooms
-                .state_compressor
-                .parse_compressed_state_event(compressed)?;
 			result.insert(parsed.0, parsed.1);
 
 			i += 1;
@@ -31,10 +30,8 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 		Ok(result)
 	}
 
-    async fn state_full(
+	#[allow(unused_qualifications)] // async traits
-        &self,
+	async fn state_full(&self, shortstatehash: u64) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
-        shortstatehash: u64,
-    ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
 		let full_state = services()
 			.rooms
 			.state_compressor
@@ -46,10 +43,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 		let mut result = HashMap::new();
 		let mut i = 0;
 		for compressed in full_state.iter() {
-            let (_, eventid) = services()
+			let (_, eventid) = services().rooms.state_compressor.parse_compressed_state_event(compressed)?;
-                .rooms
-                .state_compressor
-                .parse_compressed_state_event(compressed)?;
 			if let Some(pdu) = services().rooms.timeline.get_pdu(&eventid)? {
 				result.insert(
 					(
@@ -72,18 +66,12 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 		Ok(result)
 	}
 
-    /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
+	/// Returns a single PDU from `room_id` with key (`event_type`,
+	/// `state_key`).
 	fn state_get_id(
-        &self,
+		&self, shortstatehash: u64, event_type: &StateEventType, state_key: &str,
-        shortstatehash: u64,
-        event_type: &StateEventType,
-        state_key: &str,
 	) -> Result<Option<Arc<EventId>>> {
-        let shortstatekey = match services()
+		let shortstatekey = match services().rooms.short.get_shortstatekey(event_type, state_key)? {
-            .rooms
-            .short
-            .get_shortstatekey(event_type, state_key)?
-        {
 			Some(s) => s,
 			None => return Ok(None),
 		};
@@ -94,90 +82,63 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 			.pop()
 			.expect("there is always one layer")
 			.1;
-        Ok(full_state
+		Ok(
-            .iter()
+			full_state.iter().find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes())).and_then(|compressed| {
-            .find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes()))
+				services().rooms.state_compressor.parse_compressed_state_event(compressed).ok().map(|(_, id)| id)
-            .and_then(|compressed| {
+			}),
-                services()
+		)
-                    .rooms
-                    .state_compressor
-                    .parse_compressed_state_event(compressed)
-                    .ok()
-                    .map(|(_, id)| id)
-            }))
 	}
 
-    /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
+	/// Returns a single PDU from `room_id` with key (`event_type`,
+	/// `state_key`).
 	fn state_get(
-        &self,
+		&self, shortstatehash: u64, event_type: &StateEventType, state_key: &str,
-        shortstatehash: u64,
-        event_type: &StateEventType,
-        state_key: &str,
 	) -> Result<Option<Arc<PduEvent>>> {
 		self.state_get_id(shortstatehash, event_type, state_key)?
-            .map_or(Ok(None), |event_id| {
+			.map_or(Ok(None), |event_id| services().rooms.timeline.get_pdu(&event_id))
-                services().rooms.timeline.get_pdu(&event_id)
-            })
 	}
 
 	/// Returns the state hash for this pdu.
 	fn pdu_shortstatehash(&self, event_id: &EventId) -> Result<Option<u64>> {
-        self.eventid_shorteventid
+		self.eventid_shorteventid.get(event_id.as_bytes())?.map_or(Ok(None), |shorteventid| {
-            .get(event_id.as_bytes())?
-            .map_or(Ok(None), |shorteventid| {
 			self.shorteventid_shortstatehash
 				.get(&shorteventid)?
 				.map(|bytes| {
-                        utils::u64_from_bytes(&bytes).map_err(|_| {
+					utils::u64_from_bytes(&bytes)
-                            Error::bad_database(
+						.map_err(|_| Error::bad_database("Invalid shortstatehash bytes in shorteventid_shortstatehash"))
-                                "Invalid shortstatehash bytes in shorteventid_shortstatehash",
-                            )
-                        })
 				})
 				.transpose()
 		})
 	}
 
 	/// Returns the full room state.
-    async fn room_state_full(
+	#[allow(unused_qualifications)] // async traits
-        &self,
+	async fn room_state_full(&self, room_id: &RoomId) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
-        room_id: &RoomId,
+		if let Some(current_shortstatehash) = services().rooms.state.get_room_shortstatehash(room_id)? {
-    ) -> Result<HashMap<(StateEventType, String), Arc<PduEvent>>> {
-        if let Some(current_shortstatehash) =
-            services().rooms.state.get_room_shortstatehash(room_id)?
-        {
 			self.state_full(current_shortstatehash).await
 		} else {
 			Ok(HashMap::new())
 		}
 	}
 
-    /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
+	/// Returns a single PDU from `room_id` with key (`event_type`,
+	/// `state_key`).
 	fn room_state_get_id(
-        &self,
+		&self, room_id: &RoomId, event_type: &StateEventType, state_key: &str,
-        room_id: &RoomId,
-        event_type: &StateEventType,
-        state_key: &str,
 	) -> Result<Option<Arc<EventId>>> {
-        if let Some(current_shortstatehash) =
+		if let Some(current_shortstatehash) = services().rooms.state.get_room_shortstatehash(room_id)? {
-            services().rooms.state.get_room_shortstatehash(room_id)?
-        {
 			self.state_get_id(current_shortstatehash, event_type, state_key)
 		} else {
 			Ok(None)
 		}
 	}
 
-    /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
+	/// Returns a single PDU from `room_id` with key (`event_type`,
+	/// `state_key`).
 	fn room_state_get(
-        &self,
+		&self, room_id: &RoomId, event_type: &StateEventType, state_key: &str,
-        room_id: &RoomId,
-        event_type: &StateEventType,
-        state_key: &str,
 	) -> Result<Option<Arc<PduEvent>>> {
-        if let Some(current_shortstatehash) =
+		if let Some(current_shortstatehash) = services().rooms.state.get_room_shortstatehash(room_id)? {
-            services().rooms.state.get_room_shortstatehash(room_id)?
-        {
 			self.state_get(current_shortstatehash, event_type, state_key)
 		} else {
 			Ok(None)

src/database/key_value/rooms/state_cache.rs

@@ -1,37 +1,36 @@
 use std::{collections::HashSet, sync::Arc};
 
-use regex::Regex;
 use ruma::{
-    api::appservice::Registration,
 	events::{AnyStrippedStateEvent, AnySyncStateEvent},
 	serde::Raw,
 	OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
 };
-use tracing::debug;
 
-use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
+use crate::{
+	database::KeyValueDatabase,
+	service::{self, appservice::RegistrationInfo},
+	services, utils, Error, Result,
+};
 
-type StrippedStateEventIter<'a> =
+type StrippedStateEventIter<'a> = Box<dyn Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnyStrippedStateEvent>>)>> + 'a>;
-    Box<dyn Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnyStrippedStateEvent>>)>> + 'a>;
 
-type AnySyncStateEventIter<'a> =
+type AnySyncStateEventIter<'a> = Box<dyn Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnySyncStateEvent>>)>> + 'a>;
-    Box<dyn Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnySyncStateEvent>>)>> + 'a>;
 
 impl service::rooms::state_cache::Data for KeyValueDatabase {
 	fn mark_as_once_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 		self.roomuseroncejoinedids.insert(&userroom_id, &[])
 	}
 
 	fn mark_as_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
 		let mut roomuser_id = room_id.as_bytes().to_vec();
-        roomuser_id.push(0xff);
+		roomuser_id.push(0xFF);
 		roomuser_id.extend_from_slice(user_id.as_bytes());
 
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_joined.insert(&userroom_id, &[])?;
@@ -45,28 +44,21 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	}
 
 	fn mark_as_invited(
-        &self,
+		&self, user_id: &UserId, room_id: &RoomId, last_state: Option<Vec<Raw<AnyStrippedStateEvent>>>,
-        user_id: &UserId,
-        room_id: &RoomId,
-        last_state: Option<Vec<Raw<AnyStrippedStateEvent>>>,
 	) -> Result<()> {
 		let mut roomuser_id = room_id.as_bytes().to_vec();
-        roomuser_id.push(0xff);
+		roomuser_id.push(0xFF);
 		roomuser_id.extend_from_slice(user_id.as_bytes());
 
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_invitestate.insert(
 			&userroom_id,
-            &serde_json::to_vec(&last_state.unwrap_or_default())
+			&serde_json::to_vec(&last_state.unwrap_or_default()).expect("state to bytes always works"),
-                .expect("state to bytes always works"),
-        )?;
-        self.roomuserid_invitecount.insert(
-            &roomuser_id,
-            &services().globals.next_count()?.to_be_bytes(),
 		)?;
+		self.roomuserid_invitecount.insert(&roomuser_id, &services().globals.next_count()?.to_be_bytes())?;
 		self.userroomid_joined.remove(&userroom_id)?;
 		self.roomuserid_joined.remove(&roomuser_id)?;
 		self.userroomid_leftstate.remove(&userroom_id)?;
@@ -77,21 +69,18 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 
 	fn mark_as_left(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
 		let mut roomuser_id = room_id.as_bytes().to_vec();
-        roomuser_id.push(0xff);
+		roomuser_id.push(0xFF);
 		roomuser_id.extend_from_slice(user_id.as_bytes());
 
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_leftstate.insert(
 			&userroom_id,
 			&serde_json::to_vec(&Vec::<Raw<AnySyncStateEvent>>::new()).unwrap(),
 		)?; // TODO
-        self.roomuserid_leftcount.insert(
+		self.roomuserid_leftcount.insert(&roomuser_id, &services().globals.next_count()?.to_be_bytes())?;
-            &roomuser_id,
-            &services().globals.next_count()?.to_be_bytes(),
-        )?;
 		self.userroomid_joined.remove(&userroom_id)?;
 		self.roomuserid_joined.remove(&roomuser_id)?;
 		self.userroomid_invitestate.remove(&userroom_id)?;
@@ -100,35 +89,13 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn delete_room_join_counts(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.roomid_joinedcount.scan_prefix(prefix.clone()) {
-            debug!("Removing key: {:?}", key);
-            self.roomid_joinedcount.remove(&key)?;
-        }
-
-        for (key, _) in self.roomid_invitedcount.scan_prefix(prefix.clone()) {
-            debug!("Removing key: {:?}", key);
-            self.roomid_invitedcount.remove(&key)?;
-        }
-
-        for (key, _) in self.roomserverids.scan_prefix(prefix.clone()) {
-            debug!("Removing key: {:?}", key);
-            self.roomserverids.remove(&key)?;
-        }
-
-        Ok(())
-    }
-
 	fn update_joined_count(&self, room_id: &RoomId) -> Result<()> {
 		let mut joinedcount = 0_u64;
 		let mut invitedcount = 0_u64;
 		let mut joined_servers = HashSet::new();
 		let mut real_users = HashSet::new();
 
-        for joined in self.room_members(room_id).filter_map(|r| r.ok()) {
+		for joined in self.room_members(room_id).filter_map(std::result::Result::ok) {
 			joined_servers.insert(joined.server_name().to_owned());
 			if joined.server_name() == services().globals.server_name()
 				&& !services().users.is_deactivated(&joined).unwrap_or(true)
@@ -138,30 +105,25 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 			joinedcount += 1;
 		}
 
-        for _invited in self.room_members_invited(room_id).filter_map(|r| r.ok()) {
+		for _invited in self.room_members_invited(room_id).filter_map(std::result::Result::ok) {
 			invitedcount += 1;
 		}
 
-        self.roomid_joinedcount
+		self.roomid_joinedcount.insert(room_id.as_bytes(), &joinedcount.to_be_bytes())?;
-            .insert(room_id.as_bytes(), &joinedcount.to_be_bytes())?;
 
-        self.roomid_invitedcount
+		self.roomid_invitedcount.insert(room_id.as_bytes(), &invitedcount.to_be_bytes())?;
-            .insert(room_id.as_bytes(), &invitedcount.to_be_bytes())?;
 
-        self.our_real_users_cache
+		self.our_real_users_cache.write().unwrap().insert(room_id.to_owned(), Arc::new(real_users));
-            .write()
-            .unwrap()
-            .insert(room_id.to_owned(), Arc::new(real_users));
 
-        for old_joined_server in self.room_servers(room_id).filter_map(|r| r.ok()) {
+		for old_joined_server in self.room_servers(room_id).filter_map(std::result::Result::ok) {
 			if !joined_servers.remove(&old_joined_server) {
 				// Server not in room anymore
 				let mut roomserver_id = room_id.as_bytes().to_vec();
-                roomserver_id.push(0xff);
+				roomserver_id.push(0xFF);
 				roomserver_id.extend_from_slice(old_joined_server.as_bytes());
 
 				let mut serverroom_id = old_joined_server.as_bytes().to_vec();
-                serverroom_id.push(0xff);
+				serverroom_id.push(0xFF);
 				serverroom_id.extend_from_slice(room_id.as_bytes());
 
 				self.roomserverids.remove(&roomserver_id)?;
@@ -172,91 +134,63 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 		// Now only new servers are in joined_servers anymore
 		for server in joined_servers {
 			let mut roomserver_id = room_id.as_bytes().to_vec();
-            roomserver_id.push(0xff);
+			roomserver_id.push(0xFF);
 			roomserver_id.extend_from_slice(server.as_bytes());
 
 			let mut serverroom_id = server.as_bytes().to_vec();
-            serverroom_id.push(0xff);
+			serverroom_id.push(0xFF);
 			serverroom_id.extend_from_slice(room_id.as_bytes());
 
 			self.roomserverids.insert(&roomserver_id, &[])?;
 			self.serverroomids.insert(&serverroom_id, &[])?;
 		}
 
-        self.appservice_in_room_cache
+		self.appservice_in_room_cache.write().unwrap().remove(room_id);
-            .write()
-            .unwrap()
-            .remove(room_id);
 
 		Ok(())
 	}
 
 	#[tracing::instrument(skip(self, room_id))]
 	fn get_our_real_users(&self, room_id: &RoomId) -> Result<Arc<HashSet<OwnedUserId>>> {
-        let maybe = self
+		let maybe = self.our_real_users_cache.read().unwrap().get(room_id).cloned();
-            .our_real_users_cache
-            .read()
-            .unwrap()
-            .get(room_id)
-            .cloned();
 		if let Some(users) = maybe {
 			Ok(users)
 		} else {
 			self.update_joined_count(room_id)?;
-            Ok(Arc::clone(
+			Ok(Arc::clone(self.our_real_users_cache.read().unwrap().get(room_id).unwrap()))
-                self.our_real_users_cache
-                    .read()
-                    .unwrap()
-                    .get(room_id)
-                    .unwrap(),
-            ))
 		}
 	}
 
-    /// Check our room state cache if an appservice is in the room ID
+	#[tracing::instrument(skip(self, room_id, appservice))]
-    fn appservice_in_room(
+	fn appservice_in_room(&self, room_id: &RoomId, appservice: &RegistrationInfo) -> Result<bool> {
-        &self,
-        room_id: &RoomId,
-        appservice: &(String, Registration),
-    ) -> Result<bool> {
 		let maybe = self
 			.appservice_in_room_cache
 			.read()
 			.unwrap()
 			.get(room_id)
-            .and_then(|map| map.get(&appservice.0))
+			.and_then(|map| map.get(&appservice.registration.id))
 			.copied();
 
 		if let Some(b) = maybe {
 			Ok(b)
 		} else {
-            let namespaces = &appservice.1.namespaces;
-            let users = namespaces
-                .users
-                .iter()
-                .filter_map(|users| Regex::new(users.regex.as_str()).ok())
-                .collect::<Vec<_>>();
-
 			let bridge_user_id = UserId::parse_with_server_name(
-                appservice.1.sender_localpart.as_str(),
+				appservice.registration.sender_localpart.as_str(),
 				services().globals.server_name(),
 			)
 			.ok();
 
-            let in_room = bridge_user_id
+			let in_room = bridge_user_id.map_or(false, |id| self.is_joined(&id, room_id).unwrap_or(false))
-                .map_or(false, |id| self.is_joined(&id, room_id).unwrap_or(false))
+				|| self
-                || self.room_members(room_id).any(|userid| {
+					.room_members(room_id)
-                    userid.map_or(false, |userid| {
+					.any(|userid| userid.map_or(false, |userid| appservice.users.is_match(userid.as_str())));
-                        users.iter().any(|r| r.is_match(userid.as_str()))
-                    })
-                });
 
 			self.appservice_in_room_cache
 				.write()
 				.unwrap()
 				.entry(room_id.to_owned())
 				.or_default()
-                .insert(appservice.0.clone(), in_room);
+				.insert(appservice.registration.id.clone(), in_room);
 
 			Ok(in_room)
 		}
@@ -266,11 +200,11 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	#[tracing::instrument(skip(self))]
 	fn forget(&self, room_id: &RoomId, user_id: &UserId) -> Result<()> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		let mut roomuser_id = room_id.as_bytes().to_vec();
-        roomuser_id.push(0xff);
+		roomuser_id.push(0xFF);
 		roomuser_id.extend_from_slice(user_id.as_bytes());
 
 		self.userroomid_leftstate.remove(&userroom_id)?;
@@ -281,53 +215,38 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 
 	/// Returns an iterator of all servers participating in this room.
 	#[tracing::instrument(skip(self))]
-    fn room_servers<'a>(
+	fn room_servers<'a>(&'a self, room_id: &RoomId) -> Box<dyn Iterator<Item = Result<OwnedServerName>> + 'a> {
-        &'a self,
-        room_id: &RoomId,
-    ) -> Box<dyn Iterator<Item = Result<OwnedServerName>> + 'a> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Box::new(self.roomserverids.scan_prefix(prefix).map(|(key, _)| {
 			ServerName::parse(
-                utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                    key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("Server name in roomserverids is invalid unicode."))?,
-                        .next()
-                        .expect("rsplit always returns an element"),
-                )
-                .map_err(|_| {
-                    Error::bad_database("Server name in roomserverids is invalid unicode.")
-                })?,
 			)
 			.map_err(|_| Error::bad_database("Server name in roomserverids is invalid."))
 		}))
 	}
 
-    /// Check our room state cache if a server is in the room ID
+	#[tracing::instrument(skip(self))]
 	fn server_in_room(&self, server: &ServerName, room_id: &RoomId) -> Result<bool> {
 		let mut key = server.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
 
 		self.serverroomids.get(&key).map(|o| o.is_some())
 	}
 
-    /// Returns an iterator of all rooms a server participates in (as far as we know).
+	/// Returns an iterator of all rooms a server participates in (as far as we
+	/// know).
 	#[tracing::instrument(skip(self))]
-    fn server_rooms<'a>(
+	fn server_rooms<'a>(&'a self, server: &ServerName) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
-        &'a self,
-        server: &ServerName,
-    ) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
 		let mut prefix = server.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Box::new(self.serverroomids.scan_prefix(prefix).map(|(key, _)| {
 			RoomId::parse(
-                utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                    key.rsplit(|&b| b == 0xff)
-                        .next()
-                        .expect("rsplit always returns an element"),
-                )
 					.map_err(|_| Error::bad_database("RoomId in serverroomids is invalid unicode."))?,
 			)
 			.map_err(|_| Error::bad_database("RoomId in serverroomids is invalid."))
@@ -336,204 +255,128 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 
 	/// Returns an iterator over all joined members of a room.
 	#[tracing::instrument(skip(self))]
-    fn room_members<'a>(
+	fn room_members<'a>(&'a self, room_id: &RoomId) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
-        &'a self,
-        room_id: &RoomId,
-    ) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
 		Box::new(self.roomuserid_joined.scan_prefix(prefix).map(|(key, _)| {
 			UserId::parse(
-                utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                    key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("User ID in roomuserid_joined is invalid unicode."))?,
-                        .next()
-                        .expect("rsplit always returns an element"),
-                )
-                .map_err(|_| {
-                    Error::bad_database("User ID in roomuserid_joined is invalid unicode.")
-                })?,
 			)
 			.map_err(|_| Error::bad_database("User ID in roomuserid_joined is invalid."))
 		}))
 	}
 
+	/// Returns the number of users which are currently in a room
 	#[tracing::instrument(skip(self))]
 	fn room_joined_count(&self, room_id: &RoomId) -> Result<Option<u64>> {
 		self.roomid_joinedcount
 			.get(room_id.as_bytes())?
-            .map(|b| {
+			.map(|b| utils::u64_from_bytes(&b).map_err(|_| Error::bad_database("Invalid joinedcount in db.")))
-                utils::u64_from_bytes(&b)
-                    .map_err(|_| Error::bad_database("Invalid joinedcount in db."))
-            })
 			.transpose()
 	}
 
+	/// Returns the number of users which are currently invited to a room
 	#[tracing::instrument(skip(self))]
 	fn room_invited_count(&self, room_id: &RoomId) -> Result<Option<u64>> {
 		self.roomid_invitedcount
 			.get(room_id.as_bytes())?
-            .map(|b| {
+			.map(|b| utils::u64_from_bytes(&b).map_err(|_| Error::bad_database("Invalid joinedcount in db.")))
-                utils::u64_from_bytes(&b)
-                    .map_err(|_| Error::bad_database("Invalid joinedcount in db."))
-            })
 			.transpose()
 	}
 
 	/// Returns an iterator over all User IDs who ever joined a room.
 	#[tracing::instrument(skip(self))]
-    fn room_useroncejoined<'a>(
+	fn room_useroncejoined<'a>(&'a self, room_id: &RoomId) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
-        &'a self,
-        room_id: &RoomId,
-    ) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
-        Box::new(
+		Box::new(self.roomuseroncejoinedids.scan_prefix(prefix).map(|(key, _)| {
-            self.roomuseroncejoinedids
-                .scan_prefix(prefix)
-                .map(|(key, _)| {
 			UserId::parse(
-                        utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                            key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("User ID in room_useroncejoined is invalid unicode."))?,
-                                .next()
-                                .expect("rsplit always returns an element"),
-                        )
-                        .map_err(|_| {
-                            Error::bad_database(
-                                "User ID in room_useroncejoined is invalid unicode.",
-                            )
-                        })?,
 			)
 			.map_err(|_| Error::bad_database("User ID in room_useroncejoined is invalid."))
-                }),
+		}))
-        )
 	}
 
 	/// Returns an iterator over all invited members of a room.
 	#[tracing::instrument(skip(self))]
-    fn room_members_invited<'a>(
+	fn room_members_invited<'a>(&'a self, room_id: &RoomId) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
-        &'a self,
-        room_id: &RoomId,
-    ) -> Box<dyn Iterator<Item = Result<OwnedUserId>> + 'a> {
 		let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
-        Box::new(
+		Box::new(self.roomuserid_invitecount.scan_prefix(prefix).map(|(key, _)| {
-            self.roomuserid_invitecount
-                .scan_prefix(prefix)
-                .map(|(key, _)| {
 			UserId::parse(
-                        utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                            key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("User ID in roomuserid_invited is invalid unicode."))?,
-                                .next()
-                                .expect("rsplit always returns an element"),
-                        )
-                        .map_err(|_| {
-                            Error::bad_database("User ID in roomuserid_invited is invalid unicode.")
-                        })?,
 			)
 			.map_err(|_| Error::bad_database("User ID in roomuserid_invited is invalid."))
-                }),
+		}))
-        )
 	}
 
 	#[tracing::instrument(skip(self))]
 	fn get_invite_count(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<u64>> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
-        self.roomuserid_invitecount
+		self.roomuserid_invitecount.get(&key)?.map_or(Ok(None), |bytes| {
-            .get(&key)?
+			Ok(Some(
-            .map_or(Ok(None), |bytes| {
+				utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid invitecount in db."))?,
-                Ok(Some(utils::u64_from_bytes(&bytes).map_err(|_| {
+			))
-                    Error::bad_database("Invalid invitecount in db.")
-                })?))
 		})
 	}
 
 	#[tracing::instrument(skip(self))]
 	fn get_left_count(&self, room_id: &RoomId, user_id: &UserId) -> Result<Option<u64>> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
 		self.roomuserid_leftcount
 			.get(&key)?
-            .map(|bytes| {
+			.map(|bytes| utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid leftcount in db.")))
-                utils::u64_from_bytes(&bytes)
-                    .map_err(|_| Error::bad_database("Invalid leftcount in db."))
-            })
 			.transpose()
 	}
 
 	/// Returns an iterator over all rooms this user joined.
 	#[tracing::instrument(skip(self))]
-    fn rooms_joined<'a>(
+	fn rooms_joined<'a>(&'a self, user_id: &UserId) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
-        &'a self,
+		Box::new(self.userroomid_joined.scan_prefix(user_id.as_bytes().to_vec()).map(|(key, _)| {
-        user_id: &UserId,
-    ) -> Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a> {
-        Box::new(
-            self.userroomid_joined
-                .scan_prefix(user_id.as_bytes().to_vec())
-                .map(|(key, _)| {
 			RoomId::parse(
-                        utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                            key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("Room ID in userroomid_joined is invalid unicode."))?,
-                                .next()
-                                .expect("rsplit always returns an element"),
-                        )
-                        .map_err(|_| {
-                            Error::bad_database("Room ID in userroomid_joined is invalid unicode.")
-                        })?,
 			)
 			.map_err(|_| Error::bad_database("Room ID in userroomid_joined is invalid."))
-                }),
+		}))
-        )
 	}
 
 	/// Returns an iterator over all rooms a user was invited to.
 	#[tracing::instrument(skip(self))]
 	fn rooms_invited<'a>(&'a self, user_id: &UserId) -> StrippedStateEventIter<'a> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
-        Box::new(
+		Box::new(self.userroomid_invitestate.scan_prefix(prefix).map(|(key, state)| {
-            self.userroomid_invitestate
-                .scan_prefix(prefix)
-                .map(|(key, state)| {
 			let room_id = RoomId::parse(
-                        utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                            key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("Room ID in userroomid_invited is invalid unicode."))?,
-                                .next()
-                                .expect("rsplit always returns an element"),
 			)
-                        .map_err(|_| {
+			.map_err(|_| Error::bad_database("Room ID in userroomid_invited is invalid."))?;
-                            Error::bad_database("Room ID in userroomid_invited is invalid unicode.")
-                        })?,
-                    )
-                    .map_err(|_| {
-                        Error::bad_database("Room ID in userroomid_invited is invalid.")
-                    })?;
 
-                    let state = serde_json::from_slice(&state).map_err(|_| {
+			let state = serde_json::from_slice(&state)
-                        Error::bad_database("Invalid state in userroomid_invitestate.")
+				.map_err(|_| Error::bad_database("Invalid state in userroomid_invitestate."))?;
-                    })?;
 
 			Ok((room_id, state))
-                }),
+		}))
-        )
 	}
 
 	#[tracing::instrument(skip(self))]
-    fn invite_state(
+	fn invite_state(&self, user_id: &UserId, room_id: &RoomId) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
-        &self,
-        user_id: &UserId,
-        room_id: &RoomId,
-    ) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_invitestate
@@ -548,13 +391,9 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	}
 
 	#[tracing::instrument(skip(self))]
-    fn left_state(
+	fn left_state(&self, user_id: &UserId, room_id: &RoomId) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
-        &self,
-        user_id: &UserId,
-        room_id: &RoomId,
-    ) -> Result<Option<Vec<Raw<AnyStrippedStateEvent>>>> {
 		let mut key = user_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_leftstate
@@ -572,39 +411,26 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	#[tracing::instrument(skip(self))]
 	fn rooms_left<'a>(&'a self, user_id: &UserId) -> AnySyncStateEventIter<'a> {
 		let mut prefix = user_id.as_bytes().to_vec();
-        prefix.push(0xff);
+		prefix.push(0xFF);
 
-        Box::new(
+		Box::new(self.userroomid_leftstate.scan_prefix(prefix).map(|(key, state)| {
-            self.userroomid_leftstate
-                .scan_prefix(prefix)
-                .map(|(key, state)| {
 			let room_id = RoomId::parse(
-                        utils::string_from_bytes(
+				utils::string_from_bytes(key.rsplit(|&b| b == 0xFF).next().expect("rsplit always returns an element"))
-                            key.rsplit(|&b| b == 0xff)
+					.map_err(|_| Error::bad_database("Room ID in userroomid_invited is invalid unicode."))?,
-                                .next()
-                                .expect("rsplit always returns an element"),
 			)
-                        .map_err(|_| {
+			.map_err(|_| Error::bad_database("Room ID in userroomid_invited is invalid."))?;
-                            Error::bad_database("Room ID in userroomid_invited is invalid unicode.")
-                        })?,
-                    )
-                    .map_err(|_| {
-                        Error::bad_database("Room ID in userroomid_invited is invalid.")
-                    })?;
 
-                    let state = serde_json::from_slice(&state).map_err(|_| {
+			let state = serde_json::from_slice(&state)
-                        Error::bad_database("Invalid state in userroomid_leftstate.")
+				.map_err(|_| Error::bad_database("Invalid state in userroomid_leftstate."))?;
-                    })?;
 
 			Ok((room_id, state))
-                }),
+		}))
-        )
 	}
 
 	#[tracing::instrument(skip(self))]
 	fn once_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<bool> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		Ok(self.roomuseroncejoinedids.get(&userroom_id)?.is_some())
@@ -613,7 +439,7 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	#[tracing::instrument(skip(self))]
 	fn is_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<bool> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		Ok(self.userroomid_joined.get(&userroom_id)?.is_some())
@@ -622,7 +448,7 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	#[tracing::instrument(skip(self))]
 	fn is_invited(&self, user_id: &UserId, room_id: &RoomId) -> Result<bool> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		Ok(self.userroomid_invitestate.get(&userroom_id)?.is_some())
@@ -631,7 +457,7 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 	#[tracing::instrument(skip(self))]
 	fn is_left(&self, user_id: &UserId, room_id: &RoomId) -> Result<bool> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		Ok(self.userroomid_leftstate.get(&userroom_id)?.is_some())

src/database/key_value/rooms/state_compressor.rs

@@ -12,9 +12,12 @@ impl service::rooms::state_compressor::Data for KeyValueDatabase {
 			.shortstatehash_statediff
 			.get(&shortstatehash.to_be_bytes())?
 			.ok_or_else(|| Error::bad_database("State hash does not exist"))?;
-        let parent =
+		let parent = utils::u64_from_bytes(&value[0..size_of::<u64>()]).expect("bytes have right length");
-            utils::u64_from_bytes(&value[0..size_of::<u64>()]).expect("bytes have right length");
+		let parent = if parent != 0 {
-        let parent = if parent != 0 { Some(parent) } else { None };
+			Some(parent)
+		} else {
+			None
+		};
 
 		let mut add_mode = true;
 		let mut added = HashSet::new();
@@ -55,7 +58,6 @@ impl service::rooms::state_compressor::Data for KeyValueDatabase {
 			}
 		}
 
-        self.shortstatehash_statediff
+		self.shortstatehash_statediff.insert(&shortstatehash.to_be_bytes(), &value)
-            .insert(&shortstatehash.to_be_bytes(), &value)
 	}
 }

src/database/key_value/rooms/threads.rs

@@ -1,7 +1,6 @@
 use std::mem;
 
 use ruma::{api::client::threads::get_threads::v1::IncludeThreads, OwnedUserId, RoomId, UserId};
-use tracing::debug;
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, PduEvent, Result};
 
@@ -9,63 +8,34 @@ type PduEventIterResult<'a> = Result<Box<dyn Iterator<Item = Result<(u64, PduEve
 
 impl service::rooms::threads::Data for KeyValueDatabase {
 	fn threads_until<'a>(
-        &'a self,
+		&'a self, user_id: &'a UserId, room_id: &'a RoomId, until: u64, _include: &'a IncludeThreads,
-        user_id: &'a UserId,
-        room_id: &'a RoomId,
-        until: u64,
-        _include: &'a IncludeThreads,
 	) -> PduEventIterResult<'a> {
-        let prefix = services()
+		let prefix = services().rooms.short.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
-            .rooms
-            .short
-            .get_shortroomid(room_id)?
-            .expect("room exists")
-            .to_be_bytes()
-            .to_vec();
 
 		let mut current = prefix.clone();
 		current.extend_from_slice(&(until - 1).to_be_bytes());
 
 		Ok(Box::new(
-            self.threadid_userids
+			self.threadid_userids.iter_from(&current, true).take_while(move |(k, _)| k.starts_with(&prefix)).map(
-                .iter_from(&current, true)
+				move |(pduid, _users)| {
-                .take_while(move |(k, _)| k.starts_with(&prefix))
-                .map(move |(pduid, _users)| {
 					let count = utils::u64_from_bytes(&pduid[(mem::size_of::<u64>())..])
 						.map_err(|_| Error::bad_database("Invalid pduid in threadid_userids."))?;
 					let mut pdu = services()
 						.rooms
 						.timeline
 						.get_pdu_from_id(&pduid)?
-                        .ok_or_else(|| {
+						.ok_or_else(|| Error::bad_database("Invalid pduid reference in threadid_userids"))?;
-                            Error::bad_database("Invalid pduid reference in threadid_userids")
-                        })?;
 					if pdu.sender != user_id {
 						pdu.remove_transaction_id()?;
 					}
 					Ok((count, pdu))
-                }),
+				},
+			),
 		))
 	}
 
-    fn delete_all_rooms_threads(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.threadid_userids.scan_prefix(prefix) {
-            debug!("Removing key: {:?}", key);
-            self.threadid_userids.remove(&key)?;
-        }
-
-        Ok(())
-    }
-
 	fn update_participants(&self, root_id: &[u8], participants: &[OwnedUserId]) -> Result<()> {
-        let users = participants
+		let users = participants.iter().map(|user| user.as_bytes()).collect::<Vec<_>>().join(&[0xFF][..]);
-            .iter()
-            .map(|user| user.as_bytes())
-            .collect::<Vec<_>>()
-            .join(&[0xff][..]);
 
 		self.threadid_userids.insert(root_id, &users)?;
 
@@ -76,14 +46,15 @@ impl service::rooms::threads::Data for KeyValueDatabase {
 		if let Some(users) = self.threadid_userids.get(root_id)? {
 			Ok(Some(
 				users
-                    .split(|b| *b == 0xff)
+					.split(|b| *b == 0xFF)
 					.map(|bytes| {
-                        UserId::parse(utils::string_from_bytes(bytes).map_err(|_| {
+						UserId::parse(
-                            Error::bad_database("Invalid UserId bytes in threadid_userids.")
+							utils::string_from_bytes(bytes)
-                        })?)
+								.map_err(|_| Error::bad_database("Invalid UserId bytes in threadid_userids."))?,
+						)
 						.map_err(|_| Error::bad_database("Invalid UserId in threadid_userids."))
 					})
-                    .filter_map(|r| r.ok())
+					.filter_map(std::result::Result::ok)
 					.collect(),
 			))
 		} else {

src/database/key_value/rooms/timeline.rs

@@ -1,52 +1,34 @@
 use std::{collections::hash_map, mem::size_of, sync::Arc};
 
-use ruma::{
+use ruma::{api::client::error::ErrorKind, CanonicalJsonObject, EventId, OwnedUserId, RoomId, UserId};
-    api::client::error::ErrorKind, CanonicalJsonObject, EventId, OwnedUserId, RoomId, UserId,
-};
-use tracing::{debug, error};
-
-use crate::{
-    database::KeyValueDatabase,
-    service::{self, rooms::timeline::data::PduData},
-    services, utils, Error, PduEvent, Result,
-};
-
 use service::rooms::timeline::PduCount;
+use tracing::error;
+
+use crate::{database::KeyValueDatabase, service, services, utils, Error, PduEvent, Result};
 
 impl service::rooms::timeline::Data for KeyValueDatabase {
 	fn last_timeline_count(&self, sender_user: &UserId, room_id: &RoomId) -> Result<PduCount> {
-        match self
+		match self.lasttimelinecount_cache.lock().unwrap().entry(room_id.to_owned()) {
-            .lasttimelinecount_cache
-            .lock()
-            .unwrap()
-            .entry(room_id.to_owned())
-        {
 			hash_map::Entry::Vacant(v) => {
-                if let Some(last_count) = self
+				if let Some(last_count) = self.pdus_until(sender_user, room_id, PduCount::max())?.find_map(|r| {
-                    .pdus_until(sender_user, room_id, PduCount::max())?
-                    .find_map(|r| {
 					// Filter out buggy events
 					if r.is_err() {
 						error!("Bad pdu in pdus_since: {:?}", r);
 					}
 					r.ok()
-                    })
+				}) {
-                {
 					Ok(*v.insert(last_count.0))
 				} else {
 					Ok(PduCount::Normal(0))
 				}
-            }
+			},
 			hash_map::Entry::Occupied(o) => Ok(*o.get()),
 		}
 	}
 
 	/// Returns the `count` of this pdu's id.
 	fn get_pdu_count(&self, event_id: &EventId) -> Result<Option<PduCount>> {
-        self.eventid_pduid
+		self.eventid_pduid.get(event_id.as_bytes())?.map(|pdu_id| pdu_count(&pdu_id)).transpose()
-            .get(event_id.as_bytes())?
-            .map(|pdu_id| pdu_count(&pdu_id))
-            .transpose()
 	}
 
 	/// Returns the json of a pdu.
@@ -55,10 +37,7 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 			|| {
 				self.eventid_outlierpdu
 					.get(event_id.as_bytes())?
-                    .map(|pdu| {
+					.map(|pdu| serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")))
-                        serde_json::from_slice(&pdu)
-                            .map_err(|_| Error::bad_database("Invalid PDU in db."))
-                    })
 					.transpose()
 			},
 			|x| Ok(Some(x)),
@@ -70,35 +49,25 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 		self.eventid_pduid
 			.get(event_id.as_bytes())?
 			.map(|pduid| {
-                self.pduid_pdu
+				self.pduid_pdu.get(&pduid)?.ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid."))
-                    .get(&pduid)?
-                    .ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid."))
 			})
 			.transpose()?
-            .map(|pdu| {
+			.map(|pdu| serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")))
-                serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
-            })
 			.transpose()
 	}
 
 	/// Returns the pdu's id.
-    fn get_pdu_id(&self, event_id: &EventId) -> Result<Option<Vec<u8>>> {
+	fn get_pdu_id(&self, event_id: &EventId) -> Result<Option<Vec<u8>>> { self.eventid_pduid.get(event_id.as_bytes()) }
-        self.eventid_pduid.get(event_id.as_bytes())
-    }
 
 	/// Returns the pdu.
 	fn get_non_outlier_pdu(&self, event_id: &EventId) -> Result<Option<PduEvent>> {
 		self.eventid_pduid
 			.get(event_id.as_bytes())?
 			.map(|pduid| {
-                self.pduid_pdu
+				self.pduid_pdu.get(&pduid)?.ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid."))
-                    .get(&pduid)?
-                    .ok_or_else(|| Error::bad_database("Invalid pduid in eventid_pduid."))
 			})
 			.transpose()?
-            .map(|pdu| {
+			.map(|pdu| serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")))
-                serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
-            })
 			.transpose()
 	}
 
@@ -116,20 +85,14 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 				|| {
 					self.eventid_outlierpdu
 						.get(event_id.as_bytes())?
-                        .map(|pdu| {
+						.map(|pdu| serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db.")))
-                            serde_json::from_slice(&pdu)
-                                .map_err(|_| Error::bad_database("Invalid PDU in db."))
-                        })
 						.transpose()
 				},
 				|x| Ok(Some(x)),
 			)?
 			.map(Arc::new)
 		{
-            self.pdu_cache
+			self.pdu_cache.lock().unwrap().insert(event_id.to_owned(), Arc::clone(&pdu));
-                .lock()
-                .unwrap()
-                .insert(event_id.to_owned(), Arc::clone(&pdu));
 			Ok(Some(pdu))
 		} else {
 			Ok(None)
@@ -142,8 +105,7 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 	fn get_pdu_from_id(&self, pdu_id: &[u8]) -> Result<Option<PduEvent>> {
 		self.pduid_pdu.get(pdu_id)?.map_or(Ok(None), |pdu| {
 			Ok(Some(
-                serde_json::from_slice(&pdu)
+				serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))?,
-                    .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
 			))
 		})
 	}
@@ -152,28 +114,18 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 	fn get_pdu_json_from_id(&self, pdu_id: &[u8]) -> Result<Option<CanonicalJsonObject>> {
 		self.pduid_pdu.get(pdu_id)?.map_or(Ok(None), |pdu| {
 			Ok(Some(
-                serde_json::from_slice(&pdu)
+				serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))?,
-                    .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
 			))
 		})
 	}
 
-    fn append_pdu(
+	fn append_pdu(&self, pdu_id: &[u8], pdu: &PduEvent, json: &CanonicalJsonObject, count: u64) -> Result<()> {
-        &self,
-        pdu_id: &[u8],
-        pdu: &PduEvent,
-        json: &CanonicalJsonObject,
-        count: u64,
-    ) -> Result<()> {
 		self.pduid_pdu.insert(
 			pdu_id,
 			&serde_json::to_vec(json).expect("CanonicalJsonObject is always a valid"),
 		)?;
 
-        self.lasttimelinecount_cache
+		self.lasttimelinecount_cache.lock().unwrap().insert(pdu.room_id.clone(), PduCount::Normal(count));
-            .lock()
-            .unwrap()
-            .insert(pdu.room_id.clone(), PduCount::Normal(count));
 
 		self.eventid_pduid.insert(pdu.event_id.as_bytes(), pdu_id)?;
 		self.eventid_outlierpdu.remove(pdu.event_id.as_bytes())?;
@@ -181,12 +133,7 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn prepend_backfill_pdu(
+	fn prepend_backfill_pdu(&self, pdu_id: &[u8], event_id: &EventId, json: &CanonicalJsonObject) -> Result<()> {
-        &self,
-        pdu_id: &[u8],
-        event_id: &EventId,
-        json: &CanonicalJsonObject,
-    ) -> Result<()> {
 		self.pduid_pdu.insert(
 			pdu_id,
 			&serde_json::to_vec(json).expect("CanonicalJsonObject is always a valid"),
@@ -199,49 +146,34 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 	}
 
 	/// Removes a pdu and creates a new one with the same id.
-    fn replace_pdu(
+	fn replace_pdu(&self, pdu_id: &[u8], pdu_json: &CanonicalJsonObject, pdu: &PduEvent) -> Result<()> {
-        &self,
-        pdu_id: &[u8],
-        pdu_json: &CanonicalJsonObject,
-        pdu: &PduEvent,
-    ) -> Result<()> {
 		if self.pduid_pdu.get(pdu_id)?.is_some() {
 			self.pduid_pdu.insert(
 				pdu_id,
 				&serde_json::to_vec(pdu_json).expect("CanonicalJsonObject is always a valid"),
 			)?;
 		} else {
-            return Err(Error::BadRequest(
+			return Err(Error::BadRequest(ErrorKind::NotFound, "PDU does not exist."));
-                ErrorKind::NotFound,
-                "PDU does not exist.",
-            ));
 		}
 
-        self.pdu_cache
+		self.pdu_cache.lock().unwrap().remove(&(*pdu.event_id).to_owned());
-            .lock()
-            .unwrap()
-            .remove(&(*pdu.event_id).to_owned());
 
 		Ok(())
 	}
 
-    /// Returns an iterator over all events and their tokens in a room that happened before the
+	/// Returns an iterator over all events and their tokens in a room that
-    /// event with id `until` in reverse-chronological order.
+	/// happened before the event with id `until` in reverse-chronological
+	/// order.
 	fn pdus_until<'a>(
-        &'a self,
+		&'a self, user_id: &UserId, room_id: &RoomId, until: PduCount,
-        user_id: &UserId,
+	) -> Result<Box<dyn Iterator<Item = Result<(PduCount, PduEvent)>> + 'a>> {
-        room_id: &RoomId,
-        until: PduCount,
-    ) -> PduData<'a> {
 		let (prefix, current) = count_to_id(room_id, until, 1, true)?;
 
 		let user_id = user_id.to_owned();
 
 		Ok(Box::new(
-            self.pduid_pdu
+			self.pduid_pdu.iter_from(&current, true).take_while(move |(k, _)| k.starts_with(&prefix)).map(
-                .iter_from(&current, true)
+				move |(pdu_id, v)| {
-                .take_while(move |(k, _)| k.starts_with(&prefix))
-                .map(move |(pdu_id, v)| {
 					let mut pdu = serde_json::from_slice::<PduEvent>(&v)
 						.map_err(|_| Error::bad_database("PDU in db is invalid."))?;
 					if pdu.sender != user_id {
@@ -250,20 +182,21 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 					pdu.add_age()?;
 					let count = pdu_count(&pdu_id)?;
 					Ok((count, pdu))
-                }),
+				},
+			),
 		))
 	}
 
-    fn pdus_after<'a>(&'a self, user_id: &UserId, room_id: &RoomId, from: PduCount) -> PduData<'a> {
+	fn pdus_after<'a>(
+		&'a self, user_id: &UserId, room_id: &RoomId, from: PduCount,
+	) -> Result<Box<dyn Iterator<Item = Result<(PduCount, PduEvent)>> + 'a>> {
 		let (prefix, current) = count_to_id(room_id, from, 1, false)?;
 
 		let user_id = user_id.to_owned();
 
 		Ok(Box::new(
-            self.pduid_pdu
+			self.pduid_pdu.iter_from(&current, false).take_while(move |(k, _)| k.starts_with(&prefix)).map(
-                .iter_from(&current, false)
+				move |(pdu_id, v)| {
-                .take_while(move |(k, _)| k.starts_with(&prefix))
-                .map(move |(pdu_id, v)| {
 					let mut pdu = serde_json::from_slice::<PduEvent>(&v)
 						.map_err(|_| Error::bad_database("PDU in db is invalid."))?;
 					if pdu.sender != user_id {
@@ -272,47 +205,31 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 					pdu.add_age()?;
 					let count = pdu_count(&pdu_id)?;
 					Ok((count, pdu))
-                }),
+				},
+			),
 		))
 	}
 
 	fn increment_notification_counts(
-        &self,
+		&self, room_id: &RoomId, notifies: Vec<OwnedUserId>, highlights: Vec<OwnedUserId>,
-        room_id: &RoomId,
-        notifies: Vec<OwnedUserId>,
-        highlights: Vec<OwnedUserId>,
 	) -> Result<()> {
 		let mut notifies_batch = Vec::new();
 		let mut highlights_batch = Vec::new();
 		for user in notifies {
 			let mut userroom_id = user.as_bytes().to_vec();
-            userroom_id.push(0xff);
+			userroom_id.push(0xFF);
 			userroom_id.extend_from_slice(room_id.as_bytes());
 			notifies_batch.push(userroom_id);
 		}
 		for user in highlights {
 			let mut userroom_id = user.as_bytes().to_vec();
-            userroom_id.push(0xff);
+			userroom_id.push(0xFF);
 			userroom_id.extend_from_slice(room_id.as_bytes());
 			highlights_batch.push(userroom_id);
 		}
 
-        self.userroomid_notificationcount
+		self.userroomid_notificationcount.increment_batch(&mut notifies_batch.into_iter())?;
-            .increment_batch(&mut notifies_batch.into_iter())?;
+		self.userroomid_highlightcount.increment_batch(&mut highlights_batch.into_iter())?;
-        self.userroomid_highlightcount
-            .increment_batch(&mut highlights_batch.into_iter())?;
-        Ok(())
-    }
-
-    fn delete_all_pdus_for_room(&self, room_id: &RoomId) -> Result<()> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        for (key, _) in self.pduid_pdu.scan_prefix(prefix) {
-            debug!("Removing key: {:?}", key);
-            self.pduid_pdu.remove(&key)?;
-        }
-
 		Ok(())
 	}
 }
@@ -321,9 +238,8 @@ impl service::rooms::timeline::Data for KeyValueDatabase {
 fn pdu_count(pdu_id: &[u8]) -> Result<PduCount> {
 	let last_u64 = utils::u64_from_bytes(&pdu_id[pdu_id.len() - size_of::<u64>()..])
 		.map_err(|_| Error::bad_database("PDU has invalid count bytes."))?;
-    let second_last_u64 = utils::u64_from_bytes(
+	let second_last_u64 =
-        &pdu_id[pdu_id.len() - 2 * size_of::<u64>()..pdu_id.len() - size_of::<u64>()],
+		utils::u64_from_bytes(&pdu_id[pdu_id.len() - 2 * size_of::<u64>()..pdu_id.len() - size_of::<u64>()]);
-    );
 
 	if matches!(second_last_u64, Ok(0)) {
 		Ok(PduCount::Backfilled(u64::MAX - last_u64))
@@ -332,17 +248,12 @@ fn pdu_count(pdu_id: &[u8]) -> Result<PduCount> {
 	}
 }
 
-fn count_to_id(
+fn count_to_id(room_id: &RoomId, count: PduCount, offset: u64, subtract: bool) -> Result<(Vec<u8>, Vec<u8>)> {
-    room_id: &RoomId,
-    count: PduCount,
-    offset: u64,
-    subtract: bool,
-) -> Result<(Vec<u8>, Vec<u8>)> {
 	let prefix = services()
 		.rooms
 		.short
 		.get_shortroomid(room_id)?
-        .expect("room exists")
+		.ok_or_else(|| Error::bad_database("Looked for bad shortroomid in timeline"))?
 		.to_be_bytes()
 		.to_vec();
 	let mut pdu_id = prefix.clone();
@@ -354,7 +265,7 @@ fn count_to_id(
 			} else {
 				x + offset
 			}
-        }
+		},
 		PduCount::Backfilled(x) => {
 			pdu_id.extend_from_slice(&0_u64.to_be_bytes());
 			let num = u64::MAX - x;
@@ -367,7 +278,7 @@ fn count_to_id(
 			} else {
 				num + offset
 			}
-        }
+		},
 	};
 	pdu_id.extend_from_slice(&count_raw.to_be_bytes());
 

src/database/key_value/rooms/user.rs

@@ -5,95 +5,73 @@ use crate::{database::KeyValueDatabase, service, services, utils, Error, Result}
 impl service::rooms::user::Data for KeyValueDatabase {
 	fn reset_notification_counts(&self, user_id: &UserId, room_id: &RoomId) -> Result<()> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 		let mut roomuser_id = room_id.as_bytes().to_vec();
-        roomuser_id.push(0xff);
+		roomuser_id.push(0xFF);
 		roomuser_id.extend_from_slice(user_id.as_bytes());
 
-        self.userroomid_notificationcount
+		self.userroomid_notificationcount.insert(&userroom_id, &0_u64.to_be_bytes())?;
-            .insert(&userroom_id, &0_u64.to_be_bytes())?;
+		self.userroomid_highlightcount.insert(&userroom_id, &0_u64.to_be_bytes())?;
-        self.userroomid_highlightcount
-            .insert(&userroom_id, &0_u64.to_be_bytes())?;
 
-        self.roomuserid_lastnotificationread.insert(
+		self.roomuserid_lastnotificationread.insert(&roomuser_id, &services().globals.next_count()?.to_be_bytes())?;
-            &roomuser_id,
-            &services().globals.next_count()?.to_be_bytes(),
-        )?;
 
 		Ok(())
 	}
 
 	fn notification_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_notificationcount
 			.get(&userroom_id)?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes)
+				utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid notification count in db."))
-                    .map_err(|_| Error::bad_database("Invalid notification count in db."))
 			})
 			.unwrap_or(Ok(0))
 	}
 
 	fn highlight_count(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
 		let mut userroom_id = user_id.as_bytes().to_vec();
-        userroom_id.push(0xff);
+		userroom_id.push(0xFF);
 		userroom_id.extend_from_slice(room_id.as_bytes());
 
 		self.userroomid_highlightcount
 			.get(&userroom_id)?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes)
+				utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid highlight count in db."))
-                    .map_err(|_| Error::bad_database("Invalid highlight count in db."))
 			})
 			.unwrap_or(Ok(0))
 	}
 
 	fn last_notification_read(&self, user_id: &UserId, room_id: &RoomId) -> Result<u64> {
 		let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
+		key.push(0xFF);
 		key.extend_from_slice(user_id.as_bytes());
 
 		Ok(self
 			.roomuserid_lastnotificationread
 			.get(&key)?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+				utils::u64_from_bytes(&bytes)
-                    Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid.")
+					.map_err(|_| Error::bad_database("Count in roomuserid_lastprivatereadupdate is invalid."))
-                })
 			})
 			.transpose()?
 			.unwrap_or(0))
 	}
 
-    fn associate_token_shortstatehash(
+	fn associate_token_shortstatehash(&self, room_id: &RoomId, token: u64, shortstatehash: u64) -> Result<()> {
-        &self,
+		let shortroomid = services().rooms.short.get_shortroomid(room_id)?.expect("room exists");
-        room_id: &RoomId,
-        token: u64,
-        shortstatehash: u64,
-    ) -> Result<()> {
-        let shortroomid = services()
-            .rooms
-            .short
-            .get_shortroomid(room_id)?
-            .expect("room exists");
 
 		let mut key = shortroomid.to_be_bytes().to_vec();
 		key.extend_from_slice(&token.to_be_bytes());
 
-        self.roomsynctoken_shortstatehash
+		self.roomsynctoken_shortstatehash.insert(&key, &shortstatehash.to_be_bytes())
-            .insert(&key, &shortstatehash.to_be_bytes())
 	}
 
 	fn get_token_shortstatehash(&self, room_id: &RoomId, token: u64) -> Result<Option<u64>> {
-        let shortroomid = services()
+		let shortroomid = services().rooms.short.get_shortroomid(room_id)?.expect("room exists");
-            .rooms
-            .short
-            .get_shortroomid(room_id)?
-            .expect("room exists");
 
 		let mut key = shortroomid.to_be_bytes().to_vec();
 		key.extend_from_slice(&token.to_be_bytes());
@@ -101,20 +79,18 @@ impl service::rooms::user::Data for KeyValueDatabase {
 		self.roomsynctoken_shortstatehash
 			.get(&key)?
 			.map(|bytes| {
-                utils::u64_from_bytes(&bytes).map_err(|_| {
+				utils::u64_from_bytes(&bytes)
-                    Error::bad_database("Invalid shortstatehash in roomsynctoken_shortstatehash")
+					.map_err(|_| Error::bad_database("Invalid shortstatehash in roomsynctoken_shortstatehash"))
-                })
 			})
 			.transpose()
 	}
 
 	fn get_shared_rooms<'a>(
-        &'a self,
+		&'a self, users: Vec<OwnedUserId>,
-        users: Vec<OwnedUserId>,
 	) -> Result<Box<dyn Iterator<Item = Result<OwnedRoomId>> + 'a>> {
 		let iterators = users.into_iter().map(move |user_id| {
 			let mut prefix = user_id.as_bytes().to_vec();
-            prefix.push(0xff);
+			prefix.push(0xFF);
 
 			self.userroomid_joined
 				.scan_prefix(prefix)
@@ -122,26 +98,25 @@ impl service::rooms::user::Data for KeyValueDatabase {
 					let roomid_index = key
 						.iter()
 						.enumerate()
-                        .find(|(_, &b)| b == 0xff)
+						.find(|(_, &b)| b == 0xFF)
 						.ok_or_else(|| Error::bad_database("Invalid userroomid_joined in db."))?
-                        .0
+						.0 + 1; // +1 because the room id starts AFTER the separator
-                        + 1; // +1 because the room id starts AFTER the separator
 
 					let room_id = key[roomid_index..].to_vec();
 
 					Ok::<_, Error>(room_id)
 				})
-                .filter_map(|r| r.ok())
+				.filter_map(std::result::Result::ok)
 		});
 
-        // We use the default compare function because keys are sorted correctly (not reversed)
+		// We use the default compare function because keys are sorted correctly (not
+		// reversed)
 		Ok(Box::new(
-            utils::common_elements(iterators, Ord::cmp)
+			utils::common_elements(iterators, Ord::cmp).expect("users is not empty").map(|bytes| {
-                .expect("users is not empty")
+				RoomId::parse(
-                .map(|bytes| {
+					utils::string_from_bytes(&bytes)
-                    RoomId::parse(utils::string_from_bytes(&bytes).map_err(|_| {
+						.map_err(|_| Error::bad_database("Invalid RoomId bytes in userroomid_joined"))?,
-                        Error::bad_database("Invalid RoomId bytes in userroomid_joined")
+				)
-                    })?)
 				.map_err(|_| Error::bad_database("Invalid RoomId in userroomid_joined."))
 			}),
 		))

src/database/key_value/sending.rs

@@ -21,8 +21,7 @@ impl service::sending::Data for KeyValueDatabase {
 	}
 
 	fn active_requests_for<'a>(
-        &'a self,
+		&'a self, outgoing_kind: &OutgoingKind,
-        outgoing_kind: &OutgoingKind,
 	) -> Box<dyn Iterator<Item = Result<(Vec<u8>, SendingEventType)>> + 'a> {
 		let prefix = outgoing_kind.get_prefix();
 		Box::new(
@@ -32,9 +31,7 @@ impl service::sending::Data for KeyValueDatabase {
 		)
 	}
 
-    fn delete_active_request(&self, key: Vec<u8>) -> Result<()> {
+	fn delete_active_request(&self, key: Vec<u8>) -> Result<()> { self.servercurrentevent_data.remove(&key) }
-        self.servercurrentevent_data.remove(&key)
-    }
 
 	fn delete_all_active_requests_for(&self, outgoing_kind: &OutgoingKind) -> Result<()> {
 		let prefix = outgoing_kind.get_prefix();
@@ -58,18 +55,15 @@ impl service::sending::Data for KeyValueDatabase {
 		Ok(())
 	}
 
-    fn queue_requests(
+	fn queue_requests(&self, requests: &[(&OutgoingKind, SendingEventType)]) -> Result<Vec<Vec<u8>>> {
-        &self,
-        requests: &[(&OutgoingKind, SendingEventType)],
-    ) -> Result<Vec<Vec<u8>>> {
 		let mut batch = Vec::new();
 		let mut keys = Vec::new();
 		for (outgoing_kind, event) in requests {
 			let mut key = outgoing_kind.get_prefix();
 			if let SendingEventType::Pdu(value) = &event {
-                key.extend_from_slice(value)
+				key.extend_from_slice(value);
 			} else {
-                key.extend_from_slice(&services().globals.next_count()?.to_be_bytes())
+				key.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
 			}
 			let value = if let SendingEventType::Edu(value) = &event {
 				&**value
@@ -79,14 +73,12 @@ impl service::sending::Data for KeyValueDatabase {
 			batch.push((key.clone(), value.to_owned()));
 			keys.push(key);
 		}
-        self.servernameevent_data
+		self.servernameevent_data.insert_batch(&mut batch.into_iter())?;
-            .insert_batch(&mut batch.into_iter())?;
 		Ok(keys)
 	}
 
 	fn queued_requests<'a>(
-        &'a self,
+		&'a self, outgoing_kind: &OutgoingKind,
-        outgoing_kind: &OutgoingKind,
 	) -> Box<dyn Iterator<Item = Result<(SendingEventType, Vec<u8>)>> + 'a> {
 		let prefix = outgoing_kind.get_prefix();
 		return Box::new(
@@ -98,6 +90,10 @@ impl service::sending::Data for KeyValueDatabase {
 
 	fn mark_as_active(&self, events: &[(SendingEventType, Vec<u8>)]) -> Result<()> {
 		for (e, key) in events {
+			if key.is_empty() {
+				continue;
+			}
+
 			let value = if let SendingEventType::Edu(value) = &e {
 				&**value
 			} else {
@@ -111,37 +107,27 @@ impl service::sending::Data for KeyValueDatabase {
 	}
 
 	fn set_latest_educount(&self, server_name: &ServerName, last_count: u64) -> Result<()> {
-        self.servername_educount
+		self.servername_educount.insert(server_name.as_bytes(), &last_count.to_be_bytes())
-            .insert(server_name.as_bytes(), &last_count.to_be_bytes())
 	}
 
 	fn get_latest_educount(&self, server_name: &ServerName) -> Result<u64> {
-        self.servername_educount
+		self.servername_educount.get(server_name.as_bytes())?.map_or(Ok(0), |bytes| {
-            .get(server_name.as_bytes())?
+			utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid u64 in servername_educount."))
-            .map_or(Ok(0), |bytes| {
-                utils::u64_from_bytes(&bytes)
-                    .map_err(|_| Error::bad_database("Invalid u64 in servername_educount."))
 		})
 	}
 }
 
 #[tracing::instrument(skip(key))]
-fn parse_servercurrentevent(
+fn parse_servercurrentevent(key: &[u8], value: Vec<u8>) -> Result<(OutgoingKind, SendingEventType)> {
-    key: &[u8],
-    value: Vec<u8>,
-) -> Result<(OutgoingKind, SendingEventType)> {
 	// Appservices start with a plus
 	Ok::<_, Error>(if key.starts_with(b"+") {
-        let mut parts = key[1..].splitn(2, |&b| b == 0xff);
+		let mut parts = key[1..].splitn(2, |&b| b == 0xFF);
 
 		let server = parts.next().expect("splitn always returns one element");
-        let event = parts
+		let event = parts.next().ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            .next()
-            .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
 
-        let server = utils::string_from_bytes(server).map_err(|_| {
+		let server = utils::string_from_bytes(server)
-            Error::bad_database("Invalid server bytes in server_currenttransaction")
+			.map_err(|_| Error::bad_database("Invalid server bytes in server_currenttransaction"))?;
-        })?;
 
 		(
 			OutgoingKind::Appservice(server),
@@ -152,23 +138,19 @@ fn parse_servercurrentevent(
 			},
 		)
 	} else if key.starts_with(b"$") {
-        let mut parts = key[1..].splitn(3, |&b| b == 0xff);
+		let mut parts = key[1..].splitn(3, |&b| b == 0xFF);
 
 		let user = parts.next().expect("splitn always returns one element");
 		let user_string = utils::string_from_bytes(user)
 			.map_err(|_| Error::bad_database("Invalid user string in servercurrentevent"))?;
-        let user_id = UserId::parse(user_string)
+		let user_id =
-            .map_err(|_| Error::bad_database("Invalid user id in servercurrentevent"))?;
+			UserId::parse(user_string).map_err(|_| Error::bad_database("Invalid user id in servercurrentevent"))?;
 
-        let pushkey = parts
+		let pushkey = parts.next().ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            .next()
-            .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
 		let pushkey_string = utils::string_from_bytes(pushkey)
 			.map_err(|_| Error::bad_database("Invalid pushkey in servercurrentevent"))?;
 
-        let event = parts
+		let event = parts.next().ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            .next()
-            .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
 
 		(
 			OutgoingKind::Push(user_id, pushkey_string),
@@ -180,21 +162,19 @@ fn parse_servercurrentevent(
 			},
 		)
 	} else {
-        let mut parts = key.splitn(2, |&b| b == 0xff);
+		let mut parts = key.splitn(2, |&b| b == 0xFF);
 
 		let server = parts.next().expect("splitn always returns one element");
-        let event = parts
+		let event = parts.next().ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
-            .next()
-            .ok_or_else(|| Error::bad_database("Invalid bytes in servercurrentpdus."))?;
 
-        let server = utils::string_from_bytes(server).map_err(|_| {
+		let server = utils::string_from_bytes(server)
-            Error::bad_database("Invalid server bytes in server_currenttransaction")
+			.map_err(|_| Error::bad_database("Invalid server bytes in server_currenttransaction"))?;
-        })?;
 
 		(
-            OutgoingKind::Normal(ServerName::parse(server).map_err(|_| {
+			OutgoingKind::Normal(
-                Error::bad_database("Invalid server string in server_currenttransaction")
+				ServerName::parse(server)
-            })?),
+					.map_err(|_| Error::bad_database("Invalid server string in server_currenttransaction"))?,
+			),
 			if value.is_empty() {
 				SendingEventType::Pdu(event.to_vec())
 			} else {