From 56389ea87998fff9bc65515b8453eeefc715356f Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Sat, 8 Apr 2023 16:19:58 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=8C=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BE?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/dev/usbharu/hideout/Application.kt | 14 +++++++++++++-
 src/main/resources/application.conf                |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/Application.kt b/src/main/kotlin/dev/usbharu/hideout/Application.kt
index 02938ee8..9fe8da22 100644
--- a/src/main/kotlin/dev/usbharu/hideout/Application.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/Application.kt
@@ -1,5 +1,10 @@
 package dev.usbharu.hideout
 
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import dev.usbharu.hideout.config.Config
+import dev.usbharu.hideout.config.ConfigData
 import dev.usbharu.hideout.plugins.*
 import dev.usbharu.hideout.repository.IUserAuthRepository
 import dev.usbharu.hideout.repository.IUserRepository
@@ -28,6 +33,13 @@ val Application.property: Application.(propertyName: String) -> String
 @Suppress("unused") // application.conf references the main function. This annotation prevents the IDE from marking it as unused.
 fun Application.module() {
 
+    Config.configData = ConfigData(
+        url = property("hideout.url"),
+        objectMapper = jacksonObjectMapper().enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+            .setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+    )
+
     val module = org.koin.dsl.module {
         single<Database> {
             Database.connect(
@@ -44,7 +56,7 @@ fun Application.module() {
         single<HttpSignatureVerifyService> { HttpSignatureVerifyServiceImpl(get()) }
         single<ActivityPubService> { ActivityPubServiceImpl() }
         single<UserService> { UserService(get()) }
-        single<ActivityPubUserService> { ActivityPubUserServiceImpl(get(),get()) }
+        single<ActivityPubUserService> { ActivityPubUserServiceImpl(get(), get()) }
     }
 
     configureKoin(module)
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 0a1d02eb..dd12df2f 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -11,8 +11,8 @@ ktor {
 }
 
 hideout {
-  hostname = "https://localhost:8080"
-  hostname = ${?HOSTNAME}
+  url = "http://localhost:8080"
+
   database {
     url = "jdbc:h2:./test;MODE=POSTGRESQL"
     driver = "org.h2.Driver"