pleroma

commit: f028647ac0120f31af820a6b490598173c46a840
parent: f114f843248d207ff240b018a774ce32c34b6eaf
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri,  2 Nov 2018 18:55:16 +0000

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
Diffstat:
M
lib/pleroma/web/common_api/utils.ex
2
++
M
test/web/mastodon_api/mastodon_api_controller_test.exs
15
+++++++++++++++

2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
@@ -19,6 +19,8 @@ defmodule Pleroma.Web.CommonAPI.Utils 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
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -198,6 +198,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest 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)