mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

fix: append field values to bio before parsing

Browse source
This commit is contained in:
kPherox 2023-03-15 23:55:24 +09:00
parent d5d7648789
commit 83c7415803
No known key found for this signature in database
GPG key ID: C04751C2BFA2F62D
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/metadata/providers/rel_me.ex
View file

@ -9,8 +9,9 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
@impl Provider @impl Provider
def build_tags(%{user: user}) do def build_tags(%{user: user}) do
profile_tree = profile_tree =
Floki.parse_fragment!(user.bio) user.bio
|> prepend_fields_tag(user.fields) |> append_fields_tag(user.fields)
|> Floki.parse_fragment!()
(Floki.attribute(profile_tree, "link[rel~=me]", "href") ++ (Floki.attribute(profile_tree, "link[rel~=me]", "href") ++
Floki.attribute(profile_tree, "a[rel~=me]", "href")) Floki.attribute(profile_tree, "a[rel~=me]", "href"))
@ -19,13 +20,8 @@ defmodule Pleroma.Web.Metadata.Providers.RelMe do
end) end)
end end
defp prepend_fields_tag(bio_tree, fields) do defp append_fields_tag(bio, fields) do
fields fields
|> Enum.reduce(bio_tree, fn %{"value" => v}, tree -> |> Enum.reduce(bio, fn %{"value" => v}, res -> res <> v end)
case Floki.parse_fragment(v) do
{:ok, [a | _]} -> [a | tree]
_ -> tree
end
end)
end end
end end

4
test/pleroma/web/metadata/providers/rel_me_test.exs
View file

@ -27,8 +27,8 @@ defmodule Pleroma.Web.Metadata.Providers.RelMeTest do
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: "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
end end