diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-21 14:50:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 14:50:24 +0100 |
| commit | b668112320be62fe60582366bd3c6c9fa4f481a1 (patch) | |
| tree | 8cbccbe76026f26b05a7544cc8d12f6aee38c96e /synapse/replication/slave/storage/appservice.py | |
| parent | Merge pull request #2219 from krombel/avoid_duplicate_filters (diff) | |
| parent | Initialise exclusive_user_regex (diff) | |
| download | synapse-b668112320be62fe60582366bd3c6c9fa4f481a1.tar.xz | |
Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar
Don't work out users who share room with appservice users
Diffstat (limited to 'synapse/replication/slave/storage/appservice.py')
| -rw-r--r-- | synapse/replication/slave/storage/appservice.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/appservice.py b/synapse/replication/slave/storage/appservice.py index a374f2f1a2..0d3f31a50c 100644 --- a/synapse/replication/slave/storage/appservice.py +++ b/synapse/replication/slave/storage/appservice.py @@ -16,6 +16,7 @@ from ._base import BaseSlavedStore from synapse.storage import DataStore from synapse.config.appservice import load_appservices +from synapse.storage.appservice import _make_exclusive_regex class SlavedApplicationServiceStore(BaseSlavedStore): @@ -25,6 +26,7 @@ class SlavedApplicationServiceStore(BaseSlavedStore): hs.config.server_name, hs.config.app_service_config_files ) + self.exclusive_user_regex = _make_exclusive_regex(self.services_cache) get_app_service_by_token = DataStore.get_app_service_by_token.__func__ get_app_service_by_user_id = DataStore.get_app_service_by_user_id.__func__ @@ -38,3 +40,6 @@ class SlavedApplicationServiceStore(BaseSlavedStore): get_appservice_state = DataStore.get_appservice_state.__func__ set_appservice_last_pos = DataStore.set_appservice_last_pos.__func__ set_appservice_state = DataStore.set_appservice_state.__func__ + get_if_app_services_interested_in_user = ( + DataStore.get_if_app_services_interested_in_user.__func__ + ) |