Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

improve #239, read contact.account

This commit is contained in:
tateisu 2023-04-30 18:17:39 +09:00
parent 3c0529d47d
commit 2b1c5878c0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
View File

@ -254,7 +254,12 @@ class TootInstance(parser: TootParser, src: JsonObject) {
languages = src.jsonArray("languages")?.stringArrayList()
contact_account = parseItem(src.jsonObject("contact_account")) {
contact_account = parseItem(
// mastodon /api/v2/instance
src.jsonObject("contact")?.jsonObject("account")
// mastodon /api/v1/instance
?: src.jsonObject("contact_account")
) {
tootAccount(
TootParser(
parser.context,
@ -275,7 +280,7 @@ class TootInstance(parser: TootParser, src: JsonObject) {
src.jsonObject("registrations")?.boolean("approval_required")
// mastodon /api/v1/instance
?: src.boolean("approval_required")
// default
// default
?: false
this.feature_quote = src.boolean("feature_quote") ?: false