diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-03 02:03:51 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-03 02:03:51 +0000 |
| commit | 072e965015698a3198242aad3ad969a696b8f03e (patch) | |
| tree | 39be9d05b2c036b0620d130cb6e24f551a3448e4 /lib | |
| parent | b7923aa304c23963fd51731579a54949fa639762 (diff) | |
| parent | 35515cfa66f39d618be5702137d296b7bc25b65e (diff) | |
| download | pleroma-072e965015698a3198242aad3ad969a696b8f03e.tar.gz | |
Merge branch 'patch-2' into 'develop'
Render notification IDs as strings, not numbers
See merge request pleroma/pleroma!325
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e0267f1dc..8279db93e 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1030,6 +1030,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do NaiveDateTime.to_iso8601(created_at) |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false) + id = id |> to_string + case activity.data["type"] do "Create" -> %{ |