mirrors
/
hometown
mirror of https://github.com/hometown-fork/hometown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1196 from johnholdun/hide-private-pinned-statuses 

Hide follower-only pinned statuses from logged-out users
This commit is contained in:
Darius Kazemi 2022-11-11 15:58:37 -08:00 committed by GitHub
parent 3f2b00542b 7eedaeb007
commit fe340a6a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -29,7 +29,7 @@ class AccountsController < ApplicationController
end end
if current_user.nil? if current_user.nil?
@pinned_statuses = cache_collection(@account.pinned_statuses.without_local_only, Status) if show_pinned_statuses? @pinned_statuses = cache_collection(filtered_pinned_statuses.without_local_only, Status) if show_pinned_statuses?
else else
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses? @pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
end end

5
spec/controllers/accounts_controller_spec.rb
View File

@ -120,6 +120,11 @@ RSpec.describe AccountsController, type: :controller do
expect(response.body).to include(I18n.t('stream_entries.pinned')) expect(response.body).to include(I18n.t('stream_entries.pinned'))
end end
it 'does not render private pinned status' do
account.pinned_statuses << status_private
expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
end
it 'does not render private status' do it 'does not render private status' do
expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private)) expect(response.body).to_not include(ActivityPub::TagManager.instance.url_for(status_private))
end end