Merge remote-tracking branch 'pleroma/develop' into features/poll-validation

2020-07-31 13:57:21 +02:00 · 2020-07-31 13:57:21 +02:00 · ac2598307d
commit ac2598307d
parent e4beff90f5 a6d3bb5f30
288 changed files with 3671 additions and 3020 deletions
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@ -143,6 +143,10 @@ defmodule Pleroma.Object.Fetcher do
      {:error, "Object has been deleted"} ->
        nil

+      {:reject, reason} ->
+        Logger.info("Rejected #{id} while fetching: #{inspect(reason)}")
+        nil
+
      e ->
        Logger.error("Error while fetching #{id}: #{inspect(e)}")
        nil