From 9c965957581a29ee31eff296de833189aaa08255 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 19 Nov 2023 11:50:19 +0900 Subject: [PATCH] style: fix lint --- .../domain/model/objects/ObjectValue.kt | 1 + .../core/domain/model/instance/Nodeinfo.kt | 4 +- .../core/domain/model/instance/Nodeinfo2_0.kt | 7 +-- .../hideout/core/domain/model/user/User.kt | 5 +- .../InstanceRepositoryImpl.kt | 2 +- .../core/service/instance/InstanceService.kt | 52 +++++++++---------- .../core/service/media/MediaServiceImpl.kt | 3 +- 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt index 1cd01d81..b97b2541 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt @@ -1,5 +1,6 @@ package dev.usbharu.hideout.activitypub.domain.model.objects +@Suppress("VariableNaming") open class ObjectValue : Object { var `object`: String? = null diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt index 013bb969..427c76a3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt @@ -4,12 +4,12 @@ class Nodeinfo { var links: List = emptyList() - protected constructor() + private constructor() } class Links { var rel: String? = null var href: String? = null - protected constructor() + private constructor() } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt index 6ff35b1e..fcd99c73 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt @@ -1,22 +1,23 @@ package dev.usbharu.hideout.core.domain.model.instance +@Suppress("ClassNaming") class Nodeinfo2_0 { var metadata: Metadata? = null var software: Software? = null - protected constructor() + constructor() } class Metadata { var nodeName: String? = null var nodeDescription: String? = null - protected constructor() + constructor() } class Software { var name: String? = null var version: String? = null - protected constructor() + constructor() } diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/user/User.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/user/User.kt index 208f5b9d..b8f3be26 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/user/User.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/user/User.kt @@ -25,7 +25,10 @@ data class User private constructor( val instance: Long? = null ) { override fun toString(): String = - "User(id=$id, name='$name', domain='$domain', screenName='$screenName', description='$description', password=$password, inbox='$inbox', outbox='$outbox', url='$url', publicKey='$publicKey', privateKey=$privateKey, createdAt=$createdAt, keyId='$keyId', followers=$followers, following=$following, instance=$instance)" + "User(id=$id, name='$name', domain='$domain', screenName='$screenName', description='$description'," + + " password=$password, inbox='$inbox', outbox='$outbox', url='$url', publicKey='$publicKey', " + + "privateKey=$privateKey, createdAt=$createdAt, keyId='$keyId', followers=$followers," + + " following=$following, instance=$instance)" @Component class UserBuilder(private val characterLimit: CharacterLimit, private val applicationConfig: ApplicationConfig) { diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt index a62ac486..5d4a860d 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt @@ -15,7 +15,7 @@ class InstanceRepositoryImpl(private val idGenerateService: IdGenerateService) : override suspend fun generateId(): Long = idGenerateService.generateId() override suspend fun save(instance: InstanceEntity): InstanceEntity { - if (Instance.select { Instance.id.eq(instance.id) }.firstOrNull() == null) { + if (Instance.select { Instance.id.eq(instance.id) }.empty()) { Instance.insert { it[id] = instance.id it[name] = instance.name diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt index 380083f2..4b0e2640 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt @@ -50,13 +50,13 @@ class InstanceServiceImpl( ) val instanceCreateDto = InstanceCreateDto( - nodeinfo20.metadata?.nodeName, - nodeinfo20.metadata?.nodeDescription, - resolveInstanceUrl, - resolveInstanceUrl + "/favicon.ico", - sharedInbox, - nodeinfo20.software?.name, - nodeinfo20.software?.version + name = nodeinfo20.metadata?.nodeName, + description = nodeinfo20.metadata?.nodeDescription, + url = resolveInstanceUrl, + iconUrl = resolveInstanceUrl + "/favicon.ico", + sharedInbox = sharedInbox, + software = nodeinfo20.software?.name, + version = nodeinfo20.software?.version ) return createNewInstance(instanceCreateDto) } @@ -69,13 +69,13 @@ class InstanceServiceImpl( ) val instanceCreateDto = InstanceCreateDto( - nodeinfo20.metadata?.nodeName, - nodeinfo20.metadata?.nodeDescription, - resolveInstanceUrl, - resolveInstanceUrl + "/favicon.ico", - sharedInbox, - nodeinfo20.software?.name, - nodeinfo20.software?.version + name = nodeinfo20.metadata?.nodeName, + description = nodeinfo20.metadata?.nodeDescription, + url = resolveInstanceUrl, + iconUrl = resolveInstanceUrl + "/favicon.ico", + sharedInbox = sharedInbox, + software = nodeinfo20.software?.name, + version = nodeinfo20.software?.version ) return createNewInstance(instanceCreateDto) } @@ -91,18 +91,18 @@ class InstanceServiceImpl( override suspend fun createNewInstance(instanceCreateDto: InstanceCreateDto): Instance { val instance = Instance( - instanceRepository.generateId(), - instanceCreateDto.name ?: instanceCreateDto.url, - instanceCreateDto.description ?: "", - instanceCreateDto.url, - instanceCreateDto.iconUrl, - instanceCreateDto.sharedInbox, - instanceCreateDto.software ?: "unknown", - instanceCreateDto.version ?: "unknown", - false, - false, - "", - Instant.now() + id = instanceRepository.generateId(), + name = instanceCreateDto.name ?: instanceCreateDto.url, + description = instanceCreateDto.description.orEmpty(), + url = instanceCreateDto.url, + iconUrl = instanceCreateDto.iconUrl, + sharedInbox = instanceCreateDto.sharedInbox, + software = instanceCreateDto.software ?: "unknown", + version = instanceCreateDto.version ?: "unknown", + isBlocked = false, + isMuted = false, + moderationNote = "", + createdAt = Instant.now() ) instanceRepository.save(instance) return instance diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt index fbf99674..ff8f1d93 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt @@ -24,7 +24,7 @@ open class MediaServiceImpl( private val remoteMediaDownloadService: RemoteMediaDownloadService, private val renameService: MediaFileRenameService ) : MediaService { - @Suppress("LongMethod") + @Suppress("LongMethod", "NestedBlockDepth") override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia { val fileName = mediaRequest.file.name logger.info( @@ -95,6 +95,7 @@ open class MediaServiceImpl( } // TODO: 仮の処理として保存したように動かす + @Suppress("LongMethod", "NestedBlockDepth") override suspend fun uploadRemoteMedia(remoteMedia: RemoteMedia): Media { logger.info("MEDIA Remote media. filename:${remoteMedia.name} url:${remoteMedia.url}")