Remove useless async job to delete device messages on sync

2023-10-13 16:16:43 +02:00
190 changed files with 1918 additions and 3828 deletions
@@ -47,7 +47,7 @@ if not IS_PR:
            "database": "sqlite",
            "extras": "all",
        }
-        for version in ("3.9", "3.10", "3.11", "3.12")
+        for version in ("3.9", "3.10", "3.11", "3.12.0-rc.2")
    )

 trial_postgres_tests = [
@@ -62,7 +62,7 @@ trial_postgres_tests = [
 if not IS_PR:
    trial_postgres_tests.append(
        {
-            "python-version": "3.12",
+            "python-version": "3.11",
            "database": "postgres",
            "postgres-version": "16",
            "extras": "all",
@@ -37,18 +37,15 @@ jobs:
            - 'Cargo.toml'
            - 'Cargo.lock'
            - '.rustfmt.toml'
-            - '.github/workflows/tests.yml'

          trial:
            - 'synapse/**'
            - 'tests/**'
            - 'rust/**'
-            - '.ci/scripts/calculate_jobs.py'
            - 'Cargo.toml'
            - 'Cargo.lock'
            - 'pyproject.toml'
            - 'poetry.lock'
-            - '.github/workflows/tests.yml'

          integration:
            - 'synapse/**'
@@ -59,9 +56,7 @@ jobs:
            - 'pyproject.toml'
            - 'poetry.lock'
            - 'docker/**'
-            - '.ci/**'
            - 'scripts-dev/complement.sh'
-            - '.github/workflows/tests.yml'

          linting:
            - 'synapse/**'
@@ -75,7 +70,6 @@ jobs:
            - 'mypy.ini'
            - 'pyproject.toml'
            - 'poetry.lock'
-            - '.github/workflows/tests.yml'

  check-sampleconfig:
    runs-on: ubuntu-latest
@@ -1,58 +1,3 @@
-# Synapse 1.95.0 (2023-10-24)
-
-### Internal Changes
-
- Build Debian packages for [Ubuntu 23.10 Mantic Minotaur](https://canonical.com/blog/canonical-releases-ubuntu-23-10-mantic-minotaur). ([\#16524](https://github.com/matrix-org/synapse/issues/16524))
-
-
-# Synapse 1.95.0rc1 (2023-10-17)
-
-### Bugfixes
-
- Remove legacy unspecced `knock_state_events` field returned in some responses. ([\#16403](https://github.com/matrix-org/synapse/issues/16403))
- Fix a bug introduced in Synapse 1.81.0 where an `AttributeError` would be raised when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch. ([\#16404](https://github.com/matrix-org/synapse/issues/16404))
- Properly return inline media when content types have parameters. ([\#16440](https://github.com/matrix-org/synapse/issues/16440))
- Prevent the purging of large rooms from timing out when Postgres is in use. The timeout which causes this issue was introduced in Synapse 1.88.0. ([\#16455](https://github.com/matrix-org/synapse/issues/16455))
- Improve the performance of purging rooms, particularly encrypted rooms. ([\#16457](https://github.com/matrix-org/synapse/issues/16457))
- Fix a bug introduced in Synapse 1.59.0 where servers could be incorrectly marked as available after an error response was received. ([\#16506](https://github.com/matrix-org/synapse/issues/16506))
-
-### Improved Documentation
-
- Document internal background update mechanism. ([\#16420](https://github.com/matrix-org/synapse/issues/16420))
- Fix a typo in the sql for [useful SQL for admins document](https://matrix-org.github.io/synapse/latest/usage/administration/useful_sql_for_admins.html). ([\#16477](https://github.com/matrix-org/synapse/issues/16477))
-
-### Internal Changes
-
- Bump pyo3 from 0.17.1 to 0.19.2. ([\#16162](https://github.com/matrix-org/synapse/issues/16162))
- Update registration of media repository URLs. ([\#16419](https://github.com/matrix-org/synapse/issues/16419))
- Improve type hints. ([\#16421](https://github.com/matrix-org/synapse/issues/16421), [\#16468](https://github.com/matrix-org/synapse/issues/16468), [\#16469](https://github.com/matrix-org/synapse/issues/16469), [\#16507](https://github.com/matrix-org/synapse/issues/16507))
- Refactor some code to simplify and better type receipts stream adjacent code. ([\#16426](https://github.com/matrix-org/synapse/issues/16426))
- Factor out `MultiWriter` token from `RoomStreamToken`. ([\#16427](https://github.com/matrix-org/synapse/issues/16427))
- Improve code comments. ([\#16428](https://github.com/matrix-org/synapse/issues/16428))
- Reduce memory allocations. ([\#16429](https://github.com/matrix-org/synapse/issues/16429), [\#16431](https://github.com/matrix-org/synapse/issues/16431), [\#16433](https://github.com/matrix-org/synapse/issues/16433), [\#16434](https://github.com/matrix-org/synapse/issues/16434), [\#16438](https://github.com/matrix-org/synapse/issues/16438), [\#16444](https://github.com/matrix-org/synapse/issues/16444))
- Remove unused method. ([\#16435](https://github.com/matrix-org/synapse/issues/16435))
- Improve rate limiting logic. ([\#16441](https://github.com/matrix-org/synapse/issues/16441))
- Do not block running of CI behind the check for sign-off on PRs. ([\#16454](https://github.com/matrix-org/synapse/issues/16454))
- Update the release script to remind releaser to check for special release notes. ([\#16461](https://github.com/matrix-org/synapse/issues/16461))
- Update complement.sh to match new public API shape. ([\#16466](https://github.com/matrix-org/synapse/issues/16466))
- Clean up logging on event persister endpoints. ([\#16488](https://github.com/matrix-org/synapse/issues/16488))
- Remove useless async job to delete device messages on sync, since we only deliver (and hence delete) up to 100 device messages at a time. ([\#16491](https://github.com/matrix-org/synapse/issues/16491))
-
-### Updates to locked dependencies
-
-* Bump bleach from 6.0.0 to 6.1.0. ([\#16451](https://github.com/matrix-org/synapse/issues/16451))
-* Bump jsonschema from 4.19.0 to 4.19.1. ([\#16500](https://github.com/matrix-org/synapse/issues/16500))
-* Bump netaddr from 0.8.0 to 0.9.0. ([\#16453](https://github.com/matrix-org/synapse/issues/16453))
-* Bump packaging from 23.1 to 23.2. ([\#16497](https://github.com/matrix-org/synapse/issues/16497))
-* Bump pillow from 10.0.1 to 10.1.0. ([\#16498](https://github.com/matrix-org/synapse/issues/16498))
-* Bump psycopg2 from 2.9.8 to 2.9.9. ([\#16452](https://github.com/matrix-org/synapse/issues/16452))
-* Bump pyo3-log from 0.8.3 to 0.8.4. ([\#16495](https://github.com/matrix-org/synapse/issues/16495))
-* Bump ruff from 0.0.290 to 0.0.292. ([\#16449](https://github.com/matrix-org/synapse/issues/16449))
-* Bump sentry-sdk from 1.31.0 to 1.32.0. ([\#16496](https://github.com/matrix-org/synapse/issues/16496))
-* Bump serde from 1.0.188 to 1.0.189. ([\#16494](https://github.com/matrix-org/synapse/issues/16494))
-* Bump types-bleach from 6.0.0.4 to 6.1.0.0. ([\#16450](https://github.com/matrix-org/synapse/issues/16450))
-* Bump types-jsonschema from 4.17.0.10 to 4.19.0.3. ([\#16499](https://github.com/matrix-org/synapse/issues/16499))
-
 # Synapse 1.94.0 (2023-10-10)

 No significant changes since 1.94.0rc1.
@@ -229,9 +229,9 @@ dependencies = [

 [[package]]
 name = "pyo3-log"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09c2b349b6538d8a73d436ca606dab6ce0aaab4dad9e6b7bdd57a4f556c3bc3"
+checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605"
 dependencies = [
 "arc-swap",
 "log",
@@ -332,18 +332,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -0,0 +1 @@
+Bump pyo3 from 0.17.1 to 0.19.2.
@@ -0,0 +1 @@
+Remove legacy unspecced `knock_state_events` field returned in some responses.
@@ -0,0 +1 @@
+Fixes possbile `AttributeError` when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch.
@@ -0,0 +1 @@
+Update registration of media repository URLs.
@@ -0,0 +1 @@
+Document internal background update mechanism.
@@ -0,0 +1 @@
+Refactor some code to simplify and better type receipts stream adjacent code.
@@ -0,0 +1 @@
+Factor out `MultiWriter` token from `RoomStreamToken`.
@@ -0,0 +1 @@
+Improve code comments.
@@ -0,0 +1 @@
+Reduce memory allocations.
@@ -1 +0,0 @@
-Allow multiple workers to write to receipts stream.
@@ -0,0 +1 @@
+Reduce memory allocations.
@@ -0,0 +1 @@
+Reduce memory allocations.
@@ -0,0 +1 @@
+Remove unused method.
@@ -0,0 +1 @@
+Reduce memory allocations.
@@ -0,0 +1 @@
+Properly return inline media when content types have parameters.
@@ -0,0 +1 @@
+Improve rate limiting logic.
@@ -0,0 +1 @@
+Reduce memory allocations.
@@ -0,0 +1 @@
+Do not block running of CI behind the check for sign-off on PRs.
@@ -0,0 +1 @@
+Prevent the purging of large rooms from timing out when Postgres is in use. The timeout which causes this issue was introduced in Synapse 1.88.0.
@@ -0,0 +1 @@
+Improve the performance of purging rooms, particularly encrypted rooms.
@@ -0,0 +1 @@
+Update complement.sh to match new public API shape.
@@ -1 +0,0 @@
-Fixed a bug that prevents Grafana from finding the correct datasource. Contributed by @MichaelSasser.
@@ -1 +0,0 @@
-Fix a long-standing, exceedingly rare edge case where the first event persisted by a new event persister worker might not be sent down `/sync`.
@@ -0,0 +1 @@
+Fix a typo in the sql for [useful SQL for admins document](https://matrix-org.github.io/synapse/latest/usage/administration/useful_sql_for_admins.html).
@@ -0,0 +1 @@
+Remove useless async job to delete device messages on sync, since we only deliver (and hence delete) up to 100 device messages at a time.
@@ -1 +0,0 @@
-Fix long-standing bug where `/sync` incorrectly did not mark a room as `limited` in a sync requests when there were missing remote events.
@@ -1 +0,0 @@
-Improve performance of delete device messages query, cf issue [16479](https://github.com/matrix-org/synapse/issues/16479).
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.41 where HTTP(S) forward proxy authorization would fail when using basic HTTP authentication with a long `username:password` string.
@@ -1 +0,0 @@
-Improve replication performance when purging rooms.
@@ -1 +0,0 @@
-Run tests against Python 3.12.
@@ -1 +0,0 @@
-Run trial & integration tests in continuous integration when `.ci` directory is modified.
@@ -1 +0,0 @@
-Remove duplicate call to mark remote server 'awake' when using a federation sending worker.
@@ -1 +0,0 @@
-Stop deleting from an unused table.
@@ -1 +0,0 @@
-Fix running unit tests on Twisted trunk.
@@ -1 +0,0 @@
-Improve documentation of presence router.
@@ -1 +0,0 @@
-Force TLS certificate verification in user registration script.
@@ -1 +0,0 @@
-Add a sentence to the opentracing docs on how you can have jaeger in a different place than synapse.
@@ -1 +0,0 @@
-Bump matrix-synapse-ldap3 from 0.2.2 to 0.3.0.
@@ -1 +0,0 @@
-Fix long-standing bug where `/sync` could tightloop after restart when using SQLite.
@@ -1 +0,0 @@
-Correctly describe the meaning of unspecified rule lists in the [`alias_creation_rules`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#alias_creation_rules) and [`room_list_publication_rules`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#room_list_publication_rules) config options and improve their descriptions more generally.
@@ -1 +0,0 @@
-Add a new module API for controller presence.
@@ -1 +0,0 @@
-Add a new module API callback that allows adding extra fields to events' unsigned section when sent down to clients.
@@ -1 +0,0 @@
-Pin the recommended poetry version in contributors' guide.
@@ -1 +0,0 @@
-Fix a long-standing, exceedingly rare edge case where the first event persisted by a new event persister worker might not be sent down `/sync`.
@@ -1 +0,0 @@
-Fix ratelimiting of message sending when using workers, where the ratelimit would only be applied after most of the work has been done.
@@ -1 +0,0 @@
-Experimental support for [MSC4072](https://github.com/matrix-org/matrix-spec-proposals/pull/4072): Return a result for all devices requested in a `/keys/claim` request.
@@ -1,15 +1,3 @@
-matrix-synapse-py3 (1.95.0) stable; urgency=medium
-
-  * New Synapse release 1.95.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 24 Oct 2023 13:00:46 +0100
-
-matrix-synapse-py3 (1.95.0~rc1) stable; urgency=medium
-
-  * New synapse release 1.95.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 17 Oct 2023 15:50:17 +0000
-
 matrix-synapse-py3 (1.94.0) stable; urgency=medium

  * New Synapse release 1.94.0.
@@ -19,7 +19,7 @@
 # Usage
  - [Federation](federate.md)
  - [Configuration](usage/configuration/README.md)
-    - [Configuration Manual](usage/configuration/config_documentation.md)
+    - [Configuration Manual](usage/configuration/config_documentation.md) 
    - [Homeserver Sample Config File](usage/configuration/homeserver_sample_config.md)
    - [Logging Sample Config File](usage/configuration/logging_sample_config.md)
    - [Structured Logging](structured_logging.md)
@@ -48,7 +48,6 @@
        - [Password auth provider callbacks](modules/password_auth_provider_callbacks.md)
        - [Background update controller callbacks](modules/background_update_controller_callbacks.md)
        - [Account data callbacks](modules/account_data_callbacks.md)
-        - [Add extra fields to client events unsigned section callbacks](modules/add_extra_fields_to_client_events_unsigned.md)
        - [Porting a legacy module to the new interface](modules/porting_legacy_module.md)
    - [Workers](workers.md)
      - [Using `synctl` with Workers](synctl_workers.md)
@@ -66,7 +66,7 @@ Of their installation methods, we recommend

 ```shell
 pip install --user pipx
-pipx install poetry==1.5.2  # Problems with Poetry 1.6, see https://github.com/matrix-org/synapse/issues/16147
+pipx install poetry
 ```

 but see poetry's [installation instructions](https://python-poetry.org/docs/#installation)
@@ -51,24 +51,17 @@ will be inserted with that ID.

 For any given stream reader (including writers themselves), we may define a per-writer current stream ID:

-> A current stream ID _for a writer W_ is the largest stream ID such that
+> The current stream ID _for a writer W_ is the largest stream ID such that
 > all transactions added by W with equal or smaller ID have completed.

 Similarly, there is a "linear" notion of current stream ID:

-> A "linear" current stream ID is the largest stream ID such that
+> The "linear" current stream ID is the largest stream ID such that
 > all facts (added by any writer) with equal or smaller ID have completed.

 Because different stream readers A and B learn about new facts at different times, A and B may disagree about current stream IDs.
 Put differently: we should think of stream readers as being independent of each other, proceeding through a stream of facts at different rates.

-The above definition does not give a unique current stream ID, in fact there can
-be a range of current stream IDs. Synapse uses both the minimum and maximum IDs
-for different purposes. Most often the maximum is used, as its generally
-beneficial for workers to advance their IDs as soon as possible. However, the
-minimum is used in situations where e.g. another worker is going to wait until
-the stream advances past a position.
-
 **NB.** For both senses of "current", that if a writer opens a transaction that never completes, the current stream ID will never advance beyond that writer's last written stream ID.

 For single-writer streams, the per-writer current ID and the linear current ID are the same.
@@ -121,7 +114,7 @@ Writers need to track:
 - track their current position (i.e. its own per-writer stream ID).
 - their facts currently awaiting completion.

-At startup,
+At startup, 
 - the current position of that writer can be found by querying the database (which suggests that facts need to be written to the database atomically, in a transaction); and
 - there are no facts awaiting completion.

@@ -1,32 +0,0 @@
-# Add extra fields to client events unsigned section callbacks
-
-_First introduced in Synapse v1.96.0_
-
-This callback allows modules to add extra fields to the unsigned section of
-events when they get sent down to clients.
-
-These get called *every* time an event is to be sent to clients, so care should
-be taken to ensure with respect to performance.
-
-### API
-
-To register the callback, use
-`register_add_extra_fields_to_unsigned_client_event_callbacks` on the
-`ModuleApi`.
-
-The callback should be of the form
-
-```python
-async def add_field_to_unsigned(
-    event: EventBase,
-) -> JsonDict:
-```
-
-where the extra fields to add to the event's unsigned section is returned.
-(Modules must not attempt to modify the `event` directly).
-
-This cannot be used to alter the "core" fields in the unsigned section emitted
-by Synapse itself.
-
-If multiple such callbacks try to add the same field to an event's unsigned
-section, the last-registered callback wins.
@@ -1,16 +1,8 @@
 # Presence router callbacks

-Presence router callbacks allow module developers to define additional users
-which receive presence updates from local users. The additional users
-can be local or remote.
-
-For example, it could be used to direct all of `@alice:example.com` (a local user)'s
-presence updates to `@bob:matrix.org` (a remote user), even though they don't share a
-room. (Note that those presence updates might not make it to `@bob:matrix.org`'s client
-unless a similar presence router is running on that homeserver.)
-
-Presence router callbacks can be registered using the module API's
-`register_presence_router_callbacks` method.
+Presence router callbacks allow module developers to specify additional users (local or remote)
+to receive certain presence updates from local users. Presence router callbacks can be 
+registered using the module API's `register_presence_router_callbacks` method.

 ## Callbacks

@@ -51,11 +51,6 @@ docker run -d --name jaeger \
  jaegertracing/all-in-one:1
 ```

-By default, Synapse will publish traces to Jaeger on localhost.
-If Jaeger is hosted elsewhere, point Synapse to the correct host by setting
-`opentracing.jaeger_config.local_agent.reporting_host` [in the Synapse configuration](usage/configuration/config_documentation.md#opentracing-1)
-or by setting the `JAEGER_AGENT_HOST` environment variable to the desired address.
-
 Latest documentation is probably at
 https://www.jaegertracing.io/docs/latest/getting-started.

@@ -230,13 +230,6 @@ Example configuration:
 presence:
  enabled: false
 ```
-
-`enabled` can also be set to a special value of "untracked" which ignores updates
-received via clients and federation, while still accepting updates from the
-[module API](../../modules/index.md).
-
-*The "untracked" option was added in Synapse 1.96.0.*
-
 ---
 ### `require_auth_for_profile_requests`

@@ -3804,160 +3797,62 @@ enable_room_list_search: false
 ---
 ### `alias_creation_rules`

-The `alias_creation_rules` option allows server admins to prevent unwanted
-alias creation on this server.
+The `alias_creation_rules` option controls who is allowed to create aliases
+on this server.

-This setting is an optional list of 0 or more rules. By default, no list is
-provided, meaning that all alias creations are permitted.
+The format of this option is a list of rules that contain globs that
+match against user_id, room_id and the new alias (fully qualified with
+server name). The action in the first rule that matches is taken,
+which can currently either be "allow" or "deny".

-Otherwise, requests to create aliases are matched against each rule in order.
-The first rule that matches decides if the request is allowed or denied. If no 
-rule matches, the request is denied. In particular, this means that configuring
-an empty list of rules will deny every alias creation request.
+Missing user_id/room_id/alias fields default to "*".

-Each rule is a YAML object containing four fields, each of which is an optional string:
+If no rules match the request is denied. An empty list means no one
+can create aliases.

-* `user_id`: a glob pattern that matches against the creator of the alias.
-* `alias`: a glob pattern that matches against the alias being created.
-* `room_id`: a glob pattern that matches against the room ID the alias is being pointed at.
-* `action`: either `allow` or `deny`. What to do with the request if the rule matches. Defaults to `allow`.
-
-Each of the glob patterns is optional, defaulting to `*` ("match anything").
-Note that the patterns match against fully qualified IDs, e.g. against 
-`@alice:example.com`, `#room:example.com` and `!abcdefghijk:example.com` instead
-of `alice`, `room` and `abcedgghijk`.
+Options for the rules include:
+* `user_id`: Matches against the creator of the alias. Defaults to "*".
+* `alias`: Matches against the alias being created. Defaults to "*".
+* `room_id`: Matches against the room ID the alias is being pointed at. Defaults to "*"
+* `action`: Whether to "allow" or "deny" the request if the rule matches. Defaults to allow.

 Example configuration:
-
 ```yaml
-# No rule list specified. All alias creations are allowed.
-# This is the default behaviour.
 alias_creation_rules:
-```
-
-```yaml
-# A list of one rule which allows everything.
-# This has the same effect as the previous example.
-alias_creation_rules:
-  - "action": "allow"
-```
-
-```yaml
-# An empty list of rules. All alias creations are denied.
-alias_creation_rules: []
-```
-
-```yaml
-# A list of one rule which denies everything.
-# This has the same effect as the previous example.
-alias_creation_rules:
-  - "action": "deny"
-```
-
-```yaml
-# Prevent a specific user from creating aliases.
-# Allow other users to create any alias
-alias_creation_rules:
-  - user_id: "@bad_user:example.com"
+  - user_id: "bad_user"
+    alias: "spammy_alias"
+    room_id: "*"
    action: deny
-    
-  - action: allow
 ```
-
-```yaml
-# Prevent aliases being created which point to a specific room.
-alias_creation_rules:
-  - room_id: "!forbiddenRoom:example.com"
-    action: deny
-
-  - action: allow
-```
-
 ---
 ### `room_list_publication_rules`

-The `room_list_publication_rules` option allows server admins to prevent
-unwanted entries from being published in the public room list.
+The `room_list_publication_rules` option controls who can publish and
+which rooms can be published in the public room list.

 The format of this option is the same as that for
-[`alias_creation_rules`](#alias_creation_rules): an optional list of 0 or more
-rules. By default, no list is provided, meaning that all rooms may be
-published to the room list.
+`alias_creation_rules`.

-Otherwise, requests to publish a room are matched against each rule in order.
-The first rule that matches decides if the request is allowed or denied. If no
-rule matches, the request is denied. In particular, this means that configuring
-an empty list of rules will deny every alias creation request.
+If the room has one or more aliases associated with it, only one of
+the aliases needs to match the alias rule. If there are no aliases
+then only rules with `alias: *` match.

-Each rule is a YAML object containing four fields, each of which is an optional string:
-
-* `user_id`: a glob pattern that matches against the user publishing the room.
-* `alias`: a glob pattern that matches against one of published room's aliases.
-  - If the room has no aliases, the alias match fails unless `alias` is unspecified or `*`.
-  - If the room has exactly one alias, the alias match succeeds if the `alias` pattern matches that alias.
-  - If the room has two or more aliases, the alias match succeeds if the pattern matches at least one of the aliases.
-* `room_id`: a glob pattern that matches against the room ID of the room being published.
-* `action`: either `allow` or `deny`. What to do with the request if the rule matches. Defaults to `allow`.
-
-Each of the glob patterns is optional, defaulting to `*` ("match anything").
-Note that the patterns match against fully qualified IDs, e.g. against
-`@alice:example.com`, `#room:example.com` and `!abcdefghijk:example.com` instead
-of `alice`, `room` and `abcedgghijk`.
+If no rules match the request is denied. An empty list means no one
+can publish rooms.

+Options for the rules include:
+* `user_id`: Matches against the creator of the alias. Defaults to "*".
+* `alias`: Matches against any current local or canonical aliases associated with the room. Defaults to "*".
+* `room_id`: Matches against the room ID being published. Defaults to "*".
+* `action`: Whether to "allow" or "deny" the request if the rule matches. Defaults to allow.

 Example configuration:
-
 ```yaml
-# No rule list specified. Anyone may publish any room to the public list.
-# This is the default behaviour.
 room_list_publication_rules:
-```
-
-```yaml
-# A list of one rule which allows everything.
-# This has the same effect as the previous example.
-room_list_publication_rules:
-  - "action": "allow"
-```
-
-```yaml
-# An empty list of rules. No-one may publish to the room list.
-room_list_publication_rules: []
-```
-
-```yaml
-# A list of one rule which denies everything.
-# This has the same effect as the previous example.
-room_list_publication_rules:
-  - "action": "deny"
-```
-
-```yaml
-# Prevent a specific user from publishing rooms.
-# Allow other users to publish anything.
-room_list_publication_rules:
-  - user_id: "@bad_user:example.com"
-    action: deny
-    
-  - action: allow
-```
-
-```yaml
-# Prevent publication of a specific room.
-room_list_publication_rules:
-  - room_id: "!forbiddenRoom:example.com"
-    action: deny
-
-  - action: allow
-```
-
-```yaml
-# Prevent publication of rooms with at least one alias containing the word "potato".
-room_list_publication_rules:
-  - alias: "#*potato*:example.com"
-    action: deny
-
-  - action: allow
+  - user_id: "*"
+    alias: "*"
+    room_id: "*"
+    action: allow
 ```

 ---
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.

 [[package]]
 name = "alabaster"
@@ -162,29 +162,33 @@ lxml = ["lxml"]

 [[package]]
 name = "black"
-version = "23.10.0"
+version = "23.9.1"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "black-23.10.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:f8dc7d50d94063cdfd13c82368afd8588bac4ce360e4224ac399e769d6704e98"},
-    {file = "black-23.10.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:f20ff03f3fdd2fd4460b4f631663813e57dc277e37fb216463f3b907aa5a9bdd"},
-    {file = "black-23.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3d9129ce05b0829730323bdcb00f928a448a124af5acf90aa94d9aba6969604"},
-    {file = "black-23.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:960c21555be135c4b37b7018d63d6248bdae8514e5c55b71e994ad37407f45b8"},
-    {file = "black-23.10.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:30b78ac9b54cf87bcb9910ee3d499d2bc893afd52495066c49d9ee6b21eee06e"},
-    {file = "black-23.10.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:0e232f24a337fed7a82c1185ae46c56c4a6167fb0fe37411b43e876892c76699"},
-    {file = "black-23.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31946ec6f9c54ed7ba431c38bc81d758970dd734b96b8e8c2b17a367d7908171"},
-    {file = "black-23.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:c870bee76ad5f7a5ea7bd01dc646028d05568d33b0b09b7ecfc8ec0da3f3f39c"},
-    {file = "black-23.10.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:6901631b937acbee93c75537e74f69463adaf34379a04eef32425b88aca88a23"},
-    {file = "black-23.10.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:481167c60cd3e6b1cb8ef2aac0f76165843a374346aeeaa9d86765fe0dd0318b"},
-    {file = "black-23.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f74892b4b836e5162aa0452393112a574dac85e13902c57dfbaaf388e4eda37c"},
-    {file = "black-23.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:47c4510f70ec2e8f9135ba490811c071419c115e46f143e4dce2ac45afdcf4c9"},
-    {file = "black-23.10.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:76baba9281e5e5b230c9b7f83a96daf67a95e919c2dfc240d9e6295eab7b9204"},
-    {file = "black-23.10.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:a3c2ddb35f71976a4cfeca558848c2f2f89abc86b06e8dd89b5a65c1e6c0f22a"},
-    {file = "black-23.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db451a3363b1e765c172c3fd86213a4ce63fb8524c938ebd82919bf2a6e28c6a"},
-    {file = "black-23.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:7fb5fc36bb65160df21498d5a3dd330af8b6401be3f25af60c6ebfe23753f747"},
-    {file = "black-23.10.0-py3-none-any.whl", hash = "sha256:e223b731a0e025f8ef427dd79d8cd69c167da807f5710add30cdf131f13dd62e"},
-    {file = "black-23.10.0.tar.gz", hash = "sha256:31b9f87b277a68d0e99d2905edae08807c007973eaa609da5f0c62def6b7c0bd"},
+    {file = "black-23.9.1-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:d6bc09188020c9ac2555a498949401ab35bb6bf76d4e0f8ee251694664df6301"},
+    {file = "black-23.9.1-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:13ef033794029b85dfea8032c9d3b92b42b526f1ff4bf13b2182ce4e917f5100"},
+    {file = "black-23.9.1-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:75a2dc41b183d4872d3a500d2b9c9016e67ed95738a3624f4751a0cb4818fe71"},
+    {file = "black-23.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13a2e4a93bb8ca74a749b6974925c27219bb3df4d42fc45e948a5d9feb5122b7"},
+    {file = "black-23.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:adc3e4442eef57f99b5590b245a328aad19c99552e0bdc7f0b04db6656debd80"},
+    {file = "black-23.9.1-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:8431445bf62d2a914b541da7ab3e2b4f3bc052d2ccbf157ebad18ea126efb91f"},
+    {file = "black-23.9.1-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:8fc1ddcf83f996247505db6b715294eba56ea9372e107fd54963c7553f2b6dfe"},
+    {file = "black-23.9.1-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:7d30ec46de88091e4316b17ae58bbbfc12b2de05e069030f6b747dfc649ad186"},
+    {file = "black-23.9.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:031e8c69f3d3b09e1aa471a926a1eeb0b9071f80b17689a655f7885ac9325a6f"},
+    {file = "black-23.9.1-cp311-cp311-win_amd64.whl", hash = "sha256:538efb451cd50f43aba394e9ec7ad55a37598faae3348d723b59ea8e91616300"},
+    {file = "black-23.9.1-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:638619a559280de0c2aa4d76f504891c9860bb8fa214267358f0a20f27c12948"},
+    {file = "black-23.9.1-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:a732b82747235e0542c03bf352c126052c0fbc458d8a239a94701175b17d4855"},
+    {file = "black-23.9.1-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:cf3a4d00e4cdb6734b64bf23cd4341421e8953615cba6b3670453737a72ec204"},
+    {file = "black-23.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf99f3de8b3273a8317681d8194ea222f10e0133a24a7548c73ce44ea1679377"},
+    {file = "black-23.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:14f04c990259576acd093871e7e9b14918eb28f1866f91968ff5524293f9c573"},
+    {file = "black-23.9.1-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:c619f063c2d68f19b2d7270f4cf3192cb81c9ec5bc5ba02df91471d0b88c4c5c"},
+    {file = "black-23.9.1-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:6a3b50e4b93f43b34a9d3ef00d9b6728b4a722c997c99ab09102fd5efdb88325"},
+    {file = "black-23.9.1-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:c46767e8df1b7beefb0899c4a95fb43058fa8500b6db144f4ff3ca38eb2f6393"},
+    {file = "black-23.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50254ebfa56aa46a9fdd5d651f9637485068a1adf42270148cd101cdf56e0ad9"},
+    {file = "black-23.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:403397c033adbc45c2bd41747da1f7fc7eaa44efbee256b53842470d4ac5a70f"},
+    {file = "black-23.9.1-py3-none-any.whl", hash = "sha256:6ccd59584cc834b6d127628713e4b6b968e5f79572da66284532525a042549f9"},
+    {file = "black-23.9.1.tar.gz", hash = "sha256:24b6b3ff5c6d9ea08a8888f6977eae858e1f340d7260cf56d70a49823236b62d"},
 ]

 [package.dependencies]
@@ -596,20 +600,20 @@ smmap = ">=3.0.1,<6"

 [[package]]
 name = "gitpython"
-version = "3.1.40"
+version = "3.1.37"
 description = "GitPython is a Python library used to interact with Git repositories"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "GitPython-3.1.40-py3-none-any.whl", hash = "sha256:cf14627d5a8049ffbf49915732e5eddbe8134c3bdb9d476e6182b676fc573f8a"},
-    {file = "GitPython-3.1.40.tar.gz", hash = "sha256:22b126e9ffb671fdd0c129796343a02bf67bf2994b35449ffc9321aa755e18a4"},
+    {file = "GitPython-3.1.37-py3-none-any.whl", hash = "sha256:5f4c4187de49616d710a77e98ddf17b4782060a1788df441846bddefbb89ab33"},
+    {file = "GitPython-3.1.37.tar.gz", hash = "sha256:f9b9ddc0761c125d5780eab2d64be4873fc6817c2899cbcb34b02344bdc7bc54"},
 ]

 [package.dependencies]
 gitdb = ">=4.0.1,<5"

 [package.extras]
-test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mock", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-instafail", "pytest-subtests", "pytest-sugar"]
+test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"]

 [[package]]
 name = "hiredis"
@@ -763,17 +767,6 @@ files = [
    {file = "ijson-3.2.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4a3a6a2fbbe7550ffe52d151cf76065e6b89cfb3e9d0463e49a7e322a25d0426"},
    {file = "ijson-3.2.3-cp311-cp311-win32.whl", hash = "sha256:6a4db2f7fb9acfb855c9ae1aae602e4648dd1f88804a0d5cfb78c3639bcf156c"},
    {file = "ijson-3.2.3-cp311-cp311-win_amd64.whl", hash = "sha256:ccd6be56335cbb845f3d3021b1766299c056c70c4c9165fb2fbe2d62258bae3f"},
-    {file = "ijson-3.2.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:055b71bbc37af5c3c5861afe789e15211d2d3d06ac51ee5a647adf4def19c0ea"},
-    {file = "ijson-3.2.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c075a547de32f265a5dd139ab2035900fef6653951628862e5cdce0d101af557"},
-    {file = "ijson-3.2.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:457f8a5fc559478ac6b06b6d37ebacb4811f8c5156e997f0d87d708b0d8ab2ae"},
-    {file = "ijson-3.2.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9788f0c915351f41f0e69ec2618b81ebfcf9f13d9d67c6d404c7f5afda3e4afb"},
-    {file = "ijson-3.2.3-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa234ab7a6a33ed51494d9d2197fb96296f9217ecae57f5551a55589091e7853"},
-    {file = "ijson-3.2.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bdd0dc5da4f9dc6d12ab6e8e0c57d8b41d3c8f9ceed31a99dae7b2baf9ea769a"},
-    {file = "ijson-3.2.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c6beb80df19713e39e68dc5c337b5c76d36ccf69c30b79034634e5e4c14d6904"},
-    {file = "ijson-3.2.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a2973ce57afb142d96f35a14e9cfec08308ef178a2c76b8b5e1e98f3960438bf"},
-    {file = "ijson-3.2.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:105c314fd624e81ed20f925271ec506523b8dd236589ab6c0208b8707d652a0e"},
-    {file = "ijson-3.2.3-cp312-cp312-win32.whl", hash = "sha256:ac44781de5e901ce8339352bb5594fcb3b94ced315a34dbe840b4cff3450e23b"},
-    {file = "ijson-3.2.3-cp312-cp312-win_amd64.whl", hash = "sha256:0567e8c833825b119e74e10a7c29761dc65fcd155f5d4cb10f9d3b8916ef9912"},
    {file = "ijson-3.2.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:eeb286639649fb6bed37997a5e30eefcacddac79476d24128348ec890b2a0ccb"},
    {file = "ijson-3.2.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:396338a655fb9af4ac59dd09c189885b51fa0eefc84d35408662031023c110d1"},
    {file = "ijson-3.2.3-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e0243d166d11a2a47c17c7e885debf3b19ed136be2af1f5d1c34212850236ac"},
@@ -994,13 +987,13 @@ i18n = ["Babel (>=2.7)"]

 [[package]]
 name = "jsonschema"
-version = "4.19.1"
+version = "4.19.0"
 description = "An implementation of JSON Schema validation for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "jsonschema-4.19.1-py3-none-any.whl", hash = "sha256:cd5f1f9ed9444e554b38ba003af06c0a8c2868131e56bfbef0550fb450c0330e"},
-    {file = "jsonschema-4.19.1.tar.gz", hash = "sha256:ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf"},
+    {file = "jsonschema-4.19.0-py3-none-any.whl", hash = "sha256:043dc26a3845ff09d20e4420d6012a9c91c9aa8999fa184e7efcfeccb41e32cb"},
+    {file = "jsonschema-4.19.0.tar.gz", hash = "sha256:6e1e7569ac13be8139b2dd2c21a55d350066ee3f80df06c608b398cdc6f30e8f"},
 ]

 [package.dependencies]
@@ -1337,13 +1330,13 @@ test = ["aiounittest", "tox", "twisted"]

 [[package]]
 name = "matrix-synapse-ldap3"
-version = "0.3.0"
+version = "0.2.2"
 description = "An LDAP3 auth provider for Synapse"
 optional = true
 python-versions = ">=3.7"
 files = [
-    {file = "matrix-synapse-ldap3-0.3.0.tar.gz", hash = "sha256:8bb6517173164d4b9cc44f49de411d8cebdb2e705d5dd1ea1f38733c4a009e1d"},
-    {file = "matrix_synapse_ldap3-0.3.0-py3-none-any.whl", hash = "sha256:8b4d701f8702551e98cc1d8c20dbed532de5613584c08d0df22de376ba99159d"},
+    {file = "matrix-synapse-ldap3-0.2.2.tar.gz", hash = "sha256:b388d95693486eef69adaefd0fd9e84463d52fe17b0214a00efcaa669b73cb74"},
+    {file = "matrix_synapse_ldap3-0.2.2-py3-none-any.whl", hash = "sha256:66ee4c85d7952c6c27fd04c09cdfdf4847b8e8b7d6a7ada6ba1100013bda060f"},
 ]

 [package.dependencies]
@@ -1588,13 +1581,13 @@ tests = ["Sphinx", "doubles", "flake8", "flake8-quotes", "gevent", "mock", "pyte

 [[package]]
 name = "packaging"
-version = "23.2"
+version = "23.1"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
-    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+    {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"},
+    {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"},
 ]

 [[package]]
@@ -1635,65 +1628,65 @@ files = [

 [[package]]
 name = "pillow"
-version = "10.1.0"
+version = "10.0.1"
 description = "Python Imaging Library (Fork)"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "Pillow-10.1.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:1ab05f3db77e98f93964697c8efc49c7954b08dd61cff526b7f2531a22410106"},
-    {file = "Pillow-10.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6932a7652464746fcb484f7fc3618e6503d2066d853f68a4bd97193a3996e273"},
-    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5f63b5a68daedc54c7c3464508d8c12075e56dcfbd42f8c1bf40169061ae666"},
-    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0949b55eb607898e28eaccb525ab104b2d86542a85c74baf3a6dc24002edec2"},
-    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ae88931f93214777c7a3aa0a8f92a683f83ecde27f65a45f95f22d289a69e593"},
-    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b0eb01ca85b2361b09480784a7931fc648ed8b7836f01fb9241141b968feb1db"},
-    {file = "Pillow-10.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d27b5997bdd2eb9fb199982bb7eb6164db0426904020dc38c10203187ae2ff2f"},
-    {file = "Pillow-10.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7df5608bc38bd37ef585ae9c38c9cd46d7c81498f086915b0f97255ea60c2818"},
-    {file = "Pillow-10.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:41f67248d92a5e0a2076d3517d8d4b1e41a97e2df10eb8f93106c89107f38b57"},
-    {file = "Pillow-10.1.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1fb29c07478e6c06a46b867e43b0bcdb241b44cc52be9bc25ce5944eed4648e7"},
-    {file = "Pillow-10.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2cdc65a46e74514ce742c2013cd4a2d12e8553e3a2563c64879f7c7e4d28bce7"},
-    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50d08cd0a2ecd2a8657bd3d82c71efd5a58edb04d9308185d66c3a5a5bed9610"},
-    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:062a1610e3bc258bff2328ec43f34244fcec972ee0717200cb1425214fe5b839"},
-    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:61f1a9d247317fa08a308daaa8ee7b3f760ab1809ca2da14ecc88ae4257d6172"},
-    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a646e48de237d860c36e0db37ecaecaa3619e6f3e9d5319e527ccbc8151df061"},
-    {file = "Pillow-10.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:47e5bf85b80abc03be7455c95b6d6e4896a62f6541c1f2ce77a7d2bb832af262"},
-    {file = "Pillow-10.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a92386125e9ee90381c3369f57a2a50fa9e6aa8b1cf1d9c4b200d41a7dd8e992"},
-    {file = "Pillow-10.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:0f7c276c05a9767e877a0b4c5050c8bee6a6d960d7f0c11ebda6b99746068c2a"},
-    {file = "Pillow-10.1.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:a89b8312d51715b510a4fe9fc13686283f376cfd5abca8cd1c65e4c76e21081b"},
-    {file = "Pillow-10.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:00f438bb841382b15d7deb9a05cc946ee0f2c352653c7aa659e75e592f6fa17d"},
-    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d929a19f5469b3f4df33a3df2983db070ebb2088a1e145e18facbc28cae5b27"},
-    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a92109192b360634a4489c0c756364c0c3a2992906752165ecb50544c251312"},
-    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:0248f86b3ea061e67817c47ecbe82c23f9dd5d5226200eb9090b3873d3ca32de"},
-    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9882a7451c680c12f232a422730f986a1fcd808da0fd428f08b671237237d651"},
-    {file = "Pillow-10.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1c3ac5423c8c1da5928aa12c6e258921956757d976405e9467c5f39d1d577a4b"},
-    {file = "Pillow-10.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:806abdd8249ba3953c33742506fe414880bad78ac25cc9a9b1c6ae97bedd573f"},
-    {file = "Pillow-10.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:eaed6977fa73408b7b8a24e8b14e59e1668cfc0f4c40193ea7ced8e210adf996"},
-    {file = "Pillow-10.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:fe1e26e1ffc38be097f0ba1d0d07fcade2bcfd1d023cda5b29935ae8052bd793"},
-    {file = "Pillow-10.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a7e3daa202beb61821c06d2517428e8e7c1aab08943e92ec9e5755c2fc9ba5e"},
-    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24fadc71218ad2b8ffe437b54876c9382b4a29e030a05a9879f615091f42ffc2"},
-    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa1d323703cfdac2036af05191b969b910d8f115cf53093125e4058f62012c9a"},
-    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:912e3812a1dbbc834da2b32299b124b5ddcb664ed354916fd1ed6f193f0e2d01"},
-    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7dbaa3c7de82ef37e7708521be41db5565004258ca76945ad74a8e998c30af8d"},
-    {file = "Pillow-10.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9d7bc666bd8c5a4225e7ac71f2f9d12466ec555e89092728ea0f5c0c2422ea80"},
-    {file = "Pillow-10.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:baada14941c83079bf84c037e2d8b7506ce201e92e3d2fa0d1303507a8538212"},
-    {file = "Pillow-10.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:2ef6721c97894a7aa77723740a09547197533146fba8355e86d6d9a4a1056b14"},
-    {file = "Pillow-10.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0a026c188be3b443916179f5d04548092e253beb0c3e2ee0a4e2cdad72f66099"},
-    {file = "Pillow-10.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:04f6f6149f266a100374ca3cc368b67fb27c4af9f1cc8cb6306d849dcdf12616"},
-    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb40c011447712d2e19cc261c82655f75f32cb724788df315ed992a4d65696bb"},
-    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a8413794b4ad9719346cd9306118450b7b00d9a15846451549314a58ac42219"},
-    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:c9aeea7b63edb7884b031a35305629a7593272b54f429a9869a4f63a1bf04c34"},
-    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b4005fee46ed9be0b8fb42be0c20e79411533d1fd58edabebc0dd24626882cfd"},
-    {file = "Pillow-10.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4d0152565c6aa6ebbfb1e5d8624140a440f2b99bf7afaafbdbf6430426497f28"},
-    {file = "Pillow-10.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d921bc90b1defa55c9917ca6b6b71430e4286fc9e44c55ead78ca1a9f9eba5f2"},
-    {file = "Pillow-10.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfe96560c6ce2f4c07d6647af2d0f3c54cc33289894ebd88cfbb3bcd5391e256"},
-    {file = "Pillow-10.1.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:937bdc5a7f5343d1c97dc98149a0be7eb9704e937fe3dc7140e229ae4fc572a7"},
-    {file = "Pillow-10.1.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1c25762197144e211efb5f4e8ad656f36c8d214d390585d1d21281f46d556ba"},
-    {file = "Pillow-10.1.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:afc8eef765d948543a4775f00b7b8c079b3321d6b675dde0d02afa2ee23000b4"},
-    {file = "Pillow-10.1.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:883f216eac8712b83a63f41b76ddfb7b2afab1b74abbb413c5df6680f071a6b9"},
-    {file = "Pillow-10.1.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b920e4d028f6442bea9a75b7491c063f0b9a3972520731ed26c83e254302eb1e"},
-    {file = "Pillow-10.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c41d960babf951e01a49c9746f92c5a7e0d939d1652d7ba30f6b3090f27e412"},
-    {file = "Pillow-10.1.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1fafabe50a6977ac70dfe829b2d5735fd54e190ab55259ec8aea4aaea412fa0b"},
-    {file = "Pillow-10.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b834f4b16173e5b92ab6566f0473bfb09f939ba14b23b8da1f54fa63e4b623f"},
-    {file = "Pillow-10.1.0.tar.gz", hash = "sha256:e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38"},
+    {file = "Pillow-10.0.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:8f06be50669087250f319b706decf69ca71fdecd829091a37cc89398ca4dc17a"},
+    {file = "Pillow-10.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:50bd5f1ebafe9362ad622072a1d2f5850ecfa44303531ff14353a4059113b12d"},
+    {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e6a90167bcca1216606223a05e2cf991bb25b14695c518bc65639463d7db722d"},
+    {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f11c9102c56ffb9ca87134bd025a43d2aba3f1155f508eff88f694b33a9c6d19"},
+    {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:186f7e04248103482ea6354af6d5bcedb62941ee08f7f788a1c7707bc720c66f"},
+    {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:0462b1496505a3462d0f35dc1c4d7b54069747d65d00ef48e736acda2c8cbdff"},
+    {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d889b53ae2f030f756e61a7bff13684dcd77e9af8b10c6048fb2c559d6ed6eaf"},
+    {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:552912dbca585b74d75279a7570dd29fa43b6d93594abb494ebb31ac19ace6bd"},
+    {file = "Pillow-10.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:787bb0169d2385a798888e1122c980c6eff26bf941a8ea79747d35d8f9210ca0"},
+    {file = "Pillow-10.0.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:fd2a5403a75b54661182b75ec6132437a181209b901446ee5724b589af8edef1"},
+    {file = "Pillow-10.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2d7e91b4379f7a76b31c2dda84ab9e20c6220488e50f7822e59dac36b0cd92b1"},
+    {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19e9adb3f22d4c416e7cd79b01375b17159d6990003633ff1d8377e21b7f1b21"},
+    {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93139acd8109edcdeffd85e3af8ae7d88b258b3a1e13a038f542b79b6d255c54"},
+    {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:92a23b0431941a33242b1f0ce6c88a952e09feeea9af4e8be48236a68ffe2205"},
+    {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cbe68deb8580462ca0d9eb56a81912f59eb4542e1ef8f987405e35a0179f4ea2"},
+    {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:522ff4ac3aaf839242c6f4e5b406634bfea002469656ae8358644fc6c4856a3b"},
+    {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:84efb46e8d881bb06b35d1d541aa87f574b58e87f781cbba8d200daa835b42e1"},
+    {file = "Pillow-10.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:898f1d306298ff40dc1b9ca24824f0488f6f039bc0e25cfb549d3195ffa17088"},
+    {file = "Pillow-10.0.1-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:bcf1207e2f2385a576832af02702de104be71301c2696d0012b1b93fe34aaa5b"},
+    {file = "Pillow-10.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d6c9049c6274c1bb565021367431ad04481ebb54872edecfcd6088d27edd6ed"},
+    {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28444cb6ad49726127d6b340217f0627abc8732f1194fd5352dec5e6a0105635"},
+    {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de596695a75496deb3b499c8c4f8e60376e0516e1a774e7bc046f0f48cd620ad"},
+    {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:2872f2d7846cf39b3dbff64bc1104cc48c76145854256451d33c5faa55c04d1a"},
+    {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:4ce90f8a24e1c15465048959f1e94309dfef93af272633e8f37361b824532e91"},
+    {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ee7810cf7c83fa227ba9125de6084e5e8b08c59038a7b2c9045ef4dde61663b4"},
+    {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1be1c872b9b5fcc229adeadbeb51422a9633abd847c0ff87dc4ef9bb184ae08"},
+    {file = "Pillow-10.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:98533fd7fa764e5f85eebe56c8e4094db912ccbe6fbf3a58778d543cadd0db08"},
+    {file = "Pillow-10.0.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:764d2c0daf9c4d40ad12fbc0abd5da3af7f8aa11daf87e4fa1b834000f4b6b0a"},
+    {file = "Pillow-10.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fcb59711009b0168d6ee0bd8fb5eb259c4ab1717b2f538bbf36bacf207ef7a68"},
+    {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:697a06bdcedd473b35e50a7e7506b1d8ceb832dc238a336bd6f4f5aa91a4b500"},
+    {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f665d1e6474af9f9da5e86c2a3a2d2d6204e04d5af9c06b9d42afa6ebde3f21"},
+    {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:2fa6dd2661838c66f1a5473f3b49ab610c98a128fc08afbe81b91a1f0bf8c51d"},
+    {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:3a04359f308ebee571a3127fdb1bd01f88ba6f6fb6d087f8dd2e0d9bff43f2a7"},
+    {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:723bd25051454cea9990203405fa6b74e043ea76d4968166dfd2569b0210886a"},
+    {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:71671503e3015da1b50bd18951e2f9daf5b6ffe36d16f1eb2c45711a301521a7"},
+    {file = "Pillow-10.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:44e7e4587392953e5e251190a964675f61e4dae88d1e6edbe9f36d6243547ff3"},
+    {file = "Pillow-10.0.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:3855447d98cced8670aaa63683808df905e956f00348732448b5a6df67ee5849"},
+    {file = "Pillow-10.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ed2d9c0704f2dc4fa980b99d565c0c9a543fe5101c25b3d60488b8ba80f0cce1"},
+    {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5bb289bb835f9fe1a1e9300d011eef4d69661bb9b34d5e196e5e82c4cb09b37"},
+    {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a0d3e54ab1df9df51b914b2233cf779a5a10dfd1ce339d0421748232cea9876"},
+    {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:2cc6b86ece42a11f16f55fe8903595eff2b25e0358dec635d0a701ac9586588f"},
+    {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:ca26ba5767888c84bf5a0c1a32f069e8204ce8c21d00a49c90dabeba00ce0145"},
+    {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f0b4b06da13275bc02adfeb82643c4a6385bd08d26f03068c2796f60d125f6f2"},
+    {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bc2e3069569ea9dbe88d6b8ea38f439a6aad8f6e7a6283a38edf61ddefb3a9bf"},
+    {file = "Pillow-10.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:8b451d6ead6e3500b6ce5c7916a43d8d8d25ad74b9102a629baccc0808c54971"},
+    {file = "Pillow-10.0.1-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:32bec7423cdf25c9038fef614a853c9d25c07590e1a870ed471f47fb80b244db"},
+    {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cf63d2c6928b51d35dfdbda6f2c1fddbe51a6bc4a9d4ee6ea0e11670dd981e"},
+    {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f6d3d4c905e26354e8f9d82548475c46d8e0889538cb0657aa9c6f0872a37aa4"},
+    {file = "Pillow-10.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:847e8d1017c741c735d3cd1883fa7b03ded4f825a6e5fcb9378fd813edee995f"},
+    {file = "Pillow-10.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:7f771e7219ff04b79e231d099c0a28ed83aa82af91fd5fa9fdb28f5b8d5addaf"},
+    {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:459307cacdd4138edee3875bbe22a2492519e060660eaf378ba3b405d1c66317"},
+    {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b059ac2c4c7a97daafa7dc850b43b2d3667def858a4f112d1aa082e5c3d6cf7d"},
+    {file = "Pillow-10.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d6caf3cd38449ec3cd8a68b375e0c6fe4b6fd04edb6c9766b55ef84a6e8ddf2d"},
+    {file = "Pillow-10.0.1.tar.gz", hash = "sha256:d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d"},
 ]

 [package.extras]
@@ -1976,23 +1969,20 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"

 [[package]]
 name = "pygithub"
-version = "2.1.1"
+version = "1.59.1"
 description = "Use the full Github API v3"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "PyGithub-2.1.1-py3-none-any.whl", hash = "sha256:4b528d5d6f35e991ea5fd3f942f58748f24938805cb7fcf24486546637917337"},
-    {file = "PyGithub-2.1.1.tar.gz", hash = "sha256:ecf12c2809c44147bce63b047b3d2e9dac8a41b63e90fcb263c703f64936b97c"},
+    {file = "PyGithub-1.59.1-py3-none-any.whl", hash = "sha256:3d87a822e6c868142f0c2c4bf16cce4696b5a7a4d142a7bd160e1bdf75bc54a9"},
+    {file = "PyGithub-1.59.1.tar.gz", hash = "sha256:c44e3a121c15bf9d3a5cc98d94c9a047a5132a9b01d22264627f58ade9ddc217"},
 ]

 [package.dependencies]
-Deprecated = "*"
+deprecated = "*"
 pyjwt = {version = ">=2.4.0", extras = ["crypto"]}
 pynacl = ">=1.4.0"
-python-dateutil = "*"
 requests = ">=2.14.0"
-typing-extensions = ">=4.0.0"
-urllib3 = ">=1.26.0"

 [[package]]
 name = "pygments"
@@ -2136,7 +2126,7 @@ s2repoze = ["paste", "repoze.who", "zope.interface"]
 name = "python-dateutil"
 version = "2.8.2"
 description = "Extensions to the standard Python datetime module"
-optional = false
+optional = true
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
@@ -2493,13 +2483,13 @@ doc = ["Sphinx", "sphinx-rtd-theme"]

 [[package]]
 name = "sentry-sdk"
-version = "1.32.0"
+version = "1.31.0"
 description = "Python client for Sentry (https://sentry.io)"
 optional = true
 python-versions = "*"
 files = [
-    {file = "sentry-sdk-1.32.0.tar.gz", hash = "sha256:935e8fbd7787a3702457393b74b13d89a5afb67185bc0af85c00cb27cbd42e7c"},
-    {file = "sentry_sdk-1.32.0-py2.py3-none-any.whl", hash = "sha256:eeb0b3550536f3bbc05bb1c7e0feb3a78d74acb43b607159a606ed2ec0a33a4d"},
+    {file = "sentry-sdk-1.31.0.tar.gz", hash = "sha256:6de2e88304873484207fed836388e422aeff000609b104c802749fd89d56ba5b"},
+    {file = "sentry_sdk-1.31.0-py2.py3-none-any.whl", hash = "sha256:64a7141005fb775b9db298a30de93e3b83e0ddd1232dc6f36eb38aebc1553291"},
 ]

 [package.dependencies]
@@ -3069,18 +3059,15 @@ files = [

 [[package]]
 name = "types-jsonschema"
-version = "4.19.0.3"
+version = "4.17.0.10"
 description = "Typing stubs for jsonschema"
 optional = false
-python-versions = ">=3.8"
+python-versions = "*"
 files = [
-    {file = "types-jsonschema-4.19.0.3.tar.gz", hash = "sha256:e0fc0f5d51fd0988bf193be42174a5376b0096820ff79505d9c1b66de23f0581"},
-    {file = "types_jsonschema-4.19.0.3-py3-none-any.whl", hash = "sha256:5cedbb661e5ca88d95b94b79902423e3f97a389c245e5fe0ab384122f27d56b9"},
+    {file = "types-jsonschema-4.17.0.10.tar.gz", hash = "sha256:8e979db34d69bc9f9b3d6e8b89bdbc60b3a41cfce4e1fb87bf191d205c7f5098"},
+    {file = "types_jsonschema-4.17.0.10-py3-none-any.whl", hash = "sha256:3aa2a89afbd9eaa6ce0c15618b36f02692a621433889ce73014656f7d8caf971"},
 ]

-[package.dependencies]
-referencing = "*"
-
 [[package]]
 name = "types-netaddr"
 version = "0.9.0.1"
@@ -3105,13 +3092,13 @@ files = [

 [[package]]
 name = "types-pillow"
-version = "10.1.0.0"
+version = "10.0.0.3"
 description = "Typing stubs for Pillow"
 optional = false
-python-versions = ">=3.7"
+python-versions = "*"
 files = [
-    {file = "types-Pillow-10.1.0.0.tar.gz", hash = "sha256:0f5e7cf010ed226800cb5821e87781e5d0e81257d948a9459baa74a8c8b7d822"},
-    {file = "types_Pillow-10.1.0.0-py3-none-any.whl", hash = "sha256:f97f596b6a39ddfd26da3eb67421062193e10732d2310f33898d36f9694331b5"},
+    {file = "types-Pillow-10.0.0.3.tar.gz", hash = "sha256:ae0c877d363da349bbb82c5463c9e78037290cc07d3714cb0ceaf5d2f7f5c825"},
+    {file = "types_Pillow-10.0.0.3-py3-none-any.whl", hash = "sha256:54a49f3c6a3f5e95ebeee396d7773dde22ce2515d594f9c0596c0a983558f0d4"},
 ]

 [[package]]
@@ -3152,17 +3139,17 @@ files = [

 [[package]]
 name = "types-requests"
-version = "2.31.0.10"
+version = "2.31.0.2"
 description = "Typing stubs for requests"
 optional = false
-python-versions = ">=3.7"
+python-versions = "*"
 files = [
-    {file = "types-requests-2.31.0.10.tar.gz", hash = "sha256:dc5852a76f1eaf60eafa81a2e50aefa3d1f015c34cf0cba130930866b1b22a92"},
-    {file = "types_requests-2.31.0.10-py3-none-any.whl", hash = "sha256:b32b9a86beffa876c0c3ac99a4cd3b8b51e973fb8e3bd4e0a6bb32c7efad80fc"},
+    {file = "types-requests-2.31.0.2.tar.gz", hash = "sha256:6aa3f7faf0ea52d728bb18c0a0d1522d9bfd8c72d26ff6f61bfc3d06a411cf40"},
+    {file = "types_requests-2.31.0.2-py3-none-any.whl", hash = "sha256:56d181c85b5925cbc59f4489a57e72a8b2166f18273fd8ba7b6fe0c0b986f12a"},
 ]

 [package.dependencies]
-urllib3 = ">=2"
+types-urllib3 = "*"

 [[package]]
 name = "types-setuptools"
@@ -3175,6 +3162,17 @@ files = [
    {file = "types_setuptools-68.2.0.0-py3-none-any.whl", hash = "sha256:77edcc843e53f8fc83bb1a840684841f3dc804ec94562623bfa2ea70d5a2ba1b"},
 ]

+[[package]]
+name = "types-urllib3"
+version = "1.26.25.8"
+description = "Typing stubs for urllib3"
+optional = false
+python-versions = "*"
+files = [
+    {file = "types-urllib3-1.26.25.8.tar.gz", hash = "sha256:ecf43c42d8ee439d732a1110b4901e9017a79a38daca26f08e42c8460069392c"},
+    {file = "types_urllib3-1.26.25.8-py3-none-any.whl", hash = "sha256:95ea847fbf0bf675f50c8ae19a665baedcf07e6b4641662c4c3c72e7b2edf1a9"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.8.0"
@@ -3199,20 +3197,19 @@ files = [

 [[package]]
 name = "urllib3"
-version = "2.0.7"
+version = "1.26.17"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 files = [
-    {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"},
-    {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"},
+    {file = "urllib3-1.26.17-py2.py3-none-any.whl", hash = "sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b"},
+    {file = "urllib3-1.26.17.tar.gz", hash = "sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21"},
 ]

 [package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
-secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"]
-socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
-zstd = ["zstandard (>=0.18.0)"]
+brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]

 [[package]]
 name = "webencodings"
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.95.0"
+version = "1.94.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"
@@ -33,7 +33,6 @@ DISTS = (
    "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: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)
 )

@@ -684,10 +684,6 @@ def full(gh_token: str) -> None:
    click.echo("1. If this is a security release, read the security wiki page.")
    click.echo("2. Check for any release blockers before proceeding.")
    click.echo("    https://github.com/matrix-org/synapse/labels/X-Release-Blocker")
-    click.echo(
-        "3. Check for any other special release notes, including announcements to add to the changelog or special deployment instructions."
-    )
-    click.echo("    See the 'Synapse Maintainer Report'.")

    click.confirm("Ready?", abort=True)

@@ -50,7 +50,7 @@ def request_registration(
    url = "%s/_synapse/admin/v1/register" % (server_location.rstrip("/"),)

    # Get the nonce
-    r = requests.get(url)
+    r = requests.get(url, verify=False)

    if r.status_code != 200:
        _print("ERROR! Received %d %s" % (r.status_code, r.reason))
@@ -88,7 +88,7 @@ def request_registration(
    }

    _print("Sending registration request...")
-    r = requests.post(url, json=data)
+    r = requests.post(url, json=data, verify=False)

    if r.status_code != 200:
        _print("ERROR! Received %d %s" % (r.status_code, r.reason))
@@ -15,6 +15,7 @@
 import enum
 from typing import TYPE_CHECKING, Any, Optional

+import attr
 import attr.validators

 from synapse.api.errors import LimitExceededError
@@ -418,9 +419,3 @@ class ExperimentalConfig(Config):
        self.msc4028_push_encrypted_events = experimental.get(
            "msc4028_push_encrypted_events", False
        )
-
-        # MSC4072: Return an empty dict from /keys/claim for unknown devices or those
-        # with exhausted OTKs
-        self.msc4072_empty_dict_for_exhausted_devices = experimental.get(
-            "msc4072_empty_dict_for_exhausted_devices", False
-        )
@@ -368,14 +368,9 @@ class ServerConfig(Config):

        # Whether to enable user presence.
        presence_config = config.get("presence") or {}
-        presence_enabled = presence_config.get("enabled")
-        if presence_enabled is None:
-            presence_enabled = config.get("use_presence", True)
-
-        # Whether presence is enabled *at all*.
-        self.presence_enabled = bool(presence_enabled)
-        # Whether to internally track presence, requires that presence is enabled,
-        self.track_presence = self.presence_enabled and presence_enabled != "untracked"
+        self.use_presence = presence_config.get("enabled")
+        if self.use_presence is None:
+            self.use_presence = config.get("use_presence", True)

        # Custom presence router module
        # This is the legacy way of configuring it (the config should now be put in the modules section)
@@ -358,9 +358,9 @@ class WorkerConfig(Config):
                "Must only specify one instance to handle `account_data` messages."
            )

-        if len(self.writers.receipts) == 0:
+        if len(self.writers.receipts) != 1:
            raise ConfigError(
-                "Must specify at least one instance to handle `receipts` messages."
+                "Must only specify one instance to handle `receipts` messages."
            )

        if len(self.writers.events) == 0:
@@ -17,7 +17,6 @@ import re
 from typing import (
    TYPE_CHECKING,
    Any,
-    Awaitable,
    Callable,
    Dict,
    Iterable,
@@ -46,7 +45,6 @@ from . import EventBase

 if TYPE_CHECKING:
    from synapse.handlers.relations import BundledAggregations
-    from synapse.server import HomeServer


 # Split strings on "." but not "\." (or "\\\.").
@@ -58,13 +56,6 @@ CANONICALJSON_MAX_INT = (2**53) - 1
 CANONICALJSON_MIN_INT = -CANONICALJSON_MAX_INT


-# Module API callback that allows adding fields to the unsigned section of
-# events that are sent to clients.
-ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK = Callable[
-    [EventBase], Awaitable[JsonDict]
-]
-
-
 def prune_event(event: EventBase) -> EventBase:
    """Returns a pruned version of the given event, which removes all keys we
    don't know about or think could potentially be dodgy.
@@ -518,13 +509,7 @@ class EventClientSerializer:
    clients.
    """

-    def __init__(self, hs: "HomeServer") -> None:
-        self._store = hs.get_datastores().main
-        self._add_extra_fields_to_unsigned_client_event_callbacks: List[
-            ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
-        ] = []
-
-    async def serialize_event(
+    def serialize_event(
        self,
        event: Union[JsonDict, EventBase],
        time_now: int,
@@ -550,21 +535,10 @@ class EventClientSerializer:

        serialized_event = serialize_event(event, time_now, config=config)

-        new_unsigned = {}
-        for callback in self._add_extra_fields_to_unsigned_client_event_callbacks:
-            u = await callback(event)
-            new_unsigned.update(u)
-
-        if new_unsigned:
-            # We do the `update` this way round so that modules can't clobber
-            # existing fields.
-            new_unsigned.update(serialized_event["unsigned"])
-            serialized_event["unsigned"] = new_unsigned
-
        # Check if there are any bundled aggregations to include with the event.
        if bundle_aggregations:
            if event.event_id in bundle_aggregations:
-                await self._inject_bundled_aggregations(
+                self._inject_bundled_aggregations(
                    event,
                    time_now,
                    config,
@@ -574,7 +548,7 @@ class EventClientSerializer:

        return serialized_event

-    async def _inject_bundled_aggregations(
+    def _inject_bundled_aggregations(
        self,
        event: EventBase,
        time_now: int,
@@ -616,7 +590,7 @@ class EventClientSerializer:
            # said that we should only include the `event_id`, `origin_server_ts` and
            # `sender` of the edit; however MSC3925 proposes extending it to the whole
            # of the edit, which is what we do here.
-            serialized_aggregations[RelationTypes.REPLACE] = await self.serialize_event(
+            serialized_aggregations[RelationTypes.REPLACE] = self.serialize_event(
                event_aggregations.replace,
                time_now,
                config=config,
@@ -626,7 +600,7 @@ class EventClientSerializer:
        if event_aggregations.thread:
            thread = event_aggregations.thread

-            serialized_latest_event = await self.serialize_event(
+            serialized_latest_event = self.serialize_event(
                thread.latest_event,
                time_now,
                config=config,
@@ -649,7 +623,7 @@ class EventClientSerializer:
                "m.relations", {}
            ).update(serialized_aggregations)

-    async def serialize_events(
+    def serialize_events(
        self,
        events: Iterable[Union[JsonDict, EventBase]],
        time_now: int,
@@ -671,7 +645,7 @@ class EventClientSerializer:
            The list of serialized events
        """
        return [
-            await self.serialize_event(
+            self.serialize_event(
                event,
                time_now,
                config=config,
@@ -680,14 +654,6 @@ class EventClientSerializer:
            for event in events
        ]

-    def register_add_extra_fields_to_unsigned_client_event_callback(
-        self, callback: ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
-    ) -> None:
-        """Register a callback that returns additions to the unsigned section of
-        serialized events.
-        """
-        self._add_extra_fields_to_unsigned_client_event_callbacks.append(callback)
-

 _PowerLevel = Union[str, int]
 PowerLevelsContent = Mapping[str, Union[_PowerLevel, Mapping[str, _PowerLevel]]]
@@ -84,7 +84,7 @@ from synapse.replication.http.federation import (
 from synapse.storage.databases.main.lock import Lock
 from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
 from synapse.storage.roommember import MemberSummary
-from synapse.types import JsonDict, JsonSerializable, StateMap, get_domain_from_id
+from synapse.types import JsonDict, StateMap, get_domain_from_id
 from synapse.util import unwrapFirstError
 from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results
 from synapse.util.caches.response_cache import ResponseCache
@@ -1000,13 +1000,19 @@ class FederationServer(FederationBase):
        self, query: List[Tuple[str, str, str, int]], always_include_fallback_keys: bool
    ) -> Dict[str, Any]:
        log_kv({"message": "Claiming one time keys.", "user, device pairs": query})
-        json_result: Dict[str, Dict[str, Dict[str, JsonSerializable]]] = {}
-        await self._e2e_keys_handler.claim_local_one_time_keys(
-            query,
-            always_include_fallback_keys=always_include_fallback_keys,
-            result_dict=json_result,
+        results = await self._e2e_keys_handler.claim_local_one_time_keys(
+            query, always_include_fallback_keys=always_include_fallback_keys
        )

+        json_result: Dict[str, Dict[str, Dict[str, JsonDict]]] = {}
+        for result in results:
+            for user_id, device_keys in result.items():
+                for device_id, keys in device_keys.items():
+                    for key_id, key in keys.items():
+                        json_result.setdefault(user_id, {}).setdefault(device_id, {})[
+                            key_id
+                        ] = key
+
        logger.info(
            "Claimed one-time-keys: %s",
            ",".join(
@@ -1389,7 +1395,7 @@ class FederationHandlerRegistry:
        self._edu_type_to_instance[edu_type] = instance_names

    async def on_edu(self, edu_type: str, origin: str, content: dict) -> None:
-        if not self.config.server.track_presence and edu_type == EduTypes.PRESENCE:
+        if not self.config.server.use_presence and edu_type == EduTypes.PRESENCE:
            return

        # Check if we have a handler on this instance
@@ -844,7 +844,7 @@ class FederationSender(AbstractFederationSender):
        destinations (list[str])
        """

-        if not states or not self.hs.config.server.track_presence:
+        if not states or not self.hs.config.server.use_presence:
            # No-op if presence is disabled.
            return

@@ -47,7 +47,6 @@ from synapse.types import (
    DeviceListUpdates,
    JsonDict,
    JsonMapping,
-    MultiWriterStreamToken,
    RoomAlias,
    RoomStreamToken,
    StreamKeyType,
@@ -218,7 +217,7 @@ class ApplicationServicesHandler:
    def notify_interested_services_ephemeral(
        self,
        stream_key: StreamKeyType,
-        new_token: Union[int, RoomStreamToken, MultiWriterStreamToken],
+        new_token: Union[int, RoomStreamToken],
        users: Collection[Union[str, UserID]],
    ) -> None:
        """
@@ -260,6 +259,19 @@ class ApplicationServicesHandler:
        ):
            return

+        # Assert that new_token is an integer (and not a RoomStreamToken).
+        # All of the supported streams that this function handles use an
+        # integer to track progress (rather than a RoomStreamToken - a
+        # vector clock implementation) as they don't support multiple
+        # stream writers.
+        #
+        # As a result, we simply assert that new_token is an integer.
+        # If we do end up needing to pass a RoomStreamToken down here
+        # in the future, using RoomStreamToken.stream (the minimum stream
+        # position) to convert to an ascending integer value should work.
+        # Additional context: https://github.com/matrix-org/synapse/pull/11137
+        assert isinstance(new_token, int)
+
        # Ignore to-device messages if the feature flag is not enabled
        if (
            stream_key == StreamKeyType.TO_DEVICE
@@ -274,9 +286,6 @@ class ApplicationServicesHandler:
        ):
            return

-        # We know we're not a `RoomStreamToken` at this point.
-        assert not isinstance(new_token, RoomStreamToken)
-
        # Check whether there are any appservices which have registered to receive
        # ephemeral events.
        #
@@ -318,7 +327,7 @@ class ApplicationServicesHandler:
        self,
        services: List[ApplicationService],
        stream_key: StreamKeyType,
-        new_token: Union[int, MultiWriterStreamToken],
+        new_token: int,
        users: Collection[Union[str, UserID]],
    ) -> None:
        logger.debug("Checking interested services for %s", stream_key)
@@ -331,7 +340,6 @@ class ApplicationServicesHandler:
                    #
                    # Instead we simply grab the latest typing updates in _handle_typing
                    # and, if they apply to this application service, send it off.
-                    assert isinstance(new_token, int)
                    events = await self._handle_typing(service, new_token)
                    if events:
                        self.scheduler.enqueue_for_appservice(service, ephemeral=events)
@@ -342,23 +350,15 @@ class ApplicationServicesHandler:
                    (service.id, stream_key)
                ):
                    if stream_key == StreamKeyType.RECEIPT:
-                        assert isinstance(new_token, MultiWriterStreamToken)
-
-                        # We store appservice tokens as integers, so we ignore
-                        # the `instance_map` components and instead simply
-                        # follow the base stream position.
-                        new_token = MultiWriterStreamToken(stream=new_token.stream)
-
                        events = await self._handle_receipts(service, new_token)
                        self.scheduler.enqueue_for_appservice(service, ephemeral=events)

                        # Persist the latest handled stream token for this appservice
                        await self.store.set_appservice_stream_type_pos(
-                            service, "read_receipt", new_token.stream
+                            service, "read_receipt", new_token
                        )

                    elif stream_key == StreamKeyType.PRESENCE:
-                        assert isinstance(new_token, int)
                        events = await self._handle_presence(service, users, new_token)
                        self.scheduler.enqueue_for_appservice(service, ephemeral=events)

@@ -368,7 +368,6 @@ class ApplicationServicesHandler:
                        )

                    elif stream_key == StreamKeyType.TO_DEVICE:
-                        assert isinstance(new_token, int)
                        # Retrieve a list of to-device message events, as well as the
                        # maximum stream token of the messages we were able to retrieve.
                        to_device_messages = await self._get_to_device_messages(
@@ -384,7 +383,6 @@ class ApplicationServicesHandler:
                        )

                    elif stream_key == StreamKeyType.DEVICE_LIST:
-                        assert isinstance(new_token, int)
                        device_list_summary = await self._get_device_list_summary(
                            service, new_token
                        )
@@ -434,7 +432,7 @@ class ApplicationServicesHandler:
        return typing

    async def _handle_receipts(
-        self, service: ApplicationService, new_token: MultiWriterStreamToken
+        self, service: ApplicationService, new_token: int
    ) -> List[JsonMapping]:
        """
        Return the latest read receipts that the given application service should receive.
@@ -457,17 +455,15 @@ class ApplicationServicesHandler:
        from_key = await self.store.get_type_stream_id_for_appservice(
            service, "read_receipt"
        )
-        if new_token is not None and new_token.stream <= from_key:
+        if new_token is not None and new_token <= from_key:
            logger.debug(
                "Rejecting token lower than or equal to stored: %s" % (new_token,)
            )
            return []

-        from_token = MultiWriterStreamToken(stream=from_key)
-
        receipts_source = self.event_sources.sources.receipt
        receipts, _ = await receipts_source.get_new_events_as(
-            service=service, from_key=from_token, to_key=new_token
+            service=service, from_key=from_key, to_key=new_token
        )
        return receipts

@@ -861,7 +857,7 @@ class ApplicationServicesHandler:

        Returns:
            A tuple of:
-                A map of user ID -> a map device ID -> a map of key ID -> key.
+                A map of user ID -> a map device ID -> a map of key ID -> JSON.

                A copy of the input which has not been fulfilled (either because
                they are not appservice users or the appservice does not support
@@ -103,10 +103,10 @@ class DeactivateAccountHandler:
        # Attempt to unbind any known bound threepids to this account from identity
        # server(s).
        bound_threepids = await self.store.user_get_bound_threepids(user_id)
-        for medium, address in bound_threepids:
+        for threepid in bound_threepids:
            try:
                result = await self._identity_handler.try_unbind_threepid(
-                    user_id, medium, address, id_server
+                    user_id, threepid["medium"], threepid["address"], id_server
                )
            except Exception:
                # Do we want this to be a fatal error or should we carry on?
@@ -14,7 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from typing import TYPE_CHECKING, Dict, Iterable, List, Mapping, Optional, Set, Tuple
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    Iterable,
+    List,
+    Mapping,
+    Optional,
+    Set,
+    Tuple,
+)

 from synapse.api import errors
 from synapse.api.constants import EduTypes, EventTypes
@@ -31,7 +41,6 @@ from synapse.metrics.background_process_metrics import (
    run_as_background_process,
    wrap_as_background_process,
 )
-from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
 from synapse.types import (
    JsonDict,
    JsonMapping,
@@ -592,8 +601,6 @@ class DeviceHandler(DeviceWorkerHandler):
                )

            # Delete device messages asynchronously and in batches using the task scheduler
-            # We specify an upper stream id to avoid deleting non delivered messages
-            # if an user re-uses a device ID.
            await self._task_scheduler.schedule_task(
                DELETE_DEVICE_MSGS_TASK_NAME,
                resource_id=device_id,
@@ -1001,14 +1008,14 @@ class DeviceHandler(DeviceWorkerHandler):


 def _update_device_from_client_ips(
-    device: JsonDict, client_ips: Mapping[Tuple[str, str], DeviceLastConnectionInfo]
+    device: JsonDict, client_ips: Mapping[Tuple[str, str], Mapping[str, Any]]
 ) -> None:
-    ip = client_ips.get((device["user_id"], device["device_id"]))
+    ip = client_ips.get((device["user_id"], device["device_id"]), {})
    device.update(
        {
-            "last_seen_user_agent": ip.user_agent if ip else None,
-            "last_seen_ts": ip.last_seen if ip else None,
-            "last_seen_ip": ip.ip if ip else None,
+            "last_seen_user_agent": ip.get("user_agent"),
+            "last_seen_ts": ip.get("last_seen"),
+            "last_seen_ip": ip.get("ip"),
        }
    )

@@ -32,7 +32,6 @@ from synapse.logging.opentracing import log_kv, set_tag, tag_args, trace
 from synapse.types import (
    JsonDict,
    JsonMapping,
-    JsonSerializable,
    UserID,
    get_domain_from_id,
    get_verify_key_from_cross_signing_key,
@@ -561,8 +560,7 @@ class E2eKeysHandler:
        self,
        local_query: List[Tuple[str, str, str, int]],
        always_include_fallback_keys: bool,
-        result_dict: Dict[str, Dict[str, Dict[str, JsonSerializable]]],
-    ) -> None:
+    ) -> Iterable[Dict[str, Dict[str, Dict[str, JsonDict]]]]:
        """Claim one time keys for local users.

        1. Attempt to claim OTKs from the database.
@@ -572,19 +570,10 @@ class E2eKeysHandler:
        Args:
            local_query: An iterable of tuples of (user ID, device ID, algorithm).
            always_include_fallback_keys: True to always include fallback keys.
-            result_dict: A dict to update with the results.
-                {user_id -> { device_id -> { key_id -> key string/object }}}
-        """

-        def update_result_dict(
-            results: Mapping[str, Mapping[str, Mapping[str, JsonSerializable]]]
-        ) -> None:
-            """Stash results from a store query in `result_dict`"""
-            for user_id, device_keys in results.items():
-                user_result_dict = result_dict.setdefault(user_id, {})
-                for device_id, keys in device_keys.items():
-                    device_result_dict = user_result_dict.setdefault(device_id, {})
-                    device_result_dict.update(keys)
+        Returns:
+            An iterable of maps of user ID -> a map device ID -> a map of key ID -> JSON bytes.
+        """

        # Cap the number of OTKs that can be claimed at once to avoid abuse.
        local_query = [
@@ -592,14 +581,7 @@ class E2eKeysHandler:
            for user_id, device_id, algorithm, count in local_query
        ]

-        # prepopulate the response to make sure that all queried users/devices are
-        # included, even if the user/device is unknown or has run out of OTKs
-        if self.config.experimental.msc4072_empty_dict_for_exhausted_devices:
-            for user_id, device_id, _, _ in local_query:
-                result_dict.setdefault(user_id, {}).setdefault(device_id, {})
-
        otk_results, not_found = await self.store.claim_e2e_one_time_keys(local_query)
-        update_result_dict(otk_results)

        # If the application services have not provided any keys via the C-S
        # API, query it directly for one-time keys.
@@ -610,7 +592,6 @@ class E2eKeysHandler:
                appservice_results,
                not_found,
            ) = await self._appservice_handler.claim_e2e_one_time_keys(not_found)
-            update_result_dict(appservice_results)
        else:
            appservice_results = {}

@@ -665,7 +646,10 @@ class E2eKeysHandler:
        # For each user that does not have a one-time keys available, see if
        # there is a fallback key.
        fallback_results = await self.store.claim_e2e_fallback_keys(fallback_query)
-        update_result_dict(fallback_results)
+
+        # Return the results in order, each item from the input query should
+        # only appear once in the combined list.
+        return (otk_results, appservice_results, fallback_results)

    @trace
    async def claim_one_time_keys(
@@ -675,25 +659,6 @@ class E2eKeysHandler:
        timeout: Optional[int],
        always_include_fallback_keys: bool,
    ) -> JsonDict:
-        """
-        Handle a /keys/claim request.
-
-        Handles requests for local users with a db lookup, and makes federation
-        requests for remote users.
-
-        Args:
-            query: map from user ID, to map from device ID, to map from algorithm name
-                to number of keys needed
-                (``{user_id: {device_id: {algorithm: number_of keys}}}``)
-
-            user: The user id of the requesting user
-
-            timeout: number of milliseconds to wait for the response from remote servers.
-                ``config.federation.client_timeout_ms`` by default.
-
-            always_include_fallback_keys: True to always include fallback keys, even
-                for devices which still have one-time keys.
-        """
        local_query: List[Tuple[str, str, str, int]] = []
        remote_queries: Dict[str, Dict[str, Dict[str, Dict[str, int]]]] = {}

@@ -707,19 +672,22 @@ class E2eKeysHandler:
                domain = get_domain_from_id(user_id)
                remote_queries.setdefault(domain, {})[user_id] = one_time_keys

-        log_kv(
-            {
-                "message": "claiming one time keys",
-                "local query": local_query,
-                "remote queries, by server": remote_queries,
-            }
+        set_tag("local_key_query", str(local_query))
+        set_tag("remote_key_query", str(remote_queries))
+
+        results = await self.claim_local_one_time_keys(
+            local_query, always_include_fallback_keys
        )

        # A map of user ID -> device ID -> key ID -> key.
-        json_result: Dict[str, Dict[str, Dict[str, JsonSerializable]]] = {}
-        await self.claim_local_one_time_keys(
-            local_query, always_include_fallback_keys, json_result
-        )
+        json_result: Dict[str, Dict[str, Dict[str, JsonDict]]] = {}
+        for result in results:
+            for user_id, device_keys in result.items():
+                for device_id, keys in device_keys.items():
+                    for key_id, key in keys.items():
+                        json_result.setdefault(user_id, {}).setdefault(
+                            device_id, {}
+                        ).update({key_id: key})

        # Remote failures.
        failures: Dict[str, JsonDict] = {}
@@ -732,18 +700,9 @@ class E2eKeysHandler:
                remote_result = await self.federation.claim_client_keys(
                    user, destination, device_keys, timeout=timeout
                )
-                try:
-                    destination_result = filter_remote_claimed_keys(
-                        device_keys,
-                        remote_result,
-                        self.config.experimental.msc4072_empty_dict_for_exhausted_devices,
-                    )
-                except Exception as e:
-                    logger.warning(
-                        f"Error parsing /keys/claim response from server {destination}",
-                        e,
-                    )
-                    raise
+                for user_id, keys in remote_result["one_time_keys"].items():
+                    if user_id in device_keys:
+                        json_result[user_id] = keys

            except Exception as e:
                failure = _exception_to_failure(e)
@@ -751,11 +710,6 @@ class E2eKeysHandler:
                set_tag("error", True)
                set_tag("reason", str(failure))

-            else:
-                # only populate json_result once we know there will not be an entry in
-                # failures for this destination.
-                json_result.update(destination_result)
-
        await make_deferred_yieldable(
            defer.gatherResults(
                [
@@ -1671,51 +1625,3 @@ class SigningKeyEduUpdater:
                device_ids = device_ids + new_device_ids

            await self._device_handler.notify_device_update(user_id, device_ids)
-
-
-def filter_remote_claimed_keys(
-    destination_query: Dict[str, Dict[str, Dict[str, int]]],
-    remote_response: JsonDict,
-    msc4072_empty_dict_for_exhausted_devices: bool,
-) -> JsonDict:
-    """
-    Process the response from a federation /keys/claim request
-
-    Checks that there are no redundant entries, and that all the entries that
-    should be there are present.
-
-    Args:
-        destination_query: user->device->key map that was sent in the request to
-           this server
-        remote_response: response from the remote server
-        msc4072_empty_dict_for_exhausted_devices: true to include an entry in the
-           result for every queried device
-
-    Returns:
-        user->device->key map to be merged into the results
-    """
-    remote_otks = remote_response["one_time_keys"]
-
-    destination_result: JsonDict = {}
-
-    if msc4072_empty_dict_for_exhausted_devices:
-        # We need to make sure there is an entry in destination_result for
-        # every queried (user, device) even if the remote server did not
-        # populate it; so we iterate the query and populate
-        # destination_result based on the federation result.
-        for user_id, user_query in destination_query.items():
-            remote_user_result = remote_otks.get(user_id, {})
-            destination_user_result = destination_result[user_id] = {}
-            for device_id in user_query.keys():
-                destination_user_result[device_id] = remote_user_result.get(
-                    device_id, {}
-                )
-    else:
-        # We need to make sure that remote servers do not poison the
-        # result with data for users which do not belong to it, so we only
-        # copy data for users that were queried.
-        for user_id, keys in remote_otks.items():
-            if user_id in destination_query:
-                destination_result[user_id] = keys
-
-    return destination_result
@@ -120,7 +120,7 @@ class EventStreamHandler:

            events.extend(to_add)

-            chunks = await self._event_serializer.serialize_events(
+            chunks = self._event_serializer.serialize_events(
                events,
                time_now,
                config=SerializeEventConfig(
@@ -19,8 +19,6 @@ import logging
 import urllib.parse
 from typing import TYPE_CHECKING, Awaitable, Callable, Dict, List, Optional, Tuple

-import attr
-
 from synapse.api.errors import (
    CodeMessageException,
    Codes,
@@ -359,9 +357,9 @@ class IdentityHandler:

        # Check to see if a session already exists and that it is not yet
        # marked as validated
-        if session and session.validated_at is None:
-            session_id = session.session_id
-            last_send_attempt = session.last_send_attempt
+        if session and session.get("validated_at") is None:
+            session_id = session["session_id"]
+            last_send_attempt = session["last_send_attempt"]

            # Check that the send_attempt is higher than previous attempts
            if send_attempt <= last_send_attempt:
@@ -482,6 +480,7 @@ class IdentityHandler:

        # We don't actually know which medium this 3PID is. Thus we first assume it's email,
        # and if validation fails we try msisdn
+        validation_session = None

        # Try to validate as email
        if self.hs.config.email.can_verify_email:
@@ -489,18 +488,19 @@ class IdentityHandler:
            validation_session = await self.store.get_threepid_validation_session(
                "email", client_secret, sid=sid, validated=True
            )
-            if validation_session:
-                return attr.asdict(validation_session)
+
+        if validation_session:
+            return validation_session

        # Try to validate as msisdn
        if self.hs.config.registration.account_threepid_delegate_msisdn:
            # Ask our delegated msisdn identity server
-            return await self.threepid_from_creds(
+            validation_session = await self.threepid_from_creds(
                self.hs.config.registration.account_threepid_delegate_msisdn,
                threepid_creds,
            )

-        return None
+        return validation_session

    async def proxy_msisdn_submit_token(
        self, id_server: str, client_secret: str, sid: str, token: str
@@ -145,7 +145,7 @@ class InitialSyncHandler:
        joined_rooms = [r.room_id for r in room_list if r.membership == Membership.JOIN]
        receipt = await self.store.get_linearized_receipts_for_rooms(
            joined_rooms,
-            to_key=now_token.receipt_key,
+            to_key=int(now_token.receipt_key),
        )

        receipt = ReceiptEventSource.filter_out_private_receipts(receipt, user_id)
@@ -173,7 +173,7 @@ class InitialSyncHandler:
                d["inviter"] = event.sender

                invite_event = await self.store.get_event(event.event_id)
-                d["invite"] = await self._event_serializer.serialize_event(
+                d["invite"] = self._event_serializer.serialize_event(
                    invite_event,
                    time_now,
                    config=serializer_options,
@@ -225,7 +225,7 @@ class InitialSyncHandler:

                d["messages"] = {
                    "chunk": (
-                        await self._event_serializer.serialize_events(
+                        self._event_serializer.serialize_events(
                            messages,
                            time_now=time_now,
                            config=serializer_options,
@@ -235,7 +235,7 @@ class InitialSyncHandler:
                    "end": await end_token.to_string(self.store),
                }

-                d["state"] = await self._event_serializer.serialize_events(
+                d["state"] = self._event_serializer.serialize_events(
                    current_state.values(),
                    time_now=time_now,
                    config=serializer_options,
@@ -387,7 +387,7 @@ class InitialSyncHandler:
            "messages": {
                "chunk": (
                    # Don't bundle aggregations as this is a deprecated API.
-                    await self._event_serializer.serialize_events(
+                    self._event_serializer.serialize_events(
                        messages, time_now, config=serialize_options
                    )
                ),
@@ -396,7 +396,7 @@ class InitialSyncHandler:
            },
            "state": (
                # Don't bundle aggregations as this is a deprecated API.
-                await self._event_serializer.serialize_events(
+                self._event_serializer.serialize_events(
                    room_state.values(), time_now, config=serialize_options
                )
            ),
@@ -420,7 +420,7 @@ class InitialSyncHandler:
        time_now = self.clock.time_msec()
        serialize_options = SerializeEventConfig(requester=requester)
        # Don't bundle aggregations as this is a deprecated API.
-        state = await self._event_serializer.serialize_events(
+        state = self._event_serializer.serialize_events(
            current_state.values(),
            time_now,
            config=serialize_options,
@@ -439,7 +439,7 @@ class InitialSyncHandler:

        async def get_presence() -> List[JsonDict]:
            # If presence is disabled, return an empty list
-            if not self.hs.config.server.presence_enabled:
+            if not self.hs.config.server.use_presence:
                return []

            states = await presence_handler.get_states(
@@ -497,7 +497,7 @@ class InitialSyncHandler:
            "messages": {
                "chunk": (
                    # Don't bundle aggregations as this is a deprecated API.
-                    await self._event_serializer.serialize_events(
+                    self._event_serializer.serialize_events(
                        messages, time_now, config=serialize_options
                    )
                ),
@@ -244,7 +244,7 @@ class MessageHandler:
                )
                room_state = room_state_events[membership_event_id]

-        events = await self._event_serializer.serialize_events(
+        events = self._event_serializer.serialize_events(
            room_state.values(),
            self.clock.time_msec(),
            config=SerializeEventConfig(requester=requester),
@@ -999,26 +999,7 @@ class EventCreationHandler:
            raise ShadowBanError()

        if ratelimit:
-            room_id = event_dict["room_id"]
-            try:
-                room_version = await self.store.get_room_version(room_id)
-            except NotFoundError:
-                # The room doesn't exist.
-                raise AuthError(403, f"User {requester.user} not in room {room_id}")
-
-            if room_version.updated_redaction_rules:
-                redacts = event_dict["content"].get("redacts")
-            else:
-                redacts = event_dict.get("redacts")
-
-            is_admin_redaction = await self.is_admin_redaction(
-                event_type=event_dict["type"],
-                sender=event_dict["sender"],
-                redacts=redacts,
-            )
-            await self.request_ratelimiter.ratelimit(
-                requester, is_admin_redaction=is_admin_redaction, update=False
-            )
+            await self.request_ratelimiter.ratelimit(requester, update=False)

        # We limit the number of concurrent event sends in a room so that we
        # don't fork the DAG too much. If we don't limit then we can end up in
@@ -1527,18 +1508,6 @@ class EventCreationHandler:
                first_event.room_id
            )
            if writer_instance != self._instance_name:
-                # Ratelimit before sending to the other event persister, to
-                # ensure that we correctly have ratelimits on both the event
-                # creators and event persisters.
-                if ratelimit:
-                    for event, _ in events_and_context:
-                        is_admin_redaction = await self.is_admin_redaction(
-                            event.type, event.sender, event.redacts
-                        )
-                        await self.request_ratelimiter.ratelimit(
-                            requester, is_admin_redaction=is_admin_redaction
-                        )
-
                try:
                    result = await self.send_events(
                        instance_name=writer_instance,
@@ -1569,7 +1538,6 @@ class EventCreationHandler:
                    # stream_ordering entry manually (as it was persisted on
                    # another worker).
                    event.internal_metadata.stream_ordering = stream_id
-
                return event

            event = await self.persist_and_notify_client_events(
@@ -1728,9 +1696,21 @@ class EventCreationHandler:
                # can apply different ratelimiting. We do this by simply checking
                # it's not a self-redaction (to avoid having to look up whether the
                # user is actually admin or not).
-                is_admin_redaction = await self.is_admin_redaction(
-                    event.type, event.sender, event.redacts
-                )
+                is_admin_redaction = False
+                if event.type == EventTypes.Redaction:
+                    assert event.redacts is not None
+
+                    original_event = await self.store.get_event(
+                        event.redacts,
+                        redact_behaviour=EventRedactBehaviour.as_is,
+                        get_prev_content=False,
+                        allow_rejected=False,
+                        allow_none=True,
+                    )
+
+                    is_admin_redaction = bool(
+                        original_event and event.sender != original_event.sender
+                    )

                await self.request_ratelimiter.ratelimit(
                    requester, is_admin_redaction=is_admin_redaction
@@ -1950,27 +1930,6 @@ class EventCreationHandler:

        return persisted_events[-1]

-    async def is_admin_redaction(
-        self, event_type: str, sender: str, redacts: Optional[str]
-    ) -> bool:
-        """Return whether the event is a redaction made by an admin, and thus
-        should use a different ratelimiter.
-        """
-        if event_type != EventTypes.Redaction:
-            return False
-
-        assert redacts is not None
-
-        original_event = await self.store.get_event(
-            redacts,
-            redact_behaviour=EventRedactBehaviour.as_is,
-            get_prev_content=False,
-            allow_rejected=False,
-            allow_none=True,
-        )
-
-        return bool(original_event and sender != original_event.sender)
-
    async def _maybe_kick_guest_users(
        self, event: EventBase, context: EventContext
    ) -> None:
@@ -657,7 +657,7 @@ class PaginationHandler:

        chunk = {
            "chunk": (
-                await self._event_serializer.serialize_events(
+                self._event_serializer.serialize_events(
                    events,
                    time_now,
                    config=serialize_options,
@@ -669,7 +669,7 @@ class PaginationHandler:
        }

        if state:
-            chunk["state"] = await self._event_serializer.serialize_events(
+            chunk["state"] = self._event_serializer.serialize_events(
                state, time_now, config=serialize_options
            )

@@ -110,7 +110,6 @@ from synapse.replication.http.streams import ReplicationGetStreamUpdates
 from synapse.replication.tcp.commands import ClearUserSyncsCommand
 from synapse.replication.tcp.streams import PresenceFederationStream, PresenceStream
 from synapse.storage.databases.main import DataStore
-from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.streams import EventSource
 from synapse.types import (
    JsonDict,
@@ -192,8 +191,7 @@ class BasePresenceHandler(abc.ABC):
        self.state = hs.get_state_handler()
        self.is_mine_id = hs.is_mine_id

-        self._presence_enabled = hs.config.server.presence_enabled
-        self._track_presence = hs.config.server.track_presence
+        self._presence_enabled = hs.config.server.use_presence

        self._federation = None
        if hs.should_send_federation():
@@ -513,7 +511,7 @@ class WorkerPresenceHandler(BasePresenceHandler):
        )

    async def _on_shutdown(self) -> None:
-        if self._track_presence:
+        if self._presence_enabled:
            self.hs.get_replication_command_handler().send_command(
                ClearUserSyncsCommand(self.instance_id)
            )
@@ -525,7 +523,7 @@ class WorkerPresenceHandler(BasePresenceHandler):
        is_syncing: bool,
        last_sync_ms: int,
    ) -> None:
-        if self._track_presence:
+        if self._presence_enabled:
            self.hs.get_replication_command_handler().send_user_sync(
                self.instance_id, user_id, device_id, is_syncing, last_sync_ms
            )
@@ -572,7 +570,7 @@ class WorkerPresenceHandler(BasePresenceHandler):
        Called by the sync and events servlets to record that a user has connected to
        this worker and is waiting for some events.
        """
-        if not affect_presence or not self._track_presence:
+        if not affect_presence or not self._presence_enabled:
            return _NullContextManager()

        # Note that this causes last_active_ts to be incremented which is not
@@ -703,8 +701,8 @@ class WorkerPresenceHandler(BasePresenceHandler):

        user_id = target_user.to_string()

-        # If tracking of presence is disabled, no-op
-        if not self._track_presence:
+        # If presence is disabled, no-op
+        if not self._presence_enabled:
            return

        # Proxy request to instance that writes presence
@@ -724,7 +722,7 @@ class WorkerPresenceHandler(BasePresenceHandler):
        with the app.
        """
        # If presence is disabled, no-op
-        if not self._track_presence:
+        if not self._presence_enabled:
            return

        # Proxy request to instance that writes presence
@@ -761,7 +759,7 @@ class PresenceHandler(BasePresenceHandler):
        ] = {}

        now = self.clock.time_msec()
-        if self._track_presence:
+        if self._presence_enabled:
            for state in self.user_to_current_state.values():
                # Create a psuedo-device to properly handle time outs. This will
                # be overridden by any "real" devices within SYNC_ONLINE_TIMEOUT.
@@ -832,7 +830,7 @@ class PresenceHandler(BasePresenceHandler):

        self.external_sync_linearizer = Linearizer(name="external_sync_linearizer")

-        if self._track_presence:
+        if self._presence_enabled:
            # Start a LoopingCall in 30s that fires every 5s.
            # The initial delay is to allow disconnected clients a chance to
            # reconnect before we treat them as offline.
@@ -840,9 +838,6 @@ class PresenceHandler(BasePresenceHandler):
                30, self.clock.looping_call, self._handle_timeouts, 5000
            )

-        # Presence information is persisted, whether or not it is being tracked
-        # internally.
-        if self._presence_enabled:
            self.clock.call_later(
                60,
                self.clock.looping_call,
@@ -858,7 +853,7 @@ class PresenceHandler(BasePresenceHandler):
        )

        # Used to handle sending of presence to newly joined users/servers
-        if self._track_presence:
+        if self._presence_enabled:
            self.notifier.add_replication_callback(self.notify_new_event)

        # Presence is best effort and quickly heals itself, so lets just always
@@ -909,9 +904,7 @@ class PresenceHandler(BasePresenceHandler):
            )

    async def _update_states(
-        self,
-        new_states: Iterable[UserPresenceState],
-        force_notify: bool = False,
+        self, new_states: Iterable[UserPresenceState], force_notify: bool = False
    ) -> None:
        """Updates presence of users. Sets the appropriate timeouts. Pokes
        the notifier and federation if and only if the changed presence state
@@ -949,7 +942,7 @@ class PresenceHandler(BasePresenceHandler):
            for new_state in new_states:
                user_id = new_state.user_id

-                # It's fine to not hit the database here, as the only thing not in
+                # Its fine to not hit the database here, as the only thing not in
                # the current state cache are OFFLINE states, where the only field
                # of interest is last_active which is safe enough to assume is 0
                # here.
@@ -963,9 +956,6 @@ class PresenceHandler(BasePresenceHandler):
                    is_mine=self.is_mine_id(user_id),
                    wheel_timer=self.wheel_timer,
                    now=now,
-                    # When overriding disabled presence, don't kick off all the
-                    # wheel timers.
-                    persist=not self._track_presence,
                )

                if force_notify:
@@ -1081,7 +1071,7 @@ class PresenceHandler(BasePresenceHandler):
        with the app.
        """
        # If presence is disabled, no-op
-        if not self._track_presence:
+        if not self._presence_enabled:
            return

        user_id = user.to_string()
@@ -1133,7 +1123,7 @@ class PresenceHandler(BasePresenceHandler):
                client that is being used by a user.
            presence_state: The presence state indicated in the sync request
        """
-        if not affect_presence or not self._track_presence:
+        if not affect_presence or not self._presence_enabled:
            return _NullContextManager()

        curr_sync = self._user_device_to_num_current_syncs.get((user_id, device_id), 0)
@@ -1293,7 +1283,7 @@ class PresenceHandler(BasePresenceHandler):

    async def incoming_presence(self, origin: str, content: JsonDict) -> None:
        """Called when we receive a `m.presence` EDU from a remote server."""
-        if not self._track_presence:
+        if not self._presence_enabled:
            return

        now = self.clock.time_msec()
@@ -1368,7 +1358,7 @@ class PresenceHandler(BasePresenceHandler):
            raise SynapseError(400, "Invalid presence state")

        # If presence is disabled, no-op
-        if not self._track_presence:
+        if not self._presence_enabled:
            return

        user_id = target_user.to_string()
@@ -1509,9 +1499,9 @@ class PresenceHandler(BasePresenceHandler):
                # We may get multiple deltas for different rooms, but we want to
                # handle them on a room by room basis, so we batch them up by
                # room.
-                deltas_by_room: Dict[str, List[StateDelta]] = {}
+                deltas_by_room: Dict[str, List[JsonDict]] = {}
                for delta in deltas:
-                    deltas_by_room.setdefault(delta.room_id, []).append(delta)
+                    deltas_by_room.setdefault(delta["room_id"], []).append(delta)

                for room_id, deltas_for_room in deltas_by_room.items():
                    await self._handle_state_delta(room_id, deltas_for_room)
@@ -1523,7 +1513,7 @@ class PresenceHandler(BasePresenceHandler):
                    max_pos
                )

-    async def _handle_state_delta(self, room_id: str, deltas: List[StateDelta]) -> None:
+    async def _handle_state_delta(self, room_id: str, deltas: List[JsonDict]) -> None:
        """Process current state deltas for the room to find new joins that need
        to be handled.
        """
@@ -1534,30 +1524,31 @@ class PresenceHandler(BasePresenceHandler):
        newly_joined_users = set()

        for delta in deltas:
-            assert room_id == delta.room_id
+            assert room_id == delta["room_id"]

-            logger.debug(
-                "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
-            )
+            typ = delta["type"]
+            state_key = delta["state_key"]
+            event_id = delta["event_id"]
+            prev_event_id = delta["prev_event_id"]
+
+            logger.debug("Handling: %r %r, %s", typ, state_key, event_id)

            # Drop any event that isn't a membership join
-            if delta.event_type != EventTypes.Member:
+            if typ != EventTypes.Member:
                continue

-            if delta.event_id is None:
+            if event_id is None:
                # state has been deleted, so this is not a join. We only care about
                # joins.
                continue

-            event = await self.store.get_event(delta.event_id, allow_none=True)
+            event = await self.store.get_event(event_id, allow_none=True)
            if not event or event.content.get("membership") != Membership.JOIN:
                # We only care about joins
                continue

-            if delta.prev_event_id:
-                prev_event = await self.store.get_event(
-                    delta.prev_event_id, allow_none=True
-                )
+            if prev_event_id:
+                prev_event = await self.store.get_event(prev_event_id, allow_none=True)
                if (
                    prev_event
                    and prev_event.content.get("membership") == Membership.JOIN
@@ -1565,7 +1556,7 @@ class PresenceHandler(BasePresenceHandler):
                    # Ignore changes to join events.
                    continue

-            newly_joined_users.add(delta.state_key)
+            newly_joined_users.add(state_key)

        if not newly_joined_users:
            # If nobody has joined then there's nothing to do.
@@ -2127,7 +2118,6 @@ def handle_update(
    is_mine: bool,
    wheel_timer: WheelTimer,
    now: int,
-    persist: bool,
 ) -> Tuple[UserPresenceState, bool, bool]:
    """Given a presence update:
        1. Add any appropriate timers.
@@ -2139,8 +2129,6 @@ def handle_update(
        is_mine: Whether the user is ours
        wheel_timer
        now: Time now in ms
-        persist: True if this state should persist until another update occurs.
-            Skips insertion into wheel timers.

    Returns:
        3-tuple: `(new_state, persist_and_notify, federation_ping)` where:
@@ -2158,15 +2146,14 @@ def handle_update(
    if is_mine:
        if new_state.state == PresenceState.ONLINE:
            # Idle timer
-            if not persist:
-                wheel_timer.insert(
-                    now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER
-                )
+            wheel_timer.insert(
+                now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER
+            )

            active = now - new_state.last_active_ts < LAST_ACTIVE_GRANULARITY
            new_state = new_state.copy_and_replace(currently_active=active)

-            if active and not persist:
+            if active:
                wheel_timer.insert(
                    now=now,
                    obj=user_id,
@@ -2175,12 +2162,11 @@ def handle_update(

        if new_state.state != PresenceState.OFFLINE:
            # User has stopped syncing
-            if not persist:
-                wheel_timer.insert(
-                    now=now,
-                    obj=user_id,
-                    then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
-                )
+            wheel_timer.insert(
+                now=now,
+                obj=user_id,
+                then=new_state.last_user_sync_ts + SYNC_ONLINE_TIMEOUT,
+            )

            last_federate = new_state.last_federation_update_ts
            if now - last_federate > FEDERATION_PING_INTERVAL:
@@ -2188,7 +2174,7 @@ def handle_update(
                new_state = new_state.copy_and_replace(last_federation_update_ts=now)
                federation_ping = True

-        if new_state.state == PresenceState.BUSY and not persist:
+        if new_state.state == PresenceState.BUSY:
            wheel_timer.insert(
                now=now,
                obj=user_id,
@@ -2196,13 +2182,11 @@ def handle_update(
            )

    else:
-        # An update for a remote user was received.
-        if not persist:
-            wheel_timer.insert(
-                now=now,
-                obj=user_id,
-                then=new_state.last_federation_update_ts + FEDERATION_TIMEOUT,
-            )
+        wheel_timer.insert(
+            now=now,
+            obj=user_id,
+            then=new_state.last_federation_update_ts + FEDERATION_TIMEOUT,
+        )

    # Check whether the change was something worth notifying about
    if should_notify(prev_state, new_state, is_mine):
@@ -20,7 +20,6 @@ from synapse.streams import EventSource
 from synapse.types import (
    JsonDict,
    JsonMapping,
-    MultiWriterStreamToken,
    ReadReceipt,
    StreamKeyType,
    UserID,
@@ -201,7 +200,7 @@ class ReceiptsHandler:
            await self.federation_sender.send_read_receipt(receipt)


-class ReceiptEventSource(EventSource[MultiWriterStreamToken, JsonMapping]):
+class ReceiptEventSource(EventSource[int, JsonMapping]):
    def __init__(self, hs: "HomeServer"):
        self.store = hs.get_datastores().main
        self.config = hs.config
@@ -274,12 +273,13 @@ class ReceiptEventSource(EventSource[MultiWriterStreamToken, JsonMapping]):
    async def get_new_events(
        self,
        user: UserID,
-        from_key: MultiWriterStreamToken,
+        from_key: int,
        limit: int,
        room_ids: Iterable[str],
        is_guest: bool,
        explicit_room_id: Optional[str] = None,
-    ) -> Tuple[List[JsonMapping], MultiWriterStreamToken]:
+    ) -> Tuple[List[JsonMapping], int]:
+        from_key = int(from_key)
        to_key = self.get_current_key()

        if from_key == to_key:
@@ -296,11 +296,8 @@ class ReceiptEventSource(EventSource[MultiWriterStreamToken, JsonMapping]):
        return events, to_key

    async def get_new_events_as(
-        self,
-        from_key: MultiWriterStreamToken,
-        to_key: MultiWriterStreamToken,
-        service: ApplicationService,
-    ) -> Tuple[List[JsonMapping], MultiWriterStreamToken]:
+        self, from_key: int, to_key: int, service: ApplicationService
+    ) -> Tuple[List[JsonMapping], int]:
        """Returns a set of new read receipt events that an appservice
        may be interested in.

@@ -315,6 +312,8 @@ class ReceiptEventSource(EventSource[MultiWriterStreamToken, JsonMapping]):
                  appservice may be interested in.
                * The current read receipt stream token.
        """
+        from_key = int(from_key)
+
        if from_key == to_key:
            return [], to_key

@@ -334,5 +333,5 @@ class ReceiptEventSource(EventSource[MultiWriterStreamToken, JsonMapping]):

        return events, to_key

-    def get_current_key(self) -> MultiWriterStreamToken:
+    def get_current_key(self) -> int:
        return self.store.get_max_receipt_stream_id()
@@ -167,7 +167,7 @@ class RelationsHandler:
        now = self._clock.time_msec()
        serialize_options = SerializeEventConfig(requester=requester)
        return_value: JsonDict = {
-            "chunk": await self._event_serializer.serialize_events(
+            "chunk": self._event_serializer.serialize_events(
                events,
                now,
                bundle_aggregations=aggregations,
@@ -177,9 +177,7 @@ 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(
+            return_value["original_event"] = self._event_serializer.serialize_event(
                event,
                now,
                bundle_aggregations=None,
@@ -604,7 +602,7 @@ class RelationsHandler:
        )

        now = self._clock.time_msec()
-        serialized_events = await self._event_serializer.serialize_events(
+        serialized_events = self._event_serializer.serialize_events(
            events, now, bundle_aggregations=aggregations
        )

@@ -16,7 +16,7 @@ import abc
 import logging
 import random
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Set, Tuple

 from synapse import types
 from synapse.api.constants import (
@@ -44,7 +44,6 @@ from synapse.handlers.worker_lock import NEW_EVENT_DURING_PURGE_LOCK_NAME
 from synapse.logging import opentracing
 from synapse.metrics import event_processing_positions
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.types import (
    JsonDict,
    Requester,
@@ -2147,18 +2146,24 @@ class RoomForgetterHandler(StateDeltasHandler):

            await self._store.update_room_forgetter_stream_pos(max_pos)

-    async def _handle_deltas(self, deltas: List[StateDelta]) -> None:
+    async def _handle_deltas(self, deltas: List[Dict[str, Any]]) -> None:
        """Called with the state deltas to process"""
        for delta in deltas:
-            if delta.event_type != EventTypes.Member:
+            typ = delta["type"]
+            state_key = delta["state_key"]
+            room_id = delta["room_id"]
+            event_id = delta["event_id"]
+            prev_event_id = delta["prev_event_id"]
+
+            if typ != EventTypes.Member:
                continue

-            if not self._hs.is_mine_id(delta.state_key):
+            if not self._hs.is_mine_id(state_key):
                continue

            change = await self._get_key_change(
-                delta.prev_event_id,
-                delta.event_id,
+                prev_event_id,
+                event_id,
                key_name="membership",
                public_value=Membership.JOIN,
            )
@@ -2167,7 +2172,7 @@ class RoomForgetterHandler(StateDeltasHandler):
            if is_leave:
                try:
                    await self._room_member_handler.forget(
-                        UserID.from_string(delta.state_key), delta.room_id
+                        UserID.from_string(state_key), room_id
                    )
                except SynapseError as e:
                    if e.code == 400:
@@ -374,13 +374,13 @@ class SearchHandler:
        serialize_options = SerializeEventConfig(requester=requester)

        for context in contexts.values():
-            context["events_before"] = await self._event_serializer.serialize_events(
+            context["events_before"] = self._event_serializer.serialize_events(
                context["events_before"],
                time_now,
                bundle_aggregations=aggregations,
                config=serialize_options,
            )
-            context["events_after"] = await self._event_serializer.serialize_events(
+            context["events_after"] = self._event_serializer.serialize_events(
                context["events_after"],
                time_now,
                bundle_aggregations=aggregations,
@@ -390,7 +390,7 @@ class SearchHandler:
        results = [
            {
                "rank": search_result.rank_map[e.event_id],
-                "result": await self._event_serializer.serialize_event(
+                "result": self._event_serializer.serialize_event(
                    e,
                    time_now,
                    bundle_aggregations=aggregations,
@@ -409,7 +409,7 @@ class SearchHandler:

        if state_results:
            rooms_cat_res["state"] = {
-                room_id: await self._event_serializer.serialize_events(
+                room_id: self._event_serializer.serialize_events(
                    state_events, time_now, config=serialize_options
                )
                for room_id, state_events in state_results.items()
@@ -1206,7 +1206,10 @@ class SsoHandler:
        # We have no guarantee that all the devices of that session are for the same
        # `user_id`. Hence, we have to iterate over the list of devices and log them out
        # one by one.
-        for user_id, device_id in devices:
+        for device in devices:
+            user_id = device["user_id"]
+            device_id = device["device_id"]
+
            # If the user_id associated with that device/session is not the one we got
            # out of the `sub` claim, skip that device and show log an error.
            if expected_user_id is not None and user_id != expected_user_id:
@@ -27,7 +27,6 @@ from typing import (
 from synapse.api.constants import EventContentFields, EventTypes, Membership
 from synapse.metrics import event_processing_positions
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.types import JsonDict

 if TYPE_CHECKING:
@@ -143,7 +142,7 @@ class StatsHandler:
            self.pos = max_pos

    async def _handle_deltas(
-        self, deltas: Iterable[StateDelta]
+        self, deltas: Iterable[JsonDict]
    ) -> Tuple[Dict[str, CounterType[str]], Dict[str, CounterType[str]]]:
        """Called with the state deltas to process

@@ -158,50 +157,51 @@ class StatsHandler:
        room_to_state_updates: Dict[str, Dict[str, Any]] = {}

        for delta in deltas:
-            logger.debug(
-                "Handling: %r, %r %r, %s",
-                delta.room_id,
-                delta.event_type,
-                delta.state_key,
-                delta.event_id,
-            )
+            typ = delta["type"]
+            state_key = delta["state_key"]
+            room_id = delta["room_id"]
+            event_id = delta["event_id"]
+            stream_id = delta["stream_id"]
+            prev_event_id = delta["prev_event_id"]

-            token = await self.store.get_earliest_token_for_stats("room", delta.room_id)
+            logger.debug("Handling: %r, %r %r, %s", room_id, typ, state_key, event_id)
+
+            token = await self.store.get_earliest_token_for_stats("room", room_id)

            # If the earliest token to begin from is larger than our current
            # stream ID, skip processing this delta.
-            if token is not None and token >= delta.stream_id:
+            if token is not None and token >= stream_id:
                logger.debug(
                    "Ignoring: %s as earlier than this room's initial ingestion event",
-                    delta.event_id,
+                    event_id,
                )
                continue

-            if delta.event_id is None and delta.prev_event_id is None:
+            if event_id is None and prev_event_id is None:
                logger.error(
                    "event ID is None and so is the previous event ID. stream_id: %s",
-                    delta.stream_id,
+                    stream_id,
                )
                continue

            event_content: JsonDict = {}

-            if delta.event_id is not None:
-                event = await self.store.get_event(delta.event_id, allow_none=True)
+            if event_id is not None:
+                event = await self.store.get_event(event_id, allow_none=True)
                if event:
                    event_content = event.content or {}

            # All the values in this dict are deltas (RELATIVE changes)
-            room_stats_delta = room_to_stats_deltas.setdefault(delta.room_id, Counter())
+            room_stats_delta = room_to_stats_deltas.setdefault(room_id, Counter())

-            room_state = room_to_state_updates.setdefault(delta.room_id, {})
+            room_state = room_to_state_updates.setdefault(room_id, {})

-            if delta.prev_event_id is None:
+            if prev_event_id is None:
                # this state event doesn't overwrite another,
                # so it is a new effective/current state event
                room_stats_delta["current_state_events"] += 1

-            if delta.event_type == EventTypes.Member:
+            if typ == EventTypes.Member:
                # we could use StateDeltasHandler._get_key_change here but it's
                # a bit inefficient given we're not testing for a specific
                # result; might as well just grab the prev_membership and
@@ -210,9 +210,9 @@ class StatsHandler:
                # in the absence of a previous event because we do not want to
                # reduce the leave count when a new-to-the-room user joins.
                prev_membership = None
-                if delta.prev_event_id is not None:
+                if prev_event_id is not None:
                    prev_event = await self.store.get_event(
-                        delta.prev_event_id, allow_none=True
+                        prev_event_id, allow_none=True
                    )
                    if prev_event:
                        prev_event_content = prev_event.content
@@ -256,7 +256,7 @@ class StatsHandler:
                else:
                    raise ValueError("%r is not a valid membership" % (membership,))

-                user_id = delta.state_key
+                user_id = state_key
                if self.is_mine_id(user_id):
                    # this accounts for transitions like leave → ban and so on.
                    has_changed_joinedness = (prev_membership == Membership.JOIN) != (
@@ -272,30 +272,30 @@ class StatsHandler:

                        room_stats_delta["local_users_in_room"] += membership_delta

-            elif delta.event_type == EventTypes.Create:
+            elif typ == EventTypes.Create:
                room_state["is_federatable"] = (
                    event_content.get(EventContentFields.FEDERATE, True) is True
                )
                room_type = event_content.get(EventContentFields.ROOM_TYPE)
                if isinstance(room_type, str):
                    room_state["room_type"] = room_type
-            elif delta.event_type == EventTypes.JoinRules:
+            elif typ == EventTypes.JoinRules:
                room_state["join_rules"] = event_content.get("join_rule")
-            elif delta.event_type == EventTypes.RoomHistoryVisibility:
+            elif typ == EventTypes.RoomHistoryVisibility:
                room_state["history_visibility"] = event_content.get(
                    "history_visibility"
                )
-            elif delta.event_type == EventTypes.RoomEncryption:
+            elif typ == EventTypes.RoomEncryption:
                room_state["encryption"] = event_content.get("algorithm")
-            elif delta.event_type == EventTypes.Name:
+            elif typ == EventTypes.Name:
                room_state["name"] = event_content.get("name")
-            elif delta.event_type == EventTypes.Topic:
+            elif typ == EventTypes.Topic:
                room_state["topic"] = event_content.get("topic")
-            elif delta.event_type == EventTypes.RoomAvatar:
+            elif typ == EventTypes.RoomAvatar:
                room_state["avatar"] = event_content.get("url")
-            elif delta.event_type == EventTypes.CanonicalAlias:
+            elif typ == EventTypes.CanonicalAlias:
                room_state["canonical_alias"] = event_content.get("alias")
-            elif delta.event_type == EventTypes.GuestAccess:
+            elif typ == EventTypes.GuestAccess:
                room_state["guest_access"] = event_content.get(
                    EventContentFields.GUEST_ACCESS
                )
@@ -57,7 +57,6 @@ from synapse.types import (
    DeviceListUpdates,
    JsonDict,
    JsonMapping,
-    MultiWriterStreamToken,
    MutableStateMap,
    Requester,
    RoomStreamToken,
@@ -478,11 +477,7 @@ class SyncHandler:
                event_copy = {k: v for (k, v) in event.items() if k != "room_id"}
                ephemeral_by_room.setdefault(room_id, []).append(event_copy)

-            receipt_key = (
-                since_token.receipt_key
-                if since_token
-                else MultiWriterStreamToken(stream=0)
-            )
+            receipt_key = since_token.receipt_key if since_token else 0

            receipt_source = self.event_sources.sources.receipt
            receipts, receipt_key = await receipt_source.get_new_events(
@@ -505,27 +500,12 @@ class SyncHandler:
    async def _load_filtered_recents(
        self,
        room_id: str,
-        sync_result_builder: "SyncResultBuilder",
        sync_config: SyncConfig,
-        upto_token: StreamToken,
+        now_token: StreamToken,
        since_token: Optional[StreamToken] = None,
        potential_recents: Optional[List[EventBase]] = None,
        newly_joined_room: bool = False,
    ) -> TimelineBatch:
-        """Create a timeline batch for the room
-
-        Args:
-            room_id
-            sync_result_builder
-            sync_config
-            upto_token: The token up to which we should fetch (more) events.
-                If `potential_results` is non-empty then this is *start* of
-                the the list.
-            since_token
-            potential_recents: If non-empty, the events between the since token
-                and current token to send down to clients.
-            newly_joined_room
-        """
        with Measure(self.clock, "load_filtered_recents"):
            timeline_limit = sync_config.filter_collection.timeline_limit()
            block_all_timeline = (
@@ -541,20 +521,6 @@ class SyncHandler:
            else:
                limited = False

-            # Check if there is a gap, if so we need to mark this as limited and
-            # recalculate which events to send down.
-            gap_token = await self.store.get_timeline_gaps(
-                room_id,
-                since_token.room_key if since_token else None,
-                sync_result_builder.now_token.room_key,
-            )
-            if gap_token:
-                # There's a gap, so we need to ignore the passed in
-                # `potential_recents`, and reset `upto_token` to match.
-                potential_recents = None
-                upto_token = sync_result_builder.now_token
-                limited = True
-
            log_kv({"limited": limited})

            if potential_recents:
@@ -593,10 +559,10 @@ class SyncHandler:
                recents = []

            if not limited or block_all_timeline:
-                prev_batch_token = upto_token
+                prev_batch_token = now_token
                if recents:
                    room_key = recents[0].internal_metadata.before
-                    prev_batch_token = upto_token.copy_and_replace(
+                    prev_batch_token = now_token.copy_and_replace(
                        StreamKeyType.ROOM, room_key
                    )

@@ -607,15 +573,11 @@ class SyncHandler:
            filtering_factor = 2
            load_limit = max(timeline_limit * filtering_factor, 10)
            max_repeat = 5  # Only try a few times per room, otherwise
-            room_key = upto_token.room_key
+            room_key = now_token.room_key
            end_key = room_key

            since_key = None
-            if since_token and gap_token:
-                # If there is a gap then we need to only include events after
-                # it.
-                since_key = gap_token
-            elif since_token and not newly_joined_room:
+            if since_token and not newly_joined_room:
                since_key = since_token.room_key

            while limited and len(recents) < timeline_limit and max_repeat:
@@ -685,7 +647,7 @@ class SyncHandler:
                recents = recents[-timeline_limit:]
                room_key = recents[0].internal_metadata.before

-            prev_batch_token = upto_token.copy_and_replace(StreamKeyType.ROOM, room_key)
+            prev_batch_token = now_token.copy_and_replace(StreamKeyType.ROOM, room_key)

        # Don't bother to bundle aggregations if the timeline is unlimited,
        # as clients will have all the necessary information.
@@ -700,9 +662,7 @@ class SyncHandler:
        return TimelineBatch(
            events=recents,
            prev_batch=prev_batch_token,
-            # Also mark as limited if this is a new room or there has been a gap
-            # (to force client to paginate the gap).
-            limited=limited or newly_joined_room or gap_token is not None,
+            limited=limited or newly_joined_room,
            bundled_aggregations=bundled_aggregations,
        )

@@ -1517,7 +1477,7 @@ class SyncHandler:

        # Presence data is included if the server has it enabled and not filtered out.
        include_presence_data = bool(
-            self.hs_config.server.presence_enabled
+            self.hs_config.server.use_presence
            and not sync_config.filter_collection.blocks_all_presence()
        )
        # Device list updates are sent if a since token is provided.
@@ -2437,9 +2397,8 @@ class SyncHandler:

            batch = await self._load_filtered_recents(
                room_id,
-                sync_result_builder,
                sync_config,
-                upto_token=upto_token,
+                now_token=upto_token,
                since_token=since_token,
                potential_recents=events,
                newly_joined_room=newly_joined,
@@ -187,9 +187,9 @@ class _BaseThreepidAuthChecker:

                if row:
                    threepid = {
-                        "medium": row.medium,
-                        "address": row.address,
-                        "validated_at": row.validated_at,
+                        "medium": row["medium"],
+                        "address": row["address"],
+                        "validated_at": row["validated_at"],
                    }

                    # Valid threepid returned, delete from the db
@@ -14,7 +14,7 @@

 import logging
 from http import HTTPStatus
-from typing import TYPE_CHECKING, List, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple

 from twisted.internet.interfaces import IDelayedCall

@@ -23,7 +23,6 @@ from synapse.api.constants import EventTypes, HistoryVisibility, JoinRules, Memb
 from synapse.api.errors import Codes, SynapseError
 from synapse.handlers.state_deltas import MatchChange, StateDeltasHandler
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.storage.databases.main.user_directory import SearchResult
 from synapse.storage.roommember import ProfileInfo
 from synapse.types import UserID
@@ -248,31 +247,32 @@ class UserDirectoryHandler(StateDeltasHandler):

                await self.store.update_user_directory_stream_pos(max_pos)

-    async def _handle_deltas(self, deltas: List[StateDelta]) -> None:
+    async def _handle_deltas(self, deltas: List[Dict[str, Any]]) -> None:
        """Called with the state deltas to process"""
        for delta in deltas:
-            logger.debug(
-                "Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
-            )
+            typ = delta["type"]
+            state_key = delta["state_key"]
+            room_id = delta["room_id"]
+            event_id: Optional[str] = delta["event_id"]
+            prev_event_id: Optional[str] = delta["prev_event_id"]
+
+            logger.debug("Handling: %r %r, %s", typ, state_key, event_id)

            # For join rule and visibility changes we need to check if the room
            # may have become public or not and add/remove the users in said room
-            if delta.event_type in (
-                EventTypes.RoomHistoryVisibility,
-                EventTypes.JoinRules,
-            ):
+            if typ in (EventTypes.RoomHistoryVisibility, EventTypes.JoinRules):
                await self._handle_room_publicity_change(
-                    delta.room_id, delta.prev_event_id, delta.event_id, delta.event_type
+                    room_id, prev_event_id, event_id, typ
                )
-            elif delta.event_type == EventTypes.Member:
+            elif typ == EventTypes.Member:
                await self._handle_room_membership_event(
-                    delta.room_id,
-                    delta.prev_event_id,
-                    delta.event_id,
-                    delta.state_key,
+                    room_id,
+                    prev_event_id,
+                    event_id,
+                    state_key,
                )
            else:
-                logger.debug("Ignoring irrelevant type: %r", delta.event_type)
+                logger.debug("Ignoring irrelevant type: %r", typ)

    async def _handle_room_publicity_change(
        self,
@@ -59,7 +59,7 @@ class BasicProxyCredentials(ProxyCredentials):
            a Proxy-Authorization header.
        """
        # Encode as base64 and prepend the authorization type
-        return b"Basic " + base64.b64encode(self.username_password)
+        return b"Basic " + base64.encodebytes(self.username_password)


@attr.s(auto_attribs=True)
@@ -949,7 +949,10 @@ class MediaRepository:

        deleted = 0

-        for origin, media_id, file_id in old_media:
+        for media in old_media:
+            origin = media["media_origin"]
+            media_id = media["media_id"]
+            file_id = media["filesystem_id"]
            key = (origin, media_id)

            logger.info("Deleting: %r", key)
@@ -23,7 +23,6 @@ from typing import (
    Generator,
    Iterable,
    List,
-    Mapping,
    Optional,
    Tuple,
    TypeVar,
@@ -40,7 +39,6 @@ from twisted.web.resource import Resource

 from synapse.api import errors
 from synapse.api.errors import SynapseError
-from synapse.api.presence import UserPresenceState
 from synapse.config import ConfigError
 from synapse.events import EventBase
 from synapse.events.presence_router import (
@@ -48,7 +46,6 @@ from synapse.events.presence_router import (
    GET_USERS_FOR_STATES_CALLBACK,
    PresenceRouter,
 )
-from synapse.events.utils import ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
 from synapse.handlers.account_data import ON_ACCOUNT_DATA_UPDATED_CALLBACK
 from synapse.handlers.auth import (
    CHECK_3PID_AUTH_CALLBACK,
@@ -260,7 +257,6 @@ class ModuleApi:
        self.custom_template_dir = hs.config.server.custom_template_directory
        self._callbacks = hs.get_module_api_callbacks()
        self.msc3861_oauth_delegation_enabled = hs.config.experimental.msc3861.enabled
-        self._event_serializer = hs.get_event_client_serializer()

        try:
            app_name = self._hs.config.email.email_app_name
@@ -492,25 +488,6 @@ class ModuleApi:
        """
        self._hs.register_module_web_resource(path, resource)

-    def register_add_extra_fields_to_unsigned_client_event_callbacks(
-        self,
-        *,
-        add_field_to_unsigned_callback: Optional[
-            ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
-        ] = None,
-    ) -> None:
-        """Registers a callback that can be used to add fields to the unsigned
-        section of events.
-
-        The callback is called every time an event is sent down to a client.
-
-        Added in Synapse 1.96.0
-        """
-        if add_field_to_unsigned_callback is not None:
-            self._event_serializer.register_add_extra_fields_to_unsigned_client_event_callback(
-                add_field_to_unsigned_callback
-            )
-
    #########################################################################
    # The following methods can be called by the module at any point in time.

@@ -1207,37 +1184,6 @@ class ModuleApi:
                presence_events, [destination]
            )

-    async def set_presence_for_users(
-        self, users: Mapping[str, Tuple[str, Optional[str]]]
-    ) -> None:
-        """
-        Update the internal presence state of users.
-
-        This can be used for either local or remote users.
-
-        Note that this method can only be run on the process that is configured to write to the
-        presence stream. By default, this is the main process.
-
-        Added in Synapse v1.96.0.
-        """
-
-        # We pull out the presence handler here to break a cyclic
-        # dependency between the presence router and module API.
-        presence_handler = self._hs.get_presence_handler()
-
-        from synapse.handlers.presence import PresenceHandler
-
-        assert isinstance(presence_handler, PresenceHandler)
-
-        states = await presence_handler.current_state_for_users(users.keys())
-        for user_id, (state, status_msg) in users.items():
-            prev_state = states.setdefault(user_id, UserPresenceState.default(user_id))
-            states[user_id] = prev_state.copy_and_replace(
-                state=state, status_msg=status_msg
-            )
-
-        await presence_handler._update_states(states.values(), force_notify=True)
-
    def looping_background_call(
        self,
        f: Callable,
@@ -21,13 +21,11 @@ from typing import (
    Dict,
    Iterable,
    List,
-    Literal,
    Optional,
    Set,
    Tuple,
    TypeVar,
    Union,
-    overload,
 )

 import attr
@@ -46,7 +44,6 @@ from synapse.metrics import LaterGauge
 from synapse.streams.config import PaginationConfig
 from synapse.types import (
    JsonDict,
-    MultiWriterStreamToken,
    PersistedEventPosition,
    RoomStreamToken,
    StrCollection,
@@ -130,7 +127,7 @@ class _NotifierUserStream:
    def notify(
        self,
        stream_key: StreamKeyType,
-        stream_id: Union[int, RoomStreamToken, MultiWriterStreamToken],
+        stream_id: Union[int, RoomStreamToken],
        time_now_ms: int,
    ) -> None:
        """Notify any listeners for this user of a new event from an
@@ -455,48 +452,10 @@ class Notifier:
        except Exception:
            logger.exception("Error pusher pool of event")

-    @overload
-    def on_new_event(
-        self,
-        stream_key: Literal[StreamKeyType.ROOM],
-        new_token: RoomStreamToken,
-        users: Optional[Collection[Union[str, UserID]]] = None,
-        rooms: Optional[StrCollection] = None,
-    ) -> None:
-        ...
-
-    @overload
-    def on_new_event(
-        self,
-        stream_key: Literal[StreamKeyType.RECEIPT],
-        new_token: MultiWriterStreamToken,
-        users: Optional[Collection[Union[str, UserID]]] = None,
-        rooms: Optional[StrCollection] = None,
-    ) -> None:
-        ...
-
-    @overload
-    def on_new_event(
-        self,
-        stream_key: Literal[
-            StreamKeyType.ACCOUNT_DATA,
-            StreamKeyType.DEVICE_LIST,
-            StreamKeyType.PRESENCE,
-            StreamKeyType.PUSH_RULES,
-            StreamKeyType.TO_DEVICE,
-            StreamKeyType.TYPING,
-            StreamKeyType.UN_PARTIAL_STATED_ROOMS,
-        ],
-        new_token: int,
-        users: Optional[Collection[Union[str, UserID]]] = None,
-        rooms: Optional[StrCollection] = None,
-    ) -> None:
-        ...
-
    def on_new_event(
        self,
        stream_key: StreamKeyType,
-        new_token: Union[int, RoomStreamToken, MultiWriterStreamToken],
+        new_token: Union[int, RoomStreamToken],
        users: Optional[Collection[Union[str, UserID]]] = None,
        rooms: Optional[StrCollection] = None,
    ) -> None:
@@ -238,7 +238,7 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta):

                    data[_STREAM_POSITION_KEY] = {
                        "streams": {
-                            stream.NAME: stream.minimal_local_current_token()
+                            stream.NAME: stream.current_token(local_instance_name)
                            for stream in streams
                        },
                        "instance_name": local_instance_name,
@@ -138,11 +138,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint):

                event_and_contexts.append((event, context))

-        logger.info(
-            "Got batch of %i events to persist to room %s",
-            len(event_and_contexts),
-            room_id,
-        )
+        logger.info("Got %d events from federation", len(event_and_contexts))

        max_stream_id = await self.federation_event_handler.persist_events_and_notify(
            room_id, event_and_contexts, backfilled
@@ -118,7 +118,6 @@ class ReplicationSendEventsRestServlet(ReplicationEndpoint):
        with Measure(self.clock, "repl_send_events_parse"):
            events_and_context = []
            events = payload["events"]
-            rooms = set()

            for event_payload in events:
                event_dict = event_payload["event"]
@@ -145,13 +144,11 @@ class ReplicationSendEventsRestServlet(ReplicationEndpoint):
                    UserID.from_string(u) for u in event_payload["extra_users"]
                ]

-                # all the rooms *should* be the same, but we'll log separately to be
-                # sure.
-                rooms.add(event.room_id)
-
-            logger.info(
-                "Got batch of %i events to persist to rooms %s", len(events), rooms
-            )
+                logger.info(
+                    "Got batch of events to send, last ID of batch is: %s, sending into room: %s",
+                    event.event_id,
+                    event.room_id,
+                )

            last_event = (
                await self.event_creation_handler.persist_and_notify_client_events(
@@ -126,9 +126,8 @@ class ReplicationDataHandler:
                StreamKeyType.ACCOUNT_DATA, token, users=[row.user_id for row in rows]
            )
        elif stream_name == ReceiptsStream.NAME:
-            new_token = self.store.get_max_receipt_stream_id()
            self.notifier.on_new_event(
-                StreamKeyType.RECEIPT, new_token, rooms=[row.room_id for row in rows]
+                StreamKeyType.RECEIPT, token, rooms=[row.room_id for row in rows]
            )
            await self._pusher_pool.on_new_receipts({row.user_id for row in rows})
        elif stream_name == ToDeviceStream.NAME:
@@ -280,6 +279,14 @@ class ReplicationDataHandler:
        # may be streaming.
        self.notifier.notify_replication()

+    def on_remote_server_up(self, server: str) -> None:
+        """Called when get a new REMOTE_SERVER_UP command."""
+
+        # Let's wake up the transaction queue for the server in case we have
+        # pending stuff to send to it.
+        if self.send_handler:
+            self.send_handler.wake_destination(server)
+
    async def wait_for_stream_position(
        self,
        instance_name: str,
@@ -398,6 +405,9 @@ class FederationSenderHandler:

        self._fed_position_linearizer = Linearizer(name="_fed_position_linearizer")

+    def wake_destination(self, server: str) -> None:
+        self.federation_sender.wake_destination(server)
+
    async def process_replication_rows(
        self, stream_name: str, token: int, rows: list
    ) -> None:
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				Remove legacy unspecced `knock_state_events` field returned in some responses.
				`@@ -0,0 +1 @@`
				Fixes possbile `AttributeError` when `_matrix/client/v3/account/whoami` is called over a unix socket. Contributed by @Sir-Photch.
				`@@ -0,0 +1 @@`
				`Update registration of media repository URLs.`
				`@@ -0,0 +1 @@`
				`Document internal background update mechanism.`
				`@@ -0,0 +1 @@`
				`Refactor some code to simplify and better type receipts stream adjacent code.`
				`@@ -0,0 +1 @@`
				Factor out `MultiWriter` token from `RoomStreamToken`.
				`@@ -1 +0,0 @@`
				`Allow multiple workers to write to receipts stream.`
				`@@ -0,0 +1 @@`
				`Properly return inline media when content types have parameters.`
				`@@ -0,0 +1 @@`
				`Do not block running of CI behind the check for sign-off on PRs.`
				`@@ -0,0 +1 @@`
				`Prevent the purging of large rooms from timing out when Postgres is in use. The timeout which causes this issue was introduced in Synapse 1.88.0.`