Merge pull request #598 from usbharu/renovate/detekt

chore(deps): update detekt to v1.23.7

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

@@ -16,12 +16,12 @@ data class Reactions(
         fun of(reactionList: List<Reaction>, customEmoji: CustomEmoji?): Reactions {
             val first = reactionList.first()
             return Reactions(
-                first.id.value,
+                postId = first.id.value,
-                reactionList.size,
+                count = reactionList.size,
-                customEmoji?.name ?: first.unicodeEmoji.name,
+                name = customEmoji?.name ?: first.unicodeEmoji.name,
-                customEmoji?.domain?.domain ?: first.unicodeEmoji.domain.domain,
+                domain = customEmoji?.domain?.domain ?: first.unicodeEmoji.domain.domain,
-                customEmoji?.url,
+                url = customEmoji?.url,
-                reactionList.map { it.actorId.id }
+                actorIds = reactionList.map { it.actorId.id }
             )
         }
     }

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

@@ -44,10 +44,10 @@ class ReadTimelineApplicationService(
             val reply = if (it.replyPost != null) {
                 @Suppress("UnsafeCallOnNullableType")
                 PostDetail.of(
-                    it.replyPost,
+                    post = it.replyPost,
-                    it.replyPostActor!!,
+                    actor = it.replyPostActor!!,
-                    it.replyPostActorIconMedia,
+                    iconMedia = it.replyPostActorIconMedia,
-                    it.replyPostMedias.orEmpty(),
+                    mediaList = it.replyPostMedias.orEmpty(),
                     reactionsList = emptyList(),
                     favourited = false,
                 )

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt

@@ -27,15 +27,14 @@ class Reaction(
         return id == other.id
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = id.hashCode()
-        return id.hashCode()
-    }
 
     fun delete() {
         addDomainEvent(ReactionEventFactory(this).createEvent(ReactionEvent.DELETE))
     }
 
     companion object {
+        @Suppress("LongParameterList")
         fun create(
             id: ReactionId,
             postId: PostId,

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt

@@ -4,6 +4,7 @@ import dev.usbharu.hideout.core.domain.model.actor.ActorId
 import dev.usbharu.hideout.core.domain.model.emoji.CustomEmojiId
 import dev.usbharu.hideout.core.domain.model.post.PostId
 
+@Suppress("FunctionMaxLength")
 interface ReactionRepository {
     suspend fun save(reaction: Reaction): Reaction
     suspend fun findById(reactionId: ReactionId): Reaction?

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

@@ -9,6 +9,8 @@ interface TimelineRepository {
     suspend fun findByIds(ids: List<TimelineId>): List<Timeline>
 
     suspend fun findById(id: TimelineId): Timeline?
+
+    @Suppress("FunctionMaxLength")
     suspend fun findAllByUserDetailIdAndVisibilityIn(
         userDetailId: UserDetailId,
         visibility: List<TimelineVisibility>

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timelinerelationship/TimelineRelationship.kt

@@ -18,9 +18,7 @@ class TimelineRelationship(
         return id == other.id
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = id.hashCode()
-        return id.hashCode()
-    }
 }
 
 enum class Visible {

hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/emojikt/EmojiKtUnicodeEmojiService.kt

@@ -6,7 +6,5 @@ import org.springframework.stereotype.Service
 
 @Service
 class EmojiKtUnicodeEmojiService : UnicodeEmojiService {
-    override fun isUnicodeEmoji(emoji: String): Boolean {
+    override fun isUnicodeEmoji(emoji: String): Boolean = Emojis.allEmojis.singleOrNull { it.char == emoji } != null
-        return Emojis.allEmojis.singleOrNull { it.char == emoji } != null
-    }
 }

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

@@ -17,6 +17,9 @@ import dev.usbharu.hideout.core.infrastructure.exposedrepository.Reactions as Ex
 
 @Repository
 class ExposedReactionsQueryService : ReactionsQueryService, AbstractRepository() {
+    override val logger: Logger
+        get() = Companion.logger
+
     override suspend fun findAllByPostId(postId: PostId): List<Reactions> {
         return query {
             ExposedrepositoryReactions.leftJoin(CustomEmojis).selectAll()
@@ -52,21 +55,18 @@ class ExposedReactionsQueryService : ReactionsQueryService, AbstractRepository()
                 .groupBy(ExposedrepositoryReactions.postId)
                 .map {
                     Reactions(
-                        it[ExposedrepositoryReactions.postId],
+                        postId = it[ExposedrepositoryReactions.postId],
-                        it[ExposedrepositoryReactions.postId.count()].toInt(),
+                        count = it[ExposedrepositoryReactions.postId.count()].toInt(),
-                        it.getOrNull(CustomEmojis.name)
+                        name = it.getOrNull(CustomEmojis.name)
                             ?: it[ExposedrepositoryReactions.unicodeEmoji.max<String, String>()]!!,
-                        it.getOrNull(CustomEmojis.domain) ?: UnicodeEmoji.domain.domain,
+                        domain = it.getOrNull(CustomEmojis.domain) ?: UnicodeEmoji.domain.domain,
-                        it.getOrNull(CustomEmojis.url)?.let { it1 -> URI.create(it1) },
+                        url = it.getOrNull(CustomEmojis.url)?.let { it1 -> URI.create(it1) },
-                        it[actorIdsQuery].split(",").mapNotNull { it.toLongOrNull() }
+                        actorIds = it[actorIdsQuery].split(",").mapNotNull { s -> s.toLongOrNull() }
                     )
                 }
         }
     }
 
-    override val logger: Logger
-        get() = Companion.logger
-
     companion object {
         private val logger = LoggerFactory.getLogger(ExposedReactionsQueryService::class.java)
     }

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

@@ -76,7 +76,7 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi
                     mediaDetailList = it.mapNotNull { resultRow ->
                         resultRow.toMediaOrNull()?.let { it1 -> MediaDetail.of(it1) }
                     },
-                    favourited = it.any { it.getOrNull(Reactions.actorId) != null }
+                    favourited = it.any { resultRow -> resultRow.getOrNull(Reactions.actorId) != null }
                 )
             }
     }
@@ -108,7 +108,7 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi
             deleted = it[authorizedQuery[Posts.deleted]],
             mediaDetailList = emptyList(),
             moveTo = null,
-            emptyList(),
+            reactionsList = emptyList(),
             favourited = false
         )
     }

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

@@ -108,12 +108,12 @@ class ExposedReactionRepository(override val domainEventPublisher: DomainEventPu
 
 fun ResultRow.toReaction(): Reaction {
     return Reaction(
-        ReactionId(this[Reactions.id]),
+        id = ReactionId(this[Reactions.id]),
-        PostId(this[Reactions.postId]),
+        postId = PostId(this[Reactions.postId]),
-        ActorId(this[Reactions.actorId]),
+        actorId = ActorId(this[Reactions.actorId]),
-        this[Reactions.customEmojiId]?.let { CustomEmojiId(it) },
+        customEmojiId = this[Reactions.customEmojiId]?.let { CustomEmojiId(it) },
-        UnicodeEmoji(this[Reactions.unicodeEmoji]),
+        unicodeEmoji = UnicodeEmoji(this[Reactions.unicodeEmoji]),
-        this[Reactions.createdAt]
+        createdAt = this[Reactions.createdAt]
     )
 }
 

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

@@ -160,9 +160,8 @@ open class DefaultTimelineStore(
     override suspend fun getMedias(mediaIds: List<MediaId>): Map<MediaId, Media> =
         mediaRepository.findByIds(mediaIds).associateBy { it.id }
 
-    override suspend fun getReactions(postIds: List<PostId>): Map<PostId, List<Reactions>> {
+    override suspend fun getReactions(postIds: List<PostId>): Map<PostId, List<Reactions>> =
-        return reactionsQueryService.findAllByPostIdIn(postIds).groupBy { PostId(it.postId) }
+        reactionsQueryService.findAllByPostIdIn(postIds).groupBy { PostId(it.postId) }
-    }
 
     override suspend fun getUserDetails(userDetailIdList: List<UserDetailId>): Map<UserDetailId, UserDetail> =
         userDetailRepository.findAllById(userDetailIdList).associateBy { it.id }

libs.versions.toml

@@ -4,7 +4,7 @@ kotlin = "2.0.20"
 ktor = "2.3.12"
 exposed = "0.54.0"
 javacv-ffmpeg = "6.1.1-1.5.10"
-detekt = "1.23.6"
+detekt = "1.23.7"
 coroutines = "1.8.1"
 swagger = "2.2.23"
 tika = "2.9.2"