Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 03:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update event_push_actions table from staging table

Browse Source
This commit is contained in:
Erik Johnston 2018-02-15 15:13:36 +00:00
parent acac21248c
commit c714c61853
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
synapse/storage/event_push_actions.py
View File

@ -88,33 +88,50 @@ class EventPushActionsStore(SQLBaseStore):
self._rotate_notifs, 30 * 60 * 1000 self._rotate_notifs, 30 * 60 * 1000
) )
def _set_push_actions_for_event_and_users_txn(self, txn, event, tuples): def _set_push_actions_for_event_and_users_txn(self, txn, event):
""" """
Args: Args:
event: the event set actions for event: the event set actions for
tuples: list of tuples of (user_id, actions) tuples: list of tuples of (user_id, actions)
""" """
values = []
for uid, actions in tuples:
is_highlight = 1 if _action_has_highlight(actions) else 0
values.append({ sql = """
'room_id': event.room_id, INSERT INTO event_push_actions (
'event_id': event.event_id, room_id, event_id, user_id, actions, stream_ordering,
'user_id': uid, topological_ordering, notif, highlight
'actions': _serialize_action(actions, is_highlight), )
'stream_ordering': event.internal_metadata.stream_ordering, SELECT ?, event_id, user_id, actions, ?, ?, notif, highlight
'topological_ordering': event.depth, FROM event_push_actions_staging
'notif': 1, WHERE event_id = ?
'highlight': is_highlight, """
})
for uid, __ in tuples: txn.execute(sql, (
event.room_id, event.internal_metadata.stream_ordering,
event.depth, event.event_id,
))
user_ids = self._simple_select_onecol_txn(
txn,
table="event_push_actions_staging",
keyvalues={
"event_id": event.event_id,
},
retcol="user_id",
)
self._simple_delete_txn(
txn,
table="event_push_actions_staging",
keyvalues={
"event_id": event.event_id,
},
)
for uid in user_ids:
txn.call_after( txn.call_after(
self.get_unread_event_push_actions_by_room_for_user.invalidate_many, self.get_unread_event_push_actions_by_room_for_user.invalidate_many,
(event.room_id, uid) (event.room_id, uid,)
) )
self._simple_insert_many_txn(txn, "event_push_actions", values)
@cachedInlineCallbacks(num_args=3, tree=True, max_entries=5000) @cachedInlineCallbacks(num_args=3, tree=True, max_entries=5000)
def get_unread_event_push_actions_by_room_for_user( def get_unread_event_push_actions_by_room_for_user(
@ -751,7 +768,7 @@ class EventPushActionsStore(SQLBaseStore):
Deferred Deferred
""" """
is_highlight = _action_has_highlight(actions) is_highlight = is_highlight = 1 if _action_has_highlight(actions) else 0
return self._simple_insert( return self._simple_insert(
table="event_push_actions_staging", table="event_push_actions_staging",
@ -759,7 +776,7 @@ class EventPushActionsStore(SQLBaseStore):
"event_id": event_id, "event_id": event_id,
"user_id": user_id, "user_id": user_id,
"actions": _serialize_action(actions, is_highlight), "actions": _serialize_action(actions, is_highlight),
"notif": True, "notif": 1,
"highlight": is_highlight, "highlight": is_highlight,
}, },
desc="add_push_actions_to_staging", desc="add_push_actions_to_staging",

2
synapse/storage/events.py
View File

@ -1170,7 +1170,7 @@ class EventsStore(SQLBaseStore):
# Insert all the push actions into the event_push_actions table. # Insert all the push actions into the event_push_actions table.
if context.push_actions: if context.push_actions:
self._set_push_actions_for_event_and_users_txn( self._set_push_actions_for_event_and_users_txn(
txn, event, context.push_actions txn, event,
) )
if event.type == EventTypes.Redaction and event.redacts is not None: if event.type == EventTypes.Redaction and event.redacts is not None: