moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/length-enforce-subjects' into 'develop' 

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

Closes #315

See merge request pleroma/pleroma!371
This commit is contained in:
kaniini 2018-10-10 08:00:23 +00:00
parent 5294b11ef0 111841ad34
commit 3a77336d89
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/common_api/common_api.ex
View File

@ -83,7 +83,6 @@ def post(user, %{"status" => status} = data) 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 @@ def post(user, %{"status" => status} = data) 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,