Merge pull request 'update feature set' (#94) from feature-set into develop
ci/woodpecker/push/docs Pipeline is pending Details
ci/woodpecker/push/release Pipeline is pending Details
ci/woodpecker/push/test Pipeline is pending Details

Reviewed-on: #94
This commit is contained in:
floatingghost 2022-07-20 14:47:40 +00:00
commit ab5bf7c020
2 changed files with 3 additions and 10 deletions

View File

@ -57,6 +57,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
def features do
[
"pleroma_api",
"akkoma_api",
"mastodon_api",
"mastodon_api_streaming",
"polls",
@ -68,13 +69,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
# backwards compat
if Config.get([:shout, :enabled]) do
"chat"
end,
if Config.get([:shout, :enabled]) do
"shout"
end,
if Config.get([:instance, :allow_relay]) do
"relay"
end,
@ -82,7 +76,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
"safe_dm_mentions"
end,
"pleroma_emoji_reactions",
"pleroma_chat_messages",
if Config.get([:instance, :show_reactions]) do
"exposable_reactions"
end,

View File

@ -133,6 +133,7 @@ defmodule Pleroma.Web.NodeInfoTest do
default_features = [
"pleroma_api",
"akkoma_api",
"mastodon_api",
"mastodon_api_streaming",
"polls",
@ -140,8 +141,7 @@ defmodule Pleroma.Web.NodeInfoTest do
"shareable_emoji_packs",
"multifetch",
"pleroma_emoji_reactions",
"pleroma:api/v1/notifications:include_types_filter",
"pleroma_chat_messages"
"pleroma:api/v1/notifications:include_types_filter"
]
assert MapSet.subset?(