Black like my soul

changelog
Relay M_TOKEN_INCORRECT as per MSC4183
2024-08-29 13:06:24 +01:00 · 2024-08-29 13:02:12 +01:00 · 2024-08-29 13:00:28 +01:00
278 changed files with 4782 additions and 22491 deletions
@@ -53,7 +53,7 @@ if not IS_PR:
            "database": "sqlite",
            "extras": "all",
        }
-        for version in ("3.9", "3.10", "3.11", "3.12", "3.13")
+        for version in ("3.9", "3.10", "3.11", "3.12")
    )

 trial_postgres_tests = [
@@ -68,9 +68,9 @@ trial_postgres_tests = [
 if not IS_PR:
    trial_postgres_tests.append(
        {
-            "python-version": "3.13",
+            "python-version": "3.12",
            "database": "postgres",
-            "postgres-version": "17",
+            "postgres-version": "16",
            "extras": "all",
        }
    )
@@ -30,7 +30,7 @@ jobs:
        run: docker buildx inspect

      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.6.0

      - name: Checkout repository
        uses: actions/checkout@v4
@@ -29,13 +29,17 @@ jobs:
        with:
          install-project: "false"

-      - name: Run ruff check
+      - name: Import order (isort)
        continue-on-error: true
-        run: poetry run ruff check --fix .
+        run: poetry run isort .

-      - name: Run ruff format
+      - name: Code style (black)
        continue-on-error: true
-        run: poetry run ruff format --quiet .
+        run: poetry run black .
+
+      - name: Semantic checks (ruff)
+        continue-on-error: true
+        run: poetry run ruff --fix .

      - run: cargo clippy --all-features --fix -- -D warnings
        continue-on-error: true
@@ -45,4 +49,4 @@ jobs:

      - uses: stefanzweifel/git-auto-commit-action@v5
        with:
-          commit_message: "Attempt to fix linting"
+            commit_message: "Attempt to fix linting"
@@ -131,11 +131,15 @@ jobs:
        with:
          install-project: "false"

-      - name: Run ruff check
-        run: poetry run ruff check --output-format=github .
+      - name: Import order (isort)
+        run: poetry run isort --check --diff .

-      - name: Run ruff format
-        run: poetry run ruff format --check .
+      - name: Code style (black)
+        run: poetry run black --check --diff .
+
+      - name: Semantic checks (ruff)
+        # --quiet suppresses the update check.
+        run: poetry run ruff check --quiet .

  lint-mypy:
    runs-on: ubuntu-latest
@@ -1,317 +1,3 @@
-# Synapse 1.118.0rc1 (2024-10-22)
-
-### Python 3.8 support will be dropped in the next release
-
-Python 3.8 is now [end-of-life](https://devguide.python.org/versions/). As per our [Deprecation Policy for Platform Dependencies](https://element-hq.github.io/synapse/latest/deprecation_policy.html#policy), Synapse will be dropping support for Python 3.8 in the next release; Synapse 1.119.0.
-
-Synapse 1.118.x will be the final release to support Python 3.8. If you are running Synapse with Python 3.8, please upgrade before the 1.119.0 release, due in less than one month.
-
-### Python 3.13 and PostgreSQL 17 support
-
-On the other end of the spectrum, Synapse 1.118.0 is the first release to support [Python 3.13](https://www.python.org/downloads/release/python-3130/)! [PostgreSQL 17](https://www.postgresql.org/about/news/postgresql-17-released-2936/) is also supported as of this release.
-
-### Features
-
- Added the `display_name_claim` option to the JWT configuration. This option allows specifying the claim key that contains the user's display name in the JWT payload. ([\#17708](https://github.com/element-hq/synapse/issues/17708))
- Implement [MSC4210](https://github.com/matrix-org/matrix-spec-proposals/pull/4210): Remove legacy mentions. Contributed by @tulir @ Beeper. ([\#17783](https://github.com/element-hq/synapse/issues/17783))
-
-### Bugfixes
-
- Fix saving of PNG thumbnails, when the original image is in the CMYK color space. ([\#17736](https://github.com/element-hq/synapse/issues/17736))
- Fix bug with sliding sync where the server would not return state that was added to the `required_state` config. ([\#17785](https://github.com/element-hq/synapse/issues/17785), [\#17805](https://github.com/element-hq/synapse/issues/17805))
- Fix a bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync that would cause rooms to stay forgotten and hidden even after rejoining. ([\#17835](https://github.com/element-hq/synapse/issues/17835))
-
-### Improved Documentation
-
- Clarify when the `user_may_invite` and `user_may_send_3pid_invite` module callbacks are called. ([\#17627](https://github.com/element-hq/synapse/issues/17627))
- Correct documentation to refer to the `--config-path` argument instead of `--config-file`. ([\#17802](https://github.com/element-hq/synapse/issues/17802))
- Fix typo in `target_cache_memory_usage` docs. ([\#17825](https://github.com/element-hq/synapse/issues/17825))
-
-### Internal Changes
-
- Slight optimization when fetching state/events for Sliding Sync. ([\#17718](https://github.com/element-hq/synapse/issues/17718))
- Add Python 3.13 and Postgres 17 to the test matrix. ([\#17752](https://github.com/element-hq/synapse/issues/17752))
- Test github token before running release script steps. ([\#17803](https://github.com/element-hq/synapse/issues/17803))
- Build debian packages for new Ubuntu versions, and stop building for no longer supported versions. ([\#17824](https://github.com/element-hq/synapse/issues/17824))
- Enable the `.org.matrix.msc4028.encrypted_event` push rule by default in accordance with [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028). Note that the corresponding experimental feature must still be switched on for this push rule to have any effect. ([\#17826](https://github.com/element-hq/synapse/issues/17826))
- Fix some typing issues uncovered by upgrading mypy to 1.11.x. ([\#17842](https://github.com/element-hq/synapse/issues/17842))
-
-
-
-### Updates to locked dependencies
-
-* Bump mypy from 1.10.1 to 1.11.2. ([\#17842](https://github.com/element-hq/synapse/issues/17842))
-* Bump mypy-zope from 1.0.5 to 1.0.7. ([\#17827](https://github.com/element-hq/synapse/issues/17827))
-* Bump phonenumbers from 8.13.46 to 8.13.47. ([\#17797](https://github.com/element-hq/synapse/issues/17797))
-* Bump psycopg2 from 2.9.9 to 2.9.10. ([\#17843](https://github.com/element-hq/synapse/issues/17843))
-* Bump ruff from 0.6.8 to 0.6.9. ([\#17794](https://github.com/element-hq/synapse/issues/17794))
-* Bump sentry-sdk from 2.14.0 to 2.15.0. ([\#17795](https://github.com/element-hq/synapse/issues/17795))
-* Bump sentry-sdk from 2.15.0 to 2.16.0. ([\#17829](https://github.com/element-hq/synapse/issues/17829))
-* Bump sentry-sdk from 2.16.0 to 2.17.0. ([\#17844](https://github.com/element-hq/synapse/issues/17844))
-* Bump sigstore/cosign-installer from 3.6.0 to 3.7.0. ([\#17798](https://github.com/element-hq/synapse/issues/17798))
-* Bump tomli from 2.0.1 to 2.0.2. ([\#17796](https://github.com/element-hq/synapse/issues/17796))
-* Bump types-requests from 2.32.0.20240914 to 2.32.0.20241016. ([\#17841](https://github.com/element-hq/synapse/issues/17841))
-* Bump types-setuptools from 75.1.0.20240917 to 75.1.0.20241014. ([\#17828](https://github.com/element-hq/synapse/issues/17828))
-
-# Synapse 1.117.0 (2024-10-15)
-
-No significant changes since 1.117.0rc1.
-
-
-
-
-# Synapse 1.117.0rc1 (2024-10-08)
-
-### Features
-
- Add config option `redis.password_path`. ([\#17717](https://github.com/element-hq/synapse/issues/17717))
-
-### Bugfixes
-
- Fix a rare bug introduced in v1.29.0 where invalidating a user's access token from a worker could raise an error. ([\#17779](https://github.com/element-hq/synapse/issues/17779))
- In the response to `GET /_matrix/client/versions`, set the `unstable_features` flag for [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) to `false` when server configuration disables support for delayed events. ([\#17780](https://github.com/element-hq/synapse/issues/17780))
- Improve input validation and room membership checks in admin redaction API. ([\#17792](https://github.com/element-hq/synapse/issues/17792))
-
-### Improved Documentation
-
- Clarify the docstring of `test_forget_when_not_left`. ([\#17628](https://github.com/element-hq/synapse/issues/17628))
- Add documentation note about PYTHONMALLOC for accurate jemalloc memory tracking. Contributed by @hensg. ([\#17709](https://github.com/element-hq/synapse/issues/17709))
- Remove spurious "TODO UPDATE ALL THIS" note in the Debian installation docs. ([\#17749](https://github.com/element-hq/synapse/issues/17749))
- Explain how load balancing works for `federation_sender_instances`. ([\#17776](https://github.com/element-hq/synapse/issues/17776))
-
-### Internal Changes
-
- Minor performance increase for large accounts using sliding sync. ([\#17751](https://github.com/element-hq/synapse/issues/17751))
- Increase performance of the notifier when there are many syncing users. ([\#17765](https://github.com/element-hq/synapse/issues/17765), [\#17766](https://github.com/element-hq/synapse/issues/17766))
- Fix performance of streams that don't change often. ([\#17767](https://github.com/element-hq/synapse/issues/17767))
- Improve performance of sliding sync connections that do not ask for any rooms. ([\#17768](https://github.com/element-hq/synapse/issues/17768))
- Reduce overhead of sliding sync E2EE loops. ([\#17771](https://github.com/element-hq/synapse/issues/17771))
- Sliding sync minor performance speed up using new table. ([\#17787](https://github.com/element-hq/synapse/issues/17787))
- Sliding sync minor performance improvement by omitting unchanged data from incremental responses. ([\#17788](https://github.com/element-hq/synapse/issues/17788))
- Speed up sliding sync when there are many active subscriptions. ([\#17789](https://github.com/element-hq/synapse/issues/17789))
- Add missing license headers on new source files. ([\#17799](https://github.com/element-hq/synapse/issues/17799))
-
-
-
-### Updates to locked dependencies
-
-* Bump phonenumbers from 8.13.45 to 8.13.46. ([\#17773](https://github.com/element-hq/synapse/issues/17773))
-* Bump python-multipart from 0.0.10 to 0.0.12. ([\#17772](https://github.com/element-hq/synapse/issues/17772))
-* Bump regex from 1.10.6 to 1.11.0. ([\#17770](https://github.com/element-hq/synapse/issues/17770))
-* Bump ruff from 0.6.7 to 0.6.8. ([\#17774](https://github.com/element-hq/synapse/issues/17774))
-
-# Synapse 1.116.0 (2024-10-01)
-
-No significant changes since 1.116.0rc2.
-
-
-
-
-# Synapse 1.116.0rc2 (2024-09-26)
-
-### Features
-
- Add implementation of restricting who can overwrite a state event as proposed by [MSC3757](https://github.com/matrix-org/matrix-spec-proposals/pull/3757). ([\#17513](https://github.com/element-hq/synapse/issues/17513))
-
-
-
-
-# Synapse 1.116.0rc1 (2024-09-25)
-
-### Features
-
- Add initial implementation of delayed events as proposed by [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140). ([\#17326](https://github.com/element-hq/synapse/issues/17326))
- Add an asynchronous Admin API endpoint [to redact all a user's events](https://element-hq.github.io/synapse/v1.116/admin_api/user_admin_api.html#redact-all-the-events-of-a-user),
-  and [an endpoint to check on the status of that redaction task](https://element-hq.github.io/synapse/v1.116/admin_api/user_admin_api.html#check-the-status-of-a-redaction-process). ([\#17506](https://github.com/element-hq/synapse/issues/17506))
- Add support for the `tags` and `not_tags` filters for [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17662](https://github.com/element-hq/synapse/issues/17662))
- Guests can use the new media endpoints to download media, as described by [MSC4189](https://github.com/matrix-org/matrix-spec-proposals/pull/4189). ([\#17675](https://github.com/element-hq/synapse/issues/17675))
- Add config option `turn_shared_secret_path`. ([\#17690](https://github.com/element-hq/synapse/issues/17690))
- Return room tags in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync account data extension. ([\#17707](https://github.com/element-hq/synapse/issues/17707))
-
-### Bugfixes
-
- Make sure we get up-to-date state information when using the new [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync tables to derive room membership. ([\#17692](https://github.com/element-hq/synapse/issues/17692))
- Fix bug where room account data would not correctly be sent down [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync for old rooms. ([\#17695](https://github.com/element-hq/synapse/issues/17695))
- Fix a bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync which could prevent /sync from working for certain user accounts. ([\#17727](https://github.com/element-hq/synapse/issues/17727), [\#17733](https://github.com/element-hq/synapse/issues/17733))
- Ignore invites from ignored users in Sliding Sync. ([\#17729](https://github.com/element-hq/synapse/issues/17729))
- Fix bug in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync where the server would incorrectly return a negative bump stamp, which caused Element X apps to stop syncing. ([\#17748](https://github.com/element-hq/synapse/issues/17748))
-
-### Internal Changes
-
- Import pydantic objects from the `_pydantic_compat` module.
-  This allows `check_pydantic_models.py` to mock those pydantic objects
-  only in the synapse module, and not interfere with pydantic objects in
-  external dependencies. ([\#17667](https://github.com/element-hq/synapse/issues/17667))
- Use [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync tables as a bulk shortcut for getting the max `event_stream_ordering` of rooms. ([\#17693](https://github.com/element-hq/synapse/issues/17693))
- Speed up [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync requests a bit where there are many room changes. ([\#17696](https://github.com/element-hq/synapse/issues/17696))
- Refactor [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync filter unit tests so the sliding sync API has better test coverage. ([\#17703](https://github.com/element-hq/synapse/issues/17703))
- Fetch `bump_stamp`s more efficiently in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17723](https://github.com/element-hq/synapse/issues/17723))
- Shortcut for checking if certain background updates have completed (utilized in [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync). ([\#17724](https://github.com/element-hq/synapse/issues/17724))
- More efficiently fetch rooms for [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17725](https://github.com/element-hq/synapse/issues/17725))
- Fix `_bulk_get_max_event_pos` being inefficient. ([\#17728](https://github.com/element-hq/synapse/issues/17728))
- Add cache to `get_tags_for_room(...)`. ([\#17730](https://github.com/element-hq/synapse/issues/17730))
- Small performance improvement in speeding up [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) Sliding Sync. ([\#17731](https://github.com/element-hq/synapse/issues/17731))
- Minor speed up of initial [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) sliding sync requests. ([\#17734](https://github.com/element-hq/synapse/issues/17734))
- Remove usage of the deprecated `cgi` module, deprecated in Python 3.11 and removed in Python 3.13. ([\#17741](https://github.com/element-hq/synapse/issues/17741))
- Fix typing of a variable that is not `Unknown` anymore after updating `treq`. ([\#17744](https://github.com/element-hq/synapse/issues/17744))
-
-
-
-### Updates to locked dependencies
-
-* Bump anyhow from 1.0.86 to 1.0.89. ([\#17685](https://github.com/element-hq/synapse/issues/17685), [\#17716](https://github.com/element-hq/synapse/issues/17716))
-* Bump bytes from 1.7.1 to 1.7.2. ([\#17743](https://github.com/element-hq/synapse/issues/17743))
-* Bump cryptography from 43.0.0 to 43.0.1. ([\#17689](https://github.com/element-hq/synapse/issues/17689))
-* Bump idna from 3.8 to 3.10. ([\#17758](https://github.com/element-hq/synapse/issues/17758))
-* Bump msgpack from 1.0.8 to 1.1.0. ([\#17759](https://github.com/element-hq/synapse/issues/17759))
-* Bump phonenumbers from 8.13.44 to 8.13.45. ([\#17762](https://github.com/element-hq/synapse/issues/17762))
-* Bump prometheus-client from 0.20.0 to 0.21.0. ([\#17746](https://github.com/element-hq/synapse/issues/17746))
-* Bump pyasn1 from 0.6.0 to 0.6.1. ([\#17714](https://github.com/element-hq/synapse/issues/17714))
-* Bump pyasn1-modules from 0.4.0 to 0.4.1. ([\#17747](https://github.com/element-hq/synapse/issues/17747))
-* Bump pydantic from 2.8.2 to 2.9.2. ([\#17756](https://github.com/element-hq/synapse/issues/17756))
-* Bump python-multipart from 0.0.9 to 0.0.10. ([\#17745](https://github.com/element-hq/synapse/issues/17745))
-* Bump ruff from 0.6.4 to 0.6.7. ([\#17715](https://github.com/element-hq/synapse/issues/17715), [\#17760](https://github.com/element-hq/synapse/issues/17760))
-* Bump sentry-sdk from 2.13.0 to 2.14.0. ([\#17712](https://github.com/element-hq/synapse/issues/17712))
-* Bump serde from 1.0.209 to 1.0.210. ([\#17686](https://github.com/element-hq/synapse/issues/17686))
-* Bump serde_json from 1.0.127 to 1.0.128. ([\#17687](https://github.com/element-hq/synapse/issues/17687))
-* Bump treq from 23.11.0 to 24.9.1. ([\#17744](https://github.com/element-hq/synapse/issues/17744))
-* Bump types-pyyaml from 6.0.12.20240808 to 6.0.12.20240917. ([\#17755](https://github.com/element-hq/synapse/issues/17755))
-* Bump types-requests from 2.32.0.20240712 to 2.32.0.20240914. ([\#17713](https://github.com/element-hq/synapse/issues/17713))
-* Bump types-setuptools from 74.1.0.20240907 to 75.1.0.20240917. ([\#17757](https://github.com/element-hq/synapse/issues/17757))
-
-# Synapse 1.115.0 (2024-09-17)
-
-No significant changes since 1.115.0rc2.
-
-
-
-
-# Synapse 1.115.0rc2 (2024-09-12)
-
-### Internal Changes
-
- Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting. ([\#17652](https://github.com/element-hq/synapse/issues/17652))
- Speed up sliding sync by reducing amount of data pulled out of the database for large rooms. ([\#17683](https://github.com/element-hq/synapse/issues/17683))
-
-
-
-
-# Synapse 1.115.0rc1 (2024-09-10)
-
-### Features
-
- Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support. ([\#17509](https://github.com/element-hq/synapse/issues/17509))
-
-### Bugfixes
-
- Return `400 M_BAD_JSON` upon attempting to complete various room actions with a non-local user ID and unknown room ID, rather than an internal server error. ([\#17607](https://github.com/element-hq/synapse/issues/17607))
- Fix authenticated media responses using a wrong limit when following redirects over federation. ([\#17626](https://github.com/element-hq/synapse/issues/17626))
- Fix bug where we returned the wrong `bump_stamp` for invites in sliding sync response, causing incorrect ordering of invites in the room list. ([\#17674](https://github.com/element-hq/synapse/issues/17674))
-
-### Improved Documentation
-
- Clarify that the admin api resource is only loaded on the main process and not workers. ([\#17590](https://github.com/element-hq/synapse/issues/17590))
- Fixed typo in `saml2_config` config [example](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#saml2_config). ([\#17594](https://github.com/element-hq/synapse/issues/17594))
-
-### Deprecations and Removals
-
- Stabilise [MSC4156](https://github.com/matrix-org/matrix-spec-proposals/pull/4156) by removing the `msc4156_enabled` config setting and defaulting it to `true`. ([\#17650](https://github.com/element-hq/synapse/issues/17650))
-
-### Internal Changes
-
- Update [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) implementation: load the issuer and account management URLs from OIDC discovery. ([\#17407](https://github.com/element-hq/synapse/issues/17407))
- Pre-populate room data used in experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint for quick filtering/sorting. ([\#17512](https://github.com/element-hq/synapse/issues/17512), [\#17632](https://github.com/element-hq/synapse/issues/17632), [\#17633](https://github.com/element-hq/synapse/issues/17633), [\#17634](https://github.com/element-hq/synapse/issues/17634), [\#17635](https://github.com/element-hq/synapse/issues/17635), [\#17636](https://github.com/element-hq/synapse/issues/17636), [\#17641](https://github.com/element-hq/synapse/issues/17641), [\#17654](https://github.com/element-hq/synapse/issues/17654), [\#17673](https://github.com/element-hq/synapse/issues/17673))
- Store sliding sync per-connection state in the database. ([\#17599](https://github.com/element-hq/synapse/issues/17599), [\#17631](https://github.com/element-hq/synapse/issues/17631))
- Make the sliding sync `PerConnectionState` class immutable. ([\#17600](https://github.com/element-hq/synapse/issues/17600))
- Replace `isort` and `black` with `ruff`. ([\#17620](https://github.com/element-hq/synapse/issues/17620), [\#17643](https://github.com/element-hq/synapse/issues/17643))
- Sliding Sync: Split up `get_room_membership_for_user_at_to_token`. ([\#17629](https://github.com/element-hq/synapse/issues/17629))
- Use new database tables for sliding sync. ([\#17630](https://github.com/element-hq/synapse/issues/17630), [\#17649](https://github.com/element-hq/synapse/issues/17649))
- Prevent duplicate tags being added to Sliding Sync traces. ([\#17655](https://github.com/element-hq/synapse/issues/17655))
- Get `bump_stamp` from [new sliding sync tables](https://github.com/element-hq/synapse/pull/17512) which should be faster. ([\#17658](https://github.com/element-hq/synapse/issues/17658))
- Speed up incremental Sliding Sync requests by avoiding extra work. ([\#17665](https://github.com/element-hq/synapse/issues/17665))
- Small performance improvement in speeding up sliding sync. ([\#17666](https://github.com/element-hq/synapse/issues/17666), [\#17670](https://github.com/element-hq/synapse/issues/17670), [\#17672](https://github.com/element-hq/synapse/issues/17672))
- Speed up sliding sync by reducing number of database calls. ([\#17684](https://github.com/element-hq/synapse/issues/17684))
- Speed up sync by pulling out fewer events from the database. ([\#17688](https://github.com/element-hq/synapse/issues/17688))
-
-
-
-### Updates to locked dependencies
-
-* Bump authlib from 1.3.1 to 1.3.2. ([\#17679](https://github.com/element-hq/synapse/issues/17679))
-* Bump idna from 3.7 to 3.8. ([\#17682](https://github.com/element-hq/synapse/issues/17682))
-* Bump ruff from 0.6.2 to 0.6.4. ([\#17680](https://github.com/element-hq/synapse/issues/17680))
-* Bump towncrier from 24.7.1 to 24.8.0. ([\#17645](https://github.com/element-hq/synapse/issues/17645))
-* Bump twisted from 24.7.0rc1 to 24.7.0. ([\#17647](https://github.com/element-hq/synapse/issues/17647))
-* Bump types-pillow from 10.2.0.20240520 to 10.2.0.20240822. ([\#17644](https://github.com/element-hq/synapse/issues/17644))
-* Bump types-psycopg2 from 2.9.21.20240417 to 2.9.21.20240819. ([\#17646](https://github.com/element-hq/synapse/issues/17646))
-* Bump types-setuptools from 71.1.0.20240818 to 74.1.0.20240907. ([\#17681](https://github.com/element-hq/synapse/issues/17681))
-
-# Synapse 1.114.0 (2024-09-02)
-
-This release enables support for
-[MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186) —
-Simplified Sliding Sync. This allows using the upcoming releases of the Element
-X mobile apps without having to run a Sliding Sync Proxy.
-
-
-### Features
-
- Enable native sliding sync support ([MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) and [MSC4186](https://github.com/matrix-org/matrix-spec-proposals/pull/4186)) by default. ([\#17648](https://github.com/element-hq/synapse/issues/17648))
-
-
-
-
-# Synapse 1.114.0rc3 (2024-08-30)
-
-### Bugfixes
-
- Fix regression in v1.114.0rc2 that caused workers to fail to start. ([\#17626](https://github.com/element-hq/synapse/issues/17626))
-
-
-
-
-# Synapse 1.114.0rc2 (2024-08-30)
-
-### Features
-
- Improve cross-signing upload when using [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) to use a custom UIA flow stage, with web fallback support. ([\#17509](https://github.com/element-hq/synapse/issues/17509))
- Make `hash_password` script accept password input from stdin. ([\#17608](https://github.com/element-hq/synapse/issues/17608))
-
-### Bugfixes
-
- Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven). ([\#17194](https://github.com/element-hq/synapse/issues/17194))
- Fix content-length on federation `/thumbnail` responses. ([\#17532](https://github.com/element-hq/synapse/issues/17532))
- Fix authenticated media responses using a wrong limit when following redirects over federation. ([\#17543](https://github.com/element-hq/synapse/issues/17543))
-
-### Internal Changes
-
- MSC3861: load the issuer and account management URLs from OIDC discovery. ([\#17407](https://github.com/element-hq/synapse/issues/17407))
- Refactor sliding sync class into multiple files. ([\#17595](https://github.com/element-hq/synapse/issues/17595))
- Store sliding sync per-connection state in the database. ([\#17599](https://github.com/element-hq/synapse/issues/17599))
- Make the sliding sync `PerConnectionState` class immutable. ([\#17600](https://github.com/element-hq/synapse/issues/17600))
- Add support to `@tag_args` for standalone functions. ([\#17604](https://github.com/element-hq/synapse/issues/17604))
- Speed up incremental syncs in sliding sync by adding some more caching. ([\#17606](https://github.com/element-hq/synapse/issues/17606))
- Always return the user's own read receipts in sliding sync. ([\#17617](https://github.com/element-hq/synapse/issues/17617))
- Replace `isort` and `black` with `ruff`. ([\#17620](https://github.com/element-hq/synapse/issues/17620))
- Refactor sliding sync code to move room list logic out into a separate class. ([\#17622](https://github.com/element-hq/synapse/issues/17622))
-
-
-
-### Updates to locked dependencies
-
-* Bump attrs from 23.2.0 to 24.2.0. ([\#17609](https://github.com/element-hq/synapse/issues/17609))
-* Bump cryptography from 42.0.8 to 43.0.0. ([\#17584](https://github.com/element-hq/synapse/issues/17584))
-* Bump phonenumbers from 8.13.43 to 8.13.44. ([\#17610](https://github.com/element-hq/synapse/issues/17610))
-* Bump pygithub from 2.3.0 to 2.4.0. ([\#17612](https://github.com/element-hq/synapse/issues/17612))
-* Bump pyyaml from 6.0.1 to 6.0.2. ([\#17611](https://github.com/element-hq/synapse/issues/17611))
-* Bump sentry-sdk from 2.12.0 to 2.13.0. ([\#17585](https://github.com/element-hq/synapse/issues/17585))
-* Bump serde from 1.0.206 to 1.0.208. ([\#17581](https://github.com/element-hq/synapse/issues/17581))
-* Bump serde from 1.0.208 to 1.0.209. ([\#17613](https://github.com/element-hq/synapse/issues/17613))
-* Bump serde_json from 1.0.124 to 1.0.125. ([\#17582](https://github.com/element-hq/synapse/issues/17582))
-* Bump serde_json from 1.0.125 to 1.0.127. ([\#17614](https://github.com/element-hq/synapse/issues/17614))
-* Bump types-jsonschema from 4.23.0.20240712 to 4.23.0.20240813. ([\#17583](https://github.com/element-hq/synapse/issues/17583))
-* Bump types-setuptools from 71.1.0.20240726 to 71.1.0.20240818. ([\#17586](https://github.com/element-hq/synapse/issues/17586))
-
 # Synapse 1.114.0rc1 (2024-08-20)

 ### Features
@@ -13,9 +13,9 @@ dependencies = [

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

 [[package]]
 name = "arc-swap"
@@ -67,9 +67,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"

 [[package]]
 name = "cfg-if"
@@ -444,9 +444,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -456,9 +456,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -467,9 +467,9 @@ dependencies = [

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

 [[package]]
 name = "ryu"
@@ -485,18 +485,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -505,9 +505,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
 "itoa",
 "memchr",
@@ -158,7 +158,7 @@ it:

 We **strongly** recommend using a CAPTCHA, particularly if your homeserver is exposed to
 the public internet. Without it, anyone can freely register accounts on your homeserver.
-This can be exploited by attackers to create spambots targeting the rest of the Matrix
+This can be exploited by attackers to create spambots targetting the rest of the Matrix
 federation.

 Your new user name will be formed partly from the ``server_name``, and partly
@@ -0,0 +1 @@
+Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven).
@@ -0,0 +1 @@
+Fix content-length on federation /thumbnail responses.
@@ -0,0 +1 @@
+Fix authenticated media responses using a wrong limit when following redirects over federation.
@@ -0,0 +1 @@
+Clarify that the admin api resource is only loaded on the main process and not workers.
@@ -0,0 +1 @@
+Fixed typo in `saml2_config` config [example](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#saml2_config).
@@ -0,0 +1 @@
+Refactor sliding sync class into multiple files.
@@ -0,0 +1 @@
+Add support to `@tag_args` for standalone functions.
@@ -0,0 +1 @@
+Speed up incremental syncs in sliding sync by adding some more caching.
@@ -0,0 +1 @@
+Make `hash_password` accept password input from stdin.
@@ -0,0 +1 @@
+Always return the user's own read receipts in sliding sync.
@@ -0,0 +1 @@
+Refactor sliding sync code to move room list logic out into a separate class.
@@ -0,0 +1 @@
+Relay M_TOKEN_INCORRECT from submitToken endpoint as per MSC4183.
@@ -21,8 +21,7 @@
 #
 #

-"""Starts a synapse client console."""
-
+""" Starts a synapse client console. """
 import argparse
 import binascii
 import cmd
@@ -20,8 +20,8 @@
 #

 import argparse
+import cgi
 import datetime
-import html
 import json
 import urllib.request
 from typing import List
@@ -85,7 +85,7 @@ def make_graph(pdus: List[dict], filename_prefix: str) -> None:
            "name": name,
            "type": pdu.get("pdu_type"),
            "state_key": pdu.get("state_key"),
-            "content": html.escape(json.dumps(pdu.get("content")), quote=True),
+            "content": cgi.escape(json.dumps(pdu.get("content")), quote=True),
            "time": t,
            "depth": pdu.get("depth"),
        }
@@ -1,75 +1,3 @@
-matrix-synapse-py3 (1.118.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.118.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 22 Oct 2024 11:48:14 +0100
-
-matrix-synapse-py3 (1.117.0) stable; urgency=medium
-
-  * New Synapse release 1.117.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 15 Oct 2024 10:46:30 +0100
-
-matrix-synapse-py3 (1.117.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.117.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 08 Oct 2024 14:37:11 +0100
-
-matrix-synapse-py3 (1.116.0) stable; urgency=medium
-
-  * New Synapse release 1.116.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 01 Oct 2024 11:14:07 +0100
-
-matrix-synapse-py3 (1.116.0~rc2) stable; urgency=medium
-
-  * New synapse release 1.116.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 26 Sep 2024 13:28:43 +0000
-
-matrix-synapse-py3 (1.116.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.116.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 25 Sep 2024 09:34:07 +0000
-
-matrix-synapse-py3 (1.115.0) stable; urgency=medium
-
-  * New Synapse release 1.115.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 17 Sep 2024 14:32:10 +0100
-
-matrix-synapse-py3 (1.115.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.115.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Thu, 12 Sep 2024 11:10:15 +0100
-
-matrix-synapse-py3 (1.115.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.115.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 10 Sep 2024 08:39:09 -0600
-
-matrix-synapse-py3 (1.114.0) stable; urgency=medium
-
-  * New Synapse release 1.114.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Mon, 02 Sep 2024 15:14:53 +0100
-
-matrix-synapse-py3 (1.114.0~rc3) stable; urgency=medium
-
-  * New Synapse release 1.114.0rc3.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 30 Aug 2024 16:38:05 +0100
-
-matrix-synapse-py3 (1.114.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.114.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 30 Aug 2024 15:35:13 +0100
-
 matrix-synapse-py3 (1.114.0~rc1) stable; urgency=medium

  * New synapse release 1.114.0rc1.
@@ -111,9 +111,6 @@ server_notices:
  system_mxid_avatar_url: ""
  room_name: "Server Alert"

-# Enable delayed events (msc4140)
-max_event_delay_duration: 24h
-

 # Disable sync cache so that initial `/sync` requests are up-to-date.
 caches:
@@ -1361,83 +1361,3 @@ Returns a `404` HTTP status code if no user was found, with a response body like
 ```

 _Added in Synapse 1.72.0._
-
-
-## Redact all the events of a user
-
-The API is 
-```
-POST /_synapse/admin/v1/user/$user_id/redact
-
-{
-  "rooms": ["!roomid1", "!roomid2"]
-}
-```
-If an empty list is provided as the key for `rooms`, all events in all the rooms the user is member of will be redacted, 
-otherwise all the events in the rooms provided in the request will be redacted. 
-
-The API starts redaction process running, and returns immediately with a JSON body with
-a redact id which can be used to query the status of the redaction process:
-
-```json
-{
-    "redact_id": "<opaque id>"
-}
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
- `user_id` - The fully qualified MXID of the user: for example, `@user:server.com`.
-
-The following JSON body parameter must be provided:
-
-  `rooms` - A list of rooms to redact the user's events in. If an empty list is provided all events in all rooms
-  the user is a member of will be redacted
-
-_Added in Synapse 1.116.0._
-
-The following JSON body parameters are optional:
-
- `reason` - Reason the redaction is being requested, ie "spam", "abuse", etc. This will be included in each redaction event, and be visible to users.
- `limit` - a limit on the number of the user's events to search for ones that can be redacted (events are redacted newest to oldest) in each room, defaults to 1000 if not provided
-
-
-## Check the status of a redaction process
-
-It is possible to query the status of the background task for redacting a user's events.
-The status can be queried up to 24 hours after completion of the task,
-or until Synapse is restarted (whichever happens first).
-
-The API is:
-
-```
-GET /_synapse/admin/v1/user/redact_status/$redact_id
-```
-
-A response body like the following is returned:
-
-```
-{
-  "status": "active",
-  "failed_redactions": [],
-}
-```
-
-**Parameters**
-
-The following parameters should be set in the URL:
-
-* `redact_id` - string - The ID for this redaction process, provided when the redaction was requested.
-
-
-**Response**
-
-The following fields are returned in the JSON response body:
-
- `status` - string - one of scheduled/active/completed/failed, indicating the status of the redaction job
- `failed_redactions` - dictionary - the keys of the dict are event ids the process was unable to redact, if any, and the values are 
-  the corresponding error that caused the redaction to fail
-
-_Added in Synapse 1.116.0._
@@ -8,7 +8,9 @@ errors in code.

 The necessary tools are:

- [ruff](https://github.com/charliermarsh/ruff), which can spot common errors and enforce a consistent style; and
+- [black](https://black.readthedocs.io/en/stable/), a source code formatter;
+- [isort](https://pycqa.github.io/isort/), which organises each file's imports;
+- [ruff](https://github.com/charliermarsh/ruff), which can spot common errors; and
 - [mypy](https://mypy.readthedocs.io/en/stable/), a type checker.

 See [the contributing guide](development/contributing_guide.md#run-the-linters) for instructions
@@ -76,9 +76,8 @@ _Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_a
 async def user_may_invite(inviter: str, invitee: str, room_id: str) -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
 ```

-Called when processing an invitation, both when one is created locally or when
-receiving an invite over federation. Both inviter and invitee are represented by
-their Matrix user ID (e.g. `@alice:example.com`).
+Called when processing an invitation. Both inviter and invitee are
+represented by their Matrix user ID (e.g. `@alice:example.com`).


 The callback must return one of:
@@ -113,9 +112,7 @@ async def user_may_send_3pid_invite(
 ```

 Called when processing an invitation using a third-party identifier (also called a 3PID,
-e.g. an email address or a phone number). It is only called when a 3PID invite is created
-locally - not when one is received in a room over federation. If the 3PID is already associated
-with a Matrix ID, the spam check will go through the `user_may_invite` callback instead.
+e.g. an email address or a phone number). 

 The inviter is represented by their Matrix user ID (e.g. `@alice:example.com`), and the
 invitee is represented by its medium (e.g. "email") and its address
@@ -52,6 +52,8 @@ architecture via <https://packages.matrix.org/debian/>.

 To install the latest release:

+TODO UPDATE ALL THIS
+
 ```sh
 sudo apt install -y lsb-release wget apt-transport-https
 sudo wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg
@@ -314,7 +316,7 @@ sudo dnf group install "Development Tools"

 *Note: The term "RHEL" below refers to both Red Hat Enterprise Linux and Rocky Linux. The distributions are 1:1 binary compatible.*

-It's recommended to use the latest Python versions.
+It's recommended to use the latest Python versions. 

 RHEL 8 in particular ships with Python 3.6 by default which is EOL and therefore no longer supported by Synapse. RHEL 9 ship with Python 3.9 which is still supported by the Python core team as of this writing. However, newer Python versions provide significant performance improvements and they're available in official distributions' repositories. Therefore it's recommended to use them.

@@ -344,7 +346,7 @@ dnf install python3.12 python3.12-devel
 ```
 Finally, install common prerequisites
 ```bash
-dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf
+dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf 
 dnf group install "Development Tools"
 ```
 ###### Using venv module instead of virtualenv command
@@ -353,7 +355,7 @@ It's recommended to use Python venv module directly rather than the virtualenv c
 * On RHEL 9, virtualenv is only available on [EPEL](https://docs.fedoraproject.org/en-US/epel/).
 * On RHEL 8, virtualenv is based on Python 3.6. It does not support creating 3.11/3.12 virtual environments.

-Here's an example of creating Python 3.12 virtual environment and installing Synapse from PyPI.
+Here's an example of creating Python 3.12 virtual environment and installing Synapse from PyPI. 

 ```bash
 mkdir -p ~/synapse
@@ -255,8 +255,6 @@ line to `/etc/default/matrix-synapse`:

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

-*Note*: You may need to set `PYTHONMALLOC=malloc` to ensure that `jemalloc` can accurately calculate memory usage. By default, Python uses its internal small-object allocator, which may interfere with jemalloc's ability to track memory consumption correctly. This could prevent the [cache_autotuning](../configuration/config_documentation.md#caches-and-associated-values) feature from functioning as expected, as the Python allocator may not reach the memory threshold set by `max_cache_memory_usage`, thus not triggering the cache eviction process.
-
 This made a significant difference on Python 2.7 - it's unclear how
 much of an improvement it provides on Python 3.x.

@@ -761,19 +761,6 @@ email:
    password_reset: "[%(server_name)s] Password reset"
    email_validation: "[%(server_name)s] Validate your email"
 ```
---
-### `max_event_delay_duration`
-
-The maximum allowed duration by which sent events can be delayed, as per
-[MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140).
-Must be a positive value if set.
-
-Defaults to no duration (`null`), which disallows sending delayed events.
-
-Example configuration:
-```yaml
-max_event_delay_duration: 24h
-```

 ## Homeserver blocking
 Useful options for Synapse admins.
@@ -1434,7 +1421,7 @@ number of entries that can be stored.
   Please see the [Config Conventions](#config-conventions) for information on how to specify memory size and cache expiry
   durations.
     * `max_cache_memory_usage` sets a ceiling on how much memory the cache can use before caches begin to be continuously evicted.
-        They will continue to be evicted until the memory usage drops below the `target_cache_memory_usage`, set in
+        They will continue to be evicted until the memory usage drops below the `target_memory_usage`, set in
        the setting below, or until the `min_cache_ttl` is hit. There is no default value for this option.
     * `target_cache_memory_usage` sets a rough target for the desired memory usage of the caches. There is no default value
        for this option.
@@ -2328,22 +2315,6 @@ Example configuration:
 ```yaml
 turn_shared_secret: "YOUR_SHARED_SECRET"
 ```
---
-### `turn_shared_secret_path`
-
-An alternative to [`turn_shared_secret`](#turn_shared_secret):
-allows the shared secret to be specified in an external file.
-
-The file should be a plain text file, containing only the shared secret.
-Synapse reads the shared secret from the given file once at startup.
-
-Example configuration:
-```yaml
-turn_shared_secret_path: /path/to/secrets/file
-```
-
-_Added in Synapse 1.116.0._
-
 ---
 ### `turn_username` and `turn_password`

@@ -3722,8 +3693,6 @@ Additional sub-options for this setting include:
   Required if `enabled` is set to true.
 * `subject_claim`: Name of the claim containing a unique identifier for the user.
   Optional, defaults to `sub`.
-* `display_name_claim`: Name of the claim containing the display name for the user. Optional.
-   If provided, the display name will be set to the value of this claim upon first login.
 * `issuer`: The issuer to validate the "iss" claim against. Optional. If provided the
   "iss" claim will be required and validated for all JSON web tokens.
 * `audiences`: A list of audiences to validate the "aud" claim against. Optional.
@@ -3738,7 +3707,6 @@ jwt_config:
    secret: "provided-by-your-issuer"
    algorithm: "provided-by-your-issuer"
    subject_claim: "name_of_claim"
-    display_name_claim: "name_of_claim"
    issuer: "provided-by-your-issuer"
    audiences:
        - "provided-by-your-issuer"
@@ -4371,13 +4339,7 @@ It is possible to scale the processes that handle sending outbound federation re
 by running a [`generic_worker`](../../workers.md#synapseappgeneric_worker) and adding it's [`worker_name`](#worker_name) to
 a `federation_sender_instances` map. Doing so will remove handling of this function from
 the main process. Multiple workers can be added to this map, in which case the work is
-balanced across them. 
-
-The way that the load balancing works is any outbound federation request will be assigned 
-to a federation sender worker based on the hash of the destination server name. This
-means that all requests being sent to the same destination will be processed by the same
-worker instance. Multiple `federation_sender_instances` are useful if there is a federation
-with multiple servers.
+balanced across them.

 This configuration setting must be shared between all workers handling federation
 sending, and if changed all federation sender workers must be stopped at the same time
@@ -4527,9 +4489,6 @@ This setting has the following sub-options:
 * `path`: The full path to a local Unix socket file. **If this is used, `host` and
 `port` are ignored.** Defaults to `/tmp/redis.sock'
 * `password`: Optional password if configured on the Redis instance.
-* `password_path`: Alternative to `password`, reading the password from an
-   external file. The file should be a plain text file, containing only the
-   password. Synapse reads the password from the given file once at startup.
 * `dbid`: Optional redis dbid if needs to connect to specific redis logical db.
 * `use_tls`: Whether to use tls connection. Defaults to false.
 * `certificate_file`: Optional path to the certificate file
@@ -4543,16 +4502,13 @@ This setting has the following sub-options:

  _Changed in Synapse 1.85.0: Added path option to use a local Unix socket_

-  _Changed in Synapse 1.116.0: Added password\_path_
-
 Example configuration:
 ```yaml
 redis:
  enabled: true
  host: localhost
  port: 6379
-  password_path: <path_to_the_password_file>
-  # OR password: <secret_password>
+  password: <secret_password>
  dbid: <dbid>
  #use_tls: True
  #certificate_file: <path_to_the_certificate_file>
@@ -177,11 +177,11 @@ The following applies to Synapse installations that have been installed from sou

 You can start the main Synapse process with Poetry by running the following command:
 ```console
-poetry run synapse_homeserver --config-path [your homeserver.yaml]
+poetry run synapse_homeserver --config-file [your homeserver.yaml]
 ```
 For worker setups, you can run the following command
 ```console
-poetry run synapse_worker --config-path [your homeserver.yaml] --config-path [your worker.yaml]
+poetry run synapse_worker --config-file [your homeserver.yaml] --config-file [your worker.yaml]
 ```
 ## Available worker applications

@@ -290,7 +290,6 @@ information.
 Additionally, the following REST endpoints can be handled for GET requests:

    ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/
-    ^/_matrix/client/unstable/org.matrix.msc4140/delayed_events

 Pagination requests can also be handled, but all requests for a given
 room must be routed to the same instance. Additionally, care must be taken to
@@ -0,0 +1,280 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time. See also the "--disable" option for examples.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=missing-docstring
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_$|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct attribute names in class
+# bodies
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=__.*__
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+# List of optional constructs for which whitespace checking is disabled
+no-space-check=trailing-comma,dict-separator
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
@@ -34,9 +34,14 @@
        name = "Internal Changes"
        showcontent = true

+[tool.black]
+target-version = ['py38', 'py39', 'py310', 'py311']
+# black ignores everything in .gitignore by default, see
+# https://black.readthedocs.io/en/stable/usage_and_configuration/file_collection_and_discovery.html#gitignore
+# Use `extend-exclude` if you want to exclude something in addition to this.
+
 [tool.ruff]
 line-length = 88
-target-version = "py38"

 [tool.ruff.lint]
 # See https://beta.ruff.rs/docs/rules/#error-e
@@ -58,8 +63,6 @@ select = [
    "W",
    # pyflakes
    "F",
-    # isort
-    "I001",
    # flake8-bugbear
    "B0",
    # flake8-comprehensions
@@ -76,20 +79,17 @@ select = [
    "EXE",
 ]

-[tool.ruff.lint.isort]
-combine-as-imports = true
-section-order = ["future", "standard-library", "third-party", "twisted", "first-party", "testing", "local-folder"]
-known-first-party = ["synapse"]
-
-[tool.ruff.lint.isort.sections]
-twisted = ["twisted", "OpenSSL"]
-testing = ["tests"]
-
-[tool.ruff.format]
-quote-style = "double"
-indent-style = "space"
-skip-magic-trailing-comma = false
-line-ending = "auto"
+[tool.isort]
+line_length = 88
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "TWISTED", "FIRSTPARTY", "TESTS", "LOCALFOLDER"]
+default_section = "THIRDPARTY"
+known_first_party = ["synapse"]
+known_tests = ["tests"]
+known_twisted = ["twisted", "OpenSSL"]
+multi_line_output = 3
+include_trailing_comma = true
+combine_as_imports = true
+skip_gitignore = true

 [tool.maturin]
 manifest-path = "rust/Cargo.toml"
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.118.0rc1"
+version = "1.114.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -320,7 +320,9 @@ all = [
 # failing on new releases. Keeping lower bounds loose here means that dependabot
 # can bump versions without having to update the content-hash in the lockfile.
 # This helps prevents merge conflicts when running a batch of dependabot updates.
-ruff = "0.6.9"
+isort = ">=5.10.1"
+black = ">=22.7.0"
+ruff = "0.5.5"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"

@@ -60,7 +60,6 @@ fn bench_match_exact(b: &mut Bencher) {
        true,
        vec![],
        false,
-        false,
    )
    .unwrap();

@@ -106,7 +105,6 @@ fn bench_match_word(b: &mut Bencher) {
        true,
        vec![],
        false,
-        false,
    )
    .unwrap();

@@ -152,7 +150,6 @@ fn bench_match_word_miss(b: &mut Bencher) {
        true,
        vec![],
        false,
-        false,
    )
    .unwrap();

@@ -198,7 +195,6 @@ fn bench_eval_message(b: &mut Bencher) {
        true,
        vec![],
        false,
-        false,
    )
    .unwrap();

@@ -209,7 +205,6 @@ fn bench_eval_message(b: &mut Bencher) {
        false,
        false,
        false,
-        false,
    );

    b.iter(|| eval.run(&rules, Some("bob"), Some("person")));
@@ -81,7 +81,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[
        ))]),
        actions: Cow::Borrowed(&[Action::Notify]),
        default: true,
-        default_enabled: true,
+        default_enabled: false,
    },
    PushRule {
        rule_id: Cow::Borrowed("global/override/.m.rule.suppress_notices"),
@@ -105,9 +105,6 @@ pub struct PushRuleEvaluator {
    /// If MSC3931 (room version feature flags) is enabled. Usually controlled by the same
    /// flag as MSC1767 (extensible events core).
    msc3931_enabled: bool,
-
-    // If MSC4210 (remove legacy mentions) is enabled.
-    msc4210_enabled: bool,
 }

 #[pymethods]
@@ -125,7 +122,6 @@ impl PushRuleEvaluator {
        related_event_match_enabled,
        room_version_feature_flags,
        msc3931_enabled,
-        msc4210_enabled,
    ))]
    pub fn py_new(
        flattened_keys: BTreeMap<String, JsonValue>,
@@ -137,7 +133,6 @@ impl PushRuleEvaluator {
        related_event_match_enabled: bool,
        room_version_feature_flags: Vec<String>,
        msc3931_enabled: bool,
-        msc4210_enabled: bool,
    ) -> Result<Self, Error> {
        let body = match flattened_keys.get("content.body") {
            Some(JsonValue::Value(SimpleJsonValue::Str(s))) => s.clone().into_owned(),
@@ -155,7 +150,6 @@ impl PushRuleEvaluator {
            related_event_match_enabled,
            room_version_feature_flags,
            msc3931_enabled,
-            msc4210_enabled,
        })
    }

@@ -182,8 +176,7 @@ impl PushRuleEvaluator {

            // For backwards-compatibility the legacy mention rules are disabled
            // if the event contains the 'm.mentions' property.
-            // Additionally, MSC4210 always disables the legacy rules.
-            if (self.has_mentions || self.msc4210_enabled)
+            if self.has_mentions
                && (rule_id == "global/override/.m.rule.contains_display_name"
                    || rule_id == "global/content/.m.rule.contains_user_name"
                    || rule_id == "global/override/.m.rule.roomnotif")
@@ -533,7 +526,6 @@ fn push_rule_evaluator() {
        true,
        vec![],
        true,
-        false,
    )
    .unwrap();

@@ -563,7 +555,6 @@ fn test_requires_room_version_supports_condition() {
        false,
        flags,
        true,
-        false,
    )
    .unwrap();

@@ -591,7 +582,7 @@ fn test_requires_room_version_supports_condition() {
    };
    let rules = PushRules::new(vec![custom_rule]);
    result = evaluator.run(
-        &FilteredPushRules::py_new(rules, BTreeMap::new(), true, false, true, false, false),
+        &FilteredPushRules::py_new(rules, BTreeMap::new(), true, false, true, false),
        None,
        None,
    );
@@ -534,7 +534,6 @@ pub struct FilteredPushRules {
    msc3381_polls_enabled: bool,
    msc3664_enabled: bool,
    msc4028_push_encrypted_events: bool,
-    msc4210_enabled: bool,
 }

 #[pymethods]
@@ -547,7 +546,6 @@ impl FilteredPushRules {
        msc3381_polls_enabled: bool,
        msc3664_enabled: bool,
        msc4028_push_encrypted_events: bool,
-        msc4210_enabled: bool,
    ) -> Self {
        Self {
            push_rules,
@@ -556,7 +554,6 @@ impl FilteredPushRules {
            msc3381_polls_enabled,
            msc3664_enabled,
            msc4028_push_encrypted_events,
-            msc4210_enabled,
        }
    }

@@ -599,14 +596,6 @@ impl FilteredPushRules {
                    return false;
                }

-                if self.msc4210_enabled
-                    && (rule.rule_id == "global/override/.m.rule.contains_display_name"
-                        || rule.rule_id == "global/content/.m.rule.contains_user_name"
-                        || rule.rule_id == "global/override/.m.rule.roomnotif")
-                {
-                    return false;
-                }
-
                true
            })
            .map(|r| {
@@ -32,8 +32,8 @@ DISTS = (
    "debian:sid",  # (EOL not specified yet) (our EOL forced by Python 3.11 is 2027-10-24)
    "ubuntu:focal",  # 20.04 LTS (EOL 2025-04) (our EOL forced by Python 3.8 is 2024-10-14)
    "ubuntu:jammy",  # 22.04 LTS (EOL 2027-04) (our EOL forced by Python 3.10 is 2026-10-04)
-    "ubuntu:noble",  # 24.04 LTS (EOL 2029-06)
-    "ubuntu:oracular",  # 24.10 (EOL 2025-07)
+    "ubuntu:lunar",  # 23.04 (EOL 2024-01) (our EOL forced by Python 3.11 is 2027-10-24)
+    "ubuntu:mantic",  # 23.10 (EOL 2024-07) (our EOL forced by Python 3.11 is 2027-10-24)
    "debian:trixie",  # (EOL not specified yet)
 )

@@ -31,7 +31,6 @@ Pydantic does not yet offer a strict mode, but it is planned for pydantic v2. Se
 until then, this script is a best effort to stop us from introducing type coersion bugs
 (like the infamous stringy power levels fixed in room version 10).
 """
-
 import argparse
 import contextlib
 import functools
@@ -45,6 +44,7 @@ import traceback
 import unittest.mock
 from contextlib import contextmanager
 from typing import (
+    TYPE_CHECKING,
    Any,
    Callable,
    Dict,
@@ -56,16 +56,29 @@ from typing import (
 )

 from parameterized import parameterized
-from typing_extensions import ParamSpec

-from synapse._pydantic_compat import (
-    BaseModel as PydanticBaseModel,
-    conbytes,
-    confloat,
-    conint,
-    constr,
-    get_args,
-)
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import (
+        BaseModel as PydanticBaseModel,
+        conbytes,
+        confloat,
+        conint,
+        constr,
+    )
+    from pydantic.v1.typing import get_args
+else:
+    from pydantic import (
+        BaseModel as PydanticBaseModel,
+        conbytes,
+        confloat,
+        conint,
+        constr,
+    )
+    from pydantic.typing import get_args
+
+from typing_extensions import ParamSpec

 logger = logging.getLogger(__name__)

@@ -169,16 +182,22 @@ def monkeypatch_pydantic() -> Generator[None, None, None]:
        # Most Synapse code ought to import the patched objects directly from
        # `pydantic`. But we also patch their containing modules `pydantic.main` and
        # `pydantic.types` for completeness.
-        patch_basemodel = unittest.mock.patch(
-            "synapse._pydantic_compat.BaseModel", new=PatchedBaseModel
+        patch_basemodel1 = unittest.mock.patch(
+            "pydantic.BaseModel", new=PatchedBaseModel
        )
-        patches.enter_context(patch_basemodel)
+        patch_basemodel2 = unittest.mock.patch(
+            "pydantic.main.BaseModel", new=PatchedBaseModel
+        )
+        patches.enter_context(patch_basemodel1)
+        patches.enter_context(patch_basemodel2)
        for factory in CONSTRAINED_TYPE_FACTORIES_WITH_STRICT_FLAG:
            wrapper: Callable = make_wrapper(factory)
-            patch = unittest.mock.patch(
-                f"synapse._pydantic_compat.{factory.__name__}", new=wrapper
+            patch1 = unittest.mock.patch(f"pydantic.{factory.__name__}", new=wrapper)
+            patch2 = unittest.mock.patch(
+                f"pydantic.types.{factory.__name__}", new=wrapper
            )
-            patches.enter_context(patch)
+            patches.enter_context(patch1)
+            patches.enter_context(patch2)
        yield


@@ -220,11 +220,9 @@ test_packages=(
    ./tests/msc3874
    ./tests/msc3890
    ./tests/msc3391
-    ./tests/msc3757
    ./tests/msc3930
    ./tests/msc3902
    ./tests/msc3967
-    ./tests/msc4140
 )

 # Enable dirty runs, so tests will reuse the same container where possible.
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 #
 # Runs linting scripts over the local Synapse checkout
+# black - opinionated code formatter
 # ruff - lints and finds mistakes
-# mypy - typechecks python code
-# cargo clippy - lints rust code

 set -e

@@ -102,6 +101,12 @@ echo
 # Print out the commands being run
 set -x

+# Ensure the sort order of imports.
+isort "${files[@]}"
+
+# Ensure Python code conforms to an opinionated style.
+python3 -m black "${files[@]}"
+
 # Ensure the sample configuration file conforms to style checks.
 ./scripts-dev/config-lint.sh

@@ -109,9 +114,6 @@ set -x
 # --quiet suppresses the update check.
 ruff check --quiet --fix "${files[@]}"

-# Reformat Python code.
-ruff format --quiet "${files[@]}"
-
 # Catch any common programming mistakes in Rust code.
 #
 # --bins, --examples, --lib, --tests combined explicitly disable checking
@@ -38,7 +38,6 @@ from mypy.types import (
    NoneType,
    TupleType,
    TypeAliasType,
-    TypeVarType,
    UninhabitedType,
    UnionType,
 )
@@ -234,7 +233,6 @@ IMMUTABLE_CUSTOM_TYPES = {
    "synapse.synapse_rust.push.FilteredPushRules",
    # This is technically not immutable, but close enough.
    "signedjson.types.VerifyKey",
-    "synapse.types.StrCollection",
 }

 # Immutable containers only if the values are also immutable.
@@ -300,7 +298,7 @@ def is_cacheable(

        elif rt.type.fullname in MUTABLE_CONTAINER_TYPES:
            # Mutable containers are mutable regardless of their underlying type.
-            return False, f"container {rt.type.fullname} is mutable"
+            return False, None

        elif "attrs" in rt.type.metadata:
            # attrs classes are only cachable iff it is frozen (immutable itself)
@@ -320,9 +318,6 @@ def is_cacheable(
            else:
                return False, "non-frozen attrs class"

-        elif rt.type.is_enum:
-            # We assume Enum values are immutable
-            return True, None
        else:
            # Ensure we fail for unknown types, these generally means that the
            # above code is not complete.
@@ -331,18 +326,6 @@ def is_cacheable(
                f"Don't know how to handle {rt.type.fullname} return type instance",
            )

-    elif isinstance(rt, TypeVarType):
-        # We consider TypeVars immutable if they are bound to a set of immutable
-        # types.
-        if rt.values:
-            for value in rt.values:
-                ok, note = is_cacheable(value, signature, verbose)
-                if not ok:
-                    return False, f"TypeVar bound not cacheable {value}"
-            return True, None
-
-        return False, "TypeVar is unbound"
-
    elif isinstance(rt, NoneType):
        # None is cachable.
        return True, None
@@ -360,7 +343,7 @@ def is_cacheable(
        # For a type alias, check if the underlying real type is cachable.
        return is_cacheable(mypy.types.get_proper_type(rt), signature, verbose)

-    elif isinstance(rt, UninhabitedType):
+    elif isinstance(rt, UninhabitedType) and rt.is_noreturn:
        # There is no return value, just consider it cachable. This is only used
        # in tests.
        return True, None
@@ -20,7 +20,8 @@
 #
 #

-"""An interactive script for doing a release. See `cli()` below."""
+"""An interactive script for doing a release. See `cli()` below.
+"""

 import glob
 import json
@@ -40,7 +41,7 @@ import commonmark
 import git
 from click.exceptions import ClickException
 from git import GitCommandError, Repo
-from github import BadCredentialsException, Github
+from github import Github
 from packaging import version


@@ -323,8 +324,10 @@ def tag(gh_token: Optional[str]) -> None:
 def _tag(gh_token: Optional[str]) -> None:
    """Tags the release and generates a draft GitHub release"""

-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()

    # Make sure we're in a git repo.
    repo = get_repo_and_check_clean_checkout()
@@ -467,8 +470,10 @@ def upload(gh_token: Optional[str]) -> None:
 def _upload(gh_token: Optional[str]) -> None:
    """Upload release to pypi."""

-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()

    current_version = get_package_version()
    tag_name = f"v{current_version}"
@@ -565,8 +570,10 @@ def wait_for_actions(gh_token: Optional[str]) -> None:


 def _wait_for_actions(gh_token: Optional[str]) -> None:
-    # Test that the GH Token is valid before continuing.
-    check_valid_gh_token(gh_token)
+    if gh_token:
+        # Test that the GH Token is valid before continuing.
+        gh = Github(gh_token)
+        gh.get_user()

    # Find out the version and tag name.
    current_version = get_package_version()
@@ -800,22 +807,6 @@ def get_repo_and_check_clean_checkout(
    return repo


-def check_valid_gh_token(gh_token: Optional[str]) -> None:
-    """Check that a github token is valid, if supplied"""
-
-    if not gh_token:
-        # No github token supplied, so nothing to do.
-        return
-
-    try:
-        gh = Github(gh_token)
-
-        # We need to lookup name to trigger a request.
-        _name = gh.get_user().name
-    except BadCredentialsException as e:
-        raise click.ClickException(f"Github credentials are bad: {e}")
-
-
 def find_ref(repo: git.Repo, ref_name: str) -> Optional[git.HEAD]:
    """Find the branch/ref, looking first locally then in the remote."""
    if ref_name in repo.references:
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-"""Contains *incomplete* type hints for txredisapi."""
-
+"""Contains *incomplete* type hints for txredisapi.
+"""
 from typing import Any, List, Optional, Type, Union

 from twisted.internet import protocol
@@ -20,7 +20,8 @@
 #
 #

-"""This is an implementation of a Matrix homeserver."""
+""" This is an implementation of a Matrix homeserver.
+"""

 import os
 import sys
@@ -19,8 +19,6 @@
 #
 #

-from typing import TYPE_CHECKING
-
 from packaging.version import Version

 try:
@@ -32,64 +30,4 @@ except ImportError:

 HAS_PYDANTIC_V2: bool = Version(pydantic_version).major == 2

-if TYPE_CHECKING or HAS_PYDANTIC_V2:
-    from pydantic.v1 import (
-        BaseModel,
-        Extra,
-        Field,
-        MissingError,
-        PydanticValueError,
-        StrictBool,
-        StrictInt,
-        StrictStr,
-        ValidationError,
-        conbytes,
-        confloat,
-        conint,
-        constr,
-        parse_obj_as,
-        validator,
-    )
-    from pydantic.v1.error_wrappers import ErrorWrapper
-    from pydantic.v1.typing import get_args
-else:
-    from pydantic import (
-        BaseModel,
-        Extra,
-        Field,
-        MissingError,
-        PydanticValueError,
-        StrictBool,
-        StrictInt,
-        StrictStr,
-        ValidationError,
-        conbytes,
-        confloat,
-        conint,
-        constr,
-        parse_obj_as,
-        validator,
-    )
-    from pydantic.error_wrappers import ErrorWrapper
-    from pydantic.typing import get_args
-
-__all__ = (
-    "HAS_PYDANTIC_V2",
-    "BaseModel",
-    "constr",
-    "conbytes",
-    "conint",
-    "confloat",
-    "ErrorWrapper",
-    "Extra",
-    "Field",
-    "get_args",
-    "MissingError",
-    "parse_obj_as",
-    "PydanticValueError",
-    "StrictBool",
-    "StrictInt",
-    "StrictStr",
-    "ValidationError",
-    "validator",
-)
+__all__ = ("HAS_PYDANTIC_V2",)
@@ -171,7 +171,7 @@ def elide_http_methods_if_unconflicting(
    """

    def paths_to_methods_dict(
-        methods_and_paths: Iterable[Tuple[str, str]],
+        methods_and_paths: Iterable[Tuple[str, str]]
    ) -> Dict[str, Set[str]]:
        """
        Given (method, path) pairs, produces a dict from path to set of methods
@@ -201,7 +201,7 @@ def elide_http_methods_if_unconflicting(


 def simplify_path_regexes(
-    registrations: Dict[Tuple[str, str], EndpointDescription],
+    registrations: Dict[Tuple[str, str], EndpointDescription]
 ) -> Dict[Tuple[str, str], EndpointDescription]:
    """
    Simplify all the path regexes for the dict of endpoint descriptions,
@@ -40,7 +40,6 @@ from synapse.storage.engines import create_engine

 class ReviewConfig(RootConfig):
    "A config class that just pulls out the database config"
-
    config_classes = [DatabaseConfig]


@@ -161,11 +160,7 @@ def main() -> None:

    with make_conn(database_config, engine, "review_recent_signups") as db_conn:
        # This generates a type of Cursor, not LoggingTransaction.
-        user_infos = get_recent_users(
-            db_conn.cursor(),
-            since_ms,  # type: ignore[arg-type]
-            exclude_users_with_appservice,
-        )
+        user_infos = get_recent_users(db_conn.cursor(), since_ms, exclude_users_with_appservice)  # type: ignore[arg-type]

    for user_info in user_infos:
        if exclude_users_with_email and user_info.emails:
@@ -129,11 +129,6 @@ BOOLEAN_COLUMNS = {
    "remote_media_cache": ["authenticated"],
    "room_stats_state": ["is_federatable"],
    "rooms": ["is_public", "has_auth_chain_index"],
-    "sliding_sync_joined_rooms": ["is_encrypted"],
-    "sliding_sync_membership_snapshots": [
-        "has_known_state",
-        "is_encrypted",
-    ],
    "users": ["shadow_banned", "approved", "locked", "suspended"],
    "un_partial_stated_event_stream": ["rejection_status_changed"],
    "users_who_share_rooms": ["share_private"],
@@ -717,7 +712,9 @@ class Porter:
                return

            # Check if all background updates are done, abort if not.
-            updates_complete = await self.sqlite_store.db_pool.updates.has_completed_background_updates()
+            updates_complete = (
+                await self.sqlite_store.db_pool.updates.has_completed_background_updates()
+            )
            if not updates_complete:
                end_error = (
                    "Pending background updates exist in the SQLite3 database."
@@ -1093,10 +1090,10 @@ class Porter:
        return done, remaining + done

    async def _setup_state_group_id_seq(self) -> None:
-        curr_id: Optional[
-            int
-        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
-            table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
+        curr_id: Optional[int] = (
+            await self.sqlite_store.db_pool.simple_select_one_onecol(
+                table="state_groups", keyvalues={}, retcol="MAX(id)", allow_none=True
+            )
        )

        if not curr_id:
@@ -1184,13 +1181,13 @@ class Porter:
        )

    async def _setup_auth_chain_sequence(self) -> None:
-        curr_chain_id: Optional[
-            int
-        ] = await self.sqlite_store.db_pool.simple_select_one_onecol(
-            table="event_auth_chains",
-            keyvalues={},
-            retcol="MAX(chain_id)",
-            allow_none=True,
+        curr_chain_id: Optional[int] = (
+            await self.sqlite_store.db_pool.simple_select_one_onecol(
+                table="event_auth_chains",
+                keyvalues={},
+                retcol="MAX(chain_id)",
+                allow_none=True,
+            )
        )

        def r(txn: LoggingTransaction) -> None:
@@ -121,9 +121,7 @@ class MSC3861DelegatedAuth(BaseAuth):
        self._hostname = hs.hostname
        self._admin_token = self._config.admin_token

-        self._issuer_metadata = RetryOnExceptionCachedCall[OpenIDProviderMetadata](
-            self._load_metadata
-        )
+        self._issuer_metadata = RetryOnExceptionCachedCall(self._load_metadata)

        if isinstance(auth_method, PrivateKeyJWTWithKid):
            # Use the JWK as the client secret when using the private_key_jwt method
@@ -147,33 +145,6 @@ class MSC3861DelegatedAuth(BaseAuth):
        # metadata.validate_introspection_endpoint()
        return metadata

-    async def issuer(self) -> str:
-        """
-        Get the configured issuer
-
-        This will use the issuer value set in the metadata,
-        falling back to the one set in the config if not set in the metadata
-        """
-        metadata = await self._issuer_metadata.get()
-        return metadata.issuer or self._config.issuer
-
-    async def account_management_url(self) -> Optional[str]:
-        """
-        Get the configured account management URL
-
-        This will discover the account management URL from the issuer if it's not set in the config
-        """
-        if self._config.account_management_url is not None:
-            return self._config.account_management_url
-
-        try:
-            metadata = await self._issuer_metadata.get()
-            return metadata.get("account_management_uri", None)
-        # We don't want to raise here if we can't load the metadata
-        except Exception:
-            logger.warning("Failed to load metadata:", exc_info=True)
-            return None
-
    async def _introspection_endpoint(self) -> str:
        """
        Returns the introspection endpoint of the issuer
@@ -183,7 +154,7 @@ class MSC3861DelegatedAuth(BaseAuth):
        if self._config.introspection_endpoint is not None:
            return self._config.introspection_endpoint

-        metadata = await self._issuer_metadata.get()
+        metadata = await self._load_metadata()
        return metadata.get("introspection_endpoint")

    async def _introspect_token(self, token: str) -> IntrospectionToken:
@@ -338,7 +309,7 @@ class MSC3861DelegatedAuth(BaseAuth):
            logger.exception("Failed to introspect token")
            raise SynapseError(503, "Unable to introspect the access token")

-        logger.debug("Introspection result: %r", introspection_result)
+        logger.info(f"Introspection result: {introspection_result!r}")

        # TODO: introspection verification should be more extensive, especially:
        #   - verify the audience
@@ -230,8 +230,6 @@ class EventContentFields:

    ROOM_NAME: Final = "name"

-    MEMBERSHIP: Final = "membership"
-
    # Used in m.room.guest_access events.
    GUEST_ACCESS: Final = "guest_access"

@@ -247,8 +245,6 @@ class EventContentFields:
    # `m.room.encryption`` algorithm field
    ENCRYPTION_ALGORITHM: Final = "algorithm"

-    TOMBSTONE_SUCCESSOR_ROOM: Final = "replacement_room"
-

 class EventUnsignedContentFields:
    """Fields found inside the 'unsigned' data on events"""
@@ -63,6 +63,7 @@ class Codes(str, Enum):
    CAPTCHA_INVALID = "M_CAPTCHA_INVALID"
    MISSING_PARAM = "M_MISSING_PARAM"
    INVALID_PARAM = "M_INVALID_PARAM"
+    SESSION_EXPIRED = "M_SESSION_EXPIRED"
    TOO_LARGE = "M_TOO_LARGE"
    EXCLUSIVE = "M_EXCLUSIVE"
    THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
@@ -132,6 +133,9 @@ class Codes(str, Enum):
    # connection.
    UNKNOWN_POS = "M_UNKNOWN_POS"

+    # MSC4183: The token supplied to validate a 3pid was not correct
+    TOKEN_INCORRECT = "M_TOKEN_INCORRECT"
+

 class CodeMessageException(RuntimeError):
    """An exception with integer code, a message string attributes and optional headers.
@@ -107,8 +107,6 @@ class RoomVersion:
    # support the flag. Unknown flags are ignored by the evaluator, making conditions
    # fail if used.
    msc3931_push_features: Tuple[str, ...]  # values from PushRuleRoomFlag
-    # MSC3757: Restricting who can overwrite a state event
-    msc3757_enabled: bool


 class RoomVersions:
@@ -130,7 +128,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V2 = RoomVersion(
        "2",
@@ -150,7 +147,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V3 = RoomVersion(
        "3",
@@ -170,7 +166,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V4 = RoomVersion(
        "4",
@@ -190,7 +185,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V5 = RoomVersion(
        "5",
@@ -210,7 +204,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V6 = RoomVersion(
        "6",
@@ -230,7 +223,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V7 = RoomVersion(
        "7",
@@ -250,7 +242,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V8 = RoomVersion(
        "8",
@@ -270,7 +261,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V9 = RoomVersion(
        "9",
@@ -290,7 +280,6 @@ class RoomVersions:
        knock_restricted_join_rule=False,
        enforce_int_power_levels=False,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    V10 = RoomVersion(
        "10",
@@ -310,7 +299,6 @@ class RoomVersions:
        knock_restricted_join_rule=True,
        enforce_int_power_levels=True,
        msc3931_push_features=(),
-        msc3757_enabled=False,
    )
    MSC1767v10 = RoomVersion(
        # MSC1767 (Extensible Events) based on room version "10"
@@ -331,28 +319,6 @@ class RoomVersions:
        knock_restricted_join_rule=True,
        enforce_int_power_levels=True,
        msc3931_push_features=(PushRuleRoomFlag.EXTENSIBLE_EVENTS,),
-        msc3757_enabled=False,
-    )
-    MSC3757v10 = RoomVersion(
-        # MSC3757 (Restricting who can overwrite a state event) based on room version "10"
-        "org.matrix.msc3757.10",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.ROOM_V4_PLUS,
-        StateResolutionVersions.V2,
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=False,
-        updated_redaction_rules=False,
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=True,
    )
    V11 = RoomVersion(
        "11",
@@ -372,28 +338,6 @@ class RoomVersions:
        knock_restricted_join_rule=True,
        enforce_int_power_levels=True,
        msc3931_push_features=(),
-        msc3757_enabled=False,
-    )
-    MSC3757v11 = RoomVersion(
-        # MSC3757 (Restricting who can overwrite a state event) based on room version "11"
-        "org.matrix.msc3757.11",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.ROOM_V4_PLUS,
-        StateResolutionVersions.V2,
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=True,  # Used by MSC3820
-        updated_redaction_rules=True,  # Used by MSC3820
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=True,
    )


@@ -411,8 +355,6 @@ KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
        RoomVersions.V9,
        RoomVersions.V10,
        RoomVersions.V11,
-        RoomVersions.MSC3757v10,
-        RoomVersions.MSC3757v11,
    )
 }

@@ -19,8 +19,7 @@
 #
 #

-"""Contains the URL paths to prefix various aspects of the server with."""
-
+"""Contains the URL paths to prefix various aspects of the server with. """
 import hmac
 from hashlib import sha256
 from urllib.parse import urlencode
@@ -3,7 +3,7 @@
 #
 # Copyright 2020 The Matrix.org Foundation C.I.C.
 # Copyright 2016 OpenMarket Ltd
-# Copyright (C) 2023-2024 New Vector, Ltd
+# Copyright (C) 2023 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
@@ -65,7 +65,6 @@ from synapse.storage.databases.main.appservice import (
 )
 from synapse.storage.databases.main.censor_events import CensorEventsStore
 from synapse.storage.databases.main.client_ips import ClientIpWorkerStore
-from synapse.storage.databases.main.delayed_events import DelayedEventsStore
 from synapse.storage.databases.main.deviceinbox import DeviceInboxWorkerStore
 from synapse.storage.databases.main.devices import DeviceWorkerStore
 from synapse.storage.databases.main.directory import DirectoryWorkerStore
@@ -99,7 +98,6 @@ from synapse.storage.databases.main.roommember import RoomMemberWorkerStore
 from synapse.storage.databases.main.search import SearchStore
 from synapse.storage.databases.main.session import SessionStore
 from synapse.storage.databases.main.signatures import SignatureWorkerStore
-from synapse.storage.databases.main.sliding_sync import SlidingSyncStore
 from synapse.storage.databases.main.state import StateGroupWorkerStore
 from synapse.storage.databases.main.stats import StatsStore
 from synapse.storage.databases.main.stream import StreamWorkerStore
@@ -161,8 +159,6 @@ class GenericWorkerStore(
    SessionStore,
    TaskSchedulerWorkerStore,
    ExperimentalFeaturesStore,
-    SlidingSyncStore,
-    DelayedEventsStore,
 ):
    # Properties that multiple storage classes define. Tell mypy what the
    # expected type is.
@@ -54,7 +54,6 @@ UP & quit           +---------- YES                       SUCCESS
 This is all tied together by the AppServiceScheduler which DIs the required
 components.
 """
-
 import logging
 from typing import (
    TYPE_CHECKING,
@@ -18,11 +18,17 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import Any, Dict, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Dict, Type, TypeVar

 import jsonschema

-from synapse._pydantic_compat import BaseModel, ValidationError, parse_obj_as
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import BaseModel, ValidationError, parse_obj_as
+else:
+    from pydantic import BaseModel, ValidationError, parse_obj_as
+
 from synapse.config._base import ConfigError
 from synapse.types import JsonDict, StrSequence

@@ -338,10 +338,8 @@ class ExperimentalConfig(Config):
        # MSC3391: Removing account data.
        self.msc3391_enabled = experimental.get("msc3391_enabled", False)

-        # MSC3575 (Sliding Sync) alternate endpoints, c.f. MSC4186.
-        #
-        # This is enabled by default as a replacement for the sliding sync proxy.
-        self.msc3575_enabled: bool = experimental.get("msc3575_enabled", True)
+        # 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)
@@ -448,5 +446,5 @@ class ExperimentalConfig(Config):
        # MSC4151: Report room API (Client-Server API)
        self.msc4151_enabled: bool = experimental.get("msc4151_enabled", False)

-        # MSC4210: Remove legacy mentions
-        self.msc4210_enabled: bool = experimental.get("msc4210_enabled", False)
+        # MSC4156: Migrate server_name to via
+        self.msc4156_enabled: bool = experimental.get("msc4156_enabled", False)
@@ -38,7 +38,6 @@ class JWTConfig(Config):
            self.jwt_algorithm = jwt_config["algorithm"]

            self.jwt_subject_claim = jwt_config.get("subject_claim", "sub")
-            self.jwt_display_name_claim = jwt_config.get("display_name_claim")

            # The issuer and audiences are optional, if provided, it is asserted
            # that the claims exist on the JWT.
@@ -50,6 +49,5 @@ class JWTConfig(Config):
            self.jwt_secret = None
            self.jwt_algorithm = None
            self.jwt_subject_claim = None
-            self.jwt_display_name_claim = None
            self.jwt_issuer = None
            self.jwt_audiences = None
@@ -200,13 +200,16 @@ class KeyConfig(Config):
            )
            form_secret = 'form_secret: "%s"' % random_string_with_symbols(50)

-        return """\
+        return (
+            """\
        %(macaroon_secret_key)s
        %(form_secret)s
        signing_key_path: "%(base_key_name)s.signing.key"
        trusted_key_servers:
          - server_name: "matrix.org"
-        """ % locals()
+        """
+            % locals()
+        )

    def read_signing_keys(self, signing_key_path: str, name: str) -> List[SigningKey]:
        """Read the signing keys in the given path.
@@ -246,9 +249,7 @@ class KeyConfig(Config):
            if is_signing_algorithm_supported(key_id):
                key_base64 = key_data["key"]
                key_bytes = decode_base64(key_base64)
-                verify_key: "VerifyKeyWithExpiry" = decode_verify_key_bytes(
-                    key_id, key_bytes
-                )  # type: ignore[assignment]
+                verify_key: "VerifyKeyWithExpiry" = decode_verify_key_bytes(key_id, key_bytes)  # type: ignore[assignment]
                verify_key.expired = key_data["expired_ts"]
                keys[key_id] = verify_key
            else:
@@ -157,9 +157,12 @@ class LoggingConfig(Config):
        self, config_dir_path: str, server_name: str, **kwargs: Any
    ) -> str:
        log_config = os.path.join(config_dir_path, server_name + ".log.config")
-        return """\
+        return (
+            """\
        log_config: "%(log_config)s"
-        """ % locals()
+        """
+            % locals()
+        )

    def read_arguments(self, args: argparse.Namespace) -> None:
        if args.no_redirect_stdio is not None:
@@ -21,15 +21,10 @@

 from typing import Any

-from synapse.config._base import Config, ConfigError, read_file
+from synapse.config._base import Config
 from synapse.types import JsonDict
 from synapse.util.check_dependencies import check_requirements

-CONFLICTING_PASSWORD_OPTS_ERROR = """\
-You have configured both `redis.password` and `redis.password_path`.
-These are mutually incompatible.
-"""
-

 class RedisConfig(Config):
    section = "redis"
@@ -48,17 +43,6 @@ class RedisConfig(Config):
        self.redis_path = redis_config.get("path", None)
        self.redis_dbid = redis_config.get("dbid", None)
        self.redis_password = redis_config.get("password")
-        redis_password_path = redis_config.get("password_path")
-        if redis_password_path:
-            if self.redis_password:
-                raise ConfigError(CONFLICTING_PASSWORD_OPTS_ERROR)
-            self.redis_password = read_file(
-                redis_password_path,
-                (
-                    "redis",
-                    "password_path",
-                ),
-            ).strip()

        self.redis_use_tls = redis_config.get("use_tls", False)
        self.redis_certificate = redis_config.get("certificate_file", None)
@@ -2,7 +2,7 @@
 # This file is licensed under the Affero General Public License (AGPL) version 3.
 #
 # Copyright 2014-2021 The Matrix.org Foundation C.I.C.
-# Copyright (C) 2023-2024 New Vector, Ltd
+# Copyright (C) 2023 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
@@ -780,17 +780,6 @@ class ServerConfig(Config):
        else:
            self.delete_stale_devices_after = None

-        # The maximum allowed delay duration for delayed events (MSC4140).
-        max_event_delay_duration = config.get("max_event_delay_duration")
-        if max_event_delay_duration is not None:
-            self.max_event_delay_ms: Optional[int] = self.parse_duration(
-                max_event_delay_duration
-            )
-            if self.max_event_delay_ms <= 0:
-                raise ConfigError("max_event_delay_duration must be a positive value")
-        else:
-            self.max_event_delay_ms = None
-
    def has_tls_listener(self) -> bool:
        return any(listener.is_tls() for listener in self.listeners)

@@ -839,10 +828,13 @@ class ServerConfig(Config):
            ).lstrip()

        if not unsecure_listeners:
-            unsecure_http_bindings = """- port: %(unsecure_port)s
+            unsecure_http_bindings = (
+                """- port: %(unsecure_port)s
            tls: false
            type: http
-            x_forwarded: true""" % locals()
+            x_forwarded: true"""
+                % locals()
+            )

            if not open_private_ports:
                unsecure_http_bindings += (
@@ -861,13 +853,16 @@ class ServerConfig(Config):
        if not secure_listeners:
            secure_http_bindings = ""

-        return """\
+        return (
+            """\
        server_name: "%(server_name)s"
        pid_file: %(pid_file)s
        listeners:
          %(secure_http_bindings)s
          %(unsecure_http_bindings)s
-        """ % locals()
+        """
+            % locals()
+        )

    def read_arguments(self, args: argparse.Namespace) -> None:
        if args.manhole is not None:
@@ -23,12 +23,7 @@ from typing import Any

 from synapse.types import JsonDict

-from ._base import Config, ConfigError, read_file
-
-CONFLICTING_SHARED_SECRET_OPTS_ERROR = """\
-You have configured both `turn_shared_secret` and `turn_shared_secret_path`.
-These are mutually incompatible.
-"""
+from ._base import Config


 class VoipConfig(Config):
@@ -37,13 +32,6 @@ class VoipConfig(Config):
    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
        self.turn_uris = config.get("turn_uris", [])
        self.turn_shared_secret = config.get("turn_shared_secret")
-        turn_shared_secret_path = config.get("turn_shared_secret_path")
-        if turn_shared_secret_path:
-            if self.turn_shared_secret:
-                raise ConfigError(CONFLICTING_SHARED_SECRET_OPTS_ERROR)
-            self.turn_shared_secret = read_file(
-                turn_shared_secret_path, ("turn_shared_secret_path",)
-            ).strip()
        self.turn_username = config.get("turn_username")
        self.turn_password = config.get("turn_password")
        self.turn_user_lifetime = self.parse_duration(
@@ -22,17 +22,17 @@

 import argparse
 import logging
-from typing import Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union

 import attr

-from synapse._pydantic_compat import (
-    BaseModel,
-    Extra,
-    StrictBool,
-    StrictInt,
-    StrictStr,
-)
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import BaseModel, Extra, StrictBool, StrictInt, StrictStr
+else:
+    from pydantic import BaseModel, Extra, StrictBool, StrictInt, StrictStr
+
 from synapse.config._base import (
    Config,
    ConfigError,
@@ -328,11 +328,10 @@ class WorkerConfig(Config):
                )

        # type-ignore: the expression `Union[A, B]` is not a Type[Union[A, B]] currently
-        self.instance_map: Dict[str, InstanceLocationConfig] = (
-            parse_and_validate_mapping(
-                instance_map,
-                InstanceLocationConfig,  # type: ignore[arg-type]
-            )
+        self.instance_map: Dict[
+            str, InstanceLocationConfig
+        ] = parse_and_validate_mapping(
+            instance_map, InstanceLocationConfig  # type: ignore[arg-type]
        )

        # Map from type of streams to source, c.f. WriterLocations.
@@ -388,7 +388,6 @@ LENIENT_EVENT_BYTE_LIMITS_ROOM_VERSIONS = {
    RoomVersions.V9,
    RoomVersions.V10,
    RoomVersions.MSC1767v10,
-    RoomVersions.MSC3757v10,
 }


@@ -791,10 +790,9 @@ def get_send_level(


 def _can_send_event(event: "EventBase", auth_events: StateMap["EventBase"]) -> bool:
-    state_key = event.get_state_key()
    power_levels_event = get_power_level_event(auth_events)

-    send_level = get_send_level(event.type, state_key, power_levels_event)
+    send_level = get_send_level(event.type, event.get("state_key"), power_levels_event)
    user_level = get_user_power_level(event.user_id, auth_events)

    if user_level < send_level:
@@ -805,34 +803,11 @@ def _can_send_event(event: "EventBase", auth_events: StateMap["EventBase"]) -> b
            errcode=Codes.INSUFFICIENT_POWER,
        )

-    if (
-        state_key is not None
-        and state_key.startswith("@")
-        and state_key != event.user_id
-    ):
-        if event.room_version.msc3757_enabled:
-            try:
-                colon_idx = state_key.index(":", 1)
-                suffix_idx = state_key.find("_", colon_idx + 1)
-                state_key_user_id = (
-                    state_key[:suffix_idx] if suffix_idx != -1 else state_key
-                )
-                if not UserID.is_valid(state_key_user_id):
-                    raise ValueError
-            except ValueError:
-                raise SynapseError(
-                    400,
-                    "State key neither equals a valid user ID, nor starts with one plus an underscore",
-                    errcode=Codes.BAD_JSON,
-                )
-            if (
-                # sender is owner of the state key
-                state_key_user_id == event.user_id
-                # sender has higher PL than the owner of the state key
-                or user_level > get_user_power_level(state_key_user_id, auth_events)
-            ):
-                return True
-        raise AuthError(403, "You are not allowed to set others state")
+    # Check state_key
+    if hasattr(event, "state_key"):
+        if event.state_key.startswith("@"):
+            if event.state_key != event.user_id:
+                raise AuthError(403, "You are not allowed to set others state")

    return True

@@ -912,8 +887,7 @@ def _check_power_levels(
                    raise SynapseError(400, f"{v!r} must be an integer.")
            if k in {"events", "notifications", "users"}:
                if not isinstance(v, collections.abc.Mapping) or not all(
-                    type(v) is int
-                    for v in v.values()  # noqa: E721
+                    type(v) is int for v in v.values()  # noqa: E721
                ):
                    raise SynapseError(
                        400,
@@ -80,7 +80,7 @@ def load_legacy_presence_router(hs: "HomeServer") -> None:
    # All methods that the module provides should be async, but this wasn't enforced
    # in the old module system, so we wrap them if needed
    def async_wrapper(
-        f: Optional[Callable[P, R]],
+        f: Optional[Callable[P, R]]
    ) -> Optional[Callable[P, Awaitable[R]]]:
        # f might be None if the callback isn't implemented by the module. In this
        # case we don't want to register a callback at all so we return None.
@@ -504,7 +504,7 @@ class UnpersistedEventContext(UnpersistedEventContextBase):


 def _encode_state_group_delta(
-    state_group_delta: Dict[Tuple[int, int], StateMap[str]],
+    state_group_delta: Dict[Tuple[int, int], StateMap[str]]
 ) -> List[Tuple[int, int, Optional[List[Tuple[str, str, str]]]]]:
    if not state_group_delta:
        return []
@@ -517,7 +517,7 @@ def _encode_state_group_delta(


 def _decode_state_group_delta(
-    input: List[Tuple[int, int, List[Tuple[str, str, str]]]],
+    input: List[Tuple[int, int, List[Tuple[str, str, str]]]]
 ) -> Dict[Tuple[int, int], StateMap[str]]:
    if not input:
        return {}
@@ -544,7 +544,7 @@ def _encode_state_dict(


 def _decode_state_dict(
-    input: Optional[List[Tuple[str, str, str]]],
+    input: Optional[List[Tuple[str, str, str]]]
 ) -> Optional[StateMap[str]]:
    """Decodes a state dict encoded using `_encode_state_dict` above"""
    if input is None:
@@ -19,11 +19,17 @@
 #
 #
 import collections.abc
-from typing import List, Type, Union, cast
+from typing import TYPE_CHECKING, List, Type, Union, cast

 import jsonschema

-from synapse._pydantic_compat import Field, StrictBool, StrictStr
+from synapse._pydantic_compat import HAS_PYDANTIC_V2
+
+if TYPE_CHECKING or HAS_PYDANTIC_V2:
+    from pydantic.v1 import Field, StrictBool, StrictStr
+else:
+    from pydantic import Field, StrictBool, StrictStr
+
 from synapse.api.constants import (
    MAX_ALIAS_LENGTH,
    EventContentFields,
@@ -19,4 +19,5 @@
 #
 #

-"""This package includes all the federation specific logic."""
+""" This package includes all the federation specific logic.
+"""
@@ -20,7 +20,7 @@
 #
 #

-"""This module contains all the persistence actions done by the federation
+""" This module contains all the persistence actions done by the federation
 package.

 These actions are mostly only used by the :py:mod:`.replication` module.
@@ -859,6 +859,7 @@ class FederationMediaThumbnailServlet(BaseFederationServerServlet):
        request: SynapseRequest,
        media_id: str,
    ) -> None:
+
        width = parse_integer(request, "width", required=True)
        height = parse_integer(request, "height", required=True)
        method = parse_string(request, "method", "scale")
@@ -19,7 +19,7 @@
 #
 #

-"""Defines the JSON structure of the protocol units used by the server to
+""" Defines the JSON structure of the protocol units used by the server to
 server protocol.
 """

@@ -118,10 +118,10 @@ class AccountHandler:
            }

            if self._use_account_validity_in_account_status:
-                status[
-                    "org.matrix.expired"
-                ] = await self._account_validity_handler.is_user_expired(
-                    user_id.to_string()
+                status["org.matrix.expired"] = (
+                    await self._account_validity_handler.is_user_expired(
+                        user_id.to_string()
+                    )
                )

        return status
@@ -33,7 +33,7 @@ from synapse.replication.http.account_data import (
    ReplicationRemoveUserAccountDataRestServlet,
 )
 from synapse.streams import EventSource
-from synapse.types import JsonDict, JsonMapping, StrCollection, StreamKeyType, UserID
+from synapse.types import JsonDict, StrCollection, StreamKeyType, UserID

 if TYPE_CHECKING:
    from synapse.server import HomeServer
@@ -253,7 +253,7 @@ class AccountDataHandler:
            return response["max_stream_id"]

    async def add_tag_to_room(
-        self, user_id: str, room_id: str, tag: str, content: JsonMapping
+        self, user_id: str, room_id: str, tag: str, content: JsonDict
    ) -> int:
        """Add a tag to a room for a user.

@@ -21,34 +21,13 @@

 import abc
 import logging
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-)
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Sequence, Set

 import attr

-from synapse.api.constants import Direction, EventTypes, Membership
-from synapse.api.errors import SynapseError
+from synapse.api.constants import Direction, Membership
 from synapse.events import EventBase
-from synapse.types import (
-    JsonMapping,
-    Requester,
-    RoomStreamToken,
-    ScheduledTask,
-    StateMap,
-    TaskStatus,
-    UserID,
-    UserInfo,
-    create_requester,
-)
+from synapse.types import JsonMapping, RoomStreamToken, StateMap, UserID, UserInfo
 from synapse.visibility import filter_events_for_client

 if TYPE_CHECKING:
@@ -56,8 +35,6 @@ if TYPE_CHECKING:

 logger = logging.getLogger(__name__)

-REDACT_ALL_EVENTS_ACTION_NAME = "redact_all_events"
-

 class AdminHandler:
    def __init__(self, hs: "HomeServer"):
@@ -66,20 +43,6 @@ class AdminHandler:
        self._storage_controllers = hs.get_storage_controllers()
        self._state_storage_controller = self._storage_controllers.state
        self._msc3866_enabled = hs.config.experimental.msc3866.enabled
-        self.event_creation_handler = hs.get_event_creation_handler()
-        self._task_scheduler = hs.get_task_scheduler()
-
-        self._task_scheduler.register_action(
-            self._redact_all_events, REDACT_ALL_EVENTS_ACTION_NAME
-        )
-
-    async def get_redact_task(self, redact_id: str) -> Optional[ScheduledTask]:
-        """Get the current status of an active redaction process
-
-        Args:
-            redact_id: redact_id returned by start_redact_events.
-        """
-        return await self._task_scheduler.get_task(redact_id)

    async def get_whois(self, user: UserID) -> JsonMapping:
        connections = []
@@ -234,16 +197,14 @@ class AdminHandler:
            # events that we have and then filtering, this isn't the most
            # efficient method perhaps but it does guarantee we get everything.
            while True:
-                (
-                    events,
-                    _,
-                    _,
-                ) = await self._store.paginate_room_events_by_topological_ordering(
-                    room_id=room_id,
-                    from_key=from_key,
-                    to_key=to_key,
-                    limit=100,
-                    direction=Direction.FORWARDS,
+                events, _ = (
+                    await self._store.paginate_room_events_by_topological_ordering(
+                        room_id=room_id,
+                        from_key=from_key,
+                        to_key=to_key,
+                        limit=100,
+                        direction=Direction.FORWARDS,
+                    )
                )
                if not events:
                    break
@@ -350,153 +311,6 @@ class AdminHandler:

        return writer.finished()

-    async def start_redact_events(
-        self,
-        user_id: str,
-        rooms: list,
-        requester: JsonMapping,
-        reason: Optional[str],
-        limit: Optional[int],
-    ) -> str:
-        """
-        Start a task redacting the events of the given user in the given rooms
-
-        Args:
-            user_id: the user ID of the user whose events should be redacted
-            rooms: the rooms in which to redact the user's events
-            requester: the user requesting the events
-            reason: reason for requesting the redaction, ie spam, etc
-            limit: limit on the number of events in each room to redact
-
-        Returns:
-            a unique ID which can be used to query the status of the task
-        """
-        active_tasks = await self._task_scheduler.get_tasks(
-            actions=[REDACT_ALL_EVENTS_ACTION_NAME],
-            resource_id=user_id,
-            statuses=[TaskStatus.ACTIVE],
-        )
-
-        if len(active_tasks) > 0:
-            raise SynapseError(
-                400, "Redact already in progress for user %s" % (user_id,)
-            )
-
-        if not limit:
-            limit = 1000
-
-        redact_id = await self._task_scheduler.schedule_task(
-            REDACT_ALL_EVENTS_ACTION_NAME,
-            resource_id=user_id,
-            params={
-                "rooms": rooms,
-                "requester": requester,
-                "user_id": user_id,
-                "reason": reason,
-                "limit": limit,
-            },
-        )
-
-        logger.info(
-            "starting redact events with redact_id %s",
-            redact_id,
-        )
-
-        return redact_id
-
-    async def _redact_all_events(
-        self, task: ScheduledTask
-    ) -> Tuple[TaskStatus, Optional[Mapping[str, Any]], Optional[str]]:
-        """
-        Task to redact all of a users events in the given rooms, tracking which, if any, events
-        whose redaction failed
-        """
-
-        assert task.params is not None
-        rooms = task.params.get("rooms")
-        assert rooms is not None
-
-        r = task.params.get("requester")
-        assert r is not None
-        admin = Requester.deserialize(self._store, r)
-
-        user_id = task.params.get("user_id")
-        assert user_id is not None
-
-        requester = create_requester(
-            user_id, authenticated_entity=admin.user.to_string()
-        )
-
-        reason = task.params.get("reason")
-        limit = task.params.get("limit")
-        assert limit is not None
-
-        result: Mapping[str, Any] = (
-            task.result if task.result else {"failed_redactions": {}}
-        )
-        for room in rooms:
-            room_version = await self._store.get_room_version(room)
-            event_ids = await self._store.get_events_sent_by_user_in_room(
-                user_id,
-                room,
-                limit,
-                ["m.room.member", "m.room.message"],
-            )
-            if not event_ids:
-                # nothing to redact in this room
-                continue
-
-            events = await self._store.get_events_as_list(event_ids)
-            for event in events:
-                # we care about join events but not other membership events
-                if event.type == "m.room.member":
-                    content = event.content
-                    if content:
-                        if content.get("membership") == Membership.JOIN:
-                            pass
-                        else:
-                            continue
-                relations = await self._store.get_relations_for_event(
-                    room, event.event_id, event, event_type=EventTypes.Redaction
-                )
-
-                # if we've already successfully redacted this event then skip processing it
-                if relations[0]:
-                    continue
-
-                event_dict = {
-                    "type": EventTypes.Redaction,
-                    "content": {"reason": reason} if reason else {},
-                    "room_id": room,
-                    "sender": user_id,
-                }
-                if room_version.updated_redaction_rules:
-                    event_dict["content"]["redacts"] = event.event_id
-                else:
-                    event_dict["redacts"] = event.event_id
-
-                try:
-                    # set the prev event to the offending message to allow for redactions
-                    # to be processed in the case where the user has been kicked/banned before
-                    # redactions are requested
-                    (
-                        redaction,
-                        _,
-                    ) = await self.event_creation_handler.create_and_send_nonmember_event(
-                        requester,
-                        event_dict,
-                        prev_event_ids=[event.event_id],
-                        ratelimit=False,
-                    )
-                except Exception as ex:
-                    logger.info(
-                        f"Redaction of event {event.event_id} failed due to: {ex}"
-                    )
-                    result["failed_redactions"][event.event_id] = str(ex)
-                    await self._task_scheduler.update_task(task.id, result=result)
-
-        return TaskStatus.COMPLETE, result, None
-

 class ExfiltrationWriter(metaclass=abc.ABCMeta):
    """Interface used to specify how to write exported data."""
@@ -166,7 +166,8 @@ def login_id_phone_to_thirdparty(identifier: JsonDict) -> Dict[str, str]:
    if "country" not in identifier or (
        # The specification requires a "phone" field, while Synapse used to require a "number"
        # field. Accept both for backwards compatibility.
-        "phone" not in identifier and "number" not in identifier
+        "phone" not in identifier
+        and "number" not in identifier
    ):
        raise SynapseError(
            400, "Invalid phone-type identifier", errcode=Codes.INVALID_PARAM
@@ -1,498 +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>.
-#
-
-import logging
-from typing import TYPE_CHECKING, List, Optional, Set, Tuple
-
-from twisted.internet.interfaces import IDelayedCall
-
-from synapse.api.constants import EventTypes
-from synapse.api.errors import ShadowBanError
-from synapse.config.workers import MAIN_PROCESS_INSTANCE_NAME
-from synapse.logging.opentracing import set_tag
-from synapse.metrics import event_processing_positions
-from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.replication.http.delayed_events import (
-    ReplicationAddedDelayedEventRestServlet,
-)
-from synapse.storage.databases.main.delayed_events import (
-    DelayedEventDetails,
-    DelayID,
-    EventType,
-    StateKey,
-    Timestamp,
-    UserLocalpart,
-)
-from synapse.storage.databases.main.state_deltas import StateDelta
-from synapse.types import (
-    JsonDict,
-    Requester,
-    RoomID,
-    UserID,
-    create_requester,
-)
-from synapse.util.events import generate_fake_event_id
-from synapse.util.metrics import Measure
-
-if TYPE_CHECKING:
-    from synapse.server import HomeServer
-
-logger = logging.getLogger(__name__)
-
-
-class DelayedEventsHandler:
-    def __init__(self, hs: "HomeServer"):
-        self._store = hs.get_datastores().main
-        self._storage_controllers = hs.get_storage_controllers()
-        self._config = hs.config
-        self._clock = hs.get_clock()
-        self._request_ratelimiter = hs.get_request_ratelimiter()
-        self._event_creation_handler = hs.get_event_creation_handler()
-        self._room_member_handler = hs.get_room_member_handler()
-
-        self._next_delayed_event_call: Optional[IDelayedCall] = None
-
-        # The current position in the current_state_delta stream
-        self._event_pos: Optional[int] = None
-
-        # Guard to ensure we only process event deltas one at a time
-        self._event_processing = False
-
-        if hs.config.worker.worker_app is None:
-            self._repl_client = None
-
-            async def _schedule_db_events() -> None:
-                # We kick this off to pick up outstanding work from before the last restart.
-                # Block until we're up to date.
-                await self._unsafe_process_new_event()
-                hs.get_notifier().add_replication_callback(self.notify_new_event)
-                # Kick off again (without blocking) to catch any missed notifications
-                # that may have fired before the callback was added.
-                self._clock.call_later(0, self.notify_new_event)
-
-                # Delayed events that are already marked as processed on startup might not have been
-                # sent properly on the last run of the server, so unmark them to send them again.
-                # Caveat: this will double-send delayed events that successfully persisted, but failed
-                # to be removed from the DB table of delayed events.
-                # TODO: To avoid double-sending, scan the timeline to find which of these events were
-                # already sent. To do so, must store delay_ids in sent events to retrieve them later.
-                await self._store.unprocess_delayed_events()
-
-                events, next_send_ts = await self._store.process_timeout_delayed_events(
-                    self._get_current_ts()
-                )
-
-                if next_send_ts:
-                    self._schedule_next_at(next_send_ts)
-
-                # Can send the events in background after having awaited on marking them as processed
-                run_as_background_process(
-                    "_send_events",
-                    self._send_events,
-                    events,
-                )
-
-            self._initialized_from_db = run_as_background_process(
-                "_schedule_db_events", _schedule_db_events
-            )
-        else:
-            self._repl_client = ReplicationAddedDelayedEventRestServlet.make_client(hs)
-
-    @property
-    def _is_master(self) -> bool:
-        return self._repl_client is None
-
-    def notify_new_event(self) -> None:
-        """
-        Called when there may be more state event deltas to process,
-        which should cancel pending delayed events for the same state.
-        """
-        if self._event_processing:
-            return
-
-        self._event_processing = True
-
-        async def process() -> None:
-            try:
-                await self._unsafe_process_new_event()
-            finally:
-                self._event_processing = False
-
-        run_as_background_process("delayed_events.notify_new_event", process)
-
-    async def _unsafe_process_new_event(self) -> None:
-        # If self._event_pos is None then means we haven't fetched it from the DB yet
-        if self._event_pos is None:
-            self._event_pos = await self._store.get_delayed_events_stream_pos()
-            room_max_stream_ordering = self._store.get_room_max_stream_ordering()
-            if self._event_pos > room_max_stream_ordering:
-                # apparently, we've processed more events than exist in the database!
-                # this can happen if events are removed with history purge or similar.
-                logger.warning(
-                    "Event stream ordering appears to have gone backwards (%i -> %i): "
-                    "rewinding delayed events processor",
-                    self._event_pos,
-                    room_max_stream_ordering,
-                )
-                self._event_pos = room_max_stream_ordering
-
-        # Loop round handling deltas until we're up to date
-        while True:
-            with Measure(self._clock, "delayed_events_delta"):
-                room_max_stream_ordering = self._store.get_room_max_stream_ordering()
-                if self._event_pos == room_max_stream_ordering:
-                    return
-
-                logger.debug(
-                    "Processing delayed events %s->%s",
-                    self._event_pos,
-                    room_max_stream_ordering,
-                )
-                (
-                    max_pos,
-                    deltas,
-                ) = await self._storage_controllers.state.get_current_state_deltas(
-                    self._event_pos, room_max_stream_ordering
-                )
-
-                logger.debug(
-                    "Handling %d state deltas for delayed events processing",
-                    len(deltas),
-                )
-                await self._handle_state_deltas(deltas)
-
-                self._event_pos = max_pos
-
-                # Expose current event processing position to prometheus
-                event_processing_positions.labels("delayed_events").set(max_pos)
-
-                await self._store.update_delayed_events_stream_pos(max_pos)
-
-    async def _handle_state_deltas(self, deltas: List[StateDelta]) -> None:
-        """
-        Process current state deltas to cancel pending delayed events
-        that target the same state.
-        """
-        for delta in deltas:
-            logger.debug(
-                "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
-            )
-
-            next_send_ts = await self._store.cancel_delayed_state_events(
-                room_id=delta.room_id,
-                event_type=delta.event_type,
-                state_key=delta.state_key,
-            )
-
-            if self._next_send_ts_changed(next_send_ts):
-                self._schedule_next_at_or_none(next_send_ts)
-
-    async def add(
-        self,
-        requester: Requester,
-        *,
-        room_id: str,
-        event_type: str,
-        state_key: Optional[str],
-        origin_server_ts: Optional[int],
-        content: JsonDict,
-        delay: int,
-    ) -> str:
-        """
-        Creates a new delayed event and schedules its delivery.
-
-        Args:
-            requester: The requester of the delayed event, who will be its owner.
-            room_id: The ID of the room where the event should be sent to.
-            event_type: The type of event to be sent.
-            state_key: The state key of the event to be sent, or None if it is not a state event.
-            origin_server_ts: The custom timestamp to send the event with.
-                If None, the timestamp will be the actual time when the event is sent.
-            content: The content of the event to be sent.
-            delay: How long (in milliseconds) to wait before automatically sending the event.
-
-        Returns: The ID of the added delayed event.
-
-        Raises:
-            SynapseError: if the delayed event fails validation checks.
-        """
-        await self._request_ratelimiter.ratelimit(requester)
-
-        self._event_creation_handler.validator.validate_builder(
-            self._event_creation_handler.event_builder_factory.for_room_version(
-                await self._store.get_room_version(room_id),
-                {
-                    "type": event_type,
-                    "content": content,
-                    "room_id": room_id,
-                    "sender": str(requester.user),
-                    **({"state_key": state_key} if state_key is not None else {}),
-                },
-            )
-        )
-
-        creation_ts = self._get_current_ts()
-
-        delay_id, next_send_ts = await self._store.add_delayed_event(
-            user_localpart=requester.user.localpart,
-            device_id=requester.device_id,
-            creation_ts=creation_ts,
-            room_id=room_id,
-            event_type=event_type,
-            state_key=state_key,
-            origin_server_ts=origin_server_ts,
-            content=content,
-            delay=delay,
-        )
-
-        if self._repl_client is not None:
-            # NOTE: If this throws, the delayed event will remain in the DB and
-            # will be picked up once the main worker gets another delayed event.
-            await self._repl_client(
-                instance_name=MAIN_PROCESS_INSTANCE_NAME,
-                next_send_ts=next_send_ts,
-            )
-        elif self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-        return delay_id
-
-    def on_added(self, next_send_ts: int) -> None:
-        next_send_ts = Timestamp(next_send_ts)
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-    async def cancel(self, requester: Requester, delay_id: str) -> None:
-        """
-        Cancels the scheduled delivery of the matching delayed event.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        next_send_ts = await self._store.cancel_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at_or_none(next_send_ts)
-
-    async def restart(self, requester: Requester, delay_id: str) -> None:
-        """
-        Restarts the scheduled delivery of the matching delayed event.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        next_send_ts = await self._store.restart_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-            current_ts=self._get_current_ts(),
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at(next_send_ts)
-
-    async def send(self, requester: Requester, delay_id: str) -> None:
-        """
-        Immediately sends the matching delayed event, instead of waiting for its scheduled delivery.
-
-        Args:
-            requester: The owner of the delayed event to act on.
-            delay_id: The ID of the delayed event to act on.
-
-        Raises:
-            NotFoundError: if no matching delayed event could be found.
-        """
-        assert self._is_master
-        await self._request_ratelimiter.ratelimit(requester)
-        await self._initialized_from_db
-
-        event, next_send_ts = await self._store.process_target_delayed_event(
-            delay_id=delay_id,
-            user_localpart=requester.user.localpart,
-        )
-
-        if self._next_send_ts_changed(next_send_ts):
-            self._schedule_next_at_or_none(next_send_ts)
-
-        await self._send_event(
-            DelayedEventDetails(
-                delay_id=DelayID(delay_id),
-                user_localpart=UserLocalpart(requester.user.localpart),
-                room_id=event.room_id,
-                type=event.type,
-                state_key=event.state_key,
-                origin_server_ts=event.origin_server_ts,
-                content=event.content,
-                device_id=event.device_id,
-            )
-        )
-
-    async def _send_on_timeout(self) -> None:
-        self._next_delayed_event_call = None
-
-        events, next_send_ts = await self._store.process_timeout_delayed_events(
-            self._get_current_ts()
-        )
-
-        if next_send_ts:
-            self._schedule_next_at(next_send_ts)
-
-        await self._send_events(events)
-
-    async def _send_events(self, events: List[DelayedEventDetails]) -> None:
-        sent_state: Set[Tuple[RoomID, EventType, StateKey]] = set()
-        for event in events:
-            if event.state_key is not None:
-                state_info = (event.room_id, event.type, event.state_key)
-                if state_info in sent_state:
-                    continue
-            else:
-                state_info = None
-            try:
-                # TODO: send in background if message event or non-conflicting state event
-                await self._send_event(event)
-                if state_info is not None:
-                    sent_state.add(state_info)
-            except Exception:
-                logger.exception("Failed to send delayed event")
-
-            for room_id, event_type, state_key in sent_state:
-                await self._store.delete_processed_delayed_state_events(
-                    room_id=str(room_id),
-                    event_type=event_type,
-                    state_key=state_key,
-                )
-
-    def _schedule_next_at_or_none(self, next_send_ts: Optional[Timestamp]) -> None:
-        if next_send_ts is not None:
-            self._schedule_next_at(next_send_ts)
-        elif self._next_delayed_event_call is not None:
-            self._next_delayed_event_call.cancel()
-            self._next_delayed_event_call = None
-
-    def _schedule_next_at(self, next_send_ts: Timestamp) -> None:
-        delay = next_send_ts - self._get_current_ts()
-        delay_sec = delay / 1000 if delay > 0 else 0
-
-        if self._next_delayed_event_call is None:
-            self._next_delayed_event_call = self._clock.call_later(
-                delay_sec,
-                run_as_background_process,
-                "_send_on_timeout",
-                self._send_on_timeout,
-            )
-        else:
-            self._next_delayed_event_call.reset(delay_sec)
-
-    async def get_all_for_user(self, requester: Requester) -> List[JsonDict]:
-        """Return all pending delayed events requested by the given user."""
-        await self._request_ratelimiter.ratelimit(requester)
-        return await self._store.get_all_delayed_events_for_user(
-            requester.user.localpart
-        )
-
-    async def _send_event(
-        self,
-        event: DelayedEventDetails,
-        txn_id: Optional[str] = None,
-    ) -> None:
-        user_id = UserID(event.user_localpart, self._config.server.server_name)
-        user_id_str = user_id.to_string()
-        # Create a new requester from what data is currently available
-        requester = create_requester(
-            user_id,
-            is_guest=await self._store.is_guest(user_id_str),
-            device_id=event.device_id,
-        )
-
-        try:
-            if event.state_key is not None and event.type == EventTypes.Member:
-                membership = event.content.get("membership")
-                assert membership is not None
-                event_id, _ = await self._room_member_handler.update_membership(
-                    requester,
-                    target=UserID.from_string(event.state_key),
-                    room_id=event.room_id.to_string(),
-                    action=membership,
-                    content=event.content,
-                    origin_server_ts=event.origin_server_ts,
-                )
-            else:
-                event_dict: JsonDict = {
-                    "type": event.type,
-                    "content": event.content,
-                    "room_id": event.room_id.to_string(),
-                    "sender": user_id_str,
-                }
-
-                if event.origin_server_ts is not None:
-                    event_dict["origin_server_ts"] = event.origin_server_ts
-
-                if event.state_key is not None:
-                    event_dict["state_key"] = event.state_key
-
-                (
-                    sent_event,
-                    _,
-                ) = await self._event_creation_handler.create_and_send_nonmember_event(
-                    requester,
-                    event_dict,
-                    txn_id=txn_id,
-                )
-                event_id = sent_event.event_id
-        except ShadowBanError:
-            event_id = generate_fake_event_id()
-        finally:
-            # TODO: If this is a temporary error, retry. Otherwise, consider notifying clients of the failure
-            try:
-                await self._store.delete_processed_delayed_event(
-                    event.delay_id, event.user_localpart
-                )
-            except Exception:
-                logger.exception("Failed to delete processed delayed event")
-
-        set_tag("event_id", event_id)
-
-    def _get_current_ts(self) -> Timestamp:
-        return Timestamp(self._clock.time_msec())
-
-    def _next_send_ts_changed(self, next_send_ts: Optional[Timestamp]) -> bool:
-        # The DB alone knows if the next send time changed after adding/modifying
-        # a delayed event, but if we were to ever miss updating our delayed call's
-        # firing time, we may miss other updates. So, keep track of changes to the
-        # the next send time here instead of in the DB.
-        cached_next_send_ts = (
-            int(self._next_delayed_event_call.getTime() * 1000)
-            if self._next_delayed_event_call is not None
-            else None
-        )
-        return next_send_ts != cached_next_send_ts
@@ -48,7 +48,6 @@ from synapse.metrics.background_process_metrics import (
    wrap_as_background_process,
 )
 from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
-from synapse.storage.databases.main.roommember import EventIdMembership
 from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.types import (
    DeviceListUpdates,
@@ -223,6 +222,7 @@ class DeviceWorkerHandler:
        return changed

    @trace
+    @measure_func("device.get_user_ids_changed")
    @cancellable
    async def get_user_ids_changed(
        self, user_id: str, from_token: StreamToken
@@ -290,11 +290,9 @@ class DeviceWorkerHandler:
                memberships_to_fetch.add(delta.prev_event_id)

        # Fetch all the memberships for the membership events
-        event_id_to_memberships: Mapping[str, Optional[EventIdMembership]] = {}
-        if memberships_to_fetch:
-            event_id_to_memberships = await self.store.get_membership_from_event_ids(
-                memberships_to_fetch
-            )
+        event_id_to_memberships = await self.store.get_membership_from_event_ids(
+            memberships_to_fetch
+        )

        joined_invited_knocked = (
            Membership.JOIN,
@@ -351,6 +349,7 @@ class DeviceWorkerHandler:

        return device_list_updates

+    @measure_func("_generate_sync_entry_for_device_list")
    async def generate_sync_entry_for_device_list(
        self,
        user_id: str,
@@ -265,9 +265,9 @@ class DirectoryHandler:
    async def get_association(self, room_alias: RoomAlias) -> JsonDict:
        room_id = None
        if self.hs.is_mine(room_alias):
-            result: Optional[
-                RoomAliasMapping
-            ] = await self.get_association_from_room_alias(room_alias)
+            result: Optional[RoomAliasMapping] = (
+                await self.get_association_from_room_alias(room_alias)
+            )

            if result:
                room_id = result.room_id
@@ -512,9 +512,11 @@ class DirectoryHandler:
                raise SynapseError(403, "Not allowed to publish room")

            # Check if publishing is blocked by a third party module
-            allowed_by_third_party_rules = await (
-                self._third_party_event_rules.check_visibility_can_be_modified(
-                    room_id, visibility
+            allowed_by_third_party_rules = (
+                await (
+                    self._third_party_event_rules.check_visibility_can_be_modified(
+                        room_id, visibility
+                    )
                )
            )
            if not allowed_by_third_party_rules:
@@ -1001,11 +1001,11 @@ class FederationHandler:
                    )

                if include_auth_user_id:
-                    event_content[
-                        EventContentFields.AUTHORISING_USER
-                    ] = await self._event_auth_handler.get_user_which_could_invite(
-                        room_id,
-                        state_ids,
+                    event_content[EventContentFields.AUTHORISING_USER] = (
+                        await self._event_auth_handler.get_user_which_could_invite(
+                            room_id,
+                            state_ids,
+                        )
                    )

        builder = self.event_builder_factory.for_room_version(
@@ -21,7 +21,6 @@
 #

 """Utilities for interacting with Identity Servers"""
-
 import logging
 import urllib.parse
 from typing import TYPE_CHECKING, Awaitable, Callable, Dict, List, Optional, Tuple
@@ -536,8 +535,20 @@ class IdentityHandler:
        except RequestTimedOutError:
            raise SynapseError(500, "Timed out contacting identity server")
        except HttpResponseException as e:
-            logger.warning("Error contacting msisdn account_threepid_delegate: %s", e)
-            raise SynapseError(400, "Error contacting the identity server")
+            synapse_error = e.to_synapse_error()
+            if synapse_error.errcode == Codes.TOKEN_INCORRECT:
+                raise SynapseError(
+                    400, "Token incorrect", errcode=Codes.TOKEN_INCORRECT
+                )
+            elif synapse_error.errcode == Codes.SESSION_EXPIRED:
+                raise SynapseError(
+                    400, "Session expired", errcode=Codes.SESSION_EXPIRED
+                )
+            else:
+                logger.warning(
+                    "Error contacting msisdn account_threepid_delegate: %s", e
+                )
+                raise SynapseError(400, "Error contacting the identity server")

    async def lookup_3pid(
        self, id_server: str, medium: str, address: str, id_access_token: str
@@ -18,7 +18,7 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import TYPE_CHECKING, Optional, Tuple
+from typing import TYPE_CHECKING

 from authlib.jose import JsonWebToken, JWTClaims
 from authlib.jose.errors import BadSignatureError, InvalidClaimError, JoseError
@@ -36,12 +36,11 @@ class JwtHandler:

        self.jwt_secret = hs.config.jwt.jwt_secret
        self.jwt_subject_claim = hs.config.jwt.jwt_subject_claim
-        self.jwt_display_name_claim = hs.config.jwt.jwt_display_name_claim
        self.jwt_algorithm = hs.config.jwt.jwt_algorithm
        self.jwt_issuer = hs.config.jwt.jwt_issuer
        self.jwt_audiences = hs.config.jwt.jwt_audiences

-    def validate_login(self, login_submission: JsonDict) -> Tuple[str, Optional[str]]:
+    def validate_login(self, login_submission: JsonDict) -> str:
        """
        Authenticates the user for the /login API

@@ -50,8 +49,7 @@ class JwtHandler:
                (including 'type' and other relevant fields)

        Returns:
-            A tuple of (user_id, display_name) of the user that is logging in.
-            If the JWT does not contain a display name, the second element of the tuple will be None.
+            The user ID that is logging in.

        Raises:
            LoginError if there was an authentication problem.
@@ -111,10 +109,4 @@ class JwtHandler:
        if user is None:
            raise LoginError(403, "Invalid JWT", errcode=Codes.FORBIDDEN)

-        default_display_name = None
-        if self.jwt_display_name_claim:
-            display_name_claim = claims.get(self.jwt_display_name_claim)
-            if display_name_claim is not None:
-                default_display_name = display_name_claim
-
-        return UserID(user, self.hs.hostname).to_string(), default_display_name
+        return UserID(user, self.hs.hostname).to_string()
@@ -1225,9 +1225,10 @@ class EventCreationHandler:
            )

        if prev_event_ids is not None:
-            assert len(prev_event_ids) <= 10, (
-                "Attempting to create an event with %i prev_events"
-                % (len(prev_event_ids),)
+            assert (
+                len(prev_event_ids) <= 10
+            ), "Attempting to create an event with %i prev_events" % (
+                len(prev_event_ids),
            )
        else:
            prev_event_ids = await self.store.get_prev_events_for_room(builder.room_id)
@@ -507,17 +507,15 @@ class PaginationHandler:

        # Initially fetch the events from the database. With any luck, we can return
        # these without blocking on backfill (handled below).
-        (
-            events,
-            next_key,
-            _,
-        ) = await self.store.paginate_room_events_by_topological_ordering(
-            room_id=room_id,
-            from_key=from_token.room_key,
-            to_key=to_room_key,
-            direction=pagin_config.direction,
-            limit=pagin_config.limit,
-            event_filter=event_filter,
+        events, next_key = (
+            await self.store.paginate_room_events_by_topological_ordering(
+                room_id=room_id,
+                from_key=from_token.room_key,
+                to_key=to_room_key,
+                direction=pagin_config.direction,
+                limit=pagin_config.limit,
+                event_filter=event_filter,
+            )
        )

        if pagin_config.direction == Direction.BACKWARDS:
@@ -586,17 +584,15 @@ class PaginationHandler:
                # If we did backfill something, refetch the events from the database to
                # catch anything new that might have been added since we last fetched.
                if did_backfill:
-                    (
-                        events,
-                        next_key,
-                        _,
-                    ) = await self.store.paginate_room_events_by_topological_ordering(
-                        room_id=room_id,
-                        from_key=from_token.room_key,
-                        to_key=to_room_key,
-                        direction=pagin_config.direction,
-                        limit=pagin_config.limit,
-                        event_filter=event_filter,
+                    events, next_key = (
+                        await self.store.paginate_room_events_by_topological_ordering(
+                            room_id=room_id,
+                            from_key=from_token.room_key,
+                            to_key=to_room_key,
+                            direction=pagin_config.direction,
+                            limit=pagin_config.limit,
+                            event_filter=event_filter,
+                        )
                    )
            else:
                # Otherwise, we can backfill in the background for eventual
@@ -71,7 +71,6 @@ user state; this device follows the normal timeout logic (see above) and will
 automatically be replaced with any information from currently available devices.

 """
-
 import abc
 import contextlib
 import itertools
@@ -494,9 +493,9 @@ class WorkerPresenceHandler(BasePresenceHandler):

        # The number of ongoing syncs on this process, by (user ID, device ID).
        # Empty if _presence_enabled is false.
-        self._user_device_to_num_current_syncs: Dict[
-            Tuple[str, Optional[str]], int
-        ] = {}
+        self._user_device_to_num_current_syncs: Dict[Tuple[str, Optional[str]], int] = (
+            {}
+        )

        self.notifier = hs.get_notifier()
        self.instance_id = hs.get_instance_id()
@@ -819,9 +818,9 @@ class PresenceHandler(BasePresenceHandler):

        # Keeps track of the number of *ongoing* syncs on this process. While
        # this is non zero a user will never go offline.
-        self._user_device_to_num_current_syncs: Dict[
-            Tuple[str, Optional[str]], int
-        ] = {}
+        self._user_device_to_num_current_syncs: Dict[Tuple[str, Optional[str]], int] = (
+            {}
+        )

        # Keeps track of the number of *ongoing* syncs on other processes.
        #
@@ -351,9 +351,9 @@ class ProfileHandler:
            server_name = host

        if self._is_mine_server_name(server_name):
-            media_info: Optional[
-                Union[LocalMedia, RemoteMedia]
-            ] = await self.store.get_local_media(media_id)
+            media_info: Optional[Union[LocalMedia, RemoteMedia]] = (
+                await self.store.get_local_media(media_id)
+            )
        else:
            media_info = await self.store.get_cached_remote_media(server_name, media_id)

@@ -188,13 +188,13 @@ class RelationsHandler:
        if include_original_event:
            # Do not bundle aggregations when retrieving the original event because
            # we want the content before relations are applied to it.
-            return_value[
-                "original_event"
-            ] = await self._event_serializer.serialize_event(
-                event,
-                now,
-                bundle_aggregations=None,
-                config=serialize_options,
+            return_value["original_event"] = (
+                await self._event_serializer.serialize_event(
+                    event,
+                    now,
+                    bundle_aggregations=None,
+                    config=serialize_options,
+                )
            )

        if next_token:
@@ -20,7 +20,6 @@
 #

 """Contains functions for performing actions on rooms."""
-
 import itertools
 import logging
 import math
@@ -901,9 +900,11 @@ class RoomCreationHandler:
        )

        # Check whether this visibility value is blocked by a third party module
-        allowed_by_third_party_rules = await (
-            self._third_party_event_rules.check_visibility_can_be_modified(
-                room_id, visibility
+        allowed_by_third_party_rules = (
+            await (
+                self._third_party_event_rules.check_visibility_can_be_modified(
+                    room_id, visibility
+                )
            )
        )
        if not allowed_by_third_party_rules:
@@ -1753,7 +1754,7 @@ class RoomEventSource(EventSource[RoomStreamToken, EventBase]):
            )

            events = list(room_events)
-            events.extend(e for evs, _, _ in room_to_events.values() for e in evs)
+            events.extend(e for evs, _ in room_to_events.values() for e in evs)

            # We know stream_ordering must be not None here, as its been
            # persisted, but mypy doesn't know that
@@ -1302,11 +1302,11 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        # If this is going to be a local join, additional information must
        # be included in the event content in order to efficiently validate
        # the event.
-        content[
-            EventContentFields.AUTHORISING_USER
-        ] = await self.event_auth_handler.get_user_which_could_invite(
-            room_id,
-            state_before_join,
+        content[EventContentFields.AUTHORISING_USER] = (
+            await self.event_auth_handler.get_user_which_could_invite(
+                room_id,
+                state_before_join,
+            )
        )

        return False, []
@@ -1415,9 +1415,9 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):

        if requester is not None:
            sender = UserID.from_string(event.sender)
-            assert sender == requester.user, (
-                "Sender (%s) must be same as requester (%s)" % (sender, requester.user)
-            )
+            assert (
+                sender == requester.user
+            ), "Sender (%s) must be same as requester (%s)" % (sender, requester.user)
            assert self.hs.is_mine(sender), "Sender must be our own: %s" % (sender,)
        else:
            requester = types.create_requester(target_user)
@@ -423,9 +423,9 @@ class SearchHandler:
            }

        if search_result.room_groups and "room_id" in group_keys:
-            rooms_cat_res.setdefault("groups", {})["room_id"] = (
-                search_result.room_groups
-            )
+            rooms_cat_res.setdefault("groups", {})[
+                "room_id"
+            ] = search_result.room_groups

        if sender_group and "sender" in group_keys:
            rooms_cat_res.setdefault("groups", {})["sender"] = sender_group
@@ -14,7 +14,7 @@

 import logging
 from itertools import chain
-from typing import TYPE_CHECKING, AbstractSet, Dict, List, Mapping, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Dict, List, Mapping, Optional, Set, Tuple

 from prometheus_client import Histogram
 from typing_extensions import assert_never
@@ -25,10 +25,17 @@ from synapse.events.utils import strip_event
 from synapse.handlers.relations import BundledAggregations
 from synapse.handlers.sliding_sync.extensions import SlidingSyncExtensionHandler
 from synapse.handlers.sliding_sync.room_lists import (
-    RoomsForUserType,
    SlidingSyncRoomLists,
+    _RoomMembershipForUser,
 )
 from synapse.handlers.sliding_sync.store import SlidingSyncConnectionStore
+from synapse.handlers.sliding_sync.types import (
+    HaveSentRoomFlag,
+    MutablePerConnectionState,
+    PerConnectionState,
+    RoomSyncConfig,
+    StateValues,
+)
 from synapse.logging.opentracing import (
    SynapseTags,
    log_kv,
@@ -39,30 +46,18 @@ from synapse.logging.opentracing import (
 )
 from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
 from synapse.storage.databases.main.stream import PaginateFunction
-from synapse.storage.roommember import (
-    MemberSummary,
-)
+from synapse.storage.roommember import MemberSummary
 from synapse.types import (
    JsonDict,
-    MutableStateMap,
    PersistedEventPosition,
    Requester,
+    RoomStreamToken,
    SlidingSyncStreamToken,
    StateMap,
-    StrCollection,
    StreamKeyType,
    StreamToken,
 )
-from synapse.types.handlers import SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES
-from synapse.types.handlers.sliding_sync import (
-    HaveSentRoomFlag,
-    MutablePerConnectionState,
-    PerConnectionState,
-    RoomSyncConfig,
-    SlidingSyncConfig,
-    SlidingSyncResult,
-    StateValues,
-)
+from synapse.types.handlers import SlidingSyncConfig, SlidingSyncResult
 from synapse.types.state import StateFilter
 from synapse.util.async_helpers import concurrently_execute
 from synapse.visibility import filter_events_for_client
@@ -80,6 +75,18 @@ sync_processing_time = Histogram(
 )


+# The event types that clients should consider as new activity.
+DEFAULT_BUMP_EVENT_TYPES = {
+    EventTypes.Create,
+    EventTypes.Message,
+    EventTypes.Encrypted,
+    EventTypes.Sticker,
+    EventTypes.CallInvite,
+    EventTypes.PollStart,
+    EventTypes.LiveLocationShareStart,
+}
+
+
 class SlidingSyncHandler:
    def __init__(self, hs: "HomeServer"):
        self.clock = hs.get_clock()
@@ -92,7 +99,7 @@ class SlidingSyncHandler:
        self.rooms_to_exclude_globally = hs.config.server.rooms_to_exclude_from_sync
        self.is_mine_id = hs.is_mine_id

-        self.connection_store = SlidingSyncConnectionStore(self.store)
+        self.connection_store = SlidingSyncConnectionStore()
        self.extensions = SlidingSyncExtensionHandler(hs)
        self.room_lists = SlidingSyncRoomLists(hs)

@@ -213,11 +220,16 @@ class SlidingSyncHandler:
        # amount of time (more with round-trips and re-processing) in the end to
        # get everything again.
        previous_connection_state = (
-            await self.connection_store.get_and_clear_connection_positions(
+            await self.connection_store.get_per_connection_state(
                sync_config, from_token
            )
        )

+        await self.connection_store.mark_token_seen(
+            sync_config=sync_config,
+            from_token=from_token,
+        )
+
        # Get all of the room IDs that the user should be able to see in the sync
        # response
        has_lists = sync_config.lists is not None and len(sync_config.lists) > 0
@@ -258,8 +270,6 @@ class SlidingSyncHandler:
                ],
                from_token=from_token,
                to_token=to_token,
-                newly_joined=room_id in interested_rooms.newly_joined_rooms,
-                is_dm=room_id in interested_rooms.dm_room_ids,
            )

            # Filter out empty room results during incremental sync
@@ -268,7 +278,7 @@ class SlidingSyncHandler:

        if relevant_rooms_to_send_map:
            with start_active_span("sliding_sync.generate_room_entries"):
-                await concurrently_execute(handle_room, relevant_rooms_to_send_map, 20)
+                await concurrently_execute(handle_room, relevant_rooms_to_send_map, 10)

        extensions = await self.extensions.get_extensions_response(
            sync_config=sync_config,
@@ -294,6 +304,7 @@ class SlidingSyncHandler:
            # to record rooms as having updates even if there might not actually
            # be anything new for the user (e.g. due to event filters, events
            # having happened after the user left, etc).
+            unsent_room_ids = []
            if from_token:
                # The set of rooms that the client (may) care about, but aren't
                # in any list range (or subscribed to).
@@ -305,24 +316,15 @@ class SlidingSyncHandler:
                # TODO: Replace this with something faster. When we land the
                # sliding sync tables that record the most recent event
                # positions we can use that.
-                unsent_room_ids: StrCollection
-                if await self.store.have_finished_sliding_sync_background_jobs():
-                    unsent_room_ids = await (
-                        self.store.get_rooms_that_have_updates_since_sliding_sync_table(
-                            room_ids=missing_rooms,
-                            from_key=from_token.stream_token.room_key,
-                        )
+                missing_event_map_by_room = (
+                    await self.store.get_room_events_stream_for_rooms(
+                        room_ids=missing_rooms,
+                        from_key=to_token.room_key,
+                        to_key=from_token.stream_token.room_key,
+                        limit=1,
                    )
-                else:
-                    missing_event_map_by_room = (
-                        await self.store.get_room_events_stream_for_rooms(
-                            room_ids=missing_rooms,
-                            from_key=to_token.room_key,
-                            to_key=from_token.stream_token.room_key,
-                            limit=1,
-                        )
-                    )
-                    unsent_room_ids = list(missing_event_map_by_room)
+                )
+                unsent_room_ids = list(missing_event_map_by_room)

                new_connection_state.rooms.record_unsent_rooms(
                    unsent_room_ids, from_token.stream_token.room_key
@@ -365,7 +367,7 @@ class SlidingSyncHandler:
    async def get_current_state_ids_at(
        self,
        room_id: str,
-        room_membership_for_user_at_to_token: RoomsForUserType,
+        room_membership_for_user_at_to_token: _RoomMembershipForUser,
        state_filter: StateFilter,
        to_token: StreamToken,
    ) -> StateMap[str]:
@@ -430,7 +432,7 @@ class SlidingSyncHandler:
    async def get_current_state_at(
        self,
        room_id: str,
-        room_membership_for_user_at_to_token: RoomsForUserType,
+        room_membership_for_user_at_to_token: _RoomMembershipForUser,
        state_filter: StateFilter,
        to_token: StreamToken,
    ) -> StateMap[EventBase]:
@@ -452,15 +454,16 @@ class SlidingSyncHandler:
            to_token=to_token,
        )

-        events = await self.store.get_events_as_list(list(state_ids.values()))
+        event_map = await self.store.get_events(list(state_ids.values()))

        state_map = {}
-        for event in events:
-            state_map[(event.type, event.state_key)] = event
+        for key, event_id in state_ids.items():
+            event = event_map.get(event_id)
+            if event:
+                state_map[key] = event

        return state_map

-    @trace
    async def get_room_sync_data(
        self,
        sync_config: SlidingSyncConfig,
@@ -468,11 +471,9 @@ class SlidingSyncHandler:
        new_connection_state: "MutablePerConnectionState",
        room_id: str,
        room_sync_config: RoomSyncConfig,
-        room_membership_for_user_at_to_token: RoomsForUserType,
+        room_membership_for_user_at_to_token: _RoomMembershipForUser,
        from_token: Optional[SlidingSyncStreamToken],
        to_token: StreamToken,
-        newly_joined: bool,
-        is_dm: bool,
    ) -> SlidingSyncResult.RoomResult:
        """
        Fetch room data for the sync response.
@@ -488,8 +489,6 @@ class SlidingSyncHandler:
                in the room at the time of `to_token`.
            from_token: The point in the stream to sync from.
            to_token: The point in the stream to sync up to.
-            newly_joined: If the user has newly joined the room
-            is_dm: Whether the room is a DM room
        """
        user = sync_config.user

@@ -502,26 +501,6 @@ class SlidingSyncHandler:
            room_sync_config.timeline_limit,
        )

-        # Handle state resets. For example, if we see
-        # `room_membership_for_user_at_to_token.event_id=None and
-        # room_membership_for_user_at_to_token.membership is not None`, we should
-        # indicate to the client that a state reset happened. Perhaps we should indicate
-        # this by setting `initial: True` and empty `required_state: []`.
-        state_reset_out_of_room = False
-        if (
-            room_membership_for_user_at_to_token.event_id is None
-            and room_membership_for_user_at_to_token.membership is not None
-        ):
-            # We only expect the `event_id` to be `None` if you've been state reset out
-            # of the room (meaning you're no longer in the room). We could put this as
-            # part of the if-statement above but we want to handle every case where
-            # `event_id` is `None`.
-            assert room_membership_for_user_at_to_token.membership is Membership.LEAVE
-
-            state_reset_out_of_room = True
-
-        prev_room_sync_config = previous_connection_state.room_configs.get(room_id)
-
        # Determine whether we should limit the timeline to the token range.
        #
        # We should return historical messages (before token range) in the
@@ -550,10 +529,11 @@ class SlidingSyncHandler:
        # or `limited` mean for clients that interpret them correctly. In future this
        # behavior is almost certainly going to change.
        #
+        # TODO: Also handle changes to `required_state`
        from_bound = None
        initial = True
        ignore_timeline_bound = False
-        if from_token and not newly_joined and not state_reset_out_of_room:
+        if from_token and not room_membership_for_user_at_to_token.newly_joined:
            room_status = previous_connection_state.rooms.have_sent_room(room_id)
            if room_status.status == HaveSentRoomFlag.LIVE:
                from_bound = from_token.stream_token.room_key
@@ -570,6 +550,7 @@ class SlidingSyncHandler:

            log_kv({"sliding_sync.room_status": room_status})

+            prev_room_sync_config = previous_connection_state.room_configs.get(room_id)
            if prev_room_sync_config is not None:
                # Check if the timeline limit has increased, if so ignore the
                # timeline bound and record the change (see "XXX: Odd behavior"
@@ -580,6 +561,8 @@ class SlidingSyncHandler:
                ):
                    ignore_timeline_bound = True

+                # TODO: Check for changes in `required_state``
+
        log_kv(
            {
                "sliding_sync.from_bound": from_bound,
@@ -619,7 +602,9 @@ class SlidingSyncHandler:
                Membership.LEAVE,
                Membership.BAN,
            ):
-                to_bound = room_membership_for_user_at_to_token.event_pos.to_room_stream_token()
+                to_bound = (
+                    room_membership_for_user_at_to_token.event_pos.to_room_stream_token()
+                )

            timeline_from_bound = from_bound
            if ignore_timeline_bound:
@@ -654,7 +639,7 @@ class SlidingSyncHandler:
                # Use `stream_ordering` for updates
                else paginate_room_events_by_stream_ordering
            )
-            timeline_events, new_room_key, limited = await pagination_method(
+            timeline_events, new_room_key = await pagination_method(
                room_id=room_id,
                # The bounds are reversed so we can paginate backwards
                # (from newer to older events) starting at to_bound.
@@ -662,13 +647,28 @@ class SlidingSyncHandler:
                from_key=to_bound,
                to_key=timeline_from_bound,
                direction=Direction.BACKWARDS,
-                limit=room_sync_config.timeline_limit,
+                # We add one so we can determine if there are enough events to saturate
+                # the limit or not (see `limited`)
+                limit=room_sync_config.timeline_limit + 1,
            )

            # We want to return the events in ascending order (the last event is the
            # most recent).
            timeline_events.reverse()

+            # Determine our `limited` status based on the timeline. We do this before
+            # filtering the events so we can accurately determine if there is more to
+            # paginate even if we filter out some/all events.
+            if len(timeline_events) > room_sync_config.timeline_limit:
+                limited = True
+                # Get rid of that extra "+ 1" event because we only used it to determine
+                # if we hit the limit or not
+                timeline_events = timeline_events[-room_sync_config.timeline_limit :]
+                assert timeline_events[0].internal_metadata.stream_ordering
+                new_room_key = RoomStreamToken(
+                    stream=timeline_events[0].internal_metadata.stream_ordering - 1
+                )
+
            # Make sure we don't expose any events that the client shouldn't see
            timeline_events = await filter_events_for_client(
                self.storage_controllers,
@@ -755,56 +755,32 @@ class SlidingSyncHandler:

            stripped_state.append(strip_event(invite_or_knock_event))

-        # Get the changes to current state in the token range from the
-        # `current_state_delta_stream` table.
-        #
-        # For incremental syncs, we can do this first to determine if something relevant
-        # has changed and strategically avoid fetching other costly things.
-        room_state_delta_id_map: MutableStateMap[str] = {}
-        name_event_id: Optional[str] = None
-        membership_changed = False
-        name_changed = False
-        avatar_changed = False
-        if initial:
-            # Check whether the room has a name set
-            name_state_ids = await self.get_current_state_ids_at(
-                room_id=room_id,
-                room_membership_for_user_at_to_token=room_membership_for_user_at_to_token,
-                state_filter=StateFilter.from_types([(EventTypes.Name, "")]),
-                to_token=to_token,
-            )
-            name_event_id = name_state_ids.get((EventTypes.Name, ""))
+        # TODO: Handle state resets. For example, if we see
+        # `room_membership_for_user_at_to_token.event_id=None and
+        # room_membership_for_user_at_to_token.membership is not None`, we should
+        # indicate to the client that a state reset happened. Perhaps we should indicate
+        # this by setting `initial: True` and empty `required_state`.
+
+        # Check whether the room has a name set
+        name_state_ids = await self.get_current_state_ids_at(
+            room_id=room_id,
+            room_membership_for_user_at_to_token=room_membership_for_user_at_to_token,
+            state_filter=StateFilter.from_types([(EventTypes.Name, "")]),
+            to_token=to_token,
+        )
+        name_event_id = name_state_ids.get((EventTypes.Name, ""))
+
+        room_membership_summary: Mapping[str, MemberSummary]
+        empty_membership_summary = MemberSummary([], 0)
+        if room_membership_for_user_at_to_token.membership in (
+            Membership.LEAVE,
+            Membership.BAN,
+        ):
+            # TODO: Figure out how to get the membership summary for left/banned rooms
+            room_membership_summary = {}
        else:
-            assert from_bound is not None
-
-            # TODO: Limit the number of state events we're about to send down
-            # the room, if its too many we should change this to an
-            # `initial=True`?
-            deltas = await self.store.get_current_state_deltas_for_room(
-                room_id=room_id,
-                from_token=from_bound,
-                to_token=to_token.room_key,
-            )
-            for delta in deltas:
-                # TODO: Handle state resets where event_id is None
-                if delta.event_id is not None:
-                    room_state_delta_id_map[(delta.event_type, delta.state_key)] = (
-                        delta.event_id
-                    )
-
-                if delta.event_type == EventTypes.Member:
-                    membership_changed = True
-                elif delta.event_type == EventTypes.Name and delta.state_key == "":
-                    name_changed = True
-                elif (
-                    delta.event_type == EventTypes.RoomAvatar and delta.state_key == ""
-                ):
-                    avatar_changed = True
-
-        # We only need the room summary for calculating heroes, however if we do
-        # fetch it then we can use it to calculate `joined_count` and
-        # `invited_count`.
-        room_membership_summary: Optional[Mapping[str, MemberSummary]] = None
+            room_membership_summary = await self.store.get_room_summary(room_id)
+            # TODO: Reverse/rewind back to the `to_token`

        # `heroes` are required if the room name is not set.
        #
@@ -818,50 +794,11 @@ class SlidingSyncHandler:
        # TODO: Should we also check for `EventTypes.CanonicalAlias`
        # (`m.room.canonical_alias`) as a fallback for the room name? see
        # https://github.com/matrix-org/matrix-spec-proposals/pull/3575#discussion_r1671260153
-        #
-        # We need to fetch the `heroes` if the room name is not set. But we only need to
-        # get them on initial syncs (or the first time we send down the room) or if the
-        # membership has changed which may change the heroes.
-        if name_event_id is None and (initial or (not initial and membership_changed)):
-            # We need the room summary to extract the heroes from
-            if room_membership_for_user_at_to_token.membership != Membership.JOIN:
-                # TODO: Figure out how to get the membership summary for left/banned rooms
-                # For invite/knock rooms we don't include the information.
-                room_membership_summary = {}
-            else:
-                room_membership_summary = await self.store.get_room_summary(room_id)
-                # TODO: Reverse/rewind back to the `to_token`
-
+        if name_event_id is None:
            hero_user_ids = extract_heroes_from_room_summary(
                room_membership_summary, me=user.to_string()
            )

-        # Fetch the membership counts for rooms we're joined to.
-        #
-        # Similarly to other metadata, we only need to calculate the member
-        # counts if this is an initial sync or the memberships have changed.
-        joined_count: Optional[int] = None
-        invited_count: Optional[int] = None
-        if (
-            initial or membership_changed
-        ) and room_membership_for_user_at_to_token.membership == Membership.JOIN:
-            # If we have the room summary (because we calculated heroes above)
-            # then we can simply pull the counts from there.
-            if room_membership_summary is not None:
-                empty_membership_summary = MemberSummary([], 0)
-
-                joined_count = room_membership_summary.get(
-                    Membership.JOIN, empty_membership_summary
-                ).count
-
-                invited_count = room_membership_summary.get(
-                    Membership.INVITE, empty_membership_summary
-                ).count
-            else:
-                member_counts = await self.store.get_member_counts(room_id)
-                joined_count = member_counts.get(Membership.JOIN, 0)
-                invited_count = member_counts.get(Membership.INVITE, 0)
-
        # Fetch the `required_state` for the room
        #
        # No `required_state` for invite/knock rooms (just `stripped_state`)
@@ -919,13 +856,13 @@ class SlidingSyncHandler:
                required_state_filter = StateFilter.all()
            else:
                required_state_types: List[Tuple[str, Optional[str]]] = []
-                num_wild_state_keys = 0
-                lazy_load_room_members = False
-                num_others = 0
                for (
                    state_type,
                    state_key_set,
                ) in room_sync_config.required_state_map.items():
+                    num_wild_state_keys = 0
+                    lazy_load_room_members = False
+                    num_others = 0
                    for state_key in state_key_set:
                        if state_key == StateValues.WILDCARD:
                            num_wild_state_keys += 1
@@ -957,33 +894,27 @@ class SlidingSyncHandler:
                            num_others += 1
                            required_state_types.append((state_type, state_key))

-                set_tag(
-                    SynapseTags.FUNC_ARG_PREFIX
-                    + "required_state_wildcard_state_key_count",
-                    num_wild_state_keys,
-                )
-                set_tag(
-                    SynapseTags.FUNC_ARG_PREFIX + "required_state_lazy",
-                    lazy_load_room_members,
-                )
-                set_tag(
-                    SynapseTags.FUNC_ARG_PREFIX + "required_state_other_count",
-                    num_others,
-                )
+                    set_tag(
+                        SynapseTags.FUNC_ARG_PREFIX
+                        + "required_state_wildcard_state_key_count",
+                        num_wild_state_keys,
+                    )
+                    set_tag(
+                        SynapseTags.FUNC_ARG_PREFIX + "required_state_lazy",
+                        lazy_load_room_members,
+                    )
+                    set_tag(
+                        SynapseTags.FUNC_ARG_PREFIX + "required_state_other_count",
+                        num_others,
+                    )

                required_state_filter = StateFilter.from_types(required_state_types)

        # We need this base set of info for the response so let's just fetch it along
        # with the `required_state` for the room
-        hero_room_state = [
+        meta_room_state = [(EventTypes.Name, ""), (EventTypes.RoomAvatar, "")] + [
            (EventTypes.Member, hero_user_id) for hero_user_id in hero_user_ids
        ]
-        meta_room_state = list(hero_room_state)
-        if initial or name_changed:
-            meta_room_state.append((EventTypes.Name, ""))
-        if initial or avatar_changed:
-            meta_room_state.append((EventTypes.RoomAvatar, ""))
-
        state_filter = StateFilter.all()
        if required_state_filter != StateFilter.all():
            state_filter = StateFilter(
@@ -993,10 +924,6 @@ class SlidingSyncHandler:
                include_others=required_state_filter.include_others,
            )

-        # The required state map to store in the room sync config, if it has
-        # changed.
-        changed_required_state_map: Optional[Mapping[str, AbstractSet[str]]] = None
-
        # We can return all of the state that was requested if this was the first
        # time we've sent the room down this connection.
        room_state: StateMap[EventBase] = {}
@@ -1010,45 +937,21 @@ class SlidingSyncHandler:
        else:
            assert from_bound is not None

-            if prev_room_sync_config is not None:
-                # Check if there are any changes to the required state config
-                # that we need to handle.
-                changed_required_state_map, added_state_filter = (
-                    _required_state_changes(
-                        user.to_string(),
-                        previous_room_config=prev_room_sync_config,
-                        room_sync_config=room_sync_config,
-                        state_deltas=room_state_delta_id_map,
-                    )
-                )
-
-                if added_state_filter:
-                    # Some state entries got added, so we pull out the current
-                    # state for them. If we don't do this we'd only send down new deltas.
-                    state_ids = await self.get_current_state_ids_at(
-                        room_id=room_id,
-                        room_membership_for_user_at_to_token=room_membership_for_user_at_to_token,
-                        state_filter=added_state_filter,
-                        to_token=to_token,
-                    )
-                    room_state_delta_id_map.update(state_ids)
-
+            # TODO: Limit the number of state events we're about to send down
+            # the room, if its too many we should change this to an
+            # `initial=True`?
+            deltas = await self.store.get_current_state_deltas_for_room(
+                room_id=room_id,
+                from_token=from_bound,
+                to_token=to_token.room_key,
+            )
+            # TODO: Filter room state before fetching events
+            # TODO: Handle state resets where event_id is None
            events = await self.store.get_events(
-                state_filter.filter_state(room_state_delta_id_map).values()
+                [d.event_id for d in deltas if d.event_id]
            )
            room_state = {(s.type, s.state_key): s for s in events.values()}

-            # If the membership changed and we have to get heroes, get the remaining
-            # heroes from the state
-            if hero_user_ids:
-                hero_membership_state = await self.get_current_state_at(
-                    room_id=room_id,
-                    room_membership_for_user_at_to_token=room_membership_for_user_at_to_token,
-                    state_filter=StateFilter.from_types(hero_room_state),
-                    to_token=to_token,
-                )
-                room_state.update(hero_membership_state)
-
        required_room_state: StateMap[EventBase] = {}
        if required_state_filter != StateFilter.none():
            required_room_state = required_state_filter.filter_state(room_state)
@@ -1080,64 +983,30 @@ class SlidingSyncHandler:
                    )
                )

-        # Figure out the last bump event in the room. If the bump stamp hasn't
-        # changed we omit it from the response.
-        bump_stamp = None
-
-        always_return_bump_stamp = (
-            # We use the membership event position for any non-join
-            room_membership_for_user_at_to_token.membership != Membership.JOIN
-            # We didn't fetch any timeline events but we should still check for
-            # a bump_stamp that might be somewhere
-            or limited is None
-            # There might be a bump event somewhere before the timeline events
-            # that we fetched, that we didn't previously send down
-            or limited is True
-            # Always give the client some frame of reference if this is the
-            # first time they are seeing the room down the connection
-            or initial
+        # Figure out the last bump event in the room
+        last_bump_event_result = (
+            await self.store.get_last_event_pos_in_room_before_stream_ordering(
+                room_id, to_token.room_key, event_types=DEFAULT_BUMP_EVENT_TYPES
+            )
        )

-        # If we're joined to the room, we need to find the last bump event before the
-        # `to_token`
-        if room_membership_for_user_at_to_token.membership == Membership.JOIN:
-            # Try and get a bump stamp
-            new_bump_stamp = await self._get_bump_stamp(
-                room_id,
-                to_token,
-                timeline_events,
-                check_outside_timeline=always_return_bump_stamp,
-            )
-            if new_bump_stamp is not None:
-                bump_stamp = new_bump_stamp
+        # By default, just choose the membership event position
+        bump_stamp = room_membership_for_user_at_to_token.event_pos.stream
+        # But if we found a bump event, use that instead
+        if last_bump_event_result is not None:
+            _, new_bump_event_pos = last_bump_event_result

-        if bump_stamp is None and always_return_bump_stamp:
-            # By default, just choose the membership event position for any non-join membership
-            bump_stamp = room_membership_for_user_at_to_token.event_pos.stream
-
-        if bump_stamp is not None and bump_stamp < 0:
-            # We never want to send down negative stream orderings, as you can't
-            # sensibly compare positive and negative stream orderings (they have
-            # different meanings).
-            #
-            # A negative bump stamp here can only happen if the stream ordering
-            # of the membership event is negative (and there are no further bump
-            # stamps), which can happen if the server leaves and deletes a room,
-            # and then rejoins it.
-            #
-            # To deal with this, we just set the bump stamp to zero, which will
-            # shove this room to the bottom of the list. This is OK as the
-            # moment a new message happens in the room it will get put into a
-            # sensible order again.
-            bump_stamp = 0
-
-        room_sync_required_state_map_to_persist = room_sync_config.required_state_map
-        if changed_required_state_map:
-            room_sync_required_state_map_to_persist = changed_required_state_map
+            # If we've just joined a remote room, then the last bump event may
+            # have been backfilled (and so have a negative stream ordering).
+            # These negative stream orderings can't sensibly be compared, so
+            # instead we use the membership event position.
+            if new_bump_event_pos.stream > 0:
+                bump_stamp = new_bump_event_pos.stream

+        unstable_expanded_timeline = False
+        prev_room_sync_config = previous_connection_state.room_configs.get(room_id)
        # Record the `room_sync_config` if we're `ignore_timeline_bound` (which means
        # that the `timeline_limit` has increased)
-        unstable_expanded_timeline = False
        if ignore_timeline_bound:
            # FIXME: We signal the fact that we're sending down more events to
            # the client by setting `unstable_expanded_timeline` to true (see
@@ -1146,7 +1015,7 @@ class SlidingSyncHandler:

            new_connection_state.room_configs[room_id] = RoomSyncConfig(
                timeline_limit=room_sync_config.timeline_limit,
-                required_state_map=room_sync_required_state_map_to_persist,
+                required_state_map=room_sync_config.required_state_map,
            )
        elif prev_room_sync_config is not None:
            # If the result is `limited` then we need to record that the
@@ -1175,14 +1044,10 @@ class SlidingSyncHandler:
            ):
                new_connection_state.room_configs[room_id] = RoomSyncConfig(
                    timeline_limit=room_sync_config.timeline_limit,
-                    required_state_map=room_sync_required_state_map_to_persist,
+                    required_state_map=room_sync_config.required_state_map,
                )

-            elif changed_required_state_map is not None:
-                new_connection_state.room_configs[room_id] = RoomSyncConfig(
-                    timeline_limit=room_sync_config.timeline_limit,
-                    required_state_map=room_sync_required_state_map_to_persist,
-                )
+            # TODO: Record changes in required_state.

        else:
            new_connection_state.room_configs[room_id] = room_sync_config
@@ -1193,7 +1058,7 @@ class SlidingSyncHandler:
            name=room_name,
            avatar=room_avatar,
            heroes=heroes,
-            is_dm=is_dm,
+            is_dm=room_membership_for_user_at_to_token.is_dm,
            initial=initial,
            required_state=list(required_room_state.values()),
            timeline_events=timeline_events,
@@ -1204,296 +1069,15 @@ class SlidingSyncHandler:
            unstable_expanded_timeline=unstable_expanded_timeline,
            num_live=num_live,
            bump_stamp=bump_stamp,
-            joined_count=joined_count,
-            invited_count=invited_count,
+            joined_count=room_membership_summary.get(
+                Membership.JOIN, empty_membership_summary
+            ).count,
+            invited_count=room_membership_summary.get(
+                Membership.INVITE, empty_membership_summary
+            ).count,
            # TODO: These are just dummy values. We could potentially just remove these
            # since notifications can only really be done correctly on the client anyway
            # (encrypted rooms).
            notification_count=0,
            highlight_count=0,
        )
-
-    @trace
-    async def _get_bump_stamp(
-        self,
-        room_id: str,
-        to_token: StreamToken,
-        timeline: List[EventBase],
-        check_outside_timeline: bool,
-    ) -> Optional[int]:
-        """Get a bump stamp for the room, if we have a bump event and it has
-        changed.
-
-        Args:
-            room_id
-            to_token: The upper bound of token to return
-            timeline: The list of events we have fetched.
-            limited: If the timeline was limited.
-            check_outside_timeline: Whether we need to check for bump stamp for
-                events before the timeline if we didn't find a bump stamp in
-                the timeline events.
-        """
-
-        # First check the timeline events we're returning to see if one of
-        # those matches. We iterate backwards and take the stream ordering
-        # of the first event that matches the bump event types.
-        for timeline_event in reversed(timeline):
-            if timeline_event.type in SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES:
-                new_bump_stamp = timeline_event.internal_metadata.stream_ordering
-
-                # All persisted events have a stream ordering
-                assert new_bump_stamp is not None
-
-                # If we've just joined a remote room, then the last bump event may
-                # have been backfilled (and so have a negative stream ordering).
-                # These negative stream orderings can't sensibly be compared, so
-                # instead we use the membership event position.
-                if new_bump_stamp > 0:
-                    return new_bump_stamp
-
-        if not check_outside_timeline:
-            # If we are not a limited sync, then we know the bump stamp can't
-            # have changed.
-            return None
-
-        # We can quickly query for the latest bump event in the room using the
-        # sliding sync tables.
-        latest_room_bump_stamp = await self.store.get_latest_bump_stamp_for_room(
-            room_id
-        )
-
-        min_to_token_position = to_token.room_key.stream
-
-        # If we can rely on the new sliding sync tables and the `bump_stamp` is
-        # `None`, just fallback to the membership event position. This can happen
-        # when we've just joined a remote room and all the events are backfilled.
-        if (
-            # FIXME: The background job check can be removed once we bump
-            # `SCHEMA_COMPAT_VERSION` and run the foreground update for
-            # `sliding_sync_joined_rooms`/`sliding_sync_membership_snapshots`
-            # (tracked by https://github.com/element-hq/synapse/issues/17623)
-            latest_room_bump_stamp is None
-            and await self.store.have_finished_sliding_sync_background_jobs()
-        ):
-            return None
-
-        # The `bump_stamp` stored in the database might be ahead of our token. Since
-        # `bump_stamp` is only a `stream_ordering` position, we can't be 100% sure
-        # that's before the `to_token` in all scenarios. The only scenario we can be
-        # sure of is if the `bump_stamp` is totally before the minimum position from
-        # the token.
-        #
-        # We don't need to check if the background update has finished, as if the
-        # returned bump stamp is not None then it must be up to date.
-        elif (
-            latest_room_bump_stamp is not None
-            and latest_room_bump_stamp < min_to_token_position
-        ):
-            if latest_room_bump_stamp > 0:
-                return latest_room_bump_stamp
-            else:
-                return None
-
-        # Otherwise, if it's within or after the `to_token`, we need to find the
-        # last bump event before the `to_token`.
-        else:
-            last_bump_event_result = (
-                await self.store.get_last_event_pos_in_room_before_stream_ordering(
-                    room_id,
-                    to_token.room_key,
-                    event_types=SLIDING_SYNC_DEFAULT_BUMP_EVENT_TYPES,
-                )
-            )
-            if last_bump_event_result is not None:
-                _, new_bump_event_pos = last_bump_event_result
-
-                # If we've just joined a remote room, then the last bump event may
-                # have been backfilled (and so have a negative stream ordering).
-                # These negative stream orderings can't sensibly be compared, so
-                # instead we use the membership event position.
-                if new_bump_event_pos.stream > 0:
-                    return new_bump_event_pos.stream
-
-            return None
-
-
-def _required_state_changes(
-    user_id: str,
-    *,
-    previous_room_config: "RoomSyncConfig",
-    room_sync_config: RoomSyncConfig,
-    state_deltas: StateMap[str],
-) -> Tuple[Optional[Mapping[str, AbstractSet[str]]], StateFilter]:
-    """Calculates the changes between the required state room config from the
-    previous requests compared with the current request.
-
-    This does two things. First, it calculates if we need to update the room
-    config due to changes to required state. Secondly, it works out which state
-    entries we need to pull from current state and return due to the state entry
-    now appearing in the required state when it previously wasn't (on top of the
-    state deltas).
-
-    This function tries to ensure to handle the case where a state entry is
-    added, removed and then added again to the required state. In that case we
-    only want to re-send that entry down sync if it has changed.
-
-    Returns:
-        A 2-tuple of updated required state config (or None if there is no update)
-        and the state filter to use to fetch extra current state that we need to
-        return.
-    """
-
-    prev_required_state_map = previous_room_config.required_state_map
-    request_required_state_map = room_sync_config.required_state_map
-
-    if prev_required_state_map == request_required_state_map:
-        # There has been no change. Return immediately.
-        return None, StateFilter.none()
-
-    prev_wildcard = prev_required_state_map.get(StateValues.WILDCARD, set())
-    request_wildcard = request_required_state_map.get(StateValues.WILDCARD, set())
-
-    # If we were previously fetching everything ("*", "*"), always update the effective
-    # room required state config to match the request. And since we we're previously
-    # already fetching everything, we don't have to fetch anything now that they've
-    # narrowed.
-    if StateValues.WILDCARD in prev_wildcard:
-        return request_required_state_map, StateFilter.none()
-
-    # If a event type wildcard has been added or removed we don't try and do
-    # anything fancy, and instead always update the effective room required
-    # state config to match the request.
-    if request_wildcard - prev_wildcard:
-        # Some keys were added, so we need to fetch everything
-        return request_required_state_map, StateFilter.all()
-    if prev_wildcard - request_wildcard:
-        # Keys were only removed, so we don't have to fetch everything.
-        return request_required_state_map, StateFilter.none()
-
-    # Contains updates to the required state map compared with the previous room
-    # config. This has the same format as `RoomSyncConfig.required_state`
-    changes: Dict[str, AbstractSet[str]] = {}
-
-    # The set of types/state keys that we need to fetch and return to the
-    # client. Passed to `StateFilter.from_types(...)`
-    added: List[Tuple[str, Optional[str]]] = []
-
-    # First we calculate what, if anything, has been *added*.
-    for event_type in (
-        prev_required_state_map.keys() | request_required_state_map.keys()
-    ):
-        old_state_keys = prev_required_state_map.get(event_type, set())
-        request_state_keys = request_required_state_map.get(event_type, set())
-
-        if old_state_keys == request_state_keys:
-            # No change to this type
-            continue
-
-        if not request_state_keys - old_state_keys:
-            # Nothing *added*, so we skip. Removals happen below.
-            continue
-
-        # Always update changes to include the newly added keys
-        changes[event_type] = request_state_keys
-
-        if StateValues.WILDCARD in old_state_keys:
-            # We were previously fetching everything for this type, so we don't need to
-            # fetch anything new.
-            continue
-
-        # Record the new state keys to fetch for this type.
-        if StateValues.WILDCARD in request_state_keys:
-            # If we have added a wildcard then we always just fetch everything.
-            added.append((event_type, None))
-        else:
-            for state_key in request_state_keys - old_state_keys:
-                if state_key == StateValues.ME:
-                    added.append((event_type, user_id))
-                elif state_key == StateValues.LAZY:
-                    # We handle lazy loading separately (outside this function),
-                    # so don't need to explicitly add anything here.
-                    #
-                    # LAZY values should also be ignore for event types that are
-                    # not membership.
-                    pass
-                else:
-                    added.append((event_type, state_key))
-
-    added_state_filter = StateFilter.from_types(added)
-
-    # Convert the list of state deltas to map from type to state_keys that have
-    # changed.
-    changed_types_to_state_keys: Dict[str, Set[str]] = {}
-    for event_type, state_key in state_deltas:
-        changed_types_to_state_keys.setdefault(event_type, set()).add(state_key)
-
-    # Figure out what changes we need to apply to the effective required state
-    # config.
-    for event_type, changed_state_keys in changed_types_to_state_keys.items():
-        old_state_keys = prev_required_state_map.get(event_type, set())
-        request_state_keys = request_required_state_map.get(event_type, set())
-
-        if old_state_keys == request_state_keys:
-            # No change.
-            continue
-
-        if request_state_keys - old_state_keys:
-            # We've expanded the set of state keys, so we just clobber the
-            # current set with the new set.
-            #
-            # We could also ensure that we keep entries where the state hasn't
-            # changed, but are no longer in the requested required state, but
-            # that's a sufficient edge case that we can ignore (as its only a
-            # performance optimization).
-            changes[event_type] = request_state_keys
-            continue
-
-        old_state_key_wildcard = StateValues.WILDCARD in old_state_keys
-        request_state_key_wildcard = StateValues.WILDCARD in request_state_keys
-
-        if old_state_key_wildcard != request_state_key_wildcard:
-            # If a state_key wildcard has been added or removed, we always update the
-            # effective room required state config to match the request.
-            changes[event_type] = request_state_keys
-            continue
-
-        if event_type == EventTypes.Member:
-            old_state_key_lazy = StateValues.LAZY in old_state_keys
-            request_state_key_lazy = StateValues.LAZY in request_state_keys
-
-            if old_state_key_lazy != request_state_key_lazy:
-                # If a "$LAZY" has been added or removed we always update the effective room
-                # required state config to match the request.
-                changes[event_type] = request_state_keys
-                continue
-
-        # Handle "$ME" values by adding "$ME" if the state key matches the user
-        # ID.
-        if user_id in changed_state_keys:
-            changed_state_keys.add(StateValues.ME)
-
-        # At this point there are no wildcards and no additions to the set of
-        # state keys requested, only deletions.
-        #
-        # We only remove state keys from the effective state if they've been
-        # removed from the request *and* the state has changed. This ensures
-        # that if a client removes and then re-adds a state key, we only send
-        # down the associated current state event if its changed (rather than
-        # sending down the same event twice).
-        invalidated = (old_state_keys - request_state_keys) & changed_state_keys
-        if invalidated:
-            changes[event_type] = old_state_keys - invalidated
-
-    if changes:
-        # Update the required state config based on the changes.
-        new_required_state_map = dict(prev_required_state_map)
-        for event_type, state_keys in changes.items():
-            if state_keys:
-                new_required_state_map[event_type] = state_keys
-            else:
-                # Remove entries with empty state keys.
-                new_required_state_map.pop(event_type, None)
-
-        return new_required_state_map, added_state_filter
-    else:
-        return None, added_state_filter
@@ -14,23 +14,17 @@

 import itertools
 import logging
-from typing import (
-    TYPE_CHECKING,
-    AbstractSet,
-    ChainMap,
-    Dict,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Set,
-    cast,
-)
+from typing import TYPE_CHECKING, AbstractSet, Dict, Mapping, Optional, Sequence, Set

 from typing_extensions import assert_never

 from synapse.api.constants import AccountDataTypes, EduTypes
 from synapse.handlers.receipts import ReceiptEventSource
+from synapse.handlers.sliding_sync.types import (
+    HaveSentRoomFlag,
+    MutablePerConnectionState,
+    PerConnectionState,
+)
 from synapse.logging.opentracing import trace
 from synapse.storage.databases.main.receipts import ReceiptInRoom
 from synapse.types import (
@@ -41,15 +35,7 @@ from synapse.types import (
    StrCollection,
    StreamToken,
 )
-from synapse.types.handlers.sliding_sync import (
-    HaveSentRoomFlag,
-    MutablePerConnectionState,
-    OperationType,
-    PerConnectionState,
-    SlidingSyncConfig,
-    SlidingSyncResult,
-)
-from synapse.util.async_helpers import concurrently_execute
+from synapse.types.handlers import OperationType, SlidingSyncConfig, SlidingSyncResult

 if TYPE_CHECKING:
    from synapse.server import HomeServer
@@ -118,8 +104,6 @@ class SlidingSyncExtensionHandler:
        if sync_config.extensions.account_data is not None:
            account_data_response = await self.get_account_data_extension_response(
                sync_config=sync_config,
-                previous_connection_state=previous_connection_state,
-                new_connection_state=new_connection_state,
                actual_lists=actual_lists,
                actual_room_ids=actual_room_ids,
                account_data_request=sync_config.extensions.account_data,
@@ -362,8 +346,6 @@ class SlidingSyncExtensionHandler:
    async def get_account_data_extension_response(
        self,
        sync_config: SlidingSyncConfig,
-        previous_connection_state: "PerConnectionState",
-        new_connection_state: "MutablePerConnectionState",
        actual_lists: Mapping[str, SlidingSyncResult.SlidingWindowList],
        actual_room_ids: Set[str],
        account_data_request: SlidingSyncConfig.Extensions.AccountDataExtension,
@@ -396,39 +378,29 @@ class SlidingSyncExtensionHandler:
                )
            )

-            # TODO: This should take into account the `from_token` and `to_token`
            have_push_rules_changed = await self.store.have_push_rules_changed_for_user(
                user_id, from_token.stream_token.push_rules_key
            )
            if have_push_rules_changed:
+                global_account_data_map = dict(global_account_data_map)
                # TODO: This should take into account the `from_token` and `to_token`
-                global_account_data_map[
-                    AccountDataTypes.PUSH_RULES
-                ] = await self.push_rules_handler.push_rules_for_user(sync_config.user)
+                global_account_data_map[AccountDataTypes.PUSH_RULES] = (
+                    await self.push_rules_handler.push_rules_for_user(sync_config.user)
+                )
        else:
            # TODO: This should take into account the `to_token`
-            immutable_global_account_data_map = (
-                await self.store.get_global_account_data_for_user(user_id)
+            all_global_account_data = await self.store.get_global_account_data_for_user(
+                user_id
            )

-            # Use a `ChainMap` to avoid copying the immutable data from the cache
-            global_account_data_map = ChainMap(
-                {
-                    # TODO: This should take into account the `to_token`
-                    AccountDataTypes.PUSH_RULES: await self.push_rules_handler.push_rules_for_user(
-                        sync_config.user
-                    )
-                },
-                # Cast is safe because `ChainMap` only mutates the top-most map,
-                # see https://github.com/python/typeshed/issues/8430
-                cast(
-                    MutableMapping[str, JsonMapping], immutable_global_account_data_map
-                ),
+            global_account_data_map = dict(all_global_account_data)
+            # TODO: This should take into account the  `to_token`
+            global_account_data_map[AccountDataTypes.PUSH_RULES] = (
+                await self.push_rules_handler.push_rules_for_user(sync_config.user)
            )

        # Fetch room account data
-        #
-        account_data_by_room_map: MutableMapping[str, Mapping[str, JsonMapping]] = {}
+        account_data_by_room_map: Mapping[str, Mapping[str, JsonMapping]] = {}
        relevant_room_ids = self.find_relevant_room_ids_for_extension(
            requested_lists=account_data_request.lists,
            requested_room_ids=account_data_request.rooms,
@@ -436,154 +408,25 @@ class SlidingSyncExtensionHandler:
            actual_room_ids=actual_room_ids,
        )
        if len(relevant_room_ids) > 0:
-            # We need to handle the different cases depending on if we have sent
-            # down account data previously or not, so we split the relevant
-            # rooms up into different collections based on status.
-            live_rooms = set()
-            previously_rooms: Dict[str, int] = {}
-            initial_rooms = set()
-
-            for room_id in relevant_room_ids:
-                if not from_token:
-                    initial_rooms.add(room_id)
-                    continue
-
-                room_status = previous_connection_state.account_data.have_sent_room(
-                    room_id
-                )
-                if room_status.status == HaveSentRoomFlag.LIVE:
-                    live_rooms.add(room_id)
-                elif room_status.status == HaveSentRoomFlag.PREVIOUSLY:
-                    assert room_status.last_token is not None
-                    previously_rooms[room_id] = room_status.last_token
-                elif room_status.status == HaveSentRoomFlag.NEVER:
-                    initial_rooms.add(room_id)
-                else:
-                    assert_never(room_status.status)
-
-            # We fetch all room account data since the from_token. This is so
-            # that we can record which rooms have updates that haven't been sent
-            # down.
-            #
-            # Mapping from room_id to mapping of `type` to `content` of room account
-            # data events.
-            all_updates_since_the_from_token: Mapping[
-                str, Mapping[str, JsonMapping]
-            ] = {}
            if from_token is not None:
                # TODO: This should take into account the `from_token` and `to_token`
-                all_updates_since_the_from_token = (
+                account_data_by_room_map = (
                    await self.store.get_updated_room_account_data_for_user(
                        user_id, from_token.stream_token.account_data_key
                    )
                )
-
-                # Add room tags
-                #
-                # TODO: This should take into account the `from_token` and `to_token`
-                tags_by_room = await self.store.get_updated_tags(
-                    user_id, from_token.stream_token.account_data_key
-                )
-                for room_id, tags in tags_by_room.items():
-                    all_updates_since_the_from_token.setdefault(room_id, {})[
-                        AccountDataTypes.TAG
-                    ] = {"tags": tags}
-
-            # For live rooms we just get the updates from `all_updates_since_the_from_token`
-            if live_rooms:
-                for room_id in all_updates_since_the_from_token.keys() & live_rooms:
-                    account_data_by_room_map[room_id] = (
-                        all_updates_since_the_from_token[room_id]
-                    )
-
-            # For previously and initial rooms we query each room individually.
-            if previously_rooms or initial_rooms:
-
-                async def handle_previously(room_id: str) -> None:
-                    # Either get updates or all account data in the room
-                    # depending on if the room state is PREVIOUSLY or NEVER.
-                    previous_token = previously_rooms.get(room_id)
-                    if previous_token is not None:
-                        room_account_data = await (
-                            self.store.get_updated_room_account_data_for_user_for_room(
-                                user_id=user_id,
-                                room_id=room_id,
-                                from_stream_id=previous_token,
-                                to_stream_id=to_token.account_data_key,
-                            )
-                        )
-
-                        # Add room tags
-                        changed = await self.store.has_tags_changed_for_room(
-                            user_id=user_id,
-                            room_id=room_id,
-                            from_stream_id=previous_token,
-                            to_stream_id=to_token.account_data_key,
-                        )
-                        if changed:
-                            # XXX: Ideally, this should take into account the `to_token`
-                            # and return the set of tags at that time but we don't track
-                            # changes to tags so we just have to return all tags for the
-                            # room.
-                            immutable_tag_map = await self.store.get_tags_for_room(
-                                user_id, room_id
-                            )
-                            room_account_data[AccountDataTypes.TAG] = {
-                                "tags": immutable_tag_map
-                            }
-
-                        # Only add an entry if there were any updates.
-                        if room_account_data:
-                            account_data_by_room_map[room_id] = room_account_data
-                    else:
-                        # TODO: This should take into account the `to_token`
-                        immutable_room_account_data = (
-                            await self.store.get_account_data_for_room(user_id, room_id)
-                        )
-
-                        # Add room tags
-                        #
-                        # XXX: Ideally, this should take into account the `to_token`
-                        # and return the set of tags at that time but we don't track
-                        # changes to tags so we just have to return all tags for the
-                        # room.
-                        immutable_tag_map = await self.store.get_tags_for_room(
-                            user_id, room_id
-                        )
-
-                        account_data_by_room_map[room_id] = ChainMap(
-                            {AccountDataTypes.TAG: {"tags": immutable_tag_map}}
-                            if immutable_tag_map
-                            else {},
-                            # Cast is safe because `ChainMap` only mutates the top-most map,
-                            # see https://github.com/python/typeshed/issues/8430
-                            cast(
-                                MutableMapping[str, JsonMapping],
-                                immutable_room_account_data,
-                            ),
-                        )
-
-                # We handle these rooms concurrently to speed it up.
-                await concurrently_execute(
-                    handle_previously,
-                    previously_rooms.keys() | initial_rooms,
-                    limit=20,
+            else:
+                # TODO: This should take into account the `to_token`
+                account_data_by_room_map = (
+                    await self.store.get_room_account_data_for_user(user_id)
                )

-            # Now record which rooms are now up to data, and which rooms have
-            # pending updates to send.
-            new_connection_state.account_data.record_sent_rooms(previously_rooms.keys())
-            new_connection_state.account_data.record_sent_rooms(initial_rooms)
-            missing_updates = (
-                all_updates_since_the_from_token.keys() - relevant_room_ids
-            )
-            if missing_updates:
-                # If we have missing updates then we must have had a from_token.
-                assert from_token is not None
-
-                new_connection_state.account_data.record_unsent_rooms(
-                    missing_updates, from_token.stream_token.account_data_key
-                )
+        # Filter down to the relevant rooms
+        account_data_by_room_map = {
+            room_id: account_data_map
+            for room_id, account_data_map in account_data_by_room_map.items()
+            if room_id in relevant_room_ids
+        }

        return SlidingSyncResult.Extensions.AccountDataExtension(
            global_account_data_map=global_account_data_map,
@@ -689,10 +532,7 @@ class SlidingSyncExtensionHandler:
            # For rooms we've previously sent down, but aren't up to date, we
            # need to use the from token from the room status.
            if previously_rooms:
-                # Fetch any missing rooms concurrently.
-
-                async def handle_previously_room(room_id: str) -> None:
-                    receipt_token = previously_rooms[room_id]
+                for room_id, receipt_token in previously_rooms.items():
                    # TODO: Limit the number of receipts we're about to send down
                    # for the room, if its too many we should TODO
                    previously_receipts = (
@@ -704,10 +544,6 @@ class SlidingSyncExtensionHandler:
                    )
                    fetched_receipts.extend(previously_receipts)

-                await concurrently_execute(
-                    handle_previously_room, previously_rooms.keys(), 20
-                )
-
            if initial_rooms:
                # We also always send down receipts for the current user.
                user_receipts = (
@@ -764,10 +600,9 @@ class SlidingSyncExtensionHandler:

                room_id_to_receipt_map[room_id] = {"type": type, "content": content}

-            # Update the per-connection state to track which rooms we have sent
-            # all the receipts for.
-            new_connection_state.receipts.record_sent_rooms(previously_rooms.keys())
-            new_connection_state.receipts.record_sent_rooms(initial_rooms)
+        # Now we update the per-connection state to track which receipts we have
+        # and haven't sent down.
+        new_connection_state.receipts.record_sent_rooms(relevant_room_ids)

        if from_token:
            # Now find the set of rooms that may have receipts that we're not sending
@@ -13,18 +13,18 @@
 #

 import logging
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Dict, Optional, Tuple

 import attr

-from synapse.logging.opentracing import trace
-from synapse.storage.databases.main import DataStore
-from synapse.types import SlidingSyncStreamToken
-from synapse.types.handlers.sliding_sync import (
+from synapse.api.errors import SlidingSyncUnknownPosition
+from synapse.handlers.sliding_sync.types import (
    MutablePerConnectionState,
    PerConnectionState,
-    SlidingSyncConfig,
 )
+from synapse.logging.opentracing import trace
+from synapse.types import SlidingSyncStreamToken
+from synapse.types.handlers import SlidingSyncConfig

 if TYPE_CHECKING:
    pass
@@ -61,9 +61,22 @@ class SlidingSyncConnectionStore:
            to mapping of room ID to `HaveSentRoom`.
    """

-    store: "DataStore"
+    # `(user_id, conn_id)` -> `connection_position` -> `PerConnectionState`
+    _connections: Dict[Tuple[str, str], Dict[int, PerConnectionState]] = attr.Factory(
+        dict
+    )

-    async def get_and_clear_connection_positions(
+    async def is_valid_token(
+        self, sync_config: SlidingSyncConfig, connection_token: int
+    ) -> bool:
+        """Return whether the connection token is valid/recognized"""
+        if connection_token == 0:
+            return True
+
+        conn_key = self._get_connection_key(sync_config)
+        return connection_token in self._connections.get(conn_key, {})
+
+    async def get_per_connection_state(
        self,
        sync_config: SlidingSyncConfig,
        from_token: Optional[SlidingSyncStreamToken],
@@ -73,21 +86,23 @@ class SlidingSyncConnectionStore:
        Raises:
            SlidingSyncUnknownPosition if the connection_token is unknown
        """
-        # If this is our first request, there is no previous connection state to fetch out of the database
-        if from_token is None or from_token.connection_position == 0:
+        if from_token is None:
            return PerConnectionState()

-        conn_id = sync_config.conn_id or ""
+        connection_position = from_token.connection_position
+        if connection_position == 0:
+            # Initial sync (request without a `from_token`) starts at `0` so
+            # there is no existing per-connection state
+            return PerConnectionState()

-        device_id = sync_config.requester.device_id
-        assert device_id is not None
+        conn_key = self._get_connection_key(sync_config)
+        sync_statuses = self._connections.get(conn_key, {})
+        connection_state = sync_statuses.get(connection_position)

-        return await self.store.get_and_clear_connection_positions(
-            sync_config.user.to_string(),
-            device_id,
-            conn_id,
-            from_token.connection_position,
-        )
+        if connection_state is None:
+            raise SlidingSyncUnknownPosition()
+
+        return connection_state

    @trace
    async def record_new_state(
@@ -101,28 +116,85 @@ class SlidingSyncConnectionStore:
        If there are no changes to the state this may return the same token as
        the existing per-connection state.
        """
+        prev_connection_token = 0
+        if from_token is not None:
+            prev_connection_token = from_token.connection_position
+
        if not new_connection_state.has_updates():
-            if from_token is not None:
-                return from_token.connection_position
-            else:
-                return 0
+            return prev_connection_token

-        # A from token with a zero connection position means there was no
-        # previously stored connection state, so we treat a zero the same as
-        # there being no previous position.
-        previous_connection_position = None
-        if from_token is not None and from_token.connection_position != 0:
-            previous_connection_position = from_token.connection_position
+        conn_key = self._get_connection_key(sync_config)
+        sync_statuses = self._connections.setdefault(conn_key, {})

+        # Generate a new token, removing any existing entries in that token
+        # (which can happen if requests get resent).
+        new_store_token = prev_connection_token + 1
+        sync_statuses.pop(new_store_token, None)
+
+        # We copy the `MutablePerConnectionState` so that the inner `ChainMap`s
+        # don't grow forever.
+        sync_statuses[new_store_token] = new_connection_state.copy()
+
+        return new_store_token
+
+    @trace
+    async def mark_token_seen(
+        self,
+        sync_config: SlidingSyncConfig,
+        from_token: Optional[SlidingSyncStreamToken],
+    ) -> None:
+        """We have received a request with the given token, so we can clear out
+        any other tokens associated with the connection.
+
+        If there is no from token then we have started afresh, and so we delete
+        all tokens associated with the device.
+        """
+        # Clear out any tokens for the connection that doesn't match the one
+        # from the request.
+
+        conn_key = self._get_connection_key(sync_config)
+        sync_statuses = self._connections.pop(conn_key, {})
+        if from_token is None:
+            return
+
+        sync_statuses = {
+            connection_token: room_statuses
+            for connection_token, room_statuses in sync_statuses.items()
+            if connection_token == from_token.connection_position
+        }
+        if sync_statuses:
+            self._connections[conn_key] = sync_statuses
+
+    @staticmethod
+    def _get_connection_key(sync_config: SlidingSyncConfig) -> Tuple[str, str]:
+        """Return a unique identifier for this connection.
+
+        The first part is simply the user ID.
+
+        The second part is generally a combination of device ID and conn_id.
+        However, both these two are optional (e.g. puppet access tokens don't
+        have device IDs), so this handles those edge cases.
+
+        We use this over the raw `conn_id` to avoid clashes between different
+        clients that use the same `conn_id`. Imagine a user uses a web client
+        that uses `conn_id: main_sync_loop` and an Android client that also has
+        a `conn_id: main_sync_loop`.
+        """
+
+        user_id = sync_config.user.to_string()
+
+        # Only one sliding sync connection is allowed per given conn_id (empty
+        # or not).
        conn_id = sync_config.conn_id or ""

-        device_id = sync_config.requester.device_id
-        assert device_id is not None
+        if sync_config.requester.device_id:
+            return (user_id, f"D/{sync_config.requester.device_id}/{conn_id}")

-        return await self.store.persist_per_connection_state(
-            sync_config.user.to_string(),
-            device_id,
-            conn_id,
-            previous_connection_position,
-            new_connection_state,
-        )
+        if sync_config.requester.access_token_id:
+            # If we don't have a device, then the access token ID should be a
+            # stable ID.
+            return (user_id, f"A/{sync_config.requester.access_token_id}/{conn_id}")
+
+        # If we have neither then its likely an AS or some weird token. Either
+        # way we can just fail here.
+        raise Exception("Cannot use sliding sync with access token type")
@@ -18,387 +18,30 @@ from collections import ChainMap
 from enum import Enum
 from typing import (
    TYPE_CHECKING,
-    AbstractSet,
-    Any,
    Callable,
    Dict,
    Final,
    Generic,
-    List,
    Mapping,
    MutableMapping,
    Optional,
-    Sequence,
    Set,
-    Tuple,
    TypeVar,
    cast,
 )

 import attr

-from synapse._pydantic_compat import Extra
 from synapse.api.constants import EventTypes
-from synapse.events import EventBase
-from synapse.types import (
-    DeviceListUpdates,
-    JsonDict,
-    JsonMapping,
-    MultiWriterStreamToken,
-    Requester,
-    RoomStreamToken,
-    SlidingSyncStreamToken,
-    StrCollection,
-    StreamToken,
-    UserID,
-)
-from synapse.types.rest.client import SlidingSyncBody
+from synapse.types import MultiWriterStreamToken, RoomStreamToken, StrCollection, UserID
+from synapse.types.handlers import SlidingSyncConfig

 if TYPE_CHECKING:
-    from synapse.handlers.relations import BundledAggregations
+    pass

 logger = logging.getLogger(__name__)


-class SlidingSyncConfig(SlidingSyncBody):
-    """
-    Inherit from `SlidingSyncBody` since we need all of the same fields and add a few
-    extra fields that we need in the handler
-    """
-
-    user: UserID
-    requester: Requester
-
-    # Pydantic config
-    class Config:
-        # By default, ignore fields that we don't recognise.
-        extra = Extra.ignore
-        # By default, don't allow fields to be reassigned after parsing.
-        allow_mutation = False
-        # Allow custom types like `UserID` to be used in the model
-        arbitrary_types_allowed = True
-
-
-class OperationType(Enum):
-    """
-    Represents the operation types in a Sliding Sync window.
-
-    Attributes:
-        SYNC: Sets a range of entries. Clients SHOULD discard what they previous knew about
-            entries in this range.
-        INSERT: Sets a single entry. If the position is not empty then clients MUST move
-            entries to the left or the right depending on where the closest empty space is.
-        DELETE: Remove a single entry. Often comes before an INSERT to allow entries to move
-            places.
-        INVALIDATE: Remove a range of entries. Clients MAY persist the invalidated range for
-            offline support, but they should be treated as empty when additional operations
-            which concern indexes in the range arrive from the server.
-    """
-
-    SYNC: Final = "SYNC"
-    INSERT: Final = "INSERT"
-    DELETE: Final = "DELETE"
-    INVALIDATE: Final = "INVALIDATE"
-
-
-@attr.s(slots=True, frozen=True, auto_attribs=True)
-class SlidingSyncResult:
-    """
-    The Sliding Sync result to be serialized to JSON for a response.
-
-    Attributes:
-        next_pos: The next position token in the sliding window to request (next_batch).
-        lists: Sliding window API. A map of list key to list results.
-        rooms: Room subscription API. A map of room ID to room results.
-        extensions: Extensions API. A map of extension key to extension results.
-    """
-
-    @attr.s(slots=True, frozen=True, auto_attribs=True)
-    class RoomResult:
-        """
-        Attributes:
-            name: Room name or calculated room name.
-            avatar: Room avatar
-            heroes: List of stripped membership events (containing `user_id` and optionally
-                `avatar_url` and `displayname`) for the users used to calculate the room name.
-            is_dm: Flag to specify whether the room is a direct-message room (most likely
-                between two people).
-            initial: Flag which is set when this is the first time the server is sending this
-                data on this connection. Clients can use this flag to replace or update
-                their local state. When there is an update, servers MUST omit this flag
-                entirely and NOT send "initial":false as this is wasteful on bandwidth. The
-                absence of this flag means 'false'.
-            unstable_expanded_timeline: Flag which is set if we're returning more historic
-                events due to the timeline limit having increased. See "XXX: Odd behavior"
-                comment ing `synapse.handlers.sliding_sync`.
-            required_state: The current state of the room
-            timeline: Latest events in the room. The last event is the most recent.
-            bundled_aggregations: A mapping of event ID to the bundled aggregations for
-                the timeline events above. This allows clients to show accurate reaction
-                counts (or edits, threads), even if some of the reaction events were skipped
-                over in a gappy sync.
-            stripped_state: Stripped state events (for rooms where the usre is
-                invited/knocked). Same as `rooms.invite.$room_id.invite_state` in sync v2,
-                absent on joined/left rooms
-            prev_batch: A token that can be passed as a start parameter to the
-                `/rooms/<room_id>/messages` API to retrieve earlier messages.
-            limited: True if there are more events than `timeline_limit` looking
-                backwards from the `response.pos` to the `request.pos`.
-            num_live: The number of timeline events which have just occurred and are not historical.
-                The last N events are 'live' and should be treated as such. This is mostly
-                useful to determine whether a given @mention event should make a noise or not.
-                Clients cannot rely solely on the absence of `initial: true` to determine live
-                events because if a room not in the sliding window bumps into the window because
-                of an @mention it will have `initial: true` yet contain a single live event
-                (with potentially other old events in the timeline).
-            bump_stamp: The `stream_ordering` of the last event according to the
-                `bump_event_types`. This helps clients sort more readily without them
-                needing to pull in a bunch of the timeline to determine the last activity.
-                `bump_event_types` is a thing because for example, we don't want display
-                name changes to mark the room as unread and bump it to the top. For
-                encrypted rooms, we just have to consider any activity as a bump because we
-                can't see the content and the client has to figure it out for themselves.
-                This may not be included if there hasn't been a change.
-            joined_count: The number of users with membership of join, including the client's
-                own user ID. (same as sync `v2 m.joined_member_count`)
-            invited_count: The number of users with membership of invite. (same as sync v2
-                `m.invited_member_count`)
-            notification_count: The total number of unread notifications for this room. (same
-                as sync v2)
-            highlight_count: The number of unread notifications for this room with the highlight
-                flag set. (same as sync v2)
-        """
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class StrippedHero:
-            user_id: str
-            display_name: Optional[str]
-            avatar_url: Optional[str]
-
-        name: Optional[str]
-        avatar: Optional[str]
-        heroes: Optional[List[StrippedHero]]
-        is_dm: bool
-        initial: bool
-        unstable_expanded_timeline: bool
-        # Should be empty for invite/knock rooms with `stripped_state`
-        required_state: List[EventBase]
-        # Should be empty for invite/knock rooms with `stripped_state`
-        timeline_events: List[EventBase]
-        bundled_aggregations: Optional[Dict[str, "BundledAggregations"]]
-        # Optional because it's only relevant to invite/knock rooms
-        stripped_state: List[JsonDict]
-        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
-        prev_batch: Optional[StreamToken]
-        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
-        limited: Optional[bool]
-        # Only optional because it won't be included for invite/knock rooms with `stripped_state`
-        num_live: Optional[int]
-        bump_stamp: Optional[int]
-        joined_count: Optional[int]
-        invited_count: Optional[int]
-        notification_count: int
-        highlight_count: int
-
-        def __bool__(self) -> bool:
-            return (
-                # If this is the first time the client is seeing the room, we should not filter it out
-                # under any circumstance.
-                self.initial
-                # We need to let the client know if any of the info has changed
-                or self.name is not None
-                or self.avatar is not None
-                or bool(self.heroes)
-                or self.joined_count is not None
-                or self.invited_count is not None
-                # We need to let the client know if there are any new events
-                or bool(self.required_state)
-                or bool(self.timeline_events)
-                or bool(self.stripped_state)
-            )
-
-    @attr.s(slots=True, frozen=True, auto_attribs=True)
-    class SlidingWindowList:
-        """
-        Attributes:
-            count: The total number of entries in the list. Always present if this list
-                is.
-            ops: The sliding list operations to perform.
-        """
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class Operation:
-            """
-            Attributes:
-                op: The operation type to perform.
-                range: Which index positions are affected by this operation. These are
-                    both inclusive.
-                room_ids: Which room IDs are affected by this operation. These IDs match
-                    up to the positions in the `range`, so the last room ID in this list
-                    matches the 9th index. The room data is held in a separate object.
-            """
-
-            op: OperationType
-            range: Tuple[int, int]
-            room_ids: List[str]
-
-        count: int
-        ops: List[Operation]
-
-    @attr.s(slots=True, frozen=True, auto_attribs=True)
-    class Extensions:
-        """Responses for extensions
-
-        Attributes:
-            to_device: The to-device extension (MSC3885)
-            e2ee: The E2EE device extension (MSC3884)
-        """
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class ToDeviceExtension:
-            """The to-device extension (MSC3885)
-
-            Attributes:
-                next_batch: The to-device stream token the client should use
-                    to get more results
-                events: A list of to-device messages for the client
-            """
-
-            next_batch: str
-            events: Sequence[JsonMapping]
-
-            def __bool__(self) -> bool:
-                return bool(self.events)
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class E2eeExtension:
-            """The E2EE device extension (MSC3884)
-
-            Attributes:
-                device_list_updates: List of user_ids whose devices have changed or left (only
-                    present on incremental syncs).
-                device_one_time_keys_count: Map from key algorithm to the number of
-                    unclaimed one-time keys currently held on the server for this device. If
-                    an algorithm is unlisted, the count for that algorithm is assumed to be
-                    zero. If this entire parameter is missing, the count for all algorithms
-                    is assumed to be zero.
-                device_unused_fallback_key_types: List of unused fallback key algorithms
-                    for this device.
-            """
-
-            # Only present on incremental syncs
-            device_list_updates: Optional[DeviceListUpdates]
-            device_one_time_keys_count: Mapping[str, int]
-            device_unused_fallback_key_types: Sequence[str]
-
-            def __bool__(self) -> bool:
-                # Note that "signed_curve25519" is always returned in key count responses
-                # regardless of whether we uploaded any keys for it. This is necessary until
-                # https://github.com/matrix-org/matrix-doc/issues/3298 is fixed.
-                #
-                # Also related:
-                # https://github.com/element-hq/element-android/issues/3725 and
-                # https://github.com/matrix-org/synapse/issues/10456
-                default_otk = self.device_one_time_keys_count.get("signed_curve25519")
-                more_than_default_otk = len(self.device_one_time_keys_count) > 1 or (
-                    default_otk is not None and default_otk > 0
-                )
-
-                return bool(
-                    more_than_default_otk
-                    or self.device_list_updates
-                    or self.device_unused_fallback_key_types
-                )
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class AccountDataExtension:
-            """The Account Data extension (MSC3959)
-
-            Attributes:
-                global_account_data_map: Mapping from `type` to `content` of global
-                    account data events.
-                account_data_by_room_map: Mapping from room_id to mapping of `type` to
-                    `content` of room account data events.
-            """
-
-            global_account_data_map: Mapping[str, JsonMapping]
-            account_data_by_room_map: Mapping[str, Mapping[str, JsonMapping]]
-
-            def __bool__(self) -> bool:
-                return bool(
-                    self.global_account_data_map or self.account_data_by_room_map
-                )
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class ReceiptsExtension:
-            """The Receipts extension (MSC3960)
-
-            Attributes:
-                room_id_to_receipt_map: Mapping from room_id to `m.receipt` ephemeral
-                    event (type, content)
-            """
-
-            room_id_to_receipt_map: Mapping[str, JsonMapping]
-
-            def __bool__(self) -> bool:
-                return bool(self.room_id_to_receipt_map)
-
-        @attr.s(slots=True, frozen=True, auto_attribs=True)
-        class TypingExtension:
-            """The Typing Notification extension (MSC3961)
-
-            Attributes:
-                room_id_to_typing_map: Mapping from room_id to `m.typing` ephemeral
-                    event (type, content)
-            """
-
-            room_id_to_typing_map: Mapping[str, JsonMapping]
-
-            def __bool__(self) -> bool:
-                return bool(self.room_id_to_typing_map)
-
-        to_device: Optional[ToDeviceExtension] = None
-        e2ee: Optional[E2eeExtension] = None
-        account_data: Optional[AccountDataExtension] = None
-        receipts: Optional[ReceiptsExtension] = None
-        typing: Optional[TypingExtension] = None
-
-        def __bool__(self) -> bool:
-            return bool(
-                self.to_device
-                or self.e2ee
-                or self.account_data
-                or self.receipts
-                or self.typing
-            )
-
-    next_pos: SlidingSyncStreamToken
-    lists: Mapping[str, SlidingWindowList]
-    rooms: Dict[str, RoomResult]
-    extensions: Extensions
-
-    def __bool__(self) -> bool:
-        """Make the result appear empty if there are no updates. This is used
-        to tell if the notifier needs to wait for more events when polling for
-        events.
-        """
-        # We don't include `self.lists` here, as a) `lists` is always non-empty even if
-        # there are no changes, and b) since we're sorting rooms by `stream_ordering` of
-        # the latest activity, anything that would cause the order to change would end
-        # up in `self.rooms` and cause us to send down the change.
-        return bool(self.rooms or self.extensions)
-
-    @staticmethod
-    def empty(next_pos: SlidingSyncStreamToken) -> "SlidingSyncResult":
-        "Return a new empty result"
-        return SlidingSyncResult(
-            next_pos=next_pos,
-            lists={},
-            rooms={},
-            extensions=SlidingSyncResult.Extensions(),
-        )
-
-
 class StateValues:
    """
    Understood values of the (type, state_key) tuple in `required_state`.
@@ -417,7 +60,7 @@ class StateValues:

 # We can't freeze this class because we want to update it in place with the
 # de-duplicated data.
-@attr.s(slots=True, auto_attribs=True, frozen=True)
+@attr.s(slots=True, auto_attribs=True)
 class RoomSyncConfig:
    """
    Holds the config for what data we should fetch for a room in the sync response.
@@ -431,7 +74,7 @@ class RoomSyncConfig:
    """

    timeline_limit: int
-    required_state_map: Mapping[str, AbstractSet[str]]
+    required_state_map: Dict[str, Set[str]]

    @classmethod
    def from_room_config(
@@ -503,22 +146,27 @@ class RoomSyncConfig:
            required_state_map=required_state_map,
        )

-    def combine_room_sync_config(
-        self, other_room_sync_config: "RoomSyncConfig"
-    ) -> "RoomSyncConfig":
-        """
-        Combine this `RoomSyncConfig` with another `RoomSyncConfig` and return the
-        superset union of the two.
-        """
-        timeline_limit = self.timeline_limit
-        required_state_map = {
-            event_type: set(state_keys)
-            for event_type, state_keys in self.required_state_map.items()
+    def deep_copy(self) -> "RoomSyncConfig":
+        required_state_map: Dict[str, Set[str]] = {
+            state_type: state_key_set.copy()
+            for state_type, state_key_set in self.required_state_map.items()
        }

+        return RoomSyncConfig(
+            timeline_limit=self.timeline_limit,
+            required_state_map=required_state_map,
+        )
+
+    def combine_room_sync_config(
+        self, other_room_sync_config: "RoomSyncConfig"
+    ) -> None:
+        """
+        Combine this `RoomSyncConfig` with another `RoomSyncConfig` and take the
+        superset union of the two.
+        """
        # Take the highest timeline limit
-        if timeline_limit < other_room_sync_config.timeline_limit:
-            timeline_limit = other_room_sync_config.timeline_limit
+        if self.timeline_limit < other_room_sync_config.timeline_limit:
+            self.timeline_limit = other_room_sync_config.timeline_limit

        # Union the required state
        for (
@@ -527,14 +175,14 @@ class RoomSyncConfig:
        ) in other_room_sync_config.required_state_map.items():
            # If we already have a wildcard for everything, we don't need to add
            # anything else
-            if StateValues.WILDCARD in required_state_map.get(
+            if StateValues.WILDCARD in self.required_state_map.get(
                StateValues.WILDCARD, set()
            ):
                break

            # If we already have a wildcard `state_key` for this `state_type`, we don't need
            # to add anything else
-            if StateValues.WILDCARD in required_state_map.get(state_type, set()):
+            if StateValues.WILDCARD in self.required_state_map.get(state_type, set()):
                continue

            # If we're getting wildcards for the `state_type` and `state_key`, that's
@@ -543,14 +191,16 @@ class RoomSyncConfig:
                state_type == StateValues.WILDCARD
                and StateValues.WILDCARD in state_key_set
            ):
-                required_state_map = {state_type: {StateValues.WILDCARD}}
+                self.required_state_map = {state_type: {StateValues.WILDCARD}}
                # We can break, since we don't need to add anything else
                break

            for state_key in state_key_set:
                # If we already have a wildcard for this specific `state_key`, we don't need
                # to add it since the wildcard already covers it.
-                if state_key in required_state_map.get(StateValues.WILDCARD, set()):
+                if state_key in self.required_state_map.get(
+                    StateValues.WILDCARD, set()
+                ):
                    continue

                # If we're getting a wildcard for the `state_type`, get rid of any other
@@ -561,7 +211,7 @@ class RoomSyncConfig:
                    # Make a copy so we don't run into an error: `dictionary changed size
                    # during iteration`, when we remove items
                    for existing_state_type, existing_state_key_set in list(
-                        required_state_map.items()
+                        self.required_state_map.items()
                    ):
                        # Make a copy so we don't run into an error: `Set changed size during
                        # iteration`, when we filter out and remove items
@@ -571,21 +221,19 @@ class RoomSyncConfig:

                        # If we've the left the `set()` empty, remove it from the map
                        if existing_state_key_set == set():
-                            required_state_map.pop(existing_state_type, None)
+                            self.required_state_map.pop(existing_state_type, None)

                # If we're getting a wildcard `state_key`, get rid of any other state_keys
                # for this `state_type` since the wildcard will cover it already.
                if state_key == StateValues.WILDCARD:
-                    required_state_map[state_type] = {state_key}
+                    self.required_state_map[state_type] = {state_key}
                    break
                # Otherwise, just add it to the set
                else:
-                    if required_state_map.get(state_type) is None:
-                        required_state_map[state_type] = {state_key}
+                    if self.required_state_map.get(state_type) is None:
+                        self.required_state_map[state_type] = {state_key}
                    else:
-                        required_state_map[state_type].add(state_key)
-
-        return RoomSyncConfig(timeline_limit, required_state_map)
+                        self.required_state_map[state_type].add(state_key)

    def must_await_full_state(
        self,
@@ -676,7 +324,7 @@ class HaveSentRoomFlag(Enum):
    LIVE = "live"


-T = TypeVar("T", str, RoomStreamToken, MultiWriterStreamToken, int)
+T = TypeVar("T")


@attr.s(auto_attribs=True, slots=True, frozen=True)
@@ -708,12 +356,7 @@ class HaveSentRoom(Generic[T]):

    @staticmethod
    def never() -> "HaveSentRoom[T]":
-        # We use a singleton to avoid repeatedly instantiating new `never`
-        # values.
-        return _HAVE_SENT_ROOM_NEVER
-
-
-_HAVE_SENT_ROOM_NEVER: HaveSentRoom[Any] = HaveSentRoom(HaveSentRoomFlag.NEVER, None)
+        return HaveSentRoom(HaveSentRoomFlag.NEVER, None)


@attr.s(auto_attribs=True, slots=True, frozen=True)
@@ -740,9 +383,6 @@ class RoomStatusMap(Generic[T]):

        return RoomStatusMap(statuses=dict(self._statuses))

-    def __len__(self) -> int:
-        return len(self._statuses)
-

 class MutableRoomStatusMap(RoomStatusMap[T]):
    """A mutable version of `RoomStatusMap`"""
@@ -799,7 +439,7 @@ class MutableRoomStatusMap(RoomStatusMap[T]):
            self._statuses[room_id] = HaveSentRoom.previously(from_token)


-@attr.s(auto_attribs=True, frozen=True)
+@attr.s(auto_attribs=True)
 class PerConnectionState:
    """The per-connection state. A snapshot of what we've sent down the
    connection before.
@@ -824,7 +464,6 @@ class PerConnectionState:

    rooms: RoomStatusMap[RoomStreamToken] = attr.Factory(RoomStatusMap)
    receipts: RoomStatusMap[MultiWriterStreamToken] = attr.Factory(RoomStatusMap)
-    account_data: RoomStatusMap[int] = attr.Factory(RoomStatusMap)

    room_configs: Mapping[str, RoomSyncConfig] = attr.Factory(dict)

@@ -835,7 +474,6 @@ class PerConnectionState:
        return MutablePerConnectionState(
            rooms=self.rooms.get_mutable(),
            receipts=self.receipts.get_mutable(),
-            account_data=self.account_data.get_mutable(),
            room_configs=ChainMap({}, room_configs),
        )

@@ -843,13 +481,9 @@ class PerConnectionState:
        return PerConnectionState(
            rooms=self.rooms.copy(),
            receipts=self.receipts.copy(),
-            account_data=self.account_data.copy(),
            room_configs=dict(self.room_configs),
        )

-    def __len__(self) -> int:
-        return len(self.rooms) + len(self.receipts) + len(self.room_configs)
-

@attr.s(auto_attribs=True)
 class MutablePerConnectionState(PerConnectionState):
@@ -857,7 +491,6 @@ class MutablePerConnectionState(PerConnectionState):

    rooms: MutableRoomStatusMap[RoomStreamToken]
    receipts: MutableRoomStatusMap[MultiWriterStreamToken]
-    account_data: MutableRoomStatusMap[int]

    room_configs: typing.ChainMap[str, RoomSyncConfig]

@@ -865,7 +498,6 @@ class MutablePerConnectionState(PerConnectionState):
        return (
            bool(self.rooms.get_updates())
            or bool(self.receipts.get_updates())
-            or bool(self.account_data.get_updates())
            or bool(self.get_room_config_updates())
        )

@@ -183,7 +183,10 @@ class JoinedSyncResult:
        to tell if room needs to be part of the sync result.
        """
        return bool(
-            self.timeline or self.state or self.ephemeral or self.account_data
+            self.timeline
+            or self.state
+            or self.ephemeral
+            or self.account_data
            # nb the notification count does not, er, count: if there's nothing
            # else in the result, we don't need to send it.
        )
@@ -572,10 +575,10 @@ 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: Union[SyncResult, E2eeSyncResult] = (
+                await self.current_sync_for_user(
+                    sync_config, sync_version, since_token, full_state=full_state
+                )
            )
        else:
            # Otherwise, we wait for something to happen and report it to the user.
@@ -670,10 +673,10 @@ class SyncHandler:

            # 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
+                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:
@@ -906,7 +909,7 @@ class SyncHandler:
                    # Use `stream_ordering` for updates
                    else paginate_room_events_by_stream_ordering
                )
-                events, end_key, limited = await pagination_method(
+                events, end_key = await pagination_method(
                    room_id=room_id,
                    # The bounds are reversed so we can paginate backwards
                    # (from newer to older events) starting at to_bound.
@@ -914,7 +917,9 @@ class SyncHandler:
                    from_key=end_key,
                    to_key=since_key,
                    direction=Direction.BACKWARDS,
-                    limit=load_limit,
+                    # We add one so we can determine if there are enough events to saturate
+                    # the limit or not (see `limited`)
+                    limit=load_limit + 1,
                )
                # We want to return the events in ascending order (the last event is the
                # most recent).
@@ -969,6 +974,9 @@ class SyncHandler:
                loaded_recents.extend(recents)
                recents = loaded_recents

+                if len(events) <= load_limit:
+                    limited = False
+                    break
                max_repeat -= 1

            if len(recents) > timeline_limit:
@@ -1480,16 +1488,13 @@ class SyncHandler:
                    # 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,
-                        )
+                    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

@@ -2161,18 +2166,18 @@ 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)
+                )
        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)
+            )

        account_data_for_user = (
            await sync_config.filter_collection.filter_global_account_data(
@@ -2603,7 +2608,7 @@ class SyncHandler:

            newly_joined = room_id in newly_joined_rooms
            if room_entry:
-                events, start_key, _ = room_entry
+                events, start_key = room_entry
                # We want to return the events in ascending order (the last event is the
                # most recent).
                events.reverse()
@@ -183,7 +183,7 @@ class WorkerLocksHandler:
            return

        def _wake_all_locks(
-            locks: Collection[Union[WaitingLock, WaitingMultiLock]],
+            locks: Collection[Union[WaitingLock, WaitingMultiLock]]
        ) -> None:
            for lock in locks:
                deferred = lock.deferred
@@ -1039,7 +1039,7 @@ class _MultipartParserProtocol(protocol.Protocol):
        self.deferred = deferred
        self.boundary = boundary
        self.max_length = max_length
-        self.parser: Optional[multipart.MultipartParser] = None
+        self.parser = None
        self.multipart_response = MultipartResponse()
        self.has_redirect = False
        self.in_json = False
@@ -1097,7 +1097,7 @@ class _MultipartParserProtocol(protocol.Protocol):
                        self.deferred.errback()
                    self.file_length += end - start

-            callbacks: "multipart.multipart.MultipartCallbacks" = {
+            callbacks = {
                "on_header_field": on_header_field,
                "on_header_value": on_header_value,
                "on_part_data": on_part_data,
@@ -1113,7 +1113,7 @@ class _MultipartParserProtocol(protocol.Protocol):
            self.transport.abortConnection()

        try:
-            self.parser.write(incoming_data)
+            self.parser.write(incoming_data)  # type: ignore[attr-defined]
        except Exception as e:
            logger.warning(f"Exception writing to multipart parser: {e}")
            self.deferred.errback()
@@ -1313,5 +1313,6 @@ def is_unknown_endpoint(
        )
    ) or (
        # Older Synapses returned a 400 error.
-        e.code == 400 and synapse_error.errcode == Codes.UNRECOGNIZED
+        e.code == 400
+        and synapse_error.errcode == Codes.UNRECOGNIZED
    )
@@ -19,6 +19,7 @@
 #
 #
 import abc
+import cgi
 import codecs
 import logging
 import random
@@ -463,6 +464,8 @@ class MatrixFederationHttpClient:
        self.max_long_retries = hs.config.federation.max_long_retries
        self.max_short_retries = hs.config.federation.max_short_retries

+        self.max_download_size = hs.config.media.max_upload_size
+
        self._cooperator = Cooperator(scheduler=_make_scheduler(self.reactor))

        self._sleeper = AwakenableSleeper(self.reactor)
@@ -791,7 +794,7 @@ class MatrixFederationHttpClient:
                                url_str,
                                _flatten_response_never_received(e),
                            )
-                            body = b""
+                            body = None

                        exc = HttpResponseException(
                            response.code, response_phrase, body
@@ -1756,9 +1759,9 @@ class MatrixFederationHttpClient:
                str_url,
            )
            # We don't know how large the response will be upfront, so limit it to
-            # the `max_size` config value.
+            # the `max_upload_size` config value.
            length, headers, _, _ = await self._simple_http_client.get_file(
-                str_url, output_stream, max_size
+                str_url, output_stream, self.max_download_size
            )

        logger.info(
@@ -1812,9 +1815,8 @@ def check_content_type_is(headers: Headers, expected_content_type: str) -> None:
        )

    c_type = content_type_headers[0].decode("ascii")  # only the first header
-    # Extract the 'essence' of the mimetype, removing any parameter
-    c_type_parsed = c_type.split(";", 1)[0].strip()
-    if c_type_parsed != expected_content_type:
+    val, options = cgi.parse_header(c_type)
+    if val != expected_content_type:
        raise RequestSendFailed(
            RuntimeError(
                f"Remote server sent Content-Type header of '{c_type}', not '{expected_content_type}'",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Baker	808e29eb98	Black like my soul	2024-08-29 13:06:24 +01:00
David Baker	6f90f7068b	changelog	2024-08-29 13:02:12 +01:00
David Baker	0e48ee524f	Relay M_TOKEN_INCORRECT as per MSC4183 Relay error codes from the IS's submitToken endpoint	2024-08-29 13:00:28 +01:00
				`@@ -0,0 +1 @@`
				`Fix hierarchy returning 403 when room is accessible through federation. Contributed by Krishan (@kfiven).`
				`@@ -0,0 +1 @@`
				`Fix content-length on federation /thumbnail responses.`
				`@@ -0,0 +1 @@`
				`Fix authenticated media responses using a wrong limit when following redirects over federation.`
				`@@ -0,0 +1 @@`
				`Clarify that the admin api resource is only loaded on the main process and not workers.`
				`@@ -0,0 +1 @@`
				Fixed typo in `saml2_config` config [example](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#saml2_config).
				`@@ -0,0 +1 @@`
				`Refactor sliding sync class into multiple files.`
				`@@ -0,0 +1 @@`
				Add support to `@tag_args` for standalone functions.
				`@@ -0,0 +1 @@`
				`Speed up incremental syncs in sliding sync by adding some more caching.`
				`@@ -0,0 +1 @@`
				Make `hash_password` accept password input from stdin.