commit: 1bc58230ee16e6a6a809de85c31eb6f0841b16b3
parent: 7331733d30ff69d657df9a06d923353ffaff5228
Author: Roger Braun <roger@rogerbraun.net>
Date: Tue, 12 Sep 2017 13:31:17 +0200
Remove milliseconds from mastodon api response.
Diffstat:
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -26,6 +26,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
+ created_at = (object["published"] || "")
+ |> String.replace(~r/\.\d+/, "")
+
%{
id: activity.id,
uri: object["id"],
@@ -35,7 +38,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
in_reply_to_account_id: nil,
reblog: nil,
content: HtmlSanitizeEx.basic_html(object["content"]),
- created_at: object["published"],
+ created_at: created_at,
reblogs_count: announcement_count,
favourites_count: like_count,
reblogged: !!repeated,
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
@@ -12,6 +12,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("status.json", %{activity: note})
+ created_at = (note.data["object"]["published"] || "")
+ |> String.replace(~r/\.\d+/, "")
+
expected = %{
id: note.id,
uri: note.data["object"]["id"],
@@ -21,7 +24,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
in_reply_to_account_id: nil,
reblog: nil,
content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]),
- created_at: note.data["object"]["published"],
+ created_at: created_at,
reblogs_count: 0,
favourites_count: 0,
reblogged: false,