From 8d55b8c6d94794c4566d1867a1c3600d522c68d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 8 Jan 2023 09:15:23 +0100 Subject: [PATCH] Replace invalid/unsupported dates with with epoch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Masto API requires “ISO 8601 Datetime”, not “ISO 8601 Datetime or empty” --- lib/pleroma/web/common_api/utils.ex | 6 +++--- test/pleroma/web/common_api/utils_test.exs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index d0452c428..345c5d10d 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -332,7 +332,7 @@ def to_masto_date(%NaiveDateTime{} = date) do # It supports negative years for example. # ISO8601 only supports years before 1583 with mutual agreement if date.year < 1583 do - "" + "1970-01-01T00:00:00Z" else date |> NaiveDateTime.to_iso8601() @@ -344,11 +344,11 @@ def to_masto_date(date) when is_binary(date) do with {:ok, date} <- NaiveDateTime.from_iso8601(date) do to_masto_date(date) else - _ -> "" + _ -> "1970-01-01T00:00:00Z" end end - def to_masto_date(_), do: "" + def to_masto_date(_), do: "1970-01-01T00:00:00Z" defp shortname(name) do with max_length when max_length > 0 <- diff --git a/test/pleroma/web/common_api/utils_test.exs b/test/pleroma/web/common_api/utils_test.exs index 40137a10e..f56d21c70 100644 --- a/test/pleroma/web/common_api/utils_test.exs +++ b/test/pleroma/web/common_api/utils_test.exs @@ -495,16 +495,16 @@ test "removes microseconds from date (String)" do assert Utils.to_masto_date("2015-01-23T23:50:07.123Z") == "2015-01-23T23:50:07.000Z" end - test "returns empty string when date invalid" do - assert Utils.to_masto_date("2015-01?23T23:50:07.123Z") == "" + test "returns unix epoch when date invalid" do + assert Utils.to_masto_date("2015-01?23T23:50:07.123Z") == "1970-01-01T00:00:00Z" end - test "returns empty string when date is before the introduction of the Gregorian Calendar" do - assert Utils.to_masto_date("0621-01-01T00:00:00Z") == "" + test "returns unix epoch when date is before the introduction of the Gregorian Calendar" do + assert Utils.to_masto_date("0621-01-01T00:00:00Z") == "1970-01-01T00:00:00Z" end - test "returns empty string when date is BCE" do - assert Utils.to_masto_date("-420-01-01T00:00:00Z") == "" + test "returns unix epoch when date is BCE" do + assert Utils.to_masto_date("-0420-01-01T00:00:00Z") == "1970-01-01T00:00:00Z" end end