forked from AkkomaGang/akkoma
Revert "Merge branch 'fix/ogp-title' into 'develop'"
This reverts merge request !1277
This commit is contained in:
parent
2437f51284
commit
b6af80f769
3 changed files with 8 additions and 59 deletions
|
@ -1,19 +1,15 @@
|
||||||
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),
|
||||||
meta_data =
|
meta_data =
|
||||||
html
|
Enum.reduce(elements, data, fn el, acc ->
|
||||||
|> get_elements(key_name, prefix)
|
|
||||||
|> Enum.reduce(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
|
||||||
|> maybe_put_title(html)
|
|
||||||
|
|
||||||
if Enum.empty?(meta_data) do
|
|
||||||
{:error, error_message}
|
|
||||||
else
|
|
||||||
{:ok, meta_data}
|
{:ok, meta_data}
|
||||||
|
else
|
||||||
|
_e -> {:error, error_message}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -31,17 +27,4 @@ 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 maybe_put_title(%{title: _} = meta, _), do: meta
|
|
||||||
|
|
||||||
defp maybe_put_title(meta, html) do
|
|
||||||
case get_page_title(html) do
|
|
||||||
"" -> meta
|
|
||||||
title -> Map.put_new(meta, :title, title)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp get_page_title(html) do
|
|
||||||
Floki.find(html, "title") |> Floki.text()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
12
test/fixtures/rich_media/ogp-missing-title.html
vendored
12
test/fixtures/rich_media/ogp-missing-title.html
vendored
|
@ -1,12 +0,0 @@
|
||||||
<html prefix="og: http://ogp.me/ns#">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<title>The Rock (1996)</title>
|
|
||||||
<meta property="og:type" content="video.movie" />
|
|
||||||
<meta property="og:url" content="http://www.imdb.com/title/tt0117500/" />
|
|
||||||
<meta property="og:image" content="http://ia.media-imdb.com/images/rock.jpg" />
|
|
||||||
<meta property="og:description"
|
|
||||||
content="Directed by Michael Bay. With Sean Connery, Nicolas Cage, Ed Harris, John Spencer.">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
</html>
|
|
|
@ -9,15 +9,6 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
|
||||||
} ->
|
} ->
|
||||||
%Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}
|
%Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}
|
||||||
|
|
||||||
%{
|
|
||||||
method: :get,
|
|
||||||
url: "http://example.com/ogp-missing-title"
|
|
||||||
} ->
|
|
||||||
%Tesla.Env{
|
|
||||||
status: 200,
|
|
||||||
body: File.read!("test/fixtures/rich_media/ogp-missing-title.html")
|
|
||||||
}
|
|
||||||
|
|
||||||
%{
|
%{
|
||||||
method: :get,
|
method: :get,
|
||||||
url: "http://example.com/twitter-card"
|
url: "http://example.com/twitter-card"
|
||||||
|
@ -60,19 +51,6 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
|
||||||
}}
|
}}
|
||||||
end
|
end
|
||||||
|
|
||||||
test "falls back to <title> when ogp:title is missing" do
|
|
||||||
assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/ogp-missing-title") ==
|
|
||||||
{:ok,
|
|
||||||
%{
|
|
||||||
image: "http://ia.media-imdb.com/images/rock.jpg",
|
|
||||||
title: "The Rock (1996)",
|
|
||||||
description:
|
|
||||||
"Directed by Michael Bay. With Sean Connery, Nicolas Cage, Ed Harris, John Spencer.",
|
|
||||||
type: "video.movie",
|
|
||||||
url: "http://www.imdb.com/title/tt0117500/"
|
|
||||||
}}
|
|
||||||
end
|
|
||||||
|
|
||||||
test "parses twitter card" do
|
test "parses twitter card" do
|
||||||
assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/twitter-card") ==
|
assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/twitter-card") ==
|
||||||
{:ok,
|
{:ok,
|
||||||
|
|
Loading…
Reference in a new issue