Merge remote-tracking branch 'origin/develop' into reactions

[akkoma] / lib / pleroma / web / common_api / common_api.ex

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index b02c47059b27698a187332c3f88ae6e120642a15..0706e7ffcc9ee0306d1bb292a9c0f14a7cc0773e 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -114,6 +114,16 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
+  def react_with_emoji(id, user, emoji) do
+    with %Activity{} = activity <- Activity.get_by_id(id),
+         object <- Object.normalize(activity) do
+      ActivityPub.react_with_emoji(user, object, emoji)
+    else
+      _ ->
+        {:error, dgettext("errors", "Could not add reaction emoji")}
+    end
+  end
+
   def vote(user, %{data: %{"type" => "Question"}} = object, choices) do
     with :ok <- validate_not_author(object, user),
          :ok <- validate_existing_votes(user, object),
@@ -219,7 +229,8 @@ defmodule Pleroma.Web.CommonAPI do
            Map.take(data, ["album", "artist", "title", "length"])
            |> Map.put("type", "Audio")
            |> Map.put("to", to)
-           |> Map.put("cc", cc),
+           |> Map.put("cc", cc)
+           |> Map.put("actor", user.ap_id),
          {:ok, activity} <-
            ActivityPub.listen(%{
              actor: user,