Merge pull request 'RichMedia: skip the quote fallback link when picking the card URL' (#8004) from lambadalambda/pleroma:fix/card-skip-quote-link into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/8004
This commit is contained in:
commit
b5726f6736
3 changed files with 43 additions and 3 deletions
1
changelog.d/card-skip-quote-link.fix
Normal file
1
changelog.d/card-skip-quote-link.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Link preview cards skip the fallback link of quote posts (`RE: <url>`), which pointed at the quoted post and showed it twice.
|
||||||
|
|
@ -66,14 +66,16 @@ defmodule Pleroma.HTML do
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec extract_first_external_url_from_object(Pleroma.Object.t()) :: String.t() | nil
|
@spec extract_first_external_url_from_object(Pleroma.Object.t()) :: String.t() | nil
|
||||||
def extract_first_external_url_from_object(%{data: %{"content" => content}})
|
def extract_first_external_url_from_object(%{data: %{"content" => content} = data})
|
||||||
when is_binary(content) do
|
when is_binary(content) do
|
||||||
|
# A quote post's fallback link ("RE: <url>", in a .quote-inline element or
|
||||||
|
# bare) points at the quoted post, which is shown already.
|
||||||
content
|
content
|
||||||
|> Floki.parse_fragment!()
|
|> Floki.parse_fragment!()
|
||||||
|
|> Floki.filter_out(".quote-inline")
|
||||||
|> Floki.find("a:not(.mention,.hashtag,.attachment,[rel~=\"tag\"])")
|
|> Floki.find("a:not(.mention,.hashtag,.attachment,[rel~=\"tag\"])")
|
||||||
|> Enum.take(1)
|
|
||||||
|> Floki.attribute("href")
|
|> Floki.attribute("href")
|
||||||
|> Enum.at(0)
|
|> Enum.find(&(&1 != data["quoteUrl"]))
|
||||||
end
|
end
|
||||||
|
|
||||||
def extract_first_external_url_from_object(_), do: nil
|
def extract_first_external_url_from_object(_), do: nil
|
||||||
|
|
|
||||||
|
|
@ -337,5 +337,42 @@ defmodule Pleroma.HTMLTest do
|
||||||
|
|
||||||
assert nil == HTML.extract_first_external_url_from_object(object)
|
assert nil == HTML.extract_first_external_url_from_object(object)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "skips the link in a Mastodon quote fallback paragraph" do
|
||||||
|
object = %Object{
|
||||||
|
data: %{
|
||||||
|
"quoteUrl" => "https://raru.re/users/ocean/statuses/116235427788617987",
|
||||||
|
"content" =>
|
||||||
|
~s(<p class="quote-inline">RE: <a href="https://raru.re/@ocean/116235427788617987">raru.re/@ocean/116235427788617987</a></p>) <>
|
||||||
|
~s(<p>Berapa lapis?</p><p><a href="https://www.youtube.com/watch?v=S0dJMhWDRDE">youtube.com/watch?v=S0dJMhWDRDE</a></p>)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert HTML.extract_first_external_url_from_object(object) ==
|
||||||
|
"https://www.youtube.com/watch?v=S0dJMhWDRDE"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "skips the link in a quote fallback span (Misskey, InlineQuotePolicy)" do
|
||||||
|
object = %Object{
|
||||||
|
data: %{
|
||||||
|
"content" =>
|
||||||
|
~s(hello<span class="quote-inline"><br/><br/>RE: <a href="https://misskey.example/notes/abc">https://misskey.example/notes/abc</a></span>)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert nil == HTML.extract_first_external_url_from_object(object)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "skips a link to the quoted post without fallback markup" do
|
||||||
|
object = %Object{
|
||||||
|
data: %{
|
||||||
|
"quoteUrl" => "https://remote.example/objects/1",
|
||||||
|
"content" =>
|
||||||
|
~s(RE: <a href="https://remote.example/objects/1">https://remote.example/objects/1</a> <a href="https://cofe.example/">cofe</a>)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert HTML.extract_first_external_url_from_object(object) == "https://cofe.example/"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue