Merge branch 'patch-2' into 'develop'

Render notification IDs as strings, not numbers

See merge request pleroma/pleroma!325
This commit is contained in:
Haelwenn 2018-09-03 02:03:51 +00:00
commit 072e965015

View File

@ -1030,6 +1030,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
NaiveDateTime.to_iso8601(created_at) NaiveDateTime.to_iso8601(created_at)
|> String.replace(~r/(\.\d+)?$/, ".000Z", global: false) |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
id = id |> to_string
case activity.data["type"] do case activity.data["type"] do
"Create" -> "Create" ->
%{ %{