diff options
| author | lain <lain@soykaf.club> | 2018-11-18 22:15:03 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-11-18 22:15:03 +0100 |
| commit | 40d9d2098c85f1a8a6a5ff2b17adc78bbba3fd6c (patch) | |
| tree | d5ad97e719935f24355f83d398190a3578925d32 /lib/pleroma/web | |
| parent | cafa15131a59ae404eaa48d056885db1f052c9ed (diff) | |
| download | pleroma-40d9d2098c85f1a8a6a5ff2b17adc78bbba3fd6c.tar.gz | |
Fix user updating from AP.
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 5864855b0..2d11c40c5 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -850,10 +850,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def upgrade_user_from_ap_id(ap_id, async \\ true) do with %User{local: false} = user <- User.get_by_ap_id(ap_id), {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do - data = - data - |> Map.put(:info, Map.merge(user.info, data[:info])) - already_ap = User.ap_enabled?(user) {:ok, user} = |