diff options
| author | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
| commit | ef55d240540ed9fbac76248c60bdb23f82c3f36e (patch) | |
| tree | e65130d12a256026edb1a4768fc97e2271173248 /lib/pleroma/web/pleroma_api | |
| parent | 7ac0cffb34567dd72877e13968a10d206f643ad8 (diff) | |
| parent | bef08b85e5e1e25b65851938d6152bf0c170af03 (diff) | |
| download | pleroma-ef55d240540ed9fbac76248c60bdb23f82c3f36e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
Diffstat (limited to 'lib/pleroma/web/pleroma_api')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex index 6688d7caf..8bc77b75e 100644 --- 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) |