OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Include the ts the notif was received at

pull/1028/head
David Baker 2016-05-24 11:33:32 +01:00
parent b791a530da
commit 37b7e84620
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/rest/client/v2_alpha/notifications.py
View File

@ -68,6 +68,7 @@ class NotificationsServlet(RestServlet):
"room_id": pa["room_id"], "room_id": pa["room_id"],
"profile_tag": pa["profile_tag"], "profile_tag": pa["profile_tag"],
"actions": pa["actions"], "actions": pa["actions"],
"ts": pa["received_ts"],
"event": serialize_event( "event": serialize_event(
notif_events[pa["event_id"]], notif_events[pa["event_id"]],
self.clock.time_msec(), self.clock.time_msec(),

12
synapse/storage/event_push_actions.py
View File

@ -201,11 +201,13 @@ class EventPushActionsStore(SQLBaseStore):
else: else:
args = [user_id, limit] args = [user_id, limit]
sql = ( sql = (
"SELECT event_id, room_id, stream_ordering, topological_ordering," "SELECT epa.event_id, epa.room_id,"
" actions, profile_tag" " epa.stream_ordering, epa.topological_ordering,"
" FROM event_push_actions" " epa.actions, epa.profile_tag, e.received_ts"
" WHERE user_id = ? %s" " FROM event_push_actions epa, events e"
" ORDER BY stream_ordering DESC" " WHERE epa.room_id = e.room_id AND epa.event_id = e.event_id"
" AND epa.user_id = ? %s"
" ORDER BY epa.stream_ordering DESC"
" LIMIT ?" " LIMIT ?"
% (before_clause,) % (before_clause,)
) )