From 6bd18e43ba6ce74837b813d68b5c96e4f696069f Mon Sep 17 00:00:00 2001 From: Erin Date: Sun, 10 Dec 2017 17:23:01 -0600 Subject: [PATCH] filter local-only statuses from public pages --- app/controllers/accounts_controller.rb | 2 +- app/models/status.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 309cb65daa..31144fe053 100644 --- 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 40a8d05c8c..6f7a8c82da 100644 --- 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)