aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-05 16:17:09 +0200
committerlain <lain@soykaf.club>2020-05-05 16:17:09 +0200
commitb34debe61540cf845ccf4ac93066e45a1d9c8f85 (patch)
tree3be3d2e9e0d608f749188f9c9ae51e5f815c3106 /lib/pleroma/web/common_api
parenta3071f023166cb5364ce56e3666d5a77baa16434 (diff)
downloadpleroma-b34debe61540cf845ccf4ac93066e45a1d9c8f85.tar.gz
Undoing: Move undoing reactions to the pipeline everywhere.
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index a670ea5bc..067ac875e 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -170,7 +170,7 @@ defmodule Pleroma.Web.CommonAPI do
%Object{} = note <- Object.normalize(activity, false),
%Activity{} = like <- Utils.get_existing_like(user.ap_id, note),
{:ok, undo, _} <- Builder.undo(user, like),
- {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: false) do
+ {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
{:ok, activity}
else
{:find_activity, _} -> {:error, :not_found}
@@ -189,8 +189,10 @@ defmodule Pleroma.Web.CommonAPI do
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"])
+ with %Activity{} = reaction_activity <- Utils.get_latest_reaction(id, user, emoji),
+ {:ok, undo, _} <- Builder.undo(user, reaction_activity),
+ {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
+ {:ok, activity}
else
_ ->
{:error, dgettext("errors", "Could not remove reaction emoji")}