docs: Add links to matrix guides

2026-04-02 16:15:39 +00:00 · 2026-02-11 18:25:11 +00:00
59 changed files with 772 additions and 1319 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1,9 @@
 # Local build and dev artifacts
 target/
-!target/debug/conduwuit

 # Docker files
 Dockerfile*
+docker/

 # IDE files
 .vscode
--- a/.forgejo/workflows/build-debian.yml
+++ b/.forgejo/workflows/build-debian.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        container: [ "ubuntu-latest", "ubuntu-previous", "debian-latest", "debian-oldstable" ]
+        container: ["ubuntu-latest", "ubuntu-previous", "debian-latest", "debian-oldstable"]
    container:
      image: "ghcr.io/tcpipuk/act-runner:${{ matrix.container }}"

@@ -30,28 +30,6 @@ jobs:
          echo "version=$VERSION" >> $GITHUB_OUTPUT
          echo "distribution=$DISTRIBUTION" >> $GITHUB_OUTPUT
          echo "Debian distribution: $DISTRIBUTION ($VERSION)"
-      - name: Work around llvm-project#153385
-        id: llvm-workaround
-        run: |
-          if [ -f /usr/share/apt/default-sequoia.config ]; then
-            echo "Applying workaround for llvm-project#153385"
-            mkdir -p /etc/crypto-policies/back-ends/
-            cp /usr/share/apt/default-sequoia.config /etc/crypto-policies/back-ends/apt-sequoia.config
-            sed -i 's/\(sha1\.second_preimage_resistance = \)2026-02-01/\12026-06-01/' /etc/crypto-policies/back-ends/apt-sequoia.config
-          else
-            echo "No workaround needed for llvm-project#153385"
-          fi
-      - name: Pick compatible clang version
-        id: clang-version
-        run: |
-          # both latest need to use clang-23, but oldstable and previous can just use clang
-          if [[ "${{ matrix.container }}" == "ubuntu-latest" || "${{ matrix.container }}" == "debian-latest" ]]; then
-            echo "Using clang-23 package for ${{ matrix.container }}"
-            echo "version=clang-23" >> $GITHUB_OUTPUT
-          else
-            echo "Using default clang package for ${{ matrix.container }}"
-            echo "version=clang" >> $GITHUB_OUTPUT
-          fi

      - name: Checkout repository with full history
        uses: actions/checkout@v6
@@ -127,7 +105,7 @@ jobs:
        run: |
          apt-get update -y
          # Build dependencies for rocksdb
-          apt-get install -y liburing-dev ${{ steps.clang-version.outputs.version }}
+          apt-get install -y clang liburing-dev

      - name: Run cargo-deb
        id: cargo-deb
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -841,7 +841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
 dependencies = [
 "serde",
- "toml 0.9.12+spec-1.1.0",
+ "toml 0.9.11+spec-1.1.0",
 ]

 [[package]]
@@ -917,9 +917,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.58"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
+checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -927,9 +927,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.58"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
+checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
 dependencies = [
 "anstyle",
 "clap_lex",
@@ -949,9 +949,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "1.0.0"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"

 [[package]]
 name = "cmake"
@@ -1030,7 +1030,6 @@ dependencies = [
 "opentelemetry",
 "opentelemetry-otlp",
 "opentelemetry_sdk",
- "parking_lot",
 "sentry",
 "sentry-tower",
 "sentry-tracing",
@@ -1150,14 +1149,14 @@ dependencies = [
 "serde_json",
 "serde_regex",
 "smallstr",
- "smallvec",
+ "smallvec 1.15.1",
 "thiserror 2.0.18",
 "tikv-jemalloc-ctl",
 "tikv-jemalloc-sys",
 "tikv-jemallocator",
 "tokio",
 "tokio-metrics",
- "toml 0.9.12+spec-1.1.0",
+ "toml 0.9.11+spec-1.1.0",
 "tracing",
 "tracing-core",
 "tracing-subscriber",
@@ -1230,7 +1229,6 @@ dependencies = [
 name = "conduwuit_service"
 version = "0.5.4"
 dependencies = [
- "askama 0.14.0",
 "async-trait",
 "base64 0.22.1",
 "blurhash",
@@ -1265,7 +1263,6 @@ dependencies = [
 "tracing",
 "url",
 "webpage",
- "yansi",
 ]

 [[package]]
@@ -1346,7 +1343,7 @@ dependencies = [
 [[package]]
 name = "continuwuity-admin-api"
 version = "0.1.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "ruma-common",
 "serde",
@@ -1761,7 +1758,7 @@ dependencies = [
 [[package]]
 name = "draupnir-antispam"
 version = "0.1.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "ruma-common",
 "serde",
@@ -1920,7 +1917,7 @@ dependencies = [
 "lebe",
 "miniz_oxide",
 "rayon-core",
- "smallvec",
+ "smallvec 1.15.1",
 "zune-inflate",
 ]

@@ -2155,7 +2152,7 @@ checksum = "3a74b56a4039a46e8c91cc9d84e8a7df4e1f8b24239ca57d1304b3263cb599b9"
 dependencies = [
 "compact_str",
 "garde_derive",
- "smallvec",
+ "smallvec 1.15.1",
 ]

 [[package]]
@@ -2367,7 +2364,7 @@ dependencies = [
 "rand 0.9.2",
 "resolv-conf",
 "serde",
- "smallvec",
+ "smallvec 1.15.1",
 "thiserror 2.0.18",
 "tokio",
 "tracing",
@@ -2485,7 +2482,7 @@ dependencies = [
 "itoa",
 "pin-project-lite",
 "pin-utils",
- "smallvec",
+ "smallvec 1.15.1",
 "tokio",
 "want",
 ]
@@ -2580,7 +2577,7 @@ dependencies = [
 "icu_normalizer_data",
 "icu_properties",
 "icu_provider",
- "smallvec",
+ "smallvec 1.15.1",
 "zerovec",
 ]

@@ -2638,7 +2635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
 "idna_adapter",
- "smallvec",
+ "smallvec 1.15.1",
 "utf8_iter",
 ]

@@ -2923,9 +2920,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"

 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"

 [[package]]
 name = "libfuzzer-sys"
@@ -3119,7 +3116,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "meowlnir-antispam"
 version = "0.1.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "ruma-common",
 "serde",
@@ -3227,7 +3224,7 @@ dependencies = [
 "equivalent",
 "parking_lot",
 "portable-atomic",
- "smallvec",
+ "smallvec 1.15.1",
 "tagptr",
 "uuid",
 ]
@@ -3724,7 +3721,7 @@ dependencies = [
 "libc",
 "petgraph",
 "redox_syscall",
- "smallvec",
+ "smallvec 1.15.1",
 "windows-link",
 ]

@@ -4392,7 +4389,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.10.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "assign",
 "continuwuity-admin-api",
@@ -4415,7 +4412,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.10.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "js_int",
 "ruma-common",
@@ -4427,7 +4424,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.18.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "as_variant",
 "assign",
@@ -4450,7 +4447,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "as_variant",
 "base64 0.22.1",
@@ -4469,7 +4466,7 @@ dependencies = [
 "serde",
 "serde_html_form",
 "serde_json",
- "smallvec",
+ "smallvec 1.15.1",
 "thiserror 2.0.18",
 "time",
 "tracing",
@@ -4482,7 +4479,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.28.1"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "as_variant",
 "indexmap",
@@ -4496,7 +4493,7 @@ dependencies = [
 "ruma-macros",
 "serde",
 "serde_json",
- "smallvec",
+ "smallvec 1.15.1",
 "thiserror 2.0.18",
 "tracing",
 "url",
@@ -4507,7 +4504,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "bytes",
 "headers",
@@ -4529,7 +4526,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.5"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "js_int",
 "thiserror 2.0.18",
@@ -4538,7 +4535,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "js_int",
 "ruma-common",
@@ -4548,7 +4545,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.13.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "cfg-if",
 "proc-macro-crate",
@@ -4563,7 +4560,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.9.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "js_int",
 "ruma-common",
@@ -4575,7 +4572,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.15.0"
-source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=b496b7f38d517149361a882e75d3fd4faf210441#b496b7f38d517149361a882e75d3fd4faf210441"
+source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=458d52bdc7f9a07c497be94a1420ebd3d87d7b2b#458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 dependencies = [
 "base64 0.22.1",
 "ed25519-dalek",
@@ -4754,12 +4751,12 @@ dependencies = [

 [[package]]
 name = "saphyr-parser-bw"
-version = "0.0.608"
+version = "0.0.607"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d55ae5ea09894b6d5382621db78f586df37ef18ab581bf32c754e75076b124b1"
+checksum = "2f9bae8d059bf1ca32753cf3cdafbf5d391502de2fc2ca54510811fe9c100d90"
 dependencies = [
 "arraydeque",
- "smallvec",
+ "smallvec 2.0.0-alpha.12",
 "thiserror 2.0.18",
 ]

@@ -4966,9 +4963,9 @@ dependencies = [

 [[package]]
 name = "serde-saphyr"
-version = "0.0.18"
+version = "0.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "191a4f997fef5e095212c5790898516e9567d2d8502c4159317603ff0321e394"
+checksum = "bc14a55107113a16346915d7e3d78acc539a923458385db89670e22cac106d7a"
 dependencies = [
 "ahash",
 "annotate-snippets",
@@ -4984,7 +4981,7 @@ dependencies = [
 "saphyr-parser-bw",
 "serde",
 "serde_json",
- "smallvec",
+ "smallvec 2.0.0-alpha.12",
 "validator",
 "zmij",
 ]
@@ -5198,7 +5195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "862077b1e764f04c251fe82a2ef562fd78d7cadaeb072ca7c2bcaf7217b1ff3b"
 dependencies = [
 "serde",
- "smallvec",
+ "smallvec 1.15.1",
 ]

 [[package]]
@@ -5210,6 +5207,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "smallvec"
+version = "2.0.0-alpha.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef784004ca8777809dcdad6ac37629f0a97caee4c685fcea805278d81dd8b857"
+
 [[package]]
 name = "socket2"
 version = "0.5.10"
@@ -5327,9 +5330,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"

 [[package]]
 name = "syn"
-version = "2.0.115"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5654,9 +5657,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.9.12+spec-1.1.0"
+version = "0.9.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
+checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
 dependencies = [
 "indexmap",
 "serde_core",
@@ -5713,9 +5716,9 @@ dependencies = [

 [[package]]
 name = "toml_parser"
-version = "1.0.8+spec-1.1.0"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
 "winnow",
 ]
@@ -5900,7 +5903,7 @@ checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc"
 dependencies = [
 "js-sys",
 "opentelemetry",
- "smallvec",
+ "smallvec 1.15.1",
 "tracing",
 "tracing-core",
 "tracing-log",
@@ -5919,7 +5922,7 @@ dependencies = [
 "once_cell",
 "regex-automata",
 "sharded-slab",
- "smallvec",
+ "smallvec 1.15.1",
 "thread_local",
 "tracing",
 "tracing-core",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -158,7 +158,7 @@ features = ["raw_value"]

 # Used for appservice registration files
 [workspace.dependencies.serde-saphyr]
-version = "0.0.18"
+version = "0.0.17"

 # Used to load forbidden room/user regex from config
 [workspace.dependencies.serde_regex]
@@ -342,7 +342,7 @@ version = "0.1.2"
 # Used for matrix spec type definitions and helpers
 [workspace.dependencies.ruma]
 git = "https://forgejo.ellis.link/continuwuation/ruwuma"
-rev = "b496b7f38d517149361a882e75d3fd4faf210441"
+rev = "458d52bdc7f9a07c497be94a1420ebd3d87d7b2b"
 features = [
    "compat",
    "rand",
@@ -378,8 +378,7 @@ features = [
    "unstable-msc4210", # remove legacy mentions
    "unstable-extensible-events",
    "unstable-pdu",
-    "unstable-msc4155",
-    "unstable-msc4143", # livekit well_known response
+    "unstable-msc4155"
 ]

 [workspace.dependencies.rust-rocksdb]
@@ -549,12 +548,6 @@ features = ["sync", "tls-rustls", "rustls-provider"]
 [workspace.dependencies.resolv-conf]
 version = "0.7.5"

-[workspace.dependencies.yansi]
-version = "1.0.1"
-
-[workspace.dependencies.askama]
-version = "0.14.0"
-
 #
 # Patches
 #
--- a/changelog.d/+ffabfdf8.feature.md
+++ b/changelog.d/+ffabfdf8.feature.md
@@ -1,7 +0,0 @@
-Improved the first-time setup experience for new homeserver administrators:
- Account registration is disabled on the first run, except for with a new special registration token that is logged to the console.
- Other helpful information is logged to the console as well, including a giant warning if open registration is enabled.
- The default index page now says to check the console for setup instructions if no accounts have been created.
- Once the first admin account is created, an improved welcome message is sent to the admin room.
-
-Contributed by @ginger.
--- a/changelog.d/1307.bugfix.md
+++ b/changelog.d/1307.bugfix.md
@@ -1 +0,0 @@
-LDAP-enabled servers will no longer have all admins demoted when LDAP-controlled admins are not configured. Contributed by @Jade
--- a/changelog.d/1308.feature.md
+++ b/changelog.d/1308.feature.md
@@ -1,2 +0,0 @@
-Added unstable support for [MSC4406: `M_SENDER_IGNORED`](https://github.com/matrix-org/matrix-spec-proposals/pull/4406).
-Contributed by @nex
--- a/changelog.d/1344.misc.md
+++ b/changelog.d/1344.misc.md
@@ -1 +0,0 @@
-Continuwuity will now print information to the console when it detects a deadlock
--- a/changelog.d/1368.feature
+++ b/changelog.d/1368.feature
@@ -1 +0,0 @@
-Improved the handling of restricted join rules and improved the performance of local-first joins. Contributed by @nex.
--- a/changelog.d/1370.bugfix.md
+++ b/changelog.d/1370.bugfix.md
@@ -1 +0,0 @@
-Fixed sliding sync not resolving wildcard state key requests, enabling Video/Audio calls in Element X.
--- a/changelog.d/1372.feature.md
+++ b/changelog.d/1372.feature.md
@@ -1 +0,0 @@
-You can now set a custom User Agent for URL previews; the default one has been modified to be less likely to be rejected. Contributed by @trashpanda
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@@ -433,7 +433,7 @@
 # If you would like registration only via token reg, please configure
 # `registration_token`.
 #
-#allow_registration = true
+#allow_registration = false

 # If registration is enabled, and this setting is true, new users
 # registered after the first admin user will be automatically suspended
@@ -1474,10 +1474,6 @@
 #
 #url_preview_check_root_domain = false

-# User agent that is used specifically when fetching url previews.
-#
-#url_preview_user_agent = "continuwuity/<version> (bot; +https://continuwuity.org)"
-
 # List of forbidden room aliases and room IDs as strings of regex
 # patterns.
 #
@@ -1824,17 +1820,6 @@
 #
 #support_mxid =

-# A list of MatrixRTC foci URLs which will be served as part of the
-# MSC4143 client endpoint at /.well-known/matrix/client.  If you're
-# setting up livekit, you'd want something like:
-# rtc_focus_server_urls = [
-#     { type = "livekit", livekit_service_url = "https://livekit.example.com" },
-# ]
-#
-# To disable, set this to be an empty vector (`[]`).
-#
-#rtc_focus_server_urls = []
-
 [global.blurhashing]

 # blurhashing x component, 4 is recommended by https://blurha.sh/
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,7 +48,7 @@ EOF

 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.17.5
+ENV BINSTALL_VERSION=1.17.4
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree
--- a/docker/complement.Dockerfile
+++ b/docker/complement.Dockerfile
@@ -2,9 +2,9 @@ FROM ubuntu:latest
 EXPOSE 8008
 EXPOSE 8448
 RUN apt-get update && apt-get install -y ca-certificates liburing2 && rm -rf /var/lib/apt/lists/*
-RUN mkdir -p /etc/continuwuity /var/lib/continuwuity /usr/local/bin/
-COPY complement/complement-entrypoint.sh /usr/local/bin/complement-entrypoint.sh
-COPY complement/complement.config.toml /etc/continuwuity/config.toml
+RUN mkdir -p /etc/continuwuity /var/lib/continuwuity
+COPY docker/complement-entrypoint.sh /usr/local/bin/complement-entrypoint.sh
+COPY docker/complement.config.toml /etc/continuwuity/config.toml
 COPY target/debug/conduwuit /usr/local/bin/conduwuit
 RUN chmod +x /usr/local/bin/conduwuit /usr/local/bin/complement-entrypoint.sh
 #HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://localhost:8008/_continuwuity/server_version || exit 1
--- a/docker/musl.Dockerfile
+++ b/docker/musl.Dockerfile
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/etc/apk/cache apk add \

 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.17.5
+ENV BINSTALL_VERSION=1.17.4
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree
--- a/docs/deploying/generic.mdx
+++ b/docs/deploying/generic.mdx
@@ -269,7 +269,7 @@ # If federation is enabled
 ```

 - To check if your server can communicate with other homeservers, use the
-[Matrix Federation Tester](https://federationtester.mtrnord.blog/). If you can
+[Matrix Federation Tester](https://federationtester.matrix.org/). If you can
 register but cannot join federated rooms, check your configuration and verify
 that port 8448 is open and forwarded correctly.

--- a/package-lock.json
+++ b/package-lock.json
@@ -119,13 +119,13 @@
      }
    },
    "node_modules/@rsbuild/core": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-2.0.0-beta.3.tgz",
-      "integrity": "sha512-dfH+Pt2GuF3rWOWGsf5XOhn3Zarvr4DoHwoI1arAsCGvpzoeud3DNGmWPy13tngj0r/YvQRcPTRBCRV4RP5CMw==",
+      "version": "2.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-2.0.0-beta.1.tgz",
+      "integrity": "sha512-m7L3oi4evTDODcY+Qk3cmY/p7GCaauSRe00D0AkXVohNvxFBt7F49uPwBSThS24I9d31zFuAED2jFqBeBlDqWw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@rspack/core": "2.0.0-beta.0",
+        "@rspack/core": "2.0.0-alpha.1",
        "@swc/helpers": "^0.5.18",
        "jiti": "^2.6.1"
      },
@@ -159,28 +159,28 @@
      }
    },
    "node_modules/@rspack/binding": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.0-beta.0.tgz",
-      "integrity": "sha512-L6PPqhwZWC2vzwdhBItNPXw+7V4sq+MBDRXLdd8NMqaJSCB5iKdJIbpbEQucST9Nn7V28IYoQTXs6+ol5vWUBA==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-Glz0SNFYPtNVM+ExJ4ocSzW+oQhb1iHTmxqVEAILbL17Hq3N/nwZpo1cWEs6hJjn8cosJIb1VKbbgb/1goEtCQ==",
      "dev": true,
      "license": "MIT",
      "optionalDependencies": {
-        "@rspack/binding-darwin-arm64": "2.0.0-beta.0",
-        "@rspack/binding-darwin-x64": "2.0.0-beta.0",
-        "@rspack/binding-linux-arm64-gnu": "2.0.0-beta.0",
-        "@rspack/binding-linux-arm64-musl": "2.0.0-beta.0",
-        "@rspack/binding-linux-x64-gnu": "2.0.0-beta.0",
-        "@rspack/binding-linux-x64-musl": "2.0.0-beta.0",
-        "@rspack/binding-wasm32-wasi": "2.0.0-beta.0",
-        "@rspack/binding-win32-arm64-msvc": "2.0.0-beta.0",
-        "@rspack/binding-win32-ia32-msvc": "2.0.0-beta.0",
-        "@rspack/binding-win32-x64-msvc": "2.0.0-beta.0"
+        "@rspack/binding-darwin-arm64": "2.0.0-alpha.1",
+        "@rspack/binding-darwin-x64": "2.0.0-alpha.1",
+        "@rspack/binding-linux-arm64-gnu": "2.0.0-alpha.1",
+        "@rspack/binding-linux-arm64-musl": "2.0.0-alpha.1",
+        "@rspack/binding-linux-x64-gnu": "2.0.0-alpha.1",
+        "@rspack/binding-linux-x64-musl": "2.0.0-alpha.1",
+        "@rspack/binding-wasm32-wasi": "2.0.0-alpha.1",
+        "@rspack/binding-win32-arm64-msvc": "2.0.0-alpha.1",
+        "@rspack/binding-win32-ia32-msvc": "2.0.0-alpha.1",
+        "@rspack/binding-win32-x64-msvc": "2.0.0-alpha.1"
      }
    },
    "node_modules/@rspack/binding-darwin-arm64": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.0-beta.0.tgz",
-      "integrity": "sha512-PPx1+SPEROSvDKmBuCbsE7W9tk07ajPosyvyuafv2wbBI6PW2rNcz62uzpIFS+FTgwwZ5u/06WXRtlD2xW9bKg==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-+6E6pYgpKvs41cyOlqRjpCT3djjL9hnntF61JumM/TNo1aTYXMNNG4b8ZsLMpBq5ZwCy9Dg8oEDe8AZ84rfM7A==",
      "cpu": [
        "arm64"
      ],
@@ -192,9 +192,9 @@
      ]
    },
    "node_modules/@rspack/binding-darwin-x64": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.0-beta.0.tgz",
-      "integrity": "sha512-GucsfjrSKBZ9cuOTXmHWxeY2wPmaNyvGNxTyzttjRcfwqOWz8r+ku6PCsMSXUqxZRYWW1L9mvtTdlDrzTYJZ0w==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-Ccf9NNupVe67vlaS9zKQJ+BvsAn385uBC1vXnYaUxxHoY/tEwNJf6t+XyDARt7mCtT7+Bu4L/iJ/JEF/MsO5zg==",
      "cpu": [
        "x64"
      ],
@@ -206,9 +206,9 @@
      ]
    },
    "node_modules/@rspack/binding-linux-arm64-gnu": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.0-beta.0.tgz",
-      "integrity": "sha512-nTtYtklRZD4sb2RIFCF9YS8tZ/MjpqIBKVS3YIvdXcfHUdVfmQHTZGtwEuZGg6AxTC5L1hcvkYmTXCG0ok7auw==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-B7omNsPSsinOq2VRD4d4VFrLgHceMQobqlLg0txFUZ7PDjE307gpTcGViWQlUhNCbkZXMPzDeXBFa5ZlEmxgnA==",
      "cpu": [
        "arm64"
      ],
@@ -220,9 +220,9 @@
      ]
    },
    "node_modules/@rspack/binding-linux-arm64-musl": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.0-beta.0.tgz",
-      "integrity": "sha512-S2fshx0Rf7/XYwoMLaqFsVg4y+VAfHzubrczy8AW5xIs6UNC3eRLVTgShLerUPtF6SG+v6NQxQ9JI3vOo2qPOA==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-NCG401ofZcDKlTWD8VHv76Y+02Stmd9Nu5MRbVUBOCTVgXMj8Mgrm5XsGBWUjzd5J/Mvo2hstCKIZxNzmPd8uQ==",
      "cpu": [
        "arm64"
      ],
@@ -234,9 +234,9 @@
      ]
    },
    "node_modules/@rspack/binding-linux-x64-gnu": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.0-beta.0.tgz",
-      "integrity": "sha512-yx5Fk1gl7lfkvqcjolNLCNeduIs6C2alMsQ/kZ1pLeP5MPquVOYNqs6EcDPIp+fUjo3lZYtnJBiZKK+QosbzYg==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-Xgp8wJ5gjpPG8I3VMEsVAesfckWryQVUhJkHcxPfNi72QTv8UkMER7Jl+JrlQk7K7nMO5ltokx/VGl1c3tMx+w==",
      "cpu": [
        "x64"
      ],
@@ -248,9 +248,9 @@
      ]
    },
    "node_modules/@rspack/binding-linux-x64-musl": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.0-beta.0.tgz",
-      "integrity": "sha512-sBX4b2W0PgehlAVT224k0Q6GaH6t9HP+hBNDrbX/g6d0hfxZN56gm5NfOTOD1Rien4v7OBEejJ3/uFbm1WjwYQ==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-lrYKcOgsPA1UMswxzFAV37ofkznbtTLCcEas6lxtlT3Dr28P6VRzC8TgVbIiprkm10I0BlThQWDJ3aGzzLj9Kg==",
      "cpu": [
        "x64"
      ],
@@ -262,9 +262,9 @@
      ]
    },
    "node_modules/@rspack/binding-wasm32-wasi": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.0-beta.0.tgz",
-      "integrity": "sha512-o6OatnNvb4kCzXbCaomhENGaCsO3naIyAqqErew90HeAwa1lfY3NhRfDLeIyuANQ+xqFl34/R7n8q3ZDx3nd4Q==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-rppGiT7CtXlM8st+IgzBDqb7V//1xx5Oe0SY1sxxw0cfOGMpIQCwhJqx/uI6ioqJLZLGX/obt359+hPXyqGl4w==",
      "cpu": [
        "wasm32"
      ],
@@ -276,9 +276,9 @@
      }
    },
    "node_modules/@rspack/binding-win32-arm64-msvc": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.0-beta.0.tgz",
-      "integrity": "sha512-neCzVllXzIqM8p8qKb89qV7wyk233gC/V9VrHIKbGeQjAEzpBsk5GOWlFbq5DDL6tivQ+uzYaTrZWm9tb2qxXg==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-yD2g1JmnCxrix/344r7lBn+RH+Nv8uWP0UDP8kwv4kQGCWr4U7IP8PKFpoyulVOgOUjvJpgImeyrDJ7R8he+5w==",
      "cpu": [
        "arm64"
      ],
@@ -290,9 +290,9 @@
      ]
    },
    "node_modules/@rspack/binding-win32-ia32-msvc": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.0-beta.0.tgz",
-      "integrity": "sha512-/f0n2eO+DxMKQm9IebeMQJITx8M/+RvY/i8d3sAQZBgR53izn8y7EcDlidXpr24/2DvkLbiub8IyCKPlhLB+1A==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-5qpQL5Qz3uYb56pwffEGzznXSX9TNkLpigQbIObfnUwX7WkdjgTT7oTHpjn2sRSLLNiJ/jCp2r4ZHvjmnNRsRA==",
      "cpu": [
        "ia32"
      ],
@@ -304,9 +304,9 @@
      ]
    },
    "node_modules/@rspack/binding-win32-x64-msvc": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.0-beta.0.tgz",
-      "integrity": "sha512-dx4zgiAT88EQE7kEUpr7Z9EZAwLnO5FhzWzvd/cDK4bkqYsx+rTklgf/c0EYPBeroXCxlGiMsuC9wHAFNK7sFw==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-dZ76NN9tXLaF2gnB/pU+PcK4Adf9tj8dY06KcWk5F81ur2V4UbrMfkWJkQprur8cgL/F49YtFMRWa4yp/qNbpQ==",
      "cpu": [
        "x64"
      ],
@@ -318,13 +318,13 @@
      ]
    },
    "node_modules/@rspack/core": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.0-beta.0.tgz",
-      "integrity": "sha512-aEqlQQjiXixT5i9S4DFtiAap8ZjF6pOgfY2ALHOizins/QqWyB8dyLxSoXdzt7JixmKcFmHkbL9XahO28BlVUA==",
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/@rspack/core/-/core-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-2KK3hbxrRqzxtzg+ka7LsiEKIWIGIQz317k9HHC2U4IC5yLJ31K8y/vQfA1aIT2QcFls9gW7GyRjp8A4X5cvLA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@rspack/binding": "2.0.0-beta.0",
+        "@rspack/binding": "2.0.0-alpha.1",
        "@rspack/lite-tapable": "1.1.0"
      },
      "engines": {
@@ -371,20 +371,20 @@
      }
    },
    "node_modules/@rspress/core": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.3.tgz",
-      "integrity": "sha512-a+JJFiALqMxGJBqR38/lkN6tas42UF4jRIhu6RilC/3DdqpfqR8j6jjQFOmqoNKo6ZGXW2W+i1Pscn6drvoG3w==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.2.tgz",
+      "integrity": "sha512-tU8rUVaPyC8o8k4ezgigRVQuZhBAC41KWdwZZ0BldN6o+QXSEIb722RnxCTpa9FGK2riqcwJgM+OqqcqXsFpmw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@mdx-js/mdx": "^3.1.1",
        "@mdx-js/react": "^3.1.1",
-        "@rsbuild/core": "2.0.0-beta.3",
+        "@rsbuild/core": "2.0.0-beta.1",
        "@rsbuild/plugin-react": "~1.4.5",
-        "@rspress/shared": "2.0.3",
+        "@rspress/shared": "2.0.2",
        "@shikijs/rehype": "^3.21.0",
        "@types/unist": "^3.0.3",
-        "@unhead/react": "^2.1.4",
+        "@unhead/react": "^2.1.2",
        "body-scroll-lock": "4.0.0-beta.0",
        "cac": "^6.7.14",
        "chokidar": "^3.6.0",
@@ -428,39 +428,39 @@
      }
    },
    "node_modules/@rspress/plugin-client-redirects": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.3.tgz",
-      "integrity": "sha512-9+SoAbfoxM6OCRWx8jWHHi2zwJDcNaej/URx0CWZk8tvQ618yJW5mXJydknlac62399eYh/F7C3w8TZM3ORGVA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.2.tgz",
+      "integrity": "sha512-FOxUBDOGP06+1hL4jgbIxUe0XoEduXIQ0rSjWjzpo2mC+qTdhZUGJ0xYE2laQIfJXYv/up5zk25zjxUBnxsejw==",
      "dev": true,
      "license": "MIT",
      "engines": {
        "node": "^20.19.0 || >=22.12.0"
      },
      "peerDependencies": {
-        "@rspress/core": "^2.0.3"
+        "@rspress/core": "^2.0.2"
      }
    },
    "node_modules/@rspress/plugin-sitemap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.3.tgz",
-      "integrity": "sha512-SKa7YEAdkUqya2YjMKbakg3kcYMkXgXhTQdDsHd+QlJWN8j8cDPiCcctMZu8iIPeKZlb+hTJkTWvh27LSIKdOA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.2.tgz",
+      "integrity": "sha512-3E0yEif4Pj3RX+QVOsyWXW6IIjuhwh93bhVSmhShmTKi8opH5vnHcRVZZ1z7X/P3MHXFTrC925F8383Sl2qOEg==",
      "dev": true,
      "license": "MIT",
      "engines": {
        "node": "^20.19.0 || >=22.12.0"
      },
      "peerDependencies": {
-        "@rspress/core": "^2.0.3"
+        "@rspress/core": "^2.0.2"
      }
    },
    "node_modules/@rspress/shared": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.3.tgz",
-      "integrity": "sha512-yI9G4P165fSsmm6QoYTUrdgUis1aFnDh04GcM4SQIpL3itvEZhGtItgoeGkX9EWbnEjhriwI8mTqDDJIp+vrGA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.2.tgz",
+      "integrity": "sha512-9+QC8UL1gV2KpRZx4n55vAl6bE38y7eDnGJhdFSHdJkpFbUCiJDk9ZcR6jD/Rrtq7vlT0gfumUk640pxpi3IDQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@rsbuild/core": "2.0.0-beta.3",
+        "@rsbuild/core": "2.0.0-beta.1",
        "@shikijs/rehype": "^3.21.0",
        "gray-matter": "4.0.3",
        "lodash-es": "^4.17.23",
@@ -664,13 +664,13 @@
      "license": "ISC"
    },
    "node_modules/@unhead/react": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@unhead/react/-/react-2.1.4.tgz",
-      "integrity": "sha512-3DzMi5nJkUyLVfQF/q78smCvcSy84TTYgTwXVz5s3AjUcLyHro5Z7bLWriwk1dn5+YRfEsec8aPkLCMi5VjMZg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@unhead/react/-/react-2.1.2.tgz",
+      "integrity": "sha512-VNKa0JJZq5Jp28VuiOMfjAA7CTLHI0SdW/Hs1ZPq2PsNV/cgxGv8quFBGXWx4gfoHB52pejO929RKjIpYX5+iQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "unhead": "2.1.4"
+        "unhead": "2.1.2"
      },
      "funding": {
        "url": "https://github.com/sponsors/harlan-zw"
@@ -3563,9 +3563,9 @@
      }
    },
    "node_modules/unhead": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.1.4.tgz",
-      "integrity": "sha512-+5091sJqtNNmgfQ07zJOgUnMIMKzVKAWjeMlSrTdSGPB6JSozhpjUKuMfWEoLxlMAfhIvgOU8Me0XJvmMA/0fA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/unhead/-/unhead-2.1.2.tgz",
+      "integrity": "sha512-vSihrxyb+zsEUfEbraZBCjdE0p/WSoc2NGDrpwwSNAwuPxhYK1nH3eegf02IENLpn1sUhL8IoO84JWmRQ6tILA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/src/admin/user/commands.rs
+++ b/src/admin/user/commands.rs
@@ -5,7 +5,7 @@

 use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room, remote_leave_room};
 use conduwuit::{
-	Err, Result, debug_warn, error, info,
+	Err, Result, debug, debug_warn, error, info, is_equal_to,
 	matrix::{Event, pdu::PduBuilder},
 	utils::{self, ReadyExt},
 	warn,
@@ -140,6 +140,7 @@ pub(super) async fn create_user(&self, username: String, password: Option<String
 						self.services.globals.server_name().to_owned(),
 						room_server_name.to_owned(),
 					],
+					None,
 					&None,
 				)
 				.await
@@ -167,8 +168,27 @@ pub(super) async fn create_user(&self, username: String, password: Option<String

 	// we dont add a device since we're not the user, just the creator

-	// Make the first user to register an administrator and disable first-run mode.
-	self.services.firstrun.empower_first_user(&user_id).await?;
+	// if this account creation is from the CLI / --execute, invite the first user
+	// to admin room
+	if let Ok(admin_room) = self.services.admin.get_admin_room().await {
+		if self
+			.services
+			.rooms
+			.state_cache
+			.room_joined_count(&admin_room)
+			.await
+			.is_ok_and(is_equal_to!(1))
+		{
+			self.services
+				.admin
+				.make_user_admin(&user_id)
+				.boxed()
+				.await?;
+			warn!("Granting {user_id} admin privileges as the first user");
+		}
+	} else {
+		debug!("create_user admin command called without an admin room being available");
+	}

 	self.write_str(&format!("Created user with user_id: {user_id} and password: `{password}`"))
 		.await
@@ -529,6 +549,7 @@ pub(super) async fn force_join_list_of_local_users(
 			&room_id,
 			Some(String::from(BULK_JOIN_REASON)),
 			&servers,
+			None,
 			&None,
 		)
 		.await
@@ -614,6 +635,7 @@ pub(super) async fn force_join_all_local_users(
 			&room_id,
 			Some(String::from(BULK_JOIN_REASON)),
 			&servers,
+			None,
 			&None,
 		)
 		.await
@@ -653,7 +675,8 @@ pub(super) async fn force_join_room(
 		self.services.globals.user_is_local(&user_id),
 		"Parsed user_id must be a local user"
 	);
-	join_room_by_id_helper(self.services, &user_id, &room_id, None, &servers, &None).await?;
+	join_room_by_id_helper(self.services, &user_id, &room_id, None, &servers, None, &None)
+		.await?;

 	self.write_str(&format!("{user_id} has been joined to {room_id}.",))
 		.await
--- a/src/api/client/account.rs
+++ b/src/api/client/account.rs
@@ -3,7 +3,7 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Error, Event, Result, debug_info, err, error, info,
+	Err, Error, Event, Result, debug_info, err, error, info, is_equal_to,
 	matrix::pdu::PduBuilder,
 	utils::{self, ReadyExt, stream::BroadbandExt},
 	warn,
@@ -148,12 +148,7 @@ pub(crate) async fn register_route(
 	let is_guest = body.kind == RegistrationKind::Guest;
 	let emergency_mode_enabled = services.config.emergency_password.is_some();

-	// Allow registration if it's enabled in the config file or if this is the first
-	// run (so the first user account can be created)
-	let allow_registration =
-		services.config.allow_registration || services.firstrun.is_first_run();
-
-	if !allow_registration && body.appservice_info.is_none() {
+	if !services.config.allow_registration && body.appservice_info.is_none() {
 		match (body.username.as_ref(), body.initial_device_display_name.as_ref()) {
 			| (Some(username), Some(device_display_name)) => {
 				info!(
@@ -190,10 +185,17 @@ pub(crate) async fn register_route(
 		)));
 	}

-	if is_guest && !services.config.allow_guest_registration {
+	if is_guest
+		&& (!services.config.allow_guest_registration
+			|| (services.config.allow_registration
+				&& services
+					.registration_tokens
+					.get_config_file_token()
+					.is_some()))
+	{
 		info!(
-			"Guest registration disabled, rejecting guest registration attempt, initial device \
-			 name: \"{}\"",
+			"Guest registration disabled / registration enabled with token configured, \
+			 rejecting guest registration attempt, initial device name: \"{}\"",
 			body.initial_device_display_name.as_deref().unwrap_or("")
 		);
 		return Err!(Request(GuestAccessForbidden("Guest registration is disabled.")));
@@ -307,63 +309,54 @@ pub(crate) async fn register_route(
 	let skip_auth = body.appservice_info.is_some() || is_guest;

 	// Populate required UIAA flows
-
-	if services.firstrun.is_first_run() {
-		// Registration token forced while in first-run mode
+	if services
+		.registration_tokens
+		.iterate_tokens()
+		.next()
+		.await
+		.is_some()
+	{
+		// Registration token required
 		uiaainfo.flows.push(AuthFlow {
 			stages: vec![AuthType::RegistrationToken],
 		});
-	} else {
-		if services
-			.registration_tokens
-			.iterate_tokens()
-			.next()
-			.await
-			.is_some()
+	}
+	if services.config.recaptcha_private_site_key.is_some() {
+		if let Some(pubkey) = &services.config.recaptcha_site_key {
+			// ReCaptcha required
+			uiaainfo
+				.flows
+				.push(AuthFlow { stages: vec![AuthType::ReCaptcha] });
+			uiaainfo.params = serde_json::value::to_raw_value(&serde_json::json!({
+				"m.login.recaptcha": {
+					"public_key": pubkey,
+				},
+			}))
+			.expect("Failed to serialize recaptcha params");
+		}
+	}
+
+	if uiaainfo.flows.is_empty() && !skip_auth {
+		// Registration isn't _disabled_, but there's no captcha configured and no
+		// registration tokens currently set. Bail out by default unless open
+		// registration was explicitly enabled.
+		if !services
+			.config
+			.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
 		{
-			// Registration token required
-			uiaainfo.flows.push(AuthFlow {
-				stages: vec![AuthType::RegistrationToken],
-			});
+			return Err!(Request(Forbidden(
+				"This server is not accepting registrations at this time."
+			)));
 		}

-		if services.config.recaptcha_private_site_key.is_some() {
-			if let Some(pubkey) = &services.config.recaptcha_site_key {
-				// ReCaptcha required
-				uiaainfo
-					.flows
-					.push(AuthFlow { stages: vec![AuthType::ReCaptcha] });
-				uiaainfo.params = serde_json::value::to_raw_value(&serde_json::json!({
-					"m.login.recaptcha": {
-						"public_key": pubkey,
-					},
-				}))
-				.expect("Failed to serialize recaptcha params");
-			}
-		}
-
-		if uiaainfo.flows.is_empty() && !skip_auth {
-			// Registration isn't _disabled_, but there's no captcha configured and no
-			// registration tokens currently set. Bail out by default unless open
-			// registration was explicitly enabled.
-			if !services
-				.config
-				.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
-			{
-				return Err!(Request(Forbidden(
-					"This server is not accepting registrations at this time."
-				)));
-			}
-
-			// We have open registration enabled (😧), provide a dummy stage
-			uiaainfo = UiaaInfo {
-				flows: vec![AuthFlow { stages: vec![AuthType::Dummy] }],
-				completed: Vec::new(),
-				params: Box::default(),
-				session: None,
-				auth_error: None,
-			};
-		}
+		// We have open registration enabled (😧), provide a dummy stage
+		uiaainfo = UiaaInfo {
+			flows: vec![AuthFlow { stages: vec![AuthType::Dummy] }],
+			completed: Vec::new(),
+			params: Box::default(),
+			session: None,
+			auth_error: None,
+		};
 	}

 	if !skip_auth {
@@ -521,29 +514,39 @@ pub(crate) async fn register_route(
 		}
 	}

+	// If this is the first real user, grant them admin privileges except for guest
+	// users
+	// Note: the server user is generated first
 	if !is_guest {
-		// Make the first user to register an administrator and disable first-run mode.
-		let was_first_user = services.firstrun.empower_first_user(&user_id).await?;
-
-		// If the registering user was not the first and we're suspending users on
-		// register, suspend them.
-		if !was_first_user && services.config.suspend_on_register {
-			// Note that we can still do auto joins for suspended users
-			services
-				.users
-				.suspend_account(&user_id, &services.globals.server_user)
-				.await;
-			// And send an @room notice to the admin room, to prompt admins to review the
-			// new user and ideally unsuspend them if deemed appropriate.
-			if services.server.config.admin_room_notices {
+		if let Ok(admin_room) = services.admin.get_admin_room().await {
+			if services
+				.rooms
+				.state_cache
+				.room_joined_count(&admin_room)
+				.await
+				.is_ok_and(is_equal_to!(1))
+			{
+				services.admin.make_user_admin(&user_id).boxed().await?;
+				warn!("Granting {user_id} admin privileges as the first user");
+			} else if services.config.suspend_on_register {
+				// This is not an admin, suspend them.
+				// Note that we can still do auto joins for suspended users
 				services
-					.admin
-					.send_loud_message(RoomMessageEventContent::text_plain(format!(
-						"User {user_id} has been suspended as they are not the first user on \
-						 this server. Please review and unsuspend them if appropriate."
-					)))
-					.await
-					.ok();
+					.users
+					.suspend_account(&user_id, &services.globals.server_user)
+					.await;
+				// And send an @room notice to the admin room, to prompt admins to review the
+				// new user and ideally unsuspend them if deemed appropriate.
+				if services.server.config.admin_room_notices {
+					services
+						.admin
+						.send_loud_message(RoomMessageEventContent::text_plain(format!(
+							"User {user_id} has been suspended as they are not the first user \
+							 on this server. Please review and unsuspend them if appropriate."
+						)))
+						.await
+						.ok();
+				}
 			}
 		}
 	}
@@ -580,6 +583,7 @@ pub(crate) async fn register_route(
 					&room_id,
 					Some("Automatically joining this room upon registration".to_owned()),
 					&[services.globals.server_name().to_owned(), room_server_name.to_owned()],
+					None,
 					&body.appservice_info,
 				)
 				.boxed()
--- a/src/api/client/context.rs
+++ b/src/api/client/context.rs
@@ -16,10 +16,7 @@

 use crate::{
 	Ruma,
-	client::{
-		is_ignored_pdu,
-		message::{event_filter, ignored_filter, lazy_loading_witness, visibility_filter},
-	},
+	client::message::{event_filter, ignored_filter, lazy_loading_witness, visibility_filter},
 };

 const LIMIT_MAX: usize = 100;
@@ -81,9 +78,6 @@ pub(crate) async fn get_context_route(
 		return Err!(Request(NotFound("Event not found.")));
 	}

-	// Return M_SENDER_IGNORED if the sender of base_event is ignored (MSC4406)
-	is_ignored_pdu(&services, &base_pdu, sender_user).await?;
-
 	let base_count = base_id.pdu_count();

 	let base_event = ignored_filter(&services, (base_count, base_pdu), sender_user);
--- a/src/api/client/membership/join.rs
+++ b/src/api/client/membership/join.rs
@@ -3,7 +3,7 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Result, debug, debug_info, debug_warn, err, error, info, is_true,
+	Err, Result, debug, debug_info, debug_warn, err, error, info,
 	matrix::{
 		StateKey,
 		event::{gen_event_id, gen_event_id_canonical_json},
@@ -26,7 +26,7 @@
 	api::{
 		client::{
 			error::ErrorKind,
-			membership::{join_room_by_id, join_room_by_id_or_alias},
+			membership::{ThirdPartySigned, join_room_by_id, join_room_by_id_or_alias},
 		},
 		federation::{self},
 	},
@@ -34,7 +34,7 @@
 	events::{
 		StateEventType,
 		room::{
-			join_rules::JoinRule,
+			join_rules::{AllowRule, JoinRule},
 			member::{MembershipState, RoomMemberEventContent},
 		},
 	},
@@ -48,13 +48,9 @@
 		timeline::pdu_fits,
 	},
 };
-use tokio::join;

 use super::{banned_room_check, validate_remote_member_event_stub};
-use crate::{
-	Ruma,
-	server::{select_authorising_user, user_can_perform_restricted_join},
-};
+use crate::Ruma;

 /// # `POST /_matrix/client/r0/rooms/{roomId}/join`
 ///
@@ -120,6 +116,7 @@ pub(crate) async fn join_room_by_id_route(
 		&body.room_id,
 		body.reason.clone(),
 		&servers,
+		body.third_party_signed.as_ref(),
 		&body.appservice_info,
 	)
 	.boxed()
@@ -251,6 +248,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 		&room_id,
 		body.reason.clone(),
 		&servers,
+		body.third_party_signed.as_ref(),
 		appservice_info,
 	)
 	.boxed()
@@ -265,6 +263,7 @@ pub async fn join_room_by_id_helper(
 	room_id: &RoomId,
 	reason: Option<String>,
 	servers: &[OwnedServerName],
+	third_party_signed: Option<&ThirdPartySigned>,
 	appservice_info: &Option<RegistrationInfo>,
 ) -> Result<join_room_by_id::v3::Response> {
 	let state_lock = services.rooms.state.mutex.lock(room_id).await;
@@ -352,9 +351,17 @@ pub async fn join_room_by_id_helper(
 	}

 	if server_in_room {
-		join_room_by_id_helper_local(services, sender_user, room_id, reason, servers, state_lock)
-			.boxed()
-			.await?;
+		join_room_by_id_helper_local(
+			services,
+			sender_user,
+			room_id,
+			reason,
+			servers,
+			third_party_signed,
+			state_lock,
+		)
+		.boxed()
+		.await?;
 	} else {
 		// Ask a remote server if we are not participating in this room
 		join_room_by_id_helper_remote(
@@ -363,6 +370,7 @@ pub async fn join_room_by_id_helper(
 			room_id,
 			reason,
 			servers,
+			third_party_signed,
 			state_lock,
 		)
 		.boxed()
@@ -378,6 +386,7 @@ async fn join_room_by_id_helper_remote(
 	room_id: &RoomId,
 	reason: Option<String>,
 	servers: &[OwnedServerName],
+	_third_party_signed: Option<&ThirdPartySigned>,
 	state_lock: RoomMutexGuard,
 ) -> Result {
 	info!("Joining {room_id} over federation.");
@@ -387,10 +396,11 @@ async fn join_room_by_id_helper_remote(

 	info!("make_join finished");

-	let room_version_id = make_join_response.room_version.unwrap_or(RoomVersionId::V1);
+	let Some(room_version_id) = make_join_response.room_version else {
+		return Err!(BadServerResponse("Remote room version is not supported by conduwuit"));
+	};

 	if !services.server.supported_room_version(&room_version_id) {
-		// How did we get here?
 		return Err!(BadServerResponse(
 			"Remote room version {room_version_id} is not supported by conduwuit"
 		));
@@ -419,6 +429,10 @@ async fn join_room_by_id_helper_remote(
 		}
 	};

+	join_event_stub.insert(
+		"origin".to_owned(),
+		CanonicalJsonValue::String(services.globals.server_name().as_str().to_owned()),
+	);
 	join_event_stub.insert(
 		"origin_server_ts".to_owned(),
 		CanonicalJsonValue::Integer(
@@ -730,45 +744,87 @@ async fn join_room_by_id_helper_local(
 	room_id: &RoomId,
 	reason: Option<String>,
 	servers: &[OwnedServerName],
+	_third_party_signed: Option<&ThirdPartySigned>,
 	state_lock: RoomMutexGuard,
 ) -> Result {
-	info!("Joining room locally");
+	debug_info!("We can join locally");
+	let join_rules = services.rooms.state_accessor.get_join_rules(room_id).await;

-	let (room_version, join_rules, is_invited) = join!(
-		services.rooms.state.get_room_version(room_id),
-		services.rooms.state_accessor.get_join_rules(room_id),
-		services.rooms.state_cache.is_invited(sender_user, room_id)
-	);
-
-	let room_version = room_version?;
-	let mut auth_user: Option<OwnedUserId> = None;
-	if !is_invited && matches!(join_rules, JoinRule::Restricted(_) | JoinRule::KnockRestricted(_))
-	{
-		use RoomVersionId::*;
-		if !matches!(room_version, V1 | V2 | V3 | V4 | V5 | V6 | V7) {
-			// This is a restricted room, check if we can complete the join requirements
-			// locally.
-			let needs_auth_user =
-				user_can_perform_restricted_join(services, sender_user, room_id, &room_version)
-					.await;
-			if needs_auth_user.is_ok_and(is_true!()) {
-				// If there was an error or the value is false, we'll try joining over
-				// federation. Since it's Ok(true), we can authorise this locally.
-				// If we can't select a local user, this will remain None, the join will fail,
-				// and we'll fall back to federation.
-				auth_user = select_authorising_user(services, room_id, sender_user, &state_lock)
-					.await
-					.ok();
+	let mut restricted_join_authorized = None;
+	match join_rules {
+		| JoinRule::Restricted(restricted) | JoinRule::KnockRestricted(restricted) => {
+			for restriction in restricted.allow {
+				match restriction {
+					| AllowRule::RoomMembership(membership) => {
+						if services
+							.rooms
+							.state_cache
+							.is_joined(sender_user, &membership.room_id)
+							.await
+						{
+							restricted_join_authorized = Some(true);
+							break;
+						}
+					},
+					| AllowRule::UnstableSpamChecker => {
+						match services
+							.antispam
+							.meowlnir_accept_make_join(room_id.to_owned(), sender_user.to_owned())
+							.await
+						{
+							| Ok(()) => {
+								restricted_join_authorized = Some(true);
+								break;
+							},
+							| Err(_) =>
+								return Err!(Request(Forbidden(
+									"Antispam rejected join request."
+								))),
+						}
+					},
+					| _ => {},
+				}
 			}
-		}
+		},
+		| _ => {},
 	}
+	let join_authorized_via_users_server = if restricted_join_authorized.is_none() {
+		None
+	} else {
+		match restricted_join_authorized.unwrap() {
+			| true => services
+				.rooms
+				.state_cache
+				.local_users_in_room(room_id)
+				.filter(|user| {
+					trace!("Checking if {user} can invite {sender_user} to {room_id}");
+					services.rooms.state_accessor.user_can_invite(
+						room_id,
+						user,
+						sender_user,
+						&state_lock,
+					)
+				})
+				.boxed()
+				.next()
+				.await
+				.map(ToOwned::to_owned),
+			| false => {
+				warn!(
+					"Join authorization failed for restricted join in room {room_id} for user \
+					 {sender_user}"
+				);
+				return Err!(Request(Forbidden("You are not authorized to join this room.")));
+			},
+		}
+	};

 	let content = RoomMemberEventContent {
 		displayname: services.users.displayname(sender_user).await.ok(),
 		avatar_url: services.users.avatar_url(sender_user).await.ok(),
 		blurhash: services.users.blurhash(sender_user).await.ok(),
 		reason: reason.clone(),
-		join_authorized_via_users_server: auth_user,
+		join_authorized_via_users_server,
 		..RoomMemberEventContent::new(MembershipState::Join)
 	};

@@ -784,7 +840,6 @@ async fn join_room_by_id_helper_local(
 		)
 		.await
 	else {
-		info!("Joined room locally");
 		return Ok(());
 	};

@@ -792,13 +847,138 @@ async fn join_room_by_id_helper_local(
 		return Err(error);
 	}

-	info!(
+	warn!(
 		?error,
-		remote_servers = %servers.len(),
-		"Could not join room locally, attempting remote join",
+		servers = %servers.len(),
+		"Could not join restricted room locally, attempting remote join",
 	);
-	join_room_by_id_helper_remote(services, sender_user, room_id, reason, servers, state_lock)
-		.await
+	let Ok((make_join_response, remote_server)) =
+		make_join_request(services, sender_user, room_id, servers).await
+	else {
+		return Err(error);
+	};
+
+	let Some(room_version_id) = make_join_response.room_version else {
+		return Err!(BadServerResponse("Remote room version is not supported by conduwuit"));
+	};
+
+	if !services.server.supported_room_version(&room_version_id) {
+		return Err!(BadServerResponse(
+			"Remote room version {room_version_id} is not supported by conduwuit"
+		));
+	}
+
+	let mut join_event_stub: CanonicalJsonObject =
+		serde_json::from_str(make_join_response.event.get()).map_err(|e| {
+			err!(BadServerResponse("Invalid make_join event json received from server: {e:?}"))
+		})?;
+
+	validate_remote_member_event_stub(
+		&MembershipState::Join,
+		sender_user,
+		room_id,
+		&join_event_stub,
+	)?;
+
+	let join_authorized_via_users_server = join_event_stub
+		.get("content")
+		.map(|s| {
+			s.as_object()?
+				.get("join_authorised_via_users_server")?
+				.as_str()
+		})
+		.and_then(|s| OwnedUserId::try_from(s.unwrap_or_default()).ok());
+
+	join_event_stub.insert(
+		"origin".to_owned(),
+		CanonicalJsonValue::String(services.globals.server_name().as_str().to_owned()),
+	);
+	join_event_stub.insert(
+		"origin_server_ts".to_owned(),
+		CanonicalJsonValue::Integer(
+			utils::millis_since_unix_epoch()
+				.try_into()
+				.expect("Timestamp is valid js_int value"),
+		),
+	);
+	join_event_stub.insert(
+		"content".to_owned(),
+		to_canonical_value(RoomMemberEventContent {
+			displayname: services.users.displayname(sender_user).await.ok(),
+			avatar_url: services.users.avatar_url(sender_user).await.ok(),
+			blurhash: services.users.blurhash(sender_user).await.ok(),
+			reason,
+			join_authorized_via_users_server,
+			..RoomMemberEventContent::new(MembershipState::Join)
+		})
+		.expect("event is valid, we just created it"),
+	);
+
+	// We keep the "event_id" in the pdu only in v1 or
+	// v2 rooms
+	match room_version_id {
+		| RoomVersionId::V1 | RoomVersionId::V2 => {},
+		| _ => {
+			join_event_stub.remove("event_id");
+		},
+	}
+
+	// In order to create a compatible ref hash (EventID) the `hashes` field needs
+	// to be present
+	services
+		.server_keys
+		.hash_and_sign_event(&mut join_event_stub, &room_version_id)?;
+
+	// Generate event id
+	let event_id = gen_event_id(&join_event_stub, &room_version_id)?;
+
+	// Add event_id back
+	join_event_stub
+		.insert("event_id".to_owned(), CanonicalJsonValue::String(event_id.clone().into()));
+
+	// It has enough fields to be called a proper event now
+	let join_event = join_event_stub;
+
+	let send_join_response = services
+		.sending
+		.send_synapse_request(
+			&remote_server,
+			federation::membership::create_join_event::v2::Request {
+				room_id: room_id.to_owned(),
+				event_id: event_id.clone(),
+				omit_members: false,
+				pdu: services
+					.sending
+					.convert_to_outgoing_federation_event(join_event.clone())
+					.await,
+			},
+		)
+		.await?;
+
+	if let Some(signed_raw) = send_join_response.room_state.event {
+		let (signed_event_id, signed_value) =
+			gen_event_id_canonical_json(&signed_raw, &room_version_id).map_err(|e| {
+				err!(Request(BadJson(warn!("Could not convert event to canonical JSON: {e}"))))
+			})?;
+
+		if signed_event_id != event_id {
+			return Err!(Request(BadJson(
+				warn!(%signed_event_id, %event_id, "Server {remote_server} sent event with wrong event ID")
+			)));
+		}
+
+		drop(state_lock);
+		services
+			.rooms
+			.event_handler
+			.handle_incoming_pdu(&remote_server, room_id, &signed_event_id, signed_value, true)
+			.boxed()
+			.await?;
+	} else {
+		return Err(error);
+	}
+
+	Ok(())
 }

 async fn make_join_request(
@@ -807,16 +987,17 @@ async fn make_join_request(
 	room_id: &RoomId,
 	servers: &[OwnedServerName],
 ) -> Result<(federation::membership::prepare_join_event::v1::Response, OwnedServerName)> {
-	let mut make_join_counter: usize = 1;
+	let mut make_join_response_and_server =
+		Err!(BadServerResponse("No server available to assist in joining."));
+
+	let mut make_join_counter: usize = 0;
+	let mut incompatible_room_version_count: usize = 0;

 	for remote_server in servers {
 		if services.globals.server_is_ours(remote_server) {
 			continue;
 		}
-		info!(
-			"Asking {remote_server} for make_join (attempt {make_join_counter}/{})",
-			servers.len()
-		);
+		info!("Asking {remote_server} for make_join ({make_join_counter})");
 		let make_join_response = services
 			.sending
 			.send_federation_request(
@@ -844,44 +1025,47 @@ async fn make_join_request(
 					warn!("make_join response from {remote_server} failed validation: {e}");
 					continue;
 				}
-				return Ok((response, remote_server.clone()));
+				make_join_response_and_server = Ok((response, remote_server.clone()));
+				break;
 			},
-			| Err(e) => match e.kind() {
-				| ErrorKind::UnableToAuthorizeJoin => {
+			| Err(e) => {
+				info!("make_join request to {remote_server} failed: {e}");
+				if matches!(
+					e.kind(),
+					ErrorKind::IncompatibleRoomVersion { .. } | ErrorKind::UnsupportedRoomVersion
+				) {
+					incompatible_room_version_count =
+						incompatible_room_version_count.saturating_add(1);
+				}
+
+				if incompatible_room_version_count > 15 {
 					info!(
-						"{remote_server} was unable to verify the joining user satisfied \
-						 restricted join requirements: {e}. Will continue trying."
+						"15 servers have responded with M_INCOMPATIBLE_ROOM_VERSION or \
+						 M_UNSUPPORTED_ROOM_VERSION, assuming that conduwuit does not support \
+						 the room version {room_id}: {e}"
 					);
-				},
-				| ErrorKind::UnableToGrantJoin => {
-					info!(
-						"{remote_server} believes the joining user satisfies restricted join \
-						 rules, but is unable to authorise a join for us. Will continue trying."
-					);
-				},
-				| ErrorKind::IncompatibleRoomVersion { room_version } => {
+					make_join_response_and_server =
+						Err!(BadServerResponse("Room version is not supported by Conduwuit"));
+					return make_join_response_and_server;
+				}
+
+				if make_join_counter > 40 {
 					warn!(
-						"{remote_server} reports the room we are trying to join is \
-						 v{room_version}, which we do not support."
+						"40 servers failed to provide valid make_join response, assuming no \
+						 server can assist in joining."
 					);
-					return Err(e);
-				},
-				| ErrorKind::Forbidden { .. } => {
-					warn!("{remote_server} refuses to let us join: {e}.");
-					return Err(e);
-				},
-				| ErrorKind::NotFound => {
-					info!(
-						"{remote_server} does not know about {room_id}: {e}. Will continue \
-						 trying."
-					);
-				},
-				| _ => {
-					info!("{remote_server} failed to make_join: {e}. Will continue trying.");
-				},
+					make_join_response_and_server =
+						Err!(BadServerResponse("No server available to assist in joining."));
+
+					return make_join_response_and_server;
+				}
 			},
 		}
+
+		if make_join_response_and_server.is_ok() {
+			break;
+		}
 	}
-	info!("All {} servers were unable to assist in joining {room_id} :(", servers.len());
-	Err!(BadServerResponse("No server available to assist in joining."))
+
+	make_join_response_and_server
 }
--- a/src/api/client/membership/knock.rs
+++ b/src/api/client/membership/knock.rs
@@ -253,6 +253,7 @@ async fn knock_room_by_id_helper(
 				room_id,
 				reason.clone(),
 				servers,
+				None,
 				&None,
 			)
 			.await
--- a/src/api/client/message.rs
+++ b/src/api/client/message.rs
@@ -1,7 +1,7 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use conduwuit::{
-	Err, Error, Result, at, debug_warn,
+	Err, Result, at, debug_warn,
 	matrix::{
 		event::{Event, Matches},
 		pdu::PduCount,
@@ -26,7 +26,7 @@
 	DeviceId, RoomId, UserId,
 	api::{
 		Direction,
-		client::{error::ErrorKind, filter::RoomEventFilter, message::get_message_events},
+		client::{filter::RoomEventFilter, message::get_message_events},
 	},
 	events::{
 		AnyStateEvent, StateEventType,
@@ -279,30 +279,23 @@ pub(crate) async fn ignored_filter(

 	is_ignored_pdu(services, pdu, user_id)
 		.await
-		.unwrap_or(true)
 		.eq(&false)
 		.then_some(item)
 }

-/// Determine whether a PDU should be ignored for a given recipient user.
-/// Returns True if this PDU should be ignored, returns False otherwise.
-///
-/// The error SenderIgnored is returned if the sender or the sender's server is
-/// ignored by the relevant user. If the error cannot be returned to the user,
-/// it should equate to a true value (i.e. ignored).
 #[inline]
 pub(crate) async fn is_ignored_pdu<Pdu>(
 	services: &Services,
 	event: &Pdu,
 	recipient_user: &UserId,
-) -> Result<bool>
+) -> bool
 where
 	Pdu: Event + Send + Sync,
 {
 	// exclude Synapse's dummy events from bloating up response bodies. clients
 	// don't need to see this.
 	if event.kind().to_cow_str() == "org.matrix.dummy_event" {
-		return Ok(true);
+		return true;
 	}

 	let sender_user = event.sender();
@@ -317,27 +310,21 @@ pub(crate) async fn is_ignored_pdu<Pdu>(

 	if !type_ignored {
 		// We cannot safely ignore this type
-		return Ok(false);
+		return false;
 	}

 	if server_ignored {
 		// the sender's server is ignored, so ignore this event
-		return Err(Error::BadRequest(
-			ErrorKind::SenderIgnored { sender: None },
-			"The sender's server is ignored by this server.",
-		));
+		return true;
 	}

 	if user_ignored && !services.config.send_messages_from_ignored_users_to_client {
 		// the recipient of this PDU has the sender ignored, and we're not
 		// configured to send ignored messages to clients
-		return Err(Error::BadRequest(
-			ErrorKind::SenderIgnored { sender: Some(event.sender().to_owned()) },
-			"You have ignored this sender.",
-		));
+		return true;
 	}

-	Ok(false)
+	false
 }

 #[inline]
--- a/src/api/client/relations.rs
+++ b/src/api/client/relations.rs
@@ -1,6 +1,6 @@
 use axum::extract::State;
 use conduwuit::{
-	Err, Result, at, debug_warn, err,
+	Err, Result, at, debug_warn,
 	matrix::{Event, event::RelationTypeEqual, pdu::PduCount},
 	utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
 };
@@ -18,7 +18,7 @@
 	events::{TimelineEventType, relation::RelationType},
 };

-use crate::{Ruma, client::is_ignored_pdu};
+use crate::Ruma;

 /// # `GET /_matrix/client/r0/rooms/{roomId}/relations/{eventId}/{relType}/{eventType}`
 pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
@@ -118,14 +118,6 @@ async fn paginate_relations_with_filter(
 		debug_warn!(req_evt = %target, %room_id, "Event relations requested by {sender_user} but is not allowed to see it, returning 404");
 		return Err!(Request(NotFound("Event not found.")));
 	}
-	let target_pdu = services
-		.rooms
-		.timeline
-		.get_pdu(target)
-		.await
-		.map_err(|_| err!(Request(NotFound("Event not found."))))?;
-	// Return M_SENDER_IGNORED if the sender of base_event is ignored (MSC4406)
-	is_ignored_pdu(services, &target_pdu, sender_user).await?;

 	let start: PduCount = from
 		.map(str::parse)
@@ -167,7 +159,6 @@ async fn paginate_relations_with_filter(
 		.ready_take_while(|(count, _)| Some(*count) != to)
 		.take(limit)
 		.wide_filter_map(|item| visibility_filter(services, sender_user, item))
-		.wide_filter_map(|item| ignored_filter(services, item, sender_user))
 		.then(async |mut pdu| {
 			if let Err(e) = services
 				.rooms
@@ -223,17 +214,3 @@ async fn visibility_filter<Pdu: Event + Send + Sync>(
 		.await
 		.then_some(item)
 }
-
-async fn ignored_filter<Pdu: Event + Send + Sync>(
-	services: &Services,
-	item: (PduCount, Pdu),
-	sender_user: &UserId,
-) -> Option<(PduCount, Pdu)> {
-	let (_, pdu) = &item;
-
-	if is_ignored_pdu(services, pdu, sender_user).await.ok()? {
-		None
-	} else {
-		Some(item)
-	}
-}
--- a/src/api/client/room/event.rs
+++ b/src/api/client/room/event.rs
@@ -29,7 +29,7 @@ pub(crate) async fn get_room_event_route(

 	let (mut event, visible) = try_join(event, visible).await?;

-	if !visible || is_ignored_pdu(services, &event, body.sender_user()).await? {
+	if !visible || is_ignored_pdu(services, &event, body.sender_user()).await {
 		return Err!(Request(Forbidden("You don't have permission to view this event.")));
 	}

--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -107,7 +107,7 @@ pub(super) async fn ldap_login(
 ) -> Result<OwnedUserId> {
 	let (user_dn, is_ldap_admin) = match services.config.ldap.bind_dn.as_ref() {
 		| Some(bind_dn) if bind_dn.contains("{username}") =>
-			(bind_dn.replace("{username}", lowercased_user_id.localpart()), None),
+			(bind_dn.replace("{username}", lowercased_user_id.localpart()), false),
 		| _ => {
 			debug!("Searching user in LDAP");

@@ -144,16 +144,12 @@ pub(super) async fn ldap_login(
 			.await?;
 	}

-	// Only sync admin status if LDAP can actually determine it.
-	// None means LDAP cannot determine admin status (manual config required).
-	if let Some(is_ldap_admin) = is_ldap_admin {
-		let is_conduwuit_admin = services.admin.user_is_admin(lowercased_user_id).await;
+	let is_conduwuit_admin = services.admin.user_is_admin(lowercased_user_id).await;

-		if is_ldap_admin && !is_conduwuit_admin {
-			Box::pin(services.admin.make_user_admin(lowercased_user_id)).await?;
-		} else if !is_ldap_admin && is_conduwuit_admin {
-			Box::pin(services.admin.revoke_admin(lowercased_user_id)).await?;
-		}
+	if is_ldap_admin && !is_conduwuit_admin {
+		Box::pin(services.admin.make_user_admin(lowercased_user_id)).await?;
+	} else if !is_ldap_admin && is_conduwuit_admin {
+		Box::pin(services.admin.revoke_admin(lowercased_user_id)).await?;
 	}

 	Ok(user_id)
--- a/src/api/client/sync/v5.rs
+++ b/src/api/client/sync/v5.rs
@@ -30,8 +30,7 @@
 	api::client::sync::sync_events::{self, DeviceLists, UnreadNotificationsCount},
 	directory::RoomTypeFilter,
 	events::{
-		AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, AnySyncStateEvent, StateEventType,
-		TimelineEventType,
+		AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType, TimelineEventType,
 		room::member::{MembershipState, RoomMemberEventContent},
 		typing::TypingEventContent,
 	},
@@ -534,9 +533,6 @@ async fn process_rooms<'a, Rooms>(
 				}
 			});

-		let required_state =
-			collect_required_state(services, room_id, required_state_request).await;
-
 		let room_events: Vec<_> = timeline_pdus
 			.iter()
 			.stream()
@@ -555,6 +551,21 @@ async fn process_rooms<'a, Rooms>(
 			}
 		}

+		let required_state = required_state_request
+			.iter()
+			.stream()
+			.filter_map(|state| async move {
+				services
+					.rooms
+					.state_accessor
+					.room_state_get(room_id, &state.0, &state.1)
+					.await
+					.map(Event::into_format)
+					.ok()
+			})
+			.collect()
+			.await;
+
 		// Heroes
 		let heroes: Vec<_> = services
 			.rooms
@@ -678,51 +689,6 @@ async fn process_rooms<'a, Rooms>(
 	Ok(rooms)
 }

-/// Collect the required state events for a room
-async fn collect_required_state(
-	services: &Services,
-	room_id: &RoomId,
-	required_state_request: &BTreeSet<TypeStateKey>,
-) -> Vec<Raw<AnySyncStateEvent>> {
-	let mut required_state = Vec::new();
-	let mut wildcard_types: HashSet<&StateEventType> = HashSet::new();
-
-	for (event_type, state_key) in required_state_request {
-		if wildcard_types.contains(event_type) {
-			continue;
-		}
-
-		if state_key.as_str() == "*" {
-			wildcard_types.insert(event_type);
-			if let Ok(keys) = services
-				.rooms
-				.state_accessor
-				.room_state_keys(room_id, event_type)
-				.await
-			{
-				for key in keys {
-					if let Ok(event) = services
-						.rooms
-						.state_accessor
-						.room_state_get(room_id, event_type, &key)
-						.await
-					{
-						required_state.push(Event::into_format(event));
-					}
-				}
-			}
-		} else if let Ok(event) = services
-			.rooms
-			.state_accessor
-			.room_state_get(room_id, event_type, state_key)
-			.await
-		{
-			required_state.push(Event::into_format(event));
-		}
-	}
-	required_state
-}
-
 async fn collect_typing_events(
 	services: &Services,
 	sender_user: &UserId,
--- a/src/api/client/well_known.rs
+++ b/src/api/client/well_known.rs
@@ -27,7 +27,6 @@ pub(crate) async fn well_known_client(
 		identity_server: None,
 		sliding_sync_proxy: Some(SlidingSyncProxyInfo { url: client_url }),
 		tile_server: None,
-		rtc_foci: services.config.well_known.rtc_focus_server_urls.clone(),
 	})
 }

--- a/src/api/server/get_missing_events.rs
+++ b/src/api/server/get_missing_events.rs
@@ -1,9 +1,6 @@
-use std::collections::{HashSet, VecDeque};
-
 use axum::extract::State;
-use conduwuit::{Err, Event, Result, debug, info, trace, utils::to_canonical_object, warn};
-use ruma::{OwnedEventId, api::federation::event::get_missing_events};
-use serde_json::{json, value::RawValue};
+use conduwuit::{Err, Result, debug, debug_error, info, utils::to_canonical_object};
+use ruma::api::federation::event::get_missing_events;

 use super::AccessCheck;
 use crate::Ruma;
@@ -48,76 +45,59 @@ pub(crate) async fn get_missing_events_route(
 		.unwrap_or(LIMIT_DEFAULT)
 		.min(LIMIT_MAX);

-	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
+	let mut queued_events = body.latest_events.clone();
+	// the vec will never have more entries the limit
+	let mut events = Vec::with_capacity(limit);

-	let mut queue: VecDeque<OwnedEventId> = VecDeque::from(body.latest_events.clone());
-	let mut results: Vec<Box<RawValue>> = Vec::with_capacity(limit);
-	let mut seen: HashSet<OwnedEventId> = HashSet::from_iter(body.earliest_events.clone());
-
-	while let Some(next_event_id) = queue.pop_front() {
-		if seen.contains(&next_event_id) {
-			trace!(%next_event_id, "already seen event, skipping");
+	let mut i: usize = 0;
+	while i < queued_events.len() && events.len() < limit {
+		let Ok(pdu) = services.rooms.timeline.get_pdu(&queued_events[i]).await else {
+			debug!(
+				body.origin = body.origin.as_ref().map(tracing::field::display),
+				"Event {} does not exist locally, skipping", &queued_events[i]
+			);
+			i = i.saturating_add(1);
 			continue;
-		}
-
-		if results.len() >= limit {
-			debug!(%next_event_id, "reached limit of events to return, breaking");
-			break;
-		}
-
-		let mut pdu = match services.rooms.timeline.get_pdu(&next_event_id).await {
-			| Ok(pdu) => pdu,
-			| Err(e) => {
-				warn!("could not find event {next_event_id} while walking missing events: {e}");
-				continue;
-			},
 		};
-		if pdu.room_id_or_hash() != body.room_id {
-			return Err!(Request(Unknown(
-				"Event {next_event_id} is not in room {}",
-				body.room_id
-			)));
+
+		if body.earliest_events.contains(&queued_events[i]) {
+			i = i.saturating_add(1);
+			continue;
 		}

 		if !services
 			.rooms
 			.state_accessor
-			.server_can_see_event(body.origin(), &body.room_id, pdu.event_id())
+			.server_can_see_event(body.origin(), &body.room_id, &queued_events[i])
 			.await
 		{
-			debug!(%next_event_id, origin = %body.origin(), "redacting event origin cannot see");
-			pdu.redact(&room_version, json!({}))?;
+			debug!(
+				body.origin = body.origin.as_ref().map(tracing::field::display),
+				"Server cannot see {:?} in {:?}, skipping", pdu.event_id, pdu.room_id
+			);
+			i = i.saturating_add(1);
+			continue;
 		}

-		trace!(
-			%next_event_id,
-			prev_events = ?pdu.prev_events().collect::<Vec<_>>(),
-			"adding event to results and queueing prev events"
-		);
-		queue.extend(pdu.prev_events.clone());
-		seen.insert(next_event_id.clone());
-		if body.latest_events.contains(&next_event_id) {
-			continue; // Don't include latest_events in results,
-			// but do include their prev_events in the queue
-		}
-		results.push(
-			services
-				.sending
-				.convert_to_outgoing_federation_event(to_canonical_object(pdu)?)
-				.await,
-		);
-		trace!(
-			%next_event_id,
-			queue_len = queue.len(),
-			seen_len = seen.len(),
-			results_len = results.len(),
-			"event added to results"
-		);
+		i = i.saturating_add(1);
+		let Ok(event) = to_canonical_object(&pdu) else {
+			debug_error!(
+				body.origin = body.origin.as_ref().map(tracing::field::display),
+				"Failed to convert PDU in database to canonical JSON: {pdu:?}"
+			);
+			continue;
+		};
+
+		let prev_events = pdu.prev_events.iter().map(ToOwned::to_owned);
+
+		let event = services
+			.sending
+			.convert_to_outgoing_federation_event(event)
+			.await;
+
+		queued_events.extend(prev_events);
+		events.push(event);
 	}

-	if !queue.is_empty() {
-		debug!("limit reached before queue was empty");
-	}
-	results.reverse(); // return oldest first
-	Ok(get_missing_events::v1::Response { events: results })
+	Ok(get_missing_events::v1::Response { events })
 }
--- a/src/api/server/invite.rs
+++ b/src/api/server/invite.rs
@@ -2,7 +2,7 @@
 use axum_client_ip::InsecureClientIp;
 use base64::{Engine as _, engine::general_purpose};
 use conduwuit::{
-	Err, Error, PduEvent, Result, err, error,
+	Err, Error, PduEvent, Result, err,
 	matrix::{Event, event::gen_event_id},
 	utils::{self, hash::sha256},
 	warn,
@@ -199,27 +199,20 @@ pub(crate) async fn create_invite_route(

 		for appservice in services.appservice.read().await.values() {
 			if appservice.is_user_match(&recipient_user) {
-				let request = ruma::api::appservice::event::push_events::v1::Request {
-					events: vec![pdu.to_format()],
-					txn_id: general_purpose::URL_SAFE_NO_PAD
-						.encode(sha256::hash(pdu.event_id.as_bytes()))
-						.into(),
-					ephemeral: Vec::new(),
-					to_device: Vec::new(),
-				};
 				services
 					.sending
-					.send_appservice_request(appservice.registration.clone(), request)
-					.await
-					.map_err(|e| {
-						error!(
-							"failed to notify appservice {} about incoming invite: {e}",
-							appservice.registration.id
-						);
-						err!(BadServerResponse(
-							"Failed to notify appservice about incoming invite."
-						))
-					})?;
+					.send_appservice_request(
+						appservice.registration.clone(),
+						ruma::api::appservice::event::push_events::v1::Request {
+							events: vec![pdu.to_format()],
+							txn_id: general_purpose::URL_SAFE_NO_PAD
+								.encode(sha256::hash(pdu.event_id.as_bytes()))
+								.into(),
+							ephemeral: Vec::new(),
+							to_device: Vec::new(),
+						},
+					)
+					.await?;
 			}
 		}
 	}
--- a/src/api/server/make_join.rs
+++ b/src/api/server/make_join.rs
@@ -16,8 +16,6 @@
 	},
 };
 use serde_json::value::to_raw_value;
-use service::rooms::state::RoomMutexGuard;
-use tokio::join;

 use crate::Ruma;

@@ -87,24 +85,16 @@ pub(crate) async fn create_join_event_template_route(
 	}

 	let state_lock = services.rooms.state.mutex.lock(&body.room_id).await;
-	let (is_invited, is_joined) = join!(
-		services
-			.rooms
-			.state_cache
-			.is_invited(&body.user_id, &body.room_id),
-		services
-			.rooms
-			.state_cache
-			.is_joined(&body.user_id, &body.room_id)
-	);
+	let is_invited = services
+		.rooms
+		.state_cache
+		.is_invited(&body.user_id, &body.room_id)
+		.await;
 	let join_authorized_via_users_server: Option<OwnedUserId> = {
 		use RoomVersionId::*;
-		if is_joined || is_invited {
-			// User is already joined or invited and consequently does not need an
-			// authorising user
-			None
-		} else if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6 | V7) {
-			// room version does not support restricted join rules
+		if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6 | V7) || is_invited {
+			// room version does not support restricted join rules, or the user is currently
+			// already invited
 			None
 		} else if user_can_perform_restricted_join(
 			&services,
@@ -114,10 +104,32 @@ pub(crate) async fn create_join_event_template_route(
 		)
 		.await?
 		{
-			Some(
-				select_authorising_user(&services, &body.room_id, &body.user_id, &state_lock)
-					.await?,
-			)
+			let Some(auth_user) = services
+				.rooms
+				.state_cache
+				.local_users_in_room(&body.room_id)
+				.filter(|user| {
+					services.rooms.state_accessor.user_can_invite(
+						&body.room_id,
+						user,
+						&body.user_id,
+						&state_lock,
+					)
+				})
+				.boxed()
+				.next()
+				.await
+				.map(ToOwned::to_owned)
+			else {
+				info!(
+					"No local user is able to authorize the join of {} into {}",
+					&body.user_id, &body.room_id
+				);
+				return Err!(Request(UnableToGrantJoin(
+					"No user on this server is able to assist in joining."
+				)));
+			};
+			Some(auth_user)
 		} else {
 			None
 		}
@@ -147,7 +159,9 @@ pub(crate) async fn create_join_event_template_route(
 		)
 		.await?;
 	drop(state_lock);
-	pdu_json.remove("event_id");
+
+	// room v3 and above removed the "event_id" field from remote PDU format
+	maybe_strip_event_id(&mut pdu_json, &room_version_id)?;

 	Ok(prepare_join_event::v1::Response {
 		room_version: Some(room_version_id),
@@ -155,38 +169,6 @@ pub(crate) async fn create_join_event_template_route(
 	})
 }

-/// Attempts to find a user who is able to issue an invite in the target room.
-pub(crate) async fn select_authorising_user(
-	services: &Services,
-	room_id: &RoomId,
-	user_id: &UserId,
-	state_lock: &RoomMutexGuard,
-) -> Result<OwnedUserId> {
-	let auth_user = services
-		.rooms
-		.state_cache
-		.local_users_in_room(room_id)
-		.filter(|user| {
-			services
-				.rooms
-				.state_accessor
-				.user_can_invite(room_id, user, user_id, state_lock)
-		})
-		.boxed()
-		.next()
-		.await
-		.map(ToOwned::to_owned);
-
-	match auth_user {
-		| Some(auth_user) => Ok(auth_user),
-		| None => {
-			Err!(Request(UnableToGrantJoin(
-				"No user on this server is able to assist in joining."
-			)))
-		},
-	}
-}
-
 /// Checks whether the given user can join the given room via a restricted join.
 pub(crate) async fn user_can_perform_restricted_join(
 	services: &Services,
@@ -198,9 +180,12 @@ pub(crate) async fn user_can_perform_restricted_join(

 	// restricted rooms are not supported on <=v7
 	if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6 | V7) {
-		// This should be impossible as it was checked earlier on, but retain this check
-		// for safety.
-		unreachable!("user_can_perform_restricted_join got incompatible room version");
+		return Ok(false);
+	}
+
+	if services.rooms.state_cache.is_joined(user_id, room_id).await {
+		// joining user is already joined, there is nothing we need to do
+		return Ok(false);
 	}

 	let Ok(join_rules_event_content) = services
@@ -220,31 +205,17 @@ pub(crate) async fn user_can_perform_restricted_join(
 	let (JoinRule::Restricted(r) | JoinRule::KnockRestricted(r)) =
 		join_rules_event_content.join_rule
 	else {
-		// This is not a restricted room
 		return Ok(false);
 	};

 	if r.allow.is_empty() {
-		// This will never be authorisable, return forbidden.
-		return Err!(Request(Forbidden("You are not invited to this room.")));
+		debug_info!("{room_id} is restricted but the allow key is empty");
+		return Ok(false);
 	}

-	let mut could_satisfy = true;
 	for allow_rule in &r.allow {
 		match allow_rule {
 			| AllowRule::RoomMembership(membership) => {
-				if !services
-					.rooms
-					.state_cache
-					.server_in_room(services.globals.server_name(), &membership.room_id)
-					.await
-				{
-					// Since we can't check this room, mark could_satisfy as false
-					// so that we can return M_UNABLE_TO_AUTHORIZE_JOIN later.
-					could_satisfy = false;
-					continue;
-				}
-
 				if services
 					.rooms
 					.state_cache
@@ -268,8 +239,6 @@ pub(crate) async fn user_can_perform_restricted_join(
 					| Err(_) => Err!(Request(Forbidden("Antispam rejected join request."))),
 				},
 			| _ => {
-				// We don't recognise this join rule, so we cannot satisfy the request.
-				could_satisfy = false;
 				debug_info!(
 					"Unsupported allow rule in restricted join for room {}: {:?}",
 					room_id,
@@ -279,23 +248,9 @@ pub(crate) async fn user_can_perform_restricted_join(
 		}
 	}

-	if could_satisfy {
-		// We were able to check all the restrictions and can be certain that the
-		// prospective member is not permitted to join.
-		Err!(Request(Forbidden(
-			"You do not belong to any of the rooms or spaces required to join this room."
-		)))
-	} else {
-		// We were unable to check all the restrictions. This usually means we aren't in
-		// one of the rooms this one is restricted to, ergo can't check its state for
-		// the user's membership, and consequently the user *might* be able to join if
-		// they ask another server.
-		Err!(Request(UnableToAuthorizeJoin(
-			"You do not belong to any of the recognised rooms or spaces required to join this \
-			 room, but this server is unable to verify every requirement. You may be able to \
-			 join via another server."
-		)))
-	}
+	Err!(Request(UnableToAuthorizeJoin(
+		"Joining user is not known to be in any required room."
+	)))
 }

 pub(crate) fn maybe_strip_event_id(
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -19,7 +19,7 @@
 use regex::RegexSet;
 use ruma::{
 	OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, OwnedUserId, RoomVersionId,
-	api::client::discovery::{discover_homeserver::RtcFocusInfo, discover_support::ContactRole},
+	api::client::discovery::discover_support::ContactRole,
 };
 use serde::{Deserialize, de::IgnoredAny};
 use url::Url;
@@ -559,7 +559,7 @@ pub struct Config {
 	///
 	/// If you would like registration only via token reg, please configure
 	/// `registration_token`.
-	#[serde(default = "true_fn")]
+	#[serde(default)]
 	pub allow_registration: bool,

 	/// If registration is enabled, and this setting is true, new users
@@ -1696,11 +1696,6 @@ pub struct Config {
 	#[serde(default)]
 	pub url_preview_check_root_domain: bool,

-	/// User agent that is used specifically when fetching url previews.
-	///
-	/// default: "continuwuity/<version> (bot; +https://continuwuity.org)"
-	pub url_preview_user_agent: Option<String>,
-
 	/// List of forbidden room aliases and room IDs as strings of regex
 	/// patterns.
 	///
@@ -2116,19 +2111,6 @@ pub struct WellKnownConfig {
 	/// If no email or mxid is specified, all of the server's admins will be
 	/// listed.
 	pub support_mxid: Option<OwnedUserId>,
-
-	/// A list of MatrixRTC foci URLs which will be served as part of the
-	/// MSC4143 client endpoint at /.well-known/matrix/client.  If you're
-	/// setting up livekit, you'd want something like:
-	/// rtc_focus_server_urls = [
-	///     { type = "livekit", livekit_service_url = "https://livekit.example.com" },
-	/// ]
-	///
-	/// To disable, set this to be an empty vector (`[]`).
-	///
-	/// default: []
-	#[serde(default = "default_rtc_focus_urls")]
-	pub rtc_focus_server_urls: Vec<RtcFocusInfo>,
 }

 #[derive(Clone, Copy, Debug, Deserialize, Default)]
@@ -2626,9 +2608,6 @@ fn default_rocksdb_stats_level() -> u8 { 1 }
 #[inline]
 pub fn default_default_room_version() -> RoomVersionId { RoomVersionId::V11 }

-#[must_use]
-pub fn default_rtc_focus_urls() -> Vec<RtcFocusInfo> { vec![] }
-
 fn default_ip_range_denylist() -> Vec<String> {
 	vec![
 		"127.0.0.0/8".to_owned(),
--- a/src/core/error/response.rs
+++ b/src/core/error/response.rs
@@ -85,8 +85,7 @@ pub(super) fn bad_request_code(kind: &ErrorKind) -> StatusCode {
 		| Unrecognized => StatusCode::METHOD_NOT_ALLOWED,

 		// 404
-		| NotFound | NotImplemented | FeatureDisabled | SenderIgnored { .. } =>
-			StatusCode::NOT_FOUND,
+		| NotFound | NotImplemented | FeatureDisabled => StatusCode::NOT_FOUND,

 		// 403
 		| GuestAccessForbidden
--- a/src/core/info/version.rs
+++ b/src/core/info/version.rs
@@ -8,11 +8,9 @@
 use std::sync::OnceLock;

 static BRANDING: &str = "continuwuity";
-static WEBSITE: &str = "https://continuwuity.org";
 static SEMANTIC: &str = env!("CARGO_PKG_VERSION");

 static VERSION: OnceLock<String> = OnceLock::new();
-static VERSION_UA: OnceLock<String> = OnceLock::new();
 static USER_AGENT: OnceLock<String> = OnceLock::new();

 #[inline]
@@ -21,18 +19,11 @@ pub fn name() -> &'static str { BRANDING }

 #[inline]
 pub fn version() -> &'static str { VERSION.get_or_init(init_version) }
-#[inline]
-pub fn version_ua() -> &'static str { VERSION_UA.get_or_init(init_version_ua) }

 #[inline]
 pub fn user_agent() -> &'static str { USER_AGENT.get_or_init(init_user_agent) }

-fn init_user_agent() -> String { format!("{}/{} (bot; +{WEBSITE})", name(), version_ua()) }
-
-fn init_version_ua() -> String {
-	conduwuit_build_metadata::version_tag()
-		.map_or_else(|| SEMANTIC.to_owned(), |extra| format!("{SEMANTIC}+{extra}"))
-}
+fn init_user_agent() -> String { format!("{}/{}", name(), version()) }

 fn init_version() -> String {
 	conduwuit_build_metadata::version_tag()
--- a/src/main/Cargo.toml
+++ b/src/main/Cargo.toml
@@ -230,7 +230,6 @@ tracing-opentelemetry.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
 tracing-journald = { workspace = true, optional = true }
-parking_lot.workspace = true


 [target.'cfg(all(not(target_env = "msvc"), target_os = "linux"))'.dependencies]
--- a/src/main/deadlock.rs
+++ b/src/main/deadlock.rs
@@ -1,36 +0,0 @@
-use std::{thread, time::Duration};
-
-/// Runs a loop that checks for deadlocks every 10 seconds.
-///
-/// Note that this requires the `deadlock_detection` parking_lot feature to be
-/// enabled.
-pub(crate) fn deadlock_detection_thread() {
-	loop {
-		thread::sleep(Duration::from_secs(10));
-		let deadlocks = parking_lot::deadlock::check_deadlock();
-		if deadlocks.is_empty() {
-			continue;
-		}
-
-		eprintln!("{} deadlocks detected", deadlocks.len());
-		for (i, threads) in deadlocks.iter().enumerate() {
-			eprintln!("Deadlock #{i}");
-			for t in threads {
-				eprintln!("Thread Id {:#?}", t.thread_id());
-				eprintln!("{:#?}", t.backtrace());
-			}
-		}
-	}
-}
-
-/// Spawns the deadlock detection thread.
-///
-/// This thread will run in the background and check for deadlocks every 10
-/// seconds. When a deadlock is detected, it will print detailed information to
-/// stderr.
-pub(crate) fn spawn() {
-	thread::Builder::new()
-		.name("deadlock_detector".to_owned())
-		.spawn(deadlock_detection_thread)
-		.expect("failed to spawn deadlock detection thread");
-}
--- a/src/main/mod.rs
+++ b/src/main/mod.rs
@@ -5,7 +5,6 @@
 use conduwuit_core::{debug_info, error};

 mod clap;
-mod deadlock;
 mod logging;
 mod mods;
 mod panic;
@@ -28,9 +27,6 @@ pub fn run() -> Result<()> {
 }

 pub fn run_with_args(args: &Args) -> Result<()> {
-	// Spawn deadlock detection thread
-	deadlock::spawn();
-
 	let runtime = runtime::new(args)?;
 	let server = Server::new(args, Some(runtime.handle()))?;

--- a/src/service/Cargo.toml
+++ b/src/service/Cargo.toml
@@ -79,7 +79,6 @@ zstd_compression = [
 ]

 [dependencies]
-askama.workspace = true
 async-trait.workspace = true
 base64.workspace = true
 bytes.workspace = true
@@ -119,7 +118,6 @@ webpage.optional = true
 blurhash.workspace = true
 blurhash.optional = true
 recaptcha-verify = { version = "0.1.5", default-features = false }
-yansi.workspace = true

 [target.'cfg(all(unix, target_os = "linux"))'.dependencies]
 sd-notify.workspace = true
--- a/src/service/admin/execute.rs
+++ b/src/service/admin/execute.rs
@@ -26,7 +26,7 @@ pub(super) async fn console_auto_stop(&self) {

 /// Execute admin commands after startup
 #[implement(super::Service)]
-pub(crate) async fn startup_execute(&self) -> Result {
+pub(super) async fn startup_execute(&self) -> Result {
 	// List of commands to execute
 	let commands = &self.services.server.config.admin_execute;

--- a/src/service/admin/grant.rs
+++ b/src/service/admin/grant.rs
@@ -9,6 +9,7 @@
 		RoomAccountDataEventType, StateEventType,
 		room::{
 			member::{MembershipState, RoomMemberEventContent},
+			message::RoomMessageEventContent,
 			power_levels::RoomPowerLevelsEventContent,
 		},
 		tag::{TagEvent, TagEventContent, TagInfo},
@@ -125,6 +126,23 @@ pub async fn make_user_admin(&self, user_id: &UserId) -> Result {
 		}
 	}

+	if self.services.server.config.admin_room_notices {
+		let welcome_message = String::from(
+			"## Thank you for trying out Continuwuity!\n\nContinuwuity is a hard fork of conduwuit, which is also a hard fork of Conduit, currently in Beta. The Beta status initially was inherited from Conduit, however overtime this Beta status is rapidly becoming less and less relevant as our codebase significantly diverges more and more. Continuwuity is quite stable and very usable as a daily driver and for a low-medium sized homeserver. There is still a lot of more work to be done, but it is in a far better place than the project was in early 2024.\n\nHelpful links:\n> Source code: https://forgejo.ellis.link/continuwuation/continuwuity\n> Documentation: https://continuwuity.org/\n> Report issues: https://forgejo.ellis.link/continuwuation/continuwuity/issues\n\nFor a list of available commands, send the following message in this room: `!admin --help`\n\nHere are some rooms you can join (by typing the command into your client) -\n\nContinuwuity space: `/join #space:continuwuity.org`\nContinuwuity main room (Ask questions and get notified on updates): `/join #continuwuity:continuwuity.org`\nContinuwuity offtopic room: `/join #offtopic:continuwuity.org`",
+		);
+
+		// Send welcome message
+		self.services
+			.timeline
+			.build_and_append_pdu(
+				PduBuilder::timeline(&RoomMessageEventContent::text_markdown(welcome_message)),
+				server_user,
+				Some(&room_id),
+				&state_lock,
+			)
+			.await?;
+	}
+
 	Ok(())
 }

--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -137,6 +137,7 @@ async fn worker(self: Arc<Self>) -> Result<()> {
 		let mut signals = self.services.server.signal.subscribe();
 		let receiver = self.channel.1.clone();

+		self.startup_execute().await?;
 		self.console_auto_start().await;

 		loop {
--- a/src/service/announcements/mod.rs
+++ b/src/service/announcements/mod.rs
@@ -18,7 +18,7 @@
 use std::{sync::Arc, time::Duration};

 use async_trait::async_trait;
-use conduwuit::{Result, Server, debug, error, warn};
+use conduwuit::{Result, Server, debug, error, info, warn};
 use database::{Deserialized, Map};
 use rand::Rng;
 use ruma::events::{Mentions, room::message::RoomMessageEventContent};
@@ -155,6 +155,11 @@ async fn check(&self) -> Result<()> {

 	#[tracing::instrument(skip_all)]
 	async fn handle(&self, announcement: &CheckForAnnouncementsResponseEntry) {
+		if let Some(date) = &announcement.date {
+			info!("[announcements] {date} {:#}", announcement.message);
+		} else {
+			info!("[announcements] {:#}", announcement.message);
+		}
 		let mut message = RoomMessageEventContent::text_markdown(format!(
 			"### New announcement{}\n\n{}",
 			announcement
--- a/src/service/client/mod.rs
+++ b/src/service/client/mod.rs
@@ -36,11 +36,6 @@ fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
 			.clone()
 			.and_then(Either::right);

-		let url_preview_user_agent = config
-			.url_preview_user_agent
-			.clone()
-			.unwrap_or_else(|| conduwuit::version::user_agent().to_owned());
-
 		Ok(Arc::new(Self {
 			default: base(config)?
 				.dns_resolver(resolver.resolver.clone())
@@ -54,7 +49,6 @@ fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
 				.dns_resolver(resolver.resolver.clone())
 				.timeout(Duration::from_secs(config.url_preview_timeout))
 				.redirect(redirect::Policy::limited(3))
-				.user_agent(url_preview_user_agent)
 				.build()?,

 			extern_media: base(config)?
--- a/src/service/config/mod.rs
+++ b/src/service/config/mod.rs
@@ -7,25 +7,12 @@
 	error, implement,
 };

-use crate::registration_tokens::{ValidToken, ValidTokenSource};
-
 pub struct Service {
 	server: Arc<Server>,
 }

 const SIGNAL: &str = "SIGUSR1";

-impl Service {
-	/// Get the registration token set in the config file, if it exists.
-	#[must_use]
-	pub fn get_config_file_token(&self) -> Option<ValidToken> {
-		self.registration_token.clone().map(|token| ValidToken {
-			token,
-			source: ValidTokenSource::ConfigFile,
-		})
-	}
-}
-
 #[async_trait]
 impl crate::Service for Service {
 	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
--- a/src/service/firstrun/mod.rs
+++ b/src/service/firstrun/mod.rs
@@ -1,300 +0,0 @@
-use std::{
-	io::IsTerminal,
-	sync::{Arc, OnceLock},
-};
-
-use askama::Template;
-use async_trait::async_trait;
-use conduwuit::{Result, utils::ReadyExt};
-use futures::StreamExt;
-use ruma::{UserId, events::room::message::RoomMessageEventContent};
-
-use crate::{
-	Dep, admin, config, globals,
-	registration_tokens::{self, ValidToken, ValidTokenSource},
-	users,
-};
-
-pub struct Service {
-	services: Services,
-	/// Represents the state of first run mode.
-	///
-	/// First run mode is either active or inactive at server start. It may
-	/// transition from active to inactive, but only once, and can never
-	/// transition the other way. Additionally, whether the server is in first
-	/// run mode or not can only be determined when all services are
-	/// constructed. The outer `OnceLock` represents the unknown state of first
-	/// run mode, and the inner `OnceLock` enforces the one-time transition from
-	/// active to inactive.
-	///
-	/// Consequently, this marker may be in one of three states:
-	/// 1. OnceLock<uninitialized>, representing the unknown state of first run
-	///    mode during server startup. Once server startup is complete, the
-	///    marker transitions to state 2 or directly to state 3.
-	/// 2. OnceLock<OnceLock<uninitialized>>, representing first run mode being
-	///    active. The marker may only transition to state 3 from here.
-	/// 3. OnceLock<OnceLock<()>>, representing first run mode being inactive.
-	///    The marker may not transition out of this state.
-	first_run_marker: OnceLock<OnceLock<()>>,
-	/// A single-use registration token which may be used to create the first
-	/// account.
-	first_account_token: String,
-}
-
-struct Services {
-	config: Dep<config::Service>,
-	users: Dep<users::Service>,
-	globals: Dep<globals::Service>,
-	admin: Dep<admin::Service>,
-}
-
-#[async_trait]
-impl crate::Service for Service {
-	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
-		Ok(Arc::new(Self {
-			services: Services {
-				config: args.depend::<config::Service>("config"),
-				users: args.depend::<users::Service>("users"),
-				globals: args.depend::<globals::Service>("globals"),
-				admin: args.depend::<admin::Service>("admin"),
-			},
-			// marker starts in an indeterminate state
-			first_run_marker: OnceLock::new(),
-			first_account_token: registration_tokens::Service::generate_token_string(),
-		}))
-	}
-
-	fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
-
-	async fn worker(self: Arc<Self>) -> Result {
-		// first run mode will be enabled if there are no local users
-		let is_first_run = self
-			.services
-			.users
-			.list_local_users()
-			.ready_filter(|user| *user != self.services.globals.server_user)
-			.next()
-			.await
-			.is_none();
-
-		self.first_run_marker
-			.set(if is_first_run {
-				// first run mode is active (empty inner lock)
-				OnceLock::new()
-			} else {
-				// first run mode is inactive (already filled inner lock)
-				OnceLock::from(())
-			})
-			.expect("Service worker should only be called once");
-
-		Ok(())
-	}
-}
-
-impl Service {
-	/// Check if first run mode is active.
-	pub fn is_first_run(&self) -> bool {
-		self.first_run_marker
-			.get()
-			.expect("First run mode should not be checked during server startup")
-			.get()
-			.is_none()
-	}
-
-	/// Disable first run mode and begin normal operation.
-	///
-	/// Returns true if first run mode was successfully disabled, and false if
-	/// first run mode was already disabled.
-	fn disable_first_run(&self) -> bool {
-		self.first_run_marker
-			.get()
-			.expect("First run mode should not be disabled during server startup")
-			.set(())
-			.is_ok()
-	}
-
-	/// If first-run mode is active, grant admin powers to the specified user
-	/// and disable first-run mode.
-	///
-	/// Returns Ok(true) if the specified user was the first user, and Ok(false)
-	/// if they were not.
-	pub async fn empower_first_user(&self, user: &UserId) -> Result<bool> {
-		#[derive(Template)]
-		#[template(path = "welcome.md.j2")]
-		struct WelcomeMessage<'a> {
-			config: &'a Dep<config::Service>,
-			domain: &'a str,
-		}
-
-		// If first run mode isn't active, do nothing.
-		if !self.disable_first_run() {
-			return Ok(false);
-		}
-
-		self.services.admin.make_user_admin(user).await?;
-
-		// Send the welcome message
-		let welcome_message = WelcomeMessage {
-			config: &self.services.config,
-			domain: self.services.globals.server_name().as_str(),
-		}
-		.render()
-		.expect("should have been able to render welcome message template");
-
-		self.services
-			.admin
-			.send_loud_message(RoomMessageEventContent::text_markdown(welcome_message))
-			.await?;
-
-		Ok(true)
-	}
-
-	/// Get the single-use registration token which may be used to create the
-	/// first account.
-	pub fn get_first_account_token(&self) -> Option<ValidToken> {
-		if self.is_first_run() {
-			Some(ValidToken {
-				token: self.first_account_token.clone(),
-				source: ValidTokenSource::FirstAccount,
-			})
-		} else {
-			None
-		}
-	}
-
-	pub(crate) fn print_first_run_banner(&self) {
-		use yansi::Paint;
-		// This function is specially called by the core after all other
-		// services have started. It runs last to ensure that the banner it
-		// prints comes after any other logging which may occur on startup.
-
-		if !self.is_first_run() {
-			return;
-		}
-
-		eprintln!();
-		eprintln!("{}", "============".bold());
-		eprintln!(
-			"Welcome to {} {}!",
-			"Continuwuity".bold().bright_magenta(),
-			conduwuit::version::version().bold()
-		);
-		eprintln!();
-		eprintln!(
-			"In order to use your new homeserver, you need to create its first user account."
-		);
-		eprintln!(
-			"Open your Matrix client of choice and register an account on {} using the \
-			 registration token {} . Pick your own username and password!",
-			self.services.globals.server_name().bold().green(),
-			self.first_account_token.as_str().bold().green()
-		);
-
-		match (
-			self.services.config.allow_registration,
-			self.services.config.get_config_file_token().is_some(),
-		) {
-			| (true, true) => {
-				eprintln!(
-					"{} until you create an account using the token above.",
-					"The registration token you set in your configuration will not function"
-						.red()
-				);
-			},
-			| (true, false) => {
-				eprintln!(
-					"{} until you create an account using the token above.",
-					"Nobody else will be able to register".green()
-				);
-			},
-			| (false, true) => {
-				eprintln!(
-					"{} because you have disabled registration in your configuration. If this \
-					 is not desired, set `allow_registration` to true and restart Continuwuity.",
-					"The registration token you set in your configuration will not be usable"
-						.yellow()
-				);
-			},
-			| (false, false) => {
-				eprintln!(
-					"{} to allow you to create an account. Because registration is not enabled \
-					 in your configuration, it will be disabled again once your account is \
-					 created.",
-					"Registration has been temporarily enabled".yellow()
-				);
-			},
-		}
-		eprintln!(
-			"{} https://matrix.org/ecosystem/clients/",
-			"Find a list of Matrix clients here:".bold()
-		);
-
-		if self.services.config.suspend_on_register {
-			eprintln!(
-				"{} Because you enabled suspend-on-register in your configuration, accounts \
-				 created after yours will be automatically suspended.",
-				"Your account will not be suspended when you register.".green()
-			);
-		}
-
-		if self
-			.services
-			.config
-			.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
-		{
-			eprintln!();
-			eprintln!(
-				"{}",
-				"You have enabled open registration in your configuration! You almost certainly \
-				 do not want to do this."
-					.bold()
-					.on_red()
-			);
-			eprintln!(
-				"{}",
-				"Servers with open, unrestricted registration are prone to abuse by spammers. \
-				 Users on your server may be unable to join chatrooms which block open \
-				 registration servers."
-					.red()
-			);
-			eprintln!(
-				"If you enabled it only for the purpose of creating the first account, {} and \
-				 create the first account using the token above.",
-				"disable it now, restart Continuwuity,".red(),
-			);
-			// TODO link to a guide on setting up reCAPTCHA
-		}
-
-		if self.services.config.emergency_password.is_some() {
-			eprintln!();
-			eprintln!(
-				"{}",
-				"You have set an emergency password for the server user! You almost certainly \
-				 do not want to do this."
-					.red()
-			);
-			eprintln!(
-				"If you set the password only for the purpose of creating the first account, {} \
-				 and create the first account using the token above.",
-				"disable it now, restart Continuwuity,".red(),
-			);
-		}
-
-		eprintln!();
-		if std::io::stdin().is_terminal() && self.services.config.admin_console_automatic {
-			eprintln!(
-				"You may also create the first user through the admin console below using the \
-				 `users create-user` command."
-			);
-		} else {
-			eprintln!(
-				"If you're running the server interactively, you may also create the first user \
-				 through the admin console using the `users create-user` command. Press Ctrl-C \
-				 to open the console."
-			);
-		}
-		eprintln!("If you need assistance setting up your homeserver, make a Matrix account on another homeserver and join our chatroom: https://matrix.to/#/#continuwuity:continuwuity.org");
-
-		eprintln!("{}", "============".bold());
-	}
-}
--- a/src/service/mod.rs
+++ b/src/service/mod.rs
@@ -18,7 +18,6 @@
 pub mod config;
 pub mod emergency;
 pub mod federation;
-pub mod firstrun;
 pub mod globals;
 pub mod key_backups;
 pub mod media;
--- a/src/service/registration_tokens/mod.rs
+++ b/src/service/registration_tokens/mod.rs
@@ -1,17 +1,14 @@
 mod data;

-use std::{future::ready, pin::Pin, sync::Arc};
+use std::sync::Arc;

 use conduwuit::{Err, Result, utils};
 use data::Data;
 pub use data::{DatabaseTokenInfo, TokenExpires};
-use futures::{
-	Stream, StreamExt,
-	stream::{iter, once},
-};
+use futures::{Stream, StreamExt, stream};
 use ruma::OwnedUserId;

-use crate::{Dep, config, firstrun};
+use crate::{Dep, config};

 const RANDOM_TOKEN_LENGTH: usize = 16;

@@ -22,7 +19,6 @@ pub struct Service {

 struct Services {
 	config: Dep<config::Service>,
-	firstrun: Dep<firstrun::Service>,
 }

 /// A validated registration token which may be used to create an account.
@@ -50,9 +46,6 @@ pub enum ValidTokenSource {
 	ConfigFile,
 	/// A database token which has been checked to be valid.
 	Database(DatabaseTokenInfo),
-	/// The single-use token which may be used to create the homeserver's first
-	/// account.
-	FirstAccount,
 }

 impl std::fmt::Display for ValidTokenSource {
@@ -60,7 +53,6 @@ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
 			| Self::ConfigFile => write!(f, "Token defined in config."),
 			| Self::Database(info) => info.fmt(f),
-			| Self::FirstAccount => write!(f, "Initial setup token."),
 		}
 	}
 }
@@ -71,7 +63,6 @@ fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
 			db: Data::new(args.db),
 			services: Services {
 				config: args.depend::<config::Service>("config"),
-				firstrun: args.depend::<firstrun::Service>("firstrun"),
 			},
 		}))
 	}
@@ -80,51 +71,45 @@ fn name(&self) -> &str { crate::service::make_name(std::module_path!()) }
 }

 impl Service {
-	/// Generate a random string suitable to be used as a registration token.
-	#[must_use]
-	pub fn generate_token_string() -> String { utils::random_string(RANDOM_TOKEN_LENGTH) }
-
 	/// Issue a new registration token and save it in the database.
 	pub fn issue_token(
 		&self,
 		creator: OwnedUserId,
 		expires: Option<TokenExpires>,
 	) -> (String, DatabaseTokenInfo) {
-		let token = Self::generate_token_string();
+		let token = utils::random_string(RANDOM_TOKEN_LENGTH);
 		let info = DatabaseTokenInfo::new(creator, expires);

 		self.db.save_token(&token, &info);
 		(token, info)
 	}

-	/// Get all the "special" registration tokens that aren't defined in the
-	/// database.
-	fn iterate_static_tokens(&self) -> impl Iterator<Item = ValidToken> {
-		// This does not include the first-account token, because it's special:
-		// no other registration tokens are valid when it is set.
-		self.services.config.get_config_file_token().into_iter()
+	/// Get the registration token set in the config file, if it exists.
+	pub fn get_config_file_token(&self) -> Option<ValidToken> {
+		self.services
+			.config
+			.registration_token
+			.clone()
+			.map(|token| ValidToken {
+				token,
+				source: ValidTokenSource::ConfigFile,
+			})
 	}

 	/// Validate a registration token.
 	pub async fn validate_token(&self, token: String) -> Option<ValidToken> {
-		// Check for the first-account token first
-		if let Some(first_account_token) = self.services.firstrun.get_first_account_token() {
-			if first_account_token == *token {
-				return Some(first_account_token);
-			}
-
-			// If the first-account token is set, no other tokens are valid
-			return None;
+		// Check the registration token in the config first
+		if self
+			.get_config_file_token()
+			.is_some_and(|valid_token| valid_token == *token)
+		{
+			return Some(ValidToken {
+				token,
+				source: ValidTokenSource::ConfigFile,
+			});
 		}

-		// Then static registration tokens
-		for static_token in self.iterate_static_tokens() {
-			if static_token == *token {
-				return Some(static_token);
-			}
-		}
-
-		// Then check the database
+		// Now check the database
 		if let Some(token_info) = self.db.lookup_token_info(&token).await
 			&& token_info.is_valid()
 		{
@@ -141,14 +126,14 @@ pub async fn validate_token(&self, token: String) -> Option<ValidToken> {
 	/// Mark a valid token as having been used to create a new account.
 	pub fn mark_token_as_used(&self, ValidToken { token, source }: ValidToken) {
 		match source {
+			| ValidTokenSource::ConfigFile => {
+				// we don't track uses of the config file token, do nothing
+			},
 			| ValidTokenSource::Database(mut info) => {
 				info.uses = info.uses.saturating_add(1);

 				self.db.save_token(&token, &info);
 			},
-			| _ => {
-				// Do nothing for other token sources.
-			},
 		}
 	}

@@ -159,6 +144,7 @@ pub fn mark_token_as_used(&self, ValidToken { token, source }: ValidToken) {
 	pub fn revoke_token(&self, ValidToken { token, source }: ValidToken) -> Result {
 		match source {
 			| ValidTokenSource::ConfigFile => {
+				// the config file token cannot be revoked
 				Err!(
 					"The token set in the config file cannot be revoked. Edit the config file \
 					 to change it."
@@ -168,19 +154,11 @@ pub fn revoke_token(&self, ValidToken { token, source }: ValidToken) -> Result {
 				self.db.revoke_token(&token);
 				Ok(())
 			},
-			| ValidTokenSource::FirstAccount => {
-				Err!("The initial setup token cannot be revoked.")
-			},
 		}
 	}

 	/// Iterate over all valid registration tokens.
-	pub fn iterate_tokens(&self) -> Pin<Box<dyn Stream<Item = ValidToken> + Send + '_>> {
-		// If the first-account token is set, no other tokens are valid
-		if let Some(first_account_token) = self.services.firstrun.get_first_account_token() {
-			return once(ready(first_account_token)).boxed();
-		}
-
+	pub fn iterate_tokens(&self) -> impl Stream<Item = ValidToken> + Send + '_ {
 		let db_tokens = self
 			.db
 			.iterate_and_clean_tokens()
@@ -189,6 +167,6 @@ pub fn iterate_tokens(&self) -> Pin<Box<dyn Stream<Item = ValidToken> + Send + '
 				source: ValidTokenSource::Database(info),
 			});

-		iter(self.iterate_static_tokens()).chain(db_tokens).boxed()
+		stream::iter(self.get_config_file_token()).chain(db_tokens)
 	}
 }
--- a/src/service/rooms/event_handler/handle_incoming_pdu.rs
+++ b/src/service/rooms/event_handler/handle_incoming_pdu.rs
@@ -4,83 +4,18 @@
 };

 use conduwuit::{
-	Err, Event, PduEvent, Result, debug::INFO_SPAN_LEVEL, debug_error, debug_info, defer, err,
-	implement, info, trace, utils::stream::IterStream, warn,
+	Err, Event, Result, debug::INFO_SPAN_LEVEL, defer, err, implement, info,
+	utils::stream::IterStream, warn,
 };
 use futures::{
 	FutureExt, TryFutureExt, TryStreamExt,
-	future::{OptionFuture, try_join4},
-};
-use ruma::{
-	CanonicalJsonValue, EventId, OwnedUserId, RoomId, ServerName, UserId,
-	events::{
-		StateEventType, TimelineEventType,
-		room::member::{MembershipState, RoomMemberEventContent},
-	},
+	future::{OptionFuture, try_join5},
 };
+use ruma::{CanonicalJsonValue, EventId, RoomId, ServerName, UserId, events::StateEventType};
 use tracing::debug;

 use crate::rooms::timeline::{RawPduId, pdu_fits};

-async fn should_rescind_invite(
-	services: &crate::rooms::event_handler::Services,
-	content: &mut BTreeMap<String, CanonicalJsonValue>,
-	sender: &UserId,
-	room_id: &RoomId,
-) -> Result<Option<PduEvent>> {
-	// We insert a bogus event ID since we can't actually calculate the right one
-	content.insert("event_id".to_owned(), CanonicalJsonValue::String("$rescind".to_owned()));
-	let pdu_event = serde_json::from_value::<PduEvent>(
-		serde_json::to_value(&content).expect("CanonicalJsonObj is a valid JsonValue"),
-	)
-	.map_err(|e| err!("invalid PDU: {e}"))?;
-
-	if pdu_event.room_id().is_none_or(|r| r != room_id)
-		&& pdu_event.sender() != sender
-		&& pdu_event.event_type() != &TimelineEventType::RoomMember
-		&& pdu_event.state_key().is_none_or(|v| v == sender.as_str())
-	{
-		return Ok(None);
-	}
-
-	let target_user_id = UserId::parse(pdu_event.state_key().unwrap())?;
-	if pdu_event
-		.get_content::<RoomMemberEventContent>()?
-		.membership
-		!= MembershipState::Leave
-	{
-		return Ok(None); // Not a leave event
-	}
-
-	// Does the target user have a pending invite?
-	let Ok(pending_invite_state) = services
-		.state_cache
-		.invite_state(target_user_id, room_id)
-		.await
-	else {
-		return Ok(None); // No pending invite, so nothing to rescind
-	};
-	for event in pending_invite_state {
-		if event
-			.get_field::<String>("type")?
-			.is_some_and(|t| t == "m.room.member")
-			|| event
-				.get_field::<OwnedUserId>("state_key")?
-				.is_some_and(|s| s == *target_user_id)
-			|| event
-				.get_field::<OwnedUserId>("sender")?
-				.is_some_and(|s| s == *sender)
-			|| event
-				.get_field::<RoomMemberEventContent>("content")?
-				.is_some_and(|c| c.membership == MembershipState::Invite)
-		{
-			return Ok(Some(pdu_event));
-		}
-	}
-
-	Ok(None)
-}
-
 /// When receiving an event one needs to:
 /// 0. Check the server is in the room
 /// 1. Skip the PDU if we already know about it
@@ -134,7 +69,6 @@ pub async fn handle_incoming_pdu<'a>(
 		);
 		return Err!(Request(TooLarge("PDU is too large")));
 	}
-	trace!("processing incoming pdu from {origin} for room {room_id} with event id {event_id}");

 	// 1.1 Check we even know about the room
 	let meta_exists = self.services.metadata.exists(room_id).map(Ok);
@@ -157,14 +91,24 @@ pub async fn handle_incoming_pdu<'a>(
 		.then(|| self.acl_check(sender.server_name(), room_id))
 		.into();

-	let (meta_exists, is_disabled, (), ()) = try_join4(
+	// Fetch create event
+	let create_event =
+		self.services
+			.state_accessor
+			.room_state_get(room_id, &StateEventType::RoomCreate, "");
+
+	let (meta_exists, is_disabled, (), (), ref create_event) = try_join5(
 		meta_exists,
 		is_disabled,
 		origin_acl_check,
 		sender_acl_check.map(|o| o.unwrap_or(Ok(()))),
+		create_event,
 	)
-	.await
-	.inspect_err(|e| debug_error!("failed to handle incoming PDU: {e}"))?;
+	.await?;
+
+	if !meta_exists {
+		return Err!(Request(NotFound("Room is unknown to this server")));
+	}

 	if is_disabled {
 		return Err!(Request(Forbidden("Federation of this room is disabled by this server.")));
@@ -176,23 +120,6 @@ pub async fn handle_incoming_pdu<'a>(
 		.server_in_room(self.services.globals.server_name(), room_id)
 		.await
 	{
-		// Is this a federated invite rescind?
-		// copied from https://github.com/element-hq/synapse/blob/7e4588a/synapse/handlers/federation_event.py#L255-L300
-		if value.get("type").and_then(|t| t.as_str()) == Some("m.room.member") {
-			if let Some(pdu) =
-				should_rescind_invite(&self.services, &mut value.clone(), sender, room_id).await?
-			{
-				debug_info!(
-					"Invite to {room_id} appears to have been rescinded by {sender}, marking as \
-					 left"
-				);
-				self.services
-					.state_cache
-					.mark_as_left(sender, room_id, Some(pdu))
-					.await;
-				return Ok(None);
-			}
-		}
 		info!(
 			%origin,
 			"Dropping inbound PDU for room we aren't participating in"
@@ -200,17 +127,6 @@ pub async fn handle_incoming_pdu<'a>(
 		return Err!(Request(NotFound("This server is not participating in that room.")));
 	}

-	if !meta_exists {
-		return Err!(Request(NotFound("Room is unknown to this server")));
-	}
-
-	// Fetch create event
-	let create_event = &(self
-		.services
-		.state_accessor
-		.room_state_get(room_id, &StateEventType::RoomCreate, "")
-		.await?);
-
 	let (incoming_pdu, val) = self
 		.handle_outlier_pdu(origin, create_event, event_id, room_id, value, false)
 		.await?;
--- a/src/service/rooms/event_handler/parse_incoming_pdu.rs
+++ b/src/service/rooms/event_handler/parse_incoming_pdu.rs
@@ -56,7 +56,7 @@ pub async fn parse_incoming_pdu(&self, pdu: &RawJsonValue) -> Result<Parsed> {
 		.state
 		.get_room_version(&room_id)
 		.await
-		.unwrap_or(RoomVersionId::V1);
+		.map_err(|_| err!("Server is not in room {room_id}"))?;
 	let (event_id, value) = gen_event_id_canonical_json(pdu, &room_version_id).map_err(|e| {
 		err!(Request(InvalidParam("Could not convert event to canonical json: {e}")))
 	})?;
--- a/src/service/rooms/event_handler/policy_server.rs
+++ b/src/service/rooms/event_handler/policy_server.rs
@@ -58,11 +58,7 @@ pub async fn ask_policy_server(
 		.state_accessor
 		.room_state_get_content(room_id, &StateEventType::RoomPolicy, "")
 		.await
-		.inspect_err(|e| {
-			if !e.is_not_found() {
-				debug_error!("failed to load room policy server state event: {e}");
-			}
-		})
+		.inspect_err(|e| debug_error!("failed to load room policy server state event: {e}"))
 		.map(|c: RoomPolicyEventContent| c)
 	else {
 		debug!("room has no policy server configured");
--- a/src/service/services.rs
+++ b/src/service/services.rs
@@ -9,7 +9,7 @@

 use crate::{
 	account_data, admin, announcements, antispam, appservice, client, config, emergency,
-	federation, firstrun, globals, key_backups,
+	federation, globals, key_backups,
 	manager::Manager,
 	media, moderation, presence, pusher, registration_tokens, resolver, rooms, sending,
 	server_keys,
@@ -33,7 +33,6 @@ pub struct Services {
 	pub resolver: Arc<resolver::Service>,
 	pub rooms: rooms::Service,
 	pub federation: Arc<federation::Service>,
-	pub firstrun: Arc<firstrun::Service>,
 	pub sending: Arc<sending::Service>,
 	pub server_keys: Arc<server_keys::Service>,
 	pub sync: Arc<sync::Service>,
@@ -68,9 +67,6 @@ macro_rules! build {
 		}

 		Ok(Arc::new(Self {
-			// firstrun service should be built first so other services
-			// can check first-run state
-			firstrun: build!(firstrun::Service),
 			account_data: build!(account_data::Service),
 			admin: build!(admin::Service),
 			appservice: build!(appservice::Service),
@@ -148,14 +144,6 @@ pub async fn start(self: &Arc<Self>) -> Result<Arc<Self>> {
 		}

 		debug_info!("Services startup complete.");
-
-		// Run startup admin commands
-		self.admin.startup_execute().await?;
-
-		// Prin first-run banner if necessary. This needs to be done after the startup
-		// admin commands are run in case one of them created the first user.
-		self.firstrun.print_first_run_banner();
-
 		Ok(Arc::clone(self))
 	}

--- a/src/service/templates/welcome.md.j2
+++ b/src/service/templates/welcome.md.j2
@@ -1,29 +0,0 @@
-## Thank you for trying out Continuwuity!
-
-Your new homeserver is ready to use! {%- if config.allow_federation %} To make sure you can federate with the rest of the Matrix network, consider checking your domain (`{{ domain }}`) with a federation tester like [this one](https://connectivity-tester.mtrnord.blog/). {%- endif %}
-
-{% if config.get_config_file_token().is_some() -%}
-Users may now create accounts normally using the configured registration token.
-{%- else if config.recaptcha_site_key.is_some() -%}
-Users may now create accounts normally after solving a CAPTCHA.
-{%- else if config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse -%}
-**This server has open, unrestricted registration enabled!** Anyone, including spammers, may now create an account with no further steps. If this is not desired behavior, set `yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse` to `false` in your configuration and restart the server.
-{%- else if config.allow_registration -%}
-To allow more users to register, use the `!admin token` admin commands to issue registration tokens, or set a registration token in the configuration.
-{%- else -%}
-You've disabled registration. To create more accounts, use the `!admin users create-user` admin command.
-{%- endif %}
-
-This room is your server's admin room. You can send messages starting with `!admin` in this room to perform a range of administrative actions.
-To view a list of available commands, send the following message: `!admin --help`
-
-Project chatrooms:
-> Support chatroom: https://matrix.to/#/#continuwuity:continuwuity.org
-> Update announcements: https://matrix.to/#/#announcements:continuwuity.org
-> Other chatrooms: https://matrix.to/#/#space:continuwuity.org
->
-
-Helpful links:
-> Source code: https://forgejo.ellis.link/continuwuation/continuwuity
-> Documentation: https://continuwuity.org/
-> Report issues: https://forgejo.ellis.link/continuwuation/continuwuity/issues
--- a/src/service/users/mod.rs
+++ b/src/service/users/mod.rs
@@ -187,9 +187,7 @@ pub async fn create(
 		self.db
 			.userid_origin
 			.insert(user_id, origin.unwrap_or("password"));
-		self.set_password(user_id, password).await?;
-
-		Ok(())
+		self.set_password(user_id, password).await
 	}

 	/// Deactivate account
@@ -1271,12 +1269,12 @@ pub fn set_profile_key(
 	}

 	#[cfg(not(feature = "ldap"))]
-	pub async fn search_ldap(&self, _user_id: &UserId) -> Result<Vec<(String, Option<bool>)>> {
+	pub async fn search_ldap(&self, _user_id: &UserId) -> Result<Vec<(String, bool)>> {
 		Err!(FeatureDisabled("ldap"))
 	}

 	#[cfg(feature = "ldap")]
-	pub async fn search_ldap(&self, user_id: &UserId) -> Result<Vec<(String, Option<bool>)>> {
+	pub async fn search_ldap(&self, user_id: &UserId) -> Result<Vec<(String, bool)>> {
 		let localpart = user_id.localpart().to_owned();
 		let lowercased_localpart = localpart.to_lowercase();

@@ -1320,7 +1318,7 @@ pub async fn search_ldap(&self, user_id: &UserId) -> Result<Vec<(String, Option<
 			.inspect(|(entries, result)| trace!(?entries, ?result, "LDAP Search"))
 			.map_err(|e| err!(Ldap(error!(?attr, ?user_filter, "LDAP search error: {e}"))))?;

-		let mut dns: HashMap<String, Option<bool>> = entries
+		let mut dns: HashMap<String, bool> = entries
 			.into_iter()
 			.filter_map(|entry| {
 				let search_entry = SearchEntry::construct(entry);
@@ -1331,16 +1329,11 @@ pub async fn search_ldap(&self, user_id: &UserId) -> Result<Vec<(String, Option<
 					.into_iter()
 					.chain(search_entry.attrs.get(&config.name_attribute))
 					.any(|ids| ids.contains(&localpart) || ids.contains(&lowercased_localpart))
-					.then_some((search_entry.dn, None))
+					.then_some((search_entry.dn, false))
 			})
 			.collect();

 		if !config.admin_filter.is_empty() {
-			// Update all existing entries to Some(false) since we can now determine admin
-			// status
-			for admin_status in dns.values_mut() {
-				*admin_status = Some(false);
-			}
 			let admin_base_dn = if config.admin_base_dn.is_empty() {
 				&config.base_dn
 			} else {
@@ -1369,7 +1362,7 @@ pub async fn search_ldap(&self, user_id: &UserId) -> Result<Vec<(String, Option<
 					.into_iter()
 					.chain(search_entry.attrs.get(&config.name_attribute))
 					.any(|ids| ids.contains(&localpart) || ids.contains(&lowercased_localpart))
-					.then_some((search_entry.dn, Some(true)))
+					.then_some((search_entry.dn, true))
 			}));
 		}

--- a/src/web/Cargo.toml
+++ b/src/web/Cargo.toml
@@ -20,7 +20,9 @@ crate-type = [
 [dependencies]
 conduwuit-build-metadata.workspace = true
 conduwuit-service.workspace = true
-askama.workspace = true
+
+askama = "0.14.0"
+
 axum.workspace = true
 futures.workspace = true
 tracing.workspace = true
--- a/src/web/css/index.css
+++ b/src/web/css/index.css
@@ -83,12 +83,3 @@ footer {
    color: transparent;
    filter: brightness(1.2);
 }
-
-b {
-    color: oklch(from var(--c2) var(--name-lightness) c h);
-}
-
-.logo {
-    width: 100%;
-    height: 64px;
-}
--- a/src/web/mod.rs
+++ b/src/web/mod.rs
@@ -10,9 +10,8 @@
 use conduwuit_service::state;

 pub fn build() -> Router<state::State> {
-	Router::<state::State>::new()
-		.route("/", get(index_handler))
-		.route("/_continuwuity/logo.svg", get(logo_handler))
+	let router = Router::<state::State>::new();
+	router.route("/", get(index_handler))
 }

 async fn index_handler(
@@ -20,34 +19,22 @@ async fn index_handler(
 ) -> Result<impl IntoResponse, WebError> {
 	#[derive(Debug, Template)]
 	#[template(path = "index.html.j2")]
-	struct Index<'a> {
+	struct Tmpl<'a> {
 		nonce: &'a str,
 		server_name: &'a str,
-		first_run: bool,
 	}
 	let nonce = rand::random::<u64>().to_string();

-	let template = Index {
+	let template = Tmpl {
 		nonce: &nonce,
 		server_name: services.config.server_name.as_str(),
-		first_run: services.firstrun.is_first_run(),
 	};
 	Ok((
-		[(
-			header::CONTENT_SECURITY_POLICY,
-			format!("default-src 'nonce-{nonce}'; img-src 'self';"),
-		)],
+		[(header::CONTENT_SECURITY_POLICY, format!("default-src 'none' 'nonce-{nonce}';"))],
 		Html(template.render()?),
 	))
 }

-async fn logo_handler() -> impl IntoResponse {
-	(
-		[(header::CONTENT_TYPE, "image/svg+xml")],
-		include_str!("templates/logo.svg").to_owned(),
-	)
-}
-
 #[derive(Debug, thiserror::Error)]
 enum WebError {
 	#[error("Failed to render template: {0}")]
@@ -58,7 +45,7 @@ impl IntoResponse for WebError {
 	fn into_response(self) -> Response {
 		#[derive(Debug, Template)]
 		#[template(path = "error.html.j2")]
-		struct Error<'a> {
+		struct Tmpl<'a> {
 			nonce: &'a str,
 			err: WebError,
 		}
@@ -68,7 +55,7 @@ struct Error<'a> {
 		let status = match &self {
 			| Self::Render(_) => StatusCode::INTERNAL_SERVER_ERROR,
 		};
-		let tmpl = Error { nonce: &nonce, err: self };
+		let tmpl = Tmpl { nonce: &nonce, err: self };
 		if let Ok(body) = tmpl.render() {
 			(
 				status,
--- a/src/web/templates/_layout.html.j2
+++ b/src/web/templates/_layout.html.j2
@@ -6,7 +6,6 @@
    <title>{% block title %}Continuwuity{% endblock %}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1" />

-    <link rel="icon" href="/_continuwuity/logo.svg">
    <style type="text/css" nonce="{{ nonce }}">
        /*<![CDATA[*/
            {{ include_str !("css/index.css") | safe }}
@@ -18,8 +17,7 @@
    <main>{%~ block content %}{% endblock ~%}</main>
    {%~ block footer ~%}
        <footer>
-            <img class="logo" src="/_continuwuity/logo.svg">
-            <p>Powered by <a href="https://continuwuity.org">Continuwuity</a> {{ env!("CARGO_PKG_VERSION") }}
+            <p>Powered by <a href="https://continuwuity.org">Continuwuity</a>
                {%~ if let Some(version_info) = self::version_tag() ~%}
                    {%~ if let Some(url) = GIT_REMOTE_COMMIT_URL.or(GIT_REMOTE_WEB_URL) ~%}
                        (<a href="{{ url }}">{{ version_info }}</a>)
--- a/src/web/templates/index.html.j2
+++ b/src/web/templates/index.html.j2
@@ -1,16 +1,16 @@
 {% extends "_layout.html.j2" %}
 {%- block content -%}
+<div class="orb"></div>
 <div class="panel">
-    <h1>
-        Welcome to <a class="project-name" href="https://continuwuity.org">Continuwuity</a>!
-    </h1>
-    <p>Continuwuity is successfully installed and working.</p>
-    {%- if first_run %}
-    <p>To get started, <b>check the server logs</b> for instructions on how to create the first account.</p>
-    <p>For support, take a look at the <a href="https://continuwuity.org/introduction">documentation</a> or join the <a href="https://matrix.to/#/#continuwuity:continuwuity.org?via=continuwuity.org&via=ellis.link&via=explodie.org&via=matrix.org">Continuwuity Matrix room</a>.</p>
-    {%- else %}
-    <p>To get started, <a href="https://matrix.org/ecosystem/clients">choose a client</a> and connect to <code>{{ server_name }}</code>.</p>
-    {%- endif %}
+    <h1>Welcome to <a class="project-name" href="https://continuwuity.org">Continuwuity</a>!</h1>
+    <p>Continuwuity is successfully installed and working. </p>
+    <p>To get started, you can:</p>
+    <ul>
+        <li>Read the <a href="https://continuwuity.org/introduction">documentation</a></li>
+        <li>Join the <a href="https://matrix.to/#/#continuwuity:continuwuity.org?via=continuwuity.org&via=ellis.link&via=explodie.org&via=matrix.org">Continuwuity Matrix room</a> or <a href="https://matrix.to/#/#space:continuwuity.org?via=continuwuity.org&via=ellis.link&via=explodie.org&via=matrix.org">space</a></li>
+        <li>Log in with a <a href="https://matrix.org/ecosystem/clients/">client</a></li>
+        <li>Ensure <a href="https://federationtester.matrix.org/#{{ server_name }}">federation</a> works</li>
+    </ul>
 </div>

 {%- endblock content -%}
--- a/src/web/templates/logo.svg
+++ b/src/web/templates/logo.svg
@@ -1 +0,0 @@
-../../../docs/public/assets/logo.svg
				`@@ -1 +0,0 @@`
				`LDAP-enabled servers will no longer have all admins demoted when LDAP-controlled admins are not configured. Contributed by @Jade`
				`@@ -1 +0,0 @@`
				`Continuwuity will now print information to the console when it detects a deadlock`
				`@@ -1 +0,0 @@`
				`Improved the handling of restricted join rules and improved the performance of local-first joins. Contributed by @nex.`
				`@@ -1 +0,0 @@`
				`Fixed sliding sync not resolving wildcard state key requests, enabling Video/Audio calls in Element X.`
				`@@ -1 +0,0 @@`
				`You can now set a custom User Agent for URL previews; the default one has been modified to be less likely to be rejected. Contributed by @trashpanda`