Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-09 16:48:47 +01:00
Code Issues Releases Wiki Activity

某タンスのプロフ絵文字に対応

Browse Source
This commit is contained in:
tateisu 2019-04-28 22:05:35 +09:00
parent c6fa3fa1a1
commit 331356a0c7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt
View File

@ -186,9 +186,13 @@ open class TootAccount(parser : TootParser, src : JSONObject) {
// 絵文字データは先に読んでおく
this.custom_emojis = parseMapOrNull(CustomEmoji.decode, src.optJSONArray("emojis"))
this.profile_emojis =
parseMapOrNull(::NicoProfileEmoji, src.optJSONArray("profile_emojis"))
this.profile_emojis = when(val o = src.opt("profile_emojis")) {
is JSONArray -> parseMapOrNull(::NicoProfileEmoji, o, TootStatus.log)
is JSONObject ->parseProfileEmoji2(::NicoProfileEmoji, o, TootStatus.log)
else -> null
}
// 疑似アカウントにacctとusernameだけ
this.url = src.parseString("url")
this.username = src.notEmptyOrThrow("username")