Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate review bits

Browse Source
This commit is contained in:
Brendan Abolivier 2020-06-12 15:11:01 +01:00
parent 1e5a50302f
commit e47e5a2dcd
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/7673.feature
View File

@ -1 +1 @@
Add a per-room counter for unread messages in responses to `/sync` requests. Add a per-room counter for unread messages in responses to `/sync` requests. Implements [MSC2625](https://github.com/matrix-org/matrix-doc/pull/2625).

13
synapse/push/bulk_push_rule_evaluator.py
View File

@ -191,13 +191,12 @@ class BulkPushRuleEvaluator(object):
) )
if matches: if matches:
actions = [x for x in rule["actions"] if x != "dont_notify"] actions = [x for x in rule["actions"] if x != "dont_notify"]
if actions: if (
if ( "notify" in actions
"notify" in actions or "org.matrix.msc2625.mark_unread" in actions
or "org.matrix.msc2625.mark_unread" in actions ):
): # Push rules say we should act on this event.
# Push rules say we should act on this event. actions_by_user[uid] = actions
actions_by_user[uid] = actions
break break
# Mark in the DB staging area the push actions for users who should be # Mark in the DB staging area the push actions for users who should be

27
synapse/storage/data_stores/main/event_push_actions.py
View File

@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
import logging import logging
from typing import Dict, Tuple
import attr import attr
from six import iteritems from six import iteritems
@ -857,11 +858,11 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
# Calculate the new counts that should be upserted into event_push_summary # Calculate the new counts that should be upserted into event_push_summary
sql = """ sql = """
SELECT user_id, room_id, SELECT user_id, room_id,
coalesce(old.%s, 0) + upd.%s, coalesce(old.%s, 0) + upd.cnt,
upd.stream_ordering, upd.stream_ordering,
old.user_id old.user_id
FROM ( FROM (
SELECT user_id, room_id, count(*) as %s, SELECT user_id, room_id, count(*) as cnt,
max(stream_ordering) as stream_ordering max(stream_ordering) as stream_ordering
FROM event_push_actions FROM event_push_actions
WHERE ? <= stream_ordering AND stream_ordering < ? WHERE ? <= stream_ordering AND stream_ordering < ?
@ -874,31 +875,29 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
# First get the count of unread messages. # First get the count of unread messages.
txn.execute( txn.execute(
sql % ("unread_count", "unread_count", "unread_count", ""), sql % ("unread_count", ""),
(old_rotate_stream_ordering, rotate_to_stream_ordering), (old_rotate_stream_ordering, rotate_to_stream_ordering),
) )
unread_rows = txn.fetchall()
# Then get the count of notifications.
txn.execute(
sql % ("notif_count", "notif_count", "notif_count", "AND notif = 1"),
(old_rotate_stream_ordering, rotate_to_stream_ordering),
)
notif_rows = txn.fetchall()
# We need to merge both lists into a single object because we might not have the # We need to merge both lists into a single object because we might not have the
# same amount of rows in each of them. In this case we use a dict indexed on the # same amount of rows in each of them. In this case we use a dict indexed on the
# user ID and room ID to make it easier to populate. # user ID and room ID to make it easier to populate.
summaries = {} summaries = {} # type: Dict[Tuple[str, str], EventPushSummary]
for row in unread_rows: for row in txn:
summaries[(row[0], row[1])] = EventPushSummary( summaries[(row[0], row[1])] = EventPushSummary(
user_id=row[0], room_id=row[1], unread_count=row[2], user_id=row[0], room_id=row[1], unread_count=row[2],
stream_ordering=row[3], old_user_id=row[4], notif_count=0, stream_ordering=row[3], old_user_id=row[4], notif_count=0,
) )
# Then get the count of notifications.
txn.execute(
sql % ("notif_count", "AND notif = 1"),
(old_rotate_stream_ordering, rotate_to_stream_ordering),
)
# notif_rows is populated based on a subset of the query used to populate # notif_rows is populated based on a subset of the query used to populate
# unread_rows, so we can be sure that there will be no KeyError here. # unread_rows, so we can be sure that there will be no KeyError here.
for row in notif_rows: for row in txn:
summaries[(row[0], row[1])].notif_count = row[2] summaries[(row[0], row[1])].notif_count = row[2]
logger.info("Rotating notifications, handling %d rows", len(summaries)) logger.info("Rotating notifications, handling %d rows", len(summaries))