Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 04:34:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix invite pushes

Browse source 
* If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc)
 * Move invite_for_me to be higher prio than member events otherwise member events matches them
 * Spell override right
This commit is contained in:
David Baker 2016-04-08 15:29:59 +01:00
parent 7b6d519482
commit ed3979df5f
4 changed files with 58 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/push/bulk_push_rule_evaluator.py
View file

@ -69,7 +69,8 @@ def _get_rules(room_id, user_ids, store):
@defer.inlineCallbacks
def evaluator_for_room_id(room_id, hs, store):
def evaluator_for_event(event, hs, store):
room_id = event.room_id
users_with_pushers = yield store.get_users_with_pushers_in_room(room_id)
receipts = yield store.get_receipts_for_room(room_id, "m.read")
@ -79,6 +80,15 @@ def evaluator_for_room_id(room_id, hs, store):
if hs.is_mine_id(r['user_id']):
user_ids.add(r['user_id'])
# if this event is an invite event, we may need to run rules for the user
# who's been invited, otherwise they won't get told they've been invited
if event.type == 'm.room.member' and event.content['membership'] == 'invite':
invited_user = event.state_key
if invited_user and hs.is_mine_id(invited_user):
has_pusher = yield store.user_has_pusher(invited_user)
if has_pusher:
user_ids.add(invited_user)
user_ids = list(user_ids)
rules_by_user = yield _get_rules(room_id, user_ids, store)