diff options
author | Erin <sylphofelectricity@gmail.com> | 2017-12-10 17:23:01 -0600 |
---|---|---|
committer | Erin <sylphofelectricity@gmail.com> | 2017-12-10 17:23:01 -0600 |
commit | 6bd18e43ba6ce74837b813d68b5c96e4f696069f (patch) | |
tree | 7c123bc8e4948c674c4bd5d1d86a7f470b5cd063 | |
parent | 5ef65aab8f500b0675cf632d49f7cb544caefd27 (diff) |
filter local-only statuses from public pages
-rw-r--r-- | app/controllers/accounts_controller.rb | 2 | ||||
-rw-r--r-- | 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 309cb65da..31144fe05 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 40a8d05c8..6f7a8c82d 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) |