Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979
This commit is contained in:
commit
c6ab5ebe7c
|
@ -161,6 +161,9 @@ def masto_instance(conn, _params) do
|
||||||
},
|
},
|
||||||
stats: Stats.get_stats(),
|
stats: Stats.get_stats(),
|
||||||
thumbnail: Web.base_url() <> "/instance/thumbnail.jpeg",
|
thumbnail: Web.base_url() <> "/instance/thumbnail.jpeg",
|
||||||
|
languages: ["en"],
|
||||||
|
registrations: Pleroma.Config.get([:instance, :registrations_open]),
|
||||||
|
# Extra (not present in Mastodon):
|
||||||
max_toot_chars: Keyword.get(instance, :limit)
|
max_toot_chars: Keyword.get(instance, :limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1808,6 +1808,27 @@ test "requires 'write' permission", %{conn: conn} do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "get instance information", %{conn: conn} do
|
test "get instance information", %{conn: conn} do
|
||||||
|
conn = get(conn, "/api/v1/instance")
|
||||||
|
assert result = json_response(conn, 200)
|
||||||
|
|
||||||
|
# Note: not checking for "max_toot_chars" since it's optional
|
||||||
|
assert %{
|
||||||
|
"uri" => _,
|
||||||
|
"title" => _,
|
||||||
|
"description" => _,
|
||||||
|
"version" => _,
|
||||||
|
"email" => _,
|
||||||
|
"urls" => %{
|
||||||
|
"streaming_api" => _
|
||||||
|
},
|
||||||
|
"stats" => _,
|
||||||
|
"thumbnail" => _,
|
||||||
|
"languages" => _,
|
||||||
|
"registrations" => _
|
||||||
|
} = result
|
||||||
|
end
|
||||||
|
|
||||||
|
test "get instance stats", %{conn: conn} do
|
||||||
user = insert(:user, %{local: true})
|
user = insert(:user, %{local: true})
|
||||||
|
|
||||||
user2 = insert(:user, %{local: true})
|
user2 = insert(:user, %{local: true})
|
||||||
|
|
Loading…
Reference in a new issue