Move call invite filtering logic to filter_events_for_client
#17782
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows SSS to benefit from it as well.
anoadragon453
force-pushed
the
anoa/filter_call_events
branch
from
9d9789d
to
287d44f
Compare
It appears there's an additional DB transaction as the JoinRules state chunk is not cached for these tests.
anoadragon453
force-pushed
the
anoa/filter_call_events
branch
from
287d44f
to
65d8bea
Compare
| @@ -117,7 +118,7 @@ async def filter_events_for_client( | |||
| [event.event_id for event in events], | |||
| ) | |||
|
|
|||
| types = (_HISTORY_VIS_KEY, (EventTypes.Member, user_id)) | |||
| types = (_HISTORY_VIS_KEY, (EventTypes.Member, user_id), (EventTypes.JoinRules, "")) | |||
There was a problem hiding this comment.
filter_events_for_client(...) is a pretty slow operation already and a hot path for so many endpoints.
It would be good to conditionally request EventTypes.JoinRules only if we see an event of type EventTypes.CallInvite.
| @@ -1181,7 +1181,7 @@ def assert_annotations(bundled_aggregations: JsonDict) -> None: | |||
| bundled_aggregations, | |||
| ) | |||
|
|
|||
| self._test_bundled_aggregations(RelationTypes.REFERENCE, assert_annotations, 6) | |||
| self._test_bundled_aggregations(RelationTypes.REFERENCE, assert_annotations, 7) | |||
There was a problem hiding this comment.
To explain this change; the extra database call is because (EventTypes.JoinRules, "") was added to the types we query for in filter_events_for_client(...)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #17359. Follow-up to #16908
This allows Simplified Sliding Sync to also filter call invites events in public rooms.