Fix the sample account icon of Profile directory to local only (#11872)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 4e77c404ddfde0cd3b636d7169e369c0922825b7..b52b9bc9fa21d1518fd70aba304648cf17f277fe 100644 (file)
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -20,7 +20,7 @@
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts

-  has_and_belongs_to_many :sample_accounts, -> { searchable.discoverable.popular.limit(3) }, class_name: 'Account'
+  has_and_belongs_to_many :sample_accounts, -> { local.discoverable.popular.limit(3) }, class_name: 'Account'

 
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag
   has_one :account_tag_stat, dependent: :destroy
 
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag
   has_one :account_tag_stat, dependent: :destroy

diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index f3a73209afe56658c78372d3f2b272e5fbcdd10b..becc92c2d1995bf8ce9e78aeaf86a5471ef1f3f3 100644 (file)
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -33,7 +33,7 @@ class InstancePresenter
   end
 
   def sample_accounts
   end
 
   def sample_accounts

-    Rails.cache.fetch('sample_accounts', expires_in: 12.hours) { Account.discoverable.popular.limit(3) }
+    Rails.cache.fetch('sample_accounts', expires_in: 12.hours) { Account.local.discoverable.popular.limit(3) }

   end
 
   def version_number
   end
 
   def version_number