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

Update _on_new_receipts() to work with MSC2285 changes #12636

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12636.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update `_on_new_receipts()` to work with [MSC2285](https://github.com/matrix-org/matrix-spec-proposals/pull/2285) changes. This was missed in https://github.com/matrix-org/synapse/pull/12168.
SimonBrandner marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions synapse/replication/tcp/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from twisted.internet.protocol import ReconnectingClientFactory
from twisted.python.failure import Failure

from synapse.api.constants import EventTypes
from synapse.api.constants import EventTypes, ReceiptTypes
from synapse.federation import send_queue
from synapse.federation.sender import FederationSender
from synapse.logging.context import PreserveLoggingContext, make_deferred_yieldable
Expand Down Expand Up @@ -402,7 +402,7 @@ async def _on_new_receipts(
if not self._is_mine_id(receipt.user_id):
continue
if (
receipt.data.get("hidden", False)
receipt.receipt_type == ReceiptTypes.READ_PRIVATE
and self._hs.config.experimental.msc2285_enabled
SimonBrandner marked this conversation as resolved.
Show resolved Hide resolved
):
continue
Expand Down