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

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
parent b7923aa304 35515cfa66
commit 072e965015
1 changed files with 2 additions and 0 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

@ -1030,6 +1030,8 @@ def render_notification(user, %{id: id, activity: activity, inserted_at: created
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" ->
%{ %{