diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-03-11 13:26:12 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-03-11 13:26:12 +0000 |
| commit | 2c8deecdd2f75c6cdf1089e4266bedb8be55539c (patch) | |
| tree | e45dac3ef09fccdd705dffde41156bc420eac772 /lib | |
| parent | d9ae2d00a157fad25bf29638550e487ff1800af3 (diff) | |
| parent | 66774b5567c10005b2be810433d7f3d401e12520 (diff) | |
| download | pleroma-2c8deecdd2f75c6cdf1089e4266bedb8be55539c.tar.gz | |
Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 3468c0e1c..bf3aaf025 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -102,7 +102,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do website: nil }, language: nil, - emojis: [] + emojis: [], + pleroma: %{ + local: activity.local + } } end @@ -181,7 +184,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do website: nil }, language: nil, - emojis: build_emojis(activity.data["object"]["emoji"]) + emojis: build_emojis(activity.data["object"]["emoji"]), + pleroma: %{ + local: activity.local + } } end |