Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking

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