nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'mastopost' into 'develop'

Browse source 
Allow posting images without text in mastofe

See merge request pleroma/pleroma!194
This commit is contained in:
lambda 2018-06-08 06:02:21 +00:00
parent c86823f724 839cb7b424
commit 4a16ade2ee
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -247,7 +247,7 @@ def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
end
end
def dm_timeline(%{assigns: %{user: user}} = conn, params) do
def dm_timeline(%{assigns: %{user: user}} = conn, _params) do
query =
ActivityPub.fetch_activities_query([user.ap_id], %{"type" => "Create", visibility: "direct"})
@ -300,6 +300,15 @@ def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
end
def post_status(conn, %{"status" => "", "media_ids" => media_ids} = params)
when length(media_ids) > 0 do
params =
params
|> Map.put("status", ".")
post_status(conn, params)
end
def post_status(%{assigns: %{user: user}} = conn, %{"status" => _} = params) do
params =
params