Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for MSC4115 #17104

Merged
merged 9 commits into from
Apr 29, 2024
Merged

Add support for MSC4115 #17104

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d27023b
Remove tautologous test, and fix up doc-comments
richvdh Apr 18, 2024
33c3bb7
test_visibility: use shared injection methods
richvdh Apr 18, 2024
296f651
Add a test for client event filtering
richvdh Apr 18, 2024
b9a49e8
Return membership on each event returned to the client
richvdh Apr 18, 2024
0ca0cd7
changelog
richvdh Apr 18, 2024
b2b59c4
Enable MSC4115 in complement tests
richvdh Apr 22, 2024
88f9ba5
Update tests/test_visibility.py
richvdh Apr 26, 2024
7da98ba
Add comments and address review comments
richvdh Apr 26, 2024
1ecd3e7
Merge branch 'develop' into rav/event_visibility
richvdh Apr 26, 2024
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
12 changes: 6 additions & 6 deletions synapse/visibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,13 @@ def _check_client_allowed_to_see_event(

@attr.s(frozen=True, slots=True, auto_attribs=True)
class _CheckMembershipReturn:
"Return value of _check_membership"
"""Return value of _check_membership"""

allowed: bool
"""Whether the user should be allowed to see the event"""

joined: bool
"""Whether the user was joined at the event"""
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved


def _check_membership(
Expand All @@ -409,10 +413,6 @@ def _check_membership(
is_peeking: bool,
) -> _CheckMembershipReturn:
"""Check whether the user can see the event due to their membership

Returns:
True if they can, False if they can't, plus the membership of the user
at the event.
"""
# If the event is the user's own membership event, use the 'most joined'
# membership
Expand All @@ -435,7 +435,7 @@ def _check_membership(
if membership == "leave" and (
prev_membership == "join" or prev_membership == "invite"
):
return _CheckMembershipReturn(True, membership == Membership.JOIN)
return _CheckMembershipReturn(True, False)

new_priority = MEMBERSHIP_PRIORITY.index(membership)
old_priority = MEMBERSHIP_PRIORITY.index(prev_membership)
Expand Down