Verified Commit b30fb1f3 authored by Haelwenn's avatar Haelwenn
Browse files

User: Fix use of source_data in profile_url/1

parent 2553400a
......@@ -305,7 +305,8 @@ def banner_url(user, options \\ []) do
def profile_url(%User{source_data: %{"url" => url}}), do: url
def profile_url(%User{uri: url}) when url != nil, do: url
def profile_url(%User{source_data: %{"url" => url}}) when is_binary(url), do: url
def profile_url(%User{ap_id: ap_id}), do: ap_id
def profile_url(_), do: nil
......@@ -314,7 +315,7 @@ def ap_id(%User{nickname: nickname}), do: "#{Web.base_url()}/users/#{nickname}"
def ap_followers(%User{follower_address: fa}) when is_binary(fa), do: fa
def ap_followers(%User{} = user), do: "#{ap_id(user)}/followers"
@spec ap_following(User.t()) :: Sring.t()
@spec ap_following(User.t()) :: String.t()
def ap_following(%User{following_address: fa}) when is_binary(fa), do: fa
def ap_following(%User{} = user), do: "#{ap_id(user)}/following"
......@@ -178,7 +178,9 @@ test "Represent a Funkwhale channel" do
assert represented = AccountView.render("show.json", %{user: user})
assert represented.acct == ""
assert represented.url == ""
# assert represented.url == ""
assert represented.url ==
test "Represent a deactivated user for an admin" do
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment