diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-03-01 17:51:15 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-03-01 17:51:15 +0000 |
| commit | d03ee11b72b8e90ffff5b44b077e567485bc95e0 (patch) | |
| tree | 22e00367ab565778413f67d9cb4f94c5230673ca /lib/pleroma/web/mastodon_api/views/status_view.ex | |
| parent | 9fb8da429360ddb9433f4c740126e2d858b1f141 (diff) | |
| parent | b1e1db82bc2c076f2a7858ec63017c10dda1966b (diff) | |
Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"
See merge request pleroma/pleroma!3352
Diffstat (limited to 'lib/pleroma/web/mastodon_api/views/status_view.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 4 |
1 files changed, 2 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 792197a4a..bac897a57 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -180,7 +180,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do media_attachments: reblogged[:media_attachments] || [], mentions: mentions, tags: reblogged[:tags] || [], - application: build_application(activity_object.data["application"]), + application: build_application(activity_object.data["generator"]), language: nil, emojis: [], pleroma: %{ @@ -345,7 +345,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do poll: render(PollView, "show.json", object: object, for: opts[:for]), mentions: mentions, tags: build_tags(tags), - application: build_application(object.data["application"]), + application: build_application(object.data["generator"]), language: nil, emojis: build_emojis(object.data["emoji"]), pleroma: %{ |