diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-02 14:47:17 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-02 14:47:17 +0300 |
commit | dbcfac11b45b367185a3b18a2db3e3fb07e8f20d (patch) | |
tree | 039254a94616f04f4ea00e893bf0fb66dc06d9e8 /lib/pleroma/user.ex | |
parent | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (diff) | |
parent | fd932b14a7e7335a91a2acc2d6dd6fba7e2e90b3 (diff) | |
download | pleroma-dbcfac11b45b367185a3b18a2db3e3fb07e8f20d.tar.gz |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index d9aa54057..ff828aa17 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -305,16 +305,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" |