From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 8 Nov 2018 16:23:58 +0000 (+0000)
Subject: Merge branch 'small-jsonld-refactor' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=59cf7cf235a50abb8a1fd30ea7fd10443e533658;hp=-c;p=akkoma

Merge branch 'small-jsonld-refactor' into 'develop'

Small jsonld refactor

See merge request pleroma/pleroma!433
---

59cf7cf235a50abb8a1fd30ea7fd10443e533658
diff --combined lib/pleroma/web/activity_pub/transmogrifier.ex
index d72f4a39a,db6823f2c..a112d4ced
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@@ -506,6 -506,9 +506,6 @@@ defmodule Pleroma.Web.ActivityPub.Trans
      end
    end
  
 -  @ap_config Application.get_env(:pleroma, :activitypub)
 -  @accept_blocks Keyword.get(@ap_config, :accept_blocks)
 -
    def handle_incoming(
          %{
            "type" => "Undo",
@@@ -514,7 -517,7 +514,7 @@@
            "id" => id
          } = _data
        ) do
 -    with true <- @accept_blocks,
 +    with true <- Pleroma.Config.get([:activitypub, :accept_blocks]),
           %User{local: true} = blocked <- User.get_cached_by_ap_id(blocked),
           %User{} = blocker <- User.get_or_fetch_by_ap_id(blocker),
           {:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do
@@@ -528,7 -531,7 +528,7 @@@
    def handle_incoming(
          %{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
        ) do
 -    with true <- @accept_blocks,
 +    with true <- Pleroma.Config.get([:activitypub, :accept_blocks]),
           %User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
           %User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
           {:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do
@@@ -604,7 -607,7 +604,7 @@@
      data =
        data
        |> Map.put("object", object)
-       |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+       |> Map.merge(Utils.make_json_ld_header())
  
      {:ok, data}
    end
@@@ -623,7 -626,7 +623,7 @@@
        data =
          data
          |> Map.put("object", object)
-         |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+         |> Map.merge(Utils.make_json_ld_header())
  
        {:ok, data}
      end
@@@ -641,7 -644,7 +641,7 @@@
        data =
          data
          |> Map.put("object", object)
-         |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+         |> Map.merge(Utils.make_json_ld_header())
  
        {:ok, data}
      end
@@@ -651,7 -654,7 +651,7 @@@
      data =
        data
        |> maybe_fix_object_url
-       |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+       |> Map.merge(Utils.make_json_ld_header())
  
      {:ok, data}
    end