summary refs log tree commit diff
path: root/synapse/storage/account_data.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-08 13:20:52 +0100
committerGitHub <noreply@github.com>2017-05-08 13:20:52 +0100
commit6631985990c4043831144127d9f7df94564d5912 (patch)
tree8ee43afc082b9df7b5285190b7ee9b25f177c60a /synapse/storage/account_data.py
parentMerge pull request #2190 from matrix-org/erikj/mark_remote_as_back_more (diff)
parentRevert "Remove unused import" (diff)
downloadsynapse-6631985990c4043831144127d9f7df94564d5912.tar.xz
Merge pull request #2200 from matrix-org/erikj/revert_push
Revert speed up push
Diffstat (limited to 'synapse/storage/account_data.py')
-rw-r--r--synapse/storage/account_data.py13
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", {}) - )