Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactor fetching medias from event attachements

Browse Source 
Use first attachement Document if none has the Banner name

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-11-10 16:39:47 +01:00
parent 6822cfabf1
commit aaf9c2c931
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/federation/activity_stream/converter/utils.ex
View File

@ -196,7 +196,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
def process_pictures(object, actor_id) do def process_pictures(object, actor_id) do
attachements = Map.get(object, "attachment", []) attachements = Map.get(object, "attachment", [])
media_attachements = get_medias(attachements) {banner, media_attachements} = get_medias(attachements)
media_attachements_map = media_attachements_map =
media_attachements media_attachements
@ -220,9 +220,9 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
|> Map.new() |> Map.new()
picture_id = picture_id =
case get_banner_picture(attachements) do case banner do
banner when is_map(banner) -> banner_map when is_map(banner_map) ->
case MediaConverter.find_or_create_media(banner, actor_id) do case MediaConverter.find_or_create_media(banner_map, actor_id) do
{:error, _err} -> {:error, _err} ->
nil nil
@ -247,12 +247,23 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
defp replace_media_url_in_body(body, {old_url, new_url}), defp replace_media_url_in_body(body, {old_url, new_url}),
do: String.replace(body, old_url, new_url) do: String.replace(body, old_url, new_url)
@spec get_medias(list(map())) :: {map(), list(map())}
defp get_medias(attachments) do defp get_medias(attachments) do
Enum.filter(attachments, &(&1["type"] == "Document" && &1["name"] != @banner_picture_name)) banner = get_banner_picture(attachments)
{banner, Enum.filter(attachments, &(&1["type"] == "Document" && &1["url"] != banner["url"]))}
end end
@spec get_banner_picture(list(map())) :: map()
defp get_banner_picture(attachments) do defp get_banner_picture(attachments) do
Enum.find(attachments, &(&1["type"] == "Document" && &1["name"] == @banner_picture_name)) # Prefer media with
media_with_picture_name =
Enum.find(attachments, &(&1["type"] == "Document" && &1["name"] == @banner_picture_name))
case media_with_picture_name do
# If no banner found, use the first media
nil -> Enum.find(attachments, &(&1["type"] == "Document"))
media_with_picture_name -> media_with_picture_name
end
end end
@spec get_address(map | binary | nil) :: Address.t() | nil @spec get_address(map | binary | nil) :: Address.t() | nil