pleroma

commit: 6e6f1ead31ba26bc42b14226e3c0876042f0596a
parent: be2777715650d0ac80509f0bd22b4cea8641f9b3
Author: rinpatch <rinpatch@sdf.org>
Date:   Wed, 22 Jan 2020 17:55:49 +0000

Merge branch 'no-error-404' into 'develop'

Log at debug level for object deletion, not error.

See merge request pleroma/pleroma!2066
Diffstat:
M
lib/pleroma/object/fetcher.ex
3
+++
M
lib/pleroma/web/activity_pub/activity_pub.ex
4
++++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
@@ -117,6 +117,9 @@ defmodule Pleroma.Object.Fetcher do
       {:error, %Tesla.Mock.Error{}} ->
         nil
 
+      {:error, "Object has been deleted"} ->
+        nil
+
       e ->
         Logger.error("Error while fetching #{id}: #{inspect(e)}")
         nil
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1369,6 +1369,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
          data <- maybe_update_follow_information(data) do
       {:ok, data}
     else
+      {:error, "Object has been deleted"} = e ->
+        Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
+        {:error, e}
+
       e ->
         Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
         {:error, e}