chore(deps): update rust crate tikv-jemallocator to v0.6.0

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

.github/workflows/ci.yml

@@ -27,6 +27,16 @@ concurrency:
     cancel-in-progress: true
 
 env:
+    # sccache
+    SCCACHE_GHA_ENABLED: "true"
+    RUSTC_WRAPPER: "sccache"
+    SCCACHE_BUCKET: "sccache"
+    SCCACHE_S3_USE_SSL: ${{ vars.SCCACHE_S3_USE_SSL }}
+    SCCACHE_REGION: ${{ vars.SCCACHE_REGION }}
+    SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }}
+    SCCACHE_CACHE_MULTIARCH: ${{ vars.SCCACHE_CACHE_MULTIARCH }}
+    AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+    AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     # Required to make some things output color
     TERM: ansi
     # Publishing to my nix binary cache
@@ -52,6 +62,8 @@ jobs:
     tests:
         name: Test
         runs-on: ubuntu-latest
+        env:
+          CARGO_PROFILE: "test"
         steps:
             - name: Free Disk Space (Ubuntu)
               uses: jlumbroso/free-disk-space@main
@@ -124,9 +136,32 @@ jobs:
 
             - name: Cache CI dependencies
               run: |
-                  bin/nix-build-and-cache ci
+                  # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+                  ATTEMPTS=3
+                  SUCCESS=false
+                  while (( ATTEMPTS-- > 0 ))
+                  do
+                    bin/nix-build-and-cache ci
+                    if [[ $? == 0 ]]; then
+                      SUCCESS=true
+                      break
+                    else
+                      sleep 3
+                    fi
+                  done
 
+                  if [[ $SUCCESS == "false" ]]; then
+                    exit 1
+                  fi
+
+            # use sccache for Rust
+            - name: Run sccache-cache
+              uses: mozilla-actions/sccache-action@main
+
+            # use rust-cache
             - uses: Swatinem/rust-cache@v2
+              with:
+                cache-all-crates: "true"
 
             - name: Run CI tests
               run: |
@@ -180,6 +215,10 @@ jobs:
                       echo '```' >> $GITHUB_STEP_SUMMARY
                   fi
 
+            - name: Run cargo clean test artifacts
+              run: |
+                  cargo clean --profile test
+
     build:
         name: Build
         runs-on: ubuntu-latest
@@ -190,6 +229,9 @@ jobs:
                     - target: aarch64-unknown-linux-musl
                     - target: x86_64-unknown-linux-musl
         steps:
+            - name: Free Disk Space (Ubuntu)
+              uses: jlumbroso/free-disk-space@main
+
             - name: Sync repository
               uses: actions/checkout@v4
 
@@ -244,12 +286,38 @@ jobs:
                   direnv allow
                   nix develop .#all-features --command true
 
+            # use sccache for Rust
+            - name: Run sccache-cache
+              uses: mozilla-actions/sccache-action@main
+
+            # use rust-cache
+            - uses: Swatinem/rust-cache@v2
+              with:
+                cache-all-crates: "true"
+
             - name: Build static ${{ matrix.target }}
               run: |
                   CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
                   SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
 
-                  bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features
+                  # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+                  ATTEMPTS=3
+                  SUCCESS=false
+                  while (( ATTEMPTS-- > 0 ))
+                  do
+                    bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features
+                    if [[ $? == 0 ]]; then
+                      SUCCESS=true
+                      break
+                    else
+                      sleep 3
+                    fi
+                  done
+
+                  if [[ $SUCCESS == "false" ]]; then
+                    exit 1
+                  fi
+
                   mkdir -v -p target/release/
                   mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
                   cp -v -f result/bin/conduit target/release/conduwuit
@@ -259,6 +327,66 @@ jobs:
                   mv -v target/release/conduwuit static-${{ matrix.target }}
                   mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb
 
+            # quick smoke test of the x86_64 static release binary
+            - name: Run x86_64 static release binary
+              run: |
+                  # GH actions default runners are x86_64 only
+                  if file result/bin/conduit | grep x86-64; then
+                    result/bin/conduit --version
+                  fi
+
+            - name: Build static debug ${{ matrix.target }}
+              run: |
+                  CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
+                  SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
+
+                  # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+                  ATTEMPTS=3
+                  SUCCESS=false
+                  while (( ATTEMPTS-- > 0 ))
+                  do
+                    bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features-debug
+                    if [[ $? == 0 ]]; then
+                      SUCCESS=true
+                      break
+                    else
+                      sleep 3
+                    fi
+                  done
+
+                  if [[ $SUCCESS == "false" ]]; then
+                    exit 1
+                  fi
+
+                  # > warning: dev profile is not supported and will be a hard error in the future. cargo-deb is for making releases, and it doesn't make sense to use it with dev profiles.
+                  # so we need to coerce cargo-deb into thinking this is a release binary
+                  mkdir -v -p target/release/
+                  mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
+                  cp -v -f result/bin/conduit target/release/conduwuit
+                  cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
+                  # -p conduit is the main crate name
+                  direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}-debug.deb
+                  mv -v target/release/conduwuit static-${{ matrix.target }}-debug
+                  mv -v target/release/${{ matrix.target }}-debug.deb ${{ matrix.target }}-debug.deb
+
+            # quick smoke test of the x86_64 static debug binary
+            - name: Run x86_64 static debug binary
+              run: |
+                  # GH actions default runners are x86_64 only
+                  if file result/bin/conduit | grep x86-64; then
+                    result/bin/conduit --version
+                  fi
+
+            # check validity of produced deb package, invalid debs will error on these commands
+            - name: Validate produced deb package
+              run: |
+                  # List contents
+                  dpkg-deb --contents ${{ matrix.target }}.deb
+                  dpkg-deb --contents ${{ matrix.target }}-debug.deb
+                  # List info
+                  dpkg-deb --info ${{ matrix.target }}.deb
+                  dpkg-deb --info ${{ matrix.target }}-debug.deb
+
             - name: Upload static-${{ matrix.target }}
               uses: actions/upload-artifact@v4
               with:
@@ -274,11 +402,65 @@ jobs:
                   if-no-files-found: error
                   compression-level: 0
 
+            - name: Upload static-${{ matrix.target }}-debug
+              uses: actions/upload-artifact@v4
+              with:
+                  name: static-${{ matrix.target }}-debug
+                  path: static-${{ matrix.target }}-debug
+                  if-no-files-found: error
+
+            - name: Upload deb ${{ matrix.target }}-debug
+              uses: actions/upload-artifact@v4
+              with:
+                  name: deb-${{ matrix.target }}-debug
+                  path: ${{ matrix.target }}-debug.deb
+                  if-no-files-found: error
+                  compression-level: 0
+
             - name: Build OCI image ${{ matrix.target }}
               run: |
-                  bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features
+                  # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+                  ATTEMPTS=3
+                  SUCCESS=false
+                  while (( ATTEMPTS-- > 0 ))
+                  do
+                    bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features
+                    if [[ $? == 0 ]]; then
+                      SUCCESS=true
+                      break
+                    else
+                      sleep 3
+                    fi
+                  done
+
+                  if [[ $SUCCESS == "false" ]]; then
+                    exit 1
+                  fi
+
                   cp -v -f result oci-image-${{ matrix.target }}.tar.gz
 
+            - name: Build debug OCI image ${{ matrix.target }}
+              run: |
+                  # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+                  ATTEMPTS=3
+                  SUCCESS=false
+                  while (( ATTEMPTS-- > 0 ))
+                  do
+                    bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features-debug
+                    if [[ $? == 0 ]]; then
+                      SUCCESS=true
+                      break
+                    else
+                      sleep 3
+                    fi
+                  done
+
+                  if [[ $SUCCESS == "false" ]]; then
+                    exit 1
+                  fi
+
+                  cp -v -f result oci-image-${{ matrix.target }}-debug.tar.gz
+
             - name: Upload OCI image ${{ matrix.target }}
               uses: actions/upload-artifact@v4
               with:
@@ -287,6 +469,14 @@ jobs:
                   if-no-files-found: error
                   compression-level: 0
 
+            - name: Upload OCI image ${{ matrix.target }}-debug
+              uses: actions/upload-artifact@v4
+              with:
+                  name: oci-image-${{ matrix.target }}-debug
+                  path: oci-image-${{ matrix.target }}-debug.tar.gz
+                  if-no-files-found: error
+                  compression-level: 0
+
     docker:
         name: Docker publish
         runs-on: ubuntu-latest
@@ -337,8 +527,10 @@ jobs:
 
             - name: Move OCI images into position
               run: |
-                  mv -v oci-image-x86_64-*/*.tar.gz oci-image-amd64.tar.gz
+                  mv -v oci-image-x86_64-unknown-linux-musl/*.tar.gz oci-image-amd64.tar.gz
-                  mv -v oci-image-aarch64-*/*.tar.gz oci-image-arm64v8.tar.gz
+                  mv -v oci-image-aarch64-unknown-linux-musl/*.tar.gz oci-image-arm64v8.tar.gz
+                  mv -v oci-image-x86_64-unknown-linux-musl-debug/*.tar.gz oci-image-amd64-debug.tar.gz
+                  mv -v oci-image-aarch64-unknown-linux-musl-debug/*.tar.gz oci-image-arm64v8-debug.tar.gz
 
             - name: Load and push amd64 image
               if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
@@ -362,6 +554,28 @@ jobs:
                   docker push ${{ env.GHCR_ARM64 }}
                   docker push ${{ env.GLCR_ARM64 }}
 
+            - name: Load and push amd64 debug image
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
+              run: |
+                  docker load -i oci-image-amd64-debug.tar.gz
+                  docker tag $(docker images -q conduit:main) ${{ env.DOCKER_AMD64 }}-debug
+                  docker tag $(docker images -q conduit:main) ${{ env.GHCR_AMD64 }}-debug
+                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_AMD64 }}-debug
+                  docker push ${{ env.DOCKER_AMD64 }}-debug
+                  docker push ${{ env.GHCR_AMD64 }}-debug
+                  docker push ${{ env.GLCR_AMD64 }}-debug
+
+            - name: Load and push arm64 debug image
+              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
+              run: |
+                  docker load -i oci-image-arm64v8-debug.tar.gz
+                  docker tag $(docker images -q conduit:main) ${{ env.DOCKER_ARM64 }}-debug
+                  docker tag $(docker images -q conduit:main) ${{ env.GHCR_ARM64 }}-debug
+                  docker tag $(docker images -q conduit:main) ${{ env.GLCR_ARM64 }}-debug
+                  docker push ${{ env.DOCKER_ARM64 }}-debug
+                  docker push ${{ env.GHCR_ARM64 }}-debug
+                  docker push ${{ env.GLCR_ARM64 }}-debug
+
             - name: Create Docker combined manifests
               run: |
                   # Dockerhub Container Registry
@@ -371,9 +585,21 @@ jobs:
                   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_TAG }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GLCR_AMD64 }}
                   docker manifest create ${{ env.GLCR_BRANCH }} --amend ${{ env.GLCR_ARM64 }} --amend ${{ env.GLCR_AMD64 }}
 
+            - name: Create Docker combined debug manifests
+              run: |
+                  # Dockerhub Container Registry
+                  docker manifest create ${{ env.DOCKER_TAG }}-debug --amend ${{ env.DOCKER_ARM64 }}-debug --amend ${{ env.DOCKER_AMD64 }}-debug
+                  docker manifest create ${{ env.DOCKER_BRANCH }}-debug --amend ${{ env.DOCKER_ARM64 }}-debug --amend ${{ env.DOCKER_AMD64 }}-debug
+                  # GitHub Container Registry
+                  docker manifest create ${{ env.GHCR_TAG }}-debug --amend ${{ env.GHCR_ARM64 }}-debug --amend ${{ env.GHCR_AMD64 }}-debug
+                  docker manifest create ${{ env.GHCR_BRANCH }}-debug --amend ${{ env.GHCR_ARM64 }}-debug --amend ${{ env.GHCR_AMD64 }}-debug
+                  # GitLab Container Registry
+                  docker manifest create ${{ env.GLCR_TAG }}-debug --amend ${{ env.GLCR_ARM64 }}-debug --amend ${{ env.GLCR_AMD64 }}-debug
+                  docker manifest create ${{ env.GLCR_BRANCH }}-debug --amend ${{ env.GLCR_ARM64 }}-debug --amend ${{ env.GLCR_AMD64 }}-debug
+
             - name: Push manifests to Docker registries
               if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
               run: |
@@ -383,6 +609,12 @@ jobs:
                   docker manifest push ${{ env.GHCR_BRANCH }}
                   docker manifest push ${{ env.GLCR_TAG }}
                   docker manifest push ${{ env.GLCR_BRANCH }}
+                  docker manifest push ${{ env.DOCKER_TAG }}-debug
+                  docker manifest push ${{ env.DOCKER_BRANCH }}-debug
+                  docker manifest push ${{ env.GHCR_TAG }}-debug
+                  docker manifest push ${{ env.GHCR_BRANCH }}-debug
+                  docker manifest push ${{ env.GLCR_TAG }}-debug
+                  docker manifest push ${{ env.GLCR_BRANCH }}-debug
 
             - name: Add Image Links to Job Summary
               if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
@@ -390,3 +622,6 @@ jobs:
                   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
+                  echo "- \`docker pull ${{ env.DOCKER_TAG }}-debug\`" >> $GITHUB_STEP_SUMMARY
+                  echo "- \`docker pull ${{ env.GHCR_TAG }}-debug\`" >> $GITHUB_STEP_SUMMARY
+                  echo "- \`docker pull ${{ env.GLCR_TAG }}-debug\`" >> $GITHUB_STEP_SUMMARY

.github/workflows/documentation.yml

@@ -47,6 +47,9 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+
       - name: Sync repository
         uses: actions/checkout@v4
 
@@ -107,7 +110,23 @@ jobs:
 
       - name: Cache CI dependencies
         run: |
-            bin/nix-build-and-cache ci
+            # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
+            ATTEMPTS=3
+            SUCCESS=false
+            while (( ATTEMPTS-- > 0 ))
+            do
+              bin/nix-build-and-cache ci
+              if [[ $? == 0 ]]; then
+                SUCCESS=true
+                break
+              else
+                sleep 3
+              fi
+            done
+
+            if [[ $SUCCESS == "false" ]]; then
+              exit 1
+            fi
 
       - name: Run lychee and markdownlint
         run: |
@@ -116,8 +135,26 @@ jobs:
 
       - name: Build documentation (book)
         run: |
-          ./bin/nix-build-and-cache just .#book
+            # attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
-          cp -r --dereference result public
+            ATTEMPTS=3
+            SUCCESS=false
+            while (( ATTEMPTS-- > 0 ))
+            do
+              bin/nix-build-and-cache just .#book
+              if [[ $? == 0 ]]; then
+                SUCCESS=true
+                break
+              else
+                sleep 3
+              fi
+            done
+
+            if [[ $SUCCESS == "false" ]]; then
+              exit 1
+            fi
+
+            cp -r --dereference result public
+
       - name: Upload generated documentation (book) as normal artifact
         uses: actions/upload-artifact@v4
         with:

CONTRIBUTING.md

@@ -39,6 +39,7 @@ The following binaries are used in [`engage.toml`][engage.toml]:
 - [`cargo-deb`][cargo-deb]
 - [`lychee`][lychee]
 - [`markdownlint-cli`][markdownlint-cli]
+- `dpkg`
 
 ### Matrix tests
 

Cargo.lock

@@ -85,9 +85,9 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
 
 [[package]]
 name = "async-compression"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
 dependencies = [
  "brotli",
  "flate2",
@@ -118,7 +118,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -129,7 +129,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -377,7 +377,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -474,13 +474,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.3"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e2d530f35b40a84124146478cd16f34225306a8441998836466a2e2961c950"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
 ]
 
 [[package]]
@@ -562,7 +561,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -579,7 +578,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "conduit"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "clap",
  "conduit_admin",
@@ -608,7 +607,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_admin"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "clap",
  "conduit_api",
@@ -627,7 +626,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_api"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "axum 0.7.5",
  "axum-client-ip",
@@ -661,7 +660,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_core"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "argon2",
  "axum 0.7.5",
@@ -703,7 +702,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_database"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "conduit_core",
  "const-str",
@@ -715,7 +714,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_router"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "axum 0.7.5",
  "axum-client-ip",
@@ -746,7 +745,7 @@ dependencies = [
 
 [[package]]
 name = "conduit_service"
-version = "0.4.5"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -769,7 +768,6 @@ dependencies = [
  "regex",
  "reqwest",
  "ruma",
- "ruma-identifiers-validation",
  "rustyline-async",
  "serde",
  "serde_json",
@@ -972,7 +970,7 @@ dependencies = [
  "crossterm_winapi",
  "futures-core",
  "libc",
- "mio",
+ "mio 0.8.11",
  "parking_lot",
  "signal-hook",
  "signal-hook-mio",
@@ -1022,7 +1020,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1126,7 +1124,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1262,7 +1260,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1543,7 +1541,7 @@ dependencies = [
  "markup5ever",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1747,12 +1745,12 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
  "bytemuck",
- "byteorder",
+ "byteorder-lite",
  "color_quant",
  "gif",
  "image-webp",
@@ -1764,12 +1762,12 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
 dependencies = [
  "byteorder-lite",
- "thiserror",
+ "quick-error 2.0.1",
 ]
 
 [[package]]
@@ -1952,7 +1950,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1975,9 +1973,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -2033,9 +2031,9 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.5"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
+checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
 dependencies = [
  "cc",
  "libc",
@@ -2149,6 +2147,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -2461,7 +2471,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2554,7 +2564,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2642,7 +2652,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "version_check",
  "yansi",
 ]
@@ -2667,7 +2677,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2703,6 +2713,12 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quinn"
 version = "0.11.2"
@@ -2739,14 +2755,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
 dependencies = [
  "libc",
  "once_cell",
  "socket2",
- "tracing",
  "windows-sys 0.52.0",
 ]
 
@@ -2791,9 +2806,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2898,7 +2913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
  "hostname 0.3.1",
- "quick-error",
+ "quick-error 1.2.3",
 ]
 
 [[package]]
@@ -2919,7 +2934,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.10.1"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "assign",
  "js_int",
@@ -2929,6 +2944,7 @@ dependencies = [
  "ruma-common",
  "ruma-events",
  "ruma-federation-api",
+ "ruma-identifiers-validation",
  "ruma-identity-service-api",
  "ruma-push-gateway-api",
  "ruma-server-util",
@@ -2940,7 +2956,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.10.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2952,7 +2968,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.18.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "as_variant",
  "assign",
@@ -2975,7 +2991,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.13.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "as_variant",
  "base64 0.22.1",
@@ -3005,7 +3021,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.28.1"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "as_variant",
  "indexmap 2.2.6",
@@ -3028,7 +3044,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.9.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3040,7 +3056,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.5"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "js_int",
  "thiserror",
@@ -3049,7 +3065,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.9.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3059,7 +3075,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.13.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -3067,14 +3083,14 @@ dependencies = [
  "quote",
  "ruma-identifiers-validation",
  "serde",
- "syn 2.0.71",
+ "syn 2.0.72",
  "toml",
 ]
 
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.9.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -3086,7 +3102,7 @@ dependencies = [
 [[package]]
 name = "ruma-server-util"
 version = "0.3.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "headers",
  "http 1.1.0",
@@ -3099,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.15.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "base64 0.22.1",
  "ed25519-dalek",
@@ -3115,7 +3131,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.11.0"
-source = "git+https://github.com/girlbossceo/ruwuma?rev=c51ccb2c68d2e3557eb12b1a49036531711ec0e5#c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+source = "git+https://github.com/girlbossceo/ruwuma?rev=c76e2873c1593a3308d4ba3e0e4a1db65acf8536#c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 dependencies = [
  "itertools 0.12.1",
  "js_int",
@@ -3203,7 +3219,7 @@ dependencies = [
  "log",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.5",
+ "rustls-webpki 0.102.6",
  "subtle",
  "zeroize",
 ]
@@ -3218,7 +3234,7 @@ dependencies = [
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.5",
+ "rustls-webpki 0.102.6",
  "subtle",
  "zeroize",
 ]
@@ -3264,9 +3280,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3343,9 +3359,9 @@ checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e"
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
@@ -3356,9 +3372,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3522,7 +3538,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3668,7 +3684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -3815,9 +3831,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3875,22 +3891,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4004,21 +4020,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
+ "mio 1.0.1",
- "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4033,13 +4048,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4113,14 +4128,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.15",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
@@ -4145,15 +4160,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.15"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.13",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -4256,7 +4271,7 @@ source = "git+https://github.com/girlbossceo/tracing?rev=4d78a14a5e03f539b8c6b47
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4526,7 +4541,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
@@ -4560,7 +4575,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4831,9 +4846,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0"
 dependencies = [
  "memchr",
 ]
@@ -4917,9 +4932,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
 dependencies = [
  "zune-core",
 ]

Cargo.toml

@@ -14,13 +14,13 @@ categories = ["network-programming"]
 description = "a very cool fork of Conduit, a Matrix homeserver written in Rust"
 edition = "2021"
 homepage = "https://conduwuit.puppyirl.gay/"
-keywords = ["chat", "matrix", "server"]
+keywords = ["chat", "matrix", "server", "uwu"]
 license = "Apache-2.0"
 # See also `rust-toolchain.toml`
 readme = "README.md"
 repository = "https://github.com/girlbossceo/conduwuit"
-rust-version = "1.77.0"
+rust-version = "1.80.0"
-version = "0.4.5"
+version = "0.4.6"
 
 [workspace.metadata.crane]
 name = "conduit"
@@ -188,7 +188,7 @@ version = "0.3.30"
 default-features = false
 
 [workspace.dependencies.tokio]
-version = "1.38.0"
+version = "1.39.1"
 features = [
 	"fs",
 	"net",
@@ -204,7 +204,7 @@ features = [
 version = "0.3.1"
 
 [workspace.dependencies.libloading]
-version = "0.8.3"
+version = "0.8.5"
 
 # Validating urls in config, was already a transitive dependency
 [workspace.dependencies.url]
@@ -218,7 +218,7 @@ features = ["alloc", "std"]
 default-features = false
 
 [workspace.dependencies.hyper]
-version = "1.4.0"
+version = "1.4.1"
 features = [
 	"server",
 	"http1",
@@ -251,7 +251,7 @@ default-features = false
 
 # Used for conduit::Error type
 [workspace.dependencies.thiserror]
-version = "1.0.62"
+version = "1.0.63"
 
 # Used when hashing the state
 [workspace.dependencies.ring]
@@ -280,7 +280,7 @@ version = "0.1.2"
 [workspace.dependencies.ruma]
 git = "https://github.com/girlbossceo/ruwuma"
 #branch = "conduwuit-changes"
-rev = "c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
+rev = "c76e2873c1593a3308d4ba3e0e4a1db65acf8536"
 features = [
     "compat",
     "rand",
@@ -293,6 +293,7 @@ features = [
     "server-util",
     "unstable-exhaustive-types",
     "ring-compat",
+    "identifiers-validation",
     "unstable-unspecified",
     "unstable-msc2448",
     "unstable-msc2666",
@@ -307,10 +308,6 @@ features = [
     "unstable-extensible-events",
 ]
 
-[workspace.dependencies.ruma-identifiers-validation]
-git = "https://github.com/girlbossceo/ruwuma"
-rev = "c51ccb2c68d2e3557eb12b1a49036531711ec0e5"
-
 [workspace.dependencies.rust-rocksdb]
 path = "deps/rust-rocksdb"
 package = "rust-rocksdb-uwu"
@@ -372,16 +369,17 @@ version = "0.34.0"
 version = "0.34.0"
 
 # jemalloc usage
+# locked to 0.5.4 due to static binary linking breakage
 [workspace.dependencies.tikv-jemalloc-sys]
-version = "0.5.4"
+version = "=0.5.4"
 default-features = false
 features = ["stats", "unprefixed_malloc_on_supported_platforms"]
 [workspace.dependencies.tikv-jemallocator]
-version = "0.5.4"
+version = "=0.6.0"
 default-features = false
 features = ["stats", "unprefixed_malloc_on_supported_platforms"]
 [workspace.dependencies.tikv-jemalloc-ctl]
-version = "0.5.4"
+version = "=0.5.4"
 default-features = false
 features = ["use_std"]
 
@@ -659,7 +657,16 @@ opt-level = 'z'
 #	'-Clink-arg=-Wl,-z,nodelete',
 #]
 
+# primarily used for CI
 [profile.test]
+inherits = "dev"
+codegen-units = 16
+incremental = false
+
+[profile.test.package.'*']
+inherits = "dev"
+debug = 0
+codegen-units = 16
 incremental = false
 
 ###############################################################################
@@ -721,19 +728,19 @@ variant_size_differences = "allow"
 [workspace.lints.clippy]
 
 ###################
-cargo = "warn"
+cargo = { level = "warn", priority = -1 }
 
 ## some sadness
 multiple_crate_versions = { level = "allow", priority = 1 }
 
 ###################
-complexity = "warn"
+complexity = { level = "warn", priority = -1 }
 
 ###################
-correctness = "warn"
+correctness = { level = "warn", priority = -1 }
 
 ###################
-nursery = "warn"
+nursery = { level = "warn", priority = -1 }
 
 ## some sadness
 missing_const_for_fn = { level = "allow", priority = 1 }             # TODO
@@ -743,7 +750,7 @@ significant_drop_in_scrutinee = { level = "allow", priority = 1 }    # TODO
 significant_drop_tightening = { level = "allow", priority = 1 }      # TODO
 
 ###################
-pedantic = "warn"
+pedantic = { level = "warn", priority = -1 }
 
 ## some sadness
 doc_markdown = { level = "allow", priority = 1 }
@@ -762,7 +769,7 @@ unnecessary_wraps = { level = "allow", priority = 1 }
 unused_async = { level = "allow", priority = 1 }
 
 ###################
-perf = "warn"
+perf = { level = "warn", priority = -1 }
 
 ###################
 #restriction = "warn"
@@ -812,14 +819,14 @@ unseparated_literal_suffix = "warn"
 verbose_file_reads = "warn"
 
 ###################
-style = "warn"
+style = { level = "warn", priority = -1 }
 
 ## some sadness
 # trivial assertions are quite alright
 assertions_on_constants = { level = "allow", priority = 1 }
 
 ###################
-suspicious = "warn"
+suspicious = { level = "warn", priority = -1 }
 
 ## some sadness
 let_underscore_future = { level = "allow", priority = 1 }

conduwuit-example.toml

@@ -52,9 +52,10 @@
 
 # Performance monitoring/tracing sample rate for Sentry.io
 #
-# Note that too high values may impact performance, and can be disabled by setting it to 0.0
+# Note that too high values may impact performance, and can be disabled by setting it to 0.0 (0%)
+# This value is read as a percentage to Sentry, represented as a decimal
 #
-# Defaults to 0.15
+# Defaults to 15% of traces (0.15)
 #sentry_traces_sample_rate = 0.15
 
 # Whether to attach a stacktrace to Sentry reports.
@@ -401,7 +402,7 @@ allow_profile_lookup_federation_requests = true
 # setting this to false may reduce startup time.
 #
 # Enabled by default.
-#media_statup_check = true
+#media_startup_check = true
 
 # OpenID token expiration/TTL in seconds
 #

engage.toml

@@ -60,6 +60,11 @@ name = "markdownlint"
 group = "versions"
 script = "markdownlint --version"
 
+[[task]]
+name = "dpkg"
+group = "versions"
+script = "dpkg --version"
+
 [[task]]
 name = "cargo-audit"
 group = "security"
@@ -68,7 +73,9 @@ script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked"
 [[task]]
 name = "cargo-fmt"
 group = "lints"
-script = "cargo fmt --check -- --color=always"
+script = """
+cargo fmt --check -- --color=always
+"""
 
 [[task]]
 name = "cargo-doc"
@@ -79,6 +86,7 @@ env DIRENV_DEVSHELL=all-features \
     direnv exec . \
     cargo doc \
         --workspace \
+        --profile test \
         --all-features \
         --no-deps \
         --document-private-items \
@@ -91,6 +99,7 @@ group = "lints"
 script = """
 cargo clippy \
     --workspace \
+    --profile test \
     --all-targets \
     --color=always \
     -- \
@@ -105,6 +114,7 @@ env DIRENV_DEVSHELL=all-features \
     direnv exec . \
     cargo clippy \
         --workspace \
+        --profile test \
         --all-targets \
         --all-features \
         --color=always \
@@ -118,6 +128,7 @@ group = "lints"
 script = """
 cargo clippy \
     --workspace \
+    --profile test \
     --features jemalloc \
     --all-targets \
     --color=always \
@@ -156,6 +167,7 @@ env DIRENV_DEVSHELL=all-features \
     direnv exec . \
     cargo test \
         --workspace \
+        --profile test \
         --all-targets \
         --all-features \
         --color=always \
@@ -169,6 +181,7 @@ group = "tests"
 script = """
 cargo test \
     --workspace \
+    --profile test \
     --all-targets \
     --color=always \
     -- \
@@ -185,9 +198,11 @@ name = "nix-default"
 group = "tests"
 script = """
 env DIRENV_DEVSHELL=dynamic \
+    CARGO_PROFILE="test" \
     direnv exec . \
-    bin/nix-build-and-cache just .#default
+    bin/nix-build-and-cache just .#default-test
 env DIRENV_DEVSHELL=dynamic \
+    CARGO_PROFILE="test" \
     direnv exec . \
-    nix run -L .#default -- --help
+    nix run -L .#default-test -- --help && nix run -L .#default-test -- --version
 """

flake.nix

@@ -24,7 +24,7 @@
         file = ./rust-toolchain.toml;
 
         # See also `rust-toolchain.toml`
-        sha256 = "sha256-+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8";
+        sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4=";
       };
 
       mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
@@ -119,6 +119,9 @@
           # Needed for producing Debian packages
           cargo-deb
 
+          # Needed for CI to check validity of produced Debian packages (dpkg-deb)
+          dpkg
+
           # Needed for Complement
           go
 
@@ -133,6 +136,8 @@
 
           # Useful for editing the book locally
           mdbook
+
+          sccache
         ])
         ++ scope.main.buildInputs
         ++ scope.main.propagatedBuildInputs
@@ -144,6 +149,15 @@
     {
       packages = {
         default = scopeHost.main;
+        default-debug = scopeHost.main.override {
+            profile = "dev";
+            # debug build users expect full logs
+            disable_release_max_log_level = true;
+        };
+        default-test = scopeHost.main.override {
+            profile = "test";
+            disable_release_max_log_level = true;
+        };
         all-features = scopeHost.main.override {
             all_features = true;
             disable_features = [
@@ -153,6 +167,18 @@
                 "experimental"
             ];
         };
+        all-features-debug = scopeHost.main.override {
+            profile = "dev";
+            all_features = true;
+            # debug build users expect full logs
+            disable_release_max_log_level = true;
+            disable_features = [
+                # this is non-functional on nix for some reason
+                "hardened_malloc"
+                # dont include experimental features
+                "experimental"
+            ];
+        };
         hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; };
 
         oci-image = scopeHost.oci-image;
@@ -167,6 +193,20 @@
             ];
           };
         };
+        oci-image-all-features-debug = scopeHost.oci-image.override {
+          main = scopeHost.main.override {
+            profile = "dev";
+            all_features = true;
+            # debug build users expect full logs
+            disable_release_max_log_level = true;
+            disable_features = [
+                # this is non-functional on nix for some reason
+                "hardened_malloc"
+                # dont include experimental features
+                "experimental"
+            ];
+          };
+        };
         oci-image-hmalloc = scopeHost.oci-image.override {
           main = scopeHost.main.override {
             features = ["hardened_malloc"];
@@ -201,6 +241,26 @@
                   value = scopeCrossStatic.main;
                 }
 
+                # An output for a statically-linked unstripped debug ("dev") binary
+                {
+                  name = "${binaryName}-debug";
+                  value = scopeCrossStatic.main.override {
+                    profile = "dev";
+                    # debug build users expect full logs
+                    disable_release_max_log_level = true;
+                  };
+                }
+
+                # An output for a statically-linked unstripped debug binary with the
+                # "test" profile (for CI usage only)
+                {
+                  name = "${binaryName}-test";
+                  value = scopeCrossStatic.main.override {
+                    profile = "test";
+                    disable_release_max_log_level = true;
+                  };
+                }
+
                 # An output for a statically-linked binary with `--all-features`
                 {
                   name = "${binaryName}-all-features";
@@ -215,6 +275,23 @@
                   };
                 }
 
+                # An output for a statically-linked unstripped debug ("dev") binary with `--all-features`
+                {
+                  name = "${binaryName}-all-features-debug";
+                  value = scopeCrossStatic.main.override {
+                    profile = "dev";
+                    all_features = true;
+                    # debug build users expect full logs
+                    disable_release_max_log_level = true;
+                    disable_features = [
+                        # this is non-functional on nix for some reason
+                        "hardened_malloc"
+                        # dont include experimental features
+                        "experimental"
+                    ];
+                  };
+                }
+
                 # An output for a statically-linked binary with hardened_malloc
                 {
                   name = "${binaryName}-hmalloc";
@@ -229,6 +306,18 @@
                   value = scopeCrossStatic.oci-image;
                 }
 
+                # An output for an OCI image based on that unstripped debug ("dev") binary
+                {
+                  name = "oci-image-${crossSystem}-debug";
+                  value = scopeCrossStatic.oci-image.override {
+                    main = scopeCrossStatic.main.override {
+                        profile = "dev";
+                        # debug build users expect full logs
+                        disable_release_max_log_level = true;
+                    };
+                  };
+                }
+
                 # An output for an OCI image based on that binary with `--all-features`
                 {
                   name = "oci-image-${crossSystem}-all-features";
@@ -245,6 +334,25 @@
                   };
                 }
 
+                # An output for an OCI image based on that unstripped debug ("dev") binary with `--all-features`
+                {
+                  name = "oci-image-${crossSystem}-all-features-debug";
+                  value = scopeCrossStatic.oci-image.override {
+                    main = scopeCrossStatic.main.override {
+                        profile = "dev";
+                        all_features = true;
+                        # debug build users expect full logs
+                        disable_release_max_log_level = true;
+                        disable_features = [
+                            # this is non-functional on nix for some reason
+                            "hardened_malloc"
+                            # dont include experimental features
+                            "experimental"
+                        ];
+                    };
+                  };
+                }
+
                 # An output for an OCI image based on that binary with hardened_malloc
                 {
                   name = "oci-image-${crossSystem}-hmalloc";

nix/pkgs/complement/config.toml

@@ -14,7 +14,7 @@ yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true
 ip_range_denylist = []
 url_preview_domain_contains_allowlist = ["*"]
 media_compat_file_link = false
-media_statup_check = false
+media_startup_check = false
 rocksdb_direct_io = false
 
 [global.tls]

nix/pkgs/complement/default.nix

@@ -14,8 +14,15 @@
 
 let
   main' = main.override {
-    profile = "dev";
+    profile = "test";
-    features = ["axum_dual_protocol"];
+    all_features = true;
+    disable_release_max_log_level = true;
+    disable_features = [
+        # this is non-functional on nix for some reason
+        "hardened_malloc"
+        # dont include experimental features
+        "experimental"
+    ];
   };
 
   start = writeShellScriptBin "start" ''

nix/pkgs/main/default.nix

@@ -51,6 +51,10 @@ rust-jemalloc-sys' = (rust-jemalloc-sys.override {
   unprefixed = true;
 }).overrideAttrs (old: {
   configureFlags = old.configureFlags ++
+    # we dont need docs
+    [ "--disable-doc" ] ++
+    # we dont need cxx/C++ integration
+    [ "--disable-cxx" ] ++
     # tikv-jemalloc-sys/profiling feature
     lib.optional (featureEnabled "jemalloc_prof") "--enable-prof";
 });
@@ -149,7 +153,7 @@ commonAttrs = {
       ];
     };
 
-    dontStrip = profile == "dev";
+    dontStrip = profile == "dev" || profile == "test";
 
     buildInputs = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys';
 

rust-toolchain.toml

@@ -11,7 +11,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.
 
 [toolchain]
-channel = "1.77.0"
+channel = "1.80.0"
 components = [
     # For rust-analyzer
     "rust-src",

src/admin/room/room_info_commands.rs

@@ -64,6 +64,6 @@ async fn view_room_topic(_body: Vec<&str>, room_id: Box<RoomId>) -> Result<RoomM
 	};
 
 	Ok(RoomMessageEventContent::notice_markdown(format!(
-		"Room topic:\n\n```{room_topic}\n```"
+		"Room topic:\n```\n{room_topic}\n```"
 	)))
 }

src/admin/user/commands.rs

@@ -42,6 +42,12 @@ pub(super) async fn create(
 		return Ok(RoomMessageEventContent::text_plain(format!("Userid {user_id} already exists")));
 	}
 
+	if user_id.is_historical() {
+		return Ok(RoomMessageEventContent::text_plain(format!(
+			"User ID {user_id} does not conform to new Matrix identifier spec"
+		)));
+	}
+
 	let password = password.unwrap_or_else(|| utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
 
 	// Create user

src/api/client/presence.rs

@@ -16,6 +16,14 @@ pub(crate) async fn set_presence_route(body: Ruma<set_presence::v3::Request>) ->
 	}
 
 	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+
+	if sender_user != &body.user_id && body.appservice_info.is_none() {
+		return Err(Error::BadRequest(
+			ErrorKind::InvalidParam,
+			"Not allowed to set presence of other users",
+		));
+	}
+
 	services()
 		.presence
 		.set_presence(sender_user, &body.presence, None, None, body.status_msg.clone())?;

src/core/pdu/mod.rs

@@ -116,7 +116,12 @@ impl PduEvent {
 			.map_or_else(|| Ok(BTreeMap::new()), |u| serde_json::from_str(u.get()))
 			.map_err(|_| Error::bad_database("Invalid unsigned in pdu event"))?;
 
-		unsigned.insert("age".to_owned(), to_raw_value(&1).unwrap());
+		// deliberately allowing for the possibility of negative age
+		let now: i128 = MilliSecondsSinceUnixEpoch::now().get().into();
+		let then: i128 = self.origin_server_ts.into();
+		let this_age: i128 = now.saturating_sub(then);
+
+		unsigned.insert("age".to_owned(), to_raw_value(&this_age).unwrap());
 		self.unsigned = Some(to_raw_value(&unsigned).expect("unsigned is valid"));
 
 		Ok(())

src/service/Cargo.toml

@@ -57,7 +57,6 @@ lru-cache.workspace = true
 rand.workspace = true
 regex.workspace = true
 reqwest.workspace = true
-ruma-identifiers-validation.workspace = true
 ruma.workspace = true
 rustyline-async.workspace = true
 rustyline-async.optional = true

src/service/globals/mod.rs

@@ -39,7 +39,6 @@ pub struct Service {
 	pub stable_room_versions: Vec<RoomVersionId>,
 	pub unstable_room_versions: Vec<RoomVersionId>,
 	pub bad_event_ratelimiter: Arc<RwLock<HashMap<OwnedEventId, RateLimitState>>>,
-	pub bad_signature_ratelimiter: Arc<RwLock<HashMap<Vec<String>, RateLimitState>>>,
 	pub bad_query_ratelimiter: Arc<RwLock<HashMap<OwnedServerName, RateLimitState>>>,
 	pub stateres_mutex: Arc<Mutex<()>>,
 	pub server_user: OwnedUserId,
@@ -101,7 +100,6 @@ impl crate::Service for Service {
 			stable_room_versions,
 			unstable_room_versions,
 			bad_event_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
-			bad_signature_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
 			bad_query_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
 			stateres_mutex: Arc::new(Mutex::new(())),
 			admin_alias: RoomAliasId::parse(format!("#admins:{}", &config.server_name))
@@ -144,13 +142,6 @@ impl crate::Service for Service {
 			.len();
 		writeln!(out, "bad_query_ratelimiter: {bad_query_ratelimiter}")?;
 
-		let bad_signature_ratelimiter = self
-			.bad_signature_ratelimiter
-			.read()
-			.expect("locked for reading")
-			.len();
-		writeln!(out, "bad_signature_ratelimiter: {bad_signature_ratelimiter}")?;
-
 		Ok(())
 	}
 
@@ -166,11 +157,6 @@ impl crate::Service for Service {
 			.write()
 			.expect("locked for writing")
 			.clear();
-
-		self.bad_signature_ratelimiter
-			.write()
-			.expect("locked for writing")
-			.clear();
 	}
 
 	fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }

src/service/sending/resolve.rs

@@ -252,7 +252,7 @@ async fn request_well_known(dest: &str) -> Result<Option<String>> {
 		.as_str()
 		.unwrap_or_default();
 
-	if ruma_identifiers_validation::server_name::validate(m_server).is_err() {
+	if ruma::identifiers_validation::server_name::validate(m_server).is_err() {
 		debug_error!("response content missing or invalid");
 		return Ok(None);
 	}