luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Update StatusPolicy to check current_account for local_only? toots.

Browse source 
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream.  This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
This commit is contained in:
David Yip 2017-11-17 09:07:21 -06:00
parent 2a386ad88d
commit f6355f6ffb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/policies/status_policy.rb
View file

@ -6,7 +6,7 @@ class StatusPolicy < ApplicationPolicy
end end
def show? def show?
return false if local_only? && account.nil? return false if local_only? && current_account.nil?
if direct? if direct?
owned? || record.mentions.where(account: current_account).exists? owned? || record.mentions.where(account: current_account).exists?

6
spec/policies/status_policy_spec.rb
View file

@ -71,6 +71,12 @@ RSpec.describe StatusPolicy, type: :model do
expect(subject).to_not permit(viewer, status) expect(subject).to_not permit(viewer, status)
end end
it 'denies access when local-only and the viewer is not logged in' do
allow(status).to receive(:local_only?) { true }
expect(subject).to_not permit(nil, status)
end
end end
permissions :reblog? do permissions :reblog? do