Merge branch 'main' into bugfix/3448

halo-dev · Mar 8, 2023 · 9719a7c · 9719a7c
2 parents 205f8c5 + 633c489
commit 9719a7c
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 18 deletions.
diff --git a/console/src/modules/contents/pages/SinglePageEditor.vue b/console/src/modules/contents/pages/SinglePageEditor.vue
@@ -208,6 +208,8 @@ const handleFetchContent = async () => {
     name: formState.value.page.metadata.name,
   });
 
+  formState.value.content = Object.assign(formState.value.content, data);
+
   // get editor provider
   if (!currentEditorProvider.value) {
     const preferredEditor = editorProviders.value.find(
@@ -249,8 +251,6 @@ const handleFetchContent = async () => {
     }
     await nextTick();
   }
-
-  formState.value.content = Object.assign(formState.value.content, data);
 };
 
 // SinglePage settings

diff --git a/console/src/modules/contents/posts/PostEditor.vue b/console/src/modules/contents/posts/PostEditor.vue
@@ -213,6 +213,8 @@ const handleFetchContent = async () => {
     name: formState.value.post.metadata.name,
   });
 
+  formState.value.content = Object.assign(formState.value.content, data);
+
   // get editor provider
   if (!currentEditorProvider.value) {
     const preferredEditor = editorProviders.value.find(
@@ -256,8 +258,6 @@ const handleFetchContent = async () => {
 
     await nextTick();
   }
-
-  formState.value.content = Object.assign(formState.value.content, data);
 };
 
 const handleOpenSettingModal = async () => {

diff --git a/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java b/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java
@@ -94,17 +94,22 @@ public Mono<Comment> create(Comment comment) {
                 }
                 comment.getSpec()
                     .setApproved(Boolean.FALSE.equals(commentSetting.getRequireReviewForNew()));
+
                 if (BooleanUtils.isTrue(comment.getSpec().getApproved())
                     && comment.getSpec().getApprovedTime() == null) {
                     comment.getSpec().setApprovedTime(Instant.now());
                 }
+
+                if (comment.getSpec().getCreationTime() == null) {
+                    comment.getSpec().setCreationTime(Instant.now());
+                }
+
                 comment.getSpec().setHidden(false);
+
+                // return if the comment owner is not null
                 if (comment.getSpec().getOwner() != null) {
                     return Mono.just(comment);
                 }
-                if (comment.getSpec().getCreationTime() == null) {
-                    comment.getSpec().setCreationTime(Instant.now());
-                }
                 // populate owner from current user
                 return fetchCurrentUser()
                     .map(this::toCommentOwner)

diff --git a/src/main/java/run/halo/app/core/extension/content/Comment.java b/src/main/java/run/halo/app/core/extension/content/Comment.java
@@ -91,15 +91,6 @@ public static class BaseCommentSpec {
 
         @Schema(required = true, defaultValue = "false")
         private Boolean hidden;
-
-        /**
-         * If the creation time is null, use approvedTime.
-         *
-         * @return if creationTime is null returned approved time, otherwise creationTime.
-         */
-        public Instant getCreationTime() {
-            return defaultIfNull(creationTime, approvedTime);
-        }
     }
 
     @Data

diff --git a/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java b/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java
@@ -1,12 +1,14 @@
 package run.halo.app.core.extension.reconciler;
 
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+
 import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import run.halo.app.content.comment.ReplyService;
@@ -51,6 +53,7 @@ public Result reconcile(Request request) {
                     return;
                 }
                 addFinalizerIfNecessary(comment);
+                compatibleCreationTime(request.name());
                 reconcileStatus(request.name());
                 updateSameSubjectRefCommentCounter(comment.getSpec().getSubjectRef());
             });
@@ -64,6 +67,28 @@ public Controller setupWith(ControllerBuilder builder) {
             .build();
     }
 
+    /**
+     * If the comment creation time is null, set it to the approved time or the current time.
+     * TODO remove this method in the future and fill in attributes in hook mode instead.
+     *
+     * @param name comment name
+     */
+    void compatibleCreationTime(String name) {
+        client.fetch(Comment.class, name).ifPresent(comment -> {
+            Instant creationTime = comment.getSpec().getCreationTime();
+            Instant oldCreationTime =
+                creationTime == null ? null : Instant.ofEpochMilli(creationTime.toEpochMilli());
+            if (creationTime == null) {
+                creationTime = defaultIfNull(comment.getSpec().getApprovedTime(), Instant.now());
+                comment.getSpec().setCreationTime(creationTime);
+            }
+
+            if (!Objects.equals(oldCreationTime, comment.getSpec().getCreationTime())) {
+                client.update(comment);
+            }
+        });
+    }
+
     private boolean isDeleted(Comment comment) {
         return comment.getMetadata().getDeletionTimestamp() != null;
     }
@@ -89,7 +114,7 @@ private void reconcileStatus(String name) {
         client.fetch(Comment.class, name).ifPresent(comment -> {
             Comment oldComment = JsonUtils.deepCopy(comment);
             Comment.CommentStatus status = comment.getStatusOrDefault();
-            status.setHasNewReply(ObjectUtils.defaultIfNull(status.getUnreadReplyCount(), 0) > 0);
+            status.setHasNewReply(defaultIfNull(status.getUnreadReplyCount(), 0) > 0);
             updateUnReplyCountIfNecessary(comment);
             if (!oldComment.equals(comment)) {
                 client.update(comment);

diff --git a/src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java b/src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java
@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.time.Instant;
 import java.util.HashSet;
@@ -85,6 +86,29 @@ void reconcileDelete() {
             .contains(CommentReconciler.FINALIZER_NAME)).isFalse();
     }
 
+    @Test
+    void compatibleCreationTime() {
+        Comment comment = new Comment();
+        comment.setMetadata(new Metadata());
+        comment.getMetadata().setName("fake-comment");
+        comment.setSpec(new Comment.CommentSpec());
+        comment.getSpec().setApprovedTime(Instant.now());
+        comment.getSpec().setCreationTime(null);
+        when(client.fetch(eq(Comment.class), eq("fake-comment")))
+            .thenReturn(Optional.of(comment));
+
+        commentReconciler.compatibleCreationTime("fake-comment");
+
+        verify(client, times(1)).fetch(eq(Comment.class), eq("fake-comment"));
+
+        ArgumentCaptor<Comment> captor = ArgumentCaptor.forClass(Comment.class);
+        verify(client, times(1)).update(captor.capture());
+        Comment updated = captor.getValue();
+        assertThat(updated.getSpec().getCreationTime()).isNotNull();
+        assertThat(updated.getSpec().getCreationTime())
+            .isEqualTo(updated.getSpec().getApprovedTime());
+    }
+
     private static Ref getRef() {
         Ref ref = new Ref();
         ref.setGroup("content.halo.run");