1 files changed, 61 insertions, 32 deletions

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index a25b27aab..16a1d3e97 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -26,7 +26,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   end
 
   def make_date do
-    DateTime.utc_now() |> DateTime.to_iso8601
+    DateTime.utc_now() |> DateTime.to_iso8601()
   end
 
   def generate_activity_id do
@@ -38,25 +38,28 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   end
 
   def generate_object_id do
-    Helpers.o_status_url(Endpoint, :object, UUID.generate)
+    Helpers.o_status_url(Endpoint, :object, UUID.generate())
   end
 
   def generate_id(type) do
-    "#{Web.base_url()}/#{type}/#{UUID.generate}"
+    "#{Web.base_url()}/#{type}/#{UUID.generate()}"
   end
 
   @doc """
   Enqueues an activity for federation if it's local
   """
   def maybe_federate(%Activity{local: true} = activity) do
-    priority = case activity.data["type"] do
-                 "Delete" -> 10
-                 "Create" -> 1
-                 _ -> 5
-               end
+    priority =
+      case activity.data["type"] do
+        "Delete" -> 10
+        "Create" -> 1
+        _ -> 5
+      end
+
     Pleroma.Web.Federator.enqueue(:publish, activity, priority)
     :ok
   end
+
   def maybe_federate(_), do: :ok
 
   @doc """
@@ -64,9 +67,10 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   also adds it to an included object
   """
   def lazy_put_activity_defaults(map) do
-    map = map
-    |> Map.put_new_lazy("id", &generate_activity_id/0)
-    |> Map.put_new_lazy("published", &make_date/0)
+    map =
+      map
+      |> Map.put_new_lazy("id", &generate_activity_id/0)
+      |> Map.put_new_lazy("published", &make_date/0)
 
     if is_map(map["object"]) do
       object = lazy_put_object_defaults(map["object"])
@@ -88,11 +92,13 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   @doc """
   Inserts a full object if it is contained in an activity.
   """
-  def insert_full_object(%{"object" => %{"type" => type} = object_data}) when is_map(object_data) and type in ["Note"] do
+  def insert_full_object(%{"object" => %{"type" => type} = object_data})
+      when is_map(object_data) and type in ["Note"] do
     with {:ok, _} <- Object.create(object_data) do
       :ok
     end
   end
+
   def insert_full_object(_), do: :ok
 
   def update_object_in_activities(%{data: %{"id" => id}} = object) do
@@ -101,7 +107,8 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     # Alternatively, just don't do this and fetch the current object each time. Most
     # could probably be taken from cache.
     relevant_activities = Activity.all_by_object_ap_id(id)
-    Enum.map(relevant_activities, fn (activity) ->
+
+    Enum.map(relevant_activities, fn activity ->
       new_activity_data = activity.data |> Map.put("object", object.data)
       changeset = Changeset.change(activity, data: new_activity_data)
       Repo.update(changeset)
@@ -114,11 +121,20 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   Returns an existing like if a user already liked an object
   """
   def get_existing_like(actor, %{data: %{"id" => id}}) do
-    query = from activity in Activity,
-      where: fragment("(?)->>'actor' = ?", activity.data, ^actor),
-      # this is to use the index
-      where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^id),
-      where: fragment("(?)->>'type' = 'Like'", activity.data)
+    query =
+      from(
+        activity in Activity,
+        where: fragment("(?)->>'actor' = ?", activity.data, ^actor),
+        # this is to use the index
+        where:
+          fragment(
+            "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+            activity.data,
+            activity.data,
+            ^id
+          ),
+        where: fragment("(?)->>'type' = 'Like'", activity.data)
+      )
 
     Repo.one(query)
   end
@@ -137,10 +153,12 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   end
 
   def update_element_in_object(property, element, object) do
-    with new_data <- object.data |> Map.put("#{property}_count", length(element)) |> Map.put("#{property}s", element),
+    with new_data <-
+           object.data |> Map.put("#{property}_count", length(element))
+           |> Map.put("#{property}s", element),
          changeset <- Changeset.change(object, data: new_data),
          {:ok, object} <- Repo.update(changeset),
-          _ <- update_object_in_activities(object) do
+         _ <- update_object_in_activities(object) do
       {:ok, object}
     end
   end
@@ -150,7 +168,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   end
 
   def add_like_to_object(%Activity{data: %{"actor" => actor}}, object) do
-    with likes <- [actor | (object.data["likes"] || [])] |> Enum.uniq do
+    with likes <- [actor | object.data["likes"] || []] |> Enum.uniq() do
       update_likes_in_object(likes, object)
     end
   end
@@ -178,13 +196,20 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     if activity_id, do: Map.put(data, "id", activity_id), else: data
   end
 
-  def fetch_latest_follow(%User{ap_id: follower_id},
-                          %User{ap_id: followed_id}) do
-    query = from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{type: "Follow", actor: follower_id,
-                                                  object: followed_id}),
-      order_by: [desc: :id],
-      limit: 1
+  def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do
+    query =
+      from(
+        activity in Activity,
+        where:
+          fragment(
+            "? @> ?",
+            activity.data,
+            ^%{type: "Follow", actor: follower_id, object: followed_id}
+          ),
+        order_by: [desc: :id],
+        limit: 1
+      )
+
     Repo.one(query)
   end
 
@@ -193,7 +218,11 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   @doc """
   Make announce activity data for the given actor and object
   """
-  def make_announce_data(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, activity_id) do
+  def make_announce_data(
+        %User{ap_id: ap_id} = user,
+        %Object{data: %{"id" => id}} = object,
+        activity_id
+      ) do
     data = %{
       "type" => "Announce",
       "actor" => ap_id,
@@ -207,7 +236,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   end
 
   def add_announce_to_object(%Activity{data: %{"actor" => actor}}, object) do
-    with announcements <- [actor | (object.data["announcements"] || [])] |> Enum.uniq do
+    with announcements <- [actor | object.data["announcements"] || []] |> Enum.uniq() do
       update_element_in_object("announcement", announcements, object)
     end
   end
@@ -223,14 +252,14 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     }
   end
 
-
   #### Create-related helpers
 
   def make_create_data(params, additional) do
     published = params.published || make_date()
+
     %{
       "type" => "Create",
-      "to" => params.to |> Enum.uniq,
+      "to" => params.to |> Enum.uniq(),
       "actor" => params.actor.ap_id,
       "object" => params.object,
       "published" => published,