hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(activitypub): Remote event processing fails if featured image is of type Image

Browse Source
This commit is contained in:
André Menrath
2025-08-29 11:42:14 +02:00
committed by setop
parent 2a29b623e9
commit 63d44ce4db
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/federation/activity_stream/converter/media.ex
View File

@@ -2,7 +2,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Media do
@moduledoc """ @moduledoc """
Media converter. Media converter.
This module allows to convert events from ActivityStream format to our own This module allows converting events from ActivityStream format to our own
internal one, and back. internal one, and back.
""" """
@@ -12,6 +12,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Media do
alias Mobilizon.Service.HTTP.RemoteMediaDownloaderClient alias Mobilizon.Service.HTTP.RemoteMediaDownloaderClient
alias Mobilizon.Web.Upload alias Mobilizon.Web.Upload
@supported_media_types ["Image", "Document"]
@doc """ @doc """
Convert a media struct to an ActivityStream representation. Convert a media struct to an ActivityStream representation.
""" """
@@ -30,19 +32,18 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Media do
""" """
@spec find_or_create_media(map(), String.t() | integer()) :: @spec find_or_create_media(map(), String.t() | integer()) ::
{:ok, MediaModel.t()} | {:error, atom() | String.t() | Ecto.Changeset.t()} {:ok, MediaModel.t()} | {:error, atom() | String.t() | Ecto.Changeset.t()}
def find_or_create_media(%{"type" => type, "href" => url}, actor_id) def find_or_create_media(%{"type" => type, "href" => url}, actor_id) when type in @supported_media_types,
when type in ["Image", "Document"], do:
do: find_or_create_media(
find_or_create_media( %{"type" => type, "url" => url, "name" => "External media"},
%{"type" => type, "url" => url, "name" => "External media"}, actor_id
actor_id )
)
def find_or_create_media( def find_or_create_media(
%{"type" => type, "url" => media_url, "name" => name}, %{"type" => type, "url" => media_url, "name" => name},
actor_id actor_id
) )
when type in ["Image", "Document"] and is_binary(media_url) do when type in @supported_media_types and is_binary(media_url) do
with {:ok, %{url: url} = uploaded} <- upload_media(media_url, name) do with {:ok, %{url: url} = uploaded} <- upload_media(media_url, name) do
case Medias.get_media_by_url(url) do case Medias.get_media_by_url(url) do
%MediaModel{file: _file} = media -> %MediaModel{file: _file} = media ->