Merge pull request #735 from EdiWang/master

Release v12.12.0

Features.zh-CN.md

@@ -133,7 +133,7 @@
 
 ### OIDC
 
-- Azure Active Directory
+- Microsoft Entra ID
 
 ### 本地账号
 

README.md

@@ -14,15 +14,15 @@ The [.NET](https://dotnet.microsoft.com/) blog system of [edi.wang](https://edi.
 
 ### ☁ Full Deploy on Azure (Recommend)
 
-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.
+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. 
 
-This diagram shows a full Azure deployment for Moonglade for reference.
+But there is no automated script to deploy it, you need to manually create all the resources and configure them.
 
 ![image](https://cdn-blog.edi.wang/web-assets/ediwang-azure-arch-visio-nov2022.png)
 
-### 🐋 Quick Deploy on Azure
+### 🐋 Quick Deploy on Azure (App Service on Linux)
 
-Use automated deployment script to get your Moonglade up and running in 10 minutes, follow instructions [here](https://github.com/EdiWang/Moonglade/wiki/Quick-Deploy-on-Azure)
+Use automated deployment script to get your Moonglade up and running in 10 minutes with minimal Azure components, follow instructions [here](https://github.com/EdiWang/Moonglade/wiki/Quick-Deploy-on-Azure)
 
 ### 🐧 Quick Deploy on Linux without Docker
 
@@ -39,42 +39,32 @@ Tools | Alternative
 
 Moonglade supports three types of database. You can choose from SQL Server, PostgreSQL or MySQL.
 
-#### SQL Server
-
-Create a SQL Server 2022 database, e.g. ```moonglade```
+Update your database connection string in `appsettings.*.json`
 
-Set the `MoongladeDatabase` to your database connection string in `appsettings.Development.json`
+#### SQL Server
 
 ```json
-"MoongladeDatabase": "Server=(localdb)\\MSSQLLocalDB;Database=moonglade;Trusted_Connection=True;"
+"ConnectionStrings": {
+  "MoongladeDatabase": "Server=(localdb)\\MSSQLLocalDB;Database=Moonglade;Trusted_Connection=True;",
+  "DatabaseType": "SqlServer"
+}
 ```
-
 #### MySQL
 
-Set `DatabaseType` to `MySql`
-
 ```json
-"DatabaseType": "MySql"
-```
-
-Set the `MoongladeDatabase` to your database connection string in `appsettings.Development.json`
-
-```json
-"MoongladeDatabase": "Server=localhost;Port=3306;Database=moonglade;Uid=root;Pwd=******;"
+"ConnectionStrings": {
+  "MoongladeDatabase": "Server=localhost;Port=3306;Database=moonglade;Uid=root;Pwd=******;",
+  "DatabaseType": "MySql"
+}
 ```
 
 #### PostgreSql
 
-Set `DatabaseType` to `PostgreSql`
-
-```json
-"DatabaseType": "PostgreSql"
-```
-
-Set the `MoongladeDatabase` to your database connection string in `appsettings.Development.json`
-
 ```json
-"MoongladeDatabase": "User ID=****;Password=****;Host=localhost;Port=5432;Database=****;Pooling=true;"
+"ConnectionStrings": {
+  "MoongladeDatabase": "User ID=****;Password=****;Host=localhost;Port=5432;Database=****;Pooling=true;",
+  "DatabaseType": "PostgreSql"
+}
 ```
 
 ### 🔨 Build Source
@@ -92,9 +82,9 @@ Build and run `./src/Moonglade.sln`
 
 ### 🛡 Authentication
 
-#### [Azure Active Directory](https://azure.microsoft.com/en-us/services/active-directory/)
+#### [Microsoft Entra ID](https://azure.microsoft.com/en-us/services/active-directory/)
 
-See [Wiki document](https://github.com/EdiWang/Moonglade/wiki/Use-Azure-Active-Directory-Authentication)
+See [Wiki document](https://github.com/EdiWang/Moonglade/wiki/Use-Microsoft-Entra-ID-Authentication)
 
 #### Local Account (Alternative)
 
@@ -166,7 +156,7 @@ You can also choose File System for image storage if you don't have a cloud opti
 
 ### 📧 Email Notification
 
-If you need email notification for new comments, new replies and pingbacks, you have to setup the [Moonglade.Notification Azure Function](https://github.com/EdiWang/Moonglade.Notification) first, and then enable notification in admin portal.
+If you need email notification for new comments, new replies and pingbacks, you have to setup the [Moonglade.Email Azure Function](https://github.com/EdiWang/Moonglade.Email) first, and then enable notification in admin portal.
 
 ### 🔩 Others
 
@@ -202,5 +192,6 @@ There are a few individuals already setup thier blogs using Moonglade on Azure (
 - [AllenMasters](https://allenmasters.com)
 - [Hao's House](https://haxu.dev/)
 - [Sascha.Manns](https://saschamanns.de/)
+- [王高峰博客](https://blog.wanggaofeng.net)
 
 *Just Submit PR or issue if you want your blog to be listed here*

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.11.0.0</AssemblyVersion>
-    <FileVersion>12.11.0.0</FileVersion>
-    <Version>12.11.0</Version>
+    <AssemblyVersion>12.12.0.0</AssemblyVersion>
+    <FileVersion>12.12.0.0</FileVersion>
+    <Version>12.12.0</Version>
   </PropertyGroup>
 </Project>

src/Moonglade.Auth/Moonglade.Auth.csproj

@@ -16,7 +16,7 @@
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-		<PackageReference Include="Microsoft.Identity.Web" Version="2.11.1" />
+		<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Moonglade.Comments/GetApprovedCommentsQuery.cs

@@ -26,6 +26,6 @@ public Task<IReadOnlyList<Comment>> Handle(GetApprovedCommentsQuery request, Can
                 ReplyContent = cr.ReplyContent,
                 ReplyTimeUtc = cr.CreateTimeUtc
             }).ToList()
-        });
+        }, ct);
     }
 }

src/Moonglade.Comments/GetCommentsQuery.cs

@@ -15,7 +15,7 @@ public class GetCommentsQueryHandler : IRequestHandler<GetCommentsQuery, IReadOn
     public Task<IReadOnlyList<CommentDetailedItem>> Handle(GetCommentsQuery request, CancellationToken ct)
     {
         var spec = new CommentSpec(request.PageSize, request.PageIndex);
-        var comments = _repo.SelectAsync(spec, CommentDetailedItem.EntitySelector);
+        var comments = _repo.SelectAsync(spec, CommentDetailedItem.EntitySelector, ct);
 
         return comments;
     }

src/Moonglade.Comments/Moderators/LocalWordFilterModerator.cs → src/Moonglade.Comments/Moderators/LocalModerator.cs

@@ -3,11 +3,11 @@
 
 namespace Moonglade.Comments.Moderators;
 
-public class LocalWordFilterModerator : ICommentModerator
+public class LocalModerator : ICommentModerator
 {
     private readonly IMaskWordFilter _filter;
 
-    public LocalWordFilterModerator(IBlogConfig blogConfig)
+    public LocalModerator(IBlogConfig blogConfig)
     {
         var sw = new StringWordSource(blogConfig.ContentSettings.DisharmonyWords);
         _filter = new MaskWordFilter(sw);

src/Moonglade.Comments/Moonglade.Comments.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Edi.WordFilter" Version="1.7.0" />
-    <PackageReference Include="Edi.Captcha" Version="3.15.0" />
+    <PackageReference Include="Edi.Captcha" Version="3.16.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
   </ItemGroup>
 

src/Moonglade.Comments/ServiceCollectionExtensions.cs

@@ -28,7 +28,7 @@ public static IServiceCollection AddComments(this IServiceCollection services, I
         }
         else
         {
-            services.AddScoped<ICommentModerator, LocalWordFilterModerator>();
+            services.AddScoped<ICommentModerator, LocalModerator>();
         }
 
         return services;

src/Moonglade.Configuration/AdvancedSettings.cs

@@ -10,11 +10,8 @@ public class AdvancedSettings : IBlogSettings
     [MaxLength(1024)]
     public string RobotsTxtContent { get; set; }
 
-    [Display(Name = "Enable Pingback send")]
-    public bool EnablePingbackSend { get; set; } = true;
-
-    [Display(Name = "Enable Pingback receive")]
-    public bool EnablePingbackReceive { get; set; } = true;
+    [Display(Name = "Enable Pingback")]
+    public bool EnablePingback { get; set; } = true;
 
     [Display(Name = "Enable MetaWeblog API")]
     public bool EnableMetaWeblog { get; set; } = true;

src/Moonglade.Core/PostFeature/ListArchiveQuery.cs

@@ -12,7 +12,7 @@ public class ListArchiveQueryHandler : IRequestHandler<ListArchiveQuery, IReadOn
     public Task<IReadOnlyList<PostDigest>> Handle(ListArchiveQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Year, request.Month.GetValueOrDefault());
-        var list = _repo.SelectAsync(spec, PostDigest.EntitySelector);
+        var list = _repo.SelectAsync(spec, PostDigest.EntitySelector, ct);
         return list;
     }
 }

src/Moonglade.Core/PostFeature/ListByTagQuery.cs

@@ -15,7 +15,7 @@ public Task<IReadOnlyList<PostDigest>> Handle(ListByTagQuery request, Cancellati
         if (request.TagId <= 0) throw new ArgumentOutOfRangeException(nameof(request.TagId));
         Helper.ValidatePagingParameters(request.PageSize, request.PageIndex);
 
-        var posts = _repo.SelectAsync(new PostTagSpec(request.TagId, request.PageSize, request.PageIndex), PostDigest.EntitySelectorByTag);
+        var posts = _repo.SelectAsync(new PostTagSpec(request.TagId, request.PageSize, request.PageIndex), PostDigest.EntitySelectorByTag, ct);
         return posts;
     }
 }

src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs

@@ -16,7 +16,7 @@ public Task<IReadOnlyList<PostDigest>> Handle(ListFeaturedQuery request, Cancell
         var (pageSize, pageIndex) = request;
         Helper.ValidatePagingParameters(pageSize, pageIndex);
 
-        var posts = _repo.SelectAsync(new FeaturedPostSpec(pageSize, pageIndex), PostDigest.EntitySelector);
+        var posts = _repo.SelectAsync(new FeaturedPostSpec(pageSize, pageIndex), PostDigest.EntitySelector, ct);
         return posts;
     }
 }

src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs

@@ -12,6 +12,6 @@ public class ListPostSegmentByStatusQueryHandler : IRequestHandler<ListPostSegme
     public Task<IReadOnlyList<PostSegment>> Handle(ListPostSegmentByStatusQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Status);
-        return _repo.SelectAsync(spec, PostSegment.EntitySelector);
+        return _repo.SelectAsync(spec, PostSegment.EntitySelector, ct);
     }
 }

src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs

@@ -41,7 +41,7 @@ public class ListPostSegmentQueryHandler : IRequestHandler<ListPostSegmentQuery,
         }
 
         var spec = new PostPagingSpec(request.PostStatus, request.Keyword, request.PageSize, request.Offset);
-        var posts = await _repo.SelectAsync(spec, PostSegment.EntitySelector);
+        var posts = await _repo.SelectAsync(spec, PostSegment.EntitySelector, ct);
 
         Expression<Func<PostEntity, bool>> countExp = p => null == request.Keyword || p.Title.Contains(request.Keyword);
 

src/Moonglade.Core/PostFeature/ListPostsQuery.cs

@@ -33,6 +33,6 @@ public Task<IReadOnlyList<PostDigest>> Handle(ListPostsQuery request, Cancellati
         Helper.ValidatePagingParameters(request.PageSize, request.PageIndex);
 
         var spec = new PostPagingSpec(request.PageSize, request.PageIndex, request.CatId, request.SortBy);
-        return _repo.SelectAsync(spec, PostDigest.EntitySelector);
+        return _repo.SelectAsync(spec, PostDigest.EntitySelector, ct);
     }
 }

src/Moonglade.Core/PostFeature/PostEditModel.cs

@@ -20,8 +20,6 @@ public class PostEditModel
     [MaxLength(64)]
     public string Author { get; set; }
 
-    [Required]
-    [MinLength(1)]
     public Guid[] SelectedCatIds { get; set; }
 
     [Required]

src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs

@@ -21,7 +21,7 @@ public async Task<IReadOnlyList<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery
                 Id = t.Id,
                 DisplayName = t.DisplayName,
                 NormalizedName = t.NormalizedName
-            }, t.Posts.Count));
+            }, t.Posts.Count), ct);
 
         return tags;
     }

src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
   </ItemGroup>
 
   <ItemGroup>

src/Moonglade.Data/Infrastructure/DbContextRepository.cs

@@ -66,8 +66,8 @@ public async Task<IReadOnlyList<TResult>> SelectAsync<TResult>(Expression<Func<T
         await DbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 
     public async Task<IReadOnlyList<TResult>> SelectAsync<TResult>(
-        ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
-        await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync();
+        ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
+        await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
 
     public Task<TResult> FirstOrDefaultAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>

src/Moonglade.Data/Infrastructure/IRepository.cs

@@ -32,7 +32,7 @@ public interface IRepository<T> where T : class
 
     Task<IReadOnlyList<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
-    Task<IReadOnlyList<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector);
+    Task<IReadOnlyList<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
     Task<TResult> FirstOrDefaultAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector);
 

src/Moonglade.Data/Moonglade.Data.csproj

@@ -7,10 +7,10 @@
 	<ItemGroup>
 		<Using Include="Microsoft.EntityFrameworkCore" />
 		<PackageReference Include="CsvHelper" Version="30.0.1" />
-		<PackageReference Include="MediatR" Version="12.0.1" />
+		<PackageReference Include="MediatR" Version="12.1.1" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.7" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.9" />
 	</ItemGroup>
 
 </Project>

src/Moonglade.Notification.Client/BlogNotification.cs → src/Moonglade.Email.Client/BlogNotification.cs

@@ -1,15 +1,15 @@
-using Azure.Storage.Queues;
+using System.Text;
+using System.Text.Json;
+using Azure.Storage.Queues;
 using Microsoft.Extensions.Logging;
 using Moonglade.Configuration;
 using Moonglade.Data.Exporting.Exporters;
-using System.Text;
-using System.Text.Json;
 
-namespace Moonglade.Notification.Client;
+namespace Moonglade.Email.Client;
 
 public interface IBlogNotification
 {
-    Task EnqueueNotification<T>(MailMesageTypes type, string[] toAddresses, T payload) where T : class;
+    Task Enqueue<T>(MailMesageTypes type, string[] receipts, T payload) where T : class;
 }
 
 public class BlogNotification : IBlogNotification
@@ -25,7 +25,7 @@ public BlogNotification(
         _notificationSettings = blogConfig.NotificationSettings;
     }
 
-    public async Task EnqueueNotification<T>(MailMesageTypes type, string[] toAddresses, T payload) where T : class
+    public async Task Enqueue<T>(MailMesageTypes type, string[] receipts, T payload) where T : class
     {
         if (!_notificationSettings.EnableEmailSending) return;
 
@@ -35,7 +35,7 @@ public async Task EnqueueNotification<T>(MailMesageTypes type, string[] toAddres
 
             var en = new EmailNotification
             {
-                DistributionList = string.Join(';', toAddresses),
+                DistributionList = string.Join(';', receipts),
                 MessageType = type.ToString(),
                 MessageBody = JsonSerializer.Serialize(payload, MoongladeJsonSerializerOptions.Default),
             };
@@ -62,11 +62,4 @@ private async Task InsertMessageAsync(QueueClient queue, EmailNotification email
 
         await queue.SendMessageAsync(base64Json);
     }
-}
-
-internal class EmailNotification
-{
-    public string DistributionList { get; set; }
-    public string MessageType { get; set; }
-    public string MessageBody { get; set; }
 }

src/Moonglade.Notification.Client/CommentNotification.cs → src/Moonglade.Email.Client/CommentNotification.cs

@@ -2,7 +2,7 @@
 using Moonglade.Configuration;
 using Moonglade.Utils;
 
-namespace Moonglade.Notification.Client;
+namespace Moonglade.Email.Client;
 
 public record CommentNotification(
     string Username,
@@ -40,6 +40,6 @@ public async Task Handle(CommentNotification notification, CancellationToken ct)
         );
 
         var dl = new[] { _blogConfig.GeneralSettings.OwnerEmail };
-        await _blogNotification.EnqueueNotification(MailMesageTypes.NewCommentNotification, dl, payload);
+        await _blogNotification.Enqueue(MailMesageTypes.NewCommentNotification, dl, payload);
     }
 }