Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator

2020-05-07 18:53:34 +02:00 · 2020-05-07 18:53:34 +02:00 · ef55d24054
commit ef55d24054
parent 7ac0cffb34 bef08b85e5
30 changed files with 863 additions and 616 deletions
--- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@ -98,7 +98,8 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
        "id" => activity_id,
        "emoji" => emoji
      }) do
-    with {:ok, _activity, _object} <- CommonAPI.unreact_with_emoji(activity_id, user, emoji),
+    with {:ok, _activity} <-
+           CommonAPI.unreact_with_emoji(activity_id, user, emoji),
         activity <- Activity.get_by_id(activity_id) do
      conn
      |> put_view(StatusView)