Merge pull request #797 from EdiWang/master

Patch v14.4.1
EdiWang · May 15, 2024 · edc8614 · edc8614
2 parents 786be8f + 50ad889
commit edc8614
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 46 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,8 +3,8 @@
     <Authors>Edi Wang</Authors>
     <Company>edi.wang</Company>
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
-    <AssemblyVersion>14.4.0.0</AssemblyVersion>
-    <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0</Version>
+    <AssemblyVersion>14.4.1.0</AssemblyVersion>
+    <FileVersion>14.4.1.0</FileVersion>
+    <Version>14.4.1</Version>
   </PropertyGroup>
 </Project>
diff --git a/src/Moonglade.Configuration/BlogConfig.cs b/src/Moonglade.Configuration/BlogConfig.cs
@@ -1,9 +1,7 @@
 
 namespace Moonglade.Configuration;
 
-public interface IBlogSettings
-{
-}
+public interface IBlogSettings;
 
 public interface IBlogConfig
 {

diff --git a/src/Moonglade.Data.PostgreSql/Moonglade.Data.PostgreSql.csproj b/src/Moonglade.Data.PostgreSql/Moonglade.Data.PostgreSql.csproj
@@ -10,7 +10,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />

diff --git a/src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj b/src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj
@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />

diff --git a/src/Moonglade.Data/Moonglade.Data.csproj b/src/Moonglade.Data/Moonglade.Data.csproj
@@ -17,6 +17,9 @@
         <PackageReference Include="Ardalis.Specification" Version="8.0.0" />
         <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
         <PackageReference Include="MediatR" Version="12.2.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.5" />
+    </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/Moonglade.Data/Seed.cs b/src/Moonglade.Data/Seed.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Moonglade.Data.Entities;
+using Moonglade.Utils;
 
 namespace Moonglade.Data;
 
@@ -46,12 +47,15 @@ public static async Task SeedAsync(BlogDbContext dbContext, ILogger logger, int
                 LastModifiedUtc = DateTime.UtcNow,
                 PubDateUtc = DateTime.UtcNow,
                 ContentLanguageCode = "en-us",
-                HashCheckSum = -1688639577,
                 IsOriginal = true,
                 Tags = dbContext.Tag.ToList(),
                 PostCategory = dbContext.PostCategory.ToList()
             };
 
+            var input = $"{post.Slug}#{post.PubDateUtc.GetValueOrDefault():yyyyMMdd}";
+            var checkSum = Helper.ComputeCheckSum(input);
+            post.HashCheckSum = checkSum;
+
             await dbContext.Post.AddAsync(post);
 
             await dbContext.SaveChangesAsync();

diff --git a/src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs b/src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs
@@ -2,7 +2,7 @@
 
 namespace Moonglade.Data.Specifications;
 
-public class BlogConfigurationSpec : SingleResultSpecification<BlogConfigurationEntity>
+public sealed class BlogConfigurationSpec : SingleResultSpecification<BlogConfigurationEntity>
 {
     public BlogConfigurationSpec(string cfgKey)
     {

diff --git a/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs b/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
@@ -2,7 +2,7 @@
 
 namespace Moonglade.Data.Specifications;
 
-public class BlogThemeForIdNameSpec : Specification<BlogThemeEntity, ThemeSegment>
+public sealed class BlogThemeForIdNameSpec : Specification<BlogThemeEntity, ThemeSegment>
 {
     public BlogThemeForIdNameSpec()
     {

diff --git a/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs b/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs
@@ -2,7 +2,7 @@
 
 namespace Moonglade.Data.Specifications;
 
-public class CategoryBySlugSpec : SingleResultSpecification<CategoryEntity>
+public sealed class CategoryBySlugSpec : SingleResultSpecification<CategoryEntity>
 {
     public CategoryBySlugSpec(string slug)
     {

diff --git a/src/Moonglade.Data/Specifications/PageBySlugSpec.cs b/src/Moonglade.Data/Specifications/PageBySlugSpec.cs
@@ -2,7 +2,7 @@
 
 namespace Moonglade.Data.Specifications;
 
-public class PageBySlugSpec : SingleResultSpecification<PageEntity>
+public sealed class PageBySlugSpec : SingleResultSpecification<PageEntity>
 {
     public PageBySlugSpec(string slug)
     {

diff --git a/src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs b/src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs
@@ -2,7 +2,7 @@
 
 namespace Moonglade.Data.Specifications;
 
-public class PingbackReadOnlySpec : Specification<PingbackEntity>
+public sealed class PingbackReadOnlySpec : Specification<PingbackEntity>
 {
     public PingbackReadOnlySpec()
     {

diff --git a/src/Moonglade.Data/Specifications/PostTagSpec.cs b/src/Moonglade.Data/Specifications/PostTagSpec.cs
@@ -17,7 +17,7 @@ public PostTagSpec(int tagId, int pageSize, int pageIndex)
     }
 }
 
-public class PostTagByTagIdSpec : SingleResultSpecification<PostTagEntity>
+public sealed class PostTagByTagIdSpec : SingleResultSpecification<PostTagEntity>
 {
     public PostTagByTagIdSpec(int tagId)
     {

diff --git a/src/Moonglade.ImageStorage/Moonglade.ImageStorage.csproj b/src/Moonglade.ImageStorage/Moonglade.ImageStorage.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
     <PackageReference Include="Minio" Version="6.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Moonglade.ImageStorage/RegularFileNameGenerator.cs b/src/Moonglade.ImageStorage/RegularFileNameGenerator.cs
diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
@@ -89,7 +89,7 @@ public static string TryGetFullOSVersion()
             if (currentVersion != null)
             {
                 var name = currentVersion.GetValue("ProductName", "Microsoft Windows NT");
-                var ubr = currentVersion.GetValue("UBR", string.Empty)?.ToString();
+                var ubr = currentVersion.GetValue("UBR", string.Empty).ToString();
                 if (!string.IsNullOrWhiteSpace(ubr))
                 {
                     return $"{name} {osVer.Version.Major}.{osVer.Version.Minor}.{osVer.Version.Build}.{ubr}";

diff --git a/src/Moonglade.Web/Moonglade.Web.csproj b/src/Moonglade.Web/Moonglade.Web.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="Edi.ImageWatermark" Version="2.11.4" />
     <PackageReference Include="Edi.PasswordGenerator" Version="1.1.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Auth\Moonglade.Auth.csproj" />

diff --git a/src/Moonglade.Web/Pages/_CommentForm.cshtml b/src/Moonglade.Web/Pages/_CommentForm.cshtml
@@ -16,7 +16,7 @@
                    id="input-comment-email" />
 
             <span class="text-muted">
-                * @SharedLocalizer["Enter your email to receive reply notifications and display your Gravatar"]
+                * @SharedLocalizer["Enter your email to receive reply notifications and display your Gravatar. Your email will not be displayed publicly."]
             </span>
         </div>
         <div class="comment-md-content mb-2">