Merge pull request 'update feature set' (#94) from feature-set into develop

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/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 def features do
[ [
"pleroma_api", "pleroma_api",
"akkoma_api",
"mastodon_api", "mastodon_api",
"mastodon_api_streaming", "mastodon_api_streaming",
"polls", "polls",
@ -68,13 +69,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
if Config.get([:media_proxy, :enabled]) do if Config.get([:media_proxy, :enabled]) do
"media_proxy" "media_proxy"
end, 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 if Config.get([:instance, :allow_relay]) do
"relay" "relay"
end, end,
@ -82,7 +76,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
"safe_dm_mentions" "safe_dm_mentions"
end, end,
"pleroma_emoji_reactions", "pleroma_emoji_reactions",
"pleroma_chat_messages",
if Config.get([:instance, :show_reactions]) do if Config.get([:instance, :show_reactions]) do
"exposable_reactions" "exposable_reactions"
end, end,

View file

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