diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-19 18:51:41 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-19 18:51:41 +0000 |
| commit | 50892a198d14a628c37139761b709cd5e3261a23 (patch) | |
| tree | 52f3a1fe4c2d86fe6747f50786a49fb35438616c /lib | |
| parent | b0d2b539347f75b15bdeb38d80ff4e0d8dc9fec5 (diff) | |
| parent | 555d7d57c9a408185617268ca810002cbd59f764 (diff) | |
| download | pleroma-50892a198d14a628c37139761b709cd5e3261a23.tar.gz pleroma-50892a198d14a628c37139761b709cd5e3261a23.zip | |
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 5810f605a..ec7d150a9 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -84,7 +84,10 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do "safe_dm_mentions" end, "pleroma_emoji_reactions", - "pleroma_chat_messages" + "pleroma_chat_messages", + if Config.get([:instance, :show_reactions]) do + "exposable_reactions" + end ] |> Enum.filter(& &1) end |