summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2016-05-18 13:56:38 +0100
committerMatthew Hodgson <matthew@arasphere.net>2016-05-18 13:56:38 +0100
commit6fb51eaf7bb17b07d3e7329e668ed6e6ab3415b5 (patch)
tree7b9af791d7bd9eb85b101c8006f559c25c623fe2 /synapse/push
parentAdd desc to get_presence_for_users (diff)
parentincrement badge count per missed convo, not per msg (diff)
downloadsynapse-6fb51eaf7bb17b07d3e7329e668ed6e6ab3415b5.tar.xz
Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo
increment badge count per missed convo, not per msg
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/push_tools.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py
index e71d01e77d..89a3b5e90a 100644
--- a/synapse/push/push_tools.py
+++ b/synapse/push/push_tools.py
@@ -38,7 +38,9 @@ def get_badge_count(store, user_id):
                     r.room_id, user_id, last_unread_event_id
                 )
             )
-            badge += notifs["notify_count"]
+            # return one badge count per conversation, as count per
+            # message is so noisy as to be almost useless
+            badge += 1 if notifs["notify_count"] else 0
     defer.returnValue(badge)