2 files changed, 4 insertions, 12 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index 1a8e7ef3dc..7791b289e2 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -153,12 +153,10 @@ class BulkPushRuleEvaluator:
if event.type == "m.room.member" and event.content["membership"] == "invite":
invited = event.state_key
if invited and self.hs.is_mine_id(invited):
- has_pusher = await self.store.user_has_pusher(invited)
- if has_pusher:
- rules_by_user = dict(rules_by_user)
- rules_by_user[invited] = await self.store.get_push_rules_for_user(
- invited
- )
+ rules_by_user = dict(rules_by_user)
+ rules_by_user[invited] = await self.store.get_push_rules_for_user(
+ invited
+ )
return rules_by_user
diff --git a/synapse/storage/databases/main/pusher.py b/synapse/storage/databases/main/pusher.py
index 91286c9b65..bd0cfa7f32 100644
--- a/synapse/storage/databases/main/pusher.py
+++ b/synapse/storage/databases/main/pusher.py
@@ -91,12 +91,6 @@ class PusherWorkerStore(SQLBaseStore):
yield PusherConfig(**r)
- async def user_has_pusher(self, user_id: str) -> bool:
- ret = await self.db_pool.simple_select_one_onecol(
- "pushers", {"user_name": user_id}, "id", allow_none=True
- )
- return ret is not None
-
async def get_pushers_by_app_id_and_pushkey(
self, app_id: str, pushkey: str
) -> Iterator[PusherConfig]:
|