mastofe

commit: 0e0347ea3c518e3e002a23ba84dc2f8ec4505984
parent: f03fb6c0aed5bdbe60a9f34c5de93865bf3e58eb
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 18 Apr 2017 01:20:29 +0200

Merge branch 'pixiv-fix/cache_blocking'

Diffstat:
M
app/models/block.rb
10
++++++++++
M
app/models/mute.rb
9
+++++++++
M
app/models/status.rb
2
+-

3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/app/models/block.rb b/app/models/block.rb
@@ -7,4 +7,14 @@ 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
+
+  private
+
+  def remove_blocking_cache
+    Rails.cache.delete("exclude_account_ids_for:#{account_id}")
+    Rails.cache.delete("exclude_account_ids_for:#{target_account_id}")
+  end
 end
diff --git a/app/models/mute.rb b/app/models/mute.rb
@@ -7,4 +7,13 @@ 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
+
+  private
+
+  def remove_blocking_cache
+    Rails.cache.delete("exclude_account_ids_for:#{account_id}")
+  end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -183,7 +183,7 @@ 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("exclude_account_ids_for:#{account.id}") { Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) }
       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