moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reparse time to ensure correct format.

This commit is contained in:
Roger Braun 2017-09-13 16:38:29 +02:00
parent 94be93aad0
commit 14b4029b1d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -158,7 +158,7 @@ def notifications(%{assigns: %{user: user}} = conn, params) do
result = Enum.map(notifications, fn (%{id: id, activity: activity, inserted_at: created_at}) -> result = Enum.map(notifications, fn (%{id: id, activity: activity, inserted_at: created_at}) ->
actor = User.get_cached_by_ap_id(activity.data["actor"]) actor = User.get_cached_by_ap_id(activity.data["actor"])
created_at = NaiveDateTime.to_iso8601(created_at) created_at = NaiveDateTime.to_iso8601(created_at)
|> String.replace(~r/\.\d+Z/, ".000Z") |> String.replace(~r/\.\d+$/, ".000Z")
case activity.data["type"] do case activity.data["type"] do
"Create" -> "Create" ->
%{id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})} %{id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})}

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

@ -27,7 +27,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"] || "") created_at = (object["published"] || "")
|> String.replace(~r/\.\d+Z/, ".000Z") |> NaiveDateTime.from_iso8601!
|> NaiveDateTime.to_iso8601
|> String.replace(~r/\.\d+$/, ".000Z")
%{ %{
id: activity.id, id: activity.id,