Browse Source

Merge branch 'reply-visibility-user-guard' into 'develop'

Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user

See merge request pleroma/pleroma!2999
tags/v2.1.2^2
lain rinpatch 3 years ago
parent
commit
bb70b231d0
2 changed files with 10 additions and 2 deletions
  1. +2
    -2
      lib/pleroma/web/activity_pub/activity_pub.ex
  2. +8
    -0
      test/web/activity_pub/activity_pub_test.exs

+ 2
- 2
lib/pleroma/web/activity_pub/activity_pub.ex View File

@@ -744,7 +744,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end

defp restrict_replies(query, %{
reply_filtering_user: user,
reply_filtering_user: %User{} = user,
reply_visibility: "self"
}) do
from(
@@ -760,7 +760,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end

defp restrict_replies(query, %{
reply_filtering_user: user,
reply_filtering_user: %User{} = user,
reply_visibility: "following"
}) do
from(


+ 8
- 0
test/web/activity_pub/activity_pub_test.exs View File

@@ -1773,6 +1773,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|> Enum.map(& &1.id)

assert activities_ids == []

activities_ids =
%{}
|> Map.put(:reply_visibility, "self")
|> Map.put(:reply_filtering_user, nil)
|> ActivityPub.fetch_public_activities()

assert activities_ids == []
end

test "home timeline", %{users: %{u1: user}} do


Loading…
Cancel
Save