Merge branch 'application-to-generator' into 'develop'

ActvitityStreams application field should be called "generator"

See merge request pleroma/pleroma!3352

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index b8a7b2a0a..b051fca74 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -423,11 +423,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
   defp put_application(params, %{assigns: %{token: %Token{user: %User{} = user} = token}} = _conn) do
     if user.disclose_client do
       %{client_name: client_name, website: website} = Repo.preload(token, :app).app
-      Map.put(params, :application, %{type: "Application", name: client_name, url: website})
+      Map.put(params, :generator, %{type: "Application", name: client_name, url: website})
     else
-      Map.put(params, :application, nil)
+      Map.put(params, :generator, nil)
     end
   end
 
-  defp put_application(params, _), do: Map.put(params, :application, nil)
+  defp put_application(params, _), do: Map.put(params, :generator, nil)
 end