summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-04-01 10:19:17 +0100
committerKegan Dougal <kegan@matrix.org>2015-04-01 10:19:17 +0100
commit9fa8bda09915b83aab1b5de1760dceafe1d87e07 (patch)
tree3c8d7e4bc69871ac1316a5763d885e5f7a9ba7d7 /synapse
parentAdd same user_id char checks as registration. (diff)
parentFix thinko whereby events *for the AS specifically* were not passed on. (diff)
downloadsynapse-9fa8bda09915b83aab1b5de1760dceafe1d87e07.tar.xz
Merge branch 'develop' into application-services-registration-script
Diffstat (limited to 'synapse')
-rw-r--r--synapse/appservice/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py

index a8108c1efb..ab0a6955f0 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py
@@ -199,7 +199,10 @@ class ApplicationService(object): return self._matches_user(event, member_list) def is_interested_in_user(self, user_id): - return self._matches_regex(user_id, ApplicationService.NS_USERS) + return ( + self._matches_regex(user_id, ApplicationService.NS_USERS) + or user_id == self.sender + ) def is_interested_in_alias(self, alias): return self._matches_regex(alias, ApplicationService.NS_ALIASES)