pleroma

commit: 83c7415803774a4c56c718f5ebed2b9714ffdfcf
parent d5d7648789847b943caf339732aeeed11cd2728d
Author: kPherox <admin@mail.kr-kp.com>
Date:   Wed, 15 Mar 2023 23:55:24 +0900

fix: append field values to bio before parsing

Diffstat:
M
lib/pleroma/web/metadata/providers/rel_me.ex
14
+++++---------
M
test/pleroma/web/metadata/providers/rel_me_test.exs
4
++--

2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/lib/pleroma/web/metadata/providers/rel_me.ex b/lib/pleroma/web/metadata/providers/rel_me.ex
@@ -9,8 +9,9 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
   @impl Provider
   def build_tags(%{user: user}) do
     profile_tree =
-      Floki.parse_fragment!(user.bio)
-      |> prepend_fields_tag(user.fields)
+      user.bio
+      |> append_fields_tag(user.fields)
+      |> Floki.parse_fragment!()
 
     (Floki.attribute(profile_tree, "link[rel~=me]", "href") ++
        Floki.attribute(profile_tree, "a[rel~=me]", "href"))
@@ -19,13 +20,8 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
     end)
   end
 
-  defp prepend_fields_tag(bio_tree, fields) do
+  defp append_fields_tag(bio, fields) do
     fields
-    |> Enum.reduce(bio_tree, fn %{"value" => v}, tree ->
-      case Floki.parse_fragment(v) do
-        {:ok, [a | _]} -> [a | tree]
-        _ -> tree
-      end
-    end)
+    |> Enum.reduce(bio, fn %{"value" => v}, res -> res <> v 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
@@ -27,8 +27,8 @@ defmodule Pleroma.Web.Metadata.Providers.RelMeTest do
 
     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"], []}
+             {:link, [rel: "me", href: "https://another-link.com"], []},
+             {:link, [rel: "me", href: "http://profile.com"], []}
            ]
   end
 end