hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/funkwhale-channel' into 'develop'

Browse source 
Fix profile url for funkwhale channels, removes one source_data use

Closes #1653

See merge request pleroma/pleroma!2333
This commit is contained in:
Haelwenn 2020-03-31 22:04:02 +00:00 • committed by rinpatch
commit 01a3f145d5
7 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/user.ex
View file

@ -276,16 +276,12 @@ defmodule Pleroma.User do
end
end
def profile_url(%User{source_data: %{"url" => url}}), do: url
def profile_url(%User{ap_id: ap_id}), do: ap_id
def profile_url(_), do: nil
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"