Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 2b97665

Browse files
erikjohnstonerikjohnston
authored
Merge branch 'develop' into erikj/sync_cache_default
2 parents ebad183 + 941dc3d commit 2b97665

File tree

114 files changed

+1205
-6262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1205
-6262
lines changed

‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ jobs:
347347

348348
- run: |
349349
set -o pipefail
350-
POSTGRES=${{ (matrix.database == 'Postgres') && 1 }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt
350+
POSTGRES=${{ (matrix.database == 'Postgres') && 1 || '' }} COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -json 2>&1 | gotestfmt
351351
shell: bash
352352
name: Run Complement Tests
353353

‎CHANGES.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1-
Synapse 1.61.0rc1 (2022-06-07)
2-
==============================
1+
Synapse 1.61.0 (2022-06-14)
2+
===========================
33

44
This release removes support for the non-standard feature known both as 'groups' and as 'communities', which have been superseded by *Spaces*.
55

6+
See [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1610)
7+
for more details.
8+
9+
Improved Documentation
10+
----------------------
11+
12+
- Mention removed community/group worker endpoints in [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1610). Contributed by @olmari. ([\#13023](https://github.com/matrix-org/synapse/issues/13023))
13+
14+
15+
Synapse 1.61.0rc1 (2022-06-07)
16+
==============================
17+
618
Features
719
--------
820

‎changelog.d/12893.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Simplify the database schema for `event_edges`.

‎changelog.d/12941.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove code generating comments in configuration.

‎changelog.d/12986.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor macaroon tokens generation and move the unsubscribe link in notification emails to `/_synapse/client/unsubscribe`.

‎changelog.d/13018.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a long-standing bug which meant that rate limiting was not restrictive enough in some cases.

‎changelog.d/13021.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Decouple `synapse.api.auth_blocking.AuthBlocking` from `synapse.api.auth.Auth`.

‎changelog.d/13023.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Mention removed community/group worker endpoints in upgrade.md. Contributed by @olmari.

‎changelog.d/13034.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Enable testing against PostgreSQL databases in Complement CI.

‎changelog.d/13036.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add metrics measuring the CPU and DB time spent in state resolution.

‎changelog.d/13041.bugfix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix a bug introduced in Synapse 1.58 where profile requests for a malformed user ID would ccause an internal error. Synapse now returns 400 Bad Request in this situation.
2+

‎changelog.d/13047.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Port spam-checker API callbacks to a new, richer API. This is part of an ongoing change to let spam-checker modules inform users of the reason their event or operation is rejected.

‎changelog.d/13048.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Increase timeout of complement CI test runs.

‎changelog.d/13050.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Replace noop background updates with `DELETE` delta.

‎changelog.d/13052.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor entry points so that they all have a `main` function.

‎changelog.d/13060.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Don't instantiate modules with keyword arguments.

‎changelog.d/13061.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix type checking errors against Twisted trunk.

‎debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
matrix-synapse-py3 (1.61.0) stable; urgency=medium
2+
3+
* New Synapse release 1.61.0.
4+
5+
-- Synapse Packaging team <[email protected]> Tue, 14 Jun 2022 11:44:19 +0100
6+
17
matrix-synapse-py3 (1.61.0~rc1) stable; urgency=medium
28

39
* Remove unused `jitsimeetbridge` experiment from `contrib` directory.

‎docs/.sample_config_header.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
# This file is maintained as an up-to-date snapshot of the default
2-
# homeserver.yaml configuration generated by Synapse.
3-
#
4-
# It is intended to act as a reference for the default configuration,
5-
# helping admins keep track of new options and other changes, and compare
6-
# their configs with the current default. As such, many of the actual
7-
# config values shown are placeholders.
2+
# homeserver.yaml configuration generated by Synapse. You can find a
3+
# complete accounting of possible configuration options at
4+
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html
85
#
96
# It is *not* intended to be copied and used as the basis for a real
107
# homeserver.yaml. Instead, if you are starting from scratch, please generate
118
# a fresh config using Synapse by following the instructions in
129
# https://matrix-org.github.io/synapse/latest/setup/installation.html.
13-
14-
# Configuration options that take a time period can be set using a number
15-
# followed by a letter. Letters have the following meanings:
16-
# s = second
17-
# m = minute
18-
# h = hour
19-
# d = day
20-
# w = week
21-
# y = year
22-
# For example, setting redaction_retention_period: 5m would remove redacted
23-
# messages from the database after 5 minutes, rather than 5 months.
24-
10+
#
2511
################################################################################
2612

‎docs/modules/spam_checker_callbacks.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ this callback.
7070

7171
_First introduced in Synapse v1.37.0_
7272

73-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
73+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
7474

7575
```python
7676
async def user_may_invite(inviter: str, invitee: str, room_id: str) -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
@@ -100,7 +100,7 @@ this callback.
100100

101101
_First introduced in Synapse v1.45.0_
102102

103-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
103+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
104104

105105
```python
106106
async def user_may_send_3pid_invite(
@@ -154,7 +154,7 @@ this callback.
154154

155155
_First introduced in Synapse v1.37.0_
156156

157-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
157+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
158158

159159
```python
160160
async def user_may_create_room(user_id: str) -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
@@ -183,7 +183,7 @@ this callback.
183183

184184
_First introduced in Synapse v1.37.0_
185185

186-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
186+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
187187

188188
```python
189189
async def user_may_create_room_alias(user_id: str, room_alias: "synapse.module_api.RoomAlias") -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
@@ -212,7 +212,7 @@ this callback.
212212

213213
_First introduced in Synapse v1.37.0_
214214

215-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
215+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
216216

217217
```python
218218
async def user_may_publish_room(user_id: str, room_id: str) -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
@@ -303,7 +303,7 @@ this callback.
303303

304304
_First introduced in Synapse v1.37.0_
305305

306-
_Changed in Synapse v1.61.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
306+
_Changed in Synapse v1.62.0: `synapse.module_api.NOT_SPAM` and `synapse.module_api.errors.Codes` can be returned by this callback. Returning a boolean is now deprecated._
307307

308308
```python
309309
async def check_media_file_for_spam(

0 commit comments

Comments
 (0)