fix #239, read domain

2023-04-30 19:07:49 +09:00 · 2023-04-30 19:07:49 +09:00 · 7200c86669
parent 41e5493afb
commit 7200c86669
1 changed files with 7 additions and 1 deletions
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
@ -230,7 +230,13 @@ class TootInstance(parser: TootParser, src: JsonObject) {

            this.invites_enabled = null
        } else {
-            this.apDomain = src.string("uri")?.let { Host.parse(it) } ?: parser.apDomain
+            this.apDomain =
+                    // mastodon /api/v2/instance
+                src.string("domain")?.let { Host.parse(it) }
+                        // mastodon /api/v1/instance
+                    ?: src.string("uri")?.let { Host.parse(it) }
+                            ?: parser.apDomain
+
            this.title = src.string("title")

            val sv =