1 files changed, 13 insertions, 20 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py
index 8397229ccb..6661887d9f 100644
--- a/synapse/push/push_tools.py
+++ b/synapse/push/push_tools.py
@@ -13,7 +13,6 @@
# limitations under the License.
from typing import Dict
-from synapse.api.constants import ReceiptTypes
from synapse.events import EventBase
from synapse.push.presentable_names import calculate_room_name, name_from_member_event
from synapse.storage.controllers import StorageControllers
@@ -24,30 +23,24 @@ async def get_badge_count(store: DataStore, user_id: str, group_by_room: bool) -
invites = await store.get_invited_rooms_for_local_user(user_id)
joins = await store.get_rooms_for_user(user_id)
- my_receipts_by_room = await store.get_receipts_for_user(
- user_id, (ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE)
- )
-
badge = len(invites)
for room_id in joins:
- if room_id in my_receipts_by_room:
- last_unread_event_id = my_receipts_by_room[room_id]
-
- notifs = await (
- store.get_unread_event_push_actions_by_room_for_user(
- room_id, user_id, last_unread_event_id
- )
+ notifs = await (
+ store.get_unread_event_push_actions_by_room_for_user(
+ room_id,
+ user_id,
)
- if notifs.notify_count == 0:
- continue
+ )
+ if notifs.notify_count == 0:
+ continue
- if group_by_room:
- # return one badge count per conversation
- badge += 1
- else:
- # increment the badge count by the number of unread messages in the room
- badge += notifs.notify_count
+ if group_by_room:
+ # return one badge count per conversation
+ badge += 1
+ else:
+ # increment the badge count by the number of unread messages in the room
+ badge += notifs.notify_count
return badge
|
