diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-28 00:03:24 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-28 00:03:24 +0000 |
| commit | 50ab06435353144582f6afbf37402aef13c2b3f1 (patch) | |
| tree | 8bf4e414c478469b20095b6db108c0eb96b8af68 /lib | |
| parent | a0f42ecbca7d1aabc0fb699084865231e32ec6d9 (diff) | |
| parent | 9202904da9b48eb2a3884b8e89ea879e01d44b9a (diff) | |
| download | pleroma-50ab06435353144582f6afbf37402aef13c2b3f1.tar.gz | |
Merge branch 'bugfix/post-empty-status' into 'develop'
status_controller.ex: Posting media status without content defined
See merge request pleroma/pleroma!1735
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index f7da10289..ae3d51575 100644 --- 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), |