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 7 commits into from
May 5, 2022
Merged

Update _on_new_receipts() to work with MSC2285 changes #12636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
003a569
Add changelog
SimonBrandner May 5, 2022
3d09bef
Update `_on_new_receipts()` to work with MSC2285 changes
SimonBrandner May 5, 2022
a5dc2d6
Match changelog
SimonBrandner May 5, 2022
5d9fc6b
Fix changelog number
SimonBrandner May 5, 2022
69b42f7
Never send out private receipts no matter what
SimonBrandner May 5, 2022
51d5bbe
Delint
SimonBrandner May 5, 2022
b2add74
Add a comment.
clokep May 5, 2022
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.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 3 additions & 5 deletions synapse/replication/tcp/client.py
View file
Open in desktop
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 @@ -401,10 +401,8 @@ async def _on_new_receipts(
# we only want to send on receipts for our own users
if not self._is_mine_id(receipt.user_id):
continue
if (
receipt.data.get("hidden", False)
and self._hs.config.experimental.msc2285_enabled
):
# Private read receipts never get sent over federation.
if receipt.receipt_type == ReceiptTypes.READ_PRIVATE:
clokep marked this conversation as resolved.
Show resolved Hide resolved
continue
receipt_info = ReadReceipt(
receipt.room_id,
Expand Down