Browse Source

formatter: Use user.uri instead of user.source_data.uri

contrib/munin-healthcheck
Haelwenn (lanodan) Monnier 4 years ago
parent
commit
369c03834c
No known key found for this signature in database GPG Key ID: D5B7A8E43C997DEE
2 changed files with 3 additions and 6 deletions
  1. +2
    -5
      lib/pleroma/formatter.ex
  2. +1
    -1
      test/formatter_test.exs

+ 2
- 5
lib/pleroma/formatter.ex View File

@@ -31,7 +31,7 @@ defmodule Pleroma.Formatter do
def mention_handler("@" <> nickname, buffer, opts, acc) do
case User.get_cached_by_nickname(nickname) do
%User{id: id} = user ->
ap_id = get_ap_id(user)
user_url = user.uri || user.ap_id
nickname_text = get_nickname_text(nickname, opts)

link =
@@ -42,7 +42,7 @@ defmodule Pleroma.Formatter do
["@", Phoenix.HTML.Tag.content_tag(:span, nickname_text)],
"data-user": id,
class: "u-url mention",
href: ap_id,
href: user_url,
rel: "ugc"
),
class: "h-card"
@@ -146,9 +146,6 @@ defmodule Pleroma.Formatter do
end
end

defp get_ap_id(%User{source_data: %{"url" => url}}) when is_binary(url), do: url
defp get_ap_id(%User{ap_id: ap_id}), do: ap_id

defp get_nickname_text(nickname, %{mentions_format: :full}), do: User.full_nickname(nickname)
defp get_nickname_text(nickname, _), do: User.local_nickname(nickname)
end

+ 1
- 1
test/formatter_test.exs View File

@@ -140,7 +140,7 @@ defmodule Pleroma.FormatterTest do
archaeme =
insert(:user,
nickname: "archa_eme_",
source_data: %{"url" => "https://archeme/@archa_eme_"}
uri: "https://archeme/@archa_eme_"
)

archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})


Loading…
Cancel
Save