Merge branch 'main' into feat/multi-roles-for-user

halo-dev · Nov 22, 2024 · 3288c3b · 3288c3b
2 parents efe49a6 + 201afca
commit 3288c3b
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 22 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/security/device/DeviceServiceImpl.java b/application/src/main/java/run/halo/app/security/device/DeviceServiceImpl.java
@@ -192,12 +192,14 @@ record DeviceInfo(String browser, String os) {
                 Pattern.CASE_INSENSITIVE);
 
         static final Pattern OS_REGEX =
-            Pattern.compile("(Windows NT|Mac OS X|Android|Linux|iPhone|iPad|Windows Phone)");
+            Pattern.compile(
+                "(Windows NT|Mac OS X|Android|Linux|iPhone|iPad|Windows Phone|OpenHarmony)");
         static final Pattern[] osRegexes = {
             Pattern.compile("Windows NT (\\d+\\.\\d+)"),
             Pattern.compile("Mac OS X (\\d+[\\._]\\d+([\\._]\\d+)?)"),
             Pattern.compile("iPhone OS (\\d+_\\d+(_\\d+)?)"),
-            Pattern.compile("Android (\\d+\\.\\d+(\\.\\d+)?)")
+            Pattern.compile("Android (\\d+\\.\\d+(\\.\\d+)?)"),
+            Pattern.compile("OpenHarmony (\\d+\\.\\d+(\\.\\d+)?)")
         };
 
         public static DeviceInfo parse(String userAgent) {

diff --git a/application/src/main/java/run/halo/app/theme/TemplateEngineManager.java b/application/src/main/java/run/halo/app/theme/TemplateEngineManager.java
@@ -5,7 +5,6 @@
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ConcurrentLruCache;
-import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.dialect.IDialect;
 import org.thymeleaf.spring6.ISpringWebFluxTemplateEngine;
 import org.thymeleaf.spring6.dialect.SpringStandardDialect;
@@ -72,12 +71,7 @@ public ISpringWebFluxTemplateEngine getTemplateEngine(ThemeContext theme) {
 
     public Mono<Void> clearCache(String themeName) {
         return themeResolver.getThemeContext(themeName)
-            .doOnNext(themeContext -> {
-                CacheKey cacheKey = buildCacheKey(themeContext);
-                TemplateEngine templateEngine =
-                    (TemplateEngine) engineCache.get(cacheKey);
-                templateEngine.clearTemplateCache();
-            })
+            .doOnNext(themeContext -> engineCache.remove(buildCacheKey(themeContext)))
             .then();
     }
 

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();
     }
 }
diff --git a/application/src/test/java/run/halo/app/security/device/DeviceServiceImplTest.java b/application/src/test/java/run/halo/app/security/device/DeviceServiceImplTest.java
@@ -2,7 +2,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests for {@link DeviceServiceImpl}.
@@ -12,13 +15,29 @@
  */
 class DeviceServiceImplTest {
 
-    @Test
-    void deviceInfoParseTest() {
-        var info = DeviceServiceImpl.DeviceInfo.parse(
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like "
-                + "Gecko) Chrome/126.0.0.0 Safari/537.36");
-        assertThat(info.os()).isEqualTo("Mac OS X 10.15.7");
-        assertThat(info.browser()).isEqualTo("Chrome 126.0");
+    static Stream<Arguments> deviceInfoParseTest() {
+        return Stream.of(
+            Arguments.of(
+                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like "
+                    + "Gecko) Chrome/126.0.0.0 Safari/537.36",
+                "Mac OS X 10.15.7",
+                "Chrome 126.0"
+            ),
+            Arguments.of(
+                "Mozilla/5.0 (Phone; OpenHarmony 5.0) AppleWebKit/537.36 (KHTML, like Gecko) "
+                    + "Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile HuaweiBrowser/5.0.4"
+                    + ".300",
+                "OpenHarmony 5.0",
+                "Chrome 114.0"
+            )
+        );
     }
 
+    @ParameterizedTest
+    @MethodSource
+    void deviceInfoParseTest(String userAgent, String expectedOs, String expectedBrowser) {
+        var info = DeviceServiceImpl.DeviceInfo.parse(userAgent);
+        assertThat(info.os()).isEqualTo(expectedOs);
+        assertThat(info.browser()).isEqualTo(expectedBrowser);
+    }
 }
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '3.4.0-RC1' apply false
+    id 'org.springframework.boot' version '3.4.0' apply false
     id 'io.spring.dependency-management' version '1.1.6' apply false
     id "com.gorylenko.gradle-git-properties" version "2.4.1" apply false
     id "de.undercouch.download" version "5.6.0" apply false

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################