experiment with coroutines/folly 9ecb597d96

Signed-off-by: strawberry <strawberry@puppygock.gay>
2024-05-11 03:27:43 -04:00
700 changed files with 44621 additions and 84001 deletions
--- a/.cargo/audit.toml
+++ b/.cargo/audit.toml
@ -1,27 +0,0 @@
 [advisories]
 ignore = ["RUSTSEC-2024-0436", "RUSTSEC-2025-0014"] # advisory IDs to ignore e.g. ["RUSTSEC-2019-0001", ...]
 informational_warnings = [] # warn for categories of informational advisories
 severity_threshold = "none" # CVSS severity ("none", "low", "medium", "high", "critical")
 # Advisory Database Configuration
 [database]
 path = "~/.cargo/advisory-db" # Path where advisory git repo will be cloned
 url = "https://github.com/RustSec/advisory-db.git" # URL to git repo
 fetch = true # Perform a `git fetch` before auditing (default: true)
 stale = false # Allow stale advisory DB (i.e. no commits for 90 days, default: false)
 # Output Configuration
 [output]
 deny = ["warnings", "unmaintained", "unsound", "yanked"] # exit on error if unmaintained dependencies are found
 format = "terminal" # "terminal" (human readable report) or "json"
 quiet = false # Only print information on error
 show_tree = true # Show inverse dependency trees along with advisories (default: true)
 # Target Configuration
 [target]
 arch = ["x86_64", "aarch64"] # Ignore advisories for CPU architectures other than these
 os = ["linux", "windows", "macos"] # Ignore advisories for operating systems other than these
 [yanked]
 enabled = true # Warn for yanked crates in Cargo.lock (default: true)
 update_index = true # Auto-update the crates.io index (default: true)
--- a/.dockerignore
+++ b/.dockerignore
@ -1,9 +1,9 @@
 # Local build and dev artifacts
-target/
+target
 tests
 # Docker files
 Dockerfile*
 docker/
 # IDE files
 .vscode
--- a/.editorconfig
+++ b/.editorconfig
@ -11,14 +11,5 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 120
 [*.{md,txt}]
 indent_style = space
 indent_size = 4
 max_line_length = 80
 [*.nix]
 indent_size = 2
 [*.rs]
 indent_style = tab
 max_line_length = 98
--- a/.envrc
+++ b/.envrc
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-dotenv_if_exists
+use flake
 use flake ".#${DIRENV_DEVSHELL:-default}"
 PATH_add bin
 dotenv_if_exists
--- a/.forgejo/workflows/build-alpine.yml
+++ b/.forgejo/workflows/build-alpine.yml
@ -1,49 +0,0 @@
 on: 
  - workflow-dispatch
  - push
 jobs:
  build:
    runs-on: ubuntu-latest
    container:
      image: alpine:edge
    steps:
      - name: set up dependencies
        run: |
          apk update 
          apk upgrade 
          apk add nodejs git alpine-sdk
      - uses: actions/checkout@v4
        name: checkout the alpine dir  
        with: 
          sparse-checkout: "alpine/"
      # - uses: actions/checkout@v4
      #   name: checkout the rest in the alpine dir
      #   with:
      #     path: 'alpine/continuwuity'
      - name: set up user 
        run: adduser -DG abuild ci 
      - name: set up keys
        run: |
          pwd
          mkdir ~/.abuild 
          echo "${{ secrets.abuild_privkey }}" > ~/.abuild/ci@continuwuity.rsa
          echo "${{ secrets.abuild_pubkey }}" > ~/.abuild/ci@continuwuity.rsa.pub 
          echo $HOME
          echo 'PACKAGER_PRIVKEY="/root/.abuild/ci@continuwuity.rsa"' > ~/.abuild/abuild.conf 
          ls ~/.abuild
      - name: go go gadget abuild 
        run: |
          cd alpine 
          # modify the APKBUILD to use the current branch instead of the release
          # note that it seems to require the repo to be public (as you'll get 
          # a 404 even if the token is provided)
          export ARCHIVE_URL="${{ github.server_url }}/${{ github.repository }}/archive/${{ github.ref_name }}.tar.gz"
          echo $ARCHIVE_URL
          sed -i '/^source=/c\source="'"$ARCHIVE_URL" APKBUILD 
          abuild -F checksum
          abuild -Fr
--- a/.forgejo/workflows/documentation.yml
+++ b/.forgejo/workflows/documentation.yml
@ -1,73 +0,0 @@
 name: Documentation
 on:
  pull_request:
  push:
    branches:
      - main
    tags:
      - "v*"
  workflow_dispatch:
 concurrency:
  group: "pages-${{ github.ref }}"
  cancel-in-progress: true
 jobs:
  docs:
    name: Build and Deploy Documentation
    runs-on: ubuntu-latest
    steps:
      - name: Sync repository
        uses: https://github.com/actions/checkout@v4
        with:
          persist-credentials: false
          fetch-depth: 0
      - name: Setup mdBook
        uses: https://github.com/peaceiris/actions-mdbook@v2
        with:
          mdbook-version: "latest"
      - name: Build mdbook
        run: mdbook build
      - name: Prepare static files for deployment
        run: |
          mkdir -p ./public/.well-known/matrix
          mkdir -p ./public/.well-known/continuwuity
          mkdir -p ./public/schema
          # Copy the Matrix .well-known files
          cp ./docs/static/server ./public/.well-known/matrix/server
          cp ./docs/static/client ./public/.well-known/matrix/client
          cp ./docs/static/client ./public/.well-known/matrix/support
          cp ./docs/static/announcements.json ./public/.well-known/continuwuity/announcements
          cp ./docs/static/announcements.schema.json ./public/schema/announcements.schema.json
          # Copy the custom headers file
          cp ./docs/static/_headers ./public/_headers
          echo "Copied .well-known files and _headers to ./public"
      - name: Setup Node.js
        uses: https://github.com/actions/setup-node@v4
        with:
          node-version: 20
      - name: Install dependencies
        run: npm install --save-dev wrangler@latest
      - name: Deploy to Cloudflare Pages (Production)
        if: github.ref == 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
        uses: https://github.com/cloudflare/wrangler-action@v3
        with:
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          command: pages deploy ./public --branch="main" --commit-dirty=true --project-name="${{ vars.CLOUDFLARE_PROJECT_NAME }}"
      - name: Deploy to Cloudflare Pages (Preview)
        if: github.ref != 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
        uses: https://github.com/cloudflare/wrangler-action@v3
        with:
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          command: pages deploy ./public --branch="${{ github.head_ref || github.ref_name }}" --commit-dirty=true --project-name="${{ vars.CLOUDFLARE_PROJECT_NAME }}"
--- a/.forgejo/workflows/element.yml
+++ b/.forgejo/workflows/element.yml
@ -1,127 +0,0 @@
 name: Deploy Element Web
 on:
  schedule:
    - cron: "0 0 * * *"
  workflow_dispatch:
 concurrency:
  group: "element-${{ github.ref }}"
  cancel-in-progress: true
 jobs:
  build-and-deploy:
    name: Build and Deploy Element Web
    runs-on: ubuntu-latest
    steps:
      - name: Setup Node.js
        uses: https://code.forgejo.org/actions/setup-node@v4
        with:
          node-version: "20"
      - name: Clone, setup, and build Element Web
        run: |
          echo "Cloning Element Web..."
          git clone https://github.com/maunium/element-web
          cd element-web
          git checkout develop
          git pull
          echo "Cloning matrix-js-sdk..."
          git clone https://github.com/matrix-org/matrix-js-sdk.git
          echo "Installing Yarn..."
          npm install -g yarn
          echo "Installing dependencies..."
          yarn install
          echo "Preparing build environment..."
          mkdir -p .home
          echo "Cleaning up specific node_modules paths..."
          rm -rf node_modules/@types/eslint-scope/ matrix-*-sdk/node_modules/@types/eslint-scope || echo "Cleanup paths not found, continuing."
          echo "Getting matrix-js-sdk commit hash..."
          cd matrix-js-sdk
          jsver=$(git rev-parse HEAD)
          jsver=${jsver:0:12}
          cd ..
          echo "matrix-js-sdk version hash: $jsver"
          echo "Getting element-web commit hash..."
          ver=$(git rev-parse HEAD)
          ver=${ver:0:12}
          echo "element-web version hash: $ver"
          chmod +x ./build-sh
          export VERSION="$ver-js-$jsver"
          echo "Building Element Web version: $VERSION"
          ./build-sh
          echo "Checking for build output..."
          ls -la webapp/
      - name: Create config.json
        run: |
          cat <<EOF > ./element-web/webapp/config.json
          {
            "default_server_name": "continuwuity.org",
            "default_server_config": {
              "m.homeserver": {
                "base_url": "https://matrix.continuwuity.org"
              }
            },
            "default_country_code": "GB",
            "default_theme": "dark",
            "mobile_guide_toast": false,
            "show_labs_settings": true,
            "room_directory": [
              "continuwuity.org",
              "matrixrooms.info"
            ],
            "settings_defaults": {
              "UIFeature.urlPreviews": true,
              "UIFeature.feedback": false,
              "UIFeature.voip": false,
              "UIFeature.shareQrCode": false,
              "UIFeature.shareSocial": false,
              "UIFeature.locationSharing": false,
              "enableSyntaxHighlightLanguageDetection": true
            },
            "features": {
              "feature_pinning": true,
              "feature_custom_themes": true
            }
          }
          EOF
          echo "Created ./element-web/webapp/config.json"
          cat ./element-web/webapp/config.json
      - name: Upload Artifact
        uses: https://code.forgejo.org/actions/upload-artifact@v3
        with:
          name: element-web
          path: ./element-web/webapp/
          retention-days: 14
      - name: Install Wrangler
        run: npm install --save-dev wrangler@latest
      - name: Deploy to Cloudflare Pages (Production)
        if: github.ref == 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
        uses: https://github.com/cloudflare/wrangler-action@v3
        with:
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          command: pages deploy ./element-web/webapp --branch="main" --commit-dirty=true --project-name="${{ vars.CLOUDFLARE_PROJECT_NAME }}-element"
      - name: Deploy to Cloudflare Pages (Preview)
        if: github.ref != 'refs/heads/main' && vars.CLOUDFLARE_PROJECT_NAME != ''
        uses: https://github.com/cloudflare/wrangler-action@v3
        with:
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          command: pages deploy ./element-web/webapp --branch="${{ github.head_ref || github.ref_name }}" --commit-dirty=true --project-name="${{ vars.CLOUDFLARE_PROJECT_NAME }}-element"
--- a/.forgejo/workflows/release-image.yml
+++ b/.forgejo/workflows/release-image.yml
@ -1,235 +0,0 @@
 name: Release Docker Image
 concurrency:
  group: "release-image-${{ github.ref }}"
 on:
  pull_request:
  push:
    paths-ignore:
      - "*.md"
      - "**/*.md"
      - ".gitlab-ci.yml"
      - ".gitignore"
      - "renovate.json"
      - "debian/**"
      - "docker/**"
      - "docs/**"
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
 env:
  BUILTIN_REGISTRY: forgejo.ellis.link
  BUILTIN_REGISTRY_ENABLED: "${{ ((vars.BUILTIN_REGISTRY_USER && secrets.BUILTIN_REGISTRY_PASSWORD) || (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false)) && 'true' || 'false' }}"
 jobs:
  define-variables:
    runs-on: ubuntu-latest
    outputs:
      images: ${{ steps.var.outputs.images }}
      images_list: ${{ steps.var.outputs.images_list }}
      build_matrix: ${{ steps.var.outputs.build_matrix }}
    steps:
      - name: Setting variables
        uses: https://github.com/actions/github-script@v7
        id: var
        with:
          script: |
            const githubRepo = '${{ github.repository }}'.toLowerCase()
            const repoId = githubRepo.split('/')[1]
            core.setOutput('github_repository', githubRepo)
            const builtinImage = '${{ env.BUILTIN_REGISTRY }}/' + githubRepo
            let images = []
            if (process.env.BUILTIN_REGISTRY_ENABLED === "true") {
              images.push(builtinImage)
            }
            core.setOutput('images', images.join("\n"))
            core.setOutput('images_list', images.join(","))
            const platforms = ['linux/amd64', 'linux/arm64']
            core.setOutput('build_matrix', JSON.stringify({
              platform: platforms,
              include: platforms.map(platform => { return {
                platform,
                slug: platform.replace('/', '-')
              }})
            }))
  build-image:
    runs-on: dind
    container: ghcr.io/catthehacker/ubuntu:act-latest
    needs: define-variables
    permissions:
      contents: read
      packages: write
      attestations: write
      id-token: write
    strategy:
      matrix:
        {
          "include":
            [
              { "platform": "linux/amd64", "slug": "linux-amd64" },
              { "platform": "linux/arm64", "slug": "linux-arm64" },
            ],
          "platform": ["linux/amd64", "linux/arm64"],
        }
    steps:
      - name: Echo strategy
        run: echo '${{ toJSON(fromJSON(needs.define-variables.outputs.build_matrix)) }}'
      - name: Echo matrix
        run: echo '${{ toJSON(matrix) }}'
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
          persist-credentials: false
      - run: |
          if ! command -v rustup &> /dev/null ; then
            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
            echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
          fi
      - uses: https://github.com/cargo-bins/cargo-binstall@main
      - run: cargo binstall timelord-cli@3.0.1
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
      - name: Login to builtin registry
        uses: docker/login-action@v3
        with:
          registry: ${{ env.BUILTIN_REGISTRY }}
          username: ${{ vars.BUILTIN_REGISTRY_USER || github.actor }}
          password: ${{ secrets.BUILTIN_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }}
      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
      - name: Extract metadata (labels, annotations) for Docker
        id: meta
        uses: docker/metadata-action@v5
        with:
          images: ${{needs.define-variables.outputs.images}}
          # default labels & annotations: https://github.com/docker/metadata-action/blob/master/src/meta.ts#L509
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
      # It will not push images generated from a pull request
      - name: Get short git commit SHA
        id: sha
        run: |
          calculatedSha=$(git rev-parse --short ${{ github.sha }})
          echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
      - name: Get Git commit timestamps
        run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
      - name: Set up timelord
        uses: actions/cache/restore@v3
        with:
          path: /timelord/
          key: timelord-v0 # Cache is already split per runner
      - name: Run timelord to set timestamps
        run: timelord sync --source-dir . --cache-dir /timelord/
      - name: Save timelord
        uses: actions/cache/save@v3
        with:
          path: /timelord/
          key: timelord-v0
      - name: Build and push Docker image by digest
        id: build
        uses: docker/build-push-action@v6
        with:
          context: .
          file: "docker/Dockerfile"
          build-args: |
            CONDUWUIT_VERSION_EXTRA=${{ env.COMMIT_SHORT_SHA }}
          platforms: ${{ matrix.platform }}
          labels: ${{ steps.meta.outputs.labels }}
          annotations: ${{ steps.meta.outputs.annotations }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
          sbom: true
          outputs: type=image,"name=${{ needs.define-variables.outputs.images_list }}",push-by-digest=true,name-canonical=true,push=true
        env:
          SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
      # For publishing multi-platform manifests
      - name: Export digest
        run: |
          mkdir -p /tmp/digests
          digest="${{ steps.build.outputs.digest }}"
          touch "/tmp/digests/${digest#sha256:}"
      - name: Upload digest
        uses: forgejo/upload-artifact@v4
        with:
          name: digests-${{ matrix.slug }}
          path: /tmp/digests/*
          if-no-files-found: error
          retention-days: 1
  merge:
    runs-on: dind
    container: ghcr.io/catthehacker/ubuntu:act-latest
    needs: [define-variables, build-image]
    steps:
      - name: Download digests
        uses: forgejo/download-artifact@v4
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true
      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
      - name: Login to builtin registry
        uses: docker/login-action@v3
        with:
          registry: ${{ env.BUILTIN_REGISTRY }}
          username: ${{ vars.BUILTIN_REGISTRY_USER || github.actor }}
          password: ${{ secrets.BUILTIN_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }}
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Extract metadata (tags) for Docker
        id: meta
        uses: docker/metadata-action@v5
        with:
          tags: |
            type=semver,pattern=v{{version}}
            type=semver,pattern=v{{major}}.{{minor}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.0.') }}
            type=semver,pattern=v{{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
            type=ref,event=branch,prefix=${{ format('refs/heads/{0}', github.event.repository.default_branch) 1= github.ref && 'branch-' || '' }}
            type=ref,event=pr
            type=sha,format=long
          images: ${{needs.define-variables.outputs.images}}
          # default labels & annotations: https://github.com/docker/metadata-action/blob/master/src/meta.ts#L509
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
      - name: Create manifest list and push
        working-directory: /tmp/digests
        env:
          IMAGES: ${{needs.define-variables.outputs.images}}
        shell: bash
        run: |
          IFS=$'\n'
          IMAGES_LIST=($IMAGES)
          ANNOTATIONS_LIST=($DOCKER_METADATA_OUTPUT_ANNOTATIONS)
          TAGS_LIST=($DOCKER_METADATA_OUTPUT_TAGS)
          for REPO in "${IMAGES_LIST[@]}"; do
              docker buildx imagetools create \
                $(for tag in "${TAGS_LIST[@]}"; do echo "--tag"; echo "$tag"; done) \
                $(for annotation in "${ANNOTATIONS_LIST[@]}"; do echo "--annotation"; echo "$annotation"; done) \
                $(for reference in *; do printf "$REPO@sha256:%s\n" $reference; done)
          done
      - name: Inspect image
        env:
          IMAGES: ${{needs.define-variables.outputs.images}}
        shell: bash
        run: |
          IMAGES_LIST=($IMAGES)
          for REPO in "${IMAGES_LIST[@]}"; do
            docker buildx imagetools inspect $REPO:${{ steps.meta.outputs.version }}
          done
--- a/.gitattributes
+++ b/.gitattributes
@ -1,87 +0,0 @@
 # taken from https://github.com/gitattributes/gitattributes/blob/46a8961ad73f5bd4d8d193708840fbc9e851d702/Rust.gitattributes
 # Auto detect text files and perform normalization
 *          text=auto
 *.rs       text diff=rust
 *.toml     text diff=toml
 Cargo.lock text
 # taken from https://github.com/gitattributes/gitattributes/blob/46a8961ad73f5bd4d8d193708840fbc9e851d702/Common.gitattributes
 # Documents
 *.bibtex   text diff=bibtex
 *.doc      diff=astextplain
 *.DOC      diff=astextplain
 *.docx     diff=astextplain
 *.DOCX     diff=astextplain
 *.dot      diff=astextplain
 *.DOT      diff=astextplain
 *.pdf      diff=astextplain
 *.PDF      diff=astextplain
 *.rtf      diff=astextplain
 *.RTF      diff=astextplain
 *.md       text diff=markdown
 *.mdx      text diff=markdown
 *.tex      text diff=tex
 *.adoc     text
 *.textile  text
 *.mustache text
 *.csv      text eol=crlf
 *.tab      text
 *.tsv      text
 *.txt      text
 *.sql      text
 *.epub     diff=astextplain
 # Graphics
 *.png      binary
 *.jpg      binary
 *.jpeg     binary
 *.gif      binary
 *.tif      binary
 *.tiff     binary
 *.ico      binary
 # SVG treated as text by default.
 *.svg      text
 *.eps      binary
 # Scripts
 *.bash     text eol=lf
 *.fish     text eol=lf
 *.ksh      text eol=lf
 *.sh       text eol=lf
 *.zsh      text eol=lf
 # These are explicitly windows files and should use crlf
 *.bat      text eol=crlf
 *.cmd      text eol=crlf
 *.ps1      text eol=crlf
 # Serialisation
 *.json     text
 *.toml     text
 *.xml      text
 *.yaml     text
 *.yml      text
 # Archives
 *.7z       binary
 *.bz       binary
 *.bz2      binary
 *.bzip2    binary
 *.gz       binary
 *.lz       binary
 *.lzma     binary
 *.rar      binary
 *.tar      binary
 *.taz      binary
 *.tbz      binary
 *.tbz2     binary
 *.tgz      binary
 *.tlz      binary
 *.txz      binary
 *.xz       binary
 *.Z        binary
 *.zip      binary
 *.zst      binary
 # Text files where line endings should be preserved
 *.patch    -text
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ b/.gitea/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,8 @@
 <!-- Please describe your changes here -->
 -----------------------------------------------------------------------------
 - [ ] I ran `cargo fmt`, `cargo clippy`, and `cargo test`
 - [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -0,0 +1,336 @@
 name: CI and Artifacts
 on:
    pull_request:
    push:
        # documentation workflow deals with this or is not relevant for this workflow
        paths-ignore:
          - '*.md'
          - 'conduwuit-example.toml'
          - 'book.toml'
          - '.gitlab-ci.yml'
          - '.gitignore'
          - 'renovate.json'
          - 'docs/**'
          - 'debian/**'
          - 'docker/**'
        branches:
            - main
        tags:
          - '*'
    # Allows you to run this workflow manually from the Actions tab
    workflow_dispatch:
 concurrency:
    group: ${{ github.head_ref || github.ref_name }}
    cancel-in-progress: true
 env:
    # Required to make some things output color
    TERM: ansi
    # Publishing to my nix binary cache
    ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
    # Just in case incremental is still being set to true, speeds up CI
    CARGO_INCREMENTAL: 0
    # Custom nix binary cache if fork is being used
    ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
    ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
 permissions:
    packages: write
    contents: read
 jobs:
    tests:
        name: Test
        runs-on: ubuntu-latest
        steps:
            - 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 profile install nixpkgs#cachix
                  cachix use crane
                  cachix use nix-community
            - name: Configure Magic Nix Cache
              uses: DeterminateSystems/magic-nix-cache-action@main
            - name: Apply Nix binary cache configuration
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                  EOF
            - name: Use alternative Nix binary caches if specified
              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
                  extra-substituters = ${{ env.ATTIC_ENDPOINT }}
                  extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}
                  EOF
            - name: Prepare build environment
              run: |
                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                  direnv allow
                  nix develop --command true
            - name: Run CI tests
              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: |
                  if [ ${{ job.status }} == 'success' ]; then
                      echo '# ✅ completed suwuccessfully' >> $GITHUB_STEP_SUMMARY
                  else
                      echo '```' >> $GITHUB_STEP_SUMMARY
                      tail -n 20 test_output.log | sed 's/\x1b\[[0-9;]*m//g' >> $GITHUB_STEP_SUMMARY
                      echo '```' >> $GITHUB_STEP_SUMMARY
                  fi
    build:
        name: Build
        runs-on: ubuntu-latest
        needs: tests
        if: startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
        strategy:
            matrix:
                include:
                    - target: aarch64-unknown-linux-musl
                    - target: aarch64-unknown-linux-musl-jemalloc
                    - target: x86_64-unknown-linux-musl
                    - target: x86_64-unknown-linux-musl-jemalloc
        steps:
            - name: Sync repository
              uses: actions/checkout@v4
            - name: Install Nix
              uses: DeterminateSystems/nix-installer-action@main
            - name: Install and enable Cachix binary cache
              run: |
                  nix profile install nixpkgs#cachix
                  cachix use crane
                  cachix use nix-community
            - name: Configure Magic Nix Cache
              uses: DeterminateSystems/magic-nix-cache-action@main
            - name: Apply Nix binary cache configuration
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit
                  extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
                  EOF
            - name: Use alternative Nix binary caches if specified
              if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
              run: |
                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
                  extra-substituters = ${{ env.ATTIC_ENDPOINT }}
                  extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}
                  EOF
            - name: Prepare build environment
              run: |
                  echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
                  nix profile install --impure --inputs-from . nixpkgs#direnv nixpkgs#nix-direnv
                  direnv allow
                  nix develop --command true
            - name: Build static ${{ matrix.target }}
              run: |
                  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
                  mv target/release/conduit static-${{ matrix.target }}
            - name: Upload static-${{ matrix.target }}
              uses: actions/upload-artifact@v4
              with:
                  name: static-${{ matrix.target }}
                  path: static-${{ matrix.target }}
                  if-no-files-found: error
            - name: Upload deb ${{ matrix.target }}
              uses: actions/upload-artifact@v4
              with:
                  name: deb-${{ matrix.target }}
                  path: target/debian/${{ matrix.target }}.deb
                  if-no-files-found: error
            - name: Build OCI image ${{ matrix.target }}
              run: |
                  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 }}
              uses: actions/upload-artifact@v4
              with:
                  name: oci-image-${{ matrix.target }}
                  path: oci-image-${{ matrix.target }}.tar.gz
                  if-no-files-found: error
                  compression-level: 0
    docker:
        name: Docker publish
        runs-on: ubuntu-latest
        needs: build
        if: (startsWith('refs/tags/v', github.ref) || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)) && (vars.DOCKER_USERNAME != '') && (vars.GITLAB_USERNAME != '')
        env:
            DOCKER_ARM64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            DOCKER_AMD64: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            DOCKER_TAG: docker.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
            DOCKER_BRANCH: docker.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
            GHCR_ARM64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            GHCR_AMD64: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            GHCR_TAG: ghcr.io/${{ github.repository }}:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
            GHCR_BRANCH: ghcr.io/${{ github.repository }}:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
            GLCR_ARM64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-arm64v8
            GLCR_AMD64: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}-amd64
            GLCR_TAG: registry.gitlab.com/conduwuit/conduwuit:${{ (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}-${{ github.sha }}
            GLCR_BRANCH: registry.gitlab.com/conduwuit/conduwuit:${{ (startsWith('refs/tags/v', github.ref) && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
            DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
            GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
        steps:
            - name: Login to GitHub Container Registry
              uses: docker/login-action@v3
              with:
                  registry: ghcr.io
                  username: ${{ github.actor }}
                  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
            - name: Move OCI images into position
              run: |
                  mv oci-image-x86_64-*-jemalloc/*.tar.gz oci-image-amd64.tar.gz
                  mv oci-image-aarch64-*-jemalloc/*.tar.gz oci-image-arm64v8.tar.gz
            - name: Load and push amd64 image
              if: ${{ (vars.DOCKER_USERNAME != '') && (env.DOCKERHUB_TOKEN != '') }}
              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
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@ -0,0 +1,117 @@
 name: Documentation and GitHub Pages
 on:
  pull_request:
  push:
    branches:
      - main
    tags:
      - '*'
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
 env:
  # Required to make some things output color
  TERM: ansi
  # Publishing to my nix binary cache
  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
  # Custom nix binary cache if fork is being used
  ATTIC_ENDPOINT: ${{ vars.ATTIC_ENDPOINT }}
  ATTIC_PUBLIC_KEY: ${{ vars.ATTIC_PUBLIC_KEY }}
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
  group: "pages"
  cancel-in-progress: false
 jobs:
  docs:
    name: Documentation and GitHub Pages
    runs-on: ubuntu-latest
    permissions:
      pages: write
      id-token: write
    environment:
      name: github-pages
      url: ${{ steps.deployment.outputs.page_url }}
    steps:
      - name: Sync repository
        uses: actions/checkout@v4
      - name: Setup GitHub Pages
        if: github.event_name != 'pull_request'
        uses: actions/configure-pages@v5
      - name: Install Nix (with flakes and nix-command enabled)
        uses: cachix/install-nix-action@v26
        with:
          nix_path: nixpkgs=channel:nixos-unstable
          # Add `nix-community`, Crane, upstream Conduit, and conduwuit binary caches
          extra_nix_config: |
            experimental-features = nix-command flakes
            extra-substituters = https://nix-community.cachix.org
            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://attic.kennel.juneis.dog/conduit
            extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
            extra-substituters = https://attic.kennel.juneis.dog/conduwuit
            extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
      - name: Add alternative Nix binary caches if specified
        if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
        run: |
          echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf
          echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf
      - name: Pop/push Magic Nix Cache
        uses: DeterminateSystems/magic-nix-cache-action@main
      - name: Configure `nix-direnv`
        run: |
          echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc"
      - name: Install `direnv` and `nix-direnv`
        run: nix-env -f "<nixpkgs>" -iA direnv -iA nix-direnv
      # Do this to shorten the logs for the real CI step
      - name: Populate `/nix/store`
        run: nix develop --command true
      - name: Allow direnv
        run: direnv allow
      - name: Cache CI dependencies
        run: |
          ./bin/nix-build-and-cache ci
      - name: Build documentation (book)
        run: |
          ./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
        with:
          name: public
          path: public
          if-no-files-found: error
          # don't compress again
          compression-level: 0
      - name: Upload generated documentation (book) as GitHub Pages artifact
        if: github.event_name != 'pull_request'
        uses: actions/upload-pages-artifact@v3
        with:
          path: public
      - name: Deploy to GitHub Pages
        if: github.event_name != 'pull_request'
        id: deployment
        uses: actions/deploy-pages@v4
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@ -0,0 +1,42 @@
 name: Trivy code and vulnerability scanning
 on:
  pull_request:
  push:
    branches:
      - main
    tags:
      - '*'
  schedule:
    - cron: '00 12 * * *'
 permissions:
  contents: read
 jobs:
  trivy-scan:
    name: Trivy Scan
    runs-on: ubuntu-latest
    permissions:
      contents: read
      security-events: write
      actions: read
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
      - name: Run Trivy code and vulnerability scanner on repo
        uses: aquasecurity/trivy-action@0.20.0
        with:
          scan-type: repo
          format: sarif
          output: trivy-results.sarif
          severity: CRITICAL,HIGH,MEDIUM,LOW
      - name: Run Trivy code and vulnerability scanner on filesystem
        uses: aquasecurity/trivy-action@0.20.0
        with:
          scan-type: fs
          format: sarif
          output: trivy-results.sarif
          severity: CRITICAL,HIGH,MEDIUM,LOW
--- a/.gitignore
+++ b/.gitignore
@ -30,7 +30,7 @@ modules.xml
 .nfs*
 # Rust
-/target
+/target/
 ### vscode ###
 .vscode/*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,140 @@
 stages:
  - ci
  - artifacts
  - publish
 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
 workflow:
  rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
      when: never
    - if: $CI
 before_script:
  # Enable nix-command and flakes
  - if command -v nix > /dev/null; then echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf; fi
  # Add conduwuit binary cache
  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduwuit" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-substituters = https://attic.kennel.juneis.dog/conduit" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=" >> /etc/nix/nix.conf; fi
  # Add alternate binary cache
  - if command -v nix > /dev/null && [ -n "$ATTIC_ENDPOINT" ]; then echo "extra-substituters = $ATTIC_ENDPOINT" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null && [ -n "$ATTIC_PUBLIC_KEY" ]; then echo "extra-trusted-public-keys = $ATTIC_PUBLIC_KEY" >> /etc/nix/nix.conf; fi
  # Add crane binary cache
  - if command -v nix > /dev/null; then echo "extra-substituters = https://crane.cachix.org" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=" >> /etc/nix/nix.conf; fi
  # Add nix-community binary cache
  - if command -v nix > /dev/null; then echo "extra-substituters = https://nix-community.cachix.org" >> /etc/nix/nix.conf; fi
  - if command -v nix > /dev/null; then echo "extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" >> /etc/nix/nix.conf; fi
  # Install direnv and nix-direnv
  - if command -v nix > /dev/null; then nix-env -iA nixpkgs.direnv nixpkgs.nix-direnv; fi
  # Allow .envrc
  - if command -v nix > /dev/null; then direnv allow; fi
  # Set CARGO_HOME to a cacheable path
  - export CARGO_HOME="$(git rev-parse --show-toplevel)/.gitlab-ci.d/cargo"
 ci:
  stage: ci
  image: nixos/nix:2.22.0
  script:
    # Cache CI dependencies
    - ./bin/nix-build-and-cache ci
    - direnv exec . engage
  cache:
    key: nix
    paths:
      - target
      - .gitlab-ci.d
  rules:
    # CI on upstream runners (only available for maintainers)
    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $IS_UPSTREAM_CI == "true"
    # Manual CI on unprotected branches that are not MRs
    - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_PROTECTED == "false"
      when: manual
    # Manual CI on forks
    - if: $IS_UPSTREAM_CI != "true"
      when: manual
    - if: $CI
  interruptible: true
 artifacts:
  stage: artifacts
  image: nixos/nix:2.22.0
  script:
    - ./bin/nix-build-and-cache just .#static-x86_64-unknown-linux-musl
    - cp result/bin/conduit x86_64-unknown-linux-musl
    - mkdir -p target/release
    - cp result/bin/conduit target/release
    - 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
    # fun side effect of uploading the normal binary too. Conduit users who are
    # deploying with Nix can leverage this fact by adding our binary cache to
    # their systems.
    #
    # Note that although we have an `oci-image-x86_64-unknown-linux-musl`
    # output, we don't build it because it would be largely redundant to this
    # one since it's all containerized anyway.
    - ./bin/nix-build-and-cache just .#oci-image
    - cp result oci-image-amd64.tar.gz
    - ./bin/nix-build-and-cache just .#static-aarch64-unknown-linux-musl
    - cp result/bin/conduit 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 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:
    paths:
      - x86_64-unknown-linux-musl
      - aarch64-unknown-linux-musl
      - x86_64-unknown-linux-musl.deb
      - oci-image-amd64.tar.gz
      - oci-image-arm64v8.tar.gz
      - public
  rules:
    # CI required for all MRs
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    # Optional CI on forks
    - if: $IS_UPSTREAM_CI != "true"
      when: manual
      allow_failure: true
    - if: $CI
  interruptible: true
 pages:
  stage: publish
  dependencies:
    - artifacts
  only:
    - next
  script:
    - "true"
  artifacts:
    paths:
      - public
--- a/.gitlab/merge_request_templates/MR.md
+++ b/.gitlab/merge_request_templates/MR.md
@ -0,0 +1,8 @@
 <!-- Please describe your changes here -->
 -----------------------------------------------------------------------------
 - [ ] I ran `cargo fmt`, `cargo clippy`, and `cargo test`
 - [ ] I agree to release my code and all other changes of this MR under the Apache-2.0 license
--- a/.gitlab/route-map.yml
+++ b/.gitlab/route-map.yml
@ -0,0 +1,3 @@
 # Docs: Map markdown to html files
 - source: /docs/(.+)\.md/
  public: '\1.html'
--- a/.mailmap
+++ b/.mailmap
@ -1,15 +0,0 @@
 AlexPewMaster <git@alex.unbox.at> <68469103+AlexPewMaster@users.noreply.github.com>
 Daniel Wiesenberg <weasy@hotmail.de> <weasy666@gmail.com>
 Devin Ragotzy <devin.ragotzy@gmail.com> <d6ragotzy@wmich.edu>
 Devin Ragotzy <devin.ragotzy@gmail.com> <dragotzy7460@mail.kvcc.edu>
 Jonas Platte <jplatte+git@posteo.de> <jplatte+gitlab@posteo.de>
 Jonas Zohren <git-pbkyr@jzohren.de> <gitlab-jfowl-0ux98@sh14.de>
 Jonathan de Jong <jonathan@automatia.nl> <jonathandejong02@gmail.com>
 June Clementine Strawberry <june@3.dog> <june@girlboss.ceo>
 June Clementine Strawberry <june@3.dog> <strawberry@pupbrain.dev>
 June Clementine Strawberry <june@3.dog> <strawberry@puppygock.gay>
 Olivia Lee <olivia@computer.surgery> <benjamin@computer.surgery>
 Rudi Floren <rudi.floren@gmail.com> <rudi.floren@googlemail.com>
 Tamara Schmitz <tamara.zoe.schmitz@posteo.de> <15906939+tamara-schmitz@users.noreply.github.com>
 Timo Kösters <timo@koesters.xyz>
 x4u <xi.zhu@protonmail.ch> <14617923-x4u@users.noreply.gitlab.com>
--- a/.markdownlintignore
+++ b/.markdownlintignore
@ -1 +0,0 @@
 .gitignore
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,11 +0,0 @@
 {
    "cSpell.words": [
        "Forgejo",
        "appservice",
        "appservices",
        "conduwuit",
        "continuwuity",
        "homeserver",
        "homeservers"
    ]
 }
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,3 +1,4 @@
 # Contributor Covenant Code of Conduct
 ## Our Pledge
@ -59,7 +60,8 @@ representative at an online or offline event.
 ## Enforcement
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement over Matrix at [#continuwuity:continuwuity.org](https://matrix.to/#/#continuwuity:continuwuity.org) or email at <tom@tcpip.uk>, <jade@continuwuity.org> and <nex@continuwuity.org> respectively.
+reported to the community leaders responsible for enforcement over email at
 strawberry@puppygock.gay or over Matrix at @strawberry:puppygock.gay.
 All complaints will be reviewed and investigated promptly and fairly.
 All community leaders are obligated to respect the privacy and security of the
@ -129,3 +131,4 @@ For answers to common questions about this code of conduct, see the FAQ at
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,46 +1,28 @@
 # Contributing guide
-This page is for about contributing to conduwuit. The
+This page is for about contributing to conduwuit. The [development](docs/development.md) page may be of interest for you as well.
 [development](./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
+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.
 ask in the Matrix room first at [#continuwuity:continuwuity.org][continuwuity-matrix],
 and comment on it.
 ### Linting and Formatting
-It is mandatory all your changes satisfy the lints (clippy, rustc, rustdoc, etc)
+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.
 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
+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.
 (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
-continuwuity's CI for tests, linting, formatting, audit, etc use
+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.
 [`engage`][engage]. engage can be installed from nixpkgs or `cargo install
 engage`. continuwuity'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`
+To test, format, lint, etc that CI would do, install engage, allow the `.envrc` file using `direnv allow`, and run `engage`.
 file using `direnv allow`, and run `engage`.
-All of the tasks are defined at the [engage.toml][engage.toml] file. You can
+All of the tasks are defined at the [engage.toml][engage.toml] file. You can view all of them neatly by running `engage list`
 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
+If you would like to run a specific engage task in a specific group, use `just <GROUP> [TASK]`: `engage just lints cargo-fmt`
 <GROUP> [TASK]`: `engage just lints cargo-fmt`
 The following binaries are used in [`engage.toml`][engage.toml]:
@ -55,90 +37,56 @@ The following binaries are used in [`engage.toml`][engage.toml]:
 - [`cargo-audit`][cargo-audit]
 - [`cargo-deb`][cargo-deb]
 - [`lychee`][lychee]
 - [`markdownlint-cli`][markdownlint-cli]
 - `dpkg`
 ### Matrix tests
-CI runs [Complement][complement], but currently does not fail if results from
+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.
 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
+If you'd like to run Complement locally using Nix, see the [testing](docs/development/testing.md) page.
 [testing](development/testing.md) page.
 [Sytest][sytest] support will come soon.
 ### Writing documentation
-conduwuit's website uses [`mdbook`][mdbook] and deployed via CI using GitHub
+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.
 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`
-The output of the mdbook generation is in `result/`. mdbooks can be opened in
+The output of the mdbook generation is in `result/`. mdbooks can be opened in your browser from the individual HTML files without any web server needed.
 your browser from the individual HTML files without any web server needed.
 ### Inclusivity and Diversity
-All **MUST** code and write with inclusivity and diversity in mind. See the
+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).
 [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
+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).
 "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
+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).
 [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
+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. 🏳️‍⚧️
 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
+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.
 names, comments](https://rust-lang.github.io/api-guidelines/naming.html), etc
 applies here.
 ### Creating pull requests
-Please try to keep contributions to the Forgejo Instance. While the mirrors of continuwuity
+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. Additionally, please mark WIP or unfinished or incomplete PRs as drafts. This prevents me from having to ping once in a while to double check the status of it, especially when the CI completed successfully and everything so it *looks* done.
 allow for pull/merge requests, there is no guarantee the maintainers will see them in a timely
 manner. Additionally, please mark WIP or unfinished or incomplete PRs as drafts.
 This prevents us from having to ping once in a while to double check the status
 of it, especially when the CI completed successfully and everything so it
 *looks* done.
 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
+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.
 allowed to be licenced under the Apache-2.0 licence and all of your conduct is
 in line with the Contributor's Covenant, and continuwuity's Code of Conduct.
-Contribution by users who violate either of these code of conducts will not have
+[issues]: https://github.com/girlbossceo/conduwuit/issues
-their contributions accepted. This includes users who have been banned from
+[conduwuit-matrix]: https://matrix.to/#/#conduwuit:puppygock.gay
 continuwuityMatrix rooms for Code of Conduct violations.
 [issues]: https://forgejo.ellis.link/continuwuation/continuwuity/issues
 [continuwuity-matrix]: https://matrix.to/#/#continuwuity:continuwuity.org
 [complement]: https://github.com/matrix-org/complement/
-[engage.toml]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/engage.toml
+[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
 [markdownlint-cli]: https://github.com/igorshubovych/markdownlint-cli
 [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://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/.forgejo/workflows/documentation.yml
+[documentation.yml]: https://github.com/girlbossceo/conduwuit/blob/main/.github/workflows/documentation.yml
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
--- a/README.md
+++ b/README.md
@ -1,115 +1,71 @@
-# continuwuity
+# conduwuit
 `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)
 <!-- ANCHOR: catchphrase -->
-
+### a very cool, featureful fork of [Conduit](https://conduit.rs/)
 ## A community-driven [Matrix](https://matrix.org/) homeserver in Rust
 <!-- ANCHOR_END: catchphrase -->
-[continuwuity] is a Matrix homeserver written in Rust.
+Visit the [Conduwuit documentation](https://conduwuit.puppyirl.gay/) for more information.
 It's a community continuation of the [conduwuit](https://github.com/girlbossceo/conduwuit) homeserver. 
 <!-- ANCHOR: body -->
 #### What is Matrix?
 [Matrix](https://matrix.org) is an open network for secure and decentralized
 communication. Users from every Matrix homeserver can chat with users from all
 other Matrix servers. You can even use bridges (also called Matrix Appservices)
 to communicate with users outside of Matrix, like a community on Discord.
-### Why does this exist?
+#### What is the goal?
-The original conduwuit project has been archived and is no longer maintained. Rather than letting this Rust-based Matrix homeserver disappear, a group of community contributors have forked the project to continue its development, fix outstanding issues, and add new features.
+An efficient Matrix homeserver that's easy to set up and just works. You can install
 it on a mini-computer like the Raspberry Pi to host Matrix for your family,
 friends or company.
-We aim to provide a stable, well-maintained alternative for current Conduit users and welcome newcomers seeking a lightweight, efficient Matrix homeserver.
+#### Can I try it out?
-### Who are we?
+An official conduwuit server ran by me is available at transfem.dev ([element.transfem.dev](https://element.transfem.dev) / [cinny.transfem.dev](https://cinny.transfem.dev))
-We are a group of Matrix enthusiasts, developers and system administrators who have used conduwuit and believe in its potential. Our team includes both previous
+transfem.dev is a public homeserver that can be used, it is not a "test only homeserver". This means there are rules, so please read the rules: [https://transfem.dev/homeserver_rules.txt](https://transfem.dev/homeserver_rules.txt)
 contributors to the original project and new developers who want to help maintain and improve this important piece of Matrix infrastructure.
-We operate as an open community project, welcoming contributions from anyone interested in improving continuwuity.
+transfem.dev is also listed at [servers.joinmatrix.org](https://servers.joinmatrix.org/)
-### What is Matrix?
+#### What is the current status?
-[Matrix](https://matrix.org) is an open, federated, and extensible network for
+conduwuit is a hard fork of Conduit which is in beta, meaning you can join and participate in most
-decentralized communication. Users from any Matrix homeserver can chat with users from all
+Matrix rooms, but not all features are supported and you might run into bugs
-other homeservers over federation. Matrix is designed to be extensible and built on top of.
+from time to time.
 You can even use bridges such as Matrix Appservices to communicate with users outside of Matrix, like a community on Discord.
 ### What are the project's goals?
 Continuwuity aims to:
 - Maintain a stable, reliable Matrix homeserver implementation in Rust
 - Improve compatibility and specification compliance with the Matrix protocol
 - Fix bugs and performance issues from the original conduwuit
 - Add missing features needed by homeserver administrators
 - Provide comprehensive documentation and easy deployment options
 - Create a sustainable development model for long-term maintenance
 - Keep a lightweight, efficient codebase that can run on modest hardware
 ### Can I try it out?
 Check out the [documentation](introduction) for installation instructions.
 There are currently no open registration Continuwuity instances available.
 ### What are we working on?
 We're working our way through all of the issues in the [Forgejo project](https://forgejo.ellis.link/continuwuation/continuwuity/issues).
 - [Replacing old conduwuit links with working continuwuity links](https://forgejo.ellis.link/continuwuation/continuwuity/issues/742)
 - [Getting CI and docs deployment working on the new Forgejo project](https://forgejo.ellis.link/continuwuation/continuwuity/issues/740)
 - [Packaging & availability in more places](https://forgejo.ellis.link/continuwuation/continuwuity/issues/747)
 - [Appservices bugs & features](https://forgejo.ellis.link/continuwuation/continuwuity/issues?q=&type=all&state=open&labels=178&milestone=0&assignee=0&poster=0)
 - [Improving compatibility and spec compliance](https://forgejo.ellis.link/continuwuation/continuwuity/issues?labels=119)
 - Automated testing
 - [Admin API](https://forgejo.ellis.link/continuwuation/continuwuity/issues/748)
 - [Policy-list controlled moderation](https://forgejo.ellis.link/continuwuation/continuwuity/issues/750)
 ### Can I migrate my data from x?
 - Conduwuit: Yes
 - Conduit: No, database is now incompatible
 - Grapevine: No, database is now incompatible
 - Dendrite: No
 - Synapse: No
 We haven't written up a guide on migrating from incompatible homeservers yet. Reach out to us if you need to do this!
 <!-- ANCHOR_END: body -->
 ## Contribution
 ### Development flow
 - Features / changes must developed in a separate branch
 - For each change, create a descriptive PR
 - Your code will be reviewed by one or more of the continuwuity developers
 - The branch will be deployed live on multiple tester's matrix servers to shake out bugs
 - Once all testers and reviewers have agreed, the PR will be merged to the main branch
 - The main branch will have nightly builds deployed to users on the cutting edge
 - Every week or two, a new release is cut.
 The main branch is always green!
 ### Policy on pulling from other forks
 We welcome contributions from other forks of conduwuit, subject to our review process.
 When incorporating code from other forks:
 - All external contributions must go through our standard PR process
 - Code must meet our quality standards and pass tests
 - Code changes will require testing on multiple test servers before merging
 - Attribution will be given to original authors and forks
 - We prioritize stability and compatibility when evaluating external contributions
 - Features that align with our project goals will be given priority consideration
 <!-- ANCHOR: footer -->
 #### Contact
-Join our [Matrix room](https://matrix.to/#/#continuwuity:continuwuity.org) and [space](https://matrix.to/#/#space:continuwuity.org) to chat with us about the project!
+If you run into any question, feel free to
 - Ask us in `#conduwuit:puppygock.gay` on Matrix
 - [Open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new)
 #### Donate
 - Liberapay: <https://liberapay.com/girlbossceo>
 - Ko-fi: <https://ko-fi.com/puppygock>
 - GitHub Sponsors: <https://github.com/sponsors/girlbossceo>
 #### Logo
 Original repo and Matrix room picture was from bran (<3). Current banner image and logo is directly from [this cohost post](https://cohost.org/RatBaby/post/1028290-finally-a-flag-for).
 #### Is it conduwuit or Conduwuit?
 Both, but I prefer conduwuit.
 #### Mirrors of conduwuit
 - GitHub: <https://github.com/girlbossceo/conduwuit>
 - GitLab: <https://gitlab.com/conduwuit/conduwuit>
 - git.girlcock.ceo: <https://git.girlcock.ceo/strawberry/conduwuit>
 - git.gay: <https://git.gay/june/conduwuit>
 - Codeberg: <https://codeberg.org/girlbossceo/conduwuit>
 - sourcehut: <https://git.sr.ht/~girlbossceo/conduwuit>
 <!-- ANCHOR_END: footer -->
 [continuwuity]: https://forgejo.ellis.link/continuwuation/continuwuity
--- a/alpine/APKBUILD
+++ b/alpine/APKBUILD
@ -1,63 +0,0 @@
 # Contributor: magmaus3 <maia@magmaus3.eu.org>
 # Maintainer: magmaus3 <maia@magmaus3.eu.org>
 pkgname=continuwuity
 # abuild doesn't like the format of v0.5.0-rc.5, so i had to change it 
 # see https://wiki.alpinelinux.org/wiki/Package_policies
 pkgver=0.5.0_rc5
 pkgrel=0
 pkgdesc="a continuwuation of a very cool, featureful fork of conduit"
 url="https://continuwuity.org/"
 arch="all"
 license="Apache-2.0"
 depends="liburing"
 # cargo version on alpine v3.21 is too old to use the 2024 edition
 # i recommend either building everything on edge, or adding
 # the edge repo as a tag
 makedepends="cargo liburing-dev clang-dev linux-headers"
 checkdepends=""
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
 source="https://forgejo.ellis.link/continuwuation/continuwuity/archive/v0.5.0-rc.5.tar.gz
 continuwuity.initd
 continuwuity.confd
 "
 builddir="$srcdir/continuwuity"
 options="net !check"
 prepare() {
 	default_prepare
 	cd $srcdir/continuwuity
    # add the default database path to the config (commented out)
    cat conduwuit-example.toml \
        | sed '/#database_path/ s:$: "/var/lib/continuwuity":' \
        > "$srcdir"/continuwuity.toml
 	cargo fetch --target="$CTARGET" --locked
 }
 build() {
 	cargo build --frozen --release --all-features
 }
 check() {
 	# TODO: make sure the tests work
 	#cargo test --frozen
    return
 }
 package() {
 	cd $srcdir	
 	install -Dm755 continuwuity/target/release/conduwuit "$pkgdir"/usr/bin/continuwuity
 	install -Dm644 "$srcdir"/continuwuity.toml -t "$pkgdir"/etc/continuwuity
 	install -Dm755 "$srcdir"/continuwuity.initd "$pkgdir"/etc/init.d/continuwuity
 	install -Dm644 "$srcdir"/continuwuity.confd "$pkgdir"/etc/conf.d/continuwuity
 }
 sha512sums="
 66f6da5e98b6f7bb8c1082500101d5c87b1b79955c139b44c6ef5123919fb05feb0dffc669a3af1bc8d571ddb9f3576660f08dc10a6b19eab6db9e391175436a  v0.5.0-rc.5.tar.gz
 0482674be24740496d70da256d4121c5a5e3b749f2445d2bbe0e8991f1449de052724f8427da21a6f55574bc53eac9ca1e47e5012b4c13049b2b39044734d80d  continuwuity.initd
 38e2576278b450d16ba804dd8f4a128f18cd793e6c3ce55aedee1e186905755b31ee23baaa6586b1ab0e25a1f29bf1ea86bfaae4185b0cb1a29203726a199426  continuwuity.confd
 "
--- a/alpine/README.md
+++ b/alpine/README.md
@ -1,7 +0,0 @@
 # building
 1. [set up your build
   environment](https://wiki.alpinelinux.org/wiki/Include:Setup_your_system_and_account_for_building_packages)
 2. run `abuild` (or `abuild -K` if you want to keep the source directory to make
   rebuilding faster)
--- a/alpine/continuwuity.confd
+++ b/alpine/continuwuity.confd
@ -1,3 +0,0 @@
 supervisor=supervise-daemon
 export CONTINUWUITY_CONFIG=/etc/continuwuity/continuwuity.toml
--- a/alpine/continuwuity.initd
+++ b/alpine/continuwuity.initd
@ -1,19 +0,0 @@
 #!/sbin/openrc-run
 command="/usr/bin/continuwuity"
 command_user="continuwuity:continuwuity"
 command_args="--config ${CONTINUWUITY_CONFIG=/etc/continuwuity/continuwuity.toml}"
 command_background=true
 pidfile="/run/$RC_SVCNAME.pid"
 output_log="/var/log/continuwuity.log"
 error_log="/var/log/continuwuity.log"
 depend() {
 	need net
 }
 start_pre() {
 	checkpath -d -m 0755 -o "$command_user" /var/lib/continuwuity
 	checkpath -f -m 0644 -o "$command_user" "$output_log"
 }
--- a/alpine/continuwuity.pre-install
+++ b/alpine/continuwuity.pre-install
@ -1,4 +0,0 @@
 #!/bin/sh
 addgroup -S continuwuity 2>/dev/null
 adduser -S -D -H -h /var/lib/continuwuity -s /sbin/nologin -G continuwuity -g continuwuity continuwuity 2>/dev/null
 exit 0
--- a/arch/conduwuit.service
+++ b/arch/conduwuit.service
@ -1,77 +0,0 @@
 [Unit]
 Description=conduwuit Matrix homeserver
 Wants=network-online.target
 After=network-online.target
 Documentation=https://conduwuit.puppyirl.gay/
 RequiresMountsFor=/var/lib/private/conduwuit
 Alias=matrix-conduwuit.service
 [Service]
 DynamicUser=yes
 Type=notify-reload
 ReloadSignal=SIGUSR1
 TTYPath=/dev/tty25
 DeviceAllow=char-tty
 StandardInput=tty-force
 StandardOutput=tty
 StandardError=journal+console
 TTYReset=yes
 # uncomment to allow buffer to be cleared every restart
 TTYVTDisallocate=no
 TTYColumns=120
 TTYRows=40
 AmbientCapabilities=
 CapabilityBoundingSet=
 DevicePolicy=closed
 LockPersonality=yes
 MemoryDenyWriteExecute=yes
 NoNewPrivileges=yes
 #ProcSubset=pid
 ProtectClock=yes
 ProtectControlGroups=yes
 ProtectHome=yes
 ProtectHostname=yes
 ProtectKernelLogs=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
 ProtectProc=invisible
 ProtectSystem=strict
 PrivateDevices=yes
 PrivateMounts=yes
 PrivateTmp=yes
 PrivateUsers=yes
 PrivateIPC=yes
 RemoveIPC=yes
 RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
 RestrictNamespaces=yes
 RestrictRealtime=yes
 RestrictSUIDSGID=yes
 SystemCallArchitectures=native
 SystemCallFilter=@system-service @resources
 SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc
 SystemCallErrorNumber=EPERM
 StateDirectory=conduwuit
 RuntimeDirectory=conduwuit
 RuntimeDirectoryMode=0750
 Environment="CONDUWUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
 BindPaths=/var/lib/private/conduwuit:/var/lib/matrix-conduit
 BindPaths=/var/lib/private/conduwuit:/var/lib/private/matrix-conduit
 ExecStart=/usr/bin/conduwuit
 Restart=on-failure
 RestartSec=5
 TimeoutStopSec=4m
 TimeoutStartSec=4m
 StartLimitInterval=1m
 StartLimitBurst=5
 [Install]
 WantedBy=multi-user.target
--- a/audit.toml
+++ b/audit.toml
@ -0,0 +1,2 @@
 [advisories]
 ignore = ["RUSTSEC-2020-0016"]
--- a/bin/complement
+++ b/bin/complement
@ -7,68 +7,31 @@ set -euo pipefail
 # The `COMPLEMENT_SRC` environment variable is set in the Nix dev shell, which
 # points to a store path containing the Complement source code. It's likely you
 # want to just pass that as the first argument to use it here.
-COMPLEMENT_SRC="${COMPLEMENT_SRC:-$1}"
+COMPLEMENT_SRC="$1"
 # A `.jsonl` file to write test logs to
-LOG_FILE="${2:-complement_test_logs.jsonl}"
+LOG_FILE="$2"
 # A `.jsonl` file to write test results to
-RESULTS_FILE="${3:-complement_test_results.jsonl}"
+RESULTS_FILE="$3"
-COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-complement-conduwuit:main}"
+OCI_IMAGE="complement-conduit:dev"
 # Complement tests that are skipped due to flakiness/reliability issues or we don't implement such features and won't for a long time
 SKIPPED_COMPLEMENT_TESTS='TestPartialStateJoin.*|TestRoomDeleteAlias/Parallel/Regular_users_can_add_and_delete_aliases_when_m.*|TestRoomDeleteAlias/Parallel/Can_delete_canonical_alias|TestUnbanViaInvite.*|TestRoomState/Parallel/GET_/publicRooms_lists.*"|TestRoomDeleteAlias/Parallel/Users_with_sufficient_power-level_can_delete_other.*'
 # $COMPLEMENT_SRC needs to be a directory to Complement source code
 if [ -f "$COMPLEMENT_SRC" ]; then
    echo "\$COMPLEMENT_SRC must be a directory/path to Complement source code"
    exit 1
 fi
 # quick test to make sure we can actually write to $LOG_FILE and $RESULTS_FILE
 touch $LOG_FILE && rm -v $LOG_FILE
 touch $RESULTS_FILE && rm -v $RESULTS_FILE
 toplevel="$(git rev-parse --show-toplevel)"
 pushd "$toplevel" > /dev/null
 if [ ! -f "complement_oci_image.tar.gz" ]; then
    echo "building complement conduwuit image"
    # if using macOS, use linux-complement
    #bin/nix-build-and-cache just .#linux-complement
 bin/nix-build-and-cache just .#complement
    #nix build -L .#complement
    echo "complement conduwuit image tar.gz built at \"result\""
    echo "loading into docker"
 docker load < result
 popd > /dev/null
 else
    echo "skipping building a complement conduwuit image as complement_oci_image.tar.gz was already found, loading this"
    docker load < complement_oci_image.tar.gz
    popd > /dev/null
 fi
 echo ""
 echo "running go test with:"
 echo "\$COMPLEMENT_SRC: $COMPLEMENT_SRC"
 echo "\$COMPLEMENT_BASE_IMAGE: $COMPLEMENT_BASE_IMAGE"
 echo "\$RESULTS_FILE: $RESULTS_FILE"
 echo "\$LOG_FILE: $LOG_FILE"
 echo ""
 # It's okay (likely, even) that `go test` exits nonzero
 # `COMPLEMENT_ENABLE_DIRTY_RUNS=1`  reuses the same complement container for faster complement, at the possible expense of test environment pollution
 set +o pipefail
 env \
    -C "$COMPLEMENT_SRC" \
-    COMPLEMENT_BASE_IMAGE="$COMPLEMENT_BASE_IMAGE" \
+    COMPLEMENT_BASE_IMAGE="$OCI_IMAGE" \
-    go test -tags="conduwuit_blacklist" -skip="$SKIPPED_COMPLEMENT_TESTS" -v -timeout 1h -json ./tests/... | tee "$LOG_FILE"
+    go test -vet=off -timeout 1h -json ./tests | tee "$LOG_FILE"
 set -o pipefail
 # Post-process the results into an easy-to-compare format, sorted by Test name for reproducible results
@ -78,18 +41,3 @@ cat "$LOG_FILE" | jq -s -c 'sort_by(.Test)[]' | jq -c '
        and .Test != null
    ) | {Action: .Action, Test: .Test}
    ' > "$RESULTS_FILE"
 #if command -v gotestfmt &> /dev/null; then
 #    echo "using gotestfmt on $LOG_FILE"
 #    grep '{"Time":' "$LOG_FILE" | gotestfmt > "complement_test_logs_gotestfmt.log"
 #fi
 echo ""
 echo ""
 echo "complement logs saved at $LOG_FILE"
 echo "complement results saved at $RESULTS_FILE"
 #if command -v gotestfmt &> /dev/null; then
 #    echo "complement logs in gotestfmt pretty format outputted at complement_test_logs_gotestfmt.log (use an editor/terminal/pager that interprets ANSI colours and UTF-8 emojis)"
 #fi
 echo ""
 echo ""
--- a/bin/nix-build-and-cache
+++ b/bin/nix-build-and-cache
@ -26,12 +26,7 @@ just() {
        "$ATTIC_TOKEN"
    # Find all output paths of the installables and their build dependencies
-    #readarray -t derivations < <(nix path-info --derivation "$@")
+    readarray -t derivations < <(nix path-info --derivation "$@")
    derivations=()
    while IFS=$'\n' read derivation; do
        derivations+=("$derivation")
    done < <(nix path-info --derivation "$@")
    cache=()
    for derivation in "${derivations[@]}"; do
        cache+=(
@ -39,9 +34,6 @@ just() {
        )
    done
    withattic() {
        nix shell --inputs-from "$toplevel" attic --command xargs attic push "$@" <<< "${cache[*]}"
    }
    # Upload them to Attic (conduit store)
    #
    # Use `xargs` and a here-string because something would probably explode if
@ -49,7 +41,8 @@ just() {
    # store paths include a newline in them.
    (
        IFS=$'\n'
-        withattic conduit || withattic conduit || withattic conduit || true
+        nix shell --inputs-from "$toplevel" attic -c xargs \
            attic push conduit <<< "${cache[*]}"
    )
    # main "conduwuit" store
@ -59,20 +52,15 @@ just() {
        "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \
        "$ATTIC_TOKEN"
-    # Upload them to Attic (conduwuit store) and Cachix
+    # Upload them to Attic (conduwuit 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'
-        withattic conduwuit || withattic conduwuit || withattic conduwuit || true
+        nix shell --inputs-from "$toplevel" attic -c xargs \
-
+            attic push conduwuit <<< "${cache[*]}"
        # push to cachix if available
        if [ "$CACHIX_AUTH_TOKEN" ]; then
            nix shell --inputs-from "$toplevel" cachix -c xargs \
            cachix push conduwuit <<< "${cache[*]}"
        fi
    )
 }
@ -82,10 +70,8 @@ ci() {
        --inputs-from "$toplevel"
        # Keep sorted
-        #"$toplevel#devShells.x86_64-linux.default"
+        "$toplevel#devShells.x86_64-linux.default"
        #"$toplevel#devShells.x86_64-linux.all-features"
        attic#default
        cachix#default
        nixpkgs#direnv
        nixpkgs#jq
        nixpkgs#nix-direnv
--- a/book.toml
+++ b/book.toml
@ -1,24 +1,18 @@
 [book]
-title = "continuwuity"
+title = "conduwuit"
-description = "continuwuity is a community continuation of the conduwuit Matrix homeserver, written in Rust."
+description = "conduwuit, which is a well-maintained fork of Conduit, is a simple, fast and reliable chat server for the Matrix protocol"
 language = "en"
 authors = ["The continuwuity Community"]
 text-direction = "ltr"
 multilingual = false
 src = "docs"
 [build]
 build-dir = "public"
 create-missing = true
 extra-watch-dirs = ["debian", "docs"]
 [rust]
 edition = "2024"
 [output.html]
-edit-url-template = "https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/{path}"
+git-repository-url = "https://github.com/girlbossceo/conduwuit"
-git-repository-url = "https://forgejo.ellis.link/continuwuation/continuwuity"
+edit-url-template = "https://github.com/girlbossceo/conduwuit/edit/main/{path}"
-git-repository-icon = "fa-git-alt"
+git-repository-icon = "fa-github-square"
 [output.html.search]
 limit-results = 15
--- a/clippy.toml
+++ b/clippy.toml
@ -1,20 +1 @@
-array-size-threshold = 4096
+too-many-lines-threshold = 700
 cognitive-complexity-threshold = 94         # TODO reduce me ALARA
 excessive-nesting-threshold = 11            # TODO reduce me to 4 or 5
 future-size-threshold = 7745                # TODO reduce me ALARA
 stack-size-threshold = 196608               # TODO reduce me ALARA
 too-many-lines-threshold = 780              # TODO reduce me to <= 100
 type-complexity-threshold = 250             # reduce me to ~200
 large-error-threshold = 256                 # TODO reduce me ALARA
 disallowed-macros = [
 	{ path = "log::error", reason = "use conduwuit_core::error" },
 	{ path = "log::warn", reason = "use conduwuit_core::warn" },
 	{ path = "log::info", reason = "use conduwuit_core::info" },
 	{ path = "log::debug", reason = "use conduwuit_core::debug" },
 	{ path = "log::trace", reason = "use conduwuit_core::trace" },
 ]
 disallowed-methods = [
    { path = "tokio::spawn", reason = "use and pass conduuwit_core::server::Server::runtime() to spawn from" },
 ]
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
--- a/debian/README.md
+++ b/debian/README.md
@ -1,29 +1,33 @@
 # conduwuit for Debian
-Information about downloading and deploying the Debian package. This may also be
+Installation
-referenced for other `apt`-based distros such as Ubuntu.
+------------
-### Installation
+Information about downloading, building and deploying the Debian package, see
 the "Installing conduwuit" section in the Deploying docs.
 All following sections until "Setting up the Reverse Proxy" be ignored because
 this is handled automatically by the packaging.
-It is recommended to see the [generic deployment guide](../deploying/generic.md)
+Configuration
-for further information if needed as usage of the Debian package is generally
+-------------
 related.
-No `apt` repository is currently offered yet, it is in the works/development.
+When installed, Debconf generates the configuration of the homeserver
 (host)name, the address and port it listens on. This configuration ends up in
 `/etc/conduwuit/conduwuit.toml`.
-### Configuration
+You can tweak more detailed settings by uncommenting and setting the variables
 in `/etc/conduwuit/conduwuit.toml`. This involves settings such as the maximum
 file size for download/upload, enabling federation, etc.
-When installed, the example config is placed at `/etc/conduwuit/conduwuit.toml`
+Running
-as the default config. The config mentions things required to be changed before
+-------
 starting.
-You can tweak more detailed settings by uncommenting and setting the config
+The package uses the `conduwuit.service` systemd unit file to start and
-options in `/etc/conduwuit/conduwuit.toml`.
+stop conduwuit. It loads the configuration file mentioned above to set up the
 environment before running the server.
-### Running
+This package assumes by default that conduwuit will be placed behind a reverse
-
+proxy. This default deployment entails just listening
-The package uses the [`conduwuit.service`](../configuration/examples.md#example-systemd-unit-file) systemd unit file to start and stop conduwuit. The binary is installed at `/usr/sbin/conduwuit`.
+on `127.0.0.1` and the free port `6167` and is reachable via a client using the URL
-
+<http://localhost:6167>. Matrix federation requires TLS, so you will need to set up
-This package assumes by default that conduwuit will be placed behind a reverse proxy. The default config options apply (listening on `localhost` and TCP port `6167`). Matrix federation requires a valid domain name and TLS, so you will need to set up TLS certificates and renewal for it to work properly if you intend to federate.
+some certificates and renewal, for it to work properly.
 Consult various online documentation and guides on setting up a reverse proxy and TLS. Caddy is documented at the [generic deployment guide](../deploying/generic.md#setting-up-the-reverse-proxy) as it's the easiest and most user friendly.
--- a/debian/conduwuit.service
+++ b/debian/conduwuit.service
@ -1,9 +1,7 @@
 [Unit]
 Description=conduwuit Matrix homeserver
-Wants=network-online.target
+Documentation=https://conduwuit.puppyirl.gay/
 After=network-online.target
 Alias=matrix-conduwuit.service
 Documentation=https://continuwuity.org/
 [Service]
 DynamicUser=yes
@ -15,8 +13,6 @@ Environment="CONDUWUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
 ExecStart=/usr/sbin/conduwuit
 ReadWritePaths=/var/lib/conduwuit /etc/conduwuit
 AmbientCapabilities=
 CapabilityBoundingSet=
@ -24,7 +20,7 @@ DevicePolicy=closed
 LockPersonality=yes
 MemoryDenyWriteExecute=yes
 NoNewPrivileges=yes
-#ProcSubset=pid
+ProcSubset=pid
 ProtectClock=yes
 ProtectControlGroups=yes
 ProtectHome=yes
@ -48,16 +44,16 @@ SystemCallArchitectures=native
 SystemCallFilter=@system-service @resources
 SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc
 SystemCallErrorNumber=EPERM
-#StateDirectory=conduwuit
+StateDirectory=conduwuit
-RuntimeDirectory=conduwuit
+RuntimeDirectory=conduit
 RuntimeDirectoryMode=0750
 Restart=on-failure
 RestartSec=5
-TimeoutStopSec=2m
+TimeoutStopSec=4m
-TimeoutStartSec=2m
+TimeoutStartSec=4m
 StartLimitInterval=1m
 StartLimitBurst=5
--- a/debian/config
+++ b/debian/config
@ -1,18 +1,17 @@
 #!/bin/sh
 set -e
 # TODO: implement debconf support that is maintainable without duplicating the config
 # Source debconf library.
-#. /usr/share/debconf/confmodule
+. /usr/share/debconf/confmodule
-#
+
-## Ask for the Matrix homeserver name, address and port.
+# Ask for the Matrix homeserver name, address and port.
-#db_input high conduwuit/hostname || true
+db_input high conduwuit/hostname || true
-#db_go
+db_go
-#
+
-#db_input low conduwuit/address || true
+db_input low conduwuit/address || true
-#db_go
+db_go
-#
+
-#db_input medium conduwuit/port || true
+db_input medium conduwuit/port || true
-#db_go
+db_go
 exit 0
--- a/debian/postinst
+++ b/debian/postinst
@ -1,11 +1,9 @@
 #!/bin/sh
 set -e
-# TODO: implement debconf support that is maintainable without duplicating the config
+. /usr/share/debconf/confmodule
 #. /usr/share/debconf/confmodule
-CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
+CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit/
 CONDUWUIT_CONFIG_PATH=/etc/conduwuit
 case "$1" in
  configure)
@ -16,28 +14,15 @@ case "$1" in
        --home "$CONDUWUIT_DATABASE_PATH" \
        --disabled-login \
        --shell "/usr/sbin/nologin" \
        --force-badname \
        conduwuit
    fi
    # Create the database path if it does not exist yet and fix up ownership
-    # and permissions for the config.
+    # and permissions.
-    mkdir -v -p "$CONDUWUIT_DATABASE_PATH"
+    mkdir -p "$CONDUWUIT_DATABASE_PATH"
-
+    chown conduwuit:conduwuit -R "$CONDUWUIT_DATABASE_PATH"
-    # symlink the previous location for compatibility if it does not exist yet.
+    chmod 700 "$CONDUWUIT_DATABASE_PATH"
    if ! test -L "/var/lib/matrix-conduit" ; then
        ln -s -v "$CONDUWUIT_DATABASE_PATH" "/var/lib/matrix-conduit"
    fi
    chown -v conduwuit:conduwuit -R "$CONDUWUIT_DATABASE_PATH"
    chown -v conduwuit:conduwuit -R "$CONDUWUIT_CONFIG_PATH"
    chmod -v 740 "$CONDUWUIT_DATABASE_PATH"
    echo ''
    echo 'Make sure you edit the example config at /etc/conduwuit/conduwuit.toml before starting!'
    echo 'To start the server, run: systemctl start conduwuit.service'
    echo ''
    ;;
 esac
--- a/debian/postrm
+++ b/debian/postrm
@ -1,43 +1,26 @@
 #!/bin/sh
 set -e
-#. /usr/share/debconf/confmodule
+. /usr/share/debconf/confmodule
 CONDUWUIT_CONFIG_PATH=/etc/conduwuit
 CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit
 CONDUWUIT_DATABASE_PATH_SYMLINK=/var/lib/matrix-conduit
 case $1 in
  purge)
    # Remove debconf changes from the db
-    #db_purge
+    db_purge
    # Per https://www.debian.org/doc/debian-policy/ch-files.html#behavior
    # "configuration files must be preserved when the package is removed, and
    #  only deleted when the package is purged."
    #
    if [ -d "$CONDUWUIT_CONFIG_PATH" ]; then
-      if test -L "$CONDUWUIT_CONFIG_PATH"; then
+      rm -r "$CONDUWUIT_CONFIG_PATH"
        echo "Deleting conduwuit configuration files"
        rm -v -r "$CONDUWUIT_CONFIG_PATH"
      fi
    fi
    if [ -d "$CONDUWUIT_DATABASE_PATH" ]; then
      if test -L "$CONDUWUIT_DATABASE_PATH"; then
        echo "Deleting conduwuit database directory"
      rm -r "$CONDUWUIT_DATABASE_PATH"
    fi
    fi
    if [ -d "$CONDUWUIT_DATABASE_PATH_SYMLINK" ]; then
      if test -L "$CONDUWUIT_DATABASE_SYMLINK"; then
        echo "Removing matrix-conduit symlink"
        rm -r "$CONDUWUIT_DATABASE_PATH_SYMLINK"
      fi
    fi
    ;;
 esac
--- a/debian/templates
+++ b/debian/templates
@ -0,0 +1,21 @@
 Template: conduwuit/hostname
 Type: string
 Default: localhost
 Description: The server (host)name of the Matrix homeserver
 This is the hostname the homeserver will be reachable at via a client.
 .
 If set to "localhost", you can connect with a client locally and clients
 from other hosts and also other homeservers will not be able to reach you!
 Template: conduwuit/address
 Type: string
 Default: 127.0.0.1
 Description: The listen address of the Matrix homeserver
 This is the address the homeserver will listen on. Leave it set to 127.0.0.1
 when using a reverse proxy.
 Template: conduwuit/port
 Type: string
 Default: 6167
 Description: The port of the Matrix homeserver
 This port is most often just accessed by a reverse proxy.
--- a/development.md
+++ b/development.md
@ -1 +0,0 @@
 docs/development.md
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,208 +0,0 @@
 ARG RUST_VERSION=1
 FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx
 FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-bookworm AS base
 FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-bookworm AS toolchain
 # Prevent deletion of apt cache
 RUN rm -f /etc/apt/apt.conf.d/docker-clean
 # Match Rustc version as close as possible
 # rustc -vV
 ARG LLVM_VERSION=19
 # ENV RUSTUP_TOOLCHAIN=${RUST_VERSION}
 # Install repo tools
 # Line one: compiler tools
 # Line two: curl, for downloading binaries
 # Line three: for xx-verify
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
    --mount=type=cache,target=/var/lib/apt,sharing=locked \
 apt-get update && apt-get install -y \
    clang-${LLVM_VERSION} lld-${LLVM_VERSION} pkg-config make jq \
    curl git \
    file
 # Create symlinks for LLVM tools
 RUN <<EOF
    # clang
    ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang
    ln -s "/usr/bin/clang++-${LLVM_VERSION}" "/usr/bin/clang++"
    # lld
    ln -s /usr/bin/ld64.lld-${LLVM_VERSION} /usr/bin/ld64.lld
    ln -s /usr/bin/ld.lld-${LLVM_VERSION} /usr/bin/ld.lld
    ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/lld
    ln -s /usr/bin/lld-link-${LLVM_VERSION} /usr/bin/lld-link
    ln -s /usr/bin/wasm-ld-${LLVM_VERSION} /usr/bin/wasm-ld
 EOF
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
 ENV BINSTALL_VERSION=1.12.3
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree
 ENV LDDTREE_VERSION=0.3.7
 # Install unpackaged tools
 RUN <<EOF
    curl --retry 5 -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
    cargo binstall --no-confirm cargo-sbom --version $CARGO_SBOM_VERSION
    cargo binstall --no-confirm lddtree --version $LDDTREE_VERSION
 EOF
 # Set up xx (cross-compilation scripts)
 COPY --from=xx / /
 ARG TARGETPLATFORM
 # Install libraries linked by the binary
 # xx-* are xx-specific meta-packages
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
    --mount=type=cache,target=/var/lib/apt,sharing=locked \
 xx-apt-get install -y \
    xx-c-essentials xx-cxx-essentials pkg-config \
    liburing-dev
 # Set up Rust toolchain
 WORKDIR /app
 COPY ./rust-toolchain.toml .
 RUN rustc --version \
    && rustup target add $(xx-cargo --print-target-triple)
 # Build binary
 # We disable incremental compilation to save disk space, as it only produces a minimal speedup for this case.
 RUN echo "CARGO_INCREMENTAL=0" >> /etc/environment
 # Configure pkg-config
 RUN <<EOF
    echo "PKG_CONFIG_LIBDIR=/usr/lib/$(xx-info)/pkgconfig" >> /etc/environment
    echo "PKG_CONFIG=/usr/bin/$(xx-info)-pkg-config" >> /etc/environment
    echo "PKG_CONFIG_ALLOW_CROSS=true" >> /etc/environment
 EOF
 # Configure cc to use clang version
 RUN <<EOF
    echo "CC=clang" >> /etc/environment
    echo "CXX=clang++" >> /etc/environment
 EOF
 # Cross-language LTO
 RUN <<EOF
    echo "CFLAGS=-flto" >> /etc/environment
    echo "CXXFLAGS=-flto" >> /etc/environment
    # Linker is set to target-compatible clang by xx
    echo "RUSTFLAGS='-Clinker-plugin-lto -Clink-arg=-fuse-ld=lld'" >> /etc/environment
 EOF
 # Apply CPU-specific optimizations if TARGET_CPU is provided
 ARG TARGET_CPU=
 RUN <<EOF
  set -o allexport
  . /etc/environment
  if [ -n "${TARGET_CPU}" ]; then
    echo "CFLAGS='${CFLAGS} -march=${TARGET_CPU}'" >> /etc/environment
    echo "CXXFLAGS='${CXXFLAGS} -march=${TARGET_CPU}'" >> /etc/environment
    echo "RUSTFLAGS='${RUSTFLAGS} -C target-cpu=${TARGET_CPU}'" >> /etc/environment
  fi
 EOF
 # Prepare output directories
 RUN mkdir /out
 FROM toolchain AS builder
 # Conduwuit version info
 ARG COMMIT_SHA=
 ARG CONDUWUIT_VERSION_EXTRA=
 ENV CONDUWUIT_VERSION_EXTRA=$CONDUWUIT_VERSION_EXTRA
 RUN <<EOF
 if [ -z "${CONDUWUIT_VERSION_EXTRA}" ]; then
    echo "CONDUWUIT_VERSION_EXTRA='$(set -e; git rev-parse --short ${COMMIT_SHA:-HEAD} || echo unknown revision)'" >> /etc/environment
 fi
 EOF
 ARG TARGETPLATFORM
 # Verify environment configuration
 RUN cat /etc/environment
 RUN xx-cargo --print-target-triple
 # Get source
 COPY . .
 # Build the binary
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git/db \
    --mount=type=cache,target=/app/target \
    bash <<'EOF'
    set -o allexport
    . /etc/environment
    TARGET_DIR=($(cargo metadata --no-deps --format-version 1 | \
            jq -r ".target_directory"))
    mkdir /out/sbin
    PACKAGE=conduwuit
    xx-cargo build --locked --release \
        -p $PACKAGE;
    BINARIES=($(cargo metadata --no-deps --format-version 1 | \
        jq -r ".packages[] | select(.name == \"$PACKAGE\") | .targets[] | select( .kind | map(. == \"bin\") | any ) | .name"))
    for BINARY in "${BINARIES[@]}"; do
        echo $BINARY
        xx-verify $TARGET_DIR/$(xx-cargo   --print-target-triple)/release/$BINARY
        cp $TARGET_DIR/$(xx-cargo --print-target-triple)/release/$BINARY /out/sbin/$BINARY
    done
 EOF
 # Generate Software Bill of Materials (SBOM)
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
    --mount=type=cache,target=/usr/local/cargo/git/db \
    bash <<'EOF'
    mkdir /out/sbom
    typeset -A PACKAGES
    for BINARY in /out/sbin/*; do
        BINARY_BASE=$(basename ${BINARY})
        package=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.targets[] | select( .kind | map(. == \"bin\") | any ) | .name == \"$BINARY_BASE\") | .name")
        if [ -z "$package" ]; then
            continue
        fi
        PACKAGES[$package]=1
    done
    for PACKAGE in $(echo ${!PACKAGES[@]}); do
        echo $PACKAGE
        cargo sbom --cargo-package $PACKAGE > /out/sbom/$PACKAGE.spdx.json
    done
 EOF
 # Extract dynamically linked dependencies
 RUN <<EOF
    mkdir /out/libs
    mkdir /out/libs-root
    for BINARY in /out/sbin/*; do
        lddtree "$BINARY" | awk '{print $(NF-0) " " $1}' | sort -u -k 1,1 | awk '{print "install", "-D", $1, (($2 ~ /^\//) ? "/out/libs-root" $2 : "/out/libs/" $2)}' | xargs -I {} sh -c {}
    done
 EOF
 FROM scratch
 WORKDIR /
 # Copy root certs for tls into image
 # You can also mount the certs from the host
 # --volume /etc/ssl/certs:/etc/ssl/certs:ro
 COPY --from=base /etc/ssl/certs /etc/ssl/certs
 # Copy our build
 COPY --from=builder /out/sbin/ /sbin/
 # Copy SBOM
 COPY --from=builder /out/sbom/ /sbom/
 # Copy dynamic libraries to root
 COPY --from=builder /out/libs-root/ /
 COPY --from=builder /out/libs/ /usr/lib/
 # Inform linker where to find libraries
 ENV LD_LIBRARY_PATH=/usr/lib
 # Continuwuity default port
 EXPOSE 8008
 CMD ["/sbin/conduwuit"]
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -1,16 +1,14 @@
 # Summary
 - [Introduction](introduction.md)
- [Configuration](configuration.md)
+- [Differences from upstream Conduit](differences.md)
-  - [Examples](configuration/examples.md)
+- [Example configuration](configuration.md)
 - [Deploying](deploying.md)
    - [Generic](deploying/generic.md)
    - [NixOS](deploying/nixos.md)
    - [Docker](deploying/docker.md)
  - [Kubernetes](deploying/kubernetes.md)
    - [Arch Linux](deploying/arch-linux.md)
    - [Debian](deploying/debian.md)
  - [FreeBSD](deploying/freebsd.md)
 - [TURN](turn.md)
 - [Appservices](appservices.md)
 - [Maintenance](maintenance.md)
@ -18,5 +16,3 @@
 - [Development](development.md)
    - [Contributing](contributing.md)
    - [Testing](development/testing.md)
  - [Hot Reloading ("Live" Development)](development/hot_reload.md)
 - [Community (and Guidelines)](community.md)
--- a/docs/appservices.md
+++ b/docs/appservices.md
@ -2,25 +2,23 @@
 ## Getting help
-If you run into any problems while setting up an Appservice: ask us in
+If you run into any problems while setting up an Appservice: ask us in [#conduwuit:puppygock.gay](https://matrix.to/#/#conduwuit:puppygock.gay) or [open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new).
 [#continuwuity:continuwuity.org](https://matrix.to/#/#continuwuity:continuwuity.org) or
 [open an issue on Forgejo](https://forgejo.ellis.link/continuwuation/continuwuity/issues/new).
 ## Set up the appservice - general instructions
 Follow whatever instructions are given by the appservice. This usually includes
-downloading, changing its config (setting domain, homeserver url, port etc.) and
+downloading, changing its config (setting domain, homeserver url, port etc.)
-later starting it.
+and later starting it.
 At some point the appservice guide should ask you to add a registration yaml
 file to the homeserver. In Synapse you would do this by adding the path to the
-homeserver.yaml, but in Continuwuity you can do this from within Matrix:
+homeserver.yaml, but in Conduit you can do this from within Matrix:
-First, go into the `#admins` room of your homeserver. The first person that
+First, go into the #admins room of your homeserver. The first person that
 registered on the homeserver automatically joins it. Then send a message into
 the room like this:
-    !admin appservices register
+    @conduit:your.server.name: register-appservice
    ```
    paste
    the
@ -33,13 +31,13 @@ the room like this:
    ```
 You can confirm it worked by sending a message like this:
-`!admin appservices list`
+`@conduit:your.server.name: appservices list`
-The server bot should answer with `Appservices (1): your-bridge`
+The `@conduit` bot should answer with `Appservices (1): your-bridge`
-Then you are done. Continuwuity will send messages to the appservices and the
+Then you are done. Conduit will send messages to the appservices and the
 appservice can send requests to the homeserver. You don't need to restart
-Continuwuity, but if it doesn't work, restarting while the appservice is running
+Conduit, but if it doesn't work, restarting while the appservice is running
 could help.
 ## Appservice-specific instructions
@ -48,6 +46,16 @@ could help.
 To remove an appservice go to your admin room and execute
-`!admin appservices unregister <name>`
+`@conduit:your.server.name: appservices unregister <name>`
 where `<name>` one of the output of `appservices list`.
 ### Tested appservices
 These appservices have been tested and work with Conduit without any extra steps:
 - [matrix-appservice-discord](https://github.com/Half-Shot/matrix-appservice-discord)
 - [mautrix-hangouts](https://github.com/mautrix/hangouts/)
 - [mautrix-telegram](https://github.com/mautrix/telegram/)
 - [mautrix-signal](https://github.com/mautrix/signal/) from version `0.2.2` forward.
 - [heisenbridge](https://github.com/hifi/heisenbridge/)
--- a/docs/assets/conduwuit_logo.svg
+++ b/docs/assets/conduwuit_logo.svg
@ -1,36 +0,0 @@
 <svg
  version="1.1"
  id="Layer_1"
  xmlns="http://www.w3.org/2000/svg"
  x="0px"
  y="0px"
  width="100%"
  viewBox="0 0 864 864"
  enableBackground="new 0 0 864 864"
  xmlSpace="preserve"
 >
  <path
    fill="#EC008C"
    opacity="1.000000"
    stroke="none"
    d="M0.999997,649.000000 C1.000000,433.052795 1.000000,217.105591 1.000000,1.079198 C288.876801,1.079198 576.753601,1.079198 865.000000,1.079198 C865.000000,73.025414 865.000000,145.051453 864.634888,217.500671 C852.362488,223.837280 840.447632,229.735275 828.549438,235.666794 C782.143677,258.801056 735.743225,281.945923 688.998657,304.980469 C688.122009,304.476532 687.580750,304.087708 687.053894,303.680206 C639.556946,266.944733 573.006775,291.446869 560.804199,350.179443 C560.141357,353.369446 559.717590,356.609131 559.195374,359.748962 C474.522705,359.748962 390.283478,359.748962 306.088135,359.748962 C298.804138,318.894806 265.253357,295.206024 231.834442,293.306793 C201.003021,291.554596 169.912033,310.230042 156.935104,338.792725 C149.905151,354.265930 147.884064,370.379944 151.151794,387.034515 C155.204453,407.689667 166.300507,423.954224 183.344437,436.516663 C181.938263,437.607025 180.887405,438.409576 179.849426,439.228516 C147.141953,465.032562 139.918045,510.888947 163.388611,545.322632 C167.274551,551.023804 172.285187,555.958313 176.587341,561.495728 C125.846893,587.012817 75.302292,612.295532 24.735992,637.534790 C16.874903,641.458496 8.914484,645.183228 0.999997,649.000000 z"
  />
  <path
    fill="#000000"
    opacity="1.000000"
    stroke="none"
    d="M689.340759,305.086823 C735.743225,281.945923 782.143677,258.801056 828.549438,235.666794 C840.447632,229.735275 852.362488,223.837280 864.634888,217.961929 C865.000000,433.613190 865.000000,649.226379 865.000000,864.919800 C577.000000,864.919800 289.000000,864.919800 1.000000,864.919800 C1.000000,793.225708 1.000000,721.576721 0.999997,649.463867 C8.914484,645.183228 16.874903,641.458496 24.735992,637.534790 C75.302292,612.295532 125.846893,587.012817 176.939667,561.513062 C178.543060,562.085083 179.606812,562.886414 180.667526,563.691833 C225.656799,597.853394 291.232574,574.487244 304.462524,519.579773 C304.989105,517.394409 305.501068,515.205505 305.984619,513.166748 C391.466370,513.166748 476.422729,513.166748 561.331177,513.166748 C573.857727,555.764343 608.978149,572.880920 638.519897,572.672791 C671.048340,572.443665 700.623230,551.730408 711.658752,520.910583 C722.546875,490.502106 715.037842,453.265564 682.776733,429.447052 C683.966064,428.506866 685.119507,427.602356 686.265320,426.688232 C712.934143,405.412262 723.011475,370.684631 711.897339,338.686676 C707.312805,325.487671 699.185303,314.725128 689.340759,305.086823 z"
  />
  <path
    fill="#FEFBFC"
    opacity="1.000000"
    stroke="none"
    d="M688.998657,304.980469 C699.185303,314.725128 707.312805,325.487671 711.897339,338.686676 C723.011475,370.684631 712.934143,405.412262 686.265320,426.688232 C685.119507,427.602356 683.966064,428.506866 682.776733,429.447052 C715.037842,453.265564 722.546875,490.502106 711.658752,520.910583 C700.623230,551.730408 671.048340,572.443665 638.519897,572.672791 C608.978149,572.880920 573.857727,555.764343 561.331177,513.166748 C476.422729,513.166748 391.466370,513.166748 305.984619,513.166748 C305.501068,515.205505 304.989105,517.394409 304.462524,519.579773 C291.232574,574.487244 225.656799,597.853394 180.667526,563.691833 C179.606812,562.886414 178.543060,562.085083 177.128418,561.264465 C172.285187,555.958313 167.274551,551.023804 163.388611,545.322632 C139.918045,510.888947 147.141953,465.032562 179.849426,439.228516 C180.887405,438.409576 181.938263,437.607025 183.344437,436.516663 C166.300507,423.954224 155.204453,407.689667 151.151794,387.034515 C147.884064,370.379944 149.905151,354.265930 156.935104,338.792725 C169.912033,310.230042 201.003021,291.554596 231.834442,293.306793 C265.253357,295.206024 298.804138,318.894806 306.088135,359.748962 C390.283478,359.748962 474.522705,359.748962 559.195374,359.748962 C559.717590,356.609131 560.141357,353.369446 560.804199,350.179443 C573.006775,291.446869 639.556946,266.944733 687.053894,303.680206 C687.580750,304.087708 688.122009,304.476532 688.998657,304.980469 M703.311279,484.370789 C698.954468,457.053253 681.951416,440.229645 656.413696,429.482330 C673.953552,421.977875 688.014709,412.074219 696.456482,395.642365 C704.862061,379.280853 706.487793,362.316345 700.947998,344.809204 C691.688965,315.548492 664.183716,296.954437 633.103516,298.838257 C618.467957,299.725372 605.538086,305.139557 594.588501,314.780121 C577.473999,329.848511 570.185486,349.121399 571.838501,371.750854 C479.166595,371.750854 387.082886,371.750854 294.582672,371.750854 C293.993011,354.662048 288.485260,339.622314 276.940491,327.118439 C265.392609,314.611176 251.082092,307.205322 234.093262,305.960541 C203.355347,303.708374 176.337585,320.898438 166.089890,348.816620 C159.557541,366.613007 160.527206,384.117401 168.756042,401.172516 C177.054779,418.372589 191.471954,428.832886 207.526581,435.632172 C198.407059,442.272583 188.815598,448.302246 180.383728,455.660675 C171.685028,463.251984 166.849655,473.658661 163.940216,484.838684 C161.021744,496.053375 161.212982,507.259705 164.178833,518.426208 C171.577927,546.284302 197.338104,566.588867 226.001465,567.336853 C240.828415,567.723816 254.357819,563.819092 266.385468,555.199646 C284.811554,541.994751 293.631104,523.530579 294.687347,501.238312 C387.354828,501.238312 479.461304,501.238312 571.531799,501.238312 C577.616638,543.189026 615.312866,566.342102 651.310059,559.044739 C684.973938,552.220398 708.263306,519.393127 703.311279,484.370789 z"
  />
  <path
    fill="#EC008C"
    opacity="1.000000"
    stroke="none"
    d="M703.401855,484.804718 C708.263306,519.393127 684.973938,552.220398 651.310059,559.044739 C615.312866,566.342102 577.616638,543.189026 571.531799,501.238312 C479.461304,501.238312 387.354828,501.238312 294.687347,501.238312 C293.631104,523.530579 284.811554,541.994751 266.385468,555.199646 C254.357819,563.819092 240.828415,567.723816 226.001465,567.336853 C197.338104,566.588867 171.577927,546.284302 164.178833,518.426208 C161.212982,507.259705 161.021744,496.053375 163.940216,484.838684 C166.849655,473.658661 171.685028,463.251984 180.383728,455.660675 C188.815598,448.302246 198.407059,442.272583 207.526581,435.632172 C191.471954,428.832886 177.054779,418.372589 168.756042,401.172516 C160.527206,384.117401 159.557541,366.613007 166.089890,348.816620 C176.337585,320.898438 203.355347,303.708374 234.093262,305.960541 C251.082092,307.205322 265.392609,314.611176 276.940491,327.118439 C288.485260,339.622314 293.993011,354.662048 294.582672,371.750854 C387.082886,371.750854 479.166595,371.750854 571.838501,371.750854 C570.185486,349.121399 577.473999,329.848511 594.588501,314.780121 C605.538086,305.139557 618.467957,299.725372 633.103516,298.838257 C664.183716,296.954437 691.688965,315.548492 700.947998,344.809204 C706.487793,362.316345 704.862061,379.280853 696.456482,395.642365 C688.014709,412.074219 673.953552,421.977875 656.413696,429.482330 C681.951416,440.229645 698.954468,457.053253 703.401855,484.804718 z"
  />
 </svg>
--- a/docs/assets/gay
+++ b/docs/assets/gay
--- a/docs/community.md
+++ b/docs/community.md
@ -1,139 +0,0 @@
 # Continuwuity Community Guidelines
 Welcome to the Continuwuity commuwunity! We're excited to have you here. Continuwuity is a
 continuation of the conduwuit homeserver, which in turn is a hard-fork of the Conduit homeserver,
 aimed at making Matrix more accessible and inclusive for everyone.
 This space is dedicated to fostering a positive, supportive, and welcoming environment for everyone.
 These guidelines apply to all Continuwuity spaces, including our Matrix rooms and any other
 community channels that reference them. We've written these guidelines to help us all create an
 environment where everyone feels safe and respected.
 For code and contribution guidelines, please refer to the
 [Contributor's Covenant](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CODE_OF_CONDUCT.md).
 Below are additional guidelines specific to the Continuwuity community.
 ## Our Values and Expected Behaviors
 We strive to create a community based on mutual respect, collaboration, and inclusivity. We expect
 all members to:
 1. **Be Respectful and Inclusive**: Treat everyone with respect. We're committed to a community
   where everyone feels safe, regardless of background, identity, or experience. Discrimination,
   harassment, or hate speech won't be tolerated. Remember that each person experiences the world
   differently; share your own perspective and be open to learning about others'.
 2. **Be Positive and Constructive**: Engage in discussions constructively and support each other.
   If you feel angry or frustrated, take a break before participating. Approach disagreements with
   the goal of understanding, not winning. Focus on the issue, not the person.
 3. **Communicate Clearly and Kindly**: Our community includes neurodivergent individuals and those
   who may not appreciate sarcasm or subtlety. Communicate clearly and kindly. Avoid ambiguity and
   ensure your messages can be easily understood by all. Avoid placing the burden of education on
   marginalized groups; please make an effort to look into your questions before asking others for
   detailed explanations.
 4. **Be Open to Improving Inclusivity**: Actively participate in making our community more inclusive.
   Report behaviour that contradicts these guidelines (see Reporting and Enforcement below) and be
   open to constructive feedback aimed at improving our community. Understand that discussing
   negative experiences can be emotionally taxing; focus on the message, not the tone.
 5. **Commit to Our Values**: Building an inclusive community requires ongoing effort from everyone.
   Recognise that addressing bias and discrimination is a continuous process that needs commitment
   and action from all members.
 ## Unacceptable Behaviors
 To ensure everyone feels safe and welcome, the following behaviors are considered unacceptable
 within the Continuwuity community:
 * **Harassment and Discrimination**: Avoid offensive comments related to background, family status,
  gender, gender identity or expression, marital status, sex, sexual orientation, native language,
  age, ability, race and/or ethnicity, caste, national origin, socioeconomic status, religion,
  geographic location, or any other dimension of diversity. Don't deliberately misgender someone or
  question the legitimacy of their gender identity.
 * **Violence and Threats**: Do not engage in any form of violence or threats, including inciting
  violence towards anyone or encouraging self-harm. Posting or threatening to post someone else's
  personally identifying information ("doxxing") is also forbidden.
 * **Personal Attacks**: Disagreements happen, but they should never turn into personal attacks.
  Don't insult, demean, or belittle others.
 * **Unwelcome Attention or Contact**: Avoid unwelcome sexual attention, inappropriate physical
  contact (or simulation thereof), sexualized comments, jokes, or imagery.
 * **Disruption**: Do not engage in sustained disruption of discussions, events, or other
  community activities.
 * **Bad Faith Actions**: Do not intentionally make false reports or otherwise abuse the reporting
  process.
 This is not an exhaustive list. Any behaviour that makes others feel unsafe or unwelcome may be
 subject to enforcement action.
 ## Matrix Community
 These Community Guidelines apply to the entire
 [Continuwuity Matrix Space](https://matrix.to/#/#space:continuwuity.org) and its rooms, including:
 ### [#continuwuity:continuwuity.org](https://matrix.to/#/#continuwuity:continuwuity.org)
 This room is for support and discussions about Continuwuity. Ask questions, share insights, and help
 each other out while adhering to these guidelines.
 We ask that this room remain focused on the Continuwuity software specifically: the team are
 typically happy to engage in conversations about related subjects in the off-topic room.
 ### [#offtopic:continuwuity.org](https://matrix.to/#/#offtopic:continuwuity.org)
 For off-topic community conversations about any subject. While this room allows for a wide range of
 topics, the same guidelines apply. Please keep discussions respectful and inclusive, and avoid
 divisive or stressful subjects like specific country/world politics unless handled with exceptional
 care and respect for diverse viewpoints.
 General topics, such as world events, are welcome as long as they follow the guidelines. If a member
 of the team asks for the conversation to end, please respect their decision.
 ### [#dev:continuwuity.org](https://matrix.to/#/#dev:continuwuity.org)
 This room is dedicated to discussing active development of Continuwuity, including ongoing issues or
 code development. Collaboration here must follow these guidelines, and please consider raising
 [an issue](https://forgejo.ellis.link/continuwuation/continuwuity/issues) on the repository to help
 track progress.
 ## Reporting and Enforcement
 We take these Community Guidelines seriously to protect our community members. If you witness or
 experience unacceptable behaviour, or have any other concerns, please report it.
 **How to Report:**
 * **Alert Moderators in the Room:** If you feel comfortable doing so, you can address the issue
  publicly in the relevant room by mentioning the moderation bot, `@rock:continuwuity.org`, which
  will immediately alert all available moderators.
 * **Direct Message:** If you're not comfortable raising the issue publicly, please send a direct
  message (DM) to one of the room moderators.
 Reports will be handled with discretion. We will investigate promptly and thoroughly.
 **Enforcement Actions:**
 Anyone asked to stop unacceptable behaviour is expected to comply immediately. Failure to do so, or
 engaging in prohibited behaviour, may result in enforcement action. Moderators may take actions they
 deem appropriate, including but not limited to:
 1. **Warning**: A direct message or public warning identifying the violation and requesting
   corrective action.
 2. **Temporary Mute**: Temporary restriction from participating in discussions for a specified
   period.
 3. **Kick or Ban**: Removal from a room (kick) or the entire community space (ban). Egregious or
   repeated violations may result in an immediate ban. Bans are typically permanent and reviewed
   only in exceptional circumstances.
 Retaliation against those who report concerns in good faith will not be tolerated and will be
 subject to the same enforcement actions.
 Together, let's build and maintain a community where everyone feels valued, safe, and respected.
 — The Continuwuity Moderation Team
--- a/docs/configuration.md
+++ b/docs/configuration.md
@ -1,64 +1,5 @@
-# Configuration
+# Example configuration
-This chapter describes various ways to configure Continuwuity.
+``` toml
-
+{{#include ../conduwuit-example.toml}}
 ## Basics
 Continuwuity uses a config file for the majority of the settings, but also supports
 setting individual config options via commandline.
 Please refer to the [example config
 file](./configuration/examples.md#example-configuration) for all of those
 settings.
 The config file to use can be specified on the commandline when running
 Continuwuity by specifying the `-c`, `--config` flag. Alternatively, you can use
 the environment variable `CONDUWUIT_CONFIG` to specify the config file to used.
 Conduit's environment variables are supported for backwards compatibility.
 ## Option commandline flag
 Continuwuity supports setting individual config options in TOML format from the
 `-O` / `--option` flag. For example, you can set your server name via `-O
 server_name=\"example.com\"`.
 Note that the config is parsed as TOML, and shells like bash will remove quotes.
 So unfortunately it is required to escape quotes if the config option takes a
 string. This does not apply to options that take booleans or numbers:
 - `--option allow_registration=true` works ✅
 - `-O max_request_size=99999999` works ✅
 - `-O server_name=example.com` does not work ❌
 - `--option log=\"debug\"` works ✅
 - `--option server_name='"example.com'"` works ✅
 ## Execute commandline flag
 Continuwuity supports running admin commands on startup using the commandline
 argument `--execute`. The most notable use for this is to create an admin user
 on first startup.
 The syntax of this is a standard admin command without the prefix such as
 `./conduwuit --execute "users create_user june"`
 An example output of a success is:
 ```
 INFO conduwuit_service::admin::startup: Startup command #0 completed:
 Created user with user_id: @june:girlboss.ceo and password: `<redacted>`
 ```
 This commandline argument can be paired with the `--option` flag.
 ## Environment variables
 All of the settings that are found in the config file can be specified by using
 environment variables. The environment variable names should be all caps and
 prefixed with `CONDUWUIT_`.
 For example, if the setting you are changing is `max_request_size`, then the
 environment variable to set is `CONDUWUIT_MAX_REQUEST_SIZE`.
 To modify config options not in the `[global]` context such as
 `[global.well_known]`, use the `__` suffix split: `CONDUWUIT_WELL_KNOWN__SERVER`
 Conduit's environment variables are supported for backwards compatibility (e.g.
 `CONDUIT_SERVER_NAME`).
--- a/docs/configuration/examples.md
+++ b/docs/configuration/examples.md
@ -1,32 +0,0 @@
 ## Example configuration
 <details>
 <summary>Example configuration</summary>
 ```toml
 {{#include ../../conduwuit-example.toml}}
 ```
 </details>
 ## Debian systemd unit file
 <details>
 <summary>Debian systemd unit file</summary>
 ```
 {{#include ../../debian/conduwuit.service}}
 ```
 </details>
 ## Arch Linux systemd unit file
 <details>
 <summary>Arch Linux systemd unit file</summary>
 ```
 {{#include ../../arch/conduwuit.service}}
 ```
 </details>
--- a/docs/contributing.md
+++ b/docs/contributing.md
@ -1 +0,0 @@
 ../CONTRIBUTING.md
--- a/docs/contributing.md
+++ b/docs/contributing.md
@ -0,0 +1 @@
 {{#include ../CONTRIBUTING.md}}
--- a/docs/deploying.md
+++ b/docs/deploying.md
@ -1,3 +1,3 @@
 # Deploying
-This chapter describes various ways to deploy Continuwuity.
+This chapter describes various ways to deploy Conduwuit.
--- a/docs/deploying/arch-linux.md
+++ b/docs/deploying/arch-linux.md
@ -1,3 +1,8 @@
-# Continuwuity for Arch Linux
+# conduwuit for Arch Linux
-Continuwuity does not have any Arch Linux packages at this time.
+Currently conduwuit is only on the Arch User Repository (AUR).
 The conduwuit AUR packages are community maintained and are not maintained by conduwuit development team, but the AUR package maintainers are in the Matrix room. Please attempt to verify your AUR package's PKGBUILD file looks fine before asking for support.
 - [conduwuit](https://aur.archlinux.org/packages/conduwuit) - latest tagged conduwuit
 - [conduwuit-git](https://aur.archlinux.org/packages/conduwuit-git) - latest git conduwuit from `main` branch
--- a/docs/deploying/docker-compose.for-traefik.yml
+++ b/docs/deploying/docker-compose.for-traefik.yml
@ -1,49 +1,54 @@
-# Continuwuity - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset
 services:
    homeserver:
-    ### If you already built the conduduwit image with 'docker build' or want to use the Docker Hub image,
+        ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image,
        ### then you are ready to go.
-    image: forgejo.ellis.link/continuwuation/continuwuity:latest
+        image: girlbossceo/conduwuit:latest
        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this:
        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d
        # build:
        #     context: .
        #     args:
        #         CREATED: '2021-03-16T08:18:27Z'
        #         VERSION: '0.1.0'
        #         LOCAL: 'false'
        #         GIT_REF: origin/master
        restart: unless-stopped
        volumes:
-      - db:/var/lib/conduwuit
+            - db:/var/lib/matrix-conduit
-      - /etc/resolv.conf:/etc/resolv.conf:ro # Use the host's DNS resolver rather than Docker's. 
+            #- ./conduwuit.toml:/etc/conduit.toml
      #- ./conduwuit.toml:/etc/conduwuit.toml
        networks:
            - proxy
        environment:
-      CONDUWUIT_SERVER_NAME: your.server.name.example # EDIT THIS
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-      CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
-      CONDUWUIT_PORT: 6167 # should match the loadbalancer traefik label
+            CONDUIT_DATABASE_BACKEND: rocksdb
-      CONDUWUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB
+            CONDUIT_PORT: 6167
-      CONDUWUIT_ALLOW_REGISTRATION: 'true'
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
-      CONDUWUIT_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed.
+            CONDUIT_ALLOW_REGISTRATION: 'true'
-      #CONDUWUIT_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true'
+            CONDUIT_ALLOW_FEDERATION: 'true'
-      CONDUWUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-      CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-      CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_LOG: warn,state_res=warn
-      #CONDUWUIT_LOG: warn,state_res=warn
+            CONDUIT_ADDRESS: 0.0.0.0
-      CONDUWUIT_ADDRESS: 0.0.0.0
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
      #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above
      # We need some way to serve the client and server .well-known json. The simplest way is via the CONDUWUIT_WELL_KNOWN
      # variable / config option, there are multiple ways to do this, e.g. in the conduwuit.toml file, and in a seperate
      # see the override file for more information about delegation
      CONDUWUIT_WELL_KNOWN: |
        {
        client=https://your.server.name.example,
        server=your.server.name.example:443
        }
        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
    ulimits: # Continuwuity uses quite a few file descriptors, and on some systems it defaults to 1024, so you can tell docker to increase it
      nofile:
        soft: 1048567
        hard: 1048567
    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
    # and in the docker compose override file.
    well-known:
        image: nginx:latest
        restart: unless-stopped
        volumes:
            - ./nginx/matrix.conf:/etc/nginx/conf.d/matrix.conf # the config to serve the .well-known/matrix files
            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and Continuwuity
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@ -63,5 +68,3 @@ networks:
    # name, don't forget to change it here and in the docker-compose.override.yml
    proxy:
        external: true
 # vim: ts=2:sw=2:expandtab
--- a/docs/deploying/docker-compose.override.yml
+++ b/docs/deploying/docker-compose.override.yml
@ -1,4 +1,5 @@
-# Continuwuity - Traefik Reverse Proxy Labels
+# Conduit - Traefik Reverse Proxy Labels
 version: '2.4' # uses '2.4' for cpuset
 services:
    homeserver:
@ -6,22 +7,32 @@ services:
            - "traefik.enable=true"
            - "traefik.docker.network=proxy"  # Change this to the name of your Traefik docker proxy network
-      - "traefik.http.routers.to-conduwuit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which Continuwuity is hosted
+            - "traefik.http.routers.to-conduit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which Conduit is hosted
-      - "traefik.http.routers.to-conduwuit.tls=true"
+            - "traefik.http.routers.to-conduit.tls=true"
-      - "traefik.http.routers.to-conduwuit.tls.certresolver=letsencrypt"
+            - "traefik.http.routers.to-conduit.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.to-conduwuit.middlewares=cors-headers@docker"
+            - "traefik.http.routers.to-conduit.middlewares=cors-headers@docker"
-      - "traefik.http.services.to_conduwuit.loadbalancer.server.port=6167"
+
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS"
    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
    # and in the docker compose file.
    well-known:
        labels:
            - "traefik.enable=true"
            - "traefik.docker.network=proxy"
            - "traefik.http.routers.to-matrix-wellknown.rule=Host(`<SUBDOMAIN>.<DOMAIN>`) && PathPrefix(`/.well-known/matrix`)"
            - "traefik.http.routers.to-matrix-wellknown.tls=true"
            - "traefik.http.routers.to-matrix-wellknown.tls.certresolver=letsencrypt"
            - "traefik.http.routers.to-matrix-wellknown.middlewares=cors-headers@docker"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
            - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS"
      # If you want to have your account on <DOMAIN>, but host Continuwuity on a subdomain,
      # you can let it only handle the well known file on that domain instead
      #- "traefik.http.routers.to-matrix-wellknown.rule=Host(`<DOMAIN>`) && PathPrefix(`/.well-known/matrix`)"
      #- "traefik.http.routers.to-matrix-wellknown.tls=true"
      #- "traefik.http.routers.to-matrix-wellknown.tls.certresolver=letsencrypt"
      #- "traefik.http.routers.to-matrix-wellknown.middlewares=cors-headers@docker"
    ### Uncomment this if you uncommented Element-Web App in the docker-compose.yml
    # element-web:
@ -32,6 +43,3 @@ services:
    #         - "traefik.http.routers.to-element-web.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)"  # Change to the address on which Element-Web is hosted
    #         - "traefik.http.routers.to-element-web.tls=true"
    #         - "traefik.http.routers.to-element-web.tls.certresolver=letsencrypt"
 # vim: ts=2:sw=2:expandtab
--- a/docs/deploying/docker-compose.with-caddy.yml
+++ b/docs/deploying/docker-compose.with-caddy.yml
@ -1,56 +0,0 @@
 services:
    caddy:
    # This compose file uses caddy-docker-proxy as the reverse proxy for Continuwuity!
    # For more info, visit https://github.com/lucaslorentz/caddy-docker-proxy
        image: lucaslorentz/caddy-docker-proxy:ci-alpine
        ports:
            - 80:80
            - 443:443
        environment:
            - CADDY_INGRESS_NETWORKS=caddy
        networks:
            - caddy
        volumes:
            - /var/run/docker.sock:/var/run/docker.sock
            - ./data:/data
        restart: unless-stopped
        labels:
            caddy: example.com
            caddy.0_respond: /.well-known/matrix/server {"m.server":"matrix.example.com:443"}
            caddy.1_respond: /.well-known/matrix/client {"m.server":{"base_url":"https://matrix.example.com"},"m.homeserver":{"base_url":"https://matrix.example.com"},"org.matrix.msc3575.proxy":{"url":"https://matrix.example.com"}}
    homeserver:
        ### If you already built the Continuwuity image with 'docker build' or want to use a registry image,
        ### then you are ready to go.
        image: forgejo.ellis.link/continuwuation/continuwuity:latest
        restart: unless-stopped
        volumes:
            - db:/var/lib/conduwuit
            - /etc/resolv.conf:/etc/resolv.conf:ro # Use the host's DNS resolver rather than Docker's. 
            #- ./conduwuit.toml:/etc/conduwuit.toml
        environment:
            CONDUWUIT_SERVER_NAME: example.com # EDIT THIS
            CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
            CONDUWUIT_PORT: 6167
            CONDUWUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB
            CONDUWUIT_ALLOW_REGISTRATION: 'true'
            CONDUWUIT_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed.
            #CONDUWUIT_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true'
            CONDUWUIT_ALLOW_FEDERATION: 'true'
            CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
            CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
            #CONDUWUIT_LOG: warn,state_res=warn
            CONDUWUIT_ADDRESS: 0.0.0.0
            #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above
        networks:
            - caddy
        labels:
            caddy: matrix.example.com
            caddy.reverse_proxy: "{{upstreams 6167}}"
 volumes:
    db:
 networks:
    caddy:
        external: true
--- a/docs/deploying/docker-compose.with-traefik.yml
+++ b/docs/deploying/docker-compose.with-traefik.yml
@ -1,57 +1,59 @@
-# Continuwuity - Behind Traefik Reverse Proxy
+# Conduit - Behind Traefik Reverse Proxy
 version: '2.4' # uses '2.4' for cpuset
 services:
    homeserver:
-    ### If you already built the Continuwuity image with 'docker build' or want to use the Docker Hub image,
+        ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image,
        ### then you are ready to go.
-    image: forgejo.ellis.link/continuwuation/continuwuity:latest
+        image: girlbossceo/conduwuit:latest
        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this:
        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d
        # build:
        #     context: .
        #     args:
        #         CREATED: '2021-03-16T08:18:27Z'
        #         VERSION: '0.1.0'
        #         LOCAL: 'false'
        #         GIT_REF: origin/master
        restart: unless-stopped
        volumes:
-      - db:/var/lib/conduwuit
+            - db:/srv/conduit/.local/share/conduit
-      - /etc/resolv.conf:/etc/resolv.conf:ro # Use the host's DNS resolver rather than Docker's. 
+            #- ./conduwuit.toml:/etc/conduit.toml
      #- ./conduwuit.toml:/etc/conduwuit.toml
        networks:
            - proxy
        environment:
-      CONDUWUIT_SERVER_NAME: your.server.name.example # EDIT THIS
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-      CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-      CONDUWUIT_ALLOW_REGISTRATION: 'false' # After setting a secure registration token, you can enable this
+            CONDUIT_ALLOW_REGISTRATION : 'true'
-      CONDUWUIT_REGISTRATION_TOKEN: "" # This is a token you can use to register on the server
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
-      #CONDUWUIT_REGISTRATION_TOKEN_FILE: "" # Alternatively you can configure a path to a token file to read
+            ### Uncomment and change values as desired
-      CONDUWUIT_ADDRESS: 0.0.0.0
+            # CONDUIT_ADDRESS: 0.0.0.0
-      CONDUWUIT_PORT: 6167 # you need to match this with the traefik load balancer label if you're want to change it
+            # CONDUIT_PORT: 6167
      CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
      #CONDUWUIT_CONFIG: '/etc/conduit.toml' # Uncomment if you mapped config toml above
      ### Uncomment and change values as desired, note that Continuwuity has plenty of config options, so you should check out the example example config too
            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
-      # CONDUWUIT_LOG: info  # default is: "warn,state_res=warn"
+            # CONDUIT_LOG: info  # default is: "warn,state_res=warn"
-      # CONDUWUIT_ALLOW_ENCRYPTION: 'true'
+            # CONDUIT_ALLOW_JAEGER: 'false'
-      # CONDUWUIT_ALLOW_FEDERATION: 'true'
+            # CONDUIT_ALLOW_ENCRYPTION: 'true'
-      # CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            # CONDUIT_ALLOW_FEDERATION: 'true'
-      # CONDUWUIT_ALLOW_INCOMING_PRESENCE: true
+            # CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-      # CONDUWUIT_ALLOW_OUTGOING_PRESENCE: true
+            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
-      # CONDUWUIT_ALLOW_LOCAL_PRESENCE: true
+            # CONDUIT_WORKERS: 10
-      # CONDUWUIT_WORKERS: 10
+            # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
      # CONDUWUIT_MAX_REQUEST_SIZE: 20000000  # in bytes, ~20 MB
      # CONDUWUIT_NEW_USER_DISPLAYNAME_SUFFIX = "🏳<200d>⚧"
      # We need some way to serve the client and server .well-known json. The simplest way is via the CONDUWUIT_WELL_KNOWN
      # variable / config option, there are multiple ways to do this, e.g. in the conduwuit.toml file, and in a seperate
      # reverse proxy, but since you do not have a reverse proxy and following this guide, this example is included
      CONDUWUIT_WELL_KNOWN: |
        {
          client=https://your.server.name.example,
          server=your.server.name.example:443
        }
        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
-    ulimits: # Continuwuity uses quite a few file descriptors, and on some systems it defaults to 1024, so you can tell docker to increase it
+
-      nofile:
+    # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
-        soft: 1048567
+    # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
-        hard: 1048567
+    # and in the docker compose override file.
    well-known:
        image: nginx:latest
        restart: unless-stopped
        volumes:
            - ./nginx/matrix.conf:/etc/nginx/conf.d/matrix.conf # the config to serve the .well-known/matrix files
            - ./nginx/www:/var/www/ # location of the client and server .well-known-files
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and Continuwuity
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
@ -71,9 +73,9 @@ services:
            - "80:80"
            - "443:443"
        volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:z"
+            - "/var/run/docker.sock:/var/run/docker.sock"
            # - "./traefik_config:/etc/traefik"
            - "acme:/etc/traefik/acme"
      #- "./traefik_config:/etc/traefik:z"
        labels:
            - "traefik.enable=true"
@ -81,61 +83,11 @@ services:
            - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
            # global redirect to https
            - "traefik.http.routers.redirs.rule=hostregexp(`{host:.+}`)"
-      - "traefik.http.routers.redirs.entrypoints=web"
+            - "traefik.http.routers.redirs.entrypoints=http"
            - "traefik.http.routers.redirs.middlewares=redirect-to-https"
-    configs:
+        networks:
-      - source: dynamic.yml
+            - proxy
        target: /etc/traefik/dynamic.yml
    environment:
      TRAEFIK_LOG_LEVEL: DEBUG
      TRAEFIK_ENTRYPOINTS_WEB: true
      TRAEFIK_ENTRYPOINTS_WEB_ADDRESS: ":80"
      TRAEFIK_ENTRYPOINTS_WEB_HTTP_REDIRECTIONS_ENTRYPOINT_TO: websecure
      TRAEFIK_ENTRYPOINTS_WEBSECURE: true
      TRAEFIK_ENTRYPOINTS_WEBSECURE_ADDRESS: ":443"
      TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_TLS_CERTRESOLVER: letsencrypt
      #TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_MIDDLEWARES: secureHeaders@file # if you want to enabled STS
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT: true
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_EMAIL: # Set this to the email you want to receive certificate expiration emails for
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_KEYTYPE: EC384
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_HTTPCHALLENGE: true
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_HTTPCHALLENGE_ENTRYPOINT: web
      TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_STORAGE: "/etc/traefik/acme/acme.json"
      TRAEFIK_PROVIDERS_DOCKER: true
      TRAEFIK_PROVIDERS_DOCKER_ENDPOINT: "unix:///var/run/docker.sock"
      TRAEFIK_PROVIDERS_DOCKER_EXPOSEDBYDEFAULT: false
      TRAEFIK_PROVIDERS_FILE: true
      TRAEFIK_PROVIDERS_FILE_FILENAME: "/etc/traefik/dynamic.yml"
 configs:
  dynamic.yml:
    content: |
      # Optionally set STS headers, like in https://hstspreload.org
      # http:
      #   middlewares:
      #     secureHeaders:
      #       headers:
      #         forceSTSHeader: true
      #         stsIncludeSubdomains: true
      #         stsPreload: true
      #         stsSeconds: 31536000
      tls:
        options:
          default:
            cipherSuites:
              - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
              - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
              - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
              - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
              - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
              - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
            minVersion: VersionTLS12
 volumes:
    db:
@ -143,5 +95,3 @@ volumes:
 networks:
    proxy:
 # vim: ts=2:sw=2:expandtab
--- a/docs/deploying/docker-compose.yml
+++ b/docs/deploying/docker-compose.yml
@ -1,34 +1,45 @@
-# Continuwuity
+# Conduit
 version: '2.4' # uses '2.4' for cpuset
 services:
    homeserver:
-        ### If you already built the Continuwuity image with 'docker build' or want to use a registry image,
+        ### If you already built the Conduit image with 'docker build' or want to use a registry image,
        ### then you are ready to go.
-        image: forgejo.ellis.link/continuwuation/continuwuity:latest
+        image: girlbossceo/conduwuit:latest
        ### If you want to build a fresh image from the sources, then comment the image line and uncomment the
        ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this:
        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d
        # build:
        #     context: .
        #     args:
        #         CREATED: '2021-03-16T08:18:27Z'
        #         VERSION: '0.1.0'
        #         LOCAL: 'false'
        #         GIT_REF: origin/master
        restart: unless-stopped
        ports:
            - 8448:6167
        volumes:
-            - db:/var/lib/conduwuit
+            - db:/var/lib/matrix-conduit
-            #- ./conduwuit.toml:/etc/conduwuit.toml
+            #- ./conduwuit.toml:/etc/conduit.toml
        environment:
-            CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUWUIT_DATABASE_PATH: /var/lib/conduwuit
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
-            CONDUWUIT_PORT: 6167
+            CONDUIT_DATABASE_BACKEND: rocksdb
-            CONDUWUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB
+            CONDUIT_PORT: 6167
-            CONDUWUIT_ALLOW_REGISTRATION: 'true'
+            CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
-            CONDUWUIT_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed.
+            CONDUIT_ALLOW_REGISTRATION: 'true'
-            #CONDUWUIT_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true'
+            CONDUIT_ALLOW_FEDERATION: 'true'
-            CONDUWUIT_ALLOW_FEDERATION: 'true'
+            CONDUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
-            CONDUWUIT_ALLOW_CHECK_FOR_UPDATES: 'true'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
+            #CONDUIT_LOG: warn,state_res=warn
-            #CONDUWUIT_LOG: warn,state_res=warn
+            CONDUIT_ADDRESS: 0.0.0.0
-            CONDUWUIT_ADDRESS: 0.0.0.0
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
-            #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
    #
    ### Uncomment if you want to use your own Element-Web App.
    ### Note: You need to provide a config.json for Element and you also need a second
-    ###       Domain or Subdomain for the communication between Element and Continuwuity
+    ###       Domain or Subdomain for the communication between Element and Conduit
    ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
    # element-web:
    #     image: vectorim/element-web:latest
--- a/docs/deploying/docker.md
+++ b/docs/deploying/docker.md
@ -1,29 +1,37 @@
-# Continuwuity for Docker
+# conduwuit for Docker
 ## Docker
-To run Continuwuity with Docker you can either build the image yourself or pull it
+To run conduwuit with Docker you can either build the image yourself or pull it from a registry.
-from a registry.
+
 ### Use a registry
-OCI images for Continuwuity are available in the registries listed below.
+OCI images for conduwuit are available in the registries listed below.
-| Registry        | Image                                                           | Notes                  |
+| Registry        | Image                                                           | Size                          | Notes                  |
-| --------------- | --------------------------------------------------------------- | -----------------------|
+| --------------- | --------------------------------------------------------------- | ----------------------------- | ---------------------- |
-| Forgejo Registry| [forgejo.ellis.link/continuwuation/continuwuity:latest][fj]     | Latest tagged image.   |
+| GitHub Registry | [ghcr.io/girlbossceo/conduwuit:latest][gh] | ![Image Size][shield-latest]  | Stable tagged image.          |
-| Forgejo Registry| [forgejo.ellis.link/continuwuation/continuwuity:main][fj]       | Main branch image.     |
+| GitLab Registry | [registry.gitlab.com/conduwuit/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 main branch.   |
 | GitLab Registry | [registry.gitlab.com/conduwuit/conduwuit:main][gl]   | ![Image Size][shield-main]    | Stable main branch.   |
 | Docker Hub      | [docker.io/girlbossceo/conduwuit:main][dh]               | ![Image Size][shield-main]    | Stable main branch.   |
 [dh]: https://hub.docker.com/repository/docker/girlbossceo/conduwuit
 [gh]: https://github.com/girlbossceo/conduwuit/pkgs/container/conduwuit
 [gl]: https://gitlab.com/conduwuit/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
 [fj]: https://forgejo.ellis.link/continuwuation/-/packages/container/continuwuity
 Use
 ```bash
-docker image pull $LINK
+docker image pull <link>
 ```
 to pull it to your machine.
 ### Run
 When you have the image you can simply run it with
@ -31,87 +39,52 @@ When you have the image you can simply run it with
 ```bash
 docker run -d -p 8448:6167 \
  -v db:/var/lib/conduwuit/ \
-    -e CONDUWUIT_SERVER_NAME="your.server.name" \
+  -e CONDUIT_SERVER_NAME="your.server.name" \
-    -e CONDUWUIT_ALLOW_REGISTRATION=false \
+  -e CONDUIT_DATABASE_BACKEND="rocksdb" \
-    --name conduwuit $LINK
+  -e CONDUIT_ALLOW_REGISTRATION=false \
  -e CONDUIT_ALLOW_FEDERATION=true \
  -e CONDUIT_MAX_REQUEST_SIZE="40000000" \
  -e CONDUIT_TRUSTED_SERVERS="[\"matrix.org\"]" \
  -e CONDUIT_LOG="warn,ruma_state_res=warn" \
  --name conduit <link>
 ```
 or you can use [docker compose](#docker-compose).
-The `-d` flag lets the container run in detached mode. You may supply an
+The `-d` flag lets the container run in detached mode. You may supply an optional `conduwuit.toml` config file, the example config can be found [here](../configuration.md).
-optional `conduwuit.toml` config file, the example config can be found
+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
-[here](../configuration/examples.md). You can pass in different env vars to
+values, please take a look at the [`docker-compose.yml`](docker-compose.yml) file.
 change config values on the fly. You can even configure Continuwuity completely by
 using env vars. For an overview of possible values, please take a look at the
 [`docker-compose.yml`](docker-compose.yml) file.
-If you just want to test Continuwuity for a short time, you can use the `--rm`
+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.
 flag, which will clean up everything related to your container after you stop
 it.
 ### Docker-compose
-If the `docker run` command is not for you or your setup, you can also use one
+If the `docker run` command is not for you or your setup, you can also use one of the provided `docker-compose` files.
 of the provided `docker-compose` files.
 Depending on your proxy setup, you can use one of the following files;
-
+- If you already have a `traefik` instance set up, use [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml)
- If you already have a `traefik` instance set up, use
+- If you don't have a `traefik` instance set up (or any other reverse proxy), use [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)
 [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml)
 - If you don't have a `traefik` instance set up and would like to use it, use
 [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)
 - If you want a setup that works out of the box with `caddy-docker-proxy`, use
 [`docker-compose.with-caddy.yml`](docker-compose.with-caddy.yml) and replace all
 `example.com` placeholders with your own domain
 - For any other reverse proxy, use [`docker-compose.yml`](docker-compose.yml)
-When picking the traefik-related compose file, rename it so it matches
+When picking the traefik-related compose file, rename it so it matches `docker-compose.yml`, and
-`docker-compose.yml`, and rename the override file to
+rename the override file to `docker-compose.override.yml`. Edit the latter with the values you want
-`docker-compose.override.yml`. Edit the latter with the values you want for your
+for your server.
 server.
-When picking the `caddy-docker-proxy` compose file, it's important to first
+Additional info about deploying conduwuit can be found [here](generic.md).
 create the `caddy` network before spinning up the containers:
 ```bash
 docker network create caddy
 ```
 After that, you can rename it so it matches `docker-compose.yml` and spin up the
 containers!
 Additional info about deploying Continuwuity can be found [here](generic.md).
 ### Build
-Official Continuwuity images are built using **Docker Buildx** and the Dockerfile found at [`docker/Dockerfile`][dockerfile-path]. This approach uses common Docker tooling and enables multi-platform builds efficiently.
+To build the conduwuit image with docker-compose, you first need to open and modify the `docker-compose.yml` file. There you need to comment the `image:` option and uncomment the `build:` option. Then call docker compose with:
 The resulting images are broadly compatible with Docker and other container runtimes like Podman or containerd.
 The images *do not contain a shell*. They contain only the Continuwuity binary, required libraries, TLS certificates and metadata. Please refer to the [`docker/Dockerfile`][dockerfile-path] for the specific details of the image composition.
 To build an image locally using Docker Buildx, you can typically run a command like:
 ```bash
-# Build for the current platform and load into the local Docker daemon
+docker compose up
 docker buildx build --load --tag continuwuity:latest -f docker/Dockerfile .
 # Example: Build for specific platforms and push to a registry.
 # docker buildx build --platform linux/amd64,linux/arm64 --tag registry.io/org/continuwuity:latest -f docker/Dockerfile . --push
 # Example: Build binary optimized for the current CPU
 # docker buildx build --load --tag continuwuity:latest --build-arg TARGET_CPU=native -f docker/Dockerfile .
 ```
-Refer to the Docker Buildx documentation for more advanced build options.
+This will also start the container right afterwards, so if want it to run in detached mode, you also should use the `-d` flag.
 [dockerfile-path]: ../../docker/Dockerfile
 ### Run
-If you already have built the image or want to use one from the registries, you
+If you already have built the image or want to use one from the registries, you can just start the container and everything else in the compose file in detached mode with:
 can just start the container and everything else in the compose file in detached
 mode with:
 ```bash
 docker compose up -d
@ -121,24 +94,20 @@ docker compose up -d
 ### Use Traefik as Proxy
-As a container user, you probably know about Traefik. It is a easy to use
+As a container user, you probably know about Traefik. It is a easy to use reverse proxy for making
-reverse proxy for making containerized app and services available through the
+containerized app and services available through the web. With the two provided files,
 web. With the two provided files,
 [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or
 [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and
-[`docker-compose.override.yml`](docker-compose.override.yml), it is equally easy
+[`docker-compose.override.yml`](docker-compose.override.yml), it is equally easy to deploy
-to deploy and use Continuwuity, with a little caveat. If you already took a look at
+and use conduwuit, with a little caveat. If you already took a look at the files, then you should have
-the files, then you should have seen the `well-known` service, and that is the
+seen the `well-known` service, and that is the little caveat. Traefik is simply a proxy and
-little caveat. Traefik is simply a proxy and loadbalancer and is not able to
+loadbalancer and is not able to serve any kind of content, but for conduwuit to federate, we need to
-serve any kind of content, but for Continuwuity to federate, we need to either
+either expose ports `443` and `8448` or serve two endpoints `.well-known/matrix/client` and
-expose ports `443` and `8448` or serve two endpoints `.well-known/matrix/client`
+`.well-known/matrix/server`.
-and `.well-known/matrix/server`.
+
 With the service `well-known` we use a single `nginx` container that will serve those two files.
 With the service `well-known` we use a single `nginx` container that will serve
 those two files.
 ## Voice communication
 See the [TURN](../turn.md) page.
 [nix-buildlayeredimage]: https://ryantm.github.io/nixpkgs/builders/images/dockertools/#ssec-pkgs-dockerTools-buildLayeredImage
--- a/docs/deploying/freebsd.md
+++ b/docs/deploying/freebsd.md
@ -1,5 +0,0 @@
 # Continuwuity for FreeBSD
 Continuwuity at the moment does not provide FreeBSD builds or have FreeBSD packaging, however Continuwuity does build and work on FreeBSD using the system-provided RocksDB.
 Contributions for getting Continuwuity packaged are welcome.
--- a/docs/deploying/generic.md
+++ b/docs/deploying/generic.md
@ -1,160 +1,88 @@
 # Generic deployment documentation
-> ### Getting help
+> ## Getting help
 >
-> If you run into any problems while setting up Continuwuity, ask us in
+> If you run into any problems while setting up conduwuit, ask us
-> `#continuwuity:continuwuity.org` or [open an issue on
+> in `#conduwuit:puppygock.gay` or [open an issue on GitHub](https://github.com/girlbossceo/conduwuit/issues/new).
 > Forgejo](https://forgejo.ellis.link/continuwuation/continuwuity/issues/new).
-## Installing Continuwuity
+## Installing conduwuit
-### Static prebuilt binary
+You may simply download the binary that fits your machine. Run `uname -m` to see what you need.
-You may simply download the binary that fits your machine architecture (x86_64
+Prebuilt binaries can be downloaded from the latest tagged release [here](https://github.com/girlbossceo/conduwuit/releases/latest).
 or aarch64). Run `uname -m` to see what you need.
-Prebuilt fully static musl binaries can be downloaded from the latest tagged
+The latest tagged release also includes the Debian packages.
 release [here](https://forgejo.ellis.link/continuwuation/continuwuity/releases/latest) or
 `main` CI branch workflow artifact output. These also include Debian/Ubuntu
 packages.
-These can be curl'd directly from. `ci-bins` are CI workflow binaries by commit
+Alternatively, you may compile the binary yourself. We recommend using [Lix](https://lix.systems) to build conduwuit as this has the most guaranteed
-hash/revision, and `releases` are tagged releases. Sort by descending last
+reproducibiltiy and easiest to get a build environment and output going.
 modified for the latest.
-These binaries have jemalloc and io_uring statically linked and included with
+Otherwise, follow standard Rust project build guides (installing git and cloning the repo, getting the Rust toolchain via rustup, installing LLVM toolchain + libclang, installing liburing for io_uring and RocksDB, etc).
 them, so no additional dynamic dependencies need to be installed.
-For the **best** performance; if using an `x86_64` CPU made in the last ~15 years,
+## Adding a conduwuit user
 we recommend using the `-haswell-` optimised binaries. This sets
 `-march=haswell` which is the most compatible and highest performance with
 optimised binaries. The database backend, RocksDB, most benefits from this as it
 will then use hardware accelerated CRC32 hashing/checksumming which is critical
 for performance.
-### Compiling
+While conduwuit can run as any user it is better to use dedicated users for different services. This also allows
 you to make sure that the file permissions are correctly set up.
-Alternatively, you may compile the binary yourself. We recommend using
+In Debian or RHEL, you can use this command to create a conduwuit user:
 Nix (or [Lix](https://lix.systems)) to build Continuwuity as this has the most
 guaranteed reproducibiltiy and easiest to get a build environment and output
 going. This also allows easy cross-compilation.
 You can run the `nix build -L .#static-x86_64-linux-musl-all-features` or
 `nix build -L .#static-aarch64-linux-musl-all-features` commands based
 on architecture to cross-compile the necessary static binary located at
 `result/bin/conduwuit`. This is reproducible with the static binaries produced
 in our CI.
 If wanting to build using standard Rust toolchains, make sure you install:
 - `liburing-dev` on the compiling machine, and `liburing` on the target host
 - LLVM and libclang for RocksDB
 You can build Continuwuity using `cargo build --release --all-features`
 ## Adding a Continuwuity user
 While Continuwuity can run as any user it is better to use dedicated users for
 different services. This also allows you to make sure that the file permissions
 are correctly set up.
 In Debian, you can use this command to create a Continuwuity user:
 ```bash
-sudo adduser --system continuwuity --group --disabled-login --no-create-home
+sudo adduser --system conduwuit --group --disabled-login --no-create-home
 ```
-For distros without `adduser` (or where it's a symlink to `useradd`):
+For distros without `adduser`:
 ```bash
-sudo useradd -r --shell /usr/bin/nologin --no-create-home continuwuity
+sudo useradd -r --shell /usr/bin/nologin --no-create-home conduwuit
 ```
 ## Forwarding ports in the firewall or the router
-Matrix's default federation port is port 8448, and clients must be using port 443.
+conduwuit uses the ports 443 and 8448 both of which need to be open in the firewall.
 If you would like to use only port 443, or a different port, you will need to setup
 delegation. Continuwuity has config options for doing delegation, or you can configure
 your reverse proxy to manually serve the necessary JSON files to do delegation
 (see the `[global.well_known]` config section).
-If Continuwuity runs behind a router or in a container and has a different public
+If conduwuit runs behind a router or in a container and has a different public IP address than the host system these public ports need to be forwarded directly or indirectly to the port mentioned in the config.
 IP address than the host system these public ports need to be forwarded directly
 or indirectly to the port mentioned in the config.
 Note for NAT users; if you have trouble connecting to your server from the inside
 of your network, you need to research your router and see if it supports "NAT
 hairpinning" or "NAT loopback".
 If your router does not support this feature, you need to research doing local
 DNS overrides and force your Matrix DNS records to use your local IP internally.
 This can be done at the host level using `/etc/hosts`. If you need this to be
 on the network level, consider something like NextDNS or Pi-Hole.
 ## Setting up a systemd service
-Two example systemd units for Continuwuity can be found
+The systemd unit for conduwuit can be found [here](../../debian/conduwuit.service). You may need to change the `ExecStart=` path to where you placed the conduwuit binary.
 [on the configuration page](../configuration/examples.md#debian-systemd-unit-file).
 You may need to change the `ExecStart=` path to where you placed the Continuwuity
 binary if it is not `/usr/bin/conduwuit`.
-On systems where rsyslog is used alongside journald (i.e. Red Hat-based distros
+## Creating the conduwuit configuration file
 and OpenSUSE), put `$EscapeControlCharactersOnReceive off` inside
 `/etc/rsyslog.conf` to allow color in logs.
-If you are using a different `database_path` other than the systemd unit
+Now we need to create the conduwuit's config file in `/etc/conduwuit/conduwuit.toml`. The example config can be found at [conduwuit-example.toml](../configuration.md).**Please take a moment to read it. You need to change at least the server name.**
 configured default `/var/lib/conduwuit`, you need to add your path to the
 systemd unit's `ReadWritePaths=`. This can be done by either directly editing
 `conduwuit.service` and reloading systemd, or running `systemctl edit conduwuit.service`
 and entering the following:
-```
+RocksDB (`rocksdb`) is the only supported database backend. SQLite only exists for historical reasons and is not recommended. Any performance issues, storage issues, database issues, etc will not be assisted if using SQLite and you will be asked to migrate to RocksDB first.
 [Service]
 ReadWritePaths=/path/to/custom/database/path
 ```
 ## Creating the Continuwuity configuration file
 Now we need to create the Continuwuity's config file in
 `/etc/conduwuit/conduwuit.toml`. The example config can be found at
 [conduwuit-example.toml](../configuration/examples.md).
 **Please take a moment to read the config. You need to change at least the
 server name.**
 RocksDB is the only supported database backend.
 ## Setting the correct file permissions
-If you are using a dedicated user for Continuwuity, you will need to allow it to
+If you are using a dedicated user for conduwuit, you will need to allow it to read the config. To do that you can run this command on
-read the config. To do that you can run this:
+
 Debian or RHEL:
 ```bash
 sudo chown -R root:root /etc/conduwuit
-sudo chmod -R 755 /etc/conduwuit
+sudo chmod 755 /etc/conduwuit
 ```
 If you use the default database path you also need to run this:
 ```bash
 sudo mkdir -p /var/lib/conduwuit/
-sudo chown -R continuwuity:continuwuity /var/lib/conduwuit/
+sudo chown -R conduwuit:conduwuit /var/lib/conduwuit/
 sudo chmod 700 /var/lib/conduwuit/
 ```
 ## Setting up the Reverse Proxy
-We recommend Caddy as a reverse proxy, as it is trivial to use, handling TLS certificates, reverse proxy headers, etc transparently with proper defaults.
+Refer to the documentation or various guides online of your chosen reverse proxy software. A [Caddy](https://caddyserver.com/) example will be provided as this is the recommended reverse proxy for new users and is very trivial to use (handles TLS, reverse proxy headers, etc transparently with proper defaults).
 For other software, please refer to their respective documentation or online guides.
 ### Caddy
-After installing Caddy via your preferred method, create `/etc/caddy/conf.d/conduwuit_caddyfile`
+Create `/etc/caddy/conf.d/conduwuit_caddyfile` and enter this (substitute for your server name).
 and enter this (substitute for your server name).
-```caddyfile
+```caddy
 your.server.name, your.server.name:8448 {
-    # TCP reverse_proxy
+        # TCP
        reverse_proxy 127.0.0.1:6167
        # UNIX socket
        #reverse_proxy unix//run/conduwuit/conduwuit.sock
 }
@ -163,84 +91,38 @@ your.server.name, your.server.name:8448 {
 That's it! Just start and enable the service and you're set.
 ```bash
-sudo systemctl enable --now caddy
+$ sudo systemctl enable --now caddy
 ```
-### Other Reverse Proxies
+## You're done!
-As we would prefer our users to use Caddy, we will not provide configuration files for other proxys.
+Now you can start conduwuit with:
 You will need to reverse proxy everything under following routes:
 - `/_matrix/` - core Matrix C-S and S-S APIs
 - `/_conduwuit/` - ad-hoc Continuwuity routes such as `/local_user_count` and
 `/server_version`
 You can optionally reverse proxy the following individual routes:
 - `/.well-known/matrix/client` and `/.well-known/matrix/server` if using
 Continuwuity to perform delegation (see the `[global.well_known]` config section)
 - `/.well-known/matrix/support` if using Continuwuity to send the homeserver admin
 contact and support page (formerly known as MSC1929)
 - `/` if you would like to see `hewwo from conduwuit woof!` at the root
 See the following spec pages for more details on these files:
 - [`/.well-known/matrix/server`](https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixserver)
 - [`/.well-known/matrix/client`](https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient)
 - [`/.well-known/matrix/support`](https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixsupport)
 Examples of delegation:
 - <https://puppygock.gay/.well-known/matrix/server>
 - <https://puppygock.gay/.well-known/matrix/client>
 For Apache and Nginx there are many examples available online.
 Lighttpd is not supported as it seems to mess with the `X-Matrix` Authorization
 header, making federation non-functional. If a workaround is found, feel free to share to get it added to the documentation here.
 If using Apache, you need to use `nocanon` in your `ProxyPass` directive to prevent httpd from messing with the `X-Matrix` header (note that Apache isn't very good as a general reverse proxy and we discourage the usage of it if you can).
 If using Nginx, you need to give Continuwuity the request URI using `$request_uri`, or like so:
 - `proxy_pass http://127.0.0.1:6167$request_uri;`
 - `proxy_pass http://127.0.0.1:6167;`
 Nginx users need to increase `client_max_body_size` (default is 1M) to match
 `max_request_size` defined in conduwuit.toml.
 ## You're done
 Now you can start Continuwuity with:
 ```bash
-sudo systemctl start conduwuit
+$ sudo systemctl start conduwuit
 ```
 Set it to start automatically when your system boots with:
 ```bash
-sudo systemctl enable conduwuit
+$ sudo systemctl enable conduwuit
 ```
 ## How do I know it works?
-You can open [a Matrix client](https://matrix.org/ecosystem/clients), enter your
+You can open [a Matrix client](https://matrix.org/ecosystem/clients), enter your homeserver and try to register.
 homeserver and try to register.
-You can also use these commands as a quick health check (replace
+You can also use these commands as a quick health check.
 `your.server.name`).
 ```bash
-curl https://your.server.name/_conduwuit/server_version
+$ curl https://your.server.name/_conduwuit/server_version
 # If using port 8448
-curl https://your.server.name:8448/_conduwuit/server_version
+$ curl https://your.server.name:8448/_conduwuit/server_version
 # If federation is enabled
 curl https://your.server.name:8448/_matrix/federation/v1/version
 ```
- To check if your server can talk with other homeservers, you can use the
+- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/).
-[Matrix Federation Tester](https://federationtester.matrix.org/). If you can
+  If you can register but cannot join federated rooms check your config again and also check if the port 8448 is open and forwarded correctly.
 register but cannot join federated rooms check your config again and also check
 if the port 8448 is open and forwarded correctly.
 # What's next?
@ -250,5 +132,4 @@ For Audio/Video call functionality see the [TURN Guide](../turn.md).
 ## Appservices
-If you want to set up an appservice, take a look at the [Appservice
+If you want to set up an appservice, take a look at the [Appservice Guide](../appservices.md).
 Guide](../appservices.md).
--- a/docs/deploying/kubernetes.md
+++ b/docs/deploying/kubernetes.md
@ -1,9 +0,0 @@
 # Continuwuity for Kubernetes
 Continuwuity doesn't support horizontal scalability or distributed loading
 natively, however a community maintained Helm Chart is available here to run
 conduwuit on Kubernetes: <https://gitlab.cronce.io/charts/conduwuit>
 This should be compatible with continuwuity, but you will need to change the image reference.
 Should changes need to be made, please reach out to the maintainer as this is not maintained/controlled by the Continuwuity maintainers.
--- a/docs/deploying/nixos.md
+++ b/docs/deploying/nixos.md
@ -1,75 +1,30 @@
-# Continuwuity for NixOS
+# conduwuit for NixOS
-Continuwuity can be acquired by Nix (or [Lix][lix]) from various places:
+conduwuit can be acquired by Nix from various places:
 * The `flake.nix` at the root of the repo
 * The `default.nix` at the root of the repo
-* From Continuwuity's binary cache
+* From conduwuit's binary cache
-### NixOS module
+A binary cache for conduwuit that the CI/CD publishes to is available at the
 following places (both are the same just different names):
 ```
 https://attic.kennel.juneis.dog/conduit
 conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg=
-The `flake.nix` and `default.nix` do not currently provide a NixOS module (contributions
+https://attic.kennel.juneis.dog/conduwuit
-welcome!), so [`services.matrix-conduit`][module] from Nixpkgs can be used to configure
+conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw=
-Continuwuity.
+```
-### Conduit NixOS Config Module and SQLite
+If specifying a URL in your flake, please use the GitHub remote: `github:girlbossceo/conduwuit`
-Beware! The [`services.matrix-conduit`][module] module defaults to SQLite as a database backend.
+The `flake.nix` and `default.nix` do not (currently) provide a NixOS module, so
-Continuwuity dropped SQLite support in favor of exclusively supporting the much faster RocksDB.
+(for now) [`services.matrix-conduit`][module] from Nixpkgs should be used to
-Make sure that you are using the RocksDB backend before migrating!
+configure conduwuit.
-There is a [tool to  migrate a Conduit SQLite database to
+If you want to run the latest code, you should get Conduwuit from the `flake.nix`
 RocksDB](https://github.com/ShadowJonathan/conduit_toolbox/).
 If you want to run the latest code, you should get Continuwuity from the `flake.nix`
 or `default.nix` and set [`services.matrix-conduit.package`][package]
-appropriately to use Continuwuity instead of Conduit.
+appropriately.
 ### UNIX sockets
 Due to the lack of a Continuwuity NixOS module, when using the `services.matrix-conduit` module
 a workaround like the one below is necessary to use UNIX sockets. This is because the UNIX
 socket option does not exist in Conduit, and the module forcibly sets the `address` and 
 `port` config options.
 ```nix
 options.services.matrix-conduit.settings = lib.mkOption {
  apply = old: old // (
    if (old.global ? "unix_socket_path")
    then { global = builtins.removeAttrs old.global [ "address" "port" ]; }
    else {  }
  );
 };
 ```
 Additionally, the [`matrix-conduit` systemd unit][systemd-unit] in the module does not allow
 the `AF_UNIX` socket address family in their systemd unit's `RestrictAddressFamilies=` which
 disallows the namespace from accessing or creating UNIX sockets and has to be enabled like so:
 ```nix
 systemd.services.conduit.serviceConfig.RestrictAddressFamilies = [ "AF_UNIX" ];
 ```
 Even though those workarounds are feasible a Continuwuity NixOS configuration module, developed and
 published by the community, would be appreciated.
 ### jemalloc and hardened profile
 Continuwuity uses jemalloc by default. This may interfere with the [`hardened.nix` profile][hardened.nix]
 due to them using `scudo` by default. You must either disable/hide `scudo` from Continuwuity, or
 disable jemalloc like so:
 ```nix
 let
    conduwuit = pkgs.unstable.conduwuit.override {
      enableJemalloc = false;
    };
 in
 ```
 [lix]: https://lix.systems/
 [module]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit
 [package]: https://search.nixos.org/options?channel=unstable&query=services.matrix-conduit.package
 [hardened.nix]: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/hardened.nix#L22
 [systemd-unit]: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/matrix/conduit.nix#L132
--- a/docs/development.md
+++ b/docs/development.md
@ -1,131 +1,23 @@
 # Development
 Information about developing the project. If you are only interested in using
-it, you can safely ignore this page. If you plan on contributing, see the
+it, you can safely ignore this section. If you plan on contributing, see the
-[contributor's guide](./contributing.md).
+[contributor's guide](contributing.md).
 ## Continuwuity project layout
 Continuwuity uses a collection of sub-crates, packages, or workspace members
 that indicate what each general area of code is for. All of the workspace
 members are under `src/`. The workspace definition is at the top level / root
 `Cargo.toml`.
 The crate names are generally self-explanatory:
 - `admin` is the admin room
 - `api` is the HTTP API, Matrix C-S and S-S endpoints, etc
 - `core` is core Continuwuity functionality like config loading, error definitions,
 global utilities, logging infrastructure, etc
 - `database` is RocksDB methods, helpers, RocksDB config, and general database definitions,
 utilities, or functions
 - `macros` are Continuwuity Rust [macros][macros] like general helper macros, logging
 and error handling macros, and [syn][syn] and [procedural macros][proc-macro]
 used for admin room commands and others
 - `main` is the "primary" sub-crate. This is where the `main()` function lives,
 tokio worker and async initialisation, Sentry initialisation, [clap][clap] init,
 and signal handling. If you are adding new [Rust features][features], they *must*
 go here.
 - `router` is the webserver and request handling bits, using axum, tower, tower-http,
 hyper, etc, and the [global server state][state] to access `services`.
 - `service` is the high-level database definitions and functions for data,
 outbound/sending code, and other business logic such as media fetching.
 It is highly unlikely you will ever need to add a new workspace member, but
 if you truly find yourself needing to, we recommend reaching out to us in
 the Matrix room for discussions about it beforehand.
 The primary inspiration for this design was apart of hot reloadable development,
 to support "Continuwuity as a library" where specific parts can simply be swapped out.
 There is evidence Conduit wanted to go this route too as `axum` is technically an
 optional feature in Conduit, and can be compiled without the binary or axum library
 for handling inbound web requests; but it was never completed or worked.
 See the Rust documentation on [Workspaces][workspaces] for general questions
 and information on Cargo workspaces.
 ## Adding compile-time [features][features]
 If you'd like to add a compile-time feature, you must first define it in
 the `main` workspace crate located in `src/main/Cargo.toml`. The feature must
 enable a feature in the other workspace crate(s) you intend to use it in. Then
 the said workspace crate(s) must define the feature there in its `Cargo.toml`.
 So, if this is adding a feature to the API such as `woof`, you define the feature
 in the `api` crate's `Cargo.toml` as `woof = []`. The feature definition in `main`'s
 `Cargo.toml` will be `woof = ["conduwuit-api/woof"]`.
 The rationale for this is due to Rust / Cargo not supporting
 ["workspace level features"][9], we must make a choice of; either scattering
 features all over the workspace crates, making it difficult for anyone to add
 or remove default features; or define all the features in one central workspace
 crate that propagate down/up to the other workspace crates. It is a Cargo pitfall,
 and we'd like to see better developer UX in Rust's Workspaces.
 Additionally, the definition of one single place makes "feature collection" in our
 Nix flake a million times easier instead of collecting and deduping them all from
 searching in all the workspace crates' `Cargo.toml`s. Though we wouldn't need to
 do this if Rust supported workspace-level features to begin with.
 ## List of forked dependencies
 During Continuwuity development, we have had to fork
 some dependencies to support our use-cases in some areas. This ranges from
 things said upstream project won't accept for any reason, faster-paced
 development (unresponsive or slow upstream), Continuwuity-specific usecases, or
 lack of time to upstream some things.
 - [ruma/ruma][1]: <https://github.com/girlbossceo/ruwuma> - various performance
 improvements, more features, faster-paced development, better client/server interop
 hacks upstream won't accept, etc
 - [facebook/rocksdb][2]: <https://github.com/girlbossceo/rocksdb> - liburing
 build fixes and GCC debug build fix
 - [tikv/jemallocator][3]: <https://github.com/girlbossceo/jemallocator> - musl
 builds seem to be broken on upstream, fixes some broken/suspicious code in
 places, additional safety measures, and support redzones for Valgrind
 - [zyansheep/rustyline-async][4]:
 <https://github.com/girlbossceo/rustyline-async> - tab completion callback and
 `CTRL+\` signal quit event for Continuwuity console CLI
 - [rust-rocksdb/rust-rocksdb][5]:
 <https://github.com/girlbossceo/rust-rocksdb-zaidoon1> - [`@zaidoon1`][8]'s fork
 has quicker updates, more up to date dependencies, etc. Our fork fixes musl build
 issues, removes unnecessary `gtest` include, and uses our RocksDB and jemallocator
 forks.
 - [tokio-rs/tracing][6]: <https://github.com/girlbossceo/tracing> - Implements
 `Clone` for `EnvFilter` to support dynamically changing tracing envfilter's
 alongside other logging/metrics things
 ## Debugging with `tokio-console`
-[`tokio-console`][7] can be a useful tool for debugging and profiling. To make a
+[`tokio-console`][1] can be a useful tool for debugging and profiling. To make
-`tokio-console`-enabled build of Continuwuity, enable the `tokio_console` feature,
+a `tokio-console`-enabled build of Conduwuit, enable the `tokio_console` feature,
-disable the default `release_max_log_level` feature, and set the `--cfg
+disable the default `release_max_log_level` feature, and set the
-tokio_unstable` flag to enable experimental tokio APIs. A build might look like
+`--cfg tokio_unstable` flag to enable experimental tokio APIs. A build might
-this:
+look like this:
 ```bash
-RUSTFLAGS="--cfg tokio_unstable" cargo +nightly build \
+RUSTFLAGS="--cfg tokio_unstable" cargo build \
    --release \
    --no-default-features \
-    --features=systemd,element_hacks,gzip_compression,brotli_compression,zstd_compression,tokio_console
+    --features
    backend_rocksdb,systemd,element_hacks,sentry_telemetry,gzip_compression,brotli_compression,zstd_compression,tokio_console
 ```
-You will also need to enable the `tokio_console` config option in Continuwuity when
+[1]: https://docs.rs/tokio-console/latest/tokio_console/
 starting it. This was due to tokio-console causing gradual memory leak/usage
 if left enabled.
 [1]: https://github.com/ruma/ruma/
 [2]: https://github.com/facebook/rocksdb/
 [3]: https://github.com/tikv/jemallocator/
 [4]: https://github.com/zyansheep/rustyline-async/
 [5]: https://github.com/rust-rocksdb/rust-rocksdb/
 [6]: https://github.com/tokio-rs/tracing/
 [7]: https://docs.rs/tokio-console/latest/tokio_console/
 [8]: https://github.com/zaidoon1/
 [9]: https://github.com/rust-lang/cargo/issues/12162
 [workspaces]: https://doc.rust-lang.org/cargo/reference/workspaces.html
 [macros]: https://doc.rust-lang.org/book/ch19-06-macros.html
 [syn]: https://docs.rs/syn/latest/syn/
 [proc-macro]: https://doc.rust-lang.org/reference/procedural-macros.html
 [clap]: https://docs.rs/clap/latest/clap/
 [features]: https://doc.rust-lang.org/cargo/reference/features.html
 [state]: https://docs.rs/axum/latest/axum/extract/struct.State.html
--- a/docs/development/assets/libraries.png
+++ b/docs/development/assets/libraries.png
--- a/docs/development/assets/reload_order.png
+++ b/docs/development/assets/reload_order.png
--- a/docs/development/hot_reload.md
+++ b/docs/development/hot_reload.md
@ -1,200 +0,0 @@
 # Hot Reloading ("Live" Development)
 Note that hot reloading has not been refactored in quite a while and is not
 guaranteed to work at this time.
 ### Summary
 When developing in debug-builds with the nightly toolchain, Continuwuity is modular
 using dynamic libraries and various parts of the application are hot-reloadable
 while the server is running: http api handlers, admin commands, services,
 database, etc. These are all split up into individual workspace crates as seen
 in the `src/` directory. Changes to sourcecode in a crate rebuild that crate and
 subsequent crates depending on it. Reloading then occurs for the changed crates.
 Release builds still produce static binaries which are unaffected. Rust's
 soundness guarantees are in full force. Thus you cannot hot-reload release
 binaries.
 ### Requirements
 Currently, this development setup only works on x86_64 and aarch64 Linux glibc.
 [musl explicitly does not support hot reloadable libraries, and does not
 implement `dlclose`][2]. macOS does not fully support our usage of `RTLD_GLOBAL`
 possibly due to some thread-local issues. [This Rust issue][3] may be of
 relevance, specifically [this comment][4]. It may be possible to get it working
 on only very modern macOS versions such as at least Sonoma, as currently loading
 dylibs is supported, but not unloading them in our setup, and the cited comment
 mentions an Apple WWDC confirming there have been TLS changes to somewhat make
 this possible.
 As mentioned above this requires the nightly toolchain. This is due to reliance
 on various Cargo.toml features that are only available on nightly, most
 specifically `RUSTFLAGS` in Cargo.toml. Some of the implementation could also be
 simpler based on other various nightly features. We hope lots of nightly
 features start making it out of nightly sooner as there have been dozens of very
 helpful features that have been stuck in nightly ("unstable") for at least 5+
 years that would make this simpler. We encourage greater community consensus to
 move these features into stability.
 This currently only works on x86_64/aarch64 Linux with a glibc C library. musl C
 library, macOS, and likely other host architectures are not supported (if other
 architectures work, feel free to let us know and/or make a PR updating this).
 This should work on GNU ld and lld (rust-lld) and gcc/clang, however if you
 happen to have linker issues it's recommended to try using `mold` or `gold`
 linkers, and please let us know in the [Continuwuity Matrix room][7] the linker
 error and what linker solved this issue so we can figure out a solution. Ideally
 there should be minimal friction to using this, and in the future a build script
 (`build.rs`) may be suitable to making this easier to use if the capabilities
 allow us.
 ### Usage
 As of 19 May 2024, the instructions for using this are:
 0. Have patience. Don't hesitate to join the [Continuwuity Matrix room][7] to
   receive help using this. As indicated by the various rustflags used and some
 of the interesting issues linked at the bottom, this is definitely not something
 the Rust ecosystem or toolchain is used to doing.
 1. Install the nightly toolchain using rustup. You may need to use `rustup
   override set nightly` in your local Continuwuity directory, or use `cargo
 +nightly` for all actions.
 2. Uncomment `cargo-features` at the top level / root Cargo.toml
 3. Scroll down to the `# Developer profile` section and uncomment ALL the
   rustflags for each dev profile and their respective packages.
 4. In each workspace crate's Cargo.toml (everything under `src/*` AND
   `deps/rust-rocksdb/Cargo.toml`), uncomment the `dylib` crate type under
 `[lib]`.
 5. Due to [this rpath issue][5], you must export the `LD_LIBRARY_PATH`
   environment variable to your nightly Rust toolchain library directory. If
 using rustup (hopefully), use this: `export
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/`
 6. Start the server. You can use `cargo +nightly run` for this along with the
   standard.
 7. Make some changes where you need to.
 8. In a separate terminal window in the same directory (or using a terminal
   multiplexer like tmux), run the *build* Cargo command `cargo +nightly build`.
   Cargo should only rebuild what was changed / what's necessary, so it should
   not be rebuilding all the crates.
 9. In your Continuwuity server terminal, hit/send `CTRL+C` signal. This will tell
   Continuwuity to find which libraries need to be reloaded, and reloads them as
   necessary.
 10. If there were no errors, it will tell you it successfully reloaded `#`
   modules, and your changes should now be visible. Repeat 7 - 9 as needed.
 To shutdown Continuwuity in this setup, hit/send `CTRL+\`. Normal builds still
 shutdown with `CTRL+C` as usual.
 Steps 1 - 5 are the initial first-time steps for using this. To remove the hot
 reload setup, revert/comment all the Cargo.toml changes.
 As mentioned in the requirements section, if you happen to have some linker
 issues, try using the `-fuse-ld=` rustflag and specify mold or gold in all the
 `rustflags` definitions in the top level Cargo.toml, and please let us know in
 the [Continuwuity Matrix room][7] the problem. mold can be installed typically
 through your distro, and gold is provided by the binutils package.
 It's possible a helper script can be made to do all of this, or most preferably
 a specially made build script (build.rs). `cargo watch` support will be
 implemented soon which will eliminate the need to manually run `cargo build` all
 together.
 ### Addendum
 Conduit was inherited as a single crate without modularity or reloading in its
 design. Reasonable partitioning and abstraction allowed a split into several
 crates, though many circular dependencies had to be corrected. The resulting
 crates now form a directed graph as depicted in figures below. The interfacing
 between these crates is still extremely broad which is not mitigable.
 Initially [hot_lib_reload][6] was investigated but found appropriate for a
 project designed with modularity through limited interfaces, not a large and
 complex existing codebase. Instead a bespoke solution built directly on
 [libloading][8] satisfied our constraints. This required relatively minimal
 modifications and zero maintenance burden compared to what would be required
 otherwise. The technical difference lies with relocation processing: we leverage
 global bindings (`RTLD_GLOBAL`) in a very intentional way. Most libraries and
 off-the-shelf module systems (such as [hot_lib_reload][6]) restrict themselves
 to local bindings (`RTLD_LOCAL`). This allows them to release software to
 multiple platforms with much greater consistency, but at the cost of burdening
 applications to explicitly manage these bindings. In our case with an optional
 feature for developers, we shrug any such requirement to enjoy the cost/benefit
 on platforms where global relocations are properly cooperative.
 To make use of `RTLD_GLOBAL` the application has to be oriented as a directed
 acyclic graph. The primary rule is simple and illustrated in the figure below:
 **no crate is allowed to call a function or use a variable from a crate below
 it.**
 ![Continuwuity's dynamic library setup diagram - created by Jason
 Volk](assets/libraries.png)
 When a symbol is referenced between crates they become bound: **crates cannot be
 unloaded until their calling crates are first unloaded.** Thus we start the
 reloading process from the crate which has no callers. There is a small problem
 though: the first crate is called by the base executable itself! This is solved
 by using an `RTLD_LOCAL` binding for just one link between the main executable
 and the first crate, freeing the executable from all modules as no global
 binding ever occurs between them.
 ![Continuwuity's reload and load order diagram - created by Jason
 Volk](assets/reload_order.png)
 Proper resource management is essential for reliable reloading to occur. This is
 a very basic ask in RAII-idiomatic Rust and the exposure to reloading hazards is
 remarkably low, generally stemming from poor patterns and practices.
 Unfortunately static analysis doesn't enforce reload-safety programmatically
 (though it could one day), for now hazards can be avoided by knowing a few basic
 do's and dont's:
 1. Understand that code is memory. Just like one is forbidden from referencing
   free'd memory, one must not transfer control to free'd code. Exposure to this
 is primarily from two things:
    - Callbacks, which this project makes very little use of.
    - Async tasks, which are addressed below.
 2. Tie all resources to a scope or object lifetime with greatest possible
 symmetry (locality). For our purposes this applies to code resources, which
 means async blocks and tokio tasks.
    - **Never spawn a task without receiving and storing its JoinHandle**.
    - **Always wait on join handles** before leaving a scope or in another cleanup
    function called by an owning scope.
 3. Know any minor specific quirks documented in code or here:
    - Don't use `tokio::spawn`, instead use our `Handle` in `core/server.rs`, which
    is reachable in most of the codebase via `services()` or other state. This is
    due to some bugs or assumptions made in tokio, as it happens in `unsafe {}`
    blocks, which are mitigated by circumventing some thread-local variables. Using
    runtime handles is good practice in any case.
 The initial implementation PR is available [here][1].
 ### Interesting related issues/bugs
 - [DT_RUNPATH produced in binary with rpath = true is wrong (cargo)][5]
 - [Disabling MIR Optimization in Rust Compilation
 (cargo)](https://internals.rust-lang.org/t/disabling-mir-optimization-in-rust-compilation/19066/5)
 - [Workspace-level metadata
 (cargo-deb)](https://github.com/kornelski/cargo-deb/issues/68)
 [1]: https://github.com/girlbossceo/conduwuit/pull/387
 [2]: https://wiki.musl-libc.org/functional-differences-from-glibc.html#Unloading-libraries
 [3]: https://github.com/rust-lang/rust/issues/28794
 [4]: https://github.com/rust-lang/rust/issues/28794#issuecomment-368693049
 [5]: https://github.com/rust-lang/cargo/issues/12746
 [6]: https://crates.io/crates/hot-lib-reloader/
 [7]: https://matrix.to/#/#continuwuity:continuwuity.org
 [8]: https://crates.io/crates/libloading
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@ -5,27 +5,13 @@
 Have a look at [Complement's repository][complement] for an explanation of what
 it is.
-To test against Complement, with Nix (or [Lix](https://lix.systems) and
+To test against Complement, with Nix and direnv installed and set up, you can
-[direnv installed and set up][direnv] (run `direnv allow` after setting up the hook), you can:
+either:
-* Run `./bin/complement "$COMPLEMENT_SRC"` to build a Complement image, run
+* Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl ./path/to/results.jsonl`
-the tests, and output the logs and results to the specified paths. This will also output the OCI image
+  to build a Complement image, run the tests, and output the logs and results
-at `result`
+  to the specified paths
 * Run `nix build .#complement` from the root of the repository to just build a
-Complement OCI image outputted to `result` (it's a `.tar.gz` file)
+  Complement image
 * Or download the latest Complement OCI image from the CI workflow artifacts
 output from the commit/revision you want to test (e.g. from main)
 [here][ci-workflows]
 If you want to use your own prebuilt OCI image (such as from our CI) without needing
 Nix installed, put the image at `complement_oci_image.tar.gz` in the root of the repo
 and run the script.
 If you're on macOS and need to build an image, run `nix build .#linux-complement`.
 We have a Complement fork as some tests have needed to be fixed. This can be found
 at: <https://github.com/girlbossceo/complement>
 [ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
 [complement]: https://github.com/matrix-org/complement
 [direnv]: https://direnv.net/docs/hook.html
--- a/docs/differences.md
+++ b/docs/differences.md
@ -0,0 +1,159 @@
 #### **Note: This list may not up to date. There are rapidly more and more improvements, fixes, changes, etc being made that it is becoming more difficult to maintain this list. I recommend that you give conduwuit a try and see the differences for yourself. If you have any concerns, feel free to join the conduwuit Matrix room and ask any pre-usage questions.**
 ### list of features, bug fixes, etc that conduwuit does that Conduit does not:
 Outgoing typing indicators, outgoing read receipts, **and** outgoing presence!
 ## Performance:
 - Concurrency support for key fetching for faster remote room joins and room joins that will error less frequently
 - Send `Cache-Control` response header with `immutable` and 1 year cache length for all media requests (download and thumbnail) to instruct clients to cache media, and reduce server load from media requests that could be otherwise cached
 - Add feature flags and config options to enable/build with zstd, brotli, and/or gzip HTTP body compression (response and request)
 - Eliminate all usage of the thread-blocking `getaddrinfo(3)` call upon DNS queries, significantly improving federation latency/ping and cache DNS results (NXDOMAINs, successful queries, etc) using hickory-dns / hickory-resolver
 - Vastly improve RocksDB default settings to use new features that help with performance significantly, uses settings tailored to SSDs, various ways to tweak RocksDB, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage or buggy filesystems.
 - Add a Cargo build profile for aggressive build-time performance optimisations for release builds (1 codegen unit, no debug, fat LTO, etc, and optimise all crates with same)
 - Implement database flush and cleanup conduwuit operations when using RocksDB
 - Implement RocksDB write buffer corking and coalescing in database write-heavy areas
 - Perform connection pooling and keepalives where necessary to significantly improve federation performance and latency
 - 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)
 - Enable RocksDB async read I/O via `io_uring` by default
 ## General Fixes:
 - Raise and improve all the various request timeouts making some things like room joins and client bugs error less or none at all than they should, and make them all user configurable
 - Add missing `reason` field to user ban events (`/ban`)
 - Fixed spec compliance issue with room version 8 - 11 joins (https://github.com/matrix-org/synapse/issues/16717 / https://github.com/matrix-org/matrix-spec/issues/1708)
 - Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic
 - Stop sending `make_join` requests on room joins if 15 servers respond with `M_UNSUPPORTED_ROOM_VERSION` or `M_INVALID_ROOM_VERSION`
 - Stop sending `make_join` requests if 50 servers cannot provide `make_join` for us
 - Respect *most* client parameters for `/media/` requests (`allow_redirect` still needs work)
 - Increased graceful shutdown timeout from a low 60 seconds to 180 seconds to avoid killing connections and let the remaining ones finish processing
 - 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 and PATCH (MSC4138) 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)
 - 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:
 - (Also see [Admin Room](#admin-room) for all the admin commands pertaining to moderation, there's a lot!)
 - Add support for room banning/blocking by ID using admin command
 - Add support for serving `support` well-known from `[well_known.support]` (MSC1929)
 - Config option to forbid publishing rooms to the room directory (`lockdown_public_room_directory`) except for admins
 - Admin commands to delete room aliases and unpublish rooms from our room directory
 - For all [`/report`](https://spec.matrix.org/v1.9/client-server-api/#post_matrixclientv3roomsroomidreporteventid) requests: check if the reported event ID belongs to the reported room ID, raise report reasoning character limit to 750, fix broken formatting, make a small delayed random response per spec suggestion on privacy, and check if the sender user is in the reported room.
 - Support blocking servers from downloading remote media from, returning a 404
 - Don't allow `m.call.invite` events to be sent in public rooms (prevents calling the entire room)
 - On new public room creations, only allow moderators to send `m.call.invite`, `org.matrix.msc3401.call`, and `org.matrix.msc3401.call.member` events
 - Add support for a "global ACLs" feature (`forbidden_remote_server_names`) that blocks inbound remote room invites, room joins by room ID on server name, room joins by room alias on server name, incoming federated joins, and incoming federated room directory requests. This is very helpful for blocking servers that are purely toxic/bad and serve no value in allowing our users to suffer from things like room invite spam or such. Please note that this is not a substitute for room ACLs.
 - Add support for a config option to forbid our local users from sending federated room directory requests for (`forbidden_remote_room_directory_server_names`). Similar to above, useful for blocking servers that help prevent our users from wandering into bad areas of Matrix via room directories of those malicious servers.
 - Add config option for auto remediating/deactivating local non-admin users who attempt to join bad/forbidden rooms (`auto_deactivate_banned_room_attempts`)
 ## Privacy/Security:
 - Add config option for device name federation with a privacy-friendly default (disabled)
 - Add config option for requiring authentication to the `/publicRooms` endpoint (room directory) with a default enabled for privacy
 - Add config option for federating `/publicRooms` endpoint (room directory) to other servers with a default disabled for privacy
 - Uses proper `argon2` crate by RustCrypto instead of questionable `rust-argon2` crate
 - Generate passwords with 25 characters instead of 15
 - Config option `ip_range_denylist` to support refusing to send requests (typically federation) to specific IP ranges, typically RFC 1918, non-routable, testnet, etc addresses like Synapse for security (note: this is not a guaranteed protection, and you should be using a firewall with zones if you want guaranteed protection as doing this on the application level is prone to bypasses).
 - Config option to block non-admin users from sending room invites or receiving remote room invites. Admin users are still allowed.
 - Config option to disable incoming and/or outgoing remote read receipts
 - Config option to disable incoming and/or outgoing remote typing indicators
 - Config option to disable incoming, outgoing, and/or local presence
 - Sanitise file names for the `Content-Disposition` header for all media requests (thumbnails, downloads, uploads)
 - Return `inline` or `attachment` based on the detected file MIME type for the `Content-Disposition` and only allow images/videos/text/audio to be `inline`
 - Send secure default HTTP headers such as a strong restrictive CSP, deny iframes, disable `X-XSS-Protection`, disable interest cohort in `Permission-Policy`, etc to mitigate any potential attack surface such as from untrusted media
 ## Administration/Logging:
 - Commandline argument to specify the path to a config file instead of relying on `CONDUIT_CONFIG`
 - Revamped admin room infrastructure and commands
 - Substantially clean up, improve, and fix logging (less noisy dead server logging, registration attempts, more useful troubleshooting logging, proper error propagation, etc)
 - Configurable RocksDB logging (`LOG` files) with proper defaults (rotate, max size, verbosity, etc) to stop LOG files from accumulating so much
 - Explicit startup error if your configuration allows open registration without a token or such like Synapse with a way to bypass it if needed
 - Replace the lightning bolt emoji option with support for setting any arbitrary text (e.g. another emoji) to suffix to all new user registrations, with a conduwuit default of 🏳️‍⚧️
 - Implement config option to auto join rooms upon registration
 - Warn on unknown config options specified
 - Add `/_conduwuit/server_version` route to return the version of conduwuit without relying on the federation API `/_matrix/federation/v1/version`
 - Add configurable RocksDB recovery modes to aid in recovering corrupted RocksDB databases
 - Support config options via `CONDUWUIT_` prefix and accessing non-global struct config options with the `__` split (e.g. `CONDUWUIT_WELL_KNOWN__SERVER`)
 - Add support for listening on multiple TCP ports
 - Disable update check by default as it's not useful for conduwuit
 - **Opt-in** Sentry.io telemetry and metrics, mainly used for crash reporting
 ## Maintenance/Stability:
 - GitLab CI ported to GitHub Actions
 - Repo is mirrored to GitHub, GitLab, git.gay, git.girlcock.ceo, sourcehut, and Codeberg (see README.md for their links)
 - Docker container images published to GitLab Container Registry, GitHub Container Registry, and Dockerhub
 - Extensively revamp the example config to be extremely helpful and useful to both new users and power users
 - Fixed every single clippy (default lints) and rustc warnings, including some that were performance related or potential safety issues / unsoundness
 - Add a **lot** of other clippy and rustc lints and a rustfmt.toml file
 - Has [Renovate](https://docs.renovatebot.com/), [Trivy](https://github.com/aquasecurity/trivy-action), and keeps ALL dependencies as up to date as possible
 - Attempts and interest in removing extreme and unnecessary panics/unwraps/expects that can lead to denial of service or such (upstream and upstream contributors want this unusual behaviour for some reason)
 - Purge unmaintained/irrelevant/broken database backends (heed, sled, persy) and other unnecessary code or overhead
 - webp support for images
 - Add cargo audit support to CI
 - CI tests with all features
 - Add timestamp by commit date support to building OCI images for keeping image build reproducibility and still have a meaningful "last modified date" for OCI image metadata
 - Update rusqlite/sqlite (not that you should be using it)
 - Startup check if conduwuit running in a container and is listening on 127.0.0.1 (generally containers are using NAT networking and 0.0.0.0 is the intended listening address)
 ## Admin Room:
 - Fix admin room handler to not panic/crash if the admin room command response fails (e.g. too large message)
 - Add command to dynamically change conduwuit's tracing log level filter on the fly
 - Add admin command to fetch a server's `/.well-known/matrix/support` file
 - Add debug admin command to force update user device lists (could potentially resolve some E2EE flukes)
 - Implement **RocksDB online backups**, listing RocksDB backups, and listing database file counts all via admin commands
 - Add various database visibility commands such as being able to query the getters and iterators used in conduwuit, a very helpful online debugging utility
 - Forbid the admin room from being made public or world readable history
 - Add `!admin` as a way to call the admin bot
 - Extend clear cache admin command to support clearing more caches such as DNS and TLS name overrides
 - Admin debug command to send a federation request/ping to a server's `/_matrix/federation/v1/version` endpoint and measures the latency it took
 - Add admin command to bulk delete media via a codeblock list of MXC URLs.
 - Add admin command to delete both the thumbnail and media MXC URLs from an event ID (e.g. from an abuse report)
 - Add admin command to list all the rooms a local user is joined in
 - Add admin command to delete all remote media in the past X minutes as a form of deleting media that you don't want on your server that a remote user posted in a room
 - Add admin command to return a room's state
 - 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:
 - Support for creating rooms with custom room IDs like Maunium Synapse (`room_id` request body field to `/createRoom`)
 - Query parameter `?format=event|content` for returning either the room state event's content (default) for the full room state event on ` /_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see https://github.com/matrix-org/matrix-spec/issues/1047)
 - Add **optional** feature flag to use SHA256 key names for media instead of base64 to overcome filesystem file name length limitations (OS error file name too long)
 - Send a User-Agent on all of our requests
 - Send `avatar_url` on invite room membership events/changes
 - Support sending [`well_known` response to client login responses](https://spec.matrix.org/v1.10/client-server-api/#post_matrixclientv3login) if using config option `[well_known.client]`
 - Implement `include_state` search criteria support for `/search` requests (response now can include room states)
 - Declare various missing Matrix versions and features at `/_matrix/client/versions`
 - Implement legacy Matrix `/v1/` media endpoints that some clients and servers may still call
 - Config option to change Conduit's behaviour of homeserver key fetching (`query_trusted_key_servers_first`). This option sets whether conduwuit will query trusted notary key servers first before the individual homeserver(s), or vice versa which may help in joining certain rooms.
 - Implement unstable MSC2666 support for querying mutual rooms with a user
 - 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
 - Add various documentation on maintaining conduwuit, using RocksDB online backups, some troubleshooting, using admin commands, etc
 - (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 🏳️‍⚧️
--- a/docs/introduction.md
+++ b/docs/introduction.md
@ -1,15 +1,18 @@
-# Continuwuity
+# Conduwuit
 {{#include ../README.md:catchphrase}}
 {{#include ../README.md:body}}
 #### What's different about your fork than upstream Conduit?
 See the [differences](differences.md) page
 #### How can I deploy my own?
 - [Deployment options](deploying.md)
-If you want to connect an appservice to Continuwuity, take a look at the
+If you want to connect an Appservice to Conduwuit, take a look at the [appservices documentation](appservices.md).
 [appservices documentation](appservices.md).
 #### How can I contribute?
--- a/docs/maintenance.md
+++ b/docs/maintenance.md
@ -1,135 +1,63 @@
-# Maintaining your Continuwuity setup
+# Maintaining your conduwuit setup
 ## Moderation
-Continuwuity has moderation through admin room commands. "binary commands" (medium
+conduwuit has moderation through admin room commands. "binary commands" (medium priority) and an admin API (low priority) is planned. Some moderation-related config options are available in the example config such as "global ACLs" and blocking media requests to certain servers. See the example config for the moderation config options under the "Moderation / Privacy / Security" section.
 priority) and an admin API (low priority) is planned. Some moderation-related
 config options are available in the example config such as "global ACLs" and
 blocking media requests to certain servers. See the example config for the
 moderation config options under the "Moderation / Privacy / Security" section.
 Continuwuity has moderation admin commands for:
 conduwuit has moderation admin commands for:
 - managing room aliases (`!admin rooms alias`)
 - managing room directory (`!admin rooms directory`)
 - managing room banning/blocking and user removal (`!admin rooms moderation`)
 - managing user accounts (`!admin users`)
 - fetching `/.well-known/matrix/support` from servers (`!admin federation`)
- blocking incoming federation for certain rooms (not the same as room banning)
+- blocking incoming federation for certain rooms (not the same as room banning) (`!admin federation`)
 (`!admin federation`)
 - deleting media (see [the media section](#media))
-Any commands with `-list` in them will require a codeblock in the message with
+Any commands with `-list` in them will require a codeblock in the message with each object being newline delimited. An example of doing this is:
 each object being newline delimited. An example of doing this is:
 ````
 !admin rooms moderation ban-list-of-rooms
 ```
 !roomid1:server.name
 #badroomalias1:server.name
 !roomid2:server.name
 !roomid3:server.name
 #badroomalias2:server.name
 ```
 ````
-## Database (RocksDB)
+## Database
-Generally there is very little you need to do. [Compaction][rocksdb-compaction]
+If using RocksDB, there's very little you need to do. Compaction is ran automatically based on various defined thresholds tuned for conduwuit to be high performance with the least I/O amplifcation or overhead. Manually running compaction is not recommended, or compaction via a timer. RocksDB is built with io_uring support via liburing for async read I/O.
-is ran automatically based on various defined thresholds tuned for Continuwuity to
+
-be high performance with the least I/O amplifcation or overhead. Manually
+Some RocksDB settings can be adjusted such as the compression method chosen. See the RocksDB section in the [example config](configuration.md). btrfs users may benefit from disabling compression on RocksDB if CoW is in use.
 running compaction is not recommended, or compaction via a timer, due to
 creating unnecessary I/O amplification. RocksDB is built with io_uring support
 via liburing for improved read performance.
 RocksDB troubleshooting can be found [in the RocksDB section of troubleshooting](troubleshooting.md).
 ### Compression
 Some RocksDB settings can be adjusted such as the compression method chosen. See
 the RocksDB section in the [example config](configuration/examples.md).
 btrfs users have reported that database compression does not need to be disabled
 on Continuwuity as the filesystem already does not attempt to compress. This can be
 validated by using `filefrag -v` on a `.SST` file in your database, and ensure
 the `physical_offset` matches (no filesystem compression). It is very important
 to ensure no additional filesystem compression takes place as this can render
 unbuffered Direct IO inoperable, significantly slowing down read and write
 performance. See <https://btrfs.readthedocs.io/en/latest/Compression.html#compatibility>
 > Compression is done using the COW mechanism so it’s incompatible with
 > nodatacow. Direct IO read works on compressed files but will fall back to
 > buffered writes and leads to no compression even if force compression is set.
 > Currently nodatasum and compression don’t work together.
 ### Files in database
 Do not touch any of the files in the database directory. This must be said due
 to users being mislead by the `.log` files in the RocksDB directory, thinking
 they're server logs or database logs, however they are critical RocksDB files
 related to WAL tracking.
 The only safe files that can be deleted are the `LOG` files (all caps). These
 are the real RocksDB telemetry/log files, however Continuwuity has already
 configured to only store up to 3 RocksDB `LOG` files due to generall being
 useless for average users unless troubleshooting something low-level. If you
 would like to store nearly none at all, see the `rocksdb_max_log_files`
 config option.
 ## Backups
-Currently only RocksDB supports online backups. If you'd like to backup your
+Currently only RocksDB supports online backups. If you'd like to backup your database online without any downtime, see the `!admin server` command for the backup commands and the `database_backup_path` config options in the example config. Please note that the format of the database backup is not the exact same. This is unfortunately a bad design choice by Facebook as we are using the database backup engine API from RocksDB, however the data is still there and can still be joined together.
 database online without any downtime, see the `!admin server` command for the
 backup commands and the `database_backup_path` config options in the example
 config. Please note that the format of the database backup is not the exact
 same. This is unfortunately a bad design choice by Facebook as we are using the
 database backup engine API from RocksDB, however the data is still there and can
 still be joined together.
 To restore a backup from an online RocksDB backup:
-
+- shutdown conduwuit
 - shutdown Continuwuity
 - create a new directory for merging together the data
- in the online backup created, copy all `.sst` files in
+- in the online backup created, copy all `.sst` files in `$DATABASE_BACKUP_PATH/shared_checksum` to your new directory
-`$DATABASE_BACKUP_PATH/shared_checksum` to your new directory
+- trim all the strings so instead of `######_sxxxxxxxxx.sst`, it reads `######.sst`. A way of doing this with sed and bash is `for file in *.sst; do mv "$file" "$(echo "$file" | sed 's/_s.*/.sst/')"; done`
- trim all the strings so instead of `######_sxxxxxxxxx.sst`, it reads
+- copy all the files in `$DATABASE_BACKUP_PATH/1` to your new directory
-`######.sst`. A way of doing this with sed and bash is `for file in *.sst; do mv
+- set your `database_path` config option to your new directory, or replace your old one with the new one you crafted
-"$file" "$(echo "$file" | sed 's/_s.*/.sst/')"; done`
+- start up conduwuit again and it should open as normal
 - copy all the files in `$DATABASE_BACKUP_PATH/1` (or the latest backup number
 if you have multiple) to your new directory
 - set your `database_path` config option to your new directory, or replace your
 old one with the new one you crafted
 - start up Continuwuity again and it should open as normal
-If you'd like to do an offline backup, shutdown Continuwuity and copy your
+If you'd like to do an offline backup, shutdown conduwuit and copy your `database_path` directory elsewhere. This can be restored with no modifications needed.
 `database_path` directory elsewhere. This can be restored with no modifications
 needed.
-Backing up media is also just copying the `media/` directory from your database
+Backing up media is also just copying the `media/` directory from your database directory.
 directory.
 ## Media
-Media still needs various work, however Continuwuity implements media deletion via:
+Media still needs various work, however conduwuit implements media deletion via:
-
+- MXC URI
 - MXC URI or Event ID (unencrypted and attempts to find the MXC URI in the
 event)
 - Delete list of MXC URIs
- Delete remote media in the past `N` seconds/minutes via filesystem metadata on
+- Delete remote media in the past `N` seconds/minutes
 the file created time (`btime`) or file modified time (`mtime`)
-See the `!admin media` command for further information. All media in Continuwuity
+See the `!admin media` command for further information. All media in conduwuit is stored at `$DATABASE_DIR/media`. This will be configurable soon.
 is stored at `$DATABASE_DIR/media`. This will be configurable soon.
-If you are finding yourself needing extensive granular control over media, we
+If you are finding yourself needing extensive granular control over media, we recommend looking into [Matrix Media Repo](https://github.com/t2bot/matrix-media-repo). conduwuit intends to implement various utilities for media, but MMR is dedicated to extensive media management.
 recommend looking into [Matrix Media
 Repo](https://github.com/t2bot/matrix-media-repo). Continuwuity intends to
 implement various utilities for media, but MMR is dedicated to extensive media
 management.
-Built-in S3 support is also planned, but for now using a "S3 filesystem" on
+Built-in S3 support is also planned, but for now using a "S3 filesystem" on `media/` works. conduwuit also sends a `Cache-Control` header of 1 year and immutable for all media requests (download and thumbnail) to reduce unnecessary media requests from browsers.
 `media/` works. Continuwuity also sends a `Cache-Control` header of 1 year and
 immutable for all media requests (download and thumbnail) to reduce unnecessary
 media requests from browsers, reduce bandwidth usage, and reduce load.
 [rocksdb-compaction]: https://github.com/facebook/rocksdb/wiki/Compaction
--- a/docs/static/_headers
+++ b/docs/static/_headers
@ -1,6 +0,0 @@
 /.well-known/matrix/*
  Access-Control-Allow-Origin: *
  Content-Type: application/json
 /.well-known/continuwuity/*
  Access-Control-Allow-Origin: *
  Content-Type: application/json
--- a/docs/static/announcements.json
+++ b/docs/static/announcements.json
@ -1,9 +0,0 @@
 {
    "$schema": "https://continuwuity.org/schema/announcements.schema.json",
    "announcements": [
        {
            "id": 1,
            "message": "Welcome to Continuwuity! Important announcements about the project will appear here."
        }
    ]
 }
--- a/docs/static/announcements.schema.json
+++ b/docs/static/announcements.schema.json
@ -1,31 +0,0 @@
 {
    "$schema": "http://json-schema.org/draft-04/schema#",
    "$id": "https://continwuity.org/schema/announcements.schema.json",
    "type": "object",
    "properties": {
      "updates": {
        "type": "array",
        "items": {
          "type": "object",
          "properties": {
            "id": {
              "type": "integer"
            },
            "message": {
              "type": "string"
            },
            "date": {
              "type": "string"
            }
          },
          "required": [
            "id",
            "message"
          ]
        }
      }
    },
    "required": [
      "updates"
    ]
  }
--- a/docs/static/client
+++ b/docs/static/client
@ -1 +0,0 @@
 {"m.homeserver":{"base_url": "https://matrix.continuwuity.org"},"org.matrix.msc3575.proxy":{"url": "https://matrix.continuwuity.org"}}
--- a/docs/static/server
+++ b/docs/static/server
@ -1 +0,0 @@
 {"m.server":"matrix.continuwuity.org:443"}
--- a/docs/static/support
+++ b/docs/static/support
@ -1,24 +0,0 @@
 {
  "contacts": [
    {
      "email_address": "security@continuwuity.org",
      "role": "m.role.security"
    },
    {
      "matrix_id": "@tom:continuwuity.org",
      "email_address": "tom@tcpip.uk",
      "role": "m.role.admin"
    },
    {
      "matrix_id": "@jade:continuwuity.org",
      "email_address": "jade@continuwuity.org",
      "role": "m.role.admin"
    },
    {
      "matrix_id": "@nex:continuwuity.org",
      "email_address": "nex@continuwuity.org",
      "role": "m.role.admin"
    }
  ],
  "support_page": "https://continuwuity.org/introduction#contact"
 }
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@ -1,107 +1,22 @@
-# Troubleshooting Continuwuity
+# Troubleshooting conduwuit
-> **Docker users ⚠️**
+> ## Docker users ⚠️
 >
-> Docker can be difficult to use and debug. It's common for Docker
+> Docker is extremely UX unfriendly. Because of this, a ton of issues or support is actually Docker support, not conduwuit support. We also cannot document the ever-growing list of Docker issues here.
-> misconfigurations to cause issues, particularly with networking and permissions.
+>
-> Please check that your issues are not due to problems with your Docker setup.
+> If you intend on asking for support and you are using Docker, **PLEASE** triple validate your issues are **NOT** because you have a misconfiguration in your Docker setup.
 >
 > If there are things like Compose file issues or Dockerhub image issues, those can still be mentioned as long as they're something we can fix.
-## Continuwuity and Matrix issues
+## Rocksdb / database issues
-### Lost access to admin room
+#### Direct IO
-You can reinvite yourself to the admin room through the following methods:
+Some filesystems may not like RocksDB using [Direct IO](https://github.com/facebook/rocksdb/wiki/Direct-IO). Direct IO is for non-buffered I/O which improves conduwuit performance, but at least FUSE is a filesystem potentially known to not like this. See the [example config](configuration.md) for disabling it if needed. Issues from Direct IO on unsupported filesystems are usually shown as startup errors.
- Use the `--execute "users make_user_admin <username>"` Continuwuity binary
+#### Database corruption
 argument once to invite yourslf to the admin room on startup
 - Use the Continuwuity console/CLI to run the `users make_user_admin` command
 - Or specify the `emergency_password` config option to allow you to temporarily
 log into the server account (`@conduit`) from a web client
-## General potential issues
+If your database is corrupted and is failing to start (e.g. checksum mismatch), it may be recoverable but careful steps must be taken, and there is no guarantee it may be recoverable.
 ### Potential DNS issues when using Docker
 Docker's DNS setup for containers in a non-default network intercepts queries to
 enable resolving of container hostnames to IP addresses. However, due to
 performance issues with Docker's built-in resolver, this can cause DNS queries
 to take a long time to resolve, resulting in federation issues.
 This is particularly common with Docker Compose, as custom networks are easily
 created and configured.
 Symptoms of this include excessively long room joins (30+ minutes) from very
 long DNS timeouts, log entries of "mismatching responding nameservers",
 and/or partial or non-functional inbound/outbound federation.
 This is not a bug in continuwuity. Docker's default DNS resolver is not suitable
 for heavy DNS activity, which is normal for federated protocols like Matrix.
 Workarounds:
 - Use DNS over TCP via the config option `query_over_tcp_only = true`
 - Bypass Docker's default DNS setup and instead allow the container to use and communicate with your host's DNS servers. Typically, this can be done by mounting the host's `/etc/resolv.conf`.
 ### DNS No connections available error message
 If you receive spurious amounts of error logs saying "DNS No connections
 available", this is due to your DNS server (servers from `/etc/resolv.conf`)
 being overloaded and unable to handle typical Matrix federation volume. Some
 users have reported that the upstream servers are rate-limiting them as well
 when they get this error (e.g. popular upstreams like Google DNS).
 Matrix federation is extremely heavy and sends wild amounts of DNS requests.
 Unfortunately this is by design and has only gotten worse with more
 server/destination resolution steps. Synapse also expects a very perfect DNS
 setup.
 There are some ways you can reduce the amount of DNS queries, but ultimately
 the best solution/fix is selfhosting a high quality caching DNS server like
 [Unbound][unbound-arch] without any upstream resolvers, and without DNSSEC
 validation enabled.
 DNSSEC validation is highly recommended to be **disabled** due to DNSSEC being
 very computationally expensive, and is extremely susceptible to denial of
 service, especially on Matrix. Many servers also strangely have broken DNSSEC
 setups and will result in non-functional federation.
 Continuwuity cannot provide a "works-for-everyone" Unbound DNS setup guide, but
 the [official Unbound tuning guide][unbound-tuning] and the [Unbound Arch Linux wiki page][unbound-arch]
 may be of interest. Disabling DNSSEC on Unbound is commenting out trust-anchors
 config options and removing the `validator` module.
 **Avoid** using `systemd-resolved` as it does **not** perform very well under
 high load, and we have identified its DNS caching to not be very effective.
 dnsmasq can possibly work, but it does **not** support TCP fallback which can be
 problematic when receiving large DNS responses such as from large SRV records.
 If you still want to use dnsmasq, make sure you **disable** `dns_tcp_fallback`
 in Continuwuity config.
 Raising `dns_cache_entries` in Continuwuity config from the default can also assist
 in DNS caching, but a full-fledged external caching resolver is better and more
 reliable.
 If you don't have IPv6 connectivity, changing `ip_lookup_strategy` to match
 your setup can help reduce unnecessary AAAA queries
 (`1 - Ipv4Only (Only query for A records, no AAAA/IPv6)`).
 If your DNS server supports it, some users have reported enabling
 `query_over_tcp_only` to force only TCP querying by default has improved DNS
 reliability at a slight performance cost due to TCP overhead.
 ## RocksDB / database issues
 ### Database corruption
 If your database is corrupted *and* is failing to start (e.g. checksum
 mismatch), it may be recoverable but careful steps must be taken, and there is
 no guarantee it may be recoverable.
 The first thing that can be done is launching Continuwuity with the
 `rocksdb_repair` config option set to true. This will tell RocksDB to attempt to
 repair itself at launch. If this does not work, disable the option and continue
 reading.
 RocksDB has the following recovery modes:
@ -110,84 +25,38 @@ RocksDB has the following recovery modes:
 - `PointInTime`
 - `SkipAnyCorruptedRecord`
-By default, Continuwuity uses `TolerateCorruptedTailRecords` as generally these may
+By default, conduwuit uses `TolerateCorruptedTailRecords` as generally these may be due to bad federation and we can re-fetch the correct data over federation. The RocksDB default is `PointInTime` which will attempt to restore a "snapshot" of the data when it was last known to be good. This data can be either a few seconds old, or multiple minutes prior. `PointInTime` may not be suitable for default usage due to clients and servers possibly not being able to handle sudden "backwards time travels", and `AbsoluteConsistency` may be too strict.
 be due to bad federation and we can re-fetch the correct data over federation.
 The RocksDB default is `PointInTime` which will attempt to restore a "snapshot"
 of the data when it was last known to be good. This data can be either a few
 seconds old, or multiple minutes prior. `PointInTime` may not be suitable for
 default usage due to clients and servers possibly not being able to handle
 sudden "backwards time travels", and `AbsoluteConsistency` may be too strict.
-`AbsoluteConsistency` will fail to start the database if any sign of corruption
+`AbsoluteConsistency` will fail to start the database if any sign of corruption is detected. `SkipAnyCorruptedRecord` will skip all forms of corruption unless it forbids the database from opening (e.g. too severe). Usage of `SkipAnyCorruptedRecord` voids any support as this may cause more damage and/or leave your database in a permanently inconsistent state, but it may do something if `PointInTime` does not work as a last ditch effort.
 is detected. `SkipAnyCorruptedRecord` will skip all forms of corruption unless
 it forbids the database from opening (e.g. too severe). Usage of
 `SkipAnyCorruptedRecord` voids any support as this may cause more damage and/or
 leave your database in a permanently inconsistent state, but it may do something
 if `PointInTime` does not work as a last ditch effort.
 With this in mind:
 - First start conduwuit with the `PointInTime` recovery method. See the [example config](configuration.md) for how to do this using `rocksdb_recovery_mode`
 - If your database successfully opens, clients are recommended to clear their client cache to account for the rollback
 - Leave your conduwuit running in `PointInTime` for at least 30-60 minutes so as much possible corruption is restored
 - If all goes will, you should be able to restore back to using `TolerateCorruptedTailRecords` and you have successfully recovered your database
- First start Continuwuity with the `PointInTime` recovery method. See the [example
+## Media
-config](configuration/examples.md) for how to do this using
+
-`rocksdb_recovery_mode`
+#### "File name too long"
- If your database successfully opens, clients are recommended to clear their
+
-client cache to account for the rollback
+If you are running into the "file name is too long" OS error for media requests, your filesystem cannot handle file name lengths >=255 characters. This is unfortuntely due to Conduit (upstream) using base64 for file name keys which is very problematic for some filesystems as the base64 input is untrusted and long file names or specific inputs can cause this. If you would like to avoid this, you may build conduwuit yourself with the `sha256_media` feature. **This will lose database compatibility with upstream**.
 - Leave your Continuwuity running in `PointInTime` for at least 30-60 minutes so as
 much possible corruption is restored
 - If all goes will, you should be able to restore back to using
 `TolerateCorruptedTailRecords` and you have successfully recovered your database
 ## Debugging
-Note that users should not really be debugging things. If you find yourself
+Note that users should not really be debugging things. If you find yourself debugging and find the issue, please let us know and/or how we can fix it. Various debug commands can be found in `!admin debug`.
 debugging and find the issue, please let us know and/or how we can fix it.
 Various debug commands can be found in `!admin debug`.
-### Debug/Trace log level
+#### Debug/Trace log level
-Continuwuity builds without debug or trace log levels at compile time by default
+conduwuit builds without debug or trace log levels by default for at least performance reasons. This may change in the future and/or binaries providing such configurations may be provided. If you need to access debug/trace log levels, you will need to build without the `release_max_log_level` feature.
 for substantial performance gains in CPU usage and improved compile times. If
 you need to access debug/trace log levels, you will need to build without the
 `release_max_log_level` feature or use our provided static debug binaries.
-### Changing log level dynamically
+#### Changing log level dynamically
-Continuwuity supports changing the tracing log environment filter on-the-fly using
+conduwuit supports changing the tracing log environment filter on-the-fly using the admin command `!admin debug change-log-level`. This accepts a string **without quotes** the same format as the `log` config option.
 the admin command `!admin debug change-log-level <log env filter>`. This accepts
 a string **without quotes** the same format as the `log` config option.
-Example: `!admin debug change-log-level debug`
+#### Pinging servers
-This can also accept complex filters such as:
+conduwuit can ping other servers using `!admin debug ping`. This takes a server name and goes through the server discovery process and queries `/_matrix/federation/v1/version`. Errors are outputted.
 `!admin debug change-log-level info,conduit_service[{dest="example.com"}]=trace,ruma_state_res=trace`
 `!admin debug change-log-level info,conduit_service[{dest="example.com"}]=trace,conduit_service[send{dest="example.org"}]=trace`
-And to reset the log level to the one that was set at startup / last config
+#### Allocator memory stats
 load, simply pass the `--reset` flag.
-`!admin debug change-log-level --reset`
+If using jemalloc (for now) and built with jemallocator's `stats` feature, you can see conduwuit's jemalloc memory stats by using `!admin debug memory-stats`
 ### Pinging servers
 Continuwuity can ping other servers using `!admin debug ping <server>`. This takes
 a server name and goes through the server discovery process and queries
 `/_matrix/federation/v1/version`. Errors are outputted.
 While it does measure the latency of the request, it is not indicative of
 server performance on either side as that endpoint is completely unauthenticated
 and simply fetches a string on a static JSON endpoint. It is very low cost both
 bandwidth and computationally.
 ### Allocator memory stats
 When using jemalloc with jemallocator's `stats` feature (`--enable-stats`), you
 can see Continuwuity's high-level allocator stats by using
 `!admin server memory-usage` at the bottom.
 If you are a developer, you can also view the raw jemalloc statistics with
 `!admin debug memory-stats`. Please note that this output is extremely large
 which may only be visible in the Continuwuity console CLI due to PDU size limits,
 and is not easy for non-developers to understand.
 [unbound-tuning]: https://unbound.docs.nlnetlabs.nl/en/latest/topics/core/performance.html
 [unbound-arch]: https://wiki.archlinux.org/title/Unbound
--- a/docs/turn.md
+++ b/docs/turn.md
@ -1,8 +1,6 @@
 # Setting up TURN/STURN
-In order to make or receive calls, a TURN server is required. Continuwuity suggests
+In order to make or receive calls, a TURN server is required. conduwuit suggests using [Coturn](https://github.com/coturn/coturn) for this purpose, which is also available as a Docker image.
 using [Coturn](https://github.com/coturn/coturn) for this purpose, which is also
 available as a Docker image.
 ### Configuration
@ -13,42 +11,32 @@ use-auth-secret
 static-auth-secret=<a secret key>
 realm=<your server domain>
 ```
 A common way to generate a suitable alphanumeric secret key is by using `pwgen -s 64 1`.
-A common way to generate a suitable alphanumeric secret key is by using `pwgen
+These same values need to be set in conduwuit. You can either modify conduwuit.toml to include these lines:
 -s 64 1`.
-These same values need to be set in Continuwuity. See the [example
+```
-config](configuration/examples.md) in the TURN section for configuring these and
+turn_uris = ["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]
-restart Continuwuity after.
+turn_secret = "<secret key from coturn configuration>"
 `turn_secret` or a path to `turn_secret_file` must have a value of your
 coturn `static-auth-secret`, or use `turn_username` and `turn_password`
 if using legacy username:password TURN authentication (not preferred).
 `turn_uris` must be the list of TURN URIs you would like to send to the client.
 Typically you will just replace the example domain `example.turn.uri` with the
 `realm` you set from the example config.
 If you are using TURN over TLS, you can replace `turn:` with `turns:` in the
 `turn_uris` config option to instruct clients to attempt to connect to
 TURN over TLS. This is highly recommended.
 If you need unauthenticated access to the TURN URIs, or some clients may be
 having trouble, you can enable `turn_guest_access` in Continuwuity which disables
 authentication for the TURN URI endpoint `/_matrix/client/v3/voip/turnServer`
 ### Run
 Run the [Coturn](https://hub.docker.com/r/coturn/coturn) image using
 ```bash
 docker run -d --network=host -v
 $(pwd)/coturn.conf:/etc/coturn/turnserver.conf coturn/coturn
 ```
-or docker-compose. For the latter, paste the following section into a file
+or append the following to the docker environment variables dependig on which configuration method you used earlier:
-called `docker-compose.yml` and run `docker compose up -d` in the same
+
-directory.
+```yml
 CONDUIT_TURN_URIS: '["turn:<your server domain>?transport=udp", "turn:<your server domain>?transport=tcp"]'
 CONDUIT_TURN_SECRET: "<secret key from coturn configuration>"
 ```
 Restart conduwuit to apply these changes.
 ### Run
 Run the [Coturn](https://hub.docker.com/r/coturn/coturn) image using
 ```bash
 docker run -d --network=host -v $(pwd)/coturn.conf:/etc/coturn/turnserver.conf coturn/coturn
 ```
 or docker-compose. For the latter, paste the following section into a file called `docker-compose.yml`
 and run `docker compose up -d` in the same directory.
 ```yml
 version: 3
@ -62,9 +50,6 @@ services:
        - ./coturn.conf:/etc/coturn/turnserver.conf
 ```
-To understand why the host networking mode is used and explore alternative
+To understand why the host networking mode is used and explore alternative configuration options, please visit [Coturn's Docker documentation](https://github.com/coturn/coturn/blob/master/docker/coturn/README.md).
 configuration options, please visit [Coturn's Docker
 documentation](https://github.com/coturn/coturn/blob/master/docker/coturn/README.md).
-For security recommendations see Synapse's [Coturn
+For security recommendations see Synapse's [Coturn documentation](https://element-hq.github.io/synapse/latest/turn-howto.html).
 documentation](https://element-hq.github.io/synapse/latest/turn-howto.html).
--- a/engage.toml
+++ b/engage.toml
@ -18,12 +18,12 @@ script = "direnv --version"
 [[task]]
 name = "rustc"
 group = "versions"
-script = "rustc --version -v"
+script = "rustc --version"
 [[task]]
 name = "cargo"
 group = "versions"
-script = "cargo --version -v"
+script = "cargo --version"
 [[task]]
 name = "cargo-fmt"
@ -55,34 +55,22 @@ name = "lychee"
 group = "versions"
 script = "lychee --version"
 [[task]]
 name = "markdownlint"
 group = "versions"
 script = "markdownlint --version"
 [[task]]
 name = "cargo-audit"
 group = "security"
-script = "cargo audit --color=always -D warnings -D unmaintained -D unsound -D yanked"
+script = "cargo audit -D warnings -D unmaintained -D unsound -D yanked --ignore RUSTSEC-2020-0016"
 [[task]]
 name = "cargo-fmt"
 group = "lints"
-script = """
+script = "cargo fmt --check -- --color=always"
 cargo fmt --check -- --color=always
 """
 [[task]]
 name = "cargo-doc"
 group = "lints"
 script = """
-env DIRENV_DEVSHELL=all-features \
+RUSTDOCFLAGS="-D warnings" cargo doc \
    RUSTDOCFLAGS="-D warnings" \
    direnv exec . \
    cargo doc \
    --workspace \
        --locked \
        --profile test \
    --all-features \
    --no-deps \
    --document-private-items \
@ -93,11 +81,9 @@ env DIRENV_DEVSHELL=all-features \
 name = "clippy/default"
 group = "lints"
 script = """
 direnv exec . \
 cargo clippy \
    --workspace \
-    --locked \
+    --all-targets \
    --profile test \
    --color=always \
    -- \
    -D warnings
@ -107,12 +93,9 @@ cargo clippy \
 name = "clippy/all"
 group = "lints"
 script = """
 env DIRENV_DEVSHELL=all-features \
    direnv exec . \
 cargo clippy \
    --workspace \
-        --locked \
+    --all-targets \
        --profile test \
    --all-features \
    --color=always \
    -- \
@ -120,32 +103,26 @@ env DIRENV_DEVSHELL=all-features \
 """
 [[task]]
-name = "clippy/no-features"
+name = "clippy/jemalloc"
 group = "lints"
 script = """
 env DIRENV_DEVSHELL=no-features \
    direnv exec . \
 cargo clippy \
    --workspace \
-        --locked \
+    --features jemalloc \
-        --profile test \
+    --all-targets \
        --no-default-features \
    --color=always \
    -- \
    -D warnings
 """
 [[task]]
-name = "clippy/other-features"
+name = "clippy/hardened_malloc"
 group = "lints"
 script = """
 direnv exec . \
 cargo clippy \
    --workspace \
-    --locked \
+    --features hardened_malloc \
-    --profile test \
+    --all-targets \
    --no-default-features \
    --features=console,systemd,element_hacks,direct_tls,perf_measurements,brotli_compression,blurhashing \
    --color=always \
    -- \
    -D warnings
@ -154,36 +131,17 @@ cargo clippy \
 [[task]]
 name = "lychee"
 group = "lints"
-script = "lychee --verbose --offline docs *.md --exclude development.md --exclude contributing.md --exclude testing.md"
+script = "lychee --verbose --offline docs *.md"
 [[task]]
-name = "markdownlint"
+name = "cargo"
 group = "lints"
 script = "markdownlint docs *.md || true" # TODO: fix the ton of markdown lints so we can drop `|| true`
 [[task]]
 name = "cargo/default"
 group = "tests"
 script = """
 env DIRENV_DEVSHELL=default \
    direnv exec . \
 cargo test \
    --workspace \
        --locked \
        --profile test \
    --all-targets \
-        --no-fail-fast \
+    --all-features \
    --color=always \
    -- \
    --color=always
 """
 # Checks if the generated example config differs from the checked in repo's
 # example config.
 [[task]]
 name = "example-config"
 group = "tests"
 depends = ["cargo/default"]
 script = """
 git diff --exit-code conduwuit-example.toml
 """
--- a/flake.lock
+++ b/flake.lock
@ -4,17 +4,16 @@
      "inputs": {
        "crane": "crane",
        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-utils": "flake-utils",
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1738524606,
+        "lastModified": 1711742460,
-        "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=",
+        "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
        "owner": "zhaofengli",
        "repo": "attic",
-        "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e",
+        "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
        "type": "github"
      },
      "original": {
@ -24,71 +23,18 @@
        "type": "github"
      }
    },
    "cachix": {
      "inputs": {
        "devenv": "devenv",
        "flake-compat": "flake-compat_2",
        "git-hooks": "git-hooks",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
        "lastModified": 1737621947,
        "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=",
        "owner": "cachix",
        "repo": "cachix",
        "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5",
        "type": "github"
      },
      "original": {
        "owner": "cachix",
        "ref": "master",
        "repo": "cachix",
        "type": "github"
      }
    },
    "cachix_2": {
      "inputs": {
        "devenv": [
          "cachix",
          "devenv"
        ],
        "flake-compat": [
          "cachix",
          "devenv"
        ],
        "git-hooks": [
          "cachix",
          "devenv"
        ],
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1728672398,
        "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=",
        "owner": "cachix",
        "repo": "cachix",
        "rev": "aac51f698309fd0f381149214b7eee213c66ef0a",
        "type": "github"
      },
      "original": {
        "owner": "cachix",
        "ref": "latest",
        "repo": "cachix",
        "type": "github"
      }
    },
    "complement": {
      "flake": false,
      "locked": {
-        "lastModified": 1741891349,
+        "lastModified": 1714472853,
-        "narHash": "sha256-YvrzOWcX7DH1drp5SGa+E/fc7wN3hqFtPbqPjZpOu1Q=",
+        "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=",
-        "owner": "girlbossceo",
+        "owner": "matrix-org",
        "repo": "complement",
-        "rev": "e587b3df569cba411aeac7c20b6366d03c143745",
+        "rev": "891d18872c153d39a9ce63b545045efddb845738",
        "type": "github"
      },
      "original": {
-        "owner": "girlbossceo",
+        "owner": "matrix-org",
        "ref": "main",
        "repo": "complement",
        "type": "github"
@ -102,11 +48,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722960479,
+        "lastModified": 1702918879,
-        "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
+        "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
+        "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb",
        "type": "github"
      },
      "original": {
@ -116,12 +62,17 @@
      }
    },
    "crane_2": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1739936662,
+        "lastModified": 1713738183,
-        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
+        "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
+        "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11",
        "type": "github"
      },
      "original": {
@ -131,37 +82,6 @@
        "type": "github"
      }
    },
    "devenv": {
      "inputs": {
        "cachix": "cachix_2",
        "flake-compat": [
          "cachix",
          "flake-compat"
        ],
        "git-hooks": [
          "cachix",
          "git-hooks"
        ],
        "nix": "nix",
        "nixpkgs": [
          "cachix",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1733323168,
        "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=",
        "owner": "cachix",
        "repo": "devenv",
        "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064",
        "type": "github"
      },
      "original": {
        "owner": "cachix",
        "repo": "devenv",
        "type": "github"
      }
    },
    "fenix": {
      "inputs": {
        "nixpkgs": [
@ -170,11 +90,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1740724364,
+        "lastModified": 1714544767,
-        "narHash": "sha256-D1jLIueJx1dPrP09ZZwTrPf4cubV+TsFMYbpYYTVj6A=",
+        "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "edf7d9e431cda8782e729253835f178a356d3aab",
+        "rev": "73124e1356bde9411b163d636b39fe4804b7ca45",
        "type": "github"
      },
      "original": {
@ -187,11 +107,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1673956053,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
        "type": "github"
      },
      "original": {
@ -203,27 +123,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1696426674,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
        "owner": "edolstra",
        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1733328505,
        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -233,60 +137,31 @@
        "type": "github"
      }
    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
          "attic",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1722555600,
        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "type": "github"
      }
    },
    "flake-parts_2": {
      "inputs": {
        "nixpkgs-lib": [
          "cachix",
          "devenv",
          "nix",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1712014858,
        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "type": "github"
      }
    },
    "flake-utils": {
      "locked": {
        "lastModified": 1667395993,
        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "flake-utils_2": {
      "inputs": {
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1710146030,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -296,132 +171,13 @@
        "type": "github"
      }
    },
    "git-hooks": {
      "inputs": {
        "flake-compat": [
          "cachix",
          "flake-compat"
        ],
        "gitignore": "gitignore",
        "nixpkgs": [
          "cachix",
          "nixpkgs"
        ],
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
        "lastModified": 1733318908,
        "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
        "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
        "type": "github"
      },
      "original": {
        "owner": "cachix",
        "repo": "git-hooks.nix",
        "type": "github"
      }
    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
          "cachix",
          "git-hooks",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1709087332,
        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
        "type": "github"
      }
    },
    "libgit2": {
      "flake": false,
      "locked": {
        "lastModified": 1697646580,
        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
        "owner": "libgit2",
        "repo": "libgit2",
        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
        "type": "github"
      },
      "original": {
        "owner": "libgit2",
        "repo": "libgit2",
        "type": "github"
      }
    },
    "liburing": {
      "flake": false,
      "locked": {
        "lastModified": 1740613216,
        "narHash": "sha256-NpPOBqNND3Qe9IwqYs0mJLGTmIx7e6FgUEBAnJ+1ZLA=",
        "owner": "axboe",
        "repo": "liburing",
        "rev": "e1003e496e66f9b0ae06674869795edf772d5500",
        "type": "github"
      },
      "original": {
        "owner": "axboe",
        "ref": "master",
        "repo": "liburing",
        "type": "github"
      }
    },
    "nix": {
      "inputs": {
        "flake-compat": [
          "cachix",
          "devenv"
        ],
        "flake-parts": "flake-parts_2",
        "libgit2": "libgit2",
        "nixpkgs": "nixpkgs_3",
        "nixpkgs-23-11": [
          "cachix",
          "devenv"
        ],
        "nixpkgs-regression": [
          "cachix",
          "devenv"
        ],
        "pre-commit-hooks": [
          "cachix",
          "devenv"
        ]
      },
      "locked": {
        "lastModified": 1727438425,
        "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=",
        "owner": "domenkozar",
        "repo": "nix",
        "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546",
        "type": "github"
      },
      "original": {
        "owner": "domenkozar",
        "ref": "devenv-2.24",
        "repo": "nix",
        "type": "github"
      }
    },
    "nix-filter": {
      "locked": {
-        "lastModified": 1731533336,
+        "lastModified": 1710156097,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
+        "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
        "owner": "numtide",
        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "rev": "3342559a24e85fc164b295c3444e8a139924675b",
        "type": "github"
      },
      "original": {
@ -431,34 +187,13 @@
        "type": "github"
      }
    },
    "nix-github-actions": {
      "inputs": {
        "nixpkgs": [
          "attic",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1729742964,
        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
        "owner": "nix-community",
        "repo": "nix-github-actions",
        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "nix-github-actions",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1726042813,
+        "lastModified": 1711401922,
-        "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=",
+        "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "159be5db480d1df880a0135ca0bfed84c2f88353",
+        "rev": "07262b18b97000d16a4bdb003418bd2fb067a932",
        "type": "github"
      },
      "original": {
@ -470,43 +205,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1724316499,
+        "lastModified": 1711460390,
-        "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
+        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
+        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-stable_2": {
      "locked": {
        "lastModified": 1730741070,
        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1730531603,
+        "lastModified": 1713537308,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
        "type": "github"
      },
      "original": {
@ -516,67 +235,19 @@
        "type": "github"
      }
    },
    "nixpkgs_3": {
      "locked": {
        "lastModified": 1717432640,
        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "release-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_4": {
      "locked": {
        "lastModified": 1733212471,
        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_5": {
      "locked": {
        "lastModified": 1740547748,
        "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "3a05eebede89661660945da1f151959900903b6a",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "rocksdb": {
      "flake": false,
      "locked": {
-        "lastModified": 1741308171,
+        "lastModified": 1714770052,
-        "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=",
+        "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=",
        "owner": "girlbossceo",
        "repo": "rocksdb",
-        "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986",
+        "rev": "db6df0b185774778457dabfcbd822cb81760cade",
        "type": "github"
      },
      "original": {
        "owner": "girlbossceo",
-        "ref": "v9.11.1",
+        "ref": "v9.1.1",
        "repo": "rocksdb",
        "type": "github"
      }
@ -584,26 +255,24 @@
    "root": {
      "inputs": {
        "attic": "attic",
        "cachix": "cachix",
        "complement": "complement",
        "crane": "crane_2",
        "fenix": "fenix",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "liburing": "liburing",
        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_2",
        "rocksdb": "rocksdb"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1740691488,
+        "lastModified": 1713628977,
-        "narHash": "sha256-Fs6vBrByuiOf2WO77qeMDMTXcTGzrIMqLBv+lNeywwM=",
+        "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "fe3eda77d3a7ce212388bda7b6cec8bffcc077e5",
+        "rev": "55d9a533b309119c8acd13061581b43ae8840823",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,295 +1,58 @@
 {
  inputs = {
    attic.url = "github:zhaofengli/attic?ref=main";
-    cachix.url = "github:cachix/cachix?ref=master";
+    complement = { url = "github:matrix-org/complement?ref=main"; flake = false; };
-    complement = { url = "github:girlbossceo/complement?ref=main"; flake = false; };
+    crane = { url = "github:ipetkov/crane?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; };
    crane = { url = "github:ipetkov/crane?ref=master"; };
    fenix = { url = "github:nix-community/fenix?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; };
    flake-compat = { url = "github:edolstra/flake-compat?ref=master"; flake = false; };
    flake-utils.url = "github:numtide/flake-utils?ref=main";
    nix-filter.url = "github:numtide/nix-filter?ref=main";
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
-    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.11.1"; flake = false; };
+    # https://github.com/girlbossceo/rocksdb/commit/db6df0b185774778457dabfcbd822cb81760cade
-    liburing = { url = "github:axboe/liburing?ref=master"; flake = false; };
+    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.1.1"; flake = false; };
  };
  outputs = inputs:
    inputs.flake-utils.lib.eachDefaultSystem (system:
    let
-      pkgsHost = import inputs.nixpkgs{
+      pkgsHost = inputs.nixpkgs.legacyPackages.${system};
        inherit system;
      };
      pkgsHostStatic = pkgsHost.pkgsStatic;
      # The Rust toolchain to use
      toolchain = inputs.fenix.packages.${system}.fromToolchainFile {
        file = ./rust-toolchain.toml;
        # See also `rust-toolchain.toml`
-        sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
+        sha256 = "sha256-+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8";
      };
-      mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
+      scope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: {
        inherit pkgs;
        book = self.callPackage ./nix/pkgs/book {};
        complement = self.callPackage ./nix/pkgs/complement {};
-        craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain));
+        craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain toolchain);
        inherit inputs;
        main = self.callPackage ./nix/pkgs/main {};
        oci-image = self.callPackage ./nix/pkgs/oci-image {};
-        tini = pkgs.tini.overrideAttrs {
+        rocksdb = pkgs.rocksdb.overrideAttrs (old: {
            # newer clang/gcc is unhappy with tini-static: <https://3.dog/~strawberry/pb/c8y4>
            patches = [ (pkgs.fetchpatch {
                url = "https://patch-diff.githubusercontent.com/raw/krallin/tini/pull/224.patch";
                hash = "sha256-4bTfAhRyIT71VALhHY13hUgbjLEUyvgkIJMt3w9ag3k=";
              })
            ];
        };
        liburing = pkgs.liburing.overrideAttrs {
          # Tests weren't building
          outputs = [ "out" "dev" "man" ];
          buildFlags = [ "library" ];
          src = inputs.liburing;
        };
        rocksdb = (pkgs.rocksdb.override {
          liburing = self.liburing;
        }).overrideAttrs (old: {
          src = inputs.rocksdb;
          version = pkgs.lib.removePrefix
            "v"
            (builtins.fromJSON (builtins.readFile ./flake.lock))
              .nodes.rocksdb.original.ref;
          # we have this already at https://github.com/girlbossceo/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155
          # unsetting this so i don't have to revert it and make this nix exclusive
          patches = [];
          cmakeFlags = pkgs.lib.subtractLists
            [
              # no real reason to have snappy or zlib, no one uses this
              "-DWITH_SNAPPY=1"
              "-DZLIB=1"
              "-DWITH_ZLIB=1"
              # we dont need to use ldb or sst_dump (core_tools)
              "-DWITH_CORE_TOOLS=1"
              # we dont need to build rocksdb tests
              "-DWITH_TESTS=1"
              # we use rust-rocksdb via C interface and dont need C++ RTTI
              "-DUSE_RTTI=1"
              # this doesn't exist in RocksDB, and USE_SSE is deprecated for
              # PORTABLE=$(march)
              "-DFORCE_SSE42=1"
              # PORTABLE will get set in main/default.nix
              "-DPORTABLE=1"
            ]
            old.cmakeFlags
            ++ [
              # no real reason to have snappy, no one uses this
              "-DWITH_SNAPPY=0"
              "-DZLIB=0"
              "-DWITH_ZLIB=0"
              # we dont need to use ldb or sst_dump (core_tools)
              "-DWITH_CORE_TOOLS=0"
              # we dont need trace tools
              "-DWITH_TRACE_TOOLS=0"
              # we dont need to build rocksdb tests
              "-DWITH_TESTS=0"
              # we use rust-rocksdb via C interface and dont need C++ RTTI
              "-DUSE_RTTI=0"
            ];
          # outputs has "tools" which we dont need or use
          outputs = [ "out" ];
          # preInstall hooks has stuff for messing with ldb/sst_dump which we dont need or use
          preInstall = "";
        });
      });
-      scopeHost = mkScope pkgsHost;
+      scopeHost = (scope pkgsHost);
      scopeHostStatic = mkScope pkgsHostStatic;
      scopeCrossLinux = mkScope pkgsHost.pkgsLinux.pkgsStatic;
      mkCrossScope = crossSystem:
        let pkgsCrossStatic = (import inputs.nixpkgs {
          inherit system;
          crossSystem = {
           config = crossSystem;
          };
        }).pkgsStatic;
         in
        mkScope pkgsCrossStatic;
      mkDevShell = scope: scope.pkgs.mkShell {
        env = scope.main.env // {
          # Rust Analyzer needs to be able to find the path to default crate
          # sources, and it can read this environment variable to do so. The
          # `rust-src` component is required in order for this to work.
          RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
          # Convenient way to access a pinned version of Complement's source
          # code.
          COMPLEMENT_SRC = inputs.complement.outPath;
          # Needed for Complement: <https://github.com/golang/go/issues/52690>
          CGO_CFLAGS = "-Wl,--no-gc-sections";
          CGO_LDFLAGS = "-Wl,--no-gc-sections";
        };
        # Development tools
        packages = [
          # Always use nightly rustfmt because most of its options are unstable
          #
          # This needs to come before `toolchain` in this list, otherwise
          # `$PATH` will have stable rustfmt instead.
          inputs.fenix.packages.${system}.latest.rustfmt
          toolchain
        ]
        ++ (with pkgsHost.pkgs; [
          # Required by hardened-malloc.rs dep
          binutils
          cargo-audit
          cargo-auditable
          # Needed for producing Debian packages
          cargo-deb
          # Needed for CI to check validity of produced Debian packages (dpkg-deb)
          dpkg
 	  engage
          # Needed for Complement
          go
          # Needed for our script for Complement
          jq
          gotestfmt
          # Needed for finding broken markdown links
          lychee
          # Needed for linting markdown files
          markdownlint-cli
          # Useful for editing the book locally
          mdbook
          # used for rust caching in CI to speed it up
          sccache
        ]
        # liburing is Linux-exclusive
        ++ lib.optional stdenv.hostPlatform.isLinux liburing
        ++ lib.optional stdenv.hostPlatform.isLinux numactl)
        ++ scope.main.buildInputs
        ++ scope.main.propagatedBuildInputs
        ++ scope.main.nativeBuildInputs;
      };
    in
    {
      packages = {
-        default = scopeHost.main.override {
+        default = scopeHost.main;
-            disable_features = [
+        jemalloc = scopeHost.main.override { features = ["jemalloc"]; };
                # dont include experimental features
                "experimental"
                # jemalloc profiling/stats features are expensive and shouldn't
                # be expected on non-debug builds.
                "jemalloc_prof"
                "jemalloc_stats"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
        };
        default-debug = scopeHost.main.override {
            profile = "dev";
            # debug build users expect full logs
            disable_release_max_log_level = true;
            disable_features = [
                # dont include experimental features
                "experimental"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
        };
        # just a test profile used for things like CI and complement
        default-test = scopeHost.main.override {
            profile = "test";
            disable_release_max_log_level = true;
            disable_features = [
                # dont include experimental features
                "experimental"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
        };
        all-features = scopeHost.main.override {
            all_features = true;
            disable_features = [
                # dont include experimental features
                "experimental"
                # jemalloc profiling/stats features are expensive and shouldn't
                # be expected on non-debug builds.
                "jemalloc_prof"
                "jemalloc_stats"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
        };
        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 = [
                # dont include experimental features
                "experimental"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
        };
        hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; };
        oci-image = scopeHost.oci-image;
-        oci-image-all-features = scopeHost.oci-image.override {
+        oci-image-jemalloc = scopeHost.oci-image.override {
          main = scopeHost.main.override {
-            all_features = true;
+            features = ["jemalloc"];
            disable_features = [
                # dont include experimental features
                "experimental"
                # jemalloc profiling/stats features are expensive and shouldn't
                # be expected on non-debug builds.
                "jemalloc_prof"
                "jemalloc_stats"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
          };
        };
        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 = [
                # dont include experimental features
                "experimental"
                # this is non-functional on nix for some reason
                "hardened_malloc"
                # conduwuit_mods is a development-only hot reload feature
                "conduwuit_mods"
            ];
          };
        };
        oci-image-hmalloc = scopeHost.oci-image.override {
@ -301,9 +64,6 @@
        book = scopeHost.book;
        complement = scopeHost.complement;
        static-complement = scopeHostStatic.complement;
        # macOS containers don't exist, so the complement images must be forced to linux
        linux-complement = (mkCrossScope "${pkgsHost.hostPlatform.qemuArch}-linux-musl").complement;
      }
      //
      builtins.listToAttrs
@ -312,7 +72,14 @@
            (crossSystem:
              let
                binaryName = "static-${crossSystem}";
-                scopeCrossStatic = mkCrossScope crossSystem;
+                pkgsCrossStatic =
                  (import inputs.nixpkgs {
                    inherit system;
                    crossSystem = {
                      config = crossSystem;
                    };
                  }).pkgsStatic;
                scopeCrossStatic = scope pkgsCrossStatic;
              in
              [
                # An output for a statically-linked binary
@ -321,101 +88,11 @@
                  value = scopeCrossStatic.main;
                }
-                # An output for a statically-linked binary with x86_64 haswell
+                # An output for a statically-linked binary with jemalloc
                # target optimisations
                {
-                  name = "${binaryName}-x86_64-haswell-optimised";
+                  name = "${binaryName}-jemalloc";
                  value = scopeCrossStatic.main.override {
-                    x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false);
+                    features = ["jemalloc"];
                  };
                }
                # 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;
                    disable_features = [
                        # dont include experimental features
                        "experimental"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                    ];
                  };
                }
                # An output for a statically-linked binary with `--all-features`
                {
                  name = "${binaryName}-all-features";
                  value = scopeCrossStatic.main.override {
                    all_features = true;
                    disable_features = [
                        # dont include experimental features
                        "experimental"
                        # jemalloc profiling/stats features are expensive and shouldn't
                        # be expected on non-debug builds.
                        "jemalloc_prof"
                        "jemalloc_stats"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                    ];
                  };
                }
                # An output for a statically-linked binary with `--all-features` and with x86_64 haswell
                # target optimisations
                {
                  name = "${binaryName}-all-features-x86_64-haswell-optimised";
                  value = scopeCrossStatic.main.override {
                    all_features = true;
                    disable_features = [
                        # dont include experimental features
                        "experimental"
                        # jemalloc profiling/stats features are expensive and shouldn't
                        # be expected on non-debug builds.
                        "jemalloc_prof"
                        "jemalloc_stats"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                    ];
                    x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false);
                  };
                }
                # 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 = [
                        # dont include experimental features
                        "experimental"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                    ];
                  };
                }
@ -433,92 +110,12 @@
                  value = scopeCrossStatic.oci-image;
                }
-                # An output for an OCI image based on that binary with x86_64 haswell
+                # An output for an OCI image based on that binary with jemalloc
                # target optimisations
                {
-                  name = "oci-image-${crossSystem}-x86_64-haswell-optimised";
+                  name = "oci-image-${crossSystem}-jemalloc";
                  value = scopeCrossStatic.oci-image.override {
                    main = scopeCrossStatic.main.override {
-                      x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false);
+                      features = ["jemalloc"];
                    };
                  };
                }
                # 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";
                  value = scopeCrossStatic.oci-image.override {
                    main = scopeCrossStatic.main.override {
                      all_features = true;
                      disable_features = [
                        # dont include experimental features
                        "experimental"
                        # jemalloc profiling/stats features are expensive and shouldn't
                        # be expected on non-debug builds.
                        "jemalloc_prof"
                        "jemalloc_stats"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                      ];
                    };
                  };
                }
                # An output for an OCI image based on that binary with `--all-features` and with x86_64 haswell
                # target optimisations
                {
                  name = "oci-image-${crossSystem}-all-features-x86_64-haswell-optimised";
                  value = scopeCrossStatic.oci-image.override {
                    main = scopeCrossStatic.main.override {
                      all_features = true;
                      disable_features = [
                        # dont include experimental features
                        "experimental"
                        # jemalloc profiling/stats features are expensive and shouldn't
                        # be expected on non-debug builds.
                        "jemalloc_prof"
                        "jemalloc_stats"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                      ];
                      x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false);
                    };
                  };
                }
                # 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 = [
                        # dont include experimental features
                        "experimental"
                        # this is non-functional on nix for some reason
                        "hardened_malloc"
                        # conduwuit_mods is a development-only hot reload feature
                        "conduwuit_mods"
                      ];
                    };
                  };
                }
@ -532,47 +129,63 @@
                    };
                  };
                }
                # An output for a complement OCI image for the specified platform
                {
                  name = "complement-${crossSystem}";
                  value = scopeCrossStatic.complement;
                }
              ]
            )
            [
-              #"x86_64-apple-darwin"
+              "x86_64-unknown-linux-musl"
-              #"aarch64-apple-darwin"
+              "aarch64-unknown-linux-musl"
              "x86_64-linux-gnu"
              "x86_64-linux-musl"
              "aarch64-linux-musl"
            ]
          )
        );
-      devShells.default = mkDevShell scopeHostStatic;
+      devShells.default = pkgsHost.mkShell {
-      devShells.all-features = mkDevShell
+        env = scopeHost.main.env // {
-        (scopeHostStatic.overrideScope (final: prev: {
+          # Rust Analyzer needs to be able to find the path to default crate
-          main = prev.main.override {
+          # sources, and it can read this environment variable to do so. The
-            all_features = true;
+          # `rust-src` component is required in order for this to work.
-            disable_features = [
+          RUST_SRC_PATH = "${toolchain}/lib/rustlib/src/rust/library";
-                # dont include experimental features
+
-                "experimental"
+          # Convenient way to access a pinned version of Complement's source
-                # jemalloc profiling/stats features are expensive and shouldn't
+          # code.
-                # be expected on non-debug builds.
+          COMPLEMENT_SRC = inputs.complement.outPath;
-                "jemalloc_prof"
+        };
-                "jemalloc_stats"
+
-                # this is non-functional on nix for some reason
+        # Development tools
-                "hardened_malloc"
+        packages = [
-                # conduwuit_mods is a development-only hot reload feature
+          # Always use nightly rustfmt because most of its options are unstable
-                "conduwuit_mods"
+          #
-            ];
+          # This needs to come before `toolchain` in this list, otherwise
          # `$PATH` will have stable rustfmt instead.
          inputs.fenix.packages.${system}.latest.rustfmt
          toolchain
        ]
        ++ (with pkgsHost; [
          engage
          cargo-audit
          # Needed for producing Debian packages
          cargo-deb
          # Needed for Complement
          go
          olm
          # Needed for our script for Complement
          jq
          # Needed for finding broken markdown links
          lychee
          # Useful for editing the book locally
          mdbook
        ])
        ++ (if !pkgsHost.stdenv.isDarwin then [
            # Needed for building with io_uring
            pkgsHost.liburing
        ] else [])
        ++
        scopeHost.main.nativeBuildInputs;
      };
        }));
      devShells.no-features = mkDevShell
        (scopeHostStatic.overrideScope (final: prev: {
          main = prev.main.override { default_features = false; };
        }));
      devShells.dynamic = mkDevShell scopeHost;
    });
 }
--- a/nix/pkgs/book/default.nix
+++ b/nix/pkgs/book/default.nix
@ -14,15 +14,10 @@ stdenv.mkDerivation {
    include = [
      "book.toml"
      "conduwuit-example.toml"
      "CODE_OF_CONDUCT.md"
      "CONTRIBUTING.md"
      "README.md"
      "development.md"
      "debian/conduwuit.service"
      "debian/README.md"
      "arch/conduwuit.service"
      "docs"
      "theme"
    ];
  };
@ -31,6 +26,7 @@ stdenv.mkDerivation {
  ];
  buildPhase = ''
-    mdbook build -d $out
+    mdbook build
    mv public $out
  '';
 }
--- a/nix/pkgs/complement/certificate.crt
+++ b/nix/pkgs/complement/certificate.crt
@ -1,21 +0,0 @@
 -----BEGIN CERTIFICATE-----
 MIIDfzCCAmegAwIBAgIUcrZdSPmCh33Evys/U6mTPpShqdcwDQYJKoZIhvcNAQEL
 BQAwPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQKDAx3b29mZXJz
 IGluYy4xDDAKBgNVBAMMA2hzMTAgFw0yNTAzMTMxMjU4NTFaGA8yMDUyMDcyODEy
 NTg1MVowPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQKDAx3b29m
 ZXJzIGluYy4xDDAKBgNVBAMMA2hzMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBANL+h2ZmK/FqN5uLJPtIy6Feqcyb6EX7MQBEtxuJ56bTAbjHuCLZLpYt
 /wOWJ91drHqZ7Xd5iTisGdMu8YS803HSnHkzngf4VXKhVrdzW2YDrpZRxmOhtp88
 awOHmP7mqlJyBbCOQw8aDVrT0KmEIWzA7g+nFRQ5Ff85MaP+sQrHGKZbo61q8HBp
 L0XuaqNckruUKtxnEqrm5xx5sYyYKg7rrSFE5JMFoWKB1FNWJxyWT42BhGtnJZsK
 K5c+NDSOU4TatxoN6mpNSBpCz/a11PiQHMEfqRk6JA4g3911dqPTfZBevUdBh8gl
 8maIzqeZGhvyeKTmull1Y0781yyuj98CAwEAAaNxMG8wCQYDVR0TBAIwADALBgNV
 HQ8EBAMCBPAwNgYDVR0RBC8wLYIRKi5kb2NrZXIuaW50ZXJuYWyCA2hzMYIDaHMy
 ggNoczOCA2hzNIcEfwAAATAdBgNVHQ4EFgQUr4VYrmW1d+vjBTJewvy7fJYhLDYw
 DQYJKoZIhvcNAQELBQADggEBADkYqkjNYxjWX8hUUAmFHNdCwzT1CpYe/5qzLiyJ
 irDSdMlC5g6QqMUSrpu7nZxo1lRe1dXGroFVfWpoDxyCjSQhplQZgtYqtyLfOIx+
 HQ7cPE/tUU/KsTGc0aL61cETB6u8fj+rQKUGdfbSlm0Rpu4v0gC8RnDj06X/hZ7e
 VkWU+dOBzxlqHuLlwFFtVDgCyyTatIROx5V+GpMHrVqBPO7HcHhwqZ30k2kMM8J3
 y1CWaliQM85jqtSZV+yUHKQV8EksSowCFJuguf+Ahz0i0/koaI3i8m4MRN/1j13d
 jbTaX5a11Ynm3A27jioZdtMRty6AJ88oCp18jxVzqTxNNO4=
 -----END CERTIFICATE-----
--- a/nix/pkgs/complement/config.toml
+++ b/nix/pkgs/complement/config.toml
@ -5,46 +5,15 @@ allow_guest_registration = true
 allow_public_room_directory_over_federation = true
 allow_public_room_directory_without_auth = true
 allow_registration = true
 allow_unstable_room_versions = true
 database_backend = "rocksdb"
 database_path = "/database"
-log = "trace,h2=debug,hyper=debug"
+log = "trace"
 port = [8008, 8448]
 trusted_servers = []
 only_query_trusted_key_servers = false
 query_trusted_key_servers_first = false
 query_trusted_key_servers_first_on_join = false
 yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true
 ip_range_denylist = []
 url_preview_domain_contains_allowlist = ["*"]
 url_preview_domain_explicit_denylist = ["*"]
 media_compat_file_link = false
 media_startup_check = true
 prune_missing_media = true
 log_colors = true
 admin_room_notices = false
 allow_check_for_updates = false
 intentionally_unknown_config_option_for_testing = true
 rocksdb_log_level = "info"
 rocksdb_max_log_files = 1
 rocksdb_recovery_mode = 0
 rocksdb_paranoid_file_checks = true
 log_guest_registrations = false
 allow_legacy_media = true
 startup_netburst = true
 startup_netburst_keep = -1
 allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure = true
 # valgrind makes things so slow
 dns_timeout = 60
 dns_attempts = 20
 request_conn_timeout = 60
 request_timeout = 120
 well_known_conn_timeout = 60
 well_known_timeout = 60
 federation_idle_timeout = 300
 sender_timeout = 300
 sender_idle_timeout = 300
 sender_retry_backoff_limit = 300
 [global.tls]
 certs = "/certificate.crt"
 dual_protocol = true
 key = "/private_key.key"
--- a/nix/pkgs/complement/default.nix
+++ b/nix/pkgs/complement/default.nix
@ -3,8 +3,10 @@
 , buildEnv
 , coreutils
 , dockerTools
 , gawk
 , lib
 , main
 , openssl
 , stdenv
 , tini
 , writeShellScriptBin
@ -12,43 +14,46 @@
 let
  main' = main.override {
-    profile = "test";
+    profile = "dev";
-    all_features = true;
+    features = ["axum_dual_protocol"];
    disable_release_max_log_level = true;
    disable_features = [
        # console/CLI stuff isn't used or relevant for complement
        "console"
        "tokio_console"
        # sentry telemetry isn't useful for complement, disabled by default anyways
        "sentry_telemetry"
        "perf_measurements"
        # this is non-functional on nix for some reason
        "hardened_malloc"
        # dont include experimental features
        "experimental"
        # compression isn't needed for complement
        "brotli_compression"
        "gzip_compression"
        "zstd_compression"
        # complement doesn't need hot reloading
        "conduwuit_mods"
        # complement doesn't have URL preview media tests
        "url_preview"
    ];
  };
  start = writeShellScriptBin "start" ''
    set -euxo pipefail
    ${lib.getExe openssl} genrsa -out private_key.key 2048
    ${lib.getExe openssl} req \
      -new \
      -sha256 \
      -key private_key.key \
      -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=$SERVER_NAME" \
      -out signing_request.csr
    cp ${./v3.ext} v3.ext
    echo "DNS.1 = $SERVER_NAME" >> v3.ext
    echo "IP.1 = $(${lib.getExe gawk} 'END{print $1}' /etc/hosts)" \
      >> v3.ext
    ${lib.getExe openssl} x509 \
      -req \
      -extfile v3.ext \
      -in signing_request.csr \
      -CA /complement/ca/ca.crt \
      -CAkey /complement/ca/ca.key \
      -CAcreateserial \
      -out certificate.crt \
      -days 1 \
      -sha256
    ${lib.getExe' coreutils "env"} \
-      CONDUWUIT_SERVER_NAME="$SERVER_NAME" \
+      CONDUIT_SERVER_NAME="$SERVER_NAME" \
      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8448" \
      CONDUIT_WELL_KNOWN_SERVER="$SERVER_NAME:8008" \
      ${lib.getExe main'}
  '';
 in
 dockerTools.buildImage {
-  name = "complement-conduwuit";
+  name = "complement-${main.pname}";
-  tag = "main";
+  tag = "dev";
  copyToRoot = buildEnv {
    name = "root";
@ -68,17 +73,15 @@ dockerTools.buildImage {
      "${lib.getExe start}"
    ];
-    Entrypoint = if !stdenv.hostPlatform.isDarwin
+    Entrypoint = if !stdenv.isDarwin
      # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
      # are handled as expected
      then [ "${lib.getExe' tini "tini"}" "--" ]
      else [];
    Env = [
-      "CONDUWUIT_TLS__KEY=${./private_key.key}"
+      "SSL_CERT_FILE=/complement/ca/ca.crt"
-      "CONDUWUIT_TLS__CERTS=${./certificate.crt}"
+      "CONDUIT_CONFIG=${./config.toml}"
      "CONDUWUIT_CONFIG=${./config.toml}"
      "RUST_BACKTRACE=full"
    ];
    ExposedPorts = {
--- a/nix/pkgs/complement/private_key.key
+++ b/nix/pkgs/complement/private_key.key
@ -1,28 +0,0 @@
 -----BEGIN PRIVATE KEY-----
 MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDS/odmZivxajeb
 iyT7SMuhXqnMm+hF+zEARLcbieem0wG4x7gi2S6WLf8DlifdXax6me13eYk4rBnT
 LvGEvNNx0px5M54H+FVyoVa3c1tmA66WUcZjobafPGsDh5j+5qpScgWwjkMPGg1a
 09CphCFswO4PpxUUORX/OTGj/rEKxximW6OtavBwaS9F7mqjXJK7lCrcZxKq5ucc
 ebGMmCoO660hROSTBaFigdRTVicclk+NgYRrZyWbCiuXPjQ0jlOE2rcaDepqTUga
 Qs/2tdT4kBzBH6kZOiQOIN/ddXaj032QXr1HQYfIJfJmiM6nmRob8nik5rpZdWNO
 /Ncsro/fAgMBAAECggEAITCCkfv+a5I+vwvrPE/eIDso0JOxvNhfg+BLQVy3AMnu
 WmeoMmshZeREWgcTrEGg8QQnk4Sdrjl8MnkO6sddJ2luza3t7OkGX+q7Hk5aETkB
 DIo+f8ufU3sIhlydF3OnVSK0fGpUaBq8AQ6Soyeyrk3G5NVufmjgae5QPbDBnqUb
 piOGyfcwagL4JtCbZsMk8AT7vQSynLm6zaWsVzWNd71jummLqtVV063K95J9PqVN
 D8meEcP3WR5kQrvf+mgy9RVgWLRtVWN8OLZfJ9yrnl4Efj62elrldUj4jaCFezGQ
 8f0W+d8jjt038qhmEdymw2MWQ+X/b0R79lJar1Up8QKBgQD1DtHxauhl+JUoI3y+
 3eboqXl7YPJt1/GTnChb4b6D1Z1hvLsOKUa7hjGEfruYGbsWXBCRMICdfzp+iWcq
 /lEOp7/YU9OaW4lQMoG4sXMoBWd9uLgg0E+aH6VDJOBvxsfafqM4ufmtspzwEm90
 FU1cq6oImomFnPChSq4X+3+YpwKBgQDcalaK9llCcscWA8HAP8WVVNTjCOqiDp9q
 td61E9IO/FIB/gW5y+JkaFRrA2CN1zY3s3K92uveLTNYTArecWlDcPNNFDuaYu2M
 Roz4bC104HGh+zztJ0iPVzELL81Lgg6wHhLONN+eVi4gTftJxzJFXybyb+xVT25A
 91ynKXB+CQKBgQC+Ub43MoI+/6pHvBfb3FbDByvz6D0flgBmVXb6tP3TQYmzKHJV
 8zSd2wCGGC71V7Z3DRVIzVR1/SOetnPLbivhp+JUzfWfAcxI3pDksdvvjxLrDxTh
 VycbWcxtsywjY0w/ou581eLVRcygnpC0pP6qJCAwAmUfwd0YRvmiYo6cLQKBgHIW
 UIlJDdaJFmdctnLOD3VGHZMOUHRlYTqYvJe5lKbRD5mcZFZRI/OY1Ok3LEj+tj+K
 kL+YizHK76KqaY3N4hBYbHbfHCLDRfWvptQHGlg+vFJ9eoG+LZ6UIPyLV5XX0cZz
 KoS1dXG9Zc6uznzXsDucDsq6B/f4TzctUjXsCyARAoGAOKb4HtuNyYAW0jUlujR7
 IMHwUesOGlhSXqFtP9aTvk6qJgvV0+3CKcWEb4y02g+uYftP8BLNbJbIt9qOqLYh
 tOVyzCoamAi8araAhjA0w4dXvqDCDK7k/gZFkojmKQtRijoxTHnWcDc3vAjYCgaM
 9MVtdgSkuh2gwkD/mMoAJXM=
 -----END PRIVATE KEY-----
--- a/nix/pkgs/complement/signing_request.csr
+++ b/nix/pkgs/complement/signing_request.csr
@ -1,16 +0,0 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIChDCCAWwCAQAwPzELMAkGA1UEBhMCNjkxCzAJBgNVBAgMAjQyMRUwEwYDVQQK
 DAx3b29mZXJzIGluYy4xDDAKBgNVBAMMA2hzMTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBANL+h2ZmK/FqN5uLJPtIy6Feqcyb6EX7MQBEtxuJ56bTAbjH
 uCLZLpYt/wOWJ91drHqZ7Xd5iTisGdMu8YS803HSnHkzngf4VXKhVrdzW2YDrpZR
 xmOhtp88awOHmP7mqlJyBbCOQw8aDVrT0KmEIWzA7g+nFRQ5Ff85MaP+sQrHGKZb
 o61q8HBpL0XuaqNckruUKtxnEqrm5xx5sYyYKg7rrSFE5JMFoWKB1FNWJxyWT42B
 hGtnJZsKK5c+NDSOU4TatxoN6mpNSBpCz/a11PiQHMEfqRk6JA4g3911dqPTfZBe
 vUdBh8gl8maIzqeZGhvyeKTmull1Y0781yyuj98CAwEAAaAAMA0GCSqGSIb3DQEB
 CwUAA4IBAQDR/gjfxN0IID1MidyhZB4qpdWn3m6qZnEQqoTyHHdWalbfNXcALC79
 ffS+Smx40N5hEPvqy6euR89N5YuYvt8Hs+j7aWNBn7Wus5Favixcm2JcfCTJn2R3
 r8FefuSs2xGkoyGsPFFcXE13SP/9zrZiwvOgSIuTdz/Pbh6GtEx7aV4DqHJsrXnb
 XuPxpQleoBqKvQgSlmaEBsJg13TQB+Fl2foBVUtqAFDQiv+RIuircf0yesMCKJaK
 MPH4Oo+r3pR8lI8ewfJPreRhCoV+XrGYMubaakz003TJ1xlOW8M+N9a6eFyMVh76
 U1nY/KP8Ua6Lgaj9PRz7JCRzNoshZID/
 -----END CERTIFICATE REQUEST-----
--- a/nix/pkgs/complement/v3.ext
+++ b/nix/pkgs/complement/v3.ext
@ -4,9 +4,3 @@ keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
 subjectAltName = @alt_names
 [alt_names]
 DNS.1 = *.docker.internal
 DNS.2 = hs1
 DNS.3 = hs2
 DNS.4 = hs3
 DNS.5 = hs4
 IP.1 = 127.0.0.1
--- a/nix/pkgs/main/cross-compilation-env.nix
+++ b/nix/pkgs/main/cross-compilation-env.nix
@ -22,13 +22,25 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
          [ "-C" "relocation-model=static" ]
        ++ lib.optionals
          (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
          [ "-l" "c" ]
        ++ lib.optionals
          # This check has to match the one [here][0]. We only need to set
          # these flags when using a different linker. Don't ask me why,
          # though, because I don't know. All I know is it breaks otherwise.
          #
          # [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L37-L40
          (
            # Nixpkgs doesn't check for x86_64 here but we do, because I
            # observed a failure building statically for x86_64 without
            # including it here. Linkers are weird.
            (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
              && stdenv.hostPlatform.isStatic
              && !stdenv.isDarwin
              && !stdenv.cc.bintools.isLLVM
          )
          [
            "-l"
            "c"
            "-l"
            "stdc++"
            "-L"
            "${stdenv.cc.cc.lib}/${stdenv.hostPlatform.config}/lib"
          ]
@ -40,7 +52,7 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
 # even covers the case of build scripts that need native code compiled and
 # run on the build platform (I think).
 #
-# [0]: https://github.com/NixOS/nixpkgs/blob/nixpkgs-unstable/pkgs/build-support/rust/lib/default.nix#L48-L68
+# [0]: https://github.com/NixOS/nixpkgs/blob/5cdb38bb16c6d0a38779db14fcc766bc1b2394d6/pkgs/build-support/rust/lib/default.nix#L57-L80
 //
 (
  let
@ -56,7 +68,8 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
      {
        "CC_${cargoEnvVarTarget}" = envVars.ccForTarget;
        "CXX_${cargoEnvVarTarget}" = envVars.cxxForTarget;
-        "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.ccForTarget;
+        "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" =
          envVars.linkerForTarget;
      }
    )
  //
@ -67,7 +80,7 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
    {
      "CC_${cargoEnvVarTarget}" = envVars.ccForHost;
      "CXX_${cargoEnvVarTarget}" = envVars.cxxForHost;
-      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.ccForHost;
+      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForHost;
      CARGO_BUILD_TARGET = rustcTarget;
    }
  )
@ -79,7 +92,7 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic {
    {
      "CC_${cargoEnvVarTarget}" = envVars.ccForBuild;
      "CXX_${cargoEnvVarTarget}" = envVars.cxxForBuild;
-      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.ccForBuild;
+      "CARGO_TARGET_${cargoEnvVarTarget}_LINKER" = envVars.linkerForBuild;
      HOST_CC = "${pkgsBuildHost.stdenv.cc}/bin/cc";
      HOST_CXX = "${pkgsBuildHost.stdenv.cc}/bin/c++";
    }
--- a/nix/pkgs/main/default.nix
+++ b/nix/pkgs/main/default.nix
@ -1,120 +1,27 @@
 # Dependencies (keep sorted)
 { craneLib
 , inputs
 , jq
 , lib
 , libiconv
 , liburing
 , pkgsBuildHost
 , rocksdb
 , removeReferencesTo
 , rust
 , rust-jemalloc-sys
 , stdenv
 # Options (keep sorted)
 , all_features ? false
 , default_features ? true
 # default list of disabled features
 , disable_features ? [
  # dont include experimental features
  "experimental"
  # jemalloc profiling/stats features are expensive and shouldn't
  # be expected on non-debug builds.
  "jemalloc_prof"
  "jemalloc_stats"
  # this is non-functional on nix for some reason
  "hardened_malloc"
  # conduwuit_mods is a development-only hot reload feature
  "conduwuit_mods"
 ]
 , disable_release_max_log_level ? false
 , features ? []
 , profile ? "release"
 # rocksdb compiled with -march=haswell and target-cpu=haswell rustflag
 # haswell is pretty much any x86 cpu made in the last 12 years, and
 # supports modern CPU extensions that rocksdb can make use of.
 # disable if trying to make a portable x86_64 build for very old hardware
 , x86_64_haswell_target_optimised ? false
 }:
 let
 # We perform default-feature unification in nix, because some of the dependencies
 # on the nix side depend on feature values.
 crateFeatures = path:
  let manifest = lib.importTOML "${path}/Cargo.toml"; in
  lib.remove "default" (lib.attrNames manifest.features);
 crateDefaultFeatures = path:
  (lib.importTOML "${path}/Cargo.toml").features.default;
 allDefaultFeatures = crateDefaultFeatures "${inputs.self}/src/main";
 allFeatures = crateFeatures "${inputs.self}/src/main";
 features' = lib.unique
  (features ++
    lib.optionals default_features allDefaultFeatures ++
    lib.optionals all_features allFeatures);
 disable_features' = disable_features ++ lib.optionals disable_release_max_log_level ["release_max_log_level"];
 features'' = lib.subtractLists disable_features' features';
 featureEnabled = feature : builtins.elem feature features'';
 enableLiburing = featureEnabled "io_uring" && !stdenv.hostPlatform.isDarwin;
 # This derivation will set the JEMALLOC_OVERRIDE variable, causing the
 # tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's
 # own. In order for this to work, we need to set flags on the build that match
 # whatever flags tikv-jemalloc-sys was going to use. These are dependent on
 # which features we enable in tikv-jemalloc-sys.
 rust-jemalloc-sys' = (rust-jemalloc-sys.override {
  # tikv-jemalloc-sys/unprefixed_malloc_on_supported_platforms feature
  unprefixed = true;
 }).overrideAttrs (old: {
  configureFlags = old.configureFlags ++
    # 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" ++
    # tikv-jemalloc-sys/stats feature
    (if (featureEnabled "jemalloc_stats") then [ "--enable-stats" ] else [ "--disable-stats" ]);
 });
 buildDepsOnlyEnv =
  let
-    rocksdb' = (rocksdb.override {
+    rocksdb' = rocksdb.override {
-      jemalloc = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys';
+      enableJemalloc = builtins.elem "jemalloc" features;
-      # rocksdb fails to build with prefixed jemalloc, which is required on
+    };
      # darwin due to [1]. In this case, fall back to building rocksdb with
      # libc malloc. This should not cause conflicts, because all of the
      # jemalloc symbols are prefixed.
      #
      # [1]: https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs#L17
      enableJemalloc = featureEnabled "jemalloc" && !stdenv.hostPlatform.isDarwin;
      # for some reason enableLiburing in nixpkgs rocksdb is default true
      # which breaks Darwin entirely
      enableLiburing = enableLiburing;
    }).overrideAttrs (old: {
      enableLiburing = enableLiburing;
      cmakeFlags = (if x86_64_haswell_target_optimised then (lib.subtractLists [
        # dont make a portable build if x86_64_haswell_target_optimised is enabled
        "-DPORTABLE=1"
      ] old.cmakeFlags
      ++ [ "-DPORTABLE=haswell" ]) else ([ "-DPORTABLE=1" ])
      )
      ++ old.cmakeFlags;
      # outputs has "tools" which we dont need or use
      outputs = [ "out" ];
      # preInstall hooks has stuff for messing with ldb/sst_dump which we dont need or use
      preInstall = "";
    });
  in
  {
    # https://crane.dev/faq/rebuilds-bindgen.html
    NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
    CARGO_PROFILE = profile;
    ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
    ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
@ -131,16 +38,7 @@ buildDepsOnlyEnv =
 buildPackageEnv = {
  CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or "";
-} // buildDepsOnlyEnv // {
+} // buildDepsOnlyEnv;
  # Only needed in static stdenv because these are transitive dependencies of rocksdb
  CARGO_BUILD_RUSTFLAGS = buildDepsOnlyEnv.CARGO_BUILD_RUSTFLAGS
    + lib.optionalString (enableLiburing && stdenv.hostPlatform.isStatic)
      " -L${lib.getLib liburing}/lib -luring"
    + lib.optionalString x86_64_haswell_target_optimised
      " -Ctarget-cpu=haswell";
 };
 commonAttrs = {
  inherit
@ -155,46 +53,20 @@ commonAttrs = {
      # Keep sorted
      include = [
        ".cargo"
        "Cargo.lock"
        "Cargo.toml"
        "hot_lib"
        "src"
      ];
    };
    doCheck = true;
    cargoExtraArgs = "--no-default-features --locked "
      + lib.optionalString
        (features'' != [])
        "--features " + (builtins.concatStringsSep "," features'');
    dontStrip = profile == "dev" || profile == "test";
    dontPatchELF = profile == "dev" || profile == "test";
    buildInputs = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys'
    # needed to build Rust applications on macOS
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
        # https://github.com/NixOS/nixpkgs/issues/206242
        # ld: library not found for -liconv
        libiconv
        # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell
        # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612
        pkgsBuildHost.darwin.apple_sdk.frameworks.Security
      ];
    nativeBuildInputs = [
      # bindgen needs the build platform's libclang. Apparently due to "splicing
      # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
      # right thing here.
      pkgsBuildHost.rustPlatform.bindgenHook
-
+  ]
-      # We don't actually depend on `jq`, but crane's `buildPackage` does, but
+  ++ lib.optionals stdenv.isDarwin [ libiconv ];
      # its `buildDepsOnly` doesn't. This causes those two derivations to have
      # differing values for `NIX_CFLAGS_COMPILE`, which contributes to spurious
      # rebuilds of bindgen and its depedents.
      jq
  ];
 };
 in
@ -203,12 +75,22 @@ craneLib.buildPackage ( commonAttrs // {
    env = buildDepsOnlyEnv;
  });
-  doCheck = true;
+  cargoExtraArgs = ""
  cargoExtraArgs = "--no-default-features --locked "
    + lib.optionalString
-      (features'' != [])
+      (!default_features)
-      "--features " + (builtins.concatStringsSep "," features'');
+      "--no-default-features "
    + lib.optionalString
      (features != [])
      "--features " + (builtins.concatStringsSep "," features);
  # This is redundant with CI
  cargoTestCommand = "";
  # This is redundant with CI
  doCheck = false;
  # https://crane.dev/faq/rebuilds-bindgen.html
  NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
  env = buildPackageEnv;
--- a/nix/pkgs/oci-image/default.nix
+++ b/nix/pkgs/oci-image/default.nix
@ -14,10 +14,9 @@ dockerTools.buildLayeredImage {
  created = "@${toString inputs.self.lastModified}";
  contents = [
    dockerTools.caCertificates
    main
  ];
  config = {
-    Entrypoint = if !stdenv.hostPlatform.isDarwin
+    Entrypoint = if !stdenv.isDarwin
      # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
      # are handled as expected
      then [ "${lib.getExe' tini "tini"}" "--" ]
@ -25,22 +24,5 @@ dockerTools.buildLayeredImage {
    Cmd = [
      "${lib.getExe main}"
    ];
    Env = [
      "RUST_BACKTRACE=full"
    ];
    Labels = {
      "org.opencontainers.image.authors" = "June Clementine Strawberry <june@girlboss.ceo> and Jason Volk
      <jason@zemos.net>";
      "org.opencontainers.image.created" ="@${toString inputs.self.lastModified}";
      "org.opencontainers.image.description" = "a very cool Matrix chat homeserver written in Rust";
      "org.opencontainers.image.documentation" = "https://conduwuit.puppyirl.gay/";
      "org.opencontainers.image.licenses" = "Apache-2.0";
      "org.opencontainers.image.revision" = inputs.self.rev or inputs.self.dirtyRev or "";
      "org.opencontainers.image.source" = "https://github.com/girlbossceo/conduwuit";
      "org.opencontainers.image.title" = main.pname;
      "org.opencontainers.image.url" = "https://conduwuit.puppyirl.gay/";
      "org.opencontainers.image.vendor" = "girlbossceo";
      "org.opencontainers.image.version" = main.version;
    };
  };
 }
--- a/renovate.json
+++ b/renovate.json
@ -11,16 +11,5 @@
  },
  "nix": {
    "enabled": true
-  },
+  }
  "labels": [
    "dependencies",
    "github_actions"
  ],
  "ignoreDeps": [
    "tikv-jemllocator",
    "tikv-jemalloc-sys",
    "tikv-jemalloc-ctl",
    "opentelemetry-rust",
    "tracing-opentelemetry"
  ]
 }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@ -2,6 +2,8 @@
 #
 # Other files that need upkeep when this changes:
 #
 # * `.gitlab-ci.yml`
 # * `.github/workflows/ci.yml`
 # * `Cargo.toml`
 # * `flake.nix`
 #
@ -9,21 +11,13 @@
 # If you're having trouble making the relevant changes, bug a maintainer.
 [toolchain]
-channel = "1.86.0"
+channel = "1.77.0"
 profile = "minimal"
 components = [
    # For rust-analyzer
    "rust-src",
    "rust-analyzer",
    # For CI and editors
    "rustfmt",
    "clippy",
 ]
 targets = [
    #"x86_64-apple-darwin",
    "x86_64-unknown-linux-gnu",
    "x86_64-unknown-linux-musl",
    "aarch64-unknown-linux-musl",
    "aarch64-unknown-linux-gnu",
    #"aarch64-apple-darwin",
 ]
--- a/rustfmt.toml
+++ b/rustfmt.toml
@ -1,33 +1,28 @@
-array_width = 80
+edition = "2021"
-chain_width = 60
+
 comment_width = 80
 condense_wildcard_suffixes = true
 style_edition = "2024"
 fn_call_width = 80
 fn_single_line = true
 format_code_in_doc_comments = true
 format_macro_bodies = true
 format_macro_matchers = true
 format_strings = true
 group_imports = "StdExternalCrate"
 hard_tabs = true
 hex_literal_case = "Upper"
-imports_granularity = "Crate"
+max_width = 120
-match_arm_blocks = false
+tab_spaces = 4
-match_arm_leading_pipes = "Always"
+array_width = 80
 comment_width = 80
 wrap_comments = true
 fn_params_layout = "Compressed"
 fn_call_width = 80
 fn_single_line = true
 hard_tabs = true
 match_block_trailing_comma = true
-max_width = 98
+imports_granularity = "Crate"
 newline_style = "Unix"
 normalize_comments = false
 overflow_delimited_expr = true
 reorder_impl_items = true
 reorder_imports = true
-single_line_if_else_max_width = 60
+group_imports = "StdExternalCrate"
-single_line_let_else_max_width = 80
+newline_style = "Unix"
 struct_lit_width = 40
 tab_spaces = 4
 unstable_features = true
 use_field_init_shorthand = true
 use_small_heuristics = "Off"
 use_try_shorthand = true
-wrap_comments = true
+chain_width = 60
--- a/src/admin/Cargo.toml
+++ b/src/admin/Cargo.toml
@ -1,94 +0,0 @@
 [package]
 name = "conduwuit_admin"
 categories.workspace = true
 description.workspace = true
 edition.workspace = true
 keywords.workspace = true
 license.workspace = true
 readme.workspace = true
 repository.workspace = true
 version.workspace = true
 [lib]
 path = "mod.rs"
 crate-type = [
 	"rlib",
 #	"dylib",
 ]
 [features]
 brotli_compression = [
 	"conduwuit-api/brotli_compression",
 	"conduwuit-core/brotli_compression",
 	"conduwuit-service/brotli_compression",
 ]
 gzip_compression = [
 	"conduwuit-api/gzip_compression",
 	"conduwuit-core/gzip_compression",
 	"conduwuit-service/gzip_compression",
 ]
 io_uring = [
 	"conduwuit-api/io_uring",
 	"conduwuit-database/io_uring",
 	"conduwuit-service/io_uring",
 ]
 jemalloc = [
 	"conduwuit-api/jemalloc",
 	"conduwuit-core/jemalloc",
 	"conduwuit-database/jemalloc",
 	"conduwuit-service/jemalloc",
 ]
 jemalloc_conf = [
 	"conduwuit-api/jemalloc_conf",
 	"conduwuit-core/jemalloc_conf",
 	"conduwuit-database/jemalloc_conf",
 	"conduwuit-service/jemalloc_conf",
 ]
 jemalloc_prof = [
 	"conduwuit-api/jemalloc_prof",
 	"conduwuit-core/jemalloc_prof",
 	"conduwuit-database/jemalloc_prof",
 	"conduwuit-service/jemalloc_prof",
 ]
 jemalloc_stats = [
 	"conduwuit-api/jemalloc_stats",
 	"conduwuit-core/jemalloc_stats",
 	"conduwuit-database/jemalloc_stats",
 	"conduwuit-service/jemalloc_stats",
 ]
 release_max_log_level = [
 	"conduwuit-api/release_max_log_level",
 	"conduwuit-core/release_max_log_level",
 	"conduwuit-database/release_max_log_level",
 	"conduwuit-service/release_max_log_level",
 	"tracing/max_level_trace",
 	"tracing/release_max_level_info",
 	"log/max_level_trace",
 	"log/release_max_level_info",
 ]
 zstd_compression = [
 	"conduwuit-api/zstd_compression",
 	"conduwuit-core/zstd_compression",
 	"conduwuit-database/zstd_compression",
 	"conduwuit-service/zstd_compression",
 ]
 [dependencies]
 clap.workspace = true
 conduwuit-api.workspace = true
 conduwuit-core.workspace = true
 conduwuit-database.workspace = true
 conduwuit-macros.workspace = true
 conduwuit-service.workspace = true
 const-str.workspace = true
 futures.workspace = true
 log.workspace = true
 ruma.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
 [lints]
 workspace = true
--- a/src/admin/admin.rs
+++ b/src/admin/admin.rs
@ -1,66 +0,0 @@
 use clap::Parser;
 use conduwuit::Result;
 use crate::{
 	appservice, appservice::AppserviceCommand, check, check::CheckCommand, context::Context,
 	debug, debug::DebugCommand, federation, federation::FederationCommand, media,
 	media::MediaCommand, query, query::QueryCommand, room, room::RoomCommand, server,
 	server::ServerCommand, user, user::UserCommand,
 };
 #[derive(Debug, Parser)]
 #[command(name = "conduwuit", version = conduwuit::version())]
 pub(super) enum AdminCommand {
 	#[command(subcommand)]
 	/// - Commands for managing appservices
 	Appservices(AppserviceCommand),
 	#[command(subcommand)]
 	/// - Commands for managing local users
 	Users(UserCommand),
 	#[command(subcommand)]
 	/// - Commands for managing rooms
 	Rooms(RoomCommand),
 	#[command(subcommand)]
 	/// - Commands for managing federation
 	Federation(FederationCommand),
 	#[command(subcommand)]
 	/// - Commands for managing the server
 	Server(ServerCommand),
 	#[command(subcommand)]
 	/// - Commands for managing media
 	Media(MediaCommand),
 	#[command(subcommand)]
 	/// - Commands for checking integrity
 	Check(CheckCommand),
 	#[command(subcommand)]
 	/// - Commands for debugging things
 	Debug(DebugCommand),
 	#[command(subcommand)]
 	/// - Low-level queries for database getters and iterators
 	Query(QueryCommand),
 }
 #[tracing::instrument(skip_all, name = "command")]
 pub(super) async fn process(command: AdminCommand, context: &Context<'_>) -> Result {
 	use AdminCommand::*;
 	match command {
 		| Appservices(command) => appservice::process(command, context).await,
 		| Media(command) => media::process(command, context).await,
 		| Users(command) => user::process(command, context).await,
 		| Rooms(command) => room::process(command, context).await,
 		| Federation(command) => federation::process(command, context).await,
 		| Server(command) => server::process(command, context).await,
 		| Debug(command) => debug::process(command, context).await,
 		| Query(command) => query::process(command, context).await,
 		| Check(command) => check::process(command, context).await,
 	}
 }
--- a/Show more
+++ b/Show more
		`@ -1,3 +0,0 @@`
			`supervisor=supervise-daemon`
			`export CONTINUWUITY_CONFIG=/etc/continuwuity/continuwuity.toml`
		`@ -0,0 +1,2 @@`
							`[advisories]`
							`ignore = ["RUSTSEC-2020-0016"]`
`@ -1,3 +1,3 @@`
	`# Deploying`	`# Deploying`

	`This chapter describes various ways to deploy Continuwuity.`	`This chapter describes various ways to deploy Conduwuit.`
		`@ -1 +0,0 @@`
			`{"m.homeserver":{"base_url": "https://matrix.continuwuity.org"},"org.matrix.msc3575.proxy":{"url": "https://matrix.continuwuity.org"}}`