tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #2216 from slipeer/app_services_interested_in_user

Browse source 
Fix users claimed non-exclusively by an app service don't get notific…
This commit is contained in:
Erik Johnston 2017-05-17 16:28:50 +01:00 committed by GitHub
commit ace23463c5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/appservice.py
View file

@ -39,12 +39,15 @@ class ApplicationServiceStore(SQLBaseStore):
def get_app_services(self): def get_app_services(self):
return self.services_cache return self.services_cache
def get_if_app_services_interested_in_user(self, user_id): def get_if_app_services_interested_in_user(self, user_id, exclusive=False):
"""Check if the user is one associated with an app service """Check if the user is one associated with an app service
""" """
for service in self.services_cache: for service in self.services_cache:
if service.is_interested_in_user(user_id): if service.is_interested_in_user(user_id):
return True if exclusive:
return service.is_exclusive_user(user_id)
else:
return True
return False return False
def get_app_service_by_user_id(self, user_id): def get_app_service_by_user_id(self, user_id):

2
synapse/storage/push_rule.py
View file

@ -163,7 +163,7 @@ class PushRuleStore(SQLBaseStore):
local_users_in_room = set( local_users_in_room = set(
u for u in users_in_room u for u in users_in_room
if self.hs.is_mine_id(u) if self.hs.is_mine_id(u)
and not self.get_if_app_services_interested_in_user(u) and not self.get_if_app_services_interested_in_user(u, exclusive=True)
) )
# users in the room who have pushers need to get push rules run because # users in the room who have pushers need to get push rules run because