moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lint happy 

Ref: fix-local-public
This commit is contained in:
Tusooa Zhu 2022-05-09 15:31:26 -04:00
parent 6e5ef7f2eb
commit f1722a9f4a
No known key found for this signature in database
GPG Key ID: 7B467EDE43A08224
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,6 +613,7 @@ defp restrict_thread_visibility(query, %{user: %User{skip_thread_containment: tr
defp restrict_thread_visibility(query, %{user: %User{ap_id: ap_id}}, _) do defp restrict_thread_visibility(query, %{user: %User{ap_id: ap_id}}, _) do
local_public = as_local_public() local_public = as_local_public()
from( from(
a in query, a in query,
where: fragment("thread_visibility(?, (?)->>'id', ?) = true", ^ap_id, a.data, ^local_public) where: fragment("thread_visibility(?, (?)->>'id', ?) = true", ^ap_id, a.data, ^local_public)
@ -703,7 +704,11 @@ defp user_activities_recipients(%{godmode: true}), do: []
defp user_activities_recipients(%{reading_user: reading_user}) do defp user_activities_recipients(%{reading_user: reading_user}) do
if not is_nil(reading_user) and reading_user.local do 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)] [
Constants.as_public(),
as_local_public(),
reading_user.ap_id | User.following(reading_user)
]
else else
[Constants.as_public()] [Constants.as_public()]
end end

5
priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs
View File

@ -7,7 +7,10 @@ def up do
end end
def down do def down do
execute("DROP FUNCTION IF EXISTS thread_visibility(actor varchar, activity_id varchar, local_public varchar)") execute(
"DROP FUNCTION IF EXISTS thread_visibility(actor varchar, activity_id varchar, local_public varchar)"
)
execute(restore_thread_visibility()) execute(restore_thread_visibility())
end end