Allow using cws in mastodon api.

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index c9822dc2d333056d0abccb1b975b0997615e3318..32a8a08c71a3df50f3eee0af35bb94fa4975523f 100644 (file)
--- 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 6569b8c455a1f4f34e70753465489f62070099f6..cf09bc4b8d94a11f938c2e77d851f51955405ebf 100644 (file)
--- 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