feat: JSON-LDとして正しいJSONを返すように

hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/Constant.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 usbharu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.usbharu.hideout.activitypub.domain
+
+import dev.usbharu.hideout.activitypub.domain.model.StringOrObject
+
+object Constant {
+    val context = listOf(
+        StringOrObject("https://www.w3.org/ns/activitystreams"),
+        StringOrObject("https://w3id.org/security/v1"),
+        StringOrObject(
+            mapOf(
+                "manuallyApprovesFollowers" to "as:manuallyApprovesFollowers",
+                "sensitive" to "as:sensitive",
+                "Hashtag" to "as:Hashtag",
+                "quoteUrl" to "as:quoteUrl",
+                "toot" to "http://joinmastodon.org/ns#",
+                "Emoji" to "toot:Emoji",
+                "featured" to "toot:featured",
+                "discoverable" to "toot:discoverable",
+                "schema" to "http://schema.org#",
+                "PropertyValue" to "schema:PropertyValue",
+                "value" to "schema:value",
+            )
+        )
+    )
+}

hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt

@@ -16,8 +16,8 @@
 
 package dev.usbharu.hideout.activitypub.interfaces.api.actor
 
+import dev.usbharu.hideout.activitypub.domain.Constant
 import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.activitypub.domain.model.StringOrObject
 import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException
 import org.springframework.http.HttpStatus
@@ -32,17 +32,7 @@ class UserAPControllerImpl(private val apUserService: APUserService) : UserAPCon
         } catch (_: UserNotFoundException) {
             return ResponseEntity.notFound().build()
         }
-        person.context += listOf(
+        person.context += Constant.context
-            StringOrObject("https://www.w3.org/ns/activitystreams"),
-            StringOrObject("https://w3id.org/security/v1"),
-            StringOrObject(
-                mapOf(
-                    "manuallyApprovesFollowers" to "as:manuallyApprovesFollowers",
-                    "sensitive" to "as:sensitive",
-                    "Hashtag" to "as:Hashtag"
-                )
-            )
-        )
         return ResponseEntity(person, HttpStatus.OK)
     }
 }

hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt

@@ -17,6 +17,7 @@
 package dev.usbharu.hideout.activitypub.service.common
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import dev.usbharu.hideout.activitypub.domain.Constant
 import dev.usbharu.hideout.activitypub.domain.model.StringOrObject
 import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.actor.Actor
@@ -75,7 +76,7 @@ class APRequestServiceImpl(
         date: String,
         u: URL,
         signer: Actor,
-        url: String
+        url: String,
     ): HttpResponse {
         val headers = headers {
             append("Accept", Activity)
@@ -118,7 +119,7 @@ class APRequestServiceImpl(
         url: String,
         body: T?,
         signer: Actor?,
-        responseClass: Class<R>
+        responseClass: Class<R>,
     ): R {
         val bodyAsText = apPost(url, body, signer)
         return objectMapper.readValue(bodyAsText, responseClass)
@@ -168,7 +169,7 @@ class APRequestServiceImpl(
         url: String,
         date: String?,
         digest: String,
-        requestBody: String?
+        requestBody: String?,
     ) = httpClient.post(url) {
         accept(Activity)
         header("Date", date)
@@ -184,7 +185,7 @@ class APRequestServiceImpl(
         u: URL,
         digest: String,
         signer: Actor,
-        requestBody: String?
+        requestBody: String?,
     ): HttpResponse {
         val headers = headers {
             append("Accept", Activity)
@@ -219,10 +220,10 @@ class APRequestServiceImpl(
     }
 
     private fun <T : Object> addContextIfNotNull(body: T?) = if (body != null) {
-        val mutableListOf = mutableListOf<StringOrObject>()
+        val context = mutableListOf<StringOrObject>()
-        mutableListOf.add(StringOrObject("https://www.w3.org/ns/activitystreams"))
+        context.addAll(Constant.context)
-        mutableListOf.addAll(body.context)
+        context.addAll(body.context)
-        body.context = mutableListOf
+        body.context = context
         objectMapper.writeValueAsString(body)
     } else {
         null

hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt

@@ -17,11 +17,14 @@
 package dev.usbharu.hideout.application.config
 
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.databind.module.SimpleModule
 import com.nimbusds.jose.jwk.JWKSet
 import com.nimbusds.jose.jwk.RSAKey
 import com.nimbusds.jose.jwk.source.ImmutableJWKSet
 import com.nimbusds.jose.jwk.source.JWKSource
 import com.nimbusds.jose.proc.SecurityContext
+import dev.usbharu.hideout.activitypub.domain.model.StringORObjectSerializer
+import dev.usbharu.hideout.activitypub.domain.model.StringOrObject
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.application.infrastructure.springframework.RoleHierarchyAuthorizationManagerFactory
 import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
@@ -295,13 +298,16 @@ class SecurityConfig {
     @Primary
     fun jackson2ObjectMapperBuilderCustomizer(): Jackson2ObjectMapperBuilderCustomizer {
         return Jackson2ObjectMapperBuilderCustomizer {
-            it.serializationInclusion(JsonInclude.Include.ALWAYS).serializers()
+            it.serializationInclusion(JsonInclude.Include.ALWAYS)
+                .modulesToInstall(SimpleModule().addSerializer(StringOrObject::class.java, StringORObjectSerializer()))
+                .serializers()
         }
     }
 
     @Bean
     fun mappingJackson2HttpMessageConverter(): MappingJackson2HttpMessageConverter {
         val builder = Jackson2ObjectMapperBuilder().serializationInclusion(JsonInclude.Include.NON_NULL)
+        builder.modulesToInstall(SimpleModule().addSerializer(StringOrObject::class.java, StringORObjectSerializer()))
         return MappingJackson2HttpMessageConverter(builder.build())
     }