Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'

Check for empty string in_reply_to ids.

Closes #355

See merge request pleroma/pleroma!417
This commit is contained in:
lambda 2018-11-02 18:55:16 +00:00
commit f028647ac0
2 changed files with 17 additions and 0 deletions

View file

@ -19,6 +19,8 @@ def get_by_id_or_ap_id(id) do
end
end
def get_replied_to_activity(""), do: nil
def get_replied_to_activity(id) when not is_nil(id) do
Repo.get(Activity, id)
end

View file

@ -198,6 +198,21 @@ test "replying to a status", %{conn: conn} do
assert activity.data["object"]["inReplyToStatusId"] == replied_to.id
end
test "posting a status with an invalid in_reply_to_id", %{conn: conn} do
user = insert(:user)
conn =
conn
|> assign(:user, user)
|> post("/api/v1/statuses", %{"status" => "xD", "in_reply_to_id" => ""})
assert %{"content" => "xD", "id" => id} = json_response(conn, 200)
activity = Repo.get(Activity, id)
assert activity
end
test "verify_credentials", %{conn: conn} do
user = insert(:user)