changelog

Remove v2 variant from endpoints
Knocking Endpoints added (federated)
2024-05-17 10:45:20 +01:00 · 2024-05-15 11:59:15 +01:00 · 2024-04-07 01:08:57 +02:00
197 changed files with 3885 additions and 10962 deletions
@@ -30,7 +30,7 @@ jobs:
        run: docker buildx inspect

      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.5.0
+        uses: sigstore/cosign-installer@v3.4.0

      - name: Checkout repository
        uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
          fetch-depth: 0

      - name: Setup mdbook
-        uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
+        uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
        with:
          mdbook-version: '0.4.17'

@@ -53,7 +53,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Setup mdbook
-        uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
+        uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
        with:
          mdbook-version: '0.4.17'

@@ -56,7 +56,7 @@ jobs:
          fetch-depth: 0

      - name: Setup mdbook
-        uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2.0.0
+        uses: peaceiris/actions-mdbook@adeb05db28a0c0004681db83893d56c0388ea9ea # v1.2.0
        with:
          mdbook-version: '0.4.17'

@@ -80,8 +80,38 @@ jobs:

      # Deploy to the target directory.
      - name: Deploy to gh pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
+        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          publish_dir: ./book
          destination_dir: ./${{ needs.pre.outputs.branch-version }}
+
+################################################################################
+  pages-devdocs:
+    name: GitHub Pages (developer docs)
+    runs-on: ubuntu-latest
+    needs:
+      - pre
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Set up Sphinx"
+        uses: matrix-org/setup-python-poetry@v1
+        with:
+          python-version: "3.x"
+          poetry-version: "1.3.2"
+          groups: "dev-docs"
+          extras: ""
+
+      - name: Build the documentation
+        run: |
+          cd dev-docs
+          poetry run make html
+
+      # Deploy to the target directory.
+      - name: Deploy to gh pages
+        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dev-docs/_build/html
+          destination_dir: ./dev-docs/${{ needs.pre.outputs.branch-version }}
@@ -102,7 +102,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-11]
        arch: [x86_64, aarch64]
        # is_pr is a flag used to exclude certain jobs from the matrix on PRs.
        # It is not read by the rest of the workflow.
@@ -112,9 +112,9 @@ jobs:
        exclude:
          # Don't build macos wheels on PR CI.
          - is_pr: true
-            os: "macos-12"
+            os: "macos-11"
          # Don't build aarch64 wheels on mac.
-          - os: "macos-12"
+          - os: "macos-11"
            arch: aarch64
          # Don't build aarch64 wheels on PR CI.
          - is_pr: true
@@ -130,7 +130,7 @@ jobs:
          python-version: "3.x"

      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.19.1
+        run: python -m pip install cibuildwheel==2.16.2

      - name: Set up QEMU to emulate aarch64
        if: matrix.arch == 'aarch64'
@@ -81,7 +81,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2
      - uses: matrix-org/setup-python-poetry@v1
        with:
@@ -148,7 +148,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      - name: Setup Poetry
@@ -208,7 +208,7 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2
      - uses: matrix-org/setup-python-poetry@v1
        with:
@@ -225,7 +225,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
        with:
            components: clippy
      - uses: Swatinem/rust-cache@v2
@@ -344,7 +344,7 @@ jobs:
            postgres:${{ matrix.job.postgres-version }}

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      - uses: matrix-org/setup-python-poetry@v1
@@ -386,7 +386,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      # There aren't wheels for some of the older deps, so we need to install
@@ -479,9 +479,6 @@ jobs:
      volumes:
        - ${{ github.workspace }}:/src
      env:
-        # If this is a pull request to a release branch, use that branch as default branch for sytest, else use develop
-        # This works because the release script always create a branch on the sytest repo with the same name as the release branch
-        SYTEST_DEFAULT_BRANCH: ${{ startsWith(github.base_ref, 'release-') && github.base_ref || 'develop' }}
        SYTEST_BRANCH: ${{ github.head_ref }}
        POSTGRES: ${{ matrix.job.postgres && 1}}
        MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') || '' }}
@@ -501,7 +498,7 @@ jobs:
        run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      - name: Run SyTest
@@ -645,7 +642,7 @@ jobs:
          path: synapse

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      - name: Prepare Complement's Prerequisites
@@ -677,7 +674,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66.0
+        uses: dtolnay/rust-toolchain@1.65.0
      - uses: Swatinem/rust-cache@v2

      - run: cargo test
@@ -1,309 +1,3 @@
-# Synapse 1.109.0 (2024-06-18)
-
-### Internal Changes
-
- Fix the building of binary wheels for macOS by switching to macOS 12 CI runners. ([\#17319](https://github.com/element-hq/synapse/issues/17319))
-
-
-
-
-# Synapse 1.109.0rc3 (2024-06-17)
-
-### Bugfixes
-
- When rolling back to a previous Synapse version and then forwards again to this release, don't require server operators to manually run SQL. ([\#17305](https://github.com/element-hq/synapse/issues/17305), [\#17309](https://github.com/element-hq/synapse/issues/17309))
-
-### Internal Changes
-
- Use the release branch for sytest in release-branch PRs. ([\#17306](https://github.com/element-hq/synapse/issues/17306))
-
-
-
-
-# Synapse 1.109.0rc2 (2024-06-11)
-
-### Bugfixes
-
- Fix bug where one-time-keys were not always included in `/sync` response when using workers. Introduced in v1.109.0rc1. ([\#17275](https://github.com/element-hq/synapse/issues/17275))
- Fix bug where `/sync` could get stuck due to edge case in device lists handling. Introduced in v1.109.0rc1. ([\#17292](https://github.com/element-hq/synapse/issues/17292))
-
-
-
-
-# Synapse 1.109.0rc1 (2024-06-04)
-
-### Features
-
- Add the ability to auto-accept invites on the behalf of users. See the [`auto_accept_invites`](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#auto-accept-invites) config option for details. ([\#17147](https://github.com/element-hq/synapse/issues/17147))
- Add experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync/e2ee` endpoint for to-device messages and device encryption info. ([\#17167](https://github.com/element-hq/synapse/issues/17167))
- Support [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/issues/3916) by adding unstable media endpoints to `/_matrix/client`. ([\#17213](https://github.com/element-hq/synapse/issues/17213))
- Add logging to tasks managed by the task scheduler, showing CPU and database usage. ([\#17219](https://github.com/element-hq/synapse/issues/17219))
-
-### Bugfixes
-
- Fix deduplicating of membership events to not create unused state groups. ([\#17164](https://github.com/element-hq/synapse/issues/17164))
- Fix bug where duplicate events could be sent down sync when using workers that are overloaded. ([\#17215](https://github.com/element-hq/synapse/issues/17215))
- Ignore attempts to send to-device messages to bad users, to avoid log spam when we try to connect to the bad server. ([\#17240](https://github.com/element-hq/synapse/issues/17240))
- Fix handling of duplicate concurrent uploading of device one-time-keys. ([\#17241](https://github.com/element-hq/synapse/issues/17241))
- Fix reporting of default tags to Sentry, such as worker name. Broke in v1.108.0. ([\#17251](https://github.com/element-hq/synapse/issues/17251))
- Fix bug where typing updates would not be sent when using workers after a restart. ([\#17252](https://github.com/element-hq/synapse/issues/17252))
-
-### Improved Documentation
-
- Update the LemonLDAP documentation to say that claims should be explicitly included in the returned `id_token`, as Synapse won't request them. ([\#17204](https://github.com/element-hq/synapse/issues/17204))
-
-### Internal Changes
-
- Improve DB usage when fetching related events. ([\#17083](https://github.com/element-hq/synapse/issues/17083))
- Log exceptions when failing to auto-join new user according to the `auto_join_rooms` option. ([\#17176](https://github.com/element-hq/synapse/issues/17176))
- Reduce work of calculating outbound device lists updates. ([\#17211](https://github.com/element-hq/synapse/issues/17211))
- Improve performance of calculating device lists changes in `/sync`. ([\#17216](https://github.com/element-hq/synapse/issues/17216))
- Move towards using `MultiWriterIdGenerator` everywhere. ([\#17226](https://github.com/element-hq/synapse/issues/17226))
- Replaces all usages of `StreamIdGenerator` with `MultiWriterIdGenerator`. ([\#17229](https://github.com/element-hq/synapse/issues/17229))
- Change the `allow_unsafe_locale` config option to also apply when setting up new databases. ([\#17238](https://github.com/element-hq/synapse/issues/17238))
- Fix errors in logs about closing incorrect logging contexts when media gets rejected by a module. ([\#17239](https://github.com/element-hq/synapse/issues/17239), [\#17246](https://github.com/element-hq/synapse/issues/17246))
- Clean out invalid destinations from `device_federation_outbox` table. ([\#17242](https://github.com/element-hq/synapse/issues/17242))
- Stop logging errors when receiving invalid User IDs in key querys requests. ([\#17250](https://github.com/element-hq/synapse/issues/17250))
-
-
-
-### Updates to locked dependencies
-
-* Bump anyhow from 1.0.83 to 1.0.86. ([\#17220](https://github.com/element-hq/synapse/issues/17220))
-* Bump bcrypt from 4.1.2 to 4.1.3. ([\#17224](https://github.com/element-hq/synapse/issues/17224))
-* Bump lxml from 5.2.1 to 5.2.2. ([\#17261](https://github.com/element-hq/synapse/issues/17261))
-* Bump mypy-zope from 1.0.3 to 1.0.4. ([\#17262](https://github.com/element-hq/synapse/issues/17262))
-* Bump phonenumbers from 8.13.35 to 8.13.37. ([\#17235](https://github.com/element-hq/synapse/issues/17235))
-* Bump prometheus-client from 0.19.0 to 0.20.0. ([\#17233](https://github.com/element-hq/synapse/issues/17233))
-* Bump pyasn1 from 0.5.1 to 0.6.0. ([\#17223](https://github.com/element-hq/synapse/issues/17223))
-* Bump pyicu from 2.13 to 2.13.1. ([\#17236](https://github.com/element-hq/synapse/issues/17236))
-* Bump pyopenssl from 24.0.0 to 24.1.0. ([\#17234](https://github.com/element-hq/synapse/issues/17234))
-* Bump serde from 1.0.201 to 1.0.202. ([\#17221](https://github.com/element-hq/synapse/issues/17221))
-* Bump serde from 1.0.202 to 1.0.203. ([\#17232](https://github.com/element-hq/synapse/issues/17232))
-* Bump twine from 5.0.0 to 5.1.0. ([\#17225](https://github.com/element-hq/synapse/issues/17225))
-* Bump types-psycopg2 from 2.9.21.20240311 to 2.9.21.20240417. ([\#17222](https://github.com/element-hq/synapse/issues/17222))
-* Bump types-pyopenssl from 24.0.0.20240311 to 24.1.0.20240425. ([\#17260](https://github.com/element-hq/synapse/issues/17260))
-
-# Synapse 1.108.0 (2024-05-28)
-
-No significant changes since 1.108.0rc1.
-
-
-
-
-# Synapse 1.108.0rc1 (2024-05-21)
-
-### Features
-
- Add a feature that allows clients to query the configured federation whitelist. Disabled by default. ([\#16848](https://github.com/element-hq/synapse/issues/16848), [\#17199](https://github.com/element-hq/synapse/issues/17199))
- Add the ability to allow numeric user IDs with a specific prefix when in the CAS flow. Contributed by Aurélien Grimpard. ([\#17098](https://github.com/element-hq/synapse/issues/17098))
-
-### Bugfixes
-
- Fix bug where push rules would be empty in `/sync` for some accounts. Introduced in v1.93.0. ([\#17142](https://github.com/element-hq/synapse/issues/17142))
- Add support for optional whitespace around the Federation API's `Authorization` header's parameter commas. ([\#17145](https://github.com/element-hq/synapse/issues/17145))
- Fix bug where disabling room publication prevented public rooms being created on workers. ([\#17177](https://github.com/element-hq/synapse/issues/17177), [\#17184](https://github.com/element-hq/synapse/issues/17184))
-
-### Improved Documentation
-
- Document [`/v1/make_knock`](https://spec.matrix.org/v1.10/server-server-api/#get_matrixfederationv1make_knockroomiduserid) and [`/v1/send_knock/`](https://spec.matrix.org/v1.10/server-server-api/#put_matrixfederationv1send_knockroomideventid) federation endpoints as worker-compatible. ([\#17058](https://github.com/element-hq/synapse/issues/17058))
- Update User Admin API with note about prefixing OIDC external_id providers. ([\#17139](https://github.com/element-hq/synapse/issues/17139))
- Clarify the state of the created room when using the `autocreate_auto_join_room_preset` config option. ([\#17150](https://github.com/element-hq/synapse/issues/17150))
- Update the Admin FAQ with the current libjemalloc version for latest Debian stable. Additionally update the name of the "push_rules" stream in the Workers documentation. ([\#17171](https://github.com/element-hq/synapse/issues/17171))
-
-### Internal Changes
-
- Add note to reflect that [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) is closed but will remain supported for some time. ([\#17151](https://github.com/element-hq/synapse/issues/17151))
- Update dependency PyO3 to 0.21. ([\#17162](https://github.com/element-hq/synapse/issues/17162))
- Fixes linter errors found in PR #17147. ([\#17166](https://github.com/element-hq/synapse/issues/17166))
- Bump black from 24.2.0 to 24.4.2. ([\#17170](https://github.com/element-hq/synapse/issues/17170))
- Cache literal sync filter validation for performance. ([\#17186](https://github.com/element-hq/synapse/issues/17186))
- Improve performance by fixing a reactor pause. ([\#17192](https://github.com/element-hq/synapse/issues/17192))
- Route `/make_knock` and `/send_knock` federation APIs to the federation reader worker in Complement test runs. ([\#17195](https://github.com/element-hq/synapse/issues/17195))
- Prepare sync handler to be able to return different sync responses (`SyncVersion`). ([\#17200](https://github.com/element-hq/synapse/issues/17200))
- Organize the sync cache key parameter outside of the sync config (separate concerns). ([\#17201](https://github.com/element-hq/synapse/issues/17201))
- Refactor `SyncResultBuilder` assembly to its own function. ([\#17202](https://github.com/element-hq/synapse/issues/17202))
- Rename to be obvious: `joined_rooms` -> `joined_room_ids`. ([\#17203](https://github.com/element-hq/synapse/issues/17203), [\#17208](https://github.com/element-hq/synapse/issues/17208))
- Add a short pause when rate-limiting a request. ([\#17210](https://github.com/element-hq/synapse/issues/17210))
-
-
-
-### Updates to locked dependencies
-
-* Bump cryptography from 42.0.5 to 42.0.7. ([\#17180](https://github.com/element-hq/synapse/issues/17180))
-* Bump gitpython from 3.1.41 to 3.1.43. ([\#17181](https://github.com/element-hq/synapse/issues/17181))
-* Bump immutabledict from 4.1.0 to 4.2.0. ([\#17179](https://github.com/element-hq/synapse/issues/17179))
-* Bump sentry-sdk from 1.40.3 to 2.1.1. ([\#17178](https://github.com/element-hq/synapse/issues/17178))
-* Bump serde from 1.0.200 to 1.0.201. ([\#17183](https://github.com/element-hq/synapse/issues/17183))
-* Bump serde_json from 1.0.116 to 1.0.117. ([\#17182](https://github.com/element-hq/synapse/issues/17182))
-
-Synapse 1.107.0 (2024-05-14)
-============================
-
-No significant changes since 1.107.0rc1.
-
-
-# Synapse 1.107.0rc1 (2024-05-07)
-
-### Features
-
- Add preliminary support for [MSC3823: Account Suspension](https://github.com/matrix-org/matrix-spec-proposals/pull/3823). ([\#17051](https://github.com/element-hq/synapse/issues/17051))
- Declare support for [Matrix v1.10](https://matrix.org/blog/2024/03/22/matrix-v1.10-release/). Contributed by @clokep. ([\#17082](https://github.com/element-hq/synapse/issues/17082))
- Add support for [MSC4115: membership metadata on events](https://github.com/matrix-org/matrix-spec-proposals/pull/4115). ([\#17104](https://github.com/element-hq/synapse/issues/17104), [\#17137](https://github.com/element-hq/synapse/issues/17137))
-
-### Bugfixes
-
- Fixed search feature of Element Android on homesevers using SQLite by returning search terms as search highlights. ([\#17000](https://github.com/element-hq/synapse/issues/17000))
- Fixes a bug introduced in v1.52.0 where the `destination` query parameter for the  [Destination Rooms Admin API](https://element-hq.github.io/synapse/v1.105/usage/administration/admin_api/federation.html#destination-rooms) failed to actually filter returned rooms. ([\#17077](https://github.com/element-hq/synapse/issues/17077))
- For MSC3266 room summaries, support queries at the recommended endpoint of `/_matrix/client/unstable/im.nheko.summary/summary/{roomIdOrAlias}`. The existing endpoint of `/_matrix/client/unstable/im.nheko.summary/rooms/{roomIdOrAlias}/summary` is deprecated. ([\#17078](https://github.com/element-hq/synapse/issues/17078))
- Apply user email & picture during OIDC registration if present & selected. ([\#17120](https://github.com/element-hq/synapse/issues/17120))
- Improve error message for cross signing reset with [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) enabled. ([\#17121](https://github.com/element-hq/synapse/issues/17121))
- Fix a bug which meant that to-device messages received over federation could be dropped when the server was under load or networking problems caused problems between Synapse processes or the database. ([\#17127](https://github.com/element-hq/synapse/issues/17127))
- Fix bug where `StreamChangeCache` would not respect configured cache factors. ([\#17152](https://github.com/element-hq/synapse/issues/17152))
-
-### Updates to the Docker image
-
- Correct licensing metadata on Docker image. ([\#17141](https://github.com/element-hq/synapse/issues/17141))
-
-### Improved Documentation
-
- Update the `event_cache_size` and `global_factor` configuration options' documentation. ([\#17071](https://github.com/element-hq/synapse/issues/17071))
- Remove broken sphinx docs. ([\#17073](https://github.com/element-hq/synapse/issues/17073), [\#17148](https://github.com/element-hq/synapse/issues/17148))
- Add RuntimeDirectory to example matrix-synapse.service systemd unit. ([\#17084](https://github.com/element-hq/synapse/issues/17084))
- Fix various small typos throughout the docs. ([\#17114](https://github.com/element-hq/synapse/issues/17114))
- Update enable_notifs configuration documentation. ([\#17116](https://github.com/element-hq/synapse/issues/17116))
- Update the Upgrade Notes with the latest minimum supported Rust version of 1.66.0. Contributed by @jahway603. ([\#17140](https://github.com/element-hq/synapse/issues/17140))
-
-### Internal Changes
-
- Enable [MSC3266](https://github.com/matrix-org/matrix-spec-proposals/pull/3266) by default in the Synapse Complement image. ([\#17105](https://github.com/element-hq/synapse/issues/17105))
- Add optimisation to `StreamChangeCache.get_entities_changed(..)`. ([\#17130](https://github.com/element-hq/synapse/issues/17130))
-
-
-
-### Updates to locked dependencies
-
-* Bump furo from 2024.1.29 to 2024.4.27. ([\#17133](https://github.com/element-hq/synapse/issues/17133))
-* Bump idna from 3.6 to 3.7. ([\#17136](https://github.com/element-hq/synapse/issues/17136))
-* Bump jsonschema from 4.21.1 to 4.22.0. ([\#17157](https://github.com/element-hq/synapse/issues/17157))
-* Bump lxml from 5.1.0 to 5.2.1. ([\#17158](https://github.com/element-hq/synapse/issues/17158))
-* Bump phonenumbers from 8.13.29 to 8.13.35. ([\#17106](https://github.com/element-hq/synapse/issues/17106))
- Bump pillow from 10.2.0 to 10.3.0. ([\#17146](https://github.com/element-hq/synapse/issues/17146))
-* Bump pydantic from 2.6.4 to 2.7.0. ([\#17107](https://github.com/element-hq/synapse/issues/17107))
-* Bump pydantic from 2.7.0 to 2.7.1. ([\#17160](https://github.com/element-hq/synapse/issues/17160))
-* Bump pyicu from 2.12 to 2.13. ([\#17109](https://github.com/element-hq/synapse/issues/17109))
-* Bump serde from 1.0.197 to 1.0.198. ([\#17111](https://github.com/element-hq/synapse/issues/17111))
-* Bump serde from 1.0.198 to 1.0.199. ([\#17132](https://github.com/element-hq/synapse/issues/17132))
-* Bump serde from 1.0.199 to 1.0.200. ([\#17161](https://github.com/element-hq/synapse/issues/17161))
-* Bump serde_json from 1.0.115 to 1.0.116. ([\#17112](https://github.com/element-hq/synapse/issues/17112))
- Update `tornado` Python dependency from 6.2 to 6.4. ([\#17131](https://github.com/element-hq/synapse/issues/17131))
-* Bump twisted from 23.10.0 to 24.3.0. ([\#17135](https://github.com/element-hq/synapse/issues/17135))
-* Bump types-bleach from 6.1.0.1 to 6.1.0.20240331. ([\#17110](https://github.com/element-hq/synapse/issues/17110))
-* Bump types-pillow from 10.2.0.20240415 to 10.2.0.20240423. ([\#17159](https://github.com/element-hq/synapse/issues/17159))
-* Bump types-setuptools from 69.0.0.20240125 to 69.5.0.20240423. ([\#17134](https://github.com/element-hq/synapse/issues/17134))
-
-# Synapse 1.106.0 (2024-04-30)
-
-No significant changes since 1.106.0rc1.
-
-
-
-
-# Synapse 1.106.0rc1 (2024-04-25)
-
-### Features
-
- Send an email if the address is already bound to an user account. ([\#16819](https://github.com/element-hq/synapse/issues/16819))
- Implement the rendezvous mechanism described by [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/issues/4108). ([\#17056](https://github.com/element-hq/synapse/issues/17056))
- Support delegating the rendezvous mechanism described [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/issues/4108) to an external implementation. ([\#17086](https://github.com/element-hq/synapse/issues/17086))
-
-### Bugfixes
-
- Add validation to ensure that the `limit` parameter on `/publicRooms` is non-negative. ([\#16920](https://github.com/element-hq/synapse/issues/16920))
- Return `400 M_NOT_JSON` upon receiving invalid JSON in query parameters across various client and admin endpoints, rather than an internal server error. ([\#16923](https://github.com/element-hq/synapse/issues/16923))
- Make the CSAPI endpoint `/keys/device_signing/upload` idempotent. ([\#16943](https://github.com/element-hq/synapse/issues/16943))
- Redact membership events if the user requested erasure upon deactivating. ([\#17076](https://github.com/element-hq/synapse/issues/17076))
-
-### Improved Documentation
-
- Add a prompt in the contributing guide to manually configure icu4c. ([\#17069](https://github.com/element-hq/synapse/issues/17069))
- Clarify what part of message retention is still experimental. ([\#17099](https://github.com/element-hq/synapse/issues/17099))
-
-### Internal Changes
-
- Use new receipts column to optimise receipt and push action SQL queries. Contributed by Nick @ Beeper (@fizzadar). ([\#17032](https://github.com/element-hq/synapse/issues/17032), [\#17096](https://github.com/element-hq/synapse/issues/17096))
- Fix mypy with latest Twisted release. ([\#17036](https://github.com/element-hq/synapse/issues/17036))
- Bump minimum supported Rust version to 1.66.0. ([\#17079](https://github.com/element-hq/synapse/issues/17079))
- Add helpers to transform Twisted requests to Rust http Requests/Responses. ([\#17081](https://github.com/element-hq/synapse/issues/17081))
- Fix type annotation for `visited_chains` after `mypy` upgrade. ([\#17125](https://github.com/element-hq/synapse/issues/17125))
-
-
-
-### Updates to locked dependencies
-
-* Bump anyhow from 1.0.81 to 1.0.82. ([\#17095](https://github.com/element-hq/synapse/issues/17095))
-* Bump peaceiris/actions-gh-pages from 3.9.3 to 4.0.0. ([\#17087](https://github.com/element-hq/synapse/issues/17087))
-* Bump peaceiris/actions-mdbook from 1.2.0 to 2.0.0. ([\#17089](https://github.com/element-hq/synapse/issues/17089))
-* Bump pyasn1-modules from 0.3.0 to 0.4.0. ([\#17093](https://github.com/element-hq/synapse/issues/17093))
-* Bump pygithub from 2.2.0 to 2.3.0. ([\#17092](https://github.com/element-hq/synapse/issues/17092))
-* Bump ruff from 0.3.5 to 0.3.7. ([\#17094](https://github.com/element-hq/synapse/issues/17094))
-* Bump sigstore/cosign-installer from 3.4.0 to 3.5.0. ([\#17088](https://github.com/element-hq/synapse/issues/17088))
-* Bump twine from 4.0.2 to 5.0.0. ([\#17091](https://github.com/element-hq/synapse/issues/17091))
-* Bump types-pillow from 10.2.0.20240406 to 10.2.0.20240415. ([\#17090](https://github.com/element-hq/synapse/issues/17090))
-
-# Synapse 1.105.1 (2024-04-23)
-
-## Security advisory
-
-The following issues are fixed in 1.105.1.
-
- [GHSA-3h7q-rfh9-xm4v](https://github.com/element-hq/synapse/security/advisories/GHSA-3h7q-rfh9-xm4v) / [CVE-2024-31208](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-31208) — High Severity
-
-  Weakness in auth chain indexing allows DoS from remote room members through disk fill and high CPU usage.
-
-See the advisories for more details. If you have any questions, email security@element.io.
-
-
-
-# Synapse 1.105.0 (2024-04-16)
-
-No significant changes since 1.105.0rc1.
-
-
-
-
-# Synapse 1.105.0rc1 (2024-04-11)
-
-### Features
-
- Stabilize support for [MSC4010](https://github.com/matrix-org/matrix-spec-proposals/pull/4010) which clarifies the interaction of push rules and account data. Contributed by @clokep. ([\#17022](https://github.com/element-hq/synapse/issues/17022))
- Stabilize support for [MSC3981](https://github.com/matrix-org/matrix-spec-proposals/pull/3981): `/relations` recursion. Contributed by @clokep. ([\#17023](https://github.com/element-hq/synapse/issues/17023))
- Add support for moving `/pushrules` off of main process. ([\#17037](https://github.com/element-hq/synapse/issues/17037), [\#17038](https://github.com/element-hq/synapse/issues/17038))
-
-### Bugfixes
-
- Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations. ([\#16930](https://github.com/element-hq/synapse/issues/16930), [\#16932](https://github.com/element-hq/synapse/issues/16932), [\#16942](https://github.com/element-hq/synapse/issues/16942), [\#17064](https://github.com/element-hq/synapse/issues/17064), [\#17065](https://github.com/element-hq/synapse/issues/17065), [\#17066](https://github.com/element-hq/synapse/issues/17066))
- Fix server notice rooms not always being created as unencrypted rooms, even when `encryption_enabled_by_default_for_room_type` is in use (server notices are always unencrypted). ([\#17033](https://github.com/element-hq/synapse/issues/17033))
- Fix the `.m.rule.encrypted_room_one_to_one` and `.m.rule.room_one_to_one` default underride push rules being in the wrong order. Contributed by @Sumpy1. ([\#17043](https://github.com/element-hq/synapse/issues/17043))
-
-### Internal Changes
-
- Refactor auth chain fetching to reduce duplication. ([\#17044](https://github.com/element-hq/synapse/issues/17044))
- Improve database performance by adding a missing index to `access_tokens.refresh_token_id`. ([\#17045](https://github.com/element-hq/synapse/issues/17045), [\#17054](https://github.com/element-hq/synapse/issues/17054))
- Improve database performance by reducing number of receipts fetched when sending push notifications. ([\#17049](https://github.com/element-hq/synapse/issues/17049))
-
-
-
-### Updates to locked dependencies
-
-* Bump packaging from 23.2 to 24.0. ([\#17027](https://github.com/element-hq/synapse/issues/17027))
-* Bump regex from 1.10.3 to 1.10.4. ([\#17028](https://github.com/element-hq/synapse/issues/17028))
-* Bump ruff from 0.3.2 to 0.3.5. ([\#17060](https://github.com/element-hq/synapse/issues/17060))
-* Bump serde_json from 1.0.114 to 1.0.115. ([\#17041](https://github.com/element-hq/synapse/issues/17041))
-* Bump types-pillow from 10.2.0.20240125 to 10.2.0.20240406. ([\#17061](https://github.com/element-hq/synapse/issues/17061))
-* Bump types-requests from 2.31.0.20240125 to 2.31.0.20240406. ([\#17063](https://github.com/element-hq/synapse/issues/17063))
-* Bump typing-extensions from 4.9.0 to 4.11.0. ([\#17062](https://github.com/element-hq/synapse/issues/17062))
-
 # Synapse 1.104.0 (2024-04-02)

 ### Bugfixes
@@ -4,42 +4,36 @@ version = 3

 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"

 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"

 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "blake2"
@@ -52,40 +46,19 @@ dependencies = [

 [[package]]
 name = "block-buffer"
-version = "0.10.4"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "bytes"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -98,68 +71,25 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.7"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
 "block-buffer",
 "crypto-common",
 "subtle",
 ]

-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
 "typenum",
 "version_check",
 ]

-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "headers"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
-dependencies = [
- "base64",
- "bytes",
- "headers-core",
- "http",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
-dependencies = [
- "http",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -172,43 +102,17 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"

 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"

 [[package]]
 name = "lazy_static"
@@ -218,15 +122,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"

 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -240,36 +144,30 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"

 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"

 [[package]]
 name = "memoffset"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
 dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"

 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
 "lock_api",
 "parking_lot_core",
@@ -277,15 +175,15 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-targets",
+ "windows-sys",
 ]

 [[package]]
@@ -294,26 +192,20 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"

-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "pyo3"
-version = "0.21.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
 dependencies = [
 "anyhow",
 "cfg-if",
@@ -330,9 +222,9 @@ dependencies = [

 [[package]]
 name = "pyo3-build-config"
-version = "0.21.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
 dependencies = [
 "once_cell",
 "target-lexicon",
@@ -340,9 +232,9 @@ dependencies = [

 [[package]]
 name = "pyo3-ffi"
-version = "0.21.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
 dependencies = [
 "libc",
 "pyo3-build-config",
@@ -350,9 +242,9 @@ dependencies = [

 [[package]]
 name = "pyo3-log"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c"
+checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd"
 dependencies = [
 "arc-swap",
 "log",
@@ -361,9 +253,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros"
-version = "0.21.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
 dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
@@ -373,9 +265,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros-backend"
-version = "0.21.2"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -386,9 +278,9 @@ dependencies = [

 [[package]]
 name = "pythonize"
-version = "0.21.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0664248812c38cc55a4ed07f88e4df516ce82604b93b1ffdc041aa77a6cb3c"
+checksum = "ffd1c3ef39c725d63db5f9bc455461bafd80540cb7824c61afb823501921a850"
 dependencies = [
 "pyo3",
 "serde",
@@ -396,57 +288,27 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]

-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
 "bitflags",
 ]

 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -456,9 +318,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -467,36 +329,36 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"

 [[package]]
 name = "scopeguard"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -505,54 +367,32 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
 "itoa",
 "ryu",
 "serde",
 ]

-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -564,53 +404,35 @@ name = "synapse"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "base64",
 "blake2",
- "bytes",
- "headers",
 "hex",
- "http",
 "lazy_static",
 "log",
- "mime",
 "pyo3",
 "pyo3-log",
 "pythonize",
 "regex",
 "serde",
 "serde_json",
- "sha2",
- "ulid",
 ]

 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"

 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "ulid"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259"
-dependencies = [
- "getrandom",
- "rand",
- "web-time",
-]
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"

 [[package]]
 name = "unindent"
@@ -625,135 +447,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "windows-sys"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
 "windows_i686_gnu",
- "windows_i686_gnullvm",
 "windows_i686_msvc",
 "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
 "windows_x86_64_msvc",
 ]

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
@@ -0,0 +1 @@
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
@@ -0,0 +1 @@
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
@@ -0,0 +1 @@
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
@@ -0,0 +1 @@
+Add support for moving `/pushrules` off of main process.
@@ -0,0 +1 @@
+Add support for moving `/pushrules` off of main process.
@@ -0,0 +1 @@
+Refactor auth chain fetching to reduce duplication.
@@ -0,0 +1 @@
+Improve database performance by adding a missing index to `access_tokens.refresh_token_id`.
@@ -0,0 +1 @@
+Improve database performance by reducing number of receipts fetched when sending push notifications.
@@ -0,0 +1 @@
+Document [`/v1/make_knock`](https://spec.matrix.org/v1.10/server-server-api/#get_matrixfederationv1make_knockroomiduserid) and [`/v1/send_knock/](https://spec.matrix.org/v1.10/server-server-api/#put_matrixfederationv1send_knockroomideventid) federation endpoints as worker-compatible.
@@ -1,81 +1,3 @@
-matrix-synapse-py3 (1.109.0) stable; urgency=medium
-
-  * New synapse release 1.109.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jun 2024 09:45:15 +0000
-
-matrix-synapse-py3 (1.109.0~rc3) stable; urgency=medium
-
-  * New synapse release 1.109.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Mon, 17 Jun 2024 12:05:24 +0000
-
-matrix-synapse-py3 (1.109.0~rc2) stable; urgency=medium
-
-  * New synapse release 1.109.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 11 Jun 2024 13:20:17 +0000
-
-matrix-synapse-py3 (1.109.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.109.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 04 Jun 2024 09:42:46 +0100
-
-matrix-synapse-py3 (1.108.0) stable; urgency=medium
-
-  * New Synapse release 1.108.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 28 May 2024 11:54:22 +0100
-
-matrix-synapse-py3 (1.108.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.108.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 21 May 2024 10:54:13 +0100
-
-matrix-synapse-py3 (1.107.0) stable; urgency=medium
-
-  * New Synapse release 1.107.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 14 May 2024 14:15:34 +0100
-
-matrix-synapse-py3 (1.107.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.107.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 07 May 2024 16:26:26 +0100
-
-matrix-synapse-py3 (1.106.0) stable; urgency=medium
-
-  * New Synapse release 1.106.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 30 Apr 2024 11:51:43 +0100
-
-matrix-synapse-py3 (1.106.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.106.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 25 Apr 2024 15:54:59 +0100
-
-matrix-synapse-py3 (1.105.1) stable; urgency=medium
-
-  * New Synapse release 1.105.1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 23 Apr 2024 15:56:18 +0100
-
-matrix-synapse-py3 (1.105.0) stable; urgency=medium
-
-  * New Synapse release 1.105.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 16 Apr 2024 15:53:23 +0100
-
-matrix-synapse-py3 (1.105.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.105.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 11 Apr 2024 12:15:49 +0100
-
 matrix-synapse-py3 (1.104.0) stable; urgency=medium

  * New Synapse release 1.104.0.
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@@ -0,0 +1,50 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Project information -----------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
+
+project = "Synapse development"
+copyright = "2023, The Matrix.org Foundation C.I.C."
+author = "The Synapse Maintainers and Community"
+
+# -- General configuration ---------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
+
+extensions = [
+    "autodoc2",
+    "myst_parser",
+]
+
+templates_path = ["_templates"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+
+
+# -- Options for Autodoc2 ----------------------------------------------------
+
+autodoc2_docstring_parser_regexes = [
+    # this will render all docstrings as 'MyST' Markdown
+    (r".*", "myst"),
+]
+
+autodoc2_packages = [
+    {
+        "path": "../synapse",
+        # Don't render documentation for everything as a matter of course
+        "auto_mode": False,
+    },
+]
+
+
+# -- Options for MyST (Markdown) ---------------------------------------------
+
+# myst_heading_anchors = 2
+
+
+# -- Options for HTML output -------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
+
+html_theme = "furo"
+html_static_path = ["_static"]
@@ -0,0 +1,22 @@
+.. Synapse Developer Documentation documentation master file, created by
+   sphinx-quickstart on Mon Mar 13 08:59:51 2023.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to the Synapse Developer Documentation!
+===========================================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   modules/federation_sender
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
@@ -0,0 +1,5 @@
+Federation Sender
+=================
+
+```{autodoc2-docstring} synapse.federation.sender
+```
@@ -163,7 +163,7 @@ FROM docker.io/library/python:${PYTHON_VERSION}-slim-bookworm
 LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse'
 LABEL org.opencontainers.image.documentation='https://github.com/element-hq/synapse/blob/master/docker/README.md'
 LABEL org.opencontainers.image.source='https://github.com/element-hq/synapse.git'
-LABEL org.opencontainers.image.licenses='AGPL-3.0-or-later'
+LABEL org.opencontainers.image.licenses='Apache-2.0'

 RUN \
  --mount=type=cache,target=/var/cache/apt,sharing=locked \
@@ -92,6 +92,8 @@ allow_device_name_lookup_over_federation: true
 ## Experimental Features ##

 experimental_features:
+  # client-side support for partial state in /send_join responses
+  faster_joins: true
  # Enable support for polls
  msc3381_polls_enabled: true
  # Enable deleting device-specific notification settings stored in account data
@@ -100,12 +102,6 @@ experimental_features:
  msc3391_enabled: true
  # Filtering /messages by relation type.
  msc3874_enabled: true
-  # no UIA for x-signing upload for the first time
-  msc3967_enabled: true
-  # Expose a room summary for public rooms
-  msc3266_enabled: true
-
-  msc4115_membership_on_events: true

 server_notices:
  system_mxid_localpart: _server
@@ -211,8 +211,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
            "^/_matrix/federation/(v1|v2)/make_leave/",
            "^/_matrix/federation/(v1|v2)/send_join/",
            "^/_matrix/federation/(v1|v2)/send_leave/",
-            "^/_matrix/federation/v1/make_knock/",
-            "^/_matrix/federation/v1/send_knock/",
            "^/_matrix/federation/(v1|v2)/invite/",
            "^/_matrix/federation/(v1|v2)/query_auth/",
            "^/_matrix/federation/(v1|v2)/event_auth/",
@@ -1,6 +1,6 @@
 # Edit Room Membership API

-This API allows an administrator to join a user account with a given `user_id`
+This API allows an administrator to join an user account with a given `user_id`
 to a room with a given `room_id_or_alias`. You can only modify the membership of
 local users. The server administrator must be in the room and have permission to
 invite users.
@@ -141,8 +141,8 @@ Body parameters:
  provider for SSO (Single sign-on). More details are in the configuration manual under the
  sections [sso](../usage/configuration/config_documentation.md#sso) and [oidc_providers](../usage/configuration/config_documentation.md#oidc_providers).
  - `auth_provider` - **string**, required. The unique, internal ID of the external identity provider.
-    The same as `idp_id` from the homeserver configuration. If using OIDC, this value should be prefixed
-    with `oidc-`. Note that no error is raised if the provided value is not in the homeserver configuration.
+    The same as `idp_id` from the homeserver configuration. Note that no error is raised if the
+    provided value is not in the homeserver configuration.
  - `external_id` - **string**, required. An identifier for the user in the external identity provider.
    When the user logs in to the identity provider, this must be the unique ID that they map to.
 - `admin` - **bool**, optional, defaults to `false`. Whether the user is a homeserver administrator,
@@ -86,8 +86,6 @@ poetry install --extras all
 This will install the runtime and developer dependencies for the project.  Be sure to check
 that the `poetry install` step completed cleanly.

-For OSX users, be sure to set `PKG_CONFIG_PATH` to support `icu4c`. Run `brew info icu4c` for more details.
-
 ## Running Synapse via poetry

 To start a local instance of Synapse in the locked poetry environment, create a config file:
@@ -7,10 +7,8 @@ follow the semantics described in
 and allow server and room admins to configure how long messages should
 be kept in a homeserver's database before being purged from it.
 **Please note that, as this feature isn't part of the Matrix
-specification yet, the use of `m.room.retention` events for per-room
-retention policies is to be considered as experimental. However, the use
-of a default message retention policy is considered a stable feature
-in Synapse.**
+specification yet, this implementation is to be considered as
+experimental.**

 A message retention policy is mainly defined by its `max_lifetime`
 parameter, which defines how long a message can be kept around after
@@ -51,8 +49,8 @@ clients.

 ## Server configuration

-Support for this feature can be enabled and configured by adding the
-`retention` option in the Synapse configuration file (see
+Support for this feature can be enabled and configured by adding a the
+`retention` in the Synapse configuration file (see
 [configuration manual](usage/configuration/config_documentation.md#retention)).

 To enable support for message retention policies, set the setting
@@ -117,7 +115,7 @@ In this example, we define three jobs:
  policy's `max_lifetime` is greater than a week.

 Note that this example is tailored to show different configurations and
-features slightly more jobs than is probably necessary (in practice, a
+features slightly more jobs than it's probably necessary (in practice, a
 server admin would probably consider it better to replace the two last
 jobs with one that runs once a day and handles rooms which
 policy's `max_lifetime` is greater than 3 days).
@@ -525,8 +525,6 @@ oidc_providers:
  (`Options > Security > ID Token signature algorithm` and `Options > Security >
  Access Token signature algorithm`)
 - Scopes: OpenID, Email and Profile
- Force claims into `id_token`
-  (`Options > Advanced > Force claims to be returned in ID Token`)
 - Allowed redirection addresses for login (`Options > Basic > Allowed
  redirection addresses for login` ) :
  `[synapse public baseurl]/_synapse/client/oidc/callback`
@@ -128,7 +128,7 @@ can read more about that [here](https://www.postgresql.org/docs/10/kernel-resour
 ### Overview

 The script `synapse_port_db` allows porting an existing synapse server
-backed by SQLite to using PostgreSQL. This is done as a two phase
+backed by SQLite to using PostgreSQL. This is done in as a two phase
 process:

 1.  Copy the existing SQLite database to a separate location and run
@@ -242,11 +242,12 @@ host    all         all             ::1/128     ident

 ### Fixing incorrect `COLLATE` or `CTYPE`

-Synapse will refuse to start when using a database with incorrect values of
-`COLLATE` and `CTYPE` unless the config flag `allow_unsafe_locale`, found in the
-`database` section of the config, is set to true. Using different locales can
-cause issues if the locale library is updated from underneath the database, or
-if a different version of the locale is used on any replicas.
+Synapse will refuse to set up a new database if it has the wrong values of
+`COLLATE` and `CTYPE` set. Synapse will also refuse to start an existing database with incorrect values
+of `COLLATE` and `CTYPE` unless the config flag `allow_unsafe_locale`, found in the 
+`database` section of the config, is set to true. Using different locales can cause issues if the locale library is updated from
+underneath the database, or if a different version of the locale is used on any
+replicas.

 If you have a database with an unsafe locale, the safest way to fix the issue is to dump the database and recreate it with
 the correct locale parameter (as shown above). It is also possible to change the
@@ -255,3 +256,13 @@ however extreme care must be taken to avoid database corruption.

 Note that the above may fail with an error about duplicate rows if corruption
 has already occurred, and such duplicate rows will need to be manually removed.
+
+### Fixing inconsistent sequences error
+
+Synapse uses Postgres sequences to generate IDs for various tables. A sequence
+and associated table can get out of sync if, for example, Synapse has been
+downgraded and then upgraded again.
+
+To fix the issue shut down Synapse (including any and all workers) and run the
+SQL command included in the error message. Once done Synapse should start
+successfully.
@@ -259,9 +259,9 @@ users, etc.) to the developers via the `--report-stats` argument.

 This command will generate you a config file that you can then customise, but it will
 also generate a set of keys for you. These keys will allow your homeserver to
-identify itself to other homeservers, so don't lose or delete them. It would be
+identify itself to other homeserver, so don't lose or delete them. It would be
 wise to back them up somewhere safe. (If, for whatever reason, you do need to
-change your homeserver's keys, you may find that other homeservers have the
+change your homeserver's keys, you may find that other homeserver have the
 old key cached. If you update the signing key, you should change the name of the
 key in the `<server name>.signing.key` file (the second word) to something
 different. See the [spec](https://matrix.org/docs/spec/server_server/latest.html#retrieving-server-keys) for more information on key management).
@@ -98,7 +98,6 @@ A custom mapping provider must specify the following methods:
        either accept this localpart or pick their own username. Otherwise this
        option has no effect. If omitted, defaults to `False`.
      - `display_name`: An optional string, the display name for the user.
-      - `picture`: An optional string, the avatar url for the user.
      - `emails`: A list of strings, the email address(es) to associate with
        this user. If omitted, defaults to an empty list.
 * `async def get_extra_attributes(self, userinfo, token)`
@@ -9,7 +9,6 @@ ReloadPropagatedFrom=matrix-synapse.target
 Type=notify
 NotifyAccess=main
 User=matrix-synapse
-RuntimeDirectory=synapse
 WorkingDirectory=/var/lib/matrix-synapse
 EnvironmentFile=-/etc/default/matrix-synapse
 ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
@@ -117,14 +117,6 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).

-# Upgrading to v1.106.0
-
-## Minimum supported Rust version
-The minimum supported Rust version has been increased from v1.65.0 to v1.66.0.
-Users building from source will need to ensure their `rustc` version is up to
-date.
-
-
 # Upgrading to v1.100.0

 ## Minimum supported Rust version
@@ -44,7 +44,7 @@ For each update:

 ## Enabled

-This API allows pausing background updates.
+This API allow pausing background updates.

 Background updates should *not* be paused for significant periods of time, as
 this can affect the performance of Synapse.
@@ -241,7 +241,7 @@ in memory constrained environments, or increased if performance starts to
 degrade.

 However, degraded performance due to a low cache factor, common on
-machines with slow disks, often leads to explosions in memory use due to
+machines with slow disks, often leads to explosions in memory use due
 backlogged requests. In this case, reducing the cache factor will make
 things worse. Instead, try increasing it drastically. 2.0 is a good
 starting value.
@@ -250,10 +250,10 @@ Using [libjemalloc](https://jemalloc.net) can also yield a significant
 improvement in overall memory use, and especially in terms of giving back
 RAM to the OS. To use it, the library must simply be put in the
 LD_PRELOAD environment variable when launching Synapse. On Debian, this
-can be done by installing the `libjemalloc2` package and adding this
+can be done by installing the `libjemalloc1` package and adding this
 line to `/etc/default/matrix-synapse`:

-    LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
+    LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1

 This made a significant difference on Python 2.7 - it's unclear how
 much of an improvement it provides on Python 3.x.
@@ -676,8 +676,8 @@ This setting has the following sub-options:
    trailing 's'.
 * `app_name`: `app_name` defines the default value for '%(app)s' in `notif_from` and email
   subjects. It defaults to 'Matrix'.
-* `enable_notifs`: Set to true to allow users to receive e-mail notifications. If this is not set,
-    users can configure e-mail notifications but will not receive them. Disabled by default.
+* `enable_notifs`: Set to true to enable sending emails for messages that the user
+   has missed. Disabled by default.
 * `notif_for_new_users`: Set to false to disable automatic subscription to email
   notifications for new users. Enabled by default.
 * `notif_delay_before_mail`: The time to wait before emailing about a notification.
@@ -1232,31 +1232,6 @@ federation_domain_whitelist:
  - syd.example.com
 ```
 ---
-### `federation_whitelist_endpoint_enabled`
-
-Enables an endpoint for fetching the federation whitelist config.
-
-The request method and path is `GET /_synapse/client/v1/config/federation_whitelist`, and the
-response format is:
-
-```json
-{
-    "whitelist_enabled": true,  // Whether the federation whitelist is being enforced
-    "whitelist": [  // Which server names are allowed by the whitelist
-        "example.com"
-    ]
-}
-```
-
-If `whitelist_enabled` is `false` then the server is permitted to federate with all others.
-
-The endpoint requires authentication.
-
-Example configuration:
-```yaml
-federation_whitelist_endpoint_enabled: true
-```
---
 ### `federation_metrics_domains`

 Report prometheus metrics on the age of PDUs being sent to and received from
@@ -1342,12 +1317,6 @@ Options related to caching.
 The number of events to cache in memory. Defaults to 10K. Like other caches,
 this is affected by `caches.global_factor` (see below).

-For example, the default is 10K and the global_factor default is 0.5.
-
-Since 10K * 0.5 is 5K then the event cache size will be 5K.
-
-The cache affected by this configuration is named as "*getEvent*".
-
 Note that this option is not part of the `caches` section.

 Example configuration:
@@ -1373,8 +1342,6 @@ number of entries that can be stored.

  Defaults to 0.5, which will halve the size of all caches.

-  Note that changing this value also affects the HTTP connection pool.
-
 * `per_cache_factors`: A dictionary of cache name to cache factor for that individual
   cache. Overrides the global cache factor for a given cache.

@@ -2616,11 +2583,6 @@ Possible values for this option are:
 * "trusted_private_chat": an invitation is required to join this room and the invitee is
  assigned a power level of 100 upon joining the room.

-Each preset will set up a room in the same manner as if it were provided as the `preset` parameter when
-calling the
-[`POST /_matrix/client/v3/createRoom`](https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3createroom)
-Client-Server API endpoint.
-
 If a value of "private_chat" or "trusted_private_chat" is used then
 `auto_join_mxid_localpart` must also be configured.

@@ -3558,15 +3520,6 @@ Has the following sub-options:
   users. This allows the CAS SSO flow to be limited to sign in only, rather than
   automatically registering users that have a valid SSO login but do not have
   a pre-registered account. Defaults to true.
-* `allow_numeric_ids`: set to 'true' allow numeric user IDs (default false).
-   This allows CAS SSO flow to provide user IDs composed of numbers only.
-   These identifiers will be prefixed by the letter "u" by default.
-   The prefix can be configured using the "numeric_ids_prefix" option.
-   Be careful to choose the prefix correctly to avoid any possible conflicts
-   (e.g. user 1234 becomes u1234 when a user u1234 already exists).
-* `numeric_ids_prefix`: the prefix you wish to add in front of a numeric user ID
-   when the "allow_numeric_ids" option is set to "true".
-   By default, the prefix is the letter "u" and only alphanumeric characters are allowed.

   *Added in Synapse 1.93.0.*

@@ -3581,8 +3534,6 @@ cas_config:
    userGroup: "staff"
    department: None
  enable_registration: true
-  allow_numeric_ids: true
-  numeric_ids_prefix: "numericuser"
 ```
 ---
 ### `sso`
@@ -4595,32 +4546,3 @@ background_updates:
    min_batch_size: 10
    default_batch_size: 50
 ```
---
-## Auto Accept Invites
-Configuration settings related to automatically accepting invites.
-
---
-### `auto_accept_invites`
-
-Automatically accepting invites controls whether users are presented with an invite request or if they
-are instead automatically joined to a room when receiving an invite. Set the `enabled` sub-option to true to
-enable auto-accepting invites. Defaults to false.
-This setting has the following sub-options:
-* `enabled`: Whether to run the auto-accept invites logic. Defaults to false.
-* `only_for_direct_messages`: Whether invites should be automatically accepted for all room types, or only
-   for direct messages. Defaults to false.
-* `only_from_local_users`: Whether to only automatically accept invites from users on this homeserver. Defaults to false.
-* `worker_to_run_on`: Which worker to run this module on. This must match the "worker_name".
-
-NOTE: Care should be taken not to enable this setting if the `synapse_auto_accept_invite` module is enabled and installed.
-The two modules will compete to perform the same task and may result in undesired behaviour. For example, multiple join
-events could be generated from a single invite.
-
-Example configuration:
-```yaml
-auto_accept_invites:
-    enabled: true
-    only_for_direct_messages: true
-    only_from_local_users: true
-    worker_to_run_on: "worker_1"
-```
@@ -86,9 +86,9 @@ The search term is then split into words:
 * If unavailable, then runs of ASCII characters, numbers, underscores, and hyphens
  are considered words.

-The queries for PostgreSQL and SQLite are detailed below, but their overall goal
+The queries for PostgreSQL and SQLite are detailed below, by their overall goal
 is to find matching users, preferring users who are "real" (e.g. not bots,
-not deactivated). It is assumed that real users will have a display name and
+not deactivated). It is assumed that real users will have an display name and
 avatar set.

 ### PostgreSQL
@@ -234,7 +234,7 @@ information.
    ^/_matrix/client/v1/rooms/.*/hierarchy$
    ^/_matrix/client/(v1|unstable)/rooms/.*/relations/
    ^/_matrix/client/v1/rooms/.*/threads$
-    ^/_matrix/client/unstable/im.nheko.summary/summary/.*$
+    ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$
    ^/_matrix/client/(r0|v3|unstable)/account/3pid$
    ^/_matrix/client/(r0|v3|unstable)/account/whoami$
    ^/_matrix/client/(r0|v3|unstable)/devices$
@@ -537,7 +537,7 @@ the stream writer for the `presence` stream:
 ##### The `push_rules` stream

 The following endpoints should be routed directly to the worker configured as
-the stream writer for the `push_rules` stream:
+the stream writer for the `push` stream:

    ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/

@@ -636,7 +636,7 @@ worker application type.

 #### Push Notifications

-You can designate generic workers to send push notifications to
+You can designate generic worker to sending push notifications to
 a [push gateway](https://spec.matrix.org/v1.5/push-gateway-api/) such as
 [sygnal](https://github.com/matrix-org/sygnal) and email.

@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.109.0"
+version = "1.104.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -200,8 +200,10 @@ netaddr = ">=0.7.18"
 # add a lower bound to the Jinja2 dependency.
 Jinja2 = ">=3.0"
 bleach = ">=1.4.3"
-# We use `Self`, which were added in `typing-extensions` 4.0.
-typing-extensions = ">=4.0"
+# We use `ParamSpec` and `Concatenate`, which were added in `typing-extensions` 3.10.0.0.
+# Additionally we need https://github.com/python/typing/pull/817 to allow types to be
+# generic over ParamSpecs.
+typing-extensions = ">=3.10.0.1"
 # We enforce that we have a `cryptography` version that bundles an `openssl`
 # with the latest security patches.
 cryptography = ">=3.4.7"
@@ -319,7 +321,7 @@ all = [
 # This helps prevents merge conflicts when running a batch of dependabot updates.
 isort = ">=5.10.1"
 black = ">=22.7.0"
-ruff = "0.3.7"
+ruff = "0.3.2"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"

@@ -362,6 +364,17 @@ towncrier = ">=18.6.0rc1"
 tomli = ">=1.2.3"


+# Dependencies for building the development documentation
+[tool.poetry.group.dev-docs]
+optional = true
+
+[tool.poetry.group.dev-docs.dependencies]
+sphinx = {version = "^6.1", python = "^3.8"}
+sphinx-autodoc2 = {version = ">=0.4.2,<0.6.0", python = "^3.8"}
+myst-parser = {version = "^1.0.0", python = "^3.8"}
+furo = ">=2022.12.7,<2025.0.0"
+
+
 [build-system]
 # The upper bounds here are defensive, intended to prevent situations like
 # https://github.com/matrix-org/synapse/issues/13849 and
@@ -7,7 +7,7 @@ name = "synapse"
 version = "0.1.0"

 edition = "2021"
-rust-version = "1.66.0"
+rust-version = "1.65.0"

 [lib]
 name = "synapse"
@@ -23,26 +23,19 @@ name = "synapse.synapse_rust"

 [dependencies]
 anyhow = "1.0.63"
-base64 = "0.21.7"
-bytes = "1.6.0"
-headers = "0.4.0"
-http = "1.1.0"
 lazy_static = "1.4.0"
 log = "0.4.17"
-mime = "0.3.17"
-pyo3 = { version = "0.21.0", features = [
+pyo3 = { version = "0.20.0", features = [
    "macros",
    "anyhow",
    "abi3",
    "abi3-py38",
 ] }
-pyo3-log = "0.10.0"
-pythonize = "0.21.0"
+pyo3-log = "0.9.0"
+pythonize = "0.20.0"
 regex = "1.6.0"
-sha2 = "0.10.8"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.85"
-ulid = "1.1.2"

 [features]
 extension-module = ["pyo3/extension-module"]
@@ -25,21 +25,21 @@ use std::net::Ipv4Addr;
 use std::str::FromStr;

 use anyhow::Error;
-use pyo3::{prelude::*, pybacked::PyBackedStr};
+use pyo3::prelude::*;
 use regex::Regex;

 use crate::push::utils::{glob_to_regex, GlobMatchType};

 /// Called when registering modules with python.
-pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new_bound(py, "acl")?;
+pub fn register_module(py: Python<'_>, m: &PyModule) -> PyResult<()> {
+    let child_module = PyModule::new(py, "acl")?;
    child_module.add_class::<ServerAclEvaluator>()?;

-    m.add_submodule(&child_module)?;
+    m.add_submodule(child_module)?;

    // We need to manually add the module to sys.modules to make `from
    // synapse.synapse_rust import acl` work.
-    py.import_bound("sys")?
+    py.import("sys")?
        .getattr("modules")?
        .set_item("synapse.synapse_rust.acl", child_module)?;

@@ -59,8 +59,8 @@ impl ServerAclEvaluator {
    #[new]
    pub fn py_new(
        allow_ip_literals: bool,
-        allow: Vec<PyBackedStr>,
-        deny: Vec<PyBackedStr>,
+        allow: Vec<&str>,
+        deny: Vec<&str>,
    ) -> Result<Self, Error> {
        let allow = allow
            .iter()
@@ -1,60 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- */
-
-#![allow(clippy::new_ret_no_self)]
-
-use std::collections::HashMap;
-
-use http::{HeaderMap, StatusCode};
-use pyo3::{exceptions::PyValueError, import_exception};
-
-import_exception!(synapse.api.errors, SynapseError);
-
-impl SynapseError {
-    pub fn new(
-        code: StatusCode,
-        message: String,
-        errcode: &'static str,
-        additional_fields: Option<HashMap<String, String>>,
-        headers: Option<HeaderMap>,
-    ) -> pyo3::PyErr {
-        // Transform the HeaderMap into a HashMap<String, String>
-        let headers = if let Some(headers) = headers {
-            let mut map = HashMap::with_capacity(headers.len());
-            for (key, value) in headers.iter() {
-                let Ok(value) = value.to_str() else {
-                    // This should never happen, but we don't want to panic in case it does
-                    return PyValueError::new_err(
-                        "Could not construct SynapseError: header value is not valid ASCII",
-                    );
-                };
-
-                map.insert(key.as_str().to_owned(), value.to_owned());
-            }
-            Some(map)
-        } else {
-            None
-        };
-
-        SynapseError::new_err((code.as_u16(), message, errcode, additional_fields, headers))
-    }
-}
-
-import_exception!(synapse.api.errors, NotFoundError);
-
-impl NotFoundError {
-    pub fn new() -> pyo3::PyErr {
-        NotFoundError::new_err(())
-    }
-}
@@ -20,10 +20,8 @@

 //! Implements the internal metadata class attached to events.
 //!
-//! The internal metadata is a bit like a `TypedDict`, in that most of
-//! it is stored as a JSON dict in the DB (the exceptions being `outlier`
-//! and `stream_ordering` which have their own columns in the database).
-//! Most events have zero, or only a few, of these keys
+//! The internal metadata is a bit like a `TypedDict`, in that it is stored as a
+//! JSON dict in the DB. Most events have zero, or only a few, of these keys
 //! set. Therefore, since we care more about memory size than performance here,
 //! we store these fields in a mapping.
 //!
@@ -38,10 +36,9 @@ use anyhow::Context;
 use log::warn;
 use pyo3::{
    exceptions::PyAttributeError,
-    pybacked::PyBackedStr,
    pyclass, pymethods,
-    types::{PyAnyMethods, PyDict, PyDictMethods, PyString},
-    Bound, IntoPy, PyAny, PyObject, PyResult, Python,
+    types::{PyDict, PyString},
+    IntoPy, PyAny, PyObject, PyResult, Python,
 };

 /// Definitions of the various fields of the internal metadata.
@@ -60,7 +57,7 @@ enum EventInternalMetadataData {

 impl EventInternalMetadataData {
    /// Convert the field to its name and python object.
-    fn to_python_pair<'a>(&self, py: Python<'a>) -> (&'a Bound<'a, PyString>, PyObject) {
+    fn to_python_pair<'a>(&self, py: Python<'a>) -> (&'a PyString, PyObject) {
        match self {
            EventInternalMetadataData::OutOfBandMembership(o) => {
                (pyo3::intern!(py, "out_of_band_membership"), o.into_py(py))
@@ -91,13 +88,10 @@ impl EventInternalMetadataData {
    /// Converts from python key/values to the field.
    ///
    /// Returns `None` if the key is a valid but unrecognized string.
-    fn from_python_pair(
-        key: &Bound<'_, PyAny>,
-        value: &Bound<'_, PyAny>,
-    ) -> PyResult<Option<Self>> {
-        let key_str: PyBackedStr = key.extract()?;
+    fn from_python_pair(key: &PyAny, value: &PyAny) -> PyResult<Option<Self>> {
+        let key_str: &str = key.extract()?;

-        let e = match &*key_str {
+        let e = match key_str {
            "out_of_band_membership" => EventInternalMetadataData::OutOfBandMembership(
                value
                    .extract()
@@ -214,11 +208,11 @@ pub struct EventInternalMetadata {
 #[pymethods]
 impl EventInternalMetadata {
    #[new]
-    fn new(dict: &Bound<'_, PyDict>) -> PyResult<Self> {
+    fn new(dict: &PyDict) -> PyResult<Self> {
        let mut data = Vec::with_capacity(dict.len());

        for (key, value) in dict.iter() {
-            match EventInternalMetadataData::from_python_pair(&key, &value) {
+            match EventInternalMetadataData::from_python_pair(key, value) {
                Ok(Some(entry)) => data.push(entry),
                Ok(None) => {}
                Err(err) => {
@@ -240,11 +234,8 @@ impl EventInternalMetadata {
        self.clone()
    }

-    /// Get a dict holding the data stored in the `internal_metadata` column in the database.
-    ///
-    /// Note that `outlier` and `stream_ordering` are stored in separate columns so are not returned here.
    fn get_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
-        let dict = PyDict::new_bound(py);
+        let dict = PyDict::new(py);

        for entry in &self.data {
            let (key, value) = entry.to_python_pair(py);
@@ -20,23 +20,20 @@

 //! Classes for representing Events.

-use pyo3::{
-    types::{PyAnyMethods, PyModule, PyModuleMethods},
-    Bound, PyResult, Python,
-};
+use pyo3::{types::PyModule, PyResult, Python};

 mod internal_metadata;

 /// Called when registering modules with python.
-pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new_bound(py, "events")?;
+pub fn register_module(py: Python<'_>, m: &PyModule) -> PyResult<()> {
+    let child_module = PyModule::new(py, "events")?;
    child_module.add_class::<internal_metadata::EventInternalMetadata>()?;

-    m.add_submodule(&child_module)?;
+    m.add_submodule(child_module)?;

    // We need to manually add the module to sys.modules to make `from
    // synapse.synapse_rust import events` work.
-    py.import_bound("sys")?
+    py.import("sys")?
        .getattr("modules")?
        .set_item("synapse.synapse_rust.events", child_module)?;

@@ -1,174 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- */
-
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use headers::{Header, HeaderMapExt};
-use http::{HeaderName, HeaderValue, Method, Request, Response, StatusCode, Uri};
-use pyo3::{
-    exceptions::PyValueError,
-    types::{PyAnyMethods, PyBytes, PyBytesMethods, PySequence, PyTuple},
-    Bound, PyAny, PyResult,
-};
-
-use crate::errors::SynapseError;
-
-/// Read a file-like Python object by chunks
-///
-/// # Errors
-///
-/// Returns an error if calling the `read` on the Python object failed
-fn read_io_body(body: &Bound<'_, PyAny>, chunk_size: usize) -> PyResult<Bytes> {
-    let mut buf = BytesMut::new();
-    loop {
-        let bound = &body.call_method1("read", (chunk_size,))?;
-        let bytes: &Bound<'_, PyBytes> = bound.downcast()?;
-        if bytes.as_bytes().is_empty() {
-            return Ok(buf.into());
-        }
-        buf.put(bytes.as_bytes());
-    }
-}
-
-/// Transform a Twisted `IRequest` to an [`http::Request`]
-///
-/// It uses the following members of `IRequest`:
-///   - `content`, which is expected to be a file-like object with a `read` method
-///   - `uri`, which is expected to be a valid URI as `bytes`
-///   - `method`, which is expected to be a valid HTTP method as `bytes`
-///   - `requestHeaders`, which is expected to have a `getAllRawHeaders` method
-///
-/// # Errors
-///
-/// Returns an error if the Python object doesn't properly implement `IRequest`
-pub fn http_request_from_twisted(request: &Bound<'_, PyAny>) -> PyResult<Request<Bytes>> {
-    let content = request.getattr("content")?;
-    let body = read_io_body(&content, 4096)?;
-
-    let mut req = Request::new(body);
-
-    let bound = &request.getattr("uri")?;
-    let uri: &Bound<'_, PyBytes> = bound.downcast()?;
-    *req.uri_mut() =
-        Uri::try_from(uri.as_bytes()).map_err(|_| PyValueError::new_err("invalid uri"))?;
-
-    let bound = &request.getattr("method")?;
-    let method: &Bound<'_, PyBytes> = bound.downcast()?;
-    *req.method_mut() = Method::from_bytes(method.as_bytes())
-        .map_err(|_| PyValueError::new_err("invalid method"))?;
-
-    let headers_iter = request
-        .getattr("requestHeaders")?
-        .call_method0("getAllRawHeaders")?
-        .iter()?;
-
-    for header in headers_iter {
-        let header = header?;
-        let header: &Bound<'_, PyTuple> = header.downcast()?;
-        let bound = &header.get_item(0)?;
-        let name: &Bound<'_, PyBytes> = bound.downcast()?;
-        let name = HeaderName::from_bytes(name.as_bytes())
-            .map_err(|_| PyValueError::new_err("invalid header name"))?;
-
-        let bound = &header.get_item(1)?;
-        let values: &Bound<'_, PySequence> = bound.downcast()?;
-        for index in 0..values.len()? {
-            let bound = &values.get_item(index)?;
-            let value: &Bound<'_, PyBytes> = bound.downcast()?;
-            let value = HeaderValue::from_bytes(value.as_bytes())
-                .map_err(|_| PyValueError::new_err("invalid header value"))?;
-            req.headers_mut().append(name.clone(), value);
-        }
-    }
-
-    Ok(req)
-}
-
-/// Send an [`http::Response`] through a Twisted `IRequest`
-///
-/// It uses the following members of `IRequest`:
-///
-///  - `responseHeaders`, which is expected to have a `addRawHeader(bytes, bytes)` method
-///  - `setResponseCode(int)` method
-///  - `write(bytes)` method
-///  - `finish()` method
-///
-///  # Errors
-///
-/// Returns an error if the Python object doesn't properly implement `IRequest`
-pub fn http_response_to_twisted<B>(
-    request: &Bound<'_, PyAny>,
-    response: Response<B>,
-) -> PyResult<()>
-where
-    B: Buf,
-{
-    let (parts, mut body) = response.into_parts();
-
-    request.call_method1("setResponseCode", (parts.status.as_u16(),))?;
-
-    let response_headers = request.getattr("responseHeaders")?;
-    for (name, value) in parts.headers.iter() {
-        response_headers.call_method1("addRawHeader", (name.as_str(), value.as_bytes()))?;
-    }
-
-    while body.remaining() != 0 {
-        let chunk = body.chunk();
-        request.call_method1("write", (chunk,))?;
-        body.advance(chunk.len());
-    }
-
-    request.call_method0("finish")?;
-
-    Ok(())
-}
-
-/// An extension trait for [`HeaderMap`] that provides typed access to headers, and throws the
-/// right python exceptions when the header is missing or fails to parse.
-///
-/// [`HeaderMap`]: headers::HeaderMap
-pub trait HeaderMapPyExt: HeaderMapExt {
-    /// Get a header from the map, returning an error if it is missing or invalid.
-    fn typed_get_required<H>(&self) -> PyResult<H>
-    where
-        H: Header,
-    {
-        self.typed_get_optional::<H>()?.ok_or_else(|| {
-            SynapseError::new(
-                StatusCode::BAD_REQUEST,
-                format!("Missing required header: {}", H::name()),
-                "M_MISSING_PARAM",
-                None,
-                None,
-            )
-        })
-    }
-
-    /// Get a header from the map, returning `None` if it is missing and an error if it is invalid.
-    fn typed_get_optional<H>(&self) -> PyResult<Option<H>>
-    where
-        H: Header,
-    {
-        self.typed_try_get::<H>().map_err(|_| {
-            SynapseError::new(
-                StatusCode::BAD_REQUEST,
-                format!("Invalid header: {}", H::name()),
-                "M_INVALID_PARAM",
-                None,
-                None,
-            )
-        })
-    }
-}
-
-impl<T: HeaderMapExt> HeaderMapPyExt for T {}
@@ -3,11 +3,8 @@ use pyo3::prelude::*;
 use pyo3_log::ResetHandle;

 pub mod acl;
-pub mod errors;
 pub mod events;
-pub mod http;
 pub mod push;
-pub mod rendezvous;

 lazy_static! {
    static ref LOGGING_HANDLE: ResetHandle = pyo3_log::init();
@@ -38,7 +35,7 @@ fn reset_logging_config() {

 /// The entry point for defining the Python module.
 #[pymodule]
-fn synapse_rust(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
+fn synapse_rust(py: Python<'_>, m: &PyModule) -> PyResult<()> {
    m.add_function(wrap_pyfunction!(sum_as_string, m)?)?;
    m.add_function(wrap_pyfunction!(get_rust_file_digest, m)?)?;
    m.add_function(wrap_pyfunction!(reset_logging_config, m)?)?;
@@ -46,7 +43,6 @@ fn synapse_rust(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
    acl::register_module(py, m)?;
    push::register_module(py, m)?;
    events::register_module(py, m)?;
-    rendezvous::register_module(py, m)?;

    Ok(())
 }
@@ -304,12 +304,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
        default_enabled: true,
    },
    PushRule {
-        rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
+        rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
        priority_class: 1,
        conditions: Cow::Borrowed(&[
            Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
                key: Cow::Borrowed("type"),
-                pattern: Cow::Borrowed("m.room.encrypted"),
+                pattern: Cow::Borrowed("m.room.message"),
            })),
            Condition::Known(KnownCondition::RoomMemberCount {
                is: Some(Cow::Borrowed("2")),
@@ -320,12 +320,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
        default_enabled: true,
    },
    PushRule {
-        rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
+        rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
        priority_class: 1,
        conditions: Cow::Borrowed(&[
            Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
                key: Cow::Borrowed("type"),
-                pattern: Cow::Borrowed("m.room.message"),
+                pattern: Cow::Borrowed("m.room.encrypted"),
            })),
            Condition::Known(KnownCondition::RoomMemberCount {
                is: Some(Cow::Borrowed("2")),
@@ -66,7 +66,7 @@ use log::warn;
 use pyo3::exceptions::PyTypeError;
 use pyo3::prelude::*;
 use pyo3::types::{PyBool, PyList, PyLong, PyString};
-use pythonize::{depythonize_bound, pythonize};
+use pythonize::{depythonize, pythonize};
 use serde::de::Error as _;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -78,19 +78,19 @@ pub mod evaluator;
 pub mod utils;

 /// Called when registering modules with python.
-pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new_bound(py, "push")?;
+pub fn register_module(py: Python<'_>, m: &PyModule) -> PyResult<()> {
+    let child_module = PyModule::new(py, "push")?;
    child_module.add_class::<PushRule>()?;
    child_module.add_class::<PushRules>()?;
    child_module.add_class::<FilteredPushRules>()?;
    child_module.add_class::<PushRuleEvaluator>()?;
    child_module.add_function(wrap_pyfunction!(get_base_rule_ids, m)?)?;

-    m.add_submodule(&child_module)?;
+    m.add_submodule(child_module)?;

    // We need to manually add the module to sys.modules to make `from
    // synapse.synapse_rust import push` work.
-    py.import_bound("sys")?
+    py.import("sys")?
        .getattr("modules")?
        .set_item("synapse.synapse_rust.push", child_module)?;

@@ -271,12 +271,12 @@ pub enum SimpleJsonValue {

 impl<'source> FromPyObject<'source> for SimpleJsonValue {
    fn extract(ob: &'source PyAny) -> PyResult<Self> {
-        if let Ok(s) = ob.downcast::<PyString>() {
+        if let Ok(s) = <PyString as pyo3::PyTryFrom>::try_from(ob) {
            Ok(SimpleJsonValue::Str(Cow::Owned(s.to_string())))
        // A bool *is* an int, ensure we try bool first.
-        } else if let Ok(b) = ob.downcast::<PyBool>() {
+        } else if let Ok(b) = <PyBool as pyo3::PyTryFrom>::try_from(ob) {
            Ok(SimpleJsonValue::Bool(b.extract()?))
-        } else if let Ok(i) = ob.downcast::<PyLong>() {
+        } else if let Ok(i) = <PyLong as pyo3::PyTryFrom>::try_from(ob) {
            Ok(SimpleJsonValue::Int(i.extract()?))
        } else if ob.is_none() {
            Ok(SimpleJsonValue::Null)
@@ -299,7 +299,7 @@ pub enum JsonValue {

 impl<'source> FromPyObject<'source> for JsonValue {
    fn extract(ob: &'source PyAny) -> PyResult<Self> {
-        if let Ok(l) = ob.downcast::<PyList>() {
+        if let Ok(l) = <PyList as pyo3::PyTryFrom>::try_from(ob) {
            match l.iter().map(SimpleJsonValue::extract).collect() {
                Ok(a) => Ok(JsonValue::Array(a)),
                Err(e) => Err(PyTypeError::new_err(format!(
@@ -370,8 +370,8 @@ impl IntoPy<PyObject> for Condition {
 }

 impl<'source> FromPyObject<'source> for Condition {
-    fn extract_bound(ob: &Bound<'source, PyAny>) -> PyResult<Self> {
-        Ok(depythonize_bound(ob.clone())?)
+    fn extract(ob: &'source PyAny) -> PyResult<Self> {
+        Ok(depythonize(ob)?)
    }
 }

@@ -1,327 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- *
- */
-
-use std::{
-    collections::{BTreeMap, HashMap},
-    time::{Duration, SystemTime},
-};
-
-use bytes::Bytes;
-use headers::{
-    AccessControlAllowOrigin, AccessControlExposeHeaders, CacheControl, ContentLength, ContentType,
-    HeaderMapExt, IfMatch, IfNoneMatch, Pragma,
-};
-use http::{header::ETAG, HeaderMap, Response, StatusCode, Uri};
-use mime::Mime;
-use pyo3::{
-    exceptions::PyValueError,
-    pyclass, pymethods,
-    types::{PyAnyMethods, PyModule, PyModuleMethods},
-    Bound, Py, PyAny, PyObject, PyResult, Python, ToPyObject,
-};
-use ulid::Ulid;
-
-use self::session::Session;
-use crate::{
-    errors::{NotFoundError, SynapseError},
-    http::{http_request_from_twisted, http_response_to_twisted, HeaderMapPyExt},
-};
-
-mod session;
-
-// n.b. Because OPTIONS requests are handled by the Python code, we don't need to set Access-Control-Allow-Headers.
-fn prepare_headers(headers: &mut HeaderMap, session: &Session) {
-    headers.typed_insert(AccessControlAllowOrigin::ANY);
-    headers.typed_insert(AccessControlExposeHeaders::from_iter([ETAG]));
-    headers.typed_insert(Pragma::no_cache());
-    headers.typed_insert(CacheControl::new().with_no_store());
-    headers.typed_insert(session.etag());
-    headers.typed_insert(session.expires());
-    headers.typed_insert(session.last_modified());
-}
-
-#[pyclass]
-struct RendezvousHandler {
-    base: Uri,
-    clock: PyObject,
-    sessions: BTreeMap<Ulid, Session>,
-    capacity: usize,
-    max_content_length: u64,
-    ttl: Duration,
-}
-
-impl RendezvousHandler {
-    /// Check the input headers of a request which sets data for a session, and return the content type.
-    fn check_input_headers(&self, headers: &HeaderMap) -> PyResult<Mime> {
-        let ContentLength(content_length) = headers.typed_get_required()?;
-
-        if content_length > self.max_content_length {
-            return Err(SynapseError::new(
-                StatusCode::PAYLOAD_TOO_LARGE,
-                "Payload too large".to_owned(),
-                "M_TOO_LARGE",
-                None,
-                None,
-            ));
-        }
-
-        let content_type: ContentType = headers.typed_get_required()?;
-
-        // Content-Type must be text/plain
-        if content_type != ContentType::text() {
-            return Err(SynapseError::new(
-                StatusCode::BAD_REQUEST,
-                "Content-Type must be text/plain".to_owned(),
-                "M_INVALID_PARAM",
-                None,
-                None,
-            ));
-        }
-
-        Ok(content_type.into())
-    }
-
-    /// Evict expired sessions and remove the oldest sessions until we're under the capacity.
-    fn evict(&mut self, now: SystemTime) {
-        // First remove all the entries which expired
-        self.sessions.retain(|_, session| !session.expired(now));
-
-        // Then we remove the oldest entires until we're under the limit
-        while self.sessions.len() > self.capacity {
-            self.sessions.pop_first();
-        }
-    }
-}
-
-#[pymethods]
-impl RendezvousHandler {
-    #[new]
-    #[pyo3(signature = (homeserver, /, capacity=100, max_content_length=4*1024, eviction_interval=60*1000, ttl=60*1000))]
-    fn new(
-        py: Python<'_>,
-        homeserver: &Bound<'_, PyAny>,
-        capacity: usize,
-        max_content_length: u64,
-        eviction_interval: u64,
-        ttl: u64,
-    ) -> PyResult<Py<Self>> {
-        let base: String = homeserver
-            .getattr("config")?
-            .getattr("server")?
-            .getattr("public_baseurl")?
-            .extract()?;
-        let base = Uri::try_from(format!("{base}_synapse/client/rendezvous"))
-            .map_err(|_| PyValueError::new_err("Invalid base URI"))?;
-
-        let clock = homeserver.call_method0("get_clock")?.to_object(py);
-
-        // Construct a Python object so that we can get a reference to the
-        // evict method and schedule it to run.
-        let self_ = Py::new(
-            py,
-            Self {
-                base,
-                clock,
-                sessions: BTreeMap::new(),
-                capacity,
-                max_content_length,
-                ttl: Duration::from_millis(ttl),
-            },
-        )?;
-
-        let evict = self_.getattr(py, "_evict")?;
-        homeserver.call_method0("get_clock")?.call_method(
-            "looping_call",
-            (evict, eviction_interval),
-            None,
-        )?;
-
-        Ok(self_)
-    }
-
-    fn _evict(&mut self, py: Python<'_>) -> PyResult<()> {
-        let clock = self.clock.bind(py);
-        let now: u64 = clock.call_method0("time_msec")?.extract()?;
-        let now = SystemTime::UNIX_EPOCH + Duration::from_millis(now);
-        self.evict(now);
-
-        Ok(())
-    }
-
-    fn handle_post(&mut self, py: Python<'_>, twisted_request: &Bound<'_, PyAny>) -> PyResult<()> {
-        let request = http_request_from_twisted(twisted_request)?;
-
-        let content_type = self.check_input_headers(request.headers())?;
-
-        let clock = self.clock.bind(py);
-        let now: u64 = clock.call_method0("time_msec")?.extract()?;
-        let now = SystemTime::UNIX_EPOCH + Duration::from_millis(now);
-
-        // We trigger an immediate eviction if we're at 2x the capacity
-        if self.sessions.len() >= self.capacity * 2 {
-            self.evict(now);
-        }
-
-        // Generate a new ULID for the session from the current time.
-        let id = Ulid::from_datetime(now);
-
-        let uri = format!("{base}/{id}", base = self.base);
-
-        let body = request.into_body();
-
-        let session = Session::new(body, content_type, now, self.ttl);
-
-        let response = serde_json::json!({
-            "url": uri,
-        })
-        .to_string();
-
-        let mut response = Response::new(response.as_bytes());
-        *response.status_mut() = StatusCode::CREATED;
-        response.headers_mut().typed_insert(ContentType::json());
-        prepare_headers(response.headers_mut(), &session);
-        http_response_to_twisted(twisted_request, response)?;
-
-        self.sessions.insert(id, session);
-
-        Ok(())
-    }
-
-    fn handle_get(
-        &mut self,
-        py: Python<'_>,
-        twisted_request: &Bound<'_, PyAny>,
-        id: &str,
-    ) -> PyResult<()> {
-        let request = http_request_from_twisted(twisted_request)?;
-
-        let if_none_match: Option<IfNoneMatch> = request.headers().typed_get_optional()?;
-
-        let now: u64 = self.clock.call_method0(py, "time_msec")?.extract(py)?;
-        let now = SystemTime::UNIX_EPOCH + Duration::from_millis(now);
-
-        let id: Ulid = id.parse().map_err(|_| NotFoundError::new())?;
-        let session = self
-            .sessions
-            .get(&id)
-            .filter(|s| !s.expired(now))
-            .ok_or_else(NotFoundError::new)?;
-
-        if let Some(if_none_match) = if_none_match {
-            if !if_none_match.precondition_passes(&session.etag()) {
-                let mut response = Response::new(Bytes::new());
-                *response.status_mut() = StatusCode::NOT_MODIFIED;
-                prepare_headers(response.headers_mut(), session);
-                http_response_to_twisted(twisted_request, response)?;
-                return Ok(());
-            }
-        }
-
-        let mut response = Response::new(session.data());
-        *response.status_mut() = StatusCode::OK;
-        let headers = response.headers_mut();
-        prepare_headers(headers, session);
-        headers.typed_insert(session.content_type());
-        headers.typed_insert(session.content_length());
-        http_response_to_twisted(twisted_request, response)?;
-
-        Ok(())
-    }
-
-    fn handle_put(
-        &mut self,
-        py: Python<'_>,
-        twisted_request: &Bound<'_, PyAny>,
-        id: &str,
-    ) -> PyResult<()> {
-        let request = http_request_from_twisted(twisted_request)?;
-
-        let content_type = self.check_input_headers(request.headers())?;
-
-        let if_match: IfMatch = request.headers().typed_get_required()?;
-
-        let data = request.into_body();
-
-        let now: u64 = self.clock.call_method0(py, "time_msec")?.extract(py)?;
-        let now = SystemTime::UNIX_EPOCH + Duration::from_millis(now);
-
-        let id: Ulid = id.parse().map_err(|_| NotFoundError::new())?;
-        let session = self
-            .sessions
-            .get_mut(&id)
-            .filter(|s| !s.expired(now))
-            .ok_or_else(NotFoundError::new)?;
-
-        if !if_match.precondition_passes(&session.etag()) {
-            let mut headers = HeaderMap::new();
-            prepare_headers(&mut headers, session);
-
-            let mut additional_fields = HashMap::with_capacity(1);
-            additional_fields.insert(
-                String::from("org.matrix.msc4108.errcode"),
-                String::from("M_CONCURRENT_WRITE"),
-            );
-
-            return Err(SynapseError::new(
-                StatusCode::PRECONDITION_FAILED,
-                "ETag does not match".to_owned(),
-                "M_UNKNOWN", // Would be M_CONCURRENT_WRITE
-                Some(additional_fields),
-                Some(headers),
-            ));
-        }
-
-        session.update(data, content_type, now);
-
-        let mut response = Response::new(Bytes::new());
-        *response.status_mut() = StatusCode::ACCEPTED;
-        prepare_headers(response.headers_mut(), session);
-        http_response_to_twisted(twisted_request, response)?;
-
-        Ok(())
-    }
-
-    fn handle_delete(&mut self, twisted_request: &Bound<'_, PyAny>, id: &str) -> PyResult<()> {
-        let _request = http_request_from_twisted(twisted_request)?;
-
-        let id: Ulid = id.parse().map_err(|_| NotFoundError::new())?;
-        let _session = self.sessions.remove(&id).ok_or_else(NotFoundError::new)?;
-
-        let mut response = Response::new(Bytes::new());
-        *response.status_mut() = StatusCode::NO_CONTENT;
-        response
-            .headers_mut()
-            .typed_insert(AccessControlAllowOrigin::ANY);
-        http_response_to_twisted(twisted_request, response)?;
-
-        Ok(())
-    }
-}
-
-pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new_bound(py, "rendezvous")?;
-
-    child_module.add_class::<RendezvousHandler>()?;
-
-    m.add_submodule(&child_module)?;
-
-    // We need to manually add the module to sys.modules to make `from
-    // synapse.synapse_rust import rendezvous` work.
-    py.import_bound("sys")?
-        .getattr("modules")?
-        .set_item("synapse.synapse_rust.rendezvous", child_module)?;
-
-    Ok(())
-}
@@ -1,91 +0,0 @@
-/*
- * This file is licensed under the Affero General Public License (AGPL) version 3.
- *
- * Copyright (C) 2024 New Vector, Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * See the GNU Affero General Public License for more details:
- * <https://www.gnu.org/licenses/agpl-3.0.html>.
- */
-
-use std::time::{Duration, SystemTime};
-
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _};
-use bytes::Bytes;
-use headers::{ContentLength, ContentType, ETag, Expires, LastModified};
-use mime::Mime;
-use sha2::{Digest, Sha256};
-
-/// A single session, containing data, metadata, and expiry information.
-pub struct Session {
-    hash: [u8; 32],
-    data: Bytes,
-    content_type: Mime,
-    last_modified: SystemTime,
-    expires: SystemTime,
-}
-
-impl Session {
-    /// Create a new session with the given data, content type, and time-to-live.
-    pub fn new(data: Bytes, content_type: Mime, now: SystemTime, ttl: Duration) -> Self {
-        let hash = Sha256::digest(&data).into();
-        Self {
-            hash,
-            data,
-            content_type,
-            expires: now + ttl,
-            last_modified: now,
-        }
-    }
-
-    /// Returns true if the session has expired at the given time.
-    pub fn expired(&self, now: SystemTime) -> bool {
-        self.expires <= now
-    }
-
-    /// Update the session with new data, content type, and last modified time.
-    pub fn update(&mut self, data: Bytes, content_type: Mime, now: SystemTime) {
-        self.hash = Sha256::digest(&data).into();
-        self.data = data;
-        self.content_type = content_type;
-        self.last_modified = now;
-    }
-
-    /// Returns the Content-Type header of the session.
-    pub fn content_type(&self) -> ContentType {
-        self.content_type.clone().into()
-    }
-
-    /// Returns the Content-Length header of the session.
-    pub fn content_length(&self) -> ContentLength {
-        ContentLength(self.data.len() as _)
-    }
-
-    /// Returns the ETag header of the session.
-    pub fn etag(&self) -> ETag {
-        let encoded = URL_SAFE_NO_PAD.encode(self.hash);
-        // SAFETY: Base64 encoding is URL-safe, so ETag-safe
-        format!("\"{encoded}\"")
-            .parse()
-            .expect("base64-encoded hash should be URL-safe")
-    }
-
-    /// Returns the Last-Modified header of the session.
-    pub fn last_modified(&self) -> LastModified {
-        self.last_modified.into()
-    }
-
-    /// Returns the Expires header of the session.
-    pub fn expires(&self) -> Expires {
-        self.expires.into()
-    }
-
-    /// Returns the current data stored in the session.
-    pub fn data(&self) -> Bytes {
-        self.data.clone()
-    }
-}
@@ -214,17 +214,7 @@ fi

 extra_test_args=()

-test_packages=(
-    ./tests/csapi
-    ./tests
-    ./tests/msc3874
-    ./tests/msc3890
-    ./tests/msc3391
-    ./tests/msc3930
-    ./tests/msc3902
-    ./tests/msc3967
-    ./tests/msc4115
-)
+test_packages="./tests/csapi ./tests ./tests/msc3874 ./tests/msc3890 ./tests/msc3391 ./tests/msc3930 ./tests/msc3902"

 # Enable dirty runs, so tests will reuse the same container where possible.
 # This significantly speeds up tests, but increases the possibility of test pollution.
@@ -288,7 +278,7 @@ fi
 export PASS_SYNAPSE_LOG_TESTING=1

 # Run the tests!
-echo "Images built; running complement with ${extra_test_args[@]} $@ ${test_packages[@]}"
+echo "Images built; running complement with ${extra_test_args[@]} $@ $test_packages"
 cd "$COMPLEMENT_DIR"

-go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" "${test_packages[@]}"
+go test -v -tags "synapse_blacklist" -count=1 "${extra_test_args[@]}" "$@" $test_packages
@@ -91,6 +91,7 @@ else
          "synapse" "docker" "tests"
          "scripts-dev"
          "contrib" "synmark" "stubs" ".ci"
+          "dev-docs"
      )
  fi
 fi
@@ -127,7 +127,7 @@ BOOLEAN_COLUMNS = {
    "redactions": ["have_censored"],
    "room_stats_state": ["is_federatable"],
    "rooms": ["is_public", "has_auth_chain_index"],
-    "users": ["shadow_banned", "approved", "locked", "suspended"],
+    "users": ["shadow_banned", "approved", "locked"],
    "un_partial_stated_event_stream": ["rejection_status_changed"],
    "users_who_share_rooms": ["share_private"],
    "per_user_experimental_features": ["enabled"],
@@ -777,74 +777,22 @@ class Porter:
            await self._setup_events_stream_seqs()
            await self._setup_sequence(
                "un_partial_stated_event_stream_sequence",
-                [("un_partial_stated_event_stream", "stream_id")],
+                ("un_partial_stated_event_stream",),
            )
            await self._setup_sequence(
-                "device_inbox_sequence",
-                [
-                    ("device_inbox", "stream_id"),
-                    ("device_federation_outbox", "stream_id"),
-                ],
+                "device_inbox_sequence", ("device_inbox", "device_federation_outbox")
            )
            await self._setup_sequence(
                "account_data_sequence",
-                [
-                    ("room_account_data", "stream_id"),
-                    ("room_tags_revisions", "stream_id"),
-                    ("account_data", "stream_id"),
-                ],
-            )
-            await self._setup_sequence(
-                "receipts_sequence",
-                [
-                    ("receipts_linearized", "stream_id"),
-                ],
-            )
-            await self._setup_sequence(
-                "presence_stream_sequence",
-                [
-                    ("presence_stream", "stream_id"),
-                ],
+                ("room_account_data", "room_tags_revisions", "account_data"),
            )
+            await self._setup_sequence("receipts_sequence", ("receipts_linearized",))
+            await self._setup_sequence("presence_stream_sequence", ("presence_stream",))
            await self._setup_auth_chain_sequence()
            await self._setup_sequence(
                "application_services_txn_id_seq",
-                [
-                    (
-                        "application_services_txns",
-                        "txn_id",
-                    )
-                ],
-            )
-            await self._setup_sequence(
-                "device_lists_sequence",
-                [
-                    ("device_lists_stream", "stream_id"),
-                    ("user_signature_stream", "stream_id"),
-                    ("device_lists_outbound_pokes", "stream_id"),
-                    ("device_lists_changes_in_room", "stream_id"),
-                    ("device_lists_remote_pending", "stream_id"),
-                    ("device_lists_changes_converted_stream_position", "stream_id"),
-                ],
-            )
-            await self._setup_sequence(
-                "e2e_cross_signing_keys_sequence",
-                [
-                    ("e2e_cross_signing_keys", "stream_id"),
-                ],
-            )
-            await self._setup_sequence(
-                "push_rules_stream_sequence",
-                [
-                    ("push_rules_stream", "stream_id"),
-                ],
-            )
-            await self._setup_sequence(
-                "pushers_sequence",
-                [
-                    ("pushers", "id"),
-                    ("deleted_pushers", "stream_id"),
-                ],
+                ("application_services_txns",),
+                "txn_id",
            )

            # Step 3. Get tables.
@@ -1153,11 +1101,12 @@ class Porter:
    async def _setup_sequence(
        self,
        sequence_name: str,
-        stream_id_tables: Iterable[Tuple[str, str]],
+        stream_id_tables: Iterable[str],
+        column_name: str = "stream_id",
    ) -> None:
        """Set a sequence to the correct value."""
        current_stream_ids = []
-        for stream_id_table, column_name in stream_id_tables:
+        for stream_id_table in stream_id_tables:
            max_stream_id = cast(
                int,
                await self.sqlite_store.db_pool.simple_select_one_onecol(
@@ -234,13 +234,6 @@ class EventContentFields:
    TO_DEVICE_MSGID: Final = "org.matrix.msgid"


-class EventUnsignedContentFields:
-    """Fields found inside the 'unsigned' data on events"""
-
-    # Requesting user's membership, per MSC4115
-    MSC4115_MEMBERSHIP: Final = "io.element.msc4115.membership"
-
-
 class RoomTypes:
    """Understood values of the room_type field of m.room.create events."""

@@ -316,10 +316,6 @@ class Ratelimiter:
        )

        if not allowed:
-            # We pause for a bit here to stop clients from "tight-looping" on
-            # retrying their request.
-            await self.clock.sleep(0.5)
-
            raise LimitExceededError(
                limiter_name=self._limiter_name,
                retry_after_ms=int(1000 * (time_allowed - time_now_s)),
@@ -68,7 +68,6 @@ from synapse.config._base import format_config_error
 from synapse.config.homeserver import HomeServerConfig
 from synapse.config.server import ListenerConfig, ManholeConfig, TCPListenerConfig
 from synapse.crypto import context_factory
-from synapse.events.auto_accept_invites import InviteAutoAccepter
 from synapse.events.presence_router import load_legacy_presence_router
 from synapse.handlers.auth import load_legacy_password_auth_providers
 from synapse.http.site import SynapseSite
@@ -583,11 +582,6 @@ async def start(hs: "HomeServer") -> None:
        m = module(config, module_api)
        logger.info("Loaded module %s", m)

-    if hs.config.auto_accept_invites.enabled:
-        # Start the local auto_accept_invites module.
-        m = InviteAutoAccepter(hs.config.auto_accept_invites, module_api)
-        logger.info("Loaded local module %s", m)
-
    load_legacy_spam_checkers(hs)
    load_legacy_third_party_event_rules(hs)
    load_legacy_presence_router(hs)
@@ -681,17 +675,17 @@ def setup_sentry(hs: "HomeServer") -> None:
    )

    # We set some default tags that give some context to this instance
-    global_scope = sentry_sdk.Scope.get_global_scope()
-    global_scope.set_tag("matrix_server_name", hs.config.server.server_name)
+    with sentry_sdk.configure_scope() as scope:
+        scope.set_tag("matrix_server_name", hs.config.server.server_name)

-    app = (
-        hs.config.worker.worker_app
-        if hs.config.worker.worker_app
-        else "synapse.app.homeserver"
-    )
-    name = hs.get_instance_name()
-    global_scope.set_tag("worker_app", app)
-    global_scope.set_tag("worker_name", name)
+        app = (
+            hs.config.worker.worker_app
+            if hs.config.worker.worker_app
+            else "synapse.app.homeserver"
+        )
+        name = hs.get_instance_name()
+        scope.set_tag("worker_app", app)
+        scope.set_tag("worker_name", name)


 def setup_sdnotify(hs: "HomeServer") -> None:
@@ -23,7 +23,6 @@ from synapse.config import (  # noqa: F401
    api,
    appservice,
    auth,
-    auto_accept_invites,
    background_updates,
    cache,
    captcha,
@@ -121,7 +120,6 @@ class RootConfig:
    federation: federation.FederationConfig
    retention: retention.RetentionConfig
    background_updates: background_updates.BackgroundUpdateConfig
-    auto_accept_invites: auto_accept_invites.AutoAcceptInvitesConfig

    config_classes: List[Type["Config"]] = ...
    config_files: List[str]
@@ -1,43 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright (C) 2024 New Vector, Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# See the GNU Affero General Public License for more details:
-# <https://www.gnu.org/licenses/agpl-3.0.html>.
-#
-# Originally licensed under the Apache License, Version 2.0:
-# <http://www.apache.org/licenses/LICENSE-2.0>.
-#
-# [This file includes modifications made by New Vector Limited]
-#
-#
-from typing import Any
-
-from synapse.types import JsonDict
-
-from ._base import Config
-
-
-class AutoAcceptInvitesConfig(Config):
-    section = "auto_accept_invites"
-
-    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
-        auto_accept_invites_config = config.get("auto_accept_invites") or {}
-
-        self.enabled = auto_accept_invites_config.get("enabled", False)
-
-        self.accept_invites_only_for_direct_messages = auto_accept_invites_config.get(
-            "only_for_direct_messages", False
-        )
-
-        self.accept_invites_only_from_local_users = auto_accept_invites_config.get(
-            "only_from_local_users", False
-        )
-
-        self.worker_to_run_on = auto_accept_invites_config.get("worker_to_run_on")
@@ -66,17 +66,6 @@ class CasConfig(Config):

            self.cas_enable_registration = cas_config.get("enable_registration", True)

-            self.cas_allow_numeric_ids = cas_config.get("allow_numeric_ids")
-            self.cas_numeric_ids_prefix = cas_config.get("numeric_ids_prefix")
-            if (
-                self.cas_numeric_ids_prefix is not None
-                and self.cas_numeric_ids_prefix.isalnum() is False
-            ):
-                raise ConfigError(
-                    "Only alphanumeric characters are allowed for numeric IDs prefix",
-                    ("cas_config", "numeric_ids_prefix"),
-                )
-
            self.idp_name = cas_config.get("idp_name", "CAS")
            self.idp_icon = cas_config.get("idp_icon")
            self.idp_brand = cas_config.get("idp_brand")
@@ -88,8 +77,6 @@ class CasConfig(Config):
            self.cas_displayname_attribute = None
            self.cas_required_attributes = []
            self.cas_enable_registration = False
-            self.cas_allow_numeric_ids = False
-            self.cas_numeric_ids_prefix = "u"


 # CAS uses a legacy required attributes mapping, not the one provided by
@@ -52,7 +52,6 @@ DEFAULT_SUBJECTS = {
    "invite_from_person_to_space": "[%(app)s] %(person)s has invited you to join the %(space)s space on %(app)s...",
    "password_reset": "[%(server_name)s] Password reset",
    "email_validation": "[%(server_name)s] Validate your email",
-    "email_already_in_use": "[%(server_name)s] Email already in use",
 }

 LEGACY_TEMPLATE_DIR_WARNING = """
@@ -77,7 +76,6 @@ class EmailSubjectConfig:
    invite_from_person_to_space: str
    password_reset: str
    email_validation: str
-    email_already_in_use: str


 class EmailConfig(Config):
@@ -182,12 +180,6 @@ class EmailConfig(Config):
            registration_template_text = email_config.get(
                "registration_template_text", "registration.txt"
            )
-            already_in_use_template_html = email_config.get(
-                "already_in_use_template_html", "already_in_use.html"
-            )
-            already_in_use_template_text = email_config.get(
-                "already_in_use_template_html", "already_in_use.txt"
-            )
            add_threepid_template_html = email_config.get(
                "add_threepid_template_html", "add_threepid.html"
            )
@@ -223,8 +215,6 @@ class EmailConfig(Config):
                self.email_password_reset_template_text,
                self.email_registration_template_html,
                self.email_registration_template_text,
-                self.email_already_in_use_template_html,
-                self.email_already_in_use_template_text,
                self.email_add_threepid_template_html,
                self.email_add_threepid_template_text,
                self.email_password_reset_template_confirmation_html,
@@ -240,8 +230,6 @@ class EmailConfig(Config):
                    password_reset_template_text,
                    registration_template_html,
                    registration_template_text,
-                    already_in_use_template_html,
-                    already_in_use_template_text,
                    add_threepid_template_html,
                    add_threepid_template_text,
                    "password_reset_confirmation.html",
@@ -332,9 +332,6 @@ class ExperimentalConfig(Config):
        # MSC3391: Removing account data.
        self.msc3391_enabled = experimental.get("msc3391_enabled", False)

-        # MSC3575 (Sliding Sync API endpoints)
-        self.msc3575_enabled: bool = experimental.get("msc3575_enabled", False)
-
        # MSC3773: Thread notifications
        self.msc3773_enabled: bool = experimental.get("msc3773_enabled", False)

@@ -396,6 +393,11 @@ class ExperimentalConfig(Config):
        # MSC3967: Do not require UIA when first uploading cross signing keys
        self.msc3967_enabled = experimental.get("msc3967_enabled", False)

+        # MSC3981: Recurse relations
+        self.msc3981_recurse_relations = experimental.get(
+            "msc3981_recurse_relations", False
+        )
+
        # MSC3861: Matrix architecture change to delegate authentication via OIDC
        try:
            self.msc3861 = MSC3861(**experimental.get("msc3861", {}))
@@ -407,6 +409,11 @@ class ExperimentalConfig(Config):
        # Check that none of the other config options conflict with MSC3861 when enabled
        self.msc3861.check_config_conflicts(self.root)

+        # MSC4010: Do not allow setting m.push_rules account data.
+        self.msc4010_push_rules_account_data = experimental.get(
+            "msc4010_push_rules_account_data", False
+        )
+
        self.msc4028_push_encrypted_events = experimental.get(
            "msc4028_push_encrypted_events", False
        )
@@ -414,32 +421,3 @@ class ExperimentalConfig(Config):
        self.msc4069_profile_inhibit_propagation = experimental.get(
            "msc4069_profile_inhibit_propagation", False
        )
-
-        # MSC4108: Mechanism to allow OIDC sign in and E2EE set up via QR code
-        self.msc4108_enabled = experimental.get("msc4108_enabled", False)
-
-        self.msc4108_delegation_endpoint: Optional[str] = experimental.get(
-            "msc4108_delegation_endpoint", None
-        )
-
-        if (
-            self.msc4108_enabled or self.msc4108_delegation_endpoint is not None
-        ) and not self.msc3861.enabled:
-            raise ConfigError(
-                "MSC4108 requires MSC3861 to be enabled",
-                ("experimental", "msc4108_delegation_endpoint"),
-            )
-
-        if self.msc4108_delegation_endpoint is not None and self.msc4108_enabled:
-            raise ConfigError(
-                "You cannot have MSC4108 both enabled and delegated at the same time",
-                ("experimental", "msc4108_delegation_endpoint"),
-            )
-
-        self.msc4115_membership_on_events = experimental.get(
-            "msc4115_membership_on_events", False
-        )
-
-        self.msc3916_authenticated_media_enabled = experimental.get(
-            "msc3916_authenticated_media_enabled", False
-        )
@@ -42,10 +42,6 @@ class FederationConfig(Config):
            for domain in federation_domain_whitelist:
                self.federation_domain_whitelist[domain] = True

-        self.federation_whitelist_endpoint_enabled = config.get(
-            "federation_whitelist_endpoint_enabled", False
-        )
-
        federation_metrics_domains = config.get("federation_metrics_domains") or []
        validate_config(
            _METRICS_FOR_DOMAINS_SCHEMA,
@@ -23,7 +23,6 @@ from .account_validity import AccountValidityConfig
 from .api import ApiConfig
 from .appservice import AppServiceConfig
 from .auth import AuthConfig
-from .auto_accept_invites import AutoAcceptInvitesConfig
 from .background_updates import BackgroundUpdateConfig
 from .cache import CacheConfig
 from .captcha import CaptchaConfig
@@ -106,5 +105,4 @@ class HomeServerConfig(RootConfig):
        RedisConfig,
        ExperimentalConfig,
        BackgroundUpdateConfig,
-        AutoAcceptInvitesConfig,
    ]
@@ -1,196 +0,0 @@
-#
-# This file is licensed under the Affero General Public License (AGPL) version 3.
-#
-# Copyright 2021 The Matrix.org Foundation C.I.C
-# Copyright (C) 2024 New Vector, Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# See the GNU Affero General Public License for more details:
-# <https://www.gnu.org/licenses/agpl-3.0.html>.
-#
-# Originally licensed under the Apache License, Version 2.0:
-# <http://www.apache.org/licenses/LICENSE-2.0>.
-#
-# [This file includes modifications made by New Vector Limited]
-#
-#
-import logging
-from http import HTTPStatus
-from typing import Any, Dict, Tuple
-
-from synapse.api.constants import AccountDataTypes, EventTypes, Membership
-from synapse.api.errors import SynapseError
-from synapse.config.auto_accept_invites import AutoAcceptInvitesConfig
-from synapse.module_api import EventBase, ModuleApi, run_as_background_process
-
-logger = logging.getLogger(__name__)
-
-
-class InviteAutoAccepter:
-    def __init__(self, config: AutoAcceptInvitesConfig, api: ModuleApi):
-        # Keep a reference to the Module API.
-        self._api = api
-        self._config = config
-
-        if not self._config.enabled:
-            return
-
-        should_run_on_this_worker = config.worker_to_run_on == self._api.worker_name
-
-        if not should_run_on_this_worker:
-            logger.info(
-                "Not accepting invites on this worker (configured: %r, here: %r)",
-                config.worker_to_run_on,
-                self._api.worker_name,
-            )
-            return
-
-        logger.info(
-            "Accepting invites on this worker (here: %r)", self._api.worker_name
-        )
-
-        # Register the callback.
-        self._api.register_third_party_rules_callbacks(
-            on_new_event=self.on_new_event,
-        )
-
-    async def on_new_event(self, event: EventBase, *args: Any) -> None:
-        """Listens for new events, and if the event is an invite for a local user then
-        automatically accepts it.
-
-        Args:
-            event: The incoming event.
-        """
-        # Check if the event is an invite for a local user.
-        is_invite_for_local_user = (
-            event.type == EventTypes.Member
-            and event.is_state()
-            and event.membership == Membership.INVITE
-            and self._api.is_mine(event.state_key)
-        )
-
-        # Only accept invites for direct messages if the configuration mandates it.
-        is_direct_message = event.content.get("is_direct", False)
-        is_allowed_by_direct_message_rules = (
-            not self._config.accept_invites_only_for_direct_messages
-            or is_direct_message is True
-        )
-
-        # Only accept invites from remote users if the configuration mandates it.
-        is_from_local_user = self._api.is_mine(event.sender)
-        is_allowed_by_local_user_rules = (
-            not self._config.accept_invites_only_from_local_users
-            or is_from_local_user is True
-        )
-
-        if (
-            is_invite_for_local_user
-            and is_allowed_by_direct_message_rules
-            and is_allowed_by_local_user_rules
-        ):
-            # Make the user join the room. We run this as a background process to circumvent a race condition
-            # that occurs when responding to invites over federation (see https://github.com/matrix-org/synapse-auto-accept-invite/issues/12)
-            run_as_background_process(
-                "retry_make_join",
-                self._retry_make_join,
-                event.state_key,
-                event.state_key,
-                event.room_id,
-                "join",
-                bg_start_span=False,
-            )
-
-            if is_direct_message:
-                # Mark this room as a direct message!
-                await self._mark_room_as_direct_message(
-                    event.state_key, event.sender, event.room_id
-                )
-
-    async def _mark_room_as_direct_message(
-        self, user_id: str, dm_user_id: str, room_id: str
-    ) -> None:
-        """
-        Marks a room (`room_id`) as a direct message with the counterparty `dm_user_id`
-        from the perspective of the user `user_id`.
-
-        Args:
-            user_id: the user for whom the membership is changing
-            dm_user_id: the user performing the membership change
-            room_id: room id of the room the user is invited to
-        """
-
-        # This is a dict of User IDs to tuples of Room IDs
-        # (get_global will return a frozendict of tuples as it freezes the data,
-        # but we should accept either frozen or unfrozen variants.)
-        # Be careful: we convert the outer frozendict into a dict here,
-        # but the contents of the dict are still frozen (tuples in lieu of lists,
-        # etc.)
-        dm_map: Dict[str, Tuple[str, ...]] = dict(
-            await self._api.account_data_manager.get_global(
-                user_id, AccountDataTypes.DIRECT
-            )
-            or {}
-        )
-
-        if dm_user_id not in dm_map:
-            dm_map[dm_user_id] = (room_id,)
-        else:
-            dm_rooms_for_user = dm_map[dm_user_id]
-            assert isinstance(dm_rooms_for_user, (tuple, list))
-
-            dm_map[dm_user_id] = tuple(dm_rooms_for_user) + (room_id,)
-
-        await self._api.account_data_manager.put_global(
-            user_id, AccountDataTypes.DIRECT, dm_map
-        )
-
-    async def _retry_make_join(
-        self, sender: str, target: str, room_id: str, new_membership: str
-    ) -> None:
-        """
-        A function to retry sending the `make_join` request with an increasing backoff. This is
-        implemented to work around a race condition when receiving invites over federation.
-
-        Args:
-            sender: the user performing the membership change
-            target: the user for whom the membership is changing
-            room_id: room id of the room to join to
-            new_membership: the type of membership event (in this case will be "join")
-        """
-
-        sleep = 0
-        retries = 0
-        join_event = None
-
-        while retries < 5:
-            try:
-                await self._api.sleep(sleep)
-                join_event = await self._api.update_room_membership(
-                    sender=sender,
-                    target=target,
-                    room_id=room_id,
-                    new_membership=new_membership,
-                )
-            except SynapseError as e:
-                if e.code == HTTPStatus.FORBIDDEN:
-                    logger.debug(
-                        f"Update_room_membership was forbidden. This can sometimes be expected for remote invites. Exception: {e}"
-                    )
-                else:
-                    logger.warn(
-                        f"Update_room_membership raised the following unexpected (SynapseError) exception: {e}"
-                    )
-            except Exception as e:
-                logger.warn(
-                    f"Update_room_membership raised the following unexpected exception: {e}"
-                )
-
-            sleep = 2**retries
-            retries += 1
-
-            if join_event is not None:
-                break
@@ -49,7 +49,7 @@ from synapse.api.errors import Codes, SynapseError
 from synapse.api.room_versions import RoomVersion
 from synapse.types import JsonDict, Requester

-from . import EventBase, make_event_from_dict
+from . import EventBase

 if TYPE_CHECKING:
    from synapse.handlers.relations import BundledAggregations
@@ -82,14 +82,17 @@ def prune_event(event: EventBase) -> EventBase:
    """
    pruned_event_dict = prune_event_dict(event.room_version, event.get_dict())

+    from . import make_event_from_dict
+
    pruned_event = make_event_from_dict(
        pruned_event_dict, event.room_version, event.internal_metadata.get_dict()
    )

-    # Copy the bits of `internal_metadata` that aren't returned by `get_dict`
+    # copy the internal fields
    pruned_event.internal_metadata.stream_ordering = (
        event.internal_metadata.stream_ordering
    )
+
    pruned_event.internal_metadata.outlier = event.internal_metadata.outlier

    # Mark the event as redacted
@@ -98,29 +101,6 @@ def prune_event(event: EventBase) -> EventBase:
    return pruned_event


-def clone_event(event: EventBase) -> EventBase:
-    """Take a copy of the event.
-
-    This is mostly useful because it does a *shallow* copy of the `unsigned` data,
-    which means it can then be updated without corrupting the in-memory cache. Note that
-    other properties of the event, such as `content`, are *not* (currently) copied here.
-    """
-    # XXX: We rely on at least one of `event.get_dict()` and `make_event_from_dict()`
-    #   making a copy of `unsigned`. Currently, both do, though I don't really know why.
-    #   Still, as long as they do, there's not much point doing yet another copy here.
-    new_event = make_event_from_dict(
-        event.get_dict(), event.room_version, event.internal_metadata.get_dict()
-    )
-
-    # Copy the bits of `internal_metadata` that aren't returned by `get_dict`.
-    new_event.internal_metadata.stream_ordering = (
-        event.internal_metadata.stream_ordering
-    )
-    new_event.internal_metadata.outlier = event.internal_metadata.outlier
-
-    return new_event
-
-
 def prune_event_dict(room_version: RoomVersion, event_dict: JsonDict) -> JsonDict:
    """Redacts the event_dict in the same way as `prune_event`, except it
    operates on dicts rather than event objects
@@ -546,25 +546,7 @@ class FederationServer(FederationBase):
                edu_type=edu_dict["edu_type"],
                content=edu_dict["content"],
            )
-            try:
-                await self.registry.on_edu(edu.edu_type, origin, edu.content)
-            except Exception:
-                # If there was an error handling the EDU, we must reject the
-                # transaction.
-                #
-                # Some EDU types (notably, to-device messages) are, despite their name,
-                # expected to be reliable; if we weren't able to do something with it,
-                # we have to tell the sender that, and the only way the protocol gives
-                # us to do so is by sending an HTTP error back on the transaction.
-                #
-                # We log the exception now, and then raise a new SynapseError to cause
-                # the transaction to be failed.
-                logger.exception("Error handling EDU of type %s", edu.edu_type)
-                raise SynapseError(500, f"Error handing EDU of type {edu.edu_type}")
-
-                # TODO: if the first EDU fails, we should probably abort the whole
-                #   thing rather than carrying on with the rest of them. That would
-                #   probably be best done inside `concurrently_execute`.
+            await self.registry.on_edu(edu.edu_type, origin, edu.content)

        await concurrently_execute(
            _process_edu,
@@ -1432,7 +1414,12 @@ class FederationHandlerRegistry:
        handler = self.edu_handlers.get(edu_type)
        if handler:
            with start_active_span_from_edu(content, "handle_edu"):
-                await handler(origin, content)
+                try:
+                    await handler(origin, content)
+                except SynapseError as e:
+                    logger.info("Failed to handle edu %r: %r", edu_type, e)
+                except Exception:
+                    logger.exception("Failed to handle edu %r", edu_type)
            return

        # Check if we can route it somewhere else that isn't us
@@ -1441,12 +1428,17 @@ class FederationHandlerRegistry:
            # Pick an instance randomly so that we don't overload one.
            route_to = random.choice(instances)

-            await self._send_edu(
-                instance_name=route_to,
-                edu_type=edu_type,
-                origin=origin,
-                content=content,
-            )
+            try:
+                await self._send_edu(
+                    instance_name=route_to,
+                    edu_type=edu_type,
+                    origin=origin,
+                    content=content,
+                )
+            except SynapseError as e:
+                logger.info("Failed to handle edu %r: %r", edu_type, e)
+            except Exception:
+                logger.exception("Failed to handle edu %r", edu_type)
            return

        # Oh well, let's just log and move on.
@@ -180,11 +180,7 @@ def _parse_auth_header(header_bytes: bytes) -> Tuple[str, str, str, Optional[str
    """
    try:
        header_str = header_bytes.decode("utf-8")
-        space_or_tab = "[ \t]"
-        params = re.split(
-            rf"{space_or_tab}*,{space_or_tab}*",
-            re.split(r"^X-Matrix +", header_str, maxsplit=1)[1],
-        )
+        params = re.split(" +", header_str)[1].split(",")
        param_dict: Dict[str, str] = {
            k.lower(): v for k, v in [param.split("=", maxsplit=1) for param in params]
        }
@@ -42,7 +42,6 @@ class AdminHandler:
        self._device_handler = hs.get_device_handler()
        self._storage_controllers = hs.get_storage_controllers()
        self._state_storage_controller = self._storage_controllers.state
-        self._hs_config = hs.config
        self._msc3866_enabled = hs.config.experimental.msc3866.enabled

    async def get_whois(self, user: UserID) -> JsonMapping:
@@ -218,10 +217,7 @@ class AdminHandler:
                )

                events = await filter_events_for_client(
-                    self._storage_controllers,
-                    user_id,
-                    events,
-                    msc4115_membership_on_events=self._hs_config.experimental.msc4115_membership_on_events,
+                    self._storage_controllers, user_id, events
                )

                writer.write_events(room_id, events)
@@ -78,8 +78,6 @@ class CasHandler:
        self._cas_displayname_attribute = hs.config.cas.cas_displayname_attribute
        self._cas_required_attributes = hs.config.cas.cas_required_attributes
        self._cas_enable_registration = hs.config.cas.cas_enable_registration
-        self._cas_allow_numeric_ids = hs.config.cas.cas_allow_numeric_ids
-        self._cas_numeric_ids_prefix = hs.config.cas.cas_numeric_ids_prefix

        self._http_client = hs.get_proxied_http_client()

@@ -190,9 +188,6 @@ class CasHandler:
        for child in root[0]:
            if child.tag.endswith("user"):
                user = child.text
-                # if numeric user IDs are allowed and username is numeric then we add the prefix so Synapse can handle it
-                if self._cas_allow_numeric_ids and user is not None and user.isdigit():
-                    user = f"{self._cas_numeric_ids_prefix}{user}"
            if child.tag.endswith("attributes"):
                for attribute in child:
                    # ElementTree library expands the namespace in
@@ -261,22 +261,11 @@ class DeactivateAccountHandler:
        user = UserID.from_string(user_id)

        rooms_for_user = await self.store.get_rooms_for_user(user_id)
-        requester = create_requester(user, authenticated_entity=self._server_name)
-        should_erase = await self.store.is_user_erased(user_id)
-
        for room_id in rooms_for_user:
            logger.info("User parter parting %r from %r", user_id, room_id)
            try:
-                # Before parting the user, redact all membership events if requested
-                if should_erase:
-                    event_ids = await self.store.get_membership_event_ids_for_user(
-                        user_id, room_id
-                    )
-                    for event_id in event_ids:
-                        await self.store.expire_event(event_id)
-
                await self._room_member_handler.update_membership(
-                    requester,
+                    create_requester(user, authenticated_entity=self._server_name),
                    user,
                    room_id,
                    "leave",
@@ -159,32 +159,20 @@ class DeviceWorkerHandler:

    @cancellable
    async def get_device_changes_in_shared_rooms(
-        self,
-        user_id: str,
-        room_ids: StrCollection,
-        from_token: StreamToken,
-        now_token: Optional[StreamToken] = None,
+        self, user_id: str, room_ids: StrCollection, from_token: StreamToken
    ) -> Set[str]:
        """Get the set of users whose devices have changed who share a room with
        the given user.
        """
-        now_device_lists_key = self.store.get_device_stream_token()
-        if now_token:
-            now_device_lists_key = now_token.device_list_key
-
        changed_users = await self.store.get_device_list_changes_in_rooms(
-            room_ids,
-            from_token.device_list_key,
-            now_device_lists_key,
+            room_ids, from_token.device_list_key
        )

        if changed_users is not None:
            # We also check if the given user has changed their device. If
            # they're in no rooms then the above query won't include them.
            changed = await self.store.get_users_whose_devices_changed(
-                from_token.device_list_key,
-                [user_id],
-                to_key=now_device_lists_key,
+                from_token.device_list_key, [user_id]
            )
            changed_users.update(changed)
            return changed_users
@@ -202,9 +190,7 @@ class DeviceWorkerHandler:
        tracked_users.add(user_id)

        changed = await self.store.get_users_whose_devices_changed(
-            from_token.device_list_key,
-            tracked_users,
-            to_key=now_device_lists_key,
+            from_token.device_list_key, tracked_users
        )

        return changed
@@ -906,13 +892,6 @@ class DeviceHandler(DeviceWorkerHandler):
                        context=opentracing_context,
                    )

-                    await self.store.mark_redundant_device_lists_pokes(
-                        user_id=user_id,
-                        device_id=device_id,
-                        room_id=room_id,
-                        converted_upto_stream_id=stream_id,
-                    )
-
                    # Notify replication that we've updated the device list stream.
                    self.notifier.notify_replication()

@@ -104,9 +104,6 @@ class DeviceMessageHandler:
        """
        Handle receiving to-device messages from remote homeservers.

-        Note that any errors thrown from this method will cause the federation /send
-        request to receive an error response.
-
        Args:
            origin: The remote homeserver.
            content: The JSON dictionary containing the to-device messages.
@@ -236,13 +233,6 @@ class DeviceMessageHandler:
        local_messages = {}
        remote_messages: Dict[str, Dict[str, Dict[str, JsonDict]]] = {}
        for user_id, by_device in messages.items():
-            if not UserID.is_valid(user_id):
-                logger.warning(
-                    "Ignoring attempt to send device message to invalid user: %r",
-                    user_id,
-                )
-                continue
-
            # add an opentracing log entry for each message
            for device_id, message_content in by_device.items():
                log_kv(
@@ -53,9 +53,6 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)


-ONE_TIME_KEY_UPLOAD = "one_time_key_upload_lock"
-
-
 class E2eKeysHandler:
    def __init__(self, hs: "HomeServer"):
        self.config = hs.config
@@ -65,7 +62,6 @@ class E2eKeysHandler:
        self._appservice_handler = hs.get_application_service_handler()
        self.is_mine = hs.is_mine
        self.clock = hs.get_clock()
-        self._worker_lock_handler = hs.get_worker_locks_handler()

        federation_registry = hs.get_federation_registry()

@@ -149,11 +145,6 @@ class E2eKeysHandler:
            remote_queries = {}

            for user_id, device_ids in device_keys_query.items():
-                if not UserID.is_valid(user_id):
-                    # Ignore invalid user IDs, which is the same behaviour as if
-                    # the user existed but had no keys.
-                    continue
-
                # we use UserID.from_string to catch invalid user ids
                if self.is_mine(UserID.from_string(user_id)):
                    local_query[user_id] = device_ids
@@ -864,53 +855,45 @@ class E2eKeysHandler:
    async def _upload_one_time_keys_for_user(
        self, user_id: str, device_id: str, time_now: int, one_time_keys: JsonDict
    ) -> None:
-        # We take out a lock so that we don't have to worry about a client
-        # sending duplicate requests.
-        lock_key = f"{user_id}_{device_id}"
-        async with self._worker_lock_handler.acquire_lock(
-            ONE_TIME_KEY_UPLOAD, lock_key
-        ):
-            logger.info(
-                "Adding one_time_keys %r for device %r for user %r at %d",
-                one_time_keys.keys(),
-                device_id,
-                user_id,
-                time_now,
-            )
+        logger.info(
+            "Adding one_time_keys %r for device %r for user %r at %d",
+            one_time_keys.keys(),
+            device_id,
+            user_id,
+            time_now,
+        )

-            # make a list of (alg, id, key) tuples
-            key_list = []
-            for key_id, key_obj in one_time_keys.items():
-                algorithm, key_id = key_id.split(":")
-                key_list.append((algorithm, key_id, key_obj))
+        # make a list of (alg, id, key) tuples
+        key_list = []
+        for key_id, key_obj in one_time_keys.items():
+            algorithm, key_id = key_id.split(":")
+            key_list.append((algorithm, key_id, key_obj))

-            # First we check if we have already persisted any of the keys.
-            existing_key_map = await self.store.get_e2e_one_time_keys(
-                user_id, device_id, [k_id for _, k_id, _ in key_list]
-            )
+        # First we check if we have already persisted any of the keys.
+        existing_key_map = await self.store.get_e2e_one_time_keys(
+            user_id, device_id, [k_id for _, k_id, _ in key_list]
+        )

-            new_keys = []  # Keys that we need to insert. (alg, id, json) tuples.
-            for algorithm, key_id, key in key_list:
-                ex_json = existing_key_map.get((algorithm, key_id), None)
-                if ex_json:
-                    if not _one_time_keys_match(ex_json, key):
-                        raise SynapseError(
-                            400,
-                            (
-                                "One time key %s:%s already exists. "
-                                "Old key: %s; new key: %r"
-                            )
-                            % (algorithm, key_id, ex_json, key),
+        new_keys = []  # Keys that we need to insert. (alg, id, json) tuples.
+        for algorithm, key_id, key in key_list:
+            ex_json = existing_key_map.get((algorithm, key_id), None)
+            if ex_json:
+                if not _one_time_keys_match(ex_json, key):
+                    raise SynapseError(
+                        400,
+                        (
+                            "One time key %s:%s already exists. "
+                            "Old key: %s; new key: %r"
                        )
-                else:
-                    new_keys.append(
-                        (algorithm, key_id, encode_canonical_json(key).decode("ascii"))
+                        % (algorithm, key_id, ex_json, key),
                    )
+            else:
+                new_keys.append(
+                    (algorithm, key_id, encode_canonical_json(key).decode("ascii"))
+                )

-            log_kv({"message": "Inserting new one_time_keys.", "keys": new_keys})
-            await self.store.add_e2e_one_time_keys(
-                user_id, device_id, time_now, new_keys
-            )
+        log_kv({"message": "Inserting new one_time_keys.", "keys": new_keys})
+        await self.store.add_e2e_one_time_keys(user_id, device_id, time_now, new_keys)

    async def upload_signing_keys_for_user(
        self, user_id: str, keys: JsonDict
@@ -1493,42 +1476,6 @@ class E2eKeysHandler:
        else:
            return exists, self.clock.time_msec() < ts_replacable_without_uia_before

-    async def has_different_keys(self, user_id: str, body: JsonDict) -> bool:
-        """
-        Check if a key provided in `body` differs from the same key stored in the DB. Returns
-        true on the first difference. If a key exists in `body` but does not exist in the DB,
-        returns True. If `body` has no keys, this always returns False.
-        Note by 'key' we mean Matrix key rather than JSON key.
-
-        The purpose of this function is to detect whether or not we need to apply UIA checks.
-        We must apply UIA checks if any key in the database is being overwritten. If a key is
-        being inserted for the first time, or if the key exactly matches what is in the database,
-        then no UIA check needs to be performed.
-
-        Args:
-            user_id: The user who sent the `body`.
-            body: The JSON request body from POST /keys/device_signing/upload
-        Returns:
-            True if any key in `body` has a different value in the database.
-        """
-        # Ensure that each key provided in the request body exactly matches the one we have stored.
-        # The first time we see the DB having a different key to the matching request key, bail.
-        # Note: we do not care if the DB has a key which the request does not specify, as we only
-        # care about *replacements* or *insertions* (i.e UPSERT)
-        req_body_key_to_db_key = {
-            "master_key": "master",
-            "self_signing_key": "self_signing",
-            "user_signing_key": "user_signing",
-        }
-        for req_body_key, db_key in req_body_key_to_db_key.items():
-            if req_body_key in body:
-                existing_key = await self.store.get_e2e_cross_signing_key(
-                    user_id, db_key
-                )
-                if existing_key != body[req_body_key]:
-                    return True
-        return False
-

 def _check_cross_signing_key(
    key: JsonDict, user_id: str, key_type: str, signing_key: Optional[VerifyKey] = None
@@ -148,7 +148,6 @@ class EventHandler:
    def __init__(self, hs: "HomeServer"):
        self.store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
-        self._config = hs.config

    async def get_event(
        self,
@@ -190,11 +189,7 @@ class EventHandler:
        is_peeking = not is_user_in_room

        filtered = await filter_events_for_client(
-            self._storage_controllers,
-            user.to_string(),
-            [event],
-            is_peeking=is_peeking,
-            msc4115_membership_on_events=self._config.experimental.msc4115_membership_on_events,
+            self._storage_controllers, user.to_string(), [event], is_peeking=is_peeking
        )

        if not filtered:
@@ -221,10 +221,7 @@ class InitialSyncHandler:
                ).addErrback(unwrapFirstError)

                messages = await filter_events_for_client(
-                    self._storage_controllers,
-                    user_id,
-                    messages,
-                    msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+                    self._storage_controllers, user_id, messages
                )

                start_token = now_token.copy_and_replace(StreamKeyType.ROOM, token)
@@ -383,7 +380,6 @@ class InitialSyncHandler:
            requester.user.to_string(),
            messages,
            is_peeking=is_peeking,
-            msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
        )

        start_token = StreamToken.START.copy_and_replace(StreamKeyType.ROOM, token)
@@ -498,7 +494,6 @@ class InitialSyncHandler:
            requester.user.to_string(),
            messages,
            is_peeking=is_peeking,
-            msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
        )

        start_token = now_token.copy_and_replace(StreamKeyType.ROOM, token)
@@ -496,6 +496,13 @@ class EventCreationHandler:

        self.room_prejoin_state_types = self.hs.config.api.room_prejoin_state

+        self.membership_types_to_include_profile_data_in = {
+            Membership.JOIN,
+            Membership.KNOCK,
+        }
+        if self.hs.config.server.include_profile_data_on_invite:
+            self.membership_types_to_include_profile_data_in.add(Membership.INVITE)
+
        self.send_event = ReplicationSendEventRestServlet.make_client(hs)
        self.send_events = ReplicationSendEventsRestServlet.make_client(hs)

@@ -587,6 +594,8 @@ class EventCreationHandler:
        Creates an FrozenEvent object, filling out auth_events, prev_events,
        etc.

+        Adds display names to Join membership events.
+
        Args:
            requester
            event_dict: An entire event
@@ -663,6 +672,29 @@ class EventCreationHandler:

        self.validator.validate_builder(builder)

+        if builder.type == EventTypes.Member:
+            membership = builder.content.get("membership", None)
+            target = UserID.from_string(builder.state_key)
+
+            if membership in self.membership_types_to_include_profile_data_in:
+                # If event doesn't include a display name, add one.
+                profile = self.profile_handler
+                content = builder.content
+
+                try:
+                    if "displayname" not in content:
+                        displayname = await profile.get_displayname(target)
+                        if displayname is not None:
+                            content["displayname"] = displayname
+                    if "avatar_url" not in content:
+                        avatar_url = await profile.get_avatar_url(target)
+                        if avatar_url is not None:
+                            content["avatar_url"] = avatar_url
+                except Exception as e:
+                    logger.info(
+                        "Failed to get profile information for %r: %s", target, e
+                    )
+
        is_exempt = await self._is_exempt_from_privacy_policy(builder, requester)
        if require_consent and not is_exempt:
            await self.assert_accepted_privacy_policy(requester)
@@ -623,7 +623,6 @@ class PaginationHandler:
                user_id,
                events,
                is_peeking=(member_event_id is None),
-                msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
            )

        # if after the filter applied there are no more events
@@ -20,7 +20,7 @@
 #
 import logging
 import random
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union

 from synapse.api.errors import (
    AuthError,
@@ -64,10 +64,8 @@ class ProfileHandler:
        self.user_directory_handler = hs.get_user_directory_handler()
        self.request_ratelimiter = hs.get_request_ratelimiter()

-        self.max_avatar_size: Optional[int] = hs.config.server.max_avatar_size
-        self.allowed_avatar_mimetypes: Optional[List[str]] = (
-            hs.config.server.allowed_avatar_mimetypes
-        )
+        self.max_avatar_size = hs.config.server.max_avatar_size
+        self.allowed_avatar_mimetypes = hs.config.server.allowed_avatar_mimetypes

        self._is_mine_server_name = hs.is_mine_server_name

@@ -339,12 +337,6 @@ class ProfileHandler:
            return False

        if self.max_avatar_size:
-            if media_info.media_length is None:
-                logger.warning(
-                    "Forbidding avatar change to %s: unknown media size",
-                    mxc,
-                )
-                return False
            # Ensure avatar does not exceed max allowed avatar size
            if media_info.media_length > self.max_avatar_size:
                logger.warning(
@@ -590,7 +590,7 @@ class RegistrationHandler:
                # moving away from bare excepts is a good thing to do.
                logger.error("Failed to join new user to %r: %r", r, e)
            except Exception as e:
-                logger.error("Failed to join new user to %r: %r", r, e, exc_info=True)
+                logger.error("Failed to join new user to %r: %r", r, e)

    async def _auto_join_rooms(self, user_id: str) -> None:
        """Automatically joins users to auto join rooms - creating the room in the first place
@@ -95,7 +95,6 @@ class RelationsHandler:
        self._event_handler = hs.get_event_handler()
        self._event_serializer = hs.get_event_client_serializer()
        self._event_creation_handler = hs.get_event_creation_handler()
-        self._config = hs.config

    async def get_relations(
        self,
@@ -164,7 +163,6 @@ class RelationsHandler:
            user_id,
            events,
            is_peeking=(member_event_id is None),
-            msc4115_membership_on_events=self._config.experimental.msc4115_membership_on_events,
        )

        # The relations returned for the requested event do include their
@@ -393,9 +391,9 @@ class RelationsHandler:

                # Attempt to find another event to use as the latest event.
                potential_events, _ = await self._main_store.get_relations_for_event(
-                    room_id,
                    event_id,
                    event,
+                    room_id,
                    RelationTypes.THREAD,
                    direction=Direction.FORWARDS,
                )
@@ -610,7 +608,6 @@ class RelationsHandler:
            user_id,
            events,
            is_peeking=(member_event_id is None),
-            msc4115_membership_on_events=self._config.experimental.msc4115_membership_on_events,
        )

        aggregations = await self.get_bundled_aggregations(
@@ -956,7 +956,6 @@ class RoomCreationHandler:
            room_alias=room_alias,
            power_level_content_override=power_level_content_override,
            creator_join_profile=creator_join_profile,
-            ignore_forced_encryption=ignore_forced_encryption,
        )

        # we avoid dropping the lock between invites, as otherwise joins can
@@ -1476,7 +1475,6 @@ class RoomContextHandler:
                user.to_string(),
                events,
                is_peeking=is_peeking,
-                msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
            )

        event = await self.store.get_event(
@@ -106,13 +106,6 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        self.event_auth_handler = hs.get_event_auth_handler()
        self._worker_lock_handler = hs.get_worker_locks_handler()

-        self._membership_types_to_include_profile_data_in = {
-            Membership.JOIN,
-            Membership.KNOCK,
-        }
-        if self.hs.config.server.include_profile_data_on_invite:
-            self._membership_types_to_include_profile_data_in.add(Membership.INVITE)
-
        self.member_linearizer: Linearizer = Linearizer(name="member")
        self.member_as_limiter = Linearizer(max_count=10, name="member_as_limiter")

@@ -759,41 +752,12 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
            and requester.user.to_string() == self._server_notices_mxid
        )

-        requester_suspended = await self.store.get_user_suspended_status(
-            requester.user.to_string()
-        )
-        if action == Membership.INVITE and requester_suspended:
-            raise SynapseError(
-                403,
-                "Sending invites while account is suspended is not allowed.",
-                Codes.USER_ACCOUNT_SUSPENDED,
-            )
-
-        if target.to_string() != requester.user.to_string():
-            target_suspended = await self.store.get_user_suspended_status(
-                target.to_string()
-            )
-        else:
-            target_suspended = requester_suspended
-
-        if action == Membership.JOIN and target_suspended:
-            raise SynapseError(
-                403,
-                "Joining rooms while account is suspended is not allowed.",
-                Codes.USER_ACCOUNT_SUSPENDED,
-            )
-        if action == Membership.KNOCK and target_suspended:
-            raise SynapseError(
-                403,
-                "Knocking on rooms while account is suspended is not allowed.",
-                Codes.USER_ACCOUNT_SUSPENDED,
-            )
-
        if (
            not self.allow_per_room_profiles and not is_requester_server_notices_user
        ) or requester.shadow_banned:
-            # Strip profile data, knowing that new profile data will be added to
-            # the event's content below using the target's global profile.
+            # Strip profile data, knowing that new profile data will be added to the
+            # event's content in event_creation_handler.create_event() using the target's
+            # global profile.
            content.pop("displayname", None)
            content.pop("avatar_url", None)

@@ -829,29 +793,6 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        if action in ["kick", "unban"]:
            effective_membership_state = "leave"

-        if effective_membership_state not in Membership.LIST:
-            raise SynapseError(400, "Invalid membership key")
-
-        # Add profile data for joins etc, if no per-room profile.
-        if (
-            effective_membership_state
-            in self._membership_types_to_include_profile_data_in
-        ):
-            # If event doesn't include a display name, add one.
-            profile = self.profile_handler
-
-            try:
-                if "displayname" not in content:
-                    displayname = await profile.get_displayname(target)
-                    if displayname is not None:
-                        content["displayname"] = displayname
-                if "avatar_url" not in content:
-                    avatar_url = await profile.get_avatar_url(target)
-                    if avatar_url is not None:
-                        content["avatar_url"] = avatar_url
-            except Exception as e:
-                logger.info("Failed to get profile information for %r: %s", target, e)
-
        # if this is a join with a 3pid signature, we may need to turn a 3pid
        # invite into a normal invite before we can handle the join.
        if third_party_signed is not None:
@@ -480,10 +480,7 @@ class SearchHandler:
        filtered_events = await search_filter.filter([r["event"] for r in results])

        events = await filter_events_for_client(
-            self._storage_controllers,
-            user.to_string(),
-            filtered_events,
-            msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+            self._storage_controllers, user.to_string(), filtered_events
        )

        events.sort(key=lambda e: -rank_map[e.event_id])
@@ -582,10 +579,7 @@ class SearchHandler:
            filtered_events = await search_filter.filter([r["event"] for r in results])

            events = await filter_events_for_client(
-                self._storage_controllers,
-                user.to_string(),
-                filtered_events,
-                msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+                self._storage_controllers, user.to_string(), filtered_events
            )

            room_events.extend(events)
@@ -670,17 +664,11 @@ class SearchHandler:
            )

            events_before = await filter_events_for_client(
-                self._storage_controllers,
-                user.to_string(),
-                res.events_before,
-                msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+                self._storage_controllers, user.to_string(), res.events_before
            )

            events_after = await filter_events_for_client(
-                self._storage_controllers,
-                user.to_string(),
-                res.events_after,
-                msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+                self._storage_controllers, user.to_string(), res.events_after
            )

            context: JsonDict = {
@@ -169,7 +169,6 @@ class UsernameMappingSession:
    # attributes returned by the ID mapper
    display_name: Optional[str]
    emails: StrCollection
-    avatar_url: Optional[str]

    # An optional dictionary of extra attributes to be provided to the client in the
    # login response.
@@ -184,7 +183,6 @@ class UsernameMappingSession:
    # choices made by the user
    chosen_localpart: Optional[str] = None
    use_display_name: bool = True
-    use_avatar: bool = True
    emails_to_use: StrCollection = ()
    terms_accepted_version: Optional[str] = None

@@ -662,9 +660,6 @@ class SsoHandler:
            remote_user_id=remote_user_id,
            display_name=attributes.display_name,
            emails=attributes.emails,
-            avatar_url=attributes.picture,
-            # Default to using all mapped emails. Will be overwritten in handle_submit_username_request.
-            emails_to_use=attributes.emails,
            client_redirect_url=client_redirect_url,
            expiry_time_ms=now + self._MAPPING_SESSION_VALIDITY_PERIOD_MS,
            extra_login_attributes=extra_login_attributes,
@@ -817,7 +812,7 @@ class SsoHandler:
                server_name = profile["avatar_url"].split("/")[-2]
                media_id = profile["avatar_url"].split("/")[-1]
                if self._is_mine_server_name(server_name):
-                    media = await self._media_repo.store.get_local_media(media_id)  # type: ignore[has-type]
+                    media = await self._media_repo.store.get_local_media(media_id)
                    if media is not None and upload_name == media.upload_name:
                        logger.info("skipping saving the user avatar")
                        return True
@@ -971,7 +966,6 @@ class SsoHandler:
        session_id: str,
        localpart: str,
        use_display_name: bool,
-        use_avatar: bool,
        emails_to_use: Iterable[str],
    ) -> None:
        """Handle a request to the username-picker 'submit' endpoint
@@ -994,7 +988,6 @@ class SsoHandler:
        # update the session with the user's choices
        session.chosen_localpart = localpart
        session.use_display_name = use_display_name
-        session.use_avatar = use_avatar

        emails_from_idp = set(session.emails)
        filtered_emails: Set[str] = set()
@@ -1075,9 +1068,6 @@ class SsoHandler:
        if session.use_display_name:
            attributes.display_name = session.display_name

-        if session.use_avatar:
-            attributes.picture = session.avatar_url
-
        # the following will raise a 400 error if the username has been taken in the
        # meantime.
        user_id = await self._register_mapped_user(
@@ -20,7 +20,6 @@
 #
 import itertools
 import logging
-from enum import Enum
 from typing import (
    TYPE_CHECKING,
    AbstractSet,
@@ -28,14 +27,11 @@ from typing import (
    Dict,
    FrozenSet,
    List,
-    Literal,
    Mapping,
    Optional,
    Sequence,
    Set,
    Tuple,
-    Union,
-    overload,
 )

 import attr
@@ -116,30 +112,12 @@ LAZY_LOADED_MEMBERS_CACHE_MAX_SIZE = 100
 SyncRequestKey = Tuple[Any, ...]


-class SyncVersion(Enum):
-    """
-    Enum for specifying the version of sync request. This is used to key which type of
-    sync response that we are generating.
-
-    This is different than the `sync_type` you might see used in other code below; which
-    specifies the sub-type sync request (e.g. initial_sync, full_state_sync,
-    incremental_sync) and is really only relevant for the `/sync` v2 endpoint.
-    """
-
-    # These string values are semantically significant because they are used in the the
-    # metrics
-
-    # Traditional `/sync` endpoint
-    SYNC_V2 = "sync_v2"
-    # Part of MSC3575 Sliding Sync
-    E2EE_SYNC = "e2ee_sync"
-
-
@attr.s(slots=True, frozen=True, auto_attribs=True)
 class SyncConfig:
    user: UserID
    filter_collection: FilterCollection
    is_guest: bool
+    request_key: SyncRequestKey
    device_id: Optional[str]


@@ -284,47 +262,6 @@ class SyncResult:
            or self.device_lists
        )

-    @staticmethod
-    def empty(
-        next_batch: StreamToken,
-        device_one_time_keys_count: JsonMapping,
-        device_unused_fallback_key_types: List[str],
-    ) -> "SyncResult":
-        "Return a new empty result"
-        return SyncResult(
-            next_batch=next_batch,
-            presence=[],
-            account_data=[],
-            joined=[],
-            invited=[],
-            knocked=[],
-            archived=[],
-            to_device=[],
-            device_lists=DeviceListUpdates(),
-            device_one_time_keys_count=device_one_time_keys_count,
-            device_unused_fallback_key_types=device_unused_fallback_key_types,
-        )
-
-
-@attr.s(slots=True, frozen=True, auto_attribs=True)
-class E2eeSyncResult:
-    """
-    Attributes:
-        next_batch: Token for the next sync
-        to_device: List of direct messages for the device.
-        device_lists: List of user_ids whose devices have changed
-        device_one_time_keys_count: Dict of algorithm to count for one time keys
-            for this device
-        device_unused_fallback_key_types: List of key types that have an unused fallback
-            key
-    """
-
-    next_batch: StreamToken
-    to_device: List[JsonDict]
-    device_lists: DeviceListUpdates
-    device_one_time_keys_count: JsonMapping
-    device_unused_fallback_key_types: List[str]
-

 class SyncHandler:
    def __init__(self, hs: "HomeServer"):
@@ -368,68 +305,17 @@ class SyncHandler:

        self.rooms_to_exclude_globally = hs.config.server.rooms_to_exclude_from_sync

-    @overload
    async def wait_for_sync_for_user(
        self,
        requester: Requester,
        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.SYNC_V2],
-        request_key: SyncRequestKey,
        since_token: Optional[StreamToken] = None,
        timeout: int = 0,
        full_state: bool = False,
-    ) -> SyncResult: ...
-
-    @overload
-    async def wait_for_sync_for_user(
-        self,
-        requester: Requester,
-        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.E2EE_SYNC],
-        request_key: SyncRequestKey,
-        since_token: Optional[StreamToken] = None,
-        timeout: int = 0,
-        full_state: bool = False,
-    ) -> E2eeSyncResult: ...
-
-    @overload
-    async def wait_for_sync_for_user(
-        self,
-        requester: Requester,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        request_key: SyncRequestKey,
-        since_token: Optional[StreamToken] = None,
-        timeout: int = 0,
-        full_state: bool = False,
-    ) -> Union[SyncResult, E2eeSyncResult]: ...
-
-    async def wait_for_sync_for_user(
-        self,
-        requester: Requester,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        request_key: SyncRequestKey,
-        since_token: Optional[StreamToken] = None,
-        timeout: int = 0,
-        full_state: bool = False,
-    ) -> Union[SyncResult, E2eeSyncResult]:
+    ) -> SyncResult:
        """Get the sync for a client if we have new data for it now. Otherwise
        wait for new data to arrive on the server. If the timeout expires, then
        return an empty sync result.
-
-        Args:
-            requester: The user requesting the sync response.
-            sync_config: Config/info necessary to process the sync request.
-            sync_version: Determines what kind of sync response to generate.
-            request_key: The key to use for caching the response.
-            since_token: The point in the stream to sync from.
-            timeout: How long to wait for new data to arrive before giving up.
-            full_state: Whether to return the full state for each room.
-
-        Returns:
-            When `SyncVersion.SYNC_V2`, returns a full `SyncResult`.
-            When `SyncVersion.E2EE_SYNC`, returns a `E2eeSyncResult`.
        """
        # If the user is not part of the mau group, then check that limits have
        # not been exceeded (if not part of the group by this point, almost certain
@@ -438,10 +324,9 @@ class SyncHandler:
        await self.auth_blocking.check_auth_blocking(requester=requester)

        res = await self.response_cache.wrap(
-            request_key,
+            sync_config.request_key,
            self._wait_for_sync_for_user,
            sync_config,
-            sync_version,
            since_token,
            timeout,
            full_state,
@@ -450,48 +335,14 @@ class SyncHandler:
        logger.debug("Returning sync response for %s", user_id)
        return res

-    @overload
    async def _wait_for_sync_for_user(
        self,
        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.SYNC_V2],
        since_token: Optional[StreamToken],
        timeout: int,
        full_state: bool,
        cache_context: ResponseCacheContext[SyncRequestKey],
-    ) -> SyncResult: ...
-
-    @overload
-    async def _wait_for_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.E2EE_SYNC],
-        since_token: Optional[StreamToken],
-        timeout: int,
-        full_state: bool,
-        cache_context: ResponseCacheContext[SyncRequestKey],
-    ) -> E2eeSyncResult: ...
-
-    @overload
-    async def _wait_for_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        since_token: Optional[StreamToken],
-        timeout: int,
-        full_state: bool,
-        cache_context: ResponseCacheContext[SyncRequestKey],
-    ) -> Union[SyncResult, E2eeSyncResult]: ...
-
-    async def _wait_for_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        since_token: Optional[StreamToken],
-        timeout: int,
-        full_state: bool,
-        cache_context: ResponseCacheContext[SyncRequestKey],
-    ) -> Union[SyncResult, E2eeSyncResult]:
+    ) -> SyncResult:
        """The start of the machinery that produces a /sync response.

        See https://spec.matrix.org/v1.1/client-server-api/#syncing for full details.
@@ -512,50 +363,9 @@ class SyncHandler:
        else:
            sync_type = "incremental_sync"

-        sync_label = f"{sync_version}:{sync_type}"
-
        context = current_context()
        if context:
-            context.tag = sync_label
-
-        if since_token is not None:
-            # We need to make sure this worker has caught up with the token. If
-            # this returns false it means we timed out waiting, and we should
-            # just return an empty response.
-            start = self.clock.time_msec()
-            if not await self.notifier.wait_for_stream_token(since_token):
-                logger.warning(
-                    "Timed out waiting for worker to catch up. Returning empty response"
-                )
-                device_id = sync_config.device_id
-                one_time_keys_count: JsonMapping = {}
-                unused_fallback_key_types: List[str] = []
-                if device_id:
-                    user_id = sync_config.user.to_string()
-                    # TODO: We should have a way to let clients differentiate between the states of:
-                    #   * no change in OTK count since the provided since token
-                    #   * the server has zero OTKs left for this device
-                    #  Spec issue: https://github.com/matrix-org/matrix-doc/issues/3298
-                    one_time_keys_count = await self.store.count_e2e_one_time_keys(
-                        user_id, device_id
-                    )
-                    unused_fallback_key_types = list(
-                        await self.store.get_e2e_unused_fallback_key_types(
-                            user_id, device_id
-                        )
-                    )
-
-                cache_context.should_cache = False  # Don't cache empty responses
-                return SyncResult.empty(
-                    since_token, one_time_keys_count, unused_fallback_key_types
-                )
-
-            # If we've spent significant time waiting to catch up, take it off
-            # the timeout.
-            now = self.clock.time_msec()
-            if now - start > 1_000:
-                timeout -= now - start
-                timeout = max(timeout, 0)
+            context.tag = sync_type

        # if we have a since token, delete any to-device messages before that token
        # (since we now know that the device has received them)
@@ -573,19 +383,15 @@ class SyncHandler:
        if timeout == 0 or since_token is None or full_state:
            # we are going to return immediately, so don't bother calling
            # notifier.wait_for_events.
-            result: Union[SyncResult, E2eeSyncResult] = (
-                await self.current_sync_for_user(
-                    sync_config, sync_version, since_token, full_state=full_state
-                )
+            result: SyncResult = await self.current_sync_for_user(
+                sync_config, since_token, full_state=full_state
            )
        else:
            # Otherwise, we wait for something to happen and report it to the user.
            async def current_sync_callback(
                before_token: StreamToken, after_token: StreamToken
-            ) -> Union[SyncResult, E2eeSyncResult]:
-                return await self.current_sync_for_user(
-                    sync_config, sync_version, since_token
-                )
+            ) -> SyncResult:
+                return await self.current_sync_for_user(sync_config, since_token)

            result = await self.notifier.wait_for_events(
                sync_config.user.to_string(),
@@ -610,81 +416,27 @@ class SyncHandler:
                lazy_loaded = "true"
            else:
                lazy_loaded = "false"
-            non_empty_sync_counter.labels(sync_label, lazy_loaded).inc()
+            non_empty_sync_counter.labels(sync_type, lazy_loaded).inc()

        return result

-    @overload
    async def current_sync_for_user(
        self,
        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.SYNC_V2],
        since_token: Optional[StreamToken] = None,
        full_state: bool = False,
-    ) -> SyncResult: ...
-
-    @overload
-    async def current_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: Literal[SyncVersion.E2EE_SYNC],
-        since_token: Optional[StreamToken] = None,
-        full_state: bool = False,
-    ) -> E2eeSyncResult: ...
-
-    @overload
-    async def current_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        since_token: Optional[StreamToken] = None,
-        full_state: bool = False,
-    ) -> Union[SyncResult, E2eeSyncResult]: ...
-
-    async def current_sync_for_user(
-        self,
-        sync_config: SyncConfig,
-        sync_version: SyncVersion,
-        since_token: Optional[StreamToken] = None,
-        full_state: bool = False,
-    ) -> Union[SyncResult, E2eeSyncResult]:
-        """
-        Generates the response body of a sync result, represented as a
-        `SyncResult`/`E2eeSyncResult`.
+    ) -> SyncResult:
+        """Generates the response body of a sync result, represented as a SyncResult.

        This is a wrapper around `generate_sync_result` which starts an open tracing
        span to track the sync. See `generate_sync_result` for the next part of your
        indoctrination.
-
-        Args:
-            sync_config: Config/info necessary to process the sync request.
-            sync_version: Determines what kind of sync response to generate.
-            since_token: The point in the stream to sync from.p.
-            full_state: Whether to return the full state for each room.
-
-        Returns:
-            When `SyncVersion.SYNC_V2`, returns a full `SyncResult`.
-            When `SyncVersion.E2EE_SYNC`, returns a `E2eeSyncResult`.
        """
        with start_active_span("sync.current_sync_for_user"):
            log_kv({"since_token": since_token})
-
-            # Go through the `/sync` v2 path
-            if sync_version == SyncVersion.SYNC_V2:
-                sync_result: Union[SyncResult, E2eeSyncResult] = (
-                    await self.generate_sync_result(
-                        sync_config, since_token, full_state
-                    )
-                )
-            # Go through the MSC3575 Sliding Sync `/sync/e2ee` path
-            elif sync_version == SyncVersion.E2EE_SYNC:
-                sync_result = await self.generate_e2ee_sync_result(
-                    sync_config, since_token
-                )
-            else:
-                raise Exception(
-                    f"Unknown sync_version (this is a Synapse problem): {sync_version}"
-                )
+            sync_result = await self.generate_sync_result(
+                sync_config, since_token, full_state
+            )

            set_tag(SynapseTags.SYNC_RESULT, bool(sync_result))
            return sync_result
@@ -844,7 +596,6 @@ class SyncHandler:
                    sync_config.user.to_string(),
                    recents,
                    always_include_ids=current_state_ids,
-                    msc4115_membership_on_events=self.hs_config.experimental.msc4115_membership_on_events,
                )
                log_kv({"recents_after_visibility_filtering": len(recents)})
            else:
@@ -930,7 +681,6 @@ class SyncHandler:
                    sync_config.user.to_string(),
                    loaded_recents,
                    always_include_ids=current_state_ids,
-                    msc4115_membership_on_events=self.hs_config.experimental.msc4115_membership_on_events,
                )

                loaded_recents = []
@@ -1509,51 +1259,6 @@ class SyncHandler:
            await_full_state = True
            lazy_load_members = False

-        # For a non-gappy sync if the events in the timeline are simply a linear
-        # chain (i.e. no merging/branching of the graph), then we know the state
-        # delta between the end of the previous sync and start of the new one is
-        # empty.
-        #
-        # c.f. #16941 for an example of why we can't do this for all non-gappy
-        # syncs.
-        is_linear_timeline = True
-        if batch.events:
-            # We need to make sure the first event in our batch points to the
-            # last event in the previous batch.
-            last_event_id_prev_batch = (
-                await self.store.get_last_event_in_room_before_stream_ordering(
-                    room_id,
-                    end_token=since_token.room_key,
-                )
-            )
-
-            prev_event_id = last_event_id_prev_batch
-            for e in batch.events:
-                if e.prev_event_ids() != [prev_event_id]:
-                    is_linear_timeline = False
-                    break
-                prev_event_id = e.event_id
-
-        if is_linear_timeline and not batch.limited:
-            state_ids: StateMap[str] = {}
-            if lazy_load_members:
-                if members_to_fetch and batch.events:
-                    # We're lazy-loading, so the client might need some more
-                    # member events to understand the events in this timeline.
-                    # So we fish out all the member events corresponding to the
-                    # timeline here. The caller will then dedupe any redundant
-                    # ones.
-
-                    state_ids = await self._state_storage_controller.get_state_ids_for_event(
-                        batch.events[0].event_id,
-                        # we only want members!
-                        state_filter=StateFilter.from_types(
-                            (EventTypes.Member, member) for member in members_to_fetch
-                        ),
-                        await_full_state=False,
-                    )
-            return state_ids
-
        if batch:
            state_at_timeline_start = (
                await self._state_storage_controller.get_state_ids_for_event(
@@ -1766,17 +1471,128 @@ class SyncHandler:
            # See https://github.com/matrix-org/matrix-doc/issues/1144
            raise NotImplementedError()

-        sync_result_builder = await self.get_sync_result_builder(
-            sync_config,
-            since_token,
-            full_state,
+        # Note: we get the users room list *before* we get the current token, this
+        # avoids checking back in history if rooms are joined after the token is fetched.
+        token_before_rooms = self.event_sources.get_current_token()
+        mutable_joined_room_ids = set(await self.store.get_rooms_for_user(user_id))
+
+        # NB: The now_token gets changed by some of the generate_sync_* methods,
+        # this is due to some of the underlying streams not supporting the ability
+        # to query up to a given point.
+        # Always use the `now_token` in `SyncResultBuilder`
+        now_token = self.event_sources.get_current_token()
+        log_kv({"now_token": now_token})
+
+        # Since we fetched the users room list before the token, there's a small window
+        # during which membership events may have been persisted, so we fetch these now
+        # and modify the joined room list for any changes between the get_rooms_for_user
+        # call and the get_current_token call.
+        membership_change_events = []
+        if since_token:
+            membership_change_events = await self.store.get_membership_changes_for_user(
+                user_id,
+                since_token.room_key,
+                now_token.room_key,
+                self.rooms_to_exclude_globally,
+            )
+
+            mem_last_change_by_room_id: Dict[str, EventBase] = {}
+            for event in membership_change_events:
+                mem_last_change_by_room_id[event.room_id] = event
+
+            # For the latest membership event in each room found, add/remove the room ID
+            # from the joined room list accordingly. In this case we only care if the
+            # latest change is JOIN.
+
+            for room_id, event in mem_last_change_by_room_id.items():
+                assert event.internal_metadata.stream_ordering
+                if (
+                    event.internal_metadata.stream_ordering
+                    < token_before_rooms.room_key.stream
+                ):
+                    continue
+
+                logger.info(
+                    "User membership change between getting rooms and current token: %s %s %s",
+                    user_id,
+                    event.membership,
+                    room_id,
+                )
+                # User joined a room - we have to then check the room state to ensure we
+                # respect any bans if there's a race between the join and ban events.
+                if event.membership == Membership.JOIN:
+                    user_ids_in_room = await self.store.get_users_in_room(room_id)
+                    if user_id in user_ids_in_room:
+                        mutable_joined_room_ids.add(room_id)
+                # The user left the room, or left and was re-invited but not joined yet
+                else:
+                    mutable_joined_room_ids.discard(room_id)
+
+        # Tweak the set of rooms to return to the client for eager (non-lazy) syncs.
+        mutable_rooms_to_exclude = set(self.rooms_to_exclude_globally)
+        if not sync_config.filter_collection.lazy_load_members():
+            # Non-lazy syncs should never include partially stated rooms.
+            # Exclude all partially stated rooms from this sync.
+            results = await self.store.is_partial_state_room_batched(
+                mutable_joined_room_ids
+            )
+            mutable_rooms_to_exclude.update(
+                room_id
+                for room_id, is_partial_state in results.items()
+                if is_partial_state
+            )
+            membership_change_events = [
+                event
+                for event in membership_change_events
+                if not results.get(event.room_id, False)
+            ]
+
+        # Incremental eager syncs should additionally include rooms that
+        # - we are joined to
+        # - are full-stated
+        # - became fully-stated at some point during the sync period
+        #   (These rooms will have been omitted during a previous eager sync.)
+        forced_newly_joined_room_ids: Set[str] = set()
+        if since_token and not sync_config.filter_collection.lazy_load_members():
+            un_partial_stated_rooms = (
+                await self.store.get_un_partial_stated_rooms_between(
+                    since_token.un_partial_stated_rooms_key,
+                    now_token.un_partial_stated_rooms_key,
+                    mutable_joined_room_ids,
+                )
+            )
+            results = await self.store.is_partial_state_room_batched(
+                un_partial_stated_rooms
+            )
+            forced_newly_joined_room_ids.update(
+                room_id
+                for room_id, is_partial_state in results.items()
+                if not is_partial_state
+            )
+
+        # Now we have our list of joined room IDs, exclude as configured and freeze
+        joined_room_ids = frozenset(
+            room_id
+            for room_id in mutable_joined_room_ids
+            if room_id not in mutable_rooms_to_exclude
        )

        logger.debug(
            "Calculating sync response for %r between %s and %s",
            sync_config.user,
-            sync_result_builder.since_token,
-            sync_result_builder.now_token,
+            since_token,
+            now_token,
+        )
+
+        sync_result_builder = SyncResultBuilder(
+            sync_config,
+            full_state,
+            since_token=since_token,
+            now_token=now_token,
+            joined_room_ids=joined_room_ids,
+            excluded_room_ids=frozenset(mutable_rooms_to_exclude),
+            forced_newly_joined_room_ids=frozenset(forced_newly_joined_room_ids),
+            membership_change_events=membership_change_events,
        )

        logger.debug("Fetching account data")
@@ -1888,239 +1704,6 @@ class SyncHandler:
            next_batch=sync_result_builder.now_token,
        )

-    async def generate_e2ee_sync_result(
-        self,
-        sync_config: SyncConfig,
-        since_token: Optional[StreamToken] = None,
-    ) -> E2eeSyncResult:
-        """
-        Generates the response body of a MSC3575 Sliding Sync `/sync/e2ee` result.
-
-        This is represented by a `E2eeSyncResult` struct, which is built from small
-        pieces using a `SyncResultBuilder`. The `sync_result_builder` is passed as a
-        mutable ("inout") parameter to various helper functions. These retrieve and
-        process the data which forms the sync body, often writing to the
-        `sync_result_builder` to store their output.
-
-        At the end, we transfer data from the `sync_result_builder` to a new `E2eeSyncResult`
-        instance to signify that the sync calculation is complete.
-        """
-        user_id = sync_config.user.to_string()
-        app_service = self.store.get_app_service_by_user_id(user_id)
-        if app_service:
-            # We no longer support AS users using /sync directly.
-            # See https://github.com/matrix-org/matrix-doc/issues/1144
-            raise NotImplementedError()
-
-        sync_result_builder = await self.get_sync_result_builder(
-            sync_config,
-            since_token,
-            full_state=False,
-        )
-
-        # 1. Calculate `to_device` events
-        await self._generate_sync_entry_for_to_device(sync_result_builder)
-
-        # 2. Calculate `device_lists`
-        # Device list updates are sent if a since token is provided.
-        device_lists = DeviceListUpdates()
-        include_device_list_updates = bool(since_token and since_token.device_list_key)
-        if include_device_list_updates:
-            # Note that _generate_sync_entry_for_rooms sets sync_result_builder.joined, which
-            # is used in calculate_user_changes below.
-            #
-            # TODO: Running `_generate_sync_entry_for_rooms()` is a lot of work just to
-            # figure out the membership changes/derived info needed for
-            # `_generate_sync_entry_for_device_list()`. In the future, we should try to
-            # refactor this away.
-            (
-                newly_joined_rooms,
-                newly_left_rooms,
-            ) = await self._generate_sync_entry_for_rooms(sync_result_builder)
-
-            # This uses the sync_result_builder.joined which is set in
-            # `_generate_sync_entry_for_rooms`, if that didn't find any joined
-            # rooms for some reason it is a no-op.
-            (
-                newly_joined_or_invited_or_knocked_users,
-                newly_left_users,
-            ) = sync_result_builder.calculate_user_changes()
-
-            device_lists = await self._generate_sync_entry_for_device_list(
-                sync_result_builder,
-                newly_joined_rooms=newly_joined_rooms,
-                newly_joined_or_invited_or_knocked_users=newly_joined_or_invited_or_knocked_users,
-                newly_left_rooms=newly_left_rooms,
-                newly_left_users=newly_left_users,
-            )
-
-        # 3. Calculate `device_one_time_keys_count` and `device_unused_fallback_key_types`
-        device_id = sync_config.device_id
-        one_time_keys_count: JsonMapping = {}
-        unused_fallback_key_types: List[str] = []
-        if device_id:
-            # TODO: We should have a way to let clients differentiate between the states of:
-            #   * no change in OTK count since the provided since token
-            #   * the server has zero OTKs left for this device
-            #  Spec issue: https://github.com/matrix-org/matrix-doc/issues/3298
-            one_time_keys_count = await self.store.count_e2e_one_time_keys(
-                user_id, device_id
-            )
-            unused_fallback_key_types = list(
-                await self.store.get_e2e_unused_fallback_key_types(user_id, device_id)
-            )
-
-        return E2eeSyncResult(
-            to_device=sync_result_builder.to_device,
-            device_lists=device_lists,
-            device_one_time_keys_count=one_time_keys_count,
-            device_unused_fallback_key_types=unused_fallback_key_types,
-            next_batch=sync_result_builder.now_token,
-        )
-
-    async def get_sync_result_builder(
-        self,
-        sync_config: SyncConfig,
-        since_token: Optional[StreamToken] = None,
-        full_state: bool = False,
-    ) -> "SyncResultBuilder":
-        """
-        Assemble a `SyncResultBuilder` with all of the initial context to
-        start building up the sync response:
-
-        - Membership changes between the last sync and the current sync.
-        - Joined room IDs (minus any rooms to exclude).
-        - Rooms that became fully-stated/un-partial stated since the last sync.
-
-        Args:
-            sync_config: Config/info necessary to process the sync request.
-            since_token: The point in the stream to sync from.
-            full_state: Whether to return the full state for each room.
-
-        Returns:
-            `SyncResultBuilder` ready to start generating parts of the sync response.
-        """
-        user_id = sync_config.user.to_string()
-
-        # Note: we get the users room list *before* we get the current token, this
-        # avoids checking back in history if rooms are joined after the token is fetched.
-        token_before_rooms = self.event_sources.get_current_token()
-        mutable_joined_room_ids = set(await self.store.get_rooms_for_user(user_id))
-
-        # NB: The `now_token` gets changed by some of the `generate_sync_*` methods,
-        # this is due to some of the underlying streams not supporting the ability
-        # to query up to a given point.
-        # Always use the `now_token` in `SyncResultBuilder`
-        now_token = self.event_sources.get_current_token()
-        log_kv({"now_token": now_token})
-
-        # Since we fetched the users room list before the token, there's a small window
-        # during which membership events may have been persisted, so we fetch these now
-        # and modify the joined room list for any changes between the get_rooms_for_user
-        # call and the get_current_token call.
-        membership_change_events = []
-        if since_token:
-            membership_change_events = await self.store.get_membership_changes_for_user(
-                user_id,
-                since_token.room_key,
-                now_token.room_key,
-                self.rooms_to_exclude_globally,
-            )
-
-            mem_last_change_by_room_id: Dict[str, EventBase] = {}
-            for event in membership_change_events:
-                mem_last_change_by_room_id[event.room_id] = event
-
-            # For the latest membership event in each room found, add/remove the room ID
-            # from the joined room list accordingly. In this case we only care if the
-            # latest change is JOIN.
-
-            for room_id, event in mem_last_change_by_room_id.items():
-                assert event.internal_metadata.stream_ordering
-                if (
-                    event.internal_metadata.stream_ordering
-                    < token_before_rooms.room_key.stream
-                ):
-                    continue
-
-                logger.info(
-                    "User membership change between getting rooms and current token: %s %s %s",
-                    user_id,
-                    event.membership,
-                    room_id,
-                )
-                # User joined a room - we have to then check the room state to ensure we
-                # respect any bans if there's a race between the join and ban events.
-                if event.membership == Membership.JOIN:
-                    user_ids_in_room = await self.store.get_users_in_room(room_id)
-                    if user_id in user_ids_in_room:
-                        mutable_joined_room_ids.add(room_id)
-                # The user left the room, or left and was re-invited but not joined yet
-                else:
-                    mutable_joined_room_ids.discard(room_id)
-
-        # Tweak the set of rooms to return to the client for eager (non-lazy) syncs.
-        mutable_rooms_to_exclude = set(self.rooms_to_exclude_globally)
-        if not sync_config.filter_collection.lazy_load_members():
-            # Non-lazy syncs should never include partially stated rooms.
-            # Exclude all partially stated rooms from this sync.
-            results = await self.store.is_partial_state_room_batched(
-                mutable_joined_room_ids
-            )
-            mutable_rooms_to_exclude.update(
-                room_id
-                for room_id, is_partial_state in results.items()
-                if is_partial_state
-            )
-            membership_change_events = [
-                event
-                for event in membership_change_events
-                if not results.get(event.room_id, False)
-            ]
-
-        # Incremental eager syncs should additionally include rooms that
-        # - we are joined to
-        # - are full-stated
-        # - became fully-stated at some point during the sync period
-        #   (These rooms will have been omitted during a previous eager sync.)
-        forced_newly_joined_room_ids: Set[str] = set()
-        if since_token and not sync_config.filter_collection.lazy_load_members():
-            un_partial_stated_rooms = (
-                await self.store.get_un_partial_stated_rooms_between(
-                    since_token.un_partial_stated_rooms_key,
-                    now_token.un_partial_stated_rooms_key,
-                    mutable_joined_room_ids,
-                )
-            )
-            results = await self.store.is_partial_state_room_batched(
-                un_partial_stated_rooms
-            )
-            forced_newly_joined_room_ids.update(
-                room_id
-                for room_id, is_partial_state in results.items()
-                if not is_partial_state
-            )
-
-        # Now we have our list of joined room IDs, exclude as configured and freeze
-        joined_room_ids = frozenset(
-            room_id
-            for room_id in mutable_joined_room_ids
-            if room_id not in mutable_rooms_to_exclude
-        )
-
-        sync_result_builder = SyncResultBuilder(
-            sync_config,
-            full_state,
-            since_token=since_token,
-            now_token=now_token,
-            joined_room_ids=joined_room_ids,
-            excluded_room_ids=frozenset(mutable_rooms_to_exclude),
-            forced_newly_joined_room_ids=frozenset(forced_newly_joined_room_ids),
-            membership_change_events=membership_change_events,
-        )
-
-        return sync_result_builder
-
    @measure_func("_generate_sync_entry_for_device_list")
    async def _generate_sync_entry_for_device_list(
        self,
@@ -2169,18 +1752,42 @@ class SyncHandler:

        users_that_have_changed = set()

-        joined_room_ids = sync_result_builder.joined_room_ids
+        joined_rooms = sync_result_builder.joined_room_ids

        # Step 1a, check for changes in devices of users we share a room
        # with
-        users_that_have_changed = (
-            await self._device_handler.get_device_changes_in_shared_rooms(
-                user_id,
-                joined_room_ids,
-                from_token=since_token,
-                now_token=sync_result_builder.now_token,
-            )
+        #
+        # We do this in two different ways depending on what we have cached.
+        # If we already have a list of all the user that have changed since
+        # the last sync then it's likely more efficient to compare the rooms
+        # they're in with the rooms the syncing user is in.
+        #
+        # If we don't have that info cached then we get all the users that
+        # share a room with our user and check if those users have changed.
+        cache_result = self.store.get_cached_device_list_changes(
+            since_token.device_list_key
        )
+        if cache_result.hit:
+            changed_users = cache_result.entities
+
+            result = await self.store.get_rooms_for_users(changed_users)
+
+            for changed_user_id, entries in result.items():
+                # Check if the changed user shares any rooms with the user,
+                # or if the changed user is the syncing user (as we always
+                # want to include device list updates of their own devices).
+                if user_id == changed_user_id or any(
+                    rid in joined_rooms for rid in entries
+                ):
+                    users_that_have_changed.add(changed_user_id)
+        else:
+            users_that_have_changed = (
+                await self._device_handler.get_device_changes_in_shared_rooms(
+                    user_id,
+                    sync_result_builder.joined_room_ids,
+                    from_token=since_token,
+                )
+            )

        # Step 1b, check for newly joined rooms
        for room_id in newly_joined_rooms:
@@ -2204,7 +1811,7 @@ class SyncHandler:
        # Remove any users that we still share a room with.
        left_users_rooms = await self.store.get_rooms_for_users(newly_left_users)
        for user_id, entries in left_users_rooms.items():
-            if any(rid in joined_room_ids for rid in entries):
+            if any(rid in joined_rooms for rid in entries):
                newly_left_users.discard(user_id)

        return DeviceListUpdates(changed=users_that_have_changed, left=newly_left_users)
@@ -2291,19 +1898,23 @@ class SyncHandler:
            )

            if push_rules_changed:
-                global_account_data = dict(global_account_data)
-                global_account_data[AccountDataTypes.PUSH_RULES] = (
-                    await self._push_rules_handler.push_rules_for_user(sync_config.user)
-                )
+                global_account_data = {
+                    AccountDataTypes.PUSH_RULES: await self._push_rules_handler.push_rules_for_user(
+                        sync_config.user
+                    ),
+                    **global_account_data,
+                }
        else:
            all_global_account_data = await self.store.get_global_account_data_for_user(
                user_id
            )

-            global_account_data = dict(all_global_account_data)
-            global_account_data[AccountDataTypes.PUSH_RULES] = (
-                await self._push_rules_handler.push_rules_for_user(sync_config.user)
-            )
+            global_account_data = {
+                AccountDataTypes.PUSH_RULES: await self._push_rules_handler.push_rules_for_user(
+                    sync_config.user
+                ),
+                **all_global_account_data,
+            }

        account_data_for_user = (
            await sync_config.filter_collection.filter_global_account_data(
@@ -477,9 +477,9 @@ class TypingWriterHandler(FollowerTypingHandler):

        rows = []
        for room_id in changed_rooms:
-            serial = self._room_serials.get(room_id)
-            if serial and last_id < serial <= current_id:
-                typing = self._room_typing.get(room_id, set())
+            serial = self._room_serials[room_id]
+            if last_id < serial <= current_id:
+                typing = self._room_typing[room_id]
                rows.append((serial, [room_id, list(typing)]))
        rows.sort()

@@ -262,8 +262,7 @@ class _ProxyResponseBody(protocol.Protocol):
            self._request.finish()
        else:
            # Abort the underlying request since our remote request also failed.
-            if self._request.channel:
-                self._request.channel.forceAbortClient()
+            self._request.transport.abortConnection()


 class ProxySite(Site):
@@ -153,9 +153,9 @@ def return_json_error(
    # Only respond with an error response if we haven't already started writing,
    # otherwise lets just kill the connection
    if request.startedWriting:
-        if request.channel:
+        if request.transport:
            try:
-                request.channel.forceAbortClient()
+                request.transport.abortConnection()
            except Exception:
                # abortConnection throws if the connection is already closed
                pass
@@ -909,19 +909,7 @@ def set_cors_headers(request: "SynapseRequest") -> None:
    request.setHeader(
        b"Access-Control-Allow-Methods", b"GET, HEAD, POST, PUT, DELETE, OPTIONS"
    )
-    if request.path is not None and (
-        request.path == b"/_matrix/client/unstable/org.matrix.msc4108/rendezvous"
-        or request.path.startswith(b"/_synapse/client/rendezvous")
-    ):
-        request.setHeader(
-            b"Access-Control-Allow-Headers",
-            b"Content-Type, If-Match, If-None-Match",
-        )
-        request.setHeader(
-            b"Access-Control-Expose-Headers",
-            b"Synapse-Trace-Id, Server, ETag",
-        )
-    elif request.experimental_cors_msc3886:
+    if request.experimental_cors_msc3886:
        request.setHeader(
            b"Access-Control-Allow-Headers",
            b"X-Requested-With, Content-Type, Authorization, Date, If-Match, If-None-Match",
@@ -19,11 +19,9 @@
 #
 #

-"""This module contains base REST classes for constructing REST servlets."""
-
+""" This module contains base REST classes for constructing REST servlets. """
 import enum
 import logging
-import urllib.parse as urlparse
 from http import HTTPStatus
 from typing import (
    TYPE_CHECKING,
@@ -67,49 +65,17 @@ def parse_integer(request: Request, name: str, default: int) -> int: ...


@overload
-def parse_integer(
-    request: Request, name: str, *, default: int, negative: bool
-) -> int: ...
+def parse_integer(request: Request, name: str, *, required: Literal[True]) -> int: ...


@overload
 def parse_integer(
-    request: Request, name: str, *, default: int, negative: bool = False
-) -> int: ...
-
-
-@overload
-def parse_integer(
-    request: Request, name: str, *, required: Literal[True], negative: bool = False
-) -> int: ...
-
-
-@overload
-def parse_integer(
-    request: Request, name: str, *, default: Literal[None], negative: bool = False
-) -> None: ...
-
-
-@overload
-def parse_integer(request: Request, name: str, *, negative: bool) -> Optional[int]: ...
-
-
-@overload
-def parse_integer(
-    request: Request,
-    name: str,
-    default: Optional[int] = None,
-    required: bool = False,
-    negative: bool = False,
+    request: Request, name: str, default: Optional[int] = None, required: bool = False
 ) -> Optional[int]: ...


 def parse_integer(
-    request: Request,
-    name: str,
-    default: Optional[int] = None,
-    required: bool = False,
-    negative: bool = False,
+    request: Request, name: str, default: Optional[int] = None, required: bool = False
 ) -> Optional[int]:
    """Parse an integer parameter from the request string

@@ -119,17 +85,16 @@ def parse_integer(
        default: value to use if the parameter is absent, defaults to None.
        required: whether to raise a 400 SynapseError if the parameter is absent,
            defaults to False.
-        negative: whether to allow negative integers, defaults to True.
+
    Returns:
        An int value or the default.

    Raises:
-        SynapseError: if the parameter is absent and required, if the
-            parameter is present and not an integer, or if the
-            parameter is illegitimate negative.
+        SynapseError: if the parameter is absent and required, or if the
+            parameter is present and not an integer.
    """
    args: Mapping[bytes, Sequence[bytes]] = request.args  # type: ignore
-    return parse_integer_from_args(args, name, default, required, negative)
+    return parse_integer_from_args(args, name, default, required)


@overload
@@ -155,7 +120,6 @@ def parse_integer_from_args(
    name: str,
    default: Optional[int] = None,
    required: bool = False,
-    negative: bool = False,
 ) -> Optional[int]: ...


@@ -164,7 +128,6 @@ def parse_integer_from_args(
    name: str,
    default: Optional[int] = None,
    required: bool = False,
-    negative: bool = True,
 ) -> Optional[int]:
    """Parse an integer parameter from the request string

@@ -174,37 +137,33 @@ def parse_integer_from_args(
        default: value to use if the parameter is absent, defaults to None.
        required: whether to raise a 400 SynapseError if the parameter is absent,
            defaults to False.
-        negative: whether to allow negative integers, defaults to True.

    Returns:
        An int value or the default.

    Raises:
-        SynapseError: if the parameter is absent and required, if the
-            parameter is present and not an integer, or if the
-            parameter is illegitimate negative.
+        SynapseError: if the parameter is absent and required, or if the
+            parameter is present and not an integer.
    """
    name_bytes = name.encode("ascii")

-    if name_bytes not in args:
-        if not required:
+    if name_bytes in args:
+        try:
+            return int(args[name_bytes][0])
+        except Exception:
+            message = "Query parameter %r must be an integer" % (name,)
+            raise SynapseError(
+                HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM
+            )
+    else:
+        if required:
+            message = "Missing integer query parameter %r" % (name,)
+            raise SynapseError(
+                HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM
+            )
+        else:
            return default

-        message = f"Missing required integer query parameter {name}"
-        raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM)
-
-    try:
-        integer = int(args[name_bytes][0])
-    except Exception:
-        message = f"Query parameter {name} must be an integer"
-        raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM)
-
-    if not negative and integer < 0:
-        message = f"Query parameter {name} must be a positive integer."
-        raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.INVALID_PARAM)
-
-    return integer
-

@overload
 def parse_boolean(request: Request, name: str, default: bool) -> bool: ...
@@ -451,87 +410,6 @@ def parse_string(
    )


-def parse_json(
-    request: Request,
-    name: str,
-    default: Optional[dict] = None,
-    required: bool = False,
-    encoding: str = "ascii",
-) -> Optional[JsonDict]:
-    """
-    Parse a JSON parameter from the request query string.
-
-    Args:
-        request: the twisted HTTP request.
-        name: the name of the query parameter.
-        default: value to use if the parameter is absent,
-            defaults to None.
-        required: whether to raise a 400 SynapseError if the
-           parameter is absent, defaults to False.
-        encoding: The encoding to decode the string content with.
-
-    Returns:
-        A JSON value, or `default` if the named query parameter was not found
-        and `required` was False.
-
-    Raises:
-        SynapseError if the parameter is absent and required, or if the
-            parameter is present and not a JSON object.
-    """
-    args: Mapping[bytes, Sequence[bytes]] = request.args  # type: ignore
-    return parse_json_from_args(
-        args,
-        name,
-        default,
-        required=required,
-        encoding=encoding,
-    )
-
-
-def parse_json_from_args(
-    args: Mapping[bytes, Sequence[bytes]],
-    name: str,
-    default: Optional[dict] = None,
-    required: bool = False,
-    encoding: str = "ascii",
-) -> Optional[JsonDict]:
-    """
-    Parse a JSON parameter from the request query string.
-
-    Args:
-        args: a mapping of request args as bytes to a list of bytes (e.g. request.args).
-        name: the name of the query parameter.
-        default: value to use if the parameter is absent,
-            defaults to None.
-        required: whether to raise a 400 SynapseError if the
-            parameter is absent, defaults to False.
-        encoding: the encoding to decode the string content with.
-
-        A JSON value, or `default` if the named query parameter was not found
-        and `required` was False.
-
-    Raises:
-        SynapseError if the parameter is absent and required, or if the
-            parameter is present and not a JSON object.
-    """
-    name_bytes = name.encode("ascii")
-
-    if name_bytes not in args:
-        if not required:
-            return default
-
-        message = f"Missing required integer query parameter {name}"
-        raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.MISSING_PARAM)
-
-    json_str = parse_string_from_args(args, name, required=True, encoding=encoding)
-
-    try:
-        return json_decoder.decode(urlparse.unquote(json_str))
-    except Exception:
-        message = f"Query parameter {name} must be a valid JSON object"
-        raise SynapseError(HTTPStatus.BAD_REQUEST, message, errcode=Codes.NOT_JSON)
-
-
 EnumT = TypeVar("EnumT", bound=enum.Enum)


@@ -150,8 +150,7 @@ class SynapseRequest(Request):
                self.get_method(),
                self.get_redacted_uri(),
            )
-            if self.channel:
-                self.channel.forceAbortClient()
+            self.transport.abortConnection()
            return
        super().handleContentChunk(data)

@@ -650,7 +650,7 @@ class MediaRepository:

        file_info = FileInfo(server_name=server_name, file_id=file_id)

-        async with self.media_storage.store_into_file(file_info) as (f, fname):
+        with self.media_storage.store_into_file(file_info) as (f, fname, finish):
            try:
                length, headers = await self.client.download_media(
                    server_name,
@@ -693,6 +693,8 @@ class MediaRepository:
                )
                raise SynapseError(502, "Failed to fetch remote media")

+            await finish()
+
            if b"Content-Type" in headers:
                media_type = headers[b"Content-Type"][0].decode("ascii")
            else:
@@ -1043,17 +1045,17 @@ class MediaRepository:
                    ),
                )

-                async with self.media_storage.store_into_file(file_info) as (f, fname):
+                with self.media_storage.store_into_file(file_info) as (
+                    f,
+                    fname,
+                    finish,
+                ):
                    try:
                        await self.media_storage.write_to_file(t_byte_source, f)
+                        await finish()
                    finally:
                        t_byte_source.close()

-                    # We flush and close the file to ensure that the bytes have
-                    # been written before getting the size.
-                    f.flush()
-                    f.close()
-
                    t_len = os.path.getsize(fname)

                    # Write to database
@@ -27,9 +27,10 @@ from typing import (
    IO,
    TYPE_CHECKING,
    Any,
-    AsyncIterator,
+    Awaitable,
    BinaryIO,
    Callable,
+    Generator,
    Optional,
    Sequence,
    Tuple,
@@ -96,9 +97,11 @@ class MediaStorage:
            the file path written to in the primary media store
        """

-        async with self.store_into_file(file_info) as (f, fname):
+        with self.store_into_file(file_info) as (f, fname, finish_cb):
            # Write to the main media repository
            await self.write_to_file(source, f)
+            # Write to the other storage providers
+            await finish_cb()

        return fname

@@ -108,27 +111,32 @@ class MediaStorage:
        await defer_to_thread(self.reactor, _write_file_synchronously, source, output)

    @trace_with_opname("MediaStorage.store_into_file")
-    @contextlib.asynccontextmanager
-    async def store_into_file(
+    @contextlib.contextmanager
+    def store_into_file(
        self, file_info: FileInfo
-    ) -> AsyncIterator[Tuple[BinaryIO, str]]:
-        """Async Context manager used to get a file like object to write into, as
+    ) -> Generator[Tuple[BinaryIO, str, Callable[[], Awaitable[None]]], None, None]:
+        """Context manager used to get a file like object to write into, as
        described by file_info.

-        Actually yields a 2-tuple (file, fname,), where file is a file
-        like object that can be written to and fname is the absolute path of file
-        on disk.
+        Actually yields a 3-tuple (file, fname, finish_cb), where file is a file
+        like object that can be written to, fname is the absolute path of file
+        on disk, and finish_cb is a function that returns an awaitable.

        fname can be used to read the contents from after upload, e.g. to
        generate thumbnails.

+        finish_cb must be called and waited on after the file has been successfully been
+        written to. Should not be called if there was an error. Checks for spam and
+        stores the file into the configured storage providers.
+
        Args:
            file_info: Info about the file to store

        Example:

-            async with media_storage.store_into_file(info) as (f, fname,):
+            with media_storage.store_into_file(info) as (f, fname, finish_cb):
                # .. write into f ...
+                await finish_cb()
        """

        path = self._file_info_to_path(file_info)
@@ -137,38 +145,63 @@ class MediaStorage:
        dirname = os.path.dirname(fname)
        os.makedirs(dirname, exist_ok=True)

+        finished_called = [False]
+
+        main_media_repo_write_trace_scope = start_active_span(
+            "writing to main media repo"
+        )
+        main_media_repo_write_trace_scope.__enter__()
+
        try:
-            with start_active_span("writing to main media repo"):
-                with open(fname, "wb") as f:
-                    yield f, fname
+            with open(fname, "wb") as f:

-            with start_active_span("writing to other storage providers"):
-                spam_check = (
-                    await self._spam_checker_module_callbacks.check_media_file_for_spam(
-                        ReadableFileWrapper(self.clock, fname), file_info
-                    )
-                )
-                if spam_check != self._spam_checker_module_callbacks.NOT_SPAM:
-                    logger.info("Blocking media due to spam checker")
-                    # Note that we'll delete the stored media, due to the
-                    # try/except below. The media also won't be stored in
-                    # the DB.
-                    # We currently ignore any additional field returned by
-                    # the spam-check API.
-                    raise SpamMediaException(errcode=spam_check[0])
+                async def finish() -> None:
+                    # When someone calls finish, we assume they are done writing to the main media repo
+                    main_media_repo_write_trace_scope.__exit__(None, None, None)

-                for provider in self.storage_providers:
-                    with start_active_span(str(provider)):
-                        await provider.store_file(path, file_info)
+                    with start_active_span("writing to other storage providers"):
+                        # Ensure that all writes have been flushed and close the
+                        # file.
+                        f.flush()
+                        f.close()

+                        spam_check = await self._spam_checker_module_callbacks.check_media_file_for_spam(
+                            ReadableFileWrapper(self.clock, fname), file_info
+                        )
+                        if spam_check != self._spam_checker_module_callbacks.NOT_SPAM:
+                            logger.info("Blocking media due to spam checker")
+                            # Note that we'll delete the stored media, due to the
+                            # try/except below. The media also won't be stored in
+                            # the DB.
+                            # We currently ignore any additional field returned by
+                            # the spam-check API.
+                            raise SpamMediaException(errcode=spam_check[0])
+
+                        for provider in self.storage_providers:
+                            with start_active_span(str(provider)):
+                                await provider.store_file(path, file_info)
+
+                        finished_called[0] = True
+
+                yield f, fname, finish
        except Exception as e:
            try:
+                main_media_repo_write_trace_scope.__exit__(
+                    type(e), None, e.__traceback__
+                )
                os.remove(fname)
            except Exception:
                pass

            raise e from None

+        if not finished_called:
+            exc = Exception("Finished callback not called")
+            main_media_repo_write_trace_scope.__exit__(
+                type(exc), None, exc.__traceback__
+            )
+            raise exc
+
    async def fetch_media(self, file_info: FileInfo) -> Optional[Responder]:
        """Attempts to fetch media described by file_info from the local cache
        and configured storage providers.
@@ -22,27 +22,11 @@
 import logging
 from io import BytesIO
 from types import TracebackType
-from typing import TYPE_CHECKING, List, Optional, Tuple, Type
+from typing import Optional, Tuple, Type

 from PIL import Image

-from synapse.api.errors import Codes, SynapseError, cs_error
-from synapse.config.repository import THUMBNAIL_SUPPORTED_MEDIA_FORMAT_MAP
-from synapse.http.server import respond_with_json
-from synapse.http.site import SynapseRequest
 from synapse.logging.opentracing import trace
-from synapse.media._base import (
-    FileInfo,
-    ThumbnailInfo,
-    respond_404,
-    respond_with_file,
-    respond_with_responder,
-)
-from synapse.media.media_storage import MediaStorage
-
-if TYPE_CHECKING:
-    from synapse.media.media_repository import MediaRepository
-    from synapse.server import HomeServer

 logger = logging.getLogger(__name__)

@@ -247,471 +231,3 @@ class Thumbnailer:
    def __del__(self) -> None:
        # Make sure we actually do close the image, rather than leak data.
        self.close()
-
-
-class ThumbnailProvider:
-    def __init__(
-        self,
-        hs: "HomeServer",
-        media_repo: "MediaRepository",
-        media_storage: MediaStorage,
-    ):
-        self.hs = hs
-        self.media_repo = media_repo
-        self.media_storage = media_storage
-        self.store = hs.get_datastores().main
-        self.dynamic_thumbnails = hs.config.media.dynamic_thumbnails
-
-    async def respond_local_thumbnail(
-        self,
-        request: SynapseRequest,
-        media_id: str,
-        width: int,
-        height: int,
-        method: str,
-        m_type: str,
-        max_timeout_ms: int,
-    ) -> None:
-        media_info = await self.media_repo.get_local_media_info(
-            request, media_id, max_timeout_ms
-        )
-        if not media_info:
-            return
-
-        thumbnail_infos = await self.store.get_local_media_thumbnails(media_id)
-        await self._select_and_respond_with_thumbnail(
-            request,
-            width,
-            height,
-            method,
-            m_type,
-            thumbnail_infos,
-            media_id,
-            media_id,
-            url_cache=bool(media_info.url_cache),
-            server_name=None,
-        )
-
-    async def select_or_generate_local_thumbnail(
-        self,
-        request: SynapseRequest,
-        media_id: str,
-        desired_width: int,
-        desired_height: int,
-        desired_method: str,
-        desired_type: str,
-        max_timeout_ms: int,
-    ) -> None:
-        media_info = await self.media_repo.get_local_media_info(
-            request, media_id, max_timeout_ms
-        )
-
-        if not media_info:
-            return
-
-        thumbnail_infos = await self.store.get_local_media_thumbnails(media_id)
-        for info in thumbnail_infos:
-            t_w = info.width == desired_width
-            t_h = info.height == desired_height
-            t_method = info.method == desired_method
-            t_type = info.type == desired_type
-
-            if t_w and t_h and t_method and t_type:
-                file_info = FileInfo(
-                    server_name=None,
-                    file_id=media_id,
-                    url_cache=bool(media_info.url_cache),
-                    thumbnail=info,
-                )
-
-                responder = await self.media_storage.fetch_media(file_info)
-                if responder:
-                    await respond_with_responder(
-                        request, responder, info.type, info.length
-                    )
-                    return
-
-        logger.debug("We don't have a thumbnail of that size. Generating")
-
-        # Okay, so we generate one.
-        file_path = await self.media_repo.generate_local_exact_thumbnail(
-            media_id,
-            desired_width,
-            desired_height,
-            desired_method,
-            desired_type,
-            url_cache=bool(media_info.url_cache),
-        )
-
-        if file_path:
-            await respond_with_file(request, desired_type, file_path)
-        else:
-            logger.warning("Failed to generate thumbnail")
-            raise SynapseError(400, "Failed to generate thumbnail.")
-
-    async def select_or_generate_remote_thumbnail(
-        self,
-        request: SynapseRequest,
-        server_name: str,
-        media_id: str,
-        desired_width: int,
-        desired_height: int,
-        desired_method: str,
-        desired_type: str,
-        max_timeout_ms: int,
-    ) -> None:
-        media_info = await self.media_repo.get_remote_media_info(
-            server_name, media_id, max_timeout_ms
-        )
-        if not media_info:
-            respond_404(request)
-            return
-
-        thumbnail_infos = await self.store.get_remote_media_thumbnails(
-            server_name, media_id
-        )
-
-        file_id = media_info.filesystem_id
-
-        for info in thumbnail_infos:
-            t_w = info.width == desired_width
-            t_h = info.height == desired_height
-            t_method = info.method == desired_method
-            t_type = info.type == desired_type
-
-            if t_w and t_h and t_method and t_type:
-                file_info = FileInfo(
-                    server_name=server_name,
-                    file_id=file_id,
-                    thumbnail=info,
-                )
-
-                responder = await self.media_storage.fetch_media(file_info)
-                if responder:
-                    await respond_with_responder(
-                        request, responder, info.type, info.length
-                    )
-                    return
-
-        logger.debug("We don't have a thumbnail of that size. Generating")
-
-        # Okay, so we generate one.
-        file_path = await self.media_repo.generate_remote_exact_thumbnail(
-            server_name,
-            file_id,
-            media_id,
-            desired_width,
-            desired_height,
-            desired_method,
-            desired_type,
-        )
-
-        if file_path:
-            await respond_with_file(request, desired_type, file_path)
-        else:
-            logger.warning("Failed to generate thumbnail")
-            raise SynapseError(400, "Failed to generate thumbnail.")
-
-    async def respond_remote_thumbnail(
-        self,
-        request: SynapseRequest,
-        server_name: str,
-        media_id: str,
-        width: int,
-        height: int,
-        method: str,
-        m_type: str,
-        max_timeout_ms: int,
-    ) -> None:
-        # TODO: Don't download the whole remote file
-        # We should proxy the thumbnail from the remote server instead of
-        # downloading the remote file and generating our own thumbnails.
-        media_info = await self.media_repo.get_remote_media_info(
-            server_name, media_id, max_timeout_ms
-        )
-        if not media_info:
-            return
-
-        thumbnail_infos = await self.store.get_remote_media_thumbnails(
-            server_name, media_id
-        )
-        await self._select_and_respond_with_thumbnail(
-            request,
-            width,
-            height,
-            method,
-            m_type,
-            thumbnail_infos,
-            media_id,
-            media_info.filesystem_id,
-            url_cache=False,
-            server_name=server_name,
-        )
-
-    async def _select_and_respond_with_thumbnail(
-        self,
-        request: SynapseRequest,
-        desired_width: int,
-        desired_height: int,
-        desired_method: str,
-        desired_type: str,
-        thumbnail_infos: List[ThumbnailInfo],
-        media_id: str,
-        file_id: str,
-        url_cache: bool,
-        server_name: Optional[str] = None,
-    ) -> None:
-        """
-        Respond to a request with an appropriate thumbnail from the previously generated thumbnails.
-
-        Args:
-            request: The incoming request.
-            desired_width: The desired width, the returned thumbnail may be larger than this.
-            desired_height: The desired height, the returned thumbnail may be larger than this.
-            desired_method: The desired method used to generate the thumbnail.
-            desired_type: The desired content-type of the thumbnail.
-            thumbnail_infos: A list of thumbnail info of candidate thumbnails.
-            file_id: The ID of the media that a thumbnail is being requested for.
-            url_cache: True if this is from a URL cache.
-            server_name: The server name, if this is a remote thumbnail.
-        """
-        logger.debug(
-            "_select_and_respond_with_thumbnail: media_id=%s desired=%sx%s (%s) thumbnail_infos=%s",
-            media_id,
-            desired_width,
-            desired_height,
-            desired_method,
-            thumbnail_infos,
-        )
-
-        # If `dynamic_thumbnails` is enabled, we expect Synapse to go down a
-        # different code path to handle it.
-        assert not self.dynamic_thumbnails
-
-        if thumbnail_infos:
-            file_info = self._select_thumbnail(
-                desired_width,
-                desired_height,
-                desired_method,
-                desired_type,
-                thumbnail_infos,
-                file_id,
-                url_cache,
-                server_name,
-            )
-            if not file_info:
-                logger.info("Couldn't find a thumbnail matching the desired inputs")
-                respond_404(request)
-                return
-
-            # The thumbnail property must exist.
-            assert file_info.thumbnail is not None
-
-            responder = await self.media_storage.fetch_media(file_info)
-            if responder:
-                await respond_with_responder(
-                    request,
-                    responder,
-                    file_info.thumbnail.type,
-                    file_info.thumbnail.length,
-                )
-                return
-
-            # If we can't find the thumbnail we regenerate it. This can happen
-            # if e.g. we've deleted the thumbnails but still have the original
-            # image somewhere.
-            #
-            # Since we have an entry for the thumbnail in the DB we a) know we
-            # have have successfully generated the thumbnail in the past (so we
-            # don't need to worry about repeatedly failing to generate
-            # thumbnails), and b) have already calculated that appropriate
-            # width/height/method so we can just call the "generate exact"
-            # methods.
-
-            # First let's check that we do actually have the original image
-            # still. This will throw a 404 if we don't.
-            # TODO: We should refetch the thumbnails for remote media.
-            await self.media_storage.ensure_media_is_in_local_cache(
-                FileInfo(server_name, file_id, url_cache=url_cache)
-            )
-
-            if server_name:
-                await self.media_repo.generate_remote_exact_thumbnail(
-                    server_name,
-                    file_id=file_id,
-                    media_id=media_id,
-                    t_width=file_info.thumbnail.width,
-                    t_height=file_info.thumbnail.height,
-                    t_method=file_info.thumbnail.method,
-                    t_type=file_info.thumbnail.type,
-                )
-            else:
-                await self.media_repo.generate_local_exact_thumbnail(
-                    media_id=media_id,
-                    t_width=file_info.thumbnail.width,
-                    t_height=file_info.thumbnail.height,
-                    t_method=file_info.thumbnail.method,
-                    t_type=file_info.thumbnail.type,
-                    url_cache=url_cache,
-                )
-
-            responder = await self.media_storage.fetch_media(file_info)
-            await respond_with_responder(
-                request,
-                responder,
-                file_info.thumbnail.type,
-                file_info.thumbnail.length,
-            )
-        else:
-            # This might be because:
-            # 1. We can't create thumbnails for the given media (corrupted or
-            #    unsupported file type), or
-            # 2. The thumbnailing process never ran or errored out initially
-            #    when the media was first uploaded (these bugs should be
-            #    reported and fixed).
-            # Note that we don't attempt to generate a thumbnail now because
-            # `dynamic_thumbnails` is disabled.
-            logger.info("Failed to find any generated thumbnails")
-
-            assert request.path is not None
-            respond_with_json(
-                request,
-                400,
-                cs_error(
-                    "Cannot find any thumbnails for the requested media ('%s'). This might mean the media is not a supported_media_format=(%s) or that thumbnailing failed for some other reason. (Dynamic thumbnails are disabled on this server.)"
-                    % (
-                        request.path.decode(),
-                        ", ".join(THUMBNAIL_SUPPORTED_MEDIA_FORMAT_MAP.keys()),
-                    ),
-                    code=Codes.UNKNOWN,
-                ),
-                send_cors=True,
-            )
-
-    def _select_thumbnail(
-        self,
-        desired_width: int,
-        desired_height: int,
-        desired_method: str,
-        desired_type: str,
-        thumbnail_infos: List[ThumbnailInfo],
-        file_id: str,
-        url_cache: bool,
-        server_name: Optional[str],
-    ) -> Optional[FileInfo]:
-        """
-        Choose an appropriate thumbnail from the previously generated thumbnails.
-
-        Args:
-            desired_width: The desired width, the returned thumbnail may be larger than this.
-            desired_height: The desired height, the returned thumbnail may be larger than this.
-            desired_method: The desired method used to generate the thumbnail.
-            desired_type: The desired content-type of the thumbnail.
-            thumbnail_infos: A list of thumbnail infos of candidate thumbnails.
-            file_id: The ID of the media that a thumbnail is being requested for.
-            url_cache: True if this is from a URL cache.
-            server_name: The server name, if this is a remote thumbnail.
-
-        Returns:
-             The thumbnail which best matches the desired parameters.
-        """
-        desired_method = desired_method.lower()
-
-        # The chosen thumbnail.
-        thumbnail_info = None
-
-        d_w = desired_width
-        d_h = desired_height
-
-        if desired_method == "crop":
-            # Thumbnails that match equal or larger sizes of desired width/height.
-            crop_info_list: List[
-                Tuple[int, int, int, bool, Optional[int], ThumbnailInfo]
-            ] = []
-            # Other thumbnails.
-            crop_info_list2: List[
-                Tuple[int, int, int, bool, Optional[int], ThumbnailInfo]
-            ] = []
-            for info in thumbnail_infos:
-                # Skip thumbnails generated with different methods.
-                if info.method != "crop":
-                    continue
-
-                t_w = info.width
-                t_h = info.height
-                aspect_quality = abs(d_w * t_h - d_h * t_w)
-                min_quality = 0 if d_w <= t_w and d_h <= t_h else 1
-                size_quality = abs((d_w - t_w) * (d_h - t_h))
-                type_quality = desired_type != info.type
-                length_quality = info.length
-                if t_w >= d_w or t_h >= d_h:
-                    crop_info_list.append(
-                        (
-                            aspect_quality,
-                            min_quality,
-                            size_quality,
-                            type_quality,
-                            length_quality,
-                            info,
-                        )
-                    )
-                else:
-                    crop_info_list2.append(
-                        (
-                            aspect_quality,
-                            min_quality,
-                            size_quality,
-                            type_quality,
-                            length_quality,
-                            info,
-                        )
-                    )
-            # Pick the most appropriate thumbnail. Some values of `desired_width` and
-            # `desired_height` may result in a tie, in which case we avoid comparing on
-            # the thumbnail info and pick the thumbnail that appears earlier
-            # in the list of candidates.
-            if crop_info_list:
-                thumbnail_info = min(crop_info_list, key=lambda t: t[:-1])[-1]
-            elif crop_info_list2:
-                thumbnail_info = min(crop_info_list2, key=lambda t: t[:-1])[-1]
-        elif desired_method == "scale":
-            # Thumbnails that match equal or larger sizes of desired width/height.
-            info_list: List[Tuple[int, bool, int, ThumbnailInfo]] = []
-            # Other thumbnails.
-            info_list2: List[Tuple[int, bool, int, ThumbnailInfo]] = []
-
-            for info in thumbnail_infos:
-                # Skip thumbnails generated with different methods.
-                if info.method != "scale":
-                    continue
-
-                t_w = info.width
-                t_h = info.height
-                size_quality = abs((d_w - t_w) * (d_h - t_h))
-                type_quality = desired_type != info.type
-                length_quality = info.length
-                if t_w >= d_w or t_h >= d_h:
-                    info_list.append((size_quality, type_quality, length_quality, info))
-                else:
-                    info_list2.append(
-                        (size_quality, type_quality, length_quality, info)
-                    )
-            # Pick the most appropriate thumbnail. Some values of `desired_width` and
-            # `desired_height` may result in a tie, in which case we avoid comparing on
-            # the thumbnail info and pick the thumbnail that appears earlier
-            # in the list of candidates.
-            if info_list:
-                thumbnail_info = min(info_list, key=lambda t: t[:-1])[-1]
-            elif info_list2:
-                thumbnail_info = min(info_list2, key=lambda t: t[:-1])[-1]
-
-        if thumbnail_info:
-            return FileInfo(
-                file_id=file_id,
-                url_cache=url_cache,
-                server_name=server_name,
-                thumbnail=thumbnail_info,
-            )
-
-        # No matching thumbnail was found.
-        return None
@@ -592,7 +592,7 @@ class UrlPreviewer:

        file_info = FileInfo(server_name=None, file_id=file_id, url_cache=True)

-        async with self.media_storage.store_into_file(file_info) as (f, fname):
+        with self.media_storage.store_into_file(file_info) as (f, fname, finish):
            if url.startswith("data:"):
                if not allow_data_urls:
                    raise SynapseError(
@@ -603,6 +603,8 @@ class UrlPreviewer:
            else:
                download_result = await self._download_url(url, f)

+            await finish()
+
        try:
            time_now_ms = self.clock.time_msec()

@@ -721,7 +721,6 @@ class Notifier:
                        user.to_string(),
                        new_events,
                        is_peeking=is_peeking,
-                        msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
                    )
                elif keyname == StreamKeyType.PRESENCE:
                    now = self.clock.time_msec()
@@ -763,29 +762,6 @@ class Notifier:

        return result

-    async def wait_for_stream_token(self, stream_token: StreamToken) -> bool:
-        """Wait for this worker to catch up with the given stream token."""
-
-        start = self.clock.time_msec()
-        while True:
-            current_token = self.event_sources.get_current_token()
-            if stream_token.is_before_or_eq(current_token):
-                return True
-
-            now = self.clock.time_msec()
-
-            if now - start > 10_000:
-                return False
-
-            logger.info(
-                "Waiting for current token to reach %s; currently at %s",
-                stream_token,
-                current_token,
-            )
-
-            # TODO: be better
-            await self.clock.sleep(0.5)
-
    async def _get_room_ids(
        self, user: UserID, explicit_room_id: Optional[str]
    ) -> Tuple[StrCollection, bool]:
@@ -205,22 +205,6 @@ class Mailer:
            template_vars,
        )

-    emails_sent_counter.labels("already_in_use")
-
-    async def send_already_in_use_mail(self, email_address: str) -> None:
-        """Send an email if the address is already bound to an user account
-
-        Args:
-            email_address: Email address we're sending to the "already in use" mail
-        """
-
-        await self.send_email(
-            email_address,
-            self.email_subjects.email_already_in_use
-            % {"server_name": self.hs.config.server.server_name, "app": self.app_name},
-            {},
-        )
-
    emails_sent_counter.labels("add_threepid")

    async def send_add_threepid_mail(
@@ -529,10 +513,7 @@ class Mailer:
        }

        the_events = await filter_events_for_client(
-            self._storage_controllers,
-            user_id,
-            results.events_before,
-            msc4115_membership_on_events=self.hs.config.experimental.msc4115_membership_on_events,
+            self._storage_controllers, user_id, results.events_before
        )
        the_events.append(notif_event)

@@ -55,7 +55,6 @@ from synapse.replication.tcp.streams.partial_state import (
 )
 from synapse.types import PersistedEventPosition, ReadReceipt, StreamKeyType, UserID
 from synapse.util.async_helpers import Linearizer, timeout_deferred
-from synapse.util.iterutils import batch_iter
 from synapse.util.metrics import Measure

 if TYPE_CHECKING:
@@ -112,15 +111,6 @@ class ReplicationDataHandler:
            token: stream token for this batch of rows
            rows: a list of Stream.ROW_TYPE objects as returned by Stream.parse_row.
        """
-        all_room_ids: Set[str] = set()
-        if stream_name == DeviceListsStream.NAME:
-            if any(row.entity.startswith("@") and not row.is_signature for row in rows):
-                prev_token = self.store.get_device_stream_token()
-                all_room_ids = await self.store.get_all_device_list_changes(
-                    prev_token, token
-                )
-                self.store.device_lists_in_rooms_have_changed(all_room_ids, token)
-
        self.store.process_replication_rows(stream_name, instance_name, token, rows)
        # NOTE: this must be called after process_replication_rows to ensure any
        # cache invalidations are first handled before any stream ID advances.
@@ -155,14 +145,14 @@ class ReplicationDataHandler:
                    StreamKeyType.TO_DEVICE, token, users=entities
                )
        elif stream_name == DeviceListsStream.NAME:
-            # `all_room_ids` can be large, so let's wake up those streams in batches
-            for batched_room_ids in batch_iter(all_room_ids, 100):
-                self.notifier.on_new_event(
-                    StreamKeyType.DEVICE_LIST, token, rooms=batched_room_ids
-                )
-
-                # Yield to reactor so that we don't block.
-                await self._clock.sleep(0)
+            all_room_ids: Set[str] = set()
+            for row in rows:
+                if row.entity.startswith("@") and not row.is_signature:
+                    room_ids = await self.store.get_rooms_for_user(row.entity)
+                    all_room_ids.update(room_ids)
+            self.notifier.on_new_event(
+                StreamKeyType.DEVICE_LIST, token, rooms=all_room_ids
+            )
        elif stream_name == PushersStream.NAME:
            for row in rows:
                if row.deleted:
@@ -1,12 +0,0 @@
-{% extends "_base.html" %}
-{% block title %}Email already in use{% endblock %}
-
-{% block body %}
-<p>You have asked us to register this email with a new Matrix account, but this email is already registered with an existing account.</p>
-
-<p>Please reset your password if needed.</p>
-
-<p>If this was not you, you can safely disregard this email.</p>
-
-<p>Thank you.</p>
-{% endblock %}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Morgan	6452c704ce	changelog	2024-05-17 10:45:20 +01:00
Andrew Morgan	0abc0cbe52	Remove v2 variant from endpoints	2024-05-15 11:59:15 +01:00
Dominic Schubert	336a85d1fa	Knocking Endpoints added (federated) Knocking Endpoints was missing for federaded Worker	2024-04-07 01:08:57 +02:00
				`@@ -0,0 +1 @@`
				Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
				`@@ -0,0 +1 @@`
				Add support for moving `/pushrules` off of main process.
				`@@ -0,0 +1 @@`
				`Refactor auth chain fetching to reduce duplication.`
				`@@ -0,0 +1 @@`
				Improve database performance by adding a missing index to `access_tokens.refresh_token_id`.
				`@@ -0,0 +1 @@`
				`Improve database performance by reducing number of receipts fetched when sending push notifications.`
				`@@ -0,0 +1 @@`
				Document [`/v1/make_knock`](https://spec.matrix.org/v1.10/server-server-api/#get_matrixfederationv1make_knockroomiduserid) and [`/v1/send_knock/](https://spec.matrix.org/v1.10/server-server-api/#put_matrixfederationv1send_knockroomideventid) federation endpoints as worker-compatible.