fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide local-only pinned toots from public profiles

Browse source 
Fixes #1336

This also fixes federating pinned toots when some of them are local-only.

Public profiles will not show public toots, whether you are logged in
or not (this is consistent with local-only toots that are not pinned).
This commit is contained in:
Thibaut Girka 2020-05-31 16:11:02 +02:00 committed by ThibG
parent ddcd9fe9f0
commit 18f2c39074
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -27,7 +27,7 @@ class AccountsController < ApplicationController
return
end
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
@pinned_statuses = cache_collection(@account.pinned_statuses.not_local_only, Status) if show_pinned_statuses?
@statuses = filtered_status_page
@statuses = cache_collection(@statuses, Status)
@rss_url = rss_url

4
app/controllers/activitypub/collections_controller.rb
View file

@ -24,7 +24,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
def set_size
case params[:id]
when 'featured'
@size = @account.pinned_statuses.count
@size = @account.pinned_statuses.not_local_only.count
else
not_found
end
@ -39,7 +39,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
if authorized_fetch_mode? && !signed_request_account.nil? && (@account.blocking?(signed_request_account) || (!signed_request_account.domain.nil? && @account.domain_blocking?(signed_request_account.domain)))
Status.none
else
@account.pinned_statuses
@account.pinned_statuses.not_local_only
end
end
end