projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/develop' into moderators
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
instance_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/instance_view.ex
b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 5810f605a3bf60f9ce8ab8c8d69f12c056bd7910..ec7d150a97848603303d16ecee3950bd1d3c22ac 100644
(file)
--- 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