Merge pull request #614 from usbharu/application-service

リファクタリング

.github/workflows/pull-request-merge-check.yml

@@ -85,15 +85,17 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: Code Coverage
           update-comment: true
-          min-coverage-overall: 80
+          min-coverage-overall: 50
           min-coverage-changed-files: 80
-          coverage-counter-type: LINE
 
       - name: JUnit Test Report
         uses: mikepenz/action-junit-report@v4
         with:
           report_paths: '**/TEST-*.xml'
 
+      - name: Verify Coverage
+        run: ./hideout-core/gradlew :hideout-core:koverVerify
+
   lint:
     name: Lint
     needs: [ setup ]

hideout-core/build.gradle.kts

@@ -1,8 +1,25 @@
+/*
+ * 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.
+ */
+
 import com.github.jk1.license.filter.DependencyFilter
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.importer.DependencyDataImporter
 import com.github.jk1.license.importer.XmlReportImporter
 import com.github.jk1.license.render.*
+import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -21,19 +38,6 @@ apply {
 group = "dev.usbharu"
 version = "0.0.1"
 
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs = arrayOf(
-            "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-            "--add-opens", "java.base/java.util=ALL-UNNAMED",
-            "--add-opens", "java.naming/javax.naming=ALL-UNNAMED",
-            "--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED"
-        ).toMutableList()
-    }
-}
-
 kotlin {
     jvmToolchain(21)
     compilerOptions {
@@ -69,8 +73,7 @@ repositories {
 }
 
 
-val os = org.gradle.nativeplatform.platform.internal
+val os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem()
-    .DefaultNativePlatform.getCurrentOperatingSystem()
 
 dependencies {
     developmentOnly(libs.h2db)
@@ -157,35 +160,40 @@ configurations {
     }
 }
 
-
+tasks {
-//tasks{
+    withType<io.gitlab.arturbosch.detekt.Detekt> {
-//    bootRun {
-//        sourceResources(sourceSets.main.get())
-//    }
-//}
-
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt> {
         exclude("**/generated/**")
-    doFirst {
-
-    }
         setSource("src/main/kotlin")
         exclude("build/")
+        configureEach {
+            exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+        }
+    }
+    withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>() {
+        configureEach {
+            exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+        }
+    }
+    withType<Test> {
+        useJUnitPlatform()
+        doFirst {
+            jvmArgs = arrayOf(
+                "--add-opens",
+                "java.base/java.lang=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED",
+                "--add-opens",
+                "java.naming/javax.naming=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util.concurrent.locks=ALL-UNNAMED"
+            ).toMutableList()
+        }
+    }
 }
 
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
-}
-
-tasks.withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
-    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
-}
 
 project.gradle.taskGraph.whenReady {
-    println(this.allTasks)
-    this.allTasks.map { println(it.name) }
     if (this.hasTask(":koverGenerateArtifact")) {
-        println("has task")
         val task = this.allTasks.find { it.name == "test" }
         val verificationTask = task as VerificationTask
         verificationTask.ignoreFailures = true
@@ -195,23 +203,22 @@ project.gradle.taskGraph.whenReady {
 kover {
     currentProject {
         sources {
-            excludedSourceSets.addAll(
+
-                "aot", "e2eTest", "intTest"
-            )
 
         }
     }
 
     reports {
+        verify {
+            rule {
+                bound{
+                    minValue = 50
+                    coverageUnits = CoverageUnit.INSTRUCTION
+                }
+            }
+        }
         filters {
             excludes {
-                packages(
-                    "dev.usbharu.hideout.activitypub.domain.exception",
-                    "dev.usbharu.hideout.core.domain.exception",
-                    "dev.usbharu.hideout.core.domain.exception.media",
-                    "dev.usbharu.hideout.core.domain.exception.resource",
-                    "dev.usbharu.hideout.core.domain.exception.resource.local"
-                )
                 annotatedBy("org.springframework.context.annotation.Configuration")
                 annotatedBy("org.springframework.boot.context.properties.ConfigurationProperties")
                 packages(
@@ -236,10 +243,7 @@ licenseReport {
 
     importers = arrayOf<DependencyDataImporter>(XmlReportImporter("hideout", File("$projectDir/license-list.xml")))
     renderers = arrayOf<ReportRenderer>(
-        InventoryHtmlReportRenderer(),
+        InventoryHtmlReportRenderer(), CsvReportRenderer(), JsonReportRenderer(), XmlReportRenderer()
-        CsvReportRenderer(),
-        JsonReportRenderer(),
-        XmlReportRenderer()
     )
     filters = arrayOf<DependencyFilter>(LicenseBundleNormalizer("$projectDir/license-normalizer-bundle.json", true))
     allowedLicensesFile = File("$projectDir/allowed-licenses.json")

hideout-core/gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,19 @@
+#
+# 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.
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

hideout-core/gradlew

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# 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
 #
-#      https://www.apache.org/licenses/LICENSE-2.0
+#      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,
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #

hideout-core/gradlew.bat

@@ -1,3 +1,19 @@
+#
+# 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.
+#
+
 @rem
 @rem Copyright 2015 the original author or authors.
 @rem

hideout-core/settings.gradle.kts

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }

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

@@ -1,38 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-import dev.usbharu.hideout.core.domain.model.actor.Actor
-import java.net.URI
-
-data class ActorDetail(
-    val id: Long,
-    val name: String,
-    val screenName: String,
-    val host: String,
-    val remoteUrl: String?,
-    val locked: Boolean,
-    val description: String,
-    val postsCount: Int,
-    val iconUrl: URI?,
-    val bannerURL: URI?,
-    val followingCount: Int?,
-    val followersCount: Int?,
-) {
-    companion object {
-        fun of(actor: Actor, iconUrl: URI?, bannerURL: URI?): ActorDetail {
-            return ActorDetail(
-                id = actor.id.id,
-                name = actor.name.name,
-                screenName = actor.screenName.screenName,
-                host = actor.url.host,
-                remoteUrl = actor.url.toString(),
-                locked = actor.locked,
-                description = actor.description.description,
-                postsCount = actor.postsCount.postsCount,
-                iconUrl = iconUrl,
-                bannerURL = bannerURL,
-                followingCount = actor.followingCount?.relationshipCount,
-                followersCount = actor.followersCount?.relationshipCount,
-            )
-        }
-    }
-}

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

@@ -1,5 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-import dev.usbharu.hideout.core.domain.model.actor.ActorId
-
-data class DeleteLocalActor(val actorId: ActorId)

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

@@ -1,8 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-import dev.usbharu.hideout.core.domain.model.support.acct.Acct
-
-data class GetActorDetail(
-    val actorName: Acct? = null,
-    val id: Long? = null
-)

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

@@ -1,11 +1,29 @@
+/*
+ * 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.application.actor
 
+import dev.usbharu.hideout.core.application.model.ActorDetail
 import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.config.ApplicationConfig
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
 import dev.usbharu.hideout.core.domain.model.media.MediaRepository
+import dev.usbharu.hideout.core.domain.model.support.acct.Acct
 import dev.usbharu.hideout.core.domain.model.support.principal.Principal
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
@@ -37,8 +55,8 @@ class GetActorDetailApplicationService(
             throw IllegalArgumentException("id and actorName are null.")
         }
 
-        val iconUrl = actor.icon?.let { mediaRepository.findById(it)?.url }
+        val iconUrl = actor.icon?.let { mediaRepository.findById(it) }
-        val bannerUrl = actor.banner?.let { mediaRepository.findById(it)?.url }
+        val bannerUrl = actor.banner?.let { mediaRepository.findById(it) }
 
         return ActorDetail.of(actor, iconUrl, bannerUrl)
     }
@@ -47,3 +65,8 @@ class GetActorDetailApplicationService(
         private val logger = LoggerFactory.getLogger(GetActorDetailApplicationService::class.java)
     }
 }
+
+data class GetActorDetail(
+    val actorName: Acct? = null,
+    val id: Long? = null
+)

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

@@ -1,19 +0,0 @@
-/*
- * 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.application.actor
-
-data class GetUserDetail(val id: Long)

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

@@ -17,6 +17,7 @@
 package dev.usbharu.hideout.core.application.actor
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
+import dev.usbharu.hideout.core.application.model.UserDetail
 import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
@@ -50,3 +51,5 @@ class GetUserDetailApplicationService(
         val logger = LoggerFactory.getLogger(GetUserDetailApplicationService::class.java)
     }
 }
+
+data class GetUserDetail(val id: Long)

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

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-data class MigrationLocalActor(val from: Long, val to: Long)

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

@@ -74,3 +74,5 @@ class MigrationLocalActorApplicationService(
         private val logger = LoggerFactory.getLogger(MigrationLocalActorApplicationService::class.java)
     }
 }
+
+data class MigrationLocalActor(val from: Long, val to: Long)

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

@@ -1,22 +0,0 @@
-/*
- * 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.application.actor
-
-data class RegisterLocalActor(
-    val name: String,
-    val password: String,
-)

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

@@ -76,3 +76,8 @@ class RegisterLocalActorApplicationService(
         private val logger = LoggerFactory.getLogger(RegisterLocalActorApplicationService::class.java)
     }
 }
+
+data class RegisterLocalActor(
+    val name: String,
+    val password: String,
+)

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

@@ -1,8 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-import org.springframework.stereotype.Service
-
-@Service
-interface SetAlsoKnownAsLocalActorApplicationService {
-    suspend fun setAlsoKnownAs(actorId: Long, alsoKnownAs: List<Long>)
-}

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

@@ -20,6 +20,7 @@ import dev.usbharu.hideout.core.application.exception.InternalServerException
 import dev.usbharu.hideout.core.application.exception.PermissionDeniedException
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
 import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
@@ -44,3 +45,5 @@ class StartDeleteLocalActorApplicationService(
         private val logger = LoggerFactory.getLogger(StartDeleteLocalActorApplicationService::class.java)
     }
 }
+
+data class DeleteLocalActor(val actorId: ActorId)

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

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-data class SuspendLocalActor(val actorId: Long)

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

@@ -42,3 +42,5 @@ class SuspendLocalActorApplicationService(
         private val logger = LoggerFactory.getLogger(SuspendLocalActorApplicationService::class.java)
     }
 }
+
+data class SuspendLocalActor(val actorId: Long)

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

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.actor
-
-data class UnsuspendLocalActor(val actorId: Long)

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

@@ -42,3 +42,5 @@ class UnsuspendLocalActorApplicationService(
         private val logger = LoggerFactory.getLogger(UnsuspendLocalActorApplicationService::class.java)
     }
 }
+
+data class UnsuspendLocalActor(val actorId: Long)

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

@@ -1,26 +0,0 @@
-/*
- * 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.application.application
-
-import java.net.URI
-
-data class RegisterApplication(
-    val name: String,
-    val redirectUris: Set<URI>,
-    val useRefreshToken: Boolean,
-    val scopes: Set<String>,
-)

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

@@ -34,6 +34,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 import org.springframework.security.oauth2.server.authorization.settings.ClientSettings
 import org.springframework.security.oauth2.server.authorization.settings.TokenSettings
 import org.springframework.stereotype.Service
+import java.net.URI
 import java.time.Duration
 
 @Service
@@ -44,9 +45,15 @@ class RegisterApplicationApplicationService(
     private val registeredClientRepository: RegisteredClientRepository,
     transaction: Transaction,
     private val applicationRepository: ApplicationRepository,
-) : AbstractApplicationService<RegisterApplication, RegisteredApplication>(transaction, logger) {
+) : AbstractApplicationService<RegisterApplication, dev.usbharu.hideout.core.application.model.Application>(
+    transaction,
+    logger
+) {
 
-    override suspend fun internalExecute(command: RegisterApplication, principal: Principal): RegisteredApplication {
+    override suspend fun internalExecute(
+        command: RegisterApplication,
+        principal: Principal
+    ): dev.usbharu.hideout.core.application.model.Application {
         val id = idGenerateService.generateId()
         val clientSecret = secureTokenGenerator.generate()
         val registeredClient = RegisteredClient
@@ -82,7 +89,7 @@ class RegisterApplicationApplicationService(
         val application = Application(ApplicationId(id), ApplicationName(command.name))
 
         applicationRepository.save(application)
-        return RegisteredApplication(
+        return dev.usbharu.hideout.core.application.model.Application(
             id = id,
             name = command.name,
             clientSecret = clientSecret,
@@ -95,3 +102,10 @@ class RegisterApplicationApplicationService(
         private val logger = LoggerFactory.getLogger(RegisterApplicationApplicationService::class.java)
     }
 }
+
+data class RegisterApplication(
+    val name: String,
+    val redirectUris: Set<URI>,
+    val useRefreshToken: Boolean,
+    val scopes: Set<String>,
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/DomainEventSubscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEvent

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/RegisterHomeTimeline.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 data class RegisterHomeTimeline(

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/RegisterLocalUserSetHomeTimelineSubscriber.kt

@@ -1,5 +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.core.application.domainevent.subscribers
 
+import dev.usbharu.hideout.core.application.timeline.UserRegisterHomeTimelineApplicationService
 import dev.usbharu.hideout.core.domain.event.userdetail.UserDetailEvent
 import dev.usbharu.hideout.core.domain.event.userdetail.UserDetailEventBody
 import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/RegisterTimelineSetTimelineStoreSubscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import dev.usbharu.hideout.core.application.timeline.SetTimelineToTimelineStoreApplicationService

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/Subscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 interface Subscriber {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/SubscriberRunner.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import org.slf4j.LoggerFactory

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/TimelinePostCreateSubscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import dev.usbharu.hideout.core.application.timeline.AddPost

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/TimelineRelationshipFollowSubscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/domainevent/subscribers/TimelineRelationshipUnfollowSubscriber.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.domainevent.subscribers
 
 import dev.usbharu.hideout.core.application.timeline.RemoveTimelineRelationship

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/exception/InternalServerException.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.exception
 
 class InternalServerException : RuntimeException {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/exception/PermissionDeniedException.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.exception
 
 class PermissionDeniedException : RuntimeException {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/DeleteFilter.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.filter
-
-data class DeleteFilter(val filterId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/GetFilter.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.filter
-
-data class GetFilter(val filterId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilter.kt

@@ -1,27 +0,0 @@
-/*
- * 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.application.filter
-
-import dev.usbharu.hideout.core.domain.model.filter.FilterAction
-import dev.usbharu.hideout.core.domain.model.filter.FilterContext
-
-data class RegisterFilter(
-    val filterName: String,
-    val filterContext: Set<FilterContext>,
-    val filterAction: FilterAction,
-    val filterKeywords: Set<RegisterFilterKeyword>,
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/RegisterFilterKeyword.kt

@@ -1,24 +0,0 @@
-/*
- * 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.application.filter
-
-import dev.usbharu.hideout.core.domain.model.filter.FilterMode
-
-data class RegisterFilterKeyword(
-    val keyword: String,
-    val filterMode: FilterMode,
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationService.kt

@@ -44,3 +44,5 @@ class UserDeleteFilterApplicationService(private val filterRepository: FilterRep
         private val logger = LoggerFactory.getLogger(UserDeleteFilterApplicationService::class.java)
     }
 }
+
+data class DeleteFilter(val filterId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationService.kt

@@ -17,6 +17,7 @@
 package dev.usbharu.hideout.core.application.filter
 
 import dev.usbharu.hideout.core.application.exception.PermissionDeniedException
+import dev.usbharu.hideout.core.application.model.Filter
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.filter.FilterId
@@ -44,3 +45,5 @@ class UserGetFilterApplicationService(private val filterRepository: FilterReposi
         private val logger = LoggerFactory.getLogger(UserGetFilterApplicationService::class.java)
     }
 }
+
+data class GetFilter(val filterId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/filter/UserRegisterFilterApplicationService.kt

@@ -16,10 +16,10 @@
 
 package dev.usbharu.hideout.core.application.filter
 
+import dev.usbharu.hideout.core.application.model.Filter
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.filter.*
-import dev.usbharu.hideout.core.domain.model.filter.FilterKeyword
 import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.shared.id.IdGenerateService
 import org.slf4j.LoggerFactory
@@ -61,3 +61,15 @@ class UserRegisterFilterApplicationService(
         private val logger = LoggerFactory.getLogger(UserRegisterFilterApplicationService::class.java)
     }
 }
+
+data class RegisterFilter(
+    val filterName: String,
+    val filterContext: Set<FilterContext>,
+    val filterAction: FilterAction,
+    val filterKeywords: Set<RegisterFilterKeyword>,
+)
+
+data class RegisterFilterKeyword(
+    val keyword: String,
+    val filterMode: FilterMode,
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/instance/GetLocalInstanceApplicationService.kt

@@ -1,6 +1,23 @@
+/*
+ * 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.application.instance
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
+import dev.usbharu.hideout.core.application.model.Instance
 import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.config.ApplicationConfig

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/instance/Instance.kt

@@ -1,17 +0,0 @@
-package dev.usbharu.hideout.core.application.instance
-
-import dev.usbharu.hideout.core.domain.model.instance.Instance
-import java.net.URI
-
-data class Instance(val id: Long, val name: String, val url: URI, val description: String) {
-    companion object {
-        fun of(instance: Instance): dev.usbharu.hideout.core.application.instance.Instance {
-            return Instance(
-                instance.id.instanceId,
-                instance.name.name,
-                instance.url,
-                instance.description.description
-            )
-        }
-    }
-}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/media/Media.kt

@@ -1,50 +0,0 @@
-/*
- * 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.application.media
-
-import dev.usbharu.hideout.core.domain.model.media.FileType
-import dev.usbharu.hideout.core.domain.model.media.Media
-import dev.usbharu.hideout.core.domain.model.media.MimeType
-import java.net.URI
-
-data class Media(
-    val id: Long,
-    val name: String,
-    val url: URI,
-    val thumbprintURI: URI?,
-    val remoteURL: URI?,
-    val type: FileType,
-    val mimeType: MimeType,
-    val blurHash: String?,
-    val description: String?
-) {
-    companion object {
-        fun of(media: Media): dev.usbharu.hideout.core.application.media.Media {
-            return Media(
-                id = media.id.id,
-                name = media.name.name,
-                url = media.url,
-                thumbprintURI = media.thumbnailUrl,
-                remoteURL = media.remoteUrl,
-                type = media.type,
-                mimeType = media.mimeType,
-                blurHash = media.blurHash?.hash,
-                description = media.description?.description
-            )
-        }
-    }
-}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/media/UploadMediaApplicationService.kt

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.media
 
+import dev.usbharu.hideout.core.application.model.MediaDetail
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.media.*
@@ -26,6 +27,8 @@ import dev.usbharu.hideout.core.external.mediastore.MediaStore
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Service
+import java.net.URI
+import java.nio.file.Path
 import dev.usbharu.hideout.core.domain.model.media.Media as MediaModel
 
 @Service
@@ -35,11 +38,11 @@ class UploadMediaApplicationService(
     private val mediaRepository: MediaRepository,
     private val idGenerateService: IdGenerateService,
     transaction: Transaction
-) : LocalUserAbstractApplicationService<UploadMedia, Media>(
+) : LocalUserAbstractApplicationService<UploadMedia, MediaDetail>(
     transaction,
     logger
 ) {
-    override suspend fun internalExecute(command: UploadMedia, principal: LocalUser): Media {
+    override suspend fun internalExecute(command: UploadMedia, principal: LocalUser): MediaDetail {
         val process = mediaProcessor.process(command.path, command.name, null)
         val id = idGenerateService.generateId()
         val thumbnailUri = if (process.thumbnailPath != null) {
@@ -64,10 +67,17 @@ class UploadMediaApplicationService(
 
         mediaRepository.save(media)
 
-        return Media.of(media)
+        return MediaDetail.of(media)
     }
 
     companion object {
         private val logger = LoggerFactory.getLogger(UploadMediaApplicationService::class.java)
     }
 }
+
+data class UploadMedia(
+    val path: Path,
+    val name: String,
+    val remoteUri: URI?,
+    val description: String?
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/ActorDetail.kt

@@ -0,0 +1,57 @@
+/*
+ * 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.application.model
+
+import dev.usbharu.hideout.core.domain.model.actor.Actor
+import dev.usbharu.hideout.core.domain.model.media.Media
+import java.net.URI
+
+data class ActorDetail(
+    val id: Long,
+    val name: String,
+    val screenName: String,
+    val host: String,
+    val instanceId: Long,
+    val remoteUrl: URI?,
+    val locked: Boolean,
+    val description: String,
+    val postsCount: Int,
+    val iconUrl: URI?,
+    val bannerURL: URI?,
+    val followingCount: Int?,
+    val followersCount: Int?,
+) {
+    companion object {
+        fun of(actor: Actor, iconMedia: Media?, bannerMedia: Media?): ActorDetail {
+            return ActorDetail(
+                id = actor.id.id,
+                name = actor.name.name,
+                screenName = actor.screenName.screenName,
+                host = actor.url.host,
+                instanceId = actor.instance.instanceId,
+                remoteUrl = actor.url,
+                locked = actor.locked,
+                description = actor.description.description,
+                postsCount = actor.postsCount.postsCount,
+                iconUrl = iconMedia?.url,
+                bannerURL = bannerMedia?.url,
+                followingCount = actor.followingCount?.relationshipCount,
+                followersCount = actor.followersCount?.relationshipCount,
+            )
+        }
+    }
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Application.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.application
+package dev.usbharu.hideout.core.application.model
 
 import java.net.URI
 
-data class RegisteredApplication(
+data class Application(
     val id: Long,
     val name: String,
     val redirectUris: Set<URI>,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Filter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.filter
+package dev.usbharu.hideout.core.application.model
 
 import dev.usbharu.hideout.core.domain.model.filter.Filter
 import dev.usbharu.hideout.core.domain.model.filter.FilterAction
@@ -29,7 +29,7 @@ data class Filter(
     val filterKeywords: Set<FilterKeyword>,
 ) {
     companion object {
-        fun of(filter: Filter): dev.usbharu.hideout.core.application.filter.Filter {
+        fun of(filter: Filter): dev.usbharu.hideout.core.application.model.Filter {
             return Filter(
                 filterId = filter.id.id,
                 userDetailId = filter.userDetailId.id,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/FilterKeyword.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.filter
+package dev.usbharu.hideout.core.application.model
 
 import dev.usbharu.hideout.core.domain.model.filter.FilterMode
 

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Instance.kt

@@ -14,9 +14,20 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.media
+package dev.usbharu.hideout.core.application.model
 
+import dev.usbharu.hideout.core.domain.model.instance.Instance
 import java.net.URI
-import java.nio.file.Path
 
-data class UploadMedia(val path: Path, val name: String, val remoteUri: URI?, val description: String?)
+data class Instance(val id: Long, val name: String, val url: URI, val description: String) {
+    companion object {
+        fun of(instance: Instance): dev.usbharu.hideout.core.application.model.Instance {
+            return Instance(
+                instance.id.instanceId,
+                instance.name.name,
+                instance.url,
+                instance.description.description
+            )
+        }
+    }
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/MediaDetail.kt

@@ -1,4 +1,20 @@
-package dev.usbharu.hideout.core.application.post
+/*
+ * 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.application.model
 
 import dev.usbharu.hideout.core.domain.model.media.Media
 import java.net.URI

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/PostDetail.kt

@@ -1,6 +1,21 @@
-package dev.usbharu.hideout.core.application.post
+/*
+ * 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.application.model
 
-import dev.usbharu.hideout.core.application.model.Reactions
 import dev.usbharu.hideout.core.domain.model.actor.Actor
 import dev.usbharu.hideout.core.domain.model.media.Media
 import dev.usbharu.hideout.core.domain.model.post.Post
@@ -43,7 +58,7 @@ data class PostDetail(
         ): PostDetail {
             return PostDetail(
                 id = post.id.id,
-                actor = ActorDetail.of(actor, iconMedia),
+                actor = ActorDetail.of(actor, iconMedia, null),
                 overview = post.overview?.overview,
                 text = post.text,
                 content = post.content.content,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Reactions.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.model
 
 import dev.usbharu.hideout.core.domain.model.emoji.CustomEmoji

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Relationship.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.get
+package dev.usbharu.hideout.core.application.model
 
 import dev.usbharu.hideout.core.domain.model.actorinstancerelationship.ActorInstanceRelationship
 import dev.usbharu.hideout.core.domain.model.relationship.Relationship
@@ -38,7 +38,7 @@ data class Relationship(
             relationship: Relationship,
             relationship2: Relationship,
             actorInstanceRelationship: ActorInstanceRelationship,
-        ): dev.usbharu.hideout.core.application.relationship.get.Relationship {
+        ): dev.usbharu.hideout.core.application.model.Relationship {
             return Relationship(
                 actorId = relationship.actorId.id,
                 targetId = relationship.targetActorId.id,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/Timeline.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.model
 
 import dev.usbharu.hideout.core.domain.model.timeline.TimelineVisibility

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/model/UserDetail.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.actor
+package dev.usbharu.hideout.core.application.model
 
 import dev.usbharu.hideout.core.domain.model.actor.Actor
 import dev.usbharu.hideout.core.domain.model.emoji.CustomEmoji
@@ -45,7 +45,7 @@ data class UserDetail(
             actor: Actor,
             userDetail: UserDetail,
             customEmojis: List<CustomEmoji>,
-        ): dev.usbharu.hideout.core.application.actor.UserDetail {
+        ): dev.usbharu.hideout.core.application.model.UserDetail {
             return UserDetail(
                 id = actor.id.id,
                 userDetailId = userDetail.id.id,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/ActorDetail.kt

@@ -1,31 +0,0 @@
-package dev.usbharu.hideout.core.application.post
-
-import dev.usbharu.hideout.core.domain.model.actor.Actor
-import dev.usbharu.hideout.core.domain.model.media.Media
-import java.net.URI
-
-data class ActorDetail(
-    val actorId: Long,
-    val instanceId: Long,
-    val name: String,
-    val domain: String,
-    val screenName: String,
-    val url: URI,
-    val locked: Boolean,
-    val icon: URI?,
-) {
-    companion object {
-        fun of(actor: Actor, iconMedia: Media?): ActorDetail {
-            return ActorDetail(
-                actorId = actor.id.id,
-                instanceId = actor.instance.instanceId,
-                name = actor.name.name,
-                domain = actor.domain.domain,
-                screenName = actor.screenName.screenName,
-                url = actor.url,
-                locked = actor.locked,
-                icon = iconMedia?.url
-            )
-        }
-    }
-}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPost.kt

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.post
-
-data class DeleteLocalPost(val postId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPostApplicationService.kt

@@ -50,3 +50,5 @@ class DeleteLocalPostApplicationService(
         private val logger = LoggerFactory.getLogger(DeleteLocalPostApplicationService::class.java)
     }
 }
+
+data class DeleteLocalPost(val postId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/GetPost.kt

@@ -1,21 +0,0 @@
-/*
- * 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.application.post
-
-data class GetPost(
-    val postId: Long,
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/GetPostApplicationService.kt

@@ -1,48 +0,0 @@
-/*
- * 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.application.post
-
-import dev.usbharu.hideout.core.application.exception.PermissionDeniedException
-import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
-import dev.usbharu.hideout.core.application.shared.Transaction
-import dev.usbharu.hideout.core.domain.model.post.PostId
-import dev.usbharu.hideout.core.domain.model.post.PostRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.Principal
-import dev.usbharu.hideout.core.domain.service.post.IPostReadAccessControl
-import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Service
-
-@Service
-class GetPostApplicationService(
-    private val postRepository: PostRepository,
-    private val iPostReadAccessControl: IPostReadAccessControl,
-    transaction: Transaction
-) :
-    AbstractApplicationService<GetPost, Post>(transaction, logger) {
-
-    override suspend fun internalExecute(command: GetPost, principal: Principal): Post {
-        val post = postRepository.findById(PostId(command.postId)) ?: throw IllegalArgumentException("Post not found")
-        if (iPostReadAccessControl.isAllow(post, principal).not()) {
-            throw PermissionDeniedException()
-        }
-        return Post.of(post)
-    }
-
-    companion object {
-        private val logger = LoggerFactory.getLogger(GetPostApplicationService::class.java)
-    }
-}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/GetPostDetail.kt

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.post
-
-data class GetPostDetail(val postId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/GetPostDetailApplicationService.kt

@@ -1,6 +1,23 @@
+/*
+ * 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.application.post
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
+import dev.usbharu.hideout.core.application.model.PostDetail
 import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.Actor
@@ -97,3 +114,5 @@ class GetPostDetailApplicationService(
         private val logger = LoggerFactory.getLogger(GetPostDetailApplicationService::class.java)
     }
 }
+
+data class GetPostDetail(val postId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/Post.kt

@@ -1,58 +0,0 @@
-/*
- * 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.application.post
-
-import dev.usbharu.hideout.core.domain.model.post.Post
-import dev.usbharu.hideout.core.domain.model.post.Visibility
-import java.net.URI
-import java.time.Instant
-
-data class Post(
-    val id: Long,
-    val actorId: Long,
-    val overview: String?,
-    val text: String,
-    val content: String,
-    val createdAt: Instant,
-    val visibility: Visibility,
-    val url: URI,
-    val repostId: Long?,
-    val replyId: Long?,
-    val sensitive: Boolean,
-    val mediaIds: List<Long>,
-    val moveTo: Long?,
-) {
-    companion object {
-        fun of(post: Post): dev.usbharu.hideout.core.application.post.Post {
-            return Post(
-                id = post.id.id,
-                actorId = post.actorId.id,
-                overview = post.overview?.overview,
-                text = post.text,
-                content = post.content.content,
-                createdAt = post.createdAt,
-                visibility = post.visibility,
-                url = post.url,
-                repostId = post.repostId?.id,
-                replyId = post.replyId?.id,
-                sensitive = post.sensitive,
-                mediaIds = post.mediaIds.map { it.id },
-                moveTo = post.moveTo?.id
-            )
-        }
-    }
-}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPost.kt

@@ -1,29 +0,0 @@
-/*
- * 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.application.post
-
-import dev.usbharu.hideout.core.domain.model.post.Visibility
-
-data class RegisterLocalPost(
-    val content: String,
-    val overview: String?,
-    val visibility: Visibility,
-    val repostId: Long?,
-    val replyId: Long?,
-    val sensitive: Boolean,
-    val mediaIds: List<Long>,
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPostApplicationService.kt

@@ -24,6 +24,7 @@ import dev.usbharu.hideout.core.domain.model.media.MediaId
 import dev.usbharu.hideout.core.domain.model.post.PostId
 import dev.usbharu.hideout.core.domain.model.post.PostOverview
 import dev.usbharu.hideout.core.domain.model.post.PostRepository
+import dev.usbharu.hideout.core.domain.model.post.Visibility
 import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.infrastructure.factory.PostFactoryImpl
 import org.slf4j.Logger
@@ -64,3 +65,13 @@ class RegisterLocalPostApplicationService(
         val logger: Logger = LoggerFactory.getLogger(RegisterLocalPostApplicationService::class.java)
     }
 }
+
+data class RegisterLocalPost(
+    val content: String,
+    val overview: String?,
+    val visibility: Visibility,
+    val repostId: Long?,
+    val replyId: Long?,
+    val sensitive: Boolean,
+    val mediaIds: List<Long>,
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNote.kt

@@ -1,25 +0,0 @@
-/*
- * 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.application.post
-
-data class UpdateLocalNote(
-    val postId: Long,
-    val overview: String?,
-    val content: String,
-    val sensitive: Boolean,
-    val mediaIds: List<Long>
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNoteApplicationService.kt

@@ -64,3 +64,11 @@ class UpdateLocalNoteApplicationService(
         private val logger = LoggerFactory.getLogger(UpdateLocalNoteApplicationService::class.java)
     }
 }
+
+data class UpdateLocalNote(
+    val postId: Long,
+    val overview: String?,
+    val content: String,
+    val sensitive: Boolean,
+    val mediaIds: List<Long>
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/reaction/CreateReaction.kt

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.reaction
-
-data class CreateReaction(val postId: Long, val customEmojiId: Long?, val unicodeEmoji: String)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/reaction/RemoveReaction.kt

@@ -1,7 +0,0 @@
-package dev.usbharu.hideout.core.application.reaction
-
-data class RemoveReaction(
-    val postId: Long,
-    val customEmojiId: Long?,
-    val unicodeEmoji: String
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/reaction/UserCreateReactionApplicationService.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.reaction
 
 import dev.usbharu.hideout.core.application.exception.PermissionDeniedException
@@ -63,3 +79,5 @@ class UserCreateReactionApplicationService(
         private val logger = LoggerFactory.getLogger(UserCreateReactionApplicationService::class.java)
     }
 }
+
+data class CreateReaction(val postId: Long, val customEmojiId: Long?, val unicodeEmoji: String)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/reaction/UserRemoveReactionApplicationService.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.reaction
 
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
@@ -49,3 +65,9 @@ class UserRemoveReactionApplicationService(
         private val logger = LoggerFactory.getLogger(UserRemoveReactionApplicationService::class.java)
     }
 }
+
+data class RemoveReaction(
+    val postId: Long,
+    val customEmojiId: Long?,
+    val unicodeEmoji: String
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/GetRelationshipApplicationService.kt

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.get
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
+import dev.usbharu.hideout.core.application.model.Relationship
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -69,3 +70,5 @@ class GetRelationshipApplicationService(
         private val logger = LoggerFactory.getLogger(GetRelationshipApplicationService::class.java)
     }
 }
+
+data class GetRelationship(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserAcceptFollowRequestApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.acceptfollowrequest
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -52,3 +51,5 @@ class UserAcceptFollowRequestApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class AcceptFollowRequest(val sourceActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserBlockApplicationService.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.block
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
@@ -61,3 +61,5 @@ class UserBlockApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class Block(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserFollowRequestApplicationService.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.followrequest
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
@@ -56,3 +56,5 @@ class UserFollowRequestApplicationService(
         private val logger = LoggerFactory.getLogger(UserFollowRequestApplicationService::class.java)
     }
 }
+
+data class FollowRequest(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserMuteApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.mute
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -54,3 +53,5 @@ class UserMuteApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class Mute(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserRejectFollowRequestApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.rejectfollowrequest
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -52,3 +51,5 @@ class UserRejectFollowRequestApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class RejectFollowRequest(val sourceActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserRemoveFromFollowersApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.removefromfollowers
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -54,3 +53,5 @@ class UserRemoveFromFollowersApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class RemoveFromFollowers(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserUnblockApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.unblock
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -54,3 +53,5 @@ class UserUnblockApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class Unblock(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserUnfollowApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.unfollow
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -54,3 +53,5 @@ class UserUnfollowApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class Unfollow(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/UserUnmuteApplicationService.kt

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.hideout.core.application.relationship.unmute
+package dev.usbharu.hideout.core.application.relationship
 
 import dev.usbharu.hideout.core.application.exception.InternalServerException
-import dev.usbharu.hideout.core.application.relationship.block.UserBlockApplicationService
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
@@ -54,3 +53,5 @@ class UserUnmuteApplicationService(
         private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
     }
 }
+
+data class Unmute(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/acceptfollowrequest/AcceptFollowRequest.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.acceptfollowrequest
-
-data class AcceptFollowRequest(val sourceActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/block/Block.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.block
-
-data class Block(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/followrequest/FollowRequest.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.followrequest
-
-data class FollowRequest(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/get/GetRelationship.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.get
-
-data class GetRelationship(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/mute/Mute.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.mute
-
-data class Mute(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/rejectfollowrequest/RejectFollowRequest.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.rejectfollowrequest
-
-data class RejectFollowRequest(val sourceActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/removefromfollowers/RemoveFromFollowers.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.removefromfollowers
-
-data class RemoveFromFollowers(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/unblock/Unblock.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.unblock
-
-data class Unblock(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/unfollow/Unfollow.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.unfollow
-
-data class Unfollow(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/relationship/unmute/Unmute.kt

@@ -1,19 +0,0 @@
-/*
- * 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.application.relationship.unmute
-
-data class Unmute(val targetActorId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/shared/LocalUserAbstractApplicationService.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.application.shared
 
 import dev.usbharu.hideout.core.application.exception.PermissionDeniedException

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/AddPost.kt

@@ -1,5 +0,0 @@
-package dev.usbharu.hideout.core.application.timeline
-
-import dev.usbharu.hideout.core.domain.model.post.PostId
-
-data class AddPost(val postId: PostId)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/AddTimelineRelationship.kt

@@ -1,11 +0,0 @@
-package dev.usbharu.hideout.core.application.timeline
-
-import dev.usbharu.hideout.core.domain.model.actor.ActorId
-import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
-import dev.usbharu.hideout.core.domain.model.timelinerelationship.Visible
-
-data class AddTimelineRelationship(
-    val timelineId: TimelineId,
-    val actorId: ActorId,
-    val visible: Visible
-)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/GetTimelines.kt

@@ -1,3 +0,0 @@
-package dev.usbharu.hideout.core.application.timeline
-
-data class GetTimelines(val userDetailId: Long)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/GetUserTimeline.kt

@@ -1,5 +0,0 @@
-package dev.usbharu.hideout.core.application.timeline
-
-import dev.usbharu.hideout.core.domain.model.support.page.Page
-
-data class GetUserTimeline(val id: Long, val page: Page)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/GetUserTimelineApplicationService.kt

@@ -1,12 +1,29 @@
+/*
+ * 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.application.timeline
 
-import dev.usbharu.hideout.core.application.post.PostDetail
+import dev.usbharu.hideout.core.application.model.PostDetail
 import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.post.PostId
 import dev.usbharu.hideout.core.domain.model.post.PostRepository
 import dev.usbharu.hideout.core.domain.model.post.Visibility
+import dev.usbharu.hideout.core.domain.model.support.page.Page
 import dev.usbharu.hideout.core.domain.model.support.page.PaginationList
 import dev.usbharu.hideout.core.domain.model.support.principal.Principal
 import dev.usbharu.hideout.core.query.usertimeline.UserTimelineQueryService
@@ -51,3 +68,5 @@ class GetUserTimelineApplicationService(
         private val logger = LoggerFactory.getLogger(GetUserTimelineApplicationService::class.java)
     }
 }
+
+data class GetUserTimeline(val id: Long, val page: Page)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/ReadTimeline.kt

@@ -1,11 +0,0 @@
-package dev.usbharu.hideout.core.application.timeline
-
-import dev.usbharu.hideout.core.domain.model.support.page.Page
-
-data class ReadTimeline(
-    val timelineId: Long,
-    val mediaOnly: Boolean,
-    val localOnly: Boolean,
-    val remoteOnly: Boolean,
-    val page: Page
-)