Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from matrix-org/erikj/push_fast 

Only compute unread notifications for rooms we send down stream
This commit is contained in:
Erik Johnston 2016-01-19 17:31:10 +00:00
parent 892ee473d9 ac2842ff1e
commit af30140621
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
synapse/handlers/sync.py
View File

@ -54,8 +54,7 @@ class JoinedSyncResult(collections.namedtuple("JoinedSyncResult", [
"state", # dict[(str, str), FrozenEvent] "state", # dict[(str, str), FrozenEvent]
"ephemeral", "ephemeral",
"account_data", "account_data",
"unread_notification_count", "unread_notifications",
"unread_highlight_count",
])): ])):
__slots__ = [] __slots__ = []
@ -294,11 +293,10 @@ class SyncHandler(BaseHandler):
room_id, sync_config, ephemeral_by_room room_id, sync_config, ephemeral_by_room
) )
notif_count = None unread_notifications = {}
highlight_count = None
if notifs is not None: if notifs is not None:
notif_count = len(notifs) unread_notifications["notification_count"] = len(notifs)
highlight_count = len([ unread_notifications["highlight_count"] = len([
1 for notif in notifs if _action_has_highlight(notif["actions"]) 1 for notif in notifs if _action_has_highlight(notif["actions"])
]) ])
@ -312,8 +310,7 @@ class SyncHandler(BaseHandler):
account_data=self.account_data_for_room( account_data=self.account_data_for_room(
room_id, tags_by_room, account_data_by_room room_id, tags_by_room, account_data_by_room
), ),
unread_notification_count=notif_count, unread_notifications=unread_notifications,
unread_highlight_count=highlight_count,
)) ))
def account_data_for_user(self, account_data): def account_data_for_user(self, account_data):
@ -533,18 +530,6 @@ class SyncHandler(BaseHandler):
else: else:
prev_batch = now_token prev_batch = now_token
notifs = yield self.unread_notifs_for_room_id(
room_id, sync_config, all_ephemeral_by_room
)
notif_count = None
highlight_count = None
if notifs is not None:
notif_count = len(notifs)
highlight_count = len([
1 for notif in notifs if _action_has_highlight(notif["actions"])
])
just_joined = yield self.check_joined_room(sync_config, state) just_joined = yield self.check_joined_room(sync_config, state)
if just_joined: if just_joined:
logger.debug("User has just joined %s: needs full state", logger.debug("User has just joined %s: needs full state",
@ -565,12 +550,23 @@ class SyncHandler(BaseHandler):
account_data=self.account_data_for_room( account_data=self.account_data_for_room(
room_id, tags_by_room, account_data_by_room room_id, tags_by_room, account_data_by_room
), ),
unread_notification_count=notif_count, unread_notifications={},
unread_highlight_count=highlight_count,
) )
logger.debug("Result for room %s: %r", room_id, room_sync) logger.debug("Result for room %s: %r", room_id, room_sync)
if room_sync: if room_sync:
notifs = yield self.unread_notifs_for_room_id(
room_id, sync_config, all_ephemeral_by_room
)
if notifs is not None:
notif_dict = room_sync.unread_notifications
notif_dict["notification_count"] = len(notifs)
notif_dict["highlight_count"] = len([
1 for notif in notifs
if _action_has_highlight(notif["actions"])
])
joined.append(room_sync) joined.append(room_sync)
else: else:
@ -708,11 +704,10 @@ class SyncHandler(BaseHandler):
room_id, sync_config, all_ephemeral_by_room room_id, sync_config, all_ephemeral_by_room
) )
notif_count = None unread_notifications = {}
highlight_count = None
if notifs is not None: if notifs is not None:
notif_count = len(notifs) unread_notifications["notification_count"] = len(notifs)
highlight_count = len([ unread_notifications["highlight_count"] = len([
1 for notif in notifs if _action_has_highlight(notif["actions"]) 1 for notif in notifs if _action_has_highlight(notif["actions"])
]) ])
@ -724,8 +719,7 @@ class SyncHandler(BaseHandler):
account_data=self.account_data_for_room( account_data=self.account_data_for_room(
room_id, tags_by_room, account_data_by_room room_id, tags_by_room, account_data_by_room
), ),
unread_notification_count=notif_count, unread_notifications=unread_notifications,
unread_highlight_count=highlight_count,
) )
logger.debug("Room sync: %r", room_sync) logger.debug("Room sync: %r", room_sync)

3
synapse/rest/client/v2_alpha/sync.py
View File

@ -312,8 +312,7 @@ class SyncRestServlet(RestServlet):
if joined: if joined:
ephemeral_events = filter.filter_room_ephemeral(room.ephemeral) ephemeral_events = filter.filter_room_ephemeral(room.ephemeral)
result["ephemeral"] = {"events": ephemeral_events} result["ephemeral"] = {"events": ephemeral_events}
result["unread_notification_count"] = room.unread_notification_count result["unread_notifications"] = room.unread_notifications
result["unread_highlight_count"] = room.unread_highlight_count
return result return result