Merge branch 'fix-chats' into 'develop'

Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691
This commit is contained in:
lain 2020-06-26 11:09:37 +00:00
commit 6db9f7cdb3
2 changed files with 3 additions and 30 deletions

View File

@ -19,35 +19,7 @@ def get_nodeinfo("2.0") do
|> Enum.map(fn u -> u.ap_id end) |> Enum.map(fn u -> u.ap_id end)
federation = InstanceView.federation() federation = InstanceView.federation()
features = InstanceView.features()
features =
[
"pleroma_api",
"mastodon_api",
"mastodon_api_streaming",
"polls",
"pleroma_explicit_addressing",
"shareable_emoji_packs",
"multifetch",
"pleroma:api/v1/notifications:include_types_filter",
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
if Config.get([:gopher, :enabled]) do
"gopher"
end,
if Config.get([:chat, :enabled]) do
"chat"
end,
if Config.get([:instance, :allow_relay]) do
"relay"
end,
if Config.get([:instance, :safe_dm_mentions]) do
"safe_dm_mentions"
end,
"pleroma_emoji_reactions"
]
|> Enum.filter(& &1)
%{ %{
version: "2.0", version: "2.0",

View File

@ -142,7 +142,8 @@ test "it shows default features flags", %{conn: conn} 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?(