pleroma

commit: 50ab06435353144582f6afbf37402aef13c2b3f1
parent: a0f42ecbca7d1aabc0fb699084865231e32ec6d9
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sat, 28 Sep 2019 00:03:24 +0000

Merge branch 'bugfix/post-empty-status' into 'develop'

status_controller.ex: Posting media status without content defined

See merge request pleroma/pleroma!1735
Diffstat:
M
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
4
++++
M
test/web/mastodon_api/controllers/status_controller_test.exs
5
++---

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -103,6 +103,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
     end
   end
 
+  def create(%{assigns: %{user: _user}} = conn, %{"media_ids" => _} = params) do
+    create(conn, Map.put(params, "status", ""))
+  end
+
   @doc "GET /api/v1/statuses/:id"
   def show(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     with %Activity{} = activity <- Activity.get_by_id_with_object(id),
diff --git a/test/web/mastodon_api/controllers/status_controller_test.exs b/test/web/mastodon_api/controllers/status_controller_test.exs
@@ -99,7 +99,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
                NaiveDateTime.to_iso8601(expiration.scheduled_at)
     end
 
-    test "posting an empty status with an attachment", %{conn: conn} do
+    test "posting an undefined status with an attachment", %{conn: conn} do
       user = insert(:user)
 
       file = %Plug.Upload{
@@ -114,8 +114,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
         conn
         |> assign(:user, user)
         |> post("/api/v1/statuses", %{
-          "media_ids" => [to_string(upload.id)],
-          "status" => ""
+          "media_ids" => [to_string(upload.id)]
         })
 
       assert json_response(conn, 200)