diff options
author | Ilja <ilja@ilja.space> | 2022-07-14 07:07:19 +0200 |
---|---|---|
committer | Ilja <ilja@ilja.space> | 2022-07-14 07:07:19 +0200 |
commit | 44d14e8a9c0f9472560b6e389af7f28de6006a2f (patch) | |
tree | d34e79d791215de89373cc5913f83474c50df181 /config | |
parent | f88ed1df75efcbfff930c642eeff5891cadceb1f (diff) | |
parent | 3fb9171694936e10114ba69a728256f5de792ecb (diff) | |
download | pleroma-44d14e8a9c0f9472560b6e389af7f28de6006a2f.tar.gz pleroma-44d14e8a9c0f9472560b6e389af7f28de6006a2f.zip |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 1 | ||||
-rw-r--r-- | config/description.exs | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 994d333aa..b0b43e75a 100644 --- 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 index b3b3a3a1e..2e7f06f81 100644 --- 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)", |