From 744b7f6efb340e113f7200c73c795363b2322802 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:06:35 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20ActivityPub=E3=81=AE=E9=80=9A?= =?UTF-8?q?=E4=BF=A1=E3=81=AB=E4=BD=BF=E3=81=86HTTP=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AEUserAgent=E3=82=92?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hideout/application/config/HttpClientConfig.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt b/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt index 6000f0a3..9eb4eea9 100644 --- a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt +++ b/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt @@ -2,15 +2,18 @@ package dev.usbharu.hideout.application.config import io.ktor.client.* import io.ktor.client.engine.cio.* +import io.ktor.client.plugins.* import io.ktor.client.plugins.cache.* import io.ktor.client.plugins.logging.* +import org.springframework.boot.info.BuildProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @Configuration class HttpClientConfig { @Bean - fun httpClient(): HttpClient = HttpClient(CIO).config { + fun httpClient(buildProperties: BuildProperties, applicationConfig: ApplicationConfig): HttpClient = + HttpClient(CIO).config { install(Logging) { logger = Logger.DEFAULT level = LogLevel.ALL @@ -18,5 +21,8 @@ class HttpClientConfig { install(HttpCache) { } expectSuccess = true + install(UserAgent) { + agent = "Hideout/${buildProperties.version} (${applicationConfig.url})" + } } } From 8bd0fd9c905f473672dc5ec28d7dfa73438d8bfa Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:42:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E6=99=82=E3=81=AB=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E7=AD=89=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index ce4ceb3d..2034697c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -316,3 +316,7 @@ koverReport { } } } + +springBoot { + buildInfo() +} From ad4a9d54cb01632b225e75ae4984601e23ab8180 Mon Sep 17 00:00:00 2001 From: usbharu Date: Tue, 16 Jan 2024 14:52:49 +0900 Subject: [PATCH 3/3] Update src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../dev/usbharu/hideout/application/config/HttpClientConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt b/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt index 9eb4eea9..f3b036a1 100644 --- a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt +++ b/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt @@ -24,5 +24,5 @@ class HttpClientConfig { install(UserAgent) { agent = "Hideout/${buildProperties.version} (${applicationConfig.url})" } - } + } }