Resolve merge conflicts

2019-07-20 22:04:47 +03:00 · 2019-07-20 22:04:47 +03:00 · 196cad46f3
commit 196cad46f3
parent c3ecaea64d fe548f322e
114 changed files with 3178 additions and 914 deletions
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@ -814,13 +814,16 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do

  def prepare_outgoing(%{"type" => "Create", "object" => object_id} = data) do
    object =
-      Object.normalize(object_id).data
+      object_id
+      |> Object.normalize()
+      |> Map.get(:data)
      |> prepare_object

    data =
      data
      |> Map.put("object", object)
      |> Map.merge(Utils.make_json_ld_header())
+      |> Map.delete("bcc")

    {:ok, data}
  end