limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Revert "Only run Floki if title is missing from the map"

Browse source 
This reverts commit 97d2b1a45a.
This commit is contained in:
Mark Felder 2019-06-12 18:32:28 -05:00
parent 97d2b1a45a
commit 7363a0ea8a
1 changed files with 6 additions and 8 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,14 +1,15 @@
defmodule Pleroma.Web.RichMedia.Parsers.MetaTagsParser do
def parse(html, data, prefix, error_message, key_name, value_name \\ "content") do
with elements = [_ | _] <- get_elements(html, key_name, prefix),
page_title = get_page_title(html),
meta_data =
Enum.reduce(elements, data, fn el, acc ->
attributes = normalize_attributes(el, prefix, key_name, value_name)
Map.merge(acc, attributes)
end) do
rich_meta_data = maybe_use_page_title(meta_data, html)
{:ok, rich_meta_data}
end)
|> Map.put_new(:title, page_title) do
{:ok, meta_data}
else
_e -> {:error, error_message}
end
@ -29,10 +30,7 @@ defmodule Pleroma.Web.RichMedia.Parsers.MetaTagsParser do
%{String.to_atom(data[key_name]) => data[value_name]}
end
defp maybe_use_page_title(meta_data, html) do
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
defp get_page_title(html) do
Floki.find(html, "title") |> Floki.text()
end
end