Merge tag 'v1.40.0rc2' into develop

Synapse 1.40.0rc2 (2021-08-04)
==============================

Bugfixes
--------

- Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread. ([\#10517](https://github.com/matrix-org/synapse/issues/10517))
- Fix a bug introduced in Synapse v1.40.0rc1 that could cause Synapse to respond with an error when clients would update read receipts. ([\#10531](https://github.com/matrix-org/synapse/issues/10531))

Internal Changes
----------------

- Fix release script to open the correct URL for the release. ([\#10516](https://github.com/matrix-org/synapse/issues/10516))
This commit is contained in:
Erik Johnston 2021-08-05 11:15:29 +01:00
commit a36d77c563
7 changed files with 38 additions and 3 deletions

View File

@ -1,3 +1,19 @@
Synapse 1.40.0rc2 (2021-08-04)
==============================
Bugfixes
--------
- Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread. ([\#10517](https://github.com/matrix-org/synapse/issues/10517))
- Fix a bug introduced in Synapse v1.40.0rc1 that could cause Synapse to respond with an error when clients would update read receipts. ([\#10531](https://github.com/matrix-org/synapse/issues/10531))
Internal Changes
----------------
- Fix release script to open the correct URL for the release. ([\#10516](https://github.com/matrix-org/synapse/issues/10516))
Synapse 1.40.0rc1 (2021-08-03) Synapse 1.40.0rc1 (2021-08-03)
============================== ==============================

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.40.0~rc2) stable; urgency=medium
* New synapse release 1.40.0~rc2.
-- Synapse Packaging team <packages@matrix.org> Wed, 04 Aug 2021 17:08:55 +0100
matrix-synapse-py3 (1.40.0~rc1) stable; urgency=medium matrix-synapse-py3 (1.40.0~rc1) stable; urgency=medium
[ Richard van der Hoff ] [ Richard van der Hoff ]

View File

@ -305,7 +305,7 @@ def tag(gh_token: Optional[str]):
) )
# Open the release and the actions where we are building the assets. # Open the release and the actions where we are building the assets.
click.launch(release.url) click.launch(release.html_url)
click.launch( click.launch(
f"https://github.com/matrix-org/synapse/actions?query=branch%3A{tag_name}" f"https://github.com/matrix-org/synapse/actions?query=branch%3A{tag_name}"
) )

View File

@ -47,7 +47,7 @@ try:
except ImportError: except ImportError:
pass pass
__version__ = "1.40.0rc1" __version__ = "1.40.0rc2"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when # We import here so that we don't have to install a bunch of deps when

View File

@ -45,6 +45,7 @@ class PeriodicallyFlushingMemoryHandler(MemoryHandler):
self._flushing_thread: Thread = Thread( self._flushing_thread: Thread = Thread(
name="PeriodicallyFlushingMemoryHandler flushing thread", name="PeriodicallyFlushingMemoryHandler flushing thread",
target=self._flush_periodically, target=self._flush_periodically,
daemon=True,
) )
self._flushing_thread.start() self._flushing_thread.start()

View File

@ -43,7 +43,7 @@ class ReceiptRestServlet(RestServlet):
if receipt_type != "m.read": if receipt_type != "m.read":
raise SynapseError(400, "Receipt type must be 'm.read'") raise SynapseError(400, "Receipt type must be 'm.read'")
body = parse_json_object_from_request(request) body = parse_json_object_from_request(request, allow_empty_body=True)
hidden = body.get(ReadReceiptEventFields.MSC2285_HIDDEN, False) hidden = body.get(ReadReceiptEventFields.MSC2285_HIDDEN, False)
if not isinstance(hidden, bool): if not isinstance(hidden, bool):

View File

@ -418,6 +418,18 @@ class ReadReceiptsTestCase(unittest.HomeserverTestCase):
# Test that the first user can't see the other user's hidden read receipt # Test that the first user can't see the other user's hidden read receipt
self.assertEqual(self._get_read_receipt(), None) self.assertEqual(self._get_read_receipt(), None)
def test_read_receipt_with_empty_body(self):
# Send a message as the first user
res = self.helper.send(self.room_id, body="hello", tok=self.tok)
# Send a read receipt for this message with an empty body
channel = self.make_request(
"POST",
"/rooms/%s/receipt/m.read/%s" % (self.room_id, res["event_id"]),
access_token=self.tok2,
)
self.assertEqual(channel.code, 200)
def _get_read_receipt(self): def _get_read_receipt(self):
"""Syncs and returns the read receipt.""" """Syncs and returns the read receipt."""