style: fix lint

This commit is contained in:
usbharu 2025-02-16 11:57:35 +09:00
parent 5e5bbe756b
commit 5fd181a339
Signed by: usbharu
GPG Key ID: 8CB1087135660B8D
6 changed files with 21 additions and 19 deletions

View File

@ -13,17 +13,11 @@ import org.springframework.stereotype.Component
@Component @Component
class ActivityStreamHttpMessageConverter : HttpMessageConverter<JsonLd> { class ActivityStreamHttpMessageConverter : HttpMessageConverter<JsonLd> {
override fun canRead(clazz: Class<*>, mediaType: MediaType?): Boolean { override fun canRead(clazz: Class<*>, mediaType: MediaType?): Boolean = false
return false
}
override fun canWrite(clazz: Class<*>, mediaType: MediaType?): Boolean { override fun canWrite(clazz: Class<*>, mediaType: MediaType?): Boolean = JsonLd::class.java.isAssignableFrom(clazz)
return JsonLd::class.java.isAssignableFrom(clazz)
}
override fun getSupportedMediaTypes(): MutableList<MediaType> { override fun getSupportedMediaTypes(): MutableList<MediaType> = mutableListOf()
return mutableListOf()
}
override fun write(t: JsonLd, contentType: MediaType?, outputMessage: HttpOutputMessage) { override fun write(t: JsonLd, contentType: MediaType?, outputMessage: HttpOutputMessage) {
outputMessage.headers.contentType = MediaType.APPLICATION_JSON outputMessage.headers.contentType = MediaType.APPLICATION_JSON

View File

@ -1,4 +1,4 @@
package dev.usbharu.hideout.activitypub.`interface`.api package dev.usbharu.hideout.activitypub.interfaces.api
import dev.usbharu.activitystreamsserialization.other.JsonLd import dev.usbharu.activitystreamsserialization.other.JsonLd
import dev.usbharu.hideout.activitypub.application.actor.GetActorApplicationService import dev.usbharu.hideout.activitypub.application.actor.GetActorApplicationService
@ -15,7 +15,6 @@ class APActorController(private val getActorApplicationService: GetActorApplicat
// consumes = ["application/activity+json"], // consumes = ["application/activity+json"],
produces = ["application/activity+json"] produces = ["application/activity+json"]
) )
suspend fun user(@PathVariable username: String): ResponseEntity<JsonLd> { suspend fun user(@PathVariable username: String): ResponseEntity<JsonLd> =
return ResponseEntity.ok(getActorApplicationService.execute(username, Anonymous)) ResponseEntity.ok(getActorApplicationService.execute(username, Anonymous))
}
} }

View File

@ -1,7 +1,7 @@
package activity package activity
import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.SpringApplication
import dev.usbharu.hideout.activitypub.`interface`.api.APActorController import dev.usbharu.hideout.activitypub.interfaces.api.APActorController
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired

View File

@ -25,6 +25,7 @@ import dev.usbharu.hideout.core.domain.model.support.timelineobjectdetail.Timeli
import dev.usbharu.hideout.core.domain.model.timeline.Timeline import dev.usbharu.hideout.core.domain.model.timeline.Timeline
import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationship import dev.usbharu.hideout.core.domain.model.timelinerelationship.TimelineRelationship
@Suppress("TooManyFunctions")
interface TimelineStore { interface TimelineStore {
suspend fun addPost(post: Post) suspend fun addPost(post: Post)
suspend fun updatePost(post: Post) suspend fun updatePost(post: Post)

View File

@ -34,7 +34,7 @@ import dev.usbharu.hideout.mastodon.interfaces.api.generated.model.CustomEmoji a
@Suppress("IncompleteDestructuring") @Suppress("IncompleteDestructuring")
@Repository @Repository
class StatusQueryServiceImpl : StatusQueryService { class ExposedStatusQueryServiceImpl : StatusQueryService {
protected fun authorizedQuery(principal: Principal? = null): QueryAlias { protected fun authorizedQuery(principal: Principal? = null): QueryAlias {
if (principal == null) { if (principal == null) {
@ -60,8 +60,16 @@ class StatusQueryServiceImpl : StatusQueryService {
.where { .where {
Posts.visibility eq Visibility.PUBLIC.name or 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.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) 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.actorId eq principal.actorId.id) (Posts.actorId eq principal.actorId.id)
} }
.alias("authorized_table") .alias("authorized_table")

View File

@ -19,10 +19,10 @@ import org.springframework.transaction.annotation.Transactional
@Sql("/sql/relationships.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql("/sql/relationships.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Transactional @Transactional
@SpringBootTest(classes = [SpringApplication::class]) @SpringBootTest(classes = [SpringApplication::class])
class StatusQueryServiceImplTest { class ExposedStatusQueryServiceImplTest {
@Autowired @Autowired
lateinit var statusQueryServiceImpl: StatusQueryServiceImpl lateinit var statusQueryServiceImpl: ExposedStatusQueryServiceImpl
@Test @Test
fun フォロワー限定をフォロワー以外は見れない() = runTest { fun フォロワー限定をフォロワー以外は見れない() = runTest {