fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-24 10:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Leverage function pattern matching instead

Browse source
This commit is contained in:
Mark Felder 2021-03-11 09:20:29 -06:00
parent 8246db2a96
commit 029ff65389
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -379,18 +379,15 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
page_url = page_url_data |> to_string page_url = page_url_data |> to_string
image_url = image_url_data =
cond do if is_binary(rich_media["image"]) do
!is_binary(rich_media["image"]) -> URI.parse(rich_media["image"])
nil else
nil
String.starts_with?(rich_media["image"], "http") ->
rich_media["image"]
true ->
URI.merge(page_url_data, URI.parse(rich_media["image"])) |> to_string
end end
image_url = get_image_url(image_url_data, page_url_data)
%{ %{
type: "link", type: "link",
provider_name: page_url_data.host, provider_name: page_url_data.host,
@ -546,4 +543,23 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
do: %{name: name, website: url} do: %{name: name, website: url}
defp build_application(_), do: nil defp build_application(_), do: nil
# Workaround for Elixir issue #10771
# Avoid applying URI.merge unless necessary
# TODO: revert to always attempting URI.merge(image_url_data, page_url_data)
# when Elixir 1.12 is the minimum supported version
@spec get_image_url(struct() | nil, struct()) :: String.t() | nil
defp get_image_url(
%URI{scheme: image_scheme, host: image_host} = image_url_data,
%URI{} = _page_url_data
)
when not is_nil(image_scheme) and not is_nil(image_host) do
image_url_data |> to_string
end
defp get_image_url(%URI{} = image_url_data, %URI{} = page_url_data) do
URI.merge(page_url_data, image_url_data) |> to_string
end
defp get_image_url(_, _), do: nil
end end