filter local-only statuses from public pages

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 309cb65daa6b48333f68ac0bc481f0cad03d76d8..31144fe0535838bf897969e7be4b3ab2d788d3b0 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -49,7 +49,7 @@ class AccountsController < ApplicationController
   end
 
   def default_statuses
-    @account.statuses.where(visibility: [:public, :unlisted])
+    @account.statuses.not_local_only.where(visibility: [:public, :unlisted])
   end
 
   def only_media_scope

diff --git a/app/models/status.rb b/app/models/status.rb
index 40a8d05c8cc91f79de43e3ce8f08178eee860c99..6f7a8c82da75b617051f005a1695e498ec8f703e 100644 (file)
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -260,7 +260,7 @@ class Status < ApplicationRecord
     end
 
     def filter_timeline_default(query)
-      query.excluding_silenced_accounts
+      query.not_local_only.excluding_silenced_accounts
     end
 
     def account_silencing_filter(account)