diff options
| author | Tusooa Zhu <tusooa@kazv.moe> | 2022-05-09 15:31:26 -0400 |
|---|---|---|
| committer | Tusooa Zhu <tusooa@kazv.moe> | 2022-05-09 18:53:32 -0400 |
| commit | f1722a9f4a0a96c6a58fe25d57928c9843f96fc8 (patch) | |
| tree | c2df75619fe9e4fe8b40566a16f5b6c0cc40a44e | |
| parent | 6e5ef7f2eb40a337107b94611bf10143f94d3d49 (diff) | |
| download | pleroma-f1722a9f4a0a96c6a58fe25d57928c9843f96fc8.tar.gz | |
Make lint happy
Ref: fix-local-public
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 7 | ||||
| -rw-r--r-- | priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 8e10edc24..c28ea5e2f 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -613,6 +613,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do 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, ^local_public) @@ -703,7 +704,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do defp user_activities_recipients(%{reading_user: reading_user}) 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 [Constants.as_public()] end diff --git a/priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs b/priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs index b514977dd..ea6ae6c5c 100644 --- a/priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs +++ b/priv/repo/migrations/20220509180452_change_thread_visibility_to_be_local_only_aware.exs @@ -7,7 +7,10 @@ defmodule Pleroma.Repo.Migrations.ChangeThreadVisibilityToBeLocalOnlyAware do end 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()) end |