commit: fdc71f6051bb5bcb4b7a00213540ffb1627441ab parent 311fda32f323419141f55be19f419a796e9375d3 Author: tusooa <tusooa@kazv.moe> Date: Wed, 13 Jul 2022 04:42:24 +0000 Merge branch 'short-description' into 'develop' Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651Diffstat:
5 files changed, 13 insertions(+), 0 deletions(-)diff --git a/config/config.exs b/config/config.exs@@ -187,6 +187,7 @@ config :pleroma, :instance, email: "example@example.com", notify_email: "noreply@example.com", description: "Pleroma: An efficient and flexible fediverse server", + short_description: "", background_image: "/images/city.jpg", instance_thumbnail: "/instance/thumbnail.jpeg", limit: 5_000,diff --git a/config/description.exs b/config/description.exs@@ -537,6 +537,15 @@ config :pleroma, :config_description, [ ] }, %{ + key: :short_description, + type: :string, + description: + "Shorter version of instance description. It can be seen on `/api/v1/instance`", + suggestions: [ + "Cool instance" + ] + }, + %{ key: :limit, type: :integer, description: "Posts character limit (CW/Subject included in the counter)",diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md@@ -18,6 +18,7 @@ To add configuration to your config file, you can copy it from the base config. * `email`: Email used to reach an Administrator/Moderator of the instance. * `notify_email`: Email used for notifications. * `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``. +* `short_description`: Shorter version of instance description, can be seen on ``/api/v1/instance``. * `limit`: Posts character limit (CW/Subject included in the counter). * `description_limit`: The character limit for image descriptions. * `remote_limit`: Hard character limit beyond which remote posts will be dropped.diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex@@ -17,6 +17,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do uri: Pleroma.Web.Endpoint.url(), title: Keyword.get(instance, :name), description: Keyword.get(instance, :description), + short_description: Keyword.get(instance, :short_description), version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.named_version()})", email: Keyword.get(instance, :email), urls: %{diff --git a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs@@ -22,6 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do "uri" => _, "title" => _, "description" => _, + "short_description" => _, "version" => _, "email" => from_config_email, "urls" => %{