diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
| commit | ac08316548cf02c5991d455e96915959af603e0e (patch) | |
| tree | 6d4028791cc5656b90be063abdc2f7b2e73f68f4 /synapse/storage/account_data.py | |
| parent | Bump version and changelog (diff) | |
| parent | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts (diff) | |
| download | synapse-ac08316548cf02c5991d455e96915959af603e0e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0
Diffstat (limited to 'synapse/storage/account_data.py')
| -rw-r--r-- | synapse/storage/account_data.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/storage/account_data.py b/synapse/storage/account_data.py index ff14e54c11..aa84ffc2b0 100644 --- a/synapse/storage/account_data.py +++ b/synapse/storage/account_data.py @@ -308,16 +308,3 @@ class AccountDataStore(SQLBaseStore): " WHERE stream_id < ?" ) txn.execute(update_max_id_sql, (next_id, next_id)) - - @cachedInlineCallbacks(num_args=2, cache_context=True, max_entries=5000) - def is_ignored_by(self, ignored_user_id, ignorer_user_id, cache_context): - ignored_account_data = yield self.get_global_account_data_by_type_for_user( - "m.ignored_user_list", ignorer_user_id, - on_invalidate=cache_context.invalidate, - ) - if not ignored_account_data: - defer.returnValue(False) - - defer.returnValue( - ignored_user_id in ignored_account_data.get("ignored_users", {}) - ) |