Merge branch 'fix-initial-posts' into 'develop'

Check if the user has indeed not been federated with before fetching initial posts

See merge request pleroma/pleroma!951
This commit is contained in:
rinpatch 2019-03-18 17:57:19 +00:00
commit d0eb25a3da
1 changed files with 4 additions and 1 deletions

View File

@ -1159,9 +1159,12 @@ def get_or_fetch_by_ap_id(ap_id) do
if !is_nil(user) and !User.needs_update?(user) do
user
else
# Whether to fetch initial posts for the user (if it's a new user & the fetching is enabled)
should_fetch_initial = is_nil(user) and Pleroma.Config.get([:fetch_initial_posts, :enabled])
user = fetch_by_ap_id(ap_id)
if Pleroma.Config.get([:fetch_initial_posts, :enabled]) do
if should_fetch_initial do
with %User{} = user do
{:ok, _} = Task.start(__MODULE__, :fetch_initial_posts, [user])
end