summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/activity_draft.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2022-02-09 11:14:30 -0600
committerAlex Gleason <alex@alexgleason.me>2022-02-09 11:14:30 -0600
commitc735444f3803a8cff15c1a4aaee82b821ef27441 (patch)
tree506fb60d08c6daa1dd73384eb31a919d9fcd2f65 /lib/pleroma/web/common_api/activity_draft.ex
parent11f03344d385de78e79e35ccfe8c980f9f6e32b3 (diff)
parentfa8e2ffa3f493d5b2911507b0ac06094615e9d8f (diff)
Merge remote-tracking branch 'origin/develop' into operation-warpsneedoperation-warpsneed
Diffstat (limited to 'lib/pleroma/web/common_api/activity_draft.ex')
-rw-r--r--lib/pleroma/web/common_api/activity_draft.ex7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index b4e3e37ae..451d7323a 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -112,7 +112,12 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
defp attachments(%{params: params} = draft) do
attachments = Utils.attachments_from_ids(params)
- %__MODULE__{draft | attachments: attachments}
+ draft = %__MODULE__{draft | attachments: attachments}
+
+ case Utils.validate_attachments_count(attachments) do
+ :ok -> draft
+ {:error, message} -> add_error(draft, message)
+ end
end
defp in_reply_to(%{params: %{in_reply_to_status_id: ""}} = draft), do: draft