v14.12.0

.github/workflows/webapp-prod.yml

@@ -1,7 +1,7 @@
 name: Azure Web App (PROD)
 
 env:
-  AZURE_WEBAPP_NAME: moonglade-ediwang-us
+  AZURE_WEBAPP_NAME: ediwang
   AZURE_WEBAPP_PACKAGE_PATH: '.'
   DOTNET_VERSION: '8'
 
@@ -66,5 +66,5 @@ jobs:
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           clean: true
-          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE2 }}
           package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}

README.md

@@ -16,7 +16,7 @@ A personal blog system that optimized for [**Microsoft Azure**](https://azure.mi
 
 This is the way https://edi.wang is deployed, by taking advantage of as many Azure services as possible, the blog can run very fast and secure. There is no automated script to deploy it, you need to manually create all the resources.
 
-![image](https://cdn.edi.wang/web-assets/ediwang-azure-arch-visio-nov2022.png)
+![image](https://cdn.edi.wang/web-assets/ediwang-azure-arch-visio-oct2024.svg)
 
 ### Quick Deploy on Azure (App Service on Linux)
 

src/Directory.Build.props

@@ -3,8 +3,8 @@
     <Authors>Edi Wang</Authors>
     <Company>edi.wang</Company>
     <Copyright>(C) 2024 [email protected]</Copyright>
-    <AssemblyVersion>14.11.0.0</AssemblyVersion>
-    <FileVersion>14.11.0.0</FileVersion>
-    <Version>14.11.0</Version>
+    <AssemblyVersion>14.12.0.0</AssemblyVersion>
+    <FileVersion>14.12.0.0</FileVersion>
+    <Version>14.12.0</Version>
   </PropertyGroup>
 </Project>

src/Moonglade.Configuration/BlogConfig.cs

@@ -14,6 +14,7 @@ public interface IBlogConfig
     CustomStyleSheetSettings CustomStyleSheetSettings { get; set; }
     CustomMenuSettings CustomMenuSettings { get; set; }
     LocalAccountSettings LocalAccountSettings { get; set; }
+    SocialLinkSettings SocialLinkSettings { get; set; }
     SystemManifestSettings SystemManifestSettings { get; set; }
 
     IEnumerable<int> LoadFromConfig(IDictionary<string, string> config);
@@ -40,6 +41,8 @@ public class BlogConfig : IBlogConfig
 
     public LocalAccountSettings LocalAccountSettings { get; set; }
 
+    public SocialLinkSettings SocialLinkSettings { get; set; }
+
     public SystemManifestSettings SystemManifestSettings { get; set; }
 
     public IEnumerable<int> LoadFromConfig(IDictionary<string, string> config)
@@ -53,6 +56,7 @@ public IEnumerable<int> LoadFromConfig(IDictionary<string, string> config)
         CustomStyleSheetSettings = AssignValueForConfigItem(7, CustomStyleSheetSettings.DefaultValue, config);
         CustomMenuSettings = AssignValueForConfigItem(10, CustomMenuSettings.DefaultValue, config);
         LocalAccountSettings = AssignValueForConfigItem(11, LocalAccountSettings.DefaultValue, config);
+        SocialLinkSettings = AssignValueForConfigItem(12, SocialLinkSettings.DefaultValue, config);
 
         // Special case
         SystemManifestSettings = AssignValueForConfigItem(99, SystemManifestSettings.DefaultValue, config);

src/Moonglade.Configuration/SocialLink.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Moonglade.Configuration;
+
+public class SocialLinkSettings : IBlogSettings
+{
+    public bool IsEnabled { get; set; }
+
+    public SocialLink[] Links { get; set; } = [];
+
+    public static SocialLinkSettings DefaultValue =>
+        new()
+        {
+            IsEnabled = false,
+            Links = []
+        };
+}
+
+public class SocialLink
+{
+    public string Name { get; set; }
+
+    public string Icon { get; set; }
+
+    public string Url { get; set; }
+}
+
+public class SocialLinkSettingsJsonModel
+{
+    [Display(Name = "Enable Social Links")]
+    public bool IsEnabled { get; set; }
+
+    [MaxLength(1024)]
+    public string JsonData { get; set; }
+}

src/Moonglade.Core/GetAllSocialLinksQuery.cs

@@ -0,0 +1,21 @@
+using Moonglade.Configuration;
+
+namespace Moonglade.Core;
+
+public record GetAllSocialLinksQuery : IRequest<SocialLink[]>;
+
+public class GetAllSocialLinksQueryHandler(IBlogConfig blogConfig) : IRequestHandler<GetAllSocialLinksQuery, SocialLink[]>
+{
+    public Task<SocialLink[]> Handle(GetAllSocialLinksQuery request, CancellationToken ct)
+    {
+        var section = blogConfig.SocialLinkSettings;
+
+        if (!section.IsEnabled)
+        {
+            return Task.FromResult(Array.Empty<SocialLink>());
+        }
+
+        var links = blogConfig.SocialLinkSettings.Links;
+        return Task.FromResult(links);
+    }
+}

src/Moonglade.Core/PostFeature/CreatePostCommand.cs

@@ -33,20 +33,21 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
             abs = request.Payload.Abstract.Trim();
         }
 
+        var utcNow = DateTime.UtcNow;
         var post = new PostEntity
         {
             CommentEnabled = request.Payload.EnableComment,
             Id = Guid.NewGuid(),
             PostContent = request.Payload.EditorContent,
             ContentAbstract = abs,
-            CreateTimeUtc = DateTime.UtcNow,
-            LastModifiedUtc = DateTime.UtcNow, // Fix draft orders
+            CreateTimeUtc = utcNow,
+            LastModifiedUtc = utcNow, // Fix draft orders
             Slug = request.Payload.Slug.ToLower().Trim(),
             Author = request.Payload.Author?.Trim(),
             Title = request.Payload.Title.Trim(),
             ContentLanguageCode = request.Payload.LanguageCode,
             IsFeedIncluded = request.Payload.FeedIncluded,
-            PubDateUtc = request.Payload.IsPublished ? DateTime.UtcNow : null,
+            PubDateUtc = request.Payload.IsPublished ? utcNow : null,
             IsDeleted = false,
             IsPublished = request.Payload.IsPublished,
             IsFeatured = request.Payload.Featured,

src/Moonglade.Core/PostFeature/PostEditModel.cs

@@ -67,4 +67,7 @@ public class PostEditModel
     public bool IsOutdated { get; set; }
 
     public bool WarnSlugModification => PublishDate.HasValue && (DateTime.UtcNow - PublishDate.Value).Days > 3;
+
+    [HiddenInput]
+    public string LastModifiedUtc { get; set; }
 }

src/Moonglade.Core/PostFeature/UnpublishPostCommand.cs

@@ -0,0 +1,24 @@
+using Edi.CacheAside.InMemory;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PostFeature;
+
+public record UnpublishPostCommand(Guid Id) : IRequest;
+
+public class UnpublishPostCommandHandler(MoongladeRepository<PostEntity> repo, ICacheAside cache) : IRequestHandler<UnpublishPostCommand>
+{
+    public async Task Handle(UnpublishPostCommand request, CancellationToken ct)
+    {
+        var post = await repo.GetByIdAsync(request.Id, ct);
+        if (null == post) return;
+
+        post.IsPublished = false;
+        post.PubDateUtc = null;
+        post.RouteLink = null;
+        post.LastModifiedUtc = DateTime.UtcNow;
+
+        await repo.UpdateAsync(post, ct);
+
+        cache.Remove(BlogCachePartition.Post.ToString(), request.Id.ToString());
+    }
+}

src/Moonglade.Core/PostFeature/UpdatePostCommand.cs

@@ -48,6 +48,7 @@ public UpdatePostCommandHandler(
 
     public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToken ct)
     {
+        var utcNow = DateTime.UtcNow;
         var (guid, postEditModel) = request;
         var post = await _postRepo.GetByIdAsync(guid, ct);
         if (null == post)
@@ -73,7 +74,7 @@ public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToke
         if (postEditModel.IsPublished && !post.IsPublished)
         {
             post.IsPublished = true;
-            post.PubDateUtc = DateTime.UtcNow;
+            post.PubDateUtc = utcNow;
         }
 
         // #325: Allow changing publish date for published posts
@@ -87,7 +88,7 @@ public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToke
         post.Author = postEditModel.Author?.Trim();
         post.Slug = postEditModel.Slug.ToLower().Trim();
         post.Title = postEditModel.Title.Trim();
-        post.LastModifiedUtc = DateTime.UtcNow;
+        post.LastModifiedUtc = utcNow;
         post.IsFeedIncluded = postEditModel.FeedIncluded;
         post.ContentLanguageCode = postEditModel.LanguageCode;
         post.IsFeatured = postEditModel.Featured;

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.8" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />

src/Moonglade.ImageStorage/Moonglade.ImageStorage.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
     <PackageReference Include="Minio" Version="6.0.3" />
   </ItemGroup>
 </Project>

src/Moonglade.Setup/BlogConfigInitializer.cs

@@ -59,6 +59,10 @@ await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(CustomMenuSet
                         await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(LocalAccountSettings),
                             LocalAccountSettings.DefaultValue.ToJson()));
                         break;
+                    case 12:
+                        await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(SocialLinkSettings),
+                            SocialLinkSettings.DefaultValue.ToJson()));
+                        break;
                     case 99:
                         await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(SystemManifestSettings),
                             isNew ?

src/Moonglade.Utils/ContentProcessor.cs

@@ -1,5 +1,6 @@
 using Markdig;
 using System.Text.RegularExpressions;
+using System.Web;
 using System.Xml.Linq;
 
 namespace Moonglade.Utils;
@@ -26,10 +27,14 @@ public static string GetPostAbstract(string content, int wordCount, bool useMark
             MarkdownToContent(content, MarkdownConvertType.Text) :
             RemoveTags(content);
 
-        var result = plainText.Ellipsize(wordCount);
+        var decodedText = HtmlDecode(plainText);
+        var result = decodedText.Ellipsize(wordCount);
         return result;
     }
 
+    // Fix #833 - umlauts like (ä,ö,ü). are not displayed correctly in the abstract
+    public static string HtmlDecode(string content) => HttpUtility.HtmlDecode(content);
+
     public static string RemoveTags(string html)
     {
         if (string.IsNullOrEmpty(html))

src/Moonglade.Web/Configuration/ConfigureEndpoints.cs

@@ -9,7 +9,6 @@ public static Task WriteResponse(HttpContext context, HealthReport result)
         var obj = new
         {
             Helper.AppVersion,
-            DotNetVersion = Environment.Version.ToString(),
             EnvironmentTags = Helper.GetEnvironmentTags(),
             GeoMatch = context.Request.Headers["x-geo-match"]
         };

src/Moonglade.Web/Controllers/PostController.cs

@@ -11,6 +11,7 @@ namespace Moonglade.Web.Controllers;
 [ApiController]
 [Route("api/[controller]")]
 public class PostController(
+        IConfiguration configuration,
         IMediator mediator,
         IBlogConfig blogConfig,
         ITimeZoneResolver timeZoneResolver,
@@ -61,7 +62,20 @@ await mediator.Send(new CreatePostCommand(model)) :
                     cannonService.FireAsync<IWebmentionSender>(async sender => await sender.SendWebmentionAsync(link.ToString(), postEntity.PostContent));
                 }
 
-                cannonService.FireAsync<IIndexNowClient>(async sender => await sender.SendRequestAsync(link));
+                var isNewPublish = postEntity.LastModifiedUtc == postEntity.PubDateUtc;
+
+                bool indexCoolDown = true;
+                var minimalIntervalMinutes = int.Parse(configuration["IndexNow:MinimalIntervalMinutes"]!);
+                if (!string.IsNullOrWhiteSpace(model.LastModifiedUtc))
+                {
+                    var lastSavedInterval = DateTime.Parse(model.LastModifiedUtc) - DateTime.UtcNow;
+                    indexCoolDown = lastSavedInterval.TotalMinutes > minimalIntervalMinutes;
+                }
+
+                if (isNewPublish || indexCoolDown)
+                {
+                    cannonService.FireAsync<IIndexNowClient>(async sender => await sender.SendRequestAsync(link));
+                }
             }
 
             return Ok(new { PostId = postEntity.Id });
@@ -117,6 +131,15 @@ public async Task<IActionResult> EmptyRecycleBin()
         return NoContent();
     }
 
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.Subscription | BlogCacheType.SiteMap])]
+    [HttpPut("{postId:guid}/unpublish")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public async Task<IActionResult> Unpublish([NotEmpty] Guid postId)
+    {
+        await mediator.Send(new UnpublishPostCommand(postId));
+        return NoContent();
+    }
+
     [IgnoreAntiforgeryToken]
     [HttpPost("keep-alive")]
     [ProducesResponseType(StatusCodes.Status200OK)]

src/Moonglade.Web/Controllers/SettingsController.cs

@@ -153,6 +153,26 @@ public async Task<IActionResult> Advanced(AdvancedSettings model)
         return NoContent();
     }
 
+    [HttpPost("social-link")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public async Task<IActionResult> SocialLink(SocialLinkSettingsJsonModel model)
+    {
+        if (model.IsEnabled && string.IsNullOrWhiteSpace(model.JsonData))
+        {
+            ModelState.AddModelError(nameof(SocialLinkSettingsJsonModel.JsonData), "JsonData is required");
+            return BadRequest(ModelState.CombineErrorMessages());
+        }
+
+        blogConfig.SocialLinkSettings = new()
+        {
+            IsEnabled = model.IsEnabled,
+            Links = model.JsonData.FromJson<SocialLink[]>()
+        };
+
+        await SaveConfigAsync(blogConfig.SocialLinkSettings);
+        return NoContent();
+    }
+
     [HttpPost("reset")]
     [ProducesResponseType(StatusCodes.Status202Accepted)]
     public async Task<IActionResult> Reset(BlogDbContext context, IHostApplicationLifetime applicationLifetime)

src/Moonglade.Web/Middleware/PrefersColorSchemeMiddleware.cs

@@ -2,13 +2,19 @@
 
 public class PrefersColorSchemeMiddleware(RequestDelegate next)
 {
-    public async Task InvokeAsync(HttpContext context)
+    public async Task InvokeAsync(HttpContext context, IConfiguration configuration)
     {
+        var headerName = configuration["PrefersColorSchemeHeader:HeaderName"];
+        if (string.IsNullOrWhiteSpace(headerName))
+        {
+            await next(context);
+        }
+
         context.Response.OnStarting(() =>
         {
-            context.Response.Headers["Accept-CH"] = "Sec-CH-Prefers-Color-Scheme";
-            context.Response.Headers["Vary"] = "Sec-CH-Prefers-Color-Scheme";
-            context.Response.Headers["Critical-CH"] = "Sec-CH-Prefers-Color-Scheme";
+            context.Response.Headers["Accept-CH"] = headerName;
+            context.Response.Headers["Vary"] = headerName;
+            context.Response.Headers["Critical-CH"] = headerName;
             return Task.CompletedTask;
         });
 

src/Moonglade.Web/Moonglade.Web.csproj

@@ -43,7 +43,7 @@
     <PackageReference Include="Edi.PasswordGenerator" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.10" />
 
-    <PackageReference Include="TinyMCE" Version="7.3.0" />
+    <PackageReference Include="TinyMCE" Version="7.4.1" />
     <PackageReference Include="Moonglade.MonacoEditor" Version="0.50.0.1002" />
   </ItemGroup>
   <ItemGroup>