limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Allow using cws in mastodon api.

Browse source
This commit is contained in:
Roger Braun 2017-10-31 19:44:36 +01:00
parent c877583a4f
commit e014cc6ed8
2 changed files with 4 additions and 3 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

@ -59,7 +59,8 @@ defmodule Pleroma.Web.CommonAPI do
tags <- Formatter.parse_tags(status), tags <- Formatter.parse_tags(status),
content_html <- make_content_html(status, mentions, attachments, tags), content_html <- make_content_html(status, mentions, attachments, tags),
context <- make_context(inReplyTo), context <- make_context(inReplyTo),
object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags) do cw <- data["spoiler_text"],
object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw) do
res = ActivityPub.create(to, user, context, object) res = ActivityPub.create(to, user, context, object)
User.increase_note_count(user) User.increase_note_count(user)
res res

4
test/web/mastodon_api/mastodon_api_controller_test.exs
View file

@ -50,9 +50,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
conn = conn conn = conn
|> assign(:user, user) |> assign(:user, user)
|> post("/api/v1/statuses", %{"status" => "cofe"}) |> post("/api/v1/statuses", %{"status" => "cofe", "spoiler_text" => "2hu"})
assert %{"content" => "cofe", "id" => id} = json_response(conn, 200) assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu"} = json_response(conn, 200)
assert Repo.get(Activity, id) assert Repo.get(Activity, id)
end end