pleroma

commit: 94be93aad08ee9b1d43b1a67d94b694101bf5f1a
parent: d2faee01eea3a0cc8eed95d749d41c4a26556a13
Author: Roger Braun <rbraun@Bobble.local>
Date:   Wed, 13 Sep 2017 16:26:02 +0200

Allign datetime format with mastodon.

Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
1
+
M
lib/pleroma/web/mastodon_api/views/status_view.ex
2
+-
M
test/web/mastodon_api/status_view_test.exs
2
+-

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -158,6 +158,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     result = Enum.map(notifications, fn (%{id: id, activity: activity, inserted_at: created_at}) ->
       actor = User.get_cached_by_ap_id(activity.data["actor"])
       created_at = NaiveDateTime.to_iso8601(created_at)
+      |> String.replace(~r/\.\d+Z/, ".000Z")
       case activity.data["type"] do
         "Create" ->
           %{id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})}
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
 
     created_at = (object["published"] || "")
-    |> String.replace(~r/\.\d+/, "")
+    |> String.replace(~r/\.\d+Z/, ".000Z")
 
     %{
       id: activity.id,
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
@@ -13,7 +13,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     status = StatusView.render("status.json", %{activity: note})
 
     created_at = (note.data["object"]["published"] || "")
-    |> String.replace(~r/\.\d+/, "")
+    |> String.replace(~r/\.\d+Z/, ".000Z")
 
     expected = %{
       id: note.id,