mirror of https://github.com/usbharu/Hideout.git
style: fix lint (CI)
This commit is contained in:
parent
27cf8227ea
commit
5e5bbe756b
|
@ -30,4 +30,4 @@ class GetActorApplicationService(
|
||||||
companion object {
|
companion object {
|
||||||
private val logger = LoggerFactory.getLogger(GetActorApplicationService::class.java)
|
private val logger = LoggerFactory.getLogger(GetActorApplicationService::class.java)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.builders.HttpSecurity
|
||||||
import org.springframework.security.config.annotation.web.invoke
|
import org.springframework.security.config.annotation.web.invoke
|
||||||
import org.springframework.security.web.SecurityFilterChain
|
import org.springframework.security.web.SecurityFilterChain
|
||||||
import org.springframework.security.web.util.matcher.AnyRequestMatcher
|
|
||||||
import org.springframework.security.web.util.matcher.RequestMatcher
|
import org.springframework.security.web.util.matcher.RequestMatcher
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
|
@ -17,10 +16,12 @@ class ActivityPubSecurityConfig {
|
||||||
@Order(4)
|
@Order(4)
|
||||||
fun activityPubSecurityFilterChain(http: HttpSecurity): SecurityFilterChain {
|
fun activityPubSecurityFilterChain(http: HttpSecurity): SecurityFilterChain {
|
||||||
http {
|
http {
|
||||||
securityMatcher(RequestMatcher {
|
securityMatcher(
|
||||||
val accept = it.getHeader("Accept") ?: ""
|
RequestMatcher {
|
||||||
return@RequestMatcher accept == "application/json" || accept == "application/activity+json"
|
val accept = it.getHeader("Accept") ?: ""
|
||||||
})
|
return@RequestMatcher accept == "application/json" || accept == "application/activity+json"
|
||||||
|
}
|
||||||
|
)
|
||||||
authorizeHttpRequests {
|
authorizeHttpRequests {
|
||||||
authorize(POST, "/inbox", permitAll)
|
authorize(POST, "/inbox", permitAll)
|
||||||
authorize(POST, "/users/{username}/inbox", permitAll)
|
authorize(POST, "/users/{username}/inbox", permitAll)
|
||||||
|
@ -31,4 +32,4 @@ class ActivityPubSecurityConfig {
|
||||||
}
|
}
|
||||||
return http.build()
|
return http.build()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,4 +13,4 @@ class ActivityPubWebMvcConfigurer(private val activityStreamsHttpMessageConverte
|
||||||
override fun extendMessageConverters(converters: MutableList<HttpMessageConverter<*>>) {
|
override fun extendMessageConverters(converters: MutableList<HttpMessageConverter<*>>) {
|
||||||
converters.add(activityStreamsHttpMessageConverter)
|
converters.add(activityStreamsHttpMessageConverter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,4 +26,4 @@ class OwlConfig {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,4 +4,4 @@ import dev.usbharu.hideout.activitypub.domain.task.Task
|
||||||
|
|
||||||
interface TaskPublisher {
|
interface TaskPublisher {
|
||||||
suspend fun publish(task: Task<*>)
|
suspend fun publish(task: Task<*>)
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,4 @@ class Task<out T : TaskBody>(
|
||||||
val publishedOn: Instant,
|
val publishedOn: Instant,
|
||||||
val body: T,
|
val body: T,
|
||||||
val domain: Domain
|
val domain: Domain
|
||||||
) : Task() {
|
) : Task()
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -4,4 +4,4 @@ import dev.usbharu.hideout.core.domain.model.support.principal.Principal
|
||||||
|
|
||||||
abstract class TaskBody(private val map: Map<String, Any?>, val principal: Principal) {
|
abstract class TaskBody(private val map: Map<String, Any?>, val principal: Principal) {
|
||||||
fun toMap(): Map<String, Any?> = map
|
fun toMap(): Map<String, Any?> = map
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,17 +29,19 @@ class ActivityStreamHttpMessageConverter : HttpMessageConverter<JsonLd> {
|
||||||
outputMessage.headers.contentType = MediaType.APPLICATION_JSON
|
outputMessage.headers.contentType = MediaType.APPLICATION_JSON
|
||||||
outputMessage.body.bufferedWriter()
|
outputMessage.body.bufferedWriter()
|
||||||
.use {
|
.use {
|
||||||
it.write(JsonUtils.toString(
|
it.write(
|
||||||
JsonLdProcessor.compact(
|
JsonUtils.toString(
|
||||||
JsonUtils.fromString(JacksonSerializationConverter.convert(t.json).toString()), "https://www.w3.org/ns/activitystreams",
|
JsonLdProcessor.compact(
|
||||||
JsonLdOptions()
|
JsonUtils.fromString(JacksonSerializationConverter.convert(t.json).toString()),
|
||||||
|
"https://www.w3.org/ns/activitystreams",
|
||||||
|
JsonLdOptions()
|
||||||
|
)
|
||||||
)
|
)
|
||||||
))
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun read(clazz: Class<out JsonLd>, inputMessage: HttpInputMessage): JsonLd {
|
override fun read(clazz: Class<out JsonLd>, inputMessage: HttpInputMessage): JsonLd {
|
||||||
TODO("Not yet implemented")
|
TODO("Not yet implemented")
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package dev.usbharu.hideout.activitypub.external.activitystreams
|
package dev.usbharu.hideout.activitypub.external.activitystreams
|
||||||
|
|
||||||
|
|
||||||
import dev.usbharu.activitystreamsserialization.dsl.ActivityBuilder
|
import dev.usbharu.activitystreamsserialization.dsl.ActivityBuilder
|
||||||
import dev.usbharu.activitystreamsserialization.other.JsonLd
|
import dev.usbharu.activitystreamsserialization.other.JsonLd
|
||||||
import dev.usbharu.hideout.core.domain.model.actor.Actor
|
import dev.usbharu.hideout.core.domain.model.actor.Actor
|
||||||
|
@ -10,7 +9,7 @@ import org.springframework.stereotype.Service
|
||||||
@Service
|
@Service
|
||||||
class ActorTranslator {
|
class ActorTranslator {
|
||||||
fun translate(actor: Actor, iconMedia: Media?, bannerMedia: Media?): JsonLd {
|
fun translate(actor: Actor, iconMedia: Media?, bannerMedia: Media?): JsonLd {
|
||||||
//todo actorにbot等の属性が生えてきたら対応する
|
// todo actorにbot等の属性が生えてきたら対応する
|
||||||
val person = ActivityBuilder().Person {
|
val person = ActivityBuilder().Person {
|
||||||
name(actor.name.name)
|
name(actor.name.name)
|
||||||
id(actor.url)
|
id(actor.url)
|
||||||
|
@ -25,16 +24,16 @@ class ActorTranslator {
|
||||||
owner(actor.url)
|
owner(actor.url)
|
||||||
publicKeyPem(actor.publicKey.publicKey)
|
publicKeyPem(actor.publicKey.publicKey)
|
||||||
id(actor.keyId.keyId)
|
id(actor.keyId.keyId)
|
||||||
})
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
iconMedia?.let {
|
iconMedia?.let {
|
||||||
icon {
|
icon {
|
||||||
listOf(
|
listOf(
|
||||||
Image {
|
Image {
|
||||||
url(iconMedia.url)
|
url(iconMedia.url)
|
||||||
})
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bannerMedia?.let {
|
bannerMedia?.let {
|
||||||
|
@ -42,10 +41,11 @@ class ActorTranslator {
|
||||||
listOf(
|
listOf(
|
||||||
Image {
|
Image {
|
||||||
url(bannerMedia.url)
|
url(bannerMedia.url)
|
||||||
})
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return person
|
return person
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,4 +10,4 @@ class OwlTaskPublisher(private val owlProducer: OwlProducer) : TaskPublisher {
|
||||||
override suspend fun publish(task: Task<*>) {
|
override suspend fun publish(task: Task<*>) {
|
||||||
owlProducer.publishTask(task)
|
owlProducer.publishTask(task)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,4 +18,4 @@ class APActorController(private val getActorApplicationService: GetActorApplicat
|
||||||
suspend fun user(@PathVariable username: String): ResponseEntity<JsonLd> {
|
suspend fun user(@PathVariable username: String): ResponseEntity<JsonLd> {
|
||||||
return ResponseEntity.ok(getActorApplicationService.execute(username, Anonymous))
|
return ResponseEntity.ok(getActorApplicationService.execute(username, Anonymous))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.actor.ActorId
|
||||||
import dev.usbharu.hideout.core.domain.model.support.acct.Acct
|
import dev.usbharu.hideout.core.domain.model.support.acct.Acct
|
||||||
|
|
||||||
class RemoteUser(actorId: ActorId, acct: Acct?) : Principal(actorId, null, acct)
|
class RemoteUser(actorId: ActorId, acct: Acct?) : Principal(actorId, null, acct)
|
||||||
|
|
Loading…
Reference in New Issue