X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=45a2fbfc351e41b6052518f7edc3e2ee40dcaf16;hb=db08498a9ff9166afc5cf4df1afe55e96a74b4a3;hp=82aed7ce42a41eb08a39bd0f9bc557c6b419ee42;hpb=fa2610c7959500c18b64d70828123a817de78864;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 82aed7ce4..45a2fbfc3 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -8,15 +8,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> Map.put_new_lazy("id", &generate_activity_id/0)
     |> Map.put_new_lazy("published", &make_date/0)
 
-    map = if is_map(map["object"]) do
-      object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
-      Repo.insert!(%Object{data: object})
-      Map.put(map, "object", object)
-    else
-      map
+    with %Activity{} = activity <- Activity.get_by_ap_id(map["id"]) do
+      {:ok, activity}
+    else _e ->
+      map = if is_map(map["object"]) do
+        object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
+        Repo.insert!(%Object{data: object})
+        Map.put(map, "object", object)
+      else
+        map
+      end
+
+      Repo.insert(%Activity{data: map, local: local})
     end
-
-    Repo.insert(%Activity{data: map, local: local})
   end
 
   def create(to, actor, context, object, additional \\ %{}, published \\ nil, local \\ true) do
@@ -41,7 +45,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
-  def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, local \\ true) do
+  def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, activity_id \\ nil, local \\ true) do
     cond do
       # There's already a like here, so return the original activity.
       ap_id in (object.data["likes"] || []) ->
@@ -59,6 +63,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           "context" => object.data["context"]
         }
 
+        data = if activity_id, do: Map.put(data, "id", activity_id), else: data
+
         {:ok, activity} = insert(data, local)
 
         likes = [ap_id | (object.data["likes"] || [])] |> Enum.uniq
@@ -81,7 +87,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   defp update_object_in_activities(%{data: %{"id" => id}} = object) do
+    # TODO
     # Update activities that already had this. Could be done in a seperate process.
+    # 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) ->
       new_activity_data = activity.data |> Map.put("object", object.data)
@@ -176,7 +185,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Enum.reverse(Repo.all(query))
   end
 
-  def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, local \\ true) do
+  def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, activity_id \\ nil, local \\ true) do
     data = %{
       "type" => "Announce",
       "actor" => ap_id,
@@ -185,6 +194,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       "context" => object.data["context"]
     }
 
+    data = if activity_id, do: Map.put(data, "id", activity_id), else: data
+
     {:ok, activity} = insert(data, local)
 
     announcements = [ap_id | (object.data["announcements"] || [])] |> Enum.uniq
@@ -205,12 +216,60 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     {:ok, activity, object}
   end
 
+  def follow(%User{ap_id: follower_id, local: actor_local}, %User{ap_id: followed_id}, local \\ true) do
+    data = %{
+      "type" => "Follow",
+      "actor" => follower_id,
+      "to" => [followed_id],
+      "object" => followed_id,
+      "published" => make_date()
+    }
+
+    with {:ok, activity} <- insert(data, local) do
+      if actor_local do
+        Pleroma.Web.Federator.enqueue(:publish, activity)
+       end
+
+      {:ok, activity}
+    end
+  end
+
+  def unfollow(follower, followed, local \\ true) do
+    with follow_activity when not is_nil(follow_activity) <- fetch_latest_follow(follower, followed) do
+      data = %{
+        "type" => "Undo",
+        "actor" => follower.ap_id,
+        "to" => [followed.ap_id],
+        "object" => follow_activity.data["id"],
+        "published" => make_date()
+      }
+
+      with {:ok, activity} <- insert(data, local) do
+        if follower.local do
+          Pleroma.Web.Federator.enqueue(:publish, activity)
+        end
+
+        {:ok, activity}
+      end
+    end
+  end
+
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
       where: fragment("? @> ?", activity.data, ^%{ context: context })
     Repo.all(query)
   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: :inserted_at],
+      limit: 1
+    Repo.one(query)
+  end
+
   def upload(file) do
     data = Upload.store(file)
     Repo.insert(%Object{data: data})