From: lain <lain@soykaf.club>
Date: Tue, 31 Mar 2020 17:28:18 +0000 (+0000)
Subject: Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1b323ce1c668c6a26617a05dcc12ee255c764e88;p=akkoma

Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index f82142979..a18ece6e7 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -1267,24 +1267,19 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:error, :no_context}
   end
 
-  defp maybe_add_recipients_from_object(%{"object" => object} = data) do
-    to = data["to"] || []
-    cc = data["cc"] || []
+  defp maybe_add_recipients_from_object(%{"to" => [_ | _], "cc" => [_ | _]} = data), do: {:ok, data}
 
-    if to == [] && cc == [] do
-      if object = Object.normalize(object) do
+  defp maybe_add_recipients_from_object(%{"object" => object} = data) do
+    case Object.normalize(object) do
+      %{data: {"actor" => actor}} -> 
         data =
           data
-          |> Map.put("to", [object.data["actor"]])
-          |> Map.put("cc", cc)
+          |> Map.put("to", [actor])
+          |> Map.put("cc", data["cc"] || [])
 
         {:ok, data}
-      else
-        {:error, "No actor on referenced object"}
-      end
-    else
-      {:ok, data}
-    end
+      nil -> {:error, :no_object}
+      _ -> {:error, :no_actor}
   end
 
   defp maybe_add_recipients_from_object(_) do