fix: new tags showing null post count on theme

halo-dev · Nov 19, 2024 · ecbb2df · ecbb2df
1 parent 06f3c28
commit ecbb2df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/application/src/main/java/run/halo/app/core/reconciler/TagReconciler.java b/application/src/main/java/run/halo/app/core/reconciler/TagReconciler.java
@@ -52,10 +52,17 @@ public Result reconcile(Request request) {
                 String newPattern = tagPermalinkPolicy.pattern();
                 annotations.put(Constant.PERMALINK_PATTERN_ANNO, newPattern);
 
-                String permalink = tagPermalinkPolicy.permalink(tag);
                 var status = tag.getStatusOrDefault();
+                String permalink = tagPermalinkPolicy.permalink(tag);
                 status.setPermalink(permalink);
 
+                if (status.getPostCount() == null) {
+                    status.setPostCount(0);
+                }
+                if (status.getVisiblePostCount() == null) {
+                    status.setVisiblePostCount(0);
+                }
+
                 // Update the observed version.
                 status.setObservedVersion(tag.getMetadata().getVersion() + 1);
 

diff --git a/application/src/main/java/run/halo/app/theme/finders/vo/TagVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/TagVo.java
@@ -1,5 +1,7 @@
 package run.halo.app.theme.finders.vo;
 
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+
 import lombok.Builder;
 import lombok.Value;
 import run.halo.app.core.extension.content.Tag;
@@ -33,7 +35,7 @@ public static TagVo from(Tag tag) {
             .metadata(tag.getMetadata())
             .spec(spec)
             .status(status)
-            .postCount(tag.getStatusOrDefault().getVisiblePostCount())
+            .postCount(defaultIfNull(status.getVisiblePostCount(), 0))
             .build();
     }
 }