refactor: 使用されてないApplicationServiceを削除

noscript用の簡易SSRクライアントを追加

.github/workflows/master-publish-package.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Check diff
         id: check-diff
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           result-encoding: 'json'
           script: |
@@ -75,4 +75,8 @@ jobs:
       - name: Publish OWL Gitea
 
         if: ${{ github.base_ref == 'master' && contains( needs.release-diff-check.outputs.diff , 'owl')}}
-        run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository
+        run: ./owl/gradlew :owl:publishMavenPublicationToGiteaRepository
+        env:
+          USERNAME: ${{ github.actor }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITEA: ${{ secrets.GITEA }}

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

@@ -29,6 +29,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PAT }}
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v4
@@ -46,7 +48,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Build
-        run: ./gradlew :hideout-core:classes
+        run: ./gradlew classes --no-daemon
 
   unit-test:
     name: Unit Test
@@ -55,6 +57,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.PAT }}
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -69,12 +73,12 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Unit Test
-        run: ./gradlew :hideout-core:koverXmlReport
+        run: ./hideout-core/gradlew :hideout-core:koverXmlReport
 
       - name: Add coverage report to PR
         if: always()
         id: kover
-        uses: madrapps/jacoco-report@v1.6.1
+        uses: madrapps/jacoco-report@v1.7.0
         with:
           paths: |
             ${{ github.workspace }}/hideout-core/build/reports/kover/report.xml
@@ -94,9 +98,14 @@ jobs:
     name: Lint
     needs: [ setup ]
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          token: '${{ secrets.PAT }}'
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -111,7 +120,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Build with Gradle
-        run: ./gradlew :hideout-core:detektMain
+        run: ./gradlew :hideout-core:detektMain :hideout-mastodon:detektMain
 
       - name: Auto Commit
         if: ${{ always() }}

.gitignore

@@ -48,3 +48,4 @@ out/
 /hideout-core/files/
 /hideout-core/.kotlin/sessions/
 /hideout-mastodon/.kotlin/sessions/
+/http-client.private.env.json

docker-compose.yml

@@ -8,4 +8,9 @@ services:
     environment:
       POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "password"
-      POSTGRES_DB: "hideout"
+      POSTGRES_DB: "hideout"
+
+  mongodb:
+    image: mongo:7.0.14
+    ports:
+      - "27017:27017"

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED -XX:TieredStopAtLevel=1 -noverify
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-activitypub/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-core/build.gradle.kts

@@ -74,6 +74,7 @@ val os = org.gradle.nativeplatform.platform.internal
 
 dependencies {
     developmentOnly(libs.h2db)
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
     detektPlugins(libs.detekt.formatting)
 
     implementation(libs.bundles.exposed)
@@ -81,8 +82,8 @@ dependencies {
     implementation(libs.bundles.ktor.client)
     implementation(libs.bundles.apache.tika)
     implementation(libs.bundles.openapi)
-//    implementation(libs.bundles.owl.producer)
-//    implementation(libs.bundles.owl.broker)
+    implementation(libs.bundles.owl.producer)
+    implementation(libs.bundles.owl.broker)
     implementation(libs.bundles.spring.boot.oauth2)
     implementation(libs.bundles.spring.boot.data.mongodb)
     implementation("org.springframework.boot:spring-boot-starter-actuator")
@@ -103,7 +104,7 @@ dependencies {
     implementation(libs.flyway.core)
     runtimeOnly(libs.flyway.postgresql)
 
-//    implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1")
+    implementation(libs.owl.common.serialize.jackson)
 
     implementation(libs.javacv) {
         exclude(module = "opencv")
@@ -122,8 +123,8 @@ dependencies {
         implementation(variantOf(libs.javacv.ffmpeg) { classifier("linux-x86_64") })
     }
 
-    implementation("dev.usbharu:http-signature:1.0.0")
-    implementation("dev.usbharu:emoji-kt:2.0.0")
+    implementation(libs.http.signature)
+    implementation(libs.emoji.kt)
 
 
 
@@ -132,16 +133,13 @@ dependencies {
     testImplementation(libs.coroutines.test)
     testImplementation(libs.ktor.client.mock)
     testImplementation(libs.h2db)
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
-    testImplementation("com.jparams:to-string-verifier:1.4.8")
+    testImplementation(libs.mockito.kotlin)
 
 }
 
 detekt {
     parallel = true
-    config = files("../detekt.yml")
+    config.setFrom(files("../detekt.yml"))
     buildUponDefaultConfig = true
     basePath = "${rootDir.absolutePath}/src/main/kotlin"
     autoCorrect = true
@@ -155,6 +153,12 @@ configurations.matching { it.name == "detekt" }.all {
     }
 }
 
+//tasks{
+//    bootRun {
+//        sourceResources(sourceSets.main.get())
+//    }
+//}
+
 tasks.withType<io.gitlab.arturbosch.detekt.Detekt> {
     exclude("**/generated/**")
     doFirst {

hideout-core/gradle.properties

@@ -17,6 +17,4 @@ kotlin.code.style=official
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
-org.gradle.configuration-cache=true
-org.gradle.configuration-cache.problems=warn
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC

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

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-core/settings.gradle.kts

@@ -3,11 +3,15 @@ plugins {
 }
 rootProject.name = "hideout-core"
 
-includeBuild("../owl")
+//ローカルで変更した時、リリースまではアンコメント リリース後はコメントアウト
+//includeBuild("../owl")
 
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
+        maven {
+            url = uri("https://git.usbharu.dev/api/packages/usbharu/maven")
+        }
     }
 
     versionCatalogs {

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

@@ -0,0 +1,38 @@
+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/GetActorDetail.kt

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,47 @@
+package dev.usbharu.hideout.core.application.actor
+
+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.principal.Principal
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class GetActorDetailApplicationService(
+    private val actorRepository: ActorRepository,
+    private val mediaRepository: MediaRepository,
+    private val applicationConfig: ApplicationConfig,
+    transaction: Transaction
+) :
+    AbstractApplicationService<GetActorDetail, ActorDetail>(
+        transaction,
+        logger
+    ) {
+    override suspend fun internalExecute(command: GetActorDetail, principal: Principal): ActorDetail {
+        val actor = if (command.id != null) {
+            actorRepository.findById(ActorId(command.id))
+                ?: throw IllegalArgumentException("Actor ${command.id} not found.")
+        } else if (command.actorName != null) {
+            val host = command.actorName.host.ifEmpty {
+                applicationConfig.url.host
+            }
+            actorRepository.findByNameAndDomain(command.actorName.userpart, host)
+                ?: throw IllegalArgumentException("Actor ${command.actorName} not found.")
+        } else {
+            throw IllegalArgumentException("id and actorName are null.")
+        }
+
+        val iconUrl = actor.icon?.let { mediaRepository.findById(it)?.url }
+        val bannerUrl = actor.banner?.let { mediaRepository.findById(it)?.url }
+
+        return ActorDetail.of(actor, iconUrl, bannerUrl)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(GetActorDetailApplicationService::class.java)
+    }
+}

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

@@ -22,7 +22,7 @@ import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationS
 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.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
 import dev.usbharu.hideout.core.domain.service.actor.local.AccountMigrationCheck.*
 import dev.usbharu.hideout.core.domain.service.actor.local.LocalActorMigrationCheckDomainService
@@ -37,7 +37,7 @@ class MigrationLocalActorApplicationService(
     private val userDetailRepository: UserDetailRepository,
 ) : LocalUserAbstractApplicationService<MigrationLocalActor, Unit>(transaction, logger) {
 
-    override suspend fun internalExecute(command: MigrationLocalActor, principal: FromApi) {
+    override suspend fun internalExecute(command: MigrationLocalActor, principal: LocalUser) {
         if (command.from != principal.actorId.id) {
             throw PermissionDeniedException()
         }
@@ -58,13 +58,15 @@ class MigrationLocalActorApplicationService(
         if (canAccountMigration.canMigration) {
             fromActor.moveTo = toActorId
             actorRepository.save(fromActor)
-        } else when (canAccountMigration) {
-            is AlreadyMoved -> throw IllegalArgumentException(canAccountMigration.message)
-            is CanAccountMigration -> throw InternalServerException()
-            is CircularReferences -> throw IllegalArgumentException(canAccountMigration.message)
-            is SelfReferences -> throw IllegalArgumentException("Self references are not supported")
-            is AlsoKnownAsNotFound -> throw IllegalArgumentException(canAccountMigration.message)
-            is MigrationCoolDown -> throw IllegalArgumentException(canAccountMigration.message)
+        } else {
+            when (canAccountMigration) {
+                is AlreadyMoved -> throw IllegalArgumentException(canAccountMigration.message)
+                is CanAccountMigration -> throw InternalServerException()
+                is CircularReferences -> throw IllegalArgumentException(canAccountMigration.message)
+                is SelfReferences -> throw IllegalArgumentException("Self references are not supported")
+                is AlsoKnownAsNotFound -> throw IllegalArgumentException(canAccountMigration.message)
+                is MigrationCoolDown -> throw IllegalArgumentException(canAccountMigration.message)
+            }
         }
     }
 

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

@@ -21,7 +21,7 @@ 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.ActorRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -30,7 +30,7 @@ class StartDeleteLocalActorApplicationService(
     transaction: Transaction,
     private val actorRepository: ActorRepository,
 ) : LocalUserAbstractApplicationService<DeleteLocalActor, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: DeleteLocalActor, principal: FromApi) {
+    override suspend fun internalExecute(command: DeleteLocalActor, principal: LocalUser) {
         if (command.actorId != principal.actorId) {
             throw PermissionDeniedException()
         }

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

@@ -1,37 +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
-
-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 org.springframework.stereotype.Service
-
-@Service
-class SuspendLocalActorApplicationService(
-    private val transaction: Transaction,
-    private val actorRepository: ActorRepository,
-) {
-    suspend fun suspend(actorId: Long, executor: ActorId) {
-        transaction.transaction {
-            val id = ActorId(actorId)
-
-            val actor = actorRepository.findById(id)!!
-            actor.suspend = true
-        }
-    }
-}

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

@@ -1,36 +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
-
-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 org.springframework.stereotype.Service
-
-@Service
-class UnsuspendLocalActorApplicationService(
-    private val transaction: Transaction,
-    private val actorRepository: ActorRepository,
-) {
-    suspend fun unsuspend(actorId: Long, executor: Long) {
-        transaction.transaction {
-            val findById = actorRepository.findById(ActorId(actorId))!!
-
-            findById.suspend = false
-        }
-    }
-}

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

@@ -91,7 +91,6 @@ class RegisterApplicationApplicationService(
         )
     }
 
-
     companion object {
         private val logger = LoggerFactory.getLogger(RegisterApplicationApplicationService::class.java)
     }

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

@@ -0,0 +1,5 @@
+package dev.usbharu.hideout.core.application.domainevent.subscribers
+
+data class RegisterHomeTimeline(
+    val userDetailId: Long
+)

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

@@ -0,0 +1,21 @@
+package dev.usbharu.hideout.core.application.domainevent.subscribers
+
+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
+import org.springframework.stereotype.Component
+
+@Component
+class RegisterLocalUserSetHomeTimelineSubscriber(
+    private val domainEventSubscriber: DomainEventSubscriber,
+    private val userRegisterHomeTimelineApplicationService: UserRegisterHomeTimelineApplicationService
+) : Subscriber {
+    override fun init() {
+        domainEventSubscriber.subscribe<UserDetailEventBody>(UserDetailEvent.CREATE.eventName) {
+            userRegisterHomeTimelineApplicationService.execute(
+                RegisterHomeTimeline(it.body.getUserDetail().id),
+                Anonymous
+            )
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package dev.usbharu.hideout.core.application.domainevent.subscribers
+
+import dev.usbharu.hideout.core.application.timeline.SetTimelineToTimelineStoreApplicationService
+import dev.usbharu.hideout.core.application.timeline.SetTimleineStore
+import dev.usbharu.hideout.core.domain.event.timeline.TimelineEvent
+import dev.usbharu.hideout.core.domain.event.timeline.TimelineEventBody
+import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous
+import org.springframework.stereotype.Component
+
+@Component
+class RegisterTimelineSetTimelineStoreSubscriber(
+    private val domainEventSubscriber: DomainEventSubscriber,
+    private val setTimelineToTimelineStoreApplicationService: SetTimelineToTimelineStoreApplicationService
+) : Subscriber {
+
+    override fun init() {
+        domainEventSubscriber.subscribe<TimelineEventBody>(TimelineEvent.CREATE.eventName) {
+            setTimelineToTimelineStoreApplicationService.execute(SetTimleineStore(it.body.getTimelineId()), Anonymous)
+        }
+    }
+}

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

@@ -1,3 +1,5 @@
 package dev.usbharu.hideout.core.application.domainevent.subscribers
 
-interface Subscriber
+interface Subscriber {
+    fun init()
+}

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

@@ -5,7 +5,8 @@ import org.springframework.boot.ApplicationRunner
 import org.springframework.stereotype.Component
 
 @Component
-class SubscriberRunner(subscribers: List<Subscriber>) : ApplicationRunner {
+class SubscriberRunner(private val subscribers: List<Subscriber>) : ApplicationRunner {
     override fun run(args: ApplicationArguments?) {
+        subscribers.forEach { it.init() }
     }
 }

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

@@ -1,22 +1,20 @@
 package dev.usbharu.hideout.core.application.domainevent.subscribers
 
+import dev.usbharu.hideout.core.application.timeline.AddPost
+import dev.usbharu.hideout.core.application.timeline.TimelineAddPostApplicationService
 import dev.usbharu.hideout.core.domain.event.post.PostEvent
 import dev.usbharu.hideout.core.domain.event.post.PostEventBody
-import org.slf4j.LoggerFactory
+import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous
 import org.springframework.stereotype.Component
 
 @Component
-class TimelinePostCreateSubscriber(domainEventSubscriber: DomainEventSubscriber) : Subscriber {
-    init {
+class TimelinePostCreateSubscriber(
+    private val timelineAddPostApplicationService: TimelineAddPostApplicationService,
+    private val domainEventSubscriber: DomainEventSubscriber,
+) : Subscriber {
+    override fun init() {
         domainEventSubscriber.subscribe<PostEventBody>(PostEvent.CREATE.eventName) {
-            val post = it.body.getPost()
-            val actor = it.body.getActor()
-
-            logger.info("New Post! : {}", post)
+            timelineAddPostApplicationService.execute(AddPost(it.body.getPostId()), Anonymous)
         }
     }
-
-    companion object {
-        private val logger = LoggerFactory.getLogger(TimelinePostCreateSubscriber::class.java)
-    }
 }

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

@@ -1,5 +1,6 @@
 package dev.usbharu.hideout.core.application.domainevent.subscribers
 
+import dev.usbharu.hideout.core.application.exception.InternalServerException
 import dev.usbharu.hideout.core.application.timeline.AddTimelineRelationship
 import dev.usbharu.hideout.core.application.timeline.UserAddTimelineRelationshipApplicationService
 import dev.usbharu.hideout.core.domain.event.relationship.RelationshipEvent
@@ -17,34 +18,35 @@ class TimelineRelationshipFollowSubscriber(
     private val userAddTimelineRelationshipApplicationService: UserAddTimelineRelationshipApplicationService,
     private val idGenerateService: IdGenerateService,
     private val userDetailRepository: UserDetailRepository,
-    domainEventSubscriber: DomainEventSubscriber
+    private val domainEventSubscriber: DomainEventSubscriber
 ) : Subscriber {
 
-    init {
+    override fun init() {
         domainEventSubscriber.subscribe<RelationshipEventBody>(RelationshipEvent.FOLLOW.eventName) {
             val relationship = it.body.getRelationship()
-            val userDetail = userDetailRepository.findByActorId(relationship.actorId.id) ?: throw Exception()
+            val userDetail = userDetailRepository.findByActorId(relationship.actorId.id)
+                ?: throw InternalServerException("Userdetail ${relationship.actorId} not found by actorid.")
             if (userDetail.homeTimelineId == null) {
                 logger.warn("Home timeline for ${relationship.actorId} is not found")
                 return@subscribe
             }
+
+            @Suppress("UnsafeCallOnNullableType")
             userAddTimelineRelationshipApplicationService.execute(
                 AddTimelineRelationship(
                     TimelineRelationship(
                         TimelineRelationshipId(idGenerateService.generateId()),
-                        userDetail.homeTimelineId,
+                        userDetail.homeTimelineId!!,
                         relationship.targetActorId,
                         Visible.FOLLOWERS
                     )
-                ), it.body.principal
+                ),
+                it.body.principal
             )
-
-
         }
     }
 
     companion object {
         private val logger = LoggerFactory.getLogger(TimelineRelationshipFollowSubscriber::class.java)
     }
-
-}
+}

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

@@ -0,0 +1,56 @@
+package dev.usbharu.hideout.core.application.domainevent.subscribers
+
+import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
+import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.domain.model.timeline.*
+import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationship
+import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationshipId
+import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationshipRepository
+import dev.usbharu.hideout.core.domain.model.timelinerelationship.Visible
+import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailId
+import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.shared.id.IdGenerateService
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class UserRegisterHomeTimelineApplicationService(
+    private val userDetailRepository: UserDetailRepository,
+    private val timelineRepository: TimelineRepository,
+    private val idGenerateService: IdGenerateService,
+    transaction: Transaction,
+    private val timelineRelationshipRepository: TimelineRelationshipRepository
+) : AbstractApplicationService<RegisterHomeTimeline, Unit>(transaction, logger) {
+    override suspend fun internalExecute(command: RegisterHomeTimeline, principal: Principal) {
+        val userDetail = (
+            userDetailRepository.findById(UserDetailId(command.userDetailId))
+                ?: throw IllegalArgumentException("UserDetail ${command.userDetailId} not found.")
+            )
+
+        val timeline = Timeline.create(
+            TimelineId(idGenerateService.generateId()),
+            UserDetailId(command.userDetailId),
+            TimelineName("System-LocalUser-HomeTimeline-${command.userDetailId}"),
+            TimelineVisibility.PRIVATE,
+            true
+        )
+        timelineRepository.save(timeline)
+        userDetail.homeTimelineId = timeline.id
+
+        val timelineRelationship = TimelineRelationship(
+            TimelineRelationshipId(idGenerateService.generateId()),
+            timeline.id,
+            userDetail.actorId,
+            Visible.DIRECT
+        )
+
+        timelineRelationshipRepository.save(timelineRelationship)
+
+        userDetailRepository.save(userDetail)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(UserRegisterHomeTimelineApplicationService::class.java)
+    }
+}

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

@@ -11,4 +11,4 @@ class InternalServerException : RuntimeException {
         enableSuppression,
         writableStackTrace
     )
-}
+}

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

@@ -11,4 +11,4 @@ class PermissionDeniedException : RuntimeException {
         enableSuppression,
         writableStackTrace
     )
-}
+}

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

@@ -21,7 +21,7 @@ import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationS
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.filter.FilterId
 import dev.usbharu.hideout.core.domain.model.filter.FilterRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -31,7 +31,7 @@ class UserDeleteFilterApplicationService(private val filterRepository: FilterRep
         transaction,
         logger
     ) {
-    override suspend fun internalExecute(command: DeleteFilter, principal: FromApi) {
+    override suspend fun internalExecute(command: DeleteFilter, principal: LocalUser) {
         val filter =
             filterRepository.findByFilterId(FilterId(command.filterId)) ?: throw IllegalArgumentException("not found")
         if (filter.userDetailId != principal.userDetailId) {

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

@@ -21,7 +21,7 @@ import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationS
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.filter.FilterId
 import dev.usbharu.hideout.core.domain.model.filter.FilterRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -31,7 +31,7 @@ class UserGetFilterApplicationService(private val filterRepository: FilterReposi
         transaction,
         logger
     ) {
-    override suspend fun internalExecute(command: GetFilter, principal: FromApi): Filter {
+    override suspend fun internalExecute(command: GetFilter, principal: LocalUser): Filter {
         val filter =
             filterRepository.findByFilterId(FilterId(command.filterId)) ?: throw IllegalArgumentException("Not Found")
         if (filter.userDetailId != principal.userDetailId) {

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

@@ -20,7 +20,7 @@ import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationS
 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.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.shared.id.IdGenerateService
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -36,8 +36,7 @@ class UserRegisterFilterApplicationService(
         logger
     ) {
 
-    override suspend fun internalExecute(command: RegisterFilter, principal: FromApi): Filter {
-
+    override suspend fun internalExecute(command: RegisterFilter, principal: LocalUser): Filter {
         val filter = dev.usbharu.hideout.core.domain.model.filter.Filter.create(
             id = FilterId(idGenerateService.generateId()),
             userDetailId = principal.userDetailId,

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

@@ -0,0 +1,44 @@
+package dev.usbharu.hideout.core.application.instance
+
+import dev.usbharu.hideout.core.application.exception.InternalServerException
+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.instance.InstanceRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Service
+
+@Service
+class GetLocalInstanceApplicationService(
+    private val applicationConfig: ApplicationConfig,
+    private val instanceRepository: InstanceRepository,
+    transaction: Transaction
+) :
+    AbstractApplicationService<Unit, Instance>(
+        transaction,
+        logger
+    ) {
+    private var cachedInstance: Instance? = null
+
+    override suspend fun internalExecute(command: Unit, principal: Principal): Instance {
+        if (cachedInstance != null) {
+            logger.trace("Use cache {}", cachedInstance)
+            @Suppress("UnsafeCallOnNullableType")
+            return cachedInstance!!
+        }
+
+        val instance = (
+            instanceRepository.findByUrl(applicationConfig.url.toURI())
+                ?: throw InternalServerException("Local instance not found.")
+            )
+
+        cachedInstance = Instance.of(instance)
+        @Suppress("UnsafeCallOnNullableType")
+        return cachedInstance!!
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(GetLocalInstanceApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,17 @@
+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/UploadMediaApplicationService.kt

@@ -19,7 +19,7 @@ package dev.usbharu.hideout.core.application.media
 import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.media.*
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.shared.id.IdGenerateService
 import dev.usbharu.hideout.core.external.media.MediaProcessor
 import dev.usbharu.hideout.core.external.mediastore.MediaStore
@@ -39,7 +39,7 @@ class UploadMediaApplicationService(
     transaction,
     logger
 ) {
-    override suspend fun internalExecute(command: UploadMedia, principal: FromApi): Media {
+    override suspend fun internalExecute(command: UploadMedia, principal: LocalUser): Media {
         val process = mediaProcessor.process(command.path, command.name, null)
         val id = idGenerateService.generateId()
         val thumbnailUri = if (process.thumbnailPath != null) {
@@ -58,7 +58,8 @@ class UploadMediaApplicationService(
             type = process.fileType,
             mimeType = process.mimeType,
             blurHash = process.blurHash?.let { MediaBlurHash(it) },
-            description = command.description?.let { MediaDescription(it) }
+            description = command.description?.let { MediaDescription(it) },
+            actorId = principal.actorId
         )
 
         mediaRepository.save(media)

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

@@ -0,0 +1,31 @@
+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/DeleteLocalPostApplicationService.kt

@@ -16,28 +16,32 @@
 
 package dev.usbharu.hideout.core.application.post
 
+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.ActorRepository
 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.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class DeleteLocalPostApplicationService(
     private val postRepository: PostRepository,
-    private val actorRepository: ActorRepository, transaction: Transaction,
+    private val actorRepository: ActorRepository,
+    transaction: Transaction,
 ) : LocalUserAbstractApplicationService<DeleteLocalPost, Unit>(transaction, logger) {
 
-    override suspend fun internalExecute(command: DeleteLocalPost, principal: FromApi) {
-        val findById = postRepository.findById(PostId(command.postId))!!
+    override suspend fun internalExecute(command: DeleteLocalPost, principal: LocalUser) {
+        val findById = postRepository.findById(PostId(command.postId))
+            ?: throw IllegalArgumentException("Post ${command.postId} not found.")
         if (findById.actorId != principal.actorId) {
             throw PermissionDeniedException()
         }
-        val actor = actorRepository.findById(principal.actorId)!!
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
         findById.delete(actor)
         postRepository.save(findById)
     }

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,82 @@
+package dev.usbharu.hideout.core.application.post
+
+import dev.usbharu.hideout.core.application.exception.InternalServerException
+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
+import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
+import dev.usbharu.hideout.core.domain.model.media.Media
+import dev.usbharu.hideout.core.domain.model.media.MediaRepository
+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 GetPostDetailApplicationService(
+    transaction: Transaction,
+    private val postRepository: PostRepository,
+    private val actorRepository: ActorRepository,
+    private val mediaRepository: MediaRepository,
+    private val iPostReadAccessControl: IPostReadAccessControl
+) : AbstractApplicationService<GetPostDetail, PostDetail>(
+    transaction,
+    logger
+) {
+    override suspend fun internalExecute(command: GetPostDetail, principal: Principal): PostDetail {
+        val post = postRepository.findById(PostId(command.postId))
+            ?: throw IllegalArgumentException("Post ${command.postId} not found.")
+        if (iPostReadAccessControl.isAllow(post, principal).not()) {
+            throw IllegalArgumentException("Post ${command.postId} not found.")
+        }
+        val actor =
+            actorRepository.findById(post.actorId) ?: throw InternalServerException("Actor ${post.actorId} not found.")
+
+        val iconMedia = actor.icon?.let { mediaRepository.findById(it) }
+
+        val mediaList = mediaRepository.findByIds(post.mediaIds)
+
+        return PostDetail.of(
+            post = post,
+            actor = actor,
+            iconMedia = iconMedia,
+            mediaList = mediaList,
+            reply = post.replyId?.let { fetchChild(it, actor, iconMedia, principal) },
+            repost = post.repostId?.let { fetchChild(it, actor, iconMedia, principal) },
+            moveTo = post.moveTo?.let { fetchChild(it, actor, iconMedia, principal) },
+        )
+    }
+
+    private suspend fun fetchChild(
+        postId: PostId,
+        actor: Actor,
+        iconMedia: Media?,
+        principal: Principal
+    ): PostDetail? {
+        val post = postRepository.findById(postId) ?: return null
+
+        if (iPostReadAccessControl.isAllow(post, principal).not()) {
+            return null
+        }
+
+        val (first, third) = if (actor.id != post.actorId) {
+            (actorRepository.findById(post.actorId) ?: return null) to actor.icon?.let { mediaRepository.findById(it) }
+        } else {
+            actor to iconMedia
+        }
+
+        val mediaList = mediaRepository.findByIds(post.mediaIds)
+        return PostDetail.of(
+            post,
+            first,
+            third,
+            mediaList
+        )
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(GetPostDetailApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,30 @@
+package dev.usbharu.hideout.core.application.post
+
+import dev.usbharu.hideout.core.domain.model.media.Media
+import java.net.URI
+
+data class MediaDetail(
+    val mediaId: Long,
+    val type: String,
+    val url: URI,
+    val thumbnailUrl: URI?,
+    val sensitive: Boolean,
+    val description: String,
+    val blurhash: String,
+    val actorId: Long
+) {
+    companion object {
+        fun of(media: Media): MediaDetail {
+            return MediaDetail(
+                mediaId = media.id.id,
+                type = media.type.name,
+                url = media.url,
+                thumbnailUrl = media.thumbnailUrl,
+                sensitive = false,
+                description = media.description?.description.orEmpty(),
+                blurhash = media.blurHash?.hash.orEmpty(),
+                actorId = media.actorId.id
+            )
+        }
+    }
+}

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

@@ -0,0 +1,59 @@
+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 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 PostDetail(
+    val id: Long,
+    val actor: ActorDetail,
+    val overview: String?,
+    val text: String,
+    val content: String,
+    val createdAt: Instant,
+    val visibility: Visibility,
+    val pureRepost: Boolean,
+    val url: URI,
+    val apId: URI,
+    val repost: PostDetail?,
+    val reply: PostDetail?,
+    val sensitive: Boolean,
+    val deleted: Boolean,
+    val mediaDetailList: List<MediaDetail>,
+    val moveTo: PostDetail?
+) {
+    companion object {
+        @Suppress("LongParameterList")
+        fun of(
+            post: Post,
+            actor: Actor,
+            iconMedia: Media?,
+            mediaList: List<Media>,
+            reply: PostDetail? = null,
+            repost: PostDetail? = null,
+            moveTo: PostDetail? = null,
+        ): PostDetail {
+            return PostDetail(
+                id = post.id.id,
+                actor = ActorDetail.of(actor, iconMedia),
+                overview = post.overview?.overview,
+                text = post.text,
+                content = post.content.content,
+                createdAt = post.createdAt,
+                visibility = post.visibility,
+                pureRepost = post.isPureRepost,
+                url = post.url,
+                apId = post.apId,
+                repost = repost,
+                reply = reply,
+                sensitive = post.sensitive,
+                deleted = false,
+                mediaDetailList = mediaList.map { MediaDetail.of(it) },
+                moveTo = moveTo
+            )
+        }
+    }
+}

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

@@ -24,7 +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.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.infrastructure.factory.PostFactoryImpl
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -38,7 +38,7 @@ class RegisterLocalPostApplicationService(
     transaction: Transaction,
 ) : LocalUserAbstractApplicationService<RegisterLocalPost, Long>(transaction, Companion.logger) {
 
-    override suspend fun internalExecute(command: RegisterLocalPost, principal: FromApi): Long {
+    override suspend fun internalExecute(command: RegisterLocalPost, principal: LocalUser): Long {
         val actorId = principal.actorId
 
         val actor = actorRepository.findById(actorId) ?: throw InternalServerException("Actor $actorId not found.")

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

@@ -25,7 +25,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.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
 import dev.usbharu.hideout.core.infrastructure.factory.PostContentFactoryImpl
 import org.slf4j.LoggerFactory
@@ -40,7 +40,7 @@ class UpdateLocalNoteApplicationService(
     private val actorRepository: ActorRepository,
 ) : LocalUserAbstractApplicationService<UpdateLocalNote, Unit>(transaction, logger) {
 
-    override suspend fun internalExecute(command: UpdateLocalNote, principal: FromApi) {
+    override suspend fun internalExecute(command: UpdateLocalNote, principal: LocalUser) {
         val post = postRepository.findById(PostId(command.postId))
             ?: throw IllegalArgumentException("Post ${command.postId} not found.")
         if (post.actorId != principal.actorId) {

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

@@ -23,7 +23,7 @@ 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.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -34,8 +34,7 @@ class UserAcceptFollowRequestApplicationService(
     private val actorRepository: ActorRepository,
 ) :
     LocalUserAbstractApplicationService<AcceptFollowRequest, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: AcceptFollowRequest, principal: FromApi) {
-
+    override suspend fun internalExecute(command: AcceptFollowRequest, principal: LocalUser) {
         val actor = actorRepository.findById(principal.actorId)
             ?: throw InternalServerException("Actor ${principal.actorId} not found")
 

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

@@ -22,8 +22,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.service.relationship.RelationshipDomainService
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -33,14 +32,12 @@ class UserBlockApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
     private val relationshipDomainService: RelationshipDomainService,
 ) :
     LocalUserAbstractApplicationService<Block, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: Block, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: Block, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw IllegalStateException("Actor ${principal.actorId} not found")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(

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

@@ -16,14 +16,14 @@
 
 package dev.usbharu.hideout.core.application.relationship.followrequest
 
+import dev.usbharu.hideout.core.application.exception.InternalServerException
 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -32,16 +32,14 @@ class UserFollowRequestApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) : LocalUserAbstractApplicationService<FollowRequest, Unit>(
     transaction,
     logger
 ) {
 
-    override suspend fun internalExecute(command: FollowRequest, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: FollowRequest, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.get
 
+import dev.usbharu.hideout.core.application.exception.InternalServerException
 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
@@ -23,8 +24,7 @@ import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
 import dev.usbharu.hideout.core.domain.model.actorinstancerelationship.ActorInstanceRelationship
 import dev.usbharu.hideout.core.domain.model.actorinstancerelationship.ActorInstanceRelationshipRepository
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service
 class GetRelationshipApplicationService(
     private val relationshipRepository: RelationshipRepository,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
     private val actorInstanceRelationshipRepository: ActorInstanceRelationshipRepository,
     transaction: Transaction,
 ) :
@@ -40,11 +39,12 @@ class GetRelationshipApplicationService(
         transaction,
         logger
     ) {
-    override suspend fun internalExecute(command: GetRelationship, principal: FromApi): Relationship {
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: GetRelationship, principal: LocalUser): Relationship {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
         val targetId = ActorId(command.targetActorId)
-        val target = actorRepository.findById(targetId)!!
+        val target = actorRepository.findById(targetId)
+            ?: throw IllegalArgumentException("Actor ${command.targetActorId} not found.")
         val relationship = (
             relationshipRepository.findByActorIdAndTargetId(actor.id, targetId)
                 ?: dev.usbharu.hideout.core.domain.model.relationship.Relationship.default(actor.id, targetId)

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.mute
 
+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
@@ -23,8 +24,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -33,13 +33,11 @@ class UserMuteApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<Mute, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: Mute, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: Mute, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(

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

@@ -16,14 +16,14 @@
 
 package dev.usbharu.hideout.core.application.relationship.rejectfollowrequest
 
+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
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -32,18 +32,16 @@ class UserRejectFollowRequestApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<RejectFollowRequest, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: RejectFollowRequest, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: RejectFollowRequest, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.sourceActorId)
 
         val relationship = relationshipRepository.findByActorIdAndTargetId(targetId, actor.id)
-            ?: throw Exception("Follow request not found")
+            ?: throw IllegalArgumentException("Follow request not found")
 
         relationship.rejectFollowRequest()
 

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.removefromfollowers
 
+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
@@ -23,8 +24,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -33,13 +33,11 @@ class UserRemoveFromFollowersApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<RemoveFromFollowers, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: RemoveFromFollowers, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: RemoveFromFollowers, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(targetId, actor.id) ?: Relationship.default(

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.unblock
 
+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
@@ -23,8 +24,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -33,13 +33,11 @@ class UserUnblockApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<Unblock, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: Unblock, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: Unblock, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.unfollow
 
+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
@@ -23,8 +24,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -33,13 +33,11 @@ class UserUnfollowApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<Unfollow, Unit>(transaction, logger) {
-    override suspend fun internalExecute(command: Unfollow, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: Unfollow, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(

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

@@ -16,6 +16,7 @@
 
 package dev.usbharu.hideout.core.application.relationship.unmute
 
+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
@@ -23,8 +24,7 @@ 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.relationship.Relationship
 import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
-import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
@@ -33,17 +33,11 @@ class UserUnmuteApplicationService(
     private val relationshipRepository: RelationshipRepository,
     transaction: Transaction,
     private val actorRepository: ActorRepository,
-    private val userDetailRepository: UserDetailRepository,
 ) :
     LocalUserAbstractApplicationService<Unmute, Unit>(transaction, logger) {
-    companion object {
-        private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
-    }
-
-    override suspend fun internalExecute(command: Unmute, principal: FromApi) {
-
-        val userDetail = userDetailRepository.findById(principal.userDetailId)!!
-        val actor = actorRepository.findById(userDetail.actorId)!!
+    override suspend fun internalExecute(command: Unmute, principal: LocalUser) {
+        val actor = actorRepository.findById(principal.actorId)
+            ?: throw InternalServerException("Actor ${principal.actorId} not found.")
 
         val targetId = ActorId(command.targetActorId)
         val relationship = relationshipRepository.findByActorIdAndTargetId(actor.id, targetId) ?: Relationship.default(
@@ -55,4 +49,8 @@ class UserUnmuteApplicationService(
 
         relationshipRepository.save(relationship)
     }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
+    }
 }

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

@@ -30,12 +30,13 @@ abstract class AbstractApplicationService<T : Any, R>(
             val response = transaction.transaction<R> {
                 internalExecute(command, principal)
             }
-            logger.info("SUCCESS ${command::class.simpleName}")
+
+            logger.info("SUCCESS $command $response")
             response
         } catch (e: CancellationException) {
             logger.debug("Coroutine canceled", e)
             throw e
-        } catch (e: Exception) {
+        } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
             logger.warn("Command execution error", e)
             throw e
         }

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

@@ -1,15 +1,18 @@
 package dev.usbharu.hideout.core.application.shared
 
-import dev.usbharu.hideout.core.domain.model.support.principal.FromApi
+import dev.usbharu.hideout.core.application.exception.PermissionDeniedException
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.model.support.principal.Principal
 import org.slf4j.Logger
 
 abstract class LocalUserAbstractApplicationService<T : Any, R>(transaction: Transaction, logger: Logger) :
     AbstractApplicationService<T, R>(transaction, logger) {
     override suspend fun internalExecute(command: T, principal: Principal): R {
-        require(principal is FromApi)
+        if (principal !is LocalUser) {
+            throw PermissionDeniedException()
+        }
         return internalExecute(command, principal)
     }
 
-    protected abstract suspend fun internalExecute(command: T, principal: FromApi): R
-}
+    protected abstract suspend fun internalExecute(command: T, principal: LocalUser): R
+}

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

@@ -0,0 +1,5 @@
+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/GetUserTimeline.kt

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,53 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.application.post.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.PaginationList
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.query.usertimeline.UserTimelineQueryService
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Service
+
+@Service
+class GetUserTimelineApplicationService(
+    private val userTimelineQueryService: UserTimelineQueryService,
+    private val postRepository: PostRepository,
+    transaction: Transaction
+) :
+    AbstractApplicationService<GetUserTimeline, PaginationList<PostDetail, PostId>>(transaction, logger) {
+    override suspend fun internalExecute(
+        command: GetUserTimeline,
+        principal: Principal
+    ): PaginationList<PostDetail, PostId> {
+        val postList = postRepository.findByActorIdAndVisibilityInList(
+            ActorId(command.id),
+            listOf(Visibility.PUBLIC, Visibility.UNLISTED, Visibility.FOLLOWERS),
+            command.page
+        )
+
+        val postIdList =
+            postList.mapNotNull { it.repostId } + postList.mapNotNull { it.replyId } + postList.map { it.id }
+
+        val postDetailMap = userTimelineQueryService.findByIdAll(postIdList, principal).associateBy { it.id }
+
+        return PaginationList(
+            postList.mapNotNull {
+                postDetailMap[it.id.id]?.copy(
+                    repost = postDetailMap[it.repostId?.id],
+                    reply = postDetailMap[it.replyId?.id]
+                )
+            },
+            postList.next,
+            postList.prev
+        )
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(GetUserTimelineApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,11 @@
+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
+)

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

@@ -0,0 +1,84 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.application.post.PostDetail
+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.support.page.PaginationList
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineRepository
+import dev.usbharu.hideout.core.external.timeline.ReadTimelineOption
+import dev.usbharu.hideout.core.external.timeline.TimelineStore
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Service
+
+@Service
+class ReadTimelineApplicationService(
+    private val timelineStore: TimelineStore,
+    private val timelineRepository: TimelineRepository,
+    transaction: Transaction
+) :
+    AbstractApplicationService<ReadTimeline, PaginationList<PostDetail, PostId>>(transaction, logger) {
+    override suspend fun internalExecute(
+        command: ReadTimeline,
+        principal: Principal
+    ): PaginationList<PostDetail, PostId> {
+        val findById = timelineRepository.findById(TimelineId(command.timelineId))
+            ?: throw IllegalArgumentException("Timeline ${command.timelineId} not found.")
+
+        val readTimelineOption = ReadTimelineOption(
+            command.mediaOnly,
+            command.localOnly,
+            command.remoteOnly
+        )
+
+        val timeline = timelineStore.readTimeline(
+            findById,
+            readTimelineOption,
+            command.page,
+            principal,
+        )
+
+        val postDetailList = timeline.map {
+            val reply = if (it.replyPost != null) {
+                @Suppress("UnsafeCallOnNullableType")
+                PostDetail.of(
+                    it.replyPost,
+                    it.replyPostActor!!,
+                    it.replyPostActorIconMedia,
+                    it.replyPostMedias.orEmpty()
+                )
+            } else {
+                null
+            }
+
+            val repost = if (it.repostPost != null) {
+                @Suppress("UnsafeCallOnNullableType")
+                PostDetail.of(
+                    it.repostPost,
+                    it.repostPostActor!!,
+                    it.repostPostActorIconMedia,
+                    it.repostPostMedias.orEmpty()
+                )
+            } else {
+                null
+            }
+
+            PostDetail.of(
+                post = it.post,
+                actor = it.postActor,
+                iconMedia = it.postActorIconMedia,
+                mediaList = it.postMedias,
+                reply = reply,
+                repost = repost
+            )
+        }
+
+        return PaginationList(postDetailList, timeline.next, timeline.prev)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(ReadTimelineApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,8 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineVisibility
+
+data class RegisterTimeline(
+    val timelineName: String,
+    val visibility: TimelineVisibility
+)

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

@@ -0,0 +1,30 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
+import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineRepository
+import dev.usbharu.hideout.core.external.timeline.TimelineStore
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class SetTimelineToTimelineStoreApplicationService(
+    transaction: Transaction,
+    private val timelineStore: TimelineStore,
+    private val timelineRepository: TimelineRepository
+) :
+    AbstractApplicationService<SetTimleineStore, Unit>(
+        transaction,
+        logger
+    ) {
+    override suspend fun internalExecute(command: SetTimleineStore, principal: Principal) {
+        val findById = timelineRepository.findById(command.timelineId)
+            ?: throw IllegalArgumentException("Timeline ${command.timelineId} not found")
+        timelineStore.addTimeline(findById, emptyList())
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(SetTimelineToTimelineStoreApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,5 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
+
+data class SetTimleineStore(val timelineId: TimelineId)

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

@@ -0,0 +1,29 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
+import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.domain.model.post.PostRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.external.timeline.TimelineStore
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class TimelineAddPostApplicationService(
+    private val timelineStore: TimelineStore,
+    private val postRepository: PostRepository,
+    transaction: Transaction
+) : AbstractApplicationService<AddPost, Unit>(
+    transaction,
+    logger
+) {
+    override suspend fun internalExecute(command: AddPost, principal: Principal) {
+        val findById = postRepository.findById(command.postId)
+            ?: throw IllegalArgumentException("Post ${command.postId} not found.")
+        timelineStore.addPost(findById)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(TimelineAddPostApplicationService::class.java)
+    }
+}

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

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.core.application.timeline
 
-import dev.usbharu.hideout.core.application.shared.AbstractApplicationService
+import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
-import dev.usbharu.hideout.core.domain.model.support.principal.Principal
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
 import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationshipRepository
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
@@ -12,15 +12,15 @@ class UserAddTimelineRelationshipApplicationService(
     private val timelineRelationshipRepository: TimelineRelationshipRepository,
     transaction: Transaction
 ) :
-    AbstractApplicationService<AddTimelineRelationship, Unit>(
-        transaction, logger
+    LocalUserAbstractApplicationService<AddTimelineRelationship, Unit>(
+        transaction,
+        logger
     ) {
-    override suspend fun internalExecute(command: AddTimelineRelationship, principal: Principal) {
+    override suspend fun internalExecute(command: AddTimelineRelationship, principal: LocalUser) {
         timelineRelationshipRepository.save(command.timelineRelationship)
-
     }
 
     companion object {
         private val logger = LoggerFactory.getLogger(UserAddTimelineRelationshipApplicationService::class.java)
     }
-}
+}

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

@@ -0,0 +1,37 @@
+package dev.usbharu.hideout.core.application.timeline
+
+import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
+import dev.usbharu.hideout.core.application.shared.Transaction
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
+import dev.usbharu.hideout.core.domain.model.timeline.Timeline
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineName
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineRepository
+import dev.usbharu.hideout.core.domain.shared.id.IdGenerateService
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class UserRegisterTimelineApplicationService(
+    private val idGenerateService: IdGenerateService,
+    private val timelineRepository: TimelineRepository,
+    transaction: Transaction
+) :
+    LocalUserAbstractApplicationService<RegisterTimeline, TimelineId>(transaction, logger) {
+    override suspend fun internalExecute(command: RegisterTimeline, principal: LocalUser): TimelineId {
+        val timeline = Timeline.create(
+            id = TimelineId(idGenerateService.generateId()),
+            userDetailId = principal.userDetailId,
+            name = TimelineName(command.timelineName),
+            visibility = command.visibility,
+            isSystem = false
+        )
+
+        timelineRepository.save(timeline)
+        return timeline.id
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(UserRegisterTimelineApplicationService::class.java)
+    }
+}

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

@@ -0,0 +1,26 @@
+package dev.usbharu.hideout.core.config
+
+import org.springframework.boot.autoconfigure.context.MessageSourceProperties
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.context.MessageSource
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
+import org.springframework.context.support.ReloadableResourceBundleMessageSource
+
+@Configuration
+@Profile("dev")
+class MessageSourceConfig {
+    @Bean
+    fun messageSource(messageSourceProperties: MessageSourceProperties): MessageSource {
+        val reloadableResourceBundleMessageSource = ReloadableResourceBundleMessageSource()
+        reloadableResourceBundleMessageSource.setBasename("classpath:" + messageSourceProperties.basename)
+        reloadableResourceBundleMessageSource.setCacheSeconds(0)
+        return reloadableResourceBundleMessageSource
+    }
+
+    @Bean
+    @Profile("dev")
+    @ConfigurationProperties(prefix = "spring.messages")
+    fun messageSourceProperties(): MessageSourceProperties = MessageSourceProperties()
+}

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

@@ -23,6 +23,7 @@ import com.nimbusds.jose.jwk.source.JWKSource
 import com.nimbusds.jose.proc.SecurityContext
 import dev.usbharu.hideout.core.infrastructure.springframework.oauth2.HideoutUserDetails
 import dev.usbharu.hideout.util.RsaUtil
+import org.slf4j.LoggerFactory
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -50,9 +51,13 @@ import org.springframework.security.oauth2.server.authorization.token.JwtEncodin
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint
+import java.security.KeyPairGenerator
+import java.security.interfaces.RSAPrivateKey
+import java.security.interfaces.RSAPublicKey
+import java.util.*
 
 @Configuration
-@EnableWebSecurity(debug = true)
+@EnableWebSecurity(debug = false)
 class SecurityConfig {
     @Bean
     fun passwordEncoder(): PasswordEncoder = BCryptPasswordEncoder()
@@ -63,7 +68,7 @@ class SecurityConfig {
         OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http)
         http {
             exceptionHandling {
-                authenticationEntryPoint = LoginUrlAuthenticationEntryPoint("/login")
+                authenticationEntryPoint = LoginUrlAuthenticationEntryPoint("/auth/sign_in")
             }
         }
         return http.build()
@@ -75,16 +80,29 @@ class SecurityConfig {
         http {
             authorizeHttpRequests {
                 authorize("/error", permitAll)
-                authorize("/login", permitAll)
+                authorize("/auth/sign_in", permitAll)
                 authorize(GET, "/.well-known/**", permitAll)
                 authorize(GET, "/nodeinfo/2.0", permitAll)
 
                 authorize(GET, "/auth/sign_up", hasRole("ANONYMOUS"))
                 authorize(POST, "/auth/sign_up", permitAll)
+                authorize(GET, "/users/{username}/posts/{postId}", permitAll)
+                authorize(GET, "/users/{userid}", permitAll)
+                authorize(GET, "/files/*", permitAll)
+                authorize(POST, "/publish", authenticated)
+                authorize(GET, "/publish", authenticated)
+                authorize(GET, "/", permitAll)
 
                 authorize(anyRequest, authenticated)
             }
             formLogin {
+                loginPage = "/auth/sign_in"
+                loginProcessingUrl = "/login"
+                defaultSuccessUrl("/home", false)
+            }
+            logout {
+                logoutUrl = "/auth/sign_out"
+                logoutSuccessUrl = "/auth/sign_in"
             }
         }
         return http.build()
@@ -122,17 +140,55 @@ class SecurityConfig {
     }
 
     @Bean
-    fun loadJwkSource(jwkConfig: JwkConfig): JWKSource<SecurityContext> {
-        val rsaKey = RSAKey.Builder(RsaUtil.decodeRsaPublicKey(jwkConfig.publicKey))
-            .privateKey(RsaUtil.decodeRsaPrivateKey(jwkConfig.privateKey)).keyID(jwkConfig.keyId).build()
+    @Suppress("UnsafeCallOnNullableType")
+    fun loadJwkSource(jwkConfig: JwkConfig, applicationConfig: ApplicationConfig): JWKSource<SecurityContext> {
+        if (jwkConfig.keyId == null) {
+            logger.error("hideout.security.jwt.keyId is null.")
+        }
+        if (jwkConfig.publicKey == null) {
+            logger.error("hideout.security.jwt.publicKey is null.")
+        }
+        if (jwkConfig.privateKey == null) {
+            logger.error("hideout.security.jwt.privateKey is null.")
+        }
+        if (jwkConfig.keyId == null || jwkConfig.publicKey == null || jwkConfig.privateKey == null) {
+            val keyPairGenerator = KeyPairGenerator.getInstance("RSA")
+            keyPairGenerator.initialize(applicationConfig.keySize)
+            val generateKeyPair = keyPairGenerator.generateKeyPair()
+
+            jwkConfig.keyId = UUID.randomUUID().toString()
+            jwkConfig.publicKey = RsaUtil.encodeRsaPublicKey(generateKeyPair.public as RSAPublicKey)
+            jwkConfig.privateKey = RsaUtil.encodeRsaPrivateKey(generateKeyPair.private as RSAPrivateKey)
+            logger.error(
+                """
+                |==============
+                |==============
+                |
+                |**Write the following settings in application.yml**
+                |
+                |hideout:
+                |   security:
+                |       jwt:
+                |           keyId: ${jwkConfig.keyId}
+                |           publicKey: ${jwkConfig.publicKey}
+                |           privateKey: ${jwkConfig.privateKey}
+                |
+                |==============
+                |==============
+                """.trimMargin()
+            )
+        }
+
+        val rsaKey = RSAKey.Builder(RsaUtil.decodeRsaPublicKey(jwkConfig.publicKey!!))
+            .privateKey(RsaUtil.decodeRsaPrivateKey(jwkConfig.privateKey!!)).keyID(jwkConfig.keyId).build()
         return ImmutableJWKSet(JWKSet(rsaKey))
     }
 
     @ConfigurationProperties("hideout.security.jwt")
     data class JwkConfig(
-        val keyId: String,
-        val publicKey: String,
-        val privateKey: String,
+        var keyId: String?,
+        var publicKey: String?,
+        var privateKey: String?,
     )
 
     @Bean
@@ -191,4 +247,8 @@ class SecurityConfig {
 
         return roleHierarchyImpl
     }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(SecurityConfig::class.java)
+    }
 }

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

@@ -16,20 +16,29 @@
 
 package dev.usbharu.hideout.core.config
 
+import dev.usbharu.hideout.core.infrastructure.springframework.SPAInterceptor
 import dev.usbharu.hideout.generate.JsonOrFormModelMethodProcessor
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.converter.HttpMessageConverter
 import org.springframework.web.method.support.HandlerMethodArgumentResolver
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor
 import org.springframework.web.servlet.mvc.method.annotation.ServletModelAttributeMethodProcessor
 
 @Configuration
-class MvcConfigurer(private val jsonOrFormModelMethodProcessor: JsonOrFormModelMethodProcessor) : WebMvcConfigurer {
+class MvcConfigurer(
+    private val jsonOrFormModelMethodProcessor: JsonOrFormModelMethodProcessor,
+    private val spaInterceptor: SPAInterceptor
+) : WebMvcConfigurer {
     override fun addArgumentResolvers(resolvers: MutableList<HandlerMethodArgumentResolver>) {
         resolvers.add(jsonOrFormModelMethodProcessor)
     }
+
+    override fun addInterceptors(registry: InterceptorRegistry) {
+        registry.addInterceptor(spaInterceptor)
+    }
 }
 
 @Configuration

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/event/actor/ActorEvent.kt

@@ -17,6 +17,7 @@
 package dev.usbharu.hideout.core.domain.event.actor
 
 import dev.usbharu.hideout.core.domain.model.actor.Actor
+import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEvent
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventBody
 
@@ -24,13 +25,13 @@ class ActorDomainEventFactory(private val actor: Actor) {
     fun createEvent(actorEvent: ActorEvent): DomainEvent<ActorEventBody> {
         return DomainEvent.create(
             actorEvent.eventName,
-            ActorEventBody(actor),
+            ActorEventBody(actor.id),
             actorEvent.collectable
         )
     }
 }
 
-class ActorEventBody(actor: Actor) : DomainEventBody(
+class ActorEventBody(actor: ActorId) : DomainEventBody(
     mapOf(
         "actor" to actor
     ),

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/event/post/PostEvent.kt

@@ -17,7 +17,9 @@
 package dev.usbharu.hideout.core.domain.event.post
 
 import dev.usbharu.hideout.core.domain.model.actor.Actor
+import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.post.Post
+import dev.usbharu.hideout.core.domain.model.post.PostId
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEvent
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventBody
 
@@ -25,14 +27,14 @@ class PostDomainEventFactory(private val post: Post, private val actor: Actor? =
     fun createEvent(postEvent: PostEvent): DomainEvent<PostEventBody> {
         return DomainEvent.create(
             postEvent.eventName,
-            PostEventBody(post, actor)
+            PostEventBody(post.id, actor?.id)
         )
     }
 }
 
-class PostEventBody(post: Post, actor: Actor?) : DomainEventBody(mapOf("post" to post, "actor" to actor)) {
-    fun getPost(): Post = toMap()["post"] as Post
-    fun getActor(): Actor? = toMap()["actor"] as Actor?
+class PostEventBody(post: PostId, actor: ActorId?) : DomainEventBody(mapOf("post" to post, "actor" to actor)) {
+    fun getPostId(): PostId = toMap()["post"] as PostId
+    fun getActorId(): ActorId? = toMap()["actor"] as? ActorId
 }
 
 enum class PostEvent(val eventName: String) {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/event/relationship/RelationshipEvent.kt

@@ -31,9 +31,7 @@ class RelationshipEventBody(
     relationship: Relationship,
     override val principal: Principal
 ) : DomainEventBody(mapOf("relationship" to relationship), principal) {
-    fun getRelationship(): Relationship {
-        return toMap()["relationship"] as Relationship
-    }
+    fun getRelationship(): Relationship = toMap()["relationship"] as Relationship
 }
 
 enum class RelationshipEvent(val eventName: String) {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/event/timeline/TimelineEvent.kt

@@ -1,16 +1,20 @@
 package dev.usbharu.hideout.core.domain.event.timeline
 
 import dev.usbharu.hideout.core.domain.model.timeline.Timeline
+import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEvent
 import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventBody
 
 class TimelineEventFactory(private val timeline: Timeline) {
     fun createEvent(timelineEvent: TimelineEvent): DomainEvent<TimelineEventBody> =
-        DomainEvent.create(timelineEvent.eventName, TimelineEventBody(timeline))
+        DomainEvent.create(timelineEvent.eventName, TimelineEventBody(timeline.id))
 }
 
-class TimelineEventBody(timeline: Timeline) : DomainEventBody(mapOf("timeline" to timeline))
+class TimelineEventBody(timelineId: TimelineId) : DomainEventBody(mapOf("timeline" to timelineId)) {
+    fun getTimelineId(): TimelineId = toMap()["timeline"] as TimelineId
+}
 
 enum class TimelineEvent(val eventName: String) {
-    CHANGE_VISIBILITY("ChangeVisibility")
+    CHANGE_VISIBILITY("ChangeVisibility"),
+    CREATE("TimelineCreate")
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/event/userdetail/UserDetailEvent.kt

@@ -0,0 +1,27 @@
+package dev.usbharu.hideout.core.domain.event.userdetail
+
+import dev.usbharu.hideout.core.domain.model.userdetails.UserDetail
+import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailId
+import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEvent
+import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventBody
+
+class UserDetailDomainEventFactory(private val userDetail: UserDetail) {
+    fun createEvent(userDetailEvent: UserDetailEvent): DomainEvent<UserDetailEventBody> {
+        return DomainEvent.create(
+            userDetailEvent.eventName,
+            UserDetailEventBody(userDetail.id)
+        )
+    }
+}
+
+class UserDetailEventBody(userDetail: UserDetailId) : DomainEventBody(
+    mapOf(
+        "userDetail" to userDetail
+    )
+) {
+    fun getUserDetail(): UserDetailId = toMap()["userDetail"] as UserDetailId
+}
+
+enum class UserDetailEvent(val eventName: String) {
+    CREATE("UserDetailCreate"),
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Role.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.domain.model.actor
-
-enum class Role {
-    LOCAL,
-    MODERATOR,
-    ADMINISTRATOR,
-    REMOTE
-}

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

@@ -65,10 +65,7 @@ class Filter(
         return id == other.id
     }
 
-    override fun hashCode(): Int {
-        return id.hashCode()
-    }
-
+    override fun hashCode(): Int = id.hashCode()
 
     companion object {
         fun isAllow(user: UserDetail, action: Action, resource: Filter): Boolean {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt

@@ -8,6 +8,5 @@ interface FilterRepository {
 
     suspend fun findByFilterKeywordId(filterKeywordId: FilterKeywordId): Filter?
     suspend fun findByFilterId(filterId: FilterId): Filter?
-
     suspend fun findByUserDetailId(userDetailId: UserDetailId): List<Filter>
 }

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

@@ -16,8 +16,10 @@
 
 package dev.usbharu.hideout.core.domain.model.media
 
+import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import java.net.URI
 
+@Suppress("LongParameterList")
 class Media(
     val id: MediaId,
     val name: MediaName,
@@ -28,6 +30,7 @@ class Media(
     val mimeType: MimeType,
     val blurHash: MediaBlurHash?,
     val description: MediaDescription? = null,
+    val actorId: ActorId,
 ) {
     var url = url
         private set
@@ -35,17 +38,30 @@ class Media(
     fun setUrl(url: URI) {
         this.url = url
     }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Media
+
+        return id == other.id
+    }
+
+    override fun hashCode(): Int = id.hashCode()
+
     override fun toString(): String {
         return "Media(" +
             "id=$id, " +
             "name=$name, " +
-            "url=$url, " +
             "remoteUrl=$remoteUrl, " +
             "thumbnailUrl=$thumbnailUrl, " +
             "type=$type, " +
             "mimeType=$mimeType, " +
             "blurHash=$blurHash, " +
-            "description=$description" +
+            "description=$description, " +
+            "actorId=$actorId, " +
+            "url=$url" +
             ")"
     }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt

@@ -19,5 +19,6 @@ package dev.usbharu.hideout.core.domain.model.media
 interface MediaRepository {
     suspend fun save(media: Media): Media
     suspend fun findById(id: MediaId): Media?
+    suspend fun findByIds(ids: List<MediaId>): List<Media>
     suspend fun delete(media: Media)
 }

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

@@ -83,6 +83,8 @@ class Post(
         }
     }
 
+    val isPureRepost = content == PostContent.empty && overview == null && replyId == null && repostId != null
+
     var content = content
         get() {
             if (hide) {
@@ -199,7 +201,7 @@ class Post(
     var moveTo = moveTo
         private set
 
-    fun moveTo(moveTo: PostId, actor: Actor) {
+    fun moveTo(moveTo: PostId) {
         require(this.moveTo == null)
         this.moveTo = moveTo
     }
@@ -239,25 +241,25 @@ class Post(
 
     override fun toString(): String {
         return "Post(" +
-                "id=$id, " +
-                "createdAt=$createdAt, " +
-                "url=$url, " +
-                "repostId=$repostId, " +
-                "replyId=$replyId, " +
-                "apId=$apId, " +
-                "actorId=$actorId, " +
-                "visibility=$visibility, " +
-                "visibleActors=$visibleActors, " +
-                "content=$content, " +
-                "overview=$overview, " +
-                "sensitive=$sensitive, " +
-                "text='$text', " +
-                "emojiIds=$emojiIds, " +
-                "mediaIds=$mediaIds, " +
-                "deleted=$deleted, " +
-                "hide=$hide, " +
-                "moveTo=$moveTo" +
-                ")"
+            "id=$id, " +
+            "createdAt=$createdAt, " +
+            "url=$url, " +
+            "repostId=$repostId, " +
+            "replyId=$replyId, " +
+            "apId=$apId, " +
+            "actorId=$actorId, " +
+            "visibility=$visibility, " +
+            "visibleActors=$visibleActors, " +
+            "content=$content, " +
+            "overview=$overview, " +
+            "sensitive=$sensitive, " +
+            "text='$text', " +
+            "emojiIds=$emojiIds, " +
+            "mediaIds=$mediaIds, " +
+            "deleted=$deleted, " +
+            "hide=$hide, " +
+            "moveTo=$moveTo" +
+            ")"
     }
 
     companion object {
@@ -313,6 +315,5 @@ class Post(
             post.addDomainEvent(PostDomainEventFactory(post).createEvent(PostEvent.CREATE))
             return post
         }
-
     }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt

@@ -27,6 +27,8 @@ interface PostRepository {
     suspend fun findAllById(ids: List<PostId>): List<Post>
     suspend fun findByActorId(id: ActorId, page: Page? = null): PaginationList<Post, PostId>
     suspend fun delete(post: Post)
+
+    @Suppress("FunctionMaxLength")
     suspend fun findByActorIdAndVisibilityInList(
         actorId: ActorId,
         visibilityList: List<Visibility>,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt

@@ -18,10 +18,23 @@ package dev.usbharu.hideout.core.domain.model.relationship
 
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 
+@Suppress("FunctionMaxLength")
 interface RelationshipRepository {
     suspend fun save(relationship: Relationship): Relationship
     suspend fun delete(relationship: Relationship)
     suspend fun findByActorIdAndTargetId(actorId: ActorId, targetId: ActorId): Relationship?
+    suspend fun findByActorIdsAndTargetIdAndBlocking(
+        actorIds: List<ActorId>,
+        targetId: ActorId,
+        blocking: Boolean
+    ): List<Relationship>
+
+    suspend fun findByActorIdAndTargetIdsAndFollowing(
+        actorId: ActorId,
+        targetIds: List<ActorId>,
+        following: Boolean
+    ): List<Relationship>
+
     suspend fun findByTargetId(
         targetId: ActorId,
         option: FindRelationshipOption? = null,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/acct/Acct.kt

@@ -4,7 +4,15 @@ data class Acct(
     val userpart: String,
     val host: String
 ) {
-    override fun toString(): String {
-        return "acct:$userpart@$host"
+    override fun toString(): String = "acct:$userpart@$host"
+
+    companion object {
+
+        fun of(acct: String): Acct {
+            return Acct(
+                acct.substringBeforeLast('@'),
+                acct.substringAfterLast('@', "")
+            )
+        }
     }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/Anonymous.kt

@@ -2,4 +2,4 @@ package dev.usbharu.hideout.core.domain.model.support.principal
 
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 
-data object Anonymous : Principal(ActorId.ghost, null, null)
+data object Anonymous : Principal(ActorId.ghost, null, null)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/LocalUser.kt

@@ -4,7 +4,7 @@ import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.support.acct.Acct
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailId
 
-class FromApi(
+class LocalUser(
     actorId: ActorId,
     override val userDetailId: UserDetailId,
     override val acct: Acct
@@ -12,4 +12,4 @@ class FromApi(
     actorId,
     userDetailId,
     acct
-)
+)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/Principal.kt

@@ -4,4 +4,4 @@ import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.support.acct.Acct
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailId
 
-sealed class Principal(open val actorId: ActorId, open val userDetailId: UserDetailId?, open val acct: Acct?)
+sealed class Principal(open val actorId: ActorId, open val userDetailId: UserDetailId?, open val acct: Acct?)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/PrincipalContextHolder.kt

@@ -2,4 +2,4 @@ package dev.usbharu.hideout.core.domain.model.support.principal
 
 interface PrincipalContextHolder {
     suspend fun getPrincipal(): Principal
-}
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/timelineobjectdetail/TimelineObjectDetail.kt

@@ -1,6 +1,7 @@
 package dev.usbharu.hideout.core.domain.model.support.timelineobjectdetail
 
 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
 import dev.usbharu.hideout.core.domain.model.post.PostId
 import dev.usbharu.hideout.core.domain.model.timelineobject.TimelineObject
@@ -14,42 +15,61 @@ data class TimelineObjectDetail(
     val postId: PostId,
     val timelineUserDetail: UserDetail,
     val post: Post,
+    val postMedias: List<Media>,
     val postActor: Actor,
+    val postActorIconMedia: Media?,
     val replyPost: Post?,
+    val replyPostMedias: List<Media>?,
     val replyPostActor: Actor?,
+    val replyPostActorIconMedia: Media?,
     val repostPost: Post?,
+    val repostPostMedias: List<Media>?,
     val repostPostActor: Actor?,
+    val repostPostActorIconMedia: Media?,
     val isPureRepost: Boolean,
     val lastUpdateAt: Instant,
     val hasMediaInRepost: Boolean,
     val warnFilter: List<TimelineObjectWarnFilter>
 ) {
     companion object {
+        @Suppress("LongParameterList")
         fun of(
             timelineObject: TimelineObject,
             timelineUserDetail: UserDetail,
             post: Post,
+            postMedias: List<Media>,
             postActor: Actor,
+            postActorIconMedia: Media?,
             replyPost: Post?,
+            replyPostMedias: List<Media>?,
             replyPostActor: Actor?,
+            replyPostActorIconMedia: Media?,
             repostPost: Post?,
+            repostPostMedias: List<Media>?,
             repostPostActor: Actor?,
+            repostPostActorIconMedia: Media?,
             warnFilter: List<TimelineObjectWarnFilter>
         ): TimelineObjectDetail {
             return TimelineObjectDetail(
-                timelineObject.id,
-                post.id,
-                timelineUserDetail,
-                post,
-                postActor,
-                replyPost,
-                replyPostActor,
-                repostPost,
-                repostPostActor,
-                timelineObject.isPureRepost,
-                timelineObject.lastUpdatedAt,
-                timelineObject.hasMediaInRepost,
-                warnFilter
+                id = timelineObject.id,
+                postId = post.id,
+                timelineUserDetail = timelineUserDetail,
+                post = post,
+                postMedias = postMedias,
+                postActor = postActor,
+                postActorIconMedia = postActorIconMedia,
+                replyPost = replyPost,
+                replyPostMedias = replyPostMedias,
+                replyPostActor = replyPostActor,
+                replyPostActorIconMedia = replyPostActorIconMedia,
+                repostPost = repostPost,
+                repostPostMedias = repostPostMedias,
+                repostPostActor = repostPostActor,
+                repostPostActorIconMedia = repostPostActorIconMedia,
+                isPureRepost = timelineObject.isPureRepost,
+                lastUpdateAt = timelineObject.lastUpdatedAt,
+                hasMediaInRepost = timelineObject.hasMediaInRepost,
+                warnFilter = warnFilter
             )
         }
     }

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

@@ -16,6 +16,9 @@ class Timeline(
     var visibility = visibility
         private set
 
+    var name = name
+        private set
+
     fun setVisibility(visibility: TimelineVisibility, userDetail: UserDetail) {
         check(isSystem.not())
         require(userDetailId == userDetail.id)
@@ -23,6 +26,23 @@ class Timeline(
         addDomainEvent(TimelineEventFactory(this).createEvent(TimelineEvent.CHANGE_VISIBILITY))
     }
 
-    var name = name
-        private set
+    companion object {
+        fun create(
+            id: TimelineId,
+            userDetailId: UserDetailId,
+            name: TimelineName,
+            visibility: TimelineVisibility,
+            isSystem: Boolean
+        ): Timeline {
+            val timeline = Timeline(
+                id = id,
+                userDetailId = userDetailId,
+                name = name,
+                visibility = visibility,
+                isSystem = isSystem
+            )
+            timeline.addDomainEvent(TimelineEventFactory(timeline).createEvent(TimelineEvent.CREATE))
+            return timeline
+        }
+    }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelineobject/TimelineObject.kt

@@ -13,6 +13,7 @@ import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
 import dev.usbharu.hideout.core.domain.model.userdetails.UserDetailId
 import java.time.Instant
 
+@Suppress("LongParameterList")
 class TimelineObject(
     val id: TimelineObjectId,
     val userDetailId: UserDetailId,
@@ -33,7 +34,7 @@ class TimelineObject(
     lastUpdatedAt: Instant,
     var warnFilters: List<TimelineObjectWarnFilter>,
 
-    ) {
+) {
     var isPureRepost = isPureRepost
         private set
     var visibleActors = visibleActors
@@ -59,7 +60,10 @@ class TimelineObject(
         emojiIds = post.emojiIds.toList()
         lastUpdatedAt = Instant.now()
         isPureRepost =
-            post.repostId != null && post.replyId == null && post.text.isEmpty() && post.overview?.overview.isNullOrEmpty()
+            post.repostId != null &&
+            post.replyId == null &&
+            post.text.isEmpty() &&
+            post.overview?.overview.isNullOrEmpty()
         warnFilters = filterResults.map { TimelineObjectWarnFilter(it.filter.id, it.matchedKeyword) }
     }
 
@@ -102,6 +106,7 @@ class TimelineObject(
             )
         }
 
+        @Suppress("LongParameterList")
         fun create(
             timelineObjectId: TimelineObjectId,
             timeline: Timeline,
@@ -125,9 +130,9 @@ class TimelineObject(
                 repostActorId = repost.actorId,
                 visibility = post.visibility,
                 isPureRepost = repost.mediaIds.isEmpty() &&
-                        repost.overview == null &&
-                        repost.content == PostContent.empty &&
-                        repost.replyId == null,
+                    repost.overview == null &&
+                    repost.content == PostContent.empty &&
+                    repost.replyId == null,
                 mediaIds = post.mediaIds,
                 emojiIds = post.emojiIds,
                 visibleActors = post.visibleActors.toList(),

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

@@ -16,18 +16,21 @@
 
 package dev.usbharu.hideout.core.domain.model.userdetails
 
+import dev.usbharu.hideout.core.domain.event.userdetail.UserDetailDomainEventFactory
+import dev.usbharu.hideout.core.domain.event.userdetail.UserDetailEvent
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.timeline.TimelineId
+import dev.usbharu.hideout.core.domain.shared.domainevent.DomainEventStorable
 import java.time.Instant
 
-class UserDetail private constructor(
+class UserDetail(
     val id: UserDetailId,
     val actorId: ActorId,
     var password: UserDetailHashedPassword,
     var autoAcceptFolloweeFollowRequest: Boolean,
     var lastMigration: Instant? = null,
-    val homeTimelineId: TimelineId?
-) {
+    var homeTimelineId: TimelineId?
+) : DomainEventStorable() {
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -39,8 +42,19 @@ class UserDetail private constructor(
     }
 
     override fun hashCode(): Int = id.hashCode()
+    override fun toString(): String {
+        return "UserDetail(" +
+            "id=$id, " +
+            "actorId=$actorId, " +
+            "password=$password, " +
+            "autoAcceptFolloweeFollowRequest=$autoAcceptFolloweeFollowRequest, " +
+            "lastMigration=$lastMigration, " +
+            "homeTimelineId=$homeTimelineId" +
+            ")"
+    }
 
     companion object {
+        @Suppress("LongParameterList")
         fun create(
             id: UserDetailId,
             actorId: ActorId,
@@ -49,7 +63,7 @@ class UserDetail private constructor(
             lastMigration: Instant? = null,
             homeTimelineId: TimelineId? = null
         ): UserDetail {
-            return UserDetail(
+            val userDetail = UserDetail(
                 id,
                 actorId,
                 password,
@@ -57,6 +71,8 @@ class UserDetail private constructor(
                 lastMigration,
                 homeTimelineId
             )
+            userDetail.addDomainEvent(UserDetailDomainEventFactory(userDetail).createEvent(UserDetailEvent.CREATE))
+            return userDetail
         }
     }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailHashedPassword.kt

@@ -17,4 +17,6 @@
 package dev.usbharu.hideout.core.domain.model.userdetails
 
 @JvmInline
-value class UserDetailHashedPassword(val password: String)
+value class UserDetailHashedPassword(val password: String) {
+    override fun toString(): String = "[MASKED]"
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailId.kt

@@ -17,4 +17,6 @@
 package dev.usbharu.hideout.core.domain.model.userdetails
 
 @JvmInline
-value class UserDetailId(val id: Long)
+value class UserDetailId(val id: Long) {
+    override fun toString(): String = "UserDetailId(id=$id)"
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/service/post/DefaultPostReadAccessControl.kt

@@ -10,36 +10,44 @@ import org.springframework.stereotype.Component
 
 interface IPostReadAccessControl {
     suspend fun isAllow(post: Post, principal: Principal): Boolean
+    suspend fun areAllows(postList: List<Post>, principal: Principal): List<Post>
 }
 
 @Component
 class DefaultPostReadAccessControl(private val relationshipRepository: RelationshipRepository) :
     IPostReadAccessControl {
     override suspend fun isAllow(post: Post, principal: Principal): Boolean {
-        val relationship = (relationshipRepository.findByActorIdAndTargetId(post.actorId, principal.actorId)
-            ?: Relationship.default(post.actorId, principal.actorId))
+        // ポスト主は無条件で見れる
+        if (post.actorId == principal.actorId) {
+            return true
+        }
 
-        //ブロックされてたら見れない
+        val relationship = (
+            relationshipRepository.findByActorIdAndTargetId(post.actorId, principal.actorId)
+                ?: Relationship.default(post.actorId, principal.actorId)
+            )
+
+        // ブロックされてたら見れない
         if (relationship.blocking) {
             return false
         }
 
-        //PublicかUnlistedなら見れる
+        // PublicかUnlistedなら見れる
         if (post.visibility == Visibility.PUBLIC || post.visibility == Visibility.UNLISTED) {
             return true
         }
 
-        //principalがAnonymousなら見れない
+        // principalがAnonymousなら見れない
         if (principal is Anonymous) {
             return false
         }
 
-        //DirectでvisibleActorsに含まれていたら見れる
+        // DirectでvisibleActorsに含まれていたら見れる
         if (post.visibility == Visibility.DIRECT && post.visibleActors.contains(principal.actorId)) {
             return true
         }
 
-        //Followersでフォロワーなら見れる
+        // Followersでフォロワーなら見れる
         if (post.visibility == Visibility.FOLLOWERS) {
             val inverseRelationship =
                 relationshipRepository.findByActorIdAndTargetId(principal.actorId, post.actorId) ?: return false
@@ -47,8 +55,50 @@ class DefaultPostReadAccessControl(private val relationshipRepository: Relations
             return inverseRelationship.following
         }
 
-        //その他の場合は見れない
+        // その他の場合は見れない
         return false
     }
 
-}
+    override suspend fun areAllows(postList: List<Post>, principal: Principal): List<Post> {
+        val actorIds = postList.map { it.actorId }
+        val relationshipList =
+            relationshipRepository.findByActorIdsAndTargetIdAndBlocking(actorIds, principal.actorId, true)
+                .map { it.actorId }
+        val inverseRelationshipList =
+            relationshipRepository.findByActorIdAndTargetIdsAndFollowing(principal.actorId, actorIds, true)
+                .map { it.actorId }
+
+        fun internalAllow(post: Post): Boolean {
+            // ポスト主は無条件で見れる
+            if (post.actorId == principal.actorId) {
+                return true
+            }
+
+            if (relationshipList.contains(post.actorId)) {
+                return false
+            }
+
+            if (post.visibility == Visibility.PUBLIC || post.visibility == Visibility.UNLISTED) {
+                return true
+            }
+
+            if (principal is Anonymous) {
+                return false
+            }
+
+            if (post.visibility == Visibility.DIRECT && post.visibleActors.contains(principal.actorId)) {
+                return true
+            }
+
+            if (post.visibility == Visibility.FOLLOWERS && inverseRelationshipList.contains(principal.actorId)) {
+                return true
+            }
+            return false
+        }
+
+        return postList
+            .filter {
+                internalAllow(it)
+            }
+    }
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/timeline/TimelineStore.kt

@@ -4,6 +4,7 @@ import dev.usbharu.hideout.core.domain.model.post.Post
 import dev.usbharu.hideout.core.domain.model.post.PostId
 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.domain.model.support.timelineobjectdetail.TimelineObjectDetail
 import dev.usbharu.hideout.core.domain.model.timeline.Timeline
 import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationship
@@ -22,6 +23,7 @@ interface TimelineStore {
     suspend fun readTimeline(
         timeline: Timeline,
         option: ReadTimelineOption? = null,
-        page: Page? = null
+        page: Page? = null,
+        principal: Principal
     ): PaginationList<TimelineObjectDetail, PostId>
 }