Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-16 16:47:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't error on unknown receipt types (#12670)

Browse Source 
Fixes #12669
This commit is contained in:
Erik Johnston 2022-05-09 11:09:19 +01:00 committed by GitHub
parent 77258b6725
commit c5969b346d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12670.feature Normal file
View File

@ -0,0 +1 @@
Implement [changes](https://github.com/matrix-org/matrix-spec-proposals/pull/2285/commits/4a77139249c2e830aec3c7d6bd5501a514d1cc27) to [MSC2285 (hidden read receipts)](https://github.com/matrix-org/matrix-spec-proposals/pull/2285). Contributed by @SimonBrandner.

25
synapse/rest/client/read_marker.py
View File

@ -16,7 +16,6 @@ import logging
from typing import TYPE_CHECKING, Tuple from typing import TYPE_CHECKING, Tuple
from synapse.api.constants import ReceiptTypes from synapse.api.constants import ReceiptTypes
from synapse.api.errors import SynapseError
from synapse.http.server import HttpServer from synapse.http.server import HttpServer
from synapse.http.servlet import RestServlet, parse_json_object_from_request from synapse.http.servlet import RestServlet, parse_json_object_from_request
from synapse.http.site import SynapseRequest from synapse.http.site import SynapseRequest
@ -50,17 +49,21 @@ class ReadMarkerRestServlet(RestServlet):
body = parse_json_object_from_request(request) body = parse_json_object_from_request(request)
valid_receipt_types = {ReceiptTypes.READ, ReceiptTypes.FULLY_READ} valid_receipt_types = {
if self.config.experimental.msc2285_enabled: ReceiptTypes.READ,
valid_receipt_types.add(ReceiptTypes.READ_PRIVATE) ReceiptTypes.FULLY_READ,
ReceiptTypes.READ_PRIVATE,
}
if set(body.keys()) > valid_receipt_types: unrecognized_types = set(body.keys()) - valid_receipt_types
raise SynapseError( if unrecognized_types:
400, # It's fine if there are unrecognized receipt types, but let's log
"Receipt type must be 'm.read', 'org.matrix.msc2285.read.private' or 'm.fully_read'" # it to help debug clients that have typoed the receipt type.
if self.config.experimental.msc2285_enabled #
else "Receipt type must be 'm.read' or 'm.fully_read'", # We specifically *don't* error here, as a) it stops us processing
) # the valid receipts, and b) we need to be extensible on receipt
# types.
logger.info("Ignoring unrecognized receipt types: %s", unrecognized_types)
read_event_id = body.get(ReceiptTypes.READ, None) read_event_id = body.get(ReceiptTypes.READ, None)
if read_event_id: if read_event_id: