nullobsi/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Oh no! More datetime fixes!

Browse source
This commit is contained in:
Roger Braun 2017-09-13 17:18:08 +02:00
parent 14b4029b1d
commit ad5001828e
2 changed files with 2 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+$/, ".000Z") |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
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})}

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -29,7 +29,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
created_at = (object["published"] || "") created_at = (object["published"] || "")
|> NaiveDateTime.from_iso8601! |> NaiveDateTime.from_iso8601!
|> NaiveDateTime.to_iso8601 |> NaiveDateTime.to_iso8601
|> String.replace(~r/\.\d+$/, ".000Z") |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
%{ %{
id: activity.id, id: activity.id,