Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-24 19:38:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix user query checks. HS>AS pushing now works.

Browse source
This commit is contained in:
Kegan Dougal 2015-02-05 14:17:08 +00:00
parent 0613666d9c
commit c71456117d
2 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
synapse/appservice/__init__.py
View file

@ -75,27 +75,23 @@ class ApplicationService(object):
def _matches_user(self, event):
if (hasattr(event, "sender") and
self._matches_regex(
event.sender, ApplicationService.NS_USERS)):
self.is_interested_in_user(event.sender)):
return True
# also check m.room.member state key
if (hasattr(event, "type") and event.type == EventTypes.Member
and hasattr(event, "state_key")
and self._matches_regex(
event.state_key, ApplicationService.NS_USERS)):
and self.is_interested_in_user(event.state_key)):
return True
return False
def _matches_room_id(self, event):
if hasattr(event, "room_id"):
return self._matches_regex(
event.room_id, ApplicationService.NS_ROOMS
)
return self.is_interested_in_room(event.room_id)
return False
def _matches_aliases(self, event, alias_list):
for alias in alias_list:
if self._matches_regex(alias, ApplicationService.NS_ALIASES):
if self.is_interested_in_alias(alias):
return True
return False
@ -128,5 +124,14 @@ class ApplicationService(object):
elif restrict_to == ApplicationService.NS_USERS:
return self._matches_user(event)
def is_interested_in_user(self, user_id):
return self._matches_regex(user_id, ApplicationService.NS_USERS)
def is_interested_in_alias(self, alias):
return self._matches_regex(alias, ApplicationService.NS_ALIASES)
def is_interested_in_room(self, room_id):
return self._matches_regex(room_id, ApplicationService.NS_ROOMS)
def __str__(self):
return "ApplicationService: %s" % (self.__dict__,)