push: namespace user_id and put in root notification JSON rather than devices

Signed-off-by: Sumner Evans <sumner@beeper.com>

Author: sumnerevans

synapse/push/httppusher.py

@@ -376,14 +376,14 @@ async def _build_notification_dict(
                         "unread": badge,
                         "com.beeper.server_type": "synapse",
                     },
+                    "com.beeper.user_id": self.user_id,
                     "prio": priority,
                     "devices": [
                         {
                             "app_id": self.app_id,
                             "pushkey": self.pushkey,
                             "pushkey_ts": int(self.pushkey_ts / 1000),
                             "data": self.data_minus_url,
-                            "user_id": self.user_id,
                         }
                     ],
                 }
@@ -407,14 +407,14 @@ async def _build_notification_dict(
                     "com.beeper.server_type": "synapse",
                     # 'missed_calls': 2
                 },
+                "com.beeper.user_id": self.user_id,
                 "devices": [
                     {
                         "app_id": self.app_id,
                         "pushkey": self.pushkey,
                         "pushkey_ts": int(self.pushkey_ts / 1000),
                         "data": self.data_minus_url,
                         "tweaks": tweaks,
-                        "user_id": self.user_id,
                     }
                 ],
             }
@@ -475,13 +475,13 @@ async def _send_badge(self, badge: int) -> None:
                     "unread": badge,
                     "com.beeper.server_type": "synapse",
                 },
+                "com.beeper.user_id": self.user_id,
                 "devices": [
                     {
                         "app_id": self.app_id,
                         "pushkey": self.pushkey,
                         "pushkey_ts": int(self.pushkey_ts / 1000),
                         "data": self.data_minus_url,
-                        "user_id": self.user_id,
                     }
                 ],
             }