Release v12.14.0

src/Directory.Build.props

@@ -3,8 +3,8 @@
     <Authors>Edi Wang</Authors>
     <Company>edi.wang</Company>
     <Copyright>(C) 2023 edi.wang@outlook.com</Copyright>
-    <AssemblyVersion>12.13.0.0</AssemblyVersion>
-    <FileVersion>12.13.0.0</FileVersion>
-    <Version>12.13.0</Version>
+    <AssemblyVersion>12.14.0.0</AssemblyVersion>
+    <FileVersion>12.14.0.0</FileVersion>
+    <Version>12.14.0</Version>
   </PropertyGroup>
 </Project>

src/Moonglade.Auth/Moonglade.Auth.csproj

@@ -1,26 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Using Include="System.Text" />
-
-		<Using Include="Microsoft.AspNetCore.Mvc" />
-		<Using Include="Microsoft.AspNetCore.Authorization" />
-
-		<Using Include="MediatR" />
-	</ItemGroup>
-	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-
-		<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
-		<ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
-	</ItemGroup>
-</Project>
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyName>Moonglade.Auth</AssemblyName>
+        <RootNamespace>Moonglade.Auth</RootNamespace>
+        <IsTestProject>false</IsTestProject>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+    <ItemGroup>
+        <Using Include="System.Text" />
+        <Using Include="Microsoft.AspNetCore.Mvc" />
+        <Using Include="Microsoft.AspNetCore.Authorization" />
+        <Using Include="MediatR" />
+    </ItemGroup>
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+        <PackageReference Include="Microsoft.Identity.Web" Version="2.13.4" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
+        <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
+    </ItemGroup>
+</Project>

src/Moonglade.Comments/Moonglade.Comments.csproj

@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Edi.WordFilter" Version="1.7.0" />
-    <PackageReference Include="Edi.Captcha" Version="3.16.0" />
-    <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
-  </ItemGroup>
-
-</Project>
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyName>Moonglade.Comments</AssemblyName>
+        <RootNamespace>Moonglade.Comments</RootNamespace>
+        <IsTestProject>false</IsTestProject>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Edi.WordFilter" Version="1.7.0" />
+        <PackageReference Include="Edi.Captcha" Version="3.17.0" />
+        <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
+    </ItemGroup>
+</Project>

src/Moonglade.Configuration/ImageSettings.cs

@@ -25,27 +25,12 @@ public class ImageSettings : IBlogSettings, IValidatableObject
     [Required]
     [Display(Name = "A")]
     [Range(0, 255)]
-    public int WatermarkColorA { get; set; }
-
-    [Required]
-    [Display(Name = "R")]
-    [Range(0, 255)]
-    public int WatermarkColorR { get; set; }
-
-    [Required]
-    [Display(Name = "G")]
-    [Range(0, 255)]
-    public int WatermarkColorG { get; set; }
-
-    [Required]
-    [Display(Name = "B")]
-    [Range(0, 255)]
-    public int WatermarkColorB { get; set; }
+    public int WatermarkColorA { get; set; } = 128;
 
     [Required]
     [Display(Name = "Watermark skip pixel threshold")]
     [Range(0, int.MaxValue)]
-    public int WatermarkSkipPixel { get; set; }
+    public int WatermarkSkipPixel { get; set; } = 40000;
 
     [Display(Name = "Fit image to device pixel ratio")]
     public bool FitImageToDevicePixelRatio { get; set; }
@@ -58,16 +43,6 @@ public class ImageSettings : IBlogSettings, IValidatableObject
     [Display(Name = "CDN endpoint")]
     public string CDNEndpoint { get; set; }
 
-    public ImageSettings()
-    {
-        WatermarkColorA = 128;
-        WatermarkColorR = 128;
-        WatermarkColorG = 128;
-        WatermarkColorB = 128;
-
-        WatermarkSkipPixel = 40000;
-    }
-
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         if (EnableCDNRedirect)

src/Moonglade.Configuration/Moonglade.Configuration.csproj

@@ -1,17 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
-    <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyName>Moonglade.Configuration</AssemblyName>
+        <RootNamespace>Moonglade.Configuration</RootNamespace>
+        <IsTestProject>false</IsTestProject>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
+        <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
+    </ItemGroup>
+</Project>

src/Moonglade.Core/DeleteStyleSheetCommand.cs

@@ -0,0 +1,21 @@
+namespace Moonglade.Core;
+
+public record DeleteStyleSheetCommand(Guid Id) : IRequest;
+
+public class DeleteStyleSheetCommandHandler : IRequestHandler<DeleteStyleSheetCommand>
+{
+    private readonly IRepository<StyleSheetEntity> _repo;
+
+    public DeleteStyleSheetCommandHandler(IRepository<StyleSheetEntity> repo) => _repo = repo;
+
+    public async Task Handle(DeleteStyleSheetCommand request, CancellationToken cancellationToken)
+    {
+        var styleSheet = await _repo.GetAsync(request.Id, cancellationToken);
+        if (styleSheet is null)
+        {
+            throw new InvalidOperationException($"StyleSheetEntity with Id '{request.Id}' not found.");
+        }
+
+        await _repo.DeleteAsync(styleSheet, cancellationToken);
+    }
+}

src/Moonglade.Core/GetStyleSheetQuery.cs

@@ -0,0 +1,16 @@
+namespace Moonglade.Core;
+
+public record GetStyleSheetQuery(Guid Id) : IRequest<StyleSheetEntity>;
+
+public class GetStyleSheetQueryHandler : IRequestHandler<GetStyleSheetQuery, StyleSheetEntity>
+{
+    private readonly IRepository<StyleSheetEntity> _repo;
+
+    public GetStyleSheetQueryHandler(IRepository<StyleSheetEntity> repo) => _repo = repo;
+
+    public async Task<StyleSheetEntity> Handle(GetStyleSheetQuery request, CancellationToken cancellationToken)
+    {
+        var result = await _repo.GetAsync(request.Id, cancellationToken);
+        return result;
+    }
+}

src/Moonglade.Core/Moonglade.Core.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
-	<ItemGroup>
-	  <PackageReference Include="Edi.CacheAside.InMemory" Version="1.0.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Using Include="System.Text" />
-
-		<Using Include="Microsoft.AspNetCore.Mvc" />
-		<Using Include="Microsoft.AspNetCore.Authorization" />
-
-		<Using Include="MediatR" />
-
-		<Using Include="Moonglade.Data.Entities" />
-		<Using Include="Moonglade.Data.Infrastructure" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
-	</ItemGroup>
-</Project>
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyName>Moonglade.Core</AssemblyName>
+        <RootNamespace>Moonglade.Core</RootNamespace>
+        <IsTestProject>false</IsTestProject>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Edi.CacheAside.InMemory" Version="1.0.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <Using Include="System.Text" />
+        <Using Include="Microsoft.AspNetCore.Mvc" />
+        <Using Include="Microsoft.AspNetCore.Authorization" />
+        <Using Include="MediatR" />
+        <Using Include="Moonglade.Data.Entities" />
+        <Using Include="Moonglade.Data.Infrastructure" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
+    </ItemGroup>
+</Project>

src/Moonglade.Core/PageFeature/BlogPage.cs

@@ -7,7 +7,7 @@ public class BlogPage
     public string Slug { get; set; }
     public string MetaDescription { get; set; }
     public string RawHtmlContent { get; set; }
-    public string CssContent { get; set; }
+    public string CssId { get; set; }
     public bool HideSidebar { get; set; }
     public bool IsPublished { get; set; }
     public DateTime CreateTimeUtc { get; set; }
@@ -25,7 +25,7 @@ public BlogPage(PageEntity entity)
         Id = entity.Id;
         Title = entity.Title.Trim();
         CreateTimeUtc = entity.CreateTimeUtc;
-        CssContent = entity.CssContent;
+        CssId = entity.CssId;
         RawHtmlContent = entity.HtmlContent;
         HideSidebar = entity.HideSidebar;
         Slug = entity.Slug.Trim().ToLower();

src/Moonglade.Core/PageFeature/CreatePageCommand.cs

@@ -5,22 +5,36 @@ public record CreatePageCommand(EditPageRequest Payload) : IRequest<Guid>;
 public class CreatePageCommandHandler : IRequestHandler<CreatePageCommand, Guid>
 {
     private readonly IRepository<PageEntity> _repo;
-    public CreatePageCommandHandler(IRepository<PageEntity> repo) => _repo = repo;
+    private readonly IMediator _mediator;
+
+    public CreatePageCommandHandler(IRepository<PageEntity> repo, IMediator mediator)
+    {
+        _repo = repo;
+        _mediator = mediator;
+    }
 
     public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
     {
+        var slug = request.Payload.Slug.ToLower().Trim();
+
+        Guid? cssId = null;
+        if (!string.IsNullOrWhiteSpace(request.Payload.CssContent))
+        {
+            cssId = await _mediator.Send(new SaveStyleSheetCommand(Guid.NewGuid(), slug, request.Payload.CssContent), ct);
+        }
+
         var uid = Guid.NewGuid();
         var page = new PageEntity
         {
             Id = uid,
             Title = request.Payload.Title.Trim(),
-            Slug = request.Payload.Slug.ToLower().Trim(),
+            Slug = slug,
             MetaDescription = request.Payload.MetaDescription,
             CreateTimeUtc = DateTime.UtcNow,
             HtmlContent = request.Payload.RawHtmlContent,
-            CssContent = request.Payload.CssContent,
             HideSidebar = request.Payload.HideSidebar,
-            IsPublished = request.Payload.IsPublished
+            IsPublished = request.Payload.IsPublished,
+            CssId = cssId.ToString()
         };
 
         await _repo.AddAsync(page, ct);

src/Moonglade.Core/PageFeature/DeletePageCommand.cs

@@ -5,8 +5,27 @@ public record DeletePageCommand(Guid Id) : IRequest;
 public class DeletePageCommandHandler : IRequestHandler<DeletePageCommand>
 {
     private readonly IRepository<PageEntity> _repo;
-    public DeletePageCommandHandler(IRepository<PageEntity> repo) => _repo = repo;
+    private readonly IMediator _mediator;
+
+    public DeletePageCommandHandler(IRepository<PageEntity> repo, IMediator mediator)
+    {
+        _repo = repo;
+        _mediator = mediator;
+    }
+
+    public async Task Handle(DeletePageCommand request, CancellationToken ct)
+    {
+        var page = await _repo.GetAsync(request.Id, ct);
+        if (page is null)
+        {
+            throw new InvalidOperationException($"PageEntity with Id '{request.Id}' not found.");
+        }
+
+        if (page.CssId != null)
+        {
+            await _mediator.Send(new DeleteStyleSheetCommand(new(page.CssId)), ct);
+        }
 
-    public async Task Handle(DeletePageCommand request, CancellationToken ct) =>
         await _repo.DeleteAsync(request.Id, ct);
+    }
 }