diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-15 14:50:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-15 15:01:39 +0000 |
commit | e892457a03787e844ba291acc9bfa9455e854145 (patch) | |
tree | fe65d5d19df09f452e6f061c2ec26e5adec91c0c | |
parent | Remove unused import (diff) | |
download | synapse-e892457a03787e844ba291acc9bfa9455e854145.tar.xz |
Comment
-rw-r--r-- | synapse/api/filtering.py | 3 | ||||
-rw-r--r-- | synapse/handlers/presence.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 63d5c75f43..6cadb5645d 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -254,6 +254,9 @@ class Filter(object): Returns: bool: True if the event matches """ + # We usually get the full "events" as dictionaries coming through, + # except for presence which actually gets passed around as its own + # namedtuple type. if isinstance(event, UserPresenceState): sender = event.user_id room_id = None diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 46704c62a0..f714bcb53d 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -984,6 +984,9 @@ def should_notify(old_state, new_state): 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. + + 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. """ content = { "presence": state.state, |