Merge pull request #7716 from matrix-org/babolivier/unread_fix

Fix unread counts in sync
This commit is contained in:
Brendan Abolivier 2020-06-17 15:44:15 +01:00 committed by GitHub
commit e35d44c01d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

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).

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

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]