dedupe auto_room_join to one function

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

.envrc

@@ -3,3 +3,5 @@
 use flake
 
 PATH_add bin
+
+dotenv_if_exists

.github/workflows/ci.yml

@@ -14,10 +14,10 @@ on:
           - 'docs/**'
           - 'debian/**'
           - 'docker/**'
-          - 'test_results/**'
         branches:
             - main
-            - dev
+        tags:
+          - '*'
     # Allows you to run this workflow manually from the Actions tab
     workflow_dispatch:
 
@@ -48,12 +48,24 @@ jobs:
             - name: Sync repository
               uses: actions/checkout@v4
 
+            - name: Tag comparison check
+              if: startsWith('refs/tags/v', github.ref)
+              run: |
+                  # Tag mismatch with latest repo tag check to prevent potential downgrades
+                  LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
+
+                  if [ $LATEST_TAG != ${{ github.ref_name }} ]; then
+                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.'
+                    echo '# WARNING: Attempting to run this workflow for a tag that is not the latest repo tag. Aborting.' >> $GITHUB_STEP_SUMMARY
+                    exit 1
+                  fi
+
             - name: Install Nix
               uses: DeterminateSystems/nix-installer-action@main
 
             - name: Enable Cachix binary cache
               run: |
-                  nix-env -iA cachix -f https://cachix.org/api/v1/install
+                  nix profile install nixpkgs#cachix
                   cachix use crane
                   cachix use nix-community
 
@@ -63,8 +75,8 @@ jobs:
             - name: Apply Nix binary cache configuration
               run: |
                   sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://nix.computer.surgery/conduit https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
-                  extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo= conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
+                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                   EOF
 
             - name: Use alternative Nix binary caches if specified
@@ -78,7 +90,7 @@ jobs:
             - name: Prepare build environment
               run: |
                   echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
-                  nix-env -f "<nixpkgs>" -iA direnv -iA nix-direnv
+                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                   direnv allow
                   nix develop --command true
 
@@ -86,6 +98,43 @@ jobs:
               run: |
                   direnv exec . engage > >(tee -a test_output.log)
 
+            - name: Sync Complement repository
+              uses: actions/checkout@v4
+              with:
+                repository: 'matrix-org/complement'
+                path: complement_src
+
+            - name: Run Complement tests
+              run: |
+                  direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
+
+            - name: Upload Complement logs
+              uses: actions/upload-artifact@v4
+              with:
+                name: complement_test_logs.jsonl
+                path: complement_test_logs.jsonl
+                if-no-files-found: error
+
+            - name: Upload Complement results
+              uses: actions/upload-artifact@v4
+              with:
+                name: complement_test_results.jsonl
+                path: complement_test_results.jsonl
+                if-no-files-found: error
+
+            - name: Diff Complement results with checked-in repo results
+            # TODO: figure out why our complement results are not 100% consistent so we don't need to allow failures
+              continue-on-error: true
+              run: |
+                  diff -u --color=always complement_test_results.jsonl tests/test_results/complement/test_results.jsonl > >(tee -a complement_test_output.log)
+
+            - name: Add Complement diff result to Job Summary
+              run: |
+                  echo '# Complement diff results' >> $GITHUB_STEP_SUMMARY
+                  echo '```diff' >> $GITHUB_STEP_SUMMARY
+                  tail -n 50 complement_test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
+                  echo '```' >> $GITHUB_STEP_SUMMARY
+
             - name: Update Job Summary
               if: success() || failure()
               run: |
@@ -101,7 +150,7 @@ jobs:
         name: Build
         runs-on: ubuntu-latest
         needs: tests
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+        if: startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
         strategy:
             matrix:
                 include:
@@ -116,9 +165,9 @@ jobs:
             - name: Install Nix
               uses: DeterminateSystems/nix-installer-action@main
 
-            - name: Enable Cachix binary cache
+            - name: Install and enable Cachix binary cache
               run: |
-                  nix-env -iA cachix -f https://cachix.org/api/v1/install
+                  nix profile install nixpkgs#cachix
                   cachix use crane
                   cachix use nix-community
 
@@ -128,8 +177,8 @@ jobs:
             - name: Apply Nix binary cache configuration
               run: |
                   sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://nix.computer.surgery/conduit https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
-                  extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo= conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
+                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                   EOF
 
             - name: Use alternative Nix binary caches if specified
@@ -143,13 +192,13 @@ jobs:
             - name: Prepare build environment
               run: |
                   echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
-                  nix-env -f "<nixpkgs>" -iA direnv -iA nix-direnv
+                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                   direnv allow
                   nix develop --command true
 
             - name: Build static ${{ matrix.target }}
               run: |
-                  bin/nix-build-and-cache .#static-${{ matrix.target }}
+                  bin/nix-build-and-cache just .#static-${{ matrix.target }}
                   mkdir -p target/release
                   cp -v -f result/bin/conduit target/release/
                   direnv exec . cargo deb --no-build --no-strip --output target/debian/${{ matrix.target }}.deb
@@ -171,7 +220,7 @@ jobs:
 
             - name: Build OCI image ${{ matrix.target }}
               run: |
-                  bin/nix-build-and-cache .#oci-image-${{ matrix.target }}
+                  bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}
                   cp -v -f result oci-image-${{ matrix.target }}.tar.gz
 
             - name: Upload OCI image ${{ matrix.target }}
@@ -186,16 +235,23 @@ jobs:
         name: Docker publish
         runs-on: ubuntu-latest
         needs: build
-        if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name != 'pull_request'
+        if: startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
         env:
-            DOCKER_ARM64: docker.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}-arm64v8
+            DOCKER_ARM64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-arm64v8
-            DOCKER_AMD64: docker.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}-amd64
+            DOCKER_AMD64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-amd64
-            DOCKER_TAG: docker.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}
+            DOCKER_TAG: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}
-            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (github.ref == 'refs/heads/main' && 'latest') || github.ref_name }}
+            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}
-            GHCR_ARM64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}-arm64v8
+            GHCR_ARM64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-arm64v8
-            GHCR_AMD64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}-amd64
+            GHCR_AMD64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-amd64
-            GHCR_TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}
+            GHCR_TAG: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}
-            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (github.ref == 'refs/heads/main' && 'latest') || github.ref_name }}
+            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}
+            GLCR_ARM64: registry.gitlab.com/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-arm64v8
+            GLCR_AMD64: registry.gitlab.com/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}-amd64
+            GLCR_TAG: registry.gitlab.com/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}-${{ github.sha }}
+            GLCR_BRANCH: registry.gitlab.com/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.head_ref)) || github.ref_name }}
+
+            DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+            GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
         steps:
             - name: Login to GitHub Container Registry
               uses: docker/login-action@v3
@@ -205,12 +261,21 @@ jobs:
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Login to Docker Hub
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               uses: docker/login-action@v3
               with:
                   registry: docker.io
                   username: ${{ vars.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+            - name: Login to GitLab Container Registry
+              if: ${{ (vars.GITLAB_USERNAME != '') && (env.GITLAB_TOKEN != '') }}
+              uses: docker/login-action@v3
+              with:
+                  registry: registry.gitlab.com
+                  username: ${{ vars.GITLAB_USERNAME }}
+                  password: ${{ secrets.GITLAB_TOKEN }}
+
             - name: Download artifacts
               uses: actions/download-artifact@v4
 
@@ -220,36 +285,52 @@ jobs:
                   mv oci-image-aarch64-*-jemalloc/*.tar.gz oci-image-arm64v8.tar.gz
 
             - name: Load and push amd64 image
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
                   docker load -i oci-image-amd64.tar.gz
                   docker tag $(docker images -q conduit:main) ${{ env.DOCKER_AMD64 }}
                   docker tag $(docker images -q conduit:main) ${{ env.GHCR_AMD64 }}
+                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_AMD64 }}
                   docker push ${{ env.DOCKER_AMD64 }}
                   docker push ${{ env.GHCR_AMD64 }}
+                  docker push ${{ env.GLCR_AMD64 }}
 
             - name: Load and push arm64 image
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
                   docker load -i oci-image-arm64v8.tar.gz
                   docker tag $(docker images -q conduit:main) ${{ env.DOCKER_ARM64 }}
                   docker tag $(docker images -q conduit:main) ${{ env.GHCR_ARM64 }}
+                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_ARM64 }}
                   docker push ${{ env.DOCKER_ARM64 }}
                   docker push ${{ env.GHCR_ARM64 }}
+                  docker push ${{ env.GLCR_ARM64 }}
 
             - name: Create Docker combined manifests
               run: |
+                  # Dockerhub Container Registry
                   docker manifest create ${{ env.DOCKER_TAG }} --amend ${{ env.DOCKER_ARM64 }} --amend ${{ env.DOCKER_AMD64 }}
                   docker manifest create ${{ env.DOCKER_BRANCH }} --amend ${{ env.DOCKER_ARM64 }} --amend ${{ env.DOCKER_AMD64 }}
+                  # GitHub Container Registry
                   docker manifest create ${{ env.GHCR_TAG }} --amend ${{ env.GHCR_ARM64 }} --amend ${{ env.GHCR_AMD64 }}
                   docker manifest create ${{ env.GHCR_BRANCH }} --amend ${{ env.GHCR_ARM64 }} --amend ${{ env.GHCR_AMD64 }}
+                  # GitLab Container Registry
+                  docker manifest create ${{ env.GLCR_TAG }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GCCR_AMD64 }}
+                  docker manifest create ${{ env.GLCR_BRANCH }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GLCR_AMD64 }}
 
             - name: Push manifests to Docker registries
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
                   docker manifest push ${{ env.DOCKER_TAG }}
                   docker manifest push ${{ env.DOCKER_BRANCH }}
                   docker manifest push ${{ env.GHCR_TAG }}
                   docker manifest push ${{ env.GHCR_BRANCH }}
+                  docker manifest push ${{ env.GLCR_TAG }}
+                  docker manifest push ${{ env.GLCR_BRANCH }}
 
             - name: Add Image Links to Job Summary
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
                   echo "- \`docker pull ${{ env.DOCKER_TAG }}\`" >> $GITHUB_STEP_SUMMARY
                   echo "- \`docker pull ${{ env.GHCR_TAG }}\`" >> $GITHUB_STEP_SUMMARY
+                  echo "- \`docker pull ${{ env.GLCR_TAG }}\`" >> $GITHUB_STEP_SUMMARY

.github/workflows/documentation.yml

@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - '*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -58,8 +60,6 @@ jobs:
             extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
             extra-substituters = https://crane.cachix.org
             extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=
-            extra-substituters = https://nix.computer.surgery/conduit
-            extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo=
             extra-substituters = https://attic.kennel.juneis.dog/conduit
             extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
             extra-substituters = https://attic.kennel.juneis.dog/conduwuit
@@ -88,13 +88,13 @@ jobs:
       - name: Allow direnv
         run: direnv allow
 
-      - name: Cache x86_64 inputs for devShell
+      - name: Cache CI dependencies
         run: |
-          ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+          ./bin/nix-build-and-cache ci
 
       - name: Build documentation (book)
         run: |
-          ./bin/nix-build-and-cache .#book
+          ./bin/nix-build-and-cache just .#book
           cp -r --dereference result public
       - name: Upload generated documentation (book) as normal artifact
         uses: actions/upload-artifact@v4

.github/workflows/trivy.yml

@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - '*'
   schedule:
     - cron: '00 12 * * *'
 
@@ -37,4 +39,4 @@ jobs:
           scan-type: fs
           format: sarif
           output: trivy-results.sarif
-          severity: CRITICAL,HIGH,MEDIUM,LOW
+          severity: CRITICAL,HIGH,MEDIUM,LOW

.gitignore

@@ -1,3 +1,6 @@
+# Local environment overrides
+/.env
+
 # CMake
 cmake-build-*/
 
@@ -81,8 +84,14 @@ public/
 # macOS
 .DS_Store
 
+# VS Code
+.vscode/
+
 # Zed
 .zed/
 
 # idk where you're coming from, but i'm tired of you
 rustc-ice-*
+
+# complement test logs are huge
+tests/test_results/complement/test_logs.jsonl

.gitlab-ci.yml

@@ -6,6 +6,10 @@ stages:
 variables:
   # Makes some things print in color
   TERM: ansi
+  # Faster cache and artifact compression / decompression
+  FF_USE_FASTZIP: true
+  # Print progress reports for cache and artifact transfers
+  TRANSFER_METER_FREQUENCY: 5s
 
 # Avoid duplicate pipelines
 # See: https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
@@ -27,10 +31,6 @@ before_script:
   - 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
@@ -56,8 +56,8 @@ ci:
   stage: ci
   image: nixos/nix:2.22.0
   script:
-    # Cache the inputs required for the devShell
+    # Cache CI dependencies
-    - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation
+    - ./bin/nix-build-and-cache ci
 
     - direnv exec . engage
   cache:
@@ -81,12 +81,12 @@ artifacts:
   stage: artifacts
   image: nixos/nix:2.22.0
   script:
-    - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl
+    - ./bin/nix-build-and-cache just .#static-x86_64-unknown-linux-musl
     - cp result/bin/conduit x86_64-unknown-linux-musl
 
     - mkdir -p target/release
     - cp result/bin/conduit target/release
-    - direnv exec . cargo deb --no-build
+    - direnv exec . cargo deb --no-build --no-strip
     - mv target/debian/*.deb x86_64-unknown-linux-musl.deb
 
     # Since the OCI image package is based on the binary package, this has the
@@ -97,16 +97,16 @@ artifacts:
     # 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
+    - ./bin/nix-build-and-cache just .#oci-image
     - cp result oci-image-amd64.tar.gz
 
-    - ./bin/nix-build-and-cache .#static-aarch64-unknown-linux-musl
+    - ./bin/nix-build-and-cache just .#static-aarch64-unknown-linux-musl
     - cp result/bin/conduit aarch64-unknown-linux-musl
 
-    - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl
+    - ./bin/nix-build-and-cache just .#oci-image-aarch64-unknown-linux-musl
     - cp result oci-image-arm64v8.tar.gz
 
-    - ./bin/nix-build-and-cache .#book
+    - ./bin/nix-build-and-cache just .#book
     # We can't just copy the symlink, we need to dereference it https://gitlab.com/gitlab-org/gitlab/-/issues/19746
     - cp -r --dereference result public
   artifacts:
@@ -127,49 +127,6 @@ artifacts:
     - if: $CI
   interruptible: true
 
-.push-oci-image:
-  stage: publish
-  image: docker:26.0.2
-  services:
-    - docker:26.0.2-dind
-  variables:
-    IMAGE_SUFFIX_AMD64: amd64
-    IMAGE_SUFFIX_ARM64V8: arm64v8
-  script:
-    - docker load -i oci-image-amd64.tar.gz
-    - IMAGE_ID_AMD64=$(docker images -q conduit:main)
-    - docker load -i oci-image-arm64v8.tar.gz
-    - IMAGE_ID_ARM64V8=$(docker images -q conduit:main)
-    # Tag and push the architecture specific images
-    - docker tag $IMAGE_ID_AMD64 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64
-    - docker tag $IMAGE_ID_ARM64V8 $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
-    # Tag the multi-arch image
-    - docker manifest create $IMAGE_NAME:$CI_COMMIT_SHA --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
-    - docker manifest push $IMAGE_NAME:$CI_COMMIT_SHA
-    # Tag and push the git ref
-    - docker manifest create $IMAGE_NAME:$CI_COMMIT_REF_NAME --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
-    - docker manifest push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    # Tag git tags as 'latest'
-    - |
-      if [[ -n "$CI_COMMIT_TAG" ]]; then
-        docker manifest create $IMAGE_NAME:latest --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_AMD64 --amend $IMAGE_NAME:$CI_COMMIT_SHA-$IMAGE_SUFFIX_ARM64V8
-        docker manifest push $IMAGE_NAME:latest
-      fi
-  dependencies:
-    - artifacts
-  only:
-    - main
-    - tags
-
-oci-image:push-gitlab:
-  extends: .push-oci-image
-  variables:
-    IMAGE_NAME: $CI_REGISTRY_IMAGE/conduwuit
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
 pages:
   stage: publish
   dependencies:

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-    "recommendations": [
-        "rust-lang.rust-analyzer",
-        "editorconfig.editorconfig",
-        "ms-azuretools.vscode-docker",
-        "eamodio.gitlens",
-        "serayuzgur.crates",
-        "vadimcn.vscode-lldb",
-        "timonwong.shellcheck"
-    ]
-}

.vscode/launch.json

@@ -1,35 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug conduit",
-            "sourceLanguages": ["rust"],
-            "cargo": {
-                "args": [
-                    "build",
-                    "--bin=conduit",
-                    "--package=conduit"
-                ],
-                "filter": {
-                    "name": "conduit",
-                    "kind": "bin"
-                }
-            },
-            "args": [],
-            "env": {
-                "RUST_BACKTRACE": "1",
-                "CONDUIT_DATABASE_PATH": "/tmp/awawawa",
-                "CONDUIT_ADDRESS": "0.0.0.0",
-                "CONDUIT_PORT": "55551",
-                "CONDUIT_SERVER_NAME": "your.server.name",
-                "CONDUIT_LOG": "debug"
-            },
-            "cwd": "${workspaceFolder}"
-        }
-    ]
-}

CONTRIBUTING.md

@@ -0,0 +1,90 @@
+# Contributing guide
+
+This page is for about contributing to conduwuit. The [development](docs/development.md) page may be of interest for you as well.
+
+If you would like to work on an [issue][issues] that is not assigned, preferably ask in the Matrix room first at [#conduwuit:puppygock.gay][conduwuit-matrix], and comment on it.
+
+### Linting and Formatting
+
+It is mandatory all your changes satisfy the lints (clippy, rustc, rustdoc, etc) and your code is formatted via the **nightly** `cargo fmt`. A lot of the `rustfmt.toml` features depend on nightly toolchain. It would be ideal if they weren't nightly-exclusive features, but they currently still are. CI's rustfmt uses nightly.
+
+If you need to allow a lint, please make sure it's either obvious as to why (e.g. clippy saying redundant clone but it's actually required) or it has a comment saying why. Do not write inefficient code for the sake of satisfying lints. If a lint is wrong and provides a more inefficient solution or suggestion, allow the lint and mention that in a comment.
+
+### Running CI tests locally
+
+conduwuit's CI for tests, linting, formatting, audit, etc use [`engage`][engage]. engage can be installed from nixpkgs or `cargo install engage`. conduwuit's Nix flake devshell has the nixpkgs engage with `direnv`. Use `engage --help` for more usage details.
+
+To test, format, lint, etc that CI would do, install engage, allow the `.envrc` file using `direnv allow`, and run `engage`.
+
+All of the tasks are defined at the [engage.toml][engage.toml] file. You can view all of them neatly by running `engage list`
+
+If you would like to run only a specific engage task group, use `just`:
+- `engage just <group>`
+- Example: `engage just lints`
+
+If you would like to run a specific engage task in a specific group, use `just <GROUP> [TASK]`: `engage just lints cargo-fmt`
+
+The following binaries are used in [`engage.toml`][engage.toml]:
+
+- [`engage`][engage]
+- `nix`
+- [`direnv`][direnv]
+- `rustc`
+- `cargo`
+- `cargo-fmt`
+- `rustdoc`
+- `cargo-clippy`
+- [`cargo-audit`][cargo-audit]
+- [`cargo-deb`][cargo-deb]
+- [`lychee`][lychee]
+
+### Matrix tests
+
+CI runs [Complement][complement], but currently does not fail if results from the checked-in results differ with the new results. If your changes are done to fix Matrix tests, note that in your pull request. If more Complement tests start failing from your changes, please review the logs (they are uploaded as artifacts) and determine if they're intended or not.
+
+If you'd like to run Complement locally using Nix, see the [testing](docs/development/testing.md) page.
+
+[Sytest][sytest] support will come soon.
+
+### Writing documentation
+
+conduwuit's website uses [`mdbook`][mdbook] and deployed via CI using GitHub Pages in the [`documentation.yml`][documentation.yml] workflow file with Nix's mdbook in the devshell. All documentation is in the `docs/` directory at the top level. The compiled mdbook website is also uploaded as an artifact.
+
+To build the documentation using Nix, run: `bin/nix-build-and-cache just .#book`
+
+### Inclusivity and Diversity
+
+All **MUST** code and write with inclusivity and diversity in mind. See the [following page by Google on writing inclusive code and documentation](https://developers.google.com/style/inclusive-documentation).
+
+This **EXPLICITLY** forbids usage of terms like "blacklist"/"whitelist" and "master"/"slave", [forbids gender-specific words and phrases](https://developers.google.com/style/pronouns#gender-neutral-pronouns), forbids ableist language like "sanity-check", "cripple", or "insane", and forbids culture-specific language (e.g. US-only holidays or cultures).
+
+No exceptions are allowed. Dependencies that may use these terms are allowed but [do not replicate the name in your functions or variables](https://developers.google.com/style/inclusive-documentation#write-around).
+
+In addition to language, write and code with the user experience in mind. This is software that intends to be used by everyone, so make it easy and comfortable for everyone to use. 🏳️‍⚧️
+
+### Variable, comment, function, etc standards
+
+Rust's default style and standards with regards to [function names, variable names, comments](https://rust-lang.github.io/api-guidelines/naming.html), etc applies here.
+
+### Creating pull requests
+
+Please try to keep contributions to the GitHub. While the mirrors of conduwuit allow for pull/merge requests, there is no guarantee I will see them in a timely manner.
+
+If you open a pull request on one of the mirrors, it is your responsibility to inform me about its existence. In the future I may try to solve this with more repo bots in the conduwuit Matrix room. There is no mailing list or email-patch support on the sr.ht mirror, but if you'd like to email me a git patch you can do so at `strawberry@puppygock.gay`.
+
+Direct all PRs/MRs to the `main` branch.
+
+By sending a pull request or patch, you are agreeing that your changes are allowed to be licenced under the Apache-2.0 licence and all of your conduct is in line with the Contributor's Covenant.
+
+[issues]: https://github.com/girlbossceo/conduwuit/issues
+[conduwuit-matrix]: https://matrix.to/#/#conduwuit:puppygock.gay
+[complement]: https://github.com/matrix-org/complement/
+[engage.toml]: https://github.com/girlbossceo/conduwuit/blob/main/engage.toml
+[engage]: https://charles.page.computer.surgery/engage/
+[sytest]: https://github.com/matrix-org/sytest/
+[cargo-deb]: https://github.com/kornelski/cargo-deb
+[lychee]: https://github.com/lycheeverse/lychee
+[cargo-audit]: https://github.com/RustSec/rustsec/tree/main/cargo-audit
+[direnv]: https://direnv.net/
+[mdbook]: https://rust-lang.github.io/mdBook/
+[documentation.yml]: https://github.com/girlbossceo/conduwuit/blob/main/.github/workflows/documentation.yml

Cargo.toml

@@ -10,15 +10,17 @@ authors = [
 homepage = "https://conduwuit.puppyirl.gay/"
 repository = "https://github.com/girlbossceo/conduwuit"
 readme = "README.md"
-version = "0.3.0"
+version = "0.3.2"
 edition = "2021"
 
 # See also `rust-toolchain.toml`
-rust-version = "1.75.0"
+rust-version = "1.77.0"
-
 
 [dependencies]
-hot-lib-reloader = { version = "^0.6", optional = true }
+console-subscriber = { version = "0.2", optional = true }
+
+# for hot lib reload
+hot-lib-reloader = { version = "^0.7", optional = true }
 
 # Used for secure identifiers
 rand = "0.8.5"
@@ -27,7 +29,7 @@ rand = "0.8.5"
 thiserror = "1.0.59"
 
 # Used to encode server public key
-base64 = "0.22.0"
+base64 = "0.22.1"
 
 # Used when hashing the state
 ring = "0.17.8"
@@ -54,9 +56,6 @@ sha-1 = "0.10.1"
 # 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"
 
@@ -73,14 +72,12 @@ http-body-util = "0.1.1"
 loole = "0.3.0"
 
 # Validating urls in config, was already a transitive dependency
-url = { version = "2", features = ["serde"] }
+url = { version = "2.5.0", features = ["serde"] }
 
 async-trait = "0.1.80"
 
 lru-cache = "0.1.2"
 
-proc-macro2 = "=1.0.79"
-
 # standard date and time tools
 [dependencies.chrono]
 version = "0.4.38"
@@ -132,7 +129,7 @@ features = ["rustls-tls-native-roots", "socks", "hickory-dns"]
 # all the serde stuff
 # Used for pdu definition
 [dependencies.serde]
-version = "1.0.198"
+version = "1.0.200"
 features = ["rc"]
 # Used for appservice registration files
 [dependencies.serde_yaml]
@@ -215,11 +212,16 @@ version = "0.32.3"
 optional = true
 
 # optional jemalloc usage
+[dependencies.tikv-jemalloc-sys]
+version = "0.5.4"
+optional = true
+default-features = false
+features = ["stats", "unprefixed_malloc_on_supported_platforms"]
 [dependencies.tikv-jemallocator]
 version = "0.5.4"
 optional = true
 default-features = false
-features = ["unprefixed_malloc_on_supported_platforms"]
+features = ["stats", "unprefixed_malloc_on_supported_platforms"]
 [dependencies.tikv-jemalloc-ctl]
 version = "0.5.4"
 optional = true
@@ -338,6 +340,18 @@ hardened_malloc-rs = { version = "0.1.2", optional = true, features = [
 #hardened_malloc-rs = { optional = true, features = ["static","clang","light"], path = "../hardened_malloc-rs", default-features = false }
 
 
+# backport of [https://github.com/tokio-rs/tracing/pull/2956] to the 0.1.x branch of tracing.
+# we can switch back to upstream if #2956 is merged and backported in the upstream repo.
+[patch.crates-io.tracing-subscriber]
+git = "https://github.com/girlbossceo/tracing"
+branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
+[patch.crates-io.tracing]
+git = "https://github.com/girlbossceo/tracing"
+branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
+[patch.crates-io.tracing-core]
+git = "https://github.com/girlbossceo/tracing"
+branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
+
 [features]
 default = [
     "backend_rocksdb",
@@ -348,34 +362,45 @@ default = [
     "brotli_compression",
     "zstd_compression",
     "release_max_log_level",
+    "io_uring",
 ]
 backend_sqlite = ["sqlite"]
 backend_rocksdb = ["rocksdb"]
-rocksdb = ["rust-rocksdb"]
+rocksdb = ["dep:rust-rocksdb"]
-jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator", "rust-rocksdb/jemalloc"]
+jemalloc = [
-sqlite = ["rusqlite", "parking_lot", "thread_local"]
+    "dep:tikv-jemalloc-sys",
-systemd = ["sd-notify"]
+    "dep:tikv-jemalloc-ctl",
-sentry_telemetry = ["sentry", "sentry-tracing", "sentry-tower"]
+    "dep:tikv-jemallocator",
+    "rust-rocksdb/jemalloc",
+]
+jemalloc_prof = ["tikv-jemalloc-sys/profiling"]
+sqlite = ["dep:rusqlite", "dep:parking_lot", "dep:thread_local"]
+systemd = ["dep:sd-notify"]
+sentry_telemetry = ["dep:sentry", "dep:sentry-tracing", "dep:sentry-tower"]
 
 gzip_compression = ["tower-http/compression-gzip", "reqwest/gzip"]
 zstd_compression = ["tower-http/compression-zstd"]
 brotli_compression = ["tower-http/compression-br", "reqwest/brotli"]
 
-sha256_media = ["sha2"]
+sha256_media = ["dep:sha2"]
 io_uring = ["rust-rocksdb/io-uring"]
-axum_dual_protocol = ["axum-server-dual-protocol"]
+axum_dual_protocol = ["dep:axum-server-dual-protocol"]
 
 perf_measurements = [
-    "opentelemetry",
+    "dep:opentelemetry",
-    "tracing-flame",
+    "dep:tracing-flame",
-    "tracing-opentelemetry",
+    "dep:tracing-opentelemetry",
-    "opentelemetry_sdk",
+    "dep:opentelemetry_sdk",
-    "opentelemetry-jaeger",
+    "dep:opentelemetry-jaeger",
 ]
 
+# enable the tokio_console server
+# incompatible with release_max_log_level
+tokio_console = ["dep:console-subscriber", "tokio/tracing"]
+
 hot_reload = ["dep:hot-lib-reloader"]
 
-hardened_malloc = ["hardened_malloc-rs"]
+hardened_malloc = ["dep:hardened_malloc-rs"]
 
 # increases performance, reduces build times, and reduces binary size by not compiling or
 # genreating code for log level filters that users will generally not use (debug and trace) only in release builds
@@ -435,10 +460,13 @@ systemd-units = { unit-name = "conduwuit" }
 
 
 [profile.dev]
-debug = 0
+#debug = 0
 lto = 'off'
 codegen-units = 512
 incremental = true
+overflow-checks = true
+#panic = "abort"
+
 # seems to speed up continuous debug compilations
 [profile.dev.build-override]
 opt-level = 3
@@ -452,7 +480,6 @@ opt-level = 3
 lto = 'thin'
 incremental = false
 opt-level = 3
-overflow-checks = true
 strip = "symbols"
 control-flow-guard = true # Windows only
 debug = 0
@@ -503,9 +530,6 @@ single_use_lifetimes = "warn"
 unsafe_op_in_unsafe_fn = "warn"
 unreachable_pub = "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"
 
@@ -555,7 +579,6 @@ filetype_is_file = "warn"
 float_cmp_const = "warn"
 format_push_string = "warn"
 impl_trait_in_params = "warn"
-ref_to_mut = "warn"
 lossy_float_literal = "warn"
 mem_forget = "warn"
 missing_assert_message = "warn"
@@ -602,6 +625,8 @@ manual_let_else = "warn"
 trivially_copy_pass_by_ref = "warn"
 wildcard_imports = "warn"
 checked_conversions = "warn"
+#integer_arithmetic = "warn"
+#as_conversions = "warn"
 
 # some sadness
 missing_errors_doc = "allow"
@@ -622,7 +647,6 @@ map_err_ignore = "allow"
 missing_docs_in_private_items = "allow"
 multiple_inherent_impl = "allow"
 error_impl_error = "allow"
-as_conversions = "allow"
 string_add = "allow"
 string_slice = "allow"
 ref_patterns = "allow"

README.md

@@ -2,8 +2,6 @@
 
 `main` / stable: [![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)
 
-`dev`: [![CI and Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)
-
 <!-- ANCHOR: catchphrase -->
 ### a very cool, featureful fork of [Conduit](https://conduit.rs/)
 <!-- ANCHOR_END: catchphrase -->
@@ -37,14 +35,6 @@ from time to time.
 <!-- ANCHOR_END: body -->
 
 <!-- ANCHOR: footer -->
-#### How can I contribute?
-
-1. Look for an issue you would like to work on and make sure it's not assigned
-   to other users
-2. Ask someone to assign the issue to you (comment on the issue or chat in
-   [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay))
-3. Fork the repo and work on the issue.
-4. Submit a PR (please keep contributions to the GitHub repo, main development is done here, not the GitLab repo which exists just as a mirror. If you are avoiding GitHub, feel free to join our Matrix chat to get your patch in.)
 
 #### Contact
 

bin/complement

@@ -17,8 +17,12 @@ RESULTS_FILE="$3"
 
 OCI_IMAGE="complement-conduit:dev"
 
-pushd "$(git rev-parse --show-toplevel)" > /dev/null
+toplevel="$(git rev-parse --show-toplevel)"
-nix build .#complement
+
+pushd "$toplevel" > /dev/null
+
+bin/nix-build-and-cache just .#complement
+
 docker load < result
 popd > /dev/null
 
@@ -27,13 +31,13 @@ set +o pipefail
 env \
     -C "$COMPLEMENT_SRC" \
     COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
-    go test -timeout 1h -json ./tests | tee "$LOG_FILE"
+    go test -vet=off -timeout 1h -json ./tests | tee "$LOG_FILE"
 set -o pipefail
 
-# Post-process the results into an easy-to-compare format
+# Post-process the results into an easy-to-compare format, sorted by Test name for reproducible results
-cat "$LOG_FILE" | jq -c '
+cat "$LOG_FILE" | jq -s -c 'sort_by(.Test)[]' | jq -c '
     select(
         (.Action == "pass" or .Action == "fail" or .Action == "skip")
         and .Test != null
     ) | {Action: .Action, Test: .Test}
-    ' | sort > "$RESULTS_FILE"
+    ' > "$RESULTS_FILE"

bin/nix-build-and-cache

@@ -2,40 +2,95 @@
 
 set -eo pipefail
 
-# The first argument must be the desired installable
+toplevel="$(git rev-parse --show-toplevel)"
-INSTALLABLE="$1"
 
-# Build the installable and forward any other arguments too
+# Build just the single installable and forward any other arguments too
-nix build -L "$@"
+just() {
+    # uses nix-output-monitor (nom) if available
+    if command -v nom &> /dev/null; then
+        nom build "$@"
+    else
+        nix build -L "$@"
+    fi
 
-if [ ! -z "$ATTIC_TOKEN" ]; then
+    if [ -z "$ATTIC_TOKEN" ]; then
-    nix run --inputs-from . attic -- \
+        echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
+        return
+    fi
+
+    # historical "conduit" store for compatibility purposes, same as conduwuit
+    nix run --inputs-from "$toplevel" attic -- \
         login \
         conduit \
         "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduit}" \
         "$ATTIC_TOKEN"
 
-    # Push the target installable and its build dependencies
+    # Find all output paths of the installables and their build dependencies
-    nix run --inputs-from . attic -- \
+    readarray -t derivations < <(nix path-info --derivation "$@")
-        push \
+    cache=()
-        conduit \
+    for derivation in "${derivations[@]}"; do
-        "$(nix path-info "$INSTALLABLE" --derivation)" \
+        cache+=(
-        "$(nix path-info "$INSTALLABLE")"
+            "$(nix-store --query --requisites --include-outputs "$derivation")"
+        )
+    done
 
+    # Upload them to Attic (conduit store)
+    #
+    # Use `xargs` and a here-string because something would probably explode if
+    # several thousand arguments got passed to a command at once. Hopefully no
+    # store paths include a newline in them.
+    (
+        IFS=$'\n'
+        nix shell --inputs-from "$toplevel" attic -c xargs \
+            attic push conduit <<< "${cache[*]}"
+    )
 
-    # push to "conduwuit" too
+    # main "conduwuit" store
-    nix run --inputs-from . attic -- \
+    nix run --inputs-from "$toplevel" attic -- \
         login \
         conduwuit \
         "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \
         "$ATTIC_TOKEN"
 
-    # Push the target installable and its build dependencies
+    # Upload them to Attic (conduwuit store)
-    nix run --inputs-from . attic -- \
+    #
-        push \
+    # Use `xargs` and a here-string because something would probably explode if
-        conduwuit \
+    # several thousand arguments got passed to a command at once. Hopefully no
-        "$(nix path-info "$INSTALLABLE" --derivation)" \
+    # store paths include a newline in them.
-        "$(nix path-info "$INSTALLABLE")"
+    (
-else
+        IFS=$'\n'
-    echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache"
+        nix shell --inputs-from "$toplevel" attic -c xargs \
-fi
+            attic push conduwuit <<< "${cache[*]}"
+    )
+}
+
+# Build and cache things needed for CI
+ci() {
+    cache=(
+        --inputs-from "$toplevel"
+
+        # Keep sorted
+        "$toplevel#devShells.x86_64-linux.default"
+        attic#default
+        nixpkgs#direnv
+        nixpkgs#jq
+        nixpkgs#nix-direnv
+    )
+
+    just "${cache[@]}"
+}
+
+# Build and cache *all* the package outputs from the flake.nix
+packages() {
+    declare -a cache="($(
+        nix flake show --json 2> /dev/null |
+            nix run --inputs-from "$toplevel" nixpkgs#jq -- \
+            -r \
+            '.packages."x86_64-linux" | keys | map("'"$toplevel"'#" + .) | @sh'
+    ))"
+
+    just "${cache[@]}"
+}
+
+
+eval "$@"

conduwuit-example.toml

@@ -336,6 +336,18 @@ allow_profile_lookup_federation_requests = true
 # messages without any attempt at redelivery.
 #startup_netburst_keep = 50
 
+# If the 'perf_measurements' feature is enabled, enables collecting folded stack trace profile of tracing spans using
+# tracing_flame. The resulting profile can be visualized with inferno[1], speedscope[2], or a number of other tools.
+# [1]: https://github.com/jonhoo/inferno
+# [2]: www.speedscope.app
+# tracing_flame = false
+
+# If 'tracing_flame' is enabled, sets a filter for which events will be included in the profile.
+# Supported syntax is documented at https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives
+# tracing_flame_filter = "trace,h2=off"
+
+# If 'tracing_flame' is enabled, set the path to write the generated profile.
+# tracing_flame_output_path = "./tracing.folded"
 
 ### Generic database options
 
@@ -372,6 +384,10 @@ allow_profile_lookup_federation_requests = true
 # Defaults to false
 #rocksdb_optimize_for_spinning_disks = false
 
+# Enables direct-io to increase database performance. This is enabled by default. Set this option to false if the
+# database resides on a filesystem which does not support direct-io.
+#rocksdb_direct_io = true
+
 # RocksDB log level. This is not the same as conduwuit's log level. This is the log level for the RocksDB engine/library
 # which show up in your database folder/path as `LOG` files. Defaults to error. conduwuit will typically log RocksDB errors as normal.
 #rocksdb_log_level = "error"
@@ -400,11 +416,13 @@ allow_profile_lookup_federation_requests = true
 #rocksdb_max_log_files = 3
 
 # Type of RocksDB database compression to use.
-# Available options are "zstd", "zlib", "bz2" and "lz4"
+# Available options are "zstd", "zlib", "bz2", "lz4", or "none"
 # It is best to use ZSTD as an overall good balance between speed/performance, storage, IO amplification, and CPU usage.
 # For more performance but less compression (more storage used) and less CPU usage, use LZ4.
 # See https://github.com/facebook/rocksdb/wiki/Compression for more details.
 #
+# "none" will disable compression.
+#
 # Defaults to "zstd"
 #rocksdb_compression_algo = "zstd"
 
@@ -471,7 +489,7 @@ allow_profile_lookup_federation_requests = true
 # Maximum entries stored in DNS memory-cache. The size of an entry may vary so please take care if
 # raising this value excessively. Only decrease this when using an external DNS cache. Please note
 # that systemd does *not* count as an external cache, even when configured to do so.
-#dns_cache_entries = 12288
+#dns_cache_entries = 32768
 
 # Minimum time-to-live in seconds for entries in the DNS cache. The default may appear high to most
 # administrators; this is by design. Only decrease this if you are using an external DNS cache.
@@ -480,7 +498,9 @@ allow_profile_lookup_federation_requests = true
 # Minimum time-to-live in seconds for NXDOMAIN entries in the DNS cache. This value is critical for
 # the server to federate efficiently. NXDOMAIN's are assumed to not be returning to the federation
 # and aggressively cached rather than constantly rechecked.
-#dns_min_ttl_nxdomain = 86400
+#
+# Defaults to 3 days as these are *very rarely* false negatives.
+#dns_min_ttl_nxdomain = 259200
 
 # The number of seconds to wait for a reply to a DNS query. Please note that recursive queries can
 # take up to several seconds for some domains, so this value should not be too low.
@@ -498,6 +518,27 @@ allow_profile_lookup_federation_requests = true
 # The default is to query one nameserver and stop (false).
 #query_all_nameservers = true
 
+# Enables using *only* TCP for querying your specified nameservers instead of UDP.
+#
+# You very likely do *not* want this. hickory-resolver already falls back to TCP on UDP errors.
+# Defaults to false
+#query_over_tcp_only = false
+
+# DNS A/AAAA record lookup strategy
+#
+# Takes a number of one of the following options:
+# 1 - Ipv4Only (Only query for A records, no AAAA/IPv6)
+# 2 - Ipv6Only (Only query for AAAA records, no A/IPv4)
+# 3 - Ipv4AndIpv6 (Query for A and AAAA records in parallel, uses whatever returns a successful response first)
+# 4 - Ipv6thenIpv4 (Query for AAAA record, if that fails then query the A record)
+# 5 - Ipv4thenIpv6 (Query for A record, if that fails then query the AAAA record)
+#
+# If you don't have IPv6 networking, then for better performance it may be suitable to set this to Ipv4Only (1) as
+# you will never ever use the AAAA record contents even if the AAAA record is successful instead of the A record.
+#
+# Defaults to 5 - Ipv4ThenIpv6 as this is the most compatible and IPv4 networking is currently the most prevalent.
+#ip_lookup_strategy = 5
+
 
 ### Request Timeouts, Connection Timeouts, and Connection Pooling
 
@@ -585,8 +626,8 @@ allow_profile_lookup_federation_requests = true
 
 # Appservice URL request connection timeout
 #
-# Defaults to 120 seconds
+# Defaults to 35 seconds as generally appservices are hosted within the same network
-#appservice_timeout = 120
+#appservice_timeout = 35
 
 # Appservice URL idle connection pool timeout
 #

docker/healthcheck.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# If the config file does not contain a default port and the CONDUIT_PORT env is not set, create
-# try to get port from process list
-if [ -z "${CONDUIT_PORT}" ]; then
-  CONDUIT_PORT=$(ss -tlpn | grep conduit | grep -m1 -o ':[0-9]*' | grep -m1 -o '[0-9]*')
-fi
-
-# If CONDUIT_ADDRESS is not set try to get the address from the process list
-if [ -z "${CONDUIT_ADDRESS}" ]; then
-  CONDUIT_ADDRESS=$(ss -tlpn | awk -F ' +|:' '/conduit/ { print $4 }')
-fi
-
-# The actual health check.
-# We try to first get a response on HTTP and when that fails on HTTPS and when that fails, we exit with code 1.
-# TODO: Change this to a single wget call. Do we have a config value that we can check for that?
-wget --no-verbose --tries=1 --spider "http://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \
-    wget --no-verbose --tries=1 --spider "https://${CONDUIT_ADDRESS}:${CONDUIT_PORT}/_matrix/client/versions" || \
-    exit 1

docs/SUMMARY.md

@@ -13,3 +13,4 @@
 - [Appservices](appservices.md)
 - [Development](development.md)
     - [Testing](development/testing.md)
+    - [Contributing](contributing.md)

docs/contributing.md

@@ -0,0 +1 @@
+{{#include ../CONTRIBUTING.md}}

docs/deploying/docker.md

@@ -12,18 +12,17 @@ OCI images for conduwuit are available in the registries listed below.
 | Registry        | Image                                                           | Size                          | Notes                  |
 | --------------- | --------------------------------------------------------------- | ----------------------------- | ---------------------- |
 | GitHub Registry | [ghcr.io/girlbossceo/conduwuit:latest][gh] | ![Image Size][shield-latest]  | Stable tagged image.          |
+| GitLab Registry | [registry.gitlab.com/girlbossceo/conduwuit:latest][gl] | ![Image Size][shield-latest]  | Stable tagged image.          |
 | Docker Hub      | [docker.io/girlbossceo/conduwuit:latest][dh]             | ![Image Size][shield-latest]  | Stable tagged image.          |
-| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:main][gh]   | ![Image Size][shield-main]    | Stable branch.   |
+| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:main][gh]   | ![Image Size][shield-main]    | Stable main branch.   |
-| Docker Hub      | [docker.io/girlbossceo/conduwuit:main][dh]               | ![Image Size][shield-main]    | Stable branch.   |
+| GitLab Registry | [registry.gitlab.com/girlbossceo/conduwuit:main][gl]   | ![Image Size][shield-main]    | Stable main branch.   |
-| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:dev][gh]   | ![Image Size][shield-main]    | Development version.   |
+| Docker Hub      | [docker.io/girlbossceo/conduwuit:main][dh]               | ![Image Size][shield-main]    | Stable main branch.   |
-| Docker Hub      | [docker.io/girlbossceo/conduwuit:dev][dh]               | ![Image Size][shield-dev]    | Development version.   |
-
 
 [dh]: https://hub.docker.com/repository/docker/girlbossceo/conduwuit
 [gh]: https://github.com/girlbossceo/conduwuit/pkgs/container/conduwuit
+[gl]: https://gitlab.com/girlbossceo/conduwuit/container_registry/6351657
 [shield-latest]: https://img.shields.io/docker/image-size/girlbossceo/conduwuit/latest
 [shield-main]: https://img.shields.io/docker/image-size/girlbossceo/conduwuit/main
-[shield-dev]: https://img.shields.io/docker/image-size/girlbossceo/conduwuit/dev
 
 
 Use
@@ -33,24 +32,6 @@ docker image pull <link>
 to pull it to your machine.
 
 
-
-### Build using a Dockerfile
-
-The Dockerfile provided by conduwuit has two stages, each of which creates an image.
-
-1. **Builder:** Builds the binary from local context or by cloning a git revision from the official repository.
-2. **Runner:** Copies the built binary from **Builder** and sets up the runtime environment, like creating a volume to persist the database and applying the correct permissions.
-
-To build the image you can use the following command
-
-```bash
-docker build --tag girlbossceo/conduwuit:main .
-```
-
-which also will tag the resulting image as `girlbossceo/conduwuit:main`.
-
-
-
 ### Run
 
 When you have the image you can simply run it with
@@ -70,9 +51,9 @@ 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 `conduwuit.toml` config file, an example can be found [here](../configuration.md).
+The `-d` flag lets the container run in detached mode. You may supply an optional `conduwuit.toml` config file, an example can be found [here](../configuration.md).
-You can pass in different env vars to change config values on the fly. You can even configure conduwuit completely by using env vars, but for that you need
+You can pass in different env vars to change config values on the fly. You can even configure conduwuit completely by using env vars. For an overview of possible
-to pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file.
+values, please take a look at the `docker-compose.yml` file.
 
 If you just want to test conduwuit for a short time, you can use the `--rm` flag, which will clean up everything related to your container after you stop it.
 

docs/deploying/generic.md

@@ -11,7 +11,7 @@
 
 You may simply download the binary that fits your machine. Run `uname -m` to see what you need.
 
-Prebuilt binaries can be downloaded from the latest successful CI workflow on the main branch here: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=branch%3Amain+actor%3Agirlbossceo+is%3Asuccess+event%3Apush
+Prebuilt binaries can be downloaded from the latest tagged release [here](https://github.com/girlbossceo/conduwuit/releases/latest).
 
 Alternatively, you may compile the binary yourself. First, install any dependencies:
 

docs/development.md

@@ -1,4 +1,23 @@
 # Development
 
 Information about developing the project. If you are only interested in using
-it, you can safely ignore this section.
+it, you can safely ignore this section. If you plan on contributing, see the
+[contributor's guide](contributing.md).
+
+## Debugging with `tokio-console`
+
+[`tokio-console`][1] can be a useful tool for debugging and profiling. To make
+a `tokio-console`-enabled build of Conduwuit, enable the `tokio_console` feature,
+disable the default `release_max_log_level` feature, and set the
+`--cfg tokio_unstable` flag to enable experimental tokio APIs. A build might
+look like this:
+
+```bash
+RUSTFLAGS="--cfg tokio_unstable" cargo build \
+    --release \
+    --no-default-features \
+    --features
+    backend_rocksdb,systemd,element_hacks,sentry_telemetry,gzip_compression,brotli_compression,zstd_compression,tokio_console
+```
+
+[1]: https://docs.rs/tokio-console/latest/tokio_console/

docs/differences.md

@@ -17,9 +17,11 @@ Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 - Various config options to tweak connection pooling, request timeouts, connection timeouts, DNS timeouts and settings, etc with good defaults which also help huge with performance via reusing connections and retrying where needed
 - Implement building conduwuit with jemalloc (which extends to the RocksDB jemalloc feature for maximum gains) or hardened_malloc light variant, and produce CI builds with jemalloc for performance (Nix doesn't seem to build [hardened_malloc-rs](https://github.com/girlbossceo/hardened_malloc-rs) properly)
 - Add support for caching DNS results with hickory-dns / hickory-resolver in conduwuit (not a replacement for a proper resolver cache, but still far better than nothing)
+- Add config option for using DNS over TCP, and config option for controlling A/AAAA record lookup strategy (e.g. don't query AAAA records if you don't have IPv6 connectivity)
 - Overall significant database, Client-Server, and federation performance and latency improvements (check out the ping room leaderboards if you don't believe me :>)
 - Add config options for RocksDB compression and bottommost compression, including choosing the algorithm and compression level
 - Use [loole](https://github.com/mahdi-shojaee/loole) MPSC channels instead of tokio MPSC channels for huge performance boosts in sending channels (mainly relevant for federation) and presence channels
+- Use `tracing`/`log`'s `release_max_level_info` feature to improve performance, build speeds, binary size, and CPU usage in release builds by avoid compiling debug/trace log level macros that users will generally never use (can be disabled with a build-time feature flag)
 
 
 ## General Fixes:
@@ -34,11 +36,11 @@ Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 - Return joined member count of rooms for push rules/conditions instead of a hardcoded value of 10
 - Make `CONDUIT_CONFIG` optional, relevant for container users that configure only by environment variables and no longer need to set `CONDUIT_CONFIG` to an empty string.
 - Allow HEAD 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)
-- Add missing `destination` key to all `X-Matrix` `Authorization` requests (spec compliance issue)
 - Resolve and remove some "features" from upstream that result in concurrency hazards, exponential backoff issues, or arbitrary performance limiters
 - Find more servers for outbound federation `/hierarchy` requests instead of just the room ID server name
 - Support for suggesting servers to join through at `/_matrix/client/v3/directory/room/{roomAlias}`
 - Support for suggesting servers to join through us at `/_matrix/federation/v1/query/directory`
+- Add workaround for [Out Of Your Element](https://gitdab.com/cadence/out-of-your-element) appservice bridge to make it functional on conduwuit (bug has already been reported)
 
 
 ## Moderation:
@@ -121,6 +123,9 @@ Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 - Admin debug command to fetch a PDU from a remote server and inserts it into our database/timeline as backfill
 - Add admin command to delete media via a specific MXC. This deletes the MXC from our database, and the file locally.
 - Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, and blocks room invites (remote and local) to the banned room, as a moderation feature
+- Add admin commands to output jemalloc memory stats and memory usage
+- Add admin command to get conduwuit's uptime
+- Add admin command to get rooms a *remote* user shares with us
 
 
 ## Misc:
@@ -138,5 +143,10 @@ Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 - Assume well-knowns are broken if they exceed past 10000 characters.
 - Add support for the Matrix spec compliance test suite [Complement](https://github.com/matrix-org/complement/) via the Nix flake and various other fixes for it
 - Add support for listening on both HTTP and HTTPS if using direct TLS with conduwuit for usecases such as Complement
+- Implement running and diff'ing Complement results in CI
 - Interest in supporting other operating systems such as macOS, BSDs, and Windows, and getting them added into CI and doing builds for them
+- Add config option for disabling RocksDB Direct IO if needed
+- (Developers): Add support for tokio-console
+- (Developers): Add support for tracing flame graphs
+- Add `release-debuginfo` Cargo build profile
 - No cryptocurrency donations allowed, conduwuit is fully maintained by independent queer maintainers, and with a strong priority on inclusitivity and comfort for protected groups 🏳️‍⚧️

docs/introduction.md

@@ -6,7 +6,7 @@
 
 #### What's different about your fork than upstream Conduit?
 
-See [differences.md](differences.md)
+See the [differences](differences.md) page
 
 #### How can I deploy my own?
 
@@ -14,4 +14,8 @@ See [differences.md](differences.md)
 
 If you want to connect an Appservice to Conduwuit, take a look at the [appservices documentation](appservices.md).
 
+#### How can I contribute?
+
+See the [contributor's guide](contributing.md)
+
 {{#include ../README.md:footer}}

engage.toml

@@ -78,14 +78,60 @@ RUSTDOCFLAGS="-D warnings" cargo doc \
 """
 
 [[task]]
-name = "cargo-clippy"
+name = "clippy/default"
 group = "lints"
-script = "cargo clippy --workspace --all-targets --all-features --color=always -- -D warnings"
+script = """
+cargo clippy \
+    --workspace \
+    --all-targets \
+    --color=always \
+    -- \
+    -D warnings
+"""
+
+[[task]]
+name = "clippy/all"
+group = "lints"
+script = """
+cargo clippy \
+    --workspace \
+    --all-targets \
+    --all-features \
+    --color=always \
+    -- \
+    -D warnings
+"""
+
+[[task]]
+name = "clippy/jemalloc"
+group = "lints"
+script = """
+cargo clippy \
+    --workspace \
+    --features jemalloc \
+    --all-targets \
+    --color=always \
+    -- \
+    -D warnings
+"""
+
+[[task]]
+name = "clippy/hardened_malloc"
+group = "lints"
+script = """
+cargo clippy \
+    --workspace \
+    --features hardened_malloc \
+    --all-targets \
+    --color=always \
+    -- \
+    -D warnings
+"""
 
 [[task]]
 name = "lychee"
 group = "lints"
-script = "lychee --offline docs"
+script = "lychee --verbose --offline docs *.md"
 
 [[task]]
 name = "cargo"

flake.lock

@@ -26,15 +26,16 @@
     "complement": {
       "flake": false,
       "locked": {
-        "lastModified": 1713458251,
+        "lastModified": 1714472853,
-        "narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=",
+        "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=",
         "owner": "matrix-org",
         "repo": "complement",
-        "rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57",
+        "rev": "891d18872c153d39a9ce63b545045efddb845738",
         "type": "github"
       },
       "original": {
         "owner": "matrix-org",
+        "ref": "main",
         "repo": "complement",
         "type": "github"
       }
@@ -89,15 +90,16 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1713680591,
+        "lastModified": 1714544767,
-        "narHash": "sha256-3pbv7UgAgetwz9YdjzIT/lZ6Rgj6wj6MR4mphBLyDjU=",
+        "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "19aaa94a73cc670a4d87e84f0909966cd8f8cd79",
+        "rev": "73124e1356bde9411b163d636b39fe4804b7ca45",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "main",
         "repo": "fenix",
         "type": "github"
       }
@@ -130,6 +132,7 @@
       },
       "original": {
         "owner": "edolstra",
+        "ref": "master",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -163,6 +166,7 @@
       },
       "original": {
         "owner": "numtide",
+        "ref": "main",
         "repo": "flake-utils",
         "type": "github"
       }
@@ -178,6 +182,7 @@
       },
       "original": {
         "owner": "numtide",
+        "ref": "main",
         "repo": "nix-filter",
         "type": "github"
       }
@@ -233,15 +238,15 @@
     "rocksdb": {
       "flake": false,
       "locked": {
-        "lastModified": 1713810944,
+        "lastModified": 1714770052,
-        "narHash": "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=",
+        "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=",
-        "owner": "facebook",
+        "owner": "girlbossceo",
         "repo": "rocksdb",
-        "rev": "6f7cabeac80a3a6150be2c8a8369fcecb107bf43",
+        "rev": "db6df0b185774778457dabfcbd822cb81760cade",
         "type": "github"
       },
       "original": {
-        "owner": "facebook",
+        "owner": "girlbossceo",
         "ref": "v9.1.1",
         "repo": "rocksdb",
         "type": "github"

flake.nix

@@ -1,14 +1,15 @@
 {
   inputs = {
     attic.url = "github:zhaofengli/attic?ref=main";
-    complement = { url = "github:matrix-org/complement"; flake = false; };
+    complement = { url = "github:matrix-org/complement?ref=main"; flake = false; };
     crane = { url = "github:ipetkov/crane?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; };
-    fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; };
+    fenix = { url = "github:nix-community/fenix?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; };
-    flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
+    flake-compat = { url = "github:edolstra/flake-compat?ref=master"; flake = false; };
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils?ref=main";
-    nix-filter.url = "github:numtide/nix-filter";
+    nix-filter.url = "github:numtide/nix-filter?ref=main";
     nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
-    rocksdb = { url = "github:facebook/rocksdb?ref=v9.1.1"; flake = false; };
+    # https://github.com/girlbossceo/rocksdb/commit/db6df0b185774778457dabfcbd822cb81760cade
+    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.1.1"; flake = false; };
   };
 
   outputs = inputs:
@@ -21,7 +22,7 @@
         file = ./rust-toolchain.toml;
 
         # See also `rust-toolchain.toml`
-        sha256 = "sha256-SXRtAuO4IqNOQq+nLbrsDFbVk+3aVA8NNpSZsKlVH/8=";
+        sha256 = "sha256-+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8";
       };
 
       scope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
@@ -179,6 +180,10 @@
           # Useful for editing the book locally
           mdbook
         ])
+        ++ (if !pkgsHost.stdenv.isDarwin then [
+            # Needed for building with io_uring
+            pkgsHost.liburing
+        ] else [])
         ++
         scopeHost.main.nativeBuildInputs;
       };

nix/pkgs/main/default.nix

@@ -1,7 +1,6 @@
-{ inputs
+# Dependencies (keep sorted)
-
+{ craneLib
-# Dependencies
+, inputs
-, craneLib
 , lib
 , libiconv
 , pkgsBuildHost
@@ -9,53 +8,72 @@
 , rust
 , stdenv
 
-# Options
+# Options (keep sorted)
 , default_features ? true
 , features ? []
 , profile ? "release"
 }:
 
-craneLib.buildPackage rec {
+let
-  src = inputs.nix-filter {
+buildDepsOnlyEnv =
-    root = inputs.self;
+  let
-    include = [
+    rocksdb' = rocksdb.override {
-      "src"
+      enableJemalloc = builtins.elem "jemalloc" features;
-      "Cargo.toml"
+    };
-      "Cargo.lock"
+  in
-    ];
+  {
-  };
+    CARGO_PROFILE = profile;
+    ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
+    ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
+  }
+  //
+  (import ./cross-compilation-env.nix {
+    # Keep sorted
+    inherit
+      lib
+      pkgsBuildHost
+      rust
+      stdenv;
+  });
 
-  # This is redundant with CI
+buildPackageEnv = {
-  doCheck = false;
+  CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
+} // buildDepsOnlyEnv;
 
-  env =
+commonAttrs = {
-    let
+  inherit
-      rocksdb' = rocksdb.override {
+    (craneLib.crateNameFromCargoToml {
-        enableJemalloc = builtins.elem "jemalloc" features;
+      cargoToml = "${inputs.self}/Cargo.toml";
-      };
+    })
-    in
+    pname
-    {
+    version;
-      CARGO_PROFILE = profile;
-      CONDUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev;
-      ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
-      ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
-    }
-    //
-    (import ./cross-compilation-env.nix {
-      inherit
-        lib
-        pkgsBuildHost
-        rust
-        stdenv;
-    });
 
-  nativeBuildInputs = [
+    src = let filter = inputs.nix-filter.lib; in filter {
-    # bindgen needs the build platform's libclang. Apparently due to "splicing
+      root = inputs.self;
-    # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
+
-    # right thing here.
+      # Keep sorted
-    pkgsBuildHost.rustPlatform.bindgenHook
+      include = [
+        "Cargo.lock"
+        "Cargo.toml"
+        "hot_lib"
+        "src"
+      ];
+    };
+
+    nativeBuildInputs = [
+      # bindgen needs the build platform's libclang. Apparently due to "splicing
+      # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
+      # right thing here.
+      pkgsBuildHost.rustPlatform.bindgenHook
   ]
   ++ lib.optionals stdenv.isDarwin [ libiconv ];
+ };
+in
+
+craneLib.buildPackage ( commonAttrs // {
+  cargoArtifacts = craneLib.buildDepsOnly (commonAttrs // {
+    env = buildDepsOnlyEnv;
+  });
 
   cargoExtraArgs = ""
     + lib.optionalString
@@ -65,11 +83,20 @@ craneLib.buildPackage rec {
       (features != [])
       "--features " + (builtins.concatStringsSep "," features);
 
-  meta.mainProgram = (craneLib.crateNameFromCargoToml {
+  # This is redundant with CI
-    cargoToml = "${inputs.self}/Cargo.toml";
+  cargoTestCommand = "";
-  }).pname;
+
+  # This is redundant with CI
+  doCheck = false;
+
+  # https://crane.dev/faq/rebuilds-bindgen.html
+  NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
+
+  env = buildPackageEnv;
 
   passthru = {
-    inherit env;
+    env = buildPackageEnv;
   };
-}
+
+  meta.mainProgram = commonAttrs.pname;
+})

rust-toolchain.toml

@@ -11,7 +11,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.
 
 [toolchain]
-channel = "1.75.0"
+channel = "1.77.0"
 components = [
     # For rust-analyzer
     "rust-src",
@@ -20,4 +20,4 @@ targets = [
     "x86_64-unknown-linux-gnu",
     "x86_64-unknown-linux-musl",
     "aarch64-unknown-linux-musl",
-]
+]

src/alloc/default.rs

@@ -0,0 +1,7 @@
+//! Default allocator with no special features
+
+/// Always returns the empty string
+pub(crate) fn memory_stats() -> String { Default::default() }
+
+/// Always returns the empty string
+pub(crate) fn memory_usage() -> String { Default::default() }

src/alloc/hardened.rs

@@ -0,0 +1,8 @@
+#[global_allocator]
+static HMALLOC: hardened_malloc_rs::HardenedMalloc = hardened_malloc_rs::HardenedMalloc;
+
+pub(crate) fn memory_usage() -> String {
+	String::default() //TODO: get usage
+}
+
+pub(crate) fn memory_stats() -> String { "Extended statistics are not available from hardened_malloc.".to_owned() }

src/alloc/je.rs

@@ -0,0 +1,50 @@
+use std::ffi::{c_char, c_void};
+
+use tikv_jemalloc_ctl as mallctl;
+use tikv_jemalloc_sys as ffi;
+use tikv_jemallocator as jemalloc;
+
+#[global_allocator]
+static JEMALLOC: jemalloc::Jemalloc = jemalloc::Jemalloc;
+
+pub(crate) fn memory_usage() -> String {
+	use mallctl::stats;
+	let allocated = stats::allocated::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	let active = stats::active::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	let mapped = stats::mapped::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	let metadata = stats::metadata::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	let resident = stats::resident::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	let retained = stats::retained::read().unwrap_or_default() as f64 / 1024.0 / 1024.0;
+	format!(
+		" allocated: {allocated:.2} MiB\n active: {active:.2} MiB\n mapped: {mapped:.2} MiB\n metadata: {metadata:.2} \
+		 MiB\n resident: {resident:.2} MiB\n retained: {retained:.2} MiB\n "
+	)
+}
+
+pub(crate) fn memory_stats() -> String {
+	const MAX_LENGTH: usize = 65536 - 4096;
+
+	let opts_s = "d";
+	let mut str = String::new();
+
+	let opaque = std::ptr::from_mut(&mut str).cast::<c_void>();
+	let opts_p: *const c_char = std::ffi::CString::new(opts_s).expect("cstring").into_raw() as *const c_char;
+
+	// SAFETY: calls malloc_stats_print() with our string instance which must remain
+	// in this frame. https://docs.rs/tikv-jemalloc-sys/latest/tikv_jemalloc_sys/fn.malloc_stats_print.html
+	unsafe { ffi::malloc_stats_print(Some(malloc_stats_cb), opaque, opts_p) };
+
+	str.truncate(MAX_LENGTH);
+	format!("<pre><code>{str}</code></pre>")
+}
+
+extern "C" fn malloc_stats_cb(opaque: *mut c_void, msg: *const c_char) {
+	// SAFETY: we have to trust the opaque points to our String
+	let res: &mut String = unsafe { opaque.cast::<String>().as_mut().unwrap() };
+
+	// SAFETY: we have to trust the string is null terminated.
+	let msg = unsafe { std::ffi::CStr::from_ptr(msg) };
+
+	let msg = String::from_utf8_lossy(msg.to_bytes());
+	res.push_str(msg.as_ref());
+}

src/alloc/mod.rs

@@ -0,0 +1,25 @@
+//! Integration with allocators
+
+// jemalloc
+#[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
+mod je;
+#[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
+pub(crate) use je::{memory_stats, memory_usage};
+
+// hardened_malloc
+#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
+mod hardened;
+#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
+pub(crate) use hardened::{memory_stats, memory_usage};
+
+// default, enabled when none or multiple of the above are enabled
+#[cfg(any(
+	not(any(feature = "jemalloc", feature = "hardened_malloc")),
+	all(feature = "jemalloc", feature = "hardened_malloc"),
+))]
+mod default;
+#[cfg(any(
+	not(any(feature = "jemalloc", feature = "hardened_malloc")),
+	all(feature = "jemalloc", feature = "hardened_malloc"),
+))]
+pub(crate) use default::{memory_stats, memory_usage};

src/api/client_server/account.rs

@@ -1,3 +1,5 @@
+use std::fmt::Write as _;
+
 use register::RegistrationKind;
 use ruma::{
 	api::client::{
@@ -18,7 +20,9 @@ use tracing::{error, info, warn};
 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
 	api::client_server::{self, join_room_by_id_helper},
-	service, services, utils, Error, Result, Ruma,
+	service, services,
+	utils::{self, user_id::user_is_local},
+	Error, Result, Ruma,
 };
 
 const RANDOM_USER_ID_LENGTH: usize = 10;
@@ -40,7 +44,7 @@ pub(crate) async fn get_register_available_route(
 	// Validate user id
 	let user_id = UserId::parse_with_server_name(body.username.to_lowercase(), services().globals.server_name())
 		.ok()
-		.filter(|user_id| !user_id.is_historical() && user_id.server_name() == services().globals.server_name())
+		.filter(|user_id| !user_id.is_historical() && user_is_local(user_id))
 		.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
 
 	// Check if username is creative enough
@@ -125,9 +129,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 			let proposed_user_id =
 				UserId::parse_with_server_name(username.to_lowercase(), services().globals.server_name())
 					.ok()
-					.filter(|user_id| {
+					.filter(|user_id| !user_id.is_historical() && user_is_local(user_id))
-						!user_id.is_historical() && user_id.server_name() == services().globals.server_name()
-					})
 					.ok_or(Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
 
 			if services().users.exists(&proposed_user_id)? {
@@ -238,7 +240,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 	// If `new_user_displayname_suffix` is set, registration will push whatever
 	// content is set to the user's display name with a space before it
 	if !services().globals.new_user_displayname_suffix().is_empty() {
-		displayname.push_str(&(" ".to_owned() + services().globals.new_user_displayname_suffix()));
+		_ = write!(displayname, " {}", services().globals.config.new_user_displayname_suffix);
 	}
 
 	services()
@@ -294,7 +296,8 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 			.admin
 			.send_message(RoomMessageEventContent::notice_plain(format!(
 				"New user \"{user_id}\" registered on this server."
-			)));
+			)))
+			.await;
 	}
 
 	// log in conduit admin channel if a guest registered
@@ -310,27 +313,30 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 					.send_message(RoomMessageEventContent::notice_plain(format!(
 						"Guest user \"{user_id}\" with device display name `{device_display_name}` registered on this \
 						 server."
-					)));
+					)))
+					.await;
 			} else {
 				services()
 					.admin
 					.send_message(RoomMessageEventContent::notice_plain(format!(
 						"Guest user \"{user_id}\" with no device display name registered on this server.",
-					)));
+					)))
+					.await;
 			}
 		} else {
 			services()
 				.admin
 				.send_message(RoomMessageEventContent::notice_plain(format!(
 					"Guest user \"{user_id}\" with no device display name registered on this server.",
-				)));
+				)))
+				.await;
 		}
 	}
 
 	// If this is the first real user, grant them admin privileges except for guest
 	// users Note: the server user, @conduit:servername, is generated first
 	if !is_guest {
-		if let Some(admin_room) = service::admin::Service::get_admin_room()? {
+		if let Some(admin_room) = service::admin::Service::get_admin_room().await? {
 			if services()
 				.rooms
 				.state_cache
@@ -351,33 +357,7 @@ pub(crate) async fn register_route(body: Ruma<register::v3::Request>) -> Result<
 		&& !services().globals.config.auto_join_rooms.is_empty()
 		&& (services().globals.allow_guests_auto_join_rooms() || !is_guest)
 	{
-		for room in &services().globals.config.auto_join_rooms {
+		auto_join_rooms(&user_id).await?;
-			if !services()
-				.rooms
-				.state_cache
-				.server_in_room(services().globals.server_name(), room)?
-			{
-				warn!("Skipping room {room} to automatically join as we have never joined before.");
-				continue;
-			}
-
-			if let Some(room_id_server_name) = room.server_name() {
-				if let Err(e) = join_room_by_id_helper(
-					Some(&user_id),
-					room,
-					Some("Automatically joining this room upon registration".to_owned()),
-					&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],
-					None,
-				)
-				.await
-				{
-					// don't return this error so we don't fail registrations
-					error!("Failed to automatically join room {room} for user {user_id}: {e}");
-				} else {
-					info!("Automatically joined room {room} for user {user_id}");
-				};
-			}
-		}
 	}
 
 	Ok(register::v3::Response {
@@ -461,7 +441,8 @@ pub(crate) async fn change_password_route(
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
 			"User {sender_user} changed their password."
-		)));
+		)))
+		.await;
 
 	Ok(change_password::v3::Response {})
 }
@@ -536,7 +517,8 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
 		.admin
 		.send_message(RoomMessageEventContent::notice_plain(format!(
 			"User {sender_user} deactivated their account."
-		)));
+		)))
+		.await;
 
 	Ok(deactivate::v3::Response {
 		id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
@@ -585,3 +567,40 @@ pub(crate) async fn request_3pid_management_token_via_msisdn_route(
 		"Third party identifier is not allowed",
 	))
 }
+
+/// Auto joins all the specified users to the rooms listed in the
+/// `auto_join_rooms` config option
+///
+/// TODO: can this be moved somewhere else instead of this file where routes are
+/// typically defined?
+pub(crate) async fn auto_join_rooms(user_id: &UserId) -> Result<()> {
+	for room in &services().globals.config.auto_join_rooms {
+		if !services()
+			.rooms
+			.state_cache
+			.server_in_room(&services().globals.config.server_name, room)?
+		{
+			warn!("Skipping room {room} to automatically join as we have never joined before.");
+			continue;
+		}
+
+		if let Some(room_id_server_name) = room.server_name() {
+			if let Err(e) = join_room_by_id_helper(
+				Some(user_id),
+				room,
+				Some("Automatically joining this room upon registration".to_owned()),
+				&[room_id_server_name.to_owned(), services().globals.config.server_name.clone()],
+				None,
+			)
+			.await
+			{
+				// don't return this error so we don't fail registrations
+				error!("Failed to automatically join room {room} for user {user_id}: {e}");
+			} else {
+				info!("Automatically joined room {room} for user {user_id}");
+			};
+		}
+	}
+
+	Ok(())
+}

src/api/client_server/alias.rs

@@ -8,38 +8,29 @@ use ruma::{
 		},
 		federation,
 	},
-	OwnedRoomAliasId, OwnedServerName,
+	OwnedRoomAliasId, OwnedRoomId, OwnedServerName,
 };
 use tracing::debug;
 
-use crate::{debug_info, debug_warn, services, Error, Result, Ruma};
+use crate::{
+	debug_info, debug_warn, service::appservice::RegistrationInfo, services, utils::server_name::server_is_ours, Error,
+	Result, Ruma,
+};
 
 /// # `PUT /_matrix/client/v3/directory/room/{roomAlias}`
 ///
 /// Creates a new room alias on this server.
 pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) -> Result<create_alias::v3::Response> {
-	if body.room_alias.server_name() != services().globals.server_name() {
+	alias_checks(&body.room_alias, &body.appservice_info).await?;
-		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
-	}
 
+	// this isn't apart of alias_checks or delete alias route because we should
+	// allow removing forbidden room aliases
 	if services()
 		.globals
 		.forbidden_alias_names()
 		.is_match(body.room_alias.alias())
 	{
-		return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias is forbidden."));
+		return Err(Error::BadRequest(ErrorKind::forbidden(), "Room alias is forbidden."));
-	}
-
-	if let Some(ref info) = body.appservice_info {
-		if !info.aliases.is_match(body.room_alias.as_str()) {
-			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
-		}
-	} else if services()
-		.appservice
-		.is_exclusive_alias(&body.room_alias)
-		.await
-	{
-		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
 	}
 
 	if services()
@@ -73,9 +64,7 @@ pub(crate) async fn create_alias_route(body: Ruma<create_alias::v3::Request>) ->
 /// - TODO: additional access control checks
 /// - TODO: Update canonical alias event
 pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) -> Result<delete_alias::v3::Response> {
-	if body.room_alias.server_name() != services().globals.server_name() {
+	alias_checks(&body.room_alias, &body.appservice_info).await?;
-		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
-	}
 
 	if services()
 		.rooms
@@ -86,18 +75,6 @@ pub(crate) async fn delete_alias_route(body: Ruma<delete_alias::v3::Request>) ->
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Alias does not exist."));
 	}
 
-	if let Some(ref info) = body.appservice_info {
-		if !info.aliases.is_match(body.room_alias.as_str()) {
-			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
-		}
-	} else if services()
-		.appservice
-		.is_exclusive_alias(&body.room_alias)
-		.await
-	{
-		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
-	}
-
 	if services()
 		.rooms
 		.alias
@@ -126,7 +103,7 @@ pub(crate) async fn get_alias_helper(
 	room_alias: OwnedRoomAliasId, servers: Option<Vec<OwnedServerName>>,
 ) -> Result<get_alias::v3::Response> {
 	debug!("get_alias_helper servers: {servers:?}");
-	if room_alias.server_name() != services().globals.server_name()
+	if !server_is_ours(room_alias.server_name())
 		&& (!servers
 			.as_ref()
 			.is_some_and(|servers| servers.contains(&services().globals.server_name().to_owned()))
@@ -180,47 +157,21 @@ pub(crate) async fn get_alias_helper(
 		if let Ok(response) = response {
 			let room_id = response.room_id;
 
-			let mut servers = response.servers;
+			let mut pre_servers = response.servers;
+			// since the room alis server responded, insert it into the list
+			pre_servers.push(room_alias.server_name().into());
 
-			// since the room alias server_name responded, insert it into the list
+			let servers = room_available_servers(&room_id, &room_alias, &Some(pre_servers));
-			servers.push(room_alias.server_name().into());
+			debug_warn!(
-
+				"room alias servers from federation response for room ID {room_id} and room alias {room_alias}: \
-			// find active servers in room state cache to suggest
+				 {servers:?}"
-			servers.extend(
-				services()
-					.rooms
-					.state_cache
-					.room_servers(&room_id)
-					.filter_map(Result::ok),
 			);
 
-			servers.sort_unstable();
-			servers.dedup();
-
-			// shuffle list of servers randomly after sort and dedupe
-			servers.shuffle(&mut rand::thread_rng());
-
-			// prefer the very first server to be ourselves if available, else prefer the
-			// room alias server first
-			if let Some(server_index) = servers
-				.iter()
-				.position(|server| server == services().globals.server_name())
-			{
-				servers.remove(server_index);
-				servers.insert(0, services().globals.server_name().to_owned());
-			} else if let Some(alias_server_index) = servers
-				.iter()
-				.position(|server| server == room_alias.server_name())
-			{
-				servers.remove(alias_server_index);
-				servers.insert(0, room_alias.server_name().into());
-			}
-
 			return Ok(get_alias::v3::Response::new(room_id, servers));
 		}
 
 		return Err(Error::BadRequest(
-			ErrorKind::Unknown,
+			ErrorKind::NotFound,
 			"No servers could assist in resolving the room alias",
 		));
 	}
@@ -260,28 +211,67 @@ pub(crate) async fn get_alias_helper(
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Room with alias not found."));
 	};
 
+	let servers = room_available_servers(&room_id, &room_alias, &None);
+
+	debug_warn!("room alias servers for room ID {room_id} and room alias {room_alias}");
+
+	Ok(get_alias::v3::Response::new(room_id, servers))
+}
+
+fn room_available_servers(
+	room_id: &OwnedRoomId, room_alias: &OwnedRoomAliasId, pre_servers: &Option<Vec<OwnedServerName>>,
+) -> Vec<OwnedServerName> {
 	// find active servers in room state cache to suggest
 	let mut servers: Vec<OwnedServerName> = services()
 		.rooms
 		.state_cache
-		.room_servers(&room_id)
+		.room_servers(room_id)
 		.filter_map(Result::ok)
 		.collect();
 
+	// push any servers we want in the list already (e.g. responded remote alias
+	// servers, room alias server itself)
+	if let Some(pre_servers) = pre_servers {
+		servers.extend(pre_servers.clone());
+	};
+
 	servers.sort_unstable();
 	servers.dedup();
 
 	// shuffle list of servers randomly after sort and dedupe
 	servers.shuffle(&mut rand::thread_rng());
 
-	// insert our server as the very first choice if in list
+	// insert our server as the very first choice if in list, else check if we can
+	// prefer the room alias server first
 	if let Some(server_index) = servers
 		.iter()
-		.position(|server| server == services().globals.server_name())
+		.position(|server_name| server_is_ours(server_name))
 	{
 		servers.remove(server_index);
 		servers.insert(0, services().globals.server_name().to_owned());
+	} else if let Some(alias_server_index) = servers
+		.iter()
+		.position(|server| server == room_alias.server_name())
+	{
+		servers.remove(alias_server_index);
+		servers.insert(0, room_alias.server_name().into());
 	}
 
-	Ok(get_alias::v3::Response::new(room_id, servers))
+	servers
+}
+
+async fn alias_checks(room_alias: &OwnedRoomAliasId, appservice_info: &Option<RegistrationInfo>) -> Result<()> {
+	if !server_is_ours(room_alias.server_name()) {
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Alias is from another server."));
+	}
+
+	if let Some(ref info) = appservice_info {
+		if !info.aliases.is_match(room_alias.as_str()) {
+			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
+		}
+	} else if services().appservice.is_exclusive_alias(room_alias).await {
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
+	}
+
+	Ok(())
 }

src/api/client_server/backup.rs

@@ -1,11 +1,14 @@
-use ruma::api::client::{
+use ruma::{
-	backup::{
+	api::client::{
-		add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,
+		backup::{
-		delete_backup_keys, delete_backup_keys_for_room, delete_backup_keys_for_session, delete_backup_version,
+			add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,
-		get_backup_info, get_backup_keys, get_backup_keys_for_room, get_backup_keys_for_session,
+			delete_backup_keys, delete_backup_keys_for_room, delete_backup_keys_for_session, delete_backup_version,
-		get_latest_backup_info, update_backup_version,
+			get_backup_info, get_backup_keys, get_backup_keys_for_room, get_backup_keys_for_session,
+			get_latest_backup_info, update_backup_version,
+		},
+		error::ErrorKind,
 	},
-	error::ErrorKind,
+	UInt,
 };
 
 use crate::{services, Error, Result, Ruma};
@@ -52,17 +55,18 @@ pub(crate) async fn get_latest_backup_info_route(
 	let (version, algorithm) = services()
 		.key_backups
 		.get_latest_backup(sender_user)?
-		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
+		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
 
 	Ok(get_latest_backup_info::v3::Response {
 		algorithm,
-		count: (services().key_backups.count_keys(sender_user, &version)? as u32).into(),
+		count: (UInt::try_from(services().key_backups.count_keys(sender_user, &version)?)
+			.expect("user backup keys count should not be that high")),
 		etag: services().key_backups.get_etag(sender_user, &version)?,
 		version,
 	})
 }
 
-/// # `GET /_matrix/client/r0/room_keys/version`
+/// # `GET /_matrix/client/v3/room_keys/version/{version}`
 ///
 /// Get information about an existing backup.
 pub(crate) async fn get_backup_info_route(
@@ -72,14 +76,16 @@ pub(crate) async fn get_backup_info_route(
 	let algorithm = services()
 		.key_backups
 		.get_backup(sender_user, &body.version)?
-		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
+		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?;
 
 	Ok(get_backup_info::v3::Response {
 		algorithm,
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -139,10 +145,12 @@ pub(crate) async fn add_backup_keys_route(
 	}
 
 	Ok(add_backup_keys::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -181,10 +189,12 @@ pub(crate) async fn add_backup_keys_for_room_route(
 	}
 
 	Ok(add_backup_keys_for_room::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -221,10 +231,12 @@ pub(crate) async fn add_backup_keys_for_session_route(
 		.add_key(sender_user, &body.version, &body.room_id, &body.session_id, &body.session_data)?;
 
 	Ok(add_backup_keys_for_session::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -274,10 +286,7 @@ pub(crate) async fn get_backup_keys_for_session_route(
 	let key_data = services()
 		.key_backups
 		.get_session(sender_user, &body.version, &body.room_id, &body.session_id)?
-		.ok_or(Error::BadRequest(
+		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Backup key not found for this user's session."))?;
-			ErrorKind::NotFound,
-			"Backup key not found for this user's session.",
-		))?;
 
 	Ok(get_backup_keys_for_session::v3::Response {
 		key_data,
@@ -297,10 +306,12 @@ pub(crate) async fn delete_backup_keys_route(
 		.delete_all_keys(sender_user, &body.version)?;
 
 	Ok(delete_backup_keys::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -320,10 +331,12 @@ pub(crate) async fn delete_backup_keys_for_room_route(
 		.delete_room_keys(sender_user, &body.version, &body.room_id)?;
 
 	Ok(delete_backup_keys_for_room::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,
@@ -343,10 +356,12 @@ pub(crate) async fn delete_backup_keys_for_session_route(
 		.delete_room_key(sender_user, &body.version, &body.room_id, &body.session_id)?;
 
 	Ok(delete_backup_keys_for_session::v3::Response {
-		count: (services()
+		count: (UInt::try_from(
-			.key_backups
+			services()
-			.count_keys(sender_user, &body.version)? as u32)
+				.key_backups
-			.into(),
+				.count_keys(sender_user, &body.version)?,
+		)
+		.expect("user backup keys count should not be that high")),
 		etag: services()
 			.key_backups
 			.get_etag(sender_user, &body.version)?,

src/api/client_server/capabilities.rs

@@ -1,8 +1,7 @@
 use std::collections::BTreeMap;
 
 use ruma::api::client::discovery::get_capabilities::{
-	self, Capabilities, ChangePasswordCapability, RoomVersionStability, RoomVersionsCapability, SetAvatarUrlCapability,
+	self, Capabilities, RoomVersionStability, RoomVersionsCapability, ThirdPartyIdChangesCapability,
-	SetDisplayNameCapability, ThirdPartyIdChangesCapability,
 };
 
 use crate::{services, Result, Ruma};
@@ -22,24 +21,12 @@ pub(crate) async fn get_capabilities_route(
 		available.insert(room_version.clone(), RoomVersionStability::Stable);
 	}
 
-	let mut capabilities = Capabilities::new();
+	let mut capabilities = Capabilities::default();
 	capabilities.room_versions = RoomVersionsCapability {
 		default: services().globals.default_room_version(),
 		available,
 	};
 
-	capabilities.change_password = ChangePasswordCapability {
-		enabled: true,
-	};
-
-	capabilities.set_avatar_url = SetAvatarUrlCapability {
-		enabled: true,
-	};
-
-	capabilities.set_displayname = SetDisplayNameCapability {
-		enabled: true,
-	};
-
 	// conduit does not implement 3PID stuff
 	capabilities.thirdparty_id_changes = ThirdPartyIdChangesCapability {
 		enabled: false,

src/api/client_server/config.rs

@@ -5,6 +5,7 @@ use ruma::{
 	},
 	events::{AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent},
 	serde::Raw,
+	OwnedUserId, RoomId,
 };
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};
@@ -17,22 +18,7 @@ use crate::{services, Error, Result, Ruma};
 pub(crate) async fn set_global_account_data_route(
 	body: Ruma<set_global_account_data::v3::Request>,
 ) -> Result<set_global_account_data::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	set_account_data(None, &body.sender_user, &body.event_type.to_string(), body.data.json())?;
-
-	let data: serde_json::Value = serde_json::from_str(body.data.json().get())
-		.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
-
-	let event_type = body.event_type.to_string();
-
-	services().account_data.update(
-		None,
-		sender_user,
-		event_type.clone().into(),
-		&json!({
-			"type": event_type,
-			"content": data,
-		}),
-	)?;
 
 	Ok(set_global_account_data::v3::Response {})
 }
@@ -43,21 +29,11 @@ pub(crate) async fn set_global_account_data_route(
 pub(crate) async fn set_room_account_data_route(
 	body: Ruma<set_room_account_data::v3::Request>,
 ) -> Result<set_room_account_data::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	set_account_data(
-
-	let data: serde_json::Value = serde_json::from_str(body.data.json().get())
-		.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
-
-	let event_type = body.event_type.to_string();
-
-	services().account_data.update(
 		Some(&body.room_id),
-		sender_user,
+		&body.sender_user,
-		event_type.clone().into(),
+		&body.event_type.to_string(),
-		&json!({
+		body.data.json(),
-			"type": event_type,
-			"content": data,
-		}),
 	)?;
 
 	Ok(set_room_account_data::v3::Response {})
@@ -74,7 +50,7 @@ pub(crate) async fn get_global_account_data_route(
 	let event: Box<RawJsonValue> = services()
 		.account_data
 		.get(None, sender_user, body.event_type.to_string().into())?
-		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
 
 	let account_data = serde_json::from_str::<ExtractGlobalEventContent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -96,7 +72,7 @@ pub(crate) async fn get_room_account_data_route(
 	let event: Box<RawJsonValue> = services()
 		.account_data
 		.get(Some(&body.room_id), sender_user, body.event_type.clone())?
-		.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+		.ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
 
 	let account_data = serde_json::from_str::<ExtractRoomEventContent>(event.get())
 		.map_err(|_| Error::bad_database("Invalid account data event in db."))?
@@ -107,6 +83,27 @@ pub(crate) async fn get_room_account_data_route(
 	})
 }
 
+fn set_account_data(
+	room_id: Option<&RoomId>, sender_user: &Option<OwnedUserId>, event_type: &str, data: &RawJsonValue,
+) -> Result<()> {
+	let sender_user = sender_user.as_ref().expect("user is authenticated");
+
+	let data: serde_json::Value =
+		serde_json::from_str(data.get()).map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Data is invalid."))?;
+
+	services().account_data.update(
+		room_id,
+		sender_user,
+		event_type.into(),
+		&json!({
+			"type": event_type,
+			"content": data,
+		}),
+	)?;
+
+	Ok(())
+}
+
 #[derive(Deserialize)]
 struct ExtractRoomEventContent {
 	content: Raw<AnyRoomAccountDataEventContent>,

src/api/client_server/context.rs

@@ -63,8 +63,8 @@ pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> R
 		lazy_loaded.insert(base_event.sender.as_str().to_owned());
 	}
 
-	// Use limit with maximum 100
+	// Use limit or else 10, with maximum 100
-	let limit = u64::from(body.limit).min(100) as usize;
+	let limit = usize::try_from(body.limit).unwrap_or(10).min(100);
 
 	let base_event = base_event.to_room_event();
 
@@ -188,14 +188,12 @@ pub(crate) async fn get_context_route(body: Ruma<get_context::v3::Request>) -> R
 		}
 	}
 
-	let resp = get_context::v3::Response {
+	Ok(get_context::v3::Response {
 		start: Some(start_token),
 		end: Some(end_token),
 		events_before,
 		event: Some(base_event),
 		events_after,
 		state,
-	};
+	})
-
-	Ok(resp)
 }

src/api/client_server/directory.rs

@@ -20,11 +20,11 @@ use ruma::{
 		},
 		StateEventType,
 	},
-	ServerName, UInt,
+	uint, ServerName, UInt,
 };
 use tracing::{error, info, warn};
 
-use crate::{services, Error, Result, Ruma};
+use crate::{services, utils::server_name::server_is_ours, Error, Result, Ruma};
 
 /// # `POST /_matrix/client/v3/publicRooms`
 ///
@@ -173,7 +173,7 @@ pub(crate) async fn get_room_visibility_route(
 pub(crate) async fn get_public_rooms_filtered_helper(
 	server: Option<&ServerName>, limit: Option<UInt>, since: Option<&str>, filter: &Filter, _network: &RoomNetwork,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
-	if let Some(other_server) = server.filter(|server| *server != services().globals.server_name().as_str()) {
+	if let Some(other_server) = server.filter(|server_name| !server_is_ours(server_name)) {
 		let response = services()
 			.sending
 			.send_federation_request(
@@ -198,8 +198,9 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		});
 	}
 
+	// Use limit or else 10, with maximum 100
 	let limit = limit.map_or(10, u64::from);
-	let mut num_since = 0_u64;
+	let mut num_since: u64 = 0;
 
 	if let Some(s) = &since {
 		let mut characters = s.chars();
@@ -363,12 +364,16 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 
 	all_rooms.sort_by(|l, r| r.num_joined_members.cmp(&l.num_joined_members));
 
-	let total_room_count_estimate = (all_rooms.len() as u32).into();
+	let total_room_count_estimate = UInt::try_from(all_rooms.len()).unwrap_or_else(|_| uint!(0));
 
 	let chunk: Vec<_> = all_rooms
 		.into_iter()
-		.skip(num_since as usize)
+		.skip(
-		.take(limit as usize)
+			num_since
+				.try_into()
+				.expect("num_since should not be this high"),
+		)
+		.take(limit.try_into().expect("limit should not be this high"))
 		.collect();
 
 	let prev_batch = if num_since == 0 {
@@ -377,10 +382,15 @@ pub(crate) async fn get_public_rooms_filtered_helper(
 		Some(format!("p{num_since}"))
 	};
 
-	let next_batch = if chunk.len() < limit as usize {
+	let next_batch = if chunk.len() < limit.try_into().unwrap() {
 		None
 	} else {
-		Some(format!("n{}", num_since + limit))
+		Some(format!(
+			"n{}",
+			num_since
+				.checked_add(limit)
+				.expect("num_since and limit should not be that large")
+		))
 	};
 
 	Ok(get_public_rooms_filtered::v3::Response {

src/api/client_server/keys.rs

@@ -1,4 +1,5 @@
 use std::{
+	cmp,
 	collections::{hash_map, BTreeMap, HashMap, HashSet},
 	time::{Duration, Instant},
 };
@@ -20,7 +21,11 @@ use serde_json::json;
 use tracing::debug;
 
 use super::SESSION_ID_LENGTH;
-use crate::{services, utils, Error, Result, Ruma};
+use crate::{
+	services,
+	utils::{self, user_id::user_is_local},
+	Error, Result, Ruma,
+};
 
 /// # `POST /_matrix/client/r0/keys/upload`
 ///
@@ -71,24 +76,20 @@ pub(crate) async fn upload_keys_route(body: Ruma<upload_keys::v3::Request>) -> R
 pub(crate) 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");
 
-	let response = get_keys_helper(
+	get_keys_helper(
 		Some(sender_user),
 		&body.device_keys,
 		|u| u == sender_user,
 		true, // Always allow local users to see device names of other local users
 	)
-	.await?;
+	.await
-
-	Ok(response)
 }
 
 /// # `POST /_matrix/client/r0/keys/claim`
 ///
 /// Claims one-time keys
 pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v3::Request>) -> Result<claim_keys::v3::Response> {
-	let response = claim_keys_helper(&body.one_time_keys).await?;
+	claim_keys_helper(&body.one_time_keys).await
-
-	Ok(response)
 }
 
 /// # `POST /_matrix/client/r0/keys/device_signing/upload`
@@ -260,7 +261,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 	for (user_id, device_ids) in device_keys_input {
 		let user_id: &UserId = user_id;
 
-		if user_id.server_name() != services().globals.server_name() {
+		if !user_is_local(user_id) {
 			get_over_federation
 				.entry(user_id.server_name())
 				.or_insert_with(Vec::new)
@@ -338,7 +339,9 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 			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),
+			hash_map::Entry::Occupied(mut e) => {
+				*e.get_mut() = (Instant::now(), e.get().1.saturating_add(1));
+			},
 		}
 	};
 
@@ -353,10 +356,8 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
 				.get(server)
 			{
 				// Exponential backoff
-				let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
+				const MAX_DURATION: Duration = Duration::from_secs(60 * 60 * 24);
-				if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
+				let min_elapsed_duration = cmp::min(MAX_DURATION, Duration::from_secs(5 * 60) * (*tries) * (*tries));
-					min_elapsed_duration = Duration::from_secs(60 * 60 * 24);
-				}
 
 				if time.elapsed() < min_elapsed_duration {
 					debug!("Backing off query from {:?}", server);
@@ -454,7 +455,7 @@ pub(crate) async fn claim_keys_helper(
 	let mut get_over_federation = BTreeMap::new();
 
 	for (user_id, map) in one_time_keys_input {
-		if user_id.server_name() != services().globals.server_name() {
+		if !user_is_local(user_id) {
 			get_over_federation
 				.entry(user_id.server_name())
 				.or_insert_with(Vec::new)

src/api/client_server/media.rs

@@ -16,7 +16,9 @@ use webpage::HTML;
 use crate::{
 	debug_warn,
 	service::media::{FileMeta, UrlPreviewData},
-	services, utils, Error, Result, Ruma, RumaResponse,
+	services,
+	utils::{self, server_name::server_is_ours},
+	Error, Result, Ruma, RumaResponse,
 };
 
 /// generated MXC ID (`media-id`) length
@@ -25,6 +27,8 @@ const MXC_LENGTH: usize = 32;
 /// Cache control for immutable objects
 const CACHE_CONTROL_IMMUTABLE: &str = "public, max-age=31536000, immutable";
 
+const CORP_CROSS_ORIGIN: &str = "cross-origin";
+
 /// # `GET /_matrix/media/v3/config`
 ///
 /// Returns max upload size.
@@ -126,7 +130,7 @@ pub(crate) async fn create_content_route(
 			mxc.clone(),
 			body.filename
 				.as_ref()
-				.map(|filename| "inline; filename=".to_owned() + filename)
+				.map(|filename| format!("attachment; filename={filename}"))
 				.as_deref(),
 			body.content_type.as_deref(),
 			&body.file,
@@ -169,19 +173,20 @@ pub(crate) async fn get_content_route(body: Ruma<get_content::v3::Request>) -> R
 	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?
 	{
+		// TODO: safely sanitise filename to be included in the content-disposition
 		Ok(get_content::v3::Response {
 			file,
 			content_type,
-			content_disposition,
+			content_disposition: Some("attachment".to_owned()),
-			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
 		})
-	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+	} else if !server_is_ours(&body.server_name) && body.allow_remote {
 		get_remote_content(
 			&mxc,
 			&body.server_name,
@@ -239,11 +244,11 @@ pub(crate) async fn get_content_as_filename_route(
 		Ok(get_content_as_filename::v3::Response {
 			file,
 			content_type,
-			content_disposition: Some(format!("inline; filename={}", body.filename)),
+			content_disposition: Some("attachment".to_owned()),
-			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
 		})
-	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+	} else if !server_is_ours(&body.server_name) && body.allow_remote {
 		match get_remote_content(
 			&mxc,
 			&body.server_name,
@@ -254,10 +259,10 @@ pub(crate) async fn get_content_as_filename_route(
 		.await
 		{
 			Ok(remote_content_response) => Ok(get_content_as_filename::v3::Response {
-				content_disposition: Some(format!("inline: filename={}", body.filename)),
+				content_disposition: Some("attachment".to_owned()),
 				content_type: remote_content_response.content_type,
 				file: remote_content_response.file,
-				cross_origin_resource_policy: Some("cross-origin".to_owned()),
+				cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 				cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
 			}),
 			Err(e) => {
@@ -321,10 +326,11 @@ pub(crate) async fn get_content_thumbnail_route(
 		Ok(get_content_thumbnail::v3::Response {
 			file,
 			content_type,
-			cross_origin_resource_policy: Some("cross-origin".to_owned()),
+			cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
 			cache_control: Some(CACHE_CONTROL_IMMUTABLE.into()),
+			content_disposition: Some("attachment".to_owned()),
 		})
-	} else if &*body.server_name != services().globals.server_name() && body.allow_remote {
+	} else if !server_is_ours(&body.server_name) && body.allow_remote {
 		if services()
 			.globals
 			.prevent_media_downloads_from()
@@ -367,7 +373,13 @@ pub(crate) async fn get_content_thumbnail_route(
 					)
 					.await?;
 
-				Ok(get_thumbnail_response)
+				Ok(get_content_thumbnail::v3::Response {
+					file: get_thumbnail_response.file,
+					content_type: get_thumbnail_response.content_type,
+					cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
+					cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
+					content_disposition: Some("attachment".to_owned()),
+				})
 			},
 			Err(e) => {
 				debug_warn!("Fetching media `{}` failed: {:?}", mxc, e);
@@ -407,7 +419,7 @@ async fn get_remote_content(
 	{
 		// 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.
-		debug_warn!("Received request for media `{}` on blocklisted server", mxc);
+		debug_warn!("Received request for media `{mxc}` on blocklisted server");
 		return Err(Error::BadRequest(ErrorKind::NotFound, "Media not found."));
 	}
 
@@ -430,13 +442,19 @@ async fn get_remote_content(
 		.create(
 			None,
 			mxc.to_owned(),
-			content_response.content_disposition.as_deref(),
+			Some("attachment"),
 			content_response.content_type.as_deref(),
 			&content_response.file,
 		)
 		.await?;
 
-	Ok(content_response)
+	Ok(get_content::v3::Response {
+		file: content_response.file,
+		content_type: content_response.content_type,
+		content_disposition: Some("attachment".to_owned()),
+		cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
+		cache_control: Some(CACHE_CONTROL_IMMUTABLE.to_owned()),
+	})
 }
 
 async fn download_image(client: &reqwest::Client, url: &str) -> Result<UrlPreviewData> {

src/api/client_server/membership.rs

@@ -1,4 +1,5 @@
 use std::{
+	cmp,
 	collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
 	sync::Arc,
 	time::{Duration, Instant},
@@ -34,7 +35,9 @@ use tracing::{debug, error, info, trace, warn};
 use super::get_alias_helper;
 use crate::{
 	service::pdu::{gen_event_id_canonical_json, PduBuilder},
-	services, utils, Error, PduEvent, Result, Ruma,
+	services,
+	utils::{self, server_name::server_is_ours, user_id::user_is_local},
+	Error, PduEvent, Result, Ruma,
 };
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/join`
@@ -1088,7 +1091,7 @@ pub(crate) async fn join_room_by_id_helper(
 			.state_cache
 			.room_members(room_id)
 			.filter_map(Result::ok)
-			.filter(|user| user.server_name() == services().globals.server_name())
+			.filter(|user| user_is_local(user))
 			.collect::<Vec<OwnedUserId>>();
 
 		let mut authorized_user: Option<OwnedUserId> = None;
@@ -1150,7 +1153,7 @@ pub(crate) async fn join_room_by_id_helper(
 		if !restriction_rooms.is_empty()
 			&& servers
 				.iter()
-				.any(|s| *s != services().globals.server_name())
+				.any(|server_name| !server_is_ours(server_name))
 		{
 			info!(
 				"We couldn't do the join locally, maybe federation can help to satisfy the restricted join \
@@ -1299,11 +1302,11 @@ async fn make_join_request(
 ) -> Result<(federation::membership::prepare_join_event::v1::Response, OwnedServerName)> {
 	let mut make_join_response_and_server = Err(Error::BadServerResponse("No server available to assist in joining."));
 
-	let mut make_join_counter = 0;
+	let mut make_join_counter: u16 = 0;
-	let mut incompatible_room_version_count = 0;
+	let mut incompatible_room_version_count: u8 = 0;
 
 	for remote_server in servers {
-		if remote_server == services().globals.server_name() {
+		if server_is_ours(remote_server) {
 			continue;
 		}
 		info!("Asking {remote_server} for make_join ({make_join_counter})");
@@ -1320,7 +1323,7 @@ async fn make_join_request(
 			.await;
 
 		trace!("make_join response: {:?}", make_join_response);
-		make_join_counter += 1;
+		make_join_counter = make_join_counter.saturating_add(1);
 
 		if let Err(ref e) = make_join_response {
 			trace!("make_join ErrorKind string: {:?}", e.error_code().to_string());
@@ -1334,7 +1337,7 @@ async fn make_join_request(
 					.to_string()
 					.contains("M_UNSUPPORTED_ROOM_VERSION")
 			{
-				incompatible_room_version_count += 1;
+				incompatible_room_version_count = incompatible_room_version_count.saturating_add(1);
 			}
 
 			if incompatible_room_version_count > 15 {
@@ -1391,7 +1394,9 @@ async fn validate_and_add_event_id(
 			Entry::Vacant(e) => {
 				e.insert((Instant::now(), 1));
 			},
-			Entry::Occupied(mut e) => *e.get_mut() = (Instant::now(), e.get().1 + 1),
+			Entry::Occupied(mut e) => {
+				*e.get_mut() = (Instant::now(), e.get().1.saturating_add(1));
+			},
 		}
 	};
 
@@ -1403,10 +1408,8 @@ async fn validate_and_add_event_id(
 		.get(&event_id)
 	{
 		// Exponential backoff
-		let mut min_elapsed_duration = Duration::from_secs(5 * 60) * (*tries) * (*tries);
+		const MAX_DURATION: Duration = Duration::from_secs(60 * 60 * 24);
-		if min_elapsed_duration > Duration::from_secs(60 * 60 * 24) {
+		let min_elapsed_duration = cmp::min(MAX_DURATION, Duration::from_secs(5 * 60) * (*tries) * (*tries));
-			min_elapsed_duration = Duration::from_secs(60 * 60 * 24);
-		}
 
 		if time.elapsed() < min_elapsed_duration {
 			debug!("Backing off from {}", event_id);
@@ -1436,7 +1439,7 @@ pub(crate) async fn invite_helper(
 		));
 	}
 
-	if user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(user_id) {
 		let (pdu, pdu_json, invite_room_state) = {
 			let mutex_state = Arc::clone(
 				services()

src/api/client_server/message.rs

@@ -144,7 +144,7 @@ pub(crate) async fn get_message_events_route(
 		.lazy_load_confirm_delivery(sender_user, sender_device, &body.room_id, from)
 		.await?;
 
-	let limit = u64::from(body.limit).min(100) as usize;
+	let limit = usize::try_from(body.limit).unwrap_or(10).min(100);
 
 	let next_token;
 
@@ -159,8 +159,9 @@ pub(crate) async fn get_message_events_route(
 				.timeline
 				.pdus_after(sender_user, &body.room_id, from)?
 				.filter_map(Result::ok) // Filter out buggy events
-				.filter(|(_, pdu)| contains_url_filter(pdu, &body.filter))
+				.filter(|(_, pdu)| { contains_url_filter(pdu, &body.filter) && visibility_filter(pdu, sender_user, &body.room_id)
-				.filter(|(_, pdu)| visibility_filter(pdu, sender_user, &body.room_id))
+
+				})
 				.take_while(|&(k, _)| Some(k) != to) // Stop at `to`
 				.take(limit)
 				.collect();
@@ -205,8 +206,7 @@ pub(crate) async fn get_message_events_route(
 				.timeline
 				.pdus_until(sender_user, &body.room_id, from)?
 				.filter_map(Result::ok) // Filter out buggy events
-				.filter(|(_, pdu)| contains_url_filter(pdu, &body.filter))
+				.filter(|(_, pdu)| {contains_url_filter(pdu, &body.filter) && visibility_filter(pdu, sender_user, &body.room_id)})
-				.filter(|(_, pdu)| visibility_filter(pdu, sender_user, &body.room_id))
 				.take_while(|&(k, _)| Some(k) != to) // Stop at `to`
 				.take(limit)
 				.collect();

src/api/client_server/presence.rs

@@ -42,16 +42,27 @@ pub(crate) async fn get_presence_route(body: Ruma<get_presence::v3::Request>) ->
 		.user
 		.get_shared_rooms(vec![sender_user.clone(), body.user_id.clone()])?
 	{
-		if let Some(presence) = services().presence.get_presence(sender_user)? {
+		if let Some(presence) = services().presence.get_presence(&body.user_id)? {
 			presence_event = Some(presence);
 			break;
 		}
 	}
 
 	if let Some(presence) = presence_event {
+		let status_msg = if presence
+			.content
+			.status_msg
+			.as_ref()
+			.is_some_and(String::is_empty)
+		{
+			None
+		} else {
+			presence.content.status_msg
+		};
+
 		Ok(get_presence::v3::Response {
 			// TODO: Should ruma just use the presenceeventcontent type here?
-			status_msg: presence.content.status_msg,
+			status_msg,
 			currently_active: presence.content.currently_active,
 			last_active_ago: presence
 				.content

src/api/client_server/profile.rs

@@ -13,7 +13,7 @@ use ruma::{
 };
 use serde_json::value::to_raw_value;
 
-use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
+use crate::{service::pdu::PduBuilder, services, utils::user_id::user_is_local, Error, Result, Ruma};
 
 /// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
 ///
@@ -105,7 +105,7 @@ pub(crate) async fn set_displayname_route(
 pub(crate) async fn get_displayname_route(
 	body: Ruma<get_display_name::v3::Request>,
 ) -> Result<get_display_name::v3::Response> {
-	if body.user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&body.user_id) {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending
@@ -247,7 +247,7 @@ pub(crate) async fn set_avatar_url_route(
 pub(crate) async fn get_avatar_url_route(
 	body: Ruma<get_avatar_url::v3::Request>,
 ) -> Result<get_avatar_url::v3::Response> {
-	if body.user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&body.user_id) {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending
@@ -303,7 +303,7 @@ pub(crate) 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(crate) async fn get_profile_route(body: Ruma<get_profile::v3::Request>) -> Result<get_profile::v3::Response> {
-	if body.user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&body.user_id) {
 		// Create and update our local copy of the user
 		if let Ok(response) = services()
 			.sending

src/api/client_server/report.rs

@@ -4,12 +4,12 @@ use rand::Rng;
 use ruma::{
 	api::client::{error::ErrorKind, room::report_content},
 	events::room::message,
-	int,
+	int, EventId, RoomId, UserId,
 };
 use tokio::time::sleep;
-use tracing::{debug, info};
+use tracing::info;
 
-use crate::{services, utils::HtmlEscape, Error, Result, Ruma};
+use crate::{debug_info, service::pdu::PduEvent, services, utils::HtmlEscape, Error, Result, Ruma};
 
 /// # `POST /_matrix/client/v3/rooms/{roomId}/report/{eventId}`
 ///
@@ -20,7 +20,10 @@ pub(crate) async fn report_event_route(
 	// user authentication
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-	info!("Received /report request by user {}", sender_user);
+	info!(
+		"Received /report request by user {sender_user} for room {} and event ID {}",
+		body.room_id, body.event_id
+	);
 
 	// check if we know about the reported event ID or if it's invalid
 	let Some(pdu) = services().rooms.timeline.get_pdu(&body.event_id)? else {
@@ -30,43 +33,7 @@ pub(crate) async fn report_event_route(
 		));
 	};
 
-	// check if the room ID from the URI matches the PDU's room ID
+	is_report_valid(&pdu.event_id, &body.room_id, sender_user, &body.reason, body.score, &pdu)?;
-	if body.room_id != pdu.room_id {
-		return Err(Error::BadRequest(
-			ErrorKind::NotFound,
-			"Event ID does not belong to the reported room",
-		));
-	}
-
-	// check if reporting user is in the reporting room
-	if !services()
-		.rooms
-		.state_cache
-		.room_members(&pdu.room_id)
-		.filter_map(Result::ok)
-		.any(|user_id| user_id == *sender_user)
-	{
-		return Err(Error::BadRequest(
-			ErrorKind::NotFound,
-			"You are not in the room you are reporting.",
-		));
-	}
-
-	// check if score is in valid range
-	if let Some(true) = body.score.map(|s| s > int!(0) || s < int!(-100)) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Invalid score, must be within 0 to -100",
-		));
-	};
-
-	// check if report reasoning is less than or equal to 750 characters
-	if let Some(true) = body.reason.clone().map(|s| s.chars().count() >= 750) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Reason too long, should be 750 characters or fewer",
-		));
-	};
 
 	// send admin room message that we received the report with an @room ping for
 	// urgency
@@ -97,17 +64,70 @@ pub(crate) async fn report_event_route(
 				body.score.unwrap_or_else(|| ruma::Int::from(0)),
 				HtmlEscape(body.reason.as_deref().unwrap_or(""))
 			),
-		));
+		))
+		.await;
 
-	// even though this is kinda security by obscurity, let's still make a small
+	delay_response().await?;
-	// 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.",
-		time_to_wait
-	);
-	sleep(Duration::from_secs(time_to_wait)).await;
 
 	Ok(report_content::v3::Response {})
 }
+
+/// in the following order:
+///
+/// check if the room ID from the URI matches the PDU's room ID
+/// check if reporting user is in the reporting room
+/// check if score is in valid range
+/// check if report reasoning is less than or equal to 750 characters
+fn is_report_valid(
+	event_id: &EventId, room_id: &RoomId, sender_user: &UserId, reason: &Option<String>, score: Option<ruma::Int>,
+	pdu: &std::sync::Arc<PduEvent>,
+) -> Result<bool> {
+	debug_info!("Checking if report from user {sender_user} for event {event_id} in room {room_id} is valid");
+
+	if room_id != pdu.room_id {
+		return Err(Error::BadRequest(
+			ErrorKind::NotFound,
+			"Event ID does not belong to the reported room",
+		));
+	}
+
+	if services()
+		.rooms
+		.state_cache
+		.room_members(&pdu.room_id)
+		.filter_map(Result::ok)
+		.any(|user_id| user_id != *sender_user)
+	{
+		return Err(Error::BadRequest(
+			ErrorKind::NotFound,
+			"You are not in the room you are reporting.",
+		));
+	}
+
+	if let Some(true) = score.map(|s| s > int!(0) || s < int!(-100)) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Invalid score, must be within 0 to -100",
+		));
+	};
+
+	if let Some(true) = reason.clone().map(|s| s.len() >= 750) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Reason too long, should be 750 characters or fewer",
+		));
+	};
+
+	Ok(true)
+}
+
+/// even though this is kinda security by obscurity, let's still make a small
+/// random delay sending a successful response per spec suggestion regarding
+/// enumerating for potential events existing in our server.
+async fn delay_response() -> Result<()> {
+	let time_to_wait = rand::thread_rng().gen_range(8..21);
+	debug_info!("Got successful /report request, waiting {time_to_wait} seconds before sending successful response.");
+	sleep(Duration::from_secs(time_to_wait)).await;
+
+	Ok(())
+}

src/api/client_server/room.rs

@@ -21,13 +21,31 @@ use ruma::{
 		StateEventType, TimelineEventType,
 	},
 	int,
-	serde::JsonObject,
+	serde::{JsonObject, Raw},
-	CanonicalJsonObject, CanonicalJsonValue, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId,
+	CanonicalJsonObject, Int, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomVersionId,
 };
 use serde_json::{json, value::to_raw_value};
-use tracing::{debug, error, info, warn};
+use tracing::{error, info, warn};
 
-use crate::{api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma};
+use crate::{
+	api::client_server::invite_helper,
+	debug_info, debug_warn,
+	service::{appservice::RegistrationInfo, pdu::PduBuilder},
+	services, Error, Result, Ruma,
+};
+
+/// Recommended transferable state events list from the spec
+const TRANSFERABLE_STATE_EVENTS: &[StateEventType; 9] = &[
+	StateEventType::RoomServerAcl,
+	StateEventType::RoomEncryption,
+	StateEventType::RoomName,
+	StateEventType::RoomAvatar,
+	StateEventType::RoomTopic,
+	StateEventType::RoomGuestAccess,
+	StateEventType::RoomHistoryVisibility,
+	StateEventType::RoomJoinRules,
+	StateEventType::RoomPowerLevels,
+];
 
 /// # `POST /_matrix/client/v3/createRoom`
 ///
@@ -57,55 +75,11 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		return Err(Error::BadRequest(ErrorKind::forbidden(), "Room creation has been disabled."));
 	}
 
-	let room_id: OwnedRoomId;
+	let room_id: OwnedRoomId = if let Some(custom_room_id) = &body.room_id {
-
+		custom_room_id_check(custom_room_id)?
-	// checks if the user specified an explicit (custom) room_id to be created with
-	// in request body. falls back to normal generated room ID if not specified.
-	if let Some(CanonicalJsonValue::Object(json_body)) = &body.json_body {
-		match json_body.get("room_id") {
-			Some(custom_room_id) => {
-				let custom_room_id_s = custom_room_id.to_string();
-
-				// do some checks on the custom room ID similar to room aliases
-				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.",
-					));
-				} else if custom_room_id_s.contains(char::is_whitespace) {
-					return Err(Error::BadRequest(
-						ErrorKind::InvalidParam,
-						"Custom room ID contained spaces which is not valid.",
-					));
-				} else if custom_room_id_s.len() > 255 {
-					return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
-				}
-
-				// apply forbidden room alias checks to custom room IDs too
-				if services()
-					.globals
-					.forbidden_alias_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();
-				debug!("Full room ID: {}", full_room_id);
-
-				room_id = RoomId::parse(full_room_id).map_err(|e| {
-					info!("User attempted to create room with custom room ID but failed parsing: {}", e);
-					Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID could not be parsed")
-				})?;
-			},
-			None => room_id = RoomId::new(services().globals.server_name()),
-		}
 	} else {
-		room_id = RoomId::new(services().globals.server_name());
+		RoomId::new(&services().globals.config.server_name)
-	}
+	};
 
 	// check if room ID doesn't already exist instead of erroring on auth check
 	if services().rooms.short.get_shortroomid(&room_id)?.is_some() {
@@ -128,74 +102,11 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 	);
 	let state_lock = mutex_state.lock().await;
 
-	let alias: Option<OwnedRoomAliasId> = body
+	let alias: Option<OwnedRoomAliasId> = if let Some(alias) = &body.room_alias_name {
-		.room_alias_name
+		Some(room_alias_check(alias, &body.appservice_info).await?)
-		.as_ref()
+	} else {
-		.map_or(Ok(None), |localpart| {
+		None
-			// 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.",
-				));
-			} else if localpart.contains(char::is_whitespace) {
-				return Err(Error::BadRequest(
-					ErrorKind::InvalidParam,
-					"Room alias contained spaces which is not a valid room alias.",
-				));
-			} else if localpart.len() > 255 {
-				// there is nothing spec-wise saying to check the limit of this,
-				// however absurdly long room aliases are guaranteed to be unreadable or done
-				// maliciously. there is no reason a room alias should even exceed 100
-				// characters as is. generally in spec, 255 is matrix's fav number
-				return Err(Error::BadRequest(
-					ErrorKind::InvalidParam,
-					"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
-				));
-			} else if localpart.contains('"') {
-				return Err(Error::BadRequest(
-					ErrorKind::InvalidParam,
-					"Room alias contained `\"` which is not allowed.",
-				));
-			}
-
-			// check if room alias is forbidden
-			if services()
-				.globals
-				.forbidden_alias_names()
-				.is_match(localpart)
-			{
-				return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
-			}
-
-			let alias =
-				RoomAliasId::parse(format!("#{}:{}", localpart, services().globals.server_name())).map_err(|e| {
-					warn!("Failed to parse room alias for room ID {}: {e}", room_id);
-					Error::BadRequest(ErrorKind::InvalidParam, "Invalid room alias specified.")
-				})?;
-
-			if services()
-				.rooms
-				.alias
-				.resolve_local_alias(&alias)?
-				.is_some()
-			{
-				Err(Error::BadRequest(ErrorKind::RoomInUse, "Room alias already exists."))
-			} else {
-				Ok(Some(alias))
-			}
-		})?;
-
-	if let Some(ref alias) = alias {
-		if let Some(ref info) = body.appservice_info {
-			if !info.aliases.is_match(alias.as_str()) {
-				return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
-			}
-		} else if services().appservice.is_exclusive_alias(alias).await {
-			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
-		}
-	}
 
 	let room_version = match body.room_version.clone() {
 		Some(room_version) => {
@@ -283,7 +194,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 			};
 			let mut content = serde_json::from_str::<CanonicalJsonObject>(
 				to_raw_value(&content)
-					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?
+					.expect("we just created this as content was None")
 					.get(),
 			)
 			.unwrap();
@@ -291,23 +202,12 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 				"room_version".into(),
 				json!(room_version.as_str())
 					.try_into()
-					.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"))?,
+					.expect("we just created this as content was None"),
 			);
 			content
 		},
 	};
 
-	// Validate creation content
-	let de_result = serde_json::from_str::<CanonicalJsonObject>(
-		to_raw_value(&content)
-			.expect("Invalid creation content")
-			.get(),
-	);
-
-	if de_result.is_err() {
-		return Err(Error::BadRequest(ErrorKind::BadJson, "Invalid creation content"));
-	}
-
 	// 1. The room create event
 	services()
 		.rooms
@@ -371,39 +271,8 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		}
 	}
 
-	let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent {
+	let power_levels_content =
-		users,
+		default_power_levels_content(&body.power_level_content_override, &body.visibility, users)?;
-		..Default::default()
-	})
-	.expect("event is valid, we just created it");
-
-	// secure proper defaults of sensitive/dangerous permissions that moderators
-	// (power level 50) should not have easy access to
-	power_levels_content["events"]["m.room.power_levels"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.server_acl"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.tombstone"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.encryption"] = serde_json::to_value(100).expect("100 is valid Value");
-	power_levels_content["events"]["m.room.history_visibility"] =
-		serde_json::to_value(100).expect("100 is valid Value");
-
-	// synapse does this too. clients do not expose these permissions. it prevents
-	// default users from calling public rooms, for obvious reasons.
-	if body.visibility == room::Visibility::Public {
-		power_levels_content["events"]["m.call.invite"] = serde_json::to_value(50).expect("50 is valid Value");
-		power_levels_content["events"]["org.matrix.msc3401.call"] =
-			serde_json::to_value(50).expect("50 is valid Value");
-		power_levels_content["events"]["org.matrix.msc3401.call.member"] =
-			serde_json::to_value(50).expect("50 is valid Value");
-	}
-
-	if let Some(power_level_content_override) = &body.power_level_content_override {
-		let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
-			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;
-
-		for (key, value) in json {
-			power_levels_content[key] = value;
-		}
-	}
 
 	services()
 		.rooms
@@ -519,6 +388,17 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 			Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event.")
 		})?;
 
+		debug_warn!("initial state event: {event:?}");
+
+		// client/appservice workaround: if a user sends an initial_state event with a
+		// state event in there with the content of literally `{}` (not null or empty
+		// string), let's just skip it over and warn.
+		if pdu_builder.content.get().eq("{}") {
+			info!("skipping empty initial state event with content of `{{}}`: {event:?}");
+			debug_warn!("content: {}", pdu_builder.content.get());
+			continue;
+		}
+
 		// Implicit state key defaults to ""
 		pdu_builder.state_key.get_or_insert_with(String::new);
 
@@ -592,7 +472,7 @@ pub(crate) async fn create_room_route(body: Ruma<create_room::v3::Request>) -> R
 		services().rooms.directory.set_public(&room_id)?;
 	}
 
-	info!("{} created a room", sender_user);
+	info!("{sender_user} created a room with room ID {room_id}");
 
 	Ok(create_room::v3::Response::new(room_id))
 }
@@ -811,13 +691,13 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 	);
 
 	// Validate creation event content
-	let de_result = serde_json::from_str::<CanonicalJsonObject>(
+	if serde_json::from_str::<CanonicalJsonObject>(
 		to_raw_value(&create_event_content)
 			.expect("Error forming creation event")
 			.get(),
-	);
+	)
-
+	.is_err()
-	if de_result.is_err() {
+	{
 		return Err(Error::BadRequest(ErrorKind::BadJson, "Error forming creation event"));
 	}
 
@@ -866,25 +746,12 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 		)
 		.await?;
 
-	// Recommended transferable state events list from the specs
-	let transferable_state_events = vec![
-		StateEventType::RoomServerAcl,
-		StateEventType::RoomEncryption,
-		StateEventType::RoomName,
-		StateEventType::RoomAvatar,
-		StateEventType::RoomTopic,
-		StateEventType::RoomGuestAccess,
-		StateEventType::RoomHistoryVisibility,
-		StateEventType::RoomJoinRules,
-		StateEventType::RoomPowerLevels,
-	];
-
 	// Replicate transferable state events to the new room
-	for event_type in transferable_state_events {
+	for event_type in TRANSFERABLE_STATE_EVENTS {
 		let event_content = match services()
 			.rooms
 			.state_accessor
-			.room_state_get(&body.room_id, &event_type, "")?
+			.room_state_get(&body.room_id, event_type, "")?
 		{
 			Some(v) => v.content.clone(),
 			None => continue, // Skipping missing events.
@@ -934,7 +801,15 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 	.map_err(|_| Error::bad_database("Invalid room event in database."))?;
 
 	// Setting events_default and invite to the greater of 50 and users_default + 1
-	let new_level = max(int!(50), power_levels_event_content.users_default + int!(1));
+	let new_level = max(
+		int!(50),
+		power_levels_event_content
+			.users_default
+			.checked_add(int!(1))
+			.ok_or_else(|| {
+				Error::BadRequest(ErrorKind::BadJson, "users_default power levels event content is not valid")
+			})?,
+	);
 	power_levels_event_content.events_default = new_level;
 	power_levels_event_content.invite = new_level;
 
@@ -964,3 +839,154 @@ pub(crate) async fn upgrade_room_route(body: Ruma<upgrade_room::v3::Request>) ->
 		replacement_room,
 	})
 }
+
+/// creates the power_levels_content for the PDU builder
+fn default_power_levels_content(
+	power_level_content_override: &Option<Raw<RoomPowerLevelsEventContent>>, visibility: &room::Visibility,
+	users: BTreeMap<OwnedUserId, Int>,
+) -> Result<serde_json::Value> {
+	let mut power_levels_content = serde_json::to_value(RoomPowerLevelsEventContent {
+		users,
+		..Default::default()
+	})
+	.expect("event is valid, we just created it");
+
+	// secure proper defaults of sensitive/dangerous permissions that moderators
+	// (power level 50) should not have easy access to
+	power_levels_content["events"]["m.room.power_levels"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.server_acl"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.tombstone"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.encryption"] = serde_json::to_value(100).expect("100 is valid Value");
+	power_levels_content["events"]["m.room.history_visibility"] =
+		serde_json::to_value(100).expect("100 is valid Value");
+
+	// synapse does this too. clients do not expose these permissions. it prevents
+	// default users from calling public rooms, for obvious reasons.
+	if *visibility == room::Visibility::Public {
+		power_levels_content["events"]["m.call.invite"] = serde_json::to_value(50).expect("50 is valid Value");
+		power_levels_content["events"]["org.matrix.msc3401.call"] =
+			serde_json::to_value(50).expect("50 is valid Value");
+		power_levels_content["events"]["org.matrix.msc3401.call.member"] =
+			serde_json::to_value(50).expect("50 is valid Value");
+	}
+
+	if let Some(power_level_content_override) = power_level_content_override {
+		let json: JsonObject = serde_json::from_str(power_level_content_override.json().get())
+			.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid power_level_content_override."))?;
+
+		for (key, value) in json {
+			power_levels_content[key] = value;
+		}
+	}
+
+	Ok(power_levels_content)
+}
+
+/// if a room is being created with a room alias, run our checks
+async fn room_alias_check(
+	room_alias_name: &String, appservice_info: &Option<RegistrationInfo>,
+) -> Result<OwnedRoomAliasId> {
+	// Basic checks on the room alias validity
+	if room_alias_name.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.",
+		));
+	} else if room_alias_name.contains(char::is_whitespace) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Room alias contained spaces which is not a valid room alias.",
+		));
+	} else if room_alias_name.len() > 255 {
+		// there is nothing spec-wise saying to check the limit of this,
+		// however absurdly long room aliases are guaranteed to be unreadable or done
+		// maliciously. there is no reason a room alias should even exceed 100
+		// characters as is. generally in spec, 255 is matrix's fav number
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Room alias is excessively long, clients may not be able to handle this. Please shorten it.",
+		));
+	} else if room_alias_name.contains('"') {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Room alias contained `\"` which is not allowed.",
+		));
+	}
+
+	// check if room alias is forbidden
+	if services()
+		.globals
+		.forbidden_alias_names()
+		.is_match(room_alias_name)
+	{
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Room alias name is forbidden."));
+	}
+
+	let full_room_alias = RoomAliasId::parse(format!("#{}:{}", room_alias_name, services().globals.config.server_name))
+		.map_err(|e| {
+			info!("Failed to parse room alias {room_alias_name}: {e}");
+			Error::BadRequest(ErrorKind::InvalidParam, "Invalid room alias specified.")
+		})?;
+
+	if services()
+		.rooms
+		.alias
+		.resolve_local_alias(&full_room_alias)?
+		.is_some()
+	{
+		return Err(Error::BadRequest(ErrorKind::RoomInUse, "Room alias already exists."));
+	}
+
+	if let Some(ref info) = appservice_info {
+		if !info.aliases.is_match(full_room_alias.as_str()) {
+			return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias is not in namespace."));
+		}
+	} else if services()
+		.appservice
+		.is_exclusive_alias(&full_room_alias)
+		.await
+	{
+		return Err(Error::BadRequest(ErrorKind::Exclusive, "Room alias reserved by appservice."));
+	}
+
+	debug_info!("Full room alias: {full_room_alias}");
+
+	Ok(full_room_alias)
+}
+
+/// if a room is being created with a custom room ID, run our checks against it
+fn custom_room_id_check(custom_room_id: &String) -> Result<OwnedRoomId> {
+	// apply forbidden room alias checks to custom room IDs too
+	if services()
+		.globals
+		.forbidden_alias_names()
+		.is_match(custom_room_id)
+	{
+		return Err(Error::BadRequest(ErrorKind::Unknown, "Custom room ID is forbidden."));
+	}
+
+	if custom_room_id.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.",
+		));
+	} else if custom_room_id.contains(char::is_whitespace) {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Custom room ID contained spaces which is not valid.",
+		));
+	} else if custom_room_id.len() > 255 {
+		return Err(Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID is too long."));
+	}
+
+	let full_room_id = format!("!{}:{}", custom_room_id, services().globals.config.server_name);
+
+	debug_info!("Full custom room ID: {full_room_id}");
+
+	RoomId::parse(full_room_id).map_err(|e| {
+		info!("User attempted to create room with custom room ID {custom_room_id} but failed parsing: {e}");
+		Error::BadRequest(ErrorKind::InvalidParam, "Custom room ID could not be parsed")
+	})
+}

src/api/client_server/search.rs

@@ -10,7 +10,7 @@ use ruma::{
 	},
 	events::AnyStateEvent,
 	serde::Raw,
-	OwnedRoomId,
+	uint, OwnedRoomId,
 };
 use tracing::debug;
 
@@ -39,7 +39,12 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 	});
 
 	// Use limit or else 10, with maximum 100
-	let limit = filter.limit.map_or(10, u64::from).min(100) as usize;
+	let limit: usize = filter
+		.limit
+		.unwrap_or_else(|| uint!(10))
+		.try_into()
+		.unwrap_or(10)
+		.min(100);
 
 	let mut room_states: BTreeMap<OwnedRoomId, Vec<Raw<AnyStateEvent>>> = BTreeMap::new();
 
@@ -106,14 +111,16 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 		}
 	}
 
-	let skip = match body.next_batch.as_ref().map(|s| s.parse()) {
+	let skip: usize = match body.next_batch.as_ref().map(|s| s.parse()) {
 		Some(Ok(s)) => s,
 		Some(Err(_)) => return Err(Error::BadRequest(ErrorKind::InvalidParam, "Invalid next_batch token.")),
 		None => 0, // Default to the start
 	};
 
 	let mut results = Vec::new();
-	for _ in 0..skip + limit {
+	let next_batch: usize = skip.saturating_add(limit);
+
+	for _ in 0..next_batch {
 		if let Some(s) = searches
 			.iter_mut()
 			.map(|s| (s.peek().cloned(), s))
@@ -162,12 +169,12 @@ pub(crate) async fn search_events_route(body: Ruma<search_events::v3::Request>)
 	let next_batch = if results.len() < limit {
 		None
 	} else {
-		Some((skip + limit).to_string())
+		Some(next_batch.to_string())
 	};
 
 	Ok(search_events::v3::Response::new(ResultCategories {
 		room_events: ResultRoomEvents {
-			count: Some((results.len() as u32).into()),
+			count: Some(results.len().try_into().unwrap_or_else(|_| uint!(0))),
 			groups: BTreeMap::new(), // TODO
 			next_batch,
 			results,

src/api/client_server/space.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use ruma::{
 	api::client::{error::ErrorKind, space::get_hierarchy},
-	UInt,
+	uint, UInt,
 };
 
 use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Ruma};
@@ -14,10 +14,12 @@ use crate::{service::rooms::spaces::PagnationToken, services, Error, Result, Rum
 pub(crate) async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>) -> Result<get_hierarchy::v1::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-	let limit = body
+	let limit: usize = body
 		.limit
-		.unwrap_or_else(|| UInt::from(10_u32))
+		.unwrap_or_else(|| uint!(10))
-		.min(UInt::from(100_u32));
+		.try_into()
+		.unwrap_or(10)
+		.min(100);
 
 	let max_depth = body
 		.max_depth
@@ -45,9 +47,9 @@ pub(crate) async fn get_hierarchy_route(body: Ruma<get_hierarchy::v1::Request>)
 		.get_client_hierarchy(
 			sender_user,
 			&body.room_id,
-			u64::from(limit) as usize,
+			limit,
-			key.map_or(0, |token| u64::from(token.skip) as usize),
+			key.map_or(0, |token| token.skip.try_into().unwrap_or(0)),
-			u64::from(max_depth) as usize,
+			max_depth.try_into().unwrap_or(3),
 			body.suggested_only,
 		)
 		.await

src/api/client_server/state.rs

@@ -20,7 +20,9 @@ use tracing::{error, log::warn};
 
 use crate::{
 	service::{self, pdu::PduBuilder},
-	services, Error, Result, Ruma, RumaResponse,
+	services,
+	utils::server_name::server_is_ours,
+	Error, Result, Ruma, RumaResponse,
 };
 
 /// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}/{stateKey}`
@@ -40,7 +42,7 @@ pub(crate) async fn send_state_event_for_key_route(
 		sender_user,
 		&body.room_id,
 		&body.event_type,
-		&body.body.body, // Yes, I hate it too
+		&body.body.body,
 		body.state_key.clone(),
 	)
 	.await?;
@@ -62,22 +64,7 @@ pub(crate) async fn send_state_event_for_key_route(
 pub(crate) async fn send_state_event_for_empty_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<RumaResponse<send_state_event::v3::Response>> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	send_state_event_for_key_route(body).await.map(RumaResponse)
-
-	let event_id = send_state_event_for_key_helper(
-		sender_user,
-		&body.room_id,
-		&body.event_type.to_string().into(),
-		&body.body.body,
-		body.state_key.clone(),
-	)
-	.await?;
-
-	let event_id = (*event_id).to_owned();
-	Ok(send_state_event::v3::Response {
-		event_id,
-	}
-	.into())
 }
 
 /// # `GET /_matrix/client/v3/rooms/{roomid}/state`
@@ -180,123 +167,13 @@ pub(crate) async fn get_state_events_for_key_route(
 pub(crate) 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");
+	get_state_events_for_key_route(body).await.map(RumaResponse)
-
-	if !services()
-		.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()
-		.rooms
-		.state_accessor
-		.room_state_get(&body.room_id, &body.event_type, "")?
-		.ok_or_else(|| {
-			warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
-			Error::BadRequest(ErrorKind::NotFound, "State event not found.")
-		})?;
-
-	if body
-		.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| {
-				error!("Invalid room state event in database: {}", e);
-				Error::bad_database("Invalid room state event in database")
-			})?,
-		}
-		.into())
-	} else {
-		Ok(get_state_events_for_key::v3::Response {
-			content: Some(serde_json::from_str(event.content.get()).map_err(|e| {
-				error!("Invalid room state event content in database: {}", e);
-				Error::bad_database("Invalid room state event content in database")
-			})?),
-			event: None,
-		}
-		.into())
-	}
 }
 
 async fn send_state_event_for_key_helper(
 	sender: &UserId, room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>, state_key: String,
 ) -> Result<Arc<EventId>> {
-	match *event_type {
+	allowed_to_send_state_event(room_id, event_type, json).await?;
-		// Forbid m.room.encryption if encryption is disabled
-		StateEventType::RoomEncryption => {
-			if !services().globals.allow_encryption() {
-				return Err(Error::BadRequest(ErrorKind::forbidden(), "Encryption has been disabled"));
-			}
-		},
-		// admin room is a sensitive room, it should not ever be made public
-		StateEventType::RoomJoinRules => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room()? {
-				if admin_room_id == room_id {
-					if let Ok(join_rule) = serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get()) {
-						if join_rule.join_rule == JoinRule::Public {
-							return Err(Error::BadRequest(
-								ErrorKind::forbidden(),
-								"Admin room is not allowed to be public.",
-							));
-						}
-					}
-				}
-			}
-		},
-		// admin room is a sensitive room, it should not ever be made world readable
-		StateEventType::RoomHistoryVisibility => {
-			if let Some(admin_room_id) = service::admin::Service::get_admin_room()? {
-				if admin_room_id == room_id {
-					if let Ok(visibility_content) =
-						serde_json::from_str::<RoomHistoryVisibilityEventContent>(json.json().get())
-					{
-						if visibility_content.history_visibility == HistoryVisibility::WorldReadable {
-							return Err(Error::BadRequest(
-								ErrorKind::forbidden(),
-								"Admin room is not allowed to be made world readable (public room history).",
-							));
-						}
-					}
-				}
-			}
-		},
-		// TODO: allow alias if it previously existed
-		StateEventType::RoomCanonicalAlias => {
-			if let Ok(canonical_alias) = serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get()) {
-				let mut aliases = canonical_alias.alt_aliases.clone();
-
-				if let Some(alias) = canonical_alias.alias {
-					aliases.push(alias);
-				}
-
-				for alias in aliases {
-					if alias.server_name() != services().globals.server_name()
-						|| services()
-                        .rooms
-                        .alias
-                        .resolve_local_alias(&alias)?
-                        .filter(|room| room == room_id) // Make sure it's the right room
-                        .is_none()
-					{
-						return Err(Error::BadRequest(
-							ErrorKind::forbidden(),
-							"You are only allowed to send canonical_alias events when its aliases already exist",
-						));
-					}
-				}
-			}
-		},
-		_ => {},
-	}
 
 	let mutex_state = Arc::clone(
 		services()
@@ -328,3 +205,76 @@ async fn send_state_event_for_key_helper(
 
 	Ok(event_id)
 }
+
+async fn allowed_to_send_state_event(
+	room_id: &RoomId, event_type: &StateEventType, json: &Raw<AnyStateEventContent>,
+) -> Result<()> {
+	match event_type {
+		// Forbid m.room.encryption if encryption is disabled
+		StateEventType::RoomEncryption => {
+			if !services().globals.allow_encryption() {
+				return Err(Error::BadRequest(ErrorKind::forbidden(), "Encryption has been disabled"));
+			}
+		},
+		// admin room is a sensitive room, it should not ever be made public
+		StateEventType::RoomJoinRules => {
+			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
+				if admin_room_id == room_id {
+					if let Ok(join_rule) = serde_json::from_str::<RoomJoinRulesEventContent>(json.json().get()) {
+						if join_rule.join_rule == JoinRule::Public {
+							return Err(Error::BadRequest(
+								ErrorKind::forbidden(),
+								"Admin room is not allowed to be public.",
+							));
+						}
+					}
+				}
+			}
+		},
+		// admin room is a sensitive room, it should not ever be made world readable
+		StateEventType::RoomHistoryVisibility => {
+			if let Some(admin_room_id) = service::admin::Service::get_admin_room().await? {
+				if admin_room_id == room_id {
+					if let Ok(visibility_content) =
+						serde_json::from_str::<RoomHistoryVisibilityEventContent>(json.json().get())
+					{
+						if visibility_content.history_visibility == HistoryVisibility::WorldReadable {
+							return Err(Error::BadRequest(
+								ErrorKind::forbidden(),
+								"Admin room is not allowed to be made world readable (public room history).",
+							));
+						}
+					}
+				}
+			}
+		},
+		// TODO: allow alias if it previously existed
+		StateEventType::RoomCanonicalAlias => {
+			if let Ok(canonical_alias) = serde_json::from_str::<RoomCanonicalAliasEventContent>(json.json().get()) {
+				let mut aliases = canonical_alias.alt_aliases.clone();
+
+				if let Some(alias) = canonical_alias.alias {
+					aliases.push(alias);
+				}
+
+				for alias in aliases {
+					if !server_is_ours(alias.server_name())
+						|| services()
+                           .rooms
+                           .alias
+                           .resolve_local_alias(&alias)?
+                           .filter(|room| room == room_id) // Make sure it's the right room
+                           .is_none()
+					{
+						return Err(Error::BadRequest(
+							ErrorKind::forbidden(),
+							"You are only allowed to send canonical_alias events when its aliases already exist",
+						));
+					}
+				}
+			}
+		},
+		_ => (),
+	}
+	Ok(())
+}

src/api/client_server/sync.rs

@@ -28,7 +28,7 @@ use ruma::{
 	uint, DeviceId, EventId, OwnedDeviceId, OwnedUserId, RoomId, UInt, UserId,
 };
 use tokio::sync::watch::Sender;
-use tracing::{debug, error};
+use tracing::{debug, error, Instrument as _, Span};
 
 use crate::{
 	service::{pdu::EventHash, rooms::timeline::PduCount},
@@ -271,164 +271,17 @@ async fn sync_helper(
 		.rooms_left(&sender_user)
 		.collect();
 	for result in all_left_rooms {
-		let (room_id, _) = result?;
+		handle_left_room(
-
+			since,
-		{
+			&result?.0,
-			// Get and drop the lock to wait for remaining operations to finish
+			&sender_user,
-			let mutex_insert = Arc::clone(
+			&mut left_rooms,
-				services()
+			&next_batch_string,
-					.globals
+			full_state,
-					.roomid_mutex_insert
+			lazy_load_enabled,
-					.write()
+		)
-					.await
+		.instrument(Span::current())
-					.entry(room_id.clone())
+		.await?;
-					.or_default(),
-			);
-			let insert_lock = mutex_insert.lock().await;
-			drop(insert_lock);
-		};
-
-		let left_count = services()
-			.rooms
-			.state_cache
-			.get_left_count(&room_id, &sender_user)?;
-
-		// Left before last sync
-		if Some(since) >= left_count {
-			continue;
-		}
-
-		if !services().rooms.metadata.exists(&room_id)? {
-			// This is just a rejected invite, not a room we know
-			// Insert a leave event anyways
-			let event = PduEvent {
-				event_id: EventId::new(services().globals.server_name()).into(),
-				sender: sender_user.clone(),
-				origin: None,
-				origin_server_ts: utils::millis_since_unix_epoch()
-					.try_into()
-					.expect("Timestamp is valid js_int value"),
-				kind: TimelineEventType::RoomMember,
-				content: serde_json::from_str(r#"{"membership":"leave"}"#).expect("this is valid JSON"),
-				state_key: Some(sender_user.to_string()),
-				unsigned: None,
-				// The following keys are dropped on conversion
-				room_id: room_id.clone(),
-				prev_events: vec![],
-				depth: uint!(1),
-				auth_events: vec![],
-				redacts: None,
-				hashes: EventHash {
-					sha256: String::new(),
-				},
-				signatures: None,
-			};
-
-			left_rooms.insert(
-				room_id,
-				LeftRoom {
-					account_data: RoomAccountData {
-						events: Vec::new(),
-					},
-					timeline: Timeline {
-						limited: false,
-						prev_batch: Some(next_batch_string.clone()),
-						events: Vec::new(),
-					},
-					state: State {
-						events: vec![event.to_sync_state_event()],
-					},
-				},
-			);
-			continue;
-		}
-
-		let mut left_state_events = Vec::new();
-
-		let since_shortstatehash = services()
-			.rooms
-			.user
-			.get_token_shortstatehash(&room_id, since)?;
-
-		let since_state_ids = match since_shortstatehash {
-			Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
-			None => HashMap::new(),
-		};
-
-		let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id(
-			&room_id,
-			&StateEventType::RoomMember,
-			sender_user.as_str(),
-		)?
-		else {
-			error!("Left room but no left state event");
-			continue;
-		};
-
-		let Some(left_shortstatehash) = services()
-			.rooms
-			.state_accessor
-			.pdu_shortstatehash(&left_event_id)?
-		else {
-			error!("Leave event has no state");
-			continue;
-		};
-
-		let mut left_state_ids = services()
-			.rooms
-			.state_accessor
-			.state_full_ids(left_shortstatehash)
-			.await?;
-
-		let leave_shortstatekey = services()
-			.rooms
-			.short
-			.get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
-
-		left_state_ids.insert(leave_shortstatekey, left_event_id);
-
-		let mut i = 0;
-		for (key, id) in left_state_ids {
-			if full_state || since_state_ids.get(&key) != Some(&id) {
-				let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?;
-
-				if !lazy_load_enabled
-                    || event_type != StateEventType::RoomMember
-                    || full_state
-                    // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
-                    || (cfg!(feature = "element_hacks") && *sender_user == state_key)
-				{
-					let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
-						error!("Pdu in state not found: {}", id);
-						continue;
-					};
-
-					left_state_events.push(pdu.to_sync_state_event());
-
-					i += 1;
-					if i % 100 == 0 {
-						tokio::task::yield_now().await;
-					}
-				}
-			}
-		}
-
-		left_rooms.insert(
-			room_id.clone(),
-			LeftRoom {
-				account_data: RoomAccountData {
-					events: Vec::new(),
-				},
-				timeline: Timeline {
-					limited: false,
-					prev_batch: Some(next_batch_string.clone()),
-					events: Vec::new(),
-				},
-				state: State {
-					events: left_state_events,
-				},
-			},
-		);
 	}
 
 	let mut invited_rooms = BTreeMap::new();
@@ -567,6 +420,170 @@ async fn sync_helper(
 	}
 }
 
+#[tracing::instrument(skip_all, fields(user_id = %sender_user, room_id = %room_id))]
+async fn handle_left_room(
+	since: u64, room_id: &RoomId, sender_user: &UserId, left_rooms: &mut BTreeMap<ruma::OwnedRoomId, LeftRoom>,
+	next_batch_string: &str, full_state: bool, lazy_load_enabled: bool,
+) -> Result<()> {
+	{
+		// Get and drop the lock to wait for remaining operations to finish
+		let mutex_insert = Arc::clone(
+			services()
+				.globals
+				.roomid_mutex_insert
+				.write()
+				.await
+				.entry(room_id.to_owned())
+				.or_default(),
+		);
+		let insert_lock = mutex_insert.lock().await;
+		drop(insert_lock);
+	};
+
+	let left_count = services()
+		.rooms
+		.state_cache
+		.get_left_count(room_id, sender_user)?;
+
+	// Left before last sync
+	if Some(since) >= left_count {
+		return Ok(());
+	}
+
+	if !services().rooms.metadata.exists(room_id)? {
+		// This is just a rejected invite, not a room we know
+		// Insert a leave event anyways
+		let event = PduEvent {
+			event_id: EventId::new(services().globals.server_name()).into(),
+			sender: sender_user.to_owned(),
+			origin: None,
+			origin_server_ts: utils::millis_since_unix_epoch()
+				.try_into()
+				.expect("Timestamp is valid js_int value"),
+			kind: TimelineEventType::RoomMember,
+			content: serde_json::from_str(r#"{"membership":"leave"}"#).expect("this is valid JSON"),
+			state_key: Some(sender_user.to_string()),
+			unsigned: None,
+			// The following keys are dropped on conversion
+			room_id: room_id.to_owned(),
+			prev_events: vec![],
+			depth: uint!(1),
+			auth_events: vec![],
+			redacts: None,
+			hashes: EventHash {
+				sha256: String::new(),
+			},
+			signatures: None,
+		};
+
+		left_rooms.insert(
+			room_id.to_owned(),
+			LeftRoom {
+				account_data: RoomAccountData {
+					events: Vec::new(),
+				},
+				timeline: Timeline {
+					limited: false,
+					prev_batch: Some(next_batch_string.to_owned()),
+					events: Vec::new(),
+				},
+				state: State {
+					events: vec![event.to_sync_state_event()],
+				},
+			},
+		);
+		return Ok(());
+	}
+
+	let mut left_state_events = Vec::new();
+
+	let since_shortstatehash = services()
+		.rooms
+		.user
+		.get_token_shortstatehash(room_id, since)?;
+
+	let since_state_ids = match since_shortstatehash {
+		Some(s) => services().rooms.state_accessor.state_full_ids(s).await?,
+		None => HashMap::new(),
+	};
+
+	let Some(left_event_id) = services().rooms.state_accessor.room_state_get_id(
+		room_id,
+		&StateEventType::RoomMember,
+		sender_user.as_str(),
+	)?
+	else {
+		error!("Left room but no left state event");
+		return Ok(());
+	};
+
+	let Some(left_shortstatehash) = services()
+		.rooms
+		.state_accessor
+		.pdu_shortstatehash(&left_event_id)?
+	else {
+		error!(event_id = %left_event_id, "Leave event has no state");
+		return Ok(());
+	};
+
+	let mut left_state_ids = services()
+		.rooms
+		.state_accessor
+		.state_full_ids(left_shortstatehash)
+		.await?;
+
+	let leave_shortstatekey = services()
+		.rooms
+		.short
+		.get_or_create_shortstatekey(&StateEventType::RoomMember, sender_user.as_str())?;
+
+	left_state_ids.insert(leave_shortstatekey, left_event_id);
+
+	let mut i: u8 = 0;
+	for (key, id) in left_state_ids {
+		if full_state || since_state_ids.get(&key) != Some(&id) {
+			let (event_type, state_key) = services().rooms.short.get_statekey_from_short(key)?;
+
+			if !lazy_load_enabled
+                    || event_type != StateEventType::RoomMember
+                    || full_state
+                    // TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
+                    || (cfg!(feature = "element_hacks") && *sender_user == state_key)
+			{
+				let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
+					error!("Pdu in state not found: {}", id);
+					continue;
+				};
+
+				left_state_events.push(pdu.to_sync_state_event());
+
+				i = i.wrapping_add(1);
+				if i % 100 == 0 {
+					tokio::task::yield_now().await;
+				}
+			}
+		}
+	}
+
+	left_rooms.insert(
+		room_id.to_owned(),
+		LeftRoom {
+			account_data: RoomAccountData {
+				events: Vec::new(),
+			},
+			timeline: Timeline {
+				limited: false,
+				prev_batch: Some(next_batch_string.to_owned()),
+				events: Vec::new(),
+			},
+			state: State {
+				events: left_state_events,
+			},
+		},
+	);
+	Ok(())
+}
+
 async fn process_presence_updates(
 	presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, since: u64, syncing_user: &OwnedUserId,
 ) -> Result<()> {
@@ -688,7 +705,7 @@ async fn load_joined_room(
 				// Recalculate heroes (first 5 members)
 				let mut heroes = Vec::new();
 
-				if joined_member_count + invited_member_count <= 5 {
+				if joined_member_count.saturating_add(invited_member_count) <= 5 {
 					// Go through all PDUs and for each member event, check if the user is still
 					// joined or invited until we have 5 or we reach the end
 
@@ -767,7 +784,7 @@ async fn load_joined_room(
 				let mut state_events = Vec::new();
 				let mut lazy_loaded = HashSet::new();
 
-				let mut i = 0;
+				let mut i: u8 = 0;
 				for (shortstatekey, id) in current_state_ids {
 					let (event_type, state_key) = services()
 						.rooms
@@ -781,7 +798,7 @@ async fn load_joined_room(
 						};
 						state_events.push(pdu);
 
-						i += 1;
+						i = i.wrapping_add(1);
 						if i % 100 == 0 {
 							tokio::task::yield_now().await;
 						}
@@ -802,7 +819,7 @@ async fn load_joined_room(
 						}
 						state_events.push(pdu);
 
-						i += 1;
+						i = i.wrapping_add(1);
 						if i % 100 == 0 {
 							tokio::task::yield_now().await;
 						}
@@ -1399,10 +1416,14 @@ pub(crate) async fn sync_events_v4_route(
 					.ranges
 					.into_iter()
 					.map(|mut r| {
-						r.0 =
+						r.0 = r.0.clamp(
-							r.0.clamp(uint!(0), UInt::from(all_joined_rooms.len() as u32 - 1));
+							uint!(0),
-						r.1 =
+							UInt::try_from(all_joined_rooms.len().saturating_sub(1)).unwrap_or(UInt::MAX),
-							r.1.clamp(r.0, UInt::from(all_joined_rooms.len() as u32 - 1));
+						);
+						r.1 = r.1.clamp(
+							r.0,
+							UInt::try_from(all_joined_rooms.len().saturating_sub(1)).unwrap_or(UInt::MAX),
+						);
 						let room_ids = all_joined_rooms[(u64::from(r.0) as usize)..=(u64::from(r.1) as usize)].to_vec();
 						new_known_rooms.extend(room_ids.iter().cloned());
 						for room_id in &room_ids {
@@ -1575,14 +1596,13 @@ pub(crate) async fn sync_events_v4_route(
 			.collect::<Vec<_>>();
 		let name = match heroes.len().cmp(&(1_usize)) {
 			Ordering::Greater => {
+				let firsts = heroes[1..]
+					.iter()
+					.map(|h| h.0.clone())
+					.collect::<Vec<_>>()
+					.join(", ");
 				let last = heroes[0].0.clone();
-				Some(
+				Some(format!("{firsts} and {last}"))
-					heroes[1..]
-						.iter()
-						.map(|h| h.0.clone())
-						.collect::<Vec<_>>()
-						.join(", ") + " and " + &last,
-				)
 			},
 			Ordering::Equal => Some(heroes[0].0.clone()),
 			Ordering::Less => None,

src/api/client_server/threads.rs

@@ -1,4 +1,7 @@
-use ruma::api::client::{error::ErrorKind, threads::get_threads};
+use ruma::{
+	api::client::{error::ErrorKind, threads::get_threads},
+	uint,
+};
 
 use crate::{services, Error, Result, Ruma};
 
@@ -9,7 +12,8 @@ pub(crate) async fn get_threads_route(body: Ruma<get_threads::v1::Request>) -> R
 	// Use limit or else 10, with maximum 100
 	let limit = body
 		.limit
-		.and_then(|l| l.try_into().ok())
+		.unwrap_or_else(|| uint!(10))
+		.try_into()
 		.unwrap_or(10)
 		.min(100);
 

src/api/client_server/to_device.rs

@@ -8,7 +8,7 @@ use ruma::{
 	to_device::DeviceIdOrAllDevices,
 };
 
-use crate::{services, Error, Result, Ruma};
+use crate::{services, utils::user_id::user_is_local, Error, Result, Ruma};
 
 /// # `PUT /_matrix/client/r0/sendToDevice/{eventType}/{txnId}`
 ///
@@ -30,7 +30,7 @@ pub(crate) async fn send_event_to_device_route(
 
 	for (target_user_id, map) in &body.messages {
 		for (target_device_id_maybe, event) in map {
-			if target_user_id.server_name() != services().globals.server_name() {
+			if !user_is_local(target_user_id) {
 				let mut map = BTreeMap::new();
 				map.insert(target_device_id_maybe.clone(), event.clone());
 				let mut messages = BTreeMap::new();

src/api/client_server/typing.rs

@@ -22,14 +22,30 @@ pub(crate) async fn create_typing_event_route(
 
 	if let Typing::Yes(duration) = body.state {
 		let duration = utils::clamp(
-			duration.as_millis() as u64,
+			duration.as_millis().try_into().unwrap_or(u64::MAX),
-			services().globals.config.typing_client_timeout_min_s * 1000,
+			services()
-			services().globals.config.typing_client_timeout_max_s * 1000,
+				.globals
+				.config
+				.typing_client_timeout_min_s
+				.checked_mul(1000)
+				.unwrap(),
+			services()
+				.globals
+				.config
+				.typing_client_timeout_max_s
+				.checked_mul(1000)
+				.unwrap(),
 		);
 		services()
 			.rooms
 			.typing
-			.typing_add(sender_user, &body.room_id, utils::millis_since_unix_epoch() + duration)
+			.typing_add(
+				sender_user,
+				&body.room_id,
+				utils::millis_since_unix_epoch()
+					.checked_add(duration)
+					.expect("user typing timeout should not get this high"),
+			)
 			.await?;
 	} else {
 		services()

src/api/client_server/unversioned.rs

@@ -10,7 +10,7 @@ use ruma::api::client::{
 	error::ErrorKind,
 };
 
-use crate::{services, Error, Result, Ruma};
+use crate::{services, utils::conduwuit_version, Error, Result, Ruma};
 
 /// # `GET /_matrix/client/versions`
 ///
@@ -142,14 +142,9 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 		},
 	};
 
-	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
-		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
-		None => env!("CARGO_PKG_VERSION").to_owned(),
-	};
-
 	Ok(Json(serde_json::json!({
 		"server": server_url,
-		"version": version,
+		"version": conduwuit_version(),
 	})))
 }
 
@@ -158,13 +153,8 @@ pub(crate) async fn syncv3_client_server_json() -> Result<impl IntoResponse> {
 /// Conduwuit-specific API to get the server version, results akin to
 /// `/_matrix/federation/v1/version`
 pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
-	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
-		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
-		None => env!("CARGO_PKG_VERSION").to_owned(),
-	};
-
 	Ok(Json(serde_json::json!({
 		"name": "Conduwuit",
-		"version": version,
+		"version": conduwuit_version(),
 	})))
 }

src/api/client_server/user_directory.rs

@@ -17,7 +17,7 @@ use crate::{services, Result, Ruma};
 /// and don't share a room with the sender
 pub(crate) async fn search_users_route(body: Ruma<search_users::v3::Request>) -> Result<search_users::v3::Response> {
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
-	let limit = u64::from(body.limit) as usize;
+	let limit = usize::try_from(body.limit).unwrap_or(10); // default limit is 10
 
 	let mut users = services().users.iter().filter_map(|user_id| {
 		// Filter out buggy users (they should not exist, but you never know...)

src/api/client_server/voip.rs

@@ -21,7 +21,9 @@ pub(crate) async fn turn_server_route(
 
 	let (username, password) = if !turn_secret.is_empty() {
 		let expiry = SecondsSinceUnixEpoch::from_system_time(
-			SystemTime::now() + Duration::from_secs(services().globals.turn_ttl()),
+			SystemTime::now()
+				.checked_add(Duration::from_secs(services().globals.turn_ttl()))
+				.expect("TURN TTL should not get this high"),
 		)
 		.expect("time is valid");
 

src/api/ruma_wrapper/axum.rs

@@ -26,7 +26,7 @@ use serde::Deserialize;
 use tracing::{debug, error, trace, warn};
 
 use super::{Ruma, RumaResponse};
-use crate::{service::appservice::RegistrationInfo, services, Error, Result};
+use crate::{debug_warn, service::appservice::RegistrationInfo, services, Error, Result};
 
 enum Token {
 	Appservice(Box<RegistrationInfo>),
@@ -317,8 +317,8 @@ where
 
 		trace!("{:?} {:?} {:?}", http_request.method(), http_request.uri(), json_body);
 		let body = T::try_from_http_request(http_request, &path_params).map_err(|e| {
-			warn!("try_from_http_request failed: {e:?}\nPath parameters: {path_params:?}",);
+			warn!("try_from_http_request failed: {e:?}",);
-			debug!("JSON body: {:?}", json_body);
+			debug_warn!("JSON body: {:?}", json_body);
 			Error::BadRequest(ErrorKind::BadJson, "Failed to deserialize request.")
 		})?;
 

src/api/server_server.rs

@@ -55,7 +55,9 @@ use crate::{
 	api::client_server::{self, claim_keys_helper, get_keys_helper},
 	debug_error,
 	service::pdu::{gen_event_id_canonical_json, PduBuilder},
-	services, utils, Error, PduEvent, Result, Ruma,
+	services,
+	utils::{self, server_name::server_is_ours, user_id::user_is_local},
+	Error, PduEvent, Result, Ruma,
 };
 
 /// # `GET /_matrix/federation/v1/version`
@@ -64,15 +66,10 @@ use crate::{
 pub(crate) async fn get_server_version_route(
 	_body: Ruma<get_server_version::v1::Request>,
 ) -> Result<get_server_version::v1::Response> {
-	let version = match option_env!("CONDUIT_VERSION_EXTRA") {
-		Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
-		None => env!("CARGO_PKG_VERSION").to_owned(),
-	};
-
 	Ok(get_server_version::v1::Response {
 		server: Some(get_server_version::v1::Server {
 			name: Some("Conduwuit".to_owned()),
-			version: Some(version),
+			version: Some(utils::conduwuit_version()),
 		}),
 	})
 }
@@ -104,7 +101,9 @@ pub(crate) async fn get_server_keys_route() -> Result<impl IntoResponse> {
 				old_verify_keys: BTreeMap::new(),
 				signatures: BTreeMap::new(),
 				valid_until_ts: MilliSecondsSinceUnixEpoch::from_system_time(
-					SystemTime::now() + Duration::from_secs(86400 * 7),
+					SystemTime::now()
+						.checked_add(Duration::from_secs(86400 * 7))
+						.expect("valid_until_ts should not get this high"),
 				)
 				.expect("time is valid"),
 			})
@@ -401,8 +400,13 @@ pub(crate) async fn send_transaction_message_route(
 					.is_joined(&typing.user_id, &typing.room_id)?
 				{
 					if typing.typing {
-						let timeout = utils::millis_since_unix_epoch()
+						let timeout = utils::millis_since_unix_epoch().saturating_add(
-							+ services().globals.config.typing_federation_timeout_s * 1000;
+							services()
+								.globals
+								.config
+								.typing_federation_timeout_s
+								.saturating_mul(1000),
+						);
 						services()
 							.rooms
 							.typing
@@ -665,7 +669,7 @@ pub(crate) async fn get_missing_events_route(
 			}
 
 			if body.earliest_events.contains(&queued_events[i]) {
-				i += 1;
+				i = i.saturating_add(1);
 				continue;
 			}
 
@@ -674,7 +678,7 @@ pub(crate) async fn get_missing_events_route(
 				&body.room_id,
 				&queued_events[i],
 			)? {
-				i += 1;
+				i = i.saturating_add(1);
 				continue;
 			}
 
@@ -691,7 +695,7 @@ pub(crate) async fn get_missing_events_route(
 			);
 			events.push(PduEvent::convert_to_outgoing_federation_event(pdu));
 		}
-		i += 1;
+		i = i.saturating_add(1);
 	}
 
 	Ok(get_missing_events::v1::Response {
@@ -978,7 +982,7 @@ pub(crate) async fn create_join_event_template_route(
 						.state_cache
 						.room_members(&body.room_id)
 						.filter_map(Result::ok)
-						.filter(|user| user.server_name() == services().globals.server_name())
+						.filter(|user| user_is_local(user))
 						.collect();
 
 					let mut auth_user = None;
@@ -1454,7 +1458,7 @@ async fn create_leave_event(sender_servername: &ServerName, room_id: &RoomId, pd
 		.state_cache
 		.room_servers(room_id)
 		.filter_map(Result::ok)
-		.filter(|server| &**server != services().globals.server_name());
+		.filter(|server| !server_is_ours(server));
 
 	services().sending.send_pdu_servers(servers, &pdu_id)?;
 
@@ -1649,7 +1653,7 @@ pub(crate) async fn create_invite_route(body: Ruma<create_invite::v2::Request>)
 ///
 /// Gets information on all devices of the user.
 pub(crate) async fn get_devices_route(body: Ruma<get_devices::v1::Request>) -> Result<get_devices::v1::Response> {
-	if body.user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&body.user_id) {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Tried to access user from other server.",
@@ -1755,7 +1759,7 @@ pub(crate) async fn get_profile_information_route(
 		));
 	}
 
-	if body.user_id.server_name() != services().globals.server_name() {
+	if !server_is_ours(body.user_id.server_name()) {
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"User does not belong to this server",
@@ -1794,11 +1798,7 @@ pub(crate) async fn get_profile_information_route(
 ///
 /// Gets devices and identity keys for the given users.
 pub(crate) async fn get_keys_route(body: Ruma<get_keys::v1::Request>) -> Result<get_keys::v1::Response> {
-	if body
+	if body.device_keys.iter().any(|(u, _)| !user_is_local(u)) {
-		.device_keys
-		.iter()
-		.any(|(u, _)| u.server_name() != services().globals.server_name())
-	{
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"User does not belong to this server.",
@@ -1824,11 +1824,7 @@ pub(crate) async fn get_keys_route(body: Ruma<get_keys::v1::Request>) -> Result<
 ///
 /// Claims one-time keys.
 pub(crate) async fn claim_keys_route(body: Ruma<claim_keys::v1::Request>) -> Result<claim_keys::v1::Response> {
-	if body
+	if body.one_time_keys.iter().any(|(u, _)| !user_is_local(u)) {
-		.one_time_keys
-		.iter()
-		.any(|(u, _)| u.server_name() != services().globals.server_name())
-	{
 		return Err(Error::BadRequest(
 			ErrorKind::InvalidParam,
 			"Tried to access user from other server.",

src/config/mod.rs

@@ -103,6 +103,10 @@ pub(crate) struct Config {
 	pub(crate) dns_tcp_fallback: bool,
 	#[serde(default = "true_fn")]
 	pub(crate) query_all_nameservers: bool,
+	#[serde(default)]
+	pub(crate) query_over_tcp_only: bool,
+	#[serde(default = "default_ip_lookup_strategy")]
+	pub(crate) ip_lookup_strategy: u8,
 
 	#[serde(default = "default_max_request_size")]
 	pub(crate) max_request_size: u32,
@@ -175,6 +179,12 @@ pub(crate) struct Config {
 	#[serde(default)]
 	#[cfg(feature = "perf_measurements")]
 	pub(crate) tracing_flame: bool,
+	#[serde(default = "default_tracing_flame_filter")]
+	#[cfg(feature = "perf_measurements")]
+	pub(crate) tracing_flame_filter: String,
+	#[serde(default = "default_tracing_flame_output_path")]
+	#[cfg(feature = "perf_measurements")]
+	pub(crate) tracing_flame_output_path: String,
 	#[serde(default)]
 	pub(crate) proxy: ProxyConfig,
 	pub(crate) jwt_secret: Option<String>,
@@ -208,6 +218,8 @@ pub(crate) struct Config {
 	pub(crate) rocksdb_log_time_to_roll: usize,
 	#[serde(default)]
 	pub(crate) rocksdb_optimize_for_spinning_disks: bool,
+	#[serde(default = "true_fn")]
+	pub(crate) rocksdb_direct_io: bool,
 	#[serde(default = "default_rocksdb_parallelism_threads")]
 	pub(crate) rocksdb_parallelism_threads: usize,
 	#[serde(default = "default_rocksdb_max_log_files")]
@@ -357,6 +369,7 @@ pub(crate) struct WellKnownConfig {
 
 const DEPRECATED_KEYS: &[&str] = &[
 	"cache_capacity",
+	"max_concurrent_requests",
 	"well_known_client",
 	"well_known_server",
 	"well_known_support_page",
@@ -371,22 +384,22 @@ impl Config {
 		let raw_config = if let Some(config_file_env) = Env::var("CONDUIT_CONFIG") {
 			Figment::new()
 				.merge(Toml::file(config_file_env).nested())
-				.merge(Env::prefixed("CONDUIT_").global())
+				.merge(Env::prefixed("CONDUIT_").global().split("__"))
-				.merge(Env::prefixed("CONDUWUIT_").global())
+				.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
 		} else if let Some(config_file_arg) = Env::var("CONDUWUIT_CONFIG") {
 			Figment::new()
 				.merge(Toml::file(config_file_arg).nested())
-				.merge(Env::prefixed("CONDUIT_").global())
+				.merge(Env::prefixed("CONDUIT_").global().split("__"))
-				.merge(Env::prefixed("CONDUWUIT_").global())
+				.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
 		} else if let Some(config_file_arg) = path {
 			Figment::new()
 				.merge(Toml::file(config_file_arg).nested())
-				.merge(Env::prefixed("CONDUIT_").global())
+				.merge(Env::prefixed("CONDUIT_").global().split("__"))
-				.merge(Env::prefixed("CONDUWUIT_").global())
+				.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
 		} else {
 			Figment::new()
-				.merge(Env::prefixed("CONDUIT_").global())
+				.merge(Env::prefixed("CONDUIT_").global().split("__"))
-				.merge(Env::prefixed("CONDUWUIT_").global())
+				.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
 		};
 
 		let config = match raw_config.extract::<Config>() {
@@ -515,11 +528,12 @@ impl fmt::Display for Config {
 			),
 			("Cleanup interval in seconds", &self.cleanup_second_interval.to_string()),
 			("DNS cache entry limit", &self.dns_cache_entries.to_string()),
-			("DNS minimum ttl", &self.dns_min_ttl.to_string()),
+			("DNS minimum TTL", &self.dns_min_ttl.to_string()),
-			("DNS minimum nxdomain ttl", &self.dns_min_ttl_nxdomain.to_string()),
+			("DNS minimum NXDOMAIN TTL", &self.dns_min_ttl_nxdomain.to_string()),
 			("DNS attempts", &self.dns_attempts.to_string()),
 			("DNS timeout", &self.dns_timeout.to_string()),
 			("DNS fallback to TCP", &self.dns_tcp_fallback.to_string()),
+			("DNS query over TCP only", &self.query_over_tcp_only.to_string()),
 			("Query all nameservers", &self.query_all_nameservers.to_string()),
 			("Maximum request size (bytes)", &self.max_request_size.to_string()),
 			("Sender retry backoff limit", &self.sender_retry_backoff_limit.to_string()),
@@ -693,6 +707,8 @@ impl fmt::Display for Config {
 				&self.rocksdb_optimize_for_spinning_disks.to_string(),
 			),
 			#[cfg(feature = "rocksdb")]
+			("RocksDB Direct-IO", &self.rocksdb_direct_io.to_string()),
+			#[cfg(feature = "rocksdb")]
 			("RocksDB Parallelism Threads", &self.rocksdb_parallelism_threads.to_string()),
 			#[cfg(feature = "rocksdb")]
 			("RocksDB Compression Algorithm", &self.rocksdb_compression_algo),
@@ -798,6 +814,14 @@ impl fmt::Display for Config {
 					String::new()
 				},
 			),
+			(
+				"Well-known client URL",
+				&if let Some(server) = &self.well_known.client {
+					server.to_string()
+				} else {
+					String::new()
+				},
+			),
 			(
 				"Well-known support email",
 				&if let Some(support_email) = &self.well_known.support_email {
@@ -886,16 +910,18 @@ fn default_cleanup_second_interval() -> u32 {
 	1800 // every 30 minutes
 }
 
-fn default_dns_cache_entries() -> u32 { 12288 }
+fn default_dns_cache_entries() -> u32 { 32768 }
 
 fn default_dns_min_ttl() -> u64 { 60 * 180 }
 
-fn default_dns_min_ttl_nxdomain() -> u64 { 60 * 60 * 24 }
+fn default_dns_min_ttl_nxdomain() -> u64 { 60 * 60 * 24 * 3 }
 
 fn default_dns_attempts() -> u16 { 10 }
 
 fn default_dns_timeout() -> u64 { 10 }
 
+fn default_ip_lookup_strategy() -> u8 { 5 }
+
 fn default_max_request_size() -> u32 {
 	20 * 1024 * 1024 // Default to 20 MB
 }
@@ -926,7 +952,7 @@ fn default_sender_idle_timeout() -> u64 { 180 }
 
 fn default_sender_retry_backoff_limit() -> u64 { 86400 }
 
-fn default_appservice_timeout() -> u64 { 120 }
+fn default_appservice_timeout() -> u64 { 35 }
 
 fn default_appservice_idle_timeout() -> u64 { 300 }
 
@@ -934,6 +960,12 @@ fn default_pusher_idle_timeout() -> u64 { 15 }
 
 fn default_max_fetch_prev_events() -> u16 { 100_u16 }
 
+#[cfg(feature = "perf_measurements")]
+fn default_tracing_flame_filter() -> String { "trace,h2=off".to_owned() }
+
+#[cfg(feature = "perf_measurements")]
+fn default_tracing_flame_output_path() -> String { "./tracing.folded".to_owned() }
+
 fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] }
 
 fn default_log() -> String {

src/database/key_value/account_data.rs

@@ -105,7 +105,7 @@ impl service::account_data::Data for KeyValueDatabase {
 
 		// Skip the data that's exactly at since, because we sent that last time
 		let mut first_possible = prefix.clone();
-		first_possible.extend_from_slice(&(since + 1).to_be_bytes());
+		first_possible.extend_from_slice(&(since.saturating_add(1)).to_be_bytes());
 
 		for r in self
 			.roomuserdataid_accountdata

src/database/key_value/globals.rs

@@ -158,18 +158,15 @@ impl service::globals::Data for KeyValueDatabase {
 		let max_appservice_in_room_cache = self.appservice_in_room_cache.read().unwrap().capacity();
 		let max_lasttimelinecount_cache = self.lasttimelinecount_cache.lock().unwrap().capacity();
 
-		let mut response = format!(
+		format!(
 			"\
 auth_chain_cache: {auth_chain_cache} / {max_auth_chain_cache}
 our_real_users_cache: {our_real_users_cache} / {max_our_real_users_cache}
 appservice_in_room_cache: {appservice_in_room_cache} / {max_appservice_in_room_cache}
-lasttimelinecount_cache: {lasttimelinecount_cache} / {max_lasttimelinecount_cache}\n\n"
+lasttimelinecount_cache: {lasttimelinecount_cache} / {max_lasttimelinecount_cache}\n\n
-		);
+{}",
-		if let Ok(db_stats) = self.db.memory_usage() {
+			self.db.memory_usage().unwrap_or_default()
-			response += &db_stats;
+		)
-		}
-
-		response
 	}
 
 	fn clear_caches(&self, amount: u32) {

src/database/key_value/presence.rs

@@ -1,8 +1,8 @@
 use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, UInt, UserId};
-use tracing::debug;
 
 use crate::{
 	database::KeyValueDatabase,
+	debug_info,
 	service::{self, presence::Presence},
 	services,
 	utils::{self, user_id_from_bytes},
@@ -50,13 +50,21 @@ impl service::presence::Data for KeyValueDatabase {
 
 		// tighten for state flicker?
 		if !state_changed && last_active_ts <= last_last_active_ts {
-			debug!(
+			debug_info!(
 				"presence spam {:?} last_active_ts:{:?} <= {:?}",
-				user_id, last_active_ts, last_last_active_ts
+				user_id,
+				last_active_ts,
+				last_last_active_ts
 			);
 			return Ok(());
 		}
 
+		let status_msg = if status_msg.as_ref().is_some_and(String::is_empty) {
+			None
+		} else {
+			status_msg
+		};
+
 		let presence = Presence::new(
 			presence_state.to_owned(),
 			currently_active.unwrap_or(false),

src/database/key_value/rooms/pdu_metadata.rs

@@ -23,10 +23,10 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
 		let mut current = prefix.clone();
 
 		let count_raw = match until {
-			PduCount::Normal(x) => x - 1,
+			PduCount::Normal(x) => x.saturating_sub(1),
 			PduCount::Backfilled(x) => {
 				current.extend_from_slice(&0_u64.to_be_bytes());
-				u64::MAX - x - 1
+				u64::MAX.saturating_sub(x).saturating_sub(1)
 			},
 		};
 		current.extend_from_slice(&count_raw.to_be_bytes());

src/database/key_value/rooms/read_receipt.rs

@@ -48,7 +48,7 @@ impl service::rooms::read_receipt::Data for KeyValueDatabase {
 		let prefix2 = prefix.clone();
 
 		let mut first_possible_edu = prefix.clone();
-		first_possible_edu.extend_from_slice(&(since + 1).to_be_bytes()); // +1 so we don't send the event at since
+		first_possible_edu.extend_from_slice(&(since.saturating_add(1)).to_be_bytes()); // +1 so we don't send the event at since
 
 		Box::new(
 			self.readreceiptid_readreceipt

src/database/key_value/rooms/state_accessor.rs

@@ -17,7 +17,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 			.expect("there is always one layer")
 			.1;
 		let mut result = HashMap::new();
-		let mut i = 0;
+		let mut i: u8 = 0;
 		for compressed in full_state.iter() {
 			let parsed = services()
 				.rooms
@@ -25,7 +25,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 				.parse_compressed_state_event(compressed)?;
 			result.insert(parsed.0, parsed.1);
 
-			i += 1;
+			i = i.wrapping_add(1);
 			if i % 100 == 0 {
 				tokio::task::yield_now().await;
 			}
@@ -44,7 +44,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 			.1;
 
 		let mut result = HashMap::new();
-		let mut i = 0;
+		let mut i: u8 = 0;
 		for compressed in full_state.iter() {
 			let (_, eventid) = services()
 				.rooms
@@ -63,7 +63,7 @@ impl service::rooms::state_accessor::Data for KeyValueDatabase {
 				);
 			}
 
-			i += 1;
+			i = i.wrapping_add(1);
 			if i % 100 == 0 {
 				tokio::task::yield_now().await;
 			}

src/database/key_value/rooms/state_cache.rs

@@ -11,7 +11,9 @@ use tracing::error;
 use crate::{
 	database::KeyValueDatabase,
 	service::{self, appservice::RegistrationInfo},
-	services, utils, Error, Result,
+	services,
+	utils::{self, user_id::user_is_local},
+	Error, Result,
 };
 
 type StrippedStateEventIter<'a> = Box<dyn Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnyStrippedStateEvent>>)>> + 'a>;
@@ -149,16 +151,14 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
 
 		for joined in self.room_members(room_id).filter_map(Result::ok) {
 			joined_servers.insert(joined.server_name().to_owned());
-			if joined.server_name() == services().globals.server_name()
+			if user_is_local(&joined) && !services().users.is_deactivated(&joined).unwrap_or(true) {
-				&& !services().users.is_deactivated(&joined).unwrap_or(true)
-			{
 				real_users.insert(joined);
 			}
-			joinedcount += 1;
+			joinedcount = joinedcount.saturating_add(1);
 		}
 
 		for _invited in self.room_members_invited(room_id).filter_map(Result::ok) {
-			invitedcount += 1;
+			invitedcount = invitedcount.saturating_add(1);
 		}
 
 		self.roomid_joinedcount

src/database/key_value/rooms/timeline.rs

@@ -256,7 +256,7 @@ fn pdu_count(pdu_id: &[u8]) -> Result<PduCount> {
 		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))
+		Ok(PduCount::Backfilled(u64::MAX.saturating_sub(last_u64)))
 	} else {
 		Ok(PduCount::Normal(last_u64))
 	}
@@ -275,22 +275,18 @@ fn count_to_id(room_id: &RoomId, count: PduCount, offset: u64, subtract: bool) -
 	let count_raw = match count {
 		PduCount::Normal(x) => {
 			if subtract {
-				x - offset
+				x.saturating_sub(offset)
 			} else {
-				x + offset
+				x.saturating_add(offset)
 			}
 		},
 		PduCount::Backfilled(x) => {
 			pdu_id.extend_from_slice(&0_u64.to_be_bytes());
-			let num = u64::MAX - x;
+			let num = u64::MAX.saturating_sub(x);
 			if subtract {
-				if num > 0 {
+				num.saturating_sub(offset)
-					num - offset
-				} else {
-					num
-				}
 			} else {
-				num + offset
+				num.saturating_add(offset)
 			}
 		},
 	};

src/database/key_value/rooms/user.rs

@@ -110,7 +110,8 @@ impl service::rooms::user::Data for KeyValueDatabase {
 						.enumerate()
 						.find(|(_, &b)| b == 0xFF)
 						.ok_or_else(|| Error::bad_database("Invalid userroomid_joined in db."))?
-						.0 + 1; // +1 because the room id starts AFTER the separator
+						.0
+						.saturating_add(1); // +1 because the room id starts AFTER the separator
 
 					let room_id = key[roomid_index..].to_vec();
 

src/database/key_value/users.rs

@@ -5,7 +5,7 @@ use ruma::{
 	encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
 	events::{AnyToDeviceEvent, StateEventType},
 	serde::Raw,
-	DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedDeviceKeyId,
+	uint, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedDeviceKeyId,
 	OwnedMxcUri, OwnedUserId, UInt, UserId,
 };
 use tracing::warn;
@@ -414,7 +414,7 @@ impl service::users::Data for KeyValueDatabase {
 					.algorithm(),
 				)
 			}) {
-			*counts.entry(algorithm?).or_default() += UInt::from(1_u32);
+			*counts.entry(algorithm?).or_default() += uint!(1);
 		}
 
 		Ok(counts)
@@ -561,7 +561,7 @@ impl service::users::Data for KeyValueDatabase {
 		prefix.push(0xFF);
 
 		let mut start = prefix.clone();
-		start.extend_from_slice(&(from + 1).to_be_bytes());
+		start.extend_from_slice(&(from.saturating_add(1)).to_be_bytes());
 
 		let to = to.unwrap_or(u64::MAX);
 

src/database/migrations.rs

@@ -173,13 +173,11 @@ pub(crate) async fn migrations(db: &KeyValueDatabase, config: &Config) -> Result
 			let mut current_sstatehash: Option<u64> = None;
 			let mut current_room = None;
 			let mut current_state = HashSet::new();
-			let mut counter = 0;
 
-			let mut handle_state = |current_sstatehash: u64,
+			let handle_state = |current_sstatehash: u64,
-			                        current_room: &RoomId,
+			                    current_room: &RoomId,
-			                        current_state: HashSet<_>,
+			                    current_state: HashSet<_>,
-			                        last_roomstates: &mut HashMap<_, _>| {
+			                    last_roomstates: &mut HashMap<_, _>| {
-				counter += 1;
 				let last_roomsstatehash = last_roomstates.get(current_room);
 
 				let states_parents = last_roomsstatehash.map_or_else(

src/database/mod.rs

@@ -40,8 +40,8 @@ use tokio::time::{interval, Instant};
 use tracing::{debug, error, warn};
 
 use crate::{
-	database::migrations::migrations, service::rooms::timeline::PduCount, services, Config, Error, Result, Services,
+	database::migrations::migrations, service::rooms::timeline::PduCount, services, Config, Error,
-	SERVICES,
+	LogLevelReloadHandles, Result, Services, SERVICES,
 };
 
 pub(crate) struct KeyValueDatabase {
@@ -203,13 +203,7 @@ struct CheckForUpdatesResponse {
 impl KeyValueDatabase {
 	/// Load an existing database or create a new one.
 	#[allow(clippy::too_many_lines)]
-	pub(crate) async fn load_or_create(
+	pub(crate) async fn load_or_create(config: Config, tracing_reload_handler: LogLevelReloadHandles) -> Result<()> {
-		config: Config,
-		tracing_reload_handler: tracing_subscriber::reload::Handle<
-			tracing_subscriber::EnvFilter,
-			tracing_subscriber::Registry,
-		>,
-	) -> Result<()> {
 		Self::check_db_setup(&config)?;
 
 		if !Path::new(&config.database_path).exists() {
@@ -346,6 +340,7 @@ impl KeyValueDatabase {
 
 			roomid_inviteviaservers: builder.open_tree("roomid_inviteviaservers")?,
 
+			#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 			auth_chain_cache: Mutex::new(LruCache::new(
 				(f64::from(config.auth_chain_cache_capacity) * config.conduit_cache_capacity_modifier) as usize,
 			)),
@@ -378,7 +373,8 @@ impl KeyValueDatabase {
 						.send_message(RoomMessageEventContent::text_plain(
 							"The Conduit account emergency password is set! Please unset it as soon as you finish \
 							 admin account recovery!",
-						));
+						))
+						.await;
 				}
 			},
 			Err(e) => {
@@ -406,19 +402,8 @@ impl KeyValueDatabase {
 		let sqlite_exists = path.join("conduit.db").exists();
 		let rocksdb_exists = path.join("IDENTITY").exists();
 
-		let mut count = 0;
+		if sqlite_exists && rocksdb_exists {
-
+			return Err(Error::bad_config("Multiple databases at database_path detected."));
-		if sqlite_exists {
-			count += 1;
-		}
-
-		if rocksdb_exists {
-			count += 1;
-		}
-
-		if count > 1 {
-			warn!("Multiple databases at database_path detected");
-			return Ok(());
 		}
 
 		if sqlite_exists && config.database_backend != "sqlite" {
@@ -479,7 +464,8 @@ impl KeyValueDatabase {
 					.send_message(RoomMessageEventContent::text_plain(format!(
 						"@room: the following is a message from the conduwuit puppy. it was sent on '{}':\n\n{}",
 						update.date, update.message
-					)));
+					)))
+					.await;
 			}
 		}
 		services()

src/database/rocksdb/kvtree.rs

@@ -19,6 +19,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
 		let mut readoptions = rust_rocksdb::ReadOptions::default();
 		readoptions.set_total_order_seek(true);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
 
 		Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?)
 	}
@@ -26,6 +27,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 	fn multi_get(&self, keys: &[&[u8]]) -> Result<Vec<Option<Vec<u8>>>> {
 		let mut readoptions = rust_rocksdb::ReadOptions::default();
 		readoptions.set_total_order_seek(true);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
 
 		// Optimization can be `true` if key vector is pre-sorted **by the column
 		// comparator**.
@@ -113,6 +115,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 	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);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
 
 		Box::new(
 			self.db
@@ -126,6 +129,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 	fn iter_from<'a>(&'a self, from: &[u8], backwards: bool) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
 		let mut readoptions = rust_rocksdb::ReadOptions::default();
 		readoptions.set_total_order_seek(true);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
 
 		Box::new(
 			self.db
@@ -150,6 +154,8 @@ impl KvTree for RocksDbEngineTree<'_> {
 	fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
 		let mut readoptions = rust_rocksdb::ReadOptions::default();
 		readoptions.set_total_order_seek(true);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
+
 		let writeoptions = rust_rocksdb::WriteOptions::default();
 
 		let old = self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?;
@@ -168,6 +174,8 @@ impl KvTree for RocksDbEngineTree<'_> {
 	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);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
+
 		let writeoptions = rust_rocksdb::WriteOptions::default();
 
 		let mut batch = WriteBatchWithTransaction::<false>::default();
@@ -190,6 +198,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 	fn scan_prefix<'a>(&'a self, prefix: Vec<u8>) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
 		let mut readoptions = rust_rocksdb::ReadOptions::default();
 		readoptions.set_total_order_seek(true);
+		readoptions.set_async_io(cfg!(feature = "io_uring"));
 
 		Box::new(
 			self.db

src/database/rocksdb/mod.rs

@@ -35,7 +35,11 @@ pub(crate) struct Engine {
 impl KeyValueDatabaseEngine for Arc<Engine> {
 	fn open(config: &Config) -> Result<Self> {
 		let cache_capacity_bytes = config.db_cache_capacity_mb * 1024.0 * 1024.0;
+
+		#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 		let row_cache_capacity_bytes = (cache_capacity_bytes * 0.50) as usize;
+
+		#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 		let col_cache_capacity_bytes = (cache_capacity_bytes * 0.50) as usize;
 
 		let mut col_cache = HashMap::new();
@@ -128,6 +132,7 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 		Ok(())
 	}
 
+	#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 	fn memory_usage(&self) -> Result<String> {
 		let mut res = String::new();
 		let stats = rust_rocksdb::perf::get_memory_usage_stats(Some(&[&self.rocks]), Some(&[&self.row_cache]))?;

src/database/rocksdb/opts.rs

@@ -22,7 +22,7 @@ pub(crate) fn db_options(config: &Config, env: &mut Env, row_cache: &Cache, col_
 
 	// Processing
 	let threads = if config.rocksdb_parallelism_threads == 0 {
-		num_cpus::get() // max cores if user specified 0
+		std::cmp::max(2, num_cpus::get()) // max cores if user specified 0
 	} else {
 		config.rocksdb_parallelism_threads
 	};
@@ -36,8 +36,10 @@ pub(crate) fn db_options(config: &Config, env: &mut Env, row_cache: &Cache, col_
 
 	// IO
 	opts.set_manual_wal_flush(true);
-	opts.set_use_direct_reads(true);
+	if config.rocksdb_direct_io {
-	opts.set_use_direct_io_for_flush_and_compaction(true);
+		opts.set_use_direct_reads(true);
+		opts.set_use_direct_io_for_flush_and_compaction(true);
+	}
 	if config.rocksdb_optimize_for_spinning_disks {
 		// speeds up opening DB on hard drives
 		opts.set_skip_checking_sst_file_sizes_on_db_open(true);
@@ -143,7 +145,14 @@ pub(crate) fn cf_options(cfg: &Config, name: &str, mut opts: Options, cache: &mu
 			cache_size(cfg, cfg.statekeyshort_cache_capacity, 1024),
 		),
 
-		"pduid_pdu" => set_table_with_new_cache(&mut opts, cfg, cache, name, cfg.pdu_cache_capacity as usize * 1536),
+		#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
+		"pduid_pdu" => set_table_with_new_cache(
+			&mut opts,
+			cfg,
+			cache,
+			name,
+			(cfg.pdu_cache_capacity as usize).saturating_mul(1536),
+		),
 
 		"eventid_outlierpdu" => set_table_with_shared_cache(&mut opts, cfg, cache, name, "pduid_pdu"),
 
@@ -175,9 +184,12 @@ fn set_logging_defaults(opts: &mut Options, config: &Config) {
 
 fn set_compression_defaults(opts: &mut Options, config: &Config) {
 	let rocksdb_compression_algo = match config.rocksdb_compression_algo.as_ref() {
+		"snappy" => DBCompressionType::Snappy,
 		"zlib" => DBCompressionType::Zlib,
-		"lz4" => DBCompressionType::Lz4,
 		"bz2" => DBCompressionType::Bz2,
+		"lz4" => DBCompressionType::Lz4,
+		"lz4hc" => DBCompressionType::Lz4hc,
+		"none" => DBCompressionType::None,
 		_ => DBCompressionType::Zstd,
 	};
 
@@ -219,7 +231,7 @@ fn set_for_random_small(opts: &mut Options, config: &Config) {
 }
 
 fn set_for_sequential_small(opts: &mut Options, config: &Config) {
-	set_for_random(opts, config);
+	set_for_sequential(opts, config);
 
 	opts.set_write_buffer_size(1024 * 512);
 	opts.set_target_file_size_base(1024 * 512);
@@ -304,7 +316,10 @@ fn set_table_with_shared_cache(
 fn cache_size(config: &Config, base_size: u32, entity_size: usize) -> usize {
 	let ents = f64::from(base_size) * config.conduit_cache_capacity_modifier;
 
-	ents as usize * entity_size
+	#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
+	(ents as usize)
+		.checked_mul(entity_size)
+		.expect("cache capacity size is too large")
 }
 
 fn table_options(_config: &Config) -> BlockBasedOptions {

src/database/sqlite/mod.rs

@@ -21,7 +21,7 @@ thread_local! {
 
 struct PreparedStatementIterator<'a> {
 	iterator: Box<dyn Iterator<Item = TupleOfBytes> + 'a>,
-	_statement_ref: NonAliasingBox<rusqlite::Statement<'a>>,
+	_statement_ref: AliasableBox<rusqlite::Statement<'a>>,
 }
 
 impl Iterator for PreparedStatementIterator<'_> {
@@ -30,16 +30,25 @@ impl Iterator for PreparedStatementIterator<'_> {
 	fn next(&mut self) -> Option<Self::Item> { self.iterator.next() }
 }
 
-struct NonAliasingBox<T>(*mut T);
+struct AliasableBox<T>(*mut T);
-impl<T> Drop for NonAliasingBox<T> {
+impl<T> Drop for AliasableBox<T> {
 	fn drop(&mut self) {
-		// TODO: figure out why this is necessary, but also this is sqlite so dont think
+		// SAFETY: This is cursed and relies on non-local reasoning.
-		// i care that much. i tried checking commit history but couldn't find out why
+		//
-		// this was done.
+		// In order for this to be safe:
-		#[allow(clippy::undocumented_unsafe_blocks)]
+		//
-		unsafe {
+		// * All aliased references to this value must have been dropped first, for
-			_ = Box::from_raw(self.0);
+		//   example by coming after its referrers in struct fields, because struct
-		};
+		//   fields are automatically dropped in order from top to bottom in the absence
+		//   of an explicit Drop impl. Otherwise, the referrers may read into
+		//   deallocated memory.
+		// * This type must not be copyable or cloneable. Otherwise, double-free can
+		//   occur.
+		//
+		// These conditions are met, but again, note that changing safe code in
+		// this module can result in unsoundness if any of these constraints are
+		// violated.
+		unsafe { drop(Box::from_raw(self.0)) }
 	}
 }
 
@@ -93,8 +102,13 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
 		// 2. divide by permanent connections + permanent iter connections + write
 		//    connection
 		// 3. round down to nearest integer
-		let cache_size_per_thread: u32 =
+		#[allow(
-			((config.db_cache_capacity_mb * 1024.0) / ((num_cpus::get().max(1) * 2) + 1) as f64) as u32;
+			clippy::as_conversions,
+			clippy::cast_possible_truncation,
+			clippy::cast_precision_loss,
+			clippy::cast_sign_loss
+		)]
+		let cache_size_per_thread = ((config.db_cache_capacity_mb * 1024.0) / ((num_cpus::get() as f64 * 2.0) + 1.0)) as u32;
 
 		let writer = Mutex::new(Engine::prepare_conn(&path, cache_size_per_thread)?);
 
@@ -161,7 +175,7 @@ impl SqliteTable {
 				.unwrap(),
 		));
 
-		let statement_ref = NonAliasingBox(statement);
+		let statement_ref = AliasableBox(statement);
 
 		//let name = self.name.clone();
 
@@ -250,7 +264,7 @@ impl KvTree for SqliteTable {
 					.unwrap(),
 			));
 
-			let statement_ref = NonAliasingBox(statement);
+			let statement_ref = AliasableBox(statement);
 
 			let iterator = Box::new(
 				statement
@@ -272,7 +286,7 @@ impl KvTree for SqliteTable {
 					.unwrap(),
 			));
 
-			let statement_ref = NonAliasingBox(statement);
+			let statement_ref = AliasableBox(statement);
 
 			let iterator = Box::new(
 				statement

src/database/watchers.rs

@@ -47,7 +47,7 @@ impl Watchers {
 			let mut watchers = self.watchers.write().unwrap();
 			for prefix in triggered {
 				if let Some(tx) = watchers.remove(prefix) {
-					_ = tx.0.send(());
+					tx.0.send(()).expect("channel should still be open");
 				}
 			}
 		};

src/main.rs

@@ -6,53 +6,34 @@ use std::os::unix::fs::PermissionsExt as _; /* not unix specific, just only for
 // Not async due to services() being used in many closures, and async closures
 // are not stable as of writing This is the case for every other occurence of
 // sync Mutex/RwLock, except for database related ones
-use std::sync::RwLock;
+use std::sync::{Arc, RwLock};
-use std::{any::Any, io, net::SocketAddr, sync::atomic, time::Duration};
+use std::{io, net::SocketAddr, time::Duration};
 
 use api::ruma_wrapper::{Ruma, RumaResponse};
-use axum::{
+use axum::Router;
-	extract::{DefaultBodyLimit, MatchedPath},
-	response::IntoResponse,
-	Router,
-};
 use axum_server::{bind, bind_rustls, tls_rustls::RustlsConfig, Handle as ServerHandle};
 #[cfg(feature = "axum_dual_protocol")]
 use axum_server_dual_protocol::ServerExt;
 use config::Config;
 use database::KeyValueDatabase;
-use http::{
-	header::{self, HeaderName},
-	Method, StatusCode, Uri,
-};
-#[cfg(unix)]
-use ruma::api::client::{
-	error::{Error as RumaError, ErrorBody, ErrorKind},
-	uiaa::UiaaResponse,
-};
 use service::{pdu::PduEvent, Services};
 use tokio::{
 	signal,
 	sync::oneshot::{self, Sender},
 	task::JoinSet,
 };
-use tower::ServiceBuilder;
+use tracing::{debug, error, info, warn};
-use tower_http::{
-	catch_panic::CatchPanicLayer,
-	cors::{self, CorsLayer},
-	trace::{DefaultOnFailure, DefaultOnRequest, DefaultOnResponse, TraceLayer},
-	ServiceBuilderExt as _,
-};
-use tracing::{debug, error, info, trace, warn, Level};
 use tracing_subscriber::{prelude::*, reload, EnvFilter, Registry};
 use utils::{
 	clap,
 	error::{Error, Result},
 };
 
+pub(crate) mod alloc;
 mod api;
 mod config;
 mod database;
-mod routes;
+mod router;
 mod service;
 mod utils;
 
@@ -66,23 +47,17 @@ pub(crate) fn services() -> &'static Services<'static> {
 		.expect("SERVICES should be initialized when this is called")
 }
 
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc", not(feature = "hardened_malloc")))]
+pub(crate) struct Server {
-#[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
-#[cfg(all(not(target_env = "msvc"), feature = "hardened_malloc", target_os = "linux", not(feature = "jemalloc")))]
-#[global_allocator]
-static GLOBAL: hardened_malloc_rs::HardenedMalloc = hardened_malloc_rs::HardenedMalloc;
-
-struct Server {
 	config: Config,
 
 	runtime: tokio::runtime::Runtime,
 
-	tracing_reload_handle: reload::Handle<EnvFilter, Registry>,
+	tracing_reload_handle: LogLevelReloadHandles,
 
 	#[cfg(feature = "sentry_telemetry")]
 	_sentry_guard: Option<sentry::ClientInitGuard>,
+
+	_tracing_flame_guard: TracingFlameGuard,
 }
 
 fn main() -> Result<(), Error> {
@@ -114,7 +89,7 @@ async fn async_main(server: &Server) -> Result<(), Error> {
 }
 
 async fn run(server: &Server) -> io::Result<()> {
-	let app = build(server).await?;
+	let app = router::build(server).await?;
 	let (tx, rx) = oneshot::channel::<()>();
 	let handle = ServerHandle::new();
 	tokio::spawn(shutdown(handle.clone(), tx));
@@ -292,179 +267,6 @@ async fn start(server: &Server) -> Result<(), Error> {
 	Ok(())
 }
 
-async fn build(server: &Server) -> io::Result<axum::routing::IntoMakeService<Router>> {
-	let base_middlewares = ServiceBuilder::new();
-	#[cfg(feature = "sentry_telemetry")]
-	let base_middlewares = base_middlewares.layer(sentry_tower::NewSentryLayer::<http::Request<_>>::new_from_top());
-
-	let x_forwarded_for = HeaderName::from_static("x-forwarded-for");
-	let middlewares = base_middlewares
-		.sensitive_headers([header::AUTHORIZATION])
-		.sensitive_request_headers([x_forwarded_for].into())
-		.layer(axum::middleware::from_fn(request_spawn))
-		.layer(
-			TraceLayer::new_for_http()
-				.make_span_with(tracing_span::<_>)
-				.on_failure(DefaultOnFailure::new().level(Level::ERROR))
-				.on_request(DefaultOnRequest::new().level(Level::TRACE))
-				.on_response(DefaultOnResponse::new().level(Level::DEBUG)),
-		)
-		.layer(axum::middleware::from_fn(request_handle))
-		.layer(cors_layer(server))
-		.layer(DefaultBodyLimit::max(
-			server
-				.config
-				.max_request_size
-				.try_into()
-				.expect("failed to convert max request size"),
-		))
-		.layer(CatchPanicLayer::custom(catch_panic_layer));
-
-	#[cfg(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression"))]
-	{
-		Ok(routes::routes(&server.config)
-			.layer(compression_layer(server))
-			.layer(middlewares)
-			.into_make_service())
-	}
-	#[cfg(not(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression")))]
-	{
-		Ok(routes::routes().layer(middlewares).into_make_service())
-	}
-}
-
-#[tracing::instrument(skip_all, name = "spawn")]
-async fn request_spawn(
-	req: http::Request<axum::body::Body>, next: axum::middleware::Next,
-) -> Result<axum::response::Response, StatusCode> {
-	if services().globals.shutdown.load(atomic::Ordering::Relaxed) {
-		return Err(StatusCode::SERVICE_UNAVAILABLE);
-	}
-
-	let fut = next.run(req);
-	let task = tokio::spawn(fut);
-	task.await.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
-}
-
-#[tracing::instrument(skip_all, name = "handle")]
-async fn request_handle(
-	req: http::Request<axum::body::Body>, next: axum::middleware::Next,
-) -> Result<axum::response::Response, StatusCode> {
-	let method = req.method().clone();
-	let uri = req.uri().clone();
-	let result = next.run(req).await;
-	request_result(&method, &uri, result)
-}
-
-fn request_result(
-	method: &Method, uri: &Uri, result: axum::response::Response,
-) -> Result<axum::response::Response, StatusCode> {
-	request_result_log(method, uri, &result);
-	match result.status() {
-		StatusCode::METHOD_NOT_ALLOWED => request_result_403(method, uri, &result),
-		_ => Ok(result),
-	}
-}
-
-#[allow(clippy::unnecessary_wraps)]
-fn request_result_403(
-	_method: &Method, _uri: &Uri, result: &axum::response::Response,
-) -> Result<axum::response::Response, StatusCode> {
-	let error = UiaaResponse::MatrixError(RumaError {
-		status_code: result.status(),
-		body: ErrorBody::Standard {
-			kind: ErrorKind::Unrecognized,
-			message: "M_UNRECOGNIZED: Method not allowed for endpoint".to_owned(),
-		},
-	});
-
-	Ok(RumaResponse(error).into_response())
-}
-
-fn request_result_log(method: &Method, uri: &Uri, result: &axum::response::Response) {
-	let status = result.status();
-	let reason = status.canonical_reason().unwrap_or("Unknown Reason");
-	let code = status.as_u16();
-	if status.is_server_error() {
-		error!(method = ?method, uri = ?uri, "{code} {reason}");
-	} else if status.is_client_error() {
-		debug_error!(method = ?method, uri = ?uri, "{code} {reason}");
-	} else if status.is_redirection() {
-		debug!(method = ?method, uri = ?uri, "{code} {reason}");
-	} else {
-		trace!(method = ?method, uri = ?uri, "{code} {reason}");
-	}
-}
-
-fn cors_layer(_server: &Server) -> CorsLayer {
-	const METHODS: [Method; 6] = [
-		Method::GET,
-		Method::HEAD,
-		Method::POST,
-		Method::PUT,
-		Method::DELETE,
-		Method::OPTIONS,
-	];
-
-	let headers: [HeaderName; 5] = [
-		header::ORIGIN,
-		HeaderName::from_lowercase(b"x-requested-with").unwrap(),
-		header::CONTENT_TYPE,
-		header::ACCEPT,
-		header::AUTHORIZATION,
-	];
-
-	CorsLayer::new()
-		.allow_origin(cors::Any)
-		.allow_methods(METHODS)
-		.allow_headers(headers)
-		.max_age(Duration::from_secs(86400))
-}
-
-#[cfg(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression"))]
-fn compression_layer(server: &Server) -> tower_http::compression::CompressionLayer {
-	let mut compression_layer = tower_http::compression::CompressionLayer::new();
-
-	#[cfg(feature = "zstd_compression")]
-	{
-		if server.config.zstd_compression {
-			compression_layer = compression_layer.zstd(true);
-		} else {
-			compression_layer = compression_layer.no_zstd();
-		};
-	};
-
-	#[cfg(feature = "gzip_compression")]
-	{
-		if server.config.gzip_compression {
-			compression_layer = compression_layer.gzip(true);
-		} else {
-			compression_layer = compression_layer.no_gzip();
-		};
-	};
-
-	#[cfg(feature = "brotli_compression")]
-	{
-		if server.config.brotli_compression {
-			compression_layer = compression_layer.br(true);
-		} else {
-			compression_layer = compression_layer.no_br();
-		};
-	};
-
-	compression_layer
-}
-
-fn tracing_span<T>(request: &http::Request<T>) -> tracing::Span {
-	let path = if let Some(path) = request.extensions().get::<MatchedPath>() {
-		path.as_str()
-	} else {
-		request.uri().path()
-	};
-
-	tracing::info_span!("router:", %path)
-}
-
 /// Non-async initializations
 fn init(args: clap::Args) -> Result<Server, Error> {
 	let config = Config::new(args.config)?;
@@ -476,24 +278,7 @@ fn init(args: clap::Args) -> Result<Server, Error> {
 		None
 	};
 
-	let tracing_reload_handle;
+	let (tracing_reload_handle, tracing_flame_guard) = init_tracing(&config);
-
-	#[cfg(feature = "perf_measurements")]
-	{
-		tracing_reload_handle = if config.allow_jaeger {
-			init_tracing_jaeger(&config)
-		} else if config.tracing_flame {
-			#[cfg(feature = "perf_measurements")]
-			init_tracing_flame(&config)
-		} else {
-			init_tracing_sub(&config)
-		};
-	};
-
-	#[cfg(not(feature = "perf_measurements"))]
-	{
-		tracing_reload_handle = init_tracing_sub(&config);
-	};
 
 	config.check()?;
 
@@ -502,7 +287,7 @@ fn init(args: clap::Args) -> Result<Server, Error> {
 		database_path = ?config.database_path,
 		log_levels = ?config.log,
 		"{}",
-		env!("CARGO_PKG_VERSION"),
+		utils::conduwuit_version(),
 	);
 
 	#[cfg(unix)]
@@ -515,7 +300,7 @@ fn init(args: clap::Args) -> Result<Server, Error> {
 			.enable_io()
 			.enable_time()
 			.thread_name("conduwuit:worker")
-			.worker_threads(num_cpus::get())
+			.worker_threads(std::cmp::max(2, num_cpus::get()))
 			.build()
 			.unwrap(),
 
@@ -523,6 +308,7 @@ fn init(args: clap::Args) -> Result<Server, Error> {
 
 		#[cfg(feature = "sentry_telemetry")]
 		_sentry_guard: sentry_guard,
+		_tracing_flame_guard: tracing_flame_guard,
 	})
 }
 
@@ -547,7 +333,65 @@ fn init_sentry(config: &Config) -> sentry::ClientInitGuard {
 	))
 }
 
-fn init_tracing_sub(config: &Config) -> reload::Handle<EnvFilter, Registry> {
+/// We need to store a reload::Handle value, but can't name it's type explicitly
+/// because the S type parameter depends on the subscriber's previous layers. In
+/// our case, this includes unnameable 'impl Trait' types.
+///
+/// This is fixed[1] in the unreleased tracing-subscriber from the master
+/// branch, which removes the S parameter. Unfortunately can't use it without
+/// pulling in a version of tracing that's incompatible with the rest of our
+/// deps.
+///
+/// To work around this, we define an trait without the S paramter that forwards
+/// to the reload::Handle::reload method, and then store the handle as a trait
+/// object.
+///
+/// [1]: <https://github.com/tokio-rs/tracing/pull/1035/commits/8a87ea52425098d3ef8f56d92358c2f6c144a28f>
+trait ReloadHandle<L> {
+	fn reload(&self, new_value: L) -> Result<(), reload::Error>;
+}
+
+impl<L, S> ReloadHandle<L> for reload::Handle<L, S> {
+	fn reload(&self, new_value: L) -> Result<(), reload::Error> { reload::Handle::reload(self, new_value) }
+}
+
+struct LogLevelReloadHandlesInner {
+	handles: Vec<Box<dyn ReloadHandle<EnvFilter> + Send + Sync>>,
+}
+
+/// Wrapper to allow reloading the filter on several several
+/// [`tracing_subscriber::reload::Handle`]s at once, with the same value.
+#[derive(Clone)]
+struct LogLevelReloadHandles {
+	inner: Arc<LogLevelReloadHandlesInner>,
+}
+
+impl LogLevelReloadHandles {
+	fn new(handles: Vec<Box<dyn ReloadHandle<EnvFilter> + Send + Sync>>) -> LogLevelReloadHandles {
+		LogLevelReloadHandles {
+			inner: Arc::new(LogLevelReloadHandlesInner {
+				handles,
+			}),
+		}
+	}
+
+	fn reload(&self, new_value: &EnvFilter) -> Result<(), reload::Error> {
+		for handle in &self.inner.handles {
+			handle.reload(new_value.clone())?;
+		}
+		Ok(())
+	}
+}
+
+#[cfg(feature = "perf_measurements")]
+type TracingFlameGuard = Option<tracing_flame::FlushGuard<io::BufWriter<std::fs::File>>>;
+#[cfg(not(feature = "perf_measurements"))]
+type TracingFlameGuard = ();
+
+// clippy thinks the filter_layer clones are redundant if the next usage is
+// behind a disabled feature.
+#[allow(clippy::redundant_clone)]
+fn init_tracing(config: &Config) -> (LogLevelReloadHandles, TracingFlameGuard) {
 	let registry = Registry::default();
 	let fmt_layer = tracing_subscriber::fmt::Layer::new();
 	let filter_layer = match EnvFilter::try_new(&config.log) {
@@ -558,84 +402,92 @@ fn init_tracing_sub(config: &Config) -> reload::Handle<EnvFilter, Registry> {
 		},
 	};
 
-	let (reload_filter, reload_handle) = reload::Layer::new(filter_layer);
+	let mut reload_handles = Vec::<Box<dyn ReloadHandle<EnvFilter> + Send + Sync>>::new();
+	let subscriber = registry;
+
+	#[cfg(feature = "tokio_console")]
+	let subscriber = {
+		let console_layer = console_subscriber::spawn();
+		subscriber.with(console_layer)
+	};
+
+	let (fmt_reload_filter, fmt_reload_handle) = reload::Layer::new(filter_layer.clone());
+	reload_handles.push(Box::new(fmt_reload_handle));
+	let subscriber = subscriber.with(fmt_layer.with_filter(fmt_reload_filter));
 
 	#[cfg(feature = "sentry_telemetry")]
-	let sentry_layer = sentry_tracing::layer();
+	let subscriber = {
-
+		let sentry_layer = sentry_tracing::layer();
-	let subscriber;
+		let (sentry_reload_filter, sentry_reload_handle) = reload::Layer::new(filter_layer.clone());
-
+		reload_handles.push(Box::new(sentry_reload_handle));
-	#[allow(clippy::unnecessary_operation)] // error[E0658]: attributes on expressions are experimental
+		subscriber.with(sentry_layer.with_filter(sentry_reload_filter))
-	#[cfg(feature = "sentry_telemetry")]
-	{
-		subscriber = registry
-			.with(reload_filter)
-			.with(fmt_layer)
-			.with(sentry_layer);
 	};
 
-	#[allow(clippy::unnecessary_operation)] // error[E0658]: attributes on expressions are experimental
+	#[cfg(feature = "perf_measurements")]
-	#[cfg(not(feature = "sentry_telemetry"))]
+	let (subscriber, flame_guard) = {
-	{
+		let (flame_layer, flame_guard) = if config.tracing_flame {
-		subscriber = registry.with(reload_filter).with(fmt_layer);
+			let flame_filter = match EnvFilter::try_new(&config.tracing_flame_filter) {
+				Ok(flame_filter) => flame_filter,
+				Err(e) => panic!("tracing_flame_filter config value is invalid: {e}"),
+			};
+
+			let (flame_layer, flame_guard) =
+				match tracing_flame::FlameLayer::with_file(&config.tracing_flame_output_path) {
+					Ok(ok) => ok,
+					Err(e) => {
+						panic!("failed to initialize tracing-flame: {e}");
+					},
+				};
+			let flame_layer = flame_layer
+				.with_empty_samples(false)
+				.with_filter(flame_filter);
+			(Some(flame_layer), Some(flame_guard))
+		} else {
+			(None, None)
+		};
+
+		let jaeger_layer = if config.allow_jaeger {
+			opentelemetry::global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
+			let tracer = opentelemetry_jaeger::new_agent_pipeline()
+				.with_auto_split_batch(true)
+				.with_service_name("conduwuit")
+				.install_batch(opentelemetry_sdk::runtime::Tokio)
+				.unwrap();
+			let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
+
+			let (jaeger_reload_filter, jaeger_reload_handle) = reload::Layer::new(filter_layer);
+			reload_handles.push(Box::new(jaeger_reload_handle));
+			Some(telemetry.with_filter(jaeger_reload_filter))
+		} else {
+			None
+		};
+
+		let subscriber = subscriber.with(flame_layer).with(jaeger_layer);
+		(subscriber, flame_guard)
 	};
 
+	#[cfg(not(feature = "perf_measurements"))]
+	#[cfg_attr(not(feature = "perf_measurements"), allow(clippy::let_unit_value))]
+	let flame_guard = ();
+
 	tracing::subscriber::set_global_default(subscriber).unwrap();
 
-	reload_handle
+	#[cfg(all(feature = "tokio_console", feature = "release_max_log_level"))]
+	error!(
+		"'tokio_console' feature and 'release_max_log_level' feature are incompatible, because console-subscriber \
+		 needs access to trace-level events. 'release_max_log_level' must be disabled to use tokio-console."
+	);
+
+	(LogLevelReloadHandles::new(reload_handles), flame_guard)
 }
 
-#[cfg(feature = "perf_measurements")]
+/// This is needed for opening lots of file descriptors, which tends to
-fn init_tracing_jaeger(config: &Config) -> reload::Handle<EnvFilter, Registry> {
+/// happen more often when using RocksDB and making lots of federation
-	opentelemetry::global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
+/// connections at startup. The soft limit is usually 1024, and the hard
-	let tracer = opentelemetry_jaeger::new_agent_pipeline()
+/// limit is usually 512000; I've personally seen it hit >2000.
-		.with_auto_split_batch(true)
+///
-		.with_service_name("conduwuit")
+/// * <https://www.freedesktop.org/software/systemd/man/systemd.exec.html#id-1.12.2.1.17.6>
-		.install_batch(opentelemetry_sdk::runtime::Tokio)
+/// * <https://github.com/systemd/systemd/commit/0abf94923b4a95a7d89bc526efc84e7ca2b71741>
-		.unwrap();
-	let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
-
-	let filter_layer = match EnvFilter::try_new(&config.log) {
-		Ok(s) => s,
-		Err(e) => {
-			eprintln!("It looks like your log config is invalid. The following error occurred: {e}");
-			EnvFilter::try_new("warn").unwrap()
-		},
-	};
-
-	let (reload_filter, reload_handle) = reload::Layer::new(filter_layer);
-
-	let subscriber = Registry::default().with(reload_filter).with(telemetry);
-
-	tracing::subscriber::set_global_default(subscriber).unwrap();
-
-	reload_handle
-}
-
-#[cfg(feature = "perf_measurements")]
-fn init_tracing_flame(_config: &Config) -> reload::Handle<EnvFilter, Registry> {
-	let registry = Registry::default();
-	let (flame_layer, _guard) = tracing_flame::FlameLayer::with_file("./tracing.folded").unwrap();
-	let flame_layer = flame_layer.with_empty_samples(false);
-
-	let filter_layer = EnvFilter::new("trace,h2=off");
-
-	let (reload_filter, reload_handle) = reload::Layer::new(filter_layer);
-
-	let subscriber = registry.with(reload_filter).with(flame_layer);
-
-	tracing::subscriber::set_global_default(subscriber).unwrap();
-
-	reload_handle
-}
-
-// This is needed for opening lots of file descriptors, which tends to
-// happen more often when using RocksDB and making lots of federation
-// connections at startup. The soft limit is usually 1024, and the hard
-// limit is usually 512000; I've personally seen it hit >2000.
-//
-// * https://www.freedesktop.org/software/systemd/man/systemd.exec.html#id-1.12.2.1.17.6
-// * https://github.com/systemd/systemd/commit/0abf94923b4a95a7d89bc526efc84e7ca2b71741
 #[cfg(unix)]
 fn maximize_fd_limit() -> Result<(), nix::errno::Errno> {
 	use nix::sys::resource::{getrlimit, setrlimit, Resource::RLIMIT_NOFILE as NOFILE};
@@ -649,27 +501,3 @@ fn maximize_fd_limit() -> Result<(), nix::errno::Errno> {
 
 	Ok(())
 }
-
-#[allow(clippy::needless_pass_by_value)]
-fn catch_panic_layer(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_util::Full<bytes::Bytes>> {
-	let details = if let Some(s) = err.downcast_ref::<String>() {
-		s.clone()
-	} else if let Some(s) = err.downcast_ref::<&str>() {
-		s.to_string()
-	} else {
-		"Unknown internal server error occurred.".to_owned()
-	};
-
-	let body = serde_json::json!({
-		"errcode": "M_UNKNOWN",
-		"error": "M_UNKNOWN: Internal server error occurred",
-		"details": details,
-	})
-	.to_string();
-
-	http::Response::builder()
-		.status(StatusCode::INTERNAL_SERVER_ERROR)
-		.header(header::CONTENT_TYPE, "application/json")
-		.body(http_body_util::Full::from(body))
-		.expect("Failed to create response for our panic catcher?")
-}

src/router/mod.rs

@@ -0,0 +1,225 @@
+use std::{any::Any, io, sync::atomic, time::Duration};
+
+use axum::{
+	extract::{DefaultBodyLimit, MatchedPath},
+	response::IntoResponse,
+	Router,
+};
+use http::{
+	header::{self, HeaderName},
+	Method, StatusCode, Uri,
+};
+use ruma::api::client::{
+	error::{Error as RumaError, ErrorBody, ErrorKind},
+	uiaa::UiaaResponse,
+};
+use tower::ServiceBuilder;
+use tower_http::{
+	catch_panic::CatchPanicLayer,
+	cors::{self, CorsLayer},
+	trace::{DefaultOnFailure, DefaultOnRequest, DefaultOnResponse, TraceLayer},
+	ServiceBuilderExt as _,
+};
+use tracing::{debug, error, trace, Level};
+
+use super::{api::ruma_wrapper::RumaResponse, debug_error, services, utils::error::Result, Server};
+
+mod routes;
+
+pub(crate) async fn build(server: &Server) -> io::Result<axum::routing::IntoMakeService<Router>> {
+	let base_middlewares = ServiceBuilder::new();
+	#[cfg(feature = "sentry_telemetry")]
+	let base_middlewares = base_middlewares.layer(sentry_tower::NewSentryLayer::<http::Request<_>>::new_from_top());
+
+	let x_forwarded_for = HeaderName::from_static("x-forwarded-for");
+	let middlewares = base_middlewares
+		.sensitive_headers([header::AUTHORIZATION])
+		.sensitive_request_headers([x_forwarded_for].into())
+		.layer(axum::middleware::from_fn(request_spawn))
+		.layer(
+			TraceLayer::new_for_http()
+				.make_span_with(tracing_span::<_>)
+				.on_failure(DefaultOnFailure::new().level(Level::ERROR))
+				.on_request(DefaultOnRequest::new().level(Level::TRACE))
+				.on_response(DefaultOnResponse::new().level(Level::DEBUG)),
+		)
+		.layer(axum::middleware::from_fn(request_handle))
+		.layer(cors_layer(server))
+		.layer(DefaultBodyLimit::max(
+			server
+				.config
+				.max_request_size
+				.try_into()
+				.expect("failed to convert max request size"),
+		))
+		.layer(CatchPanicLayer::custom(catch_panic_layer));
+
+	#[cfg(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression"))]
+	{
+		Ok(routes::routes(&server.config)
+			.layer(compression_layer(server))
+			.layer(middlewares)
+			.into_make_service())
+	}
+	#[cfg(not(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression")))]
+	{
+		Ok(routes::routes().layer(middlewares).into_make_service())
+	}
+}
+
+#[tracing::instrument(skip_all, name = "spawn")]
+async fn request_spawn(
+	req: http::Request<axum::body::Body>, next: axum::middleware::Next,
+) -> Result<axum::response::Response, StatusCode> {
+	if services().globals.shutdown.load(atomic::Ordering::Relaxed) {
+		return Err(StatusCode::SERVICE_UNAVAILABLE);
+	}
+
+	let fut = next.run(req);
+	let task = tokio::spawn(fut);
+	task.await.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
+}
+
+#[tracing::instrument(skip_all, name = "handle")]
+async fn request_handle(
+	req: http::Request<axum::body::Body>, next: axum::middleware::Next,
+) -> Result<axum::response::Response, StatusCode> {
+	let method = req.method().clone();
+	let uri = req.uri().clone();
+	let result = next.run(req).await;
+	request_result(&method, &uri, result)
+}
+
+fn request_result(
+	method: &Method, uri: &Uri, result: axum::response::Response,
+) -> Result<axum::response::Response, StatusCode> {
+	request_result_log(method, uri, &result);
+	match result.status() {
+		StatusCode::METHOD_NOT_ALLOWED => request_result_403(method, uri, &result),
+		_ => Ok(result),
+	}
+}
+
+#[allow(clippy::unnecessary_wraps)]
+fn request_result_403(
+	_method: &Method, _uri: &Uri, result: &axum::response::Response,
+) -> Result<axum::response::Response, StatusCode> {
+	let error = UiaaResponse::MatrixError(RumaError {
+		status_code: result.status(),
+		body: ErrorBody::Standard {
+			kind: ErrorKind::Unrecognized,
+			message: "M_UNRECOGNIZED: Method not allowed for endpoint".to_owned(),
+		},
+	});
+
+	Ok(RumaResponse(error).into_response())
+}
+
+fn request_result_log(method: &Method, uri: &Uri, result: &axum::response::Response) {
+	let status = result.status();
+	let reason = status.canonical_reason().unwrap_or("Unknown Reason");
+	let code = status.as_u16();
+	if status.is_server_error() {
+		error!(method = ?method, uri = ?uri, "{code} {reason}");
+	} else if status.is_client_error() {
+		debug_error!(method = ?method, uri = ?uri, "{code} {reason}");
+	} else if status.is_redirection() {
+		debug!(method = ?method, uri = ?uri, "{code} {reason}");
+	} else {
+		trace!(method = ?method, uri = ?uri, "{code} {reason}");
+	}
+}
+
+fn cors_layer(_server: &Server) -> CorsLayer {
+	const METHODS: [Method; 7] = [
+		Method::GET,
+		Method::HEAD,
+		Method::PATCH,
+		Method::POST,
+		Method::PUT,
+		Method::DELETE,
+		Method::OPTIONS,
+	];
+
+	let headers: [HeaderName; 5] = [
+		header::ORIGIN,
+		HeaderName::from_lowercase(b"x-requested-with").unwrap(),
+		header::CONTENT_TYPE,
+		header::ACCEPT,
+		header::AUTHORIZATION,
+	];
+
+	CorsLayer::new()
+		.allow_origin(cors::Any)
+		.allow_methods(METHODS)
+		.allow_headers(headers)
+		.max_age(Duration::from_secs(86400))
+}
+
+#[cfg(any(feature = "zstd_compression", feature = "gzip_compression", feature = "brotli_compression"))]
+fn compression_layer(server: &Server) -> tower_http::compression::CompressionLayer {
+	let mut compression_layer = tower_http::compression::CompressionLayer::new();
+
+	#[cfg(feature = "zstd_compression")]
+	{
+		if server.config.zstd_compression {
+			compression_layer = compression_layer.zstd(true);
+		} else {
+			compression_layer = compression_layer.no_zstd();
+		};
+	};
+
+	#[cfg(feature = "gzip_compression")]
+	{
+		if server.config.gzip_compression {
+			compression_layer = compression_layer.gzip(true);
+		} else {
+			compression_layer = compression_layer.no_gzip();
+		};
+	};
+
+	#[cfg(feature = "brotli_compression")]
+	{
+		if server.config.brotli_compression {
+			compression_layer = compression_layer.br(true);
+		} else {
+			compression_layer = compression_layer.no_br();
+		};
+	};
+
+	compression_layer
+}
+
+fn tracing_span<T>(request: &http::Request<T>) -> tracing::Span {
+	let path = if let Some(path) = request.extensions().get::<MatchedPath>() {
+		path.as_str()
+	} else {
+		request.uri().path()
+	};
+
+	tracing::info_span!("router:", %path)
+}
+
+#[allow(clippy::needless_pass_by_value)]
+fn catch_panic_layer(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_util::Full<bytes::Bytes>> {
+	let details = if let Some(s) = err.downcast_ref::<String>() {
+		s.clone()
+	} else if let Some(s) = err.downcast_ref::<&str>() {
+		s.to_string()
+	} else {
+		"Unknown internal server error occurred.".to_owned()
+	};
+
+	let body = serde_json::json!({
+		"errcode": "M_UNKNOWN",
+		"error": "M_UNKNOWN: Internal server error occurred",
+		"details": details,
+	})
+	.to_string();
+
+	http::Response::builder()
+		.status(StatusCode::INTERNAL_SERVER_ERROR)
+		.header(header::CONTENT_TYPE, "application/json")
+		.body(http_body_util::Full::from(body))
+		.expect("Failed to create response for our panic catcher?")
+}

src/service/admin/appservice/appservice_command.rs

@@ -4,7 +4,7 @@ use crate::{service::admin::escape_html, services, Result};
 
 pub(crate) async fn register(body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
-		let appservice_config = body[1..body.len() - 1].join("\n");
+		let appservice_config = body[1..body.len().checked_sub(1).unwrap()].join("\n");
 		let parsed_config = serde_yaml::from_str::<Registration>(&appservice_config);
 		match parsed_config {
 			Ok(yaml) => match services().appservice.register_appservice(yaml).await {

src/service/admin/debug/debug_commands.rs

@@ -8,7 +8,10 @@ use tokio::sync::RwLock;
 use tracing::{debug, info, warn};
 use tracing_subscriber::EnvFilter;
 
-use crate::{api::server_server::parse_incoming_pdu, services, utils::HtmlEscape, Error, PduEvent, Result};
+use crate::{
+	api::server_server::parse_incoming_pdu, service::sending::send::resolve_actual_dest, services, utils::HtmlEscape,
+	Error, PduEvent, Result,
+};
 
 pub(crate) async fn get_auth_chain(_body: Vec<&str>, event_id: Box<EventId>) -> Result<RoomMessageEventContent> {
 	let event_id = Arc::<EventId>::from(event_id);
@@ -118,7 +121,7 @@ pub(crate) async fn get_remote_pdu_list(
 	if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
 		let list = body
 			.clone()
-			.drain(1..body.len() - 1)
+			.drain(1..body.len().checked_sub(1).unwrap())
 			.filter_map(|pdu| EventId::parse(pdu).ok())
 			.collect::<Vec<_>>();
 
@@ -331,7 +334,7 @@ pub(crate) async fn change_log_level(
 		match services()
 			.globals
 			.tracing_reload_handle
-			.modify(|filter| *filter = old_filter_layer)
+			.reload(&old_filter_layer)
 		{
 			Ok(()) => {
 				return Ok(RoomMessageEventContent::text_plain(format!(
@@ -360,7 +363,7 @@ pub(crate) async fn change_log_level(
 		match services()
 			.globals
 			.tracing_reload_handle
-			.modify(|filter| *filter = new_filter_layer)
+			.reload(&new_filter_layer)
 		{
 			Ok(()) => {
 				return Ok(RoomMessageEventContent::text_plain("Successfully changed log level"));
@@ -378,7 +381,7 @@ pub(crate) async fn change_log_level(
 
 pub(crate) async fn sign_json(body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
-		let string = body[1..body.len() - 1].join("\n");
+		let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
 		match serde_json::from_str(&string) {
 			Ok(mut value) => {
 				ruma::signatures::sign_json(
@@ -401,7 +404,7 @@ pub(crate) async fn sign_json(body: Vec<&str>) -> Result<RoomMessageEventContent
 
 pub(crate) async fn verify_json(body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
-		let string = body[1..body.len() - 1].join("\n");
+		let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
 		match serde_json::from_str(&string) {
 			Ok(value) => {
 				let pub_key_map = RwLock::new(BTreeMap::new());
@@ -428,3 +431,38 @@ pub(crate) async fn verify_json(body: Vec<&str>) -> Result<RoomMessageEventConte
 		))
 	}
 }
+
+pub(crate) async fn resolve_true_destination(
+	_body: Vec<&str>, server_name: Box<ServerName>, no_cache: bool,
+) -> Result<RoomMessageEventContent> {
+	if !services().globals.config.allow_federation {
+		return Ok(RoomMessageEventContent::text_plain(
+			"Federation is disabled on this homeserver.",
+		));
+	}
+
+	if server_name == services().globals.config.server_name {
+		return Ok(RoomMessageEventContent::text_plain(
+			"Not allowed to send federation requests to ourselves. Please use `get-pdu` for fetching local PDUs.",
+		));
+	}
+
+	let (actual_dest, hostname_uri) = resolve_actual_dest(&server_name, no_cache, true).await?;
+
+	Ok(RoomMessageEventContent::text_plain(format!(
+		"Actual destination: {actual_dest:?} | Hostname URI: {hostname_uri}"
+	)))
+}
+
+pub(crate) fn memory_stats() -> RoomMessageEventContent {
+	let html_body = crate::alloc::memory_stats();
+
+	if html_body.is_empty() {
+		return RoomMessageEventContent::text_plain("malloc stats are not supported on your compiled malloc.");
+	}
+
+	RoomMessageEventContent::text_html(
+		"This command's output can only be viewed by clients that render HTML.".to_owned(),
+		html_body,
+	)
+}

src/service/admin/debug/mod.rs

@@ -3,7 +3,7 @@ use ruma::{events::room::message::RoomMessageEventContent, EventId, RoomId, Serv
 
 use self::debug_commands::{
 	change_log_level, force_device_list_updates, get_auth_chain, get_pdu, get_remote_pdu, get_remote_pdu_list,
-	get_room_state, parse_pdu, ping, sign_json, verify_json,
+	get_room_state, memory_stats, parse_pdu, ping, resolve_true_destination, sign_json, verify_json,
 };
 use crate::Result;
 
@@ -106,6 +106,20 @@ pub(crate) enum DebugCommand {
 	/// This command needs a JSON blob provided in a Markdown code block below
 	/// the command.
 	VerifyJson,
+
+	/// - Runs a server name through conduwuit's true destination resolution
+	///   process
+	///
+	/// Useful for debugging well-known issues
+	ResolveTrueDestination {
+		server_name: Box<ServerName>,
+
+		#[arg(short, long)]
+		no_cache: bool,
+	},
+
+	/// - Print extended memory usage
+	MemoryStats,
 }
 
 pub(crate) async fn process(command: DebugCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
@@ -138,5 +152,10 @@ pub(crate) async fn process(command: DebugCommand, body: Vec<&str>) -> Result<Ro
 			server,
 			force,
 		} => get_remote_pdu_list(body, server, force).await?,
+		DebugCommand::ResolveTrueDestination {
+			server_name,
+			no_cache,
+		} => resolve_true_destination(body, server_name, no_cache).await?,
+		DebugCommand::MemoryStats => memory_stats(),
 	})
 }

src/service/admin/federation/federation_commands.rs

@@ -1,8 +1,13 @@
 use std::fmt::Write as _;
 
-use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName};
+use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, RoomId, ServerName, UserId};
 
-use crate::{services, utils::HtmlEscape, Result};
+use crate::{
+	service::admin::{escape_html, get_room_info},
+	services,
+	utils::HtmlEscape,
+	Result,
+};
 
 pub(crate) async fn disable_room(_body: Vec<&str>, room_id: Box<RoomId>) -> Result<RoomMessageEventContent> {
 	services().rooms.metadata.disable_room(&room_id, true)?;
@@ -70,3 +75,60 @@ pub(crate) async fn fetch_support_well_known(
 		),
 	))
 }
+
+pub(crate) async fn remote_user_in_rooms(_body: Vec<&str>, user_id: Box<UserId>) -> Result<RoomMessageEventContent> {
+	if user_id.server_name() == services().globals.config.server_name {
+		return Ok(RoomMessageEventContent::text_plain(
+			"User belongs to our server, please use `list-joined-rooms` user admin command instead.",
+		));
+	}
+
+	if !services().users.exists(&user_id)? {
+		return Ok(RoomMessageEventContent::text_plain(
+			"Remote user does not exist in our database.",
+		));
+	}
+
+	let mut rooms: Vec<(OwnedRoomId, u64, String)> = services()
+		.rooms
+		.state_cache
+		.rooms_joined(&user_id)
+		.filter_map(Result::ok)
+		.map(|room_id| get_room_info(&room_id))
+		.collect();
+
+	if rooms.is_empty() {
+		return Ok(RoomMessageEventContent::text_plain("User is not in any rooms."));
+	}
+
+	rooms.sort_by_key(|r| r.1);
+	rooms.reverse();
+
+	let output_plain = format!(
+		"Rooms {user_id} shares with us:\n{}",
+		rooms
+			.iter()
+			.map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}"))
+			.collect::<Vec<_>>()
+			.join("\n")
+	);
+	let output_html = format!(
+		"<table><caption>Rooms {user_id} shares with \
+		 us</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
+		rooms
+			.iter()
+			.fold(String::new(), |mut output, (id, members, name)| {
+				writeln!(
+					output,
+					"<tr><td>{}</td>\t<td>{}</td>\t<td>{}</td></tr>",
+					escape_html(id.as_ref()),
+					members,
+					escape_html(name)
+				)
+				.unwrap();
+				output
+			})
+	);
+
+	Ok(RoomMessageEventContent::text_html(output_plain, output_html))
+}

src/service/admin/federation/mod.rs

@@ -1,7 +1,9 @@
 use clap::Subcommand;
-use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName};
+use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName, UserId};
 
-use self::federation_commands::{disable_room, enable_room, fetch_support_well_known, incoming_federeation};
+use self::federation_commands::{
+	disable_room, enable_room, fetch_support_well_known, incoming_federeation, remote_user_in_rooms,
+};
 use crate::Result;
 
 pub(crate) mod federation_commands;
@@ -34,6 +36,11 @@ pub(crate) enum FederationCommand {
 	FetchSupportWellKnown {
 		server_name: Box<ServerName>,
 	},
+
+	/// - Lists all the rooms we share/track with the specified *remote* user
+	RemoteUserInRooms {
+		user_id: Box<UserId>,
+	},
 }
 
 pub(crate) async fn process(command: FederationCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
@@ -48,5 +55,8 @@ pub(crate) async fn process(command: FederationCommand, body: Vec<&str>) -> Resu
 		FederationCommand::FetchSupportWellKnown {
 			server_name,
 		} => fetch_support_well_known(body, server_name).await?,
+		FederationCommand::RemoteUserInRooms {
+			user_id,
+		} => remote_user_in_rooms(body, user_id).await?,
 	})
 }

src/service/admin/media/media_commands.rs

@@ -139,14 +139,19 @@ pub(crate) async fn delete(
 
 pub(crate) async fn delete_list(body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
-		let mxc_list = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
+		let mxc_list = body
+			.clone()
+			.drain(1..body.len().checked_sub(1).unwrap())
+			.collect::<Vec<_>>();
 
-		let mut mxc_deletion_count = 0;
+		let mut mxc_deletion_count: usize = 0;
 
 		for mxc in mxc_list {
 			debug!("Deleting MXC {mxc} in bulk");
 			services().media.delete(mxc.to_owned()).await?;
-			mxc_deletion_count += 1;
+			mxc_deletion_count = mxc_deletion_count
+				.checked_add(1)
+				.expect("mxc_deletion_count should not get this high");
 		}
 
 		return Ok(RoomMessageEventContent::text_plain(format!(

src/service/admin/mod.rs

@@ -23,10 +23,10 @@ use ruma::{
 	EventId, MxcUri, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId, RoomVersionId, ServerName, UserId,
 };
 use serde_json::value::to_raw_value;
-use tokio::sync::Mutex;
+use tokio::sync::{Mutex, MutexGuard};
 use tracing::{error, warn};
 
-use self::fsck::FsckCommand;
+use self::{fsck::FsckCommand, tester::TesterCommands};
 use super::pdu::PduBuilder;
 use crate::{
 	service::admin::{
@@ -44,6 +44,7 @@ pub(crate) mod media;
 pub(crate) mod query;
 pub(crate) mod room;
 pub(crate) mod server;
+pub(crate) mod tester;
 pub(crate) mod user;
 
 const PAGE_SIZE: usize = 100;
@@ -87,6 +88,9 @@ enum AdminCommand {
 	#[command(subcommand)]
 	/// - Query all the database getters and iterators
 	Fsck(FsckCommand),
+
+	#[command(subcommand)]
+	Tester(TesterCommands),
 }
 
 #[derive(Debug)]
@@ -119,98 +123,113 @@ impl Service {
 		});
 	}
 
+	pub(crate) async fn process_message(&self, room_message: String, event_id: Arc<EventId>) {
+		self.send(AdminRoomEvent::ProcessMessage(room_message, event_id))
+			.await;
+	}
+
+	pub(crate) async fn send_message(&self, message_content: RoomMessageEventContent) {
+		self.send(AdminRoomEvent::SendMessage(message_content))
+			.await;
+	}
+
+	async fn send(&self, message: AdminRoomEvent) {
+		debug_assert!(!self.sender.is_full(), "channel full");
+		debug_assert!(!self.sender.is_closed(), "channel closed");
+		self.sender.send(message).expect("message sent");
+	}
+
 	async fn handler(&self) -> Result<()> {
 		let receiver = self.receiver.lock().await;
-		// TODO: Use futures when we have long admin commands
+		let Ok(Some(admin_room)) = Self::get_admin_room().await else {
-		//let mut futures = FuturesUnordered::new();
+			return Ok(());
+		};
+		let server_name = services().globals.server_name();
+		let server_user = UserId::parse(format!("@conduit:{server_name}")).expect("server's username is valid");
 
-		let conduit_user = UserId::parse(format!("@conduit:{}", services().globals.server_name()))
+		loop {
-			.expect("@conduit:server_name is valid");
+			debug_assert!(!receiver.is_closed(), "channel closed");
-
+			tokio::select! {
-		if let Ok(Some(conduit_room)) = Self::get_admin_room() {
+				event = receiver.recv_async() => match event {
-			loop {
+					Ok(event) => self.handle_event(event, &admin_room, &server_user).await?,
-				tokio::select! {
+					Err(e) => error!("Failed to receive admin room event from channel: {e}"),
-						event = receiver.recv_async() => {
-							match event {
-								Ok(event) => {
-									let (mut message_content, reply) = match event {
-										AdminRoomEvent::SendMessage(content) => (content, None),
-										AdminRoomEvent::ProcessMessage(room_message, reply_id) => {
-											(self.process_admin_message(room_message).await, Some(reply_id))
-										}
-									};
-
-									let mutex_state = Arc::clone(
-										services().globals
-											.roomid_mutex_state
-											.write()
-											.await
-											.entry(conduit_room.clone())
-											.or_default(),
-									);
-
-									let state_lock = mutex_state.lock().await;
-
-									if let Some(reply) = reply {
-										message_content.relates_to = Some(Reply { in_reply_to: InReplyTo { event_id: reply.into() } });
-									}
-
-									if let Err(e) = services().rooms.timeline.build_and_append_pdu(
-										PduBuilder {
-										  event_type: TimelineEventType::RoomMessage,
-										  content: to_raw_value(&message_content)
-											  .expect("event is valid, we just created it"),
-										  unsigned: None,
-										  state_key: None,
-										  redacts: None,
-										},
-										&conduit_user,
-										&conduit_room,
-										&state_lock)
-									  .await {
-										error!("Failed to build and append admin room response PDU: \"{e}\"");
-
-										let error_room_message = RoomMessageEventContent::text_plain(format!("Failed to build and append admin room PDU: \"{e}\"\n\nThe original admin command may have finished successfully, but we could not return the output."));
-
-										services().rooms.timeline.build_and_append_pdu(
-											PduBuilder {
-											  event_type: TimelineEventType::RoomMessage,
-											  content: to_raw_value(&error_room_message)
-												  .expect("event is valid, we just created it"),
-											  unsigned: None,
-											  state_key: None,
-											  redacts: None,
-											},
-											&conduit_user,
-											&conduit_room,
-											&state_lock)
-										  .await?;
-									}
-									drop(state_lock);
-							}
-							Err(e) => {
-								 // generally shouldn't happen
-								 error!("Failed to receive admin room event from channel: {e}");
-							}
-						}
-					}
 				}
 			}
 		}
+	}
+
+	async fn handle_event(&self, event: AdminRoomEvent, admin_room: &OwnedRoomId, server_user: &UserId) -> Result<()> {
+		let (mut message_content, reply) = match event {
+			AdminRoomEvent::SendMessage(content) => (content, None),
+			AdminRoomEvent::ProcessMessage(room_message, reply_id) => {
+				(self.process_admin_message(room_message).await, Some(reply_id))
+			},
+		};
+
+		let mutex_state = Arc::clone(
+			services()
+				.globals
+				.roomid_mutex_state
+				.write()
+				.await
+				.entry(admin_room.clone())
+				.or_default(),
+		);
+		let state_lock = mutex_state.lock().await;
+
+		if let Some(reply) = reply {
+			message_content.relates_to = Some(Reply {
+				in_reply_to: InReplyTo {
+					event_id: reply.into(),
+				},
+			});
+		}
+
+		let response_pdu = PduBuilder {
+			event_type: TimelineEventType::RoomMessage,
+			content: to_raw_value(&message_content).expect("event is valid, we just created it"),
+			unsigned: None,
+			state_key: None,
+			redacts: None,
+		};
+
+		if let Err(e) = services()
+			.rooms
+			.timeline
+			.build_and_append_pdu(response_pdu, server_user, admin_room, &state_lock)
+			.await
+		{
+			self.handle_response_error(&e, admin_room, server_user, &state_lock)
+				.await?;
+		}
 
 		Ok(())
 	}
 
-	pub(crate) fn process_message(&self, room_message: String, event_id: Arc<EventId>) {
+	async fn handle_response_error(
-		self.sender
+		&self, e: &Error, admin_room: &OwnedRoomId, server_user: &UserId, state_lock: &MutexGuard<'_, ()>,
-			.send(AdminRoomEvent::ProcessMessage(room_message, event_id))
+	) -> Result<()> {
-			.unwrap();
+		error!("Failed to build and append admin room response PDU: \"{e}\"");
-	}
+		let error_room_message = RoomMessageEventContent::text_plain(format!(
+			"Failed to build and append admin room PDU: \"{e}\"\n\nThe original admin command may have finished \
+			 successfully, but we could not return the output."
+		));
 
-	pub(crate) fn send_message(&self, message_content: RoomMessageEventContent) {
+		let response_pdu = PduBuilder {
-		self.sender
+			event_type: TimelineEventType::RoomMessage,
-			.send(AdminRoomEvent::SendMessage(message_content))
+			content: to_raw_value(&error_room_message).expect("event is valid, we just created it"),
-			.unwrap();
+			unsigned: None,
+			state_key: None,
+			redacts: None,
+		};
+
+		services()
+			.rooms
+			.timeline
+			.build_and_append_pdu(response_pdu, server_user, admin_room, state_lock)
+			.await?;
+
+		Ok(())
 	}
 
 	// Parse and process a message from the admin room
@@ -289,6 +308,7 @@ impl Service {
 			AdminCommand::Debug(command) => debug::process(command, body).await?,
 			AdminCommand::Query(command) => query::process(command, body).await?,
 			AdminCommand::Fsck(command) => fsck::process(command, body).await?,
+			AdminCommand::Tester(command) => tester::process(command, body).await?,
 		};
 
 		Ok(reply_message_content)
@@ -387,10 +407,10 @@ impl Service {
 		let state_lock = mutex_state.lock().await;
 
 		// Create a user for the server
-		let conduit_user = UserId::parse_with_server_name("conduit", services().globals.server_name())
+		let server_user = UserId::parse_with_server_name("conduit", services().globals.server_name())
 			.expect("@conduit:server_name is valid");
 
-		services().users.create(&conduit_user, None)?;
+		services().users.create(&server_user, None)?;
 
 		let room_version = services().globals.default_room_version();
 		let mut content = match room_version {
@@ -403,7 +423,7 @@ impl Service {
 			| RoomVersionId::V7
 			| RoomVersionId::V8
 			| RoomVersionId::V9
-			| RoomVersionId::V10 => RoomCreateEventContent::new_v1(conduit_user.clone()),
+			| RoomVersionId::V10 => RoomCreateEventContent::new_v1(server_user.clone()),
 			RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
 			_ => {
 				warn!("Unexpected or unsupported room version {}", room_version);
@@ -430,7 +450,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -455,10 +475,10 @@ impl Service {
 					})
 					.expect("event is valid, we just created it"),
 					unsigned: None,
-					state_key: Some(conduit_user.to_string()),
+					state_key: Some(server_user.to_string()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -466,7 +486,7 @@ impl Service {
 
 		// 3. Power levels
 		let mut users = BTreeMap::new();
-		users.insert(conduit_user.clone(), 100.into());
+		users.insert(server_user.clone(), 100.into());
 
 		services()
 			.rooms
@@ -483,7 +503,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -502,7 +522,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -521,7 +541,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -540,7 +560,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -560,7 +580,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -580,7 +600,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -606,7 +626,7 @@ impl Service {
 					state_key: Some(String::new()),
 					redacts: None,
 				},
-				&conduit_user,
+				&server_user,
 				&room_id,
 				&state_lock,
 			)
@@ -621,7 +641,7 @@ impl Service {
 	///
 	/// Errors are propagated from the database, and will have None if there is
 	/// no admin room
-	pub(crate) fn get_admin_room() -> Result<Option<OwnedRoomId>> {
+	pub(crate) async fn get_admin_room() -> Result<Option<OwnedRoomId>> {
 		let admin_room_alias: Box<RoomAliasId> = format!("#admins:{}", services().globals.server_name())
 			.try_into()
 			.expect("#admins:server_name is a valid alias name");
@@ -636,7 +656,7 @@ impl Service {
 	///
 	/// In conduit, this is equivalent to granting admin privileges.
 	pub(crate) async fn make_user_admin(&self, user_id: &UserId, displayname: String) -> Result<()> {
-		if let Some(room_id) = Self::get_admin_room()? {
+		if let Some(room_id) = Self::get_admin_room().await? {
 			let mutex_state = Arc::clone(
 				services()
 					.globals
@@ -649,7 +669,7 @@ impl Service {
 			let state_lock = mutex_state.lock().await;
 
 			// Use the server user to grant the new admin's power level
-			let conduit_user = UserId::parse_with_server_name("conduit", services().globals.server_name())
+			let server_user = UserId::parse_with_server_name("conduit", services().globals.server_name())
 				.expect("@conduit:server_name is valid");
 
 			// Invite and join the real user
@@ -674,7 +694,7 @@ impl Service {
 						state_key: Some(user_id.to_string()),
 						redacts: None,
 					},
-					&conduit_user,
+					&server_user,
 					&room_id,
 					&state_lock,
 				)
@@ -708,7 +728,7 @@ impl Service {
 
 			// Set power level
 			let mut users = BTreeMap::new();
-			users.insert(conduit_user.clone(), 100.into());
+			users.insert(server_user.clone(), 100.into());
 			users.insert(user_id.to_owned(), 100.into());
 
 			services()
@@ -726,7 +746,7 @@ impl Service {
 						state_key: Some(String::new()),
 						redacts: None,
 					},
-					&conduit_user,
+					&server_user,
 					&room_id,
 					&state_lock,
 				)
@@ -745,7 +765,7 @@ impl Service {
                 state_key: None,
                 redacts: None,
             },
-            &conduit_user,
+            &server_user,
             &room_id,
             &state_lock,
         ).await?;

src/service/admin/room/room_commands.rs

@@ -22,7 +22,7 @@ pub(crate) async fn list(_body: Vec<&str>, page: Option<usize>) -> Result<RoomMe
 
 	let rooms = rooms
 		.into_iter()
-		.skip(page.saturating_sub(1) * PAGE_SIZE)
+		.skip(page.saturating_sub(1).saturating_mul(PAGE_SIZE))
 		.take(PAGE_SIZE)
 		.collect::<Vec<_>>();
 

src/service/admin/room/room_directory_commands.rs

@@ -39,7 +39,7 @@ pub(crate) async fn process(command: RoomDirectoryCommand, _body: Vec<&str>) ->
 
 			let rooms = rooms
 				.into_iter()
-				.skip(page.saturating_sub(1) * PAGE_SIZE)
+				.skip(page.saturating_sub(1).saturating_mul(PAGE_SIZE))
 				.take(PAGE_SIZE)
 				.collect::<Vec<_>>();
 

src/service/admin/room/room_moderation_commands.rs

@@ -9,7 +9,9 @@ use super::RoomModerationCommand;
 use crate::{
 	api::client_server::{get_alias_helper, leave_room},
 	service::admin::{escape_html, Service},
-	services, Result,
+	services,
+	utils::user_id::user_is_local,
+	Result,
 };
 
 pub(crate) async fn process(command: RoomModerationCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
@@ -25,7 +27,7 @@ pub(crate) async fn process(command: RoomModerationCommand, body: Vec<&str>) ->
 				.try_into()
 				.expect("#admins:server_name is a valid alias name");
 
-			if let Some(admin_room_id) = Service::get_admin_room()? {
+			if let Some(admin_room_id) = Service::get_admin_room().await? {
 				if room.to_string().eq(&admin_room_id) || room.to_string().eq(&admin_room_alias) {
 					return Ok(RoomMessageEventContent::text_plain("Not allowed to ban the admin room."));
 				}
@@ -102,11 +104,10 @@ pub(crate) async fn process(command: RoomModerationCommand, body: Vec<&str>) ->
 					.room_members(&room_id)
 					.filter_map(|user| {
 						user.ok().filter(|local_user| {
-							local_user.server_name() == services().globals.server_name()
+							user_is_local(local_user)
                             // additional wrapped check here is to avoid adding remote users
                             // who are in the admin room to the list of local users (would fail auth check)
-                            && (local_user.server_name()
+                            && (user_is_local(local_user)
-                                == services().globals.server_name()
                                 && services()
                                     .users
                                     .is_admin(local_user)
@@ -190,7 +191,7 @@ pub(crate) async fn process(command: RoomModerationCommand, body: Vec<&str>) ->
 				for &room in &rooms_s {
 					match <&RoomOrAliasId>::try_from(room) {
 						Ok(room_alias_or_id) => {
-							if let Some(admin_room_id) = Service::get_admin_room()? {
+							if let Some(admin_room_id) = Service::get_admin_room().await? {
 								if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(&admin_room_alias) {
 									info!("User specified admin room in bulk ban list, ignoring");
 									continue;

src/service/admin/server/mod.rs

@@ -5,13 +5,16 @@ use ruma::events::room::message::RoomMessageEventContent;
 
 use self::server_commands::{
 	backup_database, clear_database_caches, clear_service_caches, list_backups, list_database_files, memory_usage,
-	show_config,
+	show_config, uptime,
 };
 use crate::Result;
 
 #[cfg_attr(test, derive(Debug))]
 #[derive(Subcommand)]
 pub(crate) enum ServerCommand {
+	/// - Time elapsed since startup
+	Uptime,
+
 	/// - Show configuration values
 	ShowConfig,
 
@@ -43,6 +46,7 @@ pub(crate) enum ServerCommand {
 
 pub(crate) async fn process(command: ServerCommand, body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	Ok(match command {
+		ServerCommand::Uptime => uptime(body).await?,
 		ServerCommand::ShowConfig => show_config(body).await?,
 		ServerCommand::MemoryUsage => memory_usage(body).await?,
 		ServerCommand::ClearDatabaseCaches {

src/service/admin/server/server_commands.rs

@@ -2,17 +2,41 @@ use ruma::events::room::message::RoomMessageEventContent;
 
 use crate::{services, Result};
 
+pub(crate) async fn uptime(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
+	let seconds = services()
+		.globals
+		.started
+		.elapsed()
+		.expect("standard duration")
+		.as_secs();
+	let result = format!(
+		"up {} days, {} hours, {} minutes, {} seconds.",
+		seconds / 86400,
+		(seconds % 86400) / 60 / 60,
+		(seconds % 3600) / 60,
+		seconds % 60,
+	);
+
+	Ok(RoomMessageEventContent::notice_html(String::new(), result))
+}
+
 pub(crate) async fn show_config(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	// Construct and send the response
 	Ok(RoomMessageEventContent::text_plain(format!("{}", services().globals.config)))
 }
 
 pub(crate) async fn memory_usage(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
-	let response1 = services().memory_usage().await;
+	let response0 = services().memory_usage().await;
-	let response2 = services().globals.db.memory_usage();
+	let response1 = services().globals.db.memory_usage();
+	let response2 = crate::alloc::memory_usage();
 
 	Ok(RoomMessageEventContent::text_plain(format!(
-		"Services:\n{response1}\n\nDatabase:\n{response2}"
+		"Services:\n{response0}\n\nDatabase:\n{response1}\n{}",
+		if !response2.is_empty() {
+			format!("Allocator:\n {response2}")
+		} else {
+			String::new()
+		}
 	)))
 }
 

src/service/admin/test_cmd/mod.rs

@@ -0,0 +1,41 @@
+//! test commands generally used for hot lib reloadable functions.
+//! see <https://github.com/rksm/hot-lib-reloader-rs?tab=readme-ov-file#usage> for more details if you are a dev
+
+//#[cfg(not(feature = "hot_reload"))]
+//#[allow(unused_imports)]
+//#[allow(clippy::wildcard_imports)]
+// non hot reloadable functions (?)
+//use hot_lib::*;
+#[cfg(feature = "hot_reload")]
+#[allow(unused_imports)]
+#[allow(clippy::wildcard_imports)]
+use hot_lib_funcs::*;
+use ruma::events::room::message::RoomMessageEventContent;
+
+use crate::{debug_error, Result};
+
+#[cfg(feature = "hot_reload")]
+#[hot_lib_reloader::hot_module(dylib = "lib")]
+mod hot_lib_funcs {
+	// these will be functions from lib.rs, so `use hot_lib_funcs::test_command;`
+	hot_functions_from_file!("hot_lib/src/lib.rs");
+}
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(clap::Subcommand)]
+pub(crate) enum TestCommands {
+	// !admin test test1
+	Test1,
+}
+
+pub(crate) async fn process(command: TestCommands, _body: Vec<&str>) -> Result<RoomMessageEventContent> {
+	Ok(match command {
+		TestCommands::Test1 => {
+			debug_error!("before calling test_command");
+			test_command();
+			debug_error!("after calling test_command");
+
+			RoomMessageEventContent::notice_plain(String::from("loaded"))
+		},
+	})
+}

src/service/admin/tester/mod.rs

@@ -0,0 +1,14 @@
+use ruma::events::room::message::RoomMessageEventContent;
+
+use crate::Result;
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(clap::Subcommand)]
+pub(crate) enum TesterCommands {
+	Tester,
+}
+pub(crate) async fn process(command: TesterCommands, _body: Vec<&str>) -> Result<RoomMessageEventContent> {
+	Ok(match command {
+		TesterCommands::Tester => RoomMessageEventContent::notice_plain(String::from("complete")),
+	})
+}

src/service/admin/user/user_commands.rs

@@ -1,20 +1,20 @@
 use std::{fmt::Write as _, sync::Arc};
 
-use itertools::Itertools;
 use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId};
-use tracing::{error, info, warn};
 
 use crate::{
-	api::client_server::{join_room_by_id_helper, leave_all_rooms, AUTO_GEN_PASSWORD_LENGTH},
+	api::client_server::{auto_join_rooms, leave_all_rooms, AUTO_GEN_PASSWORD_LENGTH},
 	service::admin::{escape_html, get_room_info},
-	services, utils, Result,
+	services,
+	utils::{self, user_id::user_is_local},
+	Result,
 };
 
 pub(crate) async fn list(_body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	match services().users.list_local_users() {
 		Ok(users) => {
 			let mut msg = format!("Found {} local user account(s):\n", users.len());
-			msg += &users.join("\n");
+			_ = write!(msg, "{}\n", users.join("\n"));
 			Ok(RoomMessageEventContent::text_plain(&msg))
 		},
 		Err(e) => Ok(RoomMessageEventContent::text_plain(e.to_string())),
@@ -27,15 +27,23 @@ pub(crate) async fn create(
 	let password = password.unwrap_or_else(|| utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
 
 	// Validate user id
-	let user_id =
+	let user_id = match UserId::parse_with_server_name(
-		match UserId::parse_with_server_name(username.as_str().to_lowercase(), services().globals.server_name()) {
+		username.as_str().to_lowercase(),
-			Ok(id) => id,
+		&services().globals.config.server_name,
-			Err(e) => {
+	) {
-				return Ok(RoomMessageEventContent::text_plain(format!(
+		Ok(id) => id,
-					"The supplied username is not a valid username: {e}"
+		Err(e) => {
-				)))
+			return Ok(RoomMessageEventContent::text_plain(format!(
-			},
+				"The supplied username is not a valid username: {e}"
-		};
+			)))
+		},
+	};
+
+	if !user_is_local(&user_id) {
+		return Ok(RoomMessageEventContent::text_plain(format!(
+			"User {user_id} does not belong to our server."
+		)));
+	}
 
 	if user_id.is_historical() {
 		return Ok(RoomMessageEventContent::text_plain(format!(
@@ -54,8 +62,13 @@ pub(crate) async fn create(
 
 	// If `new_user_displayname_suffix` is set, registration will push whatever
 	// content is set to the user's display name with a space before it
-	if !services().globals.new_user_displayname_suffix().is_empty() {
+	if !services()
-		displayname.push_str(&(" ".to_owned() + services().globals.new_user_displayname_suffix()));
+		.globals
+		.config
+		.new_user_displayname_suffix
+		.is_empty()
+	{
+		_ = write!(displayname, " {}", services().globals.config.new_user_displayname_suffix);
 	}
 
 	services()
@@ -79,36 +92,7 @@ pub(crate) async fn create(
 	)?;
 
 	if !services().globals.config.auto_join_rooms.is_empty() {
-		for room in &services().globals.config.auto_join_rooms {
+		auto_join_rooms(&user_id).await?;
-			if !services()
-				.rooms
-				.state_cache
-				.server_in_room(services().globals.server_name(), room)?
-			{
-				warn!("Skipping room {room} to automatically join as we have never joined before.");
-				continue;
-			}
-
-			if let Some(room_id_server_name) = room.server_name() {
-				match join_room_by_id_helper(
-					Some(&user_id),
-					room,
-					Some("Automatically joining this room upon registration".to_owned()),
-					&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],
-					None,
-				)
-				.await
-				{
-					Ok(_) => {
-						info!("Automatically joined room {room} for user {user_id}");
-					},
-					Err(e) => {
-						// don't return this error so we don't fail registrations
-						error!("Failed to automatically join room {room} for user {user_id}: {e}");
-					},
-				};
-			}
-		}
 	}
 
 	// we dont add a device since we're not the user, just the creator
@@ -145,7 +129,7 @@ pub(crate) async fn deactivate(
 		== UserId::parse_with_server_name("conduit", services().globals.server_name()).expect("conduit user exists")
 	{
 		return Ok(RoomMessageEventContent::text_plain(
-			"Not allowed to deactivate the Conduit service account.",
+			"Not allowed to deactivate the conduwuit service account.",
 		));
 	}
 
@@ -181,7 +165,7 @@ pub(crate) async fn reset_password(_body: Vec<&str>, username: String) -> Result
 		};
 
 	// check if user belongs to our server
-	if user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&user_id) {
 		return Ok(RoomMessageEventContent::text_plain(format!(
 			"User {user_id} does not belong to our server."
 		)));
@@ -227,7 +211,7 @@ pub(crate) async fn deactivate_all(body: Vec<&str>, leave_rooms: bool, force: bo
 			}
 		}
 
-		let mut deactivation_count = 0;
+		let mut deactivation_count: usize = 0;
 		let mut admins = Vec::new();
 
 		if !force {
@@ -246,7 +230,7 @@ pub(crate) async fn deactivate_all(body: Vec<&str>, leave_rooms: bool, force: bo
 
 		for &user_id in &user_ids {
 			// check if user belongs to our server and skips over non-local users
-			if user_id.server_name() != services().globals.server_name() {
+			if !user_is_local(user_id) {
 				continue;
 			}
 
@@ -264,7 +248,7 @@ pub(crate) async fn deactivate_all(body: Vec<&str>, leave_rooms: bool, force: bo
 			}
 
 			if services().users.deactivate_account(user_id).is_ok() {
-				deactivation_count += 1;
+				deactivation_count = deactivation_count.saturating_add(1);
 			}
 		}
 
@@ -304,7 +288,7 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
 			},
 		};
 
-	if user_id.server_name() != services().globals.server_name() {
+	if !user_is_local(&user_id) {
 		return Ok(RoomMessageEventContent::text_plain("User does not belong to our server."));
 	}
 
@@ -318,8 +302,6 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
 		.rooms_joined(&user_id)
 		.filter_map(Result::ok)
 		.map(|room_id| get_room_info(&room_id))
-		.sorted_unstable()
-		.dedup()
 		.collect();
 
 	if rooms.is_empty() {
@@ -330,7 +312,8 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
 	rooms.reverse();
 
 	let output_plain = format!(
-		"Rooms {user_id} Joined:\n{}",
+		"Rooms {user_id} Joined ({}):\n{}",
+		rooms.len(),
 		rooms
 			.iter()
 			.map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}"))
@@ -338,8 +321,9 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
 			.join("\n")
 	);
 	let output_html = format!(
-		"<table><caption>Rooms {user_id} \
+		"<table><caption>Rooms {user_id} Joined \
-		 Joined</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
+		 ({})</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
+		rooms.len(),
 		rooms
 			.iter()
 			.fold(String::new(), |mut output, (id, members, name)| {

src/service/globals/client.rs

@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use reqwest::redirect;
 
-use crate::{service::globals::resolver, Config, Result};
+use crate::{service::globals::resolver, utils::conduwuit_version, Config, Result};
 
 pub(crate) struct Client {
 	pub(crate) default: reqwest::Client,
@@ -87,10 +87,9 @@ impl Client {
 	}
 
 	fn base(config: &Config) -> Result<reqwest::ClientBuilder> {
-		let version = match option_env!("CONDUIT_VERSION_EXTRA") {
+		let version = conduwuit_version();
-			Some(extra) => format!("{} ({})", env!("CARGO_PKG_VERSION"), extra),
+
-			None => env!("CARGO_PKG_VERSION").to_owned(),
+		let user_agent = format!("Conduwuit/{version}");
-		};
 
 		let mut builder = reqwest::Client::builder()
 			.hickory_dns(true)
@@ -99,7 +98,7 @@ impl Client {
 			.timeout(Duration::from_secs(config.request_total_timeout))
 			.pool_idle_timeout(Duration::from_secs(config.request_idle_timeout))
 			.pool_max_idle_per_host(config.request_idle_per_host.into())
-			.user_agent("Conduwuit".to_owned() + "/" + &version)
+			.user_agent(user_agent)
 			.redirect(redirect::Policy::limited(6))
 			.connection_verbose(true);
 

src/service/globals/mod.rs

@@ -7,7 +7,7 @@ use std::{
 		atomic::{self, AtomicBool},
 		Arc,
 	},
-	time::Instant,
+	time::{Instant, SystemTime},
 };
 
 use argon2::Argon2;
@@ -27,10 +27,9 @@ use ruma::{
 };
 use tokio::sync::{broadcast, watch::Receiver, Mutex, RwLock};
 use tracing::{error, info, trace};
-use tracing_subscriber::{EnvFilter, Registry};
 use url::Url;
 
-use crate::{services, Config, Result};
+use crate::{services, Config, LogLevelReloadHandles, Result};
 
 mod client;
 mod data;
@@ -45,7 +44,7 @@ type SyncHandle = (
 pub(crate) struct Service<'a> {
 	pub(crate) db: &'static dyn Data,
 
-	pub(crate) tracing_reload_handle: tracing_subscriber::reload::Handle<EnvFilter, Registry>,
+	pub(crate) tracing_reload_handle: LogLevelReloadHandles,
 	pub(crate) config: Config,
 	pub(crate) cidr_range_denylist: Vec<IPAddress>,
 	keypair: Arc<ruma::signatures::Ed25519KeyPair>,
@@ -64,7 +63,7 @@ pub(crate) struct Service<'a> {
 	pub(crate) roomid_federationhandletime: RwLock<HashMap<OwnedRoomId, (OwnedEventId, Instant)>>,
 	pub(crate) stateres_mutex: Arc<Mutex<()>>,
 	pub(crate) rotate: RotationHandler,
-
+	pub(crate) started: SystemTime,
 	pub(crate) shutdown: AtomicBool,
 	pub(crate) argon: Argon2<'a>,
 }
@@ -99,8 +98,7 @@ impl Default for RotationHandler {
 
 impl Service<'_> {
 	pub(crate) fn load(
-		db: &'static dyn Data, config: &Config,
+		db: &'static dyn Data, config: &Config, tracing_reload_handle: LogLevelReloadHandles,
-		tracing_reload_handle: tracing_subscriber::reload::Handle<EnvFilter, Registry>,
 	) -> Result<Self> {
 		let keypair = db.load_keypair();
 
@@ -167,6 +165,7 @@ impl Service<'_> {
 			stateres_mutex: Arc::new(Mutex::new(())),
 			sync_receivers: RwLock::new(HashMap::new()),
 			rotate: RotationHandler::new(),
+			started: SystemTime::now(),
 			shutdown: AtomicBool::new(false),
 			argon,
 		};

src/service/globals/resolver.rs

@@ -30,6 +30,7 @@ pub(crate) struct Hooked {
 }
 
 impl Resolver {
+	#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 	pub(crate) fn new(config: &Config) -> Self {
 		let (sys_conf, mut opts) = hickory_resolver::system_conf::read_system_conf()
 			.map_err(|e| {
@@ -51,6 +52,10 @@ impl Resolver {
 		for sys_conf in sys_conf.name_servers() {
 			let mut ns = sys_conf.clone();
 
+			if config.query_over_tcp_only {
+				ns.protocol = hickory_resolver::config::Protocol::Tcp;
+			}
+
 			ns.trust_negative_responses = !config.query_all_nameservers;
 
 			conf.add_name_server(ns);
@@ -67,6 +72,14 @@ impl Resolver {
 		opts.num_concurrent_reqs = 1;
 		opts.shuffle_dns_servers = true;
 		opts.rotate = true;
+		opts.ip_strategy = match config.ip_lookup_strategy {
+			1 => hickory_resolver::config::LookupIpStrategy::Ipv4Only,
+			2 => hickory_resolver::config::LookupIpStrategy::Ipv6Only,
+			3 => hickory_resolver::config::LookupIpStrategy::Ipv4AndIpv6,
+			4 => hickory_resolver::config::LookupIpStrategy::Ipv6thenIpv4,
+			_ => hickory_resolver::config::LookupIpStrategy::Ipv4thenIpv6,
+		};
+		opts.authentic_data = false;
 
 		let resolver = Arc::new(TokioAsyncResolver::tokio(conf, opts));
 		let overrides = Arc::new(StdRwLock::new(TlsNameMap::new()));

src/service/media/mod.rs

@@ -16,6 +16,7 @@ use crate::{services, utils, Error, Result};
 
 #[derive(Debug)]
 pub(crate) struct FileMeta {
+	#[allow(dead_code)]
 	pub(crate) content_disposition: Option<String>,
 	pub(crate) content_type: Option<String>,
 	pub(crate) file: Vec<u8>,
@@ -187,7 +188,9 @@ impl Service {
 				Ok(duration) => {
 					debug!("Parsed duration: {:?}", duration);
 					debug!("System time now: {:?}", SystemTime::now());
-					SystemTime::now() - duration
+					SystemTime::now().checked_sub(duration).ok_or_else(|| {
+						Error::bad_database("Duration specified is not valid against the current system time")
+					})?
 				},
 				Err(e) => {
 					error!("Failed to parse user-specified time duration: {}", e);
@@ -476,66 +479,68 @@ impl Service {
 
 #[cfg(test)]
 mod tests {
-	use std::path::PathBuf;
-
-	use base64::{engine::general_purpose, Engine as _};
-
-	use super::*;
-
-	struct MockedKVDatabase;
-
-	impl Data for MockedKVDatabase {
-		fn create_file_metadata(
-			&self, _sender_user: Option<&str>, mxc: String, width: u32, height: u32, content_disposition: Option<&str>,
-			content_type: Option<&str>,
-		) -> Result<Vec<u8>> {
-			// copied from src/database/key_value/media.rs
-			let mut key = mxc.as_bytes().to_vec();
-			key.push(0xFF);
-			key.extend_from_slice(&width.to_be_bytes());
-			key.extend_from_slice(&height.to_be_bytes());
-			key.push(0xFF);
-			key.extend_from_slice(
-				content_disposition
-					.as_ref()
-					.map(|f| f.as_bytes())
-					.unwrap_or_default(),
-			);
-			key.push(0xFF);
-			key.extend_from_slice(
-				content_type
-					.as_ref()
-					.map(|c| c.as_bytes())
-					.unwrap_or_default(),
-			);
-
-			Ok(key)
-		}
-
-		fn delete_file_mxc(&self, _mxc: String) -> Result<()> { todo!() }
-
-		fn search_mxc_metadata_prefix(&self, _mxc: String) -> Result<Vec<Vec<u8>>> { todo!() }
-
-		fn get_all_media_keys(&self) -> Result<Vec<Vec<u8>>> { todo!() }
-
-		fn search_file_metadata(
-			&self, _mxc: String, _width: u32, _height: u32,
-		) -> Result<(Option<String>, Option<String>, Vec<u8>)> {
-			todo!()
-		}
-
-		fn remove_url_preview(&self, _url: &str) -> Result<()> { todo!() }
-
-		fn set_url_preview(&self, _url: &str, _data: &UrlPreviewData, _timestamp: std::time::Duration) -> Result<()> {
-			todo!()
-		}
-
-		fn get_url_preview(&self, _url: &str) -> Option<UrlPreviewData> { todo!() }
-	}
-
-	#[tokio::test]
 	#[cfg(feature = "sha256_media")]
+	#[tokio::test]
 	async fn long_file_names_works() {
+		use std::path::PathBuf;
+
+		use base64::{engine::general_purpose, Engine as _};
+
+		use super::*;
+
+		struct MockedKVDatabase;
+
+		impl Data for MockedKVDatabase {
+			fn create_file_metadata(
+				&self, _sender_user: Option<&str>, mxc: String, width: u32, height: u32,
+				content_disposition: Option<&str>, content_type: Option<&str>,
+			) -> Result<Vec<u8>> {
+				// copied from src/database/key_value/media.rs
+				let mut key = mxc.as_bytes().to_vec();
+				key.push(0xFF);
+				key.extend_from_slice(&width.to_be_bytes());
+				key.extend_from_slice(&height.to_be_bytes());
+				key.push(0xFF);
+				key.extend_from_slice(
+					content_disposition
+						.as_ref()
+						.map(|f| f.as_bytes())
+						.unwrap_or_default(),
+				);
+				key.push(0xFF);
+				key.extend_from_slice(
+					content_type
+						.as_ref()
+						.map(|c| c.as_bytes())
+						.unwrap_or_default(),
+				);
+
+				Ok(key)
+			}
+
+			fn delete_file_mxc(&self, _mxc: String) -> Result<()> { todo!() }
+
+			fn search_mxc_metadata_prefix(&self, _mxc: String) -> Result<Vec<Vec<u8>>> { todo!() }
+
+			fn get_all_media_keys(&self) -> Result<Vec<Vec<u8>>> { todo!() }
+
+			fn search_file_metadata(
+				&self, _mxc: String, _width: u32, _height: u32,
+			) -> Result<(Option<String>, Option<String>, Vec<u8>)> {
+				todo!()
+			}
+
+			fn remove_url_preview(&self, _url: &str) -> Result<()> { todo!() }
+
+			fn set_url_preview(
+				&self, _url: &str, _data: &UrlPreviewData, _timestamp: std::time::Duration,
+			) -> Result<()> {
+				todo!()
+			}
+
+			fn get_url_preview(&self, _url: &str) -> Option<UrlPreviewData> { todo!() }
+		}
+
 		static DB: MockedKVDatabase = MockedKVDatabase;
 		let media = Service {
 			db: &DB,

src/service/mod.rs

@@ -6,7 +6,7 @@ use std::{
 use lru_cache::LruCache;
 use tokio::sync::{broadcast, Mutex, RwLock};
 
-use crate::{Config, Result};
+use crate::{Config, LogLevelReloadHandles, Result};
 
 pub(crate) mod account_data;
 pub(crate) mod admin;
@@ -40,6 +40,7 @@ pub(crate) struct Services<'a> {
 }
 
 impl Services<'_> {
+	#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 	pub(crate) fn build<
 		D: appservice::Data
 			+ pusher::Data
@@ -55,11 +56,7 @@ impl Services<'_> {
 			+ sending::Data
 			+ 'static,
 	>(
-		db: &'static D, config: &Config,
+		db: &'static D, config: &Config, tracing_reload_handle: LogLevelReloadHandles,
-		tracing_reload_handle: tracing_subscriber::reload::Handle<
-			tracing_subscriber::EnvFilter,
-			tracing_subscriber::Registry,
-		>,
 	) -> Result<Self> {
 		Ok(Self {
 			appservice: appservice::Service::build(db)?,