alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove milliseconds from mastodon api response.

This commit is contained in:
Roger Braun 2017-09-12 13:31:17 +02:00
parent 7331733d30
commit 1bc58230ee
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -26,6 +26,9 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment) attachments = render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
created_at = (object["published"] || "")
|> String.replace(~r/\.\d+/, "")
%{ %{
id: activity.id, id: activity.id,
uri: object["id"], uri: object["id"],
@ -35,7 +38,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
in_reply_to_account_id: nil, in_reply_to_account_id: nil,
reblog: nil, reblog: nil,
content: HtmlSanitizeEx.basic_html(object["content"]), content: HtmlSanitizeEx.basic_html(object["content"]),
created_at: object["published"], created_at: created_at,
reblogs_count: announcement_count, reblogs_count: announcement_count,
favourites_count: like_count, favourites_count: like_count,
reblogged: !!repeated, reblogged: !!repeated,

5
test/web/mastodon_api/status_view_test.exs
View File

@ -12,6 +12,9 @@ test "a note activity" do
status = StatusView.render("status.json", %{activity: note}) status = StatusView.render("status.json", %{activity: note})
created_at = (note.data["object"]["published"] || "")
|> String.replace(~r/\.\d+/, "")
expected = %{ expected = %{
id: note.id, id: note.id,
uri: note.data["object"]["id"], uri: note.data["object"]["id"],
@ -21,7 +24,7 @@ test "a note activity" do
in_reply_to_account_id: nil, in_reply_to_account_id: nil,
reblog: nil, reblog: nil,
content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]), content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]),
created_at: note.data["object"]["published"], created_at: created_at,
reblogs_count: 0, reblogs_count: 0,
favourites_count: 0, favourites_count: 0,
reblogged: false, reblogged: false,