AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 25 Projects 2 Releases 14 Packages Wiki Activity

Transmogrifier: Small readability changes.

Browse source
This commit is contained in:
lain 2020-08-11 14:02:09 +02:00
parent 54a6855ddf
commit 8f9fbc86c0
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -661,7 +661,8 @@ def handle_incoming(
) )
when type in ~w{Update Block Follow} do when type in ~w{Update Block Follow} do
with {:ok, %User{}} <- ObjectValidator.fetch_actor(data), with {:ok, %User{}} <- ObjectValidator.fetch_actor(data),
{:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do {:ok, activity, _} <-
Pipeline.common_pipeline(data, local: false) do
{:ok, activity} {:ok, activity}
end end
end end
@ -670,7 +671,8 @@ def handle_incoming(
%{"type" => "Delete"} = data, %{"type" => "Delete"} = data,
_options _options
) do ) do
with {:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do with {:ok, activity, _} <-
Pipeline.common_pipeline(data, local: false) do
{:ok, activity} {:ok, activity}
else else
{:error, {:validate_object, _}} = e -> {:error, {:validate_object, _}} = e ->

2
test/web/activity_pub/transmogrifier/undo_handling_test.exs
View file

@ -130,7 +130,7 @@ test "it works for incoming unannounces with an existing notice" do
"http://mastodon.example.org/users/admin/statuses/99542391527669785/activity" "http://mastodon.example.org/users/admin/statuses/99542391527669785/activity"
end end
test "it works for incomming unfollows with an existing follow" do test "it works for incoming unfollows with an existing follow" do
user = insert(:user) user = insert(:user)
follow_data = follow_data =