summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-13 10:47:35 +0000
committerlain <lain@soykaf.club>2019-06-13 10:47:35 +0000
commita2318e9dd6c8daf5554b17e9312f1fb6e14326de (patch)
treecc67dffe19b4f02ac6a6e5ca04a9b785685decee /lib
parent822a9f28d08af9da69a8e0f72cc6511252f25ddd (diff)
parent30e54fd7e2f967364f2c1c17d739b629d2900167 (diff)
downloadpleroma-a2318e9dd6c8daf5554b17e9312f1fb6e14326de.tar.gz
pleroma-a2318e9dd6c8daf5554b17e9312f1fb6e14326de.zip
Merge branch 'improve-410-handling' into 'develop'
Handle HTTP 404 and 410 response Closes #977 See merge request pleroma/pleroma!1278
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/object/fetcher.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index ca980c629..c422490ac 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -85,6 +85,9 @@ defmodule Pleroma.Object.Fetcher do
:ok <- Containment.contain_origin_from_id(id, data) do
{:ok, data}
else
+ {:ok, %{status: code}} when code in [404, 410] ->
+ {:error, "Object has been deleted"}
+
e ->
{:error, e}
end