treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Hide local-only pinned toots from public profiles 

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).
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
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 return
end 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 = filtered_status_page
@statuses = cache_collection(@statuses, Status) @statuses = cache_collection(@statuses, Status)
@rss_url = rss_url @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 def set_size
case params[:id] case params[:id]
when 'featured' when 'featured'
@size = @account.pinned_statuses.count @size = @account.pinned_statuses.not_local_only.count
else else
not_found not_found
end 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))) 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 Status.none
else else
@account.pinned_statuses @account.pinned_statuses.not_local_only
end end
end end
end end