alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

User: Fix use of source_data in profile_url/1

This commit is contained in:
Haelwenn (lanodan) Monnier 2020-03-29 22:30:50 +02:00
parent 2553400a66
commit b30fb1f3bb
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/user.ex
View File

@ -305,7 +305,8 @@ def banner_url(user, options \\ []) do
end end
end end
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(%User{ap_id: ap_id}), do: ap_id
def profile_url(_), do: nil 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{follower_address: fa}) when is_binary(fa), do: fa
def ap_followers(%User{} = user), do: "#{ap_id(user)}/followers" 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{following_address: fa}) when is_binary(fa), do: fa
def ap_following(%User{} = user), do: "#{ap_id(user)}/following" def ap_following(%User{} = user), do: "#{ap_id(user)}/following"

4
test/web/mastodon_api/views/account_view_test.exs
View File

@ -178,7 +178,9 @@ test "Represent a Funkwhale channel" do
assert represented = AccountView.render("show.json", %{user: user}) assert represented = AccountView.render("show.json", %{user: user})
assert represented.acct == "compositions@channels.tests.funkwhale.audio" assert represented.acct == "compositions@channels.tests.funkwhale.audio"
assert represented.url == "https://channels.tests.funkwhale.audio/channels/compositions" # assert represented.url == "https://channels.tests.funkwhale.audio/channels/compositions"
assert represented.url ==
"https://channels.tests.funkwhale.audio/federation/actors/compositions"
end end
test "Represent a deactivated user for an admin" do test "Represent a deactivated user for an admin" do