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 677a53ddfb8a37471d7d8245c25f8e8619b51cbf..995d4b1af96724ddeff1b36d31a28df374e48f26 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -80,7 +80,7 @@ defmodule Pleroma.Web.CommonAPI do
     with %Activity{} = activity <- get_by_id_or_ap_id(id_or_ap_id),
          object <- Object.normalize(activity),
          nil <- Utils.get_existing_announce(user.ap_id, object),
-         public <- get_announce_visibility(object, params) do
+         public <- public_announce?(object, params) do
       ActivityPub.announce(user, object, nil, true, public)
     else
       _ -> {:error, dgettext("errors", "Could not repeat")}
@@ -115,6 +115,25 @@ 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 unreact_with_emoji(id, user, emoji) do
+    with %Activity{} = reaction_activity <- Utils.get_latest_reaction(id, user, emoji) do
+      ActivityPub.unreact_with_emoji(user, reaction_activity.data["id"])
+    else
+      _ ->
+        {:error, dgettext("errors", "Could not remove 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),
@@ -170,11 +189,11 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
-  def get_announce_visibility(_, %{"visibility" => visibility})
+  def public_announce?(_, %{"visibility" => visibility})
       when visibility in ~w{public unlisted private direct},
       do: visibility in ~w(public unlisted)
 
-  def get_announce_visibility(object, _) do
+  def public_announce?(object, _) do
     Visibility.is_public?(object)
   end