diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-22 14:36:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-22 14:36:08 +0000 |
| commit | 1fa7aa9fc544e9c9b55ecc1a92d93c95eabcfa62 (patch) | |
| tree | 6d2d65450e3f1d4689c37c168743357741a7f434 /lib/pleroma/web/pleroma_api | |
| parent | 96650c55aec6f6013ca4fbb35b37260f1138c80b (diff) | |
| parent | bcb549531ff5f90253adc1b8cc2900c348f20175 (diff) | |
| download | pleroma-1fa7aa9fc544e9c9b55ecc1a92d93c95eabcfa62.tar.gz | |
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
Diffstat (limited to 'lib/pleroma/web/pleroma_api')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex index a002912f3..19dcffdf3 100644 --- a/lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex @@ -22,6 +22,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionController do defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.EmojiReactionOperation + action_fallback(Pleroma.Web.MastodonAPI.FallbackController) + def index(%{assigns: %{user: user}} = conn, %{id: activity_id} = params) do with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id), %Object{data: %{"reactions" => reactions}} when is_list(reactions) <- |