about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-18 01:09:57 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-18 01:09:57 +0200
commit2fd0473aa16603ca85e9e71dfbf4f32420f68327 (patch)
tree19b3b39bbfa715e4a315230eec31fbf91973bd0d /app
parentf03fb6c0aed5bdbe60a9f34c5de93865bf3e58eb (diff)
parentacd33101c50ba0cf09c1c41616f919d37760f3f7 (diff)
Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
Diffstat (limited to 'app')
-rw-r--r--app/models/block.rb8
-rw-r--r--app/models/mute.rb7
-rw-r--r--app/models/status.rb4
3 files changed, 18 insertions, 1 deletions
diff --git a/app/models/block.rb b/app/models/block.rb
index ae456a6b6..ac1e1b0b1 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -7,4 +7,12 @@ class Block < ApplicationRecord
   belongs_to :target_account, class_name: 'Account', required: true
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+
+  after_create :remove_blocking_cache
+  after_destroy :remove_blocking_cache
+
+  def remove_blocking_cache
+    Rails.cache.delete("blocked_account_ids:#{account_id}")
+    Rails.cache.delete("blocked_account_ids:#{target_account_id}")
+  end
 end
diff --git a/app/models/mute.rb b/app/models/mute.rb
index 7987ed007..0cf17be4f 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -7,4 +7,11 @@ class Mute < ApplicationRecord
   belongs_to :target_account, class_name: 'Account', required: true
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+
+  after_create :remove_blocking_cache
+  after_destroy :remove_blocking_cache
+
+  def remove_blocking_cache
+    Rails.cache.delete("blocked_account_ids:#{account_id}")
+  end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index e54664275..c05a3386f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -183,7 +183,9 @@ class Status < ApplicationRecord
     private
 
     def filter_timeline(query, account)
-      blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id)
+      blocked = Rails.cache.fetch("blocked_account_ids:#{account.id}") do
+        Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id)
+      end
       query   = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty?  # Only give us statuses from people we haven't blocked, or muted, or that have blocked us
       query   = query.where('accounts.silenced = TRUE') if account.silenced?                  # and if we're hellbanned, only people who are also hellbanned
       query