From 73128bab620f9f298542e76bc0ba06c2b9764f80 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 2 May 2024 10:01:14 +0100
Subject: [PATCH] Fix bug where push rules would be empty in `/sync`

Fixes #16987
---
 synapse/handlers/sync.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 8ff45a3353b..b9bffe4c728 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1945,12 +1945,9 @@ async def _generate_sync_entry_for_account_data(
             )
 
             if push_rules_changed:
-                global_account_data = {
-                    AccountDataTypes.PUSH_RULES: await self._push_rules_handler.push_rules_for_user(
-                        sync_config.user
-                    ),
-                    **global_account_data,
-                }
+                global_account_data[AccountDataTypes.PUSH_RULES] = (
+                    await self._push_rules_handler.push_rules_for_user(sync_config.user)
+                )
         else:
             all_global_account_data = await self.store.get_global_account_data_for_user(
                 user_id