feat: build rel me tags with profile fields

2 files changed, 29 insertions, 4 deletions

diff --git a/lib/pleroma/web/metadata/providers/rel_me.ex b/lib/pleroma/web/metadata/providers/rel_me.ex
index f0bee85c8..e1890a050 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 cce4f3607..b1177edb7 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 @@ defmodule Pleroma.Web.Metadata.Providers.RelMeTest do
     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">)
 
-    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}) == [
              {:link, [rel: "me", href: "http://some3.com"], []},
+             {:link, [rel: "me", href: "http://profile.com"], []},
              {:link, [rel: "me", href: "https://another-link.com"], []}
            ]
   end