diff options
author | tusooa <tusooa@kazv.moe> | 2022-07-13 04:42:24 +0000 |
---|---|---|
committer | tusooa <tusooa@kazv.moe> | 2022-07-13 04:42:24 +0000 |
commit | fdc71f6051bb5bcb4b7a00213540ffb1627441ab (patch) | |
tree | 57fa6b7ff6d1dc5192ece60a25d1ebb7d04c468e /lib | |
parent | 311fda32f323419141f55be19f419a796e9375d3 (diff) | |
parent | eb2a1652bf3676de955a2912a42d50aa068131fa (diff) | |
download | pleroma-fdc71f6051bb5bcb4b7a00213540ffb1627441ab.tar.gz pleroma-fdc71f6051bb5bcb4b7a00213540ffb1627441ab.zip |
Merge branch 'short-description' into 'develop'
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index ee52475d5..62931bd41 100644 --- 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: %{ |