chore: coreからmastodonにテンプレートを移動

build.gradle.kts

@@ -16,13 +16,54 @@
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.spring.boot)
+    alias(libs.plugins.kotlin.spring)
+}
+
+apply {
+    plugin("io.spring.dependency-management")
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        url = uri("https://git.usbharu.dev/api/packages/usbharu/maven")
+    }
+    maven {
+        name = "GitHubPackages"
+        url = uri("https://maven.pkg.github.com/usbharu/http-signature")
+        credentials {
+
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+        }
+    }
+    maven {
+        name = "GitHubPackages2"
+        url = uri("https://maven.pkg.github.com/multim-dev/emoji-kt")
+        credentials {
+
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+        }
+    }
+}
+configurations {
+    all {
+        exclude("org.springframework.boot", "spring-boot-starter-logging")
+        exclude("ch.qos.logback", "logback-classic")
+    }
 }
 
 dependencies {
     implementation("dev.usbharu:hideout-core:0.0.1")
-    implementation("dev.usbharu:hideout-worker:0.0.1")
+    implementation("dev.usbharu:hideout-mastodon:1.0-SNAPSHOT")
 }
 
 tasks.register("run") {
     dependsOn(gradle.includedBuild("hideout-core").task(":run"))
+}
+
+springBoot {
+    mainClass = "dev.usbharu.hideout.SpringApplicationKt"
 }

hideout-core/build.gradle.kts

@@ -4,14 +4,12 @@ import com.github.jk1.license.importer.DependencyDataImporter
 import com.github.jk1.license.importer.XmlReportImporter
 import com.github.jk1.license.render.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.detekt)
     alias(libs.plugins.spring.boot)
     alias(libs.plugins.kotlin.spring)
-    alias(libs.plugins.openapi.generator)
     alias(libs.plugins.kover)
     alias(libs.plugins.license.report)
 
@@ -102,26 +100,6 @@ tasks.clean {
     delete += listOf("$rootDir/src/main/resources/static")
 }
 
-tasks.create<GenerateTask>("openApiGenerateMastodonCompatibleApi", GenerateTask::class) {
-    generatorName.set("kotlin-spring")
-    inputSpec.set("$rootDir/src/main/resources/openapi/mastodon.yaml")
-    outputDir.set("$buildDir/generated/sources/mastodon")
-    apiPackage.set("dev.usbharu.hideout.controller.mastodon.generated")
-    modelPackage.set("dev.usbharu.hideout.domain.mastodon.model.generated")
-    configOptions.put("interfaceOnly", "true")
-    configOptions.put("useSpringBoot3", "true")
-    configOptions.put("reactive", "true")
-    additionalProperties.put("useTags", "true")
-
-    importMappings.put("org.springframework.core.io.Resource", "org.springframework.web.multipart.MultipartFile")
-    typeMappings.put("org.springframework.core.io.Resource", "org.springframework.web.multipart.MultipartFile")
-    schemaMappings.put(
-        "StatusesRequest",
-        "dev.usbharu.hideout.mastodon.interfaces.api.status.StatusesRequest"
-    )
-    templateDir.set("$rootDir/templates")
-}
-
 repositories {
     mavenCentral()
     maven {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationService.kt

@@ -16,8 +16,8 @@
 
 package dev.usbharu.hideout.core.application.actor
 
-import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.config.ApplicationConfig
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
 import dev.usbharu.hideout.core.domain.model.instance.InstanceRepository
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetail

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/config/ApplicationConfig.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 usbharu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.usbharu.hideout.core.config
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import java.net.URL
+
+@ConfigurationProperties("hideout")
+data class ApplicationConfig(
+    val url: URL,
+    val private: Boolean = true,
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/service/actor/RemoteActorCheckDomainService.kt

@@ -16,7 +16,7 @@
 
 package dev.usbharu.hideout.core.domain.service.actor
 
-import dev.usbharu.hideout.application.config.ApplicationConfig
+import dev.usbharu.hideout.core.config.ApplicationConfig
 import dev.usbharu.hideout.core.domain.model.actor.Actor
 import org.springframework.stereotype.Service
 

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/factory/ActorFactoryImpl.kt

@@ -16,7 +16,7 @@
 
 package dev.usbharu.hideout.core.infrastructure.factory
 
-import dev.usbharu.hideout.application.config.ApplicationConfig
+import dev.usbharu.hideout.core.config.ApplicationConfig
 import dev.usbharu.hideout.core.domain.model.actor.*
 import dev.usbharu.hideout.core.domain.model.instance.InstanceId
 import dev.usbharu.hideout.core.domain.model.shared.Domain

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/factory/PostFactoryImpl.kt

@@ -16,7 +16,7 @@
 
 package dev.usbharu.hideout.core.infrastructure.factory
 
-import dev.usbharu.hideout.application.config.ApplicationConfig
+import dev.usbharu.hideout.core.config.ApplicationConfig
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.actor.ActorName
 import dev.usbharu.hideout.core.domain.model.media.MediaId

hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2024 usbharu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.usbharu.hideout.generate
+
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.VALUE_PARAMETER)
+annotation class JsonOrFormBind

hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 usbharu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.usbharu.hideout.generate
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import org.springframework.core.MethodParameter
+import org.springframework.validation.BindException
+import org.springframework.web.bind.support.WebDataBinderFactory
+import org.springframework.web.context.request.NativeWebRequest
+import org.springframework.web.method.annotation.ModelAttributeMethodProcessor
+import org.springframework.web.method.support.HandlerMethodArgumentResolver
+import org.springframework.web.method.support.ModelAndViewContainer
+import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor
+
+@Suppress("TooGenericExceptionCaught")
+class JsonOrFormModelMethodProcessor(
+    private val modelAttributeMethodProcessor: ModelAttributeMethodProcessor,
+    private val requestResponseBodyMethodProcessor: RequestResponseBodyMethodProcessor,
+) : HandlerMethodArgumentResolver {
+    private val isJsonRegex = Regex("application/((\\w*)\\+)?json")
+
+    override fun supportsParameter(parameter: MethodParameter): Boolean =
+        parameter.hasParameterAnnotation(JsonOrFormBind::class.java)
+
+    override fun resolveArgument(
+        parameter: MethodParameter,
+        mavContainer: ModelAndViewContainer?,
+        webRequest: NativeWebRequest,
+        binderFactory: WebDataBinderFactory?,
+    ): Any? {
+        val contentType = webRequest.getHeader("Content-Type").orEmpty()
+        logger.trace("ContentType is {}", contentType)
+        if (contentType.contains(isJsonRegex)) {
+            logger.trace("Determine content type as json.")
+            return requestResponseBodyMethodProcessor.resolveArgument(
+                parameter,
+                mavContainer,
+                webRequest,
+                binderFactory
+            )
+        }
+
+        return try {
+            modelAttributeMethodProcessor.resolveArgument(parameter, mavContainer, webRequest, binderFactory)
+        } catch (e: BindException) {
+            throw e
+        } catch (exception: Exception) {
+            try {
+                requestResponseBodyMethodProcessor.resolveArgument(parameter, mavContainer, webRequest, binderFactory)
+            } catch (e: BindException) {
+                throw e
+            } catch (e: Exception) {
+                logger.warn("Failed to bind request (1)", exception)
+                logger.warn("Failed to bind request (2)", e)
+                throw IllegalArgumentException("Failed to bind request.")
+            }
+        }
+    }
+
+    companion object {
+        val logger: Logger = LoggerFactory.getLogger(JsonOrFormModelMethodProcessor::class.java)
+    }
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt

@@ -17,9 +17,7 @@
 package dev.usbharu.hideout.util
 
 import java.security.KeyFactory
-import java.security.interfaces.RSAPrivateKey
 import java.security.interfaces.RSAPublicKey
-import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 
 object RsaUtil {
@@ -38,10 +36,4 @@ object RsaUtil {
         return decodeRsaPublicKey(replace)
     }
 
-    fun decodeRsaPrivateKey(byteArray: ByteArray): RSAPrivateKey {
-        val pkcS8EncodedKeySpec = PKCS8EncodedKeySpec(byteArray)
-        return KeyFactory.getInstance("RSA").generatePrivate(pkcS8EncodedKeySpec) as RSAPrivateKey
-    }
-
-    fun decodeRsaPrivateKey(encoded: String): RSAPrivateKey = decodeRsaPrivateKey(Base64Util.decode(encoded))
 }

hideout-mastodon/build.gradle.kts

@@ -1,5 +1,15 @@
+import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
+
 plugins {
-    kotlin("jvm") version "1.9.23"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.openapi.generator)
+    alias(libs.plugins.spring.boot)
+    alias(libs.plugins.kotlin.spring)
+}
+
+
+apply {
+    plugin("io.spring.dependency-management")
 }
 
 group = "dev.usbharu"
@@ -10,7 +20,19 @@ repositories {
 }
 
 dependencies {
-    testImplementation(kotlin("test"))
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+
+    implementation("dev.usbharu:hideout-core:0.0.1")
+
+    implementation(libs.jackson.databind)
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.jakarta.annotation)
+    implementation(libs.jakarta.validation)
+
+    implementation(libs.bundles.openapi)
+    implementation(libs.bundles.coroutines)
 }
 
 tasks.test {
@@ -18,4 +40,29 @@ tasks.test {
 }
 kotlin {
     jvmToolchain(21)
-}
+}
+
+tasks.create<GenerateTask>("openApiGenerateMastodonCompatibleApi", GenerateTask::class) {
+    generatorName.set("kotlin-spring")
+    inputSpec.set("$rootDir/src/main/resources/openapi/mastodon.yaml")
+    outputDir.set("$buildDir/generated/sources/mastodon")
+    apiPackage.set("dev.usbharu.hideout.mastodon.interfaces.api.generated")
+    modelPackage.set("dev.usbharu.hideout.mastodon.interfaces.api.generated.model")
+    configOptions.put("interfaceOnly", "true")
+    configOptions.put("useSpringBoot3", "true")
+    configOptions.put("reactive", "true")
+    configOptions.put("gradleBuildFile", "false")
+    configOptions.put("useSwaggerUI", "false")
+    configOptions.put("enumPropertyNaming", "UPPERCASE")
+    additionalProperties.put("useTags", "true")
+
+    importMappings.put("org.springframework.core.io.Resource", "org.springframework.web.multipart.MultipartFile")
+    typeMappings.put("org.springframework.core.io.Resource", "org.springframework.web.multipart.MultipartFile")
+    templateDir.set("$rootDir/templates")
+}
+
+sourceSets.main {
+    kotlin.srcDirs(
+        "$buildDir/generated/sources/mastodon/src/main/kotlin"
+    )
+}

hideout-mastodon/settings.gradle.kts

@@ -3,3 +3,16 @@ plugins {
 }
 rootProject.name = "hideout-mastodon"
 
+includeBuild("../hideout-core")
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../libs.versions.toml"))
+        }
+    }
+}

settings.gradle.kts

@@ -21,6 +21,7 @@ rootProject.name = "hideout"
 
 includeBuild("hideout-core")
 includeBuild("hideout-worker")
+includeBuild("hideout-mastodon")
 
 dependencyResolutionManagement {
     repositories {