From 6535575ba32a1154ed20777a70bc6bc4aef7cbeb Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 1 Dec 2018 10:25:58 +0900 Subject: [PATCH] =?UTF-8?q?(Mastodon)Misskey=E3=81=8B=E3=82=89=E6=B5=81?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=8D=E3=81=9F=E7=A9=BA=E6=AC=84CW?= =?UTF-8?q?=E3=82=92=E3=81=9D=E3=82=8C=E3=81=A8=E5=88=86=E3=81=8B=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/juggler/subwaytooter/api/entity/TootStatus.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt index 7f00f094..29aa23b2 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt @@ -453,8 +453,13 @@ class TootStatus(parser : TootParser, src : JSONObject) : TimelineItem() { this.highlight_sound = options.highlight_sound } - this.spoiler_text = (src.parseString("spoiler_text") ?: "").cleanCW() - + val sv = (src.parseString("spoiler_text")?:"").cleanCW() + this.spoiler_text = when{ + sv.isEmpty() ->"" // CWなし + sv.isBlank() ->parser.context.getString(R.string.blank_cw) + else->sv + } + options = DecodeOptions( parser.context, emojiMapCustom = custom_emojis,