projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
[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 ec7d150a97848603303d16ecee3950bd1d3c22ac..2717da99d950b3c441ee3c7263c30b4ba61959ae 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/instance_view.ex
@@
-26,7
+26,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
thumbnail:
URI.merge(Pleroma.Web.Endpoint.url(), Keyword.get(instance, :instance_thumbnail))
|> to_string,
thumbnail:
URI.merge(Pleroma.Web.Endpoint.url(), Keyword.get(instance, :instance_thumbnail))
|> to_string,
- languages:
["en"]
,
+ languages:
Keyword.get(instance, :languages, ["en"])
,
registrations: Keyword.get(instance, :registrations_open),
approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon):
registrations: Keyword.get(instance, :registrations_open),
approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon):
@@
-37,7
+37,6
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
background_upload_limit: Keyword.get(instance, :background_upload_limit),
banner_upload_limit: Keyword.get(instance, :banner_upload_limit),
background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image),
background_upload_limit: Keyword.get(instance, :background_upload_limit),
banner_upload_limit: Keyword.get(instance, :banner_upload_limit),
background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image),
- shout_limit: Config.get([:shout, :limit]),
description_limit: Keyword.get(instance, :description_limit),
pleroma: %{
metadata: %{
description_limit: Keyword.get(instance, :description_limit),
pleroma: %{
metadata: %{
@@
-45,7
+44,8
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
features: features(),
federation: federation(),
fields_limits: fields_limits(),
features: features(),
federation: federation(),
fields_limits: fields_limits(),
- post_formats: Config.get([:instance, :allowed_post_formats])
+ post_formats: Config.get([:instance, :allowed_post_formats]),
+ privileged_staff: Config.get([:instance, :privileged_staff])
},
stats: %{mau: Pleroma.User.active_user_count()},
vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
},
stats: %{mau: Pleroma.User.active_user_count()},
vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
@@
-56,6
+56,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
def features do
[
"pleroma_api",
def features do
[
"pleroma_api",
+ "akkoma_api",
"mastodon_api",
"mastodon_api_streaming",
"polls",
"mastodon_api",
"mastodon_api_streaming",
"polls",
@@
-64,19
+65,11
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
"shareable_emoji_packs",
"multifetch",
"pleroma:api/v1/notifications:include_types_filter",
"shareable_emoji_packs",
"multifetch",
"pleroma:api/v1/notifications:include_types_filter",
+ "quote_posting",
+ "editing",
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
if Config.get([:media_proxy, :enabled]) do
"media_proxy"
end,
- if Config.get([:gopher, :enabled]) do
- "gopher"
- 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,
if Config.get([:instance, :allow_relay]) do
"relay"
end,
@@
-84,10
+77,17
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
"safe_dm_mentions"
end,
"pleroma_emoji_reactions",
"safe_dm_mentions"
end,
"pleroma_emoji_reactions",
- "pleroma_chat_messages",
if Config.get([:instance, :show_reactions]) do
"exposable_reactions"
if Config.get([:instance, :show_reactions]) do
"exposable_reactions"
- end
+ end,
+ if Config.get([:instance, :profile_directory]) do
+ "profile_directory"
+ end,
+ if Config.get([:translator, :enabled], false) do
+ "akkoma:machine_translation"
+ end,
+ "custom_emoji_reactions",
+ "pleroma:get:main/ostatus"
]
|> Enum.filter(& &1)
end
]
|> Enum.filter(& &1)
end