X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=eca9f3a05ac6fb8b5cfb1323253e6e62b12c5dba;hb=7a0046d1271d97d635294ee0cace135d32b141ba;hp=b9ba72b0d14cb467f232d02b51a5010c629fa37b;hpb=fa0c279139f384f6c97bce217be4131b255f00b1;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index b9ba72b0d..eca9f3a05 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       # There's already a like here, so return the original activity.
       ap_id in (object.data["likes"] || []) ->
         query = from activity in Activity,
-          where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id})
+          where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id, type: "Like"})
 
         activity = Repo.one(query)
         {:ok, activity, object}
@@ -33,7 +33,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           "type" => "Like",
           "actor" => ap_id,
           "object" => id,
-          "to" => [User.ap_followers(user)]
+          "to" => [User.ap_followers(user), object.data["actor"]]
         }
 
         {:ok, activity} = insert(data)
@@ -47,17 +47,49 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         changeset = Ecto.Changeset.change(object, data: new_data)
         {:ok, object} = Repo.update(changeset)
 
-        # Update activities that already had this. Could be done in a seperate process.
-        relevant_activities = Activity.all_by_object_ap_id(id)
-        Enum.map(relevant_activities, fn (activity) ->
-          new_activity_data = activity.data |> Map.put("object", new_data)
-          changeset = Ecto.Changeset.change(activity, data: new_activity_data)
-          Repo.update(changeset)
-        end)
+        update_object_in_activities(object)
+
         {:ok, activity, object}
     end
   end
 
+  defp update_object_in_activities(%{data: %{"id" => id}} = object) do
+    # Update activities that already had this. Could be done in a seperate process.
+    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)
+      changeset = Ecto.Changeset.change(activity, data: new_activity_data)
+      Repo.update(changeset)
+    end)
+  end
+
+  def unlike(%User{ap_id: ap_id}, %Object{data: %{ "id" => id}} = object) do
+    query = from activity in Activity,
+      where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id, type: "Like"})
+
+    activity = Repo.one(query)
+
+    if activity do
+      # just delete for now...
+      {:ok, _activity} = Repo.delete(activity)
+
+      likes = (object.data["likes"] || []) |> List.delete(ap_id)
+
+      new_data = object.data
+      |> Map.put("like_count", length(likes))
+      |> Map.put("likes", likes)
+
+      changeset = Ecto.Changeset.change(object, data: new_data)
+      {:ok, object} = Repo.update(changeset)
+
+      update_object_in_activities(object)
+
+      {:ok, object}
+    else
+      {:ok, object}
+    end
+  end
+
   def generate_activity_id do
     generate_id("activities")
   end
@@ -101,10 +133,41 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       query
     end
 
+    query = if opts["actor_id"] do
+      from activity in query,
+        where: fragment("? @> ?", activity.data, ^%{actor: opts["actor_id"]})
+    else
+      query
+    end
+
     Repo.all(query)
     |> Enum.reverse
   end
 
+  def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do
+    data = %{
+      "type" => "Announce",
+      "actor" => ap_id,
+      "object" => id,
+      "to" => [User.ap_followers(user), object.data["actor"]]
+    }
+
+    {:ok, activity} = insert(data)
+
+    announcements = [ap_id | (object.data["announcements"] || [])] |> Enum.uniq
+
+    new_data = object.data
+    |> Map.put("announcement_count", length(announcements))
+    |> Map.put("announcements", announcements)
+
+    changeset = Ecto.Changeset.change(object, data: new_data)
+    {:ok, object} = Repo.update(changeset)
+
+    update_object_in_activities(object)
+
+    {:ok, activity, object}
+  end
+
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
       where: fragment("? @> ?", activity.data, ^%{ context: context })