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

lint and credo

Browse source
This commit is contained in:
Phantasm 2025-12-03 00:06:32 +01:00
commit a4e480a636
No known key found for this signature in database
GPG key ID: 2669E588BCC634C8
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file

@ -483,7 +483,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
end end
defp validate_visibility(%User{} = user, %{"type" => type, "object" => object} = activity) do defp validate_visibility(%User{} = user, %{"type" => type, "object" => object} = activity) do
with {_, %Object{} = normalized_object} <- {:normalize, Object.normalize(object, fetch: false)}, with {_, %Object{} = normalized_object} <-
{:normalize, Object.normalize(object, fetch: false)},
{_, true} <- {:visibility, Visibility.visible_for_user?(normalized_object, user)} do {_, true} <- {:visibility, Visibility.visible_for_user?(normalized_object, user)} do
{:ok, activity} {:ok, activity}
else else

15
lib/pleroma/web/common_api/activity_draft.ex
View file

@ -140,9 +140,10 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
# If a post was deleted all its activities (except the newly added Delete) are purged too, # If a post was deleted all its activities (except the newly added Delete) are purged too,
# thus lookup by Create db ID will yield nil just as if it never existed in the first place. # thus lookup by Create db ID will yield nil just as if it never existed in the first place.
# #
# We allow replying to Announce here, due to a Pleroma-FE quirk where if presented with an Announce id # We allow replying to Announce here, due to a Pleroma-FE quirk where if presented with
# it will render it as if it was just the normal referenced post, but use the Announce id for replies # an Announce id it will render it as if it was just the normal referenced post, but
# in the in_reply_to_id key of a POST request to /api/v1/statuses, or as an :id in /api/v1/statuses/:id/*. # use the Announce id for replies in the in_reply_to_id key of a POST request to
# /api/v1/statuses, or as an :id in /api/v1/statuses/:id/*.
# TODO: Fix this quirk in FE and remove here and other affected places # TODO: Fix this quirk in FE and remove here and other affected places
with %Activity{} = activity <- Activity.get_by_id(id), with %Activity{} = activity <- Activity.get_by_id(id),
true <- Visibility.visible_for_user?(activity, draft.user), true <- Visibility.visible_for_user?(activity, draft.user),
@ -156,8 +157,12 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
add_error(draft, dgettext("errors", "Replying to a status that is not visibile to user")) add_error(draft, dgettext("errors", "Replying to a status that is not visibile to user"))
{:type, type} -> {:type, type} ->
add_error(draft, dgettext("errors", "Can only reply to posts, not %{type} activities", add_error(
type: inspect(type))) draft,
dgettext("errors", "Can only reply to posts, not %{type} activities",
type: inspect(type)
)
)
end end
end end

6
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
View file

@ -291,7 +291,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
end end
test "replying to own DM succeeds", %{user: user, conn: conn} do test "replying to own DM succeeds", %{user: user, conn: conn} do
# this is an "edge" case for visibility: replying user is not part of addressed users (but is the author) # this is an "edge" case for visibility: replying user is not
# part of addressed users (but is the author)
stranger = insert(:user) stranger = insert(:user)
{:ok, %{id: dm_id} = dm_post_act} = {:ok, %{id: dm_id} = dm_post_act} =
@ -1546,7 +1547,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
assert match?(%{"error" => _}, resp1) assert match?(%{"error" => _}, resp1)
# unreblog by reblog ID (reblog IDs are accepted by some APIs; ensure it fails here one way or another) # unreblog by reblog ID (reblog IDs are accepted by some APIs;
# ensure it fails here one way or another)
resp2 = resp2 =
build_conn() build_conn()
|> assign(:user, user) |> assign(:user, user)