hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow authenticated users to access local-only posts in MastoAPI

Browse source 
Ref: fix-local-public
This commit is contained in:
Tusooa Zhu 2022-05-09 15:04:51 -04:00
commit 38444aa92a
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
3 changed files with 168 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -612,9 +612,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
do: query
defp restrict_thread_visibility(query, %{user: %User{ap_id: ap_id}}, _) do
local_public = as_local_public()
from(
a in query,
where: fragment("thread_visibility(?, (?)->>'id') = true", ^ap_id, a.data)
where: fragment("thread_visibility(?, (?)->>'id', ?) = true", ^ap_id, a.data, ^local_public)
)
end
@ -701,8 +702,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp user_activities_recipients(%{godmode: true}), do: []
defp user_activities_recipients(%{reading_user: reading_user}) do
if reading_user do
[Constants.as_public(), reading_user.ap_id | User.following(reading_user)]
if not is_nil(reading_user) and reading_user.local do
[Constants.as_public(), as_local_public(), reading_user.ap_id | User.following(reading_user)]
else
[Constants.as_public()]
end