Don't notify a target who's not in the room
Also avoid unncessary DB queries when creating a roomanoa/redirect_instances
parent
a7fa951876
commit
ea3210f8e5
|
@ -135,7 +135,16 @@ class BulkPushRuleEvaluator:
|
||||||
# little, we can skip fetching a huge number of push rules in large rooms.
|
# little, we can skip fetching a huge number of push rules in large rooms.
|
||||||
# This helps make joins and leaves faster.
|
# This helps make joins and leaves faster.
|
||||||
if event.type == EventTypes.Member:
|
if event.type == EventTypes.Member:
|
||||||
if self.hs.is_mine_id(event.state_key):
|
# We never notify a user about their own actions. This is enforced in
|
||||||
|
# `_action_for_event_by_user` in the loop over `rules_by_user`, but we
|
||||||
|
# do the same check here to avoid unnecessary DB queries.
|
||||||
|
if event.sender != event.state_key and self.hs.is_mine_id(event.state_key):
|
||||||
|
# Check the target is in the room, to avoid notifying them of
|
||||||
|
# e.g. a pre-emptive ban.
|
||||||
|
target_already_in_room = await self.store.check_local_user_in_room(
|
||||||
|
event.state_key, event.room_id
|
||||||
|
)
|
||||||
|
if target_already_in_room:
|
||||||
local_users = [event.state_key]
|
local_users = [event.state_key]
|
||||||
else:
|
else:
|
||||||
return {}
|
return {}
|
||||||
|
|
Loading…
Reference in New Issue