Move new fields to pleroma object

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

docs/development/API/differences_in_mastoapi_responses.md

@@ -97,11 +97,6 @@ Endpoints which accept `with_relationships` parameter:
 - `/api/v1/accounts/:id/following`
 - `/api/v1/mutes`
 
-Has these additional fields:
-
-- `avatar_description`: string, image description for user avatar, defaults to empty string
-- `header_description`: string, image description for user banner, defaults to empty string
-
 Has these additional fields under the `pleroma` object:
 
 - `ap_id`: nullable URL string, ActivityPub id of the user
@@ -125,6 +120,8 @@ Has these additional fields under the `pleroma` object:
 - `notification_settings`: object, can be absent. See `/api/v1/pleroma/notification_settings` for the parameters/keys returned.
 - `accepts_chat_messages`: boolean, but can be null if we don't have that information about a user
 - `favicon`: nullable URL string, Favicon image of the user's instance
+- `avatar_description`: string, image description for user avatar, defaults to empty string
+- `header_description`: string, image description for user banner, defaults to empty string
 
 ### Source
 

lib/pleroma/web/api_spec/schemas/account.ex

@@ -111,7 +111,9 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
             format: :uri,
             nullable: true,
             description: "Favicon image of the user's instance"
-          }
+          },
+          avatar_description: %Schema{type: :string},
+          header_description: %Schema{type: :string}
         }
       },
       source: %Schema{
@@ -147,9 +149,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
             }
           }
         }
-      },
-      avatar_description: %Schema{type: :string},
-      header_description: %Schema{type: :string}
+      }
     },
     example: %{
       "acct" => "foobar",

lib/pleroma/web/mastodon_api/views/account_view.ex

@@ -324,11 +324,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
         skip_thread_containment: user.skip_thread_containment,
         background_image: image_url(user.background) |> MediaProxy.url(),
         accepts_chat_messages: user.accepts_chat_messages,
-        favicon: favicon
-      },
+        favicon: favicon,
         avatar_description: avatar_description,
         header_description: header_description
       }
+    }
     |> maybe_put_role(user, opts[:for])
     |> maybe_put_settings(user, opts[:for], opts)
     |> maybe_put_notification_settings(user, opts[:for])