From 85d36e5aa2df6f7d20643f09f5a67259942e6c44 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 11 Sep 2024 18:08:46 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20ExposedActorRepository.kt=E3=81=ABu?= =?UTF-8?q?ri=E5=9E=8B=E3=82=92=E5=B0=8E=E5=85=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exposedquery/ExposedAccountQueryServiceImpl.kt | 2 +- .../exposedquery/ExposedStatusQueryService.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedAccountQueryServiceImpl.kt b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedAccountQueryServiceImpl.kt index 4645c3af..51589189 100644 --- a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedAccountQueryServiceImpl.kt +++ b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedAccountQueryServiceImpl.kt @@ -50,7 +50,7 @@ class ExposedAccountQueryServiceImpl(private val applicationConfig: ApplicationC id = resultRow[Actors.id].toString(), username = resultRow[Actors.name], acct = "${resultRow[Actors.name]}@${resultRow[Actors.domain]}", - url = resultRow[Actors.url], + url = resultRow[Actors.url].toString(), displayName = resultRow[Actors.screenName], note = resultRow[Actors.description], avatar = "$userUrl/icon.jpg", diff --git a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedStatusQueryService.kt b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedStatusQueryService.kt index d80009f1..93101819 100644 --- a/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedStatusQueryService.kt +++ b/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedStatusQueryService.kt @@ -225,13 +225,13 @@ private fun toStatus(it: ResultRow, queryAlias: QueryAlias, inReplyToAlias: Alia id = it[Actors.id].toString(), username = it[Actors.name], acct = "${it[Actors.name]}@${it[Actors.domain]}", - url = it[Actors.url], + url = it[Actors.url].toString(), displayName = it[Actors.screenName], note = it[Actors.description], - avatar = it[Actors.url] + "/icon.jpg", - avatarStatic = it[Actors.url] + "/icon.jpg", - header = it[Actors.url] + "/header.jpg", - headerStatic = it[Actors.url] + "/header.jpg", + avatar = "${it[Actors.url]}/icon.jpg", + avatarStatic = "${it[Actors.url]}/icon.jpg", + header = "${it[Actors.url]}/header.jpg", + headerStatic = "${it[Actors.url]}/header.jpg", locked = it[Actors.locked], fields = emptyList(), emojis = emptyList(),