summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-03-31 16:43:49 +0100
committerKegan Dougal <kegan@matrix.org>2015-03-31 16:44:45 +0100
commit09cbff174a01757d10107b7960972a484153323e (patch)
tree52229facc62f2f0ad95301c62fa3fddf06a53530 /synapse/appservice
parentAdd note in changelog about change in config option names (diff)
downloadsynapse-09cbff174a01757d10107b7960972a484153323e.tar.xz
Fix thinko whereby events *for the AS specifically* were not passed on.
This was caused by not explicitly checking the service.sender field. This
has now been fixed and a regression test has been added.
Diffstat (limited to 'synapse/appservice')
-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 c60db16b74..4a6cdbc2be 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)