diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt index ba32b94c..8ad40516 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt @@ -30,4 +30,4 @@ class GetActorApplicationService( companion object { private val logger = LoggerFactory.getLogger(GetActorApplicationService::class.java) } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt index 6890b0b0..e1a07ba6 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt @@ -8,7 +8,6 @@ import org.springframework.http.HttpMethod.POST import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.invoke import org.springframework.security.web.SecurityFilterChain -import org.springframework.security.web.util.matcher.AnyRequestMatcher import org.springframework.security.web.util.matcher.RequestMatcher @Configuration @@ -17,10 +16,12 @@ class ActivityPubSecurityConfig { @Order(4) fun activityPubSecurityFilterChain(http: HttpSecurity): SecurityFilterChain { http { - securityMatcher(RequestMatcher { - val accept = it.getHeader("Accept") ?: "" - return@RequestMatcher accept == "application/json" || accept == "application/activity+json" - }) + securityMatcher( + RequestMatcher { + val accept = it.getHeader("Accept") ?: "" + return@RequestMatcher accept == "application/json" || accept == "application/activity+json" + } + ) authorizeHttpRequests { authorize(POST, "/inbox", permitAll) authorize(POST, "/users/{username}/inbox", permitAll) @@ -31,4 +32,4 @@ class ActivityPubSecurityConfig { } return http.build() } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubWebMvcConfigurer.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubWebMvcConfigurer.kt index 8d1a88ad..6a06958d 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubWebMvcConfigurer.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubWebMvcConfigurer.kt @@ -13,4 +13,4 @@ class ActivityPubWebMvcConfigurer(private val activityStreamsHttpMessageConverte override fun extendMessageConverters(converters: MutableList>) { converters.add(activityStreamsHttpMessageConverter) } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt index 615be159..3258dcdf 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt @@ -26,4 +26,4 @@ class OwlConfig { ) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt index 1c0c33b4..1055b7ef 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt @@ -4,4 +4,4 @@ import dev.usbharu.hideout.activitypub.domain.task.Task interface TaskPublisher { suspend fun publish(task: Task<*>) -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt index 77ab78c7..875a8946 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt @@ -10,6 +10,4 @@ class Task( val publishedOn: Instant, val body: T, val domain: Domain -) : Task() { - -} \ No newline at end of file +) : Task() diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt index c0049b1d..dd0afca2 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt @@ -4,4 +4,4 @@ import dev.usbharu.hideout.core.domain.model.support.principal.Principal abstract class TaskBody(private val map: Map, val principal: Principal) { fun toMap(): Map = map -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActivityStreamHttpMessageConverter.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActivityStreamHttpMessageConverter.kt index c5ee2afd..30f5c1e5 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActivityStreamHttpMessageConverter.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActivityStreamHttpMessageConverter.kt @@ -29,17 +29,19 @@ class ActivityStreamHttpMessageConverter : HttpMessageConverter { outputMessage.headers.contentType = MediaType.APPLICATION_JSON outputMessage.body.bufferedWriter() .use { - it.write(JsonUtils.toString( - JsonLdProcessor.compact( - JsonUtils.fromString(JacksonSerializationConverter.convert(t.json).toString()), "https://www.w3.org/ns/activitystreams", - JsonLdOptions() + it.write( + JsonUtils.toString( + JsonLdProcessor.compact( + JsonUtils.fromString(JacksonSerializationConverter.convert(t.json).toString()), + "https://www.w3.org/ns/activitystreams", + JsonLdOptions() + ) ) - )) + ) } } override fun read(clazz: Class, inputMessage: HttpInputMessage): JsonLd { TODO("Not yet implemented") } - -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActorTranslator.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActorTranslator.kt index bc83299a..2bfcb763 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActorTranslator.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/external/activitystreams/ActorTranslator.kt @@ -1,6 +1,5 @@ package dev.usbharu.hideout.activitypub.external.activitystreams - import dev.usbharu.activitystreamsserialization.dsl.ActivityBuilder import dev.usbharu.activitystreamsserialization.other.JsonLd import dev.usbharu.hideout.core.domain.model.actor.Actor @@ -10,7 +9,7 @@ import org.springframework.stereotype.Service @Service class ActorTranslator { fun translate(actor: Actor, iconMedia: Media?, bannerMedia: Media?): JsonLd { - //todo actorにbot等の属性が生えてきたら対応する + // todo actorにbot等の属性が生えてきたら対応する val person = ActivityBuilder().Person { name(actor.name.name) id(actor.url) @@ -25,16 +24,16 @@ class ActorTranslator { owner(actor.url) publicKeyPem(actor.publicKey.publicKey) id(actor.keyId.keyId) - }) - + } + ) } iconMedia?.let { icon { listOf( Image { url(iconMedia.url) - }) - + } + ) } } bannerMedia?.let { @@ -42,10 +41,11 @@ class ActorTranslator { listOf( Image { url(bannerMedia.url) - }) + } + ) } } } return person } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt index a641d786..766feea0 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt @@ -10,4 +10,4 @@ class OwlTaskPublisher(private val owlProducer: OwlProducer) : TaskPublisher { override suspend fun publish(task: Task<*>) { owlProducer.publishTask(task) } -} \ No newline at end of file +} diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt index 22619f32..02002923 100644 --- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt +++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt @@ -18,4 +18,4 @@ class APActorController(private val getActorApplicationService: GetActorApplicat suspend fun user(@PathVariable username: String): ResponseEntity { return ResponseEntity.ok(getActorApplicationService.execute(username, Anonymous)) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/RemoteUser.kt b/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/RemoteUser.kt index 3e0a114f..01a41536 100644 --- a/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/RemoteUser.kt +++ b/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/support/principal/RemoteUser.kt @@ -3,4 +3,4 @@ package dev.usbharu.hideout.core.domain.model.support.principal import dev.usbharu.hideout.core.domain.model.actor.ActorId import dev.usbharu.hideout.core.domain.model.support.acct.Acct -class RemoteUser(actorId: ActorId, acct: Acct?) : Principal(actorId, null, acct) \ No newline at end of file +class RemoteUser(actorId: ActorId, acct: Acct?) : Principal(actorId, null, acct)