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 | |
| 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')
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/emoji_reaction_operation.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/api_spec/operations/emoji_reaction_operation.ex b/lib/pleroma/web/api_spec/operations/emoji_reaction_operation.ex index 7c08fbaa7..1a49fece0 100644 --- a/lib/pleroma/web/api_spec/operations/emoji_reaction_operation.ex +++ b/lib/pleroma/web/api_spec/operations/emoji_reaction_operation.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Web.ApiSpec.EmojiReactionOperation do alias OpenApiSpex.Operation alias OpenApiSpex.Schema alias Pleroma.Web.ApiSpec.Schemas.Account + alias Pleroma.Web.ApiSpec.Schemas.ApiError alias Pleroma.Web.ApiSpec.Schemas.FlakeID alias Pleroma.Web.ApiSpec.Schemas.Status @@ -46,7 +47,8 @@ defmodule Pleroma.Web.ApiSpec.EmojiReactionOperation do security: [%{"oAuth" => ["write:statuses"]}], operationId: "EmojiReactionController.create", responses: %{ - 200 => Operation.response("Status", "application/json", Status) + 200 => Operation.response("Status", "application/json", Status), + 400 => Operation.response("Bad Request", "application/json", ApiError) } } end 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) <- |