commit: d0eb25a3da2567dddcd6fdca1a4de5461b8984cd
parent: 9073039d723ab7e245af439ca351ba0f551d722c
Author: rinpatch <rinpatch@sdf.org>
Date: Mon, 18 Mar 2019 17:57:19 +0000
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
Diffstat:
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -1159,9 +1159,12 @@ defmodule Pleroma.User 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