quad/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use approval_required in /api/v1/instance

Browse source
This commit is contained in:
Alex Gleason 2020-07-15 17:04:30 -05:00
parent 0d004a9d04
commit 9ce95fa68f
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/instance_view.ex
View file

@ -26,6 +26,7 @@ def render("show.json", _) do
thumbnail: Keyword.get(instance, :instance_thumbnail), thumbnail: Keyword.get(instance, :instance_thumbnail),
languages: ["en"], languages: ["en"],
registrations: Keyword.get(instance, :registrations_open), registrations: Keyword.get(instance, :registrations_open),
approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon): # Extra (not present in Mastodon):
max_toot_chars: Keyword.get(instance, :limit), max_toot_chars: Keyword.get(instance, :limit),
poll_limits: Keyword.get(instance, :poll_limits), poll_limits: Keyword.get(instance, :poll_limits),
@ -39,7 +40,6 @@ def render("show.json", _) do
pleroma: %{ pleroma: %{
metadata: %{ metadata: %{
account_activation_required: Keyword.get(instance, :account_activation_required), account_activation_required: Keyword.get(instance, :account_activation_required),
account_approval_required: Keyword.get(instance, :account_approval_required),
features: features(), features: features(),
federation: federation(), federation: federation(),
fields_limits: fields_limits() fields_limits: fields_limits()

2
test/web/mastodon_api/controllers/instance_controller_test.exs
View file

@ -27,6 +27,7 @@ test "get instance information", %{conn: conn} do
"thumbnail" => _, "thumbnail" => _,
"languages" => _, "languages" => _,
"registrations" => _, "registrations" => _,
"approval_required" => _,
"poll_limits" => _, "poll_limits" => _,
"upload_limit" => _, "upload_limit" => _,
"avatar_upload_limit" => _, "avatar_upload_limit" => _,
@ -38,7 +39,6 @@ test "get instance information", %{conn: conn} do
} = result } = result
assert result["pleroma"]["metadata"]["account_activation_required"] != nil assert result["pleroma"]["metadata"]["account_activation_required"] != nil
assert result["pleroma"]["metadata"]["account_approval_required"] != nil
assert result["pleroma"]["metadata"]["features"] assert result["pleroma"]["metadata"]["features"]
assert result["pleroma"]["metadata"]["federation"] assert result["pleroma"]["metadata"]["federation"]
assert result["pleroma"]["metadata"]["fields_limits"] assert result["pleroma"]["metadata"]["fields_limits"]