mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Move new fields to pleroma object

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-08-17 19:59:39 +02:00
parent c802f3b7f6
commit 3498662712
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/development/API/differences_in_mastoapi_responses.md
View file

@ -97,11 +97,6 @@ Endpoints which accept `with_relationships` parameter:
- `/api/v1/accounts/:id/following` - `/api/v1/accounts/:id/following`
- `/api/v1/mutes` - `/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: Has these additional fields under the `pleroma` object:
- `ap_id`: nullable URL string, ActivityPub id of the user - `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. - `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 - `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 - `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 ### Source

8
lib/pleroma/web/api_spec/schemas/account.ex
View file

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

4
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

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