logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 2301de3d75fa29d2dd856ae82b73ac564ea27ea0
parent: 95a4a194173cb056c4ceeb422cbf8dfcdc234467
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue, 17 Sep 2019 17:16:39 +0000

Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'

Fix `Transmogrifier.upgrade_user_from_ap_id/1`

See merge request pleroma/pleroma!1677

Diffstat:

Mlib/pleroma/web/activity_pub/transmogrifier.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -1050,7 +1050,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do with %User{local: false} = user <- User.get_cached_by_ap_id(ap_id), {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id), already_ap <- User.ap_enabled?(user), - {:ok, user} <- user |> User.upgrade_changeset(data) |> User.update_and_set_cache() do + {:ok, user} <- user |> User.upgrade_changeset(data, true) |> User.update_and_set_cache() do unless already_ap do TransmogrifierWorker.enqueue("user_upgrade", %{"user_id" => user.id}) end