From 7211538a63ff135e75d2b7b9aced63af1a57560d Mon Sep 17 00:00:00 2001 From: tateisu Date: Sun, 2 Feb 2020 23:57:00 +0900 Subject: [PATCH] =?UTF-8?q?fix=20#131,=20GIF=E3=82=A2=E3=83=8B=E3=83=A1?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=82=89Misskey=E3=81=AE=E3=82=A2=E3=83=90=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=81=A8=E3=83=98=E3=83=83=E3=83=80=E7=94=BB?= =?UTF-8?q?=E5=83=8F=E3=81=AEURL=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../juggler/subwaytooter/api/entity/TootAccount.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt index f5feb657..bcd4c1d8 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt @@ -15,7 +15,6 @@ import jp.juggler.subwaytooter.util.DecodeOptions import jp.juggler.subwaytooter.util.NetworkEmojiInvalidator import jp.juggler.subwaytooter.view.MyLinkMovementMethod import jp.juggler.util.* -import java.net.IDN import java.util.* import java.util.regex.Pattern @@ -174,10 +173,18 @@ open class TootAccount(parser : TootParser, src : JsonObject) { this.created_at = src.string("createdAt") this.time_created_at = TootStatus.parseTime(this.created_at) + // https://github.com/syuilo/misskey/blob/develop/src/client/scripts/get-static-image-url.ts + fun String.getStaticImageUrl():String?{ + val uri = this.mayUri() ?: return null + val dummy = "${uri.encodedAuthority}${uri.encodedPath}" + return "https://${parser.linkHelper.host?.ascii}/proxy/$dummy?url=${encodePercent()}&static=1" + } + this.avatar = src.string("avatarUrl") - this.avatar_static = src.string("avatarUrl") + this.avatar_static = src.string("avatarUrl")?.getStaticImageUrl() this.header = src.string("bannerUrl") - this.header_static = src.string("bannerUrl") + this.header_static = src.string("bannerUrl")?.getStaticImageUrl() + this.pinnedNoteIds = src.stringArrayList("pinnedNoteIds") if(parser.misskeyDecodeProfilePin) {