diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-12-09 01:18:05 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-12-09 01:18:05 +0300 |
| commit | dbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77 (patch) | |
| tree | 59895cf60690a9db72c1ca29f59822fd40a6469c /lib/pleroma/web/activity_pub | |
| parent | 8a7b0819664b1bd9d2a7a9a9fd4f3c21810e66f7 (diff) | |
| download | pleroma-dbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77.tar.gz | |
wip
Diffstat (limited to 'lib/pleroma/web/activity_pub')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index f9483d82e..39fe69524 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -164,7 +164,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do defp maybe_update_media(%Object{data: %{"attachment" => []}}), do: :ok - defp maybe_update_media(%Object{id: id, data: %{"attachment" => attachments}}) do + defp maybe_update_media(%Object{data: %{"id" => id, "attachment" => attachments}}) do Enum.each(attachments, fn data -> with %{"id" => media_id} <- data do media_id diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 7e2663e09..d18d30fee 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -9,6 +9,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do alias Pleroma.Activity alias Pleroma.EctoType.ActivityPub.ObjectValidators alias Pleroma.Maps + alias Pleroma.Media alias Pleroma.Object alias Pleroma.Object.Containment alias Pleroma.Repo @@ -272,9 +273,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def fix_attachments(object), do: object def fix_media(%{"attachment" => [_ | _] = attachments} = object) do - Enum.each(attachments, fn attachment -> - IO.inspect({:fix_media, %{attachment: attachment, object: object}}) - end) + Enum.each( + attachments, + &Media.create_from_object_data(&1, %{user: User.get_by_ap_id(object.actor), object: object}) + ) object end |