From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 14 Jul 2019 10:02:16 +0000 (+0200)
Subject: Object.Fetcher: Handle error on Containment.contain_origin/2
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=40d0a198e20d577b51339f4026d672b1aa968be1;p=akkoma

Object.Fetcher: Handle error on Containment.contain_origin/2
---

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 101c21f96..82250ab8d 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -38,6 +38,7 @@ defmodule Pleroma.Object.Fetcher do
              "type" => "Create",
              "to" => data["to"],
              "cc" => data["cc"],
+             # TODO: Should we seriously keep this attributedTo thing?
              "actor" => data["actor"] || data["attributedTo"],
              "object" => data
            },
@@ -56,6 +57,9 @@ defmodule Pleroma.Object.Fetcher do
         object = %Object{} ->
           {:ok, object}
 
+        :error ->
+          {:error, "Object containment failed."}
+
         _e ->
           Logger.info("Couldn't get object via AP, trying out OStatus fetching...")