Merge pull request #561 from usbharu/detekt

Detektをhideout-mastodonにも適用するように

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

@@ -46,7 +46,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Build
-        run: ./hideout-core/gradlew :hideout-core:classes --no-daemon
+        run: ./gradlew classes --no-daemon
 
   unit-test:
     name: Unit Test
@@ -115,7 +115,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Build with Gradle
-        run: ./hideout-core/gradlew :hideout-core:detektMain
+        run: ./gradlew :hideout-core:detektMain :hideout-mastodon:detektMain
 
       - name: Auto Commit
         if: ${{ always() }}

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

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

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

@@ -16,22 +16,29 @@
 
 package dev.usbharu.hideout.core.application.actor
 
+import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class SuspendLocalActorApplicationService(
-    private val transaction: Transaction,
+    transaction: Transaction,
     private val actorRepository: ActorRepository,
-) {
+) : LocalUserAbstractApplicationService<SuspendLocalActor, Unit>(transaction, logger) {
-    suspend fun suspend(actorId: Long, executor: ActorId) {
-        transaction.transaction {
-            val id = ActorId(actorId)
 
-            val actor = actorRepository.findById(id)!!
+    override suspend fun internalExecute(command: SuspendLocalActor, principal: LocalUser) {
-            actor.suspend = true
+        val id = ActorId(command.actorId)
-        }
+        val actor =
+            actorRepository.findById(id) ?: throw IllegalArgumentException("Actor ${command.actorId} not found.")
+        actor.suspend = true
+        actorRepository.save(actor)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(SuspendLocalActorApplicationService::class.java)
     }
 }

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

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

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

@@ -16,21 +16,29 @@
 
 package dev.usbharu.hideout.core.application.actor
 
+import dev.usbharu.hideout.core.application.shared.LocalUserAbstractApplicationService
 import dev.usbharu.hideout.core.application.shared.Transaction
 import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
+import dev.usbharu.hideout.core.domain.model.support.principal.LocalUser
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class UnsuspendLocalActorApplicationService(
-    private val transaction: Transaction,
+    transaction: Transaction,
     private val actorRepository: ActorRepository,
-) {
+) : LocalUserAbstractApplicationService<UnsuspendLocalActor, Unit>(transaction, logger) {
-    suspend fun unsuspend(actorId: Long, executor: Long) {
-        transaction.transaction {
-            val findById = actorRepository.findById(ActorId(actorId))!!
 
-            findById.suspend = false
+    override suspend fun internalExecute(command: UnsuspendLocalActor, principal: LocalUser) {
-        }
+        val findById = actorRepository.findById(ActorId(command.actorId))
+            ?: throw IllegalArgumentException("Actor ${command.actorId} not found.")
+
+        findById.suspend = false
+        actorRepository.save(findById)
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(UnsuspendLocalActorApplicationService::class.java)
     }
 }

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

@@ -20,5 +20,3 @@ class RegisterLocalUserSetHomeTimelineSubscriber(
         }
     }
 }
-
-// todo userdetailにdomain event付けて createのイベントで反応させる タイムラインを新しく一つ作って userdetailのhometimelineに紐づけて自分自身をtimleine relationshipに入れる

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

@@ -5,7 +5,6 @@ import dev.usbharu.hideout.core.application.timeline.TimelineAddPostApplicationS
 import dev.usbharu.hideout.core.domain.event.post.PostEvent
 import dev.usbharu.hideout.core.domain.event.post.PostEventBody
 import dev.usbharu.hideout.core.domain.model.support.principal.Anonymous
-import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 
 @Component
@@ -18,8 +17,4 @@ class TimelinePostCreateSubscriber(
             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
@@ -23,11 +24,14 @@ class TimelineRelationshipFollowSubscriber(
     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(

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

@@ -23,6 +23,7 @@ class GetLocalInstanceApplicationService(
 
     override suspend fun internalExecute(command: Unit, principal: Principal): Instance {
         if (cachedInstance != null) {
+            @Suppress("UnsafeCallOnNullableType")
             return cachedInstance!!
         }
 
@@ -32,6 +33,7 @@ class GetLocalInstanceApplicationService(
             )
 
         cachedInstance = Instance.of(instance)
+        @Suppress("UnsafeCallOnNullableType")
         return cachedInstance!!
     }
 

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

@@ -17,14 +17,14 @@ data class ActorDetail(
     companion object {
         fun of(actor: Actor, iconMedia: Media?): ActorDetail {
             return ActorDetail(
-                actor.id.id,
+                actorId = actor.id.id,
-                actor.instance.instanceId,
+                instanceId = actor.instance.instanceId,
-                actor.name.name,
+                name = actor.name.name,
-                actor.domain.domain,
+                domain = actor.domain.domain,
-                actor.screenName.screenName,
+                screenName = actor.screenName.screenName,
-                actor.url,
+                url = actor.url,
-                actor.locked,
+                locked = actor.locked,
-                iconMedia?.url
+                icon = iconMedia?.url
             )
         }
     }

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

@@ -16,6 +16,7 @@
 
 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
@@ -34,11 +35,13 @@ class DeleteLocalPostApplicationService(
 ) : LocalUserAbstractApplicationService<DeleteLocalPost, Unit>(transaction, logger) {
 
     override suspend fun internalExecute(command: DeleteLocalPost, principal: LocalUser) {
-        val findById = postRepository.findById(PostId(command.postId))!!
+        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/GetPostDetailApplicationService.kt

@@ -39,13 +39,13 @@ class GetPostDetailApplicationService(
         val mediaList = mediaRepository.findByIds(post.mediaIds)
 
         return PostDetail.of(
-            post,
+            post = post,
-            actor,
+            actor = actor,
-            iconMedia,
+            iconMedia = iconMedia,
-            mediaList,
+            mediaList = mediaList,
-            post.replyId?.let { fetchChild(it, actor, iconMedia, principal) },
+            reply = post.replyId?.let { fetchChild(it, actor, iconMedia, principal) },
-            post.repostId?.let { fetchChild(it, actor, iconMedia, principal) },
+            repost = post.repostId?.let { fetchChild(it, actor, iconMedia, principal) },
-            post.moveTo?.let { fetchChild(it, actor, iconMedia, principal) },
+            moveTo = post.moveTo?.let { fetchChild(it, actor, iconMedia, principal) },
         )
     }
 

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

@@ -26,6 +26,7 @@ data class PostDetail(
     val moveTo: PostDetail?
 ) {
     companion object {
+        @Suppress("LongParameterList")
         fun of(
             post: Post,
             actor: Actor,

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

@@ -41,7 +41,7 @@ class UserRejectFollowRequestApplicationService(
         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/unmute/UserUnmuteApplicationService.kt

@@ -35,10 +35,6 @@ class UserUnmuteApplicationService(
     private val actorRepository: ActorRepository,
 ) :
     LocalUserAbstractApplicationService<Unmute, Unit>(transaction, logger) {
-    companion object {
-        private val logger = LoggerFactory.getLogger(UserBlockApplicationService::class.java)
-    }
-
     override suspend fun internalExecute(command: Unmute, principal: LocalUser) {
         val actor = actorRepository.findById(principal.actorId)
             ?: throw InternalServerException("Actor ${principal.actorId} not found.")
@@ -53,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

@@ -35,7 +35,7 @@ abstract class AbstractApplicationService<T : Any, R>(
         } 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/timeline/ReadTimelineApplicationService.kt

@@ -42,6 +42,7 @@ class ReadTimelineApplicationService(
 
         val postDetailList = timeline.map {
             val reply = if (it.replyPost != null) {
+                @Suppress("UnsafeCallOnNullableType")
                 PostDetail.of(
                     it.replyPost,
                     it.replyPostActor!!,
@@ -53,6 +54,7 @@ class ReadTimelineApplicationService(
             }
 
             val repost = if (it.repostPost != null) {
+                @Suppress("UnsafeCallOnNullableType")
                 PostDetail.of(
                     it.repostPost,
                     it.repostPostActor!!,
@@ -64,12 +66,12 @@ class ReadTimelineApplicationService(
             }
 
             PostDetail.of(
-                it.post,
+                post = it.post,
-                it.postActor,
+                actor = it.postActor,
-                it.postActorIconMedia,
+                iconMedia = it.postActorIconMedia,
-                it.postMedias,
+                mediaList = it.postMedias,
-                reply,
+                reply = reply,
-                repost
+                repost = repost
             )
         }
 

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

@@ -34,7 +34,7 @@ class PostDomainEventFactory(private val post: Post, private val actor: 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?
+    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 {
+    fun getRelationship(): Relationship = toMap()["relationship"] as Relationship
-        return toMap()["relationship"] as Relationship
-    }
 }
 
 enum class RelationshipEvent(val eventName: String) {

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

@@ -11,9 +11,7 @@ class TimelineEventFactory(private val timeline: Timeline) {
 }
 
 class TimelineEventBody(timelineId: TimelineId) : DomainEventBody(mapOf("timeline" to timelineId)) {
-    fun getTimelineId(): TimelineId {
+    fun getTimelineId(): TimelineId = toMap()["timeline"] as TimelineId
-        return toMap()["timeline"] as TimelineId
-    }
 }
 
 enum class TimelineEvent(val eventName: String) {

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

@@ -19,9 +19,7 @@ class UserDetailEventBody(userDetail: UserDetailId) : DomainEventBody(
         "userDetail" to userDetail
     )
 ) {
-    fun getUserDetail(): UserDetailId {
+    fun getUserDetail(): UserDetailId = toMap()["userDetail"] as UserDetailId
-        return toMap()["userDetail"] as UserDetailId
-    }
 }
 
 enum class UserDetailEvent(val eventName: String) {

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

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

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

@@ -19,6 +19,7 @@ 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,
@@ -47,9 +48,7 @@ class Media(
         return id == other.id
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = id.hashCode()
-        return id.hashCode()
-    }
 
     override fun toString(): String {
         return "Media(" +

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

@@ -201,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
     }

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,6 +18,7 @@ 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)

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

@@ -4,7 +4,5 @@ data class Acct(
     val userpart: String,
     val host: String
 ) {
-    override fun toString(): String {
+    override fun toString(): String = "acct:$userpart@$host"
-        return "acct:$userpart@$host"
-    }
 }

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

@@ -32,6 +32,7 @@ data class TimelineObjectDetail(
     val warnFilter: List<TimelineObjectWarnFilter>
 ) {
     companion object {
+        @Suppress("LongParameterList")
         fun of(
             timelineObject: TimelineObject,
             timelineUserDetail: UserDetail,

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,9 +26,6 @@ class Timeline(
         addDomainEvent(TimelineEventFactory(this).createEvent(TimelineEvent.CHANGE_VISIBILITY))
     }
 
-    var name = name
-        private set
-
     companion object {
         fun create(
             id: TimelineId,

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,
@@ -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,

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

@@ -44,6 +44,7 @@ class UserDetail(
     override fun hashCode(): Int = id.hashCode()
 
     companion object {
+        @Suppress("LongParameterList")
         fun create(
             id: UserDetailId,
             actorId: ActorId,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedPrincipalQueryService.kt

@@ -14,6 +14,9 @@ import org.springframework.stereotype.Repository
 
 @Repository
 class ExposedPrincipalQueryService : PrincipalQueryService, AbstractRepository() {
+    override val logger: Logger
+        get() = Companion.logger
+
     override suspend fun findByUserDetailId(userDetailId: UserDetailId): PrincipalDTO {
         return query {
             UserDetails.leftJoin(Actors).selectAll().where { UserDetails.id eq userDetailId.id }.single()
@@ -28,9 +31,6 @@ class ExposedPrincipalQueryService : PrincipalQueryService, AbstractRepository()
         }
     }
 
-    override val logger: Logger
-        get() = Companion.logger
-
     companion object {
         private val logger: Logger = LoggerFactory.getLogger(ExposedPrincipalQueryService::class.java)
     }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedPostRepository.kt

@@ -152,8 +152,8 @@ class ExposedPostRepository(
                 this[PostsVisibleActors.actorId] = it.second
             }
             onComplete {
-                posts.forEach {
+                posts.forEach { post: Post ->
-                    update(it)
+                    update(post)
                 }
             }
         }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt

@@ -15,6 +15,9 @@ class ExposedTimelineRepository(override val domainEventPublisher: DomainEventPu
     TimelineRepository,
     AbstractRepository(),
     DomainEventPublishableRepository<Timeline> {
+    override val logger: Logger
+        get() = Companion.logger
+
     override suspend fun save(timeline: Timeline): Timeline {
         query {
             Timelines.insert {
@@ -58,9 +61,6 @@ class ExposedTimelineRepository(override val domainEventPublisher: DomainEventPu
     companion object {
         private val logger = LoggerFactory.getLogger(ExposedTimelineRepository::class.java.name)
     }
-
-    override val logger: Logger
-        get() = Companion.logger
 }
 
 fun ResultRow.toTimeline(): Timeline {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt

@@ -109,12 +109,12 @@ class UserDetailRepositoryImpl(override val domainEventPublisher: DomainEventPub
     }
 
     private fun userDetail(it: ResultRow) = UserDetail(
-        UserDetailId(it[UserDetails.id]),
+        id = UserDetailId(it[UserDetails.id]),
-        ActorId(it[UserDetails.actorId]),
+        actorId = ActorId(it[UserDetails.actorId]),
-        UserDetailHashedPassword(it[UserDetails.password]),
+        password = UserDetailHashedPassword(it[UserDetails.password]),
-        it[UserDetails.autoAcceptFolloweeFollowRequest],
+        autoAcceptFolloweeFollowRequest = it[UserDetails.autoAcceptFolloweeFollowRequest],
-        it[UserDetails.lastMigration],
+        lastMigration = it[UserDetails.lastMigration],
-        it[UserDetails.homeTimelineId]?.let { it1 -> TimelineId(it1) }
+        homeTimelineId = it[UserDetails.homeTimelineId]?.let { it1 -> TimelineId(it1) }
     )
 
     companion object {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/media/image/ImageIOImageProcessor.kt

@@ -1,5 +1,6 @@
 package dev.usbharu.hideout.core.infrastructure.media.image
 
+import dev.usbharu.hideout.core.application.exception.InternalServerException
 import dev.usbharu.hideout.core.config.ImageIOImageConfig
 import dev.usbharu.hideout.core.domain.model.media.FileType
 import dev.usbharu.hideout.core.domain.model.media.MimeType
@@ -59,7 +60,7 @@ class ImageIOImageProcessor(
         tempFile.outputStream().use {
             if (ImageIO.write(bufferedImage, imageIOImageConfig.format, it).not()) {
                 logger.warn("Failed to save a temporary file. type: {} ,path: {}", imageIOImageConfig.format, tempFile)
-                throw Exception("Failed to save a temporary file.")
+                throw InternalServerException("Failed to save a temporary file.")
             }
         }
 

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoInternalTimelineObjectRepository.kt

@@ -46,9 +46,8 @@ class MongoInternalTimelineObjectRepository(
         return timelineObjectList
     }
 
-    override suspend fun findByPostId(postId: PostId): List<TimelineObject> {
+    override suspend fun findByPostId(postId: PostId): List<TimelineObject> =
-        return springDataMongoTimelineObjectRepository.findByPostId(postId.id).map { it.toTimelineObject() }.toList()
+        springDataMongoTimelineObjectRepository.findByPostId(postId.id).map { it.toTimelineObject() }.toList()
-    }
 
     override suspend fun deleteByPostId(postId: PostId) {
         springDataMongoTimelineObjectRepository.deleteByPostId(postId.id)
@@ -139,48 +138,48 @@ data class SpringDataMongoTimelineObject(
 
     fun toTimelineObject(): TimelineObject {
         return TimelineObject(
-            TimelineObjectId(id),
+            id = TimelineObjectId(id),
-            UserDetailId(userDetailId),
+            userDetailId = UserDetailId(userDetailId),
-            TimelineId(timelineId),
+            timelineId = TimelineId(timelineId),
-            PostId(postId),
+            postId = PostId(postId),
-            ActorId(postActorId),
+            postActorId = ActorId(postActorId),
-            Instant.ofEpochSecond(postCreatedAt),
+            postCreatedAt = Instant.ofEpochSecond(postCreatedAt),
-            replyId?.let { PostId(it) },
+            replyId = replyId?.let { PostId(it) },
-            replyActorId?.let { ActorId(it) },
+            replyActorId = replyActorId?.let { ActorId(it) },
-            repostId?.let { PostId(it) },
+            repostId = repostId?.let { PostId(it) },
-            repostActorId?.let { ActorId(it) },
+            repostActorId = repostActorId?.let { ActorId(it) },
-            visibility,
+            visibility = visibility,
-            isPureRepost,
+            isPureRepost = isPureRepost,
-            mediaIds.map { MediaId(it) },
+            mediaIds = mediaIds.map { MediaId(it) },
-            emojiIds.map { EmojiId(it) },
+            emojiIds = emojiIds.map { EmojiId(it) },
-            visibleActors.map { ActorId(it) },
+            visibleActors = visibleActors.map { ActorId(it) },
-            hasMediaInRepost,
+            hasMediaInRepost = hasMediaInRepost,
-            Instant.ofEpochSecond(lastUpdatedAt),
+            lastUpdatedAt = Instant.ofEpochSecond(lastUpdatedAt),
-            warnFilters.map { it.toTimelineObjectWarnFilter() }
+            warnFilters = warnFilters.map { it.toTimelineObjectWarnFilter() }
         )
     }
 
     companion object {
         fun of(timelineObject: TimelineObject): SpringDataMongoTimelineObject {
             return SpringDataMongoTimelineObject(
-                timelineObject.id.value,
+                id = timelineObject.id.value,
-                timelineObject.userDetailId.id,
+                userDetailId = timelineObject.userDetailId.id,
-                timelineObject.timelineId.value,
+                timelineId = timelineObject.timelineId.value,
-                timelineObject.postId.id,
+                postId = timelineObject.postId.id,
-                timelineObject.postActorId.id,
+                postActorId = timelineObject.postActorId.id,
-                timelineObject.postCreatedAt.epochSecond,
+                postCreatedAt = timelineObject.postCreatedAt.epochSecond,
-                timelineObject.replyId?.id,
+                replyId = timelineObject.replyId?.id,
-                timelineObject.replyActorId?.id,
+                replyActorId = timelineObject.replyActorId?.id,
-                timelineObject.repostId?.id,
+                repostId = timelineObject.repostId?.id,
-                timelineObject.repostActorId?.id,
+                repostActorId = timelineObject.repostActorId?.id,
-                timelineObject.visibility,
+                visibility = timelineObject.visibility,
-                timelineObject.isPureRepost,
+                isPureRepost = timelineObject.isPureRepost,
-                timelineObject.mediaIds.map { it.id },
+                mediaIds = timelineObject.mediaIds.map { it.id },
-                timelineObject.emojiIds.map { it.emojiId },
+                emojiIds = timelineObject.emojiIds.map { it.emojiId },
-                timelineObject.visibleActors.map { it.id },
+                visibleActors = timelineObject.visibleActors.map { it.id },
-                timelineObject.hasMediaInRepost,
+                hasMediaInRepost = timelineObject.hasMediaInRepost,
-                timelineObject.lastUpdatedAt.epochSecond,
+                lastUpdatedAt = timelineObject.lastUpdatedAt.epochSecond,
-                timelineObject.warnFilters.map { SpringDataMongoTimelineObjectWarnFilter.of(it) }
+                warnFilters = timelineObject.warnFilters.map { SpringDataMongoTimelineObjectWarnFilter.of(it) }
             )
         }
     }
@@ -208,6 +207,7 @@ data class SpringDataMongoTimelineObjectWarnFilter(
     }
 }
 
+@Suppress("FunctionMaxLength")
 interface SpringDataMongoTimelineObjectRepository : CoroutineCrudRepository<SpringDataMongoTimelineObject, Long> {
     fun findByPostId(postId: Long): Flow<SpringDataMongoTimelineObject>
 
@@ -217,8 +217,6 @@ interface SpringDataMongoTimelineObjectRepository : CoroutineCrudRepository<Spri
 
     suspend fun deleteByTimelineId(timelineId: Long)
 
-    suspend fun findByTimelineId(timelineId: TimelineId): Flow<SpringDataMongoTimelineObject>
-
     suspend fun findFirstByTimelineIdAndPostIdGreaterThanOrderByIdAsc(
         timelineId: Long,
         postId: Long

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/domainevent/SpringFrameworkDomainEventSubscriber.kt

@@ -23,7 +23,7 @@ class SpringFrameworkDomainEventSubscriber : DomainEventSubscriber {
         map[domainEvent.name]?.forEach {
             try {
                 it.invoke(domainEvent)
-            } catch (e: Exception) {
+            } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
                 logger.error("", e)
             }
         }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/AbstractTimelineStore.kt

@@ -58,7 +58,9 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
         if (timeline.visibility == TimelineVisibility.PUBLIC && post.visibility != Visibility.PUBLIC) {
             return null
         }
-        if (timeline.visibility == TimelineVisibility.UNLISTED && (post.visibility != Visibility.PUBLIC || post.visibility != Visibility.UNLISTED)) {
+        if (timeline.visibility == TimelineVisibility.UNLISTED &&
+            (post.visibility != Visibility.PUBLIC || post.visibility != Visibility.UNLISTED)
+        ) {
             return null
         }
 
@@ -68,21 +70,21 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
 
         if (repost != null) {
             return TimelineObject.create(
-                TimelineObjectId(idGenerateService.generateId()),
+                timelineObjectId = TimelineObjectId(idGenerateService.generateId()),
-                timeline,
+                timeline = timeline,
-                post,
+                post = post,
-                replyActorId,
+                replyActorId = replyActorId,
-                repost,
+                repost = repost,
-                applyFilters.filterResults
+                filterResults = applyFilters.filterResults
             )
         }
 
         return TimelineObject.create(
-            TimelineObjectId(idGenerateService.generateId()),
+            timelineObjectId = TimelineObjectId(idGenerateService.generateId()),
-            timeline,
+            timeline = timeline,
-            post,
+            post = post,
-            replyActorId,
+            replyActorId = replyActorId,
-            applyFilters.filterResults
+            filterResults = applyFilters.filterResults
         )
     }
 
@@ -106,7 +108,10 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
 
     protected abstract suspend fun removeTimelineObject(timelineId: TimelineId)
 
-    protected abstract suspend fun getPostsByTimelineRelationshipList(timelineRelationshipList: List<TimelineRelationship>): List<Post>
+    @Suppress("FunctionMaxLength")
+    protected abstract suspend fun getPostsByTimelineRelationshipList(
+        timelineRelationshipList: List<TimelineRelationship>
+    ): List<Post>
 
     protected abstract suspend fun getPostsByPostId(postIds: List<PostId>, principal: Principal): List<Post>
 
@@ -116,6 +121,7 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
         page: Page?
     ): PaginationList<TimelineObject, PostId>
 
+    @Suppress("RedundantHigherOrderMapUsage") // if式に対応していないため
     override suspend fun updatePost(post: Post) {
         val timelineObjectByPostId = getTimelineObjectByPostId(post.id)
 
@@ -236,16 +242,19 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
 
         val actors =
             getActors(
-                timelineObjectList.map {
+                timelineObjectList.map { it.postActorId } +
-                    it.postActorId
+                    timelineObjectList.mapNotNull { it.repostActorId } +
-                } + timelineObjectList.mapNotNull { it.repostActorId } + timelineObjectList.mapNotNull { it.replyActorId }
+                    timelineObjectList.mapNotNull { it.replyActorId }
             )
 
         val postMap = posts.associate { post ->
             post.id to applyFilters(post, newerFilters)
         }
 
-        val mediaMap = getMedias(posts.flatMap { it.mediaIds } + actors.mapNotNull { it.value.icon })
+        val mediaMap = getMedias(
+            posts.flatMap { it.mediaIds } +
+                actors.mapNotNull { it.value.icon }
+        )
 
         return PaginationList(
             timelineObjectList.mapNotNull<TimelineObject, TimelineObjectDetail> {
@@ -274,10 +283,10 @@ abstract class AbstractTimelineStore(private val idGenerateService: IdGenerateSe
                     repostPostMedias = repostMedias,
                     repostPostActor = repostActor,
                     repostPostActorIconMedia = mediaMap[repostActor?.icon],
-                    warnFilter = it.warnFilters + post.filterResults.map {
+                    warnFilter = it.warnFilters + post.filterResults.map { filterResult ->
                         TimelineObjectWarnFilter(
-                            it.filter.id,
+                            filterResult.filter.id,
-                            it.matchedKeyword
+                            filterResult.matchedKeyword
                         )
                     }
                 )

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStore.kt

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Component
 import java.time.Instant
 
 @Component
+@Suppress("LongParameterList")
 open class DefaultTimelineStore(
     private val timelineRepository: TimelineRepository,
     private val timelineRelationshipRepository: TimelineRelationshipRepository,
@@ -59,25 +60,18 @@ open class DefaultTimelineStore(
         )
     }
 
-    override suspend fun getTimeline(timelineId: TimelineId): Timeline? {
+    override suspend fun getTimeline(timelineId: TimelineId): Timeline? = timelineRepository.findById(timelineId)
-        return timelineRepository.findById(timelineId)
-    }
 
-    override suspend fun getFilters(userDetailId: UserDetailId): List<Filter> {
+    override suspend fun getFilters(userDetailId: UserDetailId): List<Filter> =
-        return filterRepository.findByUserDetailId(userDetailId)
+        filterRepository.findByUserDetailId(userDetailId)
-    }
 
-    override suspend fun getNewerFilters(userDetailId: UserDetailId, lastUpdateAt: Instant): List<Filter> {
+    override suspend fun getNewerFilters(userDetailId: UserDetailId, lastUpdateAt: Instant): List<Filter> =
-        return filterRepository.findByUserDetailId(userDetailId)
+        filterRepository.findByUserDetailId(userDetailId)
-    }
 
-    override suspend fun applyFilters(post: Post, filters: List<Filter>): FilteredPost {
+    override suspend fun applyFilters(post: Post, filters: List<Filter>): FilteredPost =
-        return filterDomainService.apply(post, FilterContext.HOME, filters)
+        filterDomainService.apply(post, FilterContext.HOME, filters)
-    }
 
-    override suspend fun getPost(postId: PostId): Post? {
+    override suspend fun getPost(postId: PostId): Post? = postRepository.findById(postId)
-        return postRepository.findById(postId)
-    }
 
     override suspend fun insertTimelineObject(timelineObjectList: List<TimelineObject>) {
         internalTimelineObjectRepository.saveAll(timelineObjectList)
@@ -87,9 +81,8 @@ open class DefaultTimelineStore(
         internalTimelineObjectRepository.saveAll(timelineObjectList)
     }
 
-    override suspend fun getTimelineObjectByPostId(postId: PostId): List<TimelineObject> {
+    override suspend fun getTimelineObjectByPostId(postId: PostId): List<TimelineObject> =
-        return internalTimelineObjectRepository.findByPostId(postId)
+        internalTimelineObjectRepository.findByPostId(postId)
-    }
 
     override suspend fun removeTimelineObject(postId: PostId) {
         internalTimelineObjectRepository.deleteByPostId(postId)
@@ -103,9 +96,8 @@ open class DefaultTimelineStore(
         internalTimelineObjectRepository.deleteByTimelineId(timelineId)
     }
 
-    override suspend fun getPostsByTimelineRelationshipList(timelineRelationshipList: List<TimelineRelationship>): List<Post> {
+    override suspend fun getPostsByTimelineRelationshipList(timelineRelationshipList: List<TimelineRelationship>): List<Post> =
-        return timelineRelationshipList.flatMap { getActorPost(it.actorId, visibilities(it)) }
+        timelineRelationshipList.flatMap { getActorPost(it.actorId, visibilities(it)) }
-    }
 
     override suspend fun getPostsByPostId(postIds: List<PostId>, principal: Principal): List<Post> {
         val findAllById = postRepository.findAllById(postIds)
@@ -136,6 +128,7 @@ open class DefaultTimelineStore(
         )
     }
 
+    @Suppress("UnsafeCallOnNullableType")
     override suspend fun getNextPaging(
         timelineId: TimelineId,
         page: Page?
@@ -158,15 +151,12 @@ open class DefaultTimelineStore(
         return PaginationList(emptyList(), page?.maxId?.let { PostId(it) }, page?.minId?.let { PostId(it) })
     }
 
-    override suspend fun getActors(actorIds: List<ActorId>): Map<ActorId, Actor> {
+    override suspend fun getActors(actorIds: List<ActorId>): Map<ActorId, Actor> =
-        return actorRepository.findAllById(actorIds).associateBy { it.id }
+        actorRepository.findAllById(actorIds).associateBy { it.id }
-    }
 
-    override suspend fun getMedias(mediaIds: List<MediaId>): Map<MediaId, Media> {
+    override suspend fun getMedias(mediaIds: List<MediaId>): Map<MediaId, Media> =
-        return mediaRepository.findByIds(mediaIds).associateBy { it.id }
+        mediaRepository.findByIds(mediaIds).associateBy { it.id }
-    }
 
-    override suspend fun getUserDetails(userDetailIdList: List<UserDetailId>): Map<UserDetailId, UserDetail> {
+    override suspend fun getUserDetails(userDetailIdList: List<UserDetailId>): Map<UserDetailId, UserDetail> =
-        return userDetailRepository.findAllById(userDetailIdList).associateBy { it.id }
+        userDetailRepository.findAllById(userDetailIdList).associateBy { it.id }
-    }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/web/posts/PublishController.kt

@@ -30,6 +30,8 @@ class PublishController(
         }
 
         val instance = getLocalInstanceApplicationService.execute(Unit, principal)
+
+        @Suppress("UnsafeCallOnNullableType")
         val userDetail = getUserDetailApplicationService.execute(GetUserDetail(principal.userDetailId!!.id), principal)
         model.addAttribute("instance", instance)
         model.addAttribute("user", userDetail)

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/web/timeline/TimelineController.kt

@@ -32,7 +32,8 @@ class TimelineController(
                 ?: throw InternalServerException("UserDetail not found.")
         }
 
-        val homeTimelineId = userDetail.homeTimelineId!!
+        val homeTimelineId =
+            userDetail.homeTimelineId ?: throw InternalServerException("HomeTimeline ${userDetail.id} is null.")
         val execute = readTimelineApplicationService.execute(
             ReadTimeline(
                 timelineId = homeTimelineId.value,

hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt

@@ -677,7 +677,7 @@ class PostTest {
         val actor = TestActorFactory.create(post.actorId.id)
 
         assertThrows<IllegalArgumentException> {
-            post.moveTo(PostId(2), actor)
+            post.moveTo(PostId(2))
         }
     }
 
@@ -687,7 +687,7 @@ class PostTest {
         val actor = TestActorFactory.create(post.actorId.id)
 
         assertDoesNotThrow {
-            post.moveTo(PostId(2), actor)
+            post.moveTo(PostId(2))
         }
 
         assertEquals(PostId(2), post.moveTo)

hideout-mastodon/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.openapi.generator)
     alias(libs.plugins.spring.boot)
     alias(libs.plugins.kotlin.spring)
+    alias(libs.plugins.detekt)
 }
 
 
@@ -48,6 +49,7 @@ configurations {
 }
 
 dependencies {
+    detektPlugins(libs.detekt.formatting)
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
@@ -115,3 +117,35 @@ sourceSets.main {
     )
 }
 
+detekt {
+    parallel = true
+    config.setFrom(files("../detekt.yml"))
+    buildUponDefaultConfig = true
+    basePath = "${rootDir.absolutePath}/src/main/kotlin"
+    autoCorrect = true
+}
+
+configurations.matching { it.name == "detekt" }.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "org.jetbrains.kotlin") {
+            useVersion(io.gitlab.arturbosch.detekt.getSupportedKotlinVersion())
+        }
+    }
+}
+
+tasks.withType<io.gitlab.arturbosch.detekt.Detekt> {
+    exclude("**/generated/**")
+    doFirst {
+
+    }
+    setSource("src/main/kotlin")
+    exclude("build/")
+}
+
+tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
+    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+}
+
+tasks.withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
+    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+}

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/application/accounts/GetAccountApplicationService.kt

@@ -31,7 +31,8 @@ class GetAccountApplicationService(private val accountQueryService: AccountQuery
         logger
     ) {
     override suspend fun internalExecute(command: GetAccount, principal: LocalUser): Account {
-        return accountQueryService.findById(command.accountId.toLong()) ?: throw Exception("Account not found")
+        return accountQueryService.findById(command.accountId.toLong())
+            ?: throw IllegalArgumentException("Account ${command.accountId} not found")
     }
 
     companion object {

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/application/filter/DeleteFilterV1ApplicationService.kt

@@ -28,7 +28,8 @@ import org.springframework.stereotype.Service
 @Service
 class DeleteFilterV1ApplicationService(private val filterRepository: FilterRepository, transaction: Transaction) :
     LocalUserAbstractApplicationService<DeleteFilterV1, Unit>(
-        transaction, logger
+        transaction,
+        logger
     ) {
     override suspend fun internalExecute(command: DeleteFilterV1, principal: LocalUser) {
         val filter = filterRepository.findByFilterKeywordId(FilterKeywordId(command.filterKeywordId))

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/application/filter/GetFilterV1ApplicationService.kt

@@ -31,7 +31,8 @@ import org.springframework.stereotype.Repository
 @Repository
 class GetFilterV1ApplicationService(private val filterRepository: FilterRepository, transaction: Transaction) :
     AbstractApplicationService<GetFilterV1, V1Filter>(
-        transaction, logger
+        transaction,
+        logger
     ) {
     override suspend fun internalExecute(command: GetFilterV1, principal: Principal): V1Filter {
         val filter = filterRepository.findByFilterKeywordId(FilterKeywordId(command.filterKeywordId))

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/application/status/GetStatusApplicationService.kt

@@ -32,13 +32,12 @@ class GetStatusApplicationService(
     transaction,
     logger
 ) {
-    companion object {
-        val logger = LoggerFactory.getLogger(GetStatusApplicationService::class.java)!!
-    }
-
     override suspend fun internalExecute(command: GetStatus, principal: Principal): Status {
         return statusQueryService.findByPostId(command.id.toLong(), principal)
             ?: throw IllegalArgumentException("Post ${command.id} not found.")
+    }
 
+    companion object {
+        val logger = LoggerFactory.getLogger(GetStatusApplicationService::class.java)!!
     }
 }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedAccountQueryServiceImpl.kt

@@ -25,7 +25,7 @@ import org.jetbrains.exposed.sql.selectAll
 import org.springframework.stereotype.Repository
 
 @Repository
-class AccountQueryServiceImpl(private val applicationConfig: ApplicationConfig) : AccountQueryService {
+class ExposedAccountQueryServiceImpl(private val applicationConfig: ApplicationConfig) : AccountQueryService {
     override suspend fun findById(accountId: Long): Account? {
         val query = Actors.selectAll().where { Actors.id eq accountId }
 

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/ExposedStatusQueryService.kt

@@ -56,14 +56,15 @@ class StatusQueryServiceImpl : StatusQueryService {
             .leftJoin(
                 relationshipsAlias,
                 onColumn = { Posts.actorId },
-                otherColumn = { relationshipsAlias[Relationships.targetActorId] })
+                otherColumn = { relationshipsAlias[Relationships.targetActorId] }
+            )
             .select(Posts.columns)
             .where {
                 Posts.visibility eq Visibility.PUBLIC.name or
-                        (Posts.visibility eq Visibility.UNLISTED.name) or
+                    (Posts.visibility eq Visibility.UNLISTED.name) or
-                        (Posts.visibility eq Visibility.DIRECT.name and (PostsVisibleActors.actorId eq principal.actorId.id)) or
+                    (Posts.visibility eq Visibility.DIRECT.name and (PostsVisibleActors.actorId eq principal.actorId.id)) or
-                        (Posts.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or
+                    (Posts.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or
-                        (Posts.actorId eq principal.actorId.id)
+                    (Posts.actorId eq principal.actorId.id)
             }
             .alias("authorized_table")
     }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAccountApi.kt

@@ -48,6 +48,7 @@ import org.springframework.http.ResponseEntity
 import org.springframework.stereotype.Controller
 
 @Controller
+@Suppress("LongParameterList")
 class SpringAccountApi(
     private val getUserDetailApplicationService: GetUserDetailApplicationService,
     private val getAccountApplicationService: GetAccountApplicationService,
@@ -64,7 +65,6 @@ class SpringAccountApi(
     private val principalContextHolder: SpringSecurityOauth2PrincipalContextHolder
 ) : AccountApi {
 
-
     override suspend fun apiV1AccountsIdBlockPost(id: String): ResponseEntity<Relationship> {
         userBlockApplicationService.execute(Block(id.toLong()), principalContextHolder.getPrincipal())
         return fetchRelationship(id)
@@ -74,9 +74,9 @@ class SpringAccountApi(
         id: String,
         followRequestBody: FollowRequestBody?,
     ): ResponseEntity<Relationship> {
-
         userFollowRequestApplicationService.execute(
-            FollowRequest(id.toLong()), principalContextHolder.getPrincipal()
+            FollowRequest(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
@@ -110,53 +110,57 @@ class SpringAccountApi(
     override suspend fun apiV1AccountsIdGet(id: String): ResponseEntity<Account> {
         return ResponseEntity.ok(
             getAccountApplicationService.execute(
-                GetAccount(id), principalContextHolder.getPrincipal()
+                GetAccount(id),
+                principalContextHolder.getPrincipal()
             )
         )
     }
 
     override suspend fun apiV1AccountsIdMutePost(id: String): ResponseEntity<Relationship> {
         userMuteApplicationService.execute(
-            Mute(id.toLong()), principalContextHolder.getPrincipal()
+            Mute(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
 
     override suspend fun apiV1AccountsIdRemoveFromFollowersPost(id: String): ResponseEntity<Relationship> {
         userRemoveFromFollowersApplicationService.execute(
-            RemoveFromFollowers(id.toLong()), principalContextHolder.getPrincipal()
+            RemoveFromFollowers(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
 
     override suspend fun apiV1AccountsIdUnblockPost(id: String): ResponseEntity<Relationship> {
         userUnblockApplicationService.execute(
-            Unblock(id.toLong()), principalContextHolder.getPrincipal()
+            Unblock(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
 
     override suspend fun apiV1AccountsIdUnfollowPost(id: String): ResponseEntity<Relationship> {
         userUnfollowApplicationService.execute(
-            Unfollow(id.toLong()), principalContextHolder.getPrincipal()
+            Unfollow(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
 
     override suspend fun apiV1AccountsIdUnmutePost(id: String): ResponseEntity<Relationship> {
         userUnmuteApplicationService.execute(
-            Unmute(id.toLong()), principalContextHolder.getPrincipal()
+            Unmute(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(id)
     }
 
-    override suspend fun apiV1AccountsPost(accountsCreateRequest: AccountsCreateRequest): ResponseEntity<Unit> {
+    override suspend fun apiV1AccountsPost(accountsCreateRequest: AccountsCreateRequest): ResponseEntity<Unit> =
-        return super.apiV1AccountsPost(accountsCreateRequest)
+        super.apiV1AccountsPost(accountsCreateRequest)
-    }
 
-    override suspend fun apiV1AccountsUpdateCredentialsPatch(updateCredentials: UpdateCredentials?): ResponseEntity<Account> {
+    override suspend fun apiV1AccountsUpdateCredentialsPatch(updateCredentials: UpdateCredentials?): ResponseEntity<Account> =
-        return super.apiV1AccountsUpdateCredentialsPatch(updateCredentials)
+        super.apiV1AccountsUpdateCredentialsPatch(updateCredentials)
-    }
 
     override suspend fun apiV1AccountsVerifyCredentialsGet(): ResponseEntity<CredentialAccount> {
         val principal = principalContextHolder.getPrincipal()
@@ -164,7 +168,8 @@ class SpringAccountApi(
             getUserDetailApplicationService.execute(
                 GetUserDetail(
                     principal.userDetailId?.id ?: throw PermissionDeniedException()
-                ), principal
+                ),
+                principal
             )
 
         return ResponseEntity.ok(
@@ -215,19 +220,18 @@ class SpringAccountApi(
     }
 
     override suspend fun apiV1FollowRequestsAccountIdAuthorizePost(accountId: String): ResponseEntity<Relationship> {
-
         userAcceptFollowRequestApplicationService.execute(
-            AcceptFollowRequest(accountId.toLong()), principalContextHolder.getPrincipal()
+            AcceptFollowRequest(accountId.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(accountId)
     }
 
     override suspend fun apiV1FollowRequestsAccountIdRejectPost(accountId: String): ResponseEntity<Relationship> {
-
         userRejectFollowRequestApplicationService.execute(
-            RejectFollowRequest(accountId.toLong()), principalContextHolder.getPrincipal()
+            RejectFollowRequest(accountId.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return fetchRelationship(accountId)
     }
-
 }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAppApi.kt

@@ -29,7 +29,6 @@ import java.net.URI
 @Controller
 class SpringAppApi(private val registerApplicationApplicationService: RegisterApplicationApplicationService) : AppApi {
     override suspend fun apiV1AppsPost(appsRequest: AppsRequest): ResponseEntity<Application> {
-
         val registerApplication = RegisterApplication(
             appsRequest.clientName,
             setOf(URI.create(appsRequest.redirectUris)),
@@ -39,12 +38,12 @@ class SpringAppApi(private val registerApplicationApplicationService: RegisterAp
         val registeredApplication = registerApplicationApplicationService.execute(registerApplication, Anonymous)
         return ResponseEntity.ok(
             Application(
-                registeredApplication.name,
+                name = registeredApplication.name,
-                "invalid-vapid-key",
+                vapidKey = "invalid-vapid-key",
-                null,
+                website = null,
-                registeredApplication.clientId,
+                clientId = registeredApplication.clientId,
-                registeredApplication.clientSecret,
+                clientSecret = registeredApplication.clientSecret,
-                appsRequest.redirectUris
+                redirectUri = appsRequest.redirectUris
             )
         )
     }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringFilterApi.kt

@@ -47,7 +47,8 @@ class SpringFilterApi(
     override suspend fun apiV1FiltersIdDelete(id: String): ResponseEntity<Any> {
         return ResponseEntity.ok(
             deleteFilterV1ApplicationService.execute(
-                DeleteFilterV1(id.toLong()), principalContextHolder.getPrincipal()
+                DeleteFilterV1(id.toLong()),
+                principalContextHolder.getPrincipal()
             )
         )
     }
@@ -55,7 +56,8 @@ class SpringFilterApi(
     override suspend fun apiV1FiltersIdGet(id: String): ResponseEntity<V1Filter> {
         return ResponseEntity.ok(
             getFilterV1ApplicationService.execute(
-                GetFilterV1(id.toLong()), principalContextHolder.getPrincipal()
+                GetFilterV1(id.toLong()),
+                principalContextHolder.getPrincipal()
             )
         )
     }
@@ -67,12 +69,9 @@ class SpringFilterApi(
         irreversible: Boolean?,
         wholeWord: Boolean?,
         expiresIn: Int?,
-    ): ResponseEntity<V1Filter> {
+    ): ResponseEntity<V1Filter> = super.apiV1FiltersIdPut(id, phrase, context, irreversible, wholeWord, expiresIn)
-        return super.apiV1FiltersIdPut(id, phrase, context, irreversible, wholeWord, expiresIn)
-    }
 
     override suspend fun apiV1FiltersPost(v1FilterPostRequest: V1FilterPostRequest): ResponseEntity<V1Filter> {
-
         val filterMode = if (v1FilterPostRequest.wholeWord == true) {
             FilterMode.WHOLE_WORD
         } else {
@@ -89,13 +88,17 @@ class SpringFilterApi(
         }.toSet()
         val filter = userRegisterFilterApplicationService.execute(
             RegisterFilter(
-                v1FilterPostRequest.phrase, filterContext, FilterAction.WARN,
+                v1FilterPostRequest.phrase,
+                filterContext,
+                FilterAction.WARN,
                 setOf(RegisterFilterKeyword(v1FilterPostRequest.phrase, filterMode))
-            ), principalContextHolder.getPrincipal()
+            ),
+            principalContextHolder.getPrincipal()
         )
         return ResponseEntity.ok(
             getFilterV1ApplicationService.execute(
-                GetFilterV1(filter.filterKeywords.first().id), principalContextHolder.getPrincipal()
+                GetFilterV1(filter.filterKeywords.first().id),
+                principalContextHolder.getPrincipal()
             )
         )
     }
@@ -103,27 +106,25 @@ class SpringFilterApi(
     override suspend fun apiV2FiltersFilterIdKeywordsPost(
         filterId: String,
         filterKeywordsPostRequest: FilterKeywordsPostRequest,
-    ): ResponseEntity<FilterKeyword> {
+    ): ResponseEntity<FilterKeyword> = super.apiV2FiltersFilterIdKeywordsPost(filterId, filterKeywordsPostRequest)
-        return super.apiV2FiltersFilterIdKeywordsPost(filterId, filterKeywordsPostRequest)
-    }
 
     override suspend fun apiV2FiltersFilterIdStatusesPost(
         filterId: String,
         filterStatusRequest: FilterStatusRequest,
-    ): ResponseEntity<FilterStatus> {
+    ): ResponseEntity<FilterStatus> = super.apiV2FiltersFilterIdStatusesPost(filterId, filterStatusRequest)
-        return super.apiV2FiltersFilterIdStatusesPost(filterId, filterStatusRequest)
-    }
 
     override suspend fun apiV2FiltersIdDelete(id: String): ResponseEntity<Any> {
         userDeleteFilterApplicationService.execute(
-            DeleteFilter(id.toLong()), principalContextHolder.getPrincipal()
+            DeleteFilter(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return ResponseEntity.ok(Unit)
     }
 
     override suspend fun apiV2FiltersIdGet(id: String): ResponseEntity<Filter> {
         val filter = userGetFilterApplicationService.execute(
-            GetFilter(id.toLong()), principalContextHolder.getPrincipal()
+            GetFilter(id.toLong()),
+            principalContextHolder.getPrincipal()
         )
         return ResponseEntity.ok(
             filter(filter)
@@ -146,7 +147,6 @@ class SpringFilterApi(
         filterAction = when (filter.filterAction) {
             FilterAction.WARN -> Filter.FilterAction.warn
             FilterAction.HIDE -> Filter.FilterAction.hide
-
         },
         keywords = filter.filterKeywords.map {
             FilterKeyword(
@@ -154,7 +154,8 @@ class SpringFilterApi(
                 it.keyword,
                 it.filterMode == FilterMode.WHOLE_WORD
             )
-        }, statuses = null
+        },
+        statuses = null
     )
 
     override suspend fun apiV2FiltersIdPut(
@@ -164,29 +165,23 @@ class SpringFilterApi(
         filterAction: String?,
         expiresIn: Int?,
         keywordsAttributes: List<FilterPubRequestKeyword>?,
-    ): ResponseEntity<Filter> {
+    ): ResponseEntity<Filter> =
-        return super.apiV2FiltersIdPut(id, title, context, filterAction, expiresIn, keywordsAttributes)
+        super.apiV2FiltersIdPut(id, title, context, filterAction, expiresIn, keywordsAttributes)
-    }
 
-    override suspend fun apiV2FiltersKeywordsIdDelete(id: String): ResponseEntity<Any> {
+    override suspend fun apiV2FiltersKeywordsIdDelete(id: String): ResponseEntity<Any> =
-        return super.apiV2FiltersKeywordsIdDelete(id)
+        super.apiV2FiltersKeywordsIdDelete(id)
-    }
 
-    override suspend fun apiV2FiltersKeywordsIdGet(id: String): ResponseEntity<FilterKeyword> {
+    override suspend fun apiV2FiltersKeywordsIdGet(id: String): ResponseEntity<FilterKeyword> =
-        return super.apiV2FiltersKeywordsIdGet(id)
+        super.apiV2FiltersKeywordsIdGet(id)
-    }
 
     override suspend fun apiV2FiltersKeywordsIdPut(
         id: String,
         keyword: String?,
         wholeWord: Boolean?,
         regex: Boolean?,
-    ): ResponseEntity<FilterKeyword> {
+    ): ResponseEntity<FilterKeyword> = super.apiV2FiltersKeywordsIdPut(id, keyword, wholeWord, regex)
-        return super.apiV2FiltersKeywordsIdPut(id, keyword, wholeWord, regex)
-    }
 
     override suspend fun apiV2FiltersPost(filterPostRequest: FilterPostRequest): ResponseEntity<Filter> {
-
         val filter = userRegisterFilterApplicationService.execute(
             RegisterFilter(
                 filterName = filterPostRequest.title,
@@ -216,16 +211,15 @@ class SpringFilterApi(
                         }
                     )
                 }.toSet()
-            ), principalContextHolder.getPrincipal()
+            ),
+            principalContextHolder.getPrincipal()
         )
         return ResponseEntity.ok(filter(filter))
     }
 
-    override suspend fun apiV2FiltersStatusesIdDelete(id: String): ResponseEntity<Any> {
+    override suspend fun apiV2FiltersStatusesIdDelete(id: String): ResponseEntity<Any> =
-        return ResponseEntity.notFound().build()
+        ResponseEntity.notFound().build()
-    }
 
-    override suspend fun apiV2FiltersStatusesIdGet(id: String): ResponseEntity<FilterStatus> {
+    override suspend fun apiV2FiltersStatusesIdGet(id: String): ResponseEntity<FilterStatus> =
-        return ResponseEntity.notFound().build()
+        ResponseEntity.notFound().build()
-    }
 }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringInstanceApi.kt

@@ -17,23 +17,19 @@
 package dev.usbharu.hideout.mastodon.interfaces.api
 
 import dev.usbharu.hideout.mastodon.interfaces.api.generated.InstanceApi
-import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.*
+import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.ExtendedDescription
-import kotlinx.coroutines.flow.Flow
+import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.Instance
+import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.V1Instance
 import org.springframework.http.ResponseEntity
 import org.springframework.stereotype.Controller
 
 @Controller
 class SpringInstanceApi : InstanceApi {
 
-    override suspend fun apiV1InstanceExtendedDescriptionGet(): ResponseEntity<ExtendedDescription> {
+    override suspend fun apiV1InstanceExtendedDescriptionGet(): ResponseEntity<ExtendedDescription> =
-        return super.apiV1InstanceExtendedDescriptionGet()
+        super.apiV1InstanceExtendedDescriptionGet()
-    }
 
-    override suspend fun apiV1InstanceGet(): ResponseEntity<V1Instance> {
+    override suspend fun apiV1InstanceGet(): ResponseEntity<V1Instance> = super.apiV1InstanceGet()
-        return super.apiV1InstanceGet()
-    }
 
-    override suspend fun apiV2InstanceGet(): ResponseEntity<Instance> {
+    override suspend fun apiV2InstanceGet(): ResponseEntity<Instance> = super.apiV2InstanceGet()
-        return super.apiV2InstanceGet()
-    }
 }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringMediaApi.kt

@@ -52,24 +52,25 @@ class SpringMediaApi(
                 file.originalFilename ?: file.name,
                 null,
                 description
-            ), principalContextHolder.getPrincipal()
+            ),
+            principalContextHolder.getPrincipal()
         )
 
         return ResponseEntity.ok(
             MediaAttachment(
-                media.id.toString(),
+                id = media.id.toString(),
-                when (media.type) {
+                type = when (media.type) {
                     Image -> MediaAttachment.Type.image
                     Video -> MediaAttachment.Type.video
                     Audio -> MediaAttachment.Type.audio
                     Unknown -> MediaAttachment.Type.unknown
                 },
-                media.url.toString(),
+                url = media.url.toString(),
-                media.thumbprintURI?.toString(),
+                previewUrl = media.thumbprintURI?.toString(),
-                media.remoteURL?.toString(),
+                remoteUrl = media.remoteURL?.toString(),
-                media.description,
+                description = media.description,
-                media.blurHash,
+                blurhash = media.blurHash,
-                media.url.toASCIIString()
+                textUrl = media.url.toASCIIString()
             )
         )
     }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringNotificationApi.kt

@@ -18,21 +18,16 @@ package dev.usbharu.hideout.mastodon.interfaces.api
 
 import dev.usbharu.hideout.mastodon.interfaces.api.generated.NotificationsApi
 import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.Notification
-import kotlinx.coroutines.flow.Flow
 import org.springframework.http.ResponseEntity
 import org.springframework.stereotype.Controller
 
 @Controller
 class SpringNotificationApi : NotificationsApi {
-    override suspend fun apiV1NotificationsClearPost(): ResponseEntity<Any> {
+    override suspend fun apiV1NotificationsClearPost(): ResponseEntity<Any> = super.apiV1NotificationsClearPost()
-        return super.apiV1NotificationsClearPost()
-    }
 
-    override suspend fun apiV1NotificationsIdDismissPost(id: String): ResponseEntity<Any> {
+    override suspend fun apiV1NotificationsIdDismissPost(id: String): ResponseEntity<Any> =
-        return super.apiV1NotificationsIdDismissPost(id)
+        super.apiV1NotificationsIdDismissPost(id)
-    }
 
-    override suspend fun apiV1NotificationsIdGet(id: String): ResponseEntity<Notification> {
+    override suspend fun apiV1NotificationsIdGet(id: String): ResponseEntity<Notification> =
-        return super.apiV1NotificationsIdGet(id)
+        super.apiV1NotificationsIdGet(id)
-    }
 }

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringStatusApi.kt

@@ -34,25 +34,22 @@ class SpringStatusApi(
     private val getStatusApplicationService: GetStatusApplicationService,
     private val principalContextHolder: SpringSecurityOauth2PrincipalContextHolder
 ) : StatusApi {
-    override suspend fun apiV1StatusesIdEmojiReactionsEmojiDelete(id: String, emoji: String): ResponseEntity<Status> {
+    override suspend fun apiV1StatusesIdEmojiReactionsEmojiDelete(id: String, emoji: String): ResponseEntity<Status> =
-        return super.apiV1StatusesIdEmojiReactionsEmojiDelete(id, emoji)
+        super.apiV1StatusesIdEmojiReactionsEmojiDelete(id, emoji)
-    }
 
-    override suspend fun apiV1StatusesIdEmojiReactionsEmojiPut(id: String, emoji: String): ResponseEntity<Status> {
+    override suspend fun apiV1StatusesIdEmojiReactionsEmojiPut(id: String, emoji: String): ResponseEntity<Status> =
-        return super.apiV1StatusesIdEmojiReactionsEmojiPut(id, emoji)
+        super.apiV1StatusesIdEmojiReactionsEmojiPut(id, emoji)
-    }
 
     override suspend fun apiV1StatusesIdGet(id: String): ResponseEntity<Status> {
-
         return ResponseEntity.ok(
             getStatusApplicationService.execute(
-                GetStatus(id), principalContextHolder.getPrincipal()
+                GetStatus(id),
+                principalContextHolder.getPrincipal()
             )
         )
     }
 
-    override suspend fun apiV1StatusesPost(statusesRequest: dev.usbharu.hideout.mastodon.interfaces.api.StatusesRequest): ResponseEntity<Status> {
+    override suspend fun apiV1StatusesPost(statusesRequest: StatusesRequest): ResponseEntity<Status> {
-
         val principal = principalContextHolder.getPrincipal()
         val execute = registerLocalPostApplicationService.execute(
             RegisterLocalPost(
@@ -69,10 +66,10 @@ class SpringStatusApi(
                 replyId = statusesRequest.in_reply_to_id?.toLong(),
                 sensitive = statusesRequest.sensitive == true,
                 mediaIds = statusesRequest.media_ids.map { it.toLong() }
-            ), principal
+            ),
+            principal
         )
 
-
         val status =
             getStatusApplicationService.execute(GetStatus(execute.toString()), principal)
         return ResponseEntity.ok(

hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/StatusesRequest.kt

@@ -66,8 +66,8 @@ class StatusesRequest {
 
     override fun toString(): String {
         return "StatusesRequest(status=$status, mediaIds=$media_ids, poll=$poll, inReplyToId=$in_reply_to_id, " +
-                "sensitive=$sensitive, spoilerText=$spoiler_text, visibility=$visibility, language=$language," +
+            "sensitive=$sensitive, spoilerText=$spoiler_text, visibility=$visibility, language=$language," +
-                " scheduledAt=$scheduled_at)"
+            " scheduledAt=$scheduled_at)"
     }
 
     @Suppress("EnumNaming", "EnumEntryNameCase")