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 4cfa8d85ca0e04083a52f16bc77c04e3776618d7..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):
@@
-65,6
+65,8
@@
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,
@@
-81,7
+83,11
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
if Config.get([:instance, :profile_directory]) do
"profile_directory"
end,
if Config.get([:instance, :profile_directory]) do
"profile_directory"
end,
- "custom_emoji_reactions"
+ 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