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
父節點 2553400a66
當前提交 b30fb1f3bb
沒有發現已知的金鑰在資料庫的簽署中
GPG 金鑰 ID: D5B7A8E43C997DEE
共有 2 個檔案被更改,包括 6 行新增3 行删除

查看文件

@ -305,7 +305,8 @@ defmodule Pleroma.User do
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(_), do: nil
@ -314,7 +315,7 @@ defmodule Pleroma.User do
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 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
assert represented = AccountView.render("show.json", %{user: user})
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
test "Represent a deactivated user for an admin" do