diff --git a/lib/pleroma/web/metadata/providers/rel_me.ex b/lib/pleroma/web/metadata/providers/rel_me.ex
index f013def51..92528513a 100644
--- a/lib/pleroma/web/metadata/providers/rel_me.ex
+++ b/lib/pleroma/web/metadata/providers/rel_me.ex
@@ -8,12 +8,24 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
@impl Provider
def build_tags(%{user: user}) do
- bio_tree = Floki.parse_fragment!(user.bio)
+ profile_tree =
+ Floki.parse_fragment!(user.bio)
+ |> prepend_fields_tag(user.fields)
- (Floki.attribute(bio_tree, "link[rel~=me]", "href") ++
- Floki.attribute(bio_tree, "a[rel~=me]", "href"))
+ (Floki.attribute(profile_tree, "link[rel~=me]", "href") ++
+ Floki.attribute(profile_tree, "a[rel~=me]", "href"))
|> Enum.map(fn link ->
{:link, [rel: "me", href: link], []}
end)
end
+
+ defp prepend_fields_tag(bio_tree, fields) do
+ fields
+ |> Enum.reduce(bio_tree, fn %{"value" => v}, tree ->
+ case Floki.parse_fragment(v) do
+ {:ok, [a | _]} -> [a | tree]
+ _ -> tree
+ end
+ end)
+ end
end
diff --git a/test/pleroma/web/metadata/providers/rel_me_test.exs b/test/pleroma/web/metadata/providers/rel_me_test.exs
index 0db6e7d22..78e509a40 100644
--- a/test/pleroma/web/metadata/providers/rel_me_test.exs
+++ b/test/pleroma/web/metadata/providers/rel_me_test.exs
@@ -11,10 +11,23 @@ test "it renders all links with rel='me' from user bio" do
bio =
~s(https://some-link.com https://another-link.com )
- user = insert(:user, %{bio: bio})
+ fields = [
+ %{
+ "name" => "profile",
+ "value" => ~S(http://profile.com)
+ },
+ %{
+ "name" => "like",
+ "value" => ~S(http://cofe.io)
+ },
+ %{"name" => "foo", "value" => "bar"}
+ ]
+
+ user = insert(:user, %{bio: bio, fields: fields})
assert RelMe.build_tags(%{user: user}) == [
{:link, [rel: "me", href: "http://some3.com"], []},
+ {:link, [rel: "me", href: "http://profile.com"], []},
{:link, [rel: "me", href: "https://another-link.com"], []}
]
end