Include the user_id when pushing to sygnal

Author: bradtgmurray

synapse/push/httppusher.py

@@ -88,6 +88,8 @@ def __init__(self, hs: "HomeServer", pusher_config: PusherConfig):
             pusher_config.app_id,
             pusher_config.pushkey,
         )
+        # Beeper: Save this so we can pass this on to Sygnal as well
+        self.user_name = pusher_config.user_name
 
         # Validate that there's a URL and it is of the proper form.
         if "url" not in self.data:
@@ -345,6 +347,7 @@ async def _build_notification_dict(
                             "pushkey": self.pushkey,
                             "pushkey_ts": int(self.pushkey_ts / 1000),
                             "data": self.data_minus_url,
+                            "user_id": self.user_id,
                         }
                     ],
                 }
@@ -372,6 +375,7 @@ async def _build_notification_dict(
                         "pushkey_ts": int(self.pushkey_ts / 1000),
                         "data": self.data_minus_url,
                         "tweaks": tweaks,
+                        "user_id": self.user_id,
                     }
                 ],
             }
@@ -435,6 +439,7 @@ async def _send_badge(self, badge: int) -> None:
                         "pushkey": self.pushkey,
                         "pushkey_ts": int(self.pushkey_ts / 1000),
                         "data": self.data_minus_url,
+                        "user_id": self.user_id,
                     }
                 ],
             }