forked from AkkomaGang/akkoma
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
This commit is contained in:
commit
42105497ca
2 changed files with 12 additions and 5 deletions
lib/pleroma/web/twitter_api
test/web/twitter_api
|
@ -16,11 +16,15 @@ def status_update(conn, %{"status" => ""} = _status_data) do
|
|||
empty_status_reply(conn)
|
||||
end
|
||||
|
||||
def status_update(%{assigns: %{user: user}} = conn, %{"status" => _status_text} = status_data) do
|
||||
media_ids = extract_media_ids(status_data)
|
||||
{:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids ))
|
||||
conn
|
||||
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
|
||||
def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
|
||||
if status_text |> String.trim |> String.length != 0 do
|
||||
media_ids = extract_media_ids(status_data)
|
||||
{:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids ))
|
||||
conn
|
||||
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
|
||||
else
|
||||
empty_status_reply(conn)
|
||||
end
|
||||
end
|
||||
|
||||
def status_update(conn, _status_data) do
|
||||
|
|
|
@ -42,6 +42,9 @@ test "with credentials", %{conn: conn, user: user} do
|
|||
conn = conn_with_creds |> post(request_path, %{ status: "" })
|
||||
assert json_response(conn, 400) == error_response
|
||||
|
||||
conn = conn_with_creds |> post(request_path, %{ status: " " })
|
||||
assert json_response(conn, 400) == error_response
|
||||
|
||||
conn = conn_with_creds |> post(request_path, %{ status: "Nice meme." })
|
||||
assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue