diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
| commit | ce6dfb6f066616553d8594fd6ffadcc96ad1daff (patch) | |
| tree | b7b4022f45fd01233bf76138d5222b81f16e8ad4 /lib/pleroma/web/mastodon_api/views | |
| parent | 5cb37412a21420509f61027fe486ae66242f800a (diff) | |
| parent | d9aacbec4d8e787ff9f62427a120d28366463a7f (diff) | |
| download | pleroma-1.0.2.tar.gz | |
Merge branch 'release/1.0.2' into 'master'v1.0.2
1.0.2 release
See merge request pleroma/pleroma!1499
Diffstat (limited to 'lib/pleroma/web/mastodon_api/views')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 6836d331a..c183c9f4a 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -374,7 +374,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do %{ # Mastodon uses separate ids for polls, but an object can't have # more than one poll embedded so object id is fine - id: object.id, + id: to_string(object.id), expires_at: Utils.to_masto_date(end_time), expired: expired, multiple: multiple, |