tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix unread counts in sync

Browse source 
* Always return an unread_count in get_unread_event_push_actions_by_room_for_user
* Don't always expect unread_count to be there so we don't take out sync entirely if something goes wrong
This commit is contained in:
Brendan Abolivier 2020-06-17 15:10:09 +01:00
parent 6418b0379f
commit 5a5cf6460e
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/7716.feature Normal file
View file

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

2
synapse/push/push_tools.py
View file

@ -42,7 +42,7 @@ def get_badge_count(store, user_id):
# We're populating this badge using the unread_count (instead of the # We're populating this badge using the unread_count (instead of the
# notify_count) as this badge is the number of missed messages, not the # notify_count) as this badge is the number of missed messages, not the
# number of missed notifications. # number of missed notifications.
badge += 1 if notifs["unread_count"] else 0 badge += 1 if notifs.get("unread_count") else 0
return badge return badge

2
synapse/storage/data_stores/main/event_push_actions.py
View file

@ -123,7 +123,7 @@ class EventPushActionsWorkerStore(SQLBaseStore):
txn.execute(sql, (room_id, last_read_event_id)) txn.execute(sql, (room_id, last_read_event_id))
results = txn.fetchall() results = txn.fetchall()
if len(results) == 0: if len(results) == 0:
return {"notify_count": 0, "highlight_count": 0} return {"notify_count": 0, "highlight_count": 0, "unread_count": 0}
stream_ordering = results[0][0] stream_ordering = results[0][0]