diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-19 21:36:20 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-19 21:36:20 +0000 |
| commit | 9b80203ea5d3a43ccba15f20172c790e127038f9 (patch) | |
| tree | 03fa3aa6b87894d4a9ac674017ef076f4cf8377e /lib/pleroma/user.ex | |
| parent | 43bd7f47db7f2a31c59ec3f48cf22a51847ae241 (diff) | |
| parent | 1685e4258f452343c86d9dd3914076f101c8ed73 (diff) | |
| download | pleroma-9b80203ea5d3a43ccba15f20172c790e127038f9.tar.gz | |
Merge branch 'bugfix/activitypub-public' into 'develop'
activitypub addressing improvements
Closes #730 and #739
See merge request pleroma/pleroma!953
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index fb3bd121d..8df276ae0 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -104,9 +104,8 @@ defmodule Pleroma.User do "#{Web.base_url()}/users/#{nickname}" end - def ap_followers(%User{} = user) do - "#{ap_id(user)}/followers" - end + def ap_followers(%User{follower_address: fa}) when is_binary(fa), do: fa + def ap_followers(%User{} = user), do: "#{ap_id(user)}/followers" def user_info(%User{} = user) do oneself = if user.local, do: 1, else: 0 |