diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-10-31 19:44:36 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-10-31 19:44:36 +0100 |
| commit | e014cc6ed8f98e20f5d64f1e666582c62de6321d (patch) | |
| tree | e6035eab501a95227732ddd9359d56448cdaf6e9 | |
| parent | c877583a4fc872410b9d0202e7092b17666ba409 (diff) | |
| download | pleroma-e014cc6ed8f98e20f5d64f1e666582c62de6321d.tar.gz pleroma-e014cc6ed8f98e20f5d64f1e666582c62de6321d.zip | |
Allow using cws in mastodon api.
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 | ||||
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index c9822dc2d..32a8a08c7 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -59,7 +59,8 @@ defmodule Pleroma.Web.CommonAPI do tags <- Formatter.parse_tags(status), content_html <- make_content_html(status, mentions, attachments, tags), 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) User.increase_note_count(user) res diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 6569b8c45..cf09bc4b8 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -50,9 +50,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do conn = conn |> 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) end |