Merge branch 'master' into develop

77 files changed, 92 insertions, 78 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 2bf8cdea75..c42a18cbff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,91 @@
+Synapse 1.61.0rc1 (2022-06-07)
+==============================
+
+This release removes support for the non-standard feature known both as 'groups' and as 'communities', which have been superseded by *Spaces*.
+
+Features
+--------
+
+- Add new `media_retention` options to the homeserver config for routinely cleaning up non-recently accessed media. ([\#12732](https://github.com/matrix-org/synapse/issues/12732), [\#12972](https://github.com/matrix-org/synapse/issues/12972), [\#12977](https://github.com/matrix-org/synapse/issues/12977))
+- Experimental support for [MSC3772](https://github.com/matrix-org/matrix-spec-proposals/pull/3772): Push rule for mutually related events. ([\#12740](https://github.com/matrix-org/synapse/issues/12740), [\#12859](https://github.com/matrix-org/synapse/issues/12859))
+- Update to the `check_event_for_spam` module callback: Deprecate the current callback signature, replace it with a new signature that is both less ambiguous (replacing booleans with explicit allow/block) and more powerful (ability to return explicit error codes). ([\#12808](https://github.com/matrix-org/synapse/issues/12808))
+- Add storage and module API methods to get monthly active users (and their corresponding appservices) within an optionally specified time range. ([\#12838](https://github.com/matrix-org/synapse/issues/12838), [\#12917](https://github.com/matrix-org/synapse/issues/12917))
+- Support the new error code `ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED` from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823). ([\#12845](https://github.com/matrix-org/synapse/issues/12845), [\#12923](https://github.com/matrix-org/synapse/issues/12923))
+- Add a configurable background job to delete stale devices. ([\#12855](https://github.com/matrix-org/synapse/issues/12855))
+- Improve URL previews for pages with empty elements. ([\#12951](https://github.com/matrix-org/synapse/issues/12951))
+- Allow updating a user's password using the admin API without logging out their devices. Contributed by @jcgruenhage. ([\#12952](https://github.com/matrix-org/synapse/issues/12952))
+
+
+Bugfixes
+--------
+
+- Always send an `access_token` in `/thirdparty/` requests to appservices, as required by the [Application Service API specification](https://spec.matrix.org/v1.1/application-service-api/#third-party-networks). ([\#12746](https://github.com/matrix-org/synapse/issues/12746))
+- Implement [MSC3816](https://github.com/matrix-org/matrix-spec-proposals/pull/3816): sending the root event in a thread should count as having 'participated' in it. ([\#12766](https://github.com/matrix-org/synapse/issues/12766))
+- Delete events from the `federation_inbound_events_staging` table when a room is purged through the admin API. ([\#12784](https://github.com/matrix-org/synapse/issues/12784))
+- Fix a bug where we did not correctly handle invalid device list updates over federation. Contributed by Carl Bordum Hansen. ([\#12829](https://github.com/matrix-org/synapse/issues/12829))
+- Fix a bug which allowed multiple async operations to access database locks concurrently. Contributed by @sumnerevans @ Beeper. ([\#12832](https://github.com/matrix-org/synapse/issues/12832))
+- Fix an issue introduced in Synapse 0.34 where the `/notifications` endpoint would only return notifications if a user registered at least one pusher. Contributed by Famedly. ([\#12840](https://github.com/matrix-org/synapse/issues/12840))
+- Fix a bug where servers using a Postgres database would fail to backfill from an insertion event when MSC2716 is enabled (`experimental_features.msc2716_enabled`). ([\#12843](https://github.com/matrix-org/synapse/issues/12843))
+- Fix [MSC3787](https://github.com/matrix-org/matrix-spec-proposals/pull/3787) rooms being omitted from room directory, room summary and space hierarchy responses. ([\#12858](https://github.com/matrix-org/synapse/issues/12858))
+- Fix a bug introduced in Synapse 1.54.0 which could sometimes cause exceptions when handling federated traffic. ([\#12877](https://github.com/matrix-org/synapse/issues/12877))
+- Fix a bug introduced in Synapse 1.59.0 which caused room deletion to fail with a foreign key violation error. ([\#12889](https://github.com/matrix-org/synapse/issues/12889))
+- Fix a long-standing bug which caused the `/messages` endpoint to return an incorrect `end` attribute when there were no more events. Contributed by @Vetchu. ([\#12903](https://github.com/matrix-org/synapse/issues/12903))
+- Fix a bug introduced in Synapse 1.58.0 where `/sync` would fail if the most recent event in a room was a redaction of an event that has since been purged. ([\#12905](https://github.com/matrix-org/synapse/issues/12905))
+- Fix a potential memory leak when generating thumbnails. ([\#12932](https://github.com/matrix-org/synapse/issues/12932))
+- Fix a long-standing bug where a URL preview would break if the image failed to download. ([\#12950](https://github.com/matrix-org/synapse/issues/12950))
+
+
+Improved Documentation
+----------------------
+
+- Fix typographical errors in documentation. ([\#12863](https://github.com/matrix-org/synapse/issues/12863))
+- Fix documentation incorrectly stating the `sendToDevice` endpoint can be directed at generic workers. Contributed by Nick @ Beeper. ([\#12867](https://github.com/matrix-org/synapse/issues/12867))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove support for the non-standard groups/communities feature from Synapse. ([\#12553](https://github.com/matrix-org/synapse/issues/12553), [\#12558](https://github.com/matrix-org/synapse/issues/12558), [\#12563](https://github.com/matrix-org/synapse/issues/12563), [\#12895](https://github.com/matrix-org/synapse/issues/12895), [\#12897](https://github.com/matrix-org/synapse/issues/12897), [\#12899](https://github.com/matrix-org/synapse/issues/12899), [\#12900](https://github.com/matrix-org/synapse/issues/12900), [\#12936](https://github.com/matrix-org/synapse/issues/12936), [\#12966](https://github.com/matrix-org/synapse/issues/12966))
+- Remove contributed `kick_users.py` script. This is broken under Python 3, and is not added to the environment when `pip install`ing Synapse. ([\#12908](https://github.com/matrix-org/synapse/issues/12908))
+- Remove `contrib/jitsimeetbridge`. This was an unused experiment that hasn't been meaningfully changed since 2014. ([\#12909](https://github.com/matrix-org/synapse/issues/12909))
+- Remove unused `contrib/experiements/cursesio.py` script, which fails to run under Python 3. ([\#12910](https://github.com/matrix-org/synapse/issues/12910))
+- Remove unused `contrib/experiements/test_messaging.py` script. This fails to run on Python 3. ([\#12911](https://github.com/matrix-org/synapse/issues/12911))
+
+
+Internal Changes
+----------------
+
+- Test Synapse against Complement with workers. ([\#12810](https://github.com/matrix-org/synapse/issues/12810), [\#12933](https://github.com/matrix-org/synapse/issues/12933))
+- Reduce the amount of state we pull from the DB. ([\#12811](https://github.com/matrix-org/synapse/issues/12811), [\#12964](https://github.com/matrix-org/synapse/issues/12964))
+- Try other homeservers when re-syncing state for rooms with partial state. ([\#12812](https://github.com/matrix-org/synapse/issues/12812))
+- Resume state re-syncing for rooms with partial state after a Synapse restart. ([\#12813](https://github.com/matrix-org/synapse/issues/12813))
+- Remove Mutual Rooms' ([MSC2666](https://github.com/matrix-org/matrix-spec-proposals/pull/2666)) endpoint dependency on the User Directory. ([\#12836](https://github.com/matrix-org/synapse/issues/12836))
+- Experimental: expand `check_event_for_spam` with ability to return additional fields. This enables spam-checker implementations to experiment with mechanisms to give users more information about why they are blocked and whether any action is needed from them to be unblocked. ([\#12846](https://github.com/matrix-org/synapse/issues/12846))
+- Remove `dont_notify` from the `.m.rule.room.server_acl` rule. ([\#12849](https://github.com/matrix-org/synapse/issues/12849))
+- Remove the unstable `/hierarchy` endpoint from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#12851](https://github.com/matrix-org/synapse/issues/12851))
+- Pull out less state when handling gaps in room DAG. ([\#12852](https://github.com/matrix-org/synapse/issues/12852), [\#12904](https://github.com/matrix-org/synapse/issues/12904))
+- Clean-up the push rules datastore. ([\#12856](https://github.com/matrix-org/synapse/issues/12856))
+- Correct a type annotation in the URL preview source code. ([\#12860](https://github.com/matrix-org/synapse/issues/12860))
+- Update `pyjwt` dependency to [2.4.0](https://github.com/jpadilla/pyjwt/releases/tag/2.4.0). ([\#12865](https://github.com/matrix-org/synapse/issues/12865))
+- Enable the `/account/whoami` endpoint on synapse worker processes. Contributed by Nick @ Beeper. ([\#12866](https://github.com/matrix-org/synapse/issues/12866))
+- Enable the `batch_send` endpoint on synapse worker processes. Contributed by Nick @ Beeper. ([\#12868](https://github.com/matrix-org/synapse/issues/12868))
+- Don't generate empty AS transactions when the AS is flagged as down. Contributed by Nick @ Beeper. ([\#12869](https://github.com/matrix-org/synapse/issues/12869))
+- Fix up the variable `state_store` naming. ([\#12871](https://github.com/matrix-org/synapse/issues/12871))
+- Faster room joins: when querying the current state of the room, wait for state to be populated. ([\#12872](https://github.com/matrix-org/synapse/issues/12872))
+- Avoid running queries which will never result in deletions. ([\#12879](https://github.com/matrix-org/synapse/issues/12879))
+- Use constants for EDU types. ([\#12884](https://github.com/matrix-org/synapse/issues/12884))
+- Reduce database load of `/sync` when presence is enabled. ([\#12885](https://github.com/matrix-org/synapse/issues/12885))
+- Refactor `have_seen_events` to reduce memory consumed when processing federation traffic. ([\#12886](https://github.com/matrix-org/synapse/issues/12886))
+- Refactor receipt linearization code. ([\#12888](https://github.com/matrix-org/synapse/issues/12888))
+- Add type annotations to `synapse.logging.opentracing`. ([\#12894](https://github.com/matrix-org/synapse/issues/12894))
+- Remove PyNaCl occurrences directly used in Synapse code. ([\#12902](https://github.com/matrix-org/synapse/issues/12902))
+- Bump types-jsonschema from 4.4.1 to 4.4.6. ([\#12912](https://github.com/matrix-org/synapse/issues/12912))
+- Rename storage classes. ([\#12913](https://github.com/matrix-org/synapse/issues/12913))
+- Preparation for database schema simplifications: stop reading from `event_edges.room_id`. ([\#12914](https://github.com/matrix-org/synapse/issues/12914))
+- Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script. ([\#12916](https://github.com/matrix-org/synapse/issues/12916))
+- Improve the logging when signature checks on events fail. ([\#12925](https://github.com/matrix-org/synapse/issues/12925))
+
+
 Synapse 1.60.0 (2022-05-31)
 ===========================
 
diff --git a/changelog.d/12553.removal b/changelog.d/12553.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12553.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12558.removal b/changelog.d/12558.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12558.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12563.removal b/changelog.d/12563.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12563.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12732.feature b/changelog.d/12732.feature
deleted file mode 100644
index 3c73363d28..0000000000
--- a/changelog.d/12732.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new `media_retention` options to the homeserver config for routinely cleaning up non-recently accessed media.
\ No newline at end of file
diff --git a/changelog.d/12740.feature b/changelog.d/12740.feature
deleted file mode 100644
index e674c31ae8..0000000000
--- a/changelog.d/12740.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support for [MSC3772](https://github.com/matrix-org/matrix-spec-proposals/pull/3772): Push rule for mutually related events.
diff --git a/changelog.d/12746.bugfix b/changelog.d/12746.bugfix
deleted file mode 100644
index 67e7fc854c..0000000000
--- a/changelog.d/12746.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Always send an `access_token` in `/thirdparty/` requests to appservices, as required by the [Matrix specification](https://spec.matrix.org/v1.1/application-service-api/#third-party-networks).
\ No newline at end of file
diff --git a/changelog.d/12766.bugfix b/changelog.d/12766.bugfix
deleted file mode 100644
index 912c3deb70..0000000000
--- a/changelog.d/12766.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC3816](https://github.com/matrix-org/matrix-spec-proposals/pull/3816): sending the root event in a thread should count as "participated" in it.
diff --git a/changelog.d/12784.bugfix b/changelog.d/12784.bugfix
deleted file mode 100644
index a958f9a16b..0000000000
--- a/changelog.d/12784.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Delete events from the `federation_inbound_events_staging` table when a room is purged through the admin API.
diff --git a/changelog.d/12808.feature b/changelog.d/12808.feature
deleted file mode 100644
index 561c8b9d34..0000000000
--- a/changelog.d/12808.feature
+++ /dev/null
@@ -1 +0,0 @@
-Update to `check_event_for_spam`. Deprecate the current callback signature, replace it with a new signature that is both less ambiguous (replacing booleans with explicit allow/block) and more powerful (ability to return explicit error codes).
\ No newline at end of file
diff --git a/changelog.d/12810.misc b/changelog.d/12810.misc
deleted file mode 100644
index fe5fb81d5e..0000000000
--- a/changelog.d/12810.misc
+++ /dev/null
@@ -1 +0,0 @@
-Test Synapse against Complement with workers.
\ No newline at end of file
diff --git a/changelog.d/12811.misc b/changelog.d/12811.misc
deleted file mode 100644
index d57e1aca6b..0000000000
--- a/changelog.d/12811.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce the amount of state we pull from the DB.
diff --git a/changelog.d/12812.misc b/changelog.d/12812.misc
deleted file mode 100644
index 53cb936a02..0000000000
--- a/changelog.d/12812.misc
+++ /dev/null
@@ -1 +0,0 @@
-Try other homeservers when re-syncing state for rooms with partial state.
diff --git a/changelog.d/12813.misc b/changelog.d/12813.misc
deleted file mode 100644
index 8be9f3eb44..0000000000
--- a/changelog.d/12813.misc
+++ /dev/null
@@ -1 +0,0 @@
-Resume state re-syncing for rooms with partial state after a Synapse restart.
diff --git a/changelog.d/12829.bugfix b/changelog.d/12829.bugfix
deleted file mode 100644
index dfa1fed34e..0000000000
--- a/changelog.d/12829.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where we did not correctly handle invalid device list updates over federation. Contributed by Carl Bordum Hansen.
diff --git a/changelog.d/12832.bugfix b/changelog.d/12832.bugfix
deleted file mode 100644
index 497d5184ea..0000000000
--- a/changelog.d/12832.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug which allowed multiple async operations to access database locks concurrently. Contributed by @sumnerevans @ Beeper.
diff --git a/changelog.d/12836.misc b/changelog.d/12836.misc
deleted file mode 100644
index 85909c6a2d..0000000000
--- a/changelog.d/12836.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove Mutual Rooms ([MSC2666](https://github.com/matrix-org/matrix-spec-proposals/pull/2666)) endpoint dependency on the User Directory.
\ No newline at end of file
diff --git a/changelog.d/12838.feature b/changelog.d/12838.feature
deleted file mode 100644
index b24489aaad..0000000000
--- a/changelog.d/12838.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add storage and module API methods to get monthly active users (and their corresponding appservices) within an optionally specified time range.
diff --git a/changelog.d/12840.bugfix b/changelog.d/12840.bugfix
deleted file mode 100644
index b15cedf896..0000000000
--- a/changelog.d/12840.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue introduced in Synapse 0.34 where the `/notifications` endpoint would only return notifications if a user registered at least one pusher. Contributed by Famedly.
diff --git a/changelog.d/12843.bugfix b/changelog.d/12843.bugfix
deleted file mode 100644
index f87c0799a0..0000000000
--- a/changelog.d/12843.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where servers using a Postgres database would fail to backfill from an insertion event when MSC2716 is enabled (`experimental_features.msc2716_enabled`).
diff --git a/changelog.d/12845.feature b/changelog.d/12845.feature
deleted file mode 100644
index 815a1f10ea..0000000000
--- a/changelog.d/12845.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support the new error code "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED" from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823).
\ No newline at end of file
diff --git a/changelog.d/12846.misc b/changelog.d/12846.misc
deleted file mode 100644
index f72d3d2bea..0000000000
--- a/changelog.d/12846.misc
+++ /dev/null
@@ -1 +0,0 @@
-Experimental: expand `check_event_for_spam` with ability to return additional fields. This enables spam-checker implementations to experiment with mechanisms to give users more information about why they are blocked and whether any action is needed from them to be unblocked.
\ No newline at end of file
diff --git a/changelog.d/12849.misc b/changelog.d/12849.misc
deleted file mode 100644
index 4c2a15ce2b..0000000000
--- a/changelog.d/12849.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove `dont_notify` from the `.m.rule.room.server_acl` rule.
\ No newline at end of file
diff --git a/changelog.d/12851.misc b/changelog.d/12851.misc
deleted file mode 100644
index ca6f48c369..0000000000
--- a/changelog.d/12851.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove the unstable `/hierarchy` endpoint from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).
diff --git a/changelog.d/12852.misc b/changelog.d/12852.misc
deleted file mode 100644
index afca32471f..0000000000
--- a/changelog.d/12852.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pull out less state when handling gaps in room DAG.
diff --git a/changelog.d/12855.feature b/changelog.d/12855.feature
deleted file mode 100644
index 915f008ec6..0000000000
--- a/changelog.d/12855.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a configurable background job to delete stale devices.
diff --git a/changelog.d/12856.misc b/changelog.d/12856.misc
deleted file mode 100644
index 19ecefd9af..0000000000
--- a/changelog.d/12856.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean-up the push rules datastore.
diff --git a/changelog.d/12858.bugfix b/changelog.d/12858.bugfix
deleted file mode 100644
index 8c95a3e3a3..0000000000
--- a/changelog.d/12858.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix [MSC3787](https://github.com/matrix-org/matrix-spec-proposals/pull/3787) rooms being omitted from room directory, room summary and space hierarchy responses.
diff --git a/changelog.d/12859.feature b/changelog.d/12859.feature
deleted file mode 100644
index e674c31ae8..0000000000
--- a/changelog.d/12859.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support for [MSC3772](https://github.com/matrix-org/matrix-spec-proposals/pull/3772): Push rule for mutually related events.
diff --git a/changelog.d/12860.misc b/changelog.d/12860.misc
deleted file mode 100644
index b7d2943023..0000000000
--- a/changelog.d/12860.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correct a type annotation in the URL preview source code.
diff --git a/changelog.d/12863.doc b/changelog.d/12863.doc
deleted file mode 100644
index 94f7b8371a..0000000000
--- a/changelog.d/12863.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typos in documentation.
\ No newline at end of file
diff --git a/changelog.d/12865.misc b/changelog.d/12865.misc
deleted file mode 100644
index d982ca7622..0000000000
--- a/changelog.d/12865.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update `pyjwt` dependency to [2.4.0](https://github.com/jpadilla/pyjwt/releases/tag/2.4.0).
diff --git a/changelog.d/12866.misc b/changelog.d/12866.misc
deleted file mode 100644
index 3f7ef59253..0000000000
--- a/changelog.d/12866.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable the `/account/whoami` endpoint on synapse worker processes. Contributed by Nick @ Beeper.
diff --git a/changelog.d/12867.doc b/changelog.d/12867.doc
deleted file mode 100644
index 1caeb7a290..0000000000
--- a/changelog.d/12867.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix documentation incorrectly stating the `sendToDevice` endpoint can be directed at generic workers. Contributed by Nick @ Beeper.
diff --git a/changelog.d/12868.misc b/changelog.d/12868.misc
deleted file mode 100644
index 382a876dab..0000000000
--- a/changelog.d/12868.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable the `batch_send` endpoint on synapse worker processes. Contributed by Nick @ Beeper.
diff --git a/changelog.d/12869.misc b/changelog.d/12869.misc
deleted file mode 100644
index 1d9d1c8921..0000000000
--- a/changelog.d/12869.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't generate empty AS transactions when the AS is flagged as down. Contributed by Nick @ Beeper.
diff --git a/changelog.d/12871.misc b/changelog.d/12871.misc
deleted file mode 100644
index 94bd6c4974..0000000000
--- a/changelog.d/12871.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix up the variable `state_store` naming.
diff --git a/changelog.d/12872.misc b/changelog.d/12872.misc
deleted file mode 100644
index f60a756f21..0000000000
--- a/changelog.d/12872.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster room joins: when querying the current state of the room, wait for state to be populated.
diff --git a/changelog.d/12877.bugfix b/changelog.d/12877.bugfix
deleted file mode 100644
index 1ecf448baf..0000000000
--- a/changelog.d/12877.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.54 which could sometimes cause exceptions when handling federated traffic.
diff --git a/changelog.d/12879.misc b/changelog.d/12879.misc
deleted file mode 100644
index 24fa0d0de0..0000000000
--- a/changelog.d/12879.misc
+++ /dev/null
@@ -1 +0,0 @@
-Avoid running queries which will never result in deletions.
diff --git a/changelog.d/12884.misc b/changelog.d/12884.misc
deleted file mode 100644
index 56eead9472..0000000000
--- a/changelog.d/12884.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use constants for EDU types.
diff --git a/changelog.d/12885.misc b/changelog.d/12885.misc
deleted file mode 100644
index 2524056307..0000000000
--- a/changelog.d/12885.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database load of `/sync` when presence is enabled.
diff --git a/changelog.d/12886.misc b/changelog.d/12886.misc
deleted file mode 100644
index 3dd08f74ba..0000000000
--- a/changelog.d/12886.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `have_seen_events` to reduce memory consumed when processing federation traffic.
diff --git a/changelog.d/12888.misc b/changelog.d/12888.misc
deleted file mode 100644
index 8ed2ea65b5..0000000000
--- a/changelog.d/12888.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor receipt linearization code.
diff --git a/changelog.d/12889.bugfix b/changelog.d/12889.bugfix
deleted file mode 100644
index 582b2f0642..0000000000
--- a/changelog.d/12889.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.59.0 which caused room deletion to fail with a foreign key violation.
diff --git a/changelog.d/12894.misc b/changelog.d/12894.misc
deleted file mode 100644
index 646a62fccb..0000000000
--- a/changelog.d/12894.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations to `synapse.logging.opentracing`.
diff --git a/changelog.d/12895.removal b/changelog.d/12895.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12895.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12897.removal b/changelog.d/12897.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12897.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12899.removal b/changelog.d/12899.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12899.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12900.removal b/changelog.d/12900.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12900.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12902.misc b/changelog.d/12902.misc
deleted file mode 100644
index 3ee8f92552..0000000000
--- a/changelog.d/12902.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove PyNaCl occurrences directly used in Synapse code.
\ No newline at end of file
diff --git a/changelog.d/12903.bugfix b/changelog.d/12903.bugfix
deleted file mode 100644
index f264399483..0000000000
--- a/changelog.d/12903.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug which caused the `/messages` endpoint to return an incorrect `end` attribute when there were no more events. Contributed by @Vetchu.
diff --git a/changelog.d/12904.misc b/changelog.d/12904.misc
deleted file mode 100644
index afca32471f..0000000000
--- a/changelog.d/12904.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pull out less state when handling gaps in room DAG.
diff --git a/changelog.d/12905.bugfix b/changelog.d/12905.bugfix
deleted file mode 100644
index 67e95d0398..0000000000
--- a/changelog.d/12905.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.58.0 where `/sync` would fail if the most recent event in a room was a redaction of an event that has since been purged.
diff --git a/changelog.d/12908.removal b/changelog.d/12908.removal
deleted file mode 100644
index a1d05d69e8..0000000000
--- a/changelog.d/12908.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove contributed `kick_users.py` script. This is broken under Python 3, and is not added to the environment when `pip install`ing Synapse.
diff --git a/changelog.d/12909.removal b/changelog.d/12909.removal
deleted file mode 100644
index 0baff46ea9..0000000000
--- a/changelog.d/12909.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove `contrib/jitsimeetbridge`. This was an unused experiment that hasn't been meaningfully changed since 2014.
diff --git a/changelog.d/12910.removal b/changelog.d/12910.removal
deleted file mode 100644
index 4bd4f877f6..0000000000
--- a/changelog.d/12910.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused `contrib/experiements/cursesio.py` script, which fails to run under Python 3.
diff --git a/changelog.d/12911.removal b/changelog.d/12911.removal
deleted file mode 100644
index 5178cd6532..0000000000
--- a/changelog.d/12911.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused `contrib/experiements/test_messaging.py` script. This fails to run on Python 3.
diff --git a/changelog.d/12912.misc b/changelog.d/12912.misc
deleted file mode 100644
index 6396fd9d36..0000000000
--- a/changelog.d/12912.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-jsonschema from 4.4.1 to 4.4.6.
diff --git a/changelog.d/12913.misc b/changelog.d/12913.misc
deleted file mode 100644
index a2bc940557..0000000000
--- a/changelog.d/12913.misc
+++ /dev/null
@@ -1 +0,0 @@
-Rename storage classes.
diff --git a/changelog.d/12914.misc b/changelog.d/12914.misc
deleted file mode 100644
index 07d819932a..0000000000
--- a/changelog.d/12914.misc
+++ /dev/null
@@ -1 +0,0 @@
-Preparation for database schema simplifications: stop reading from `event_edges.room_id`.
diff --git a/changelog.d/12916.misc b/changelog.d/12916.misc
deleted file mode 100644
index 347eb096db..0000000000
--- a/changelog.d/12916.misc
+++ /dev/null
@@ -1 +0,0 @@
-Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script.
diff --git a/changelog.d/12917.feature b/changelog.d/12917.feature
deleted file mode 100644
index b24489aaad..0000000000
--- a/changelog.d/12917.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add storage and module API methods to get monthly active users (and their corresponding appservices) within an optionally specified time range.
diff --git a/changelog.d/12923.feature b/changelog.d/12923.feature
deleted file mode 100644
index 815a1f10ea..0000000000
--- a/changelog.d/12923.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support the new error code "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED" from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823).
\ No newline at end of file
diff --git a/changelog.d/12925.misc b/changelog.d/12925.misc
deleted file mode 100644
index 71ca956dc5..0000000000
--- a/changelog.d/12925.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the logging when signature checks on events fail.
diff --git a/changelog.d/12932.bugfix b/changelog.d/12932.bugfix
deleted file mode 100644
index 506f92b427..0000000000
--- a/changelog.d/12932.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix potential memory leak when generating thumbnails.
diff --git a/changelog.d/12933.misc b/changelog.d/12933.misc
deleted file mode 100644
index e29bf02407..0000000000
--- a/changelog.d/12933.misc
+++ /dev/null
@@ -1 +0,0 @@
-Test Synapse against Complement with workers.
diff --git a/changelog.d/12936.removal b/changelog.d/12936.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12936.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12950.bugfix b/changelog.d/12950.bugfix
deleted file mode 100644
index e835d9aa72..0000000000
--- a/changelog.d/12950.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where a URL preview would break if the image failed to download.
diff --git a/changelog.d/12951.feature b/changelog.d/12951.feature
deleted file mode 100644
index f885be9fe4..0000000000
--- a/changelog.d/12951.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve URL previews for pages with empty elements.
diff --git a/changelog.d/12952.feature b/changelog.d/12952.feature
deleted file mode 100644
index 7329bcc3d4..0000000000
--- a/changelog.d/12952.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow updating a user's password using the admin API without logging out their devices. Contributed by @jcgruenhage.
diff --git a/changelog.d/12964.misc b/changelog.d/12964.misc
deleted file mode 100644
index d57e1aca6b..0000000000
--- a/changelog.d/12964.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce the amount of state we pull from the DB.
diff --git a/changelog.d/12966.removal b/changelog.d/12966.removal
deleted file mode 100644
index 41f6fae5da..0000000000
--- a/changelog.d/12966.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for the non-standard groups/communities feature from Synapse.
diff --git a/changelog.d/12972.feature b/changelog.d/12972.feature
deleted file mode 100644
index 3c73363d28..0000000000
--- a/changelog.d/12972.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new `media_retention` options to the homeserver config for routinely cleaning up non-recently accessed media.
\ No newline at end of file
diff --git a/changelog.d/12977.feature b/changelog.d/12977.feature
deleted file mode 100644
index 3c73363d28..0000000000
--- a/changelog.d/12977.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new `media_retention` options to the homeserver config for routinely cleaning up non-recently accessed media.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 8f08972743..9591334c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-matrix-synapse-py3 (1.61.0~rc1+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.61.0~rc1) stable; urgency=medium
 
-  * Non-maintainer upload.
   * Remove unused `jitsimeetbridge` experiment from `contrib` directory.
+  * New Synapse release 1.61.0rc1.
 
- -- Synapse Packaging team <packages@matrix.org>  Sun, 29 May 2022 14:44:45 +0100
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Jun 2022 12:42:31 +0100
 
 matrix-synapse-py3 (1.60.0) stable; urgency=medium
 
diff --git a/pyproject.toml b/pyproject.toml
index a6f3169e70..fde6a4f424 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.60.0"
+version = "1.61.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"