diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 7731de85c0..93bd07b196 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -260,19 +260,18 @@ class PresenceHandler(BaseHandler):
@defer.inlineCallbacks
def user_joined_room(self, user, room_id):
-
if user.is_mine:
- self.push_update_to_local_and_remote(
- observed_user=user,
- room_ids=[room_id],
- statuscache=self._get_or_offline_usercache(user),
- )
+ statuscache = self._get_or_make_usercache(user)
- else:
- self.push_update_to_clients(
+ # No actual update but we need to bump the serial anyway for the
+ # event source
+ self._user_cachemap_latest_serial += 1
+ statuscache.update({}, serial=self._user_cachemap_latest_serial)
+
+ self.push_update_to_local_and_remote(
observed_user=user,
room_ids=[room_id],
- statuscache=self._get_or_offline_usercache(user),
+ statuscache=statuscache,
)
# We also want to tell them about current presence of people.
@@ -722,6 +721,78 @@ class PresenceHandler(BaseHandler):
)
+class PresenceEventSource(object):
+ def __init__(self, hs):
+ self.hs = hs
+ self.clock = hs.get_clock()
+
+ def get_new_events_for_user(self, user, from_key, limit):
+ from_key = int(from_key)
+
+ presence = self.hs.get_handlers().presence_handler
+ cachemap = presence._user_cachemap
+
+ # TODO(paul): limit, and filter by visibility
+ updates = [(k, cachemap[k]) for k in cachemap
+ if from_key < cachemap[k].serial]
+
+ if updates:
+ clock = self.clock
+
+ latest_serial = max([x[1].serial for x in updates])
+ data = [x[1].make_event(user=x[0], clock=clock) for x in updates]
+
+ return ((data, latest_serial))
+ else:
+ return (([], presence._user_cachemap_latest_serial))
+
+ def get_current_key(self):
+ presence = self.hs.get_handlers().presence_handler
+ return presence._user_cachemap_latest_serial
+
+ def get_pagination_rows(self, user, pagination_config, key):
+ # TODO (erikj): Does this make sense? Ordering?
+
+ from_token = pagination_config.from_token
+ to_token = pagination_config.to_token
+
+ from_key = int(from_token.presence_key)
+
+ if to_token:
+ to_key = int(to_token.presence_key)
+ else:
+ to_key = -1
+
+ presence = self.hs.get_handlers().presence_handler
+ cachemap = presence._user_cachemap
+
+ # TODO(paul): limit, and filter by visibility
+ updates = [(k, cachemap[k]) for k in cachemap
+ if to_key < cachemap[k].serial < from_key]
+
+ if updates:
+ clock = self.clock
+
+ earliest_serial = max([x[1].serial for x in updates])
+ data = [x[1].make_event(user=x[0], clock=clock) for x in updates]
+
+ if to_token:
+ next_token = to_token
+ else:
+ next_token = from_token
+
+ next_token = next_token.copy_and_replace(
+ "presence_key", earliest_serial
+ )
+ return ((data, next_token))
+ else:
+ if not to_token:
+ to_token = from_token.copy_and_replace(
+ "presence_key", 0
+ )
+ return (([], to_token))
+
+
class UserPresenceCache(object):
"""Store an observed user's state and status message.
|
