X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=ec605b694f49557b0f7dcfb472618ae98d324439;hb=13440a80e1e30141f0f0466ff351bd6f9c148228;hp=dfcc5b9eda804ceb5e322a967de960758aa4e37d;hpb=90cf75f4a781f2eb7016a4a165a8617d4352451b;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index dfcc5b9ed..ec605b694 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -30,7 +30,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def insert(map, local \\ true) when is_map(map) do
-    with nil <- Activity.get_by_ap_id(map["id"]),
+    with nil <- Activity.normalize(map),
          map <- lazy_put_activity_defaults(map),
          :ok <- check_actor_is_active(map["actor"]),
          {:ok, map} <- MRF.filter(map),
@@ -251,16 +251,25 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def block(blocker, blocked, activity_id \\ nil, local \\ true) do
-    follow_activity = fetch_latest_follow(blocker, blocked)
+    ap_config = Application.get_env(:pleroma, :activitypub)
+    unfollow_blocked = Keyword.get(ap_config, :unfollow_blocked)
+    outgoing_blocks = Keyword.get(ap_config, :outgoing_blocks)
 
-    if follow_activity do
-      unfollow(blocker, blocked, nil, local)
+    with true <- unfollow_blocked do
+      follow_activity = fetch_latest_follow(blocker, blocked)
+
+      if follow_activity do
+        unfollow(blocker, blocked, nil, local)
+      end
     end
 
-    with block_data <- make_block_data(blocker, blocked, activity_id),
+    with true <- outgoing_blocks,
+         block_data <- make_block_data(blocker, blocked, activity_id),
          {:ok, activity} <- insert(block_data, local),
          :ok <- maybe_federate(activity) do
       {:ok, activity}
+    else
+      _e -> {:ok, nil}
     end
   end
 
@@ -632,13 +641,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Logger.info("Federating #{id} to #{inbox}")
     host = URI.parse(inbox).host
 
+    digest = "SHA-256=" <> (:crypto.hash(:sha256, json) |> Base.encode64())
+
     signature =
-      Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
+      Pleroma.Web.HTTPSignatures.sign(actor, %{
+        host: host,
+        "content-length": byte_size(json),
+        digest: digest
+      })
 
     @httpoison.post(
       inbox,
       json,
-      [{"Content-Type", "application/activity+json"}, {"signature", signature}],
+      [
+        {"Content-Type", "application/activity+json"},
+        {"signature", signature},
+        {"digest", digest}
+      ],
       hackney: [pool: :default]
     )
   end
@@ -661,7 +680,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
                recv_timeout: 20000
              ),
            {:ok, data} <- Jason.decode(body),
-           nil <- Object.get_by_ap_id(data["id"]),
+           nil <- Object.normalize(data),
            params <- %{
              "type" => "Create",
              "to" => data["to"],
@@ -670,7 +689,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
              "object" => data
            },
            {:ok, activity} <- Transmogrifier.handle_incoming(params) do
-        {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
+        {:ok, Object.normalize(activity.data["object"])}
       else
         object = %Object{} ->
           {:ok, object}
@@ -679,7 +698,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
 
           case OStatus.fetch_activity_from_url(id) do
-            {:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
+            {:ok, [activity | _]} -> {:ok, Object.normalize(activity.data["object"])}
             e -> e
           end
       end