Merge branch 'feat/fields-rel-me-tag' into 'develop'
feat: build rel me tags with profile fields See merge request pleroma/pleroma!3850
This commit is contained in:
commit
c3600b6104
2 changed files with 26 additions and 5 deletions
|
@ -8,12 +8,20 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
|
||||||
|
|
||||||
@impl Provider
|
@impl Provider
|
||||||
def build_tags(%{user: user}) do
|
def build_tags(%{user: user}) do
|
||||||
bio_tree = Floki.parse_fragment!(user.bio)
|
profile_tree =
|
||||||
|
user.bio
|
||||||
|
|> append_fields_tag(user.fields)
|
||||||
|
|> Floki.parse_fragment!()
|
||||||
|
|
||||||
(Floki.attribute(bio_tree, "link[rel~=me]", "href") ++
|
(Floki.attribute(profile_tree, "link[rel~=me]", "href") ++
|
||||||
Floki.attribute(bio_tree, "a[rel~=me]", "href"))
|
Floki.attribute(profile_tree, "a[rel~=me]", "href"))
|
||||||
|> Enum.map(fn link ->
|
|> Enum.map(fn link ->
|
||||||
{:link, [rel: "me", href: link], []}
|
{:link, [rel: "me", href: link], []}
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp append_fields_tag(bio, fields) do
|
||||||
|
fields
|
||||||
|
|> Enum.reduce(bio, fn %{"value" => v}, res -> res <> v end)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,11 +11,24 @@ test "it renders all links with rel='me' from user bio" do
|
||||||
bio =
|
bio =
|
||||||
~s(<a href="https://some-link.com">https://some-link.com</a> <a rel="me" href="https://another-link.com">https://another-link.com</a> <link href="http://some.com"> <link rel="me" href="http://some3.com">)
|
~s(<a href="https://some-link.com">https://some-link.com</a> <a rel="me" href="https://another-link.com">https://another-link.com</a> <link href="http://some.com"> <link rel="me" href="http://some3.com">)
|
||||||
|
|
||||||
user = insert(:user, %{bio: bio})
|
fields = [
|
||||||
|
%{
|
||||||
|
"name" => "profile",
|
||||||
|
"value" => ~S(<a rel="me" href="http://profile.com">http://profile.com</a>)
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
"name" => "like",
|
||||||
|
"value" => ~S(<a href="http://cofe.io">http://cofe.io</a>)
|
||||||
|
},
|
||||||
|
%{"name" => "foo", "value" => "bar"}
|
||||||
|
]
|
||||||
|
|
||||||
|
user = insert(:user, %{bio: bio, fields: fields})
|
||||||
|
|
||||||
assert RelMe.build_tags(%{user: user}) == [
|
assert RelMe.build_tags(%{user: user}) == [
|
||||||
{:link, [rel: "me", href: "http://some3.com"], []},
|
{:link, [rel: "me", href: "http://some3.com"], []},
|
||||||
{:link, [rel: "me", href: "https://another-link.com"], []}
|
{:link, [rel: "me", href: "https://another-link.com"], []},
|
||||||
|
{:link, [rel: "me", href: "http://profile.com"], []}
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue