From 20012782b746b11e9397d590c4f032f8702716af Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:03:53 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20Note=E4=B8=AD=E3=81=AEHTML=E3=82=92Post?=
 =?UTF-8?q?Builder=E3=81=AB=E3=81=84=E3=82=8C=E3=82=8B=E6=BA=96=E5=82=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/objects/note/APNoteService.kt            |  2 +-
 .../usbharu/hideout/core/domain/model/post/Post.kt   | 12 ++++++++----
 .../infrastructure/exposed/PostResultRowMapper.kt    |  2 +-
 .../hideout/core/service/post/PostServiceImpl.kt     |  2 +-
 src/test/kotlin/utils/PostBuilder.kt                 |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
index 43d0b7f1..7c788ae0 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
@@ -128,7 +128,7 @@ class APNoteServiceImpl(
             postBuilder.of(
                 id = postRepository.generateId(),
                 actorId = person.second.id,
-                text = note.content,
+                content = note.content,
                 createdAt = Instant.parse(note.published).toEpochMilli(),
                 visibility = visibility,
                 url = note.id,
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt
index cad1606f..4eb41077 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt
@@ -8,6 +8,7 @@ data class Post private constructor(
     val id: Long,
     val actorId: Long,
     val overview: String? = null,
+    val content: String,
     val text: String,
     val createdAt: Long,
     val visibility: Visibility,
@@ -28,7 +29,7 @@ data class Post private constructor(
             id: Long,
             actorId: Long,
             overview: String? = null,
-            text: String,
+            content: String,
             createdAt: Long,
             visibility: Visibility,
             url: String,
@@ -49,10 +50,10 @@ data class Post private constructor(
                 overview
             }
 
-            val limitedText = if (text.length >= characterLimit.post.text) {
-                text.substring(0, characterLimit.post.text)
+            val limitedText = if (content.length >= characterLimit.post.text) {
+                content.substring(0, characterLimit.post.text)
             } else {
-                text
+                content
             }
 
             require(url.isNotBlank()) { "url must contain non-blank characters" }
@@ -67,6 +68,7 @@ data class Post private constructor(
                 id = id,
                 actorId = actorId,
                 overview = limitedOverview,
+                content = content,
                 text = limitedText,
                 createdAt = createdAt,
                 visibility = visibility,
@@ -94,6 +96,7 @@ data class Post private constructor(
                 id = id,
                 actorId = 0,
                 overview = null,
+                content = "",
                 text = "",
                 createdAt = Instant.EPOCH.toEpochMilli(),
                 visibility = visibility,
@@ -113,6 +116,7 @@ data class Post private constructor(
             id = this.id,
             actorId = 0,
             overview = null,
+            content = "",
             text = "",
             createdAt = Instant.EPOCH.toEpochMilli(),
             visibility = visibility,
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt
index ed3802f6..c8a4ccbf 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt
@@ -25,7 +25,7 @@ class PostResultRowMapper(private val postBuilder: Post.PostBuilder) : ResultRow
             id = resultRow[Posts.id],
             actorId = resultRow[Posts.actorId],
             overview = resultRow[Posts.overview],
-            text = resultRow[Posts.text],
+            content = resultRow[Posts.text],
             createdAt = resultRow[Posts.createdAt],
             visibility = Visibility.values().first { visibility -> visibility.ordinal == resultRow[Posts.visibility] },
             url = resultRow[Posts.url],
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt
index f6fc8471..02bdacd2 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt
@@ -97,7 +97,7 @@ class PostServiceImpl(
             id = id,
             actorId = post.userId,
             overview = post.overview,
-            text = post.text,
+            content = post.text,
             createdAt = Instant.now().toEpochMilli(),
             visibility = post.visibility,
             url = "${user.url}/posts/$id",
diff --git a/src/test/kotlin/utils/PostBuilder.kt b/src/test/kotlin/utils/PostBuilder.kt
index d69c9d70..97b8f6fb 100644
--- a/src/test/kotlin/utils/PostBuilder.kt
+++ b/src/test/kotlin/utils/PostBuilder.kt
@@ -26,7 +26,7 @@ object PostBuilder {
             id = id,
             actorId = userId,
             overview = overview,
-            text = text,
+            content = text,
             createdAt = createdAt,
             visibility = visibility,
             url = url,