X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=e9f0dcd3290bfb213c596c1cca2f4400610d2ace;hb=1c00eb4a90cddb7518a823d9304f6aee4fd3ef78;hp=a38f63b0312db40c7c39df07ed75d85fa49972e0;hpb=21c397820f5feffc5d68ccfb578e2d6765052a3b;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a38f63b03..e9f0dcd32 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -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)
@@ -63,7 +63,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end)
   end
 
-  def unlike(%User{ap_id: ap_id} = user, %Object{data: %{ "id" => id}} = object) do
+  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"})
 
@@ -133,6 +133,13 @@ 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
@@ -142,7 +149,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       "type" => "Announce",
       "actor" => ap_id,
       "object" => id,
-      "to" => [User.ap_followers(user)]
+      "to" => [User.ap_followers(user), object.data["actor"]]
     }
 
     {:ok, activity} = insert(data)
@@ -167,7 +174,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Repo.all(query)
   end
 
-  def upload(%Plug.Upload{} = file) do
+  def upload(file) do
     data = Upload.store(file)
     Repo.insert(%Object{data: data})
   end