diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-28 15:33:36 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-28 15:33:36 +0400 |
| commit | 4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c (patch) | |
| tree | be6180594d4416c53670799ca3d0a11696b2dbdd /lib/pleroma/web | |
| parent | 4f90077767b416f3469fe7c8acfaa6932c579ec2 (diff) | |
| parent | 1204aaa2e35983f7361d61ee7906ccf3d09d84e4 (diff) | |
| download | pleroma-4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/account-export
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index d17c892a7..13869f897 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1378,6 +1378,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:ok, data} <- user_data_from_user_object(data) do {:ok, maybe_update_follow_information(data)} else + # If this has been deleted, only log a debug and not an error {:error, "Object has been deleted" = e} -> Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}") {:error, e} |