This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Format presence events on the edges instead of reformatting them multiple times #2013
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
synapse/api/filtering.py
Outdated
| # account_data has been allowed to have non-dict content, so check type first | ||
| if isinstance(content, dict): | ||
| sender = content.get("user_id") | ||
| if isinstance(event, UserPresenceState): |
There was a problem hiding this comment.
Could you comment what's going on here? Just a quick comment to explain why both branches are necessary would be enough.
| @@ -979,14 +981,15 @@ def should_notify(old_state, new_state): | |||
| return False | |||
|
|
|||
|
|
|||
| def format_user_presence_state(state, now): | |||
| def format_user_presence_state(state, now, include_user_id=True): | |||
| """Convert UserPresenceState to a format that can be sent down to clients | |||
| and to other servers. | |||
There was a problem hiding this comment.
Maybe add a comment to explain why the "user_id" is optional? something like
The "user_id" is optional so that this function can be used to format presence
updates for client /sync responses and for federation /send requests.
synapse/api/filtering.py
Outdated
| sender = event.get("sender", None) | ||
| if not sender: | ||
| # Presence events have their 'sender' in content.user_id | ||
| content = event.get("content") |
There was a problem hiding this comment.
Is this still needed? It looks like it is presence specific and presence should be handled as UserPresenceState tuples/
There was a problem hiding this comment.
Does account data have a sender?
There was a problem hiding this comment.
I don't remember tbh. I think only presence has a content.user_id though.
erikjohnston
force-pushed
the
erikj/presence_FASTER
branch
from
a65012c
to
e892457
Compare
|
Other than updating the comment for #2013 (diff) LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.