Merge branch 'matrix-org:main' into main

6 months ago · e20c93cfac
parent 4fae6112e4 3b2146c875
commit e20c93cfac
2 changed files with 2 additions and 1 deletions
--- a/changelogs/client_server/newsfragments/1685.clarification
+++ b/changelogs/client_server/newsfragments/1685.clarification
@ -0,0 +1 @@
+Clarify that read-receipts should be batched by thread as well as room.
--- a/content/client-server-api/modules/receipts.md
+++ b/content/client-server-api/modules/receipts.md
@ -208,7 +208,7 @@ event when the user expands that thread.

 #### Server behaviour

-For efficiency, receipts SHOULD be batched into one event per room
+For efficiency, receipts SHOULD be batched into one event per room and thread
 before delivering them to clients.

 Some receipts are sent across federation as EDUs with type `m.receipt`. The
				`@ -0,0 +1 @@`
				`Clarify that read-receipts should be batched by thread as well as room.`