From fd81916e8625e5de39855522300eaeffd85ee13d Mon Sep 17 00:00:00 2001
From: Keiji Yoshimi <walf443@gmail.com>
Date: Sat, 15 Apr 2017 23:59:39 +0900
Subject: [PATCH 1/2] cache blockings for reducing queries.
---
app/models/block.rb | 8 ++++++++
app/models/mute.rb | 7 +++++++
app/models/status.rb | 4 +++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/models/block.rb b/app/models/block.rb
index ae456a6b6b..ac1e1b0b1b 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 a5b334c859..875d030e97 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -8,4 +8,11 @@ class Mute < ApplicationRecord
validates :account, :target_account, presence: 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 16cd4383f1..22d93947a9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -180,7 +180,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
From f5cd0b4956445d3e30d555a55d58fe8a04560632 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 18 Apr 2017 01:14:02 +0200
Subject: [PATCH 2/2] Rename cache key to exclude_account_ids_for:id, adjust
formatting
---
app/models/block.rb | 8 +++++---
app/models/mute.rb | 6 ++++--
app/models/status.rb | 4 +---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app/models/block.rb b/app/models/block.rb
index ac1e1b0b1b..c978b2200a 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -8,11 +8,13 @@ class Block < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
- after_create :remove_blocking_cache
+ after_create :remove_blocking_cache
after_destroy :remove_blocking_cache
+ private
+
def remove_blocking_cache
- Rails.cache.delete("blocked_account_ids:#{account_id}")
- Rails.cache.delete("blocked_account_ids:#{target_account_id}")
+ 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
index 0cf17be4f9..d0de62ed5d 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -8,10 +8,12 @@ class Mute < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
- after_create :remove_blocking_cache
+ after_create :remove_blocking_cache
after_destroy :remove_blocking_cache
+ private
+
def remove_blocking_cache
- Rails.cache.delete("blocked_account_ids:#{account_id}")
+ Rails.cache.delete("exclude_account_ids_for:#{account_id}")
end
end
diff --git a/app/models/status.rb b/app/models/status.rb
index c05a3386f3..a9b7327c35 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -183,9 +183,7 @@ class Status < ApplicationRecord
private
def filter_timeline(query, account)
- 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
+ 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