squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only run Floki if title is missing from the map

Browse Source
This commit is contained in:
Mark Felder 2019-06-12 18:27:35 -05:00
parent 097fdf6a5d
commit 97d2b1a45a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pleroma/web/rich_media/parsers/meta_tags_parser.ex
View File

@ -1,15 +1,14 @@
defmodule Pleroma.Web.RichMedia.Parsers.MetaTagsParser do defmodule Pleroma.Web.RichMedia.Parsers.MetaTagsParser do
def parse(html, data, prefix, error_message, key_name, value_name \\ "content") do def parse(html, data, prefix, error_message, key_name, value_name \\ "content") do
with elements = [_ | _] <- get_elements(html, key_name, prefix), with elements = [_ | _] <- get_elements(html, key_name, prefix),
page_title = get_page_title(html),
meta_data = meta_data =
Enum.reduce(elements, data, fn el, acc -> Enum.reduce(elements, data, fn el, acc ->
attributes = normalize_attributes(el, prefix, key_name, value_name) attributes = normalize_attributes(el, prefix, key_name, value_name)
Map.merge(acc, attributes) Map.merge(acc, attributes)
end) end) do
|> Map.put_new(:title, page_title) do rich_meta_data = maybe_use_page_title(meta_data, html)
{:ok, meta_data} {:ok, rich_meta_data}
else else
_e -> {:error, error_message} _e -> {:error, error_message}
end end
@ -30,7 +29,10 @@ defmodule Pleroma.Web.RichMedia.Parsers.MetaTagsParser do
%{String.to_atom(data[key_name]) => data[value_name]} %{String.to_atom(data[key_name]) => data[value_name]}
end end
defp get_page_title(html) do defp maybe_use_page_title(meta_data, html) do
Floki.find(html, "title") |> Floki.text() if !Map.has_key?(meta_data, :title) do
page_title = Floki.find(html, "title") |> Floki.text()
Map.put_new(meta_data, :title, page_title)
end
end end
end end