Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
ef86cf3d
Unverified
Commit
ef86cf3d
authored
2 years ago
by
Šimon Brandner
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update `_on_new_receipts()` to work with MSC2285 changes. (#12636)
parent
07fa53ec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/12636.feature
+1
-0
1 addition, 0 deletions
changelog.d/12636.feature
synapse/replication/tcp/client.py
+3
-5
3 additions, 5 deletions
synapse/replication/tcp/client.py
with
4 additions
and
5 deletions
changelog.d/12636.feature
0 → 100644
+
1
−
0
View file @
ef86cf3d
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.
This diff is collapsed.
Click to expand it.
synapse/replication/tcp/client.py
+
3
−
5
View file @
ef86cf3d
...
...
@@ -21,7 +21,7 @@ from twisted.internet.interfaces import IAddress, IConnector
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
...
...
@@ -401,10 +401,8 @@ class FederationSenderHandler:
# 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
:
continue
receipt_info
=
ReadReceipt
(
receipt
.
room_id
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment