From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 10 Oct 2018 07:53:20 +0000 (+0000)
Subject: common api: take the combination of the subject and content for length limit enforcement
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=111841ad3482c1d41c6f117a3e70676e06d4ca61;p=akkoma

common api: take the combination of the subject and content for length limit enforcement

closes #315
---

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index d4a973e36..f8fef219f 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -83,7 +83,6 @@ defmodule Pleroma.Web.CommonAPI do
     visibility = get_visibility(data)
 
     with status <- String.trim(status),
-         length when length in 1..@limit <- String.length(status),
          attachments <- attachments_from_ids(data["media_ids"]),
          mentions <- Formatter.parse_mentions(status),
          inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
@@ -100,6 +99,8 @@ defmodule Pleroma.Web.CommonAPI do
            ),
          context <- make_context(inReplyTo),
          cw <- data["spoiler_text"],
+         full_payload <- String.trim(status <> (data["spoiler_text"] || "")),
+         length when length in 1..@limit <- String.length(full_payload),
          object <-
            make_note_data(
              user.ap_id,