From a2562f9d749023b9564ccd36acf920eeb45178ff Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Sep 2017 15:39:39 +0100
Subject: [PATCH 1/3] Add support for event_id_only push format

Param in the data dict of a pusher that tells an HTTP pusher to
send just the event_id of the event it's notifying about and the
notification counts. For clients that want to go & fetch the body
of the event themselves anyway.
---
 synapse/push/httppusher.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 8a5d473108..1b6510eea4 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -244,6 +244,25 @@ class HttpPusher(object):
 
     @defer.inlineCallbacks
     def _build_notification_dict(self, event, tweaks, badge):
+        if 'format' in self.data and self.data['format'] == 'event_id_only':
+            d = {
+                'notification': {
+                    'event_id': event.event_id,
+                    'counts': {
+                        'unread': badge,
+                    },
+                    'devices': [
+                        {
+                            'app_id': self.app_id,
+                            'pushkey': self.pushkey,
+                            'pushkey_ts': long(self.pushkey_ts / 1000),
+                            'data': self.data_minus_url,
+                        }
+                    ]
+                }
+            }
+            defer.returnValue(d)
+
         ctx = yield push_tools.get_context_for_event(
             self.store, self.state_handler, event, self.user_id
         )

From b393f5db51ab1e37f364a11bfbb0440063be4753 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Sep 2017 15:50:26 +0100
Subject: [PATCH 2/3] Use .get - it's much shorter

---
 synapse/push/httppusher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 1b6510eea4..b4140e08a8 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -244,7 +244,7 @@ class HttpPusher(object):
 
     @defer.inlineCallbacks
     def _build_notification_dict(self, event, tweaks, badge):
-        if 'format' in self.data and self.data['format'] == 'event_id_only':
+        if self.data.get('format') == 'event_id_only':
             d = {
                 'notification': {
                     'event_id': event.event_id,

From 436ee0a2ea9782d003c0ab8288c50c6d3f46bdb1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Sep 2017 15:58:38 +0100
Subject: [PATCH 3/3] Also include the room_id

as really it's part of the event ID
---
 synapse/push/httppusher.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index b4140e08a8..62c41cd9db 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -248,6 +248,7 @@ class HttpPusher(object):
             d = {
                 'notification': {
                     'event_id': event.event_id,
+                    'room_id': event.room_id,
                     'counts': {
                         'unread': badge,
                     },