From d2d79da9295e1b68913f102fe259431387a3c00d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 10 Apr 2024 09:50:49 +0800
Subject: [PATCH 001/227] patch .net

---
 src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj | 2 +-
 src/Moonglade.Data/Moonglade.Data.csproj                     | 2 +-
 src/Moonglade.Utils/Moonglade.Utils.csproj                   | 2 +-
 src/Moonglade.Web/Moonglade.Web.csproj                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj b/src/Moonglade.Data.SqlServer/Moonglade.Data.SqlServer.csproj
index 048121024..4e2a69f1a 100644
--- 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.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
     </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
index a8bbb077c..a55db46fb 100644
--- a/src/Moonglade.Data/Moonglade.Data.csproj
+++ b/src/Moonglade.Data/Moonglade.Data.csproj
@@ -12,6 +12,6 @@
         <Using Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="MediatR" Version="12.2.0" />
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Moonglade.Utils/Moonglade.Utils.csproj b/src/Moonglade.Utils/Moonglade.Utils.csproj
index 7a70324e0..d22c03d1d 100644
--- a/src/Moonglade.Utils/Moonglade.Utils.csproj
+++ b/src/Moonglade.Utils/Moonglade.Utils.csproj
@@ -11,6 +11,6 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="NUglify" Version="1.21.4" />
-    <PackageReference Include="Markdig" Version="0.36.2" />
+    <PackageReference Include="Markdig" Version="0.37.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Moonglade.Web/Moonglade.Web.csproj b/src/Moonglade.Web/Moonglade.Web.csproj
index d0bf11fc8..5c5b0eb6c 100644
--- 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.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Auth\Moonglade.Auth.csproj" />

From d37ea2d8c9aff8c78dab6843da4373b8c341452a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 10 Apr 2024 09:51:12 +0800
Subject: [PATCH 002/227] bump version

---
 src/Directory.Build.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ac92d6bf3..446681a21 100644
--- 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.3.3.0</AssemblyVersion>
-    <FileVersion>14.3.3.0</FileVersion>
-    <Version>14.3.3</Version>
+    <AssemblyVersion>14.3.4.0</AssemblyVersion>
+    <FileVersion>14.3.4.0</FileVersion>
+    <Version>14.3.4</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 661ba88f6bcc2ad42e9550e22d03f7deb95732e7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 14:57:34 +0800
Subject: [PATCH 003/227] Update PagedListRenderOptions.cs

---
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 1a2ede7a4..6738b1be2 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -25,10 +25,10 @@ public PagedListRenderOptions()
         ItemSliceAndTotalFormat = "Showing items {0} through {1} of {2}.";
         ItemSliceAndTotalPosition = ItemSliceAndTotalPosition.Start;
         FunctionToDisplayEachPageNumber = null;
-        ContainerDivClasses = new[] { "pagination-container" };
-        UlElementClasses = new[] { "pagination" };
-        LiElementClasses = new[] { "page-item" };
-        PageClasses = new[] { "page-link" };
+        ContainerDivClasses = ["pagination-container"];
+        UlElementClasses = ["pagination"];
+        LiElementClasses = ["page-item"];
+        PageClasses = ["page-link"];
         ActiveLiElementClass = "active";
         EllipsesElementClass = "paged-list-ellipses";
         PreviousElementClass = "PagedList-skip-to-previous";

From c616d5c14416ae88617c37064b885705b7cf147b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:09:59 +0800
Subject: [PATCH 004/227] minimal code refact

---
 src/Moonglade.Comments/Comment.cs                  | 2 +-
 src/Moonglade.Web/PagedList/HtmlHelperExtension.cs | 4 ++--
 src/Moonglade.Web/Pages/Admin/Comments.cshtml      | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Moonglade.Comments/Comment.cs b/src/Moonglade.Comments/Comment.cs
index feaf008c5..06ef738f2 100644
--- a/src/Moonglade.Comments/Comment.cs
+++ b/src/Moonglade.Comments/Comment.cs
@@ -13,7 +13,7 @@ public class Comment
 
     public string CommentContent { get; set; }
 
-    public IReadOnlyList<CommentReplyDigest> CommentReplies { get; set; }
+    public List<CommentReplyDigest> CommentReplies { get; set; }
 }
 
 public class CommentDetailedItem : Comment
diff --git a/src/Moonglade.Web/PagedList/HtmlHelperExtension.cs b/src/Moonglade.Web/PagedList/HtmlHelperExtension.cs
index d1d7ef284..8fe96b64c 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelperExtension.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelperExtension.cs
@@ -11,11 +11,11 @@ public static HtmlString PagedListPager(this IHtmlHelper html,
         Func<int, string> generatePageUrl,
         PagedListRenderOptions options)
     {
-        var htmlHelper = new HtmlHelper(new TagBuilderFactory());
+        var htmlHelper = new HtmlHelper(new());
         var htmlString = htmlHelper.PagedListPager(list, generatePageUrl, options);
 
         htmlString = HttpUtility.HtmlDecode(htmlString);
 
-        return new HtmlString(htmlString);
+        return new(htmlString);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/Comments.cshtml b/src/Moonglade.Web/Pages/Admin/Comments.cshtml
index 590f6ddb8..a8c060f2b 100644
--- a/src/Moonglade.Web/Pages/Admin/Comments.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/Comments.cshtml
@@ -7,7 +7,7 @@
 }
 @Html.AntiForgeryToken()
 
-@section scripts{
+@section scripts {
     <script type="module">
         import * as utils from '/js/app/utils.module.js'
 
@@ -65,7 +65,7 @@
     </script>
 }
 
-@section head{
+@section head {
     <style>
         .mdrendered-comment-content img {
             max-width: 720px;
@@ -77,7 +77,7 @@
         }
     </style>
 }
-@section admintoolbar{
+@section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
         <a href="javascript:window.deleteSelectedComments();" class="btn btn-outline-danger btn-delete-selected">
             <i class="bi-trash"></i> @SharedLocalizer["Delete selected"]
@@ -171,7 +171,7 @@
         }
     }
 
-    @Html.PagedListPager(Model.CommentDetailedItems, page => $"?pageIndex={page}", new PagedListRenderOptions
+    @Html.PagedListPager(Model.CommentDetailedItems, page => $"?pageIndex={page}", new()
     {
         UlElementClasses = new[] { "pagination mt-3" },
         DisplayEllipsesWhenNotShowingAllPageNumbers = false

From 22ca3b35e02a92e5ed88cda39cbdb86a737009a0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:22:15 +0800
Subject: [PATCH 005/227] remove support for multiple local account phase 1

---
 .../Controllers/LocalAccountController.cs     |  41 -----
 .../Pages/Admin/LocalAccount.cshtml           | 140 ++++--------------
 .../Pages/Shared/_AsideAdmin.cshtml           |   2 +-
 .../Resources/Program.zh-Hans.resx            |   2 +-
 .../Resources/Program.zh-Hant.resx            |   2 +-
 5 files changed, 30 insertions(+), 157 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/LocalAccountController.cs b/src/Moonglade.Web/Controllers/LocalAccountController.cs
index ba900b590..4621e1901 100644
--- a/src/Moonglade.Web/Controllers/LocalAccountController.cs
+++ b/src/Moonglade.Web/Controllers/LocalAccountController.cs
@@ -9,47 +9,6 @@ namespace Moonglade.Web.Controllers;
 [Route("api/[controller]")]
 public class LocalAccountController(IMediator mediator) : ControllerBase
 {
-    [HttpPost]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> Create(CreateAccountCommand command)
-    {
-        if (await mediator.Send(new AccountExistsQuery(command.Username)))
-        {
-            ModelState.AddModelError("username", $"User '{command.Username}' already exist.");
-            return Conflict(ModelState);
-        }
-
-        await mediator.Send(command);
-        return Ok();
-    }
-
-    [HttpDelete("{id:guid}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> Delete([NotEmpty] Guid id)
-    {
-        var uidClaim = User.Claims.FirstOrDefault(c => c.Type == "uid");
-        if (null == uidClaim || string.IsNullOrWhiteSpace(uidClaim.Value))
-        {
-            return StatusCode(StatusCodes.Status500InternalServerError, "Can not get current uid.");
-        }
-
-        if (id.ToString() == uidClaim.Value)
-        {
-            return Conflict("Can not delete current user.");
-        }
-
-        var count = await mediator.Send(new CountAccountsQuery());
-        if (count == 1)
-        {
-            return Conflict("Can not delete last account.");
-        }
-
-        await mediator.Send(new DeleteAccountCommand(id));
-        return NoContent();
-    }
-
     [HttpPut("{id:guid}/password")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status409Conflict)]
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index 4f4c795f7..5f7d6e032 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -5,57 +5,19 @@
     var currentUidClaim = User.Claims.FirstOrDefault(c => c.Type == "uid");
 }
 
-@section scripts{
+@section scripts {
     <script type="module">
         import * as utils from '/js/app/utils.module.js'
 
-        var editAccountModal = new bootstrap.Modal('#editAccountModal');
         var resetPasswordModal = new bootstrap.Modal('#resetPasswordModal');
-
         var cid = '';
 
-        window.deleteConfirm = function (accountId) {
-            var cfm = confirm("Delete Confirmation?");
-            if (cfm) {
-                deleteAccount(accountId);
-            }
-        }
-
-        window.deleteAccount = function (accountid) {
-            callApi(`/api/localaccount/${accountid}`, 'DELETE', {},
-                (resp) => {
-                    document.querySelector(`#tr-${accountid}`).remove();
-                });
-        }
-
         window.resetPassword = function (accountId) {
             document.querySelector('#resetpassword-form').reset();
             resetPasswordModal.show();
             cid = accountId;
         }
 
-        window.initCreateAccount = function () {
-            document.querySelector('#new-account-form').reset();
-            editAccountModal.show();
-        }
-
-        window.handleNewAccountFormSubmit = function (event) {
-            event.preventDefault();
-
-            const data = new FormData(event.target);
-            const value = Object.fromEntries(data.entries());
-            const newValue = utils.toMagicJson(value);
-
-            callApi(`/api/localaccount`,
-                'POST',
-                newValue,
-                (resp) => {
-                    document.querySelector('#new-account-form').reset();
-                    editAccountModal.hide();
-                    window.location.reload();
-                });
-        }
-
         window.handleResetPasswordFormSubmit = function (event) {
             event.preventDefault();
 
@@ -73,94 +35,46 @@
                 });
         }
 
-        const newAccountForm = document.querySelector('#new-account-form');
-        newAccountForm.addEventListener('submit', handleNewAccountFormSubmit);
-
         const resetPasswordForm = document.querySelector('#resetpassword-form');
         resetPasswordForm.addEventListener('submit', handleResetPasswordFormSubmit);
     </script>
 }
 
 
-@section admintoolbar{
+@section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
-        <a class="btn btn-outline-accent" href="javascript:initCreateAccount();">
-            <i class="bi-plus-lg"></i>
-            @SharedLocalizer["Create"]
+        <a class="btn btn-outline-accent" href="javascript:resetPassword('@currentUidClaim');">
+            <i class="bi-key"></i>
+            @SharedLocalizer["Change Password"]
         </a>
     </div>
 }
 
 
-    @if (null != Model.Accounts && Model.Accounts.Any())
-    {
-        <table class="table table-bordered mt-3">
-            <thead>
-                <tr>
-                    <th>@SharedLocalizer["Username"]</th>
-                    <th>@SharedLocalizer["Last Login IP"]</th>
-                    <th>@SharedLocalizer["Last Login Time (UTC)"]</th>
-                    <th>@SharedLocalizer["Create Time (UTC)"]</th>
-                    <th>@SharedLocalizer["Action"]</th>
+@if (null != Model.Accounts && Model.Accounts.Any())
+{
+    <table class="table table-bordered mt-3">
+        <thead>
+            <tr>
+                <th>@SharedLocalizer["Username"]</th>
+                <th>@SharedLocalizer["Last Login IP"]</th>
+                <th>@SharedLocalizer["Last Login Time (UTC)"]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model.Accounts.OrderBy(p => p.Username))
+            {
+                <tr id="tr-@item.Id">
+                    <td>@item.Username</td>
+                    <td>@(item.LastLoginIp ?? "N/A")</td>
+                    <td>@(null != item.LastLoginTimeUtc ? item.LastLoginTimeUtc.ToString() : "N/A")</td>
                 </tr>
-            </thead>
-            <tbody>
-                @foreach (var item in Model.Accounts.OrderBy(p => p.Username))
-                {
-                    <tr id="tr-@item.Id">
-                        <td>@item.Username</td>
-                        <td>@(item.LastLoginIp ?? "N/A")</td>
-                        <td>@(null != item.LastLoginTimeUtc ? item.LastLoginTimeUtc.ToString() : "N/A")</td>
-                        <td>@item.CreateTimeUtc</td>
-                        <td>
-                            <a href="javascript:resetPassword('@item.Id');" class="btn btn-sm btn-outline-accent btn-updatepwd">
-                                <i class="bi-key-fill"></i>
-                            </a>
-
-                            @if (null != currentUidClaim && currentUidClaim.Value != item.Id.ToString())
-                            {
-                                <a href="javascript:deleteConfirm('@item.Id');" class="btn btn-sm btn-outline-danger btn-delete"><i class="bi-trash"></i></a>
-                            }
-                        </td>
-                    </tr>
-                }
-            </tbody>
-        </table>
-    }
-
-    <p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
-
-
-<div class="modal fade" id="editAccountModal" tabindex="-1" role="dialog" aria-labelledby="editAccountModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="editAccountModalLabel">@SharedLocalizer["Account Information"]</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
-                </button>
-            </div>
+            }
+        </tbody>
+    </table>
+}
 
-            <form id="new-account-form" method="post">
-                <div class="modal-body">
-                    <div class="mb-2">
-                        <label asp-for="ViewModel.Username"></label>
-                        <input asp-for="ViewModel.Username" class="form-control" required pattern="[a-z0-9]+" minlength="2" maxlength="32" />
-                        <small class="text-muted">Username must be lower case letters or numbers.</small>
-                    </div>
-                    <div class="mb-2">
-                        <label asp-for="ViewModel.Password"></label>
-                        <input asp-for="ViewModel.Password" class="form-control" required pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@@#$^&*]{8,}$" />
-                        <small class="text-muted">Password must be minimum eight characters, at least one letter and one number</small>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" class="btn btn-outline-accent btn-submit">@SharedLocalizer["Submit"]</button>
-                    <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">@SharedLocalizer["Cancel"]</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
+<p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
 
 <div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
diff --git a/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml b/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
index 4964aa736..e44c2c144 100644
--- a/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
@@ -54,7 +54,7 @@
                 <a asp-page="/Admin/LocalAccount"
                    class="list-group-item list-group-item-action @(currentPage is "/Admin/LocalAccount" ? "active" : null)">
                     <i class="bi-people admin-nav-icon" title="Manage local account link"></i>
-                    @SharedLocalizer["Accounts"]
+                    @SharedLocalizer["Account"]
                 </a>
             }
         </div>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index 800e32dab..d54b11385 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -144,7 +144,7 @@
   <data name="Account Information" xml:space="preserve">
     <value>账号信息</value>
   </data>
-  <data name="Accounts" xml:space="preserve">
+  <data name="Account" xml:space="preserve">
     <value>账号</value>
   </data>
   <data name="Action" xml:space="preserve">
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hant.resx b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
index 33caa43d2..4863aa0d2 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hant.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
@@ -124,7 +124,7 @@
   <data name="Account Information" xml:space="preserve">
     <value>帳號資訊</value>
   </data>
-  <data name="Accounts" xml:space="preserve">
+  <data name="Account" xml:space="preserve">
     <value>帳號</value>
   </data>
   <data name="Action" xml:space="preserve">

From 344fca6b2c9a8883443eac3c75f2b07cc9a08df9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:24:00 +0800
Subject: [PATCH 006/227] bump version

---
 src/Directory.Build.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 446681a21..f9940a1e7 100644
--- 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.3.4.0</AssemblyVersion>
-    <FileVersion>14.3.4.0</FileVersion>
-    <Version>14.3.4</Version>
+    <AssemblyVersion>14.4.0.0</AssemblyVersion>
+    <FileVersion>14.4.0.0</FileVersion>
+    <Version>14.4.0-preview.1</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From f3e97f7b7701e252de5a033bea5fb4dcb4b30cb3 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:25:04 +0800
Subject: [PATCH 007/227] bump Microsoft.Identity.Web

---
 src/Moonglade.Auth/Moonglade.Auth.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj
index a8f928369..abfa6b13e 100644
--- a/src/Moonglade.Auth/Moonglade.Auth.csproj
+++ b/src/Moonglade.Auth/Moonglade.Auth.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />

From f5a93b3698333bff82966ddeb5fba7d7d9fdc252 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:36:07 +0800
Subject: [PATCH 008/227] Update mssql-migration.sql

---
 Deployment/mssql-migration.sql | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Deployment/mssql-migration.sql b/Deployment/mssql-migration.sql
index b931a83dd..75ff620f1 100644
--- a/Deployment/mssql-migration.sql
+++ b/Deployment/mssql-migration.sql
@@ -1 +1,13 @@
--- 
\ No newline at end of file
+-- v14.3.x - v14.4.0
+CREATE TABLE [dbo].[LoginHistory](
+	[Id] [int] IDENTITY(1,1) NOT NULL,
+	[LoginTimeUtc] [datetime] NOT NULL,
+	[LoginIp] [nvarchar](64) NULL,
+	[LoginUserAgent] [nvarchar](128) NULL,
+	[DeviceFingerprint] [nvarchar](128) NULL,
+ CONSTRAINT [PK_LoginHistory] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO

From 80ddbd17556c685176c60078b6685529eecbc57b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:53:16 +0800
Subject: [PATCH 009/227] migrate login record to LoginHistory table

---
 src/Moonglade.Auth/Account.cs                 |  4 ----
 src/Moonglade.Auth/GetAccountsQuery.cs        |  2 --
 src/Moonglade.Auth/LogSuccessLoginCommand.cs  | 18 +++++++---------
 .../LocalAccountConfiguration.cs              |  2 --
 .../LocalAccountConfiguration.cs              |  2 --
 .../LoginHistoryConfiguration.cs              | 13 ++++++++++++
 .../PostgreSqlBlogDbContext.cs                |  1 +
 .../LocalAccountConfiguration.cs              |  3 ---
 .../LoginHistoryConfiguration.cs              | 13 ++++++++++++
 .../SqlServerBlogDbContext.cs                 |  1 +
 src/Moonglade.Data/BlogDbContext.cs           |  1 +
 .../Entities/LocalAccountEntity.cs            |  2 --
 .../Entities/LoginHistoryEntity.cs            | 21 +++++++++++++++++++
 .../Pages/Admin/LocalAccount.cshtml           |  8 +++----
 src/Moonglade.Web/Pages/SignIn.cshtml.cs      |  2 +-
 15 files changed, 63 insertions(+), 30 deletions(-)
 create mode 100644 src/Moonglade.Data.PostgreSql/Configurations/LoginHistoryConfiguration.cs
 create mode 100644 src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
 create mode 100644 src/Moonglade.Data/Entities/LoginHistoryEntity.cs

diff --git a/src/Moonglade.Auth/Account.cs b/src/Moonglade.Auth/Account.cs
index 9d4f95601..1c02a25c8 100644
--- a/src/Moonglade.Auth/Account.cs
+++ b/src/Moonglade.Auth/Account.cs
@@ -6,8 +6,6 @@ public class Account
 {
     public Guid Id { get; set; }
     public string Username { get; set; }
-    public DateTime? LastLoginTimeUtc { get; set; }
-    public string LastLoginIp { get; set; }
     public DateTime CreateTimeUtc { get; set; }
 
     public Account()
@@ -21,8 +19,6 @@ public Account(LocalAccountEntity entity)
 
         Id = entity.Id;
         CreateTimeUtc = entity.CreateTimeUtc;
-        LastLoginIp = entity.LastLoginIp.Trim();
-        LastLoginTimeUtc = entity.LastLoginTimeUtc.GetValueOrDefault();
         Username = entity.Username.Trim();
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Auth/GetAccountsQuery.cs b/src/Moonglade.Auth/GetAccountsQuery.cs
index 4ac6961e6..fc87fccdd 100644
--- a/src/Moonglade.Auth/GetAccountsQuery.cs
+++ b/src/Moonglade.Auth/GetAccountsQuery.cs
@@ -13,8 +13,6 @@ public Task<IReadOnlyList<Account>> Handle(GetAccountsQuery request, Cancellatio
         {
             Id = p.Id,
             CreateTimeUtc = p.CreateTimeUtc,
-            LastLoginIp = p.LastLoginIp,
-            LastLoginTimeUtc = p.LastLoginTimeUtc,
             Username = p.Username
         }, ct);
     }
diff --git a/src/Moonglade.Auth/LogSuccessLoginCommand.cs b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
index 463cef937..269a990d0 100644
--- a/src/Moonglade.Auth/LogSuccessLoginCommand.cs
+++ b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
@@ -3,20 +3,18 @@
 
 namespace Moonglade.Auth;
 
-public record LogSuccessLoginCommand(Guid Id, string IpAddress) : IRequest;
+public record LogSuccessLoginCommand(string IpAddress) : IRequest;
 
-public class LogSuccessLoginCommandHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<LogSuccessLoginCommand>
+public class LogSuccessLoginCommandHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<LogSuccessLoginCommand>
 {
     public async Task Handle(LogSuccessLoginCommand request, CancellationToken ct)
     {
-        var (id, ipAddress) = request;
-
-        var entity = await repo.GetAsync(id, ct);
-        if (entity is not null)
+        var entity = new LoginHistoryEntity
         {
-            entity.LastLoginIp = ipAddress.Trim();
-            entity.LastLoginTimeUtc = DateTime.UtcNow;
-            await repo.UpdateAsync(entity, ct);
-        }
+            LoginIp = request.IpAddress.Trim(),
+            LoginTimeUtc = DateTime.UtcNow
+        };
+
+        await repo.AddAsync(entity, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
index a2141a57e..e665d8754 100644
--- a/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
+++ b/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
@@ -12,8 +12,6 @@ public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
         builder.Property(e => e.Id).ValueGeneratedNever();
         builder.Property(e => e.Username).HasMaxLength(32);
         builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.LastLoginIp).HasMaxLength(64);
         builder.Property(e => e.CreateTimeUtc).HasColumnType("datetime");
-        builder.Property(e => e.LastLoginTimeUtc).HasColumnType("datetime");
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
index c691cb8a7..d7d02b2f1 100644
--- a/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
+++ b/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
@@ -12,8 +12,6 @@ public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
         builder.Property(e => e.Id).ValueGeneratedNever();
         builder.Property(e => e.Username).HasMaxLength(32);
         builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.LastLoginIp).HasMaxLength(64);
         builder.Property(e => e.CreateTimeUtc).HasColumnType("timestamp");
-        builder.Property(e => e.LastLoginTimeUtc).HasColumnType("timestamp");
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data.PostgreSql/Configurations/LoginHistoryConfiguration.cs b/src/Moonglade.Data.PostgreSql/Configurations/LoginHistoryConfiguration.cs
new file mode 100644
index 000000000..3781f1224
--- /dev/null
+++ b/src/Moonglade.Data.PostgreSql/Configurations/LoginHistoryConfiguration.cs
@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.PostgreSql.Configurations;
+
+internal class LoginHistoryConfiguration : IEntityTypeConfiguration<LoginHistoryEntity>
+{
+    public void Configure(EntityTypeBuilder<LoginHistoryEntity> builder)
+    {
+        builder.Property(e => e.Id).UseIdentityColumn();
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs b/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
index 4889ae458..f9cc2a61b 100644
--- a/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
+++ b/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
@@ -20,6 +20,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new PostConfiguration());
         modelBuilder.ApplyConfiguration(new PostCategoryConfiguration());
         modelBuilder.ApplyConfiguration(new LocalAccountConfiguration());
+        modelBuilder.ApplyConfiguration(new LoginHistoryConfiguration());
         modelBuilder.ApplyConfiguration(new PingbackConfiguration());
         modelBuilder.ApplyConfiguration(new BlogThemeConfiguration());
         modelBuilder.ApplyConfiguration(new BlogAssetConfiguration());
diff --git a/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
index 4392de7e9..8c21a6a9e 100644
--- a/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
+++ b/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
@@ -4,7 +4,6 @@
 
 namespace Moonglade.Data.SqlServer.Configurations;
 
-
 internal class LocalAccountConfiguration : IEntityTypeConfiguration<LocalAccountEntity>
 {
     public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
@@ -12,8 +11,6 @@ public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
         builder.Property(e => e.Id).ValueGeneratedNever();
         builder.Property(e => e.Username).HasMaxLength(32);
         builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.LastLoginIp).HasMaxLength(64);
         builder.Property(e => e.CreateTimeUtc).HasColumnType("datetime");
-        builder.Property(e => e.LastLoginTimeUtc).HasColumnType("datetime");
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs b/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
new file mode 100644
index 000000000..6d4315cb7
--- /dev/null
+++ b/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.SqlServer.Configurations;
+
+internal class LoginHistoryConfiguration : IEntityTypeConfiguration<LoginHistoryEntity>
+{
+    public void Configure(EntityTypeBuilder<LoginHistoryEntity> builder)
+    {
+        builder.Property(e => e.Id).UseIdentityColumn(1, 1);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs b/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
index 66c70be71..9e94ca30e 100644
--- a/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
+++ b/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
@@ -22,6 +22,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new PostConfiguration());
         modelBuilder.ApplyConfiguration(new PostCategoryConfiguration());
         modelBuilder.ApplyConfiguration(new LocalAccountConfiguration());
+        modelBuilder.ApplyConfiguration(new LoginHistoryConfiguration());
         modelBuilder.ApplyConfiguration(new PingbackConfiguration());
         modelBuilder.ApplyConfiguration(new BlogThemeConfiguration());
         modelBuilder.ApplyConfiguration(new BlogAssetConfiguration());
diff --git a/src/Moonglade.Data/BlogDbContext.cs b/src/Moonglade.Data/BlogDbContext.cs
index 84abcb721..acd90ae8e 100644
--- a/src/Moonglade.Data/BlogDbContext.cs
+++ b/src/Moonglade.Data/BlogDbContext.cs
@@ -23,6 +23,7 @@ public BlogDbContext(DbContextOptions options)
     public virtual DbSet<FriendLinkEntity> FriendLink { get; set; }
     public virtual DbSet<PageEntity> CustomPage { get; set; }
     public virtual DbSet<LocalAccountEntity> LocalAccount { get; set; }
+    public virtual DbSet<LoginHistoryEntity> LoginHistory { get; set; }
     public virtual DbSet<PingbackEntity> Pingback { get; set; }
     public virtual DbSet<BlogThemeEntity> BlogTheme { get; set; }
     public virtual DbSet<StyleSheetEntity> StyleSheet { get; set; }
diff --git a/src/Moonglade.Data/Entities/LocalAccountEntity.cs b/src/Moonglade.Data/Entities/LocalAccountEntity.cs
index 09161d667..48ac6293b 100644
--- a/src/Moonglade.Data/Entities/LocalAccountEntity.cs
+++ b/src/Moonglade.Data/Entities/LocalAccountEntity.cs
@@ -6,7 +6,5 @@ public class LocalAccountEntity
     public string Username { get; set; }
     public string PasswordSalt { get; set; }
     public string PasswordHash { get; set; }
-    public DateTime? LastLoginTimeUtc { get; set; }
-    public string LastLoginIp { get; set; }
     public DateTime CreateTimeUtc { get; set; }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Entities/LoginHistoryEntity.cs b/src/Moonglade.Data/Entities/LoginHistoryEntity.cs
new file mode 100644
index 000000000..5c19d81c0
--- /dev/null
+++ b/src/Moonglade.Data/Entities/LoginHistoryEntity.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Moonglade.Data.Entities;
+
+public class LoginHistoryEntity
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public int Id { get; set; }
+
+    public DateTime LoginTimeUtc { get; set; }
+
+    [MaxLength(64)]
+    public string LoginIp { get; set; }
+
+    [MaxLength(128)]
+    public string LoginUserAgent { get; set; }
+
+    [MaxLength(128)]
+    public string DeviceFingerprint { get; set; }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index 5f7d6e032..f553940ae 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -57,8 +57,8 @@
         <thead>
             <tr>
                 <th>@SharedLocalizer["Username"]</th>
-                <th>@SharedLocalizer["Last Login IP"]</th>
-                <th>@SharedLocalizer["Last Login Time (UTC)"]</th>
+                @* <th>@SharedLocalizer["Last Login IP"]</th>
+                <th>@SharedLocalizer["Last Login Time (UTC)"]</th> *@
             </tr>
         </thead>
         <tbody>
@@ -66,8 +66,8 @@
             {
                 <tr id="tr-@item.Id">
                     <td>@item.Username</td>
-                    <td>@(item.LastLoginIp ?? "N/A")</td>
-                    <td>@(null != item.LastLoginTimeUtc ? item.LastLoginTimeUtc.ToString() : "N/A")</td>
+                    @* <td>@(item.LastLoginIp ?? "N/A")</td>
+                    <td>@(null != item.LastLoginTimeUtc ? item.LastLoginTimeUtc.ToString() : "N/A")</td> *@
                 </tr>
             }
         </tbody>
diff --git a/src/Moonglade.Web/Pages/SignIn.cshtml.cs b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
index 35b19550b..c9e2d4429 100644
--- a/src/Moonglade.Web/Pages/SignIn.cshtml.cs
+++ b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
@@ -80,7 +80,7 @@ public async Task<IActionResult> OnPostAsync()
                     var p = new ClaimsPrincipal(ci);
 
                     await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, p);
-                    await mediator.Send(new LogSuccessLoginCommand(uid, Helper.GetClientIP(HttpContext)));
+                    await mediator.Send(new LogSuccessLoginCommand(Helper.GetClientIP(HttpContext)));
 
                     var successMessage = $@"Authentication success for local account ""{Username}""";
 

From 25047cfb934ae962c24f664a6f197d8033bcc276 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 15:56:32 +0800
Subject: [PATCH 010/227] save login UA

---
 src/Moonglade.Auth/LogSuccessLoginCommand.cs | 6 ++++--
 src/Moonglade.Web/Pages/SignIn.cshtml.cs     | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Auth/LogSuccessLoginCommand.cs b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
index 269a990d0..a465afdb7 100644
--- a/src/Moonglade.Auth/LogSuccessLoginCommand.cs
+++ b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
@@ -3,7 +3,7 @@
 
 namespace Moonglade.Auth;
 
-public record LogSuccessLoginCommand(string IpAddress) : IRequest;
+public record LogSuccessLoginCommand(string IpAddress, string UserAgent, string DeviceFingerprint) : IRequest;
 
 public class LogSuccessLoginCommandHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<LogSuccessLoginCommand>
 {
@@ -12,7 +12,9 @@ public async Task Handle(LogSuccessLoginCommand request, CancellationToken ct)
         var entity = new LoginHistoryEntity
         {
             LoginIp = request.IpAddress.Trim(),
-            LoginTimeUtc = DateTime.UtcNow
+            LoginTimeUtc = DateTime.UtcNow,
+            LoginUserAgent = request.UserAgent.Trim(),
+            DeviceFingerprint = request.DeviceFingerprint.Trim()
         };
 
         await repo.AddAsync(entity, ct);
diff --git a/src/Moonglade.Web/Pages/SignIn.cshtml.cs b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
index c9e2d4429..239e97e1c 100644
--- a/src/Moonglade.Web/Pages/SignIn.cshtml.cs
+++ b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
@@ -65,6 +65,13 @@ public async Task<IActionResult> OnPostAsync()
                 ModelState.AddModelError(nameof(CaptchaCode), "Wrong Captcha Code");
             }
 
+            // Check User-Agent
+            var ua = Request.Headers["User-Agent"].ToString();
+            if (string.IsNullOrWhiteSpace(ua))
+            {
+                return Unauthorized();
+            }
+
             if (ModelState.IsValid)
             {
                 var uid = await mediator.Send(new ValidateLoginCommand(Username, Password));
@@ -80,7 +87,7 @@ public async Task<IActionResult> OnPostAsync()
                     var p = new ClaimsPrincipal(ci);
 
                     await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, p);
-                    await mediator.Send(new LogSuccessLoginCommand(Helper.GetClientIP(HttpContext)));
+                    await mediator.Send(new LogSuccessLoginCommand(Helper.GetClientIP(HttpContext), ua, "TODO"));
 
                     var successMessage = $@"Authentication success for local account ""{Username}""";
 

From 5776a7468d1552d31890b6aaf89393beba30f54c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 16:02:41 +0800
Subject: [PATCH 011/227] Create LocalAccountSettings.cs

---
 src/Moonglade.Configuration/LocalAccountSettings.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/Moonglade.Configuration/LocalAccountSettings.cs

diff --git a/src/Moonglade.Configuration/LocalAccountSettings.cs b/src/Moonglade.Configuration/LocalAccountSettings.cs
new file mode 100644
index 000000000..a218861fe
--- /dev/null
+++ b/src/Moonglade.Configuration/LocalAccountSettings.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Moonglade.Configuration;
+
+public class LocalAccountSettings : IBlogSettings
+{
+}
\ No newline at end of file

From 426249208e154e1b00d8f01e35a3a6339a4bfdef Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 16:08:00 +0800
Subject: [PATCH 012/227] create LocalAccountSettings

---
 src/Moonglade.Configuration/BlogConfig.cs     |  4 +++
 .../LocalAccountSettings.cs                   | 20 ++++++++-----
 .../Controllers/LocalAccountController.cs     |  2 +-
 .../Pages/Admin/LocalAccount.cshtml           | 30 +++++++++----------
 .../Pages/Settings/Advanced.cshtml            |  6 ++--
 5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/Moonglade.Configuration/BlogConfig.cs b/src/Moonglade.Configuration/BlogConfig.cs
index 96a1bcda1..9b9e95ea6 100644
--- a/src/Moonglade.Configuration/BlogConfig.cs
+++ b/src/Moonglade.Configuration/BlogConfig.cs
@@ -15,6 +15,7 @@ public interface IBlogConfig
     AdvancedSettings AdvancedSettings { get; set; }
     CustomStyleSheetSettings CustomStyleSheetSettings { get; set; }
     CustomMenuSettings CustomMenuSettings { get; set; }
+    LocalAccountSettings LocalAccountSettings { get; set; }
 
     IEnumerable<int> LoadFromConfig(IDictionary<string, string> config);
     KeyValuePair<string, string> UpdateAsync<T>(T blogSettings) where T : IBlogSettings;
@@ -38,6 +39,8 @@ public class BlogConfig : IBlogConfig
 
     public CustomMenuSettings CustomMenuSettings { get; set; }
 
+    public LocalAccountSettings LocalAccountSettings { get; set; }
+
     public IEnumerable<int> LoadFromConfig(IDictionary<string, string> config)
     {
         ContentSettings = AssignValueForConfigItem(1, ContentSettings.DefaultValue, config);
@@ -48,6 +51,7 @@ public IEnumerable<int> LoadFromConfig(IDictionary<string, string> config)
         AdvancedSettings = AssignValueForConfigItem(6, AdvancedSettings.DefaultValue, config);
         CustomStyleSheetSettings = AssignValueForConfigItem(7, CustomStyleSheetSettings.DefaultValue, config);
         CustomMenuSettings = AssignValueForConfigItem(10, CustomMenuSettings.DefaultValue, config);
+        LocalAccountSettings = AssignValueForConfigItem(11, LocalAccountSettings.DefaultValue, config);
 
         return _keysToInit.AsEnumerable();
     }
diff --git a/src/Moonglade.Configuration/LocalAccountSettings.cs b/src/Moonglade.Configuration/LocalAccountSettings.cs
index a218861fe..dc7fb2db2 100644
--- a/src/Moonglade.Configuration/LocalAccountSettings.cs
+++ b/src/Moonglade.Configuration/LocalAccountSettings.cs
@@ -1,11 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Moonglade.Configuration;
+namespace Moonglade.Configuration;
 
 public class LocalAccountSettings : IBlogSettings
 {
+    public string Username { get; set; }
+
+    public string PasswordHash { get; set; }
+    public string PasswordSalt { get; set; }
+
+    public static LocalAccountSettings DefaultValue =>
+        new()
+        {
+            Username = "admin",
+            PasswordHash = "JAvlGPq9JyTdtvBO6x2llnRI1+gxwIyPqCKAn3THIKk=",
+            PasswordSalt = "" // TODO
+        };
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/LocalAccountController.cs b/src/Moonglade.Web/Controllers/LocalAccountController.cs
index 4621e1901..283b8ac71 100644
--- a/src/Moonglade.Web/Controllers/LocalAccountController.cs
+++ b/src/Moonglade.Web/Controllers/LocalAccountController.cs
@@ -16,7 +16,7 @@ public async Task<IActionResult> ResetPassword([NotEmpty] Guid id, [FromBody][Re
     {
         if (!Regex.IsMatch(newPassword, @"^(?=.*[A-Za-z])(?=.*\d)[!@#$%^&*A-Za-z\d]{8,}$"))
         {
-            return Conflict("Password must be minimum eight characters, at least one letter and one number");
+            return Conflict("PasswordHash must be minimum eight characters, at least one letter and one number");
         }
 
         await mediator.Send(new ChangePasswordCommand(id, newPassword));
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index f553940ae..a419087ee 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -9,16 +9,16 @@
     <script type="module">
         import * as utils from '/js/app/utils.module.js'
 
-        var resetPasswordModal = new bootstrap.Modal('#resetPasswordModal');
+        var resetPasswordHashModal = new bootstrap.Modal('#resetPasswordHashModal');
         var cid = '';
 
-        window.resetPassword = function (accountId) {
+        window.resetPasswordHash = function (accountId) {
             document.querySelector('#resetpassword-form').reset();
-            resetPasswordModal.show();
+            resetPasswordHashModal.show();
             cid = accountId;
         }
 
-        window.handleResetPasswordFormSubmit = function (event) {
+        window.handleResetPasswordHashFormSubmit = function (event) {
             event.preventDefault();
 
             const data = new FormData(event.target);
@@ -26,26 +26,26 @@
 
             callApi(`/api/localaccount/${cid}/password`,
                 'PUT',
-                value["NewPassword"],
+                value["NewPasswordHash"],
                 (resp) => {
                     document.querySelector('#resetpassword-form').reset();
-                    resetPasswordModal.hide();
-                    blogToast.success('Password updated.');
+                    resetPasswordHashModal.hide();
+                    blogToast.success('PasswordHash updated.');
                     cid = '';
                 });
         }
 
-        const resetPasswordForm = document.querySelector('#resetpassword-form');
-        resetPasswordForm.addEventListener('submit', handleResetPasswordFormSubmit);
+        const resetPasswordHashForm = document.querySelector('#resetpassword-form');
+        resetPasswordHashForm.addEventListener('submit', handleResetPasswordHashFormSubmit);
     </script>
 }
 
 
 @section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
-        <a class="btn btn-outline-accent" href="javascript:resetPassword('@currentUidClaim');">
+        <a class="btn btn-outline-accent" href="javascript:resetPasswordHash('@currentUidClaim');">
             <i class="bi-key"></i>
-            @SharedLocalizer["Change Password"]
+            @SharedLocalizer["Change PasswordHash"]
         </a>
     </div>
 }
@@ -76,11 +76,11 @@
 
 <p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
 
-<div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordModalLabel" aria-hidden="true">
+<div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordHashModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="resetPasswordModalLabel">@SharedLocalizer["Reset Password"]</h5>
+                <h5 class="modal-title" id="resetPasswordModalLabel">@SharedLocalizer["Reset PasswordHash"]</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
                 </button>
             </div>
@@ -88,12 +88,12 @@
             <form id="resetpassword-form" method="post">
                 <div class="modal-body">
                     <div class="mb-2">
-                        <label for="NewPassword">New Password</label>
+                        <label for="NewPassword">New PasswordHash</label>
                         <input class="form-control" type="password"
                                id="NewPassword"
                                minlength="8"
                                maxlength="32"
-                               name="NewPassword"
+                               name="NewPasswordHash"
                                pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@@#$^&*]{8,}$"
                                required>
                         <span class="text-danger field-validation-valid"></span>
diff --git a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
index f080e64e8..944defddb 100644
--- a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
+++ b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
@@ -92,10 +92,10 @@
             });
         });
 
-        window.generateMetaWeblogPassword = function () {
+        window.generateMetaWeblogPasswordHash = function () {
             callApi('/api/settings/password/generate', 'GET', {}, async (resp) => {
                 var data = await resp.json();
-                $('#settings_MetaWeblogPassword').val(data.password);
+                $('#settings_MetaWeblogPasswordHash').val(data.password);
             });
         }
 
@@ -243,7 +243,7 @@
                     <div class="col-md-4">
                         <input asp-for="@settings.MetaWeblogPassword" class="form-control" minlength="8" maxlength="16" />
 
-                        <a href="javascript:;" class="btn btn-sm btn-outline-accent mt-2" onclick="generateMetaWeblogPassword()">@SharedLocalizer["Generate password"]</a>
+                        <a href="javascript:;" class="btn btn-sm btn-outline-accent mt-2" onclick="generateMetaWeblogPasswordHash()">@SharedLocalizer["Generate password"]</a>
                     </div>
                 </div>
             </div>

From 044fe796838bbe67b854d14ff0910776d0228f26 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 16:11:35 +0800
Subject: [PATCH 013/227] Update WebApplicationExtensions.cs

---
 src/Moonglade.Web/WebApplicationExtensions.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Moonglade.Web/WebApplicationExtensions.cs b/src/Moonglade.Web/WebApplicationExtensions.cs
index ca5155f9a..67f3e6c2c 100644
--- a/src/Moonglade.Web/WebApplicationExtensions.cs
+++ b/src/Moonglade.Web/WebApplicationExtensions.cs
@@ -141,6 +141,10 @@ await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(CustomStyleSh
                         await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(CustomMenuSettings),
                             CustomMenuSettings.DefaultValue.ToJson()));
                         break;
+                    case 11:
+                        await mediator.Send(new AddDefaultConfigurationCommand(key, nameof(LocalAccountSettings),
+                            LocalAccountSettings.DefaultValue.ToJson()));
+                        break;
                 }
             }
         }

From fdff6a44d4e151a1b636a6c053672db4f0d85915 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 16:22:41 +0800
Subject: [PATCH 014/227] validate account against blogconfig

---
 src/Moonglade.Auth/Moonglade.Auth.csproj      |  1 +
 src/Moonglade.Auth/ValidateLoginCommand.cs    | 31 ++++++-------------
 .../LocalAccountSettings.cs                   |  4 +--
 src/Moonglade.Web/Pages/SignIn.cshtml.cs      |  7 ++---
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj
index abfa6b13e..ca9f20187 100644
--- a/src/Moonglade.Auth/Moonglade.Auth.csproj
+++ b/src/Moonglade.Auth/Moonglade.Auth.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Identity.Web" Version="2.17.5" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
     <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
     <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
   </ItemGroup>
diff --git a/src/Moonglade.Auth/ValidateLoginCommand.cs b/src/Moonglade.Auth/ValidateLoginCommand.cs
index 8e2464994..a9e2bfd19 100644
--- a/src/Moonglade.Auth/ValidateLoginCommand.cs
+++ b/src/Moonglade.Auth/ValidateLoginCommand.cs
@@ -1,34 +1,21 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
+using Moonglade.Configuration;
 using Moonglade.Utils;
 
 namespace Moonglade.Auth;
 
-public record ValidateLoginCommand(string Username, string InputPassword) : IRequest<Guid>;
+public record ValidateLoginCommand(string Username, string InputPassword) : IRequest<bool>;
 
-public class ValidateLoginCommandHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<ValidateLoginCommand, Guid>
+public class ValidateLoginCommandHandler(IBlogConfig config) : IRequestHandler<ValidateLoginCommand, bool>
 {
-    public async Task<Guid> Handle(ValidateLoginCommand request, CancellationToken ct)
+    public Task<bool> Handle(ValidateLoginCommand request, CancellationToken ct)
     {
-        var account = await repo.GetAsync(p => p.Username == request.Username);
-        if (account is null) return Guid.Empty;
+        var account = config.LocalAccountSettings;
 
-        var valid = account.PasswordHash == (string.IsNullOrWhiteSpace(account.PasswordSalt)
-            ? Helper.HashPassword(request.InputPassword.Trim())
-            : Helper.HashPassword2(request.InputPassword.Trim(), account.PasswordSalt));
+        if (account is null) return Task.FromResult(false);
+        if (account.Username != request.Username) return Task.FromResult(false);
 
-        // migrate old account to salt
-        if (valid && string.IsNullOrWhiteSpace(account.PasswordSalt))
-        {
-            var salt = Helper.GenerateSalt();
-            var newHash = Helper.HashPassword2(request.InputPassword.Trim(), salt);
+        var valid = account.PasswordHash == Helper.HashPassword2(request.InputPassword.Trim(), account.PasswordSalt);
 
-            account.PasswordSalt = salt;
-            account.PasswordHash = newHash;
-
-            await repo.UpdateAsync(account, ct);
-        }
-
-        return valid ? account.Id : Guid.Empty;
+        return Task.FromResult(valid);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Configuration/LocalAccountSettings.cs b/src/Moonglade.Configuration/LocalAccountSettings.cs
index dc7fb2db2..e122f9229 100644
--- a/src/Moonglade.Configuration/LocalAccountSettings.cs
+++ b/src/Moonglade.Configuration/LocalAccountSettings.cs
@@ -11,7 +11,7 @@ public class LocalAccountSettings : IBlogSettings
         new()
         {
             Username = "admin",
-            PasswordHash = "JAvlGPq9JyTdtvBO6x2llnRI1+gxwIyPqCKAn3THIKk=",
-            PasswordSalt = "" // TODO
+            PasswordHash = "bXHAa7tEsZmCh1pYcHPotNlP0gaYfzIkxKuHoJnHMt0=",
+            PasswordSalt = "Hq8jxngFtTEtl3UI294K7w=="
         };
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/SignIn.cshtml.cs b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
index 239e97e1c..3b03f9c9c 100644
--- a/src/Moonglade.Web/Pages/SignIn.cshtml.cs
+++ b/src/Moonglade.Web/Pages/SignIn.cshtml.cs
@@ -74,14 +74,13 @@ public async Task<IActionResult> OnPostAsync()
 
             if (ModelState.IsValid)
             {
-                var uid = await mediator.Send(new ValidateLoginCommand(Username, Password));
-                if (uid != Guid.Empty)
+                var isValid = await mediator.Send(new ValidateLoginCommand(Username, Password));
+                if (isValid)
                 {
                     var claims = new List<Claim>
                     {
                         new (ClaimTypes.Name, Username),
-                        new (ClaimTypes.Role, "Administrator"),
-                        new ("uid", uid.ToString())
+                        new (ClaimTypes.Role, "Administrator")
                     };
                     var ci = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
                     var p = new ClaimsPrincipal(ci);

From 736a329e2a253b90fb24fddf741a1b4d9fda934d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 18 Apr 2024 16:33:54 +0800
Subject: [PATCH 015/227] remove old LocalAccount data

---
 src/Moonglade.Auth/Account.cs                 | 24 ---------
 src/Moonglade.Auth/AccountExistsQuery.cs      | 12 -----
 src/Moonglade.Auth/ChangePasswordCommand.cs   | 25 ++++-----
 src/Moonglade.Auth/CountAccountsQuery.cs      | 11 ----
 src/Moonglade.Auth/CreateAccountCommand.cs    | 53 -------------------
 src/Moonglade.Auth/DeleteAccountCommand.cs    | 15 ------
 src/Moonglade.Auth/GetAccountQuery.cs         | 16 ------
 src/Moonglade.Auth/GetAccountsQuery.cs        | 19 -------
 src/Moonglade.Auth/GetLoginHistoryQuery.cs    | 15 ++++++
 .../LocalAccountConfiguration.cs              | 17 ------
 .../MySqlBlogDbContext.cs                     |  1 -
 .../LocalAccountConfiguration.cs              | 17 ------
 .../PostgreSqlBlogDbContext.cs                |  1 -
 .../LocalAccountConfiguration.cs              | 16 ------
 .../SqlServerBlogDbContext.cs                 |  1 -
 src/Moonglade.Data/BlogDbContext.cs           |  4 +-
 .../Entities/LocalAccountEntity.cs            | 10 ----
 src/Moonglade.Data/Seed.cs                    | 13 -----
 .../Pages/Admin/LocalAccount.cshtml           | 25 ++++-----
 .../Pages/Admin/LocalAccount.cshtml.cs        |  7 ++-
 .../Resources/Program.zh-Hans.resx            |  8 +--
 21 files changed, 47 insertions(+), 263 deletions(-)
 delete mode 100644 src/Moonglade.Auth/Account.cs
 delete mode 100644 src/Moonglade.Auth/AccountExistsQuery.cs
 delete mode 100644 src/Moonglade.Auth/CountAccountsQuery.cs
 delete mode 100644 src/Moonglade.Auth/CreateAccountCommand.cs
 delete mode 100644 src/Moonglade.Auth/DeleteAccountCommand.cs
 delete mode 100644 src/Moonglade.Auth/GetAccountQuery.cs
 delete mode 100644 src/Moonglade.Auth/GetAccountsQuery.cs
 create mode 100644 src/Moonglade.Auth/GetLoginHistoryQuery.cs
 delete mode 100644 src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
 delete mode 100644 src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
 delete mode 100644 src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
 delete mode 100644 src/Moonglade.Data/Entities/LocalAccountEntity.cs

diff --git a/src/Moonglade.Auth/Account.cs b/src/Moonglade.Auth/Account.cs
deleted file mode 100644
index 1c02a25c8..000000000
--- a/src/Moonglade.Auth/Account.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Auth;
-
-public class Account
-{
-    public Guid Id { get; set; }
-    public string Username { get; set; }
-    public DateTime CreateTimeUtc { get; set; }
-
-    public Account()
-    {
-
-    }
-
-    public Account(LocalAccountEntity entity)
-    {
-        if (null == entity) return;
-
-        Id = entity.Id;
-        CreateTimeUtc = entity.CreateTimeUtc;
-        Username = entity.Username.Trim();
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/AccountExistsQuery.cs b/src/Moonglade.Auth/AccountExistsQuery.cs
deleted file mode 100644
index a0ce6aaf6..000000000
--- a/src/Moonglade.Auth/AccountExistsQuery.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Auth;
-
-public record AccountExistsQuery(string Username) : IRequest<bool>;
-
-public class AccountExistsQueryHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<AccountExistsQuery, bool>
-{
-    public Task<bool> Handle(AccountExistsQuery request, CancellationToken ct) =>
-        repo.AnyAsync(p => p.Username == request.Username.ToLower(), ct);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/ChangePasswordCommand.cs b/src/Moonglade.Auth/ChangePasswordCommand.cs
index 7e1d384cc..3b1510494 100644
--- a/src/Moonglade.Auth/ChangePasswordCommand.cs
+++ b/src/Moonglade.Auth/ChangePasswordCommand.cs
@@ -1,25 +1,26 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
+using Moonglade.Configuration;
 using Moonglade.Utils;
 
 namespace Moonglade.Auth;
 
 public record ChangePasswordCommand(Guid Id, string ClearPassword) : IRequest;
 
-public class ChangePasswordCommandHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<ChangePasswordCommand>
+public class ChangePasswordCommandHandler(IBlogConfig blogConfig) : IRequestHandler<ChangePasswordCommand>
 {
     public async Task Handle(ChangePasswordCommand request, CancellationToken ct)
     {
-        var account = await repo.GetAsync(request.Id, ct);
-        if (account is null)
-        {
-            throw new InvalidOperationException($"LocalAccountEntity with Id '{request.Id}' not found.");
-        }
+        // TODO
 
-        var newSalt = Helper.GenerateSalt();
-        account.PasswordSalt = newSalt;
-        account.PasswordHash = Helper.HashPassword2(request.ClearPassword, newSalt);
+        //var account = await repo.GetAsync(request.Id, ct);
+        //if (account is null)
+        //{
+        //    throw new InvalidOperationException($"LocalAccountEntity with Id '{request.Id}' not found.");
+        //}
 
-        await repo.UpdateAsync(account, ct);
+        //var newSalt = Helper.GenerateSalt();
+        //account.PasswordSalt = newSalt;
+        //account.PasswordHash = Helper.HashPassword2(request.ClearPassword, newSalt);
+
+        //await repo.UpdateAsync(account, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Auth/CountAccountsQuery.cs b/src/Moonglade.Auth/CountAccountsQuery.cs
deleted file mode 100644
index a61d336cb..000000000
--- a/src/Moonglade.Auth/CountAccountsQuery.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Auth;
-
-public record CountAccountsQuery : IRequest<int>;
-
-public class CountAccountsQueryHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<CountAccountsQuery, int>
-{
-    public Task<int> Handle(CountAccountsQuery request, CancellationToken ct) => repo.CountAsync(ct: ct);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/CreateAccountCommand.cs b/src/Moonglade.Auth/CreateAccountCommand.cs
deleted file mode 100644
index 9f71d2619..000000000
--- a/src/Moonglade.Auth/CreateAccountCommand.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-using Moonglade.Utils;
-using System.ComponentModel.DataAnnotations;
-
-namespace Moonglade.Auth;
-
-public class CreateAccountCommand : IRequest
-{
-    [Required]
-    [Display(Name = "Username")]
-    [MinLength(2), MaxLength(32)]
-    [RegularExpression("[a-z0-9]+")]
-    public string Username { get; set; }
-
-    [Required]
-    [Display(Name = "Password")]
-    [MinLength(8), MaxLength(32)]
-    [DataType(DataType.Password)]
-    [RegularExpression(@"^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$")]
-    public string Password { get; set; }
-}
-
-public class CreateAccountCommandHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<CreateAccountCommand>
-{
-    public Task Handle(CreateAccountCommand request, CancellationToken ct)
-    {
-        if (string.IsNullOrWhiteSpace(request.Username))
-        {
-            throw new ArgumentNullException(nameof(request.Username), "value must not be empty.");
-        }
-
-        if (string.IsNullOrWhiteSpace(request.Password))
-        {
-            throw new ArgumentNullException(nameof(request.Password), "value must not be empty.");
-        }
-
-        var uid = Guid.NewGuid();
-        var salt = Helper.GenerateSalt();
-        var hash = Helper.HashPassword2(request.Password.Trim(), salt);
-
-        var account = new LocalAccountEntity
-        {
-            Id = uid,
-            CreateTimeUtc = DateTime.UtcNow,
-            Username = request.Username.ToLower().Trim(),
-            PasswordSalt = salt,
-            PasswordHash = hash
-        };
-
-        return repo.AddAsync(account, ct);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/DeleteAccountCommand.cs b/src/Moonglade.Auth/DeleteAccountCommand.cs
deleted file mode 100644
index a8dd6a888..000000000
--- a/src/Moonglade.Auth/DeleteAccountCommand.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Auth;
-
-public record DeleteAccountCommand(Guid Id) : IRequest;
-
-public class DeleteAccountCommandHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<DeleteAccountCommand>
-{
-    public async Task Handle(DeleteAccountCommand request, CancellationToken ct)
-    {
-        var account = await repo.GetAsync(request.Id, ct);
-        if (account != null) await repo.DeleteAsync(request.Id, ct);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/GetAccountQuery.cs b/src/Moonglade.Auth/GetAccountQuery.cs
deleted file mode 100644
index ae83c1bae..000000000
--- a/src/Moonglade.Auth/GetAccountQuery.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Auth;
-
-public record GetAccountQuery(Guid Id) : IRequest<Account>;
-
-public class GetAccountQueryHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<GetAccountQuery, Account>
-{
-    public async Task<Account> Handle(GetAccountQuery request, CancellationToken ct)
-    {
-        var entity = await repo.GetAsync(request.Id, ct);
-        var item = new Account(entity);
-        return item;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/GetAccountsQuery.cs b/src/Moonglade.Auth/GetAccountsQuery.cs
deleted file mode 100644
index fc87fccdd..000000000
--- a/src/Moonglade.Auth/GetAccountsQuery.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Auth;
-
-public record GetAccountsQuery : IRequest<IReadOnlyList<Account>>;
-
-public class GetAccountsQueryHandler(IRepository<LocalAccountEntity> repo) : IRequestHandler<GetAccountsQuery, IReadOnlyList<Account>>
-{
-    public Task<IReadOnlyList<Account>> Handle(GetAccountsQuery request, CancellationToken ct)
-    {
-        return repo.SelectAsync(p => new Account
-        {
-            Id = p.Id,
-            CreateTimeUtc = p.CreateTimeUtc,
-            Username = p.Username
-        }, ct);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Auth/GetLoginHistoryQuery.cs b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
new file mode 100644
index 000000000..77c90539a
--- /dev/null
+++ b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
@@ -0,0 +1,15 @@
+using Moonglade.Data.Entities;
+using Moonglade.Data.Infrastructure;
+
+namespace Moonglade.Auth;
+
+public record GetLoginHistoryQuery : IRequest<IReadOnlyList<LoginHistoryEntity>>;
+
+public class GetLoginHistoryQueryHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<GetLoginHistoryQuery, IReadOnlyList<LoginHistoryEntity>>
+{
+    public async Task<IReadOnlyList<LoginHistoryEntity>> Handle(GetLoginHistoryQuery request, CancellationToken ct)
+    {
+        var history = await repo.ListAsync(ct);
+        return history;
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
deleted file mode 100644
index e665d8754..000000000
--- a/src/Moonglade.Data.MySql/Configurations/LocalAccountConfiguration.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.MySql.Configurations;
-
-
-internal class LocalAccountConfiguration : IEntityTypeConfiguration<LocalAccountEntity>
-{
-    public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
-    {
-        builder.Property(e => e.Id).ValueGeneratedNever();
-        builder.Property(e => e.Username).HasMaxLength(32);
-        builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.CreateTimeUtc).HasColumnType("datetime");
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data.MySql/MySqlBlogDbContext.cs b/src/Moonglade.Data.MySql/MySqlBlogDbContext.cs
index 66bb4ab34..ee6c135f3 100644
--- a/src/Moonglade.Data.MySql/MySqlBlogDbContext.cs
+++ b/src/Moonglade.Data.MySql/MySqlBlogDbContext.cs
@@ -21,7 +21,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new CommentReplyConfiguration());
         modelBuilder.ApplyConfiguration(new PostConfiguration());
         modelBuilder.ApplyConfiguration(new PostCategoryConfiguration());
-        modelBuilder.ApplyConfiguration(new LocalAccountConfiguration());
         modelBuilder.ApplyConfiguration(new PingbackConfiguration());
         modelBuilder.ApplyConfiguration(new BlogThemeConfiguration());
         modelBuilder.ApplyConfiguration(new BlogAssetConfiguration());
diff --git a/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
deleted file mode 100644
index d7d02b2f1..000000000
--- a/src/Moonglade.Data.PostgreSql/Configurations/LocalAccountConfiguration.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.PostgreSql.Configurations;
-
-
-internal class LocalAccountConfiguration : IEntityTypeConfiguration<LocalAccountEntity>
-{
-    public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
-    {
-        builder.Property(e => e.Id).ValueGeneratedNever();
-        builder.Property(e => e.Username).HasMaxLength(32);
-        builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.CreateTimeUtc).HasColumnType("timestamp");
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs b/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
index f9cc2a61b..44815882f 100644
--- a/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
+++ b/src/Moonglade.Data.PostgreSql/PostgreSqlBlogDbContext.cs
@@ -19,7 +19,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new CommentReplyConfiguration());
         modelBuilder.ApplyConfiguration(new PostConfiguration());
         modelBuilder.ApplyConfiguration(new PostCategoryConfiguration());
-        modelBuilder.ApplyConfiguration(new LocalAccountConfiguration());
         modelBuilder.ApplyConfiguration(new LoginHistoryConfiguration());
         modelBuilder.ApplyConfiguration(new PingbackConfiguration());
         modelBuilder.ApplyConfiguration(new BlogThemeConfiguration());
diff --git a/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs b/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
deleted file mode 100644
index 8c21a6a9e..000000000
--- a/src/Moonglade.Data.SqlServer/Configurations/LocalAccountConfiguration.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.SqlServer.Configurations;
-
-internal class LocalAccountConfiguration : IEntityTypeConfiguration<LocalAccountEntity>
-{
-    public void Configure(EntityTypeBuilder<LocalAccountEntity> builder)
-    {
-        builder.Property(e => e.Id).ValueGeneratedNever();
-        builder.Property(e => e.Username).HasMaxLength(32);
-        builder.Property(e => e.PasswordHash).HasMaxLength(64);
-        builder.Property(e => e.CreateTimeUtc).HasColumnType("datetime");
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs b/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
index 9e94ca30e..6c39cead6 100644
--- a/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
+++ b/src/Moonglade.Data.SqlServer/SqlServerBlogDbContext.cs
@@ -21,7 +21,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new CommentReplyConfiguration());
         modelBuilder.ApplyConfiguration(new PostConfiguration());
         modelBuilder.ApplyConfiguration(new PostCategoryConfiguration());
-        modelBuilder.ApplyConfiguration(new LocalAccountConfiguration());
         modelBuilder.ApplyConfiguration(new LoginHistoryConfiguration());
         modelBuilder.ApplyConfiguration(new PingbackConfiguration());
         modelBuilder.ApplyConfiguration(new BlogThemeConfiguration());
diff --git a/src/Moonglade.Data/BlogDbContext.cs b/src/Moonglade.Data/BlogDbContext.cs
index acd90ae8e..ded52120d 100644
--- a/src/Moonglade.Data/BlogDbContext.cs
+++ b/src/Moonglade.Data/BlogDbContext.cs
@@ -22,7 +22,6 @@ public BlogDbContext(DbContextOptions options)
     public virtual DbSet<TagEntity> Tag { get; set; }
     public virtual DbSet<FriendLinkEntity> FriendLink { get; set; }
     public virtual DbSet<PageEntity> CustomPage { get; set; }
-    public virtual DbSet<LocalAccountEntity> LocalAccount { get; set; }
     public virtual DbSet<LoginHistoryEntity> LoginHistory { get; set; }
     public virtual DbSet<PingbackEntity> Pingback { get; set; }
     public virtual DbSet<BlogThemeEntity> BlogTheme { get; set; }
@@ -70,7 +69,8 @@ public static async Task ClearAllData(this BlogDbContext context)
         context.BlogConfiguration.RemoveRange();
         context.BlogAsset.RemoveRange();
         context.BlogTheme.RemoveRange();
-        context.LocalAccount.RemoveRange();
+        context.StyleSheet.RemoveRange();
+        context.LoginHistory.RemoveRange();
 
         await context.SaveChangesAsync();
     }
diff --git a/src/Moonglade.Data/Entities/LocalAccountEntity.cs b/src/Moonglade.Data/Entities/LocalAccountEntity.cs
deleted file mode 100644
index 48ac6293b..000000000
--- a/src/Moonglade.Data/Entities/LocalAccountEntity.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Moonglade.Data.Entities;
-
-public class LocalAccountEntity
-{
-    public Guid Id { get; set; }
-    public string Username { get; set; }
-    public string PasswordSalt { get; set; }
-    public string PasswordHash { get; set; }
-    public DateTime CreateTimeUtc { get; set; }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Seed.cs b/src/Moonglade.Data/Seed.cs
index b03866f0c..12b0c634a 100644
--- a/src/Moonglade.Data/Seed.cs
+++ b/src/Moonglade.Data/Seed.cs
@@ -11,7 +11,6 @@ public static async Task SeedAsync(BlogDbContext dbContext, ILogger logger, int
 
         try
         {
-            await dbContext.LocalAccount.AddRangeAsync(GetLocalAccounts());
             await dbContext.BlogTheme.AddRangeAsync(GetThemes());
             await dbContext.Category.AddRangeAsync(GetCategories());
             await dbContext.Tag.AddRangeAsync(GetTags());
@@ -59,18 +58,6 @@ public static async Task SeedAsync(BlogDbContext dbContext, ILogger logger, int
         }
     }
 
-    private static IEnumerable<LocalAccountEntity> GetLocalAccounts() =>
-        new List<LocalAccountEntity>
-        {
-            new()
-            {
-                Id = Guid.Parse("ab78493d-7569-42d2-ae78-c2b610ada1aa"),
-                Username = "admin",
-                PasswordHash = "JAvlGPq9JyTdtvBO6x2llnRI1+gxwIyPqCKAn3THIKk=",
-                CreateTimeUtc = DateTime.UtcNow
-            }
-        };
-
     private static IEnumerable<BlogThemeEntity> GetThemes() =>
         new List<BlogThemeEntity>
         {
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index a419087ee..0b328dd6b 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -1,8 +1,8 @@
 @page "/admin/account"
+@using System.Globalization
 @model Moonglade.Web.Pages.Admin.LocalAccountModel
 @{
     ViewBag.Title = "Accounts";
-    var currentUidClaim = User.Claims.FirstOrDefault(c => c.Type == "uid");
 }
 
 @section scripts {
@@ -10,12 +10,10 @@
         import * as utils from '/js/app/utils.module.js'
 
         var resetPasswordHashModal = new bootstrap.Modal('#resetPasswordHashModal');
-        var cid = '';
 
-        window.resetPasswordHash = function (accountId) {
+        window.resetPasswordHash = function () {
             document.querySelector('#resetpassword-form').reset();
             resetPasswordHashModal.show();
-            cid = accountId;
         }
 
         window.handleResetPasswordHashFormSubmit = function (event) {
@@ -43,31 +41,28 @@
 
 @section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
-        <a class="btn btn-outline-accent" href="javascript:resetPasswordHash('@currentUidClaim');">
+        <a class="btn btn-outline-accent" href="javascript:resetPasswordHash();">
             <i class="bi-key"></i>
             @SharedLocalizer["Change PasswordHash"]
         </a>
     </div>
 }
 
-
-@if (null != Model.Accounts && Model.Accounts.Any())
+@if (null != Model.LoginHistoryList && Model.LoginHistoryList.Any())
 {
     <table class="table table-bordered mt-3">
         <thead>
             <tr>
-                <th>@SharedLocalizer["Username"]</th>
-                @* <th>@SharedLocalizer["Last Login IP"]</th>
-                <th>@SharedLocalizer["Last Login Time (UTC)"]</th> *@
+                <th>@SharedLocalizer["Login IP"]</th>
+                <th>@SharedLocalizer["Login Time (UTC)"]</th>
             </tr>
         </thead>
         <tbody>
-            @foreach (var item in Model.Accounts.OrderBy(p => p.Username))
+            @foreach (var item in Model.LoginHistoryList.OrderByDescending(p => p.LoginTimeUtc))
             {
-                <tr id="tr-@item.Id">
-                    <td>@item.Username</td>
-                    @* <td>@(item.LastLoginIp ?? "N/A")</td>
-                    <td>@(null != item.LastLoginTimeUtc ? item.LastLoginTimeUtc.ToString() : "N/A")</td> *@
+                <tr>
+                    <td>@item.LoginIp</td>
+                    <td>@item.LoginTimeUtc.ToString(CultureInfo.CurrentCulture)</td>
                 </tr>
             }
         </tbody>
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
index 01bfb38fa..954f50d5d 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Web.Pages.Admin;
 
 public class LocalAccountModel(IMediator mediator) : PageModel
 {
-    public CreateAccountCommand ViewModel { get; set; } = new();
+    public IReadOnlyList<LoginHistoryEntity> LoginHistoryList { get; set; }
 
-    public IReadOnlyList<Account> Accounts { get; set; }
-
-    public async Task OnGet() => Accounts = await mediator.Send(new GetAccountsQuery());
+    public async Task OnGet() => LoginHistoryList = await mediator.Send(new GetLoginHistoryQuery());
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index d54b11385..c52cad39a 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -483,11 +483,11 @@
   <data name="Language" xml:space="preserve">
     <value>语言</value>
   </data>
-  <data name="Last Login IP" xml:space="preserve">
-    <value>最后登录 IP</value>
+  <data name="Login IP" xml:space="preserve">
+    <value>登录 IP</value>
   </data>
-  <data name="Last Login Time (UTC)" xml:space="preserve">
-    <value>最后登录时间 (UTC)</value>
+  <data name="Login Time (UTC)" xml:space="preserve">
+    <value>登录时间 (UTC)</value>
   </data>
   <data name="Latest Posts" xml:space="preserve">
     <value>最新文章</value>

From 0ce7cc0db911c43da44d52b4ee6c8b771112e6d1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 09:47:48 +0800
Subject: [PATCH 016/227] Update LocalAccount.cshtml

---
 .../Pages/Admin/LocalAccount.cshtml           | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index 0b328dd6b..e565ea074 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -9,14 +9,14 @@
     <script type="module">
         import * as utils from '/js/app/utils.module.js'
 
-        var resetPasswordHashModal = new bootstrap.Modal('#resetPasswordHashModal');
+        var resetPasswordModal = new bootstrap.Modal('#resetPasswordModal');
 
-        window.resetPasswordHash = function () {
+        window.resetPassword = function () {
             document.querySelector('#resetpassword-form').reset();
-            resetPasswordHashModal.show();
+            resetPasswordModal.show();
         }
 
-        window.handleResetPasswordHashFormSubmit = function (event) {
+        window.handleResetPasswordFormSubmit = function (event) {
             event.preventDefault();
 
             const data = new FormData(event.target);
@@ -24,26 +24,26 @@
 
             callApi(`/api/localaccount/${cid}/password`,
                 'PUT',
-                value["NewPasswordHash"],
+                value["NewPassword"],
                 (resp) => {
                     document.querySelector('#resetpassword-form').reset();
-                    resetPasswordHashModal.hide();
-                    blogToast.success('PasswordHash updated.');
+                    resetPasswordModal.hide();
+                    blogToast.success('Password updated.');
                     cid = '';
                 });
         }
 
-        const resetPasswordHashForm = document.querySelector('#resetpassword-form');
-        resetPasswordHashForm.addEventListener('submit', handleResetPasswordHashFormSubmit);
+        const resetPasswordForm = document.querySelector('#resetpassword-form');
+        resetPasswordForm.addEventListener('submit', handleResetPasswordFormSubmit);
     </script>
 }
 
 
 @section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
-        <a class="btn btn-outline-accent" href="javascript:resetPasswordHash();">
+        <a class="btn btn-outline-accent" href="javascript:resetPassword();">
             <i class="bi-key"></i>
-            @SharedLocalizer["Change PasswordHash"]
+            @SharedLocalizer["Change Password"]
         </a>
     </div>
 }
@@ -55,6 +55,7 @@
             <tr>
                 <th>@SharedLocalizer["Login IP"]</th>
                 <th>@SharedLocalizer["Login Time (UTC)"]</th>
+                <th>@SharedLocalizer["User Agent"]</th>
             </tr>
         </thead>
         <tbody>
@@ -63,6 +64,7 @@
                 <tr>
                     <td>@item.LoginIp</td>
                     <td>@item.LoginTimeUtc.ToString(CultureInfo.CurrentCulture)</td>
+                    <td>@item.LoginUserAgent</td>
                 </tr>
             }
         </tbody>
@@ -71,11 +73,11 @@
 
 <p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
 
-<div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordHashModalLabel" aria-hidden="true">
+<div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="resetPasswordModalLabel">@SharedLocalizer["Reset PasswordHash"]</h5>
+                <h5 class="modal-title" id="resetPasswordModalLabel">@SharedLocalizer["Reset Password"]</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
                 </button>
             </div>
@@ -83,12 +85,12 @@
             <form id="resetpassword-form" method="post">
                 <div class="modal-body">
                     <div class="mb-2">
-                        <label for="NewPassword">New PasswordHash</label>
+                        <label for="NewPassword">New Password</label>
                         <input class="form-control" type="password"
                                id="NewPassword"
                                minlength="8"
                                maxlength="32"
-                               name="NewPasswordHash"
+                               name="NewPassword"
                                pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@@#$^&*]{8,}$"
                                required>
                         <span class="text-danger field-validation-valid"></span>

From 8cac22995defc96d03bba1339326f6f773d3dc49 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 09:51:21 +0800
Subject: [PATCH 017/227] take last 10 for login history

---
 src/Moonglade.Auth/GetLoginHistoryQuery.cs  |  3 ++-
 src/Moonglade.Data/Spec/LoginHistorySpec.cs | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/Moonglade.Data/Spec/LoginHistorySpec.cs

diff --git a/src/Moonglade.Auth/GetLoginHistoryQuery.cs b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
index 77c90539a..5afd93ec6 100644
--- a/src/Moonglade.Auth/GetLoginHistoryQuery.cs
+++ b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
@@ -1,5 +1,6 @@
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Auth;
 
@@ -9,7 +10,7 @@ public class GetLoginHistoryQueryHandler(IRepository<LoginHistoryEntity> repo) :
 {
     public async Task<IReadOnlyList<LoginHistoryEntity>> Handle(GetLoginHistoryQuery request, CancellationToken ct)
     {
-        var history = await repo.ListAsync(ct);
+        var history = await repo.ListAsync(new LoginHistorySpec(10));
         return history;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/LoginHistorySpec.cs b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
new file mode 100644
index 000000000..bfbbf60ac
--- /dev/null
+++ b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
@@ -0,0 +1,13 @@
+using Moonglade.Data.Entities;
+using Moonglade.Data.Infrastructure;
+
+namespace Moonglade.Data.Spec;
+
+public sealed class LoginHistorySpec : BaseSpecification<LoginHistoryEntity>
+{
+    public LoginHistorySpec(int top) : base(t => true)
+    {
+        ApplyPaging(0, top);
+        ApplyOrderByDescending(p => p.LoginTimeUtc);
+    }
+}
\ No newline at end of file

From 6e0be03959ca77d4a956d5845340e9c758e4470a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 09:52:50 +0800
Subject: [PATCH 018/227] Update LocalAccountController.cs

---
 src/Moonglade.Web/Controllers/LocalAccountController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Controllers/LocalAccountController.cs b/src/Moonglade.Web/Controllers/LocalAccountController.cs
index 283b8ac71..4621e1901 100644
--- a/src/Moonglade.Web/Controllers/LocalAccountController.cs
+++ b/src/Moonglade.Web/Controllers/LocalAccountController.cs
@@ -16,7 +16,7 @@ public async Task<IActionResult> ResetPassword([NotEmpty] Guid id, [FromBody][Re
     {
         if (!Regex.IsMatch(newPassword, @"^(?=.*[A-Za-z])(?=.*\d)[!@#$%^&*A-Za-z\d]{8,}$"))
         {
-            return Conflict("PasswordHash must be minimum eight characters, at least one letter and one number");
+            return Conflict("Password must be minimum eight characters, at least one letter and one number");
         }
 
         await mediator.Send(new ChangePasswordCommand(id, newPassword));

From 1ab285c9c323c3bd285183938e239d270b98b095 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:04:56 +0800
Subject: [PATCH 019/227] reset password

---
 src/Moonglade.Auth/ChangePasswordCommand.cs   | 26 ----------
 .../Controllers/LocalAccountController.cs     | 25 ---------
 .../Controllers/SettingsController.cs         | 21 ++++++++
 .../Pages/Admin/LocalAccount.cshtml           | 52 ++++++++++++-------
 4 files changed, 54 insertions(+), 70 deletions(-)
 delete mode 100644 src/Moonglade.Auth/ChangePasswordCommand.cs
 delete mode 100644 src/Moonglade.Web/Controllers/LocalAccountController.cs

diff --git a/src/Moonglade.Auth/ChangePasswordCommand.cs b/src/Moonglade.Auth/ChangePasswordCommand.cs
deleted file mode 100644
index 3b1510494..000000000
--- a/src/Moonglade.Auth/ChangePasswordCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Moonglade.Configuration;
-using Moonglade.Utils;
-
-namespace Moonglade.Auth;
-
-public record ChangePasswordCommand(Guid Id, string ClearPassword) : IRequest;
-
-public class ChangePasswordCommandHandler(IBlogConfig blogConfig) : IRequestHandler<ChangePasswordCommand>
-{
-    public async Task Handle(ChangePasswordCommand request, CancellationToken ct)
-    {
-        // TODO
-
-        //var account = await repo.GetAsync(request.Id, ct);
-        //if (account is null)
-        //{
-        //    throw new InvalidOperationException($"LocalAccountEntity with Id '{request.Id}' not found.");
-        //}
-
-        //var newSalt = Helper.GenerateSalt();
-        //account.PasswordSalt = newSalt;
-        //account.PasswordHash = Helper.HashPassword2(request.ClearPassword, newSalt);
-
-        //await repo.UpdateAsync(account, ct);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/LocalAccountController.cs b/src/Moonglade.Web/Controllers/LocalAccountController.cs
deleted file mode 100644
index 4621e1901..000000000
--- a/src/Moonglade.Web/Controllers/LocalAccountController.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Moonglade.Web.Attributes;
-using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
-
-namespace Moonglade.Web.Controllers;
-
-[Authorize]
-[ApiController]
-[Route("api/[controller]")]
-public class LocalAccountController(IMediator mediator) : ControllerBase
-{
-    [HttpPut("{id:guid}/password")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> ResetPassword([NotEmpty] Guid id, [FromBody][Required] string newPassword)
-    {
-        if (!Regex.IsMatch(newPassword, @"^(?=.*[A-Za-z])(?=.*\d)[!@#$%^&*A-Za-z\d]{8,}$"))
-        {
-            return Conflict("Password must be minimum eight characters, at least one letter and one number");
-        }
-
-        await mediator.Send(new ChangePasswordCommand(id, newPassword));
-        return NoContent();
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index e544a2435..f5f500901 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -1,7 +1,10 @@
 using Edi.PasswordGenerator;
 using Microsoft.AspNetCore.Localization;
 using Moonglade.Email.Client;
+using Moonglade.Web.Attributes;
 using NUglify;
+using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
 
 namespace Moonglade.Web.Controllers;
 
@@ -239,6 +242,24 @@ public IActionResult GeneratePassword([FromServices] IPasswordGenerator password
         });
     }
 
+    [HttpPut("password/local")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> UpdateLocalAccountPassword([NotEmpty] Guid id, [FromBody][Required] string newPassword)
+    {
+        if (!Regex.IsMatch(newPassword, "^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$"))
+        {
+            return Conflict("Password must be minimum eight characters, at least one letter and one number");
+        }
+
+        var newSalt = Helper.GenerateSalt();
+        blogConfig.LocalAccountSettings.PasswordSalt = newSalt;
+        blogConfig.LocalAccountSettings.PasswordHash = Helper.HashPassword2(newPassword, newSalt);
+
+        await SaveConfigAsync(blogConfig.LocalAccountSettings);
+        return NoContent();
+    }
+
     private async Task SaveConfigAsync<T>(T blogSettings) where T : IBlogSettings
     {
         var kvp = blogConfig.UpdateAsync(blogSettings);
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index e565ea074..9c192e91a 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -22,14 +22,13 @@
             const data = new FormData(event.target);
             const value = Object.fromEntries(data.entries());
 
-            callApi(`/api/localaccount/${cid}/password`,
+            callApi(`/api/settings/password/local`,
                 'PUT',
                 value["NewPassword"],
                 (resp) => {
                     document.querySelector('#resetpassword-form').reset();
                     resetPasswordModal.hide();
                     blogToast.success('Password updated.');
-                    cid = '';
                 });
         }
 
@@ -48,27 +47,33 @@
     </div>
 }
 
+<h4 class="admin-subtitle fw-bold mb-2">
+    Last 10 sign in activities
+</h4>
+
 @if (null != Model.LoginHistoryList && Model.LoginHistoryList.Any())
 {
-    <table class="table table-bordered mt-3">
-        <thead>
-            <tr>
-                <th>@SharedLocalizer["Login IP"]</th>
-                <th>@SharedLocalizer["Login Time (UTC)"]</th>
-                <th>@SharedLocalizer["User Agent"]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var item in Model.LoginHistoryList.OrderByDescending(p => p.LoginTimeUtc))
-            {
+    <div class="mb-4 rounded-3 shadow-sm border bg-white p-2">
+        <table class="table table-borderless table-sm mb-0">
+            <thead>
                 <tr>
-                    <td>@item.LoginIp</td>
-                    <td>@item.LoginTimeUtc.ToString(CultureInfo.CurrentCulture)</td>
-                    <td>@item.LoginUserAgent</td>
+                    <th>@SharedLocalizer["Login IP"]</th>
+                    <th>@SharedLocalizer["Login Time (UTC)"]</th>
+                    <th>@SharedLocalizer["User Agent"]</th>
                 </tr>
-            }
-        </tbody>
-    </table>
+            </thead>
+            <tbody>
+                @foreach (var item in Model.LoginHistoryList.OrderByDescending(p => p.LoginTimeUtc))
+                {
+                    <tr>
+                        <td>@item.LoginIp</td>
+                        <td>@item.LoginTimeUtc.ToString(CultureInfo.CurrentCulture)</td>
+                        <td>@item.LoginUserAgent</td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
 }
 
 <p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
@@ -95,6 +100,15 @@
                                required>
                         <span class="text-danger field-validation-valid"></span>
                     </div>
+                    <div class="text-muted">
+                        Your password must be:
+                        <ul>
+                            <li>Contain at least one letter (can be either lowercase or uppercase).</li>
+                            <li>Contain at least one digit.</li>
+                            <li>Be at least 8 characters long.</li>
+                            <li>Only contain characters from the set: uppercase letters, lowercase letters, digits, and the special characters <code>._~!@@#$^&*`</code>.</li>
+                        </ul>
+                    </div>
                 </div>
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-outline-accent btn-resetpwd">@SharedLocalizer["Submit"]</button>

From 27a9976d51dd67386c1be900b67010cd40e4ab9f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:10:30 +0800
Subject: [PATCH 020/227] Update LocalAccount.cshtml

---
 src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index 9c192e91a..b21ba087b 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -44,9 +44,18 @@
             <i class="bi-key"></i>
             @SharedLocalizer["Change Password"]
         </a>
+
+        <a class="btn btn-outline-accent" href="javascript:alert('coming soon');">
+            <i class="bi-pass"></i>
+            @SharedLocalizer["Configure MFA"]
+        </a>
     </div>
 }
 
+<div class="alert alert-warning">
+    Local account is not secure. It's recommended to use <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> for authentication. Click <a href="https://github.com/EdiWang/Moonglade/wiki/Use-Microsoft-Entra-ID-Authentication" target="_blank">here</a> to configure.
+</div>
+
 <h4 class="admin-subtitle fw-bold mb-2">
     Last 10 sign in activities
 </h4>
@@ -76,8 +85,6 @@
     </div>
 }
 
-<p class="text-muted">Check out <a href="https://learn.microsoft.com/en-us/azure/active-directory/fundamentals/whatis?WT.mc_id=AZ-MVP-5002809">Microsoft Entra ID</a> and empower your blog to achieve more!</p>
-
 <div class="modal fade" id="resetPasswordModal" tabindex="-1" role="dialog" aria-labelledby="resetPasswordModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">

From 6d3bf0d085249871d237f508d1da1a7e290f7794 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:21:35 +0800
Subject: [PATCH 021/227] allow reset username

---
 .../UpdateLocalAccountPasswordRequest.cs        | 14 ++++++++++++++
 .../Controllers/SettingsController.cs           | 10 +++-------
 .../Pages/Admin/LocalAccount.cshtml             | 17 ++++++++++++++---
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs

diff --git a/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs b/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs
new file mode 100644
index 000000000..7d529e83b
--- /dev/null
+++ b/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Moonglade.Auth;
+
+public class UpdateLocalAccountPasswordRequest
+{
+    [Required]
+    [RegularExpression("^[A-Za-z0-9]{3,16}$")]
+    public string NewUsername { get; set; }
+
+    [Required]
+    [RegularExpression("^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$")]
+    public string NewPassword { get; set; }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index f5f500901..f99803b26 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -245,16 +245,12 @@ public IActionResult GeneratePassword([FromServices] IPasswordGenerator password
     [HttpPut("password/local")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> UpdateLocalAccountPassword([NotEmpty] Guid id, [FromBody][Required] string newPassword)
+    public async Task<IActionResult> UpdateLocalAccountPassword(UpdateLocalAccountPasswordRequest request)
     {
-        if (!Regex.IsMatch(newPassword, "^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$"))
-        {
-            return Conflict("Password must be minimum eight characters, at least one letter and one number");
-        }
-
         var newSalt = Helper.GenerateSalt();
+        blogConfig.LocalAccountSettings.Username = request.NewUsername.Trim();
         blogConfig.LocalAccountSettings.PasswordSalt = newSalt;
-        blogConfig.LocalAccountSettings.PasswordHash = Helper.HashPassword2(newPassword, newSalt);
+        blogConfig.LocalAccountSettings.PasswordHash = Helper.HashPassword2(request.NewPassword, newSalt);
 
         await SaveConfigAsync(blogConfig.LocalAccountSettings);
         return NoContent();
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index b21ba087b..009e2f0c0 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -24,7 +24,7 @@
 
             callApi(`/api/settings/password/local`,
                 'PUT',
-                value["NewPassword"],
+                value,
                 (resp) => {
                     document.querySelector('#resetpassword-form').reset();
                     resetPasswordModal.hide();
@@ -97,7 +97,19 @@
             <form id="resetpassword-form" method="post">
                 <div class="modal-body">
                     <div class="mb-2">
-                        <label for="NewPassword">New Password</label>
+                        <label for="NewPassword">New username</label>
+                        <input class="form-control" type="text"
+                               id="NewUsername"
+                               minlength="3"
+                               maxlength="16"
+                               name="NewUsername"
+                               value="@User.Identity?.Name?.Trim()"
+                               pattern="^[A-Za-z0-9]{3,16}$"
+                               required>
+                        <div class="text-muted">English letters and numbers only.</div>
+                    </div>
+                    <div class="mb-2">
+                        <label for="NewPassword">New password</label>
                         <input class="form-control" type="password"
                                id="NewPassword"
                                minlength="8"
@@ -105,7 +117,6 @@
                                name="NewPassword"
                                pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@@#$^&*]{8,}$"
                                required>
-                        <span class="text-danger field-validation-valid"></span>
                     </div>
                     <div class="text-muted">
                         Your password must be:

From 535c985f6091e5317b4dd9dc518ca34e12b89b94 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:22:04 +0800
Subject: [PATCH 022/227] code clean up

---
 .../Configurations/LoginHistoryConfiguration.cs               | 4 ++--
 src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs              | 2 +-
 src/Moonglade.MetaWeblog/XmlRpcService.cs                     | 4 ++--
 src/Moonglade.Web/Program.cs                                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs b/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
index 6d4315cb7..9620e0617 100644
--- a/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
+++ b/src/Moonglade.Data.SqlServer/Configurations/LoginHistoryConfiguration.cs
@@ -1,5 +1,5 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Moonglade.Data.Entities;
 
 namespace Moonglade.Data.SqlServer.Configurations;
diff --git a/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs b/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
index 9e10479b7..39224428c 100644
--- a/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
+++ b/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
@@ -10,7 +10,7 @@ public class MetaWeblogMiddleware(RequestDelegate next, ILoggerFactory loggerFac
     public async Task Invoke(HttpContext context, MetaWeblogService service)
     {
         if (context.Request.Method == "POST" &&
-            context.Request.Path.StartsWithSegments(urlEndpoint) && 
+            context.Request.Path.StartsWithSegments(urlEndpoint) &&
             context.Request.ContentType.ToLower().Contains("text/xml"))
         {
             try
diff --git a/src/Moonglade.MetaWeblog/XmlRpcService.cs b/src/Moonglade.MetaWeblog/XmlRpcService.cs
index 64c44a369..d3d109dbc 100644
--- a/src/Moonglade.MetaWeblog/XmlRpcService.cs
+++ b/src/Moonglade.MetaWeblog/XmlRpcService.cs
@@ -1,9 +1,9 @@
-using System.Collections;
+using Microsoft.Extensions.Logging;
+using System.Collections;
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
 using System.Xml.Linq;
-using Microsoft.Extensions.Logging;
 
 namespace Moonglade.MetaWeblog;
 
diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index e7f042fef..1e966c66c 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -9,13 +9,13 @@
 using Moonglade.Data.PostgreSql;
 using Moonglade.Data.SqlServer;
 using Moonglade.Email.Client;
+using Moonglade.MetaWeblog;
 using Moonglade.Pingback;
 using Moonglade.Syndication;
 using SixLabors.Fonts;
 using System.Globalization;
 using System.Net;
 using System.Text.Json.Serialization;
-using Moonglade.MetaWeblog;
 using Encoder = Moonglade.Web.Configuration.Encoder;
 
 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

From d5a6b000bdefac7ed3a07d7d4f8a45580f8105b9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:22:07 +0800
Subject: [PATCH 023/227] Update SettingsController.cs

---
 src/Moonglade.Web/Controllers/SettingsController.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index f99803b26..272617784 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -1,10 +1,7 @@
 using Edi.PasswordGenerator;
 using Microsoft.AspNetCore.Localization;
 using Moonglade.Email.Client;
-using Moonglade.Web.Attributes;
 using NUglify;
-using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
 
 namespace Moonglade.Web.Controllers;
 

From 607805aad2e1a0d0b327eeb2ed12003de0d2f518 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 10:30:40 +0800
Subject: [PATCH 024/227] remove IReadOnlyList overdesign

---
 src/Moonglade.Auth/GetLoginHistoryQuery.cs             |  6 +++---
 src/Moonglade.Comments/GetApprovedCommentsQuery.cs     |  6 +++---
 src/Moonglade.Comments/GetCommentsQuery.cs             |  6 +++---
 .../CategoryFeature/GetCategoriesQuery.cs              |  6 +++---
 src/Moonglade.Core/PageFeature/GetPagesQuery.cs        |  6 +++---
 src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs |  6 +++---
 src/Moonglade.Core/PostFeature/GetArchiveQuery.cs      |  6 +++---
 src/Moonglade.Core/PostFeature/ListArchiveQuery.cs     |  6 +++---
 src/Moonglade.Core/PostFeature/ListByTagQuery.cs       |  6 +++---
 src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs    |  6 +++---
 .../PostFeature/ListPostSegmentByStatusQuery.cs        |  6 +++---
 src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs |  6 +++---
 src/Moonglade.Core/PostFeature/ListPostsQuery.cs       |  6 +++---
 src/Moonglade.Core/PostFeature/SearchPostQuery.cs      |  6 +++---
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs       |  6 +++---
 src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs  |  6 +++---
 src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs      |  6 +++---
 src/Moonglade.Core/TagFeature/GetTagsQuery.cs          |  6 +++---
 .../Infrastructure/DbContextRepository.cs              | 10 +++++-----
 src/Moonglade.Data/Infrastructure/IRepository.cs       | 10 +++++-----
 src/Moonglade.FriendLink/GetAllLinksQuery.cs           |  6 +++---
 src/Moonglade.Pingback/GetPingbacksQuery.cs            |  6 +++---
 src/Moonglade.Syndication/SyndicationDataSource.cs     |  8 ++++----
 src/Moonglade.Theme/GetAllThemeSegmentQuery.cs         |  6 +++---
 src/Moonglade.Web/Controllers/CategoryController.cs    |  2 +-
 src/Moonglade.Web/Controllers/TagsController.cs        |  4 ++--
 src/Moonglade.Web/Middleware/WriteFoafCommand.cs       |  4 ++--
 src/Moonglade.Web/Pages/Admin/Category.cshtml.cs       |  2 +-
 src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs     |  2 +-
 src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs   |  2 +-
 src/Moonglade.Web/Pages/ArchiveList.cshtml.cs          |  4 ++--
 .../Pages/Components/CategoryList/Default.cshtml       |  2 +-
 .../Pages/Components/CategoryList/Menu.cshtml          |  2 +-
 .../Pages/Components/CommentList/Default.cshtml        |  2 +-
 .../Pages/Components/FriendLink/Default.cshtml         |  2 +-
 src/Moonglade.Web/Pages/Components/Tags/Default.cshtml |  2 +-
 src/Moonglade.Web/Pages/Search.cshtml.cs               |  2 +-
 37 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/src/Moonglade.Auth/GetLoginHistoryQuery.cs b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
index 5afd93ec6..8070d556b 100644
--- a/src/Moonglade.Auth/GetLoginHistoryQuery.cs
+++ b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
@@ -4,11 +4,11 @@
 
 namespace Moonglade.Auth;
 
-public record GetLoginHistoryQuery : IRequest<IReadOnlyList<LoginHistoryEntity>>;
+public record GetLoginHistoryQuery : IRequest<List<LoginHistoryEntity>>;
 
-public class GetLoginHistoryQueryHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<GetLoginHistoryQuery, IReadOnlyList<LoginHistoryEntity>>
+public class GetLoginHistoryQueryHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<GetLoginHistoryQuery, List<LoginHistoryEntity>>
 {
-    public async Task<IReadOnlyList<LoginHistoryEntity>> Handle(GetLoginHistoryQuery request, CancellationToken ct)
+    public async Task<List<LoginHistoryEntity>> Handle(GetLoginHistoryQuery request, CancellationToken ct)
     {
         var history = await repo.ListAsync(new LoginHistorySpec(10));
         return history;
diff --git a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
index 80c7b2f58..9d8a6bb06 100644
--- a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
@@ -5,11 +5,11 @@
 
 namespace Moonglade.Comments;
 
-public record GetApprovedCommentsQuery(Guid PostId) : IRequest<IReadOnlyList<Comment>>;
+public record GetApprovedCommentsQuery(Guid PostId) : IRequest<List<Comment>>;
 
-public class GetApprovedCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetApprovedCommentsQuery, IReadOnlyList<Comment>>
+public class GetApprovedCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetApprovedCommentsQuery, List<Comment>>
 {
-    public Task<IReadOnlyList<Comment>> Handle(GetApprovedCommentsQuery request, CancellationToken ct)
+    public Task<List<Comment>> Handle(GetApprovedCommentsQuery request, CancellationToken ct)
     {
         return repo.SelectAsync(new CommentSpec(request.PostId), c => new Comment
         {
diff --git a/src/Moonglade.Comments/GetCommentsQuery.cs b/src/Moonglade.Comments/GetCommentsQuery.cs
index 1b191ed0a..df3702822 100644
--- a/src/Moonglade.Comments/GetCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetCommentsQuery.cs
@@ -5,11 +5,11 @@
 
 namespace Moonglade.Comments;
 
-public record GetCommentsQuery(int PageSize, int PageIndex) : IRequest<IReadOnlyList<CommentDetailedItem>>;
+public record GetCommentsQuery(int PageSize, int PageIndex) : IRequest<List<CommentDetailedItem>>;
 
-public class GetCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetCommentsQuery, IReadOnlyList<CommentDetailedItem>>
+public class GetCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetCommentsQuery, List<CommentDetailedItem>>
 {
-    public Task<IReadOnlyList<CommentDetailedItem>> Handle(GetCommentsQuery request, CancellationToken ct)
+    public Task<List<CommentDetailedItem>> Handle(GetCommentsQuery request, CancellationToken ct)
     {
         var spec = new CommentSpec(request.PageSize, request.PageIndex);
         var comments = repo.SelectAsync(spec, CommentDetailedItem.EntitySelector, ct);
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
index 7f16460f2..cd865396c 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
@@ -2,11 +2,11 @@
 
 namespace Moonglade.Core.CategoryFeature;
 
-public record GetCategoriesQuery : IRequest<IReadOnlyList<Category>>;
+public record GetCategoriesQuery : IRequest<List<Category>>;
 
-public class GetCategoriesQueryHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, IReadOnlyList<Category>>
+public class GetCategoriesQueryHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, List<Category>>
 {
-    public Task<IReadOnlyList<Category>> Handle(GetCategoriesQuery request, CancellationToken ct)
+    public Task<List<Category>> Handle(GetCategoriesQuery request, CancellationToken ct)
     {
         return cache.GetOrCreateAsync(BlogCachePartition.General.ToString(), "allcats", async entry =>
         {
diff --git a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs b/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
index 85e348f01..f2564d154 100644
--- a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
@@ -2,11 +2,11 @@
 
 namespace Moonglade.Core.PageFeature;
 
-public record GetPagesQuery(int Top) : IRequest<IReadOnlyList<BlogPage>>;
+public record GetPagesQuery(int Top) : IRequest<List<BlogPage>>;
 
-public class GetPagesQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<GetPagesQuery, IReadOnlyList<BlogPage>>
+public class GetPagesQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<GetPagesQuery, List<BlogPage>>
 {
-    public async Task<IReadOnlyList<BlogPage>> Handle(GetPagesQuery request, CancellationToken ct)
+    public async Task<List<BlogPage>> Handle(GetPagesQuery request, CancellationToken ct)
     {
         var pages = await repo.ListAsync(new PageSpec(request.Top));
         var list = pages.Select(p => new BlogPage(p)).ToList();
diff --git a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
index a8a0f2873..58a3eb4db 100644
--- a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
+++ b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
@@ -1,10 +1,10 @@
 namespace Moonglade.Core.PageFeature;
 
-public record ListPageSegmentQuery : IRequest<IReadOnlyList<PageSegment>>;
+public record ListPageSegmentQuery : IRequest<List<PageSegment>>;
 
-public class ListPageSegmentQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, IReadOnlyList<PageSegment>>
+public class ListPageSegmentQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, List<PageSegment>>
 {
-    public Task<IReadOnlyList<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct)
+    public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct)
     {
         return repo.SelectAsync(page => new PageSegment
         {
diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index 323d4df92..7dc3c635f 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -4,14 +4,14 @@
 namespace Moonglade.Core.PostFeature;
 
 public record struct Archive(int Year, int Month, int Count);
-public record GetArchiveQuery : IRequest<IReadOnlyList<Archive>>;
+public record GetArchiveQuery : IRequest<List<Archive>>;
 
-public class GetArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<GetArchiveQuery, IReadOnlyList<Archive>>
+public class GetArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<GetArchiveQuery, List<Archive>>
 {
     private readonly Expression<Func<IGrouping<(int Year, int Month), PostEntity>, Archive>> _archiveSelector =
         p => new(p.Key.Year, p.Key.Month, p.Count());
 
-    public async Task<IReadOnlyList<Archive>> Handle(GetArchiveQuery request, CancellationToken ct)
+    public async Task<List<Archive>> Handle(GetArchiveQuery request, CancellationToken ct)
     {
         if (!await repo.AnyAsync(p => p.IsPublished && !p.IsDeleted, ct))
         {
diff --git a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
index 72de4f0a7..dadef3e57 100644
--- a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
@@ -2,11 +2,11 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record ListArchiveQuery(int Year, int? Month = null) : IRequest<IReadOnlyList<PostDigest>>;
+public record ListArchiveQuery(int Year, int? Month = null) : IRequest<List<PostDigest>>;
 
-public class ListArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListArchiveQuery, IReadOnlyList<PostDigest>>
+public class ListArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListArchiveQuery, List<PostDigest>>
 {
-    public Task<IReadOnlyList<PostDigest>> Handle(ListArchiveQuery request, CancellationToken ct)
+    public Task<List<PostDigest>> Handle(ListArchiveQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Year, request.Month.GetValueOrDefault());
         var list = repo.SelectAsync(spec, PostDigest.EntitySelector, ct);
diff --git a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
index d21f0f7ae..7ec3dadcf 100644
--- a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
@@ -3,11 +3,11 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record ListByTagQuery(int TagId, int PageSize, int PageIndex) : IRequest<IReadOnlyList<PostDigest>>;
+public record ListByTagQuery(int TagId, int PageSize, int PageIndex) : IRequest<List<PostDigest>>;
 
-public class ListByTagQueryHandler(IRepository<PostTagEntity> repo) : IRequestHandler<ListByTagQuery, IReadOnlyList<PostDigest>>
+public class ListByTagQueryHandler(IRepository<PostTagEntity> repo) : IRequestHandler<ListByTagQuery, List<PostDigest>>
 {
-    public Task<IReadOnlyList<PostDigest>> Handle(ListByTagQuery request, CancellationToken ct)
+    public Task<List<PostDigest>> Handle(ListByTagQuery request, CancellationToken ct)
     {
         if (request.TagId <= 0) throw new ArgumentOutOfRangeException(nameof(request.TagId));
         Helper.ValidatePagingParameters(request.PageSize, request.PageIndex);
diff --git a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
index 59c7230bf..a3992a913 100644
--- a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
@@ -3,11 +3,11 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record ListFeaturedQuery(int PageSize, int PageIndex) : IRequest<IReadOnlyList<PostDigest>>;
+public record ListFeaturedQuery(int PageSize, int PageIndex) : IRequest<List<PostDigest>>;
 
-public class ListFeaturedQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListFeaturedQuery, IReadOnlyList<PostDigest>>
+public class ListFeaturedQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListFeaturedQuery, List<PostDigest>>
 {
-    public Task<IReadOnlyList<PostDigest>> Handle(ListFeaturedQuery request, CancellationToken ct)
+    public Task<List<PostDigest>> Handle(ListFeaturedQuery request, CancellationToken ct)
     {
         var (pageSize, pageIndex) = request;
         Helper.ValidatePagingParameters(pageSize, pageIndex);
diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
index f8df8252b..bbf695025 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
@@ -2,11 +2,11 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record ListPostSegmentByStatusQuery(PostStatus Status) : IRequest<IReadOnlyList<PostSegment>>;
+public record ListPostSegmentByStatusQuery(PostStatus Status) : IRequest<List<PostSegment>>;
 
-public class ListPostSegmentByStatusQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentByStatusQuery, IReadOnlyList<PostSegment>>
+public class ListPostSegmentByStatusQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentByStatusQuery, List<PostSegment>>
 {
-    public Task<IReadOnlyList<PostSegment>> Handle(ListPostSegmentByStatusQuery request, CancellationToken ct)
+    public Task<List<PostSegment>> Handle(ListPostSegmentByStatusQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Status);
         return repo.SelectAsync(spec, PostSegment.EntitySelector, ct);
diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
index e12212aeb..87be9b638 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
@@ -4,7 +4,7 @@
 namespace Moonglade.Core.PostFeature;
 
 public class ListPostSegmentQuery(PostStatus postStatus, int offset, int pageSize, string keyword = null)
-    : IRequest<(IReadOnlyList<PostSegment> Posts, int TotalRows)>
+    : IRequest<(List<PostSegment> Posts, int TotalRows)>
 {
     public PostStatus PostStatus { get; set; } = postStatus;
 
@@ -15,9 +15,9 @@ public class ListPostSegmentQuery(PostStatus postStatus, int offset, int pageSiz
     public string Keyword { get; set; } = keyword;
 }
 
-public class ListPostSegmentQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentQuery, (IReadOnlyList<PostSegment> Posts, int TotalRows)>
+public class ListPostSegmentQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentQuery, (List<PostSegment> Posts, int TotalRows)>
 {
-    public async Task<(IReadOnlyList<PostSegment> Posts, int TotalRows)> Handle(ListPostSegmentQuery request, CancellationToken ct)
+    public async Task<(List<PostSegment> Posts, int TotalRows)> Handle(ListPostSegmentQuery request, CancellationToken ct)
     {
         if (request.PageSize < 1)
         {
diff --git a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
index 968e4593f..7fe79dfb7 100644
--- a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
@@ -4,7 +4,7 @@
 namespace Moonglade.Core.PostFeature;
 
 public class ListPostsQuery(int pageSize, int pageIndex, Guid? catId = null)
-    : IRequest<IReadOnlyList<PostDigest>>
+    : IRequest<List<PostDigest>>
 {
     public int PageSize { get; set; } = pageSize;
 
@@ -13,9 +13,9 @@ public class ListPostsQuery(int pageSize, int pageIndex, Guid? catId = null)
     public Guid? CatId { get; set; } = catId;
 }
 
-public class ListPostsQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostsQuery, IReadOnlyList<PostDigest>>
+public class ListPostsQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostsQuery, List<PostDigest>>
 {
-    public Task<IReadOnlyList<PostDigest>> Handle(ListPostsQuery request, CancellationToken ct)
+    public Task<List<PostDigest>> Handle(ListPostsQuery request, CancellationToken ct)
     {
         Helper.ValidatePagingParameters(request.PageSize, request.PageIndex);
 
diff --git a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
index 32bc6c98d..4d6741d6c 100644
--- a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
+++ b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
@@ -3,11 +3,11 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record SearchPostQuery(string Keyword) : IRequest<IReadOnlyList<PostDigest>>;
+public record SearchPostQuery(string Keyword) : IRequest<List<PostDigest>>;
 
-public class SearchPostQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<SearchPostQuery, IReadOnlyList<PostDigest>>
+public class SearchPostQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<SearchPostQuery, List<PostDigest>>
 {
-    public async Task<IReadOnlyList<PostDigest>> Handle(SearchPostQuery request, CancellationToken ct)
+    public async Task<List<PostDigest>> Handle(SearchPostQuery request, CancellationToken ct)
     {
         if (null == request || string.IsNullOrWhiteSpace(request.Keyword))
         {
diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index eed20e389..213abba84 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -2,11 +2,11 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetHotTagsQuery(int Top) : IRequest<IReadOnlyList<KeyValuePair<Tag, int>>>;
+public record GetHotTagsQuery(int Top) : IRequest<List<KeyValuePair<Tag, int>>>;
 
-public class GetHotTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, IReadOnlyList<KeyValuePair<Tag, int>>>
+public class GetHotTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<Tag, int>>>
 {
-    public async Task<IReadOnlyList<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
+    public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
         if (!await repo.AnyAsync(ct: ct)) return new List<KeyValuePair<Tag, int>>();
 
diff --git a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
index ab9b24b6b..44311ed9a 100644
--- a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
@@ -1,10 +1,10 @@
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagCountListQuery : IRequest<IReadOnlyList<KeyValuePair<Tag, int>>>;
+public record GetTagCountListQuery : IRequest<List<KeyValuePair<Tag, int>>>;
 
-public class GetTagCountListQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, IReadOnlyList<KeyValuePair<Tag, int>>>
+public class GetTagCountListQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<Tag, int>>>
 {
-    public Task<IReadOnlyList<KeyValuePair<Tag, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
+    public Task<List<KeyValuePair<Tag, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
         repo.SelectAsync(t =>
             new KeyValuePair<Tag, int>(new()
             {
diff --git a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
index 03625c473..262c1279b 100644
--- a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
@@ -1,8 +1,8 @@
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagNamesQuery : IRequest<IReadOnlyList<string>>;
+public record GetTagNamesQuery : IRequest<List<string>>;
 
-public class GetTagNamesQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagNamesQuery, IReadOnlyList<string>>
+public class GetTagNamesQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagNamesQuery, List<string>>
 {
-    public Task<IReadOnlyList<string>> Handle(GetTagNamesQuery request, CancellationToken ct) => repo.SelectAsync(t => t.DisplayName, ct);
+    public Task<List<string>> Handle(GetTagNamesQuery request, CancellationToken ct) => repo.SelectAsync(t => t.DisplayName, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
index f06152ff7..886eb1559 100644
--- a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
@@ -1,8 +1,8 @@
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagsQuery : IRequest<IReadOnlyList<Tag>>;
+public record GetTagsQuery : IRequest<List<Tag>>;
 
-public class GetTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, IReadOnlyList<Tag>>
+public class GetTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, List<Tag>>
 {
-    public Task<IReadOnlyList<Tag>> Handle(GetTagsQuery request, CancellationToken ct) => repo.SelectAsync(Tag.EntitySelector, ct);
+    public Task<List<Tag>> Handle(GetTagsQuery request, CancellationToken ct) => repo.SelectAsync(Tag.EntitySelector, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 1ad73cb44..49be06d63 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -19,10 +19,10 @@ public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
     public virtual ValueTask<T> GetAsync(object key, CancellationToken ct = default) =>
         DbContext.Set<T>().FindAsync(keyValues: new[] { key }, cancellationToken: ct);
 
-    public async Task<IReadOnlyList<T>> ListAsync(CancellationToken ct = default) =>
+    public async Task<List<T>> ListAsync(CancellationToken ct = default) =>
         await DbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
 
-    public async Task<IReadOnlyList<T>> ListAsync(ISpecification<T> spec) =>
+    public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
     public IQueryable<T> AsQueryable() => DbContext.Set<T>();
@@ -61,10 +61,10 @@ public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, Cancellat
             DbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :
             DbContext.Set<T>().AnyAsync(cancellationToken: ct);
 
-    public async Task<IReadOnlyList<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
+    public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await DbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 
-    public async Task<IReadOnlyList<TResult>> SelectAsync<TResult>(
+    public async Task<List<TResult>> SelectAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
 
@@ -72,7 +72,7 @@ public Task<TResult> FirstOrDefaultAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
         ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
 
-    public async Task<IReadOnlyList<TResult>> SelectAsync<TGroup, TResult>(
+    public async Task<List<TResult>> SelectAsync<TGroup, TResult>(
         Expression<Func<T, TGroup>> groupExpression,
         Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
         ISpecification<T> spec = null) =>
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index aa5cfac8b..b76174ed3 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -10,9 +10,9 @@ public interface IRepository<T> where T : class
 
     Task<T> GetAsync(Expression<Func<T, bool>> condition);
 
-    Task<IReadOnlyList<T>> ListAsync(CancellationToken ct = default);
+    Task<List<T>> ListAsync(CancellationToken ct = default);
 
-    Task<IReadOnlyList<T>> ListAsync(ISpecification<T> spec);
+    Task<List<T>> ListAsync(ISpecification<T> spec);
 
     IQueryable<T> AsQueryable();
 
@@ -30,13 +30,13 @@ public interface IRepository<T> where T : class
 
     Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);
 
-    Task<IReadOnlyList<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
+    Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
-    Task<IReadOnlyList<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default);
+    Task<List<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);
 
-    Task<IReadOnlyList<TResult>> SelectAsync<TGroup, TResult>(
+    Task<List<TResult>> SelectAsync<TGroup, TResult>(
         Expression<Func<T, TGroup>> groupExpression,
         Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
         ISpecification<T> spec = null);
diff --git a/src/Moonglade.FriendLink/GetAllLinksQuery.cs b/src/Moonglade.FriendLink/GetAllLinksQuery.cs
index 393469629..b397c2279 100644
--- a/src/Moonglade.FriendLink/GetAllLinksQuery.cs
+++ b/src/Moonglade.FriendLink/GetAllLinksQuery.cs
@@ -4,11 +4,11 @@
 
 namespace Moonglade.FriendLink;
 
-public record GetAllLinksQuery : IRequest<IReadOnlyList<FriendLinkEntity>>;
+public record GetAllLinksQuery : IRequest<List<FriendLinkEntity>>;
 
-public class GetAllLinksQueryHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<GetAllLinksQuery, IReadOnlyList<FriendLinkEntity>>
+public class GetAllLinksQueryHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<GetAllLinksQuery, List<FriendLinkEntity>>
 {
-    public Task<IReadOnlyList<FriendLinkEntity>> Handle(GetAllLinksQuery request, CancellationToken ct)
+    public Task<List<FriendLinkEntity>> Handle(GetAllLinksQuery request, CancellationToken ct)
     {
         return repo.ListAsync(ct);
     }
diff --git a/src/Moonglade.Pingback/GetPingbacksQuery.cs b/src/Moonglade.Pingback/GetPingbacksQuery.cs
index 9c81c83e1..86d9344bf 100644
--- a/src/Moonglade.Pingback/GetPingbacksQuery.cs
+++ b/src/Moonglade.Pingback/GetPingbacksQuery.cs
@@ -4,9 +4,9 @@
 
 namespace Moonglade.Pingback;
 
-public record GetPingbacksQuery : IRequest<IReadOnlyList<PingbackEntity>>;
+public record GetPingbacksQuery : IRequest<List<PingbackEntity>>;
 
-public class GetPingbacksQueryHandler(IRepository<PingbackEntity> repo) : IRequestHandler<GetPingbacksQuery, IReadOnlyList<PingbackEntity>>
+public class GetPingbacksQueryHandler(IRepository<PingbackEntity> repo) : IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
 {
-    public Task<IReadOnlyList<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => repo.ListAsync(ct);
+    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => repo.ListAsync(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index 984d561b1..a9de919d0 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -10,7 +10,7 @@ namespace Moonglade.Syndication;
 
 public interface ISyndicationDataSource
 {
-    Task<IReadOnlyList<FeedEntry>> GetFeedDataAsync(string catRoute = null);
+    Task<List<FeedEntry>> GetFeedDataAsync(string catRoute = null);
 }
 
 public class SyndicationDataSource : ISyndicationDataSource
@@ -37,9 +37,9 @@ public SyndicationDataSource(
         _baseUrl = $"{acc.HttpContext.Request.Scheme}://{acc.HttpContext.Request.Host}";
     }
 
-    public async Task<IReadOnlyList<FeedEntry>> GetFeedDataAsync(string catRoute = null)
+    public async Task<List<FeedEntry>> GetFeedDataAsync(string catRoute = null)
     {
-        IReadOnlyList<FeedEntry> itemCollection;
+        List<FeedEntry> itemCollection;
         if (!string.IsNullOrWhiteSpace(catRoute))
         {
             var cat = await _catRepo.GetAsync(c => c.RouteName == catRoute);
@@ -55,7 +55,7 @@ public async Task<IReadOnlyList<FeedEntry>> GetFeedDataAsync(string catRoute = n
         return itemCollection;
     }
 
-    private async Task<IReadOnlyList<FeedEntry>> GetFeedEntriesAsync(Guid? catId = null)
+    private async Task<List<FeedEntry>> GetFeedEntriesAsync(Guid? catId = null)
     {
         int? top = null;
         if (_blogConfig.FeedSettings.RssItemCount != 0)
diff --git a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
index 85f373ffa..bca60a12f 100644
--- a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
+++ b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
@@ -4,11 +4,11 @@
 
 namespace Moonglade.Theme;
 
-public record GetAllThemeSegmentQuery : IRequest<IReadOnlyList<ThemeSegment>>;
+public record GetAllThemeSegmentQuery : IRequest<List<ThemeSegment>>;
 
-public class GetAllThemeSegmentQueryHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<GetAllThemeSegmentQuery, IReadOnlyList<ThemeSegment>>
+public class GetAllThemeSegmentQueryHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<GetAllThemeSegmentQuery, List<ThemeSegment>>
 {
-    public Task<IReadOnlyList<ThemeSegment>> Handle(GetAllThemeSegmentQuery request, CancellationToken ct)
+    public Task<List<ThemeSegment>> Handle(GetAllThemeSegmentQuery request, CancellationToken ct)
     {
         return repo.SelectAsync(p => new ThemeSegment
         {
diff --git a/src/Moonglade.Web/Controllers/CategoryController.cs b/src/Moonglade.Web/Controllers/CategoryController.cs
index 9aa2f0e4b..75b85115a 100644
--- a/src/Moonglade.Web/Controllers/CategoryController.cs
+++ b/src/Moonglade.Web/Controllers/CategoryController.cs
@@ -20,7 +20,7 @@ public async Task<IActionResult> Get([NotEmpty] Guid id)
     }
 
     [HttpGet("list")]
-    [ProducesResponseType<IReadOnlyList<Category>>(StatusCodes.Status200OK)]
+    [ProducesResponseType<List<Category>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List()
     {
         var list = await mediator.Send(new GetCategoriesQuery());
diff --git a/src/Moonglade.Web/Controllers/TagsController.cs b/src/Moonglade.Web/Controllers/TagsController.cs
index 99c095db1..2e99c49e0 100644
--- a/src/Moonglade.Web/Controllers/TagsController.cs
+++ b/src/Moonglade.Web/Controllers/TagsController.cs
@@ -9,7 +9,7 @@ namespace Moonglade.Web.Controllers;
 public class TagsController(IMediator mediator) : ControllerBase
 {
     [HttpGet("names")]
-    [ProducesResponseType<IReadOnlyList<string>>(StatusCodes.Status200OK)]
+    [ProducesResponseType<List<string>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> Names()
     {
         var names = await mediator.Send(new GetTagNamesQuery());
@@ -17,7 +17,7 @@ public async Task<IActionResult> Names()
     }
 
     [HttpGet("list")]
-    [ProducesResponseType<IReadOnlyList<Tag>>(StatusCodes.Status200OK)]
+    [ProducesResponseType<List<Tag>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List()
     {
         var list = await mediator.Send(new GetTagsQuery());
diff --git a/src/Moonglade.Web/Middleware/WriteFoafCommand.cs b/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
index 454febcb7..6a9713548 100644
--- a/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
+++ b/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
@@ -4,14 +4,14 @@
 
 namespace Moonglade.Web.Middleware;
 
-public class WriteFoafCommand(FoafDoc doc, string currentRequestUrl, IReadOnlyList<FriendLinkEntity> links)
+public class WriteFoafCommand(FoafDoc doc, string currentRequestUrl, List<FriendLinkEntity> links)
     : IRequest<string>
 {
     public FoafDoc Doc { get; set; } = doc;
 
     public string CurrentRequestUrl { get; set; } = currentRequestUrl;
 
-    public IReadOnlyList<FriendLinkEntity> Links { get; set; } = links;
+    public List<FriendLinkEntity> Links { get; set; } = links;
 
     public static string ContentType => "application/rdf+xml";
 }
diff --git a/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs b/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
index acbbabf7b..c2f8b9ec4 100644
--- a/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
@@ -7,7 +7,7 @@ public class CategoryModel(IMediator mediator) : PageModel
 {
     public CreateCategoryCommand EditCategoryRequest { get; set; } = new();
 
-    public IReadOnlyList<Category> Categories { get; set; }
+    public List<Category> Categories { get; set; }
 
     public async Task OnGet() => Categories = await mediator.Send(new GetCategoriesQuery());
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
index 160b72115..489256d0b 100644
--- a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
@@ -8,7 +8,7 @@ public class FriendLinkModel(IMediator mediator) : PageModel
 {
     public UpdateLinkCommand EditLinkRequest { get; set; } = new();
 
-    public IReadOnlyList<FriendLinkEntity> Links { get; set; }
+    public List<FriendLinkEntity> Links { get; set; }
 
     public async Task OnGet() => Links = await mediator.Send(new GetAllLinksQuery());
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
index 954f50d5d..feb0ed860 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
@@ -5,7 +5,7 @@ namespace Moonglade.Web.Pages.Admin;
 
 public class LocalAccountModel(IMediator mediator) : PageModel
 {
-    public IReadOnlyList<LoginHistoryEntity> LoginHistoryList { get; set; }
+    public List<LoginHistoryEntity> LoginHistoryList { get; set; }
 
     public async Task OnGet() => LoginHistoryList = await mediator.Send(new GetLoginHistoryQuery());
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/ArchiveList.cshtml.cs b/src/Moonglade.Web/Pages/ArchiveList.cshtml.cs
index e5a6996bd..c2e2f6279 100644
--- a/src/Moonglade.Web/Pages/ArchiveList.cshtml.cs
+++ b/src/Moonglade.Web/Pages/ArchiveList.cshtml.cs
@@ -5,7 +5,7 @@ namespace Moonglade.Web.Pages;
 
 public class ArchiveListModel(IMediator mediator) : PageModel
 {
-    public IReadOnlyList<PostDigest> Posts { get; set; }
+    public List<PostDigest> Posts { get; set; }
 
     public string ArchiveInfo { get; set; }
 
@@ -14,7 +14,7 @@ public async Task<IActionResult> OnGetAsync(int year, int? month)
         if (year < DateTime.MinValue.Year || year > DateTime.UtcNow.Year) return BadRequest();
         if (month is > 12 or < 0) return BadRequest();
 
-        IReadOnlyList<PostDigest> model;
+        List<PostDigest> model;
 
         if (month is not null)
         {
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
index 8ec71f78b..b4156196a 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
@@ -1,4 +1,4 @@
-@model IReadOnlyList<Moonglade.Core.CategoryFeature.Category>
+@model List<Moonglade.Core.CategoryFeature.Category>
 
 @if (Model.Count > 0)
 {
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
index bea03fc20..25479dbcb 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
@@ -1,4 +1,4 @@
-@model IReadOnlyList<Moonglade.Core.CategoryFeature.Category>
+@model List<Moonglade.Core.CategoryFeature.Category>
 
 @if (Model.Count > 0)
 {
diff --git a/src/Moonglade.Web/Pages/Components/CommentList/Default.cshtml b/src/Moonglade.Web/Pages/Components/CommentList/Default.cshtml
index 34c51c84f..652d40d55 100644
--- a/src/Moonglade.Web/Pages/Components/CommentList/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CommentList/Default.cshtml
@@ -1,5 +1,5 @@
 @using Moonglade.Utils
-@model IReadOnlyList<Moonglade.Comments.Comment>
+@model List<Moonglade.Comments.Comment>
 
 @{
     static string GetUserAvatarChar(string username)
diff --git a/src/Moonglade.Web/Pages/Components/FriendLink/Default.cshtml b/src/Moonglade.Web/Pages/Components/FriendLink/Default.cshtml
index efa07e78b..b4c8db42e 100644
--- a/src/Moonglade.Web/Pages/Components/FriendLink/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/FriendLink/Default.cshtml
@@ -1,5 +1,5 @@
 @using Moonglade.Utils
-@model IReadOnlyList<Moonglade.Data.Entities.FriendLinkEntity>
+@model List<Moonglade.Data.Entities.FriendLinkEntity>
 
 @if (Model.Any())
 {
diff --git a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
index b9db45a48..3ff8fd486 100644
--- a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
@@ -1,4 +1,4 @@
-@model IReadOnlyList<KeyValuePair<Moonglade.Core.TagFeature.Tag, int>>
+@model List<KeyValuePair<Moonglade.Core.TagFeature.Tag, int>>
 
 @if (Model.Any())
 {
diff --git a/src/Moonglade.Web/Pages/Search.cshtml.cs b/src/Moonglade.Web/Pages/Search.cshtml.cs
index f75c1fc35..1700f8c7b 100644
--- a/src/Moonglade.Web/Pages/Search.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Search.cshtml.cs
@@ -5,7 +5,7 @@ namespace Moonglade.Web.Pages;
 
 public class SearchModel(IMediator mediator) : PageModel
 {
-    public IReadOnlyList<PostDigest> Posts { get; set; }
+    public List<PostDigest> Posts { get; set; }
 
     public async Task<IActionResult> OnGetAsync(string term)
     {

From f343d65225eabfa4d6156cb5988bb3265e3626d5 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 12:11:42 +0800
Subject: [PATCH 025/227] validate old password

---
 .../UpdateLocalAccountPasswordRequest.cs      |  4 ++++
 .../Controllers/SettingsController.cs         |  6 ++++-
 .../Pages/Admin/LocalAccount.cshtml           | 22 ++++++++++++++-----
 .../Pages/Admin/LocalAccount.cshtml.cs        | 11 ----------
 4 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs

diff --git a/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs b/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs
index 7d529e83b..736a712ab 100644
--- a/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs
+++ b/src/Moonglade.Auth/UpdateLocalAccountPasswordRequest.cs
@@ -8,6 +8,10 @@ public class UpdateLocalAccountPasswordRequest
     [RegularExpression("^[A-Za-z0-9]{3,16}$")]
     public string NewUsername { get; set; }
 
+    [Required]
+    [RegularExpression("^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$")]
+    public string OldPassword { get; set; }
+
     [Required]
     [RegularExpression("^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@#$^&*]{8,}$")]
     public string NewPassword { get; set; }
diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index 272617784..24c9887be 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -40,7 +40,7 @@ public IActionResult SetLanguage(string culture, string returnUrl)
 
     [HttpPost("general")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCachePartition.General, "theme" })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCachePartition.General, "theme"])]
     public async Task<IActionResult> General(GeneralSettings model, ITimeZoneResolver timeZoneResolver)
     {
         model.AvatarUrl = blogConfig.GeneralSettings.AvatarUrl;
@@ -244,6 +244,10 @@ public IActionResult GeneratePassword([FromServices] IPasswordGenerator password
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> UpdateLocalAccountPassword(UpdateLocalAccountPasswordRequest request)
     {
+        var oldPasswordValid = blogConfig.LocalAccountSettings.PasswordHash == Helper.HashPassword2(request.OldPassword.Trim(), blogConfig.LocalAccountSettings.PasswordSalt);
+
+        if (!oldPasswordValid) return Conflict("Old password is incorrect.");
+
         var newSalt = Helper.GenerateSalt();
         blogConfig.LocalAccountSettings.Username = request.NewUsername.Trim();
         blogConfig.LocalAccountSettings.PasswordSalt = newSalt;
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
index 009e2f0c0..f5d4ae597 100644
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml
@@ -1,8 +1,9 @@
 @page "/admin/account"
 @using System.Globalization
-@model Moonglade.Web.Pages.Admin.LocalAccountModel
+@inject IMediator Mediator
 @{
-    ViewBag.Title = "Accounts";
+    ViewBag.Title = "Account";
+    var loginHistoryList = await Mediator.Send(new GetLoginHistoryQuery());
 }
 
 @section scripts {
@@ -37,7 +38,6 @@
     </script>
 }
 
-
 @section admintoolbar {
     <div class="admin-toolbar pb-2 border-bottom mb-3">
         <a class="btn btn-outline-accent" href="javascript:resetPassword();">
@@ -60,10 +60,10 @@
     Last 10 sign in activities
 </h4>
 
-@if (null != Model.LoginHistoryList && Model.LoginHistoryList.Any())
+@if (null != loginHistoryList && loginHistoryList.Any())
 {
     <div class="mb-4 rounded-3 shadow-sm border bg-white p-2">
-        <table class="table table-borderless table-sm mb-0">
+        <table class="table table-borderless mb-0">
             <thead>
                 <tr>
                     <th>@SharedLocalizer["Login IP"]</th>
@@ -72,7 +72,7 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach (var item in Model.LoginHistoryList.OrderByDescending(p => p.LoginTimeUtc))
+                @foreach (var item in loginHistoryList.OrderByDescending(p => p.LoginTimeUtc))
                 {
                     <tr>
                         <td>@item.LoginIp</td>
@@ -108,6 +108,16 @@
                                required>
                         <div class="text-muted">English letters and numbers only.</div>
                     </div>
+                    <div class="mb-2">
+                        <label for="NewPassword">Old password</label>
+                        <input class="form-control" type="password"
+                               id="OldPassword"
+                               minlength="8"
+                               maxlength="32"
+                               name="OldPassword"
+                               pattern="^(?=.*[a-zA-Z])(?=.*[0-9])[A-Za-z0-9._~!@@#$^&*]{8,}$"
+                               required>
+                    </div>
                     <div class="mb-2">
                         <label for="NewPassword">New password</label>
                         <input class="form-control" type="password"
diff --git a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs b/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
deleted file mode 100644
index feb0ed860..000000000
--- a/src/Moonglade.Web/Pages/Admin/LocalAccount.cshtml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Web.Pages.Admin;
-
-public class LocalAccountModel(IMediator mediator) : PageModel
-{
-    public List<LoginHistoryEntity> LoginHistoryList { get; set; }
-
-    public async Task OnGet() => LoginHistoryList = await mediator.Send(new GetLoginHistoryQuery());
-}
\ No newline at end of file

From 0916b398190c72cf95a55c6d4dec6f41f635c267 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 12:17:17 +0800
Subject: [PATCH 026/227] code refact

---
 src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs  | 8 ++++----
 src/Moonglade.Data/Entities/CategoryEntity.cs             | 4 +++-
 src/Moonglade.Web/Pages/Admin/Category.cshtml.cs          | 3 ++-
 .../Pages/Components/CategoryList/Default.cshtml          | 2 +-
 .../Pages/Components/CategoryList/Menu.cshtml             | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
index cd865396c..19db20e6b 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
@@ -2,16 +2,16 @@
 
 namespace Moonglade.Core.CategoryFeature;
 
-public record GetCategoriesQuery : IRequest<List<Category>>;
+public record GetCategoriesQuery : IRequest<List<CategoryEntity>>;
 
-public class GetCategoriesQueryHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, List<Category>>
+public class GetCategoriesQueryHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, List<CategoryEntity>>
 {
-    public Task<List<Category>> Handle(GetCategoriesQuery request, CancellationToken ct)
+    public Task<List<CategoryEntity>> Handle(GetCategoriesQuery request, CancellationToken ct)
     {
         return cache.GetOrCreateAsync(BlogCachePartition.General.ToString(), "allcats", async entry =>
         {
             entry.SlidingExpiration = TimeSpan.FromHours(1);
-            var list = await repo.SelectAsync(Category.EntitySelector, ct);
+            var list = await repo.ListAsync(ct);
             return list;
         });
     }
diff --git a/src/Moonglade.Data/Entities/CategoryEntity.cs b/src/Moonglade.Data/Entities/CategoryEntity.cs
index f4de9ba7c..3144f03c0 100644
--- a/src/Moonglade.Data/Entities/CategoryEntity.cs
+++ b/src/Moonglade.Data/Entities/CategoryEntity.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.Text.Json.Serialization;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace Moonglade.Data.Entities;
 
@@ -14,6 +15,7 @@ public CategoryEntity()
     public string DisplayName { get; set; }
     public string Note { get; set; }
 
+    [JsonIgnore]
     public virtual ICollection<PostCategoryEntity> PostCategory { get; set; }
 }
 
diff --git a/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs b/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
index c2f8b9ec4..b5161b504 100644
--- a/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/Category.cshtml.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.CategoryFeature;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Web.Pages.Admin;
 
@@ -7,7 +8,7 @@ public class CategoryModel(IMediator mediator) : PageModel
 {
     public CreateCategoryCommand EditCategoryRequest { get; set; } = new();
 
-    public List<Category> Categories { get; set; }
+    public List<CategoryEntity> Categories { get; set; }
 
     public async Task OnGet() => Categories = await mediator.Send(new GetCategoriesQuery());
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
index b4156196a..2e967061f 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
@@ -1,4 +1,4 @@
-@model List<Moonglade.Core.CategoryFeature.Category>
+@model List<Moonglade.Data.Entities.CategoryEntity>
 
 @if (Model.Count > 0)
 {
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
index 25479dbcb..e687f30b0 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
@@ -1,4 +1,4 @@
-@model List<Moonglade.Core.CategoryFeature.Category>
+@model List<Moonglade.Data.Entities.CategoryEntity>
 
 @if (Model.Count > 0)
 {

From cd2907c2f3cd9d27c8384a3bec44c8e4ffaea625 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 12:19:37 +0800
Subject: [PATCH 027/227] Update CategoryController.cs

---
 src/Moonglade.Web/Controllers/CategoryController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Controllers/CategoryController.cs b/src/Moonglade.Web/Controllers/CategoryController.cs
index 75b85115a..408500530 100644
--- a/src/Moonglade.Web/Controllers/CategoryController.cs
+++ b/src/Moonglade.Web/Controllers/CategoryController.cs
@@ -1,4 +1,5 @@
 using Moonglade.Core.CategoryFeature;
+using Moonglade.Data.Entities;
 using Moonglade.Web.Attributes;
 
 namespace Moonglade.Web.Controllers;
@@ -20,7 +21,7 @@ public async Task<IActionResult> Get([NotEmpty] Guid id)
     }
 
     [HttpGet("list")]
-    [ProducesResponseType<List<Category>>(StatusCodes.Status200OK)]
+    [ProducesResponseType<List<CategoryEntity>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List()
     {
         var list = await mediator.Send(new GetCategoriesQuery());

From 685e7cd4fd19900326a4418c36063190b00092af Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 12:55:59 +0800
Subject: [PATCH 028/227] code refact

---
 .../CategoryFeature/Category.cs               | 19 -------------------
 .../GetCategoryByRouteQuery.cs                | 11 +++++------
 .../CategoryFeature/GetCategoryQuery.cs       | 12 +++++-------
 src/Moonglade.Core/PostFeature/Post.cs        | 13 +++----------
 src/Moonglade.Data/Entities/CategoryEntity.cs |  4 ++--
 .../Entities/PostCategoryEntity.cs            |  7 ++++++-
 .../MoongladeJsonSerializerOptions.cs         |  1 +
 src/Moonglade.Data/Spec/CategorySpec.cs       | 17 -----------------
 .../Controllers/CategoryController.cs         | 11 +++++++++--
 .../Pages/CategoryList.cshtml.cs              |  3 ++-
 10 files changed, 33 insertions(+), 65 deletions(-)
 delete mode 100644 src/Moonglade.Core/CategoryFeature/Category.cs
 delete mode 100644 src/Moonglade.Data/Spec/CategorySpec.cs

diff --git a/src/Moonglade.Core/CategoryFeature/Category.cs b/src/Moonglade.Core/CategoryFeature/Category.cs
deleted file mode 100644
index c69bcecde..000000000
--- a/src/Moonglade.Core/CategoryFeature/Category.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Linq.Expressions;
-
-namespace Moonglade.Core.CategoryFeature;
-
-public class Category
-{
-    public Guid Id { get; set; }
-    public string RouteName { get; set; }
-    public string DisplayName { get; set; }
-    public string Note { get; set; }
-
-    public static readonly Expression<Func<CategoryEntity, Category>> EntitySelector = c => new()
-    {
-        Id = c.Id,
-        DisplayName = c.DisplayName,
-        RouteName = c.RouteName,
-        Note = c.Note
-    };
-}
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
index 731d01325..577fdae8d 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
@@ -1,11 +1,10 @@
-using Moonglade.Data.Spec;
-
+
 namespace Moonglade.Core.CategoryFeature;
 
-public record GetCategoryByRouteQuery(string RouteName) : IRequest<Category>;
+public record GetCategoryByRouteQuery(string RouteName) : IRequest<CategoryEntity>;
 
-public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryByRouteQuery, Category>
+public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryByRouteQuery, CategoryEntity>
 {
-    public Task<Category> Handle(GetCategoryByRouteQuery request, CancellationToken ct) =>
-        repo.FirstOrDefaultAsync(new CategorySpec(request.RouteName), Category.EntitySelector);
+    public Task<CategoryEntity> Handle(GetCategoryByRouteQuery request, CancellationToken ct) =>
+        repo.GetAsync(p => p.RouteName == request.RouteName);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
index 844ae87db..e40f0adc2 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
@@ -1,11 +1,9 @@
-using Moonglade.Data.Spec;
+namespace Moonglade.Core.CategoryFeature;
 
-namespace Moonglade.Core.CategoryFeature;
+public record GetCategoryQuery(Guid Id) : IRequest<CategoryEntity>;
 
-public record GetCategoryQuery(Guid Id) : IRequest<Category>;
-
-public class GetCategoryByIdQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryQuery, Category>
+public class GetCategoryByIdQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryQuery, CategoryEntity>
 {
-    public Task<Category> Handle(GetCategoryQuery request, CancellationToken ct) =>
-        repo.FirstOrDefaultAsync(new CategorySpec(request.Id), Category.EntitySelector);
+    public async Task<CategoryEntity> Handle(GetCategoryQuery request, CancellationToken ct) =>
+        await repo.GetAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PostFeature/Post.cs b/src/Moonglade.Core/PostFeature/Post.cs
index 7da4393b2..6c50ca110 100644
--- a/src/Moonglade.Core/PostFeature/Post.cs
+++ b/src/Moonglade.Core/PostFeature/Post.cs
@@ -1,5 +1,4 @@
-using Moonglade.Core.CategoryFeature;
-using Moonglade.Core.TagFeature;
+using Moonglade.Core.TagFeature;
 using System.Linq.Expressions;
 
 namespace Moonglade.Core.PostFeature;
@@ -23,7 +22,7 @@ public class Post
     public string HeroImageUrl { get; set; }
     public bool IsOutdated { get; set; }
     public Tag[] Tags { get; set; }
-    public Category[] Categories { get; set; }
+    public CategoryEntity[] Categories { get; set; }
     public DateTime? PubDateUtc { get; set; }
     public DateTime? LastModifiedUtc { get; set; }
 
@@ -53,12 +52,6 @@ public class Post
             NormalizedName = pt.NormalizedName,
             DisplayName = pt.DisplayName
         }).ToArray(),
-        Categories = p.PostCategory.Select(pc => new Category
-        {
-            Id = pc.CategoryId,
-            DisplayName = pc.Category.DisplayName,
-            RouteName = pc.Category.RouteName,
-            Note = pc.Category.Note
-        }).ToArray()
+        Categories = p.PostCategory.Select(pc => pc.Category).ToArray()
     };
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Entities/CategoryEntity.cs b/src/Moonglade.Data/Entities/CategoryEntity.cs
index 3144f03c0..1b786ad30 100644
--- a/src/Moonglade.Data/Entities/CategoryEntity.cs
+++ b/src/Moonglade.Data/Entities/CategoryEntity.cs
@@ -1,5 +1,5 @@
-using System.Text.Json.Serialization;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.Text.Json.Serialization;
 
 namespace Moonglade.Data.Entities;
 
diff --git a/src/Moonglade.Data/Entities/PostCategoryEntity.cs b/src/Moonglade.Data/Entities/PostCategoryEntity.cs
index a415d6503..037a5ecb0 100644
--- a/src/Moonglade.Data/Entities/PostCategoryEntity.cs
+++ b/src/Moonglade.Data/Entities/PostCategoryEntity.cs
@@ -1,10 +1,15 @@
-namespace Moonglade.Data.Entities;
+using System.Text.Json.Serialization;
+
+namespace Moonglade.Data.Entities;
 
 public class PostCategoryEntity
 {
     public Guid PostId { get; set; }
     public Guid CategoryId { get; set; }
 
+    [JsonIgnore]
     public virtual CategoryEntity Category { get; set; }
+
+    [JsonIgnore]
     public virtual PostEntity Post { get; set; }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs b/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs
index 558ec0ecd..449e3e65d 100644
--- a/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs
+++ b/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs
@@ -21,6 +21,7 @@ public static class MoongladeJsonSerializerOptions
             UnicodeRanges.CjkSymbolsandPunctuation,
             UnicodeRanges.HalfwidthandFullwidthForms),
         PropertyNameCaseInsensitive = true,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         WriteIndented = true
     };
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/CategorySpec.cs b/src/Moonglade.Data/Spec/CategorySpec.cs
deleted file mode 100644
index c7abeb6c4..000000000
--- a/src/Moonglade.Data/Spec/CategorySpec.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Data.Spec;
-
-public class CategorySpec : BaseSpecification<CategoryEntity>
-{
-    public CategorySpec(string routeName) : base(c => c.RouteName == routeName)
-    {
-
-    }
-
-    public CategorySpec(Guid id) : base(c => c.Id == id)
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/CategoryController.cs b/src/Moonglade.Web/Controllers/CategoryController.cs
index 408500530..2026ccfc5 100644
--- a/src/Moonglade.Web/Controllers/CategoryController.cs
+++ b/src/Moonglade.Web/Controllers/CategoryController.cs
@@ -1,6 +1,8 @@
 using Moonglade.Core.CategoryFeature;
 using Moonglade.Data.Entities;
+using Moonglade.Data.Exporting.Exporters;
 using Moonglade.Web.Attributes;
+using System.Text.Json;
 
 namespace Moonglade.Web.Controllers;
 
@@ -10,14 +12,19 @@ namespace Moonglade.Web.Controllers;
 public class CategoryController(IMediator mediator) : ControllerBase
 {
     [HttpGet("{id:guid}")]
-    [ProducesResponseType<Category>(StatusCodes.Status200OK)]
+    [ProducesResponseType<CategoryEntity>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     public async Task<IActionResult> Get([NotEmpty] Guid id)
     {
         var cat = await mediator.Send(new GetCategoryQuery(id));
         if (null == cat) return NotFound();
 
-        return Ok(cat);
+        // return Ok(cat); 
+
+        // Workaround .NET by design bug: https://stackoverflow.com/questions/60184661/net-core-3-jsonignore-not-working-when-requesting-single-resource
+        // https://github.com/dotnet/aspnetcore/issues/31396
+        // https://github.com/dotnet/efcore/issues/33223
+        return Content(JsonSerializer.Serialize(cat, MoongladeJsonSerializerOptions.Default), "application/json");
     }
 
     [HttpGet("list")]
diff --git a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
index 95c5181b6..032dc9d47 100644
--- a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
+++ b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.CategoryFeature;
 using Moonglade.Core.PostFeature;
+using Moonglade.Data.Entities;
 using Moonglade.Web.PagedList;
 
 namespace Moonglade.Web.Pages;
@@ -13,7 +14,7 @@ public class CategoryListModel(
     [BindProperty(SupportsGet = true)]
     public int P { get; set; } = 1;
     public BasePagedList<PostDigest> Posts { get; set; }
-    public Category Cat { get; set; }
+    public CategoryEntity Cat { get; set; }
 
     public async Task<IActionResult> OnGetAsync(string routeName)
     {

From 647eda513ca4985393ae8d6b805fec4cb26bde56 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 13:31:07 +0800
Subject: [PATCH 029/227] code refact

---
 src/Moonglade.Core/PostFeature/GetArchiveQuery.cs  |  2 +-
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs   |  2 +-
 src/Moonglade.Web/Controllers/CommentController.cs | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index 7dc3c635f..838f1f3b4 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -15,7 +15,7 @@ public async Task<List<Archive>> Handle(GetArchiveQuery request, CancellationTok
     {
         if (!await repo.AnyAsync(p => p.IsPublished && !p.IsDeleted, ct))
         {
-            return new List<Archive>();
+            return new();
         }
 
         var spec = new PostSpec(PostStatus.Published);
diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index 213abba84..5d336a4db 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -8,7 +8,7 @@ public class GetHotTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandl
 {
     public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
-        if (!await repo.AnyAsync(ct: ct)) return new List<KeyValuePair<Tag, int>>();
+        if (!await repo.AnyAsync(ct: ct)) return new();
 
         var spec = new TagSpec(request.Top);
         var tags = await repo.SelectAsync(spec, t =>
diff --git a/src/Moonglade.Web/Controllers/CommentController.cs b/src/Moonglade.Web/Controllers/CommentController.cs
index 46ddc250e..7a6284544 100644
--- a/src/Moonglade.Web/Controllers/CommentController.cs
+++ b/src/Moonglade.Web/Controllers/CommentController.cs
@@ -17,8 +17,7 @@ public class CommentController(
     [HttpPost("{postId:guid}")]
     [AllowAnonymous]
     [ServiceFilter(typeof(ValidateCaptcha))]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status201Created)]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
     [ProducesResponseType<ModelStateDictionary>(StatusCodes.Status409Conflict)]
@@ -62,12 +61,7 @@ await mediator.Publish(new CommentNotification(
             }
         }
 
-        if (blogConfig.ContentSettings.RequireCommentReview)
-        {
-            return Created("moonglade://empty", item);
-        }
-
-        return Ok();
+        return NoContent();
     }
 
     [HttpPut("{commentId:guid}/approval/toggle")]

From bc40b154c11ac6810ed49193e96203476c3ff1b4 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 13:34:48 +0800
Subject: [PATCH 030/227] code refact

---
 .../CreateCommentCommand.cs                   | 36 ++++------------
 .../Controllers/CommentController.cs          | 41 +++++++++++++------
 2 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index d5d82b0b7..a348ba275 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -1,5 +1,4 @@
 using MediatR;
-using Moonglade.Comments.Moderator;
 using Moonglade.Configuration;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
@@ -7,7 +6,7 @@
 
 namespace Moonglade.Comments;
 
-public class CreateCommentCommand(Guid postId, CommentRequest payload, string ipAddress) : IRequest<(int Status, CommentDetailedItem Item)>
+public class CreateCommentCommand(Guid postId, CommentRequest payload, string ipAddress) : IRequest<CommentDetailedItem>
 {
     public Guid PostId { get; set; } = postId;
 
@@ -16,29 +15,13 @@ public class CreateCommentCommand(Guid postId, CommentRequest payload, string ip
     public string IpAddress { get; set; } = ipAddress;
 }
 
-public class CreateCommentCommandHandler(IBlogConfig blogConfig, IRepository<PostEntity> postRepo, IModeratorService moderator, IRepository<CommentEntity> commentRepo) :
-        IRequestHandler<CreateCommentCommand, (int Status, CommentDetailedItem Item)>
+public class CreateCommentCommandHandler(
+    IBlogConfig blogConfig,
+    IRepository<PostEntity> postRepo,
+    IRepository<CommentEntity> commentRepo) : IRequestHandler<CreateCommentCommand, CommentDetailedItem>
 {
-    public async Task<(int Status, CommentDetailedItem Item)> Handle(CreateCommentCommand request, CancellationToken ct)
+    public async Task<CommentDetailedItem> Handle(CreateCommentCommand request, CancellationToken ct)
     {
-        if (blogConfig.ContentSettings.EnableWordFilter)
-        {
-            switch (blogConfig.ContentSettings.WordFilterMode)
-            {
-                case WordFilterMode.Mask:
-                    request.Payload.Username = await moderator.Mask(request.Payload.Username);
-                    request.Payload.Content = await moderator.Mask(request.Payload.Content);
-                    break;
-                case WordFilterMode.Block:
-                    if (await moderator.Detect(request.Payload.Username, request.Payload.Content))
-                    {
-                        await Task.CompletedTask;
-                        return (-1, null);
-                    }
-                    break;
-            }
-        }
-
         var spec = new PostSpec(request.PostId, false);
         var postInfo = await postRepo.FirstOrDefaultAsync(spec, p => new
         {
@@ -49,10 +32,7 @@ public class CreateCommentCommandHandler(IBlogConfig blogConfig, IRepository<Pos
         if (blogConfig.ContentSettings.CloseCommentAfterDays > 0)
         {
             var days = DateTime.UtcNow.Date.Subtract(postInfo.PubDateUtc.GetValueOrDefault()).Days;
-            if (days > blogConfig.ContentSettings.CloseCommentAfterDays)
-            {
-                return (-2, null);
-            }
+            if (days > blogConfig.ContentSettings.CloseCommentAfterDays) return null;
         }
 
         var model = new CommentEntity
@@ -81,6 +61,6 @@ public class CreateCommentCommandHandler(IBlogConfig blogConfig, IRepository<Pos
             Username = model.Username
         };
 
-        return (0, item);
+        return item;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/CommentController.cs b/src/Moonglade.Web/Controllers/CommentController.cs
index 7a6284544..750e1a727 100644
--- a/src/Moonglade.Web/Controllers/CommentController.cs
+++ b/src/Moonglade.Web/Controllers/CommentController.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Moonglade.Comments.Moderator;
 using Moonglade.Email.Client;
 using Moonglade.Web.Attributes;
 using System.ComponentModel.DataAnnotations;
@@ -11,6 +12,7 @@ namespace Moonglade.Web.Controllers;
 [CommentProviderGate]
 public class CommentController(
         IMediator mediator,
+        IModeratorService moderator,
         IBlogConfig blogConfig,
         ILogger<CommentController> logger) : ControllerBase
 {
@@ -31,17 +33,32 @@ public async Task<IActionResult> Create([NotEmpty] Guid postId, CommentRequest r
 
         if (!blogConfig.ContentSettings.EnableComments) return Forbid();
 
+        if (blogConfig.ContentSettings.EnableWordFilter)
+        {
+            switch (blogConfig.ContentSettings.WordFilterMode)
+            {
+                case WordFilterMode.Mask:
+                    request.Username = await moderator.Mask(request.Username);
+                    request.Content = await moderator.Mask(request.Content);
+                    break;
+                case WordFilterMode.Block:
+                    if (await moderator.Detect(request.Username, request.Content))
+                    {
+                        await Task.CompletedTask;
+                        ModelState.AddModelError(nameof(request.Content), "Your comment contains bad bad word.");
+                        return Conflict(ModelState);
+                    }
+                    break;
+            }
+        }
+
         var ip = (bool)HttpContext.Items["DNT"]! ? "N/A" : Helper.GetClientIP(HttpContext);
         var item = await mediator.Send(new CreateCommentCommand(postId, request, ip));
 
-        switch (item.Status)
+        if (null == item)
         {
-            case -1:
-                ModelState.AddModelError(nameof(request.Content), "Your comment contains bad bad word.");
-                return Conflict(ModelState);
-            case -2:
-                ModelState.AddModelError(nameof(postId), "Comment is closed for this post.");
-                return Conflict(ModelState);
+            ModelState.AddModelError(nameof(postId), "Comment is closed for this post.");
+            return Conflict(ModelState);
         }
 
         if (blogConfig.NotificationSettings.SendEmailOnNewComment)
@@ -49,11 +66,11 @@ public async Task<IActionResult> Create([NotEmpty] Guid postId, CommentRequest r
             try
             {
                 await mediator.Publish(new CommentNotification(
-                    item.Item.Username,
-                    item.Item.Email,
-                    item.Item.IpAddress,
-                    item.Item.PostTitle,
-                    item.Item.CommentContent));
+                    item.Username,
+                    item.Email,
+                    item.IpAddress,
+                    item.PostTitle,
+                    item.CommentContent));
             }
             catch (Exception e)
             {

From 28e05d1a05533d5e137018c0f31e7b384a82f9ba Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 13:39:43 +0800
Subject: [PATCH 031/227] Update HtmlHelper.cs

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 3c2758443..024f6d90c 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -29,16 +29,6 @@ private static string TagBuilderToString(TagBuilder tagBuilder)
         return writer.ToString();
     }
 
-    private TagBuilder WrapInListItem(string text)
-    {
-        var li = tagBuilderFactory
-            .Create("li");
-
-        SetInnerText(li, text);
-
-        return li;
-    }
-
     private TagBuilder WrapInListItem(TagBuilder inner, PagedListRenderOptions options, params string[] classes)
     {
         var li = tagBuilderFactory.Create("li");
@@ -333,7 +323,10 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
                 //show delimiter between page numbers
                 if (i > firstPageToDisplay && !string.IsNullOrWhiteSpace(options.DelimiterBetweenPageNumbers))
                 {
-                    listItemLinks.Add(WrapInListItem(options.DelimiterBetweenPageNumbers));
+                    var li = tagBuilderFactory.Create("li");
+
+                    SetInnerText(li, options.DelimiterBetweenPageNumbers);
+                    listItemLinks.Add(li);
                 }
 
                 //show page number link

From c8dd4f3f369778a45cb03da5a9449c2cdfb9cce0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 13:41:57 +0800
Subject: [PATCH 032/227] Update GetLinkQuery.cs

---
 src/Moonglade.FriendLink/GetLinkQuery.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Moonglade.FriendLink/GetLinkQuery.cs b/src/Moonglade.FriendLink/GetLinkQuery.cs
index 04860fe58..df0d94278 100644
--- a/src/Moonglade.FriendLink/GetLinkQuery.cs
+++ b/src/Moonglade.FriendLink/GetLinkQuery.cs
@@ -8,8 +8,5 @@ public record GetLinkQuery(Guid Id) : IRequest<FriendLinkEntity>;
 
 public class GetLinkQueryHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<GetLinkQuery, FriendLinkEntity>
 {
-    public async Task<FriendLinkEntity> Handle(GetLinkQuery request, CancellationToken ct)
-    {
-        return await repo.GetAsync(request.Id, ct);
-    }
+    public async Task<FriendLinkEntity> Handle(GetLinkQuery request, CancellationToken ct) => await repo.GetAsync(request.Id, ct);
 }
\ No newline at end of file

From 5bf5c294a1b496b112b82558054d1eaaa99c16a7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 13:46:54 +0800
Subject: [PATCH 033/227] code refact

---
 src/Moonglade.FriendLink/AddLinkCommand.cs        | 10 ++++++----
 src/Moonglade.FriendLink/UpdateLinkCommand.cs     | 15 ++++++---------
 .../Controllers/FriendLinkController.cs           | 11 +++++------
 .../Pages/Admin/FriendLink.cshtml.cs              |  2 +-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Moonglade.FriendLink/AddLinkCommand.cs b/src/Moonglade.FriendLink/AddLinkCommand.cs
index 310ff6555..6bf56037a 100644
--- a/src/Moonglade.FriendLink/AddLinkCommand.cs
+++ b/src/Moonglade.FriendLink/AddLinkCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Moonglade.FriendLink;
 
-public class AddLinkCommand : IRequest, IValidatableObject
+public class EditLinkRequest : IValidatableObject
 {
     [Required]
     [Display(Name = "Title")]
@@ -31,6 +31,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
     }
 }
 
+public record AddLinkCommand(EditLinkRequest Payload) : IRequest;
+
 public class AddLinkCommandHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<AddLinkCommand>
 {
     public async Task Handle(AddLinkCommand request, CancellationToken ct)
@@ -38,9 +40,9 @@ public async Task Handle(AddLinkCommand request, CancellationToken ct)
         var link = new FriendLinkEntity
         {
             Id = Guid.NewGuid(),
-            LinkUrl = Helper.SterilizeLink(request.LinkUrl),
-            Title = request.Title,
-            Rank = request.Rank
+            LinkUrl = Helper.SterilizeLink(request.Payload.LinkUrl),
+            Title = request.Payload.Title,
+            Rank = request.Payload.Rank
         };
 
         await repo.AddAsync(link, ct);
diff --git a/src/Moonglade.FriendLink/UpdateLinkCommand.cs b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
index 743cc890e..e412794a6 100644
--- a/src/Moonglade.FriendLink/UpdateLinkCommand.cs
+++ b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
@@ -5,26 +5,23 @@
 
 namespace Moonglade.FriendLink;
 
-public class UpdateLinkCommand : AddLinkCommand
-{
-    public Guid Id { get; set; }
-}
+public record UpdateLinkCommand(Guid Id, EditLinkRequest Payload) : IRequest;
 
 public class UpdateLinkCommandHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<UpdateLinkCommand>
 {
     public async Task Handle(UpdateLinkCommand request, CancellationToken ct)
     {
-        if (!Uri.IsWellFormedUriString(request.LinkUrl, UriKind.Absolute))
+        if (!Uri.IsWellFormedUriString(request.Payload.LinkUrl, UriKind.Absolute))
         {
-            throw new InvalidOperationException($"{nameof(request.LinkUrl)} is not a valid url.");
+            throw new InvalidOperationException($"{nameof(request.Payload.LinkUrl)} is not a valid url.");
         }
 
         var link = await repo.GetAsync(request.Id, ct);
         if (link is not null)
         {
-            link.Title = request.Title;
-            link.LinkUrl = Helper.SterilizeLink(request.LinkUrl);
-            link.Rank = request.Rank;
+            link.Title = request.Payload.Title;
+            link.LinkUrl = Helper.SterilizeLink(request.Payload.LinkUrl);
+            link.Rank = request.Payload.Rank;
 
             await repo.UpdateAsync(link, ct);
         }
diff --git a/src/Moonglade.Web/Controllers/FriendLinkController.cs b/src/Moonglade.Web/Controllers/FriendLinkController.cs
index 34451ae99..0749a6d58 100644
--- a/src/Moonglade.Web/Controllers/FriendLinkController.cs
+++ b/src/Moonglade.Web/Controllers/FriendLinkController.cs
@@ -11,10 +11,10 @@ public class FriendLinkController(IMediator mediator) : ControllerBase
 {
     [HttpPost]
     [ProducesResponseType(StatusCodes.Status201Created)]
-    public async Task<IActionResult> Create(AddLinkCommand command)
+    public async Task<IActionResult> Create(EditLinkRequest request)
     {
-        await mediator.Send(command);
-        return Created(new Uri(command.LinkUrl), command);
+        await mediator.Send(new AddLinkCommand(request));
+        return Created(new Uri(request.LinkUrl), request);
     }
 
     [HttpGet("{id:guid}")]
@@ -38,10 +38,9 @@ public async Task<IActionResult> List()
 
     [HttpPut("{id:guid}")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
-    public async Task<IActionResult> Update([NotEmpty] Guid id, UpdateLinkCommand command)
+    public async Task<IActionResult> Update([NotEmpty] Guid id, EditLinkRequest request)
     {
-        command.Id = id;
-        await mediator.Send(command);
+        await mediator.Send(new UpdateLinkCommand(id, request));
         return NoContent();
     }
 
diff --git a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
index 489256d0b..4f71a284e 100644
--- a/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/FriendLink.cshtml.cs
@@ -6,7 +6,7 @@ namespace Moonglade.Web.Pages.Admin;
 
 public class FriendLinkModel(IMediator mediator) : PageModel
 {
-    public UpdateLinkCommand EditLinkRequest { get; set; } = new();
+    public EditLinkRequest EditLinkRequest { get; set; } = new();
 
     public List<FriendLinkEntity> Links { get; set; }
 

From ed26397a1655a8c9a73c8652210afe520aff5ead Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 19 Apr 2024 15:40:29 +0800
Subject: [PATCH 034/227] move local account management link

---
 .../Pages/Shared/_AsideAdmin.cshtml           | 11 +---------
 .../Pages/Shared/_LayoutAdmin.cshtml          | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml b/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
index e44c2c144..7fce334c5 100644
--- a/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_AsideAdmin.cshtml
@@ -1,5 +1,4 @@
-@inject IOptions<AuthenticationSettings> AuthOptions
-@{
+@{
     var currentPage = ViewContext.RouteData.Values["Page"]?.ToString();
 }
 
@@ -49,14 +48,6 @@
                 <i class="bi-arrow-left-right admin-nav-icon" title="Manage Pingback link"></i>
                 @SharedLocalizer["Pingbacks"]
             </a>
-            @if (AuthOptions.Value.Provider == AuthenticationProvider.Local)
-            {
-                <a asp-page="/Admin/LocalAccount"
-                   class="list-group-item list-group-item-action @(currentPage is "/Admin/LocalAccount" ? "active" : null)">
-                    <i class="bi-people admin-nav-icon" title="Manage local account link"></i>
-                    @SharedLocalizer["Account"]
-                </a>
-            }
         </div>
     </section>
 </aside>
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Shared/_LayoutAdmin.cshtml b/src/Moonglade.Web/Pages/Shared/_LayoutAdmin.cshtml
index c82acbe38..c43f4f1f2 100644
--- a/src/Moonglade.Web/Pages/Shared/_LayoutAdmin.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_LayoutAdmin.cshtml
@@ -1,4 +1,5 @@
-@{
+@inject IOptions<AuthenticationSettings> AuthOptions
+@{
     if (string.IsNullOrEmpty(BlogConfig.GeneralSettings.AvatarUrl))
     {
         BlogConfig.GeneralSettings.AvatarUrl = Url.Action("Avatar", "Assets");
@@ -56,9 +57,20 @@
             </ul>
 
             <span class="navbar-text me-2">
-                <img src="@BlogConfig.GeneralSettings.AvatarUrl" alt="@BlogConfig.GeneralSettings.OwnerName"
-                     class="rounded-circle admin-nav-head-pic me-1" />
-                <userinfo user="User"></userinfo>
+                @if (AuthOptions.Value.Provider == AuthenticationProvider.Local)
+                {
+                    <a asp-page="/Admin/LocalAccount">
+                        <img src="@BlogConfig.GeneralSettings.AvatarUrl" alt="@BlogConfig.GeneralSettings.OwnerName"
+                             class="rounded-circle admin-nav-head-pic me-1" />
+                        <userinfo user="User"></userinfo>
+                    </a>
+                }
+                else
+                {
+                    <img src="@BlogConfig.GeneralSettings.AvatarUrl" alt="@BlogConfig.GeneralSettings.OwnerName"
+                         class="rounded-circle admin-nav-head-pic me-1" />
+                    <userinfo user="User"></userinfo>
+                }
             </span>
 
             <a class="navbar-text d-inline-block" asp-controller="Auth" asp-action="SignOut" title="Sign Out">

From b4ee733e06c9fa15bed5b7c01ea2c0726e75e7d9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:24:32 +0800
Subject: [PATCH 035/227] add settings to control RenderApplicationInsightsJs

---
 src/Moonglade.Web/Pages/Shared/_Layout.cshtml | 3 ++-
 src/Moonglade.Web/appsettings.json            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Pages/Shared/_Layout.cshtml b/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
index 252e71ace..50108995e 100644
--- a/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
@@ -1,6 +1,7 @@
 @using Moonglade.Utils
 @using Microsoft.AspNetCore.Localization
 @using System.Globalization
+@inject IConfiguration Configuration
 
 @{
     if (string.IsNullOrEmpty(BlogConfig.GeneralSettings.AvatarUrl))
@@ -96,7 +97,7 @@
     <script src="~/js/3rd/jquery.slim.min.js"></script>
 
     <environment include="Production">
-        @if (!(bool)Context.Items["DNT"]!)
+        @if (bool.Parse(Configuration["RenderApplicationInsightsJs"]!) && !(bool)Context.Items["DNT"]!)
         {
             <partial name="_ApplicationInsightsJs" />
         }
diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index fba81b0a8..c53b9fc57 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -51,6 +51,7 @@
   },
   "Editor": "HTML",
   "DetectChina": "block",
+  "RenderApplicationInsightsJs": true,
   "CacheSlidingExpirationMinutes": {
     "Post": 20,
     "Page": 20,

From 20004e4b7a9fd285fcfc7b10b84a5b82cbed3c68 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:33:57 +0800
Subject: [PATCH 036/227] remove bmp from default image extension list

---
 src/Moonglade.Web/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index c53b9fc57..4f6ffaf4c 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -34,7 +34,7 @@
     "KnownProxies": []
   },
   "ImageStorage": {
-    "AllowedExtensions": [ ".png", ".jpg", ".jpeg", ".bmp", ".gif" ],
+    "AllowedExtensions": [ ".png", ".jpg", ".jpeg", ".gif" ],
     "Provider": "filesystem",
     "FileSystemPath": "C:\\UploadedImages",
     "AzureStorageSettings": {

From c907c57934f2be2bd276ebc6524e37a5d7fb265e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:34:56 +0800
Subject: [PATCH 037/227] move logging section

---
 src/Moonglade.Web/appsettings.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index 4f6ffaf4c..ed6b610d1 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -13,12 +13,6 @@
       "CallbackPath": "/signin-oidc"
     }
   },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning",
-      "Microsoft": "Warning"
-    }
-  },
   "ContentModerator": {
     "Provider": "Local",
     "ApiEndpoint": "",
@@ -58,5 +52,11 @@
     "Image": 60,
     "Widget": 30
   },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning",
+      "Microsoft": "Warning"
+    }
+  },
   "AllowedHosts": "*"
 }

From bf783777d4de40a0a86630889ce738edb7a82b54 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:36:22 +0800
Subject: [PATCH 038/227] rename to x-geo-match

---
 src/Moonglade.Web/Configuration/ConfigureEndpoints.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Configuration/ConfigureEndpoints.cs b/src/Moonglade.Web/Configuration/ConfigureEndpoints.cs
index c2c453103..a4af2d815 100644
--- a/src/Moonglade.Web/Configuration/ConfigureEndpoints.cs
+++ b/src/Moonglade.Web/Configuration/ConfigureEndpoints.cs
@@ -11,7 +11,7 @@ public static Task WriteResponse(HttpContext context, HealthReport result)
             Helper.AppVersion,
             DotNetVersion = Environment.Version.ToString(),
             EnvironmentTags = Helper.GetEnvironmentTags(),
-            GeoMatch = context.Request.Headers["x-afd-geo-match"]
+            GeoMatch = context.Request.Headers["x-geo-match"]
         };
 
         return context.Response.WriteAsJsonAsync(obj);

From ff33592e492b6af69c2639cc27bca4bf6f8c1a94 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:37:22 +0800
Subject: [PATCH 039/227] upgrade Microsoft.Identity.Web

---
 src/Moonglade.Auth/Moonglade.Auth.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj
index ca9f20187..331259822 100644
--- a/src/Moonglade.Auth/Moonglade.Auth.csproj
+++ b/src/Moonglade.Auth/Moonglade.Auth.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.5" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />

From ab8793e74237dce0328c5bbb7f01cd46c5a2c44c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:40:19 +0800
Subject: [PATCH 040/227] hard code ActiveLiElementClass

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 2 +-
 src/Moonglade.Web/PagedList/PagedListMetaData.cs      | 7 +------
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 024f6d90c..9667b8487 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -116,7 +116,7 @@ private TagBuilder Page(int i, IPagedList list, Func<int, string> generatePageUr
 
         if (i == list.PageNumber)
         {
-            return WrapInListItem(page, options, options.ActiveLiElementClass);
+            return WrapInListItem(page, options, "active");
         }
 
         page.Attributes.Add("href", generatePageUrl(targetPageNumber));
diff --git a/src/Moonglade.Web/PagedList/PagedListMetaData.cs b/src/Moonglade.Web/PagedList/PagedListMetaData.cs
index 5d942494e..6fd94f3da 100644
--- a/src/Moonglade.Web/PagedList/PagedListMetaData.cs
+++ b/src/Moonglade.Web/PagedList/PagedListMetaData.cs
@@ -1,5 +1,4 @@
-
-namespace Moonglade.Web.PagedList;
+namespace Moonglade.Web.PagedList;
 
 ///<summary>
 /// Non-enumerable version of the PagedList class.
@@ -31,8 +30,6 @@ public PagedListMetaData(IPagedList pagedList)
         LastItemOnPage = pagedList.LastItemOnPage;
     }
 
-    #region IPagedList Members
-
     /// <summary>
     /// 	Total number of subsets within the superset.
     /// </summary>
@@ -122,6 +119,4 @@ public PagedListMetaData(IPagedList pagedList)
     /// is greater than PageCount.
     /// </value>
     public int LastItemOnPage { get; protected set; }
-
-    #endregion
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 6738b1be2..b5b10a9b0 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -29,7 +29,6 @@ public PagedListRenderOptions()
         UlElementClasses = ["pagination"];
         LiElementClasses = ["page-item"];
         PageClasses = ["page-link"];
-        ActiveLiElementClass = "active";
         EllipsesElementClass = "paged-list-ellipses";
         PreviousElementClass = "PagedList-skip-to-previous";
         NextElementClass = "paged-list-skip-to-next";
@@ -55,11 +54,6 @@ public PagedListRenderOptions()
     ///</summary>
     public IEnumerable<string> LiElementClasses { get; set; }
 
-    /// <summary>
-    /// CSS Classes to appent to active &lt;li&gt; element in the paging control.
-    /// </summary>
-    public string ActiveLiElementClass { get; set; }
-
     ///<summary>
     /// CSS Classes to append to every &lt;a&gt; or &lt;span&gt; element that represent each page in the paging control.
     ///</summary>

From b197f1f29da047895657e78a8b9d486453bdd9ae Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 07:41:29 +0800
Subject: [PATCH 041/227] remove FunctionToTransformEachPageLink

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 5 -----
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 9667b8487..43cee3c5c 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -38,11 +38,6 @@ private TagBuilder WrapInListItem(TagBuilder inner, PagedListRenderOptions optio
             li.AddCssClass(@class);
         }
 
-        if (options?.FunctionToTransformEachPageLink != null)
-        {
-            return options.FunctionToTransformEachPageLink(li, inner);
-        }
-
         AppendHtml(li, TagBuilderToString(inner));
 
         return li;
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index b5b10a9b0..140f59241 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -188,9 +188,4 @@ public PagedListRenderOptions()
     /// Text that will appear between each page number. If null or whitespace is specified, no delimiter will be shown.
     /// </summary>
     public string DelimiterBetweenPageNumbers { get; set; }
-
-    /// <summary>
-    /// An extension point which allows you to fully customize the anchor tags used for clickable pages, as well as navigation features such as Next, Last, etc.
-    /// </summary>
-    public Func<TagBuilder, TagBuilder, TagBuilder> FunctionToTransformEachPageLink { get; set; }
 }
\ No newline at end of file

From 0ab9486fb8bd84a1941d2161cdca367f7cb30e73 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:13:48 +0800
Subject: [PATCH 042/227] Update mssql-migration.sql

---
 Deployment/mssql-migration.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Deployment/mssql-migration.sql b/Deployment/mssql-migration.sql
index 75ff620f1..ad01c0cfc 100644
--- a/Deployment/mssql-migration.sql
+++ b/Deployment/mssql-migration.sql
@@ -11,3 +11,6 @@ CREATE TABLE [dbo].[LoginHistory](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
+
+DROP TABLE [LocalAccount]
+GO
\ No newline at end of file

From 002f770e7bd8f0e21471d0b7f45ec56ce3f593af Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:22:17 +0800
Subject: [PATCH 043/227] rename RouteName to Slug

---
 Deployment/mssql-migration.sql                |  6 +++++
 .../CategoryFeature/CreateCategoryCommand.cs  |  8 +++----
 .../GetCategoryByRouteQuery.cs                |  4 ++--
 .../CategoryFeature/UpdateCategoryCommand.cs  |  2 +-
 src/Moonglade.Data/Entities/CategoryEntity.cs |  4 ++--
 src/Moonglade.Data/Seed.cs                    |  2 +-
 .../GetAtomStringQuery.cs                     |  4 ++--
 .../SyndicationDataSource.cs                  |  8 +++----
 .../Controllers/SubscriptionController.cs     | 22 +++++++++----------
 src/Moonglade.Web/MetaWeblogService.cs        |  6 ++---
 src/Moonglade.Web/Pages/Admin/Category.cshtml | 12 +++++-----
 src/Moonglade.Web/Pages/CategoryList.cshtml   |  4 ++--
 .../Pages/CategoryList.cshtml.cs              |  6 ++---
 .../Components/CategoryList/Default.cshtml    |  2 +-
 .../Pages/Components/CategoryList/Menu.cshtml |  2 +-
 .../Pages/Components/SubList/Default.cshtml   |  4 ++--
 src/Moonglade.Web/Pages/_PostActions.cshtml   |  2 +-
 .../ViewComponents/SubListViewComponent.cs    |  2 +-
 18 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/Deployment/mssql-migration.sql b/Deployment/mssql-migration.sql
index ad01c0cfc..517b77e92 100644
--- a/Deployment/mssql-migration.sql
+++ b/Deployment/mssql-migration.sql
@@ -13,4 +13,10 @@ CREATE TABLE [dbo].[LoginHistory](
 GO
 
 DROP TABLE [LocalAccount]
+GO
+
+EXEC sys.sp_rename 
+    @objname = N'Category.RouteName', 
+    @newname = 'Slug', 
+    @objtype = 'COLUMN'
 GO
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
index 85f111634..106804478 100644
--- a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
@@ -11,10 +11,10 @@ public class CreateCategoryCommand : IRequest
     public string DisplayName { get; set; }
 
     [Required]
-    [Display(Name = "Route Name")]
+    [Display(Name = "Slug")]
     [RegularExpression("(?!-)([a-z0-9-]+)")]
     [MaxLength(64)]
-    public string RouteName { get; set; }
+    public string Slug { get; set; }
 
     [Required]
     [Display(Name = "Description")]
@@ -26,13 +26,13 @@ public class CreateCategoryCommandHandler(IRepository<CategoryEntity> catRepo, I
 {
     public async Task Handle(CreateCategoryCommand request, CancellationToken ct)
     {
-        var exists = await catRepo.AnyAsync(c => c.RouteName == request.RouteName, ct);
+        var exists = await catRepo.AnyAsync(c => c.Slug == request.Slug, ct);
         if (exists) return;
 
         var category = new CategoryEntity
         {
             Id = Guid.NewGuid(),
-            RouteName = request.RouteName.Trim(),
+            Slug = request.Slug.Trim(),
             Note = request.Note?.Trim(),
             DisplayName = request.DisplayName.Trim()
         };
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
index 577fdae8d..8923c07e3 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
@@ -1,10 +1,10 @@
 
 namespace Moonglade.Core.CategoryFeature;
 
-public record GetCategoryByRouteQuery(string RouteName) : IRequest<CategoryEntity>;
+public record GetCategoryByRouteQuery(string Slug) : IRequest<CategoryEntity>;
 
 public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryByRouteQuery, CategoryEntity>
 {
     public Task<CategoryEntity> Handle(GetCategoryByRouteQuery request, CancellationToken ct) =>
-        repo.GetAsync(p => p.RouteName == request.RouteName);
+        repo.GetAsync(p => p.Slug == request.Slug);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
index 4aa0ecc5d..b978c3564 100644
--- a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
@@ -15,7 +15,7 @@ public async Task<OperationCode> Handle(UpdateCategoryCommand request, Cancellat
         var cat = await repo.GetAsync(request.Id, ct);
         if (cat is null) return OperationCode.ObjectNotFound;
 
-        cat.RouteName = request.RouteName.Trim();
+        cat.Slug = request.Slug.Trim();
         cat.DisplayName = request.DisplayName.Trim();
         cat.Note = request.Note?.Trim();
 
diff --git a/src/Moonglade.Data/Entities/CategoryEntity.cs b/src/Moonglade.Data/Entities/CategoryEntity.cs
index 1b786ad30..ff15e8132 100644
--- a/src/Moonglade.Data/Entities/CategoryEntity.cs
+++ b/src/Moonglade.Data/Entities/CategoryEntity.cs
@@ -11,7 +11,7 @@ public CategoryEntity()
     }
 
     public Guid Id { get; set; }
-    public string RouteName { get; set; }
+    public string Slug { get; set; }
     public string DisplayName { get; set; }
     public string Note { get; set; }
 
@@ -26,6 +26,6 @@ public void Configure(EntityTypeBuilder<CategoryEntity> builder)
         builder.Property(e => e.Id).ValueGeneratedNever();
         builder.Property(e => e.DisplayName).HasMaxLength(64);
         builder.Property(e => e.Note).HasMaxLength(128);
-        builder.Property(e => e.RouteName).HasMaxLength(64);
+        builder.Property(e => e.Slug).HasMaxLength(64);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Seed.cs b/src/Moonglade.Data/Seed.cs
index 12b0c634a..430e6276c 100644
--- a/src/Moonglade.Data/Seed.cs
+++ b/src/Moonglade.Data/Seed.cs
@@ -103,7 +103,7 @@ private static IEnumerable<CategoryEntity> GetCategories() =>
                 Id = Guid.Parse("b0c15707-dfc8-4b09-9aa0-5bfca744c50b"),
                 DisplayName = "Default",
                 Note = "Default Category",
-                RouteName = "default"
+                Slug = "default"
             }
         };
 
diff --git a/src/Moonglade.Syndication/GetAtomStringQuery.cs b/src/Moonglade.Syndication/GetAtomStringQuery.cs
index ac3baef54..aea7afeac 100644
--- a/src/Moonglade.Syndication/GetAtomStringQuery.cs
+++ b/src/Moonglade.Syndication/GetAtomStringQuery.cs
@@ -5,7 +5,7 @@
 
 namespace Moonglade.Syndication;
 
-public record GetAtomStringQuery(string CategoryName = null) : IRequest<string>;
+public record GetAtomStringQuery(string Slug = null) : IRequest<string>;
 
 public class GetAtomStringQueryHandler : IRequestHandler<GetAtomStringQuery, string>
 {
@@ -31,7 +31,7 @@ public GetAtomStringQueryHandler(IBlogConfig blogConfig, ISyndicationDataSource
 
     public async Task<string> Handle(GetAtomStringQuery request, CancellationToken ct)
     {
-        var data = await _sdds.GetFeedDataAsync(request.CategoryName);
+        var data = await _sdds.GetFeedDataAsync(request.Slug);
         if (data is null) return null;
 
         _feedGenerator.FeedItemCollection = data;
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index a9de919d0..5b22b8a02 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -10,7 +10,7 @@ namespace Moonglade.Syndication;
 
 public interface ISyndicationDataSource
 {
-    Task<List<FeedEntry>> GetFeedDataAsync(string catRoute = null);
+    Task<List<FeedEntry>> GetFeedDataAsync(string catSlug = null);
 }
 
 public class SyndicationDataSource : ISyndicationDataSource
@@ -37,12 +37,12 @@ public SyndicationDataSource(
         _baseUrl = $"{acc.HttpContext.Request.Scheme}://{acc.HttpContext.Request.Host}";
     }
 
-    public async Task<List<FeedEntry>> GetFeedDataAsync(string catRoute = null)
+    public async Task<List<FeedEntry>> GetFeedDataAsync(string catSlug = null)
     {
         List<FeedEntry> itemCollection;
-        if (!string.IsNullOrWhiteSpace(catRoute))
+        if (!string.IsNullOrWhiteSpace(catSlug))
         {
-            var cat = await _catRepo.GetAsync(c => c.RouteName == catRoute);
+            var cat = await _catRepo.GetAsync(c => c.Slug == catSlug);
             if (cat is null) return null;
 
             itemCollection = await GetFeedEntriesAsync(cat.Id);
diff --git a/src/Moonglade.Web/Controllers/SubscriptionController.cs b/src/Moonglade.Web/Controllers/SubscriptionController.cs
index df95965ed..c5097ef14 100644
--- a/src/Moonglade.Web/Controllers/SubscriptionController.cs
+++ b/src/Moonglade.Web/Controllers/SubscriptionController.cs
@@ -16,7 +16,7 @@ public async Task<IActionResult> Opml()
         if (!blogConfig.AdvancedSettings.EnableOpml) return NotFound();
 
         var cats = await mediator.Send(new GetCategoriesQuery());
-        var catInfos = cats.Select(c => new KeyValuePair<string, string>(c.DisplayName, c.RouteName));
+        var catInfos = cats.Select(c => new KeyValuePair<string, string>(c.DisplayName, c.Slug));
         var rootUrl = Helper.ResolveRootUrl(HttpContext, blogConfig.GeneralSettings.CanonicalPrefix);
 
         var oi = new OpmlDoc
@@ -33,18 +33,18 @@ public async Task<IActionResult> Opml()
         return Content(xml, "text/xml");
     }
 
-    [HttpGet("rss/{routeName?}")]
-    public async Task<IActionResult> Rss([MaxLength(64)] string routeName = null)
+    [HttpGet("rss/{slug?}")]
+    public async Task<IActionResult> Rss([MaxLength(64)] string slug = null)
     {
-        bool hasRoute = !string.IsNullOrWhiteSpace(routeName);
-        var route = hasRoute ? routeName.ToLower().Trim() : null;
+        bool hasRoute = !string.IsNullOrWhiteSpace(slug);
+        var route = hasRoute ? slug.ToLower().Trim() : null;
 
         return await cache.GetOrCreateAsync(
             hasRoute ? BlogCachePartition.RssCategory.ToString() : BlogCachePartition.General.ToString(), route ?? "rss", async entry =>
             {
                 entry.SlidingExpiration = TimeSpan.FromHours(1);
 
-                var xml = await mediator.Send(new GetRssStringQuery(routeName));
+                var xml = await mediator.Send(new GetRssStringQuery(slug));
                 if (string.IsNullOrWhiteSpace(xml))
                 {
                     return (IActionResult)NotFound();
@@ -54,18 +54,18 @@ public async Task<IActionResult> Rss([MaxLength(64)] string routeName = null)
             });
     }
 
-    [HttpGet("atom/{routeName?}")]
-    public async Task<IActionResult> Atom([MaxLength(64)] string routeName = null)
+    [HttpGet("atom/{slug?}")]
+    public async Task<IActionResult> Atom([MaxLength(64)] string slug = null)
     {
-        bool hasRoute = !string.IsNullOrWhiteSpace(routeName);
-        var route = hasRoute ? routeName.ToLower().Trim() : null;
+        bool hasRoute = !string.IsNullOrWhiteSpace(slug);
+        var route = hasRoute ? slug.ToLower().Trim() : null;
 
         return await cache.GetOrCreateAsync(
             hasRoute ? BlogCachePartition.AtomCategory.ToString() : BlogCachePartition.General.ToString(), route ?? "atom", async entry =>
         {
             entry.SlidingExpiration = TimeSpan.FromHours(1);
 
-            var xml = await mediator.Send(new GetAtomStringQuery(routeName));
+            var xml = await mediator.Send(new GetAtomStringQuery(slug));
             return Content(xml, "text/xml");
         });
     }
diff --git a/src/Moonglade.Web/MetaWeblogService.cs b/src/Moonglade.Web/MetaWeblogService.cs
index d3bec1582..6911274d3 100644
--- a/src/Moonglade.Web/MetaWeblogService.cs
+++ b/src/Moonglade.Web/MetaWeblogService.cs
@@ -177,8 +177,8 @@ public Task<CategoryInfo[]> GetCategoriesAsync(string blogid, string username, s
                 title = p.DisplayName,
                 categoryid = p.Id.ToString(),
                 description = p.Note,
-                htmlUrl = $"/category/{p.RouteName}",
-                rssUrl = $"/rss/{p.RouteName}"
+                htmlUrl = $"/category/{p.Slug}",
+                rssUrl = $"/rss/{p.Slug}"
             }).ToArray();
 
             return catInfos;
@@ -194,7 +194,7 @@ public Task<int> AddCategoryAsync(string key, string username, string password,
             await mediator.Send(new CreateCategoryCommand
             {
                 DisplayName = category.name.Trim(),
-                RouteName = category.slug.ToLower(),
+                Slug = category.slug.ToLower(),
                 Note = category.description.Trim()
             });
 
diff --git a/src/Moonglade.Web/Pages/Admin/Category.cshtml b/src/Moonglade.Web/Pages/Admin/Category.cshtml
index 7f89a4838..13c4dc154 100644
--- a/src/Moonglade.Web/Pages/Admin/Category.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/Category.cshtml
@@ -21,7 +21,7 @@
                 async (resp) => {
                     var data = await resp.json();
                     catId = data.id;
-                    document.querySelector('#EditCategoryRequest_RouteName').value = data.routeName;
+                    document.querySelector('#EditCategoryRequest_Slug').value = data.slug;
                     document.querySelector('#EditCategoryRequest_DisplayName').value = data.displayName;
                     document.querySelector('#EditCategoryRequest_Note').value = data.note;
                     editCanvas.show();
@@ -61,7 +61,7 @@
 
             callApi(apiAddress, verb,
                 {
-                    routeName: value["EditCategoryRequest.RouteName"],
+                    slug: value["EditCategoryRequest.Slug"],
                     displayName: value["EditCategoryRequest.DisplayName"],
                     note: value["EditCategoryRequest.Note"]
                 },
@@ -100,7 +100,7 @@
             <div class="card shadow-sm" id="card-@cat.Id">
                 <div class="card-body">
                     <h6 class="card-title">
-                        <a asp-page="/CategoryList" asp-route-routeName="@cat.RouteName" target="_blank">
+                        <a asp-page="/CategoryList" asp-route-slug="@cat.Slug" target="_blank">
                             @cat.DisplayName
                         </a>
                     </h6>
@@ -109,7 +109,7 @@
                         @cat.Note
                     </p>
 
-                    <small class="text-muted">@cat.RouteName</small>
+                    <small class="text-muted">@cat.Slug</small>
                 </div>
                 <div class="card-footer">
                     <a href="javascript:editCat('@cat.Id');" class="btn btn-sm btn-outline-accent btn-edit"><i class="bi-pen"></i></a>
@@ -132,8 +132,8 @@
                 <input asp-for="EditCategoryRequest.DisplayName" class="form-control" required />
             </div>
             <div class="mb-3">
-                <label class="form-label" asp-for="EditCategoryRequest.RouteName"></label>
-                <input asp-for="EditCategoryRequest.RouteName" class="form-control" required pattern="(?!-)([a-z0-9-]+)" />
+                <label class="form-label" asp-for="EditCategoryRequest.Slug"></label>
+                <input asp-for="EditCategoryRequest.Slug" class="form-control" required pattern="(?!-)([a-z0-9-]+)" />
                 <small class="text-muted">
                     @SharedLocalizer["lower case English letters (a-z) and numbers (0-9) with/out hyphen (-) in middle."]
                 </small>
diff --git a/src/Moonglade.Web/Pages/CategoryList.cshtml b/src/Moonglade.Web/Pages/CategoryList.cshtml
index 0cc4c8d12..383a30437 100644
--- a/src/Moonglade.Web/Pages/CategoryList.cshtml
+++ b/src/Moonglade.Web/Pages/CategoryList.cshtml
@@ -1,4 +1,4 @@
-@page "/category/{routeName:regex(^(?!-)([a-zA-Z0-9-]){{1,64}}$)}"
+@page "/category/{slug:regex(^(?!-)([a-zA-Z0-9-]){{1,64}}$)}"
 @model Moonglade.Web.Pages.CategoryListModel
 @{
     ViewBag.TitlePrefix = Model.Cat.DisplayName;
@@ -10,7 +10,7 @@
     <a class="float-end d-none d-md-block"
        asp-controller="Subscription"
        asp-action="Rss"
-       asp-route-routeName="@Model.Cat.RouteName.ToLower()" target="_blank"
+       asp-route-slug="@Model.Cat.Slug.ToLower()" target="_blank"
        title="Subscribe @(Model.Cat.DisplayName)">
         <i class="bi-rss font-125rem"></i>
     </a>
diff --git a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
index 032dc9d47..2c3e8b81e 100644
--- a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
+++ b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
@@ -16,12 +16,12 @@ public class CategoryListModel(
     public BasePagedList<PostDigest> Posts { get; set; }
     public CategoryEntity Cat { get; set; }
 
-    public async Task<IActionResult> OnGetAsync(string routeName)
+    public async Task<IActionResult> OnGetAsync(string slug)
     {
-        if (string.IsNullOrWhiteSpace(routeName)) return NotFound();
+        if (string.IsNullOrWhiteSpace(slug)) return NotFound();
 
         var pageSize = blogConfig.ContentSettings.PostListPageSize;
-        Cat = await mediator.Send(new GetCategoryByRouteQuery(routeName));
+        Cat = await mediator.Send(new GetCategoryByRouteQuery(slug));
 
         if (Cat is null) return NotFound();
 
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
index 2e967061f..340ec8cdb 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Default.cshtml
@@ -7,7 +7,7 @@
         {
             <a class="d-block mb-3 mt-2"
                asp-page="/CategoryList"
-               asp-route-routeName="@item.RouteName.ToLower()"
+               asp-route-slug="@item.Slug.ToLower()"
                title="@item.Note">
                 <i class="bi-folder2 me-1"></i>
                 @item.DisplayName
diff --git a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
index e687f30b0..2e0fa951f 100644
--- a/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
+++ b/src/Moonglade.Web/Pages/Components/CategoryList/Menu.cshtml
@@ -6,7 +6,7 @@
         @foreach (var item in Model.OrderBy(c => c.DisplayName))
         {
             <li>
-                <a class="dropdown-item" asp-page="/CategoryList" asp-route-routeName="@item.RouteName.ToLower()" title="@item.Note">
+                <a class="dropdown-item" asp-page="/CategoryList" asp-route-slug="@item.Slug.ToLower()" title="@item.Note">
                     <i class="bi-folder2 me-1"></i>
                     @item.DisplayName
                 </a>
diff --git a/src/Moonglade.Web/Pages/Components/SubList/Default.cshtml b/src/Moonglade.Web/Pages/Components/SubList/Default.cshtml
index c812be610..f312c24f0 100644
--- a/src/Moonglade.Web/Pages/Components/SubList/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/SubList/Default.cshtml
@@ -8,12 +8,12 @@
             @key
         </span>
         <span>(</span>
-        <a asp-controller="Subscription" asp-action="Rss" asp-route-routeName="@value"
+        <a asp-controller="Subscription" asp-action="Rss" asp-route-slug="@value"
            title="@key">
             RSS
         </a>
         <span> | </span>
-        <a asp-controller="Subscription" asp-action="Atom" asp-route-routeName="@value"
+        <a asp-controller="Subscription" asp-action="Atom" asp-route-slug="@value"
            title="@key">
             Atom
         </a>
diff --git a/src/Moonglade.Web/Pages/_PostActions.cshtml b/src/Moonglade.Web/Pages/_PostActions.cshtml
index c9be20697..0a66cd9ce 100644
--- a/src/Moonglade.Web/Pages/_PostActions.cshtml
+++ b/src/Moonglade.Web/Pages/_PostActions.cshtml
@@ -11,7 +11,7 @@
                     <li>
                         <a class="btn btn-sm btn-outline-secondary mb-1"
                            asp-page="/CategoryList"
-                           asp-route-routeName="@item.RouteName.ToLower()">
+                           asp-route-slug="@item.Slug.ToLower()">
                             <i class="bi-folder2" aria-hidden="true"></i>
                             @item.DisplayName
                         </a>
diff --git a/src/Moonglade.Web/ViewComponents/SubListViewComponent.cs b/src/Moonglade.Web/ViewComponents/SubListViewComponent.cs
index d97a39485..768047b5c 100644
--- a/src/Moonglade.Web/ViewComponents/SubListViewComponent.cs
+++ b/src/Moonglade.Web/ViewComponents/SubListViewComponent.cs
@@ -9,7 +9,7 @@ public async Task<IViewComponentResult> InvokeAsync()
         try
         {
             var cats = await mediator.Send(new GetCategoriesQuery());
-            var items = cats.Select(c => new KeyValuePair<string, string>(c.DisplayName, c.RouteName));
+            var items = cats.Select(c => new KeyValuePair<string, string>(c.DisplayName, c.Slug));
 
             return View(items);
         }

From 6a3dedb15227fac02430ce0afe744a220fc9de7d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:23:21 +0800
Subject: [PATCH 044/227] rename

---
 .../CategoryFeature/GetCategoryByRouteQuery.cs         | 10 ----------
 .../CategoryFeature/GetCategoryBySlugQuery.cs          | 10 ++++++++++
 src/Moonglade.Web/Pages/CategoryList.cshtml.cs         |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
 create mode 100644 src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs

diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
deleted file mode 100644
index 8923c07e3..000000000
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryByRouteQuery.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace Moonglade.Core.CategoryFeature;
-
-public record GetCategoryByRouteQuery(string Slug) : IRequest<CategoryEntity>;
-
-public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryByRouteQuery, CategoryEntity>
-{
-    public Task<CategoryEntity> Handle(GetCategoryByRouteQuery request, CancellationToken ct) =>
-        repo.GetAsync(p => p.Slug == request.Slug);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
new file mode 100644
index 000000000..b4c882f26
--- /dev/null
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
@@ -0,0 +1,10 @@
+
+namespace Moonglade.Core.CategoryFeature;
+
+public record GetCategoryBySlugQuery(string Slug) : IRequest<CategoryEntity>;
+
+public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryBySlugQuery, CategoryEntity>
+{
+    public Task<CategoryEntity> Handle(GetCategoryBySlugQuery request, CancellationToken ct) =>
+        repo.GetAsync(p => p.Slug == request.Slug);
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
index 2c3e8b81e..126c24b0b 100644
--- a/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
+++ b/src/Moonglade.Web/Pages/CategoryList.cshtml.cs
@@ -21,7 +21,7 @@ public async Task<IActionResult> OnGetAsync(string slug)
         if (string.IsNullOrWhiteSpace(slug)) return NotFound();
 
         var pageSize = blogConfig.ContentSettings.PostListPageSize;
-        Cat = await mediator.Send(new GetCategoryByRouteQuery(slug));
+        Cat = await mediator.Send(new GetCategoryBySlugQuery(slug));
 
         if (Cat is null) return NotFound();
 

From 3354ad9bfccc5539a5b662196fed6077480d4fc9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:28:18 +0800
Subject: [PATCH 045/227] remove MetaWeblog API

---
 README.md                                     |   4 +-
 .../AdvancedSettings.cs                       |   9 -
 src/Moonglade.MetaWeblog/DateTime8601.cs      |  41 --
 .../IMetaWeblogProvider.cs                    |  34 --
 .../MetaWeblogException.cs                    |   6 -
 .../MetaWeblogExtensions.cs                   |  19 -
 .../MetaWeblogMiddleware.cs                   |  36 --
 src/Moonglade.MetaWeblog/MetaWeblogService.cs | 126 -----
 .../Moonglade.MetaWeblog.csproj               |  13 -
 src/Moonglade.MetaWeblog/Structs.cs           | 103 ----
 .../XmlRpcMethodAttribute.cs                  |   6 -
 src/Moonglade.MetaWeblog/XmlRpcService.cs     | 348 -------------
 src/Moonglade.Utils/Helper.cs                 |  10 -
 .../Controllers/SettingsController.cs         |   4 -
 src/Moonglade.Web/MetaWeblogService.cs        | 458 ------------------
 src/Moonglade.Web/Middleware/RSDMiddleware.cs |  72 ---
 src/Moonglade.Web/Moonglade.Web.csproj        |   1 -
 .../PagedList/PagedListRenderOptions.cs       |   3 +-
 .../Pages/Settings/Advanced.cshtml            |  47 --
 src/Moonglade.Web/Pages/Shared/_Layout.cshtml |   4 -
 src/Moonglade.Web/Program.cs                  |   7 -
 .../Resources/Program.zh-Hans.resx            |   6 -
 .../Resources/Program.zh-Hant.resx            |   6 -
 src/Moonglade.sln                             |   9 +-
 24 files changed, 4 insertions(+), 1368 deletions(-)
 delete mode 100644 src/Moonglade.MetaWeblog/DateTime8601.cs
 delete mode 100644 src/Moonglade.MetaWeblog/IMetaWeblogProvider.cs
 delete mode 100644 src/Moonglade.MetaWeblog/MetaWeblogException.cs
 delete mode 100644 src/Moonglade.MetaWeblog/MetaWeblogExtensions.cs
 delete mode 100644 src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
 delete mode 100644 src/Moonglade.MetaWeblog/MetaWeblogService.cs
 delete mode 100644 src/Moonglade.MetaWeblog/Moonglade.MetaWeblog.csproj
 delete mode 100644 src/Moonglade.MetaWeblog/Structs.cs
 delete mode 100644 src/Moonglade.MetaWeblog/XmlRpcMethodAttribute.cs
 delete mode 100644 src/Moonglade.MetaWeblog/XmlRpcService.cs
 delete mode 100644 src/Moonglade.Web/MetaWeblogService.cs
 delete mode 100644 src/Moonglade.Web/Middleware/RSDMiddleware.cs

diff --git a/README.md b/README.md
index 1489281c2..49b48648e 100644
--- a/README.md
+++ b/README.md
@@ -152,8 +152,8 @@ Open Search | Search | Supported | `/opensearch`
 Pingback | Social | Supported | `/pingback`
 Reader View | Reader mode | Supported | N/A
 FOAF | Social | Supported | `/foaf.xml`
-RSD | Service Discovery | Supported | `/rsd` *If MetaWeblog is enabled*
-MetaWeblog | Blogging | Basic Support | `/metaweblog`
+RSD | Service Discovery | Deprecated | N/A
+MetaWeblog | Blogging | Deprecated | N/A
 Dublin Core Metadata | SEO | Basic Support | N/A
 BlogML | Blogging | Not planned | 
 APML | Social | Not planned | 
diff --git a/src/Moonglade.Configuration/AdvancedSettings.cs b/src/Moonglade.Configuration/AdvancedSettings.cs
index cf76b97b6..6338b24d2 100644
--- a/src/Moonglade.Configuration/AdvancedSettings.cs
+++ b/src/Moonglade.Configuration/AdvancedSettings.cs
@@ -18,9 +18,6 @@ public class AdvancedSettings : IBlogSettings
     [Display(Name = "Enable Pingback")]
     public bool EnablePingback { get; set; } = true;
 
-    [Display(Name = "Enable MetaWeblog API")]
-    public bool EnableMetaWeblog { get; set; } = true;
-
     [Display(Name = "Enable OpenSearch")]
     public bool EnableOpenSearch { get; set; } = true;
 
@@ -33,15 +30,9 @@ public class AdvancedSettings : IBlogSettings
     [Display(Name = "Enable Site Map")]
     public bool EnableSiteMap { get; set; } = true;
 
-    [MinLength(8), MaxLength(16)]
-    [Display(Name = "MetaWeblog password")]
-    public string MetaWeblogPassword { get; set; }
-
     [Display(Name = "Show warning when clicking external links")]
     public bool WarnExternalLink { get; set; }
 
-    public string MetaWeblogPasswordHash { get; set; }
-
     [JsonIgnore]
     public static AdvancedSettings DefaultValue => new();
 }
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/DateTime8601.cs b/src/Moonglade.MetaWeblog/DateTime8601.cs
deleted file mode 100644
index d8775209f..000000000
--- a/src/Moonglade.MetaWeblog/DateTime8601.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace Moonglade.MetaWeblog;
-// Borrowed from: https://github.com/snielsson/XmlRpcLight/blob/master/XmlRpcLight/DataTypes/DateTime8601.cs
-
-internal static class DateTime8601
-{
-    private static readonly Regex DateTime8601Regex = new(
-        @"(((?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2}))|((?<year>\d{4})(?<month>\d{2})(?<day>\d{2})))"
-        + @"T"
-        + @"(((?<hour>\d{2}):(?<minute>\d{2}):(?<second>\d{2}))|((?<hour>\d{2})(?<minute>\d{2})(?<second>\d{2})))"
-        + @"(?<tz>$|Z|([+-]\d{2}:?(\d{2})?))");
-
-    public static bool TryParseDateTime8601(string date, out DateTime result)
-    {
-        result = DateTime.MinValue;
-        var m = DateTime8601Regex.Match(date);
-        var normalized = m.Groups["year"].Value + m.Groups["month"].Value + m.Groups["day"].Value
-                         + "T"
-                         + m.Groups["hour"].Value + m.Groups["minute"].Value + m.Groups["second"].Value
-                         + m.Groups["tz"].Value;
-        var formats = new[] {
-            "yyyyMMdd'T'HHmmss",
-            "yyyyMMdd'T'HHmmss'Z'",
-            "yyyyMMdd'T'HHmmsszzz",
-            "yyyyMMdd'T'HHmmsszz"
-        };
-
-        try
-        {
-            result = DateTime.ParseExact(normalized, formats, CultureInfo.InvariantCulture,
-                DateTimeStyles.AdjustToUniversal);
-            return true;
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/IMetaWeblogProvider.cs b/src/Moonglade.MetaWeblog/IMetaWeblogProvider.cs
deleted file mode 100644
index 9ea75c104..000000000
--- a/src/Moonglade.MetaWeblog/IMetaWeblogProvider.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace Moonglade.MetaWeblog;
-
-public interface IMetaWeblogProvider
-{
-    Task<UserInfo> GetUserInfoAsync(string key, string username, string password);
-
-    Task<BlogInfo[]> GetUsersBlogsAsync(string key, string username, string password);
-
-    Task<Post> GetPostAsync(string postid, string username, string password);
-
-    Task<Post[]> GetRecentPostsAsync(string blogid, string username, string password, int numberOfPosts);
-
-    Task<string> AddPostAsync(string blogid, string username, string password, Post post, bool publish);
-
-    Task<bool> DeletePostAsync(string key, string postid, string username, string password, bool publish);
-
-    Task<bool> EditPostAsync(string postid, string username, string password, Post post, bool publish);
-
-    Task<CategoryInfo[]> GetCategoriesAsync(string blogid, string username, string password);
-
-    Task<int> AddCategoryAsync(string key, string username, string password, NewCategory category);
-
-    Task<Tag[]> GetTagsAsync(string blogid, string username, string password);
-
-    Task<MediaObjectInfo> NewMediaObjectAsync(string blogid, string username, string password, MediaObject mediaObject);
-
-    Task<Page> GetPageAsync(string blogid, string pageid, string username, string password);
-    Task<Page[]> GetPagesAsync(string blogid, string username, string password, int numPages);
-    Task<Author[]> GetAuthorsAsync(string blogid, string username, string password);
-
-    Task<string> AddPageAsync(string blogid, string username, string password, Page page, bool publish);
-    Task<bool> EditPageAsync(string blogid, string pageid, string username, string password, Page page, bool publish);
-    Task<bool> DeletePageAsync(string blogid, string username, string password, string pageid);
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/MetaWeblogException.cs b/src/Moonglade.MetaWeblog/MetaWeblogException.cs
deleted file mode 100644
index ab0e1df6d..000000000
--- a/src/Moonglade.MetaWeblog/MetaWeblogException.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Moonglade.MetaWeblog;
-
-public class MetaWeblogException(string message, int code = 1) : Exception(message)
-{
-    public int Code { get; private set; } = code;
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/MetaWeblogExtensions.cs b/src/Moonglade.MetaWeblog/MetaWeblogExtensions.cs
deleted file mode 100644
index 509f621a1..000000000
--- a/src/Moonglade.MetaWeblog/MetaWeblogExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Moonglade.MetaWeblog;
-
-public static class MetaWeblogExtensions
-{
-    public static IApplicationBuilder UseMetaWeblog(this IApplicationBuilder builder, string path)
-    {
-        return builder.UseMiddleware<MetaWeblogMiddleware>(path);
-    }
-
-    public static IServiceCollection AddMetaWeblog<TImplementation>(this IServiceCollection coll) where TImplementation : class, IMetaWeblogProvider
-    {
-        return coll.AddScoped<IMetaWeblogProvider, TImplementation>()
-            .AddScoped<MetaWeblogService>();
-    }
-
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs b/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
deleted file mode 100644
index 39224428c..000000000
--- a/src/Moonglade.MetaWeblog/MetaWeblogMiddleware.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-
-namespace Moonglade.MetaWeblog;
-
-public class MetaWeblogMiddleware(RequestDelegate next, ILoggerFactory loggerFactory, string urlEndpoint)
-{
-    private readonly ILogger _logger = loggerFactory.CreateLogger<MetaWeblogMiddleware>();
-
-    public async Task Invoke(HttpContext context, MetaWeblogService service)
-    {
-        if (context.Request.Method == "POST" &&
-            context.Request.Path.StartsWithSegments(urlEndpoint) &&
-            context.Request.ContentType.ToLower().Contains("text/xml"))
-        {
-            try
-            {
-                context.Response.ContentType = "text/xml";
-                var rdr = new StreamReader(context.Request.Body);
-                var xml = await rdr.ReadToEndAsync();
-                _logger.LogInformation($"Request XMLRPC: {xml}");
-                var result = await service.InvokeAsync(xml);
-                _logger.LogInformation($"Result XMLRPC: {result}");
-                await context.Response.WriteAsync(result, Encoding.UTF8);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError($"Failed to read the content: {ex}");
-            }
-            return;
-        }
-
-        // Continue On
-        await next.Invoke(context);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/MetaWeblogService.cs b/src/Moonglade.MetaWeblog/MetaWeblogService.cs
deleted file mode 100644
index 919f53094..000000000
--- a/src/Moonglade.MetaWeblog/MetaWeblogService.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace Moonglade.MetaWeblog;
-
-public class MetaWeblogService(IMetaWeblogProvider provider, ILogger<MetaWeblogService> logger)
-    : XmlRpcService(logger)
-{
-    [XmlRpcMethod("blogger.getUsersBlogs")]
-    public async Task<BlogInfo[]> GetUsersBlogsAsync(string key, string username, string password)
-    {
-        logger.LogInformation($"MetaWeblog:GetUserBlogs is called");
-        return await provider.GetUsersBlogsAsync(key, username, password);
-    }
-
-    [XmlRpcMethod("blogger.getUserInfo")]
-    public async Task<UserInfo> GetUserInfoAsync(string key, string username, string password)
-    {
-        logger.LogInformation($"MetaWeblog:GetUserInfo is called");
-        return await provider.GetUserInfoAsync(key, username, password);
-    }
-
-    [XmlRpcMethod("wp.newCategory")]
-    public async Task<int> AddCategoryAsync(string key, string username, string password, NewCategory category)
-    {
-        logger.LogInformation($"MetaWeblog:AddCategory is called");
-        return await provider.AddCategoryAsync(key, username, password, category);
-    }
-
-    [XmlRpcMethod("metaWeblog.getPost")]
-    public async Task<Post> GetPostAsync(string postid, string username, string password)
-    {
-        logger.LogInformation($"MetaWeblog:GetPost is called");
-        return await provider.GetPostAsync(postid, username, password);
-    }
-
-    [XmlRpcMethod("metaWeblog.getRecentPosts")]
-    public async Task<Post[]> GetRecentPostsAsync(string blogid, string username, string password, int numberOfPosts)
-    {
-        logger.LogInformation($"MetaWeblog:GetRecentPosts is called");
-        return await provider.GetRecentPostsAsync(blogid, username, password, numberOfPosts);
-    }
-
-    [XmlRpcMethod("metaWeblog.newPost")]
-    public async Task<string> AddPostAsync(string blogid, string username, string password, Post post, bool publish)
-    {
-        logger.LogInformation($"MetaWeblog:AddPost is called");
-        return await provider.AddPostAsync(blogid, username, password, post, publish);
-    }
-
-    [XmlRpcMethod("metaWeblog.editPost")]
-    public async Task<bool> EditPostAsync(string postid, string username, string password, Post post, bool publish)
-    {
-        logger.LogInformation($"MetaWeblog:EditPost is called");
-        return await provider.EditPostAsync(postid, username, password, post, publish);
-    }
-
-    [XmlRpcMethod("blogger.deletePost")]
-    public async Task<bool> DeletePostAsync(string key, string postid, string username, string password, bool publish)
-    {
-        logger.LogInformation($"MetaWeblog:DeletePost is called");
-        return await provider.DeletePostAsync(key, postid, username, password, publish);
-    }
-
-    [XmlRpcMethod("metaWeblog.getCategories")]
-    public async Task<CategoryInfo[]> GetCategoriesAsync(string blogid, string username, string password)
-    {
-        logger.LogInformation($"MetaWeblog:GetCategories is called");
-        return await provider.GetCategoriesAsync(blogid, username, password);
-    }
-
-    [XmlRpcMethod("wp.getTags")]
-    public async Task<Tag[]> GetTagsAsync(string blogid, string username, string password)
-    {
-        logger.LogInformation($"MetaWeblog:GetTagsAsync is called");
-        return await provider.GetTagsAsync(blogid, username, password);
-    }
-
-    [XmlRpcMethod("metaWeblog.newMediaObject")]
-    public async Task<MediaObjectInfo> NewMediaObjectAsync(string blogid, string username, string password, MediaObject mediaObject)
-    {
-        logger.LogInformation($"MetaWeblog:NewMediaObject is called");
-        return await provider.NewMediaObjectAsync(blogid, username, password, mediaObject);
-    }
-
-    [XmlRpcMethod("wp.getPage")]
-    public async Task<Page> GetPageAsync(string blogid, string pageid, string username, string password)
-    {
-        logger.LogInformation($"wp.getPage is called");
-        return await provider.GetPageAsync(blogid, pageid, username, password);
-    }
-
-    [XmlRpcMethod("wp.getPages")]
-    public async Task<Page[]> GetPagesAsync(string blogid, string username, string password, int numPages)
-    {
-        logger.LogInformation($"wp.getPages is called");
-        return await provider.GetPagesAsync(blogid, username, password, numPages);
-    }
-
-    [XmlRpcMethod("wp.getAuthors")]
-    public async Task<Author[]> GetAuthorsAsync(string blogid, string username, string password)
-    {
-        logger.LogInformation($"wp.getAuthors is called");
-        return await provider.GetAuthorsAsync(blogid, username, password);
-    }
-
-    [XmlRpcMethod("wp.newPage")]
-    public async Task<string> AddPageAsync(string blogid, string username, string password, Page page, bool publish)
-    {
-        logger.LogInformation($"wp.newPage is called");
-        return await provider.AddPageAsync(blogid, username, password, page, publish);
-    }
-
-    [XmlRpcMethod("wp.editPage")]
-    public async Task<bool> EditPageAsync(string blogid, string pageid, string username, string password, Page page, bool publish)
-    {
-        logger.LogInformation($"wp.editPage is called");
-        return await provider.EditPageAsync(blogid, pageid, username, password, page, publish);
-    }
-
-    [XmlRpcMethod("wp.deletePage")]
-    public async Task<bool> DeletePageAsync(string blogid, string username, string password, string pageid)
-    {
-        logger.LogInformation($"wp.deletePage is called");
-        return await provider.DeletePageAsync(blogid, username, password, pageid);
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/Moonglade.MetaWeblog.csproj b/src/Moonglade.MetaWeblog/Moonglade.MetaWeblog.csproj
deleted file mode 100644
index beb10f8f7..000000000
--- a/src/Moonglade.MetaWeblog/Moonglade.MetaWeblog.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Description>Continue to maintain https://github.com/shawnwildermuth/MetaWeblog</Description>
-    </PropertyGroup>
-    <ItemGroup>
-        <Using Include="System.Text" />
-    </ItemGroup>
-    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
-</Project>
diff --git a/src/Moonglade.MetaWeblog/Structs.cs b/src/Moonglade.MetaWeblog/Structs.cs
deleted file mode 100644
index 7ec9bf336..000000000
--- a/src/Moonglade.MetaWeblog/Structs.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// ReSharper disable InconsistentNaming
-namespace Moonglade.MetaWeblog;
-
-public class BlogInfo
-{
-    public string blogid;
-    public string url;
-    public string blogName;
-}
-
-public class CategoryInfo
-{
-    public string description;
-    public string htmlUrl;
-    public string rssUrl;
-    public string title;
-    public string categoryid;
-}
-
-public class NewCategory
-{
-    public string name;
-    public int parent_id;
-    public string slug;
-    public string description;
-}
-
-public class Tag
-{
-    public string name;
-}
-
-public class Enclosure
-{
-    public int length;
-    public string type;
-    public string url;
-}
-
-public class Post
-{
-    public DateTime dateCreated;
-    public string description;
-    public string title;
-    public string[] categories;
-    public string permalink;
-    public object postid;
-    public string userid;
-    public string wp_slug;
-    public string mt_excerpt;
-    public string mt_keywords;
-    public string link;
-    public string wp_post_thumbnail;
-    public int mt_allow_comments;
-    public string mt_basename;
-}
-
-public class Source
-{
-    public string name;
-    public string url;
-}
-
-public class UserInfo
-{
-    public string userid;
-    public string firstname;
-    public string lastname;
-    public string nickname;
-    public string email;
-    public string url;
-}
-
-public class MediaObject
-{
-    public string name;
-    public string type;
-    public string bits;
-}
-
-public class MediaObjectInfo
-{
-    public string url;
-}
-
-public class Page
-{
-    public DateTime dateCreated;
-    public string description;
-    public string title;
-    public string[] categories;
-    public string wp_author_id;
-    public string page_parent_id;
-    public string page_id;
-}
-
-public class Author
-{
-    public string user_id;
-    public string user_login;
-    public string display_name;
-    public string meta_value;
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/XmlRpcMethodAttribute.cs b/src/Moonglade.MetaWeblog/XmlRpcMethodAttribute.cs
deleted file mode 100644
index 869d5f133..000000000
--- a/src/Moonglade.MetaWeblog/XmlRpcMethodAttribute.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Moonglade.MetaWeblog;
-
-public class XmlRpcMethodAttribute(string methodName) : Attribute
-{
-    public string MethodName { get; set; } = methodName;
-}
\ No newline at end of file
diff --git a/src/Moonglade.MetaWeblog/XmlRpcService.cs b/src/Moonglade.MetaWeblog/XmlRpcService.cs
deleted file mode 100644
index d3d109dbc..000000000
--- a/src/Moonglade.MetaWeblog/XmlRpcService.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Collections;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Xml.Linq;
-
-namespace Moonglade.MetaWeblog;
-
-public class XmlRpcService(ILogger logger)
-{
-    private string _method;
-
-    public async Task<string> InvokeAsync(string xml)
-    {
-        try
-        {
-            var doc = XDocument.Parse(xml);
-            var methodNameElement = doc
-                .Descendants("methodName")
-                .FirstOrDefault();
-            if (methodNameElement != null)
-            {
-                _method = methodNameElement.Value;
-
-                logger.LogDebug($"Invoking {_method} on XMLRPC Service");
-
-                var theType = GetType();
-
-                foreach (var typeMethod in theType.GetMethods())
-                {
-                    var attr = typeMethod.GetCustomAttribute<XmlRpcMethodAttribute>();
-                    if (attr != null && _method.Equals(attr.MethodName, StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        var parameters = GetParameters(doc);
-                        var resultTask = (Task)typeMethod.Invoke(this, parameters);
-                        if (resultTask != null)
-                        {
-                            await resultTask;
-
-                            // get result via reflection
-                            var resultProperty = resultTask.GetType().GetProperty("Result");
-                            if (resultProperty != null)
-                            {
-                                var result = resultProperty.GetValue(resultTask);
-
-                                return SerializeResponse(result);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        catch (MetaWeblogException ex)
-        {
-            return SerializeResponse(ex);
-        }
-        catch (Exception ex)
-        {
-            logger.LogError($"Exception thrown during serialization: Exception: {ex}");
-            return SerializeResponse(new MetaWeblogException($"Exception during XmlRpcService call: {ex.Message}"));
-        }
-
-        return SerializeResponse(new MetaWeblogException("Failed to handle XmlRpcService call"));
-    }
-
-    private string SerializeResponse(object result)
-    {
-        var doc = new XDocument();
-        var response = new XElement("methodResponse");
-        doc.Add(response);
-
-        if (result is MetaWeblogException exception)
-        {
-            response.Add(SerializeFaultResponse(exception));
-        }
-        else
-        {
-            var theParams = new XElement("params");
-            response.Add(theParams);
-
-            SerializeResponseParameters(theParams, result);
-        }
-
-        return doc.ToString(SaveOptions.None);
-    }
-
-    private XElement SerializeValue(object result)
-    {
-        var theType = result.GetType();
-        var newElement = new XElement("value");
-
-        if (theType == typeof(int))
-        {
-            newElement.Add(new XElement("i4", result.ToString()));
-        }
-        else if (theType == typeof(long))
-        {
-            newElement.Add(new XElement("long", result.ToString()));
-        }
-        else if (theType == typeof(double))
-        {
-            newElement.Add(new XElement("double", result.ToString()));
-        }
-        else if (theType == typeof(bool))
-        {
-            newElement.Add(new XElement("boolean", ((bool)result) ? 1 : 0));
-        }
-        else if (theType == typeof(string))
-        {
-            newElement.Add(new XElement("string", result.ToString()));
-        }
-        else if (theType == typeof(DateTime))
-        {
-            var date = (DateTime)result;
-            newElement.Add(new XElement("dateTime.iso8601", date.ToString("yyyyMMdd'T'HH':'mm':'ss",
-                DateTimeFormatInfo.InvariantInfo)));
-        }
-        else if (result is IEnumerable enumerable)
-        {
-            var data = new XElement("data");
-            foreach (var item in enumerable)
-            {
-                data.Add(SerializeValue(item));
-            }
-            newElement.Add(new XElement("array", data));
-        }
-        else
-        {
-            var theStruct = new XElement("struct");
-            // Reference Type
-            foreach (var field in theType.GetFields(BindingFlags.Public | BindingFlags.Instance))
-            {
-                var member = new XElement("member");
-                member.Add(new XElement("name", field.Name));
-                var value = field.GetValue(result);
-                if (value != null)
-                {
-                    member.Add(SerializeValue(value));
-                    theStruct.Add(member);
-                }
-            }
-            newElement.Add(theStruct);
-        }
-
-        return newElement;
-    }
-
-    private void SerializeResponseParameters(XElement theParams, object result)
-    {
-        theParams.Add(new XElement("param", SerializeValue(result)));
-    }
-
-    private XElement CreateStringValue(string typeName, string value)
-    {
-        return new("value", new XElement(typeName, value));
-    }
-
-    private XElement SerializeFaultResponse(MetaWeblogException result)
-    {
-        return new("fault",
-            new XElement("value",
-                new XElement("struct",
-                    new XElement("member",
-                        new XElement("name", "faultCode"),
-                        CreateStringValue("int", result.Code.ToString())),
-                    new XElement("member",
-                        new XElement("name", "faultString"),
-                        CreateStringValue("string", result.Message)))
-            ));
-    }
-
-    private object[] GetParameters(XDocument doc)
-    {
-        var parameters = new List<object>();
-        var paramsEle = doc.Descendants("params");
-
-        foreach (var p in paramsEle.Descendants("param"))
-        {
-            parameters.AddRange(ParseValue(p.Element("value")));
-        }
-
-        return parameters.ToArray();
-    }
-
-    private List<object> ParseValue(XElement value)
-    {
-        var type = value.Descendants().FirstOrDefault();
-        if (type != null)
-        {
-            var typename = type.Name.LocalName;
-            switch (typename)
-            {
-                case "array":
-                    return ParseArray(type);
-                case "struct":
-                    return ParseStruct(type);
-                case "i4":
-                case "int":
-                    return ParseInt(type);
-                case "i8":
-                    return ParseLong(type);
-                case "string":
-                    return ParseString(type);
-                case "boolean":
-                    return ParseBoolean(type);
-                case "double":
-                    return ParseDouble(type);
-                case "dateTime.iso8601":
-                    return ParseDateTime(type);
-                case "base64":
-                    return ParseBase64(type);
-            }
-        }
-
-        throw new MetaWeblogException("Failed to parse parameters");
-
-    }
-
-    private List<object> ParseBase64(XElement type)
-    {
-        return [type.Value];
-    }
-
-    private List<object> ParseLong(XElement type)
-    {
-        return [long.Parse(type.Value)];
-    }
-
-    private List<object> ParseDateTime(XElement type)
-    {
-        if (DateTime8601.TryParseDateTime8601(type.Value, out var parsed))
-        {
-            return [parsed];
-        }
-
-        throw new MetaWeblogException("Failed to parse date");
-    }
-
-    private static List<object> ParseBoolean(XElement type)
-    {
-        return [type.Value == "1"];
-    }
-
-    private static List<object> ParseString(XElement type)
-    {
-        return [type.Value];
-    }
-
-    private List<object> ParseDouble(XElement type)
-    {
-        return [double.Parse(type.Value)];
-    }
-
-    private List<object> ParseInt(XElement type)
-    {
-        return [int.Parse(type.Value)];
-    }
-
-    private List<object> ParseStruct(XElement type)
-    {
-        var dict = new Dictionary<string, object>();
-        var members = type.Descendants("member");
-        foreach (var member in members)
-        {
-            var name = member.Element("name").Value;
-            var value = ParseValue(member.Element("value"));
-            dict[name] = value;
-        }
-
-        return _method switch
-        {
-            "metaWeblog.newMediaObject" => ConvertToType<MediaObject>(dict),
-            "metaWeblog.newPost" or "metaWeblog.editPost" => ConvertToType<Post>(dict),
-            "wp.newCategory" => ConvertToType<NewCategory>(dict),
-            "wp.newPage" or "wp.editPage" => ConvertToType<Page>(dict),
-            _ => throw new InvalidOperationException("Unknown type of struct discovered."),
-        };
-    }
-
-    private List<object> ConvertToType<T>(Dictionary<string, object> dict) where T : new()
-    {
-        var info = typeof(T).GetTypeInfo();
-
-        // Convert it
-        var result = new T();
-        foreach (var key in dict.Keys)
-        {
-            var field = info.GetDeclaredField(key);
-            if (field != null)
-            {
-                var container = (List<object>)dict[key];
-                var value = container.Count == 1 ? container.First() : container.ToArray();
-                if (field.FieldType != value.GetType())
-                {
-                    if (field.FieldType.IsArray && value.GetType().IsArray)
-                    {
-                        var valueArray = (Array)value;
-                        var newValue = Array.CreateInstance(field.FieldType.GetElementType(), valueArray.Length);
-                        Array.Copy(valueArray, newValue, valueArray.Length);
-                        value = newValue;
-                    }
-                    else if (value.GetType().IsAssignableFrom(field.FieldType))
-                    {
-                        value = Convert.ChangeType(value, field.FieldType);
-                    }
-                    else
-                    {
-                        logger.LogWarning($"Skipping conversion to type as not supported: {field.FieldType.Name}");
-                        continue;
-                    }
-                }
-                field.SetValue(result, value);
-            }
-            else
-            {
-                logger.LogWarning($"Skipping field {key} when converting to {typeof(T).Name}");
-            }
-        }
-
-        Debug.WriteLine(result);
-
-        return [result];
-    }
-
-    private List<object> ParseArray(XElement type)
-    {
-        try
-        {
-            var result = new List<object>();
-            var data = type.Element("data");
-            if (data != null)
-            {
-                foreach (var ele in data.Elements())
-                {
-                    result.AddRange(ParseValue(ele));
-                }
-            }
-
-            return [result.ToArray()]; // make an array;
-        }
-        catch (Exception)
-        {
-            logger.LogCritical($"Failed to Parse Array: {type}");
-            throw;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index 70a7a78c1..a28b86a4a 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -122,16 +122,6 @@ public static string GetMd5Hash(string input)
         return sBuilder.ToString();
     }
 
-    public static string HashPassword(string plainMessage)
-    {
-        if (string.IsNullOrWhiteSpace(plainMessage)) return string.Empty;
-
-        var data = Encoding.UTF8.GetBytes(plainMessage);
-        using var sha = SHA256.Create();
-        sha.TransformFinalBlock(data, 0, data.Length);
-        return Convert.ToBase64String(sha.Hash ?? throw new InvalidOperationException());
-    }
-
     // https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/consumer-apis/password-hashing?view=aspnetcore-6.0
     // This is not secure, but better than nothing.
     public static string HashPassword2(string clearPassword, string saltBase64)
diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index 24c9887be..1a5b355ec 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -148,10 +148,6 @@ public async Task<IActionResult> Image(ImageSettings model, IBlogImageStorage im
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public async Task<IActionResult> Advanced(AdvancedSettings model)
     {
-        model.MetaWeblogPasswordHash = !string.IsNullOrWhiteSpace(model.MetaWeblogPassword) ?
-            Helper.HashPassword(model.MetaWeblogPassword) :
-            blogConfig.AdvancedSettings.MetaWeblogPasswordHash;
-
         blogConfig.AdvancedSettings = model;
 
         await SaveConfigAsync(blogConfig.AdvancedSettings);
diff --git a/src/Moonglade.Web/MetaWeblogService.cs b/src/Moonglade.Web/MetaWeblogService.cs
deleted file mode 100644
index 6911274d3..000000000
--- a/src/Moonglade.Web/MetaWeblogService.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-using Moonglade.Core.CategoryFeature;
-using Moonglade.Core.PageFeature;
-using Moonglade.Core.PostFeature;
-using Moonglade.Core.TagFeature;
-using Moonglade.MetaWeblog;
-using Post = Moonglade.MetaWeblog.Post;
-using Tag = Moonglade.MetaWeblog.Tag;
-
-namespace Moonglade.Web;
-
-public class MetaWeblogService(IBlogConfig blogConfig,
-        ILogger<MetaWeblogService> logger,
-        IBlogImageStorage blogImageStorage,
-        IFileNameGenerator fileNameGenerator,
-        IMediator mediator)
-    : IMetaWeblogProvider
-{
-    public Task<UserInfo> GetUserInfoAsync(string key, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecute(() =>
-        {
-            var user = new UserInfo
-            {
-                email = blogConfig.GeneralSettings.OwnerEmail,
-                firstname = blogConfig.GeneralSettings.OwnerName,
-                lastname = string.Empty,
-                nickname = string.Empty,
-                url = blogConfig.GeneralSettings.CanonicalPrefix,
-                userid = key
-            };
-
-            return Task.FromResult(user);
-        });
-    }
-
-    public Task<BlogInfo[]> GetUsersBlogsAsync(string key, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecute(() =>
-        {
-            var blog = new BlogInfo
-            {
-                blogid = blogConfig.GeneralSettings.SiteTitle,
-                blogName = blogConfig.GeneralSettings.SiteTitle,
-                url = "/"
-            };
-
-            return Task.FromResult(new[] { blog });
-        });
-    }
-
-    public Task<Post> GetPostAsync(string postid, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(postid.Trim(), out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(postid));
-            }
-
-            var post = await mediator.Send(new GetPostByIdQuery(id));
-            return ToMetaWeblogPost(post);
-        });
-    }
-
-    public async Task<Post[]> GetRecentPostsAsync(string blogid, string username, string password, int numberOfPosts)
-    {
-        EnsureUser(username, password);
-        await Task.CompletedTask;
-
-        return TryExecute(() =>
-        {
-            if (numberOfPosts < 0) throw new ArgumentOutOfRangeException(nameof(numberOfPosts));
-
-            // TODO: Get recent posts
-            return Array.Empty<Post>();
-        });
-    }
-
-    public Task<string> AddPostAsync(string blogid, string username, string password, Post post, bool publish)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            var cids = await GetCatIds(post.categories);
-            if (cids.Length == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(post.categories));
-            }
-
-            var req = new PostEditModel
-            {
-                Title = post.title,
-                Slug = post.wp_slug ?? ToSlug(post.title),
-                EditorContent = post.description,
-                Tags = post.mt_keywords,
-                SelectedCatIds = cids,
-                LanguageCode = "en-us",
-                IsPublished = publish,
-                EnableComment = true,
-                FeedIncluded = true,
-                PublishDate = DateTime.UtcNow
-            };
-
-            var p = await mediator.Send(new CreatePostCommand(req));
-            return p.Id.ToString();
-        });
-    }
-
-    public Task<bool> DeletePostAsync(string key, string postid, string username, string password, bool publish)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(postid.Trim(), out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(postid));
-            }
-
-            await mediator.Send(new DeletePostCommand(id, publish));
-            return true;
-        });
-    }
-
-    public Task<bool> EditPostAsync(string postid, string username, string password, Post post, bool publish)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(postid.Trim(), out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(postid));
-            }
-
-            var cids = await GetCatIds(post.categories);
-            if (cids.Length == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(post.categories));
-            }
-
-            var req = new PostEditModel
-            {
-                Title = post.title,
-                Slug = post.wp_slug ?? ToSlug(post.title),
-                EditorContent = post.description,
-                Tags = post.mt_keywords,
-                SelectedCatIds = cids,
-                LanguageCode = "en-us",
-                IsPublished = publish,
-                EnableComment = true,
-                FeedIncluded = true,
-                PublishDate = DateTime.UtcNow
-            };
-
-            await mediator.Send(new UpdatePostCommand(id, req));
-            return true;
-        });
-    }
-
-    public Task<CategoryInfo[]> GetCategoriesAsync(string blogid, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            var cats = await mediator.Send(new GetCategoriesQuery());
-            var catInfos = cats.Select(p => new CategoryInfo
-            {
-                title = p.DisplayName,
-                categoryid = p.Id.ToString(),
-                description = p.Note,
-                htmlUrl = $"/category/{p.Slug}",
-                rssUrl = $"/rss/{p.Slug}"
-            }).ToArray();
-
-            return catInfos;
-        });
-    }
-
-    public Task<int> AddCategoryAsync(string key, string username, string password, NewCategory category)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            await mediator.Send(new CreateCategoryCommand
-            {
-                DisplayName = category.name.Trim(),
-                Slug = category.slug.ToLower(),
-                Note = category.description.Trim()
-            });
-
-            return 996;
-        });
-    }
-
-    public Task<Tag[]> GetTagsAsync(string blogid, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            var names = await mediator.Send(new GetTagNamesQuery());
-            var tags = names.Select(p => new Tag
-            {
-                name = p
-            }).ToArray();
-
-            return tags;
-        });
-    }
-
-    public Task<MediaObjectInfo> NewMediaObjectAsync(string blogid, string username, string password, MediaObject mediaObject)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            // TODO: Check extension names
-
-            var bits = Convert.FromBase64String(mediaObject.bits);
-
-            var pFilename = fileNameGenerator.GetFileName(mediaObject.name);
-            var filename = await blogImageStorage.InsertAsync(pFilename, bits);
-
-            var imageUrl = $"{Helper.ResolveRootUrl(null, blogConfig.GeneralSettings.CanonicalPrefix, true)}image/{filename}";
-
-            var objectInfo = new MediaObjectInfo { url = imageUrl };
-            return objectInfo;
-        });
-    }
-
-    public Task<Page> GetPageAsync(string blogid, string pageid, string username, string password)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(pageid, out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(pageid));
-            }
-
-            var page = await mediator.Send(new GetPageByIdQuery(id));
-            return ToMetaWeblogPage(page);
-        });
-    }
-
-    public Task<Page[]> GetPagesAsync(string blogid, string username, string password, int numPages)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (numPages < 0) throw new ArgumentOutOfRangeException(nameof(numPages));
-
-            var pages = await mediator.Send(new GetPagesQuery(numPages));
-            var mPages = pages.Select(ToMetaWeblogPage);
-
-            return mPages.ToArray();
-        });
-    }
-
-    public async Task<Author[]> GetAuthorsAsync(string blogid, string username, string password)
-    {
-        EnsureUser(username, password);
-        await Task.CompletedTask;
-
-        return TryExecute(() =>
-        {
-            return new[]
-            {
-                new Author
-                {
-                    display_name = blogConfig.GeneralSettings.OwnerName
-                }
-            };
-        });
-    }
-
-    public Task<string> AddPageAsync(string blogid, string username, string password, Page page, bool publish)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            var pageRequest = new EditPageRequest
-            {
-                Title = page.title,
-                HideSidebar = true,
-                MetaDescription = string.Empty,
-                RawHtmlContent = page.description,
-                CssContent = string.Empty,
-                IsPublished = publish,
-                Slug = ToSlug(page.title)
-            };
-
-            var uid = await mediator.Send(new CreatePageCommand(pageRequest));
-            return uid.ToString();
-        });
-    }
-
-    public Task<bool> EditPageAsync(string blogid, string pageid, string username, string password, Page page, bool publish)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(pageid, out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(pageid));
-            }
-
-            var pageRequest = new EditPageRequest
-            {
-                Title = page.title,
-                HideSidebar = true,
-                MetaDescription = string.Empty,
-                RawHtmlContent = page.description,
-                CssContent = string.Empty,
-                IsPublished = publish,
-                Slug = ToSlug(page.title)
-            };
-
-            await mediator.Send(new UpdatePageCommand(id, pageRequest));
-            return true;
-        });
-    }
-
-    public Task<bool> DeletePageAsync(string blogid, string username, string password, string pageid)
-    {
-        EnsureUser(username, password);
-
-        return TryExecuteAsync(async () =>
-        {
-            if (!Guid.TryParse(pageid, out var id))
-            {
-                throw new ArgumentException("Invalid ID", nameof(pageid));
-            }
-
-            await mediator.Send(new DeletePageCommand(id));
-            return true;
-        });
-    }
-
-    private void EnsureUser(string username, string password)
-    {
-        if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
-        {
-            throw new ArgumentNullException(nameof(password));
-        }
-
-        var pwdHash = Helper.HashPassword(password.Trim());
-
-        if (string.Compare(username.Trim(), "moonglade", StringComparison.Ordinal) == 0 &&
-            string.Compare(pwdHash, blogConfig.AdvancedSettings.MetaWeblogPasswordHash.Trim(), StringComparison.Ordinal) == 0) return;
-
-        throw new MetaWeblogException("Authentication failed.");
-    }
-
-    private string ToSlug(string title)
-    {
-        var engSlug = title.GenerateSlug();
-        if (!string.IsNullOrWhiteSpace(engSlug)) return engSlug;
-
-        // Chinese and other language title
-        var bytes = Encoding.Unicode.GetBytes(title);
-        var hexArray = bytes.Select(b => $"{b:x2}");
-        var hexName = string.Join(string.Empty, hexArray);
-
-        return hexName;
-    }
-
-    private Post ToMetaWeblogPost(Core.PostFeature.Post post)
-    {
-        if (!post.IsPublished) return null;
-        var pubDate = post.PubDateUtc.GetValueOrDefault();
-        var link = $"/post/{pubDate.Year}/{pubDate.Month}/{pubDate.Day}/{post.Slug.Trim().ToLower()}";
-
-        var mPost = new Post
-        {
-            postid = post.Id,
-            categories = post.Categories.Select(p => p.DisplayName).ToArray(),
-            dateCreated = post.CreateTimeUtc,
-            description = post.ContentAbstract,
-            link = link,
-            permalink = $"{Helper.ResolveRootUrl(null, blogConfig.GeneralSettings.CanonicalPrefix, true)}/{link}",
-            title = post.Title,
-            wp_slug = post.Slug,
-            mt_keywords = string.Join(',', post.Tags.Select(p => p.DisplayName)),
-            mt_excerpt = post.ContentAbstract,
-            userid = blogConfig.GeneralSettings.OwnerName
-        };
-
-        return mPost;
-    }
-
-    private Page ToMetaWeblogPage(BlogPage blogPage)
-    {
-        var mPage = new Page
-        {
-            title = blogPage.Title,
-            description = blogPage.RawHtmlContent,
-            dateCreated = blogPage.CreateTimeUtc,
-            categories = Array.Empty<string>(),
-            page_id = blogPage.Id.ToString(),
-            wp_author_id = blogConfig.GeneralSettings.OwnerName
-        };
-
-        return mPage;
-    }
-
-    private async Task<Guid[]> GetCatIds(string[] mPostCategories)
-    {
-        var allCats = await mediator.Send(new GetCategoriesQuery());
-        var cids = (from postCategory in mPostCategories
-                    select allCats.FirstOrDefault(category => category.DisplayName == postCategory)
-            into cat
-                    where null != cat
-                    select cat.Id).ToArray();
-
-        return cids;
-    }
-
-    private T TryExecute<T>(Func<T> action)
-    {
-        try
-        {
-            return action();
-        }
-        catch (Exception e)
-        {
-            logger.LogError(e, e.Message);
-            throw new MetaWeblogException(e.Message);
-        }
-    }
-
-    private async Task<T> TryExecuteAsync<T>(Func<Task<T>> func)
-    {
-        try
-        {
-            return await func();
-        }
-        catch (Exception e)
-        {
-            logger.LogError(e, e.Message);
-            throw new MetaWeblogException(e.Message);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Middleware/RSDMiddleware.cs b/src/Moonglade.Web/Middleware/RSDMiddleware.cs
deleted file mode 100644
index e03010711..000000000
--- a/src/Moonglade.Web/Middleware/RSDMiddleware.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Xml;
-
-namespace Moonglade.Web.Middleware;
-
-// Really Simple Discovery (RSD) is a protocol or method that makes it easier for client software to automatically discover the API endpoint needed to interact with a web service. It's primarily used in the context of blog software and content management systems (CMS).
-// 
-// RSD allows client applications, like blog editors and content aggregators, to find the services needed to read, edit, or work with the content of a website without the user having to manually input the details of the API endpoints. For example, if you're using a desktop blogging application, RSD would enable that application to find the endpoint for the XML-RPC API of your blog so you can post directly from your desktop.
-
-public class RSDMiddleware(RequestDelegate next)
-{
-    public async Task Invoke(HttpContext httpContext, IBlogConfig blogConfig)
-    {
-        if (httpContext.Request.Path == "/rsd")
-        {
-            var siteRootUrl = Helper.ResolveRootUrl(httpContext, blogConfig.GeneralSettings.CanonicalPrefix, true);
-            var xml = await GetRSDData(siteRootUrl);
-
-            httpContext.Response.ContentType = "text/xml";
-            await httpContext.Response.WriteAsync(xml, httpContext.RequestAborted);
-        }
-        else
-        {
-            await next(httpContext);
-        }
-    }
-
-    private static async Task<string> GetRSDData(string siteRootUrl)
-    {
-        var sb = new StringBuilder();
-
-        var writerSettings = new XmlWriterSettings { Encoding = Encoding.UTF8, Async = true };
-        await using (var writer = XmlWriter.Create(sb, writerSettings))
-        {
-            await writer.WriteStartDocumentAsync();
-
-            // Rsd tag
-            writer.WriteStartElement("rsd");
-            writer.WriteAttributeString("version", "1.0");
-
-            // Service 
-            writer.WriteStartElement("service");
-            writer.WriteElementString("engineName", $"Moonglade {Helper.AppVersion}");
-            writer.WriteElementString("engineLink", "https://github.com/EdiWang/Moonglade");
-            writer.WriteElementString("homePageLink", siteRootUrl);
-
-            // APIs
-            writer.WriteStartElement("apis");
-
-            // MetaWeblog
-            writer.WriteStartElement("api");
-            writer.WriteAttributeString("name", "MetaWeblog");
-            writer.WriteAttributeString("preferred", "true");
-            writer.WriteAttributeString("apiLink", $"{siteRootUrl}metaweblog");
-            writer.WriteAttributeString("blogID", siteRootUrl);
-            await writer.WriteEndElementAsync();
-
-            // End APIs
-            await writer.WriteEndElementAsync();
-
-            // End Service
-            await writer.WriteEndElementAsync();
-
-            // End Rsd
-            await writer.WriteEndElementAsync();
-
-            await writer.WriteEndDocumentAsync();
-        }
-
-        var xml = sb.ToString();
-        return xml;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Moonglade.Web.csproj b/src/Moonglade.Web/Moonglade.Web.csproj
index 5c5b0eb6c..d530fc6cd 100644
--- a/src/Moonglade.Web/Moonglade.Web.csproj
+++ b/src/Moonglade.Web/Moonglade.Web.csproj
@@ -50,7 +50,6 @@
     <ProjectReference Include="..\Moonglade.FriendLink\Moonglade.FriendLink.csproj" />
     <ProjectReference Include="..\Moonglade.ImageStorage\Moonglade.ImageStorage.csproj" />
     <ProjectReference Include="..\Moonglade.Email.Client\Moonglade.Email.Client.csproj" />
-    <ProjectReference Include="..\Moonglade.MetaWeblog\Moonglade.MetaWeblog.csproj" />
     <ProjectReference Include="..\Moonglade.Pingback\Moonglade.Pingback.csproj" />
     <ProjectReference Include="..\Moonglade.Syndication\Moonglade.Syndication.csproj" />
     <ProjectReference Include="..\Moonglade.Theme\Moonglade.Theme.csproj" />
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 140f59241..66bc8c6b4 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Text.Encodings.Web;
+using System.Text.Encodings.Web;
 
 namespace Moonglade.Web.PagedList;
 
diff --git a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
index 944defddb..fecef98e9 100644
--- a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
+++ b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
@@ -92,13 +92,6 @@
             });
         });
 
-        window.generateMetaWeblogPasswordHash = function () {
-            callApi('/api/settings/password/generate', 'GET', {}, async (resp) => {
-                var data = await resp.json();
-                $('#settings_MetaWeblogPasswordHash').val(data.password);
-            });
-        }
-
         const form = document.querySelector('#form-settings');
         form.addEventListener('submit', settings.handleSettingsSubmit);
     </script>
@@ -206,46 +199,6 @@
                         </div>
                     </div>
                 </div>
-
-                <h4 class="admin-subtitle fw-bold mb-2">
-                    MetaWeblog
-                </h4>
-
-                <div class="settings-entry2 row align-items-center py-3 px-2 rounded-3 shadow-sm border bg-white mb-2">
-                    <div class="col-auto">
-                        <i class="bi-puzzle settings-entry-icon"></i>
-                    </div>
-                    <div class="col">
-                        <label asp-for="@settings.EnableMetaWeblog" class="form-check-label"></label>
-                        <div class="form-text">
-                            @SharedLocalizer["* Requires restarting application"]
-                        </div>
-                    </div>
-                    <div class="col-md-4 text-end">
-                        <div class="form-check form-switch form-control-lg">
-                            <input type="hidden" name="EnableMetaWeblog" value="false">
-                            <input type="checkbox" name="EnableMetaWeblog" value="true" class="form-check-input" @(settings.EnableMetaWeblog ? "checked" : null)>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="settings-entry2 row align-items-center py-3 px-2 rounded-3 shadow-sm border bg-white">
-                    <div class="col-auto">
-                        <i class="bi-key settings-entry-icon"></i>
-                    </div>
-                    <div class="col">
-                        @SharedLocalizer["Password"]
-                        <div class="form-text">
-                            @SharedLocalizer["Leave blank if you don't need to change password."]
-                            @SharedLocalizer["* Username: moonglade"]
-                        </div>
-                    </div>
-                    <div class="col-md-4">
-                        <input asp-for="@settings.MetaWeblogPassword" class="form-control" minlength="8" maxlength="16" />
-
-                        <a href="javascript:;" class="btn btn-sm btn-outline-accent mt-2" onclick="generateMetaWeblogPasswordHash()">@SharedLocalizer["Generate password"]</a>
-                    </div>
-                </div>
             </div>
             <div class="col-md-6">
                 <div class="mb-3">
diff --git a/src/Moonglade.Web/Pages/Shared/_Layout.cshtml b/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
index 50108995e..fc7b0a346 100644
--- a/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_Layout.cshtml
@@ -73,10 +73,6 @@
         <opensearch href="/opensearch" title="@BlogConfig.GeneralSettings.SiteTitle" />
     }
 
-    @if (BlogConfig.AdvancedSettings.EnableMetaWeblog)
-    {
-        <rsd href="/rsd" />
-    }
     @if (BlogConfig.AdvancedSettings.EnableFoaf)
     {
         <foaf href="/foaf.xml" />
diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index 1e966c66c..b22502c4a 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -9,7 +9,6 @@
 using Moonglade.Data.PostgreSql;
 using Moonglade.Data.SqlServer;
 using Moonglade.Email.Client;
-using Moonglade.MetaWeblog;
 using Moonglade.Pingback;
 using Moonglade.Syndication;
 using SixLabors.Fonts;
@@ -101,7 +100,6 @@ void ConfigureServices(IServiceCollection services)
     services.AddPingback()
             .AddSyndication()
             .AddInMemoryCacheAside()
-            .AddMetaWeblog<Moonglade.Web.MetaWeblogService>()
             .AddScoped<ValidateCaptcha>()
             .AddScoped<ITimeZoneResolver, BlogTimeZoneResolver>()
             .AddBlogConfig()
@@ -161,11 +159,6 @@ void ConfigureMiddleware()
         appBuilder => appBuilder.UseMiddleware<FoafMiddleware>()
     );
 
-    app.UseWhen(
-        _ => bc.AdvancedSettings.EnableMetaWeblog,
-        appBuilder => appBuilder.UseMiddleware<RSDMiddleware>().UseMetaWeblog("/metaweblog")
-    );
-
     app.UseWhen(
         ctx => bc.AdvancedSettings.EnableSiteMap && ctx.Request.Path == "/sitemap.xml",
         appBuilder => appBuilder.UseMiddleware<SiteMapMiddleware>()
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index c52cad39a..7150749e5 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -378,9 +378,6 @@
   <data name="Enable Gravatar in comment list" xml:space="preserve">
     <value>在评论列表中开启Gravatar头像</value>
   </data>
-  <data name="Enable MetaWeblog API" xml:space="preserve">
-    <value>启用 MetaWeblog API</value>
-  </data>
   <data name="Enable OpenSearch" xml:space="preserve">
     <value>启用 OpenSearch</value>
   </data>
@@ -519,9 +516,6 @@
   <data name="Meta keyword" xml:space="preserve">
     <value>网站关键词</value>
   </data>
-  <data name="MetaWeblog password" xml:space="preserve">
-    <value>MetaWeblog 密码</value>
-  </data>
   <data name="Moonglade Configuration" xml:space="preserve">
     <value>Moonglade 配置</value>
   </data>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hant.resx b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
index 4863aa0d2..10a63c3a8 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hant.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
@@ -358,9 +358,6 @@
   <data name="Enable Gravatar in comment list" xml:space="preserve">
     <value>在評論清單中開啟Gravatar頭像</value>
   </data>
-  <data name="Enable MetaWeblog API" xml:space="preserve">
-    <value>啟用MetaWeblog API</value>
-  </data>
   <data name="Enable OpenSearch" xml:space="preserve">
     <value>啟用OpenSearch</value>
   </data>
@@ -499,9 +496,6 @@
   <data name="Meta keyword" xml:space="preserve">
     <value>網站關鍵字</value>
   </data>
-  <data name="MetaWeblog password" xml:space="preserve">
-    <value>MetaWeblog 密碼</value>
-  </data>
   <data name="Moonglade Configuration" xml:space="preserve">
     <value>Moonglade 設定</value>
   </data>
diff --git a/src/Moonglade.sln b/src/Moonglade.sln
index a51107f1d..0f84cee8d 100644
--- a/src/Moonglade.sln
+++ b/src/Moonglade.sln
@@ -56,8 +56,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moonglade.Data.MySql", "Moo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moonglade.Data.PostgreSql", "Moonglade.Data.PostgreSql\Moonglade.Data.PostgreSql.csproj", "{5750F136-DD4B-42F8-BA64-2371C2527505}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moonglade.MetaWeblog", "Moonglade.MetaWeblog\Moonglade.MetaWeblog.csproj", "{AB1667E7-70CE-40FA-A729-F4513E39AF50}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,10 +126,6 @@ Global
 		{5750F136-DD4B-42F8-BA64-2371C2527505}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5750F136-DD4B-42F8-BA64-2371C2527505}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5750F136-DD4B-42F8-BA64-2371C2527505}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB1667E7-70CE-40FA-A729-F4513E39AF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB1667E7-70CE-40FA-A729-F4513E39AF50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB1667E7-70CE-40FA-A729-F4513E39AF50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB1667E7-70CE-40FA-A729-F4513E39AF50}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -154,10 +148,9 @@ Global
 		{1ED1FD2A-703E-471D-AEDA-9885748194FF} = {41072B8B-1052-4CC6-930F-83A5F8EA7482}
 		{0267C513-2DB9-4697-A6FA-39BB83E1CA9B} = {41072B8B-1052-4CC6-930F-83A5F8EA7482}
 		{5750F136-DD4B-42F8-BA64-2371C2527505} = {41072B8B-1052-4CC6-930F-83A5F8EA7482}
-		{AB1667E7-70CE-40FA-A729-F4513E39AF50} = {97439361-03B4-46C9-BC06-49F76BA57879}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_CultureCountyOverrides = zh=zh-Hant
 		SolutionGuid = {EBD14882-9899-4C4B-B9BC-22C0B93BD559}
+		RESX_CultureCountyOverrides = zh=zh-Hant
 	EndGlobalSection
 EndGlobal

From de398b19ed39e36348108b37e09b7decae12c62c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:36:41 +0800
Subject: [PATCH 046/227] Update mssql-migration.sql

---
 Deployment/mssql-migration.sql | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Deployment/mssql-migration.sql b/Deployment/mssql-migration.sql
index 517b77e92..1aa9aec1d 100644
--- a/Deployment/mssql-migration.sql
+++ b/Deployment/mssql-migration.sql
@@ -19,4 +19,15 @@ EXEC sys.sp_rename
     @objname = N'Category.RouteName', 
     @newname = 'Slug', 
     @objtype = 'COLUMN'
+GO
+
+IF EXISTS (
+    SELECT 1
+    FROM sys.columns c
+    JOIN sys.objects o ON c.object_id = o.object_id
+    WHERE o.name = 'Post' AND c.name = 'InlineCss'
+)
+BEGIN
+    ALTER TABLE Post DROP COLUMN InlineCss;
+END;
 GO
\ No newline at end of file

From a09065decb93cb260fc981aab70807e9bbf2174b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:48:53 +0800
Subject: [PATCH 047/227] redesign comment form

---
 src/Moonglade.Web/Pages/_CommentForm.cshtml   | 23 ++++++++++---------
 .../Resources/Program.zh-Hans.resx            |  2 +-
 .../Resources/Program.zh-Hant.resx            |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Web/Pages/_CommentForm.cshtml b/src/Moonglade.Web/Pages/_CommentForm.cshtml
index 0341ef2c2..7ff1162f3 100644
--- a/src/Moonglade.Web/Pages/_CommentForm.cshtml
+++ b/src/Moonglade.Web/Pages/_CommentForm.cshtml
@@ -1,22 +1,23 @@
 <form id="comment-form">
     <div>
-        <div class="row g-1 mb-2">
-            <div class="col-md-4">
+        <div class="row mb-2">
+            <div class="col-md-6">
                 <input type="text"
                        class="form-control"
                        placeholder="Your name"
                        id="input-comment-name"
                        required />
             </div>
-            <div class="col-md-8">
-                <input type="email"
-                       class="form-control"
-                       placeholder="Email (Optional)"
-                       id="input-comment-email"
-                       data-bs-toggle="tooltip"
-                       data-placement="top"
-                       title="@SharedLocalizer["Providing your email address can enable blog admin to send notifications for replying your comment. Your email address will also be used to show Gravatar if it has one."]" />
-            </div>
+        </div>
+        <div class="mb-3">
+            <input type="email"
+                   class="form-control"
+                   placeholder="Email (Optional)"
+                   id="input-comment-email" />
+            
+            <span class="text-muted">
+                * @SharedLocalizer["Enter your email to receive reply notifications and display your Gravatar"]
+            </span>
         </div>
         <div class="comment-md-content mb-2">
             <textarea id="input-comment-content"
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index 7150749e5..1dff336db 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -610,7 +610,7 @@
     <value>处理中……</value>
   </data>
   <data name="Providing your email address can enable blog admin to send notifications for replying your comment. Your email address will also be used to show Gravatar if it has one." xml:space="preserve">
-    <value>提供Email地址以让博主回复您评论时发送通知。您的Email地址也会被用来显示Gravatar头像（如果有）。</value>
+    <value>输入您的电子邮件以接收回复通知并显示您的Gravatar头像。</value>
   </data>
   <data name="Publish" xml:space="preserve">
     <value>发布</value>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hant.resx b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
index 10a63c3a8..db98fa25d 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hant.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
@@ -590,7 +590,7 @@
     <value>處理中……</value>
   </data>
   <data name="Providing your email address can enable blog admin to send notifications for replying your comment. Your email address will also be used to show Gravatar if it has one." xml:space="preserve">
-    <value>提供Email位址以讓博主回復您評論時發送通知。 您的Email位址也會被用來顯示Gravatar頭像（如果有）。</value>
+    <value>輸入您的電子郵件以接收回覆通知並顯示您的Gravatar頭像。</value>
   </data>
   <data name="Publish" xml:space="preserve">
     <value>發佈</value>

From cd3a4bee218d04dfc107b35b68e013275f64abaa Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 08:50:37 +0800
Subject: [PATCH 048/227] bump version

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f9940a1e7..54358dfeb 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-preview.1</Version>
+    <Version>14.4.0-preview.2</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From bcc2a4ac1b5331120479bf68194a78da4fa223b8 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 09:11:28 +0800
Subject: [PATCH 049/227] migrate csp to afd

---
 src/Moonglade.Web/web.Release.config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Moonglade.Web/web.Release.config b/src/Moonglade.Web/web.Release.config
index d7e3e6d5f..09d4069e8 100644
--- a/src/Moonglade.Web/web.Release.config
+++ b/src/Moonglade.Web/web.Release.config
@@ -16,8 +16,6 @@
 				<customHeaders>
 					<remove name="X-Powered-By" />
 					<add name="x-content-type-options" value="nosniff" />
-					<add name="content-security-policy"
-					     value="frame-ancestors 'self'; form-action 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com https://*.vo.msecnd.net https://*.services.visualstudio.com https://*.monitor.azure.com https://www.clarity.ms https://twitter.com https://platform.twitter.com; worker-src blob: data: https://cdnjs.cloudflare.com"/>
 				</customHeaders>
 			</httpProtocol>
 		</system.webServer>

From c0415f36b2c873843a49090986a2629ae15a3a10 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 23 Apr 2024 11:44:09 +0800
Subject: [PATCH 050/227] remove shutdown action

---
 .../Controllers/SettingsController.cs         |  9 ------
 .../Pages/Settings/Advanced.cshtml            | 28 -------------------
 .../Resources/Program.zh-Hans.resx            |  3 --
 .../Resources/Program.zh-Hant.resx            |  3 --
 4 files changed, 43 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index 1a5b355ec..760b38399 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -154,15 +154,6 @@ public async Task<IActionResult> Advanced(AdvancedSettings model)
         return NoContent();
     }
 
-    [HttpPost("shutdown")]
-    [ProducesResponseType(StatusCodes.Status202Accepted)]
-    public IActionResult Shutdown(IHostApplicationLifetime applicationLifetime)
-    {
-        logger.LogWarning($"Shutdown is requested by '{User.Identity?.Name}'.");
-        applicationLifetime.StopApplication();
-        return Accepted();
-    }
-
     [HttpPost("reset")]
     [ProducesResponseType(StatusCodes.Status202Accepted)]
     public async Task<IActionResult> Reset(BlogDbContext context, IHostApplicationLifetime applicationLifetime)
diff --git a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
index fecef98e9..e9bbee8e1 100644
--- a/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
+++ b/src/Moonglade.Web/Pages/Settings/Advanced.cshtml
@@ -28,17 +28,6 @@
             }, 1000);
         }
 
-        $('.btn-restart').click(function () {
-            callApi(`/api/settings/shutdown`, 'POST', {}, () => { });
-            $('.btn-restart').text('Wait...');
-            $('.btn-restart').addClass('disabled');
-            $('.btn-restart').attr('disabled', 'disabled');
-            startTimer(30, $('.btn-restart'));
-            setTimeout(function () {
-                location.href = '/admin/settings';
-            }, 30000);
-        });
-
         $('.btn-reset').click(function () {
             callApi(`/api/settings/reset`, 'POST', {}, () => { });
             $('.btn-reset').text('Wait...');
@@ -244,23 +233,6 @@
                         </div>
                     </div>
 
-                    <div class="settings-entry2 row align-items-center py-3 px-2 rounded-3 shadow-sm border bg-white mb-2">
-                        <div class="col-auto">
-                            <i class="bi-power settings-entry-icon"></i>
-                        </div>
-                        <div class="col">
-                            @SharedLocalizer["Restart Website"]
-                            <div class="form-text">
-                                @SharedLocalizer["Try to shutdown and restart the website, this will terminate all current requests."]
-                            </div>
-                        </div>
-                        <div class="col-md-3 text-end">
-                            <a href="javascript:;" class="btn btn-sm btn-outline-accent" data-bs-toggle="modal" data-bs-target="#restartModal">
-                                @SharedLocalizer["Restart"]
-                            </a>
-                        </div>
-                    </div>
-
                     <div class="settings-entry2 row align-items-center py-3 px-2 rounded-3 shadow-sm border bg-white">
                         <div class="col-auto">
                             <i class="bi-eraser settings-entry-icon"></i>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index 1dff336db..0ae31e3f1 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -774,9 +774,6 @@
   <data name="Title" xml:space="preserve">
     <value>标题</value>
   </data>
-  <data name="Try to shutdown and restart the website, this will terminate all current requests." xml:space="preserve">
-    <value>尝试关闭并重新启动网站，该操作会终止所有当前请求</value>
-  </data>
   <data name="Update" xml:space="preserve">
     <value>更新</value>
   </data>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hant.resx b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
index db98fa25d..1cbf49b3d 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hant.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
@@ -754,9 +754,6 @@
   <data name="Title" xml:space="preserve">
     <value>標題</value>
   </data>
-  <data name="Try to shutdown and restart the website, this will terminate all current requests." xml:space="preserve">
-    <value>嘗試關閉並重新啟動網站，該操作會終止所有當前請求</value>
-  </data>
   <data name="Update" xml:space="preserve">
     <value>更新</value>
   </data>

From 6c271cc9053e49231412ac211a7e8a9631058a6e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 10:24:09 +0800
Subject: [PATCH 051/227] show X-Azure-FDID header

---
 src/Moonglade.Web/Pages/Admin/About.cshtml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Moonglade.Web/Pages/Admin/About.cshtml b/src/Moonglade.Web/Pages/Admin/About.cshtml
index 6b98595fb..2684ae7b0 100644
--- a/src/Moonglade.Web/Pages/Admin/About.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/About.cshtml
@@ -106,6 +106,16 @@
                         </td>
                     </tr>
                 }
+
+                @if (Request.Headers.ContainsKey("X-Azure-FDID"))
+                {
+                    <tr>
+                        <td>@SharedLocalizer["Azure Front Door"]</td>
+                        <td class="text-muted">
+                            X-Azure-FDID: @Request.Headers["X-Azure-FDID"]
+                        </td>
+                    </tr>
+                }
             </tbody>
         </table>
     </div>

From cf0b2995addc11b238e9291da155ee1b36f436dd Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:03:11 +0800
Subject: [PATCH 052/227] add Ardalis.Specification libs

---
 src/Moonglade.Data/Moonglade.Data.csproj | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Data/Moonglade.Data.csproj b/src/Moonglade.Data/Moonglade.Data.csproj
index a55db46fb..895414053 100644
--- a/src/Moonglade.Data/Moonglade.Data.csproj
+++ b/src/Moonglade.Data/Moonglade.Data.csproj
@@ -10,8 +10,13 @@
     </PropertyGroup>
     <ItemGroup>
         <Using Include="Microsoft.EntityFrameworkCore" />
-        <PackageReference Include="MediatR" Version="12.2.0" />
+        <Using Include="Ardalis.Specification" />
+    </ItemGroup>
+    <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
+        <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" />
     </ItemGroup>
 </Project>
\ No newline at end of file

From 1bbb413030efafc4d0c7f2188344480c1d0a09ec Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:12:50 +0800
Subject: [PATCH 053/227] empty MoongladeRepository

---
 .../ServiceCollectionExtensions.cs                 |  1 +
 .../ServiceCollectionExtensions.cs                 |  1 +
 .../ServiceCollectionExtensions.cs                 |  1 +
 src/Moonglade.Data/MoongladeRepository.cs          | 14 ++++++++++++++
 4 files changed, 17 insertions(+)
 create mode 100644 src/Moonglade.Data/MoongladeRepository.cs

diff --git a/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs b/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
index fe165f700..f8a677d00 100644
--- a/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
@@ -10,6 +10,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddMySqlStorage(this IServiceCollection services, string connectionString)
     {
+        services.AddScoped(typeof(MoongladeRepository<>));
         services.AddScoped(typeof(IRepository<>), typeof(MySqlDbContextRepository<>));
 
         services.AddDbContext<MySqlBlogDbContext>(optionsAction => optionsAction.UseLazyLoadingProxies()
diff --git a/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs b/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
index 823357558..335f63a33 100644
--- a/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
@@ -9,6 +9,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddPostgreSqlStorage(this IServiceCollection services, string connectionString)
     {
+        services.AddScoped(typeof(MoongladeRepository<>));
         services.AddScoped(typeof(IRepository<>), typeof(PostgreSqlDbContextRepository<>));
 
         AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
diff --git a/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs b/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
index 1484ec91f..f3f23581e 100644
--- a/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
@@ -10,6 +10,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddSqlServerStorage(this IServiceCollection services, string connectionString)
     {
+        services.AddScoped(typeof(MoongladeRepository<>));
         services.AddScoped(typeof(IRepository<>), typeof(SqlServerDbContextRepository<>));
 
         services.AddDbContext<SqlServerBlogDbContext>(options =>
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
new file mode 100644
index 000000000..a2d97892c
--- /dev/null
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -0,0 +1,14 @@
+using Ardalis.Specification.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Moonglade.Data;
+
+public class MoongladeRepository<T>(BlogDbContext dbContext) : RepositoryBase<T>(dbContext)
+    where T : class
+{
+
+}
\ No newline at end of file

From fbee59afe27ae550183780948e48fd4db34f2f72 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:29:45 +0800
Subject: [PATCH 054/227] migrate pingback commands

---
 .../Infrastructure/DbContextRepository.cs     |  6 ----
 .../Infrastructure/IRepository.cs             |  2 --
 src/Moonglade.Data/MoongladeRepository.cs     | 29 +++++++++++++++----
 .../ClearPingbackCommand.cs                   |  4 +--
 .../DeletePingbackCommand.cs                  |  4 +--
 src/Moonglade.Pingback/GetPingbacksQuery.cs   |  6 ++--
 src/Moonglade.Pingback/ReceivePingCommand.cs  |  3 +-
 src/Moonglade.Theme/CreateThemeCommand.cs     |  4 +--
 src/Moonglade.Theme/DeleteThemeCommand.cs     |  7 ++---
 .../GetAllThemeSegmentQuery.cs                |  4 +--
 .../GetSiteThemeStyleSheetQuery.cs            |  6 ++--
 11 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 49be06d63..8ab01628f 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -7,12 +7,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
 {
     protected readonly DbContext DbContext = ctx;
 
-    public Task Clear(CancellationToken ct = default)
-    {
-        DbContext.RemoveRange(DbContext.Set<T>());
-        return DbContext.SaveChangesAsync(ct);
-    }
-
     public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
         DbContext.Set<T>().FirstOrDefaultAsync(condition);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index b76174ed3..2f5cf6aac 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -4,8 +4,6 @@ namespace Moonglade.Data.Infrastructure;
 
 public interface IRepository<T> where T : class
 {
-    Task Clear(CancellationToken ct = default);
-
     ValueTask<T> GetAsync(object key, CancellationToken ct = default);
 
     Task<T> GetAsync(Expression<Func<T, bool>> condition);
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index a2d97892c..30d166a55 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -1,14 +1,33 @@
 using Ardalis.Specification.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq.Expressions;
 
 namespace Moonglade.Data;
 
 public class MoongladeRepository<T>(BlogDbContext dbContext) : RepositoryBase<T>(dbContext)
     where T : class
 {
+    public Task Clear(CancellationToken ct = default)
+    {
+        dbContext.RemoveRange(dbContext.Set<T>());
+        return dbContext.SaveChangesAsync(ct);
+    }
 
+    public async Task DeleteAsync(object key, CancellationToken ct = default)
+    {
+        var entity = await GetByIdAsync(key, ct);
+        if (entity is not null) await DeleteAsync(entity, ct);
+    }
+
+    public async Task<List<T>> ListNoTrackingAsync(CancellationToken ct = default) =>
+        await dbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
+
+    public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default)
+    {
+        return null != condition ?
+            dbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :
+            dbContext.Set<T>().AnyAsync(cancellationToken: ct);
+    }
+
+    public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
+        await dbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/ClearPingbackCommand.cs b/src/Moonglade.Pingback/ClearPingbackCommand.cs
index 0a7230e3a..564ce684f 100644
--- a/src/Moonglade.Pingback/ClearPingbackCommand.cs
+++ b/src/Moonglade.Pingback/ClearPingbackCommand.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Pingback;
 
 public record ClearPingbackCommand : IRequest;
 
-public class ClearPingbackCommandHandler(IRepository<PingbackEntity> repo) : IRequestHandler<ClearPingbackCommand>
+public class ClearPingbackCommandHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<ClearPingbackCommand>
 {
     public Task Handle(ClearPingbackCommand request, CancellationToken ct) => repo.Clear(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/DeletePingbackCommand.cs b/src/Moonglade.Pingback/DeletePingbackCommand.cs
index a0942464c..cc200dc18 100644
--- a/src/Moonglade.Pingback/DeletePingbackCommand.cs
+++ b/src/Moonglade.Pingback/DeletePingbackCommand.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Pingback;
 
 public record DeletePingbackCommand(Guid Id) : IRequest;
 
-public class DeletePingbackCommandHandler(IRepository<PingbackEntity> repo) : IRequestHandler<DeletePingbackCommand>
+public class DeletePingbackCommandHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<DeletePingbackCommand>
 {
     public Task Handle(DeletePingbackCommand request, CancellationToken ct) => repo.DeleteAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/GetPingbacksQuery.cs b/src/Moonglade.Pingback/GetPingbacksQuery.cs
index 86d9344bf..34de124af 100644
--- a/src/Moonglade.Pingback/GetPingbacksQuery.cs
+++ b/src/Moonglade.Pingback/GetPingbacksQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Pingback;
 
 public record GetPingbacksQuery : IRequest<List<PingbackEntity>>;
 
-public class GetPingbacksQueryHandler(IRepository<PingbackEntity> repo) : IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
+public class GetPingbacksQueryHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
 {
-    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => repo.ListAsync(ct);
+    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => repo.ListNoTrackingAsync(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index 38b87d20e..b00cf9b46 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
@@ -21,7 +22,7 @@ public class ReceivePingCommand(string requestBody, string ip, Action<PingbackEn
 public class ReceivePingCommandHandler(
         ILogger<ReceivePingCommandHandler> logger,
         IPingSourceInspector pingSourceInspector,
-        IRepository<PingbackEntity> pingbackRepo,
+        MoongladeRepository<PingbackEntity> pingbackRepo,
         IRepository<PostEntity> postRepo) : IRequestHandler<ReceivePingCommand, PingbackResponse>
 {
     private string _sourceUrl;
diff --git a/src/Moonglade.Theme/CreateThemeCommand.cs b/src/Moonglade.Theme/CreateThemeCommand.cs
index 22f71962d..63a37255e 100644
--- a/src/Moonglade.Theme/CreateThemeCommand.cs
+++ b/src/Moonglade.Theme/CreateThemeCommand.cs
@@ -1,13 +1,13 @@
 using MediatR;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using System.Text.Json;
+using Moonglade.Data;
 
 namespace Moonglade.Theme;
 
 public record CreateThemeCommand(string Name, IDictionary<string, string> Rules) : IRequest<int>;
 
-public class CreateThemeCommandHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<CreateThemeCommand, int>
+public class CreateThemeCommandHandler(MoongladeRepository<BlogThemeEntity> repo) : IRequestHandler<CreateThemeCommand, int>
 {
     public async Task<int> Handle(CreateThemeCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Theme/DeleteThemeCommand.cs b/src/Moonglade.Theme/DeleteThemeCommand.cs
index b8f253e2b..4e5afa869 100644
--- a/src/Moonglade.Theme/DeleteThemeCommand.cs
+++ b/src/Moonglade.Theme/DeleteThemeCommand.cs
@@ -1,21 +1,20 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Theme;
 
 public record DeleteThemeCommand(int Id) : IRequest<OperationCode>;
 
-public class DeleteThemeCommandHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<DeleteThemeCommand, OperationCode>
+public class DeleteThemeCommandHandler(MoongladeRepository<BlogThemeEntity> repo) : IRequestHandler<DeleteThemeCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteThemeCommand request, CancellationToken ct)
     {
-        var theme = await repo.GetAsync(request.Id, ct);
+        var theme = await repo.GetByIdAsync(request.Id, ct);
         if (null == theme) return OperationCode.ObjectNotFound;
         if (theme.ThemeType == ThemeType.System) return OperationCode.Canceled;
 
-        await repo.DeleteAsync(request.Id, ct);
+        await repo.DeleteAsync(theme, ct);
         return OperationCode.Done;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
index bca60a12f..1e9cdb4bc 100644
--- a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
+++ b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Theme;
 
 public record GetAllThemeSegmentQuery : IRequest<List<ThemeSegment>>;
 
-public class GetAllThemeSegmentQueryHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<GetAllThemeSegmentQuery, List<ThemeSegment>>
+public class GetAllThemeSegmentQueryHandler(MoongladeRepository<BlogThemeEntity> repo) : IRequestHandler<GetAllThemeSegmentQuery, List<ThemeSegment>>
 {
     public Task<List<ThemeSegment>> Handle(GetAllThemeSegmentQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Theme/GetSiteThemeStyleSheetQuery.cs b/src/Moonglade.Theme/GetSiteThemeStyleSheetQuery.cs
index b0018cd20..fd34cd5e0 100644
--- a/src/Moonglade.Theme/GetSiteThemeStyleSheetQuery.cs
+++ b/src/Moonglade.Theme/GetSiteThemeStyleSheetQuery.cs
@@ -1,17 +1,17 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using System.Text;
 using System.Text.Json;
 
 namespace Moonglade.Theme;
 
 public record GetSiteThemeStyleSheetQuery(int Id) : IRequest<string>;
-public class GetStyleSheetQueryHandler(IRepository<BlogThemeEntity> repo) : IRequestHandler<GetSiteThemeStyleSheetQuery, string>
+public class GetStyleSheetQueryHandler(MoongladeRepository<BlogThemeEntity> repo) : IRequestHandler<GetSiteThemeStyleSheetQuery, string>
 {
     public async Task<string> Handle(GetSiteThemeStyleSheetQuery request, CancellationToken ct)
     {
-        var theme = await repo.GetAsync(request.Id, ct);
+        var theme = await repo.GetByIdAsync(request.Id, ct);
         if (null == theme) return null;
 
         if (string.IsNullOrWhiteSpace(theme.CssRules))

From 0cab837b6de0fde23a9ea7072208afcf4f3cbca2 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:31:14 +0800
Subject: [PATCH 055/227] migrate FriendLink commands

---
 src/Moonglade.FriendLink/AddLinkCommand.cs    | 4 ++--
 src/Moonglade.FriendLink/DeleteLinkCommand.cs | 4 ++--
 src/Moonglade.FriendLink/GetAllLinksQuery.cs  | 4 ++--
 src/Moonglade.FriendLink/GetLinkQuery.cs      | 6 +++---
 src/Moonglade.FriendLink/UpdateLinkCommand.cs | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Moonglade.FriendLink/AddLinkCommand.cs b/src/Moonglade.FriendLink/AddLinkCommand.cs
index 6bf56037a..eef38ea47 100644
--- a/src/Moonglade.FriendLink/AddLinkCommand.cs
+++ b/src/Moonglade.FriendLink/AddLinkCommand.cs
@@ -1,6 +1,6 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Utils;
 using System.ComponentModel.DataAnnotations;
 
@@ -33,7 +33,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 
 public record AddLinkCommand(EditLinkRequest Payload) : IRequest;
 
-public class AddLinkCommandHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<AddLinkCommand>
+public class AddLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<AddLinkCommand>
 {
     public async Task Handle(AddLinkCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.FriendLink/DeleteLinkCommand.cs b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
index a54dadfeb..ee5ccce1e 100644
--- a/src/Moonglade.FriendLink/DeleteLinkCommand.cs
+++ b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.FriendLink;
 
 public record DeleteLinkCommand(Guid Id) : IRequest;
 
-public class DeleteLinkCommandHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<DeleteLinkCommand>
+public class DeleteLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<DeleteLinkCommand>
 {
     public Task Handle(DeleteLinkCommand request, CancellationToken ct) => repo.DeleteAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.FriendLink/GetAllLinksQuery.cs b/src/Moonglade.FriendLink/GetAllLinksQuery.cs
index b397c2279..1f0e5ce0a 100644
--- a/src/Moonglade.FriendLink/GetAllLinksQuery.cs
+++ b/src/Moonglade.FriendLink/GetAllLinksQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.FriendLink;
 
 public record GetAllLinksQuery : IRequest<List<FriendLinkEntity>>;
 
-public class GetAllLinksQueryHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<GetAllLinksQuery, List<FriendLinkEntity>>
+public class GetAllLinksQueryHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<GetAllLinksQuery, List<FriendLinkEntity>>
 {
     public Task<List<FriendLinkEntity>> Handle(GetAllLinksQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.FriendLink/GetLinkQuery.cs b/src/Moonglade.FriendLink/GetLinkQuery.cs
index df0d94278..baed33a76 100644
--- a/src/Moonglade.FriendLink/GetLinkQuery.cs
+++ b/src/Moonglade.FriendLink/GetLinkQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.FriendLink;
 
 public record GetLinkQuery(Guid Id) : IRequest<FriendLinkEntity>;
 
-public class GetLinkQueryHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<GetLinkQuery, FriendLinkEntity>
+public class GetLinkQueryHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<GetLinkQuery, FriendLinkEntity>
 {
-    public async Task<FriendLinkEntity> Handle(GetLinkQuery request, CancellationToken ct) => await repo.GetAsync(request.Id, ct);
+    public async Task<FriendLinkEntity> Handle(GetLinkQuery request, CancellationToken ct) => await repo.GetByIdAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.FriendLink/UpdateLinkCommand.cs b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
index e412794a6..198baa571 100644
--- a/src/Moonglade.FriendLink/UpdateLinkCommand.cs
+++ b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
@@ -1,13 +1,13 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Utils;
 
 namespace Moonglade.FriendLink;
 
 public record UpdateLinkCommand(Guid Id, EditLinkRequest Payload) : IRequest;
 
-public class UpdateLinkCommandHandler(IRepository<FriendLinkEntity> repo) : IRequestHandler<UpdateLinkCommand>
+public class UpdateLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<UpdateLinkCommand>
 {
     public async Task Handle(UpdateLinkCommand request, CancellationToken ct)
     {
@@ -16,7 +16,7 @@ public async Task Handle(UpdateLinkCommand request, CancellationToken ct)
             throw new InvalidOperationException($"{nameof(request.Payload.LinkUrl)} is not a valid url.");
         }
 
-        var link = await repo.GetAsync(request.Id, ct);
+        var link = await repo.GetByIdAsync(request.Id, ct);
         if (link is not null)
         {
             link.Title = request.Payload.Title;

From 1f0eaab19d279677cdc403607380a7d01395b2bb Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:33:32 +0800
Subject: [PATCH 056/227] migrate CategoryFeature

---
 .../CategoryFeature/CreateCategoryCommand.cs              | 3 ++-
 .../CategoryFeature/DeleteCategoryCommand.cs              | 4 ++--
 src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs  | 3 ++-
 .../CategoryFeature/GetCategoryBySlugQuery.cs             | 4 +++-
 src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs    | 8 +++++---
 .../CategoryFeature/UpdateCategoryCommand.cs              | 4 ++--
 src/Moonglade.Data/MoongladeRepository.cs                 | 3 +++
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
index 106804478..0a282f377 100644
--- a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
@@ -1,4 +1,5 @@
 using Edi.CacheAside.InMemory;
+using Moonglade.Data;
 using System.ComponentModel.DataAnnotations;
 
 namespace Moonglade.Core.CategoryFeature;
@@ -22,7 +23,7 @@ public class CreateCategoryCommand : IRequest
     public string Note { get; set; }
 }
 
-public class CreateCategoryCommandHandler(IRepository<CategoryEntity> catRepo, ICacheAside cache) : IRequestHandler<CreateCategoryCommand>
+public class CreateCategoryCommandHandler(MoongladeRepository<CategoryEntity> catRepo, ICacheAside cache) : IRequestHandler<CreateCategoryCommand>
 {
     public async Task Handle(CreateCategoryCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
index dad61fb10..52f46f802 100644
--- a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
@@ -6,8 +6,8 @@ namespace Moonglade.Core.CategoryFeature;
 public record DeleteCategoryCommand(Guid Id) : IRequest<OperationCode>;
 
 public class DeleteCategoryCommandHandler(
-        IRepository<CategoryEntity> catRepo,
-        IRepository<PostCategoryEntity> postCatRepo,
+        MoongladeRepository<CategoryEntity> catRepo,
+        MoongladeRepository<PostCategoryEntity> postCatRepo,
         ICacheAside cache) : IRequestHandler<DeleteCategoryCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteCategoryCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
index 19db20e6b..920360e9f 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoriesQuery.cs
@@ -1,10 +1,11 @@
 using Edi.CacheAside.InMemory;
+using Moonglade.Data;
 
 namespace Moonglade.Core.CategoryFeature;
 
 public record GetCategoriesQuery : IRequest<List<CategoryEntity>>;
 
-public class GetCategoriesQueryHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, List<CategoryEntity>>
+public class GetCategoriesQueryHandler(MoongladeRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<GetCategoriesQuery, List<CategoryEntity>>
 {
     public Task<List<CategoryEntity>> Handle(GetCategoriesQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
index b4c882f26..c94c83599 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
@@ -1,9 +1,11 @@
 
+using Moonglade.Data;
+
 namespace Moonglade.Core.CategoryFeature;
 
 public record GetCategoryBySlugQuery(string Slug) : IRequest<CategoryEntity>;
 
-public class GetCategoryByRouteQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryBySlugQuery, CategoryEntity>
+public class GetCategoryByRouteQueryHandler(MoongladeRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryBySlugQuery, CategoryEntity>
 {
     public Task<CategoryEntity> Handle(GetCategoryBySlugQuery request, CancellationToken ct) =>
         repo.GetAsync(p => p.Slug == request.Slug);
diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
index e40f0adc2..86bd62750 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryQuery.cs
@@ -1,9 +1,11 @@
-namespace Moonglade.Core.CategoryFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.CategoryFeature;
 
 public record GetCategoryQuery(Guid Id) : IRequest<CategoryEntity>;
 
-public class GetCategoryByIdQueryHandler(IRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryQuery, CategoryEntity>
+public class GetCategoryByIdQueryHandler(MoongladeRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryQuery, CategoryEntity>
 {
     public async Task<CategoryEntity> Handle(GetCategoryQuery request, CancellationToken ct) =>
-        await repo.GetAsync(request.Id, ct);
+        await repo.GetByIdAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
index b978c3564..0d98b3a3b 100644
--- a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
@@ -8,11 +8,11 @@ public class UpdateCategoryCommand : CreateCategoryCommand, IRequest<OperationCo
     public Guid Id { get; set; }
 }
 
-public class UpdateCategoryCommandHandler(IRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<UpdateCategoryCommand, OperationCode>
+public class UpdateCategoryCommandHandler(MoongladeRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<UpdateCategoryCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(UpdateCategoryCommand request, CancellationToken ct)
     {
-        var cat = await repo.GetAsync(request.Id, ct);
+        var cat = await repo.GetByIdAsync(request.Id, ct);
         if (cat is null) return OperationCode.ObjectNotFound;
 
         cat.Slug = request.Slug.Trim();
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 30d166a55..534526ed6 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -18,6 +18,9 @@ public async Task DeleteAsync(object key, CancellationToken ct = default)
         if (entity is not null) await DeleteAsync(entity, ct);
     }
 
+    public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
+        dbContext.Set<T>().FirstOrDefaultAsync(condition);
+
     public async Task<List<T>> ListNoTrackingAsync(CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
 

From 3e165642ddf7fb17522b7aee7e23effb1dc98254 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:34:03 +0800
Subject: [PATCH 057/227] code clean up

---
 src/Moonglade.Theme/CreateThemeCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Theme/CreateThemeCommand.cs b/src/Moonglade.Theme/CreateThemeCommand.cs
index 63a37255e..617eedc12 100644
--- a/src/Moonglade.Theme/CreateThemeCommand.cs
+++ b/src/Moonglade.Theme/CreateThemeCommand.cs
@@ -1,7 +1,7 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
 using System.Text.Json;
-using Moonglade.Data;
 
 namespace Moonglade.Theme;
 

From 452176b78b9ffc5adc996d70c3695154c71ba3c5 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:35:42 +0800
Subject: [PATCH 058/227] migrate a part of PageFeature

---
 src/Moonglade.Core/PageFeature/CreatePageCommand.cs    | 6 ++++--
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs    | 8 +++++---
 src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs     | 8 +++++---
 src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs   | 6 ++++--
 src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs | 6 ++++--
 src/Moonglade.Core/PageFeature/UpdatePageCommand.cs    | 8 +++++---
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
index 2bc914242..ef08adbd9 100644
--- a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record CreatePageCommand(EditPageRequest Payload) : IRequest<Guid>;
 
-public class CreatePageCommandHandler(IRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<CreatePageCommand, Guid>
+public class CreatePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<CreatePageCommand, Guid>
 {
     public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index 0651579e4..f910302ff 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -1,12 +1,14 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record DeletePageCommand(Guid Id) : IRequest;
 
-public class DeletePageCommandHandler(IRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<DeletePageCommand>
+public class DeletePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<DeletePageCommand>
 {
     public async Task Handle(DeletePageCommand request, CancellationToken ct)
     {
-        var page = await repo.GetAsync(request.Id, ct);
+        var page = await repo.GetByIdAsync(request.Id, ct);
         if (page is null)
         {
             throw new InvalidOperationException($"PageEntity with Id '{request.Id}' not found.");
diff --git a/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs b/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
index 9213c5a73..b8142fbdd 100644
--- a/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
@@ -1,12 +1,14 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record GetPageByIdQuery(Guid Id) : IRequest<BlogPage>;
 
-public class GetPageByIdQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<GetPageByIdQuery, BlogPage>
+public class GetPageByIdQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageByIdQuery, BlogPage>
 {
     public async Task<BlogPage> Handle(GetPageByIdQuery request, CancellationToken ct)
     {
-        var entity = await repo.GetAsync(request.Id, ct);
+        var entity = await repo.GetByIdAsync(request.Id, ct);
         if (entity == null) return null;
 
         var item = new BlogPage(entity);
diff --git a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
index 73afd9377..0ff0eebb8 100644
--- a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record GetPageBySlugQuery(string Slug) : IRequest<BlogPage>;
 
-public class GetPageBySlugQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<GetPageBySlugQuery, BlogPage>
+public class GetPageBySlugQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageBySlugQuery, BlogPage>
 {
     public async Task<BlogPage> Handle(GetPageBySlugQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
index 58a3eb4db..f52836792 100644
--- a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
+++ b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record ListPageSegmentQuery : IRequest<List<PageSegment>>;
 
-public class ListPageSegmentQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, List<PageSegment>>
+public class ListPageSegmentQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, List<PageSegment>>
 {
     public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
index 7c7cac140..bfd5111c3 100644
--- a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
@@ -1,13 +1,15 @@
-namespace Moonglade.Core.PageFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PageFeature;
 
 public record UpdatePageCommand(Guid Id, EditPageRequest Payload) : IRequest<Guid>;
 
-public class UpdatePageCommandHandler(IRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<UpdatePageCommand, Guid>
+public class UpdatePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<UpdatePageCommand, Guid>
 {
     public async Task<Guid> Handle(UpdatePageCommand request, CancellationToken ct)
     {
         var (guid, payload) = request;
-        var page = await repo.GetAsync(guid, ct);
+        var page = await repo.GetByIdAsync(guid, ct);
         if (page is null)
         {
             throw new InvalidOperationException($"PageEntity with Id '{guid}' not found.");

From f2100792bcac7d091d325a7fb3f1486cfe189727 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:37:55 +0800
Subject: [PATCH 059/227] Update DeleteTagCommand.cs

---
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index 920e8aed2..8805ee8c2 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -5,7 +5,7 @@ namespace Moonglade.Core.TagFeature;
 
 public record DeleteTagCommand(int Id) : IRequest<OperationCode>;
 
-public class DeleteTagCommandHandler(IRepository<TagEntity> tagRepo, IRepository<PostTagEntity> postTagRepo)
+public class DeleteTagCommandHandler(MoongladeRepository<TagEntity> tagRepo, IRepository<PostTagEntity> postTagRepo)
     : IRequestHandler<DeleteTagCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationToken ct)

From cdafd58e96a4f5eb879b5dac19cb907d22c984a9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:38:59 +0800
Subject: [PATCH 060/227] migrate a part of tags

---
 src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs | 6 ++++--
 src/Moonglade.Core/TagFeature/GetTagsQuery.cs     | 6 ++++--
 src/Moonglade.Core/TagFeature/UpdateTagCommand.cs | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
index 262c1279b..3f8e76cc8 100644
--- a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.TagFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.TagFeature;
 
 public record GetTagNamesQuery : IRequest<List<string>>;
 
-public class GetTagNamesQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagNamesQuery, List<string>>
+public class GetTagNamesQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagNamesQuery, List<string>>
 {
     public Task<List<string>> Handle(GetTagNamesQuery request, CancellationToken ct) => repo.SelectAsync(t => t.DisplayName, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
index 886eb1559..6ab510598 100644
--- a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.TagFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.TagFeature;
 
 public record GetTagsQuery : IRequest<List<Tag>>;
 
-public class GetTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, List<Tag>>
+public class GetTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, List<Tag>>
 {
     public Task<List<Tag>> Handle(GetTagsQuery request, CancellationToken ct) => repo.SelectAsync(Tag.EntitySelector, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
index c6fba81f7..7880a5a8f 100644
--- a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
@@ -5,12 +5,12 @@ namespace Moonglade.Core.TagFeature;
 
 public record UpdateTagCommand(int Id, string Name) : IRequest<OperationCode>;
 
-public class UpdateTagCommandHandler(IRepository<TagEntity> repo) : IRequestHandler<UpdateTagCommand, OperationCode>
+public class UpdateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<UpdateTagCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(UpdateTagCommand request, CancellationToken ct)
     {
         var (id, name) = request;
-        var tag = await repo.GetAsync(id, ct);
+        var tag = await repo.GetByIdAsync(id, ct);
         if (null == tag) return OperationCode.ObjectNotFound;
 
         tag.DisplayName = name;

From 3e95d4264fca840d53f5fb860cd07e8047698b45 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:40:19 +0800
Subject: [PATCH 061/227] migrate assets and css

---
 src/Moonglade.Core/DeleteStyleSheetCommand.cs | 12 +++++++-----
 src/Moonglade.Core/GetAssetQuery.cs           |  8 +++++---
 src/Moonglade.Core/GetStyleSheetQuery.cs      |  8 +++++---
 src/Moonglade.Core/SaveAssetCommand.cs        |  8 +++++---
 src/Moonglade.Core/SaveStyleSheetCommand.cs   |  7 ++++---
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/Moonglade.Core/DeleteStyleSheetCommand.cs b/src/Moonglade.Core/DeleteStyleSheetCommand.cs
index ddb17a4f3..b74ebe9b5 100644
--- a/src/Moonglade.Core/DeleteStyleSheetCommand.cs
+++ b/src/Moonglade.Core/DeleteStyleSheetCommand.cs
@@ -1,17 +1,19 @@
-namespace Moonglade.Core;
+using Moonglade.Data;
+
+namespace Moonglade.Core;
 
 public record DeleteStyleSheetCommand(Guid Id) : IRequest;
 
-public class DeleteStyleSheetCommandHandler(IRepository<StyleSheetEntity> repo) : IRequestHandler<DeleteStyleSheetCommand>
+public class DeleteStyleSheetCommandHandler(MoongladeRepository<StyleSheetEntity> repo) : IRequestHandler<DeleteStyleSheetCommand>
 {
-    public async Task Handle(DeleteStyleSheetCommand request, CancellationToken cancellationToken)
+    public async Task Handle(DeleteStyleSheetCommand request, CancellationToken ct)
     {
-        var styleSheet = await repo.GetAsync(request.Id, cancellationToken);
+        var styleSheet = await repo.GetByIdAsync(request.Id, ct);
         if (styleSheet is null)
         {
             throw new InvalidOperationException($"StyleSheetEntity with Id '{request.Id}' not found.");
         }
 
-        await repo.DeleteAsync(styleSheet, cancellationToken);
+        await repo.DeleteAsync(styleSheet, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/GetAssetQuery.cs b/src/Moonglade.Core/GetAssetQuery.cs
index a35178522..bc055d2bd 100644
--- a/src/Moonglade.Core/GetAssetQuery.cs
+++ b/src/Moonglade.Core/GetAssetQuery.cs
@@ -1,12 +1,14 @@
-namespace Moonglade.Core;
+using Moonglade.Data;
+
+namespace Moonglade.Core;
 
 public record GetAssetQuery(Guid AssetId) : IRequest<string>;
 
-public class GetAssetQueryHandler(IRepository<BlogAssetEntity> repo) : IRequestHandler<GetAssetQuery, string>
+public class GetAssetQueryHandler(MoongladeRepository<BlogAssetEntity> repo) : IRequestHandler<GetAssetQuery, string>
 {
     public async Task<string> Handle(GetAssetQuery request, CancellationToken ct)
     {
-        var asset = await repo.GetAsync(request.AssetId, ct);
+        var asset = await repo.GetByIdAsync(request.AssetId, ct);
         return asset?.Base64Data;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/GetStyleSheetQuery.cs b/src/Moonglade.Core/GetStyleSheetQuery.cs
index 4b73e42d9..8730db874 100644
--- a/src/Moonglade.Core/GetStyleSheetQuery.cs
+++ b/src/Moonglade.Core/GetStyleSheetQuery.cs
@@ -1,12 +1,14 @@
-namespace Moonglade.Core;
+using Moonglade.Data;
+
+namespace Moonglade.Core;
 
 public record GetStyleSheetQuery(Guid Id) : IRequest<StyleSheetEntity>;
 
-public class GetStyleSheetQueryHandler(IRepository<StyleSheetEntity> repo) : IRequestHandler<GetStyleSheetQuery, StyleSheetEntity>
+public class GetStyleSheetQueryHandler(MoongladeRepository<StyleSheetEntity> repo) : IRequestHandler<GetStyleSheetQuery, StyleSheetEntity>
 {
     public async Task<StyleSheetEntity> Handle(GetStyleSheetQuery request, CancellationToken cancellationToken)
     {
-        var result = await repo.GetAsync(request.Id, cancellationToken);
+        var result = await repo.GetByIdAsync(request.Id, cancellationToken);
         return result;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/SaveAssetCommand.cs b/src/Moonglade.Core/SaveAssetCommand.cs
index fefeb093f..ffc8588ee 100644
--- a/src/Moonglade.Core/SaveAssetCommand.cs
+++ b/src/Moonglade.Core/SaveAssetCommand.cs
@@ -1,15 +1,17 @@
-namespace Moonglade.Core;
+using Moonglade.Data;
+
+namespace Moonglade.Core;
 
 public record SaveAssetCommand(Guid AssetId, string AssetBase64) : INotification;
 
-public class SaveAssetCommandHandler(IRepository<BlogAssetEntity> repo) : INotificationHandler<SaveAssetCommand>
+public class SaveAssetCommandHandler(MoongladeRepository<BlogAssetEntity> repo) : INotificationHandler<SaveAssetCommand>
 {
     public async Task Handle(SaveAssetCommand request, CancellationToken ct)
     {
         if (request.AssetId == Guid.Empty) throw new ArgumentOutOfRangeException(nameof(request.AssetId));
         if (string.IsNullOrWhiteSpace(request.AssetBase64)) throw new ArgumentNullException(nameof(request.AssetBase64));
 
-        var entity = await repo.GetAsync(request.AssetId, ct);
+        var entity = await repo.GetByIdAsync(request.AssetId, ct);
 
         if (null == entity)
         {
diff --git a/src/Moonglade.Core/SaveStyleSheetCommand.cs b/src/Moonglade.Core/SaveStyleSheetCommand.cs
index 0dd46cf30..126dcae9e 100644
--- a/src/Moonglade.Core/SaveStyleSheetCommand.cs
+++ b/src/Moonglade.Core/SaveStyleSheetCommand.cs
@@ -1,10 +1,11 @@
-using System.Security.Cryptography;
+using Moonglade.Data;
+using System.Security.Cryptography;
 
 namespace Moonglade.Core;
 
 public record SaveStyleSheetCommand(Guid Id, string Slug, string CssContent) : IRequest<Guid>;
 
-public class SaveStyleSheetCommandHandler(IRepository<StyleSheetEntity> repo) : IRequestHandler<SaveStyleSheetCommand, Guid>
+public class SaveStyleSheetCommandHandler(MoongladeRepository<StyleSheetEntity> repo) : IRequestHandler<SaveStyleSheetCommand, Guid>
 {
     public async Task<Guid> Handle(SaveStyleSheetCommand request, CancellationToken cancellationToken)
     {
@@ -12,7 +13,7 @@ public async Task<Guid> Handle(SaveStyleSheetCommand request, CancellationToken
         var css = request.CssContent.Trim();
         var hash = CalculateHash($"{slug}_{css}");
 
-        var entity = await repo.GetAsync(request.Id, cancellationToken);
+        var entity = await repo.GetByIdAsync(request.Id, cancellationToken);
         if (entity is null)
         {
             entity = new()

From 1c6d825416a54f174cfdd8cf755e4c4fd602f661 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:41:11 +0800
Subject: [PATCH 062/227] remove unused methods

---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 9 ---------
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 8ab01628f..c677567e5 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -13,9 +13,6 @@ public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
     public virtual ValueTask<T> GetAsync(object key, CancellationToken ct = default) =>
         DbContext.Set<T>().FindAsync(keyValues: new[] { key }, cancellationToken: ct);
 
-    public async Task<List<T>> ListAsync(CancellationToken ct = default) =>
-        await DbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
-
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
@@ -33,12 +30,6 @@ public Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default)
         return DbContext.SaveChangesAsync(ct);
     }
 
-    public async Task DeleteAsync(object key, CancellationToken ct = default)
-    {
-        var entity = await GetAsync(key, ct);
-        if (entity is not null) await DeleteAsync(entity, ct);
-    }
-
     public Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default) =>
         DbContext.Set<T>().CountAsync(condition, ct);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 2f5cf6aac..0f8c5509d 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -8,8 +8,6 @@ public interface IRepository<T> where T : class
 
     Task<T> GetAsync(Expression<Func<T, bool>> condition);
 
-    Task<List<T>> ListAsync(CancellationToken ct = default);
-
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
     IQueryable<T> AsQueryable();
@@ -18,8 +16,6 @@ public interface IRepository<T> where T : class
 
     Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default);
 
-    Task DeleteAsync(object key, CancellationToken ct = default);
-
     Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default);
 
     Task<int> CountAsync(ISpecification<T> spec = null, CancellationToken ct = default);

From f88f0088348edc282467d3764de55f1a5d050e88 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:43:39 +0800
Subject: [PATCH 063/227] Update LogSuccessLoginCommand.cs

---
 src/Moonglade.Auth/LogSuccessLoginCommand.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Auth/LogSuccessLoginCommand.cs b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
index a465afdb7..51146d081 100644
--- a/src/Moonglade.Auth/LogSuccessLoginCommand.cs
+++ b/src/Moonglade.Auth/LogSuccessLoginCommand.cs
@@ -1,11 +1,11 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
+using Moonglade.Data;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Auth;
 
 public record LogSuccessLoginCommand(string IpAddress, string UserAgent, string DeviceFingerprint) : IRequest;
 
-public class LogSuccessLoginCommandHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<LogSuccessLoginCommand>
+public class LogSuccessLoginCommandHandler(MoongladeRepository<LoginHistoryEntity> repo) : IRequestHandler<LogSuccessLoginCommand>
 {
     public async Task Handle(LogSuccessLoginCommand request, CancellationToken ct)
     {

From e2ded8e6f3f491db21836870b34966460a9daa94 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:45:09 +0800
Subject: [PATCH 064/227] Update RestorePostCommand.cs

---
 src/Moonglade.Core/PostFeature/RestorePostCommand.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/RestorePostCommand.cs b/src/Moonglade.Core/PostFeature/RestorePostCommand.cs
index 818552d35..f928a6eee 100644
--- a/src/Moonglade.Core/PostFeature/RestorePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/RestorePostCommand.cs
@@ -1,14 +1,15 @@
 using Edi.CacheAside.InMemory;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
 public record RestorePostCommand(Guid Id) : IRequest;
 
-public class RestorePostCommandHandler(IRepository<PostEntity> repo, ICacheAside cache) : IRequestHandler<RestorePostCommand>
+public class RestorePostCommandHandler(MoongladeRepository<PostEntity> repo, ICacheAside cache) : IRequestHandler<RestorePostCommand>
 {
     public async Task Handle(RestorePostCommand request, CancellationToken ct)
     {
-        var pp = await repo.GetAsync(request.Id, ct);
+        var pp = await repo.GetByIdAsync(request.Id, ct);
         if (null == pp) return;
 
         pp.IsDeleted = false;

From f748b65704375d27e4e3305dcea025599a590f3c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:46:54 +0800
Subject: [PATCH 065/227] migrate configuration

---
 src/Moonglade.Configuration/AddDefaultConfigurationCommand.cs | 3 +--
 src/Moonglade.Configuration/GetAllConfigurationsQuery.cs      | 4 ++--
 src/Moonglade.Configuration/UpdateConfigurationCommand.cs     | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Configuration/AddDefaultConfigurationCommand.cs b/src/Moonglade.Configuration/AddDefaultConfigurationCommand.cs
index 13ba5b3d2..497e34e51 100644
--- a/src/Moonglade.Configuration/AddDefaultConfigurationCommand.cs
+++ b/src/Moonglade.Configuration/AddDefaultConfigurationCommand.cs
@@ -1,13 +1,12 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Configuration;
 
 public record AddDefaultConfigurationCommand(int Id, string CfgKey, string DefaultJson) : IRequest<OperationCode>;
 
-public class AddDefaultConfigurationCommandHandler(IRepository<BlogConfigurationEntity> repository) : IRequestHandler<AddDefaultConfigurationCommand, OperationCode>
+public class AddDefaultConfigurationCommandHandler(MoongladeRepository<BlogConfigurationEntity> repository) : IRequestHandler<AddDefaultConfigurationCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(AddDefaultConfigurationCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs b/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
index 13ca8abcd..1c8723b68 100644
--- a/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
+++ b/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Configuration;
 
 public record GetAllConfigurationsQuery : IRequest<IDictionary<string, string>>;
 
-public class GetAllConfigurationsQueryHandler(IRepository<BlogConfigurationEntity> repo) : IRequestHandler<GetAllConfigurationsQuery, IDictionary<string, string>>
+public class GetAllConfigurationsQueryHandler(MoongladeRepository<BlogConfigurationEntity> repo) : IRequestHandler<GetAllConfigurationsQuery, IDictionary<string, string>>
 {
     public async Task<IDictionary<string, string>> Handle(GetAllConfigurationsQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Configuration/UpdateConfigurationCommand.cs b/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
index 7b4119c49..916db1127 100644
--- a/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
+++ b/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
@@ -1,13 +1,12 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Configuration;
 
 public record UpdateConfigurationCommand(string Name, string Json) : IRequest<OperationCode>;
 
-public class UpdateConfigurationCommandHandler(IRepository<BlogConfigurationEntity> repository) : IRequestHandler<UpdateConfigurationCommand, OperationCode>
+public class UpdateConfigurationCommandHandler(MoongladeRepository<BlogConfigurationEntity> repository) : IRequestHandler<UpdateConfigurationCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(UpdateConfigurationCommand request, CancellationToken ct)
     {

From 3339d00e862a50a6a412bb9e9a6df306f66620d6 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:49:31 +0800
Subject: [PATCH 066/227] migrate SearchPostQuery

---
 src/Moonglade.Core/PostFeature/SearchPostQuery.cs | 3 ++-
 src/Moonglade.Data/MoongladeRepository.cs         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
index 4d6741d6c..283ff6824 100644
--- a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
+++ b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
@@ -1,11 +1,12 @@
 using Microsoft.EntityFrameworkCore;
 using System.Text.RegularExpressions;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
 public record SearchPostQuery(string Keyword) : IRequest<List<PostDigest>>;
 
-public class SearchPostQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<SearchPostQuery, List<PostDigest>>
+public class SearchPostQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<SearchPostQuery, List<PostDigest>>
 {
     public async Task<List<PostDigest>> Handle(SearchPostQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 534526ed6..be0d3e117 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -6,6 +6,8 @@ namespace Moonglade.Data;
 public class MoongladeRepository<T>(BlogDbContext dbContext) : RepositoryBase<T>(dbContext)
     where T : class
 {
+    public IQueryable<T> AsQueryable() => dbContext.Set<T>();
+
     public Task Clear(CancellationToken ct = default)
     {
         dbContext.RemoveRange(dbContext.Set<T>());

From 526e0152aeac77446d43a2bcd1b415f23422cc74 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:51:21 +0800
Subject: [PATCH 067/227] migrate CountPostQueryHandler

---
 src/Moonglade.Core/PostFeature/CountPostQuery.cs | 11 +++++++----
 src/Moonglade.Data/MoongladeRepository.cs        |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CountPostQuery.cs b/src/Moonglade.Core/PostFeature/CountPostQuery.cs
index 6a70cb4e8..7cd2ac0c8 100644
--- a/src/Moonglade.Core/PostFeature/CountPostQuery.cs
+++ b/src/Moonglade.Core/PostFeature/CountPostQuery.cs
@@ -1,4 +1,6 @@
-namespace Moonglade.Core.PostFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.PostFeature;
 
 public enum CountType
 {
@@ -10,9 +12,10 @@ public enum CountType
 
 public record CountPostQuery(CountType CountType, Guid? CatId = null, int? TagId = null) : IRequest<int>;
 
-public class CountPostQueryHandler(IRepository<PostEntity> postRepo,
-        IRepository<PostTagEntity> postTagRepo,
-        IRepository<PostCategoryEntity> postCatRepo)
+public class CountPostQueryHandler(
+    MoongladeRepository<PostEntity> postRepo,
+    MoongladeRepository<PostTagEntity> postTagRepo,
+    MoongladeRepository<PostCategoryEntity> postCatRepo)
     : IRequestHandler<CountPostQuery, int>
 {
     public async Task<int> Handle(CountPostQuery request, CancellationToken ct)
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index be0d3e117..882aa57f0 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -8,6 +8,9 @@ public class MoongladeRepository<T>(BlogDbContext dbContext) : RepositoryBase<T>
 {
     public IQueryable<T> AsQueryable() => dbContext.Set<T>();
 
+    public Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default) =>
+        dbContext.Set<T>().CountAsync(condition, ct);
+
     public Task Clear(CancellationToken ct = default)
     {
         dbContext.RemoveRange(dbContext.Set<T>());

From d3f3177be4bbf9c93c9c9d34fb5ce58b1fd14f3f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:53:24 +0800
Subject: [PATCH 068/227] Update DeletePostCommand.cs

---
 src/Moonglade.Core/PostFeature/DeletePostCommand.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/DeletePostCommand.cs b/src/Moonglade.Core/PostFeature/DeletePostCommand.cs
index e17a5451d..d201c3a43 100644
--- a/src/Moonglade.Core/PostFeature/DeletePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/DeletePostCommand.cs
@@ -1,15 +1,16 @@
 using Edi.CacheAside.InMemory;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
 public record DeletePostCommand(Guid Id, bool SoftDelete = false) : IRequest;
 
-public class DeletePostCommandHandler(IRepository<PostEntity> repo, ICacheAside cache) : IRequestHandler<DeletePostCommand>
+public class DeletePostCommandHandler(MoongladeRepository<PostEntity> repo, ICacheAside cache) : IRequestHandler<DeletePostCommand>
 {
     public async Task Handle(DeletePostCommand request, CancellationToken ct)
     {
         var (guid, softDelete) = request;
-        var post = await repo.GetAsync(guid, ct);
+        var post = await repo.GetByIdAsync(guid, ct);
         if (null == post) return;
 
         if (softDelete)

From 03411fa709adc624983cb0c406374b1637fa069d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 12:56:00 +0800
Subject: [PATCH 069/227] CommentByIdsSepc

---
 src/Moonglade.Comments/DeleteCommentsCommand.cs |  7 ++++---
 src/Moonglade.Comments/ToggleApprovalCommand.cs |  8 ++++----
 src/Moonglade.Data/Spec/CommentSpec.cs          | 13 ++++++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index 2de51bdb1..0fd279a00 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
@@ -7,12 +8,12 @@ namespace Moonglade.Comments;
 
 public record DeleteCommentsCommand(Guid[] Ids) : IRequest;
 
-public class DeleteCommentsCommandHandler(IRepository<CommentEntity> commentRepo, IRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<DeleteCommentsCommand>
+public class DeleteCommentsCommandHandler(MoongladeRepository<CommentEntity> commentRepo, IRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<DeleteCommentsCommand>
 {
     public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
     {
-        var spec = new CommentSpec(request.Ids);
-        var comments = await commentRepo.ListAsync(spec);
+        var spec = new CommentByIdsSepc(request.Ids);
+        var comments = await commentRepo.ListAsync(spec, ct);
         foreach (var cmt in comments)
         {
             // 1. Delete all replies
diff --git a/src/Moonglade.Comments/ToggleApprovalCommand.cs b/src/Moonglade.Comments/ToggleApprovalCommand.cs
index 1f408e004..a5d3c5405 100644
--- a/src/Moonglade.Comments/ToggleApprovalCommand.cs
+++ b/src/Moonglade.Comments/ToggleApprovalCommand.cs
@@ -1,18 +1,18 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Comments;
 
 public record ToggleApprovalCommand(Guid[] CommentIds) : IRequest;
 
-public class ToggleApprovalCommandHandler(IRepository<CommentEntity> repo) : IRequestHandler<ToggleApprovalCommand>
+public class ToggleApprovalCommandHandler(MoongladeRepository<CommentEntity> repo) : IRequestHandler<ToggleApprovalCommand>
 {
     public async Task Handle(ToggleApprovalCommand request, CancellationToken ct)
     {
-        var spec = new CommentSpec(request.CommentIds);
-        var comments = await repo.ListAsync(spec);
+        var spec = new CommentByIdsSepc(request.CommentIds);
+        var comments = await repo.ListAsync(spec, ct);
         foreach (var cmt in comments)
         {
             cmt.IsApproved = !cmt.IsApproved;
diff --git a/src/Moonglade.Data/Spec/CommentSpec.cs b/src/Moonglade.Data/Spec/CommentSpec.cs
index a0764a334..47f8089d9 100644
--- a/src/Moonglade.Data/Spec/CommentSpec.cs
+++ b/src/Moonglade.Data/Spec/CommentSpec.cs
@@ -16,14 +16,17 @@ public CommentSpec(int pageSize, int pageIndex) : base(c => true)
         ApplyPaging(startRow, pageSize);
     }
 
-    public CommentSpec(Guid[] ids) : base(c => ids.Contains(c.Id))
-    {
-
-    }
-
     public CommentSpec(Guid postId) : base(c => c.PostId == postId &&
                                                 c.IsApproved)
     {
         AddInclude(comments => comments.Include(c => c.Replies));
     }
+}
+
+public class CommentByIdsSepc : Specification<CommentEntity>
+{
+    public CommentByIdsSepc(Guid[] ids)
+    {
+        Query.Where(c => ids.Contains(c.Id));
+    }
 }
\ No newline at end of file

From 9de1eb1a466dfbc4cde87420acc0f09f7c0f7a45 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:07:05 +0800
Subject: [PATCH 070/227] CommentWithRepliesSpec

---
 .../GetApprovedCommentsQuery.cs                   |  6 +++---
 src/Moonglade.Data/MoongladeRepository.cs         |  4 ++++
 src/Moonglade.Data/Spec/CommentSpec.cs            | 15 +++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
index 9d8a6bb06..c64820d0f 100644
--- a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
@@ -1,17 +1,17 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Comments;
 
 public record GetApprovedCommentsQuery(Guid PostId) : IRequest<List<Comment>>;
 
-public class GetApprovedCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetApprovedCommentsQuery, List<Comment>>
+public class GetApprovedCommentsQueryHandler(MoongladeRepository<CommentEntity> repo) : IRequestHandler<GetApprovedCommentsQuery, List<Comment>>
 {
     public Task<List<Comment>> Handle(GetApprovedCommentsQuery request, CancellationToken ct)
     {
-        return repo.SelectAsync(new CommentSpec(request.PostId), c => new Comment
+        return repo.SelectAsync(new CommentWithRepliesSpec(request.PostId), c => new Comment
         {
             CommentContent = c.CommentContent,
             CreateTimeUtc = c.CreateTimeUtc,
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 882aa57f0..b836c7438 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -38,4 +38,8 @@ public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, Cancellat
 
     public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
+
+    public async Task<List<TResult>> SelectAsync<TResult>(
+        ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
+        await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/CommentSpec.cs b/src/Moonglade.Data/Spec/CommentSpec.cs
index 47f8089d9..88a6a94d4 100644
--- a/src/Moonglade.Data/Spec/CommentSpec.cs
+++ b/src/Moonglade.Data/Spec/CommentSpec.cs
@@ -15,12 +15,6 @@ public CommentSpec(int pageSize, int pageIndex) : base(c => true)
         ApplyOrderByDescending(p => p.CreateTimeUtc);
         ApplyPaging(startRow, pageSize);
     }
-
-    public CommentSpec(Guid postId) : base(c => c.PostId == postId &&
-                                                c.IsApproved)
-    {
-        AddInclude(comments => comments.Include(c => c.Replies));
-    }
 }
 
 public class CommentByIdsSepc : Specification<CommentEntity>
@@ -29,4 +23,13 @@ public CommentByIdsSepc(Guid[] ids)
     {
         Query.Where(c => ids.Contains(c.Id));
     }
+}
+
+public class CommentWithRepliesSpec : Specification<CommentEntity>
+{
+    public CommentWithRepliesSpec(Guid postId)
+    {
+        Query.Where(c => c.PostId == postId && c.IsApproved);
+        Query.Include(p => p.Replies);
+    }
 }
\ No newline at end of file

From 0350c9d9f704e2aeb8d02f2c58cb4bf788d80bf7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:10:00 +0800
Subject: [PATCH 071/227] CommentPagingSepc

---
 src/Moonglade.Comments/GetCommentsQuery.cs |  6 +++---
 src/Moonglade.Data/Spec/CommentSpec.cs     | 19 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Comments/GetCommentsQuery.cs b/src/Moonglade.Comments/GetCommentsQuery.cs
index df3702822..0a6ee4d7f 100644
--- a/src/Moonglade.Comments/GetCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetCommentsQuery.cs
@@ -1,17 +1,17 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Comments;
 
 public record GetCommentsQuery(int PageSize, int PageIndex) : IRequest<List<CommentDetailedItem>>;
 
-public class GetCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<GetCommentsQuery, List<CommentDetailedItem>>
+public class GetCommentsQueryHandler(MoongladeRepository<CommentEntity> repo) : IRequestHandler<GetCommentsQuery, List<CommentDetailedItem>>
 {
     public Task<List<CommentDetailedItem>> Handle(GetCommentsQuery request, CancellationToken ct)
     {
-        var spec = new CommentSpec(request.PageSize, request.PageIndex);
+        var spec = new CommentPagingSepc(request.PageSize, request.PageIndex);
         var comments = repo.SelectAsync(spec, CommentDetailedItem.EntitySelector, ct);
 
         return comments;
diff --git a/src/Moonglade.Data/Spec/CommentSpec.cs b/src/Moonglade.Data/Spec/CommentSpec.cs
index 88a6a94d4..254c446e0 100644
--- a/src/Moonglade.Data/Spec/CommentSpec.cs
+++ b/src/Moonglade.Data/Spec/CommentSpec.cs
@@ -1,23 +1,22 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class CommentSpec : BaseSpecification<CommentEntity>
+public sealed class CommentPagingSepc : Specification<CommentEntity>
 {
-    public CommentSpec(int pageSize, int pageIndex) : base(c => true)
+    public CommentPagingSepc(int pageSize, int pageIndex)
     {
         var startRow = (pageIndex - 1) * pageSize;
 
-        AddInclude(comment => comment
-            .Include(c => c.Post)
-            .Include(c => c.Replies));
-        ApplyOrderByDescending(p => p.CreateTimeUtc);
-        ApplyPaging(startRow, pageSize);
+        Query.Include(c => c.Post);
+        Query.Include(c => c.Replies);
+
+        Query.OrderByDescending(p => p.CreateTimeUtc);
+        Query.Take(pageSize).Skip(startRow);
     }
 }
 
-public class CommentByIdsSepc : Specification<CommentEntity>
+public sealed class CommentByIdsSepc : Specification<CommentEntity>
 {
     public CommentByIdsSepc(Guid[] ids)
     {
@@ -25,7 +24,7 @@ public CommentByIdsSepc(Guid[] ids)
     }
 }
 
-public class CommentWithRepliesSpec : Specification<CommentEntity>
+public sealed class CommentWithRepliesSpec : Specification<CommentEntity>
 {
     public CommentWithRepliesSpec(Guid postId)
     {

From 70a20bef5685e254bf1946594f1aaea2b95adde9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:10:33 +0800
Subject: [PATCH 072/227] remove unused methods

---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 6 ------
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 2 --
 2 files changed, 8 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index c677567e5..a301114cc 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -18,12 +18,6 @@ public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
 
     public IQueryable<T> AsQueryable() => DbContext.Set<T>();
 
-    public async Task DeleteAsync(T entity, CancellationToken ct = default)
-    {
-        DbContext.Set<T>().Remove(entity);
-        await DbContext.SaveChangesAsync(ct);
-    }
-
     public Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default)
     {
         DbContext.Set<T>().RemoveRange(entities);
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 0f8c5509d..9247a1795 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -12,8 +12,6 @@ public interface IRepository<T> where T : class
 
     IQueryable<T> AsQueryable();
 
-    Task DeleteAsync(T entity, CancellationToken ct = default);
-
     Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default);
 
     Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default);

From fe02c9565dda75d3f0115d2b3606ae16b2361e41 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:10:36 +0800
Subject: [PATCH 073/227] Update SearchPostQuery.cs

---
 src/Moonglade.Core/PostFeature/SearchPostQuery.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
index 283ff6824..37ff3f4be 100644
--- a/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
+++ b/src/Moonglade.Core/PostFeature/SearchPostQuery.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using System.Text.RegularExpressions;
 using Moonglade.Data;
+using System.Text.RegularExpressions;
 
 namespace Moonglade.Core.PostFeature;
 

From 13f7bb3aea947d0a6bb58e31cb0f5f12a7331171 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:11:52 +0800
Subject: [PATCH 074/227] CommentReplySpec

---
 src/Moonglade.Comments/DeleteCommentsCommand.cs | 5 ++---
 src/Moonglade.Data/Spec/CommentReplySpec.cs     | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index 0fd279a00..80307dd59 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -1,14 +1,13 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Comments;
 
 public record DeleteCommentsCommand(Guid[] Ids) : IRequest;
 
-public class DeleteCommentsCommandHandler(MoongladeRepository<CommentEntity> commentRepo, IRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<DeleteCommentsCommand>
+public class DeleteCommentsCommandHandler(MoongladeRepository<CommentEntity> commentRepo, MoongladeRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<DeleteCommentsCommand>
 {
     public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
     {
@@ -17,7 +16,7 @@ public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
         foreach (var cmt in comments)
         {
             // 1. Delete all replies
-            var cReplies = await commentReplyRepo.ListAsync(new CommentReplySpec(cmt.Id));
+            var cReplies = await commentReplyRepo.ListAsync(new CommentReplySpec(cmt.Id), ct);
             if (cReplies.Any())
             {
                 await commentReplyRepo.DeleteAsync(cReplies, ct);
diff --git a/src/Moonglade.Data/Spec/CommentReplySpec.cs b/src/Moonglade.Data/Spec/CommentReplySpec.cs
index 1434caf04..5a6a50ccb 100644
--- a/src/Moonglade.Data/Spec/CommentReplySpec.cs
+++ b/src/Moonglade.Data/Spec/CommentReplySpec.cs
@@ -1,6 +1,11 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public class CommentReplySpec(Guid commentId) : BaseSpecification<CommentReplyEntity>(cr => cr.CommentId == commentId);
\ No newline at end of file
+public class CommentReplySpec : Specification<CommentReplyEntity>
+{
+    public CommentReplySpec(Guid commentId)
+    {
+        Query.Where(cr => cr.CommentId == commentId);
+    }
+}
\ No newline at end of file

From 68569236289120f3a028f05de9b9115dbe905eab Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:13:17 +0800
Subject: [PATCH 075/227] migrate CountAsync

---
 src/Moonglade.Comments/CountCommentsQuery.cs             | 6 +++---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 5 -----
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Comments/CountCommentsQuery.cs b/src/Moonglade.Comments/CountCommentsQuery.cs
index 3b37ec06d..b18fbffdc 100644
--- a/src/Moonglade.Comments/CountCommentsQuery.cs
+++ b/src/Moonglade.Comments/CountCommentsQuery.cs
@@ -1,12 +1,12 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Comments;
 
 public record CountCommentsQuery : IRequest<int>;
 
-public class CountCommentsQueryHandler(IRepository<CommentEntity> repo) : IRequestHandler<CountCommentsQuery, int>
+public class CountCommentsQueryHandler(MoongladeRepository<CommentEntity> repo) : IRequestHandler<CountCommentsQuery, int>
 {
-    public Task<int> Handle(CountCommentsQuery request, CancellationToken ct) => repo.CountAsync(ct: ct);
+    public Task<int> Handle(CountCommentsQuery request, CancellationToken ct) => repo.CountAsync(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index a301114cc..09daccd62 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -27,11 +27,6 @@ public Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default)
     public Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default) =>
         DbContext.Set<T>().CountAsync(condition, ct);
 
-    public Task<int> CountAsync(ISpecification<T> spec = null, CancellationToken ct = default) =>
-        null != spec ?
-            ApplySpecification(spec).CountAsync(cancellationToken: ct) :
-            DbContext.Set<T>().CountAsync(cancellationToken: ct);
-
     public Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default) =>
         ApplySpecification(spec).AnyAsync(cancellationToken: ct);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 9247a1795..309363cc6 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -16,8 +16,6 @@ public interface IRepository<T> where T : class
 
     Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default);
 
-    Task<int> CountAsync(ISpecification<T> spec = null, CancellationToken ct = default);
-
     Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default);
 
     Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);

From 1e17221b04cb72df6a0a5e6b0ccaf41246e910f4 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:16:27 +0800
Subject: [PATCH 076/227] TagByNormalizedNameSpec

---
 src/Moonglade.Core/TagFeature/CreateTagCommand.cs | 7 ++++---
 src/Moonglade.Core/TagFeature/GetTagQuery.cs      | 7 ++++---
 src/Moonglade.Data/MoongladeRepository.cs         | 4 ++++
 src/Moonglade.Data/Spec/TagSpec.cs                | 7 +++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
index 44f9567df..ec56ec4ae 100644
--- a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
@@ -1,11 +1,12 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.TagFeature;
 
 public record CreateTagCommand(string Name) : IRequest<Tag>;
 
-public class CreateTagCommandHandler(IRepository<TagEntity> repo) : IRequestHandler<CreateTagCommand, Tag>
+public class CreateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<CreateTagCommand, Tag>
 {
     public async Task<Tag> Handle(CreateTagCommand request, CancellationToken ct)
     {
@@ -14,7 +15,7 @@ public async Task<Tag> Handle(CreateTagCommand request, CancellationToken ct)
         var normalizedName = Tag.NormalizeName(request.Name, Helper.TagNormalizationDictionary);
         if (await repo.AnyAsync(t => t.NormalizedName == normalizedName, ct))
         {
-            return await repo.FirstOrDefaultAsync(new TagSpec(normalizedName), Tag.EntitySelector);
+            return await repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(normalizedName), Tag.EntitySelector);
         }
 
         var newTag = new TagEntity
diff --git a/src/Moonglade.Core/TagFeature/GetTagQuery.cs b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
index 3d1d6bab2..1e7871bcf 100644
--- a/src/Moonglade.Core/TagFeature/GetTagQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
@@ -1,11 +1,12 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.TagFeature;
 
 public record GetTagQuery(string NormalizedName) : IRequest<Tag>;
 
-public class GetTagQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagQuery, Tag>
+public class GetTagQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagQuery, Tag>
 {
     public Task<Tag> Handle(GetTagQuery request, CancellationToken ct) =>
-        repo.FirstOrDefaultAsync(new TagSpec(request.NormalizedName), Tag.EntitySelector);
+        repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(request.NormalizedName), Tag.EntitySelector);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index b836c7438..50d1dd3ad 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -36,6 +36,10 @@ public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, Cancellat
             dbContext.Set<T>().AnyAsync(cancellationToken: ct);
     }
 
+    public Task<TResult> FirstOrDefaultAsync<TResult>(
+        ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
+        ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
+
     public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 
diff --git a/src/Moonglade.Data/Spec/TagSpec.cs b/src/Moonglade.Data/Spec/TagSpec.cs
index ba4bca140..39c42c85d 100644
--- a/src/Moonglade.Data/Spec/TagSpec.cs
+++ b/src/Moonglade.Data/Spec/TagSpec.cs
@@ -10,9 +10,12 @@ public TagSpec(int top) : base(t => true)
         ApplyPaging(0, top);
         ApplyOrderByDescending(p => p.Posts.Count);
     }
+}
 
-    public TagSpec(string normalizedName) : base(t => t.NormalizedName == normalizedName)
+public sealed class TagByNormalizedNameSpec : Specification<TagEntity>
+{
+    public TagByNormalizedNameSpec(string normalizedName)
     {
-
+        Query.Where(t => t.NormalizedName == normalizedName);
     }
 }
\ No newline at end of file

From 49e49ba7c0e01b0c33da5e5341641463c52d2cd5 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:18:10 +0800
Subject: [PATCH 077/227] TagSpec

---
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs | 5 +++--
 src/Moonglade.Data/Spec/TagSpec.cs               | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index 5d336a4db..063352cfe 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -1,10 +1,11 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.TagFeature;
 
 public record GetHotTagsQuery(int Top) : IRequest<List<KeyValuePair<Tag, int>>>;
 
-public class GetHotTagsQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<Tag, int>>>
+public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<Tag, int>>>
 {
     public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Spec/TagSpec.cs b/src/Moonglade.Data/Spec/TagSpec.cs
index 39c42c85d..d90edb78b 100644
--- a/src/Moonglade.Data/Spec/TagSpec.cs
+++ b/src/Moonglade.Data/Spec/TagSpec.cs
@@ -1,14 +1,13 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class TagSpec : BaseSpecification<TagEntity>
+public sealed class TagSpec : Specification<TagEntity>
 {
-    public TagSpec(int top) : base(t => true)
+    public TagSpec(int top)
     {
-        ApplyPaging(0, top);
-        ApplyOrderByDescending(p => p.Posts.Count);
+        Query.Skip(0).Take(top);
+        Query.OrderByDescending(p => p.Posts.Count);
     }
 }
 

From 112a89131d9d9e3d5dee3a7e31162aa3402c08fd Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:20:39 +0800
Subject: [PATCH 078/227] migrate PurgeRecycledCommand

---
 .../PostFeature/PurgeRecycledCommand.cs              |  7 ++++---
 src/Moonglade.Data/Spec/PostSpec.cs                  | 12 +++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
index 2a5897145..a7aa9426f 100644
--- a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
+++ b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
@@ -1,16 +1,17 @@
 using Edi.CacheAside.InMemory;
+using Moonglade.Data;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PostFeature;
 
 public record PurgeRecycledCommand : IRequest;
 
-public class PurgeRecycledCommandHandler(ICacheAside cache, IRepository<PostEntity> repo) : IRequestHandler<PurgeRecycledCommand>
+public class PurgeRecycledCommandHandler(ICacheAside cache, MoongladeRepository<PostEntity> repo) : IRequestHandler<PurgeRecycledCommand>
 {
     public async Task Handle(PurgeRecycledCommand request, CancellationToken ct)
     {
-        var spec = new PostSpec(true);
-        var posts = await repo.ListAsync(spec);
+        var spec = new PostByDeletionFlagSpec(true);
+        var posts = await repo.ListAsync(spec, ct);
         await repo.DeleteAsync(posts, ct);
 
         foreach (var guid in posts.Select(p => p.Id))
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 9e751bed0..880b0bb99 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -93,15 +93,17 @@ public PostSpec(PostStatus status)
         }
     }
 
-    public PostSpec(bool isDeleted) :
-        base(p => p.IsDeleted == isDeleted)
+    public PostSpec() :
+        base(p => p.IsDeleted)
     {
 
     }
+}
 
-    public PostSpec() :
-        base(p => p.IsDeleted)
+public class PostByDeletionFlagSpec : Specification<PostEntity>
+{
+    public PostByDeletionFlagSpec(bool isDeleted)
     {
-
+        Query.Where(p => p.IsDeleted == isDeleted);
     }
 }
\ No newline at end of file

From 09d8f6a9c4004c0927d630b8eb2a0ec5c23e0c87 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:23:03 +0800
Subject: [PATCH 079/227] PostTagByTagIdSpec

---
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs |  6 ++++--
 src/Moonglade.Data/Spec/PostTagSpec.cs            | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index 8805ee8c2..570a19d9a 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -5,7 +5,9 @@ namespace Moonglade.Core.TagFeature;
 
 public record DeleteTagCommand(int Id) : IRequest<OperationCode>;
 
-public class DeleteTagCommandHandler(MoongladeRepository<TagEntity> tagRepo, IRepository<PostTagEntity> postTagRepo)
+public class DeleteTagCommandHandler(
+    MoongladeRepository<TagEntity> tagRepo,
+    MoongladeRepository<PostTagEntity> postTagRepo)
     : IRequestHandler<DeleteTagCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationToken ct)
@@ -14,7 +16,7 @@ public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationTo
         if (!exists) return OperationCode.ObjectNotFound;
 
         // 1. Delete Post-Tag Association
-        var postTags = await postTagRepo.ListAsync(new PostTagSpec(request.Id));
+        var postTags = await postTagRepo.ListAsync(new PostTagByTagIdSpec(request.Id), ct);
         await postTagRepo.DeleteAsync(postTags, ct);
 
         // 2. Delte Tag itslef
diff --git a/src/Moonglade.Data/Spec/PostTagSpec.cs b/src/Moonglade.Data/Spec/PostTagSpec.cs
index 10e8488cf..ccd031c39 100644
--- a/src/Moonglade.Data/Spec/PostTagSpec.cs
+++ b/src/Moonglade.Data/Spec/PostTagSpec.cs
@@ -5,10 +5,6 @@ namespace Moonglade.Data.Spec;
 
 public sealed class PostTagSpec : BaseSpecification<PostTagEntity>
 {
-    public PostTagSpec(int tagId) : base(pt => pt.TagId == tagId)
-    {
-    }
-
     public PostTagSpec(int tagId, int pageSize, int pageIndex)
         : base(pt =>
             pt.TagId == tagId
@@ -19,4 +15,12 @@ public PostTagSpec(int tagId, int pageSize, int pageIndex)
         ApplyPaging(startRow, pageSize);
         ApplyOrderByDescending(p => p.Post.PubDateUtc);
     }
+}
+
+public class PostTagByTagIdSpec : Specification<PostTagEntity>
+{
+    public PostTagByTagIdSpec(int tagId)
+    {
+        Query.Where(pt => pt.TagId == tagId);
+    }
 }
\ No newline at end of file

From a1f82b681871ff0ea19995420794a05b57b173be Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:25:17 +0800
Subject: [PATCH 080/227] migrate AsQueryable DeleteAsync

---
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 13 +++++++------
 .../Infrastructure/DbContextRepository.cs           |  8 --------
 src/Moonglade.Data/Infrastructure/IRepository.cs    |  4 ----
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 8ef506dff..0d31c6897 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Moonglade.Configuration;
 using Moonglade.Core.TagFeature;
+using Moonglade.Data;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
@@ -10,9 +11,9 @@ namespace Moonglade.Core.PostFeature;
 public record UpdatePostCommand(Guid Id, PostEditModel Payload) : IRequest<PostEntity>;
 public class UpdatePostCommandHandler : IRequestHandler<UpdatePostCommand, PostEntity>
 {
-    private readonly IRepository<PostCategoryEntity> _pcRepository;
-    private readonly IRepository<PostTagEntity> _ptRepository;
-    private readonly IRepository<TagEntity> _tagRepo;
+    private readonly MoongladeRepository<PostCategoryEntity> _pcRepository;
+    private readonly MoongladeRepository<PostTagEntity> _ptRepository;
+    private readonly MoongladeRepository<TagEntity> _tagRepo;
     private readonly IRepository<PostEntity> _postRepo;
     private readonly ICacheAside _cache;
     private readonly IBlogConfig _blogConfig;
@@ -20,9 +21,9 @@ public class UpdatePostCommandHandler : IRequestHandler<UpdatePostCommand, PostE
     private readonly bool _useMySqlWorkaround;
 
     public UpdatePostCommandHandler(
-        IRepository<PostCategoryEntity> pcRepository,
-        IRepository<PostTagEntity> ptRepository,
-        IRepository<TagEntity> tagRepo,
+        MoongladeRepository<PostCategoryEntity> pcRepository,
+        MoongladeRepository<PostTagEntity> ptRepository,
+        MoongladeRepository<TagEntity> tagRepo,
         IRepository<PostEntity> postRepo,
         ICacheAside cache,
         IBlogConfig blogConfig, IConfiguration configuration)
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 09daccd62..2f4eb1360 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -16,14 +16,6 @@ public virtual ValueTask<T> GetAsync(object key, CancellationToken ct = default)
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
-    public IQueryable<T> AsQueryable() => DbContext.Set<T>();
-
-    public Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default)
-    {
-        DbContext.Set<T>().RemoveRange(entities);
-        return DbContext.SaveChangesAsync(ct);
-    }
-
     public Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default) =>
         DbContext.Set<T>().CountAsync(condition, ct);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 309363cc6..0db8143a6 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -10,10 +10,6 @@ public interface IRepository<T> where T : class
 
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
-    IQueryable<T> AsQueryable();
-
-    Task DeleteAsync(IEnumerable<T> entities, CancellationToken ct = default);
-
     Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default);
 
     Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default);

From de3dbdbddd1d84d6d5ffb08d2372bad735a1f10b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:30:02 +0800
Subject: [PATCH 081/227] PostPagingByStatusSpec

---
 .../PostFeature/ListPostSegmentQuery.cs       |  6 ++++--
 src/Moonglade.Data/Spec/PostPagingSpec.cs     | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
index 87be9b638..9d66f7997 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
@@ -1,5 +1,6 @@
 using Moonglade.Data.Spec;
 using System.Linq.Expressions;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
@@ -15,7 +16,8 @@ public class ListPostSegmentQuery(PostStatus postStatus, int offset, int pageSiz
     public string Keyword { get; set; } = keyword;
 }
 
-public class ListPostSegmentQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentQuery, (List<PostSegment> Posts, int TotalRows)>
+public class ListPostSegmentQueryHandler(MoongladeRepository<PostEntity> repo) :
+    IRequestHandler<ListPostSegmentQuery, (List<PostSegment> Posts, int TotalRows)>
 {
     public async Task<(List<PostSegment> Posts, int TotalRows)> Handle(ListPostSegmentQuery request, CancellationToken ct)
     {
@@ -30,7 +32,7 @@ public class ListPostSegmentQueryHandler(IRepository<PostEntity> repo) : IReques
                 $"{nameof(request.Offset)} can not be less than 0, current value: {request.Offset}.");
         }
 
-        var spec = new PostPagingSpec(request.PostStatus, request.Keyword, request.PageSize, request.Offset);
+        var spec = new PostPagingByStatusSpec(request.PostStatus, request.Keyword, request.PageSize, request.Offset);
         var posts = await repo.SelectAsync(spec, PostSegment.EntitySelector, ct);
 
         Expression<Func<PostEntity, bool>> countExp = p => null == request.Keyword || p.Title.Contains(request.Keyword);
diff --git a/src/Moonglade.Data/Spec/PostPagingSpec.cs b/src/Moonglade.Data/Spec/PostPagingSpec.cs
index 0ec1fd016..c6b4a8bb5 100644
--- a/src/Moonglade.Data/Spec/PostPagingSpec.cs
+++ b/src/Moonglade.Data/Spec/PostPagingSpec.cs
@@ -14,29 +14,33 @@ public PostPagingSpec(int pageSize, int pageIndex, Guid? categoryId = null)
         ApplyOrderByDescending(p => p.PubDateUtc);
         ApplyPaging(startRow, pageSize);
     }
+}
 
-    public PostPagingSpec(PostStatus postStatus, string keyword, int pageSize, int offset)
-        : base(p => null == keyword || p.Title.Contains(keyword))
+public sealed class PostPagingByStatusSpec : Specification<PostEntity>
+{
+    public PostPagingByStatusSpec(PostStatus postStatus, string keyword, int pageSize, int offset)
     {
+        Query.Where(p => null == keyword || p.Title.Contains(keyword));
+
         switch (postStatus)
         {
             case PostStatus.Draft:
-                AddCriteria(p => !p.IsPublished && !p.IsDeleted);
+                Query.Where(p => !p.IsPublished && !p.IsDeleted);
                 break;
             case PostStatus.Published:
-                AddCriteria(p => p.IsPublished && !p.IsDeleted);
+                Query.Where(p => p.IsPublished && !p.IsDeleted);
                 break;
             case PostStatus.Deleted:
-                AddCriteria(p => p.IsDeleted);
+                Query.Where(p => p.IsDeleted);
                 break;
             case PostStatus.Default:
-                AddCriteria(p => true);
+                Query.Where(p => true);
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(postStatus), postStatus, null);
         }
 
-        ApplyPaging(offset, pageSize);
-        ApplyOrderByDescending(p => p.PubDateUtc);
+        Query.Skip(offset).Take(pageSize);
+        Query.OrderByDescending(p => p.PubDateUtc);
     }
 }
\ No newline at end of file

From 71481ed8bdb169ce1462aa6f1a2385105bf7debb Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:30:26 +0800
Subject: [PATCH 082/227] remove CountAsync

---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 3 ---
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 2f4eb1360..6557a83f0 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -16,9 +16,6 @@ public virtual ValueTask<T> GetAsync(object key, CancellationToken ct = default)
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
-    public Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default) =>
-        DbContext.Set<T>().CountAsync(condition, ct);
-
     public Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default) =>
         ApplySpecification(spec).AnyAsync(cancellationToken: ct);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 0db8143a6..6830d2b43 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -10,8 +10,6 @@ public interface IRepository<T> where T : class
 
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
-    Task<int> CountAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default);
-
     Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default);
 
     Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);

From 57367089ab775189bb7bf033f4579f9a198b6ee6 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:32:55 +0800
Subject: [PATCH 083/227] ReplyCommentCommandHandler

---
 src/Moonglade.Comments/ReplyCommentCommand.cs | 8 +++++---
 src/Moonglade.Data/Spec/PostSpec.cs           | 8 +-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Comments/ReplyCommentCommand.cs b/src/Moonglade.Comments/ReplyCommentCommand.cs
index f13717ada..85e143796 100644
--- a/src/Moonglade.Comments/ReplyCommentCommand.cs
+++ b/src/Moonglade.Comments/ReplyCommentCommand.cs
@@ -1,17 +1,19 @@
 using MediatR;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Utils;
 
 namespace Moonglade.Comments;
 
 public record ReplyCommentCommand(Guid CommentId, string ReplyContent) : IRequest<CommentReply>;
 
-public class ReplyCommentCommandHandler(IRepository<CommentEntity> commentRepo, IRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<ReplyCommentCommand, CommentReply>
+public class ReplyCommentCommandHandler(
+    MoongladeRepository<CommentEntity> commentRepo,
+    MoongladeRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<ReplyCommentCommand, CommentReply>
 {
     public async Task<CommentReply> Handle(ReplyCommentCommand request, CancellationToken ct)
     {
-        var cmt = await commentRepo.GetAsync(request.CommentId, ct);
+        var cmt = await commentRepo.GetByIdAsync(request.CommentId, ct);
         if (cmt is null) throw new InvalidOperationException($"Comment {request.CommentId} is not found.");
 
         var id = Guid.NewGuid();
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 880b0bb99..41617b98a 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -92,12 +92,6 @@ public PostSpec(PostStatus status)
                 throw new ArgumentOutOfRangeException(nameof(status), status, null);
         }
     }
-
-    public PostSpec() :
-        base(p => p.IsDeleted)
-    {
-
-    }
 }
 
 public class PostByDeletionFlagSpec : Specification<PostEntity>
@@ -106,4 +100,4 @@ public PostByDeletionFlagSpec(bool isDeleted)
     {
         Query.Where(p => p.IsDeleted == isDeleted);
     }
-}
\ No newline at end of file
+}

From 557bb1d1cf890150c7e2f881d2cf9c0b6e3a8597 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:34:15 +0800
Subject: [PATCH 084/227] Update UpdatePostCommand.cs

---
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 0d31c6897..a80694b02 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -14,7 +14,7 @@ public class UpdatePostCommandHandler : IRequestHandler<UpdatePostCommand, PostE
     private readonly MoongladeRepository<PostCategoryEntity> _pcRepository;
     private readonly MoongladeRepository<PostTagEntity> _ptRepository;
     private readonly MoongladeRepository<TagEntity> _tagRepo;
-    private readonly IRepository<PostEntity> _postRepo;
+    private readonly MoongladeRepository<PostEntity> _postRepo;
     private readonly ICacheAside _cache;
     private readonly IBlogConfig _blogConfig;
     private readonly IConfiguration _configuration;
@@ -24,7 +24,7 @@ public UpdatePostCommandHandler(
         MoongladeRepository<PostCategoryEntity> pcRepository,
         MoongladeRepository<PostTagEntity> ptRepository,
         MoongladeRepository<TagEntity> tagRepo,
-        IRepository<PostEntity> postRepo,
+        MoongladeRepository<PostEntity> postRepo,
         ICacheAside cache,
         IBlogConfig blogConfig, IConfiguration configuration)
     {
@@ -43,7 +43,7 @@ public UpdatePostCommandHandler(
     public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToken ct)
     {
         var (guid, postEditModel) = request;
-        var post = await _postRepo.GetAsync(guid, ct);
+        var post = await _postRepo.GetByIdAsync(guid, ct);
         if (null == post)
         {
             throw new InvalidOperationException($"Post {guid} is not found.");

From 400bf47fe0e83504809e1e52efc3822158e40c2d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:38:21 +0800
Subject: [PATCH 085/227] PostByChecksumSpec

---
 .../PostFeature/GetPostBySlugQuery.cs         |  9 ++---
 src/Moonglade.Data/Spec/PostSpec.cs           | 36 ++++++++++++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index bd464dcee..970a9da51 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -1,5 +1,6 @@
 using Edi.CacheAside.InMemory;
 using Microsoft.Extensions.Configuration;
+using Moonglade.Data;
 using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
@@ -7,7 +8,7 @@ namespace Moonglade.Core.PostFeature;
 
 public record GetPostBySlugQuery(PostSlug Slug) : IRequest<Post>;
 
-public class GetPostBySlugQueryHandler(IRepository<PostEntity> repo, ICacheAside cache, IConfiguration configuration)
+public class GetPostBySlugQueryHandler(MoongladeRepository<PostEntity> repo, ICacheAside cache, IConfiguration configuration)
     : IRequestHandler<GetPostBySlugQuery, Post>
 {
     public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
@@ -16,19 +17,19 @@ public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
 
         // Try to find by checksum
         var slugCheckSum = Helper.ComputeCheckSum($"{request.Slug.Slug}#{date:yyyyMMdd}");
-        ISpecification<PostEntity> spec = new PostSpec(slugCheckSum);
+        Ardalis.Specification.ISpecification<PostEntity> spec = new PostByChecksumSpec(slugCheckSum);
 
         var pid = await repo.FirstOrDefaultAsync(spec, p => p.Id);
         if (pid == Guid.Empty)
         {
             // Post does not have a checksum, fall back to old method
-            spec = new PostSpec(date, request.Slug.Slug);
+            spec = new PostByDateAndSlugSpec(date, request.Slug.Slug);
             pid = await repo.FirstOrDefaultAsync(spec, x => x.Id);
 
             if (pid == Guid.Empty) return null;
 
             // Post is found, fill it's checksum so that next time the query can be run against checksum
-            var p = await repo.GetAsync(pid, ct);
+            var p = await repo.GetByIdAsync(pid, ct);
             p.HashCheckSum = slugCheckSum;
 
             await repo.UpdateAsync(p, ct);
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 41617b98a..ed5341dd4 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -40,15 +40,6 @@ public PostSpec(string slug, DateTime pubDateUtc) :
 
     }
 
-    public PostSpec(int hashCheckSum)
-        : base(p => p.HashCheckSum == hashCheckSum && p.IsPublished && !p.IsDeleted)
-    {
-        AddInclude(post => post
-            .Include(p => p.Comments)
-            .Include(pt => pt.Tags)
-            .Include(p => p.PostCategory).ThenInclude(pc => pc.Category));
-    }
-
     public PostSpec(DateTime date, string slug)
         : base(p => p.Slug == slug &&
                     p.IsPublished &&
@@ -101,3 +92,30 @@ public PostByDeletionFlagSpec(bool isDeleted)
         Query.Where(p => p.IsDeleted == isDeleted);
     }
 }
+
+public class PostByChecksumSpec : Specification<PostEntity>
+{
+    public PostByChecksumSpec(int hashCheckSum)
+    {
+        Query.Where(p => p.HashCheckSum == hashCheckSum && p.IsPublished && !p.IsDeleted);
+
+        Query.Include(p => p.Comments)
+             .Include(pt => pt.Tags)
+             .Include(p => p.PostCategory).ThenInclude(pc => pc.Category);
+    }
+}
+
+public class PostByDateAndSlugSpec : Specification<PostEntity>
+{
+    public PostByDateAndSlugSpec(DateTime date, string slug)
+    {
+        Query.Where(p => p.Slug == slug &&
+                         p.IsPublished &&
+                         p.PubDateUtc.Value.Date == date &&
+                         !p.IsDeleted);
+
+        Query.Include(p => p.Comments)
+             .Include(pt => pt.Tags)
+             .Include(p => p.PostCategory).ThenInclude(pc => pc.Category);
+    }
+}
\ No newline at end of file

From 7c603dbfc3f6d95e496c244696e9874d0e142dab Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:38:42 +0800
Subject: [PATCH 086/227] remove GetAsync

---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 3 ---
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 6557a83f0..e48ea60ef 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -10,9 +10,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
     public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
         DbContext.Set<T>().FirstOrDefaultAsync(condition);
 
-    public virtual ValueTask<T> GetAsync(object key, CancellationToken ct = default) =>
-        DbContext.Set<T>().FindAsync(keyValues: new[] { key }, cancellationToken: ct);
-
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 6830d2b43..d01c289f8 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -4,8 +4,6 @@ namespace Moonglade.Data.Infrastructure;
 
 public interface IRepository<T> where T : class
 {
-    ValueTask<T> GetAsync(object key, CancellationToken ct = default);
-
     Task<T> GetAsync(Expression<Func<T, bool>> condition);
 
     Task<List<T>> ListAsync(ISpecification<T> spec);

From f3d957092fd2e481e61cfeeb3bea100d8b2d7eb6 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:39:11 +0800
Subject: [PATCH 087/227] remove UpdateAsync

---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs | 6 ------
 src/Moonglade.Data/Infrastructure/IRepository.cs         | 2 --
 2 files changed, 8 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index e48ea60ef..b553d2f05 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -48,12 +48,6 @@ public async Task<T> AddAsync(T entity, CancellationToken ct = default)
         return entity;
     }
 
-    public async Task UpdateAsync(T entity, CancellationToken ct = default)
-    {
-        DbContext.Entry(entity).State = EntityState.Modified;
-        await DbContext.SaveChangesAsync(ct);
-    }
-
     private IQueryable<T> ApplySpecification(ISpecification<T> spec) =>
         SpecificationEvaluator<T>.GetQuery(DbContext.Set<T>().AsQueryable(), spec);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index d01c289f8..bb281c7f3 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -24,6 +24,4 @@ Task<List<TResult>> SelectAsync<TGroup, TResult>(
         ISpecification<T> spec = null);
 
     Task<T> AddAsync(T entity, CancellationToken ct = default);
-
-    Task UpdateAsync(T entity, CancellationToken ct = default);
 }
\ No newline at end of file

From 4006b056ee519da7abcd5c48877b5630fb480bdc Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:42:11 +0800
Subject: [PATCH 088/227] apply more MoongladeRepository

---
 src/Moonglade.Comments/CreateCommentCommand.cs      | 3 ++-
 src/Moonglade.Core/PostFeature/CreatePostCommand.cs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index a348ba275..f91cce86e 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using Moonglade.Configuration;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
@@ -18,7 +19,7 @@ public class CreateCommentCommand(Guid postId, CommentRequest payload, string ip
 public class CreateCommentCommandHandler(
     IBlogConfig blogConfig,
     IRepository<PostEntity> postRepo,
-    IRepository<CommentEntity> commentRepo) : IRequestHandler<CreateCommentCommand, CommentDetailedItem>
+    MoongladeRepository<CommentEntity> commentRepo) : IRequestHandler<CreateCommentCommand, CommentDetailedItem>
 {
     public async Task<CommentDetailedItem> Handle(CreateCommentCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 43c53dc7f..4356b4efb 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Moonglade.Configuration;
 using Moonglade.Core.TagFeature;
+using Moonglade.Data;
 using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
@@ -9,9 +10,10 @@ namespace Moonglade.Core.PostFeature;
 
 public record CreatePostCommand(PostEditModel Payload) : IRequest<PostEntity>;
 
-public class CreatePostCommandHandler(IRepository<PostEntity> postRepo,
+public class CreatePostCommandHandler(
+        IRepository<PostEntity> postRepo,
+        MoongladeRepository<TagEntity> tagRepo,
         ILogger<CreatePostCommandHandler> logger,
-        IRepository<TagEntity> tagRepo,
         IConfiguration configuration,
         IBlogConfig blogConfig)
     : IRequestHandler<CreatePostCommand, PostEntity>

From 1b852985bd05e6e50202545a5a696a64605fbf82 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:44:24 +0800
Subject: [PATCH 089/227] PostBySlugAndPubDateSpec

---
 .../PostFeature/CreatePostCommand.cs          |  4 ++--
 .../Infrastructure/DbContextRepository.cs     | 11 ---------
 .../Infrastructure/IRepository.cs             |  4 ----
 src/Moonglade.Data/Spec/PostSpec.cs           | 24 ++++++++++---------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 4356b4efb..9219e55c3 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -11,7 +11,7 @@ namespace Moonglade.Core.PostFeature;
 public record CreatePostCommand(PostEditModel Payload) : IRequest<PostEntity>;
 
 public class CreatePostCommandHandler(
-        IRepository<PostEntity> postRepo,
+        MoongladeRepository<PostEntity> postRepo,
         MoongladeRepository<TagEntity> tagRepo,
         ILogger<CreatePostCommandHandler> logger,
         IConfiguration configuration,
@@ -50,7 +50,7 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
 
         // check if exist same slug under the same day
         var todayUtc = DateTime.UtcNow.Date;
-        if (await postRepo.AnyAsync(new PostSpec(post.Slug, todayUtc), ct))
+        if (await postRepo.AnyAsync(new PostBySlugAndPubDateSpec(post.Slug, todayUtc), ct))
         {
             var uid = Guid.NewGuid();
             post.Slug += $"-{uid.ToString().ToLower()[..8]}";
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index b553d2f05..f987e311b 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -13,9 +13,6 @@ public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
-    public Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default) =>
-        ApplySpecification(spec).AnyAsync(cancellationToken: ct);
-
     public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default) =>
         null != condition ?
             DbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :
@@ -40,14 +37,6 @@ public async Task<List<TResult>> SelectAsync<TGroup, TResult>(
             await ApplySpecification(spec).AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync() :
             await DbContext.Set<T>().AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync();
 
-    public async Task<T> AddAsync(T entity, CancellationToken ct = default)
-    {
-        await DbContext.Set<T>().AddAsync(entity, ct);
-        await DbContext.SaveChangesAsync(ct);
-
-        return entity;
-    }
-
     private IQueryable<T> ApplySpecification(ISpecification<T> spec) =>
         SpecificationEvaluator<T>.GetQuery(DbContext.Set<T>().AsQueryable(), spec);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index bb281c7f3..143732e47 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -8,8 +8,6 @@ public interface IRepository<T> where T : class
 
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
-    Task<bool> AnyAsync(ISpecification<T> spec, CancellationToken ct = default);
-
     Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);
 
     Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
@@ -22,6 +20,4 @@ Task<List<TResult>> SelectAsync<TGroup, TResult>(
         Expression<Func<T, TGroup>> groupExpression,
         Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
         ISpecification<T> spec = null);
-
-    Task<T> AddAsync(T entity, CancellationToken ct = default);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index ed5341dd4..247b1204c 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -29,17 +29,6 @@ public PostSpec(int year, int month = 0) :
         ApplyOrderByDescending(p => p.PubDateUtc);
     }
 
-    public PostSpec(string slug, DateTime pubDateUtc) :
-        base(p =>
-        p.Slug == slug &&
-        p.PubDateUtc != null
-        && p.PubDateUtc.Value.Year == pubDateUtc.Year
-        && p.PubDateUtc.Value.Month == pubDateUtc.Month
-        && p.PubDateUtc.Value.Day == pubDateUtc.Day)
-    {
-
-    }
-
     public PostSpec(DateTime date, string slug)
         : base(p => p.Slug == slug &&
                     p.IsPublished &&
@@ -118,4 +107,17 @@ public PostByDateAndSlugSpec(DateTime date, string slug)
              .Include(pt => pt.Tags)
              .Include(p => p.PostCategory).ThenInclude(pc => pc.Category);
     }
+}
+
+public class PostBySlugAndPubDateSpec : Specification<PostEntity>
+{
+    public PostBySlugAndPubDateSpec(string slug, DateTime pubDateUtc)
+    {
+        Query.Where(p =>
+            p.Slug == slug &&
+            p.PubDateUtc != null
+            && p.PubDateUtc.Value.Year == pubDateUtc.Year
+            && p.PubDateUtc.Value.Month == pubDateUtc.Month
+            && p.PubDateUtc.Value.Day == pubDateUtc.Day);
+    }
 }
\ No newline at end of file

From 8afca3d90763c0462a27dbae8aa039e3031fae1e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:45:22 +0800
Subject: [PATCH 090/227] Update BaseSpecification.cs

---
 src/Moonglade.Data/Infrastructure/BaseSpecification.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs b/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
index 6033b6c13..4aa75d71d 100644
--- a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
+++ b/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
@@ -34,8 +34,6 @@ protected virtual void ApplyPaging(int skip, int take)
         IsPagingEnabled = true;
     }
 
-    protected virtual void ApplyOrderBy(Expression<Func<T, object>> expression) => OrderBy = expression;
-
     protected virtual void ApplyOrderByDescending(Expression<Func<T, object>> expression) => OrderByDescending = expression;
 }
 

From dec7cc62bb819c4faeaa3cb78ba7d9b5ac1f26b1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:47:50 +0800
Subject: [PATCH 091/227] PostByCatSpec

---
 .../Infrastructure/DbContextRepository.cs      |  3 ---
 .../Infrastructure/IRepository.cs              |  2 --
 src/Moonglade.Data/Spec/PostSpec.cs            | 18 ++++++++++++++++++
 .../SyndicationDataSource.cs                   | 11 ++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index f987e311b..d7f3f66fc 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -7,9 +7,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
 {
     protected readonly DbContext DbContext = ctx;
 
-    public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
-        DbContext.Set<T>().FirstOrDefaultAsync(condition);
-
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 143732e47..065da1ac7 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -4,8 +4,6 @@ namespace Moonglade.Data.Infrastructure;
 
 public interface IRepository<T> where T : class
 {
-    Task<T> GetAsync(Expression<Func<T, bool>> condition);
-
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
     Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 247b1204c..a47d949dd 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -74,6 +74,24 @@ public PostSpec(PostStatus status)
     }
 }
 
+public class PostByCatSpec : Specification<PostEntity>
+{
+    public PostByCatSpec(Guid? categoryId, int? top = null)
+    {
+        Query.Where(p => !p.IsDeleted &&
+                         p.IsPublished &&
+                         p.IsFeedIncluded &&
+                         (categoryId == null || p.PostCategory.Any(c => c.CategoryId == categoryId.Value)));
+
+        Query.OrderByDescending(p => p.PubDateUtc);
+
+        if (top.HasValue)
+        {
+            Query.Skip(0).Take(top.Value);
+        }
+    }
+}
+
 public class PostByDeletionFlagSpec : Specification<PostEntity>
 {
     public PostByDeletionFlagSpec(bool isDeleted)
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index 5b22b8a02..bedc1909b 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Moonglade.Configuration;
+using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
@@ -17,15 +18,15 @@ public class SyndicationDataSource : ISyndicationDataSource
 {
     private readonly string _baseUrl;
     private readonly IBlogConfig _blogConfig;
-    private readonly IRepository<CategoryEntity> _catRepo;
-    private readonly IRepository<PostEntity> _postRepo;
+    private readonly MoongladeRepository<CategoryEntity> _catRepo;
+    private readonly MoongladeRepository<PostEntity> _postRepo;
     private readonly IConfiguration _configuration;
 
     public SyndicationDataSource(
         IBlogConfig blogConfig,
         IHttpContextAccessor httpContextAccessor,
-        IRepository<CategoryEntity> catRepo,
-        IRepository<PostEntity> postRepo,
+        MoongladeRepository<CategoryEntity> catRepo,
+        MoongladeRepository<PostEntity> postRepo,
         IConfiguration configuration)
     {
         _blogConfig = blogConfig;
@@ -63,7 +64,7 @@ private async Task<List<FeedEntry>> GetFeedEntriesAsync(Guid? catId = null)
             top = _blogConfig.FeedSettings.RssItemCount;
         }
 
-        var postSpec = new PostSpec(catId, top);
+        var postSpec = new PostByCatSpec(catId, top);
         var list = await _postRepo.SelectAsync(postSpec, p => p.PubDateUtc != null ? new FeedEntry
         {
             Id = p.Id.ToString(),

From 2021ad45858f29375b8fc4bd57d6b3f46af4181f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:48:10 +0800
Subject: [PATCH 092/227] code clean up

---
 src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs | 4 ++--
 src/Moonglade.Syndication/SyndicationDataSource.cs     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
index 9d66f7997..af2e336be 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
@@ -1,6 +1,6 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using System.Linq.Expressions;
-using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index bedc1909b..bf3c88c4e 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -3,7 +3,6 @@
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 using Moonglade.Utils;
 

From a820c99675cd0c7aa1c4729ba1cf359233a76429 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 13:57:30 +0800
Subject: [PATCH 093/227] PostByYearMonthSpec

---
 .../PostFeature/ListArchiveQuery.cs           |  7 ++--
 src/Moonglade.Data/Spec/PostSpec.cs           | 38 +++++++------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
index dadef3e57..397dace67 100644
--- a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
@@ -1,14 +1,15 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PostFeature;
 
 public record ListArchiveQuery(int Year, int? Month = null) : IRequest<List<PostDigest>>;
 
-public class ListArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListArchiveQuery, List<PostDigest>>
+public class ListArchiveQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<ListArchiveQuery, List<PostDigest>>
 {
     public Task<List<PostDigest>> Handle(ListArchiveQuery request, CancellationToken ct)
     {
-        var spec = new PostSpec(request.Year, request.Month.GetValueOrDefault());
+        var spec = new PostByYearMonthSpec(request.Year, request.Month.GetValueOrDefault());
         var list = repo.SelectAsync(spec, PostDigest.EntitySelector, ct);
         return list;
     }
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index a47d949dd..913dae0ac 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -5,30 +5,6 @@ namespace Moonglade.Data.Spec;
 
 public sealed class PostSpec : BaseSpecification<PostEntity>
 {
-    public PostSpec(Guid? categoryId, int? top = null) :
-        base(p => !p.IsDeleted &&
-                  p.IsPublished &&
-                  p.IsFeedIncluded &&
-                  (categoryId == null || p.PostCategory.Any(c => c.CategoryId == categoryId.Value)))
-    {
-        ApplyOrderByDescending(p => p.PubDateUtc);
-
-        if (top.HasValue)
-        {
-            ApplyPaging(0, top.Value);
-        }
-    }
-
-    public PostSpec(int year, int month = 0) :
-        base(p => p.PubDateUtc.Value.Year == year &&
-                  (month == 0 || p.PubDateUtc.Value.Month == month))
-    {
-        // Fix #313: Filter out unpublished posts
-        AddCriteria(p => p.IsPublished && !p.IsDeleted);
-
-        ApplyOrderByDescending(p => p.PubDateUtc);
-    }
-
     public PostSpec(DateTime date, string slug)
         : base(p => p.Slug == slug &&
                     p.IsPublished &&
@@ -92,6 +68,20 @@ public PostByCatSpec(Guid? categoryId, int? top = null)
     }
 }
 
+public class PostByYearMonthSpec : Specification<PostEntity>
+{
+    public PostByYearMonthSpec(int year, int month = 0)
+    {
+        Query.Where(p => p.PubDateUtc.Value.Year == year &&
+                         (month == 0 || p.PubDateUtc.Value.Month == month));
+
+        // Fix #313: Filter out unpublished posts
+        Query.Where(p => p.IsPublished && !p.IsDeleted);
+
+        Query.OrderByDescending(p => p.PubDateUtc);
+    }
+}
+
 public class PostByDeletionFlagSpec : Specification<PostEntity>
 {
     public PostByDeletionFlagSpec(bool isDeleted)

From be9abe6cacace3a6e14c329cd43c2e2d9f4f7de2 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:01:51 +0800
Subject: [PATCH 094/227] migrate PostByDateAndSlugSpec

---
 src/Moonglade.Data/Spec/PostSpec.cs          | 12 ------------
 src/Moonglade.Pingback/ReceivePingCommand.cs |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 913dae0ac..65901d4a7 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -5,18 +5,6 @@ namespace Moonglade.Data.Spec;
 
 public sealed class PostSpec : BaseSpecification<PostEntity>
 {
-    public PostSpec(DateTime date, string slug)
-        : base(p => p.Slug == slug &&
-                    p.IsPublished &&
-                    p.PubDateUtc.Value.Date == date &&
-                    !p.IsDeleted)
-    {
-        AddInclude(post => post
-            .Include(p => p.Comments)
-            .Include(pt => pt.Tags)
-            .Include(p => p.PostCategory).ThenInclude(pc => pc.Category));
-    }
-
     public PostSpec(Guid id, bool includeRelatedData = true) : base(p => p.Id == id)
     {
         if (includeRelatedData)
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index b00cf9b46..a329c5724 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -23,7 +23,7 @@ public class ReceivePingCommandHandler(
         ILogger<ReceivePingCommandHandler> logger,
         IPingSourceInspector pingSourceInspector,
         MoongladeRepository<PingbackEntity> pingbackRepo,
-        IRepository<PostEntity> postRepo) : IRequestHandler<ReceivePingCommand, PingbackResponse>
+        MoongladeRepository<PostEntity> postRepo) : IRequestHandler<ReceivePingCommand, PingbackResponse>
 {
     private string _sourceUrl;
     private string _targetUrl;
@@ -57,7 +57,7 @@ public async Task<PingbackResponse> Handle(ReceivePingCommand request, Cancellat
             }
 
             var (slug, pubDate) = GetSlugInfoFromUrl(pingRequest.TargetUrl);
-            var spec = new PostSpec(pubDate, slug);
+            var spec = new PostByDateAndSlugSpec(pubDate, slug);
             var (id, title) = await postRepo.FirstOrDefaultAsync(spec, p => new Tuple<Guid, string>(p.Id, p.Title));
             if (id == Guid.Empty)
             {

From b606617a277ded024b0aa1339b947a6ff8147907 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:06:40 +0800
Subject: [PATCH 095/227] PostByStatusSpec

---
 .../PostFeature/GetArchiveQuery.cs            |  5 ++--
 src/Moonglade.Data/MoongladeRepository.cs     |  8 +++++++
 src/Moonglade.Data/Spec/PostSpec.cs           | 24 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index 838f1f3b4..a56b380c0 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -1,12 +1,13 @@
 using Moonglade.Data.Spec;
 using System.Linq.Expressions;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
 public record struct Archive(int Year, int Month, int Count);
 public record GetArchiveQuery : IRequest<List<Archive>>;
 
-public class GetArchiveQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<GetArchiveQuery, List<Archive>>
+public class GetArchiveQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetArchiveQuery, List<Archive>>
 {
     private readonly Expression<Func<IGrouping<(int Year, int Month), PostEntity>, Archive>> _archiveSelector =
         p => new(p.Key.Year, p.Key.Month, p.Count());
@@ -18,7 +19,7 @@ public async Task<List<Archive>> Handle(GetArchiveQuery request, CancellationTok
             return new();
         }
 
-        var spec = new PostSpec(PostStatus.Published);
+        var spec = new PostByStatusSpec(PostStatus.Published);
         var list = await repo.SelectAsync(
             post => new(post.PubDateUtc.Value.Year, post.PubDateUtc.Value.Month),
             _archiveSelector, spec);
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 50d1dd3ad..a4e4dd39f 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -46,4 +46,12 @@ public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult
     public async Task<List<TResult>> SelectAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
+
+    public async Task<List<TResult>> SelectAsync<TGroup, TResult>(
+        Expression<Func<T, TGroup>> groupExpression,
+        Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
+        ISpecification<T> spec = null) =>
+        null != spec ?
+            await ApplySpecification(spec).AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync() :
+            await dbContext.Set<T>().AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync();
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 65901d4a7..ec0bd3915 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -38,6 +38,30 @@ public PostSpec(PostStatus status)
     }
 }
 
+public class PostByStatusSpec : Specification<PostEntity>
+{
+    public PostByStatusSpec(PostStatus status)
+    {
+        switch (status)
+        {
+            case PostStatus.Draft:
+                Query.Where(p => !p.IsPublished && !p.IsDeleted);
+                break;
+            case PostStatus.Published:
+                Query.Where(p => p.IsPublished && !p.IsDeleted);
+                break;
+            case PostStatus.Deleted:
+                Query.Where(p => p.IsDeleted);
+                break;
+            case PostStatus.Default:
+                Query.Where(p => true);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(status), status, null);
+        }
+    }
+}
+
 public class PostByCatSpec : Specification<PostEntity>
 {
     public PostByCatSpec(Guid? categoryId, int? top = null)

From 57187674fc762de36456fee89d67644535964e00 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:07:38 +0800
Subject: [PATCH 096/227] clean up

---
 .../ListPostSegmentByStatusQuery.cs           |  7 ++++---
 .../Infrastructure/DbContextRepository.cs     | 13 ------------
 .../Infrastructure/IRepository.cs             |  7 -------
 src/Moonglade.Data/Spec/PostSpec.cs           | 21 -------------------
 4 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
index bbf695025..4c6de7efe 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
@@ -1,14 +1,15 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PostFeature;
 
 public record ListPostSegmentByStatusQuery(PostStatus Status) : IRequest<List<PostSegment>>;
 
-public class ListPostSegmentByStatusQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentByStatusQuery, List<PostSegment>>
+public class ListPostSegmentByStatusQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<ListPostSegmentByStatusQuery, List<PostSegment>>
 {
     public Task<List<PostSegment>> Handle(ListPostSegmentByStatusQuery request, CancellationToken ct)
     {
-        var spec = new PostSpec(request.Status);
+        var spec = new PostByStatusSpec(request.Status);
         return repo.SelectAsync(spec, PostSegment.EntitySelector, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index d7f3f66fc..39b67a43b 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -10,11 +10,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
     public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
         await ApplySpecification(spec).AsNoTracking().ToListAsync();
 
-    public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default) =>
-        null != condition ?
-            DbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :
-            DbContext.Set<T>().AnyAsync(cancellationToken: ct);
-
     public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await DbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 
@@ -26,14 +21,6 @@ public Task<TResult> FirstOrDefaultAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
         ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
 
-    public async Task<List<TResult>> SelectAsync<TGroup, TResult>(
-        Expression<Func<T, TGroup>> groupExpression,
-        Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
-        ISpecification<T> spec = null) =>
-        null != spec ?
-            await ApplySpecification(spec).AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync() :
-            await DbContext.Set<T>().AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync();
-
     private IQueryable<T> ApplySpecification(ISpecification<T> spec) =>
         SpecificationEvaluator<T>.GetQuery(DbContext.Set<T>().AsQueryable(), spec);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 065da1ac7..bd85fb2f2 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -6,16 +6,9 @@ public interface IRepository<T> where T : class
 {
     Task<List<T>> ListAsync(ISpecification<T> spec);
 
-    Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default);
-
     Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
     Task<List<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);
-
-    Task<List<TResult>> SelectAsync<TGroup, TResult>(
-        Expression<Func<T, TGroup>> groupExpression,
-        Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
-        ISpecification<T> spec = null);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index ec0bd3915..75d64552b 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -15,27 +15,6 @@ public PostSpec(Guid id, bool includeRelatedData = true) : base(p => p.Id == id)
                 .ThenInclude(pc => pc.Category));
         }
     }
-
-    public PostSpec(PostStatus status)
-    {
-        switch (status)
-        {
-            case PostStatus.Draft:
-                AddCriteria(p => !p.IsPublished && !p.IsDeleted);
-                break;
-            case PostStatus.Published:
-                AddCriteria(p => p.IsPublished && !p.IsDeleted);
-                break;
-            case PostStatus.Deleted:
-                AddCriteria(p => p.IsDeleted);
-                break;
-            case PostStatus.Default:
-                AddCriteria(p => true);
-                break;
-            default:
-                throw new ArgumentOutOfRangeException(nameof(status), status, null);
-        }
-    }
 }
 
 public class PostByStatusSpec : Specification<PostEntity>

From e42ef4ce6175dc078471e5c9e65884086ecac621 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:10:03 +0800
Subject: [PATCH 097/227] migrate PostSpec

---
 src/Moonglade.Comments/CreateCommentCommand.cs     |  2 +-
 src/Moonglade.Core/PostFeature/GetDraftQuery.cs    |  5 +++--
 src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs |  5 +++--
 .../Infrastructure/DbContextRepository.cs          |  4 ----
 src/Moonglade.Data/Infrastructure/IRepository.cs   |  2 --
 src/Moonglade.Data/Spec/PostSpec.cs                | 14 +++++++-------
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index f91cce86e..3338ec1a0 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -18,7 +18,7 @@ public class CreateCommentCommand(Guid postId, CommentRequest payload, string ip
 
 public class CreateCommentCommandHandler(
     IBlogConfig blogConfig,
-    IRepository<PostEntity> postRepo,
+    MoongladeRepository<PostEntity> postRepo,
     MoongladeRepository<CommentEntity> commentRepo) : IRequestHandler<CreateCommentCommand, CommentDetailedItem>
 {
     public async Task<CommentDetailedItem> Handle(CreateCommentCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
index 02051396a..2a4727fbc 100644
--- a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
@@ -1,10 +1,11 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PostFeature;
 
 public record GetDraftQuery(Guid Id) : IRequest<Post>;
 
-public class GetDraftQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<GetDraftQuery, Post>
+public class GetDraftQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetDraftQuery, Post>
 {
     public Task<Post> Handle(GetDraftQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
index 628dd4d56..5dab5f18d 100644
--- a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
@@ -1,10 +1,11 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PostFeature;
 
 public record GetPostByIdQuery(Guid Id) : IRequest<Post>;
 
-public class GetPostByIdQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<GetPostByIdQuery, Post>
+public class GetPostByIdQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetPostByIdQuery, Post>
 {
     public Task<Post> Handle(GetPostByIdQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 39b67a43b..17148241b 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -17,10 +17,6 @@ public async Task<List<TResult>> SelectAsync<TResult>(
         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) =>
-        ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
-
     private IQueryable<T> ApplySpecification(ISpecification<T> spec) =>
         SpecificationEvaluator<T>.GetQuery(DbContext.Set<T>().AsQueryable(), spec);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index bd85fb2f2..5409fea30 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -9,6 +9,4 @@ public interface IRepository<T> where T : class
     Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
     Task<List<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);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Spec/PostSpec.cs
index 75d64552b..9cedead97 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSpec.cs
@@ -1,18 +1,18 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class PostSpec : BaseSpecification<PostEntity>
+public sealed class PostSpec : Specification<PostEntity>
 {
-    public PostSpec(Guid id, bool includeRelatedData = true) : base(p => p.Id == id)
+    public PostSpec(Guid id, bool includeRelatedData = true)
     {
+        Query.Where(p => p.Id == id);
+
         if (includeRelatedData)
         {
-            AddInclude(post => post
-                .Include(p => p.Tags)
-                .Include(p => p.PostCategory)
-                .ThenInclude(pc => pc.Category));
+            Query.Include(p => p.Tags)
+                 .Include(p => p.PostCategory)
+                 .ThenInclude(pc => pc.Category);
         }
     }
 }

From 2f7c4e57c357c56bf71f54041c00b5f3b98cabd4 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:10:25 +0800
Subject: [PATCH 098/227] clean up

---
 src/Moonglade.Comments/CreateCommentCommand.cs    | 1 -
 src/Moonglade.Core/PostFeature/GetArchiveQuery.cs | 4 ++--
 src/Moonglade.Pingback/ReceivePingCommand.cs      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index 3338ec1a0..840ffdf28 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -2,7 +2,6 @@
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Comments;
diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index a56b380c0..03aedbe64 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -1,6 +1,6 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using System.Linq.Expressions;
-using Moonglade.Data;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index a329c5724..d90087e12 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 using System.Text.RegularExpressions;
 using System.Xml;

From 621b9f1dc2ece2e6a2217a2592a2dd796aad6d70 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:11:40 +0800
Subject: [PATCH 099/227] LoginHistorySpec

---
 src/Moonglade.Auth/GetLoginHistoryQuery.cs  | 8 ++++----
 src/Moonglade.Data/Spec/LoginHistorySpec.cs | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Moonglade.Auth/GetLoginHistoryQuery.cs b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
index 8070d556b..4ac9d4578 100644
--- a/src/Moonglade.Auth/GetLoginHistoryQuery.cs
+++ b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
@@ -1,16 +1,16 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
+using Moonglade.Data;
+using Moonglade.Data.Entities;
 using Moonglade.Data.Spec;
 
 namespace Moonglade.Auth;
 
 public record GetLoginHistoryQuery : IRequest<List<LoginHistoryEntity>>;
 
-public class GetLoginHistoryQueryHandler(IRepository<LoginHistoryEntity> repo) : IRequestHandler<GetLoginHistoryQuery, List<LoginHistoryEntity>>
+public class GetLoginHistoryQueryHandler(MoongladeRepository<LoginHistoryEntity> repo) : IRequestHandler<GetLoginHistoryQuery, List<LoginHistoryEntity>>
 {
     public async Task<List<LoginHistoryEntity>> Handle(GetLoginHistoryQuery request, CancellationToken ct)
     {
-        var history = await repo.ListAsync(new LoginHistorySpec(10));
+        var history = await repo.ListAsync(new LoginHistorySpec(10), ct);
         return history;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/LoginHistorySpec.cs b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
index bfbbf60ac..bfee98681 100644
--- a/src/Moonglade.Data/Spec/LoginHistorySpec.cs
+++ b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
@@ -1,13 +1,12 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class LoginHistorySpec : BaseSpecification<LoginHistoryEntity>
+public sealed class LoginHistorySpec : Specification<LoginHistoryEntity>
 {
-    public LoginHistorySpec(int top) : base(t => true)
+    public LoginHistorySpec(int top)
     {
-        ApplyPaging(0, top);
-        ApplyOrderByDescending(p => p.LoginTimeUtc);
+        Query.Skip(0).Take(top);
+        Query.OrderByDescending(p => p.LoginTimeUtc);
     }
 }
\ No newline at end of file

From cbd99a05e3afa87cbe3998fa47872558a50913d0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:12:42 +0800
Subject: [PATCH 100/227] PageSpec

---
 src/Moonglade.Core/PageFeature/GetPagesQuery.cs       |  7 ++++---
 .../Infrastructure/DbContextRepository.cs             |  3 ---
 src/Moonglade.Data/Infrastructure/IRepository.cs      |  2 --
 src/Moonglade.Data/Spec/PageSpec.cs                   | 11 ++++++-----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs b/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
index f2564d154..9072efcb8 100644
--- a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
@@ -1,14 +1,15 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 
 namespace Moonglade.Core.PageFeature;
 
 public record GetPagesQuery(int Top) : IRequest<List<BlogPage>>;
 
-public class GetPagesQueryHandler(IRepository<PageEntity> repo) : IRequestHandler<GetPagesQuery, List<BlogPage>>
+public class GetPagesQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPagesQuery, List<BlogPage>>
 {
     public async Task<List<BlogPage>> Handle(GetPagesQuery request, CancellationToken ct)
     {
-        var pages = await repo.ListAsync(new PageSpec(request.Top));
+        var pages = await repo.ListAsync(new PageSpec(request.Top), ct);
         var list = pages.Select(p => new BlogPage(p)).ToList();
         return list;
     }
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 17148241b..4c6577c68 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -7,9 +7,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
 {
     protected readonly DbContext DbContext = ctx;
 
-    public async Task<List<T>> ListAsync(ISpecification<T> spec) =>
-        await ApplySpecification(spec).AsNoTracking().ToListAsync();
-
     public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await DbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 5409fea30..26c78af20 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -4,8 +4,6 @@ namespace Moonglade.Data.Infrastructure;
 
 public interface IRepository<T> where T : class
 {
-    Task<List<T>> ListAsync(ISpecification<T> spec);
-
     Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 
     Task<List<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default);
diff --git a/src/Moonglade.Data/Spec/PageSpec.cs b/src/Moonglade.Data/Spec/PageSpec.cs
index 7efe61db1..b97cc66be 100644
--- a/src/Moonglade.Data/Spec/PageSpec.cs
+++ b/src/Moonglade.Data/Spec/PageSpec.cs
@@ -1,13 +1,14 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class PageSpec : BaseSpecification<PageEntity>
+public sealed class PageSpec : Specification<PageEntity>
 {
-    public PageSpec(int top) : base(p => p.IsPublished)
+    public PageSpec(int top)
     {
-        ApplyOrderByDescending(p => p.CreateTimeUtc);
-        ApplyPaging(0, top);
+        Query.Where(p => p.IsPublished);
+
+        Query.OrderByDescending(p => p.CreateTimeUtc);
+        Query.Skip(0).Take(top);
     }
 }
\ No newline at end of file

From 01a573ab91402f91cc39c0df2f132e14dc911c03 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:14:21 +0800
Subject: [PATCH 101/227] PostSitePageSpec

---
 src/Moonglade.Data/Spec/PostSitePageSpec.cs       | 10 ++++++++--
 src/Moonglade.Web/Middleware/SiteMapMiddleware.cs |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Data/Spec/PostSitePageSpec.cs b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
index b66f3125e..9aadb4f5f 100644
--- a/src/Moonglade.Data/Spec/PostSitePageSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
@@ -3,5 +3,11 @@
 
 namespace Moonglade.Data.Spec;
 
-public class PostSitePageSpec() : BaseSpecification<PostEntity>(p =>
-    p.IsPublished && !p.IsDeleted);
\ No newline at end of file
+public class PostSitePageSpec : Specification<PostEntity>
+{
+    public PostSitePageSpec()
+    {
+        Query.Where(p =>
+            p.IsPublished && !p.IsDeleted);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index 851001927..6fd2c0c4d 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -12,8 +12,8 @@ public async Task Invoke(
         HttpContext httpContext,
         IBlogConfig blogConfig,
         ICacheAside cache,
-        IRepository<PostEntity> postRepo,
-        IRepository<PageEntity> pageRepo)
+        MoongladeRepository<PostEntity> postRepo,
+        MoongladeRepository<PageEntity> pageRepo)
     {
         var xml = await cache.GetOrCreateAsync(BlogCachePartition.General.ToString(), "sitemap", async _ =>
         {
@@ -28,8 +28,8 @@ public async Task Invoke(
 
     private static async Task<string> GetSiteMapData(
         string siteRootUrl,
-        IRepository<PostEntity> postRepo,
-        IRepository<PageEntity> pageRepo,
+        MoongladeRepository<PostEntity> postRepo,
+        MoongladeRepository<PageEntity> pageRepo,
         CancellationToken ct)
     {
         var sb = new StringBuilder();

From 7a667cbfc9e5106928edb62065dfe28f0cb63b7a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:14:38 +0800
Subject: [PATCH 102/227] code clean up

---
 src/Moonglade.Data/Spec/PostSitePageSpec.cs       | 1 -
 src/Moonglade.Web/Middleware/SiteMapMiddleware.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Moonglade.Data/Spec/PostSitePageSpec.cs b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
index 9aadb4f5f..7de2dc5f2 100644
--- a/src/Moonglade.Data/Spec/PostSitePageSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
@@ -1,5 +1,4 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index 6fd2c0c4d..43d9b7285 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -1,5 +1,4 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.Spec;
 using System.Globalization;
 using System.Xml;

From c86a7847c0305036285eac5d1a071fae8bf45172 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:15:01 +0800
Subject: [PATCH 103/227] Update BaseSpecification.cs

---
 src/Moonglade.Data/Infrastructure/BaseSpecification.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs b/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
index 4aa75d71d..6f016adca 100644
--- a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
+++ b/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
@@ -20,13 +20,6 @@ protected BaseSpecification()
     public int Skip { get; private set; }
     public bool IsPagingEnabled { get; private set; }
 
-    public void AddCriteria(Expression<Func<T, bool>> criteria)
-    {
-        Criteria = Criteria is not null ? Criteria.AndAlso(criteria) : criteria;
-    }
-
-    protected virtual void AddInclude(Func<IQueryable<T>, IIncludableQueryable<T, object>> expression) => Include = expression;
-
     protected virtual void ApplyPaging(int skip, int take)
     {
         Skip = skip;

From cc6b731be6de6d20c0dc18f315fc880d3d7ae700 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:16:38 +0800
Subject: [PATCH 104/227] migrate exporters

---
 src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs       | 6 ++++--
 src/Moonglade.Data/Exporting/ExportPageDataCommand.cs       | 3 +--
 src/Moonglade.Data/Exporting/ExportPostDataCommand.cs       | 3 +--
 .../Exporting/Exporters/ZippedJsonExporter.cs               | 5 ++---
 src/Moonglade.Data/Infrastructure/DbContextRepository.cs    | 3 ---
 src/Moonglade.Data/Infrastructure/IRepository.cs            | 2 --
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
index 44311ed9a..5ec83a3f9 100644
--- a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
@@ -1,8 +1,10 @@
-namespace Moonglade.Core.TagFeature;
+using Moonglade.Data;
+
+namespace Moonglade.Core.TagFeature;
 
 public record GetTagCountListQuery : IRequest<List<KeyValuePair<Tag, int>>>;
 
-public class GetTagCountListQueryHandler(IRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<Tag, int>>>
+public class GetTagCountListQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<Tag, int>>>
 {
     public Task<List<KeyValuePair<Tag, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
         repo.SelectAsync(t =>
diff --git a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
index 9e278e6cc..1b3e7593f 100644
--- a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
@@ -1,13 +1,12 @@
 using MediatR;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Exporting.Exporters;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Exporting;
 
 public record ExportPageDataCommand : IRequest<ExportResult>;
 
-public class ExportPageDataCommandHandler(IRepository<PageEntity> repo) : IRequestHandler<ExportPageDataCommand, ExportResult>
+public class ExportPageDataCommandHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<ExportPageDataCommand, ExportResult>
 {
     public Task<ExportResult> Handle(ExportPageDataCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
index 25fcb2756..9d1b5e819 100644
--- a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
@@ -1,13 +1,12 @@
 using MediatR;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Exporting.Exporters;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Exporting;
 
 public record ExportPostDataCommand : IRequest<ExportResult>;
 
-public class ExportPostDataCommandHandler(IRepository<PostEntity> repo) : IRequestHandler<ExportPostDataCommand, ExportResult>
+public class ExportPostDataCommandHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<ExportPostDataCommand, ExportResult>
 {
     public Task<ExportResult> Handle(ExportPostDataCommand request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
index 9abe8d8ed..c9186eeaf 100644
--- a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
+++ b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
@@ -1,12 +1,11 @@
-using Moonglade.Data.Infrastructure;
-using System.IO.Compression;
+using System.IO.Compression;
 using System.Linq.Expressions;
 using System.Text;
 using System.Text.Json;
 
 namespace Moonglade.Data.Exporting.Exporters;
 
-public class ZippedJsonExporter<T>(IRepository<T> repository, string fileNamePrefix, string directory)
+public class ZippedJsonExporter<T>(MoongladeRepository<T> repository, string fileNamePrefix, string directory)
     : IExporter<T>
     where T : class
 {
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
index 4c6577c68..d340d1f17 100644
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
@@ -7,9 +7,6 @@ public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
 {
     protected readonly DbContext DbContext = ctx;
 
-    public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
-        await DbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
-
     public async Task<List<TResult>> SelectAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
index 26c78af20..d8272c5d5 100644
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ b/src/Moonglade.Data/Infrastructure/IRepository.cs
@@ -4,7 +4,5 @@ namespace Moonglade.Data.Infrastructure;
 
 public interface IRepository<T> where T : class
 {
-    Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default);
-
     Task<List<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default);
 }
\ No newline at end of file

From fe1a68654bd05dbcd19bbc8a3d92804c83910bf2 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:17:48 +0800
Subject: [PATCH 105/227] PostTagSpec

---
 src/Moonglade.Core/PostFeature/ListByTagQuery.cs |  5 +++--
 src/Moonglade.Data/Spec/PostTagSpec.cs           | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
index 7ec3dadcf..f5c2a7027 100644
--- a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
@@ -1,11 +1,12 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
 
 public record ListByTagQuery(int TagId, int PageSize, int PageIndex) : IRequest<List<PostDigest>>;
 
-public class ListByTagQueryHandler(IRepository<PostTagEntity> repo) : IRequestHandler<ListByTagQuery, List<PostDigest>>
+public class ListByTagQueryHandler(MoongladeRepository<PostTagEntity> repo) : IRequestHandler<ListByTagQuery, List<PostDigest>>
 {
     public Task<List<PostDigest>> Handle(ListByTagQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Spec/PostTagSpec.cs b/src/Moonglade.Data/Spec/PostTagSpec.cs
index ccd031c39..a2b1d248d 100644
--- a/src/Moonglade.Data/Spec/PostTagSpec.cs
+++ b/src/Moonglade.Data/Spec/PostTagSpec.cs
@@ -3,17 +3,18 @@
 
 namespace Moonglade.Data.Spec;
 
-public sealed class PostTagSpec : BaseSpecification<PostTagEntity>
+public sealed class PostTagSpec : Specification<PostTagEntity>
 {
     public PostTagSpec(int tagId, int pageSize, int pageIndex)
-        : base(pt =>
+    {
+        Query.Where(pt =>
             pt.TagId == tagId
             && !pt.Post.IsDeleted
-            && pt.Post.IsPublished)
-    {
+            && pt.Post.IsPublished);
+
         var startRow = (pageIndex - 1) * pageSize;
-        ApplyPaging(startRow, pageSize);
-        ApplyOrderByDescending(p => p.Post.PubDateUtc);
+        Query.Skip(startRow).Take(pageSize);
+        Query.OrderByDescending(p => p.Post.PubDateUtc);
     }
 }
 

From cbff397736bf4ffdcf8fca89459e0222326a1655 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:18:55 +0800
Subject: [PATCH 106/227] FeaturedPostSpec

---
 .../PostFeature/ListFeaturedQuery.cs            |  5 +++--
 src/Moonglade.Data/Spec/FeaturedPostSpec.cs     | 17 +++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
index a3992a913..90eb664bf 100644
--- a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
@@ -1,11 +1,12 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
 
 public record ListFeaturedQuery(int PageSize, int PageIndex) : IRequest<List<PostDigest>>;
 
-public class ListFeaturedQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListFeaturedQuery, List<PostDigest>>
+public class ListFeaturedQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<ListFeaturedQuery, List<PostDigest>>
 {
     public Task<List<PostDigest>> Handle(ListFeaturedQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs b/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
index 4660a89c9..89de57208 100644
--- a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
+++ b/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
@@ -3,20 +3,17 @@
 
 namespace Moonglade.Data.Spec;
 
-public sealed class FeaturedPostSpec : BaseSpecification<PostEntity>
+public sealed class FeaturedPostSpec : Specification<PostEntity>
 {
-    public FeaturedPostSpec() : base(p => p.IsFeatured)
-    {
-    }
-
     public FeaturedPostSpec(int pageSize, int pageIndex)
-        : base(p =>
+    {
+        Query.Where(p =>
             p.IsFeatured
             && !p.IsDeleted
-            && p.IsPublished)
-    {
+            && p.IsPublished);
+
         var startRow = (pageIndex - 1) * pageSize;
-        ApplyPaging(startRow, pageSize);
-        ApplyOrderByDescending(p => p.PubDateUtc);
+        Query.Skip(startRow).Take(pageSize);
+        Query.OrderByDescending(p => p.PubDateUtc);
     }
 }
\ No newline at end of file

From 132b382ae0a8d136864918a109592bf5f97e86cf Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:25:43 +0800
Subject: [PATCH 107/227] clean up old code

---
 src/Moonglade.Core/Moonglade.Core.csproj      |  1 -
 .../PostFeature/ListPostsQuery.cs             |  5 +-
 .../MySqlDbContextRepository.cs               |  6 +--
 .../ServiceCollectionExtensions.cs            |  4 +-
 .../PostgreSqlDbContextRepository.cs          |  6 +--
 .../ServiceCollectionExtensions.cs            |  4 +-
 .../SqlServerDbContextRepository.cs           |  6 +--
 .../ServiceCollectionExtensions.cs            |  4 +-
 ...ecification.cs => ExpressionExtentions.cs} | 35 +++-----------
 .../Infrastructure/DbContextRepository.cs     | 16 -------
 .../Infrastructure/IRepository.cs             |  8 ----
 .../Infrastructure/ISpecification.cs          | 16 -------
 .../Infrastructure/SpecificationEvaluator.cs  | 46 -------------------
 src/Moonglade.Data/Spec/FeaturedPostSpec.cs   |  1 -
 src/Moonglade.Data/Spec/FriendLinkSpec.cs     |  6 ---
 src/Moonglade.Data/Spec/PostPagingSpec.cs     | 12 ++---
 src/Moonglade.Data/Spec/PostTagSpec.cs        |  1 -
 17 files changed, 24 insertions(+), 153 deletions(-)
 rename src/Moonglade.Data/{Infrastructure/BaseSpecification.cs => ExpressionExtentions.cs} (52%)
 delete mode 100644 src/Moonglade.Data/Infrastructure/DbContextRepository.cs
 delete mode 100644 src/Moonglade.Data/Infrastructure/IRepository.cs
 delete mode 100644 src/Moonglade.Data/Infrastructure/ISpecification.cs
 delete mode 100644 src/Moonglade.Data/Infrastructure/SpecificationEvaluator.cs
 delete mode 100644 src/Moonglade.Data/Spec/FriendLinkSpec.cs

diff --git a/src/Moonglade.Core/Moonglade.Core.csproj b/src/Moonglade.Core/Moonglade.Core.csproj
index c1e26fed7..b0f009de1 100644
--- a/src/Moonglade.Core/Moonglade.Core.csproj
+++ b/src/Moonglade.Core/Moonglade.Core.csproj
@@ -17,7 +17,6 @@
         <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" />
diff --git a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
index 7fe79dfb7..e9e89a686 100644
--- a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
@@ -1,4 +1,5 @@
-using Moonglade.Data.Spec;
+using Moonglade.Data;
+using Moonglade.Data.Spec;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
@@ -13,7 +14,7 @@ public class ListPostsQuery(int pageSize, int pageIndex, Guid? catId = null)
     public Guid? CatId { get; set; } = catId;
 }
 
-public class ListPostsQueryHandler(IRepository<PostEntity> repo) : IRequestHandler<ListPostsQuery, List<PostDigest>>
+public class ListPostsQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<ListPostsQuery, List<PostDigest>>
 {
     public Task<List<PostDigest>> Handle(ListPostsQuery request, CancellationToken ct)
     {
diff --git a/src/Moonglade.Data.MySql/Infrastructure/MySqlDbContextRepository.cs b/src/Moonglade.Data.MySql/Infrastructure/MySqlDbContextRepository.cs
index 6e8e1d969..14f83a157 100644
--- a/src/Moonglade.Data.MySql/Infrastructure/MySqlDbContextRepository.cs
+++ b/src/Moonglade.Data.MySql/Infrastructure/MySqlDbContextRepository.cs
@@ -1,7 +1,5 @@
-using Moonglade.Data.Infrastructure;
+namespace Moonglade.Data.MySql.Infrastructure;
 
-namespace Moonglade.Data.MySql.Infrastructure;
 
-
-public class MySqlDbContextRepository<T>(MySqlBlogDbContext dbContext) : DbContextRepository<T>(dbContext)
+public class MySqlDbContextRepository<T>(MySqlBlogDbContext dbContext) : MoongladeRepository<T>(dbContext)
     where T : class;
\ No newline at end of file
diff --git a/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs b/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
index f8a677d00..8e5d176ff 100644
--- a/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.MySql/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.MySql.Infrastructure;
 
 namespace Moonglade.Data.MySql;
@@ -10,8 +9,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddMySqlStorage(this IServiceCollection services, string connectionString)
     {
-        services.AddScoped(typeof(MoongladeRepository<>));
-        services.AddScoped(typeof(IRepository<>), typeof(MySqlDbContextRepository<>));
+        services.AddScoped(typeof(MoongladeRepository<>), typeof(MySqlDbContextRepository<>));
 
         services.AddDbContext<MySqlBlogDbContext>(optionsAction => optionsAction.UseLazyLoadingProxies()
             .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), builder =>
diff --git a/src/Moonglade.Data.PostgreSql/Infrastructure/PostgreSqlDbContextRepository.cs b/src/Moonglade.Data.PostgreSql/Infrastructure/PostgreSqlDbContextRepository.cs
index 0f0950642..cea43e290 100644
--- a/src/Moonglade.Data.PostgreSql/Infrastructure/PostgreSqlDbContextRepository.cs
+++ b/src/Moonglade.Data.PostgreSql/Infrastructure/PostgreSqlDbContextRepository.cs
@@ -1,6 +1,4 @@
-using Moonglade.Data.Infrastructure;
+namespace Moonglade.Data.PostgreSql.Infrastructure;
 
-namespace Moonglade.Data.PostgreSql.Infrastructure;
-
-public class PostgreSqlDbContextRepository<T>(PostgreSqlBlogDbContext dbContext) : DbContextRepository<T>(dbContext)
+public class PostgreSqlDbContextRepository<T>(PostgreSqlBlogDbContext dbContext) : MoongladeRepository<T>(dbContext)
     where T : class;
diff --git a/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs b/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
index 335f63a33..0c3d54364 100644
--- a/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.PostgreSql/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.PostgreSql.Infrastructure;
 
 namespace Moonglade.Data.PostgreSql;
@@ -9,8 +8,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddPostgreSqlStorage(this IServiceCollection services, string connectionString)
     {
-        services.AddScoped(typeof(MoongladeRepository<>));
-        services.AddScoped(typeof(IRepository<>), typeof(PostgreSqlDbContextRepository<>));
+        services.AddScoped(typeof(MoongladeRepository<>), typeof(PostgreSqlDbContextRepository<>));
 
         AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
         services.AddDbContext<PostgreSqlBlogDbContext>(optionsAction => optionsAction
diff --git a/src/Moonglade.Data.SqlServer/Infrastructure/SqlServerDbContextRepository.cs b/src/Moonglade.Data.SqlServer/Infrastructure/SqlServerDbContextRepository.cs
index a08e3e011..7de361ea5 100644
--- a/src/Moonglade.Data.SqlServer/Infrastructure/SqlServerDbContextRepository.cs
+++ b/src/Moonglade.Data.SqlServer/Infrastructure/SqlServerDbContextRepository.cs
@@ -1,7 +1,5 @@
-using Moonglade.Data.Infrastructure;
+namespace Moonglade.Data.SqlServer.Infrastructure;
 
-namespace Moonglade.Data.SqlServer.Infrastructure;
 
-
-public class SqlServerDbContextRepository<T>(SqlServerBlogDbContext dbContext) : DbContextRepository<T>(dbContext)
+public class SqlServerDbContextRepository<T>(SqlServerBlogDbContext dbContext) : MoongladeRepository<T>(dbContext)
     where T : class;
\ No newline at end of file
diff --git a/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs b/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
index f3f23581e..9a53cbfa7 100644
--- a/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
+++ b/src/Moonglade.Data.SqlServer/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Moonglade.Data.Infrastructure;
 using Moonglade.Data.SqlServer.Infrastructure;
 
 namespace Moonglade.Data.SqlServer;
@@ -10,8 +9,7 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddSqlServerStorage(this IServiceCollection services, string connectionString)
     {
-        services.AddScoped(typeof(MoongladeRepository<>));
-        services.AddScoped(typeof(IRepository<>), typeof(SqlServerDbContextRepository<>));
+        services.AddScoped(typeof(MoongladeRepository<>), typeof(SqlServerDbContextRepository<>));
 
         services.AddDbContext<SqlServerBlogDbContext>(options =>
             options.UseLazyLoadingProxies()
diff --git a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs b/src/Moonglade.Data/ExpressionExtentions.cs
similarity index 52%
rename from src/Moonglade.Data/Infrastructure/BaseSpecification.cs
rename to src/Moonglade.Data/ExpressionExtentions.cs
index 6f016adca..04ae706f3 100644
--- a/src/Moonglade.Data/Infrastructure/BaseSpecification.cs
+++ b/src/Moonglade.Data/ExpressionExtentions.cs
@@ -1,34 +1,11 @@
-using Microsoft.EntityFrameworkCore.Query;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
 
-namespace Moonglade.Data.Infrastructure;
-
-public abstract class BaseSpecification<T> : ISpecification<T>
-{
-    protected BaseSpecification()
-    {
-    }
-
-    protected BaseSpecification(Expression<Func<T, bool>> criteria) => Criteria = criteria;
-
-    public Expression<Func<T, bool>> Criteria { get; private set; }
-    public Func<IQueryable<T>, IIncludableQueryable<T, object>> Include { get; private set; }
-    public Expression<Func<T, object>> OrderBy { get; private set; }
-    public Expression<Func<T, object>> OrderByDescending { get; private set; }
-
-    public int Take { get; private set; }
-    public int Skip { get; private set; }
-    public bool IsPagingEnabled { get; private set; }
-
-    protected virtual void ApplyPaging(int skip, int take)
-    {
-        Skip = skip;
-        Take = take;
-        IsPagingEnabled = true;
-    }
-
-    protected virtual void ApplyOrderByDescending(Expression<Func<T, object>> expression) => OrderByDescending = expression;
-}
+namespace Moonglade.Data;
 
 // https://stackoverflow.com/questions/457316/combining-two-expressions-expressionfunct-bool
 public static class ExpressionExtentions
diff --git a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs b/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
deleted file mode 100644
index d340d1f17..000000000
--- a/src/Moonglade.Data/Infrastructure/DbContextRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Linq.Expressions;
-
-namespace Moonglade.Data.Infrastructure;
-
-public abstract class DbContextRepository<T>(DbContext ctx) : IRepository<T>
-    where T : class
-{
-    protected readonly DbContext DbContext = ctx;
-
-    public async Task<List<TResult>> SelectAsync<TResult>(
-        ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
-        await ApplySpecification(spec).AsNoTracking().Select(selector).ToListAsync(ct);
-
-    private IQueryable<T> ApplySpecification(ISpecification<T> spec) =>
-        SpecificationEvaluator<T>.GetQuery(DbContext.Set<T>().AsQueryable(), spec);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/IRepository.cs b/src/Moonglade.Data/Infrastructure/IRepository.cs
deleted file mode 100644
index d8272c5d5..000000000
--- a/src/Moonglade.Data/Infrastructure/IRepository.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Linq.Expressions;
-
-namespace Moonglade.Data.Infrastructure;
-
-public interface IRepository<T> where T : class
-{
-    Task<List<TResult>> SelectAsync<TResult>(ISpecification<T> spec, Expression<Func<T, TResult>> selector, CancellationToken ct = default);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/ISpecification.cs b/src/Moonglade.Data/Infrastructure/ISpecification.cs
deleted file mode 100644
index c9139d286..000000000
--- a/src/Moonglade.Data/Infrastructure/ISpecification.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.EntityFrameworkCore.Query;
-using System.Linq.Expressions;
-
-namespace Moonglade.Data.Infrastructure;
-
-public interface ISpecification<T>
-{
-    Expression<Func<T, bool>> Criteria { get; }
-    Func<IQueryable<T>, IIncludableQueryable<T, object>> Include { get; }
-    Expression<Func<T, object>> OrderBy { get; }
-    Expression<Func<T, object>> OrderByDescending { get; }
-
-    int Take { get; }
-    int Skip { get; }
-    bool IsPagingEnabled { get; }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Infrastructure/SpecificationEvaluator.cs b/src/Moonglade.Data/Infrastructure/SpecificationEvaluator.cs
deleted file mode 100644
index 1031022ad..000000000
--- a/src/Moonglade.Data/Infrastructure/SpecificationEvaluator.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace Moonglade.Data.Infrastructure;
-
-public class SpecificationEvaluator<T> where T : class
-{
-    public static IQueryable<T> GetQuery(IQueryable<T> inputQuery, ISpecification<T> specification)
-    {
-        var query = inputQuery;
-
-        // modify the IQueryable using the specification's criteria expression
-        if (specification.Criteria is not null)
-        {
-            query = query.Where(specification.Criteria);
-        }
-
-        //// Includes all expression-based includes
-        //query = specification.Includes.Aggregate(query,
-        //    (current, include) => current.Include(include));
-
-        //// Include any string-based include statements
-        //query = specification.IncludeStrings.Aggregate(query,
-        //    (current, include) => current.Include(include));
-
-        if (specification.Include is not null)
-        {
-            query = specification.Include(query);
-        }
-
-        // Apply ordering if expressions are set
-        if (specification.OrderBy is not null)
-        {
-            query = query.OrderBy(specification.OrderBy);
-        }
-        else if (specification.OrderByDescending is not null)
-        {
-            query = query.OrderByDescending(specification.OrderByDescending);
-        }
-
-        // Apply paging if enabled
-        if (specification.IsPagingEnabled)
-        {
-            query = query.Skip(specification.Skip)
-                .Take(specification.Take);
-        }
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs b/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
index 89de57208..4f4b8eaf9 100644
--- a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
+++ b/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
@@ -1,5 +1,4 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
diff --git a/src/Moonglade.Data/Spec/FriendLinkSpec.cs b/src/Moonglade.Data/Spec/FriendLinkSpec.cs
deleted file mode 100644
index db186dc68..000000000
--- a/src/Moonglade.Data/Spec/FriendLinkSpec.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
-
-namespace Moonglade.Data.Spec;
-
-public class FriendLinkSpec(Guid id) : BaseSpecification<FriendLinkEntity>(f => f.Id == id);
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PostPagingSpec.cs b/src/Moonglade.Data/Spec/PostPagingSpec.cs
index c6b4a8bb5..5c14a33e4 100644
--- a/src/Moonglade.Data/Spec/PostPagingSpec.cs
+++ b/src/Moonglade.Data/Spec/PostPagingSpec.cs
@@ -1,18 +1,18 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 
-public sealed class PostPagingSpec : BaseSpecification<PostEntity>
+public sealed class PostPagingSpec : Specification<PostEntity>
 {
     public PostPagingSpec(int pageSize, int pageIndex, Guid? categoryId = null)
-        : base(p => !p.IsDeleted && p.IsPublished &&
-                    (categoryId == null || p.PostCategory.Select(c => c.CategoryId).Contains(categoryId.Value)))
     {
+        Query.Where(p => !p.IsDeleted && p.IsPublished &&
+                         (categoryId == null || p.PostCategory.Select(c => c.CategoryId).Contains(categoryId.Value)));
+
         var startRow = (pageIndex - 1) * pageSize;
 
-        ApplyOrderByDescending(p => p.PubDateUtc);
-        ApplyPaging(startRow, pageSize);
+        Query.OrderByDescending(p => p.PubDateUtc);
+        Query.Skip(startRow).Take(pageSize);
     }
 }
 
diff --git a/src/Moonglade.Data/Spec/PostTagSpec.cs b/src/Moonglade.Data/Spec/PostTagSpec.cs
index a2b1d248d..9bacd5e6d 100644
--- a/src/Moonglade.Data/Spec/PostTagSpec.cs
+++ b/src/Moonglade.Data/Spec/PostTagSpec.cs
@@ -1,5 +1,4 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Infrastructure;
 
 namespace Moonglade.Data.Spec;
 

From 99baf74f305f8284a940d64df634d2ceb8d46392 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:25:56 +0800
Subject: [PATCH 108/227] Update ExpressionExtentions.cs

---
 src/Moonglade.Data/ExpressionExtentions.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Moonglade.Data/ExpressionExtentions.cs b/src/Moonglade.Data/ExpressionExtentions.cs
index 04ae706f3..f2f14eac6 100644
--- a/src/Moonglade.Data/ExpressionExtentions.cs
+++ b/src/Moonglade.Data/ExpressionExtentions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq.Expressions;
 
 namespace Moonglade.Data;
 

From 083fff4fe4d57d64464e60e716fedf1a5fa3bae0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:32:15 +0800
Subject: [PATCH 109/227] fix deletion

---
 src/Moonglade.Comments/DeleteCommentsCommand.cs             | 2 +-
 src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs | 2 +-
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs         | 2 +-
 src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs      | 2 +-
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs         | 4 ++--
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs           | 4 ++--
 src/Moonglade.Data/MoongladeRepository.cs                   | 2 +-
 src/Moonglade.FriendLink/DeleteLinkCommand.cs               | 2 +-
 src/Moonglade.Pingback/DeletePingbackCommand.cs             | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index 80307dd59..4dec03193 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -19,7 +19,7 @@ public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
             var cReplies = await commentReplyRepo.ListAsync(new CommentReplySpec(cmt.Id), ct);
             if (cReplies.Any())
             {
-                await commentReplyRepo.DeleteAsync(cReplies, ct);
+                await commentReplyRepo.DeleteRangeAsync(cReplies, ct);
             }
 
             // 2. Delete comment itself
diff --git a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
index 52f46f802..c25756376 100644
--- a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
@@ -18,7 +18,7 @@ public async Task<OperationCode> Handle(DeleteCategoryCommand request, Cancellat
         var pcs = await postCatRepo.GetAsync(pc => pc.CategoryId == request.Id);
         if (pcs is not null) await postCatRepo.DeleteAsync(pcs, ct);
 
-        await catRepo.DeleteAsync(request.Id, ct);
+        await catRepo.DeleteByIdAsync(request.Id, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");
 
         return OperationCode.Done;
diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index f910302ff..2450b6d3e 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -19,6 +19,6 @@ public async Task Handle(DeletePageCommand request, CancellationToken ct)
             await mediator.Send(new DeleteStyleSheetCommand(new(page.CssId)), ct);
         }
 
-        await repo.DeleteAsync(request.Id, ct);
+        await repo.DeleteByIdAsync(request.Id, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
index a7aa9426f..d33ab9703 100644
--- a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
+++ b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
@@ -12,7 +12,7 @@ public async Task Handle(PurgeRecycledCommand request, CancellationToken ct)
     {
         var spec = new PostByDeletionFlagSpec(true);
         var posts = await repo.ListAsync(spec, ct);
-        await repo.DeleteAsync(posts, ct);
+        await repo.DeleteRangeAsync(posts, ct);
 
         foreach (var guid in posts.Select(p => p.Id))
         {
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index a80694b02..ebeafdfb4 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -108,7 +108,7 @@ await _tagRepo.AddAsync(new()
         if (_useMySqlWorkaround)
         {
             var oldTags = await _ptRepository.AsQueryable().Where(pc => pc.PostId == post.Id).ToListAsync(cancellationToken: ct);
-            await _ptRepository.DeleteAsync(oldTags, ct);
+            await _ptRepository.DeleteRangeAsync(oldTags, ct);
         }
 
         post.Tags.Clear();
@@ -131,7 +131,7 @@ await _tagRepo.AddAsync(new()
         {
             var oldpcs = await _pcRepository.AsQueryable().Where(pc => pc.PostId == post.Id)
                 .ToListAsync(cancellationToken: ct);
-            await _pcRepository.DeleteAsync(oldpcs, ct);
+            await _pcRepository.DeleteRangeAsync(oldpcs, ct);
         }
 
         post.PostCategory.Clear();
diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index 570a19d9a..a603719de 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -17,10 +17,10 @@ public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationTo
 
         // 1. Delete Post-Tag Association
         var postTags = await postTagRepo.ListAsync(new PostTagByTagIdSpec(request.Id), ct);
-        await postTagRepo.DeleteAsync(postTags, ct);
+        await postTagRepo.DeleteRangeAsync(postTags, ct);
 
         // 2. Delte Tag itslef
-        await tagRepo.DeleteAsync(request.Id, ct);
+        await tagRepo.DeleteByIdAsync(request.Id, ct);
 
         return OperationCode.Done;
     }
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index a4e4dd39f..0e8dd8002 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,7 +17,7 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public async Task DeleteAsync(object key, CancellationToken ct = default)
+    public async Task DeleteByIdAsync(object key, CancellationToken ct = default)
     {
         var entity = await GetByIdAsync(key, ct);
         if (entity is not null) await DeleteAsync(entity, ct);
diff --git a/src/Moonglade.FriendLink/DeleteLinkCommand.cs b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
index ee5ccce1e..092014ae4 100644
--- a/src/Moonglade.FriendLink/DeleteLinkCommand.cs
+++ b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
@@ -8,5 +8,5 @@ public record DeleteLinkCommand(Guid Id) : IRequest;
 
 public class DeleteLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<DeleteLinkCommand>
 {
-    public Task Handle(DeleteLinkCommand request, CancellationToken ct) => repo.DeleteAsync(request.Id, ct);
+    public Task Handle(DeleteLinkCommand request, CancellationToken ct) => repo.DeleteByIdAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/DeletePingbackCommand.cs b/src/Moonglade.Pingback/DeletePingbackCommand.cs
index cc200dc18..61174d99b 100644
--- a/src/Moonglade.Pingback/DeletePingbackCommand.cs
+++ b/src/Moonglade.Pingback/DeletePingbackCommand.cs
@@ -8,5 +8,5 @@ public record DeletePingbackCommand(Guid Id) : IRequest;
 
 public class DeletePingbackCommandHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<DeletePingbackCommand>
 {
-    public Task Handle(DeletePingbackCommand request, CancellationToken ct) => repo.DeleteAsync(request.Id, ct);
+    public Task Handle(DeletePingbackCommand request, CancellationToken ct) => repo.DeleteByIdAsync(request.Id, ct);
 }
\ No newline at end of file

From e3c2897cb0df28a04ab4dd5e9788a8572fdcb791 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 25 Apr 2024 14:38:21 +0800
Subject: [PATCH 110/227] bump version

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 54358dfeb..fa5102896 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-preview.2</Version>
+    <Version>14.4.0-preview.3</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 3d3dec8a9768325b01d58dde1f04e2e271275ecb Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:23:36 +0800
Subject: [PATCH 111/227] code refact

---
 src/Moonglade.Comments/DeleteCommentsCommand.cs |  9 +--------
 src/Moonglade.Data/Spec/CommentReplySpec.cs     | 11 -----------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 src/Moonglade.Data/Spec/CommentReplySpec.cs

diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index 4dec03193..e14590934 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -15,14 +15,7 @@ public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
         var comments = await commentRepo.ListAsync(spec, ct);
         foreach (var cmt in comments)
         {
-            // 1. Delete all replies
-            var cReplies = await commentReplyRepo.ListAsync(new CommentReplySpec(cmt.Id), ct);
-            if (cReplies.Any())
-            {
-                await commentReplyRepo.DeleteRangeAsync(cReplies, ct);
-            }
-
-            // 2. Delete comment itself
+            cmt.Replies.Clear();
             await commentRepo.DeleteAsync(cmt, ct);
         }
     }
diff --git a/src/Moonglade.Data/Spec/CommentReplySpec.cs b/src/Moonglade.Data/Spec/CommentReplySpec.cs
deleted file mode 100644
index 5a6a50ccb..000000000
--- a/src/Moonglade.Data/Spec/CommentReplySpec.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.Spec;
-
-public class CommentReplySpec : Specification<CommentReplyEntity>
-{
-    public CommentReplySpec(Guid commentId)
-    {
-        Query.Where(cr => cr.CommentId == commentId);
-    }
-}
\ No newline at end of file

From b37c18d1c7d00bd537b6e6d1a339c109e0a81448 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:25:50 +0800
Subject: [PATCH 112/227] remove unused code

---
 src/Moonglade.Core/PageFeature/GetPagesQuery.cs | 16 ----------------
 src/Moonglade.Data/Spec/PageSpec.cs             | 14 --------------
 2 files changed, 30 deletions(-)
 delete mode 100644 src/Moonglade.Core/PageFeature/GetPagesQuery.cs
 delete mode 100644 src/Moonglade.Data/Spec/PageSpec.cs

diff --git a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs b/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
deleted file mode 100644
index 9072efcb8..000000000
--- a/src/Moonglade.Core/PageFeature/GetPagesQuery.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Moonglade.Data;
-using Moonglade.Data.Spec;
-
-namespace Moonglade.Core.PageFeature;
-
-public record GetPagesQuery(int Top) : IRequest<List<BlogPage>>;
-
-public class GetPagesQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPagesQuery, List<BlogPage>>
-{
-    public async Task<List<BlogPage>> Handle(GetPagesQuery request, CancellationToken ct)
-    {
-        var pages = await repo.ListAsync(new PageSpec(request.Top), ct);
-        var list = pages.Select(p => new BlogPage(p)).ToList();
-        return list;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Spec/PageSpec.cs b/src/Moonglade.Data/Spec/PageSpec.cs
deleted file mode 100644
index b97cc66be..000000000
--- a/src/Moonglade.Data/Spec/PageSpec.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.Spec;
-
-public sealed class PageSpec : Specification<PageEntity>
-{
-    public PageSpec(int top)
-    {
-        Query.Where(p => p.IsPublished);
-
-        Query.OrderByDescending(p => p.CreateTimeUtc);
-        Query.Skip(0).Take(top);
-    }
-}
\ No newline at end of file

From d91e1b2ef38b85eef1cb24fc53028bf70f234d94 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:26:00 +0800
Subject: [PATCH 113/227] AsNoTracking

---
 src/Moonglade.Data/Spec/LoginHistorySpec.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Moonglade.Data/Spec/LoginHistorySpec.cs b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
index bfee98681..b9cf7da15 100644
--- a/src/Moonglade.Data/Spec/LoginHistorySpec.cs
+++ b/src/Moonglade.Data/Spec/LoginHistorySpec.cs
@@ -8,5 +8,6 @@ public LoginHistorySpec(int top)
     {
         Query.Skip(0).Take(top);
         Query.OrderByDescending(p => p.LoginTimeUtc);
+        Query.AsNoTracking();
     }
 }
\ No newline at end of file

From efce60b2f2b81a2118a66914be6465e228ec4c9a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:26:59 +0800
Subject: [PATCH 114/227] AsNoTracking

---
 src/Moonglade.Data/Spec/PostSitePageSpec.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Data/Spec/PostSitePageSpec.cs b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
index 7de2dc5f2..11d969766 100644
--- a/src/Moonglade.Data/Spec/PostSitePageSpec.cs
+++ b/src/Moonglade.Data/Spec/PostSitePageSpec.cs
@@ -6,7 +6,7 @@ public class PostSitePageSpec : Specification<PostEntity>
 {
     public PostSitePageSpec()
     {
-        Query.Where(p =>
-            p.IsPublished && !p.IsDeleted);
+        Query.Where(p => p.IsPublished && !p.IsDeleted);
+        Query.AsNoTracking();
     }
 }
\ No newline at end of file

From 92ccb98411b5d96c5ab4c62384e1afd8f90b211f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:36:38 +0800
Subject: [PATCH 115/227] code refact

---
 .../CategoryFeature/DeleteCategoryCommand.cs         |  6 +++---
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs  |  2 +-
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs    |  6 +++---
 src/Moonglade.Data/BlogDbContext.cs                  |  1 -
 .../Entities/BlogConfigurationEntity.cs              | 12 ++----------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
index c25756376..214034970 100644
--- a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
@@ -12,13 +12,13 @@ public class DeleteCategoryCommandHandler(
 {
     public async Task<OperationCode> Handle(DeleteCategoryCommand request, CancellationToken ct)
     {
-        var exists = await catRepo.AnyAsync(c => c.Id == request.Id, ct);
-        if (!exists) return OperationCode.ObjectNotFound;
+        var cat = await catRepo.GetByIdAsync(request.Id, ct);
+        if (null == cat) return OperationCode.ObjectNotFound;
 
         var pcs = await postCatRepo.GetAsync(pc => pc.CategoryId == request.Id);
         if (pcs is not null) await postCatRepo.DeleteAsync(pcs, ct);
 
-        await catRepo.DeleteByIdAsync(request.Id, ct);
+        await catRepo.DeleteAsync(cat, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");
 
         return OperationCode.Done;
diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index 2450b6d3e..124937db2 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -19,6 +19,6 @@ public async Task Handle(DeletePageCommand request, CancellationToken ct)
             await mediator.Send(new DeleteStyleSheetCommand(new(page.CssId)), ct);
         }
 
-        await repo.DeleteByIdAsync(request.Id, ct);
+        await repo.DeleteAsync(page, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index a603719de..9a87b4185 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -12,15 +12,15 @@ public class DeleteTagCommandHandler(
 {
     public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationToken ct)
     {
-        var exists = await tagRepo.AnyAsync(c => c.Id == request.Id, ct);
-        if (!exists) return OperationCode.ObjectNotFound;
+        var tag = await tagRepo.GetByIdAsync(request.Id, ct);
+        if (null == tag) return OperationCode.ObjectNotFound;
 
         // 1. Delete Post-Tag Association
         var postTags = await postTagRepo.ListAsync(new PostTagByTagIdSpec(request.Id), ct);
         await postTagRepo.DeleteRangeAsync(postTags, ct);
 
         // 2. Delte Tag itslef
-        await tagRepo.DeleteByIdAsync(request.Id, ct);
+        await tagRepo.DeleteAsync(tag, ct);
 
         return OperationCode.Done;
     }
diff --git a/src/Moonglade.Data/BlogDbContext.cs b/src/Moonglade.Data/BlogDbContext.cs
index ded52120d..b6748f778 100644
--- a/src/Moonglade.Data/BlogDbContext.cs
+++ b/src/Moonglade.Data/BlogDbContext.cs
@@ -35,7 +35,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ApplyConfiguration(new CategoryConfiguration());
         modelBuilder.ApplyConfiguration(new TagConfiguration());
         modelBuilder.ApplyConfiguration(new FriendLinkConfiguration());
-        modelBuilder.ApplyConfiguration(new BlogConfigurationConfiguration());
 
         modelBuilder
             .Entity<PostEntity>()
diff --git a/src/Moonglade.Data/Entities/BlogConfigurationEntity.cs b/src/Moonglade.Data/Entities/BlogConfigurationEntity.cs
index 02f0ea4c2..d7ad5000b 100644
--- a/src/Moonglade.Data/Entities/BlogConfigurationEntity.cs
+++ b/src/Moonglade.Data/Entities/BlogConfigurationEntity.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.ComponentModel.DataAnnotations;
 
 namespace Moonglade.Data.Entities;
 
@@ -6,18 +6,10 @@ public class BlogConfigurationEntity
 {
     public int Id { get; set; }
 
+    [MaxLength(64)]
     public string CfgKey { get; set; }
 
     public string CfgValue { get; set; }
 
     public DateTime? LastModifiedTimeUtc { get; set; }
-}
-
-
-internal class BlogConfigurationConfiguration : IEntityTypeConfiguration<BlogConfigurationEntity>
-{
-    public void Configure(EntityTypeBuilder<BlogConfigurationEntity> builder)
-    {
-        builder.Property(e => e.CfgKey).HasMaxLength(64);
-    }
 }
\ No newline at end of file

From 65990d9e6370901063c089db36388defccb30d34 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:39:07 +0800
Subject: [PATCH 116/227] code refact

---
 src/Moonglade.Data/MoongladeRepository.cs       | 6 ------
 src/Moonglade.FriendLink/DeleteLinkCommand.cs   | 9 ++++++++-
 src/Moonglade.Pingback/DeletePingbackCommand.cs | 9 ++++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 0e8dd8002..bb9368f04 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,12 +17,6 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public async Task DeleteByIdAsync(object key, CancellationToken ct = default)
-    {
-        var entity = await GetByIdAsync(key, ct);
-        if (entity is not null) await DeleteAsync(entity, ct);
-    }
-
     public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
         dbContext.Set<T>().FirstOrDefaultAsync(condition);
 
diff --git a/src/Moonglade.FriendLink/DeleteLinkCommand.cs b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
index 092014ae4..b2d9d570b 100644
--- a/src/Moonglade.FriendLink/DeleteLinkCommand.cs
+++ b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
@@ -8,5 +8,12 @@ public record DeleteLinkCommand(Guid Id) : IRequest;
 
 public class DeleteLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<DeleteLinkCommand>
 {
-    public Task Handle(DeleteLinkCommand request, CancellationToken ct) => repo.DeleteByIdAsync(request.Id, ct);
+    public async Task Handle(DeleteLinkCommand request, CancellationToken ct)
+    {
+        var link = await repo.GetByIdAsync(request.Id, ct);
+        if (null != link)
+        {
+            await repo.DeleteAsync(link, ct);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/DeletePingbackCommand.cs b/src/Moonglade.Pingback/DeletePingbackCommand.cs
index 61174d99b..4e6289907 100644
--- a/src/Moonglade.Pingback/DeletePingbackCommand.cs
+++ b/src/Moonglade.Pingback/DeletePingbackCommand.cs
@@ -8,5 +8,12 @@ public record DeletePingbackCommand(Guid Id) : IRequest;
 
 public class DeletePingbackCommandHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<DeletePingbackCommand>
 {
-    public Task Handle(DeletePingbackCommand request, CancellationToken ct) => repo.DeleteByIdAsync(request.Id, ct);
+    public async Task Handle(DeletePingbackCommand request, CancellationToken ct)
+    {
+        var pingback = await repo.GetByIdAsync(request.Id, ct);
+        if (pingback != null)
+        {
+            await repo.DeleteAsync(pingback, ct);
+        }
+    }
 }
\ No newline at end of file

From 31142396ee91ad4b0dafebe5809eb8f70c011df7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:40:08 +0800
Subject: [PATCH 117/227] more standard naming

---
 src/Moonglade.Auth/GetLoginHistoryQuery.cs                      | 2 +-
 src/Moonglade.Comments/CreateCommentCommand.cs                  | 2 +-
 src/Moonglade.Comments/DeleteCommentsCommand.cs                 | 2 +-
 src/Moonglade.Comments/GetApprovedCommentsQuery.cs              | 2 +-
 src/Moonglade.Comments/GetCommentsQuery.cs                      | 2 +-
 src/Moonglade.Comments/ToggleApprovalCommand.cs                 | 2 +-
 src/Moonglade.Core/PostFeature/CreatePostCommand.cs             | 2 +-
 src/Moonglade.Core/PostFeature/GetArchiveQuery.cs               | 2 +-
 src/Moonglade.Core/PostFeature/GetDraftQuery.cs                 | 2 +-
 src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs              | 2 +-
 src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs            | 2 +-
 src/Moonglade.Core/PostFeature/ListArchiveQuery.cs              | 2 +-
 src/Moonglade.Core/PostFeature/ListByTagQuery.cs                | 2 +-
 src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs             | 2 +-
 src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs  | 2 +-
 src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs          | 2 +-
 src/Moonglade.Core/PostFeature/ListPostsQuery.cs                | 2 +-
 src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs          | 2 +-
 src/Moonglade.Core/TagFeature/CreateTagCommand.cs               | 2 +-
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs               | 2 +-
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs                | 2 +-
 src/Moonglade.Core/TagFeature/GetTagQuery.cs                    | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/CommentSpec.cs      | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/FeaturedPostSpec.cs | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/LoginHistorySpec.cs | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/PostPagingSpec.cs   | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/PostSitePageSpec.cs | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/PostSpec.cs         | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/PostStatus.cs       | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/PostTagSpec.cs      | 2 +-
 src/Moonglade.Data/{Spec => Specifications}/TagSpec.cs          | 2 +-
 src/Moonglade.Pingback/ReceivePingCommand.cs                    | 2 +-
 src/Moonglade.Syndication/SyndicationDataSource.cs              | 2 +-
 src/Moonglade.Web/Middleware/SiteMapMiddleware.cs               | 2 +-
 src/Moonglade.Web/Pages/Admin/Draft.cshtml                      | 2 +-
 src/Moonglade.Web/Pages/Admin/Post.cshtml.cs                    | 2 +-
 src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml                 | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)
 rename src/Moonglade.Data/{Spec => Specifications}/CommentSpec.cs (95%)
 rename src/Moonglade.Data/{Spec => Specifications}/FeaturedPostSpec.cs (91%)
 rename src/Moonglade.Data/{Spec => Specifications}/LoginHistorySpec.cs (87%)
 rename src/Moonglade.Data/{Spec => Specifications}/PostPagingSpec.cs (97%)
 rename src/Moonglade.Data/{Spec => Specifications}/PostSitePageSpec.cs (84%)
 rename src/Moonglade.Data/{Spec => Specifications}/PostSpec.cs (98%)
 rename src/Moonglade.Data/{Spec => Specifications}/PostStatus.cs (68%)
 rename src/Moonglade.Data/{Spec => Specifications}/PostTagSpec.cs (93%)
 rename src/Moonglade.Data/{Spec => Specifications}/TagSpec.cs (91%)

diff --git a/src/Moonglade.Auth/GetLoginHistoryQuery.cs b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
index 4ac9d4578..3fe788932 100644
--- a/src/Moonglade.Auth/GetLoginHistoryQuery.cs
+++ b/src/Moonglade.Auth/GetLoginHistoryQuery.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Auth;
 
diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index 840ffdf28..3a5cec4bd 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -2,7 +2,7 @@
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Comments;
 
diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index e14590934..5e0bc4fa8 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -1,7 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Comments;
 
diff --git a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
index c64820d0f..a4678ca31 100644
--- a/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetApprovedCommentsQuery.cs
@@ -1,7 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Comments;
 
diff --git a/src/Moonglade.Comments/GetCommentsQuery.cs b/src/Moonglade.Comments/GetCommentsQuery.cs
index 0a6ee4d7f..ee3c3ce19 100644
--- a/src/Moonglade.Comments/GetCommentsQuery.cs
+++ b/src/Moonglade.Comments/GetCommentsQuery.cs
@@ -1,7 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Comments;
 
diff --git a/src/Moonglade.Comments/ToggleApprovalCommand.cs b/src/Moonglade.Comments/ToggleApprovalCommand.cs
index a5d3c5405..d7afb8800 100644
--- a/src/Moonglade.Comments/ToggleApprovalCommand.cs
+++ b/src/Moonglade.Comments/ToggleApprovalCommand.cs
@@ -1,7 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Comments;
 
diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 9219e55c3..edce62727 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -3,7 +3,7 @@
 using Moonglade.Configuration;
 using Moonglade.Core.TagFeature;
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index 03aedbe64..06b3e15f1 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using System.Linq.Expressions;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
index 2a4727fbc..fe8f1a3eb 100644
--- a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
index 5dab5f18d..614712ce3 100644
--- a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index 970a9da51..6b9727a0d 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -1,7 +1,7 @@
 using Edi.CacheAside.InMemory;
 using Microsoft.Extensions.Configuration;
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
index 397dace67..d5b5e7d1b 100644
--- a/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListArchiveQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
index f5c2a7027..8e46c2a3e 100644
--- a/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListByTagQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
index 90eb664bf..22cf55c0f 100644
--- a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
index 4c6de7efe..395da9c43 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentByStatusQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
index af2e336be..ca077ac0e 100644
--- a/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostSegmentQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using System.Linq.Expressions;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
index e9e89a686..69d630f8e 100644
--- a/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListPostsQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
diff --git a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
index d33ab9703..af975bdd3 100644
--- a/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
+++ b/src/Moonglade.Core/PostFeature/PurgeRecycledCommand.cs
@@ -1,6 +1,6 @@
 using Edi.CacheAside.InMemory;
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
diff --git a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
index ec56ec4ae..ea2f738fc 100644
--- a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.TagFeature;
diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index 9a87b4185..fe5232f62 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
 
diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index 063352cfe..0396fa9a8 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
 
diff --git a/src/Moonglade.Core/TagFeature/GetTagQuery.cs b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
index 1e7871bcf..db6f93426 100644
--- a/src/Moonglade.Core/TagFeature/GetTagQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
 
diff --git a/src/Moonglade.Data/Spec/CommentSpec.cs b/src/Moonglade.Data/Specifications/CommentSpec.cs
similarity index 95%
rename from src/Moonglade.Data/Spec/CommentSpec.cs
rename to src/Moonglade.Data/Specifications/CommentSpec.cs
index 254c446e0..ab02052d1 100644
--- a/src/Moonglade.Data/Spec/CommentSpec.cs
+++ b/src/Moonglade.Data/Specifications/CommentSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class CommentPagingSepc : Specification<CommentEntity>
 {
diff --git a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs b/src/Moonglade.Data/Specifications/FeaturedPostSpec.cs
similarity index 91%
rename from src/Moonglade.Data/Spec/FeaturedPostSpec.cs
rename to src/Moonglade.Data/Specifications/FeaturedPostSpec.cs
index 4f4b8eaf9..177ba5c4f 100644
--- a/src/Moonglade.Data/Spec/FeaturedPostSpec.cs
+++ b/src/Moonglade.Data/Specifications/FeaturedPostSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class FeaturedPostSpec : Specification<PostEntity>
 {
diff --git a/src/Moonglade.Data/Spec/LoginHistorySpec.cs b/src/Moonglade.Data/Specifications/LoginHistorySpec.cs
similarity index 87%
rename from src/Moonglade.Data/Spec/LoginHistorySpec.cs
rename to src/Moonglade.Data/Specifications/LoginHistorySpec.cs
index b9cf7da15..bba7a9d99 100644
--- a/src/Moonglade.Data/Spec/LoginHistorySpec.cs
+++ b/src/Moonglade.Data/Specifications/LoginHistorySpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class LoginHistorySpec : Specification<LoginHistoryEntity>
 {
diff --git a/src/Moonglade.Data/Spec/PostPagingSpec.cs b/src/Moonglade.Data/Specifications/PostPagingSpec.cs
similarity index 97%
rename from src/Moonglade.Data/Spec/PostPagingSpec.cs
rename to src/Moonglade.Data/Specifications/PostPagingSpec.cs
index 5c14a33e4..181f75608 100644
--- a/src/Moonglade.Data/Spec/PostPagingSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostPagingSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class PostPagingSpec : Specification<PostEntity>
 {
diff --git a/src/Moonglade.Data/Spec/PostSitePageSpec.cs b/src/Moonglade.Data/Specifications/PostSitePageSpec.cs
similarity index 84%
rename from src/Moonglade.Data/Spec/PostSitePageSpec.cs
rename to src/Moonglade.Data/Specifications/PostSitePageSpec.cs
index 11d969766..dfac38f73 100644
--- a/src/Moonglade.Data/Spec/PostSitePageSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSitePageSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public class PostSitePageSpec : Specification<PostEntity>
 {
diff --git a/src/Moonglade.Data/Spec/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
similarity index 98%
rename from src/Moonglade.Data/Spec/PostSpec.cs
rename to src/Moonglade.Data/Specifications/PostSpec.cs
index 9cedead97..cb027d7dd 100644
--- a/src/Moonglade.Data/Spec/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class PostSpec : Specification<PostEntity>
 {
diff --git a/src/Moonglade.Data/Spec/PostStatus.cs b/src/Moonglade.Data/Specifications/PostStatus.cs
similarity index 68%
rename from src/Moonglade.Data/Spec/PostStatus.cs
rename to src/Moonglade.Data/Specifications/PostStatus.cs
index 2a95fb001..c41c31139 100644
--- a/src/Moonglade.Data/Spec/PostStatus.cs
+++ b/src/Moonglade.Data/Specifications/PostStatus.cs
@@ -1,4 +1,4 @@
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public enum PostStatus
 {
diff --git a/src/Moonglade.Data/Spec/PostTagSpec.cs b/src/Moonglade.Data/Specifications/PostTagSpec.cs
similarity index 93%
rename from src/Moonglade.Data/Spec/PostTagSpec.cs
rename to src/Moonglade.Data/Specifications/PostTagSpec.cs
index 9bacd5e6d..b57ee1cde 100644
--- a/src/Moonglade.Data/Spec/PostTagSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostTagSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class PostTagSpec : Specification<PostTagEntity>
 {
diff --git a/src/Moonglade.Data/Spec/TagSpec.cs b/src/Moonglade.Data/Specifications/TagSpec.cs
similarity index 91%
rename from src/Moonglade.Data/Spec/TagSpec.cs
rename to src/Moonglade.Data/Specifications/TagSpec.cs
index d90edb78b..bdae526b6 100644
--- a/src/Moonglade.Data/Spec/TagSpec.cs
+++ b/src/Moonglade.Data/Specifications/TagSpec.cs
@@ -1,6 +1,6 @@
 using Moonglade.Data.Entities;
 
-namespace Moonglade.Data.Spec;
+namespace Moonglade.Data.Specifications;
 
 public sealed class TagSpec : Specification<TagEntity>
 {
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index d90087e12..c03794651 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using System.Text.RegularExpressions;
 using System.Xml;
 
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index bf3c88c4e..ad9d93d4d 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -3,7 +3,7 @@
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Syndication;
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index 43d9b7285..b78b8e6e4 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -1,5 +1,5 @@
 using Moonglade.Data.Entities;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using System.Globalization;
 using System.Xml;
 
diff --git a/src/Moonglade.Web/Pages/Admin/Draft.cshtml b/src/Moonglade.Web/Pages/Admin/Draft.cshtml
index e91e72df8..4aaaa3fe4 100644
--- a/src/Moonglade.Web/Pages/Admin/Draft.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/Draft.cshtml
@@ -1,6 +1,6 @@
 @page "/admin/post/draft"
 @using Moonglade.Core.PostFeature
-@using Moonglade.Data.Spec
+@using Moonglade.Data.Specifications
 @inject IMediator Mediator
 @{
     ViewBag.Title = "Drafts";
diff --git a/src/Moonglade.Web/Pages/Admin/Post.cshtml.cs b/src/Moonglade.Web/Pages/Admin/Post.cshtml.cs
index 77f375453..a45e101cf 100644
--- a/src/Moonglade.Web/Pages/Admin/Post.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/Post.cshtml.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.PostFeature;
-using Moonglade.Data.Spec;
+using Moonglade.Data.Specifications;
 using Moonglade.Web.PagedList;
 using System.ComponentModel.DataAnnotations;
 
diff --git a/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml b/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml
index 6150ae876..d3350bcb8 100644
--- a/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/RecycleBin.cshtml
@@ -1,6 +1,6 @@
 @page "/admin/post/recycle-bin"
 @using Moonglade.Core.PostFeature
-@using Moonglade.Data.Spec
+@using Moonglade.Data.Specifications
 @inject IMediator Mediator
 @{
     ViewBag.Title = "Recycle Bin";

From 886e558bf5cc0c25467bdae82b52e0ae9e35285a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:46:55 +0800
Subject: [PATCH 118/227] code refact

---
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs | 2 +-
 src/Moonglade.Data/MoongladeRepository.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index 0396fa9a8..9832beae4 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -9,7 +9,7 @@ public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequ
 {
     public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
-        if (!await repo.AnyAsync(ct: ct)) return new();
+        if (!await repo.AnyAsync(ct)) return new();
 
         var spec = new TagSpec(request.Top);
         var tags = await repo.SelectAsync(spec, t =>
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index bb9368f04..9f2daf20b 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -23,7 +23,7 @@ public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
     public async Task<List<T>> ListNoTrackingAsync(CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
 
-    public Task<bool> AnyAsync(Expression<Func<T, bool>> condition = null, CancellationToken ct = default)
+    public Task<bool> AnyAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default)
     {
         return null != condition ?
             dbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :

From 2639f808428964c9c6e2df264ea1fa1c3bab7df7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sat, 27 Apr 2024 17:50:33 +0800
Subject: [PATCH 119/227] PageBySlugSpec

---
 src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs |  3 ++-
 src/Moonglade.Data/Specifications/PageBySlugSpec.cs  | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/Moonglade.Data/Specifications/PageBySlugSpec.cs

diff --git a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
index 0ff0eebb8..2ac2eeb60 100644
--- a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
@@ -1,4 +1,5 @@
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PageFeature;
 
@@ -9,7 +10,7 @@ public class GetPageBySlugQueryHandler(MoongladeRepository<PageEntity> repo) : I
     public async Task<BlogPage> Handle(GetPageBySlugQuery request, CancellationToken ct)
     {
         var lower = request.Slug.ToLower();
-        var entity = await repo.GetAsync(p => p.Slug == lower);
+        var entity = await repo.FirstOrDefaultAsync(new PageBySlugSpec(lower), ct);
         if (entity == null) return null;
 
         var item = new BlogPage(entity);
diff --git a/src/Moonglade.Data/Specifications/PageBySlugSpec.cs b/src/Moonglade.Data/Specifications/PageBySlugSpec.cs
new file mode 100644
index 000000000..b9f28e5df
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PageBySlugSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public class PageBySlugSpec : Specification<PageEntity>
+{
+    public PageBySlugSpec(string slug)
+    {
+        Query.Where(p => p.Slug == slug);
+    }
+}
\ No newline at end of file

From fb434044ebe84e8bf57c1f1aa4b2bb81b6ca10c7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:35:26 +0800
Subject: [PATCH 120/227] Update DeleteCategoryCommand.cs

---
 .../CategoryFeature/DeleteCategoryCommand.cs             | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
index 214034970..5bcb8e9da 100644
--- a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
@@ -5,18 +5,15 @@ namespace Moonglade.Core.CategoryFeature;
 
 public record DeleteCategoryCommand(Guid Id) : IRequest<OperationCode>;
 
-public class DeleteCategoryCommandHandler(
-        MoongladeRepository<CategoryEntity> catRepo,
-        MoongladeRepository<PostCategoryEntity> postCatRepo,
-        ICacheAside cache) : IRequestHandler<DeleteCategoryCommand, OperationCode>
+public class DeleteCategoryCommandHandler(MoongladeRepository<CategoryEntity> catRepo, ICacheAside cache)
+    : IRequestHandler<DeleteCategoryCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteCategoryCommand request, CancellationToken ct)
     {
         var cat = await catRepo.GetByIdAsync(request.Id, ct);
         if (null == cat) return OperationCode.ObjectNotFound;
 
-        var pcs = await postCatRepo.GetAsync(pc => pc.CategoryId == request.Id);
-        if (pcs is not null) await postCatRepo.DeleteAsync(pcs, ct);
+        cat.PostCategory.Clear();
 
         await catRepo.DeleteAsync(cat, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");

From b643ef8d5a307ab02eb4a4d49e67dd752dd87919 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:37:59 +0800
Subject: [PATCH 121/227] CategoryBySlugSpec

---
 .../CategoryFeature/GetCategoryBySlugQuery.cs         |  6 +++---
 .../Specifications/CategoryBySlugSpec.cs              | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs

diff --git a/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
index c94c83599..af65208e6 100644
--- a/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
+++ b/src/Moonglade.Core/CategoryFeature/GetCategoryBySlugQuery.cs
@@ -1,5 +1,5 @@
-
-using Moonglade.Data;
+using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.CategoryFeature;
 
@@ -8,5 +8,5 @@ public record GetCategoryBySlugQuery(string Slug) : IRequest<CategoryEntity>;
 public class GetCategoryByRouteQueryHandler(MoongladeRepository<CategoryEntity> repo) : IRequestHandler<GetCategoryBySlugQuery, CategoryEntity>
 {
     public Task<CategoryEntity> Handle(GetCategoryBySlugQuery request, CancellationToken ct) =>
-        repo.GetAsync(p => p.Slug == request.Slug);
+        repo.FirstOrDefaultAsync(new CategoryBySlugSpec(request.Slug), ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs b/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs
new file mode 100644
index 000000000..e0ceb39b1
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public class CategoryBySlugSpec : Specification<CategoryEntity>
+{
+    public CategoryBySlugSpec(string slug)
+    {
+        Query.Where(p => p.Slug == slug);
+    }
+}
\ No newline at end of file

From a74dac00cf6624d5295c6272aaea55e41ef47ca7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:39:53 +0800
Subject: [PATCH 122/227] TagByDisplayNameSpec

---
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 3 ++-
 src/Moonglade.Data/Specifications/TagSpec.cs        | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index ebeafdfb4..615db8c73 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -4,6 +4,7 @@
 using Moonglade.Configuration;
 using Moonglade.Core.TagFeature;
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.PostFeature;
@@ -121,7 +122,7 @@ await _tagRepo.AddAsync(new()
                     continue;
                 }
 
-                var tag = await _tagRepo.GetAsync(t => t.DisplayName == tagName);
+                var tag = await _tagRepo.FirstOrDefaultAsync(new TagByDisplayNameSpec(tagName), ct);
                 if (tag is not null) post.Tags.Add(tag);
             }
         }
diff --git a/src/Moonglade.Data/Specifications/TagSpec.cs b/src/Moonglade.Data/Specifications/TagSpec.cs
index bdae526b6..f47bed13d 100644
--- a/src/Moonglade.Data/Specifications/TagSpec.cs
+++ b/src/Moonglade.Data/Specifications/TagSpec.cs
@@ -17,4 +17,12 @@ public TagByNormalizedNameSpec(string normalizedName)
     {
         Query.Where(t => t.NormalizedName == normalizedName);
     }
+}
+
+public sealed class TagByDisplayNameSpec : Specification<TagEntity>
+{
+    public TagByDisplayNameSpec(string displayName)
+    {
+        Query.Where(t => t.DisplayName == displayName);
+    }
 }
\ No newline at end of file

From 4897c4cfd08602d0ce40b0bdbec7fa679fb8ad2b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:39:55 +0800
Subject: [PATCH 123/227] Update SyndicationDataSource.cs

---
 src/Moonglade.Syndication/SyndicationDataSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index ad9d93d4d..7c0e02704 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -42,7 +42,7 @@ public async Task<List<FeedEntry>> GetFeedDataAsync(string catSlug = null)
         List<FeedEntry> itemCollection;
         if (!string.IsNullOrWhiteSpace(catSlug))
         {
-            var cat = await _catRepo.GetAsync(c => c.Slug == catSlug);
+            var cat = await _catRepo.FirstOrDefaultAsync(new CategoryBySlugSpec(catSlug));
             if (cat is null) return null;
 
             itemCollection = await GetFeedEntriesAsync(cat.Id);

From acde95c72d68c7237bb263b9160ee2d55b530a9b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:45:49 +0800
Subject: [PATCH 124/227] BlogConfigurationSpec

---
 .../UpdateConfigurationCommand.cs                     |  3 ++-
 .../Specifications/BlogConfigurationSpec.cs           | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs

diff --git a/src/Moonglade.Configuration/UpdateConfigurationCommand.cs b/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
index 916db1127..0e6721e1c 100644
--- a/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
+++ b/src/Moonglade.Configuration/UpdateConfigurationCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Configuration;
 
@@ -11,7 +12,7 @@ public class UpdateConfigurationCommandHandler(MoongladeRepository<BlogConfigura
     public async Task<OperationCode> Handle(UpdateConfigurationCommand request, CancellationToken ct)
     {
         var (name, json) = request;
-        var entity = await repository.GetAsync(p => p.CfgKey == name);
+        var entity = await repository.FirstOrDefaultAsync(new BlogConfigurationSpec(name), ct);
         if (entity == null) return OperationCode.ObjectNotFound;
 
         entity.CfgValue = json;
diff --git a/src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs b/src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs
new file mode 100644
index 000000000..fef63e7e2
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/BlogConfigurationSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public class BlogConfigurationSpec : SingleResultSpecification<BlogConfigurationEntity>
+{
+    public BlogConfigurationSpec(string cfgKey)
+    {
+        Query.Where(p => p.CfgKey == cfgKey);
+    }
+}
\ No newline at end of file

From 6fe7bf72667913e41021adc7a5bb95a173f87f68 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:47:33 +0800
Subject: [PATCH 125/227] remove GetAsync(Expression<Func<T, bool>> condition)

---
 src/Moonglade.Core/PostFeature/CreatePostCommand.cs | 2 +-
 src/Moonglade.Data/MoongladeRepository.cs           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index edce62727..ff6719ccd 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -86,7 +86,7 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
             {
                 if (!Tag.ValidateName(item)) continue;
 
-                var tag = await tagRepo.GetAsync(q => q.DisplayName == item) ?? await CreateTag(item);
+                var tag = await tagRepo.FirstOrDefaultAsync(new TagByDisplayNameSpec(item), ct) ?? await CreateTag(item);
                 post.Tags.Add(tag);
             }
         }
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 9f2daf20b..0a543787e 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,9 +17,6 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public Task<T> GetAsync(Expression<Func<T, bool>> condition) =>
-        dbContext.Set<T>().FirstOrDefaultAsync(condition);
-
     public async Task<List<T>> ListNoTrackingAsync(CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
 

From c8b936c0e8093bfffa5b20c088794405a35706fd Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:51:45 +0800
Subject: [PATCH 126/227] PingbackReadOnlySpec

---
 src/Moonglade.Data/MoongladeRepository.cs             |  3 ---
 .../Specifications/PingbackReadOnlySpec.cs            | 11 +++++++++++
 src/Moonglade.Pingback/GetPingbacksQuery.cs           |  7 +++++--
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs

diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 0a543787e..312f03971 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,9 +17,6 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public async Task<List<T>> ListNoTrackingAsync(CancellationToken ct = default) =>
-        await dbContext.Set<T>().AsNoTracking().ToListAsync(cancellationToken: ct);
-
     public Task<bool> AnyAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default)
     {
         return null != condition ?
diff --git a/src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs b/src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs
new file mode 100644
index 000000000..7fd89158c
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PingbackReadOnlySpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public class PingbackReadOnlySpec : Specification<PingbackEntity>
+{
+    public PingbackReadOnlySpec()
+    {
+        Query.AsNoTracking();
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/GetPingbacksQuery.cs b/src/Moonglade.Pingback/GetPingbacksQuery.cs
index 34de124af..b3895a884 100644
--- a/src/Moonglade.Pingback/GetPingbacksQuery.cs
+++ b/src/Moonglade.Pingback/GetPingbacksQuery.cs
@@ -1,12 +1,15 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Pingback;
 
 public record GetPingbacksQuery : IRequest<List<PingbackEntity>>;
 
-public class GetPingbacksQueryHandler(MoongladeRepository<PingbackEntity> repo) : IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
+public class GetPingbacksQueryHandler(MoongladeRepository<PingbackEntity> repo) : 
+    IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
 {
-    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => repo.ListNoTrackingAsync(ct);
+    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => 
+        repo.ListAsync(new PingbackReadOnlySpec(), ct);
 }
\ No newline at end of file

From 5506a8566da4def3f89aee0491c101dab8f865ee Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:51:58 +0800
Subject: [PATCH 127/227] code clean up

---
 src/Moonglade.Pingback/GetPingbacksQuery.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Pingback/GetPingbacksQuery.cs b/src/Moonglade.Pingback/GetPingbacksQuery.cs
index b3895a884..368e3dd0c 100644
--- a/src/Moonglade.Pingback/GetPingbacksQuery.cs
+++ b/src/Moonglade.Pingback/GetPingbacksQuery.cs
@@ -7,9 +7,9 @@ namespace Moonglade.Pingback;
 
 public record GetPingbacksQuery : IRequest<List<PingbackEntity>>;
 
-public class GetPingbacksQueryHandler(MoongladeRepository<PingbackEntity> repo) : 
+public class GetPingbacksQueryHandler(MoongladeRepository<PingbackEntity> repo) :
     IRequestHandler<GetPingbacksQuery, List<PingbackEntity>>
 {
-    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) => 
+    public Task<List<PingbackEntity>> Handle(GetPingbacksQuery request, CancellationToken ct) =>
         repo.ListAsync(new PingbackReadOnlySpec(), ct);
 }
\ No newline at end of file

From f023cd0c7a84f1db1979c609b35f010cc86ed3c0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 08:57:07 +0800
Subject: [PATCH 128/227] SingleResultSpecification

---
 src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs | 2 +-
 src/Moonglade.Data/Specifications/PageBySlugSpec.cs     | 2 +-
 src/Moonglade.Data/Specifications/PostSpec.cs           | 2 +-
 src/Moonglade.Data/Specifications/PostTagSpec.cs        | 2 +-
 src/Moonglade.Data/Specifications/TagSpec.cs            | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs b/src/Moonglade.Data/Specifications/CategoryBySlugSpec.cs
index e0ceb39b1..4a141933f 100644
--- 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 : Specification<CategoryEntity>
+public class CategoryBySlugSpec : SingleResultSpecification<CategoryEntity>
 {
     public CategoryBySlugSpec(string slug)
     {
diff --git a/src/Moonglade.Data/Specifications/PageBySlugSpec.cs b/src/Moonglade.Data/Specifications/PageBySlugSpec.cs
index b9f28e5df..52b7efb66 100644
--- 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 : Specification<PageEntity>
+public class PageBySlugSpec : SingleResultSpecification<PageEntity>
 {
     public PageBySlugSpec(string slug)
     {
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index cb027d7dd..819c17837 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -81,7 +81,7 @@ public PostByDeletionFlagSpec(bool isDeleted)
     }
 }
 
-public class PostByChecksumSpec : Specification<PostEntity>
+public class PostByChecksumSpec : SingleResultSpecification<PostEntity>
 {
     public PostByChecksumSpec(int hashCheckSum)
     {
diff --git a/src/Moonglade.Data/Specifications/PostTagSpec.cs b/src/Moonglade.Data/Specifications/PostTagSpec.cs
index b57ee1cde..9e2eca9c4 100644
--- 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 : Specification<PostTagEntity>
+public class PostTagByTagIdSpec : SingleResultSpecification<PostTagEntity>
 {
     public PostTagByTagIdSpec(int tagId)
     {
diff --git a/src/Moonglade.Data/Specifications/TagSpec.cs b/src/Moonglade.Data/Specifications/TagSpec.cs
index f47bed13d..865360b83 100644
--- a/src/Moonglade.Data/Specifications/TagSpec.cs
+++ b/src/Moonglade.Data/Specifications/TagSpec.cs
@@ -11,7 +11,7 @@ public TagSpec(int top)
     }
 }
 
-public sealed class TagByNormalizedNameSpec : Specification<TagEntity>
+public sealed class TagByNormalizedNameSpec : SingleResultSpecification<TagEntity>
 {
     public TagByNormalizedNameSpec(string normalizedName)
     {
@@ -19,7 +19,7 @@ public TagByNormalizedNameSpec(string normalizedName)
     }
 }
 
-public sealed class TagByDisplayNameSpec : Specification<TagEntity>
+public sealed class TagByDisplayNameSpec : SingleResultSpecification<TagEntity>
 {
     public TagByDisplayNameSpec(string displayName)
     {

From 0cf02a41a432b59403daa294ecb0119866adf4db Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 09:03:12 +0800
Subject: [PATCH 129/227] code refact

---
 .../PostFeature/CreatePostCommand.cs          |  2 +-
 .../PostFeature/GetPostBySlugQuery.cs         |  2 +-
 src/Moonglade.Data/Specifications/PostSpec.cs | 36 ++++++++-----------
 src/Moonglade.Pingback/ReceivePingCommand.cs  |  2 +-
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index ff6719ccd..8040e0196 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -50,7 +50,7 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
 
         // check if exist same slug under the same day
         var todayUtc = DateTime.UtcNow.Date;
-        if (await postRepo.AnyAsync(new PostBySlugAndPubDateSpec(post.Slug, todayUtc), ct))
+        if (await postRepo.AnyAsync(new PostByDateAndSlugSpec(todayUtc, post.Slug, false), ct))
         {
             var uid = Guid.NewGuid();
             post.Slug += $"-{uid.ToString().ToLower()[..8]}";
diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index 6b9727a0d..fd4f385da 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -23,7 +23,7 @@ public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
         if (pid == Guid.Empty)
         {
             // Post does not have a checksum, fall back to old method
-            spec = new PostByDateAndSlugSpec(date, request.Slug.Slug);
+            spec = new PostByDateAndSlugSpec(date, request.Slug.Slug, true);
             pid = await repo.FirstOrDefaultAsync(spec, x => x.Id);
 
             if (pid == Guid.Empty) return null;
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index 819c17837..ec5a8a671 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -93,30 +93,22 @@ public PostByChecksumSpec(int hashCheckSum)
     }
 }
 
-public class PostByDateAndSlugSpec : Specification<PostEntity>
+public sealed class PostByDateAndSlugSpec : Specification<PostEntity>
 {
-    public PostByDateAndSlugSpec(DateTime date, string slug)
-    {
-        Query.Where(p => p.Slug == slug &&
-                         p.IsPublished &&
-                         p.PubDateUtc.Value.Date == date &&
-                         !p.IsDeleted);
-
-        Query.Include(p => p.Comments)
-             .Include(pt => pt.Tags)
-             .Include(p => p.PostCategory).ThenInclude(pc => pc.Category);
-    }
-}
-
-public class PostBySlugAndPubDateSpec : Specification<PostEntity>
-{
-    public PostBySlugAndPubDateSpec(string slug, DateTime pubDateUtc)
+    public PostByDateAndSlugSpec(DateTime date, string slug, bool includeRelationData)
     {
         Query.Where(p =>
-            p.Slug == slug &&
-            p.PubDateUtc != null
-            && p.PubDateUtc.Value.Year == pubDateUtc.Year
-            && p.PubDateUtc.Value.Month == pubDateUtc.Month
-            && p.PubDateUtc.Value.Day == pubDateUtc.Day);
+                    p.Slug == slug &&
+                    p.IsPublished &&
+                    p.PubDateUtc.Value.Date == date &&
+                    !p.IsDeleted);
+
+        if (includeRelationData)
+        {
+            Query.Include(p => p.Comments)
+                 .Include(pt => pt.Tags)
+                 .Include(p => p.PostCategory)
+                    .ThenInclude(pc => pc.Category);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index c03794651..436caa9d0 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -56,7 +56,7 @@ public async Task<PingbackResponse> Handle(ReceivePingCommand request, Cancellat
             }
 
             var (slug, pubDate) = GetSlugInfoFromUrl(pingRequest.TargetUrl);
-            var spec = new PostByDateAndSlugSpec(pubDate, slug);
+            var spec = new PostByDateAndSlugSpec(pubDate, slug, false);
             var (id, title) = await postRepo.FirstOrDefaultAsync(spec, p => new Tuple<Guid, string>(p.Id, p.Title));
             if (id == Guid.Empty)
             {

From cd26ebe03bd90417e53a26cbaf009e358e5851b1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 09:05:01 +0800
Subject: [PATCH 130/227] sealed

---
 src/Moonglade.Data/Specifications/PostSpec.cs | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index ec5a8a671..7175fad59 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -17,7 +17,7 @@ public PostSpec(Guid id, bool includeRelatedData = true)
     }
 }
 
-public class PostByStatusSpec : Specification<PostEntity>
+public sealed class PostByStatusSpec : Specification<PostEntity>
 {
     public PostByStatusSpec(PostStatus status)
     {
@@ -41,14 +41,15 @@ public PostByStatusSpec(PostStatus status)
     }
 }
 
-public class PostByCatSpec : Specification<PostEntity>
+public sealed class PostByCatSpec : Specification<PostEntity>
 {
     public PostByCatSpec(Guid? categoryId, int? top = null)
     {
-        Query.Where(p => !p.IsDeleted &&
-                         p.IsPublished &&
-                         p.IsFeedIncluded &&
-                         (categoryId == null || p.PostCategory.Any(c => c.CategoryId == categoryId.Value)));
+        Query.Where(p =>
+                    !p.IsDeleted &&
+                    p.IsPublished &&
+                    p.IsFeedIncluded &&
+                    (categoryId == null || p.PostCategory.Any(c => c.CategoryId == categoryId.Value)));
 
         Query.OrderByDescending(p => p.PubDateUtc);
 
@@ -59,7 +60,7 @@ public PostByCatSpec(Guid? categoryId, int? top = null)
     }
 }
 
-public class PostByYearMonthSpec : Specification<PostEntity>
+public sealed class PostByYearMonthSpec : Specification<PostEntity>
 {
     public PostByYearMonthSpec(int year, int month = 0)
     {
@@ -73,15 +74,12 @@ public PostByYearMonthSpec(int year, int month = 0)
     }
 }
 
-public class PostByDeletionFlagSpec : Specification<PostEntity>
+public sealed class PostByDeletionFlagSpec : Specification<PostEntity>
 {
-    public PostByDeletionFlagSpec(bool isDeleted)
-    {
-        Query.Where(p => p.IsDeleted == isDeleted);
-    }
+    public PostByDeletionFlagSpec(bool isDeleted) => Query.Where(p => p.IsDeleted == isDeleted);
 }
 
-public class PostByChecksumSpec : SingleResultSpecification<PostEntity>
+public sealed class PostByChecksumSpec : SingleResultSpecification<PostEntity>
 {
     public PostByChecksumSpec(int hashCheckSum)
     {

From a29c4b64698db88846ebb509f3d5eaac84e49017 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 09:34:03 +0800
Subject: [PATCH 131/227] AsSplitQuery

---
 src/Moonglade.Data/Specifications/PostSpec.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index 7175fad59..b6f5e6384 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -87,7 +87,9 @@ public PostByChecksumSpec(int hashCheckSum)
 
         Query.Include(p => p.Comments)
              .Include(pt => pt.Tags)
-             .Include(p => p.PostCategory).ThenInclude(pc => pc.Category);
+             .Include(p => p.PostCategory)
+                .ThenInclude(pc => pc.Category)
+             .AsSplitQuery();
     }
 }
 

From a33353c76602bb0f4cf4ccb4daf2e6148f5164d7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 09:41:42 +0800
Subject: [PATCH 132/227] code refact

---
 src/Moonglade.Configuration/GetAllConfigurationsQuery.cs | 2 +-
 src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs        | 4 +++-
 src/Moonglade.Data/Specifications/TagSpec.cs             | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs b/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
index 1c8723b68..728c1b378 100644
--- a/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
+++ b/src/Moonglade.Configuration/GetAllConfigurationsQuery.cs
@@ -10,7 +10,7 @@ public class GetAllConfigurationsQueryHandler(MoongladeRepository<BlogConfigurat
 {
     public async Task<IDictionary<string, string>> Handle(GetAllConfigurationsQuery request, CancellationToken ct)
     {
-        var entities = await repo.SelectAsync(p => new { p.CfgKey, p.CfgValue }, ct);
+        var entities = await repo.ListAsync(ct);
         return entities.ToDictionary(k => k.CfgKey, v => v.CfgValue);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
index 3f8e76cc8..7253b84b9 100644
--- a/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagNamesQuery.cs
@@ -1,4 +1,5 @@
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
 
@@ -6,5 +7,6 @@ public record GetTagNamesQuery : IRequest<List<string>>;
 
 public class GetTagNamesQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagNamesQuery, List<string>>
 {
-    public Task<List<string>> Handle(GetTagNamesQuery request, CancellationToken ct) => repo.SelectAsync(t => t.DisplayName, ct);
+    public Task<List<string>> Handle(GetTagNamesQuery request, CancellationToken ct) =>
+        repo.ListAsync(new TagDisplayNameNameSpec(), ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/TagSpec.cs b/src/Moonglade.Data/Specifications/TagSpec.cs
index 865360b83..2ae7b325b 100644
--- a/src/Moonglade.Data/Specifications/TagSpec.cs
+++ b/src/Moonglade.Data/Specifications/TagSpec.cs
@@ -25,4 +25,12 @@ public TagByDisplayNameSpec(string displayName)
     {
         Query.Where(t => t.DisplayName == displayName);
     }
+}
+
+public sealed class TagDisplayNameNameSpec : Specification<TagEntity, string>
+{
+    public TagDisplayNameNameSpec()
+    {
+        Query.Select(t => t.DisplayName);
+    }
 }
\ No newline at end of file

From 701ea84f2e8d1e25e054e1728762b7cfa5fde1cf Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:00:48 +0800
Subject: [PATCH 133/227] Update appsettings.json

---
 src/Moonglade.Web/appsettings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index ed6b610d1..837b0f2d6 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -46,6 +46,7 @@
   "Editor": "HTML",
   "DetectChina": "block",
   "RenderApplicationInsightsJs": true,
+  "BlockPingbackToLocalhost": true,
   "CacheSlidingExpirationMinutes": {
     "Post": 20,
     "Page": 20,

From 7b83a1b291e5105a47096ad7a031d2315f8ca5ab Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:00:55 +0800
Subject: [PATCH 134/227] BlockPingbackToLocalhost

---
 .../Moonglade.Pingback.csproj                 |  1 +
 src/Moonglade.Pingback/PingbackSender.cs      | 12 ++++++-
 src/Moonglade.Utils/UrlExtension.cs           | 31 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Pingback/Moonglade.Pingback.csproj b/src/Moonglade.Pingback/Moonglade.Pingback.csproj
index 93c951c80..e06bd732e 100644
--- a/src/Moonglade.Pingback/Moonglade.Pingback.csproj
+++ b/src/Moonglade.Pingback/Moonglade.Pingback.csproj
@@ -14,5 +14,6 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Moonglade.Data\Moonglade.Data.csproj" />
+        <ProjectReference Include="..\Moonglade.Utils\Moonglade.Utils.csproj" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/PingbackSender.cs b/src/Moonglade.Pingback/PingbackSender.cs
index 2d8a49335..b0506cbe5 100644
--- a/src/Moonglade.Pingback/PingbackSender.cs
+++ b/src/Moonglade.Pingback/PingbackSender.cs
@@ -1,11 +1,14 @@
 using Microsoft.Extensions.Logging;
+using Moonglade.Utils;
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.Configuration;
 
 namespace Moonglade.Pingback;
 
 public class PingbackSender(HttpClient httpClient,
         IPingbackWebRequest pingbackWebRequest,
-        ILogger<PingbackSender> logger = null)
+        IConfiguration configuration,
+        ILogger<PingbackSender> logger)
     : IPingbackSender
 {
     public async Task TrySendPingAsync(string postUrl, string postContent)
@@ -20,6 +23,13 @@ public async Task TrySendPingAsync(string postUrl, string postContent)
 
                 foreach (var url in GetUrlsFromContent(postContent))
                 {
+                    // check if url is localhost
+                    if (bool.Parse(configuration["BlockPingbackToLocalhost"]!) && url.IsLocalhostUrl())
+                    {
+                        logger?.LogWarning("URL is localhost, skipping.");
+                        continue;
+                    }
+
                     logger?.LogInformation("Pinging URL: " + url);
                     try
                     {
diff --git a/src/Moonglade.Utils/UrlExtension.cs b/src/Moonglade.Utils/UrlExtension.cs
index 7b7f4a1c0..be5bb1331 100644
--- a/src/Moonglade.Utils/UrlExtension.cs
+++ b/src/Moonglade.Utils/UrlExtension.cs
@@ -1,4 +1,6 @@
-namespace Moonglade.Utils;
+using System.Net;
+
+namespace Moonglade.Utils;
 
 public static class UrlExtension
 {
@@ -36,4 +38,31 @@ public static string CombineUrl(this string url, string path)
 
         return url.TrimEnd('/') + "/" + path.TrimStart('/');
     }
+
+    public static bool IsLocalhostUrl(this Uri uri)
+    {
+        try
+        {
+            if (uri.IsLoopback)
+            {
+                // localhost, 127.0.0.1, [::1]
+                return true;
+            }
+
+            // Get the local host name and compare it with the URL host
+            string localHostName = Dns.GetHostName();
+            if (uri.Host.Equals(localHostName, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // Get local IP addresses and compare them with the URL host
+            IPAddress[] localIPs = Dns.GetHostAddresses(Dns.GetHostName());
+            return localIPs.Any(addr => uri.Host.Equals(addr.ToString()));
+        }
+        catch (UriFormatException)
+        {
+            return false;
+        }
+    }
 }
\ No newline at end of file

From 4ba7e58fbdad6d3a3867e3330fd804ae73e0cd3c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:09:56 +0800
Subject: [PATCH 135/227] AllowPingbackFromLocalhost option

---
 src/Moonglade.Pingback/PingbackSender.cs | 28 ++++++++++++++----------
 src/Moonglade.Web/appsettings.json       |  3 ++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Moonglade.Pingback/PingbackSender.cs b/src/Moonglade.Pingback/PingbackSender.cs
index b0506cbe5..04392eee2 100644
--- a/src/Moonglade.Pingback/PingbackSender.cs
+++ b/src/Moonglade.Pingback/PingbackSender.cs
@@ -16,35 +16,41 @@ public async Task TrySendPingAsync(string postUrl, string postContent)
         try
         {
             var uri = new Uri(postUrl);
+
+            if (!bool.Parse(configuration["AllowPingbackFromLocalhost"]!) && uri.IsLocalhostUrl())
+            {
+                logger.LogWarning("Source URL is localhost, skipping.");
+                return;
+            }
+
             var content = postContent.ToUpperInvariant();
             if (content.Contains("HTTP://") || content.Contains("HTTPS://"))
             {
-                logger?.LogInformation("URL is detected in post content, trying to send ping requests.");
+                logger.LogInformation("URL is detected in post content, trying to send ping requests.");
 
                 foreach (var url in GetUrlsFromContent(postContent))
                 {
-                    // check if url is localhost
-                    if (bool.Parse(configuration["BlockPingbackToLocalhost"]!) && url.IsLocalhostUrl())
+                    if (!bool.Parse(configuration["AllowPingbackToLocalhost"]!) && url.IsLocalhostUrl())
                     {
-                        logger?.LogWarning("URL is localhost, skipping.");
+                        logger.LogWarning("Target URL is localhost, skipping.");
                         continue;
                     }
 
-                    logger?.LogInformation("Pinging URL: " + url);
+                    logger.LogInformation("Pinging URL: " + url);
                     try
                     {
                         await SendAsync(uri, url);
                     }
                     catch (Exception e)
                     {
-                        logger?.LogError(e, "SendAsync Ping Error.");
+                        logger.LogError(e, "SendAsync Ping Error.");
                     }
                 }
             }
         }
         catch (Exception ex)
         {
-            logger?.LogError(ex, $"{nameof(TrySendPingAsync)}({postUrl})");
+            logger.LogError(ex, $"{nameof(TrySendPingAsync)}({postUrl})");
         }
     }
 
@@ -64,14 +70,14 @@ private async Task SendAsync(Uri sourceUrl, Uri targetUrl)
 
             if (key is null || value is null)
             {
-                logger?.LogInformation($"Pingback endpoint is not found for URL '{targetUrl}', ping request is terminated.");
+                logger.LogInformation($"Pingback endpoint is not found for URL '{targetUrl}', ping request is terminated.");
                 return;
             }
 
             var pingUrl = value.FirstOrDefault();
             if (pingUrl is not null)
             {
-                logger?.LogInformation($"Found Ping service URL '{pingUrl}' on target '{sourceUrl}'");
+                logger.LogInformation($"Found Ping service URL '{pingUrl}' on target '{sourceUrl}'");
 
                 bool successUrlCreation = Uri.TryCreate(pingUrl, UriKind.Absolute, out var url);
                 if (successUrlCreation)
@@ -80,13 +86,13 @@ private async Task SendAsync(Uri sourceUrl, Uri targetUrl)
                 }
                 else
                 {
-                    logger?.LogInformation($"Invliad Ping service URL '{pingUrl}'");
+                    logger.LogInformation($"Invliad Ping service URL '{pingUrl}'");
                 }
             }
         }
         catch (Exception e)
         {
-            logger?.LogError(e, $"{nameof(SendAsync)}({sourceUrl},{targetUrl})");
+            logger.LogError(e, $"{nameof(SendAsync)}({sourceUrl},{targetUrl})");
         }
     }
 
diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index 837b0f2d6..927b04909 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -46,7 +46,8 @@
   "Editor": "HTML",
   "DetectChina": "block",
   "RenderApplicationInsightsJs": true,
-  "BlockPingbackToLocalhost": true,
+  "AllowPingbackToLocalhost": false,
+  "AllowPingbackFromLocalhost": false,
   "CacheSlidingExpirationMinutes": {
     "Post": 20,
     "Page": 20,

From 0ce8d008a53f0e3268a10d4878ebd2ec7796b7f1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:15:14 +0800
Subject: [PATCH 136/227] bump NUglify Microsoft.Identity.Web

---
 src/Directory.Build.props                  | 2 +-
 src/Moonglade.Auth/Moonglade.Auth.csproj   | 2 +-
 src/Moonglade.Utils/Moonglade.Utils.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index fa5102896..555eb0a31 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-preview.3</Version>
+    <Version>14.4.0-preview.4</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Moonglade.Auth/Moonglade.Auth.csproj b/src/Moonglade.Auth/Moonglade.Auth.csproj
index 331259822..e89187834 100644
--- a/src/Moonglade.Auth/Moonglade.Auth.csproj
+++ b/src/Moonglade.Auth/Moonglade.Auth.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Moonglade.Configuration\Moonglade.Configuration.csproj" />
diff --git a/src/Moonglade.Utils/Moonglade.Utils.csproj b/src/Moonglade.Utils/Moonglade.Utils.csproj
index d22c03d1d..9d58777a3 100644
--- a/src/Moonglade.Utils/Moonglade.Utils.csproj
+++ b/src/Moonglade.Utils/Moonglade.Utils.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NUglify" Version="1.21.4" />
+    <PackageReference Include="NUglify" Version="1.21.7" />
     <PackageReference Include="Markdig" Version="0.37.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 7d1a2e6aa78bc18155fe1bd47ff24419c4389069 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:28:51 +0800
Subject: [PATCH 137/227] code refact

---
 .../PostFeature/UpdatePostCommand.cs          |  2 +-
 .../TagFeature/CreateTagCommand.cs            | 23 ++++++-------------
 .../Controllers/TagsController.cs             |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 615db8c73..bc5e9b467 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -95,7 +95,7 @@ public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToke
 
         foreach (var item in tags)
         {
-            if (!await _tagRepo.AnyAsync(p => p.DisplayName == item, ct))
+            if (!await _tagRepo.AnyAsync(new TagByDisplayNameSpec(item), ct))
             {
                 await _tagRepo.AddAsync(new()
                 {
diff --git a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
index ea2f738fc..ca95281c7 100644
--- a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
@@ -4,19 +4,16 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record CreateTagCommand(string Name) : IRequest<Tag>;
+public record CreateTagCommand(string Name) : IRequest;
 
-public class CreateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<CreateTagCommand, Tag>
+public class CreateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<CreateTagCommand>
 {
-    public async Task<Tag> Handle(CreateTagCommand request, CancellationToken ct)
+    public async Task Handle(CreateTagCommand request, CancellationToken ct)
     {
-        if (!Tag.ValidateName(request.Name)) return null;
-
         var normalizedName = Tag.NormalizeName(request.Name, Helper.TagNormalizationDictionary);
-        if (await repo.AnyAsync(t => t.NormalizedName == normalizedName, ct))
-        {
-            return await repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(normalizedName), Tag.EntitySelector);
-        }
+
+        var existingTag = await repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(normalizedName), ct);
+        if (null != existingTag) return;
 
         var newTag = new TagEntity
         {
@@ -24,12 +21,6 @@ public async Task<Tag> Handle(CreateTagCommand request, CancellationToken ct)
             NormalizedName = normalizedName
         };
 
-        var tag = await repo.AddAsync(newTag, ct);
-
-        return new()
-        {
-            DisplayName = tag.DisplayName,
-            NormalizedName = tag.NormalizedName
-        };
+        await repo.AddAsync(newTag, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Controllers/TagsController.cs b/src/Moonglade.Web/Controllers/TagsController.cs
index 2e99c49e0..e52e97096 100644
--- a/src/Moonglade.Web/Controllers/TagsController.cs
+++ b/src/Moonglade.Web/Controllers/TagsController.cs
@@ -30,7 +30,6 @@ public async Task<IActionResult> List()
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> Create([Required][FromBody] string name)
     {
-        if (string.IsNullOrWhiteSpace(name)) return BadRequest();
         if (!Tag.ValidateName(name)) return Conflict();
 
         await mediator.Send(new CreateTagCommand(name.Trim()));

From fdad29b622dbc5e595847275b189b523761a3edc Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:30:32 +0800
Subject: [PATCH 138/227] Update CreateCategoryCommand.cs

---
 src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
index 0a282f377..a551ce761 100644
--- a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
@@ -1,6 +1,7 @@
 using Edi.CacheAside.InMemory;
 using Moonglade.Data;
 using System.ComponentModel.DataAnnotations;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.CategoryFeature;
 
@@ -27,7 +28,7 @@ public class CreateCategoryCommandHandler(MoongladeRepository<CategoryEntity> ca
 {
     public async Task Handle(CreateCategoryCommand request, CancellationToken ct)
     {
-        var exists = await catRepo.AnyAsync(c => c.Slug == request.Slug, ct);
+        var exists = await catRepo.AnyAsync(new CategoryBySlugSpec(request.Slug), ct);
         if (exists) return;
 
         var category = new CategoryEntity

From d02e57be90d97105bf06eab7fe4bd51aa45d4280 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:32:03 +0800
Subject: [PATCH 139/227] C# language usage

---
 .../Moderator/ModeratorService.cs             |  6 ++---
 src/Moonglade.Configuration/BlogConfig.cs     |  2 +-
 .../CustomMenuSettings.cs                     |  8 +++----
 src/Moonglade.Configuration/Menu.cs           |  2 +-
 .../PostFeature/GetArchiveQuery.cs            |  2 +-
 .../TagFeature/GetHotTagsQuery.cs             |  2 +-
 .../Controllers/AssetsController.cs           |  2 +-
 .../Controllers/CommentController.cs          |  2 +-
 .../Controllers/PageController.cs             |  4 ++--
 .../Controllers/PostController.cs             | 22 +++++++++----------
 .../Controllers/TagsController.cs             |  4 ++--
 .../Controllers/ThemeController.cs            |  4 ++--
 src/Moonglade.Web/IconGenerator.cs            |  6 ++---
 .../Middleware/WriteFoafCommand.cs            |  2 +-
 src/Moonglade.Web/PagedList/BasePagedList.cs  |  2 +-
 .../ViewComponents/FriendLinkViewComponent.cs |  2 +-
 16 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/Moonglade.Comments/Moderator/ModeratorService.cs b/src/Moonglade.Comments/Moderator/ModeratorService.cs
index d6555fb10..095714cd3 100644
--- a/src/Moonglade.Comments/Moderator/ModeratorService.cs
+++ b/src/Moonglade.Comments/Moderator/ModeratorService.cs
@@ -54,14 +54,14 @@ public async Task<string> Mask(string input)
             var payload = new Payload
             {
                 OriginAspNetRequestId = _httpContextAccessor.HttpContext?.TraceIdentifier,
-                Contents = new[]
-                {
+                Contents =
+                [
                     new Content
                     {
                         Id = "0",
                         RawText = input
                     }
-                }
+                ]
             };
 
             var response = await _httpClient.PostAsync(
diff --git a/src/Moonglade.Configuration/BlogConfig.cs b/src/Moonglade.Configuration/BlogConfig.cs
index 9b9e95ea6..d9660d06e 100644
--- a/src/Moonglade.Configuration/BlogConfig.cs
+++ b/src/Moonglade.Configuration/BlogConfig.cs
@@ -56,7 +56,7 @@ public IEnumerable<int> LoadFromConfig(IDictionary<string, string> config)
         return _keysToInit.AsEnumerable();
     }
 
-    private readonly List<int> _keysToInit = new();
+    private readonly List<int> _keysToInit = [];
     private T AssignValueForConfigItem<T>(int index, T defaultValue, IDictionary<string, string> config) where T : IBlogSettings
     {
         var name = typeof(T).Name;
diff --git a/src/Moonglade.Configuration/CustomMenuSettings.cs b/src/Moonglade.Configuration/CustomMenuSettings.cs
index 093e2acbd..b7f6cf3bc 100644
--- a/src/Moonglade.Configuration/CustomMenuSettings.cs
+++ b/src/Moonglade.Configuration/CustomMenuSettings.cs
@@ -27,8 +27,8 @@ public static CustomMenuSettings DefaultValue
             return new()
             {
                 IsEnabled = true,
-                Menus = new[]
-                {
+                Menus =
+                [
                     new Menu
                     {
                         Title = "About",
@@ -36,9 +36,9 @@ public static CustomMenuSettings DefaultValue
                         Icon = "bi-star",
                         DisplayOrder = 1,
                         IsOpenInNewTab = false,
-                        SubMenus = new()
+                        SubMenus = []
                     }
-                }
+                ]
             };
         }
     }
diff --git a/src/Moonglade.Configuration/Menu.cs b/src/Moonglade.Configuration/Menu.cs
index 84c1f281d..0117774b9 100644
--- a/src/Moonglade.Configuration/Menu.cs
+++ b/src/Moonglade.Configuration/Menu.cs
@@ -12,5 +12,5 @@ public class Menu
 
     public bool IsOpenInNewTab { get; set; }
 
-    public List<SubMenu> SubMenus { get; set; } = new();
+    public List<SubMenu> SubMenus { get; set; } = [];
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index 06b3e15f1..d98ae0cb9 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -16,7 +16,7 @@ public async Task<List<Archive>> Handle(GetArchiveQuery request, CancellationTok
     {
         if (!await repo.AnyAsync(p => p.IsPublished && !p.IsDeleted, ct))
         {
-            return new();
+            return [];
         }
 
         var spec = new PostByStatusSpec(PostStatus.Published);
diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index 9832beae4..cd03129df 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -9,7 +9,7 @@ public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequ
 {
     public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
-        if (!await repo.AnyAsync(ct)) return new();
+        if (!await repo.AnyAsync(ct)) return [];
 
         var spec = new TagSpec(request.Top);
         var tags = await repo.SelectAsync(spec, t =>
diff --git a/src/Moonglade.Web/Controllers/AssetsController.cs b/src/Moonglade.Web/Controllers/AssetsController.cs
index b8ce2e3b4..eb0cc3690 100644
--- a/src/Moonglade.Web/Controllers/AssetsController.cs
+++ b/src/Moonglade.Web/Controllers/AssetsController.cs
@@ -35,7 +35,7 @@ public async Task<IActionResult> Avatar(ICacheAside cache)
     [HttpPost("avatar")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCachePartition.General, "avatar" })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCachePartition.General, "avatar"])]
     public async Task<IActionResult> Avatar([FromBody] string base64Img)
     {
         base64Img = base64Img.Trim();
diff --git a/src/Moonglade.Web/Controllers/CommentController.cs b/src/Moonglade.Web/Controllers/CommentController.cs
index 750e1a727..2f18d295e 100644
--- a/src/Moonglade.Web/Controllers/CommentController.cs
+++ b/src/Moonglade.Web/Controllers/CommentController.cs
@@ -85,7 +85,7 @@ await mediator.Publish(new CommentNotification(
     [ProducesResponseType<Guid>(StatusCodes.Status200OK)]
     public async Task<IActionResult> Approval([NotEmpty] Guid commentId)
     {
-        await mediator.Send(new ToggleApprovalCommand(new[] { commentId }));
+        await mediator.Send(new ToggleApprovalCommand([commentId]));
         return Ok(commentId);
     }
 
diff --git a/src/Moonglade.Web/Controllers/PageController.cs b/src/Moonglade.Web/Controllers/PageController.cs
index 556e4b0d4..7f9ae5bdb 100644
--- a/src/Moonglade.Web/Controllers/PageController.cs
+++ b/src/Moonglade.Web/Controllers/PageController.cs
@@ -10,13 +10,13 @@ namespace Moonglade.Web.Controllers;
 public class PageController(ICacheAside cache, IMediator mediator) : Controller
 {
     [HttpPost]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.SiteMap })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.SiteMap])]
     [ProducesResponseType(StatusCodes.Status200OK)]
     public Task<IActionResult> Create(EditPageRequest model) =>
         CreateOrEdit(model, async request => await mediator.Send(new CreatePageCommand(request)));
 
     [HttpPut("{id:guid}")]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.SiteMap })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.SiteMap])]
     [ProducesResponseType(StatusCodes.Status200OK)]
     public Task<IActionResult> Edit([NotEmpty] Guid id, EditPageRequest model) =>
         CreateOrEdit(model, async request => await mediator.Send(new UpdatePageCommand(id, request)));
diff --git a/src/Moonglade.Web/Controllers/PostController.cs b/src/Moonglade.Web/Controllers/PostController.cs
index da375889e..039281507 100644
--- a/src/Moonglade.Web/Controllers/PostController.cs
+++ b/src/Moonglade.Web/Controllers/PostController.cs
@@ -16,12 +16,12 @@ public class PostController(
         ILogger<PostController> logger) : ControllerBase
 {
     [HttpPost("createoredit")]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[]
-    {
+    [TypeFilter(typeof(ClearBlogCache), Arguments =
+    [
         BlogCacheType.SiteMap |
         BlogCacheType.Subscription |
         BlogCacheType.PagingCount
-    })]
+    ])]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> CreateOrEdit(PostEditModel model, LinkGenerator linkGenerator)
@@ -73,12 +73,12 @@ await mediator.Send(new CreatePostCommand(model)) :
         }
     }
 
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[]
-    {
+    [TypeFilter(typeof(ClearBlogCache), Arguments =
+    [
         BlogCacheType.SiteMap |
         BlogCacheType.Subscription |
         BlogCacheType.PagingCount
-    })]
+    ])]
     [HttpPost("{postId:guid}/restore")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public async Task<IActionResult> Restore([NotEmpty] Guid postId)
@@ -87,12 +87,12 @@ public async Task<IActionResult> Restore([NotEmpty] Guid postId)
         return NoContent();
     }
 
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[]
-    {
+    [TypeFilter(typeof(ClearBlogCache), Arguments =
+    [
         BlogCacheType.SiteMap |
         BlogCacheType.Subscription |
         BlogCacheType.PagingCount
-    })]
+    ])]
     [HttpDelete("{postId:guid}/recycle")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public async Task<IActionResult> Delete([NotEmpty] Guid postId)
@@ -101,7 +101,7 @@ public async Task<IActionResult> Delete([NotEmpty] Guid postId)
         return NoContent();
     }
 
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.Subscription | BlogCacheType.SiteMap })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.Subscription | BlogCacheType.SiteMap])]
     [HttpDelete("{postId:guid}/destroy")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public async Task<IActionResult> DeleteFromRecycleBin([NotEmpty] Guid postId)
@@ -110,7 +110,7 @@ public async Task<IActionResult> DeleteFromRecycleBin([NotEmpty] Guid postId)
         return NoContent();
     }
 
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.Subscription | BlogCacheType.SiteMap })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.Subscription | BlogCacheType.SiteMap])]
     [HttpDelete("recyclebin")]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public async Task<IActionResult> EmptyRecycleBin()
diff --git a/src/Moonglade.Web/Controllers/TagsController.cs b/src/Moonglade.Web/Controllers/TagsController.cs
index e52e97096..d8e5b42d8 100644
--- a/src/Moonglade.Web/Controllers/TagsController.cs
+++ b/src/Moonglade.Web/Controllers/TagsController.cs
@@ -37,7 +37,7 @@ public async Task<IActionResult> Create([Required][FromBody] string name)
     }
 
     [HttpPut("{id:int}")]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.PagingCount })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.PagingCount])]
     [ApiConventionMethod(typeof(DefaultApiConventions), nameof(DefaultApiConventions.Put))]
     public async Task<IActionResult> Update([Range(1, int.MaxValue)] int id, [Required][FromBody] string name)
     {
@@ -48,7 +48,7 @@ public async Task<IActionResult> Update([Range(1, int.MaxValue)] int id, [Requir
     }
 
     [HttpDelete("{id:int}")]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCacheType.PagingCount })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.PagingCount])]
     [ApiConventionMethod(typeof(DefaultApiConventions), nameof(DefaultApiConventions.Delete))]
     public async Task<IActionResult> Delete([Range(0, int.MaxValue)] int id)
     {
diff --git a/src/Moonglade.Web/Controllers/ThemeController.cs b/src/Moonglade.Web/Controllers/ThemeController.cs
index 2ab98487a..be98d1d36 100644
--- a/src/Moonglade.Web/Controllers/ThemeController.cs
+++ b/src/Moonglade.Web/Controllers/ThemeController.cs
@@ -48,7 +48,7 @@ public async Task<IActionResult> Css()
     [HttpPost]
     [ProducesResponseType<string>(StatusCodes.Status409Conflict)]
     [ProducesResponseType<int>(StatusCodes.Status200OK)]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCachePartition.General, "theme" })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCachePartition.General, "theme"])]
     public async Task<IActionResult> Create(CreateThemeRequest request)
     {
         var dic = new Dictionary<string, string>
@@ -67,7 +67,7 @@ public async Task<IActionResult> Create(CreateThemeRequest request)
     [Authorize]
     [HttpDelete("{id:int}")]
     [ApiConventionMethod(typeof(DefaultApiConventions), nameof(DefaultApiConventions.Delete))]
-    [TypeFilter(typeof(ClearBlogCache), Arguments = new object[] { BlogCachePartition.General, "theme" })]
+    [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCachePartition.General, "theme"])]
     public async Task<IActionResult> Delete([Range(1, int.MaxValue)] int id)
     {
         var oc = await mediator.Send(new DeleteThemeCommand(id));
diff --git a/src/Moonglade.Web/IconGenerator.cs b/src/Moonglade.Web/IconGenerator.cs
index f1412e595..2342f3b01 100644
--- a/src/Moonglade.Web/IconGenerator.cs
+++ b/src/Moonglade.Web/IconGenerator.cs
@@ -46,9 +46,9 @@ public static void GenerateIcons(string base64Data, string webRootPath, ILogger
 
         var dic = new Dictionary<string, int[]>
         {
-            { "android-icon-", new[] { 144, 192 } },
-            { "favicon-", new[] { 16, 32, 96 } },
-            { "apple-icon-", new[] { 180 } }
+            { "android-icon-", [144, 192] },
+            { "favicon-", [16, 32, 96] },
+            { "apple-icon-", [180] }
         };
 
         foreach (var (key, value) in dic)
diff --git a/src/Moonglade.Web/Middleware/WriteFoafCommand.cs b/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
index 6a9713548..e8db2a074 100644
--- a/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
+++ b/src/Moonglade.Web/Middleware/WriteFoafCommand.cs
@@ -50,7 +50,7 @@ public async Task<string> Handle(WriteFoafCommand request, CancellationToken ct)
             Blog = request.Doc.BlogUrl,
             Email = request.Doc.Email,
             PhotoUrl = request.Doc.PhotoUrl,
-            Friends = new()
+            Friends = []
         };
 
         foreach (var friend in request.Links)
diff --git a/src/Moonglade.Web/PagedList/BasePagedList.cs b/src/Moonglade.Web/PagedList/BasePagedList.cs
index 3a109f3a4..cca09d5c5 100644
--- a/src/Moonglade.Web/PagedList/BasePagedList.cs
+++ b/src/Moonglade.Web/PagedList/BasePagedList.cs
@@ -15,7 +15,7 @@ namespace Moonglade.Web.PagedList;
 /// <seealso cref = "List{T}" />
 public class BasePagedList<T> : PagedListMetaData, IPagedList<T>
 {
-    protected readonly List<T> Subset = new();
+    protected readonly List<T> Subset = [];
 
     /// <summary>
     /// Parameterless constructor.
diff --git a/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs b/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
index 8d9712a24..8b8c54009 100644
--- a/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
+++ b/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
@@ -10,7 +10,7 @@ public async Task<IViewComponentResult> InvokeAsync()
         try
         {
             var links = await mediator.Send(new GetAllLinksQuery());
-            return View(links ?? new List<FriendLinkEntity>());
+            return View(links ?? []);
         }
         catch (Exception e)
         {

From 1ce6e219b1d66d4dcfb803a7547e186b644965b0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:32:34 +0800
Subject: [PATCH 140/227] Update CustomMenuSettings.cs

---
 .../CustomMenuSettings.cs                     | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/Moonglade.Configuration/CustomMenuSettings.cs b/src/Moonglade.Configuration/CustomMenuSettings.cs
index b7f6cf3bc..57c848aa2 100644
--- a/src/Moonglade.Configuration/CustomMenuSettings.cs
+++ b/src/Moonglade.Configuration/CustomMenuSettings.cs
@@ -20,26 +20,21 @@ public class CustomMenuSettings : IBlogSettings
     public Menu[] Menus { get; set; } = Array.Empty<Menu>();
 
     [JsonIgnore]
-    public static CustomMenuSettings DefaultValue
-    {
-        get
+    public static CustomMenuSettings DefaultValue =>
+        new()
         {
-            return new()
-            {
-                IsEnabled = true,
-                Menus =
-                [
-                    new Menu
-                    {
-                        Title = "About",
-                        Url = "/page/about",
-                        Icon = "bi-star",
-                        DisplayOrder = 1,
-                        IsOpenInNewTab = false,
-                        SubMenus = []
-                    }
-                ]
-            };
-        }
-    }
+            IsEnabled = true,
+            Menus =
+            [
+                new Menu
+                {
+                    Title = "About",
+                    Url = "/page/about",
+                    Icon = "bi-star",
+                    DisplayOrder = 1,
+                    IsOpenInNewTab = false,
+                    SubMenus = []
+                }
+            ]
+        };
 }
\ No newline at end of file

From 72db0afd2712cfa1798d14ea876e30cbcfd6b4bb Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 10:34:55 +0800
Subject: [PATCH 141/227] more standard convention

---
 src/Moonglade.Theme/CreateThemeCommand.cs        | 2 +-
 src/Moonglade.Web/Controllers/ThemeController.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Theme/CreateThemeCommand.cs b/src/Moonglade.Theme/CreateThemeCommand.cs
index 617eedc12..d99167c89 100644
--- a/src/Moonglade.Theme/CreateThemeCommand.cs
+++ b/src/Moonglade.Theme/CreateThemeCommand.cs
@@ -12,7 +12,7 @@ public class CreateThemeCommandHandler(MoongladeRepository<BlogThemeEntity> repo
     public async Task<int> Handle(CreateThemeCommand request, CancellationToken ct)
     {
         var (name, dictionary) = request;
-        if (await repo.AnyAsync(p => p.ThemeName == name.Trim(), ct)) return 0;
+        if (await repo.AnyAsync(p => p.ThemeName == name.Trim(), ct)) return -1;
 
         var rules = JsonSerializer.Serialize(dictionary);
         var entity = new BlogThemeEntity
diff --git a/src/Moonglade.Web/Controllers/ThemeController.cs b/src/Moonglade.Web/Controllers/ThemeController.cs
index be98d1d36..40a56c68c 100644
--- a/src/Moonglade.Web/Controllers/ThemeController.cs
+++ b/src/Moonglade.Web/Controllers/ThemeController.cs
@@ -59,7 +59,7 @@ public async Task<IActionResult> Create(CreateThemeRequest request)
         };
 
         var id = await mediator.Send(new CreateThemeCommand(request.Name, dic));
-        if (id == 0) return Conflict("Theme with same name already exists");
+        if (id == -1) return Conflict("Theme with same name already exists");
 
         return Ok(id);
     }

From 47724ec5f14a1eb3ae04e496b6d0d3fd7e25bdd7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Sun, 28 Apr 2024 14:26:04 +0800
Subject: [PATCH 142/227] code refact

---
 src/Moonglade.Core/PostFeature/GetArchiveQuery.cs    |  2 +-
 src/Moonglade.Data/Specifications/ThemeByNameSpec.cs | 11 +++++++++++
 src/Moonglade.Theme/CreateThemeCommand.cs            |  3 ++-
 src/Moonglade.Web/Pages/Settings/General.cshtml      |  1 -
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/ThemeByNameSpec.cs

diff --git a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
index d98ae0cb9..02cc33d74 100644
--- a/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetArchiveQuery.cs
@@ -14,7 +14,7 @@ public class GetArchiveQueryHandler(MoongladeRepository<PostEntity> repo) : IReq
 
     public async Task<List<Archive>> Handle(GetArchiveQuery request, CancellationToken ct)
     {
-        if (!await repo.AnyAsync(p => p.IsPublished && !p.IsDeleted, ct))
+        if (!await repo.AnyAsync(new PostByStatusSpec(PostStatus.Published), ct))
         {
             return [];
         }
diff --git a/src/Moonglade.Data/Specifications/ThemeByNameSpec.cs b/src/Moonglade.Data/Specifications/ThemeByNameSpec.cs
new file mode 100644
index 000000000..e5fa1723a
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/ThemeByNameSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class ThemeByNameSpec : Specification<BlogThemeEntity>
+{
+    public ThemeByNameSpec(string name)
+    {
+        Query.Where(p => p.ThemeName == name);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Theme/CreateThemeCommand.cs b/src/Moonglade.Theme/CreateThemeCommand.cs
index d99167c89..4dd8284ce 100644
--- a/src/Moonglade.Theme/CreateThemeCommand.cs
+++ b/src/Moonglade.Theme/CreateThemeCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
+using Moonglade.Data.Specifications;
 using System.Text.Json;
 
 namespace Moonglade.Theme;
@@ -12,7 +13,7 @@ public class CreateThemeCommandHandler(MoongladeRepository<BlogThemeEntity> repo
     public async Task<int> Handle(CreateThemeCommand request, CancellationToken ct)
     {
         var (name, dictionary) = request;
-        if (await repo.AnyAsync(p => p.ThemeName == name.Trim(), ct)) return -1;
+        if (await repo.AnyAsync(new ThemeByNameSpec(name.Trim()), ct)) return -1;
 
         var rules = JsonSerializer.Serialize(dictionary);
         var entity = new BlogThemeEntity
diff --git a/src/Moonglade.Web/Pages/Settings/General.cshtml b/src/Moonglade.Web/Pages/Settings/General.cshtml
index 3545088ca..110417dd6 100644
--- a/src/Moonglade.Web/Pages/Settings/General.cshtml
+++ b/src/Moonglade.Web/Pages/Settings/General.cshtml
@@ -64,7 +64,6 @@
                 },
                 async (resp) => {
                     var id = await resp.json();
-                    console.info(id);
 
                     themeModal.hide();
                     $("#ViewModel_SelectedThemeId").append(new Option(document.querySelector('#Name').value, id));

From 64abf018c4005ff1b50ed3d95a71d0eb5ba57b77 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:14:46 +0800
Subject: [PATCH 143/227] remove AnyAsync

---
 src/Moonglade.Data/MoongladeRepository.cs         |  7 -------
 src/Moonglade.Data/Specifications/PingbackSpec.cs | 14 ++++++++++++++
 src/Moonglade.Pingback/ReceivePingCommand.cs      |  6 +-----
 3 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/PingbackSpec.cs

diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 312f03971..1d0f1366f 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,13 +17,6 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public Task<bool> AnyAsync(Expression<Func<T, bool>> condition, CancellationToken ct = default)
-    {
-        return null != condition ?
-            dbContext.Set<T>().AnyAsync(condition, cancellationToken: ct) :
-            dbContext.Set<T>().AnyAsync(cancellationToken: ct);
-    }
-
     public Task<TResult> FirstOrDefaultAsync<TResult>(
         ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
         ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
diff --git a/src/Moonglade.Data/Specifications/PingbackSpec.cs b/src/Moonglade.Data/Specifications/PingbackSpec.cs
new file mode 100644
index 000000000..42d2a6e49
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PingbackSpec.cs
@@ -0,0 +1,14 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class PingbackSpec : Specification<PingbackEntity>
+{
+    public PingbackSpec(Guid postId, string sourceUrl, string sourceIp)
+    {
+        Query.Where(p =>
+            p.TargetPostId == postId &&
+            p.SourceUrl == sourceUrl &&
+            p.SourceIp == sourceIp);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index 436caa9d0..e06da9831 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -66,11 +66,7 @@ public async Task<PingbackResponse> Handle(ReceivePingCommand request, Cancellat
 
             logger.LogInformation($"Post '{id}:{title}' is found for ping.");
 
-            var pinged = await pingbackRepo.AnyAsync(p =>
-                p.TargetPostId == id &&
-                p.SourceUrl == pingRequest.SourceUrl &&
-                p.SourceIp.Trim() == request.IP, ct);
-
+            var pinged = await pingbackRepo.AnyAsync(new PingbackSpec(id, pingRequest.SourceUrl, request.IP), ct);
             if (pinged) return PingbackResponse.Error48PingbackAlreadyRegistered;
 
             logger.LogInformation("Adding received pingback...");

From 8689965bcc7ae66744b2d53020524f5bea6eaebc Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:19:34 +0800
Subject: [PATCH 144/227] remove outdated fallback

---
 .../PostFeature/GetPostBySlugQuery.cs           | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index fd4f385da..f5c2c5df2 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -17,23 +17,10 @@ public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
 
         // Try to find by checksum
         var slugCheckSum = Helper.ComputeCheckSum($"{request.Slug.Slug}#{date:yyyyMMdd}");
-        Ardalis.Specification.ISpecification<PostEntity> spec = new PostByChecksumSpec(slugCheckSum);
+        var spec = new PostByChecksumSpec(slugCheckSum);
 
         var pid = await repo.FirstOrDefaultAsync(spec, p => p.Id);
-        if (pid == Guid.Empty)
-        {
-            // Post does not have a checksum, fall back to old method
-            spec = new PostByDateAndSlugSpec(date, request.Slug.Slug, true);
-            pid = await repo.FirstOrDefaultAsync(spec, x => x.Id);
-
-            if (pid == Guid.Empty) return null;
-
-            // Post is found, fill it's checksum so that next time the query can be run against checksum
-            var p = await repo.GetByIdAsync(pid, ct);
-            p.HashCheckSum = slugCheckSum;
-
-            await repo.UpdateAsync(p, ct);
-        }
+        if (pid == Guid.Empty) return null;
 
         var psm = await cache.GetOrCreateAsync(BlogCachePartition.Post.ToString(), $"{pid}", async entry =>
         {

From 0ea2328575e0c83c2ef2307cfc486e63fc32eb51 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:20:50 +0800
Subject: [PATCH 145/227] code clean up

---
 src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs | 2 +-
 src/Moonglade.Pingback/PingbackSender.cs                    | 4 ++--
 src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
index a551ce761..42d193f9c 100644
--- a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
@@ -1,7 +1,7 @@
 using Edi.CacheAside.InMemory;
 using Moonglade.Data;
-using System.ComponentModel.DataAnnotations;
 using Moonglade.Data.Specifications;
+using System.ComponentModel.DataAnnotations;
 
 namespace Moonglade.Core.CategoryFeature;
 
diff --git a/src/Moonglade.Pingback/PingbackSender.cs b/src/Moonglade.Pingback/PingbackSender.cs
index 04392eee2..89b002b6a 100644
--- a/src/Moonglade.Pingback/PingbackSender.cs
+++ b/src/Moonglade.Pingback/PingbackSender.cs
@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Moonglade.Utils;
 using System.Text.RegularExpressions;
-using Microsoft.Extensions.Configuration;
 
 namespace Moonglade.Pingback;
 
diff --git a/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs b/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
index 8b8c54009..2ff6a937b 100644
--- a/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
+++ b/src/Moonglade.Web/ViewComponents/FriendLinkViewComponent.cs
@@ -1,4 +1,3 @@
-using Moonglade.Data.Entities;
 using Moonglade.FriendLink;
 
 namespace Moonglade.Web.ViewComponents;

From 483d715fb56deba4b82d8339a73396691ee04eda Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:24:46 +0800
Subject: [PATCH 146/227] remove PostSitePageSpec

---
 .../Specifications/PostSitePageSpec.cs               | 12 ------------
 src/Moonglade.Data/Specifications/PostSpec.cs        |  1 +
 src/Moonglade.Web/Middleware/SiteMapMiddleware.cs    |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 src/Moonglade.Data/Specifications/PostSitePageSpec.cs

diff --git a/src/Moonglade.Data/Specifications/PostSitePageSpec.cs b/src/Moonglade.Data/Specifications/PostSitePageSpec.cs
deleted file mode 100644
index dfac38f73..000000000
--- a/src/Moonglade.Data/Specifications/PostSitePageSpec.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Moonglade.Data.Entities;
-
-namespace Moonglade.Data.Specifications;
-
-public class PostSitePageSpec : Specification<PostEntity>
-{
-    public PostSitePageSpec()
-    {
-        Query.Where(p => p.IsPublished && !p.IsDeleted);
-        Query.AsNoTracking();
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index b6f5e6384..64e351614 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -71,6 +71,7 @@ public PostByYearMonthSpec(int year, int month = 0)
         Query.Where(p => p.IsPublished && !p.IsDeleted);
 
         Query.OrderByDescending(p => p.PubDateUtc);
+        Query.AsNoTracking();
     }
 }
 
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index b78b8e6e4..c702427b9 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -40,7 +40,7 @@ private static async Task<string> GetSiteMapData(
             writer.WriteStartElement("urlset", "http://www.sitemaps.org/schemas/sitemap/0.9");
 
             // Posts
-            var spec = new PostSitePageSpec();
+            var spec = new PostByStatusSpec(PostStatus.Published);
             var posts = await postRepo
                 .SelectAsync(spec, p => new Tuple<string, DateTime?, DateTime?>(p.Slug, p.PubDateUtc, p.LastModifiedUtc), ct);
 

From 4a2ee33ab7b70464f9a8a14f9d1c130721c7bbaa Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:30:04 +0800
Subject: [PATCH 147/227] code refact

---
 src/Moonglade.Core/PostFeature/CountPostQuery.cs          | 5 +++--
 src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs       | 2 +-
 .../{FeaturedPostSpec.cs => FeaturedPostPagingSpec.cs}    | 4 ++--
 src/Moonglade.Data/Specifications/PostSpec.cs             | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)
 rename src/Moonglade.Data/Specifications/{FeaturedPostSpec.cs => FeaturedPostPagingSpec.cs} (72%)

diff --git a/src/Moonglade.Core/PostFeature/CountPostQuery.cs b/src/Moonglade.Core/PostFeature/CountPostQuery.cs
index 7cd2ac0c8..ce7962881 100644
--- a/src/Moonglade.Core/PostFeature/CountPostQuery.cs
+++ b/src/Moonglade.Core/PostFeature/CountPostQuery.cs
@@ -1,4 +1,5 @@
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PostFeature;
 
@@ -25,7 +26,7 @@ public async Task<int> Handle(CountPostQuery request, CancellationToken ct)
         switch (request.CountType)
         {
             case CountType.Public:
-                count = await postRepo.CountAsync(p => p.IsPublished && !p.IsDeleted, ct);
+                count = await postRepo.CountAsync(new PostByStatusSpec(PostStatus.Published), ct);
                 break;
 
             case CountType.Category:
@@ -41,7 +42,7 @@ public async Task<int> Handle(CountPostQuery request, CancellationToken ct)
                 break;
 
             case CountType.Featured:
-                count = await postRepo.CountAsync(p => p.IsFeatured && p.IsPublished && !p.IsDeleted, ct);
+                count = await postRepo.CountAsync(new FeaturedPostSpec(), ct);
                 break;
         }
 
diff --git a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
index 22cf55c0f..d81721348 100644
--- a/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
+++ b/src/Moonglade.Core/PostFeature/ListFeaturedQuery.cs
@@ -13,7 +13,7 @@ public Task<List<PostDigest>> Handle(ListFeaturedQuery request, CancellationToke
         var (pageSize, pageIndex) = request;
         Helper.ValidatePagingParameters(pageSize, pageIndex);
 
-        var posts = repo.SelectAsync(new FeaturedPostSpec(pageSize, pageIndex), PostDigest.EntitySelector, ct);
+        var posts = repo.SelectAsync(new FeaturedPostPagingSpec(pageSize, pageIndex), PostDigest.EntitySelector, ct);
         return posts;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/FeaturedPostSpec.cs b/src/Moonglade.Data/Specifications/FeaturedPostPagingSpec.cs
similarity index 72%
rename from src/Moonglade.Data/Specifications/FeaturedPostSpec.cs
rename to src/Moonglade.Data/Specifications/FeaturedPostPagingSpec.cs
index 177ba5c4f..b1be4f582 100644
--- a/src/Moonglade.Data/Specifications/FeaturedPostSpec.cs
+++ b/src/Moonglade.Data/Specifications/FeaturedPostPagingSpec.cs
@@ -2,9 +2,9 @@
 
 namespace Moonglade.Data.Specifications;
 
-public sealed class FeaturedPostSpec : Specification<PostEntity>
+public sealed class FeaturedPostPagingSpec : Specification<PostEntity>
 {
-    public FeaturedPostSpec(int pageSize, int pageIndex)
+    public FeaturedPostPagingSpec(int pageSize, int pageIndex)
     {
         Query.Where(p =>
             p.IsFeatured
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index 64e351614..277cb13e4 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -41,6 +41,14 @@ public PostByStatusSpec(PostStatus status)
     }
 }
 
+public sealed class FeaturedPostSpec : Specification<PostEntity>
+{
+    public FeaturedPostSpec()
+    {
+        Query.Where(p => p.IsFeatured && p.IsPublished && !p.IsDeleted);
+    }
+}
+
 public sealed class PostByCatSpec : Specification<PostEntity>
 {
     public PostByCatSpec(Guid? categoryId, int? top = null)

From f0bad3cad6d669b569732a18eab532b627d68cc3 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 09:34:00 +0800
Subject: [PATCH 148/227] code refact

---
 src/Moonglade.Data/MoongladeRepository.cs     | 6 ++----
 src/Moonglade.Data/Specifications/PostSpec.cs | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 1d0f1366f..39f784ca9 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -31,8 +31,6 @@ public async Task<List<TResult>> SelectAsync<TResult>(
     public async Task<List<TResult>> SelectAsync<TGroup, TResult>(
         Expression<Func<T, TGroup>> groupExpression,
         Expression<Func<IGrouping<TGroup, T>, TResult>> selector,
-        ISpecification<T> spec = null) =>
-        null != spec ?
-            await ApplySpecification(spec).AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync() :
-            await dbContext.Set<T>().AsNoTracking().GroupBy(groupExpression).Select(selector).ToListAsync();
+        ISpecification<T> spec) =>
+        await ApplySpecification(spec).GroupBy(groupExpression).Select(selector).ToListAsync();
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index 277cb13e4..50e866f77 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -38,6 +38,8 @@ public PostByStatusSpec(PostStatus status)
             default:
                 throw new ArgumentOutOfRangeException(nameof(status), status, null);
         }
+
+        Query.AsNoTracking();
     }
 }
 

From 3a996208f033a522ea9fc80d18f31cba4da72446 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 11:03:46 +0800
Subject: [PATCH 149/227] use PostEntity for Draft preview

---
 .../PostFeature/GetDraftQuery.cs              |  8 ++--
 src/Moonglade.Web/Pages/PostPreview.cshtml    |  6 +--
 src/Moonglade.Web/Pages/PostPreview.cshtml.cs |  3 +-
 src/Moonglade.Web/Pages/_PostActions.cshtml   |  1 -
 src/Moonglade.Web/Pages/_PostActions2.cshtml  | 43 +++++++++++++++++++
 5 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 src/Moonglade.Web/Pages/_PostActions2.cshtml

diff --git a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
index fe8f1a3eb..c308eacb6 100644
--- a/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetDraftQuery.cs
@@ -3,14 +3,14 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record GetDraftQuery(Guid Id) : IRequest<Post>;
+public record GetDraftQuery(Guid Id) : IRequest<PostEntity>;
 
-public class GetDraftQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetDraftQuery, Post>
+public class GetDraftQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetDraftQuery, PostEntity>
 {
-    public Task<Post> Handle(GetDraftQuery request, CancellationToken ct)
+    public Task<PostEntity> Handle(GetDraftQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Id);
-        var post = repo.FirstOrDefaultAsync(spec, Post.EntitySelector);
+        var post = repo.FirstOrDefaultAsync(spec, ct);
         return post;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/PostPreview.cshtml b/src/Moonglade.Web/Pages/PostPreview.cshtml
index ce2bc59f2..994091455 100644
--- a/src/Moonglade.Web/Pages/PostPreview.cshtml
+++ b/src/Moonglade.Web/Pages/PostPreview.cshtml
@@ -41,7 +41,7 @@
 </div>
 
 <article class="article-post-slug position-relative p-4 rounded-3 shadow-sm border bg-white mb-4" data-postid="@Model.Post.Id" lang="@Model.Post.ContentLanguageCode">
-    @if (Model.Post.Featured)
+    @if (Model.Post.IsFeatured)
     {
         <partial name="_FeaturedTag" />
     }
@@ -62,7 +62,7 @@
     }
 
     <section class="post-content clearfix">
-        <partial name="_PostContentRender" model="Model.Post.RawPostContent" />
+        <partial name="_PostContentRender" model="Model.Post.PostContent" />
     </section>
     @if (BlogConfig.ContentSettings.ShowPostFooter)
     {
@@ -71,7 +71,7 @@
         </section>
     }
 
-    <partial name="_PostActions" model="Model.Post" />
+    <partial name="_PostActions2" model="Model.Post" />
     
     @if (!string.IsNullOrWhiteSpace(Model.Post.OriginLink))
     {
diff --git a/src/Moonglade.Web/Pages/PostPreview.cshtml.cs b/src/Moonglade.Web/Pages/PostPreview.cshtml.cs
index c2ca1201a..646994499 100644
--- a/src/Moonglade.Web/Pages/PostPreview.cshtml.cs
+++ b/src/Moonglade.Web/Pages/PostPreview.cshtml.cs
@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.PostFeature;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Web.Pages;
 
 [Authorize]
 public class PostPreviewModel(IMediator mediator) : PageModel
 {
-    public Post Post { get; set; }
+    public PostEntity Post { get; set; }
 
     public async Task<IActionResult> OnGetAsync(Guid postId)
     {
diff --git a/src/Moonglade.Web/Pages/_PostActions.cshtml b/src/Moonglade.Web/Pages/_PostActions.cshtml
index 0a66cd9ce..d16504083 100644
--- a/src/Moonglade.Web/Pages/_PostActions.cshtml
+++ b/src/Moonglade.Web/Pages/_PostActions.cshtml
@@ -1,5 +1,4 @@
 @model Moonglade.Core.PostFeature.Post
-@inject IConfiguration Configuration
 
 <hr />
 <div class="row g-1 align-items-center post-slug-actions clearfix mb-2 d-print-none">
diff --git a/src/Moonglade.Web/Pages/_PostActions2.cshtml b/src/Moonglade.Web/Pages/_PostActions2.cshtml
new file mode 100644
index 000000000..e6d13f479
--- /dev/null
+++ b/src/Moonglade.Web/Pages/_PostActions2.cshtml
@@ -0,0 +1,43 @@
+@model Moonglade.Data.Entities.PostEntity
+
+<hr />
+<div class="row g-1 align-items-center post-slug-actions clearfix mb-2 d-print-none">
+    <div class="col-md">
+        <section class="post-cat-tag-info">
+            <ul class="d-flex flex-row flex-wrap list-unstyled ul-cat-list-desktop mb-0">
+                @foreach (var item in Model.PostCategory.Select(p => p.Category))
+                {
+                    <li>
+                        <a class="btn btn-sm btn-outline-secondary mb-1"
+                           asp-page="/CategoryList"
+                           asp-route-slug="@item.Slug.ToLower()">
+                            <i class="bi-folder2" aria-hidden="true"></i>
+                            @item.DisplayName
+                        </a>
+                    </li>
+                }
+
+                @foreach (var item in Model.Tags)
+                {
+                    <li>
+                        <a asp-page="/TagList"
+                           asp-route-normalizedName="@item.NormalizedName" class="btn btn-sm btn-outline-secondary mb-1">
+                            <i class="bi-tag" aria-hidden="true"></i>
+                            @item.DisplayName
+                        </a>
+                    </li>
+                }
+            </ul>
+        </section>
+    </div>
+    @if (null == ViewBag.IsDraftPreview)
+    {
+        <div class="col-auto">
+            <a href="javascript:;" class="text-muted" data-bs-toggle="modal" data-bs-target="#qrcode-window" title="Link to show QR Code for this blog post">
+                <i class="bi-qr-code-scan"></i>
+            </a>
+        </div>
+    }
+</div>
+
+<partial name="_QRCodeWindow" />
\ No newline at end of file

From 783c7db0338d18c06168abb5cefcb3716d925c90 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 11:08:21 +0800
Subject: [PATCH 150/227] use PageEntity for BlogPageModel

---
 src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs | 11 ++++-------
 src/Moonglade.Web/Pages/BlogPage.cshtml              |  6 +++---
 src/Moonglade.Web/Pages/BlogPage.cshtml.cs           |  3 ++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
index 2ac2eeb60..864761409 100644
--- a/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPageBySlugQuery.cs
@@ -3,17 +3,14 @@
 
 namespace Moonglade.Core.PageFeature;
 
-public record GetPageBySlugQuery(string Slug) : IRequest<BlogPage>;
+public record GetPageBySlugQuery(string Slug) : IRequest<PageEntity>;
 
-public class GetPageBySlugQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageBySlugQuery, BlogPage>
+public class GetPageBySlugQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageBySlugQuery, PageEntity>
 {
-    public async Task<BlogPage> Handle(GetPageBySlugQuery request, CancellationToken ct)
+    public async Task<PageEntity> Handle(GetPageBySlugQuery request, CancellationToken ct)
     {
         var lower = request.Slug.ToLower();
         var entity = await repo.FirstOrDefaultAsync(new PageBySlugSpec(lower), ct);
-        if (entity == null) return null;
-
-        var item = new BlogPage(entity);
-        return item;
+        return entity;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/BlogPage.cshtml b/src/Moonglade.Web/Pages/BlogPage.cshtml
index 35532e0b2..d84d1532a 100644
--- a/src/Moonglade.Web/Pages/BlogPage.cshtml
+++ b/src/Moonglade.Web/Pages/BlogPage.cshtml
@@ -2,11 +2,11 @@
 @model Moonglade.Web.Pages.BlogPageModel
 
 @{
-    ViewBag.TitlePrefix = Model.BlogPage.Title;
+    ViewBag.TitlePrefix = Model.BlogPage.Title.Trim();
     ViewBag.HideSideBar = Model.BlogPage.HideSidebar;
     ViewBag.DisableLightSwitch = true;
 
-    ViewBag.MetaDescription = Model.BlogPage.MetaDescription;
+    ViewBag.MetaDescription = Model.BlogPage.MetaDescription?.Trim();
 }
 
 @section head {
@@ -17,7 +17,7 @@
 }
 
 <div class="page-content">
-    @Html.Raw(Model.BlogPage.RawHtmlContent)
+    @Html.Raw(Model.BlogPage.HtmlContent)
 </div>
 
 <partial name="_PageForestageAdmin" />
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/BlogPage.cshtml.cs b/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
index 62c18a656..bda1e2b8d 100644
--- a/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
+++ b/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.PageFeature;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Web.Pages;
 
 public class BlogPageModel(IMediator mediator, ICacheAside cache, IConfiguration configuration) : PageModel
 {
-    public BlogPage BlogPage { get; set; }
+    public PageEntity BlogPage { get; set; }
 
     public async Task<IActionResult> OnGetAsync(string slug)
     {

From c013cf6e537561ac6f71b98c25fbf5374add6459 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 11:59:08 +0800
Subject: [PATCH 151/227] simplify code

---
 src/Moonglade.Core/PageFeature/BlogPage.cs    | 36 -------------------
 .../PageFeature/GetPageByIdQuery.cs           | 13 ++-----
 .../Pages/Admin/EditPage.cshtml.cs            |  2 +-
 src/Moonglade.Web/Pages/PagePreview.cshtml    |  2 +-
 src/Moonglade.Web/Pages/PagePreview.cshtml.cs |  3 +-
 5 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 src/Moonglade.Core/PageFeature/BlogPage.cs

diff --git a/src/Moonglade.Core/PageFeature/BlogPage.cs b/src/Moonglade.Core/PageFeature/BlogPage.cs
deleted file mode 100644
index 4ace8f98a..000000000
--- a/src/Moonglade.Core/PageFeature/BlogPage.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace Moonglade.Core.PageFeature;
-
-public class BlogPage
-{
-    public Guid Id { get; set; }
-    public string Title { get; set; }
-    public string Slug { get; set; }
-    public string MetaDescription { get; set; }
-    public string RawHtmlContent { get; set; }
-    public string CssId { get; set; }
-    public bool HideSidebar { get; set; }
-    public bool IsPublished { get; set; }
-    public DateTime CreateTimeUtc { get; set; }
-    public DateTime? UpdateTimeUtc { get; set; }
-
-    public BlogPage()
-    {
-
-    }
-
-    public BlogPage(PageEntity entity)
-    {
-        if (entity is null) return;
-
-        Id = entity.Id;
-        Title = entity.Title.Trim();
-        CreateTimeUtc = entity.CreateTimeUtc;
-        CssId = entity.CssId;
-        RawHtmlContent = entity.HtmlContent;
-        HideSidebar = entity.HideSidebar;
-        Slug = entity.Slug.Trim().ToLower();
-        MetaDescription = entity.MetaDescription?.Trim();
-        UpdateTimeUtc = entity.UpdateTimeUtc;
-        IsPublished = entity.IsPublished;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs b/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
index b8142fbdd..9634f30a7 100644
--- a/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
+++ b/src/Moonglade.Core/PageFeature/GetPageByIdQuery.cs
@@ -2,16 +2,9 @@
 
 namespace Moonglade.Core.PageFeature;
 
-public record GetPageByIdQuery(Guid Id) : IRequest<BlogPage>;
+public record GetPageByIdQuery(Guid Id) : IRequest<PageEntity>;
 
-public class GetPageByIdQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageByIdQuery, BlogPage>
+public class GetPageByIdQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<GetPageByIdQuery, PageEntity>
 {
-    public async Task<BlogPage> Handle(GetPageByIdQuery request, CancellationToken ct)
-    {
-        var entity = await repo.GetByIdAsync(request.Id, ct);
-        if (entity == null) return null;
-
-        var item = new BlogPage(entity);
-        return item;
-    }
+    public Task<PageEntity> Handle(GetPageByIdQuery request, CancellationToken ct) => repo.GetByIdAsync(request.Id, ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/EditPage.cshtml.cs b/src/Moonglade.Web/Pages/Admin/EditPage.cshtml.cs
index 80b57dcec..70d428d6b 100644
--- a/src/Moonglade.Web/Pages/Admin/EditPage.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/EditPage.cshtml.cs
@@ -31,7 +31,7 @@ public async Task<IActionResult> OnGetAsync(Guid? id)
             Slug = page.Slug,
             MetaDescription = page.MetaDescription,
             CssContent = css?.CssContent,
-            RawHtmlContent = page.RawHtmlContent,
+            RawHtmlContent = page.HtmlContent,
             HideSidebar = page.HideSidebar,
             IsPublished = page.IsPublished
         };
diff --git a/src/Moonglade.Web/Pages/PagePreview.cshtml b/src/Moonglade.Web/Pages/PagePreview.cshtml
index 06e684fa7..c7b52a62b 100644
--- a/src/Moonglade.Web/Pages/PagePreview.cshtml
+++ b/src/Moonglade.Web/Pages/PagePreview.cshtml
@@ -23,7 +23,7 @@
 </div>
 
 <div class="page-content">
-    @Html.Raw(Model.BlogPage.RawHtmlContent)
+    @Html.Raw(Model.BlogPage.HtmlContent)
 </div>
 
 <partial name="_PageForestageAdmin" />
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/PagePreview.cshtml.cs b/src/Moonglade.Web/Pages/PagePreview.cshtml.cs
index 2ff0975bc..242fe37bc 100644
--- a/src/Moonglade.Web/Pages/PagePreview.cshtml.cs
+++ b/src/Moonglade.Web/Pages/PagePreview.cshtml.cs
@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.PageFeature;
+using Moonglade.Data.Entities;
 
 namespace Moonglade.Web.Pages;
 
 [Authorize]
 public class PagePreviewModel(IMediator mediator) : PageModel
 {
-    public BlogPage BlogPage { get; set; }
+    public PageEntity BlogPage { get; set; }
 
     public async Task<IActionResult> OnGetAsync(Guid pageId)
     {

From 43e9571ee2db3b2f2da0000533c49f410ef0b11f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:02:58 +0800
Subject: [PATCH 152/227] Update DeletePageCommand.cs

---
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index 124937db2..16042a8fc 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -2,17 +2,14 @@
 
 namespace Moonglade.Core.PageFeature;
 
-public record DeletePageCommand(Guid Id) : IRequest;
+public record DeletePageCommand(Guid Id) : IRequest<OperationCode>;
 
-public class DeletePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<DeletePageCommand>
+public class DeletePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<DeletePageCommand, OperationCode>
 {
-    public async Task Handle(DeletePageCommand request, CancellationToken ct)
+    public async Task<OperationCode> Handle(DeletePageCommand request, CancellationToken ct)
     {
         var page = await repo.GetByIdAsync(request.Id, ct);
-        if (page is null)
-        {
-            throw new InvalidOperationException($"PageEntity with Id '{request.Id}' not found.");
-        }
+        if (page == null) return OperationCode.ObjectNotFound;
 
         if (page.CssId != null)
         {
@@ -20,5 +17,6 @@ public async Task Handle(DeletePageCommand request, CancellationToken ct)
         }
 
         await repo.DeleteAsync(page, ct);
+        return OperationCode.Done;
     }
 }
\ No newline at end of file

From 884fd723431455e8707058045203c2c15a4cfa21 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:23:48 +0800
Subject: [PATCH 153/227] remove css validation

---
 .../Controllers/PageController.cs             | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/PageController.cs b/src/Moonglade.Web/Controllers/PageController.cs
index 7f9ae5bdb..73cfa99af 100644
--- a/src/Moonglade.Web/Controllers/PageController.cs
+++ b/src/Moonglade.Web/Controllers/PageController.cs
@@ -1,6 +1,5 @@
 using Moonglade.Core.PageFeature;
 using Moonglade.Web.Attributes;
-using NUglify;
 
 namespace Moonglade.Web.Controllers;
 
@@ -12,31 +11,20 @@ public class PageController(ICacheAside cache, IMediator mediator) : Controller
     [HttpPost]
     [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.SiteMap])]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public Task<IActionResult> Create(EditPageRequest model) =>
-        CreateOrEdit(model, async request => await mediator.Send(new CreatePageCommand(request)));
+    public async Task<IActionResult> Create(EditPageRequest model)
+    {
+        var uid = await mediator.Send(new CreatePageCommand(model));
+
+        cache.Remove(BlogCachePartition.Page.ToString(), model.Slug.ToLower());
+        return Ok(new { PageId = uid });
+    }
 
     [HttpPut("{id:guid}")]
     [TypeFilter(typeof(ClearBlogCache), Arguments = [BlogCacheType.SiteMap])]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public Task<IActionResult> Edit([NotEmpty] Guid id, EditPageRequest model) =>
-        CreateOrEdit(model, async request => await mediator.Send(new UpdatePageCommand(id, request)));
-
-    private async Task<IActionResult> CreateOrEdit(EditPageRequest model, Func<EditPageRequest, Task<Guid>> pageServiceAction)
+    public async Task<IActionResult> Edit([NotEmpty] Guid id, EditPageRequest model)
     {
-        if (!string.IsNullOrWhiteSpace(model.CssContent))
-        {
-            var uglifyTest = Uglify.Css(model.CssContent);
-            if (uglifyTest.HasErrors)
-            {
-                foreach (var err in uglifyTest.Errors)
-                {
-                    ModelState.AddModelError(model.CssContent, err.ToString());
-                }
-                return BadRequest(ModelState.CombineErrorMessages());
-            }
-        }
-
-        var uid = await pageServiceAction(model);
+        var uid = await mediator.Send(new UpdatePageCommand(id, model));
 
         cache.Remove(BlogCachePartition.Page.ToString(), model.Slug.ToLower());
         return Ok(new { PageId = uid });

From 3b706d494f113ffe298a788a0f55521dac295ae0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:25:26 +0800
Subject: [PATCH 154/227] remove css validation for custom css settings

---
 src/Moonglade.Web/Controllers/SettingsController.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index 760b38399..d37067054 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -177,16 +177,6 @@ public async Task<IActionResult> CustomStyleSheet(CustomStyleSheetSettings model
             return BadRequest(ModelState.CombineErrorMessages());
         }
 
-        var uglifyTest = Uglify.Css(model.CssCode);
-        if (uglifyTest.HasErrors)
-        {
-            foreach (var err in uglifyTest.Errors)
-            {
-                ModelState.AddModelError(model.CssCode, err.ToString());
-            }
-            return BadRequest(ModelState.CombineErrorMessages());
-        }
-
         blogConfig.CustomStyleSheetSettings = model;
 
         await SaveConfigAsync(blogConfig.CustomStyleSheetSettings);

From 2d2f3be198f783c2af62870389e41fc3b79159fa Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:26:39 +0800
Subject: [PATCH 155/227] Update SettingsController.cs

---
 src/Moonglade.Web/Controllers/SettingsController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index d37067054..1d32ee2a6 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -1,7 +1,6 @@
 using Edi.PasswordGenerator;
 using Microsoft.AspNetCore.Localization;
 using Moonglade.Email.Client;
-using NUglify;
 
 namespace Moonglade.Web.Controllers;
 

From dfa1ac32f13c8c61aa16a3bd8cf893e88c8ff8db Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:26:41 +0800
Subject: [PATCH 156/227] Update StyleSheetMiddleware.cs

---
 src/Moonglade.Web/Middleware/StyleSheetMiddleware.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Web/Middleware/StyleSheetMiddleware.cs b/src/Moonglade.Web/Middleware/StyleSheetMiddleware.cs
index cd7d9da40..d85945699 100644
--- a/src/Moonglade.Web/Middleware/StyleSheetMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/StyleSheetMiddleware.cs
@@ -1,5 +1,4 @@
-using NUglify;
-using System.Web;
+using System.Web;
 
 namespace Moonglade.Web.Middleware;
 
@@ -70,16 +69,9 @@ private static async Task WriteStyleSheet(HttpContext context, string cssCode)
             return;
         }
 
-        var uglifiedCss = Uglify.Css(cssCode);
-        if (uglifiedCss.HasErrors)
-        {
-            context.Response.StatusCode = StatusCodes.Status409Conflict;
-            return;
-        }
-
         context.Response.StatusCode = StatusCodes.Status200OK;
         context.Response.ContentType = "text/css; charset=utf-8";
-        await context.Response.WriteAsync(uglifiedCss.Code, context.RequestAborted);
+        await context.Response.WriteAsync(cssCode, context.RequestAborted);
     }
 }
 

From 9d87218abdcb927859b1027cecc122594a1ad87c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:28:03 +0800
Subject: [PATCH 157/227] remove css validation for theme

---
 src/Moonglade.Web/Controllers/ThemeController.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Moonglade.Web/Controllers/ThemeController.cs b/src/Moonglade.Web/Controllers/ThemeController.cs
index 40a56c68c..4736a7c3b 100644
--- a/src/Moonglade.Web/Controllers/ThemeController.cs
+++ b/src/Moonglade.Web/Controllers/ThemeController.cs
@@ -1,5 +1,4 @@
-using NUglify;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Moonglade.Web.Controllers;
 
@@ -10,7 +9,6 @@ public class ThemeController(IMediator mediator, ICacheAside cache, IBlogConfig
     [HttpGet("/theme.css")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType<List<UglifyError>>(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> Css()
     {
         try
@@ -33,10 +31,7 @@ public async Task<IActionResult> Css()
 
             if (css == null) return NotFound();
 
-            var uCss = Uglify.Css(css);
-            if (uCss.HasErrors) return Conflict(uCss.Errors);
-
-            return Content(uCss.Code, "text/css; charset=utf-8");
+            return Content(css, "text/css; charset=utf-8");
         }
         catch (InvalidDataException e)
         {

From a96a73abd64bf2d97726a462dccd207efeb87fb0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:36:04 +0800
Subject: [PATCH 158/227] remove NUglify because it's maintainer only says "PR
 welcome"

---
 src/Moonglade.Utils/ContentProcessor.cs    | 16 +++++++++++-----
 src/Moonglade.Utils/Moonglade.Utils.csproj |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Utils/ContentProcessor.cs b/src/Moonglade.Utils/ContentProcessor.cs
index 0e30fd6cb..883184db1 100644
--- a/src/Moonglade.Utils/ContentProcessor.cs
+++ b/src/Moonglade.Utils/ContentProcessor.cs
@@ -1,6 +1,6 @@
 using Markdig;
-using NUglify;
 using System.Text.RegularExpressions;
+using System.Xml.Linq;
 
 namespace Moonglade.Utils;
 
@@ -37,11 +37,17 @@ public static string RemoveTags(string html)
             return string.Empty;
         }
 
-        var result = Uglify.HtmlToText(html);
+        try
+        {
+            var doc = XDocument.Parse(html);
+            var result = doc.Root?.DescendantNodes().OfType<XText>().Aggregate("", (current, node) => current + node);
 
-        return !result.HasErrors && !string.IsNullOrWhiteSpace(result.Code)
-            ? result.Code.Trim()
-            : RemoveTagsBackup(html);
+            return result?.Trim();
+        }
+        catch (Exception)
+        {
+            return RemoveTagsBackup(html);
+        }
     }
 
     public static string Ellipsize(this string text, int characterCount)
diff --git a/src/Moonglade.Utils/Moonglade.Utils.csproj b/src/Moonglade.Utils/Moonglade.Utils.csproj
index 9d58777a3..4fcc9def2 100644
--- a/src/Moonglade.Utils/Moonglade.Utils.csproj
+++ b/src/Moonglade.Utils/Moonglade.Utils.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NUglify" Version="1.21.7" />
     <PackageReference Include="Markdig" Version="0.37.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From c84127f0c1ae1936e26464f37dcfa8887521507c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:45:40 +0800
Subject: [PATCH 159/227] PostByIdForTitleDateSpec

---
 src/Moonglade.Comments/CreateCommentCommand.cs | 8 ++------
 src/Moonglade.Data/Specifications/PostSpec.cs  | 9 +++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index 3a5cec4bd..3d9df75ed 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -22,12 +22,8 @@ public class CreateCommentCommandHandler(
 {
     public async Task<CommentDetailedItem> Handle(CreateCommentCommand request, CancellationToken ct)
     {
-        var spec = new PostSpec(request.PostId, false);
-        var postInfo = await postRepo.FirstOrDefaultAsync(spec, p => new
-        {
-            p.Title,
-            p.PubDateUtc
-        });
+        var spec = new PostByIdForTitleDateSpec(request.PostId);
+        var postInfo = await postRepo.FirstOrDefaultAsync(spec, ct);
 
         if (blogConfig.ContentSettings.CloseCommentAfterDays > 0)
         {
diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index 50e866f77..d053b1a30 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -17,6 +17,15 @@ public PostSpec(Guid id, bool includeRelatedData = true)
     }
 }
 
+public sealed class PostByIdForTitleDateSpec : SingleResultSpecification<PostEntity, (string Title, DateTime? PubDateUtc)>
+{
+    public PostByIdForTitleDateSpec(Guid id)
+    {
+        Query.Where(p => p.Id == id);
+        Query.Select(p => new ValueTuple<string, DateTime?>(p.Title, p.PubDateUtc));
+    }
+}
+
 public sealed class PostByStatusSpec : Specification<PostEntity>
 {
     public PostByStatusSpec(PostStatus status)

From d9cc578c25770e830cf4ebb7d9fc9af0844d3cee Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:50:24 +0800
Subject: [PATCH 160/227] Update CommentController.cs

---
 src/Moonglade.Web/Controllers/CommentController.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Moonglade.Web/Controllers/CommentController.cs b/src/Moonglade.Web/Controllers/CommentController.cs
index 2f18d295e..26bbaa3bf 100644
--- a/src/Moonglade.Web/Controllers/CommentController.cs
+++ b/src/Moonglade.Web/Controllers/CommentController.cs
@@ -19,6 +19,7 @@ public class CommentController(
     [HttpPost("{postId:guid}")]
     [AllowAnonymous]
     [ServiceFilter(typeof(ValidateCaptcha))]
+    [ProducesResponseType(StatusCodes.Status201Created)]
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
@@ -78,6 +79,11 @@ await mediator.Publish(new CommentNotification(
             }
         }
 
+        if (blogConfig.ContentSettings.RequireCommentReview)
+        {
+            return Created("moonglade://empty", item);
+        }
+
         return NoContent();
     }
 

From 89a58ca6e73c61d2048295dac87a4e6ebc075b56 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 12:52:43 +0800
Subject: [PATCH 161/227] remove unnecessary condition

---
 src/Moonglade.Web/Pages/Post.cshtml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Pages/Post.cshtml.cs b/src/Moonglade.Web/Pages/Post.cshtml.cs
index 3e1c3f17b..43d76bf13 100644
--- a/src/Moonglade.Web/Pages/Post.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Post.cshtml.cs
@@ -11,7 +11,7 @@ public class PostModel(IMediator mediator) : PageModel
 
     public async Task<IActionResult> OnGetAsync(int year, int month, int day, string slug)
     {
-        if (year > DateTime.UtcNow.Year || month is < 1 or > 12 || string.IsNullOrWhiteSpace(slug)) return NotFound();
+        if (year > DateTime.UtcNow.Year || string.IsNullOrWhiteSpace(slug)) return NotFound();
 
         var slugInfo = new PostSlug(year, month, day, slug);
         var post = await mediator.Send(new GetPostBySlugQuery(slugInfo));

From 54b84c39f344815e42fd0b92b17727128fc360e4 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 13:01:32 +0800
Subject: [PATCH 162/227] PostEntity for post page

---
 src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs | 8 ++++----
 src/Moonglade.Web/Pages/Post.cshtml                  | 8 ++++----
 src/Moonglade.Web/Pages/Post.cshtml.cs               | 3 ++-
 src/Moonglade.Web/Pages/_DublinCoreMetaData.cshtml   | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index f5c2c5df2..3598ed5f0 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -6,12 +6,12 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record GetPostBySlugQuery(PostSlug Slug) : IRequest<Post>;
+public record GetPostBySlugQuery(PostSlug Slug) : IRequest<PostEntity>;
 
 public class GetPostBySlugQueryHandler(MoongladeRepository<PostEntity> repo, ICacheAside cache, IConfiguration configuration)
-    : IRequestHandler<GetPostBySlugQuery, Post>
+    : IRequestHandler<GetPostBySlugQuery, PostEntity>
 {
-    public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
+    public async Task<PostEntity> Handle(GetPostBySlugQuery request, CancellationToken ct)
     {
         var date = new DateTime(request.Slug.Year, request.Slug.Month, request.Slug.Day);
 
@@ -26,7 +26,7 @@ public async Task<Post> Handle(GetPostBySlugQuery request, CancellationToken ct)
         {
             entry.SlidingExpiration = TimeSpan.FromMinutes(int.Parse(configuration["CacheSlidingExpirationMinutes:Post"]!));
 
-            var post = await repo.FirstOrDefaultAsync(spec, Post.EntitySelector);
+            var post = await repo.FirstOrDefaultAsync(spec, ct);
             return post;
         });
 
diff --git a/src/Moonglade.Web/Pages/Post.cshtml b/src/Moonglade.Web/Pages/Post.cshtml
index bd42ab589..80ebd0320 100644
--- a/src/Moonglade.Web/Pages/Post.cshtml
+++ b/src/Moonglade.Web/Pages/Post.cshtml
@@ -14,7 +14,7 @@
     ViewBag.PostLangCode = Model.Post.ContentLanguageCode;
     ViewBag.MetaDescription = Model.Post.ContentAbstract;
 
-    @if (Model.Post.Tags.Length > 0)
+    @if (Model.Post.Tags.Any())
     {
         ViewBag.Keywords = string.Join(", ", Model.Post.Tags.Select(t => t.NormalizedName));
     }
@@ -106,7 +106,7 @@
 }
 
 <article class="article-post-slug position-relative p-4 rounded-3 shadow-sm border bg-white mb-4" data-postid="@Model.Post.Id" lang="@Model.Post.ContentLanguageCode">
-    @if (Model.Post.Featured)
+    @if (Model.Post.IsFeatured)
     {
         <partial name="_FeaturedTag" />
     }
@@ -157,7 +157,7 @@
     }
 
     <section class="post-content clearfix">
-        <partial name="_PostContentRender" model="Model.Post.RawPostContent" />
+        <partial name="_PostContentRender" model="Model.Post.PostContent" />
     </section>
 
     @if (BlogConfig.ContentSettings.ShowPostFooter)
@@ -167,7 +167,7 @@
         </section>
     }
 
-    <partial name="_PostActions" model="Model.Post" />
+    <partial name="_PostActions2" model="Model.Post" />
 
     @if (!string.IsNullOrWhiteSpace(Model.Post.OriginLink))
     {
diff --git a/src/Moonglade.Web/Pages/Post.cshtml.cs b/src/Moonglade.Web/Pages/Post.cshtml.cs
index 43d76bf13..fa978e015 100644
--- a/src/Moonglade.Web/Pages/Post.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Post.cshtml.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Moonglade.Core.PostFeature;
+using Moonglade.Data.Entities;
 using Moonglade.Pingback;
 
 namespace Moonglade.Web.Pages;
@@ -7,7 +8,7 @@ namespace Moonglade.Web.Pages;
 [AddPingbackHeader("pingback")]
 public class PostModel(IMediator mediator) : PageModel
 {
-    public Post Post { get; set; }
+    public PostEntity Post { get; set; }
 
     public async Task<IActionResult> OnGetAsync(int year, int month, int day, string slug)
     {
diff --git a/src/Moonglade.Web/Pages/_DublinCoreMetaData.cshtml b/src/Moonglade.Web/Pages/_DublinCoreMetaData.cshtml
index e0a08703d..6874cc7c9 100644
--- a/src/Moonglade.Web/Pages/_DublinCoreMetaData.cshtml
+++ b/src/Moonglade.Web/Pages/_DublinCoreMetaData.cshtml
@@ -12,7 +12,7 @@
 {
     <meta name="DC.Source" content="@Model.Post.OriginLink">
 }
-<meta name="DC.Subject" content="@string.Join(", ", Model.Post.Categories.Select(t => t.DisplayName))" />
+<meta name="DC.Subject" content="@string.Join(", ", Model.Post.PostCategory.Select(p => p.Category.DisplayName))" />
 <meta name="DC.Subject.Keyword" content="@string.Join(", ", Model.Post.Tags.Select(t => t.NormalizedName))" />
 @if (BlogConfig.GeneralSettings.DcLicenseUrl != null)
 {

From 850810a92924d4066021c0d978d08345d7bf85e5 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 13:07:32 +0800
Subject: [PATCH 163/227] remove Post DTO

---
 .../PostFeature/GetPostByIdQuery.cs           |  8 +--
 src/Moonglade.Core/PostFeature/Post.cs        | 57 -------------------
 .../Pages/Admin/EditPost.cshtml.cs            | 18 +++---
 src/Moonglade.Web/Pages/_PostActions.cshtml   | 46 ---------------
 4 files changed, 13 insertions(+), 116 deletions(-)
 delete mode 100644 src/Moonglade.Core/PostFeature/Post.cs
 delete mode 100644 src/Moonglade.Web/Pages/_PostActions.cshtml

diff --git a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
index 614712ce3..9935717cb 100644
--- a/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostByIdQuery.cs
@@ -3,14 +3,14 @@
 
 namespace Moonglade.Core.PostFeature;
 
-public record GetPostByIdQuery(Guid Id) : IRequest<Post>;
+public record GetPostByIdQuery(Guid Id) : IRequest<PostEntity>;
 
-public class GetPostByIdQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetPostByIdQuery, Post>
+public class GetPostByIdQueryHandler(MoongladeRepository<PostEntity> repo) : IRequestHandler<GetPostByIdQuery, PostEntity>
 {
-    public Task<Post> Handle(GetPostByIdQuery request, CancellationToken ct)
+    public Task<PostEntity> Handle(GetPostByIdQuery request, CancellationToken ct)
     {
         var spec = new PostSpec(request.Id);
-        var post = repo.FirstOrDefaultAsync(spec, Post.EntitySelector);
+        var post = repo.FirstOrDefaultAsync(spec, ct);
         return post;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PostFeature/Post.cs b/src/Moonglade.Core/PostFeature/Post.cs
deleted file mode 100644
index 6c50ca110..000000000
--- a/src/Moonglade.Core/PostFeature/Post.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Moonglade.Core.TagFeature;
-using System.Linq.Expressions;
-
-namespace Moonglade.Core.PostFeature;
-
-public class Post
-{
-    public Guid Id { get; set; }
-    public string Title { get; set; }
-    public string Slug { get; set; }
-    public string Author { get; set; }
-    public string RawPostContent { get; set; }
-    public bool CommentEnabled { get; set; }
-    public DateTime CreateTimeUtc { get; set; }
-    public string ContentAbstract { get; set; }
-    public bool IsPublished { get; set; }
-    public bool IsFeedIncluded { get; set; }
-    public bool Featured { get; set; }
-    public string ContentLanguageCode { get; set; }
-    public bool IsOriginal { get; set; }
-    public string OriginLink { get; set; }
-    public string HeroImageUrl { get; set; }
-    public bool IsOutdated { get; set; }
-    public Tag[] Tags { get; set; }
-    public CategoryEntity[] Categories { get; set; }
-    public DateTime? PubDateUtc { get; set; }
-    public DateTime? LastModifiedUtc { get; set; }
-
-    public static readonly Expression<Func<PostEntity, Post>> EntitySelector = p => new()
-    {
-        Id = p.Id,
-        Title = p.Title,
-        Slug = p.Slug,
-        Author = p.Author,
-        RawPostContent = p.PostContent,
-        ContentAbstract = p.ContentAbstract,
-        CommentEnabled = p.CommentEnabled,
-        CreateTimeUtc = p.CreateTimeUtc,
-        PubDateUtc = p.PubDateUtc,
-        LastModifiedUtc = p.LastModifiedUtc,
-        IsPublished = p.IsPublished,
-        IsFeedIncluded = p.IsFeedIncluded,
-        Featured = p.IsFeatured,
-        IsOriginal = p.IsOriginal,
-        OriginLink = p.OriginLink,
-        HeroImageUrl = p.HeroImageUrl,
-        IsOutdated = p.IsOutdated,
-        ContentLanguageCode = p.ContentLanguageCode,
-        Tags = p.Tags.Select(pt => new Tag
-        {
-            Id = pt.Id,
-            NormalizedName = pt.NormalizedName,
-            DisplayName = pt.DisplayName
-        }).ToArray(),
-        Categories = p.PostCategory.Select(pc => pc.Category).ToArray()
-    };
-}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml.cs b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml.cs
index 4af01b6ca..c3b49c3ac 100644
--- a/src/Moonglade.Web/Pages/Admin/EditPost.cshtml.cs
+++ b/src/Moonglade.Web/Pages/Admin/EditPost.cshtml.cs
@@ -19,12 +19,13 @@ public class EditPostModel(IMediator mediator, ITimeZoneResolver timeZoneResolve
 
     public async Task<IActionResult> OnGetAsync(Guid? id)
     {
+        var cats = await mediator.Send(new GetCategoriesQuery());
+
         if (id is null)
         {
-            var cats1 = await mediator.Send(new GetCategoriesQuery());
-            if (cats1.Count > 0)
+            if (cats.Count > 0)
             {
-                var cbCatList = cats1.Select(p =>
+                var cbCatList = cats.Select(p =>
                     new CategoryCheckBox
                     {
                         Id = p.Id,
@@ -47,7 +48,7 @@ public async Task<IActionResult> OnGetAsync(Guid? id)
         {
             PostId = post.Id,
             IsPublished = post.IsPublished,
-            EditorContent = post.RawPostContent,
+            EditorContent = post.PostContent,
             Author = post.Author,
             Slug = post.Slug,
             Title = post.Title,
@@ -55,7 +56,7 @@ public async Task<IActionResult> OnGetAsync(Guid? id)
             FeedIncluded = post.IsFeedIncluded,
             LanguageCode = post.ContentLanguageCode,
             Abstract = post.ContentAbstract.Replace("\u00A0\u2026", string.Empty),
-            Featured = post.Featured,
+            Featured = post.IsFeatured,
             OriginLink = post.OriginLink,
             HeroImageUrl = post.HeroImageUrl,
             IsOutdated = post.IsOutdated
@@ -73,15 +74,14 @@ public async Task<IActionResult> OnGetAsync(Guid? id)
         tagStr = tagStr.TrimEnd(',');
         ViewModel.Tags = tagStr;
 
-        var cats2 = await mediator.Send(new GetCategoriesQuery());
-        if (cats2.Count > 0)
+        if (cats.Count > 0)
         {
-            var cbCatList = cats2.Select(p =>
+            var cbCatList = cats.Select(p =>
                 new CategoryCheckBox
                 {
                     Id = p.Id,
                     DisplayText = p.DisplayName,
-                    IsChecked = post.Categories.Any(q => q.Id == p.Id)
+                    IsChecked = post.PostCategory.Any(q => q.CategoryId == p.Id)
                 });
             CategoryList = cbCatList.ToList();
         }
diff --git a/src/Moonglade.Web/Pages/_PostActions.cshtml b/src/Moonglade.Web/Pages/_PostActions.cshtml
deleted file mode 100644
index d16504083..000000000
--- a/src/Moonglade.Web/Pages/_PostActions.cshtml
+++ /dev/null
@@ -1,46 +0,0 @@
-@model Moonglade.Core.PostFeature.Post
-
-<hr />
-<div class="row g-1 align-items-center post-slug-actions clearfix mb-2 d-print-none">
-    <div class="col-md">
-        <section class="post-cat-tag-info">
-            <ul class="d-flex flex-row flex-wrap list-unstyled ul-cat-list-desktop mb-0">
-                @foreach (var item in Model.Categories)
-                {
-                    <li>
-                        <a class="btn btn-sm btn-outline-secondary mb-1"
-                           asp-page="/CategoryList"
-                           asp-route-slug="@item.Slug.ToLower()">
-                            <i class="bi-folder2" aria-hidden="true"></i>
-                            @item.DisplayName
-                        </a>
-                    </li>
-                }
-
-                @if (Model.Tags.Length > 0)
-                {
-                    @foreach (var item in Model.Tags)
-                    {
-                        <li>
-                            <a asp-page="/TagList"
-                               asp-route-normalizedName="@item.NormalizedName" class="btn btn-sm btn-outline-secondary mb-1">
-                                <i class="bi-tag" aria-hidden="true"></i>
-                                @item.DisplayName
-                            </a>
-                        </li>
-                    }
-                }
-            </ul>
-        </section>
-    </div>
-    @if (null == ViewBag.IsDraftPreview)
-    {
-        <div class="col-auto">
-            <a href="javascript:;" class="text-muted" data-bs-toggle="modal" data-bs-target="#qrcode-window" title="Link to show QR Code for this blog post">
-                <i class="bi-qr-code-scan"></i>
-            </a>
-        </div>
-    }
-</div>
-
-<partial name="_QRCodeWindow" />
\ No newline at end of file

From 1bf07b9e54efdcc751e49e27ede16b7a902f5c94 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 13:15:02 +0800
Subject: [PATCH 164/227] use TagEntity

---
 src/Moonglade.Core/TagFeature/GetTagQuery.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetTagQuery.cs b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
index db6f93426..03b9df209 100644
--- a/src/Moonglade.Core/TagFeature/GetTagQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagQuery.cs
@@ -3,10 +3,10 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagQuery(string NormalizedName) : IRequest<Tag>;
+public record GetTagQuery(string NormalizedName) : IRequest<TagEntity>;
 
-public class GetTagQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagQuery, Tag>
+public class GetTagQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagQuery, TagEntity>
 {
-    public Task<Tag> Handle(GetTagQuery request, CancellationToken ct) =>
-        repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(request.NormalizedName), Tag.EntitySelector);
+    public Task<TagEntity> Handle(GetTagQuery request, CancellationToken ct) =>
+        repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(request.NormalizedName), ct);
 }
\ No newline at end of file

From 673e686ce1b6291af0037522b6ad3e60f0b3441d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 13:17:10 +0800
Subject: [PATCH 165/227] code refact

---
 src/Moonglade.Data/BlogDbContext.cs      |  1 -
 src/Moonglade.Data/Entities/TagEntity.cs | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Moonglade.Data/BlogDbContext.cs b/src/Moonglade.Data/BlogDbContext.cs
index b6748f778..28a6bbac7 100644
--- a/src/Moonglade.Data/BlogDbContext.cs
+++ b/src/Moonglade.Data/BlogDbContext.cs
@@ -33,7 +33,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         // base.OnModelCreating(modelBuilder);
         modelBuilder.ApplyConfiguration(new CategoryConfiguration());
-        modelBuilder.ApplyConfiguration(new TagConfiguration());
         modelBuilder.ApplyConfiguration(new FriendLinkConfiguration());
 
         modelBuilder
diff --git a/src/Moonglade.Data/Entities/TagEntity.cs b/src/Moonglade.Data/Entities/TagEntity.cs
index 3ca803647..b60241091 100644
--- a/src/Moonglade.Data/Entities/TagEntity.cs
+++ b/src/Moonglade.Data/Entities/TagEntity.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 
 namespace Moonglade.Data.Entities;
 
@@ -10,17 +11,13 @@ public TagEntity()
     }
 
     public int Id { get; set; }
+
+    [MaxLength(32)]
     public string DisplayName { get; set; }
+
+    [MaxLength(32)]
     public string NormalizedName { get; set; }
 
+    [JsonIgnore]
     public virtual ICollection<PostEntity> Posts { get; set; }
-}
-
-internal class TagConfiguration : IEntityTypeConfiguration<TagEntity>
-{
-    public void Configure(EntityTypeBuilder<TagEntity> builder)
-    {
-        builder.Property(e => e.DisplayName).HasMaxLength(32);
-        builder.Property(e => e.NormalizedName).HasMaxLength(32);
-    }
 }
\ No newline at end of file

From 254011e391a46063655df508d9859b69ea9f81aa Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 13:19:15 +0800
Subject: [PATCH 166/227] use TagEntity

---
 src/Moonglade.Core/TagFeature/GetTagsQuery.cs   | 6 +++---
 src/Moonglade.Core/TagFeature/Tag.cs            | 7 -------
 src/Moonglade.Web/Controllers/TagsController.cs | 3 ++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
index 6ab510598..ab8278cf7 100644
--- a/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagsQuery.cs
@@ -2,9 +2,9 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagsQuery : IRequest<List<Tag>>;
+public record GetTagsQuery : IRequest<List<TagEntity>>;
 
-public class GetTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, List<Tag>>
+public class GetTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagsQuery, List<TagEntity>>
 {
-    public Task<List<Tag>> Handle(GetTagsQuery request, CancellationToken ct) => repo.SelectAsync(Tag.EntitySelector, ct);
+    public Task<List<TagEntity>> Handle(GetTagsQuery request, CancellationToken ct) => repo.ListAsync(ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/Tag.cs b/src/Moonglade.Core/TagFeature/Tag.cs
index 55f1c6d86..20a513ca1 100644
--- a/src/Moonglade.Core/TagFeature/Tag.cs
+++ b/src/Moonglade.Core/TagFeature/Tag.cs
@@ -11,13 +11,6 @@ public class Tag
 
     public string NormalizedName { get; set; }
 
-    public static readonly Expression<Func<TagEntity, Tag>> EntitySelector = t => new()
-    {
-        Id = t.Id,
-        NormalizedName = t.NormalizedName,
-        DisplayName = t.DisplayName
-    };
-
     public static bool ValidateName(string tagDisplayName)
     {
         if (string.IsNullOrWhiteSpace(tagDisplayName)) return false;
diff --git a/src/Moonglade.Web/Controllers/TagsController.cs b/src/Moonglade.Web/Controllers/TagsController.cs
index d8e5b42d8..2e5f1b12f 100644
--- a/src/Moonglade.Web/Controllers/TagsController.cs
+++ b/src/Moonglade.Web/Controllers/TagsController.cs
@@ -1,4 +1,5 @@
 using Moonglade.Core.TagFeature;
+using Moonglade.Data.Entities;
 using System.ComponentModel.DataAnnotations;
 
 namespace Moonglade.Web.Controllers;
@@ -17,7 +18,7 @@ public async Task<IActionResult> Names()
     }
 
     [HttpGet("list")]
-    [ProducesResponseType<List<Tag>>(StatusCodes.Status200OK)]
+    [ProducesResponseType<List<TagEntity>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List()
     {
         var list = await mediator.Send(new GetTagsQuery());

From 3955b7ba8548b7245b9509962be066dc7f955d44 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:04:49 +0800
Subject: [PATCH 167/227] use TagEntity

---
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs    | 13 ++++---------
 .../Pages/Components/Tags/Default.cshtml            |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index cd03129df..f1edaf5e4 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -3,22 +3,17 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetHotTagsQuery(int Top) : IRequest<List<KeyValuePair<Tag, int>>>;
+public record GetHotTagsQuery(int Top) : IRequest<List<KeyValuePair<TagEntity, int>>>;
 
-public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<Tag, int>>>
+public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<TagEntity, int>>>
 {
-    public async Task<List<KeyValuePair<Tag, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
+    public async Task<List<KeyValuePair<TagEntity, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
         if (!await repo.AnyAsync(ct)) return [];
 
         var spec = new TagSpec(request.Top);
         var tags = await repo.SelectAsync(spec, t =>
-            new KeyValuePair<Tag, int>(new()
-            {
-                Id = t.Id,
-                DisplayName = t.DisplayName,
-                NormalizedName = t.NormalizedName
-            }, t.Posts.Count), ct);
+            new KeyValuePair<TagEntity, int>(t, t.Posts.Count), ct);
 
         return tags;
     }
diff --git a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
index 3ff8fd486..84f6e14e9 100644
--- a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
@@ -1,4 +1,4 @@
-@model List<KeyValuePair<Moonglade.Core.TagFeature.Tag, int>>
+@model List<KeyValuePair<Moonglade.Data.Entities.TagEntity, int>>
 
 @if (Model.Any())
 {

From 1d1c99ab2aa1bb47592b808371b528f1a4fb0687 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:09:30 +0800
Subject: [PATCH 168/227] HotTagSpec

---
 src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs      | 11 +++++------
 .../Specifications/{TagSpec.cs => HotTagSpec.cs}      |  6 ++++--
 .../Pages/Components/Tags/Default.cshtml              | 10 +++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename src/Moonglade.Data/Specifications/{TagSpec.cs => HotTagSpec.cs} (79%)

diff --git a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
index f1edaf5e4..203300078 100644
--- a/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetHotTagsQuery.cs
@@ -3,17 +3,16 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetHotTagsQuery(int Top) : IRequest<List<KeyValuePair<TagEntity, int>>>;
+public record GetHotTagsQuery(int Top) : IRequest<List<(TagEntity Tag, int PostCount)>>;
 
-public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<KeyValuePair<TagEntity, int>>>
+public class GetHotTagsQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetHotTagsQuery, List<(TagEntity Tag, int PostCount)>>
 {
-    public async Task<List<KeyValuePair<TagEntity, int>>> Handle(GetHotTagsQuery request, CancellationToken ct)
+    public async Task<List<(TagEntity Tag, int PostCount)>> Handle(GetHotTagsQuery request, CancellationToken ct)
     {
         if (!await repo.AnyAsync(ct)) return [];
 
-        var spec = new TagSpec(request.Top);
-        var tags = await repo.SelectAsync(spec, t =>
-            new KeyValuePair<TagEntity, int>(t, t.Posts.Count), ct);
+        var spec = new HotTagSpec(request.Top);
+        var tags = await repo.ListAsync(spec, ct);
 
         return tags;
     }
diff --git a/src/Moonglade.Data/Specifications/TagSpec.cs b/src/Moonglade.Data/Specifications/HotTagSpec.cs
similarity index 79%
rename from src/Moonglade.Data/Specifications/TagSpec.cs
rename to src/Moonglade.Data/Specifications/HotTagSpec.cs
index 2ae7b325b..807957080 100644
--- a/src/Moonglade.Data/Specifications/TagSpec.cs
+++ b/src/Moonglade.Data/Specifications/HotTagSpec.cs
@@ -2,12 +2,14 @@
 
 namespace Moonglade.Data.Specifications;
 
-public sealed class TagSpec : Specification<TagEntity>
+public sealed class HotTagSpec : Specification<TagEntity, (TagEntity Tag, int PostCount)>
 {
-    public TagSpec(int top)
+    public HotTagSpec(int top)
     {
         Query.Skip(0).Take(top);
         Query.OrderByDescending(p => p.Posts.Count);
+
+        Query.Select(t => new ValueTuple<TagEntity, int>(t, t.Posts.Count));
     }
 }
 
diff --git a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
index 84f6e14e9..dae45ab71 100644
--- a/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
+++ b/src/Moonglade.Web/Pages/Components/Tags/Default.cshtml
@@ -1,14 +1,14 @@
-@model List<KeyValuePair<Moonglade.Data.Entities.TagEntity, int>>
+@model List<(Moonglade.Data.Entities.TagEntity Tag, int PostCount)>
 
 @if (Model.Any())
 {
-    foreach (var (key, value) in Model)
+    foreach (var (tag, count) in Model)
     {
         <a asp-page="/TagList"
-           asp-route-normalizedName="@key.NormalizedName"
-           rel="@value"
+           asp-route-normalizedName="@tag.NormalizedName"
+           rel="@count"
            class="d-inline-block btn btn-sm btn-accent mb-2 me-1">
-            @key.DisplayName
+            @tag.DisplayName
         </a>
     }
 }
\ No newline at end of file

From 6abc6590f43ec1caf1b72dc66ddaf1570480e9f3 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:10:14 +0800
Subject: [PATCH 169/227] split files

---
 src/Moonglade.Core/TagFeature/Tag.cs          |  3 +--
 .../Specifications/HotTagSpec.cs              | 24 -------------------
 .../Specifications/TagByDisplayNameSpec.cs    | 11 +++++++++
 .../Specifications/TagByNormalizedNameSpec.cs | 11 +++++++++
 .../Specifications/TagDisplayNameNameSpec.cs  | 11 +++++++++
 5 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/TagByDisplayNameSpec.cs
 create mode 100644 src/Moonglade.Data/Specifications/TagByNormalizedNameSpec.cs
 create mode 100644 src/Moonglade.Data/Specifications/TagDisplayNameNameSpec.cs

diff --git a/src/Moonglade.Core/TagFeature/Tag.cs b/src/Moonglade.Core/TagFeature/Tag.cs
index 20a513ca1..a75e4690d 100644
--- a/src/Moonglade.Core/TagFeature/Tag.cs
+++ b/src/Moonglade.Core/TagFeature/Tag.cs
@@ -1,5 +1,4 @@
-using System.Linq.Expressions;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace Moonglade.Core.TagFeature;
 
diff --git a/src/Moonglade.Data/Specifications/HotTagSpec.cs b/src/Moonglade.Data/Specifications/HotTagSpec.cs
index 807957080..cb2dd4338 100644
--- a/src/Moonglade.Data/Specifications/HotTagSpec.cs
+++ b/src/Moonglade.Data/Specifications/HotTagSpec.cs
@@ -11,28 +11,4 @@ public HotTagSpec(int top)
 
         Query.Select(t => new ValueTuple<TagEntity, int>(t, t.Posts.Count));
     }
-}
-
-public sealed class TagByNormalizedNameSpec : SingleResultSpecification<TagEntity>
-{
-    public TagByNormalizedNameSpec(string normalizedName)
-    {
-        Query.Where(t => t.NormalizedName == normalizedName);
-    }
-}
-
-public sealed class TagByDisplayNameSpec : SingleResultSpecification<TagEntity>
-{
-    public TagByDisplayNameSpec(string displayName)
-    {
-        Query.Where(t => t.DisplayName == displayName);
-    }
-}
-
-public sealed class TagDisplayNameNameSpec : Specification<TagEntity, string>
-{
-    public TagDisplayNameNameSpec()
-    {
-        Query.Select(t => t.DisplayName);
-    }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/TagByDisplayNameSpec.cs b/src/Moonglade.Data/Specifications/TagByDisplayNameSpec.cs
new file mode 100644
index 000000000..b5c4cec15
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/TagByDisplayNameSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class TagByDisplayNameSpec : SingleResultSpecification<TagEntity>
+{
+    public TagByDisplayNameSpec(string displayName)
+    {
+        Query.Where(t => t.DisplayName == displayName);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/TagByNormalizedNameSpec.cs b/src/Moonglade.Data/Specifications/TagByNormalizedNameSpec.cs
new file mode 100644
index 000000000..743de96a9
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/TagByNormalizedNameSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class TagByNormalizedNameSpec : SingleResultSpecification<TagEntity>
+{
+    public TagByNormalizedNameSpec(string normalizedName)
+    {
+        Query.Where(t => t.NormalizedName == normalizedName);
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/TagDisplayNameNameSpec.cs b/src/Moonglade.Data/Specifications/TagDisplayNameNameSpec.cs
new file mode 100644
index 000000000..543ae6262
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/TagDisplayNameNameSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class TagDisplayNameNameSpec : Specification<TagEntity, string>
+{
+    public TagDisplayNameNameSpec()
+    {
+        Query.Select(t => t.DisplayName);
+    }
+}
\ No newline at end of file

From 312aa43c5ac42c49e2c986796a93afe23d5a1bf2 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:11:37 +0800
Subject: [PATCH 170/227] Update GetTagCountListQuery.cs

---
 .../TagFeature/GetTagCountListQuery.cs              | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
index 5ec83a3f9..34f108656 100644
--- a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
@@ -2,16 +2,11 @@
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagCountListQuery : IRequest<List<KeyValuePair<Tag, int>>>;
+public record GetTagCountListQuery : IRequest<List<KeyValuePair<TagEntity, int>>>;
 
-public class GetTagCountListQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<Tag, int>>>
+public class GetTagCountListQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<TagEntity, int>>>
 {
-    public Task<List<KeyValuePair<Tag, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
+    public Task<List<KeyValuePair<TagEntity, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
         repo.SelectAsync(t =>
-            new KeyValuePair<Tag, int>(new()
-            {
-                Id = t.Id,
-                DisplayName = t.DisplayName,
-                NormalizedName = t.NormalizedName
-            }, t.Posts.Count), ct);
+            new KeyValuePair<TagEntity, int>(t, t.Posts.Count), ct);
 }
\ No newline at end of file

From f8782df62b4af25d5f74bdfee3cb0361246bb357 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:11:51 +0800
Subject: [PATCH 171/227] Update Tag.cs

---
 src/Moonglade.Core/TagFeature/Tag.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/Tag.cs b/src/Moonglade.Core/TagFeature/Tag.cs
index a75e4690d..7a1a049e3 100644
--- a/src/Moonglade.Core/TagFeature/Tag.cs
+++ b/src/Moonglade.Core/TagFeature/Tag.cs
@@ -4,8 +4,6 @@ namespace Moonglade.Core.TagFeature;
 
 public class Tag
 {
-    public int Id { get; set; }
-
     public string DisplayName { get; set; }
 
     public string NormalizedName { get; set; }

From 34501379df7db5ed489b3470035ffb2e9e9957de Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:17:00 +0800
Subject: [PATCH 172/227] TagCloudSpec

---
 .../TagFeature/GetTagCountListQuery.cs               | 10 +++++-----
 src/Moonglade.Data/Specifications/TagCloudSpec.cs    | 11 +++++++++++
 src/Moonglade.Web/Pages/Tags.cshtml                  | 12 ++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/TagCloudSpec.cs

diff --git a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
index 34f108656..d0a47e6b2 100644
--- a/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
+++ b/src/Moonglade.Core/TagFeature/GetTagCountListQuery.cs
@@ -1,12 +1,12 @@
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
 
-public record GetTagCountListQuery : IRequest<List<KeyValuePair<TagEntity, int>>>;
+public record GetTagCountListQuery : IRequest<List<(TagEntity Tag, int PostCount)>>;
 
-public class GetTagCountListQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<KeyValuePair<TagEntity, int>>>
+public class GetTagCountListQueryHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<GetTagCountListQuery, List<(TagEntity Tag, int PostCount)>>
 {
-    public Task<List<KeyValuePair<TagEntity, int>>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
-        repo.SelectAsync(t =>
-            new KeyValuePair<TagEntity, int>(t, t.Posts.Count), ct);
+    public Task<List<(TagEntity Tag, int PostCount)>> Handle(GetTagCountListQuery request, CancellationToken ct) =>
+        repo.ListAsync(new TagCloudSpec(), ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/TagCloudSpec.cs b/src/Moonglade.Data/Specifications/TagCloudSpec.cs
new file mode 100644
index 000000000..9b6d89bc6
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/TagCloudSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class TagCloudSpec : Specification<TagEntity, (TagEntity Tag, int PostCount)>
+{
+    public TagCloudSpec()
+    {
+        Query.Select(t => new ValueTuple<TagEntity, int>(t, t.Posts.Count));
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Tags.cshtml b/src/Moonglade.Web/Pages/Tags.cshtml
index 479694fec..8b5c8ee6b 100644
--- a/src/Moonglade.Web/Pages/Tags.cshtml
+++ b/src/Moonglade.Web/Pages/Tags.cshtml
@@ -49,21 +49,21 @@
 
 @if (tags.Any())
 {
-    var tagMax = tags.Select(p => p.Value).Max();
+    var tagMax = tags.Select(p => p.PostCount).Max();
 
     <input id="tagFilter" type="text" class="form-control mb-3" maxlength="32" placeholder="Filter..">
 
     <ul class="list-unstyled ul-tags">
-        @foreach (var tag in tags.OrderBy(t => t.Key.DisplayName))
+        @foreach (var tag in tags.OrderBy(t => t.Tag.DisplayName))
         {
-            var weightPercent = tag.Value * 1.0 / tagMax * 100;
+            var weightPercent = tag.PostCount * 1.0 / tagMax * 100;
             var weight = Weight(weightPercent);
 
             <li class="d-inline-block mb-2 me-2">
                 <a asp-page="/TagList"
-                   asp-route-normalizedName="@HttpUtility.UrlDecode(tag.Key.NormalizedName.ToLower())"
-                   class="btn btn-sm btn-@weight" title="@(tag.Value)">
-                    @tag.Key.DisplayName.Replace("-", " ")
+                   asp-route-normalizedName="@HttpUtility.UrlDecode(tag.Tag.NormalizedName.ToLower())"
+                   class="btn btn-sm btn-@weight" title="@(tag.PostCount)">
+                    @tag.Tag.DisplayName.Replace("-", " ")
                 </a>
             </li>
         }

From e637a38e0182fcb04d92967d2550c2b755b554cc Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:20:40 +0800
Subject: [PATCH 173/227] refact ValidateName

---
 .../PostFeature/CreatePostCommand.cs          |  2 +-
 .../PostFeature/UpdatePostCommand.cs          |  2 +-
 src/Moonglade.Core/TagFeature/Tag.cs          | 18 ------------
 src/Moonglade.Utils/Helper.cs                 | 29 +++++++++----------
 .../Controllers/TagsController.cs             |  2 +-
 5 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 8040e0196..32da6f445 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -84,7 +84,7 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
         {
             foreach (var item in tags)
             {
-                if (!Tag.ValidateName(item)) continue;
+                if (!Helper.IsValidTagName(item)) continue;
 
                 var tag = await tagRepo.FirstOrDefaultAsync(new TagByDisplayNameSpec(item), ct) ?? await CreateTag(item);
                 post.Tags.Add(tag);
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index bc5e9b467..0778289c6 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -117,7 +117,7 @@ await _tagRepo.AddAsync(new()
         {
             foreach (var tagName in tags)
             {
-                if (!Tag.ValidateName(tagName))
+                if (!Helper.IsValidTagName(tagName))
                 {
                     continue;
                 }
diff --git a/src/Moonglade.Core/TagFeature/Tag.cs b/src/Moonglade.Core/TagFeature/Tag.cs
index 7a1a049e3..1bc5076d3 100644
--- a/src/Moonglade.Core/TagFeature/Tag.cs
+++ b/src/Moonglade.Core/TagFeature/Tag.cs
@@ -8,24 +8,6 @@ public class Tag
 
     public string NormalizedName { get; set; }
 
-    public static bool ValidateName(string tagDisplayName)
-    {
-        if (string.IsNullOrWhiteSpace(tagDisplayName)) return false;
-
-        // Regex performance best practice
-        // See https://docs.microsoft.com/en-us/dotnet/standard/base-types/best-practices
-
-        const string pattern = @"^[a-zA-Z 0-9\.\-\+\#\s]*$";
-        var isEng = Regex.IsMatch(tagDisplayName, pattern);
-        if (isEng) return true;
-
-        // https://docs.microsoft.com/en-us/dotnet/standard/base-types/character-classes-in-regular-expressions#supported-named-blocks
-        const string chsPattern = @"\p{IsCJKUnifiedIdeographs}";
-        var isChs = Regex.IsMatch(tagDisplayName, chsPattern);
-
-        return isChs;
-    }
-
     public static string NormalizeName(string orgTagName, IDictionary<string, string> normalizations)
     {
         var isEnglishName = Regex.IsMatch(orgTagName, @"^[a-zA-Z 0-9\.\-\+\#\s]*$");
diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index a28b86a4a..e3c58682e 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -349,23 +349,22 @@ private static Regex CreateEmailRegEx()
         return new(pattern, options);
     }
 
-    public static string GenerateSlug(this string phrase)
+    public static bool IsValidTagName(string tagDisplayName)
     {
-        string str = phrase.RemoveAccent().ToLower();
-        // invalid chars           
-        str = Regex.Replace(str, @"[^a-z0-9\s-]", "");
-        // convert multiple spaces into one space   
-        str = Regex.Replace(str, @"\s+", " ").Trim();
-        // cut and trim 
-        str = str[..(str.Length <= 45 ? str.Length : 45)].Trim();
-        str = Regex.Replace(str, @"\s", "-"); // hyphens   
-        return str;
-    }
+        if (string.IsNullOrWhiteSpace(tagDisplayName)) return false;
 
-    public static string RemoveAccent(this string txt)
-    {
-        byte[] bytes = Encoding.GetEncoding("Cyrillic").GetBytes(txt);
-        return Encoding.ASCII.GetString(bytes);
+        // Regex performance best practice
+        // See https://docs.microsoft.com/en-us/dotnet/standard/base-types/best-practices
+
+        const string pattern = @"^[a-zA-Z 0-9\.\-\+\#\s]*$";
+        var isEng = Regex.IsMatch(tagDisplayName, pattern);
+        if (isEng) return true;
+
+        // https://docs.microsoft.com/en-us/dotnet/standard/base-types/character-classes-in-regular-expressions#supported-named-blocks
+        const string chsPattern = @"\p{IsCJKUnifiedIdeographs}";
+        var isChs = Regex.IsMatch(tagDisplayName, chsPattern);
+
+        return isChs;
     }
 
     public static string CombineErrorMessages(this ModelStateDictionary modelStateDictionary, string sep = ", ")
diff --git a/src/Moonglade.Web/Controllers/TagsController.cs b/src/Moonglade.Web/Controllers/TagsController.cs
index 2e5f1b12f..b1a5a1437 100644
--- a/src/Moonglade.Web/Controllers/TagsController.cs
+++ b/src/Moonglade.Web/Controllers/TagsController.cs
@@ -31,7 +31,7 @@ public async Task<IActionResult> List()
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> Create([Required][FromBody] string name)
     {
-        if (!Tag.ValidateName(name)) return Conflict();
+        if (!Helper.IsValidTagName(name)) return Conflict();
 
         await mediator.Send(new CreateTagCommand(name.Trim()));
         return Ok();

From ebcb3eb26578558ef81c9e4c784eca8f52a9c834 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:22:26 +0800
Subject: [PATCH 174/227] move NormalizeName method

---
 .../PostFeature/CreatePostCommand.cs          |  2 +-
 .../PostFeature/UpdatePostCommand.cs          |  2 +-
 .../TagFeature/CreateTagCommand.cs            |  2 +-
 src/Moonglade.Core/TagFeature/Tag.cs          | 30 +------------------
 .../TagFeature/UpdateTagCommand.cs            |  2 +-
 src/Moonglade.Utils/Helper.cs                 | 26 ++++++++++++++++
 6 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 32da6f445..b39b2e2c0 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -101,7 +101,7 @@ private async Task<TagEntity> CreateTag(string item)
         var newTag = new TagEntity
         {
             DisplayName = item,
-            NormalizedName = Tag.NormalizeName(item, Helper.TagNormalizationDictionary)
+            NormalizedName = Helper.NormalizeName(item, Helper.TagNormalizationDictionary)
         };
 
         var tag = await tagRepo.AddAsync(newTag);
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 0778289c6..3b7634c80 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -100,7 +100,7 @@ public async Task<PostEntity> Handle(UpdatePostCommand request, CancellationToke
                 await _tagRepo.AddAsync(new()
                 {
                     DisplayName = item,
-                    NormalizedName = Tag.NormalizeName(item, Helper.TagNormalizationDictionary)
+                    NormalizedName = Helper.NormalizeName(item, Helper.TagNormalizationDictionary)
                 }, ct);
             }
         }
diff --git a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
index ca95281c7..7403df2ff 100644
--- a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
@@ -10,7 +10,7 @@ public class CreateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IReq
 {
     public async Task Handle(CreateTagCommand request, CancellationToken ct)
     {
-        var normalizedName = Tag.NormalizeName(request.Name, Helper.TagNormalizationDictionary);
+        var normalizedName = Helper.NormalizeName(request.Name, Helper.TagNormalizationDictionary);
 
         var existingTag = await repo.FirstOrDefaultAsync(new TagByNormalizedNameSpec(normalizedName), ct);
         if (null != existingTag) return;
diff --git a/src/Moonglade.Core/TagFeature/Tag.cs b/src/Moonglade.Core/TagFeature/Tag.cs
index 1bc5076d3..574d49555 100644
--- a/src/Moonglade.Core/TagFeature/Tag.cs
+++ b/src/Moonglade.Core/TagFeature/Tag.cs
@@ -1,36 +1,8 @@
-using System.Text.RegularExpressions;
-
-namespace Moonglade.Core.TagFeature;
+namespace Moonglade.Core.TagFeature;
 
 public class Tag
 {
     public string DisplayName { get; set; }
 
     public string NormalizedName { get; set; }
-
-    public static string NormalizeName(string orgTagName, IDictionary<string, string> normalizations)
-    {
-        var isEnglishName = Regex.IsMatch(orgTagName, @"^[a-zA-Z 0-9\.\-\+\#\s]*$");
-        if (isEnglishName)
-        {
-            // special case
-            if (orgTagName.Equals(".net", StringComparison.OrdinalIgnoreCase))
-            {
-                return "dot-net";
-            }
-
-            var result = new StringBuilder(orgTagName);
-            foreach (var (key, value) in normalizations)
-            {
-                result.Replace(key, value);
-            }
-            return result.ToString().ToLower();
-        }
-
-        var bytes = Encoding.Unicode.GetBytes(orgTagName);
-        var hexArray = bytes.Select(b => $"{b:x2}");
-        var hexName = string.Join('-', hexArray);
-
-        return hexName;
-    }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
index 7880a5a8f..3cd60caa9 100644
--- a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
@@ -14,7 +14,7 @@ public async Task<OperationCode> Handle(UpdateTagCommand request, CancellationTo
         if (null == tag) return OperationCode.ObjectNotFound;
 
         tag.DisplayName = name;
-        tag.NormalizedName = Tag.NormalizeName(name, Helper.TagNormalizationDictionary);
+        tag.NormalizedName = Helper.NormalizeName(name, Helper.TagNormalizationDictionary);
         await repo.UpdateAsync(tag, ct);
 
         return OperationCode.Done;
diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index e3c58682e..9248e2b46 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -407,6 +407,32 @@ public static void ValidatePagingParameters(int pageSize, int pageIndex)
         { "+", "-plus" }
     };
 
+    public static string NormalizeName(string orgTagName, IDictionary<string, string> normalizations)
+    {
+        var isEnglishName = Regex.IsMatch(orgTagName, @"^[a-zA-Z 0-9\.\-\+\#\s]*$");
+        if (isEnglishName)
+        {
+            // special case
+            if (orgTagName.Equals(".net", StringComparison.OrdinalIgnoreCase))
+            {
+                return "dot-net";
+            }
+
+            var result = new StringBuilder(orgTagName);
+            foreach (var (key, value) in normalizations)
+            {
+                result.Replace(key, value);
+            }
+            return result.ToString().ToLower();
+        }
+
+        var bytes = Encoding.Unicode.GetBytes(orgTagName);
+        var hexArray = bytes.Select(b => $"{b:x2}");
+        var hexName = string.Join('-', hexArray);
+
+        return hexName;
+    }
+
     public static bool IsValidHeaderName(string headerName)
     {
         if (string.IsNullOrEmpty(headerName))

From 529b0ef6046c69ff95e2306351a6bfbe21dc2d27 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:22:41 +0800
Subject: [PATCH 175/227] clean up

---
 src/Moonglade.Core/PostFeature/CreatePostCommand.cs | 1 -
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index b39b2e2c0..542f3e747 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Moonglade.Configuration;
-using Moonglade.Core.TagFeature;
 using Moonglade.Data;
 using Moonglade.Data.Specifications;
 using Moonglade.Utils;
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 3b7634c80..3959822ef 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Moonglade.Configuration;
-using Moonglade.Core.TagFeature;
 using Moonglade.Data;
 using Moonglade.Data.Specifications;
 using Moonglade.Utils;

From 3910db12b3b2759d096baf2ece6365ea2ab1afa9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:32:05 +0800
Subject: [PATCH 176/227] PostByDateAndSlugForIdTitleSpec

---
 src/Moonglade.Data/Specifications/PostSpec.cs | 14 ++++++++++++++
 src/Moonglade.Pingback/ReceivePingCommand.cs  |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Data/Specifications/PostSpec.cs b/src/Moonglade.Data/Specifications/PostSpec.cs
index d053b1a30..dee80f202 100644
--- a/src/Moonglade.Data/Specifications/PostSpec.cs
+++ b/src/Moonglade.Data/Specifications/PostSpec.cs
@@ -131,4 +131,18 @@ public PostByDateAndSlugSpec(DateTime date, string slug, bool includeRelationDat
                     .ThenInclude(pc => pc.Category);
         }
     }
+}
+
+public sealed class PostByDateAndSlugForIdTitleSpec : SingleResultSpecification<PostEntity, (Guid Id, string Title)>
+{
+    public PostByDateAndSlugForIdTitleSpec(DateTime date, string slug)
+    {
+        Query.Where(p =>
+            p.Slug == slug &&
+            p.IsPublished &&
+            p.PubDateUtc.Value.Date == date &&
+            !p.IsDeleted);
+
+        Query.Select(p => new ValueTuple<Guid, string>(p.Id, p.Title));
+    }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Pingback/ReceivePingCommand.cs b/src/Moonglade.Pingback/ReceivePingCommand.cs
index e06da9831..b6f83571a 100644
--- a/src/Moonglade.Pingback/ReceivePingCommand.cs
+++ b/src/Moonglade.Pingback/ReceivePingCommand.cs
@@ -56,8 +56,8 @@ public async Task<PingbackResponse> Handle(ReceivePingCommand request, Cancellat
             }
 
             var (slug, pubDate) = GetSlugInfoFromUrl(pingRequest.TargetUrl);
-            var spec = new PostByDateAndSlugSpec(pubDate, slug, false);
-            var (id, title) = await postRepo.FirstOrDefaultAsync(spec, p => new Tuple<Guid, string>(p.Id, p.Title));
+            var spec = new PostByDateAndSlugForIdTitleSpec(pubDate, slug);
+            var (id, title) = await postRepo.FirstOrDefaultAsync(spec, ct);
             if (id == Guid.Empty)
             {
                 logger.LogError($"Can not get post id and title for url '{pingRequest.TargetUrl}'");

From d2c10adb2457b6798e7730c9553d8a1e91eb7408 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:34:51 +0800
Subject: [PATCH 177/227] upgrade monaco

---
 src/Moonglade.Web/Pages/Shared/_MonacoLoaderScript.cshtml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Moonglade.Web/Pages/Shared/_MonacoLoaderScript.cshtml b/src/Moonglade.Web/Pages/Shared/_MonacoLoaderScript.cshtml
index bd44fe68d..aae64f830 100644
--- a/src/Moonglade.Web/Pages/Shared/_MonacoLoaderScript.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_MonacoLoaderScript.cshtml
@@ -1,8 +1,9 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.47.0/min/vs/loader.min.js" 
+<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.48.0/min/vs/loader.min.js" 
         integrity="sha512-ZG31AN9z/CQD1YDDAK4RUAvogwbJHv6bHrumrnMLzdCrVu4HeAqrUX7Jsal/cbUwXGfaMUNmQU04tQ8XXl5Znw==" 
-        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        crossorigin="anonymous" 
+        referrerpolicy="no-referrer"></script>
 <script>
-    require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.47.0/min/vs' } });
+    require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.48.0/min/vs' } });
 
     function initEditor(containerId, textAreaQuerySelector, lang) {
         var editorDiv = document.getElementById(containerId);

From fa4b679d96a11dd2c01e9f75e6e066800a2b7a2e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 29 Apr 2024 14:35:02 +0800
Subject: [PATCH 178/227] bump version

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 555eb0a31..7dd65c24c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-preview.4</Version>
+    <Version>14.4.0-preview.5</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From c11af0298704627515fc6eee625ade343be6e1d7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 30 Apr 2024 10:40:16 +0800
Subject: [PATCH 179/227] remove FirstOrDefaultAsync

---
 src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs | 5 +----
 src/Moonglade.Data/MoongladeRepository.cs            | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
index 3598ed5f0..cba55232f 100644
--- a/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
+++ b/src/Moonglade.Core/PostFeature/GetPostBySlugQuery.cs
@@ -19,10 +19,7 @@ public async Task<PostEntity> Handle(GetPostBySlugQuery request, CancellationTok
         var slugCheckSum = Helper.ComputeCheckSum($"{request.Slug.Slug}#{date:yyyyMMdd}");
         var spec = new PostByChecksumSpec(slugCheckSum);
 
-        var pid = await repo.FirstOrDefaultAsync(spec, p => p.Id);
-        if (pid == Guid.Empty) return null;
-
-        var psm = await cache.GetOrCreateAsync(BlogCachePartition.Post.ToString(), $"{pid}", async entry =>
+        var psm = await cache.GetOrCreateAsync(BlogCachePartition.Post.ToString(), $"{slugCheckSum}", async entry =>
         {
             entry.SlidingExpiration = TimeSpan.FromMinutes(int.Parse(configuration["CacheSlidingExpirationMinutes:Post"]!));
 
diff --git a/src/Moonglade.Data/MoongladeRepository.cs b/src/Moonglade.Data/MoongladeRepository.cs
index 39f784ca9..015b04a10 100644
--- a/src/Moonglade.Data/MoongladeRepository.cs
+++ b/src/Moonglade.Data/MoongladeRepository.cs
@@ -17,10 +17,6 @@ public Task Clear(CancellationToken ct = default)
         return dbContext.SaveChangesAsync(ct);
     }
 
-    public Task<TResult> FirstOrDefaultAsync<TResult>(
-        ISpecification<T> spec, Expression<Func<T, TResult>> selector) =>
-        ApplySpecification(spec).AsNoTracking().Select(selector).FirstOrDefaultAsync();
-
     public async Task<List<TResult>> SelectAsync<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct = default) =>
         await dbContext.Set<T>().AsNoTracking().Select(selector).ToListAsync(cancellationToken: ct);
 

From f1bb98ebf103a2ccae40e03df7400771bd5111b1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 14:59:28 +0800
Subject: [PATCH 180/227] set UpdateTimeUtc when creating page

---
 src/Moonglade.Core/PageFeature/CreatePageCommand.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
index ef08adbd9..2c3f6a871 100644
--- a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
@@ -24,6 +24,7 @@ public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
             Slug = slug,
             MetaDescription = request.Payload.MetaDescription,
             CreateTimeUtc = DateTime.UtcNow,
+            UpdateTimeUtc = DateTime.UtcNow,
             HtmlContent = request.Payload.RawHtmlContent,
             HideSidebar = request.Payload.HideSidebar,
             IsPublished = request.Payload.IsPublished,

From e82d1fc04aa7f5b9a5fecf45d28d1af52722f88c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:13:59 +0800
Subject: [PATCH 181/227] Experimental:SetLastModifiedHeaderForPages

---
 src/Moonglade.Web/Pages/BlogPage.cshtml.cs | 15 +++++++++++++++
 src/Moonglade.Web/appsettings.json         |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/src/Moonglade.Web/Pages/BlogPage.cshtml.cs b/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
index bda1e2b8d..409609a18 100644
--- a/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
+++ b/src/Moonglade.Web/Pages/BlogPage.cshtml.cs
@@ -23,6 +23,21 @@ public async Task<IActionResult> OnGetAsync(string slug)
         if (page is null || !page.IsPublished) return NotFound();
 
         BlogPage = page;
+
+        if (page.UpdateTimeUtc.HasValue && bool.Parse(configuration["Experimental:SetLastModifiedHeaderForPages"]!))
+        {
+            Response.Headers.LastModified = page.UpdateTimeUtc.Value.ToString("R");
+
+            if (Request.Headers.TryGetValue("If-Modified-Since", out var ifModifiedSince))
+            {
+                if (DateTime.TryParse(ifModifiedSince, out var ifModifiedSinceDate) &&
+                    page.UpdateTimeUtc.Value <= ifModifiedSinceDate)
+                {
+                    return StatusCode(304);
+                }
+            }
+        }
+
         return Page();
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
index 927b04909..b4250d11a 100644
--- a/src/Moonglade.Web/appsettings.json
+++ b/src/Moonglade.Web/appsettings.json
@@ -54,6 +54,9 @@
     "Image": 60,
     "Widget": 30
   },
+  "Experimental": {
+    "SetLastModifiedHeaderForPages": true
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Warning",

From 6bb4a384dc0007afdddb14f02ac16231bcf0383d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:20:23 +0800
Subject: [PATCH 182/227] code refact

---
 .../Specifications/BlogThemeForIdNameSpec.cs          | 11 +++++++++++
 src/Moonglade.Data/ThemeSegment.cs                    |  3 +++
 src/Moonglade.Theme/GetAllThemeSegmentQuery.cs        | 11 +++--------
 src/Moonglade.Theme/ThemeSegment.cs                   |  7 -------
 4 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
 create mode 100644 src/Moonglade.Data/ThemeSegment.cs
 delete mode 100644 src/Moonglade.Theme/ThemeSegment.cs

diff --git a/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs b/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
new file mode 100644
index 000000000..7e87302a2
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
@@ -0,0 +1,11 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public class BlogThemeForIdNameSpec : Specification<BlogThemeEntity, ThemeSegment>
+{
+    public BlogThemeForIdNameSpec()
+    {
+        Query.Select(p => new(p.Id, p.ThemeName));
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data/ThemeSegment.cs b/src/Moonglade.Data/ThemeSegment.cs
new file mode 100644
index 000000000..532e21fc3
--- /dev/null
+++ b/src/Moonglade.Data/ThemeSegment.cs
@@ -0,0 +1,3 @@
+namespace Moonglade.Data;
+
+public record ThemeSegment(int Id, string Name);
\ No newline at end of file
diff --git a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
index 1e9cdb4bc..c61a8848c 100644
--- a/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
+++ b/src/Moonglade.Theme/GetAllThemeSegmentQuery.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Theme;
 
@@ -8,12 +9,6 @@ public record GetAllThemeSegmentQuery : IRequest<List<ThemeSegment>>;
 
 public class GetAllThemeSegmentQueryHandler(MoongladeRepository<BlogThemeEntity> repo) : IRequestHandler<GetAllThemeSegmentQuery, List<ThemeSegment>>
 {
-    public Task<List<ThemeSegment>> Handle(GetAllThemeSegmentQuery request, CancellationToken ct)
-    {
-        return repo.SelectAsync(p => new ThemeSegment
-        {
-            Id = p.Id,
-            Name = p.ThemeName
-        }, ct);
-    }
+    public Task<List<ThemeSegment>> Handle(GetAllThemeSegmentQuery request, CancellationToken ct) =>
+        repo.ListAsync(new BlogThemeForIdNameSpec(), ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Theme/ThemeSegment.cs b/src/Moonglade.Theme/ThemeSegment.cs
deleted file mode 100644
index c3037869f..000000000
--- a/src/Moonglade.Theme/ThemeSegment.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Moonglade.Theme;
-
-public record ThemeSegment
-{
-    public int Id { get; set; }
-    public string Name { get; set; }
-}
\ No newline at end of file

From bb61d59db69ba90fc18da70945bde1d6ce247320 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:32:25 +0800
Subject: [PATCH 183/227] AsNoTracking

---
 src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs b/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
index 7e87302a2..608cebd03 100644
--- a/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
+++ b/src/Moonglade.Data/Specifications/BlogThemeForIdNameSpec.cs
@@ -7,5 +7,6 @@ public class BlogThemeForIdNameSpec : Specification<BlogThemeEntity, ThemeSegmen
     public BlogThemeForIdNameSpec()
     {
         Query.Select(p => new(p.Id, p.ThemeName));
+        Query.AsNoTracking();
     }
 }
\ No newline at end of file

From f0fc9f2d060f1fba87a03b4c6c43935e8d43d60e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:34:54 +0800
Subject: [PATCH 184/227] PageSegmentSpec

---
 .../PageFeature/ListPageSegmentQuery.cs       | 14 +++-----------
 .../PageSegment.cs                            |  2 +-
 .../Specifications/PageSegmentSpec.cs         | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)
 rename src/{Moonglade.Core/PageFeature => Moonglade.Data}/PageSegment.cs (84%)
 create mode 100644 src/Moonglade.Data/Specifications/PageSegmentSpec.cs

diff --git a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
index f52836792..088c04757 100644
--- a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
+++ b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
@@ -1,4 +1,5 @@
 using Moonglade.Data;
+using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.PageFeature;
 
@@ -6,15 +7,6 @@ public record ListPageSegmentQuery : IRequest<List<PageSegment>>;
 
 public class ListPageSegmentQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, List<PageSegment>>
 {
-    public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct)
-    {
-        return repo.SelectAsync(page => new PageSegment
-        {
-            Id = page.Id,
-            CreateTimeUtc = page.CreateTimeUtc,
-            Slug = page.Slug,
-            Title = page.Title,
-            IsPublished = page.IsPublished
-        }, ct);
-    }
+    public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct) => 
+        repo.ListAsync(new PageSegmentSpec(), ct);
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PageFeature/PageSegment.cs b/src/Moonglade.Data/PageSegment.cs
similarity index 84%
rename from src/Moonglade.Core/PageFeature/PageSegment.cs
rename to src/Moonglade.Data/PageSegment.cs
index 806c9e615..81f7a94ce 100644
--- a/src/Moonglade.Core/PageFeature/PageSegment.cs
+++ b/src/Moonglade.Data/PageSegment.cs
@@ -1,4 +1,4 @@
-namespace Moonglade.Core.PageFeature;
+namespace Moonglade.Data;
 
 public record PageSegment
 {
diff --git a/src/Moonglade.Data/Specifications/PageSegmentSpec.cs b/src/Moonglade.Data/Specifications/PageSegmentSpec.cs
new file mode 100644
index 000000000..48a0d1f97
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PageSegmentSpec.cs
@@ -0,0 +1,19 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class PageSegmentSpec : Specification<PageEntity, PageSegment>
+{
+    public PageSegmentSpec()
+    {
+        Query.Select(page => new PageSegment
+        {
+            Id = page.Id,
+            CreateTimeUtc = page.CreateTimeUtc,
+            Slug = page.Slug,
+            Title = page.Title,
+            IsPublished = page.IsPublished
+        });
+        Query.AsNoTracking();
+    }
+}
\ No newline at end of file

From b364de9e342931fd686e52b4f0d64938360f848b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:35:09 +0800
Subject: [PATCH 185/227] Update ListPageSegmentQuery.cs

---
 src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
index 088c04757..99cc00af1 100644
--- a/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
+++ b/src/Moonglade.Core/PageFeature/ListPageSegmentQuery.cs
@@ -7,6 +7,6 @@ public record ListPageSegmentQuery : IRequest<List<PageSegment>>;
 
 public class ListPageSegmentQueryHandler(MoongladeRepository<PageEntity> repo) : IRequestHandler<ListPageSegmentQuery, List<PageSegment>>
 {
-    public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct) => 
+    public Task<List<PageSegment>> Handle(ListPageSegmentQuery request, CancellationToken ct) =>
         repo.ListAsync(new PageSegmentSpec(), ct);
 }
\ No newline at end of file

From da1796e6c2658e5bec1e45f4f191675a8cb95f1f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:43:46 +0800
Subject: [PATCH 186/227] PageSitemapSpec

---
 src/Moonglade.Data/SiteMapInfo.cs              |  8 ++++++++
 .../Specifications/PageSitemapSpec.cs          | 18 ++++++++++++++++++
 .../Middleware/SiteMapMiddleware.cs            | 15 +++++----------
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 src/Moonglade.Data/SiteMapInfo.cs
 create mode 100644 src/Moonglade.Data/Specifications/PageSitemapSpec.cs

diff --git a/src/Moonglade.Data/SiteMapInfo.cs b/src/Moonglade.Data/SiteMapInfo.cs
new file mode 100644
index 000000000..fe621809d
--- /dev/null
+++ b/src/Moonglade.Data/SiteMapInfo.cs
@@ -0,0 +1,8 @@
+namespace Moonglade.Data;
+
+public class SiteMapInfo
+{
+    public string Slug { get; set; }
+    public DateTime CreateTimeUtc { get; set; }
+    public DateTime? UpdateTimeUtc { get; set; }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Specifications/PageSitemapSpec.cs b/src/Moonglade.Data/Specifications/PageSitemapSpec.cs
new file mode 100644
index 000000000..0b7a787fa
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PageSitemapSpec.cs
@@ -0,0 +1,18 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class PageSitemapSpec : Specification<PageEntity, SiteMapInfo>
+{
+    public PageSitemapSpec()
+    {
+        Query.Where(p => p.IsPublished);
+        Query.Select(p => new SiteMapInfo
+        {
+            Slug = p.Slug,
+            CreateTimeUtc = p.CreateTimeUtc,
+            UpdateTimeUtc = p.UpdateTimeUtc
+        });
+        Query.AsNoTracking();
+    }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index c702427b9..c77384ed0 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -56,18 +56,13 @@ private static async Task<string> GetSiteMapData(
             }
 
             // Pages
-            var pages = await pageRepo.SelectAsync(page => new Tuple<DateTime, DateTime?, string, bool>(
-                page.CreateTimeUtc,
-                page.UpdateTimeUtc,
-                page.Slug,
-                page.IsPublished), ct);
-
-            foreach (var (createdTimeUtc, updateTimeUtc, slug, isPublished) in pages.Where(p => p.Item4))
+            var pages = await pageRepo.ListAsync(new PageSitemapSpec(), ct);
+            foreach (var page in pages)
             {
                 writer.WriteStartElement("url");
-                writer.WriteElementString("loc", $"{siteRootUrl}/page/{slug.ToLower()}");
-                writer.WriteElementString("lastmod", createdTimeUtc.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture));
-                writer.WriteElementString("changefreq", GetChangeFreq(createdTimeUtc, updateTimeUtc));
+                writer.WriteElementString("loc", $"{siteRootUrl}/page/{page.Slug.ToLower()}");
+                writer.WriteElementString("lastmod", page.CreateTimeUtc.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture));
+                writer.WriteElementString("changefreq", GetChangeFreq(page.CreateTimeUtc, page.UpdateTimeUtc));
                 await writer.WriteEndElementAsync();
             }
 

From 34e992617933f6d25ab9142d0bf5040f1b0e10ad Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:49:33 +0800
Subject: [PATCH 187/227] remove DisplayEllipsesWhenNotShowingAllPageNumbers

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs           | 13 -------------
 .../PagedList/PagedListRenderOptions.cs             | 11 -----------
 src/Moonglade.Web/Pages/Admin/Comments.cshtml       |  3 +--
 src/Moonglade.Web/Pages/Admin/Post.cshtml           |  3 +--
 src/Moonglade.Web/Pages/Shared/_PostList.cshtml     |  3 +--
 5 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 43cee3c5c..261223541 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -307,12 +307,6 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
         //page
         if (options.DisplayLinkToIndividualPages)
         {
-            //if there are previous page numbers not displayed, show an ellipsis
-            if (options.DisplayEllipsesWhenNotShowingAllPageNumbers && firstPageToDisplay > 1)
-            {
-                listItemLinks.Add(PreviousEllipsis(list, generatePageUrl, options, firstPageToDisplay));
-            }
-
             foreach (var i in Enumerable.Range(firstPageToDisplay, pageNumbersToDisplay))
             {
                 //show delimiter between page numbers
@@ -327,13 +321,6 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
                 //show page number link
                 listItemLinks.Add(Page(i, list, generatePageUrl, options));
             }
-
-            //if there are subsequent page numbers not displayed, show an ellipsis
-            if (options.DisplayEllipsesWhenNotShowingAllPageNumbers &&
-                (firstPageToDisplay + pageNumbersToDisplay - 1) < list.PageCount)
-            {
-                listItemLinks.Add(NextEllipsis(list, generatePageUrl, options, lastPageToDisplay));
-            }
         }
 
         //next
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 66bc8c6b4..bdbf131e4 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -13,7 +13,6 @@ public PagedListRenderOptions()
         DisplayLinkToIndividualPages = true;
         DisplayPageCountAndCurrentLocation = false;
         MaximumPageNumbersToDisplay = 10;
-        DisplayEllipsesWhenNotShowingAllPageNumbers = true;
         EllipsesFormat = "&#8230;";
         LinkToFirstPageFormat = "<<";
         LinkToPreviousPageFormat = "<";
@@ -99,16 +98,6 @@ public PagedListRenderOptions()
     ///</summary>
     public int? MaximumPageNumbersToDisplay { get; set; }
 
-    ///<summary>
-    /// If true, adds an ellipsis where not all page numbers are being displayed.
-    ///</summary>
-    ///<example>
-    /// "1 2 3 4 5 ...",
-    /// "... 6 7 8 9 10 ...",
-    /// "... 11 12 13 14 15"
-    ///</example>
-    public bool DisplayEllipsesWhenNotShowingAllPageNumbers { get; set; }
-
     ///<summary>
     /// The pre-formatted text to display when not all page numbers are displayed at once.
     ///</summary>
diff --git a/src/Moonglade.Web/Pages/Admin/Comments.cshtml b/src/Moonglade.Web/Pages/Admin/Comments.cshtml
index a8c060f2b..83d850bee 100644
--- a/src/Moonglade.Web/Pages/Admin/Comments.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/Comments.cshtml
@@ -173,7 +173,6 @@
 
     @Html.PagedListPager(Model.CommentDetailedItems, page => $"?pageIndex={page}", new()
     {
-        UlElementClasses = new[] { "pagination mt-3" },
-        DisplayEllipsesWhenNotShowingAllPageNumbers = false
+        UlElementClasses = new[] { "pagination mt-3" }
     })
 </div>
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Admin/Post.cshtml b/src/Moonglade.Web/Pages/Admin/Post.cshtml
index deaae6443..cc29fe768 100644
--- a/src/Moonglade.Web/Pages/Admin/Post.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/Post.cshtml
@@ -87,8 +87,7 @@
 
         @Html.PagedListPager(Model.PostSegments, page => $"?pageIndex={page}&searchTerm={Model.SearchTerm}", new ()
         {
-            UlElementClasses = new[] {"pagination mt-4"},
-            DisplayEllipsesWhenNotShowingAllPageNumbers = false
+            UlElementClasses = new[] {"pagination mt-4"}
         })
     }
 </div>
\ No newline at end of file
diff --git a/src/Moonglade.Web/Pages/Shared/_PostList.cshtml b/src/Moonglade.Web/Pages/Shared/_PostList.cshtml
index b10df5472..f4c7c065d 100644
--- a/src/Moonglade.Web/Pages/Shared/_PostList.cshtml
+++ b/src/Moonglade.Web/Pages/Shared/_PostList.cshtml
@@ -9,6 +9,5 @@
 @Html.PagedListPager(Model, page => $"?p={page}", new()
 {
     UlElementClasses = new[] { "pagination justify-content-end" },
-    MaximumPageNumbersToDisplay = 5,
-    DisplayEllipsesWhenNotShowingAllPageNumbers = false
+    MaximumPageNumbersToDisplay = 5
 })

From e6d60717cd43484173a64eec2c78212379daecd7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:51:56 +0800
Subject: [PATCH 188/227] remove DelimiterBetweenPageNumbers

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 9 ---------
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 5 -----
 2 files changed, 14 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 261223541..27dba6534 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -309,15 +309,6 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
         {
             foreach (var i in Enumerable.Range(firstPageToDisplay, pageNumbersToDisplay))
             {
-                //show delimiter between page numbers
-                if (i > firstPageToDisplay && !string.IsNullOrWhiteSpace(options.DelimiterBetweenPageNumbers))
-                {
-                    var li = tagBuilderFactory.Create("li");
-
-                    SetInnerText(li, options.DelimiterBetweenPageNumbers);
-                    listItemLinks.Add(li);
-                }
-
                 //show page number link
                 listItemLinks.Add(Page(i, list, generatePageUrl, options));
             }
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index bdbf131e4..fde0302ab 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -171,9 +171,4 @@ public PagedListRenderOptions()
     /// A function that will render each page number when specified (and DisplayLinkToIndividualPages is true). If no function is specified, the LinkToIndividualPageFormat value will be used instead.
     /// </summary>
     public Func<int, string> FunctionToDisplayEachPageNumber { get; set; }
-
-    /// <summary>
-    /// Text that will appear between each page number. If null or whitespace is specified, no delimiter will be shown.
-    /// </summary>
-    public string DelimiterBetweenPageNumbers { get; set; }
 }
\ No newline at end of file

From 121b4a591d49b6174bb75d87ff405e59835f3814 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:53:07 +0800
Subject: [PATCH 189/227] remove HtmlEncoder

---
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index fde0302ab..252464207 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -9,7 +9,6 @@ public class PagedListRenderOptions
     ///</summary>
     public PagedListRenderOptions()
     {
-        HtmlEncoder = HtmlEncoder.Default;
         DisplayLinkToIndividualPages = true;
         DisplayPageCountAndCurrentLocation = false;
         MaximumPageNumbersToDisplay = 10;
@@ -32,11 +31,6 @@ public PagedListRenderOptions()
         NextElementClass = "paged-list-skip-to-next";
     }
 
-    /// <summary>
-    /// Gets or sets the HtmlEncoder to use encoding HTML render.
-    /// </summary>
-    public HtmlEncoder HtmlEncoder { get; set; }
-
     ///<summary>
     /// CSS Classes to append to the &lt;div&gt; element that wraps the paging control.
     ///</summary>

From be3bc0151c94a8305f546ede9f3cf9ea08aded6c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:54:06 +0800
Subject: [PATCH 190/227] remove DisplayLinkToIndividualPages

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 9 +--------
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 27dba6534..9baf38480 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -305,14 +305,7 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
         }
 
         //page
-        if (options.DisplayLinkToIndividualPages)
-        {
-            foreach (var i in Enumerable.Range(firstPageToDisplay, pageNumbersToDisplay))
-            {
-                //show page number link
-                listItemLinks.Add(Page(i, list, generatePageUrl, options));
-            }
-        }
+        listItemLinks.AddRange(Enumerable.Range(firstPageToDisplay, pageNumbersToDisplay).Select(i => Page(i, list, generatePageUrl, options)));
 
         //next
         if (!list.IsLastPage)
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 252464207..c9ab16fa4 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -9,7 +9,6 @@ public class PagedListRenderOptions
     ///</summary>
     public PagedListRenderOptions()
     {
-        DisplayLinkToIndividualPages = true;
         DisplayPageCountAndCurrentLocation = false;
         MaximumPageNumbersToDisplay = 10;
         EllipsesFormat = "&#8230;";
@@ -66,11 +65,6 @@ public PagedListRenderOptions()
     ///</summary>
     public string EllipsesElementClass { get; set; }
 
-    ///<summary>
-    /// When true, includes hyperlinks for each page in the list.
-    ///</summary>
-    public bool DisplayLinkToIndividualPages { get; set; }
-
     ///<summary>
     /// When true, shows the current page number and the total number of pages in the list.
     ///</summary>

From 924c8b065bcb3526ad86a35a9a715d7368458fce Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:54:49 +0800
Subject: [PATCH 191/227] remove unused methods

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs     | 54 -------------------
 .../PagedList/PagedListRenderOptions.cs       |  4 +-
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 9baf38480..71701ce90 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -187,60 +187,6 @@ private TagBuilder ItemSliceAndTotalText(IPagedList list, PagedListRenderOptions
         return WrapInListItem(text, options, "PagedList-pageCountAndLocation", "disabled");
     }
 
-    private TagBuilder PreviousEllipsis(IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options, int firstPageToDisplay)
-    {
-        var previous = tagBuilderFactory
-            .Create("a");
-
-        AppendHtml(previous, options.EllipsesFormat);
-
-        previous.Attributes.Add("rel", "prev");
-        previous.AddCssClass("paged-list-skip-to-previous");
-
-        foreach (var c in options.PageClasses ?? Enumerable.Empty<string>())
-        {
-            previous.AddCssClass(c);
-        }
-
-        if (!list.HasPreviousPage)
-        {
-            return WrapInListItem(previous, options, options.EllipsesElementClass, "disabled");
-        }
-
-        var targetPageNumber = firstPageToDisplay - 1;
-
-        previous.Attributes.Add("href", generatePageUrl(targetPageNumber));
-
-        return WrapInListItem(previous, options, options.EllipsesElementClass);
-    }
-
-    private TagBuilder NextEllipsis(IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options, int lastPageToDisplay)
-    {
-        var next = tagBuilderFactory
-            .Create("a");
-
-        AppendHtml(next, options.EllipsesFormat);
-
-        next.Attributes.Add("rel", "next");
-        next.AddCssClass("paged-list-skip-to-next");
-
-        foreach (var c in options.PageClasses ?? Enumerable.Empty<string>())
-        {
-            next.AddCssClass(c);
-        }
-
-        if (!list.HasNextPage)
-        {
-            return WrapInListItem(next, options, options.EllipsesElementClass, "disabled");
-        }
-
-        var targetPageNumber = lastPageToDisplay + 1;
-
-        next.Attributes.Add("href", generatePageUrl(targetPageNumber));
-
-        return WrapInListItem(next, options, options.EllipsesElementClass);
-    }
-
     #endregion Private methods
 
     public string PagedListPager(IPagedList pagedList, Func<int, string> generatePageUrl, PagedListRenderOptions options)
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index c9ab16fa4..0e75edf90 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -1,6 +1,4 @@
-using System.Text.Encodings.Web;
-
-namespace Moonglade.Web.PagedList;
+namespace Moonglade.Web.PagedList;
 
 public class PagedListRenderOptions
 {

From f7d14ec5affffea2537fd901f360a91a159f5376 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 15:59:27 +0800
Subject: [PATCH 192/227] remove EllipsesElementClass

---
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 0e75edf90..45263d2f1 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -23,7 +23,6 @@ public PagedListRenderOptions()
         UlElementClasses = ["pagination"];
         LiElementClasses = ["page-item"];
         PageClasses = ["page-link"];
-        EllipsesElementClass = "paged-list-ellipses";
         PreviousElementClass = "PagedList-skip-to-previous";
         NextElementClass = "paged-list-skip-to-next";
     }
@@ -58,11 +57,6 @@ public PagedListRenderOptions()
     ///</summary>
     public string NextElementClass { get; set; }
 
-    ///<summary>
-    /// CSS Classes to append to Ellipses element in the paging control.
-    ///</summary>
-    public string EllipsesElementClass { get; set; }
-
     ///<summary>
     /// When true, shows the current page number and the total number of pages in the list.
     ///</summary>

From 4336416cde0e12eb2c664eed7396179c9a3043ca Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 16:00:02 +0800
Subject: [PATCH 193/227] remove EllipsesFormat

---
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 45263d2f1..b3f4d3093 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -9,7 +9,6 @@ public PagedListRenderOptions()
     {
         DisplayPageCountAndCurrentLocation = false;
         MaximumPageNumbersToDisplay = 10;
-        EllipsesFormat = "&#8230;";
         LinkToFirstPageFormat = "<<";
         LinkToPreviousPageFormat = "<";
         LinkToIndividualPageFormat = "{0}";
@@ -78,14 +77,6 @@ public PagedListRenderOptions()
     ///</summary>
     public int? MaximumPageNumbersToDisplay { get; set; }
 
-    ///<summary>
-    /// The pre-formatted text to display when not all page numbers are displayed at once.
-    ///</summary>
-    ///<example>
-    /// "..."
-    ///</example>
-    public string EllipsesFormat { get; set; }
-
     ///<summary>
     /// The pre-formatted text to display inside the hyperlink to the first page. The one-based index of the page (always 1 in this case) is passed into the formatting function - use {0} to reference it.
     ///</summary>

From 4e09d2ffb22391900788dfb66826d9a5a9a477e5 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 16:02:02 +0800
Subject: [PATCH 194/227] remove ItemSliceAndTotalPosition

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 8 +-------
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 71701ce90..11e434bbb 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -245,7 +245,7 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
         }
 
         //text
-        if (options.DisplayItemSliceAndTotal && options.ItemSliceAndTotalPosition == ItemSliceAndTotalPosition.Start)
+        if (options.DisplayItemSliceAndTotal)
         {
             listItemLinks.Add(ItemSliceAndTotalText(list, options));
         }
@@ -265,12 +265,6 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
             listItemLinks.Add(Last(list, generatePageUrl, options));
         }
 
-        //text
-        if (options.DisplayItemSliceAndTotal && options.ItemSliceAndTotalPosition == ItemSliceAndTotalPosition.End)
-        {
-            listItemLinks.Add(ItemSliceAndTotalText(list, options));
-        }
-
         if (listItemLinks.Any())
         {
             //append classes to all list item links
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index b3f4d3093..58b27cc12 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -16,7 +16,6 @@ public PagedListRenderOptions()
         LinkToLastPageFormat = ">>";
         PageCountAndCurrentLocationFormat = "Page {0} of {1}.";
         ItemSliceAndTotalFormat = "Showing items {0} through {1} of {2}.";
-        ItemSliceAndTotalPosition = ItemSliceAndTotalPosition.Start;
         FunctionToDisplayEachPageNumber = null;
         ContainerDivClasses = ["pagination-container"];
         UlElementClasses = ["pagination"];
@@ -133,11 +132,6 @@ public PagedListRenderOptions()
     ///</example>
     public string ItemSliceAndTotalFormat { get; set; }
 
-    /// <summary>
-    /// If set to <see cref="ItemSliceAndTotalPosition.Start"/>, render an info at the beginning of the list. If set to <see cref="ItemSliceAndTotalPosition.End"/>, render the at the beginning of the list.
-    /// </summary>
-    public ItemSliceAndTotalPosition ItemSliceAndTotalPosition { get; set; }
-
     /// <summary>
     /// A function that will render each page number when specified (and DisplayLinkToIndividualPages is true). If no function is specified, the LinkToIndividualPageFormat value will be used instead.
     /// </summary>

From dbdc3ccc6a4964687b8b44d00f6d251b9b4da1bb Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 16:07:28 +0800
Subject: [PATCH 195/227] remove DisplayItemSliceAndTotal

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 6 ------
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 11e434bbb..72dbf1969 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -244,12 +244,6 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
             listItemLinks.Add(PageCountAndLocationText(list, options));
         }
 
-        //text
-        if (options.DisplayItemSliceAndTotal)
-        {
-            listItemLinks.Add(ItemSliceAndTotalText(list, options));
-        }
-
         //page
         listItemLinks.AddRange(Enumerable.Range(firstPageToDisplay, pageNumbersToDisplay).Select(i => Page(i, list, generatePageUrl, options)));
 
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 58b27cc12..323f23e5b 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -63,14 +63,6 @@ public PagedListRenderOptions()
     ///</example>
     public bool DisplayPageCountAndCurrentLocation { get; set; }
 
-    ///<summary>
-    /// When true, shows the one-based index of the first and last items on the page, and the total number of items in the list.
-    ///</summary>
-    ///<example>
-    /// "Showing items 75 through 100 of 183."
-    ///</example>
-    public bool DisplayItemSliceAndTotal { get; set; }
-
     ///<summary>
     /// The maximum number of page numbers to display. Null displays all page numbers.
     ///</summary>

From d7e2fcbe23ab85fae0892e7f70d0617985c21112 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 20:38:33 +0800
Subject: [PATCH 196/227] Update HtmlHelper.cs

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 72dbf1969..d2d2f81da 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -29,7 +29,7 @@ private static string TagBuilderToString(TagBuilder tagBuilder)
         return writer.ToString();
     }
 
-    private TagBuilder WrapInListItem(TagBuilder inner, PagedListRenderOptions options, params string[] classes)
+    private TagBuilder WrapInListItem(TagBuilder inner, params string[] classes)
     {
         var li = tagBuilderFactory.Create("li");
 
@@ -58,12 +58,12 @@ private TagBuilder First(IPagedList list, Func<int, string> generatePageUrl, Pag
 
         if (list.IsFirstPage)
         {
-            return WrapInListItem(first, options, "paged-list-skip-to-first", "disabled");
+            return WrapInListItem(first, "paged-list-skip-to-first", "disabled");
         }
 
         first.Attributes.Add("href", generatePageUrl(targetPageNumber));
 
-        return WrapInListItem(first, options, "paged-list-skip-to-first");
+        return WrapInListItem(first, "paged-list-skip-to-first");
     }
 
     private TagBuilder Previous(IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options)
@@ -83,12 +83,12 @@ private TagBuilder Previous(IPagedList list, Func<int, string> generatePageUrl,
 
         if (!list.HasPreviousPage)
         {
-            return WrapInListItem(previous, options, options.PreviousElementClass, "disabled");
+            return WrapInListItem(previous, options.PreviousElementClass, "disabled");
         }
 
         previous.Attributes.Add("href", generatePageUrl(targetPageNumber));
 
-        return WrapInListItem(previous, options, options.PreviousElementClass);
+        return WrapInListItem(previous, options.PreviousElementClass);
     }
 
     private TagBuilder Page(int i, IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options)
@@ -111,12 +111,12 @@ private TagBuilder Page(int i, IPagedList list, Func<int, string> generatePageUr
 
         if (i == list.PageNumber)
         {
-            return WrapInListItem(page, options, "active");
+            return WrapInListItem(page, "active");
         }
 
         page.Attributes.Add("href", generatePageUrl(targetPageNumber));
 
-        return WrapInListItem(page, options);
+        return WrapInListItem(page);
     }
 
     private TagBuilder Next(IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options)
@@ -136,12 +136,12 @@ private TagBuilder Next(IPagedList list, Func<int, string> generatePageUrl, Page
 
         if (!list.HasNextPage)
         {
-            return WrapInListItem(next, options, options.NextElementClass, "disabled");
+            return WrapInListItem(next, options.NextElementClass, "disabled");
         }
 
         next.Attributes.Add("href", generatePageUrl(targetPageNumber));
 
-        return WrapInListItem(next, options, options.NextElementClass);
+        return WrapInListItem(next, options.NextElementClass);
     }
 
     private TagBuilder Last(IPagedList list, Func<int, string> generatePageUrl, PagedListRenderOptions options)
@@ -159,12 +159,12 @@ private TagBuilder Last(IPagedList list, Func<int, string> generatePageUrl, Page
 
         if (list.IsLastPage)
         {
-            return WrapInListItem(last, options, "paged-list-skip-to-last", "disabled");
+            return WrapInListItem(last, "paged-list-skip-to-last", "disabled");
         }
 
         last.Attributes.Add("href", generatePageUrl(targetPageNumber));
 
-        return WrapInListItem(last, options, "paged-list-skip-to-last");
+        return WrapInListItem(last, "paged-list-skip-to-last");
     }
 
     private TagBuilder PageCountAndLocationText(IPagedList list, PagedListRenderOptions options)
@@ -174,7 +174,7 @@ private TagBuilder PageCountAndLocationText(IPagedList list, PagedListRenderOpti
 
         SetInnerText(text, string.Format(options.PageCountAndCurrentLocationFormat, list.PageNumber, list.PageCount));
 
-        return WrapInListItem(text, options, "PagedList-pageCountAndLocation", "disabled");
+        return WrapInListItem(text, "PagedList-pageCountAndLocation", "disabled");
     }
 
     private TagBuilder ItemSliceAndTotalText(IPagedList list, PagedListRenderOptions options)
@@ -184,7 +184,7 @@ private TagBuilder ItemSliceAndTotalText(IPagedList list, PagedListRenderOptions
 
         SetInnerText(text, string.Format(options.ItemSliceAndTotalFormat, list.FirstItemOnPage, list.LastItemOnPage, list.TotalItemCount));
 
-        return WrapInListItem(text, options, "PagedList-pageCountAndLocation", "disabled");
+        return WrapInListItem(text, "PagedList-pageCountAndLocation", "disabled");
     }
 
     #endregion Private methods

From d931b86e61ee18cf89b5977b6369bcfda5368bc1 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 20:41:05 +0800
Subject: [PATCH 197/227] remove ContainerDivClasses

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 5 +----
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index d2d2f81da..0bee90333 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -290,10 +290,7 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
         var outerDiv = tagBuilderFactory
             .Create("div");
 
-        foreach (var c in options.ContainerDivClasses ?? Enumerable.Empty<string>())
-        {
-            outerDiv.AddCssClass(c);
-        }
+        outerDiv.AddCssClass("pagination-container");
 
         AppendHtml(outerDiv, TagBuilderToString(ul));
 
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 323f23e5b..6296c4058 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -17,7 +17,6 @@ public PagedListRenderOptions()
         PageCountAndCurrentLocationFormat = "Page {0} of {1}.";
         ItemSliceAndTotalFormat = "Showing items {0} through {1} of {2}.";
         FunctionToDisplayEachPageNumber = null;
-        ContainerDivClasses = ["pagination-container"];
         UlElementClasses = ["pagination"];
         LiElementClasses = ["page-item"];
         PageClasses = ["page-link"];
@@ -25,11 +24,6 @@ public PagedListRenderOptions()
         NextElementClass = "paged-list-skip-to-next";
     }
 
-    ///<summary>
-    /// CSS Classes to append to the &lt;div&gt; element that wraps the paging control.
-    ///</summary>
-    public IEnumerable<string> ContainerDivClasses { get; set; }
-
     ///<summary>
     /// CSSClasses to append to the &lt;ul&gt; element in the paging control.
     ///</summary>

From 4eb0c51f72b01a86a59d2adf98cc4e67cb031384 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 20:43:40 +0800
Subject: [PATCH 198/227] remove LiElementClasses

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs             | 5 +----
 src/Moonglade.Web/PagedList/PagedListRenderOptions.cs | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 0bee90333..5e54915af 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -264,10 +264,7 @@ public string PagedListPager(IPagedList pagedList, Func<int, string> generatePag
             //append classes to all list item links
             foreach (var li in listItemLinks)
             {
-                foreach (var c in options.LiElementClasses ?? Enumerable.Empty<string>())
-                {
-                    li.AddCssClass(c);
-                }
+                li.AddCssClass("page-item");
             }
         }
 
diff --git a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
index 6296c4058..31db19c25 100644
--- a/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
+++ b/src/Moonglade.Web/PagedList/PagedListRenderOptions.cs
@@ -18,7 +18,6 @@ public PagedListRenderOptions()
         ItemSliceAndTotalFormat = "Showing items {0} through {1} of {2}.";
         FunctionToDisplayEachPageNumber = null;
         UlElementClasses = ["pagination"];
-        LiElementClasses = ["page-item"];
         PageClasses = ["page-link"];
         PreviousElementClass = "PagedList-skip-to-previous";
         NextElementClass = "paged-list-skip-to-next";
@@ -29,11 +28,6 @@ public PagedListRenderOptions()
     ///</summary>
     public IEnumerable<string> UlElementClasses { get; set; }
 
-    ///<summary>
-    /// CSS Classes to append to every &lt;li&gt; element in the paging control.
-    ///</summary>
-    public IEnumerable<string> LiElementClasses { get; set; }
-
     ///<summary>
     /// CSS Classes to append to every &lt;a&gt; or &lt;span&gt; element that represent each page in the paging control.
     ///</summary>

From 3e3338a4a5cd10f8e42b0d11b9cb59826af5009c Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Fri, 3 May 2024 20:50:27 +0800
Subject: [PATCH 199/227] Update HtmlHelper.cs

---
 src/Moonglade.Web/PagedList/HtmlHelper.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Moonglade.Web/PagedList/HtmlHelper.cs b/src/Moonglade.Web/PagedList/HtmlHelper.cs
index 5e54915af..abb4397fd 100644
--- a/src/Moonglade.Web/PagedList/HtmlHelper.cs
+++ b/src/Moonglade.Web/PagedList/HtmlHelper.cs
@@ -177,16 +177,6 @@ private TagBuilder PageCountAndLocationText(IPagedList list, PagedListRenderOpti
         return WrapInListItem(text, "PagedList-pageCountAndLocation", "disabled");
     }
 
-    private TagBuilder ItemSliceAndTotalText(IPagedList list, PagedListRenderOptions options)
-    {
-        var text = tagBuilderFactory
-            .Create("a");
-
-        SetInnerText(text, string.Format(options.ItemSliceAndTotalFormat, list.FirstItemOnPage, list.LastItemOnPage, list.TotalItemCount));
-
-        return WrapInListItem(text, "PagedList-pageCountAndLocation", "disabled");
-    }
-
     #endregion Private methods
 
     public string PagedListPager(IPagedList pagedList, Func<int, string> generatePageUrl, PagedListRenderOptions options)

From 31074c811f764b26e7e1f33c7ff60dd948d4f835 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Mon, 6 May 2024 13:32:40 +0800
Subject: [PATCH 200/227] bump version to 14.4 rc.1

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7dd65c24c..296f4cde4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-preview.5</Version>
+    <Version>14.4.0-rc.1</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 92b31e291fb1c121bc943d5adc32a03258d0d32e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 12:13:44 +0800
Subject: [PATCH 201/227] rename RssItemCount to FeedItemCount

---
 src/Moonglade.Configuration/FeedSettings.cs          | 6 +++---
 src/Moonglade.Syndication/SyndicationDataSource.cs   | 4 ++--
 src/Moonglade.Web/Pages/Settings/Subscription.cshtml | 6 +++---
 src/Moonglade.Web/Resources/Program.zh-Hans.resx     | 8 ++++----
 src/Moonglade.Web/Resources/Program.zh-Hant.resx     | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Moonglade.Configuration/FeedSettings.cs b/src/Moonglade.Configuration/FeedSettings.cs
index 504da6c1d..c702055c3 100644
--- a/src/Moonglade.Configuration/FeedSettings.cs
+++ b/src/Moonglade.Configuration/FeedSettings.cs
@@ -5,8 +5,8 @@ namespace Moonglade.Configuration;
 
 public class FeedSettings : IBlogSettings
 {
-    [Display(Name = "RSS items")]
-    public int RssItemCount { get; set; }
+    [Display(Name = "Feed items")]
+    public int FeedItemCount { get; set; }
 
     [Display(Name = "Use full blog post content instead of abstract")]
     public bool UseFullContent { get; set; }
@@ -14,7 +14,7 @@ public class FeedSettings : IBlogSettings
     [JsonIgnore]
     public static FeedSettings DefaultValue => new()
     {
-        RssItemCount = 20,
+        FeedItemCount = 20,
         UseFullContent = false
     };
 }
\ No newline at end of file
diff --git a/src/Moonglade.Syndication/SyndicationDataSource.cs b/src/Moonglade.Syndication/SyndicationDataSource.cs
index 7c0e02704..c971fccbf 100644
--- a/src/Moonglade.Syndication/SyndicationDataSource.cs
+++ b/src/Moonglade.Syndication/SyndicationDataSource.cs
@@ -58,9 +58,9 @@ public async Task<List<FeedEntry>> GetFeedDataAsync(string catSlug = null)
     private async Task<List<FeedEntry>> GetFeedEntriesAsync(Guid? catId = null)
     {
         int? top = null;
-        if (_blogConfig.FeedSettings.RssItemCount != 0)
+        if (_blogConfig.FeedSettings.FeedItemCount != 0)
         {
-            top = _blogConfig.FeedSettings.RssItemCount;
+            top = _blogConfig.FeedSettings.FeedItemCount;
         }
 
         var postSpec = new PostByCatSpec(catId, top);
diff --git a/src/Moonglade.Web/Pages/Settings/Subscription.cshtml b/src/Moonglade.Web/Pages/Settings/Subscription.cshtml
index 2faaa3d16..c969a48da 100644
--- a/src/Moonglade.Web/Pages/Settings/Subscription.cshtml
+++ b/src/Moonglade.Web/Pages/Settings/Subscription.cshtml
@@ -24,11 +24,11 @@
                         <i class="bi-list-ol settings-entry-icon"></i>
                     </div>
                     <div class="col">
-                        <label asp-for="@settings.RssItemCount"></label>
-                        <div class="form-text">@SharedLocalizer["The number of entries to include in RSS feed."]</div>
+                        <label asp-for="@settings.FeedItemCount"></label>
+                        <div class="form-text">@SharedLocalizer["The number of entries to include in RSS/ATOM feed."]</div>
                     </div>
                     <div class="col-md-5">
-                        <input asp-for="@settings.RssItemCount" class="form-control" required />
+                        <input asp-for="@settings.FeedItemCount" class="form-control" required />
                     </div>
                 </div>
 
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hans.resx b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
index 0ae31e3f1..26560a27b 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hans.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hans.resx
@@ -663,8 +663,8 @@
   <data name="Route Name" xml:space="preserve">
     <value>路由名称</value>
   </data>
-  <data name="RSS Items" xml:space="preserve">
-    <value>RSS条目数量</value>
+  <data name="Feed Items" xml:space="preserve">
+    <value>订阅条目数量</value>
   </data>
   <data name="Save" xml:space="preserve">
     <value>保存</value>
@@ -756,8 +756,8 @@
   <data name="The first {0} character(s) will be used as abstract if you leave this field blank." xml:space="preserve">
     <value>留空自动选取文章前 {0} 字符作为摘要</value>
   </data>
-  <data name="The number of entries to include in RSS feed." xml:space="preserve">
-    <value>RSS中包含的条目数量</value>
+  <data name="The number of entries to include in RSS/ATOM feed." xml:space="preserve">
+    <value>RSS/ATOM 中包含的条目数量</value>
   </data>
   <data name="Theme" xml:space="preserve">
     <value>主题</value>
diff --git a/src/Moonglade.Web/Resources/Program.zh-Hant.resx b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
index 1cbf49b3d..113d51ef4 100644
--- a/src/Moonglade.Web/Resources/Program.zh-Hant.resx
+++ b/src/Moonglade.Web/Resources/Program.zh-Hant.resx
@@ -643,8 +643,8 @@
   <data name="Route Name" xml:space="preserve">
     <value>路由名稱</value>
   </data>
-  <data name="RSS Items" xml:space="preserve">
-    <value>RSS條目數量</value>
+  <data name="Feed Items" xml:space="preserve">
+    <value>訂閱條目數量</value>
   </data>
   <data name="Save" xml:space="preserve">
     <value>保存</value>
@@ -737,7 +737,7 @@
     <value>留空自動選取文章前 {0} 字元作為摘要</value>
   </data>
   <data name="The number of entries to include in RSS feed." xml:space="preserve">
-    <value>RSS中包含的條目數量</value>
+    <value>RSS/ATOM 中包含的條目數量</value>
   </data>
   <data name="Theme" xml:space="preserve">
     <value>主題</value>

From 5488d3db063dfb772e1c94e496af1a43d8245008 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 12:18:07 +0800
Subject: [PATCH 202/227] Update ExportPageDataCommand.cs

---
 .../Exporting/ExportPageDataCommand.cs             | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
index 1b3e7593f..db746a508 100644
--- a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
@@ -11,18 +11,6 @@ public class ExportPageDataCommandHandler(MoongladeRepository<PageEntity> repo)
     public Task<ExportResult> Handle(ExportPageDataCommand request, CancellationToken ct)
     {
         var pgExp = new ZippedJsonExporter<PageEntity>(repo, "moonglade-pages", ExportManager.DataDir);
-        return pgExp.ExportData(p => new
-        {
-            p.Id,
-            p.Title,
-            p.Slug,
-            p.MetaDescription,
-            p.HtmlContent,
-            p.CssId,
-            p.HideSidebar,
-            p.IsPublished,
-            p.CreateTimeUtc,
-            p.UpdateTimeUtc
-        }, ct);
+        return pgExp.ExportData(p => p, ct);
     }
 }
\ No newline at end of file

From ebc61e5b4edc38c663a22bbf7397cf7a3ab73e3b Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 12:35:37 +0800
Subject: [PATCH 203/227] PostSiteMapSpec

---
 .../Specifications/PostSiteMapSpec.cs         | 25 +++++++++++++++++++
 .../Middleware/SiteMapMiddleware.cs           | 13 +++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 src/Moonglade.Data/Specifications/PostSiteMapSpec.cs

diff --git a/src/Moonglade.Data/Specifications/PostSiteMapSpec.cs b/src/Moonglade.Data/Specifications/PostSiteMapSpec.cs
new file mode 100644
index 000000000..57ed11803
--- /dev/null
+++ b/src/Moonglade.Data/Specifications/PostSiteMapSpec.cs
@@ -0,0 +1,25 @@
+using Moonglade.Data.Entities;
+
+namespace Moonglade.Data.Specifications;
+
+public sealed class PostSiteMapSpec : Specification<PostEntity, PostSiteMapInfo>
+{
+    public PostSiteMapSpec()
+    {
+        Query.Where(p => p.IsPublished && !p.IsDeleted);
+        Query.Select(p => new PostSiteMapInfo
+        {
+            Slug = p.Slug,
+            CreateTimeUtc = p.PubDateUtc.GetValueOrDefault(),
+            UpdateTimeUtc = p.LastModifiedUtc
+        });
+        Query.AsNoTracking();
+    }
+}
+
+public class PostSiteMapInfo
+{
+    public string Slug { get; set; }
+    public DateTime CreateTimeUtc { get; set; }
+    public DateTime? UpdateTimeUtc { get; set; }
+}
\ No newline at end of file
diff --git a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
index c77384ed0..ec9b054f9 100644
--- a/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
+++ b/src/Moonglade.Web/Middleware/SiteMapMiddleware.cs
@@ -40,18 +40,17 @@ private static async Task<string> GetSiteMapData(
             writer.WriteStartElement("urlset", "http://www.sitemaps.org/schemas/sitemap/0.9");
 
             // Posts
-            var spec = new PostByStatusSpec(PostStatus.Published);
-            var posts = await postRepo
-                .SelectAsync(spec, p => new Tuple<string, DateTime?, DateTime?>(p.Slug, p.PubDateUtc, p.LastModifiedUtc), ct);
+            var spec = new PostSiteMapSpec();
+            var posts = await postRepo.ListAsync(spec, ct);
 
-            foreach (var (slug, pubDateUtc, lastModifyUtc) in posts.OrderByDescending(p => p.Item2))
+            foreach (var item in posts.OrderByDescending(p => p.UpdateTimeUtc))
             {
-                var pubDate = pubDateUtc.GetValueOrDefault();
+                var pubDate = item.CreateTimeUtc;
 
                 writer.WriteStartElement("url");
-                writer.WriteElementString("loc", $"{siteRootUrl}/post/{pubDate.Year}/{pubDate.Month}/{pubDate.Day}/{slug.ToLower()}");
+                writer.WriteElementString("loc", $"{siteRootUrl}/post/{pubDate.Year}/{pubDate.Month}/{pubDate.Day}/{item.Slug.ToLower()}");
                 writer.WriteElementString("lastmod", pubDate.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture));
-                writer.WriteElementString("changefreq", GetChangeFreq(pubDateUtc.GetValueOrDefault(), lastModifyUtc));
+                writer.WriteElementString("changefreq", GetChangeFreq(pubDate, item.UpdateTimeUtc));
                 await writer.WriteEndElementAsync();
             }
 

From 34fe75839d368f7edb13a271b0e2b50890ba32ab Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:09:22 +0800
Subject: [PATCH 204/227] remove unused interface

---
 src/Moonglade.Data/Exporting/Exporters/IExporter.cs       | 8 --------
 .../Exporting/Exporters/ZippedJsonExporter.cs             | 1 -
 2 files changed, 9 deletions(-)
 delete mode 100644 src/Moonglade.Data/Exporting/Exporters/IExporter.cs

diff --git a/src/Moonglade.Data/Exporting/Exporters/IExporter.cs b/src/Moonglade.Data/Exporting/Exporters/IExporter.cs
deleted file mode 100644
index ee2a916f5..000000000
--- a/src/Moonglade.Data/Exporting/Exporters/IExporter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Linq.Expressions;
-
-namespace Moonglade.Data.Exporting.Exporters;
-
-public interface IExporter<T>
-{
-    Task<ExportResult> ExportData<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct);
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
index c9186eeaf..3ec3e0edc 100644
--- a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
+++ b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
@@ -6,7 +6,6 @@
 namespace Moonglade.Data.Exporting.Exporters;
 
 public class ZippedJsonExporter<T>(MoongladeRepository<T> repository, string fileNamePrefix, string directory)
-    : IExporter<T>
     where T : class
 {
     public async Task<ExportResult> ExportData<TResult>(Expression<Func<T, TResult>> selector, CancellationToken ct)

From ed7ba01999f9b00b8c7d75de61efb83e70f43efc Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:12:17 +0800
Subject: [PATCH 205/227] simplify code

---
 src/Moonglade.Data/Exporting/ExportFormat.cs       |  6 ------
 src/Moonglade.Data/Exporting/ExportResult.cs       | 14 --------------
 .../Exporting/Exporters/ZippedJsonExporter.cs      |  1 -
 .../Controllers/DataPortingController.cs           |  7 +------
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 src/Moonglade.Data/Exporting/ExportFormat.cs

diff --git a/src/Moonglade.Data/Exporting/ExportFormat.cs b/src/Moonglade.Data/Exporting/ExportFormat.cs
deleted file mode 100644
index 48e4301e4..000000000
--- a/src/Moonglade.Data/Exporting/ExportFormat.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Moonglade.Data.Exporting;
-
-public enum ExportFormat
-{
-    ZippedJsonFiles
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/ExportResult.cs b/src/Moonglade.Data/Exporting/ExportResult.cs
index f86c80624..ec2504a6e 100644
--- a/src/Moonglade.Data/Exporting/ExportResult.cs
+++ b/src/Moonglade.Data/Exporting/ExportResult.cs
@@ -2,21 +2,7 @@
 
 public class ExportResult
 {
-    public ExportFormat ExportFormat { get; set; }
-
     public string FilePath { get; set; }
 
     public byte[] Content { get; set; }
-
-    public string ContentType
-    {
-        get
-        {
-            return ExportFormat switch
-            {
-                ExportFormat.ZippedJsonFiles => "application/zip",
-                _ => string.Empty
-            };
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
index 3ec3e0edc..7c3d9b0f0 100644
--- a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
+++ b/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
@@ -30,7 +30,6 @@ private async Task<ExportResult> ToZippedJsonResult<TE>(IEnumerable<TE> list, Ca
 
         return new()
         {
-            ExportFormat = ExportFormat.ZippedJsonFiles,
             FilePath = distPath
         };
     }
diff --git a/src/Moonglade.Web/Controllers/DataPortingController.cs b/src/Moonglade.Web/Controllers/DataPortingController.cs
index d6995d37d..abface033 100644
--- a/src/Moonglade.Web/Controllers/DataPortingController.cs
+++ b/src/Moonglade.Web/Controllers/DataPortingController.cs
@@ -18,11 +18,6 @@ public async Task<IActionResult> ExportDownload(ExportType type, CancellationTok
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
         };
 
-        return exportResult.ExportFormat switch
-        {
-            ExportFormat.ZippedJsonFiles => PhysicalFile(exportResult.FilePath, exportResult.ContentType,
-                Path.GetFileName(exportResult.FilePath)),
-            _ => BadRequest(ModelState.CombineErrorMessages())
-        };
+        return PhysicalFile(exportResult.FilePath, "application/zip", Path.GetFileName(exportResult.FilePath));
     }
 }
\ No newline at end of file

From 653503c849d339e14ad5a98bc10be41c781bb25f Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:13:45 +0800
Subject: [PATCH 206/227] move files

---
 src/Moonglade.Data/Exporting/ExportPageDataCommand.cs           | 1 -
 src/Moonglade.Data/Exporting/ExportPostDataCommand.cs           | 1 -
 .../Exporting/{Exporters => }/MoongladeJsonSerializerOptions.cs | 2 +-
 .../Exporting/{Exporters => }/ZippedJsonExporter.cs             | 2 +-
 src/Moonglade.Web/Controllers/CategoryController.cs             | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename src/Moonglade.Data/Exporting/{Exporters => }/MoongladeJsonSerializerOptions.cs (95%)
 rename src/Moonglade.Data/Exporting/{Exporters => }/ZippedJsonExporter.cs (97%)

diff --git a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
index db746a508..d2b7adc3b 100644
--- a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
@@ -1,6 +1,5 @@
 using MediatR;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Exporting.Exporters;
 
 namespace Moonglade.Data.Exporting;
 
diff --git a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
index 9d1b5e819..42ed6e7dd 100644
--- a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
@@ -1,6 +1,5 @@
 using MediatR;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Exporting.Exporters;
 
 namespace Moonglade.Data.Exporting;
 
diff --git a/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs b/src/Moonglade.Data/Exporting/MoongladeJsonSerializerOptions.cs
similarity index 95%
rename from src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs
rename to src/Moonglade.Data/Exporting/MoongladeJsonSerializerOptions.cs
index 449e3e65d..8392cc318 100644
--- a/src/Moonglade.Data/Exporting/Exporters/MoongladeJsonSerializerOptions.cs
+++ b/src/Moonglade.Data/Exporting/MoongladeJsonSerializerOptions.cs
@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Unicode;
 
-namespace Moonglade.Data.Exporting.Exporters;
+namespace Moonglade.Data.Exporting;
 
 public static class MoongladeJsonSerializerOptions
 {
diff --git a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs b/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
similarity index 97%
rename from src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
rename to src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
index 7c3d9b0f0..6adc772a8 100644
--- a/src/Moonglade.Data/Exporting/Exporters/ZippedJsonExporter.cs
+++ b/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace Moonglade.Data.Exporting.Exporters;
+namespace Moonglade.Data.Exporting;
 
 public class ZippedJsonExporter<T>(MoongladeRepository<T> repository, string fileNamePrefix, string directory)
     where T : class
diff --git a/src/Moonglade.Web/Controllers/CategoryController.cs b/src/Moonglade.Web/Controllers/CategoryController.cs
index 2026ccfc5..98d8a58ed 100644
--- a/src/Moonglade.Web/Controllers/CategoryController.cs
+++ b/src/Moonglade.Web/Controllers/CategoryController.cs
@@ -1,6 +1,6 @@
 using Moonglade.Core.CategoryFeature;
 using Moonglade.Data.Entities;
-using Moonglade.Data.Exporting.Exporters;
+using Moonglade.Data.Exporting;
 using Moonglade.Web.Attributes;
 using System.Text.Json;
 

From b8c246d16017c44edaa747d785871558900687d7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:16:46 +0800
Subject: [PATCH 207/227] code refact

---
 src/Moonglade.Data/Exporting/ExportManager.cs | 20 -------------------
 .../Exporting/ExportPageDataCommand.cs        |  2 +-
 .../Exporting/ExportPostDataCommand.cs        |  2 +-
 .../Exporting/ZippedJsonExporter.cs           | 16 ++++++++++++++-
 4 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 src/Moonglade.Data/Exporting/ExportManager.cs

diff --git a/src/Moonglade.Data/Exporting/ExportManager.cs b/src/Moonglade.Data/Exporting/ExportManager.cs
deleted file mode 100644
index b75da30af..000000000
--- a/src/Moonglade.Data/Exporting/ExportManager.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Moonglade.Data.Exporting;
-
-public class ExportManager
-{
-    public static readonly string DataDir = Path.GetTempPath();
-
-    public static string CreateExportDirectory(string directory, string subDirName)
-    {
-        if (directory is null) return null;
-
-        var path = Path.Join(directory, "export", subDirName);
-        if (Directory.Exists(path))
-        {
-            Directory.Delete(path);
-        }
-
-        Directory.CreateDirectory(path);
-        return path;
-    }
-}
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
index d2b7adc3b..9478fa265 100644
--- a/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPageDataCommand.cs
@@ -9,7 +9,7 @@ public class ExportPageDataCommandHandler(MoongladeRepository<PageEntity> repo)
 {
     public Task<ExportResult> Handle(ExportPageDataCommand request, CancellationToken ct)
     {
-        var pgExp = new ZippedJsonExporter<PageEntity>(repo, "moonglade-pages", ExportManager.DataDir);
+        var pgExp = new ZippedJsonExporter<PageEntity>(repo, "moonglade-pages", Path.GetTempPath());
         return pgExp.ExportData(p => p, ct);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
index 42ed6e7dd..533412295 100644
--- a/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
+++ b/src/Moonglade.Data/Exporting/ExportPostDataCommand.cs
@@ -9,7 +9,7 @@ public class ExportPostDataCommandHandler(MoongladeRepository<PostEntity> repo)
 {
     public Task<ExportResult> Handle(ExportPostDataCommand request, CancellationToken ct)
     {
-        var poExp = new ZippedJsonExporter<PostEntity>(repo, "moonglade-posts", ExportManager.DataDir);
+        var poExp = new ZippedJsonExporter<PostEntity>(repo, "moonglade-posts", Path.GetTempPath());
         var poExportData = poExp.ExportData(p => new
         {
             p.Title,
diff --git a/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs b/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
index 6adc772a8..7fa65e114 100644
--- a/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
+++ b/src/Moonglade.Data/Exporting/ZippedJsonExporter.cs
@@ -18,7 +18,7 @@ public async Task<ExportResult> ExportData<TResult>(Expression<Func<T, TResult>>
     private async Task<ExportResult> ToZippedJsonResult<TE>(IEnumerable<TE> list, CancellationToken ct)
     {
         var tempId = Guid.NewGuid().ToString();
-        string exportDirectory = ExportManager.CreateExportDirectory(directory, tempId);
+        string exportDirectory = CreateExportDirectory(directory, tempId);
         foreach (var item in list)
         {
             var json = JsonSerializer.Serialize(item, MoongladeJsonSerializerOptions.Default);
@@ -39,4 +39,18 @@ private static async Task SaveJsonToDirectory(string json, string directory, str
         var path = Path.Join(directory, filename);
         await File.WriteAllTextAsync(path, json, Encoding.UTF8, ct);
     }
+
+    private static string CreateExportDirectory(string directory, string subDirName)
+    {
+        if (directory is null) return null;
+
+        var path = Path.Join(directory, "export", subDirName);
+        if (Directory.Exists(path))
+        {
+            Directory.Delete(path);
+        }
+
+        Directory.CreateDirectory(path);
+        return path;
+    }
 }
\ No newline at end of file

From c8e4367ea84a424969a1ad6acf369d5171f05a89 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:17:12 +0800
Subject: [PATCH 208/227] Update ExportResult.cs

---
 src/Moonglade.Data/Exporting/ExportResult.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Moonglade.Data/Exporting/ExportResult.cs b/src/Moonglade.Data/Exporting/ExportResult.cs
index ec2504a6e..89ecbbd0e 100644
--- a/src/Moonglade.Data/Exporting/ExportResult.cs
+++ b/src/Moonglade.Data/Exporting/ExportResult.cs
@@ -3,6 +3,4 @@
 public class ExportResult
 {
     public string FilePath { get; set; }
-
-    public byte[] Content { get; set; }
 }
\ No newline at end of file

From 484c78ca4b5b119adbe68aa01f0346c8f86eeade Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:17:50 +0800
Subject: [PATCH 209/227] Update ExportResult.cs

---
 src/Moonglade.Data/Exporting/ExportResult.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Data/Exporting/ExportResult.cs b/src/Moonglade.Data/Exporting/ExportResult.cs
index 89ecbbd0e..6b74717f6 100644
--- a/src/Moonglade.Data/Exporting/ExportResult.cs
+++ b/src/Moonglade.Data/Exporting/ExportResult.cs
@@ -1,6 +1,6 @@
 namespace Moonglade.Data.Exporting;
 
-public class ExportResult
+public record ExportResult
 {
     public string FilePath { get; set; }
 }
\ No newline at end of file

From 1b68c9324adedc3f5d615da7598648fddc89cade Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:20:19 +0800
Subject: [PATCH 210/227] rename file

---
 src/Moonglade.Web/Pages/Post.cshtml                             | 2 +-
 src/Moonglade.Web/Pages/PostPreview.cshtml                      | 2 +-
 .../Pages/{_PostActions2.cshtml => _PostActions.cshtml}         | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Moonglade.Web/Pages/{_PostActions2.cshtml => _PostActions.cshtml} (100%)

diff --git a/src/Moonglade.Web/Pages/Post.cshtml b/src/Moonglade.Web/Pages/Post.cshtml
index 80ebd0320..a9b4723f2 100644
--- a/src/Moonglade.Web/Pages/Post.cshtml
+++ b/src/Moonglade.Web/Pages/Post.cshtml
@@ -167,7 +167,7 @@
         </section>
     }
 
-    <partial name="_PostActions2" model="Model.Post" />
+    <partial name="_PostActions" model="Model.Post" />
 
     @if (!string.IsNullOrWhiteSpace(Model.Post.OriginLink))
     {
diff --git a/src/Moonglade.Web/Pages/PostPreview.cshtml b/src/Moonglade.Web/Pages/PostPreview.cshtml
index 994091455..3e45d2b36 100644
--- a/src/Moonglade.Web/Pages/PostPreview.cshtml
+++ b/src/Moonglade.Web/Pages/PostPreview.cshtml
@@ -71,7 +71,7 @@
         </section>
     }
 
-    <partial name="_PostActions2" model="Model.Post" />
+    <partial name="_PostActions" model="Model.Post" />
     
     @if (!string.IsNullOrWhiteSpace(Model.Post.OriginLink))
     {
diff --git a/src/Moonglade.Web/Pages/_PostActions2.cshtml b/src/Moonglade.Web/Pages/_PostActions.cshtml
similarity index 100%
rename from src/Moonglade.Web/Pages/_PostActions2.cshtml
rename to src/Moonglade.Web/Pages/_PostActions.cshtml

From e7241be995213f98c46d94d9d00063d200865dab Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:22:26 +0800
Subject: [PATCH 211/227] fix cache

---
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 3959822ef..52154f521 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -149,7 +149,7 @@ await _tagRepo.AddAsync(new()
 
         await _postRepo.UpdateAsync(post, ct);
 
-        _cache.Remove(BlogCachePartition.Post.ToString(), guid.ToString());
+        _cache.Remove(BlogCachePartition.Post.ToString(), checkSum.ToString());
         return post;
     }
 }

From 73dbf94d0b8b58bf1156ac7664f739bf6a628770 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:24:55 +0800
Subject: [PATCH 212/227] rename method

---
 src/Moonglade.Auth/ValidateLoginCommand.cs          | 2 +-
 src/Moonglade.Utils/Helper.cs                       | 2 +-
 src/Moonglade.Web/Controllers/SettingsController.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moonglade.Auth/ValidateLoginCommand.cs b/src/Moonglade.Auth/ValidateLoginCommand.cs
index a9e2bfd19..19317237c 100644
--- a/src/Moonglade.Auth/ValidateLoginCommand.cs
+++ b/src/Moonglade.Auth/ValidateLoginCommand.cs
@@ -14,7 +14,7 @@ public Task<bool> Handle(ValidateLoginCommand request, CancellationToken ct)
         if (account is null) return Task.FromResult(false);
         if (account.Username != request.Username) return Task.FromResult(false);
 
-        var valid = account.PasswordHash == Helper.HashPassword2(request.InputPassword.Trim(), account.PasswordSalt);
+        var valid = account.PasswordHash == Helper.HashPassword(request.InputPassword.Trim(), account.PasswordSalt);
 
         return Task.FromResult(valid);
     }
diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index 9248e2b46..706c49c07 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -124,7 +124,7 @@ public static string GetMd5Hash(string input)
 
     // https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/consumer-apis/password-hashing?view=aspnetcore-6.0
     // This is not secure, but better than nothing.
-    public static string HashPassword2(string clearPassword, string saltBase64)
+    public static string HashPassword(string clearPassword, string saltBase64)
     {
         var salt = Convert.FromBase64String(saltBase64);
 
diff --git a/src/Moonglade.Web/Controllers/SettingsController.cs b/src/Moonglade.Web/Controllers/SettingsController.cs
index 1d32ee2a6..2e35972ae 100644
--- a/src/Moonglade.Web/Controllers/SettingsController.cs
+++ b/src/Moonglade.Web/Controllers/SettingsController.cs
@@ -220,14 +220,14 @@ public IActionResult GeneratePassword([FromServices] IPasswordGenerator password
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     public async Task<IActionResult> UpdateLocalAccountPassword(UpdateLocalAccountPasswordRequest request)
     {
-        var oldPasswordValid = blogConfig.LocalAccountSettings.PasswordHash == Helper.HashPassword2(request.OldPassword.Trim(), blogConfig.LocalAccountSettings.PasswordSalt);
+        var oldPasswordValid = blogConfig.LocalAccountSettings.PasswordHash == Helper.HashPassword(request.OldPassword.Trim(), blogConfig.LocalAccountSettings.PasswordSalt);
 
         if (!oldPasswordValid) return Conflict("Old password is incorrect.");
 
         var newSalt = Helper.GenerateSalt();
         blogConfig.LocalAccountSettings.Username = request.NewUsername.Trim();
         blogConfig.LocalAccountSettings.PasswordSalt = newSalt;
-        blogConfig.LocalAccountSettings.PasswordHash = Helper.HashPassword2(request.NewPassword, newSalt);
+        blogConfig.LocalAccountSettings.PasswordHash = Helper.HashPassword(request.NewPassword, newSalt);
 
         await SaveConfigAsync(blogConfig.LocalAccountSettings);
         return NoContent();

From 15f552130c3fa392d9839a716fd5d3b3389489de Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:28:46 +0800
Subject: [PATCH 213/227] add debug log

---
 src/Moonglade.Data/Seed.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Moonglade.Data/Seed.cs b/src/Moonglade.Data/Seed.cs
index 430e6276c..d96db321b 100644
--- a/src/Moonglade.Data/Seed.cs
+++ b/src/Moonglade.Data/Seed.cs
@@ -11,12 +11,22 @@ public static async Task SeedAsync(BlogDbContext dbContext, ILogger logger, int
 
         try
         {
+            logger.LogDebug("Adding themes data...");
             await dbContext.BlogTheme.AddRangeAsync(GetThemes());
+
+            logger.LogDebug("Adding categories data...");
             await dbContext.Category.AddRangeAsync(GetCategories());
+
+            logger.LogDebug("Adding tags data...");
             await dbContext.Tag.AddRangeAsync(GetTags());
+
+            logger.LogDebug("Adding friend links data...");
             await dbContext.FriendLink.AddRangeAsync(GetFriendLinks());
+
+            logger.LogDebug("Adding pages data...");
             await dbContext.CustomPage.AddRangeAsync(GetPages());
 
+            logger.LogDebug("Adding example post...");
             // Add example post
             var content = "Moonglade is the blog system for https://edi.wang. Powered by .NET 8 and runs on Microsoft Azure, the best cloud on the planet.";
 

From 521013d8028b34f29d0e826dcd74e6c4dc0faf87 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Tue, 7 May 2024 14:32:12 +0800
Subject: [PATCH 214/227] add log for create edit post

---
 src/Moonglade.Core/PostFeature/CreatePostCommand.cs | 3 +++
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
index 542f3e747..21e409f60 100644
--- a/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/CreatePostCommand.cs
@@ -92,6 +92,7 @@ public async Task<PostEntity> Handle(CreatePostCommand request, CancellationToke
 
         await postRepo.AddAsync(post, ct);
 
+        logger.LogInformation($"Created post Id: {post.Id}, Title: '{post.Title}'");
         return post;
     }
 
@@ -104,6 +105,8 @@ private async Task<TagEntity> CreateTag(string item)
         };
 
         var tag = await tagRepo.AddAsync(newTag);
+
+        logger.LogInformation($"Created tag: {tag.DisplayName}");
         return tag;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index 52154f521..b27f56eb2 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -1,6 +1,7 @@
 using Edi.CacheAside.InMemory;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Specifications;
@@ -18,6 +19,7 @@ public class UpdatePostCommandHandler : IRequestHandler<UpdatePostCommand, PostE
     private readonly ICacheAside _cache;
     private readonly IBlogConfig _blogConfig;
     private readonly IConfiguration _configuration;
+    private readonly ILogger<UpdatePostCommandHandler> _logger;
     private readonly bool _useMySqlWorkaround;
 
     public UpdatePostCommandHandler(
@@ -26,7 +28,9 @@ public UpdatePostCommandHandler(
         MoongladeRepository<TagEntity> tagRepo,
         MoongladeRepository<PostEntity> postRepo,
         ICacheAside cache,
-        IBlogConfig blogConfig, IConfiguration configuration)
+        IBlogConfig blogConfig, 
+        IConfiguration configuration,
+        ILogger<UpdatePostCommandHandler> logger)
     {
         _ptRepository = ptRepository;
         _pcRepository = pcRepository;
@@ -35,6 +39,7 @@ public UpdatePostCommandHandler(
         _cache = cache;
         _blogConfig = blogConfig;
         _configuration = configuration;
+        _logger = logger;
 
         string dbType = configuration.GetConnectionString("DatabaseType");
         _useMySqlWorkaround = dbType!.ToLower().Trim() == "mysql";
@@ -150,6 +155,8 @@ await _tagRepo.AddAsync(new()
         await _postRepo.UpdateAsync(post, ct);
 
         _cache.Remove(BlogCachePartition.Post.ToString(), checkSum.ToString());
+
+        _logger.LogInformation($"Post updated: {post.Id}");
         return post;
     }
 }

From 752b8e13e354cddbf8a2aad089b42c9efbe7243d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 10:57:34 +0800
Subject: [PATCH 215/227] bump version

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 296f4cde4..00b8272ee 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-rc.1</Version>
+    <Version>14.4.0-rc.2</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From d4ba274ee813c479ac8619fee84957a3a190171a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:34:10 +0800
Subject: [PATCH 216/227] logging for page CUD

---
 src/Moonglade.Core/PageFeature/CreatePageCommand.cs |  9 +++++++--
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs | 10 ++++++++--
 src/Moonglade.Core/PageFeature/UpdatePageCommand.cs |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
index 2c3f6a871..a2e54a482 100644
--- a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
@@ -1,10 +1,14 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PageFeature;
 
 public record CreatePageCommand(EditPageRequest Payload) : IRequest<Guid>;
 
-public class CreatePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<CreatePageCommand, Guid>
+public class CreatePageCommandHandler(
+    MoongladeRepository<PageEntity> repo, 
+    IMediator mediator, 
+    ILogger<CreatePageCommandHandler> logger) : IRequestHandler<CreatePageCommand, Guid>
 {
     public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
     {
@@ -33,6 +37,7 @@ public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
 
         await repo.AddAsync(page, ct);
 
+        logger.LogInformation("Created page: {PageId}", uid);
         return uid;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index 16042a8fc..a74f8eeeb 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -1,10 +1,14 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PageFeature;
 
 public record DeletePageCommand(Guid Id) : IRequest<OperationCode>;
 
-public class DeletePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<DeletePageCommand, OperationCode>
+public class DeletePageCommandHandler(
+    MoongladeRepository<PageEntity> repo, 
+    IMediator mediator, 
+    ILogger<DeletePageCommandHandler> logger) : IRequestHandler<DeletePageCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeletePageCommand request, CancellationToken ct)
     {
@@ -17,6 +21,8 @@ public async Task<OperationCode> Handle(DeletePageCommand request, CancellationT
         }
 
         await repo.DeleteAsync(page, ct);
+
+        logger.LogInformation("Deleted page: {PageId}", request.Id);
         return OperationCode.Done;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
index bfd5111c3..93a14cc03 100644
--- a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
@@ -1,10 +1,14 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 
 namespace Moonglade.Core.PageFeature;
 
 public record UpdatePageCommand(Guid Id, EditPageRequest Payload) : IRequest<Guid>;
 
-public class UpdatePageCommandHandler(MoongladeRepository<PageEntity> repo, IMediator mediator) : IRequestHandler<UpdatePageCommand, Guid>
+public class UpdatePageCommandHandler(
+    MoongladeRepository<PageEntity> repo, 
+    IMediator mediator, 
+    ILogger<UpdatePageCommandHandler> logger) : IRequestHandler<UpdatePageCommand, Guid>
 {
     public async Task<Guid> Handle(UpdatePageCommand request, CancellationToken ct)
     {
@@ -34,6 +38,7 @@ public async Task<Guid> Handle(UpdatePageCommand request, CancellationToken ct)
 
         await repo.UpdateAsync(page, ct);
 
+        logger.LogInformation("Page updated: {PageId}", page.Id);
         return page.Id;
     }
 }
\ No newline at end of file

From 17bfb6858f87b7f05f16549109b3626a7e322f8a Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:36:25 +0800
Subject: [PATCH 217/227] logging for category CUD

---
 .../CategoryFeature/CreateCategoryCommand.cs              | 8 +++++++-
 .../CategoryFeature/DeleteCategoryCommand.cs              | 7 ++++++-
 .../CategoryFeature/UpdateCategoryCommand.cs              | 7 ++++++-
 src/Moonglade.Core/PageFeature/CreatePageCommand.cs       | 4 ++--
 src/Moonglade.Core/PageFeature/DeletePageCommand.cs       | 4 ++--
 src/Moonglade.Core/PageFeature/UpdatePageCommand.cs       | 4 ++--
 src/Moonglade.Core/PostFeature/UpdatePostCommand.cs       | 2 +-
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
index 42d193f9c..85da377d2 100644
--- a/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/CreateCategoryCommand.cs
@@ -1,4 +1,5 @@
 using Edi.CacheAside.InMemory;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Specifications;
 using System.ComponentModel.DataAnnotations;
@@ -24,7 +25,10 @@ public class CreateCategoryCommand : IRequest
     public string Note { get; set; }
 }
 
-public class CreateCategoryCommandHandler(MoongladeRepository<CategoryEntity> catRepo, ICacheAside cache) : IRequestHandler<CreateCategoryCommand>
+public class CreateCategoryCommandHandler(
+    MoongladeRepository<CategoryEntity> catRepo,
+    ICacheAside cache,
+    ILogger<CreateCategoryCommandHandler> logger) : IRequestHandler<CreateCategoryCommand>
 {
     public async Task Handle(CreateCategoryCommand request, CancellationToken ct)
     {
@@ -41,5 +45,7 @@ public async Task Handle(CreateCategoryCommand request, CancellationToken ct)
 
         await catRepo.AddAsync(category, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");
+
+        logger.LogInformation("Category created: {Category}", category.Id);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
index 5bcb8e9da..fb687e82a 100644
--- a/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/DeleteCategoryCommand.cs
@@ -1,11 +1,15 @@
 using Edi.CacheAside.InMemory;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 
 namespace Moonglade.Core.CategoryFeature;
 
 public record DeleteCategoryCommand(Guid Id) : IRequest<OperationCode>;
 
-public class DeleteCategoryCommandHandler(MoongladeRepository<CategoryEntity> catRepo, ICacheAside cache)
+public class DeleteCategoryCommandHandler(
+    MoongladeRepository<CategoryEntity> catRepo,
+    ICacheAside cache,
+    ILogger<DeleteCategoryCommandHandler> logger)
     : IRequestHandler<DeleteCategoryCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteCategoryCommand request, CancellationToken ct)
@@ -18,6 +22,7 @@ public async Task<OperationCode> Handle(DeleteCategoryCommand request, Cancellat
         await catRepo.DeleteAsync(cat, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");
 
+        logger.LogInformation("Category deleted: {Category}", cat.Id);
         return OperationCode.Done;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
index 0d98b3a3b..19720f0f8 100644
--- a/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
+++ b/src/Moonglade.Core/CategoryFeature/UpdateCategoryCommand.cs
@@ -1,4 +1,5 @@
 using Edi.CacheAside.InMemory;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 
 namespace Moonglade.Core.CategoryFeature;
@@ -8,7 +9,10 @@ public class UpdateCategoryCommand : CreateCategoryCommand, IRequest<OperationCo
     public Guid Id { get; set; }
 }
 
-public class UpdateCategoryCommandHandler(MoongladeRepository<CategoryEntity> repo, ICacheAside cache) : IRequestHandler<UpdateCategoryCommand, OperationCode>
+public class UpdateCategoryCommandHandler(
+    MoongladeRepository<CategoryEntity> repo,
+    ICacheAside cache,
+    ILogger<UpdateCategoryCommandHandler> logger) : IRequestHandler<UpdateCategoryCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(UpdateCategoryCommand request, CancellationToken ct)
     {
@@ -22,6 +26,7 @@ public async Task<OperationCode> Handle(UpdateCategoryCommand request, Cancellat
         await repo.UpdateAsync(cat, ct);
         cache.Remove(BlogCachePartition.General.ToString(), "allcats");
 
+        logger.LogInformation("Category updated: {Category}", cat.Id);
         return OperationCode.Done;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
index a2e54a482..7b8e5a1bd 100644
--- a/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/CreatePageCommand.cs
@@ -6,8 +6,8 @@ namespace Moonglade.Core.PageFeature;
 public record CreatePageCommand(EditPageRequest Payload) : IRequest<Guid>;
 
 public class CreatePageCommandHandler(
-    MoongladeRepository<PageEntity> repo, 
-    IMediator mediator, 
+    MoongladeRepository<PageEntity> repo,
+    IMediator mediator,
     ILogger<CreatePageCommandHandler> logger) : IRequestHandler<CreatePageCommand, Guid>
 {
     public async Task<Guid> Handle(CreatePageCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
index a74f8eeeb..4e137cd7a 100644
--- a/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/DeletePageCommand.cs
@@ -6,8 +6,8 @@ namespace Moonglade.Core.PageFeature;
 public record DeletePageCommand(Guid Id) : IRequest<OperationCode>;
 
 public class DeletePageCommandHandler(
-    MoongladeRepository<PageEntity> repo, 
-    IMediator mediator, 
+    MoongladeRepository<PageEntity> repo,
+    IMediator mediator,
     ILogger<DeletePageCommandHandler> logger) : IRequestHandler<DeletePageCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeletePageCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
index 93a14cc03..68a22546f 100644
--- a/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
+++ b/src/Moonglade.Core/PageFeature/UpdatePageCommand.cs
@@ -6,8 +6,8 @@ namespace Moonglade.Core.PageFeature;
 public record UpdatePageCommand(Guid Id, EditPageRequest Payload) : IRequest<Guid>;
 
 public class UpdatePageCommandHandler(
-    MoongladeRepository<PageEntity> repo, 
-    IMediator mediator, 
+    MoongladeRepository<PageEntity> repo,
+    IMediator mediator,
     ILogger<UpdatePageCommandHandler> logger) : IRequestHandler<UpdatePageCommand, Guid>
 {
     public async Task<Guid> Handle(UpdatePageCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
index b27f56eb2..7aca0251b 100644
--- a/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
+++ b/src/Moonglade.Core/PostFeature/UpdatePostCommand.cs
@@ -28,7 +28,7 @@ public UpdatePostCommandHandler(
         MoongladeRepository<TagEntity> tagRepo,
         MoongladeRepository<PostEntity> postRepo,
         ICacheAside cache,
-        IBlogConfig blogConfig, 
+        IBlogConfig blogConfig,
         IConfiguration configuration,
         ILogger<UpdatePostCommandHandler> logger)
     {

From 9905ced3a99fb72b91c532f85661b181478c5a40 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:39:33 +0800
Subject: [PATCH 218/227] logger for tag CUD

---
 src/Moonglade.Core/TagFeature/CreateTagCommand.cs | 8 ++++++--
 src/Moonglade.Core/TagFeature/DeleteTagCommand.cs | 7 +++++--
 src/Moonglade.Core/TagFeature/UpdateTagCommand.cs | 8 ++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
index 7403df2ff..37848fbd6 100644
--- a/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/CreateTagCommand.cs
@@ -1,4 +1,5 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 using Moonglade.Data.Specifications;
 using Moonglade.Utils;
 
@@ -6,7 +7,9 @@ namespace Moonglade.Core.TagFeature;
 
 public record CreateTagCommand(string Name) : IRequest;
 
-public class CreateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<CreateTagCommand>
+public class CreateTagCommandHandler(
+    MoongladeRepository<TagEntity> repo,
+    ILogger<CreateTagCommandHandler> logger) : IRequestHandler<CreateTagCommand>
 {
     public async Task Handle(CreateTagCommand request, CancellationToken ct)
     {
@@ -22,5 +25,6 @@ public async Task Handle(CreateTagCommand request, CancellationToken ct)
         };
 
         await repo.AddAsync(newTag, ct);
+        logger.LogInformation("Tag created: {TagName}", request.Name);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
index fe5232f62..324a32474 100644
--- a/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/DeleteTagCommand.cs
@@ -1,4 +1,5 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 using Moonglade.Data.Specifications;
 
 namespace Moonglade.Core.TagFeature;
@@ -7,7 +8,8 @@ public record DeleteTagCommand(int Id) : IRequest<OperationCode>;
 
 public class DeleteTagCommandHandler(
     MoongladeRepository<TagEntity> tagRepo,
-    MoongladeRepository<PostTagEntity> postTagRepo)
+    MoongladeRepository<PostTagEntity> postTagRepo,
+    ILogger<DeleteTagCommandHandler> logger)
     : IRequestHandler<DeleteTagCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationToken ct)
@@ -22,6 +24,7 @@ public async Task<OperationCode> Handle(DeleteTagCommand request, CancellationTo
         // 2. Delte Tag itslef
         await tagRepo.DeleteAsync(tag, ct);
 
+        logger.LogInformation("Deleted tag: {TagId}", request.Id);
         return OperationCode.Done;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
index 3cd60caa9..2495fea28 100644
--- a/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
+++ b/src/Moonglade.Core/TagFeature/UpdateTagCommand.cs
@@ -1,11 +1,14 @@
-using Moonglade.Data;
+using Microsoft.Extensions.Logging;
+using Moonglade.Data;
 using Moonglade.Utils;
 
 namespace Moonglade.Core.TagFeature;
 
 public record UpdateTagCommand(int Id, string Name) : IRequest<OperationCode>;
 
-public class UpdateTagCommandHandler(MoongladeRepository<TagEntity> repo) : IRequestHandler<UpdateTagCommand, OperationCode>
+public class UpdateTagCommandHandler(
+    MoongladeRepository<TagEntity> repo,
+    ILogger<UpdateTagCommandHandler> logger) : IRequestHandler<UpdateTagCommand, OperationCode>
 {
     public async Task<OperationCode> Handle(UpdateTagCommand request, CancellationToken ct)
     {
@@ -17,6 +20,7 @@ public async Task<OperationCode> Handle(UpdateTagCommand request, CancellationTo
         tag.NormalizedName = Helper.NormalizeName(name, Helper.TagNormalizationDictionary);
         await repo.UpdateAsync(tag, ct);
 
+        logger.LogInformation("Updated tag: {TagId}", request.Id);
         return OperationCode.Done;
     }
 }
\ No newline at end of file

From dac06fd20eddc299f1c62c735dd278275aa40ad0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:43:55 +0800
Subject: [PATCH 219/227] logging for comments

---
 src/Moonglade.Comments/CreateCommentCommand.cs  | 3 +++
 src/Moonglade.Comments/DeleteCommentsCommand.cs | 7 ++++++-
 src/Moonglade.Comments/ReplyCommentCommand.cs   | 3 +++
 src/Moonglade.Comments/ToggleApprovalCommand.cs | 7 ++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Comments/CreateCommentCommand.cs b/src/Moonglade.Comments/CreateCommentCommand.cs
index 3d9df75ed..62dd13341 100644
--- a/src/Moonglade.Comments/CreateCommentCommand.cs
+++ b/src/Moonglade.Comments/CreateCommentCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Configuration;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
@@ -17,6 +18,7 @@ public class CreateCommentCommand(Guid postId, CommentRequest payload, string ip
 
 public class CreateCommentCommandHandler(
     IBlogConfig blogConfig,
+    ILogger<CreateCommentCommandHandler> logger,
     MoongladeRepository<PostEntity> postRepo,
     MoongladeRepository<CommentEntity> commentRepo) : IRequestHandler<CreateCommentCommand, CommentDetailedItem>
 {
@@ -57,6 +59,7 @@ public async Task<CommentDetailedItem> Handle(CreateCommentCommand request, Canc
             Username = model.Username
         };
 
+        logger.LogInformation("New comment created: {0}", item.Id);
         return item;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index 5e0bc4fa8..dda7ea9c9 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Specifications;
@@ -7,7 +8,9 @@ namespace Moonglade.Comments;
 
 public record DeleteCommentsCommand(Guid[] Ids) : IRequest;
 
-public class DeleteCommentsCommandHandler(MoongladeRepository<CommentEntity> commentRepo, MoongladeRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<DeleteCommentsCommand>
+public class DeleteCommentsCommandHandler(
+    MoongladeRepository<CommentEntity> commentRepo, 
+    ILogger<DeleteCommentsCommandHandler> logger) : IRequestHandler<DeleteCommentsCommand>
 {
     public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
     {
@@ -18,5 +21,7 @@ public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
             cmt.Replies.Clear();
             await commentRepo.DeleteAsync(cmt, ct);
         }
+
+        logger.LogInformation("Deleted {Count} comment(s)", comments.Count);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Comments/ReplyCommentCommand.cs b/src/Moonglade.Comments/ReplyCommentCommand.cs
index 85e143796..21ca456f8 100644
--- a/src/Moonglade.Comments/ReplyCommentCommand.cs
+++ b/src/Moonglade.Comments/ReplyCommentCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Utils;
@@ -8,6 +9,7 @@ namespace Moonglade.Comments;
 public record ReplyCommentCommand(Guid CommentId, string ReplyContent) : IRequest<CommentReply>;
 
 public class ReplyCommentCommandHandler(
+    ILogger<ReplyCommentCommandHandler> logger,
     MoongladeRepository<CommentEntity> commentRepo,
     MoongladeRepository<CommentReplyEntity> commentReplyRepo) : IRequestHandler<ReplyCommentCommand, CommentReply>
 {
@@ -42,6 +44,7 @@ public async Task<CommentReply> Handle(ReplyCommentCommand request, Cancellation
             Title = cmt.Post.Title
         };
 
+        logger.LogInformation("Replied comment '{CommentId}' with reply '{ReplyId}'", request.CommentId, id);
         return reply;
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.Comments/ToggleApprovalCommand.cs b/src/Moonglade.Comments/ToggleApprovalCommand.cs
index d7afb8800..c600a1975 100644
--- a/src/Moonglade.Comments/ToggleApprovalCommand.cs
+++ b/src/Moonglade.Comments/ToggleApprovalCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Data.Specifications;
@@ -7,7 +8,9 @@ namespace Moonglade.Comments;
 
 public record ToggleApprovalCommand(Guid[] CommentIds) : IRequest;
 
-public class ToggleApprovalCommandHandler(MoongladeRepository<CommentEntity> repo) : IRequestHandler<ToggleApprovalCommand>
+public class ToggleApprovalCommandHandler(
+    MoongladeRepository<CommentEntity> repo, 
+    ILogger<ToggleApprovalCommandHandler> logger) : IRequestHandler<ToggleApprovalCommand>
 {
     public async Task Handle(ToggleApprovalCommand request, CancellationToken ct)
     {
@@ -18,5 +21,7 @@ public async Task Handle(ToggleApprovalCommand request, CancellationToken ct)
             cmt.IsApproved = !cmt.IsApproved;
             await repo.UpdateAsync(cmt, ct);
         }
+
+        logger.LogInformation("Toggled approval status for {Count} comment(s)", comments.Count);
     }
 }
\ No newline at end of file

From 47a8bfee42594c5208cbee813714421f5c40d72e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:44:49 +0800
Subject: [PATCH 220/227] Update AddLinkCommand.cs

---
 src/Moonglade.FriendLink/AddLinkCommand.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.FriendLink/AddLinkCommand.cs b/src/Moonglade.FriendLink/AddLinkCommand.cs
index eef38ea47..2bb48a65a 100644
--- a/src/Moonglade.FriendLink/AddLinkCommand.cs
+++ b/src/Moonglade.FriendLink/AddLinkCommand.cs
@@ -3,6 +3,7 @@
 using Moonglade.Data.Entities;
 using Moonglade.Utils;
 using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Logging;
 
 namespace Moonglade.FriendLink;
 
@@ -33,7 +34,9 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 
 public record AddLinkCommand(EditLinkRequest Payload) : IRequest;
 
-public class AddLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<AddLinkCommand>
+public class AddLinkCommandHandler(
+    MoongladeRepository<FriendLinkEntity> repo, 
+    ILogger<AddLinkCommandHandler> logger) : IRequestHandler<AddLinkCommand>
 {
     public async Task Handle(AddLinkCommand request, CancellationToken ct)
     {
@@ -46,5 +49,7 @@ public async Task Handle(AddLinkCommand request, CancellationToken ct)
         };
 
         await repo.AddAsync(link, ct);
+        
+        logger.LogInformation("Added a new friend link: {Title}", link.Title);
     }
 }
\ No newline at end of file

From a1569deb3f2e2ac3809b3fa637ad9ed908edd9d0 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:46:07 +0800
Subject: [PATCH 221/227] logging for friend link CUD

---
 src/Moonglade.Comments/DeleteCommentsCommand.cs | 2 +-
 src/Moonglade.Comments/ToggleApprovalCommand.cs | 2 +-
 src/Moonglade.FriendLink/AddLinkCommand.cs      | 6 +++---
 src/Moonglade.FriendLink/DeleteLinkCommand.cs   | 7 ++++++-
 src/Moonglade.FriendLink/UpdateLinkCommand.cs   | 7 ++++++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Moonglade.Comments/DeleteCommentsCommand.cs b/src/Moonglade.Comments/DeleteCommentsCommand.cs
index dda7ea9c9..d4f8c6182 100644
--- a/src/Moonglade.Comments/DeleteCommentsCommand.cs
+++ b/src/Moonglade.Comments/DeleteCommentsCommand.cs
@@ -9,7 +9,7 @@ namespace Moonglade.Comments;
 public record DeleteCommentsCommand(Guid[] Ids) : IRequest;
 
 public class DeleteCommentsCommandHandler(
-    MoongladeRepository<CommentEntity> commentRepo, 
+    MoongladeRepository<CommentEntity> commentRepo,
     ILogger<DeleteCommentsCommandHandler> logger) : IRequestHandler<DeleteCommentsCommand>
 {
     public async Task Handle(DeleteCommentsCommand request, CancellationToken ct)
diff --git a/src/Moonglade.Comments/ToggleApprovalCommand.cs b/src/Moonglade.Comments/ToggleApprovalCommand.cs
index c600a1975..3400046b2 100644
--- a/src/Moonglade.Comments/ToggleApprovalCommand.cs
+++ b/src/Moonglade.Comments/ToggleApprovalCommand.cs
@@ -9,7 +9,7 @@ namespace Moonglade.Comments;
 public record ToggleApprovalCommand(Guid[] CommentIds) : IRequest;
 
 public class ToggleApprovalCommandHandler(
-    MoongladeRepository<CommentEntity> repo, 
+    MoongladeRepository<CommentEntity> repo,
     ILogger<ToggleApprovalCommandHandler> logger) : IRequestHandler<ToggleApprovalCommand>
 {
     public async Task Handle(ToggleApprovalCommand request, CancellationToken ct)
diff --git a/src/Moonglade.FriendLink/AddLinkCommand.cs b/src/Moonglade.FriendLink/AddLinkCommand.cs
index 2bb48a65a..0401291d5 100644
--- a/src/Moonglade.FriendLink/AddLinkCommand.cs
+++ b/src/Moonglade.FriendLink/AddLinkCommand.cs
@@ -1,9 +1,9 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Utils;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Logging;
 
 namespace Moonglade.FriendLink;
 
@@ -35,7 +35,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 public record AddLinkCommand(EditLinkRequest Payload) : IRequest;
 
 public class AddLinkCommandHandler(
-    MoongladeRepository<FriendLinkEntity> repo, 
+    MoongladeRepository<FriendLinkEntity> repo,
     ILogger<AddLinkCommandHandler> logger) : IRequestHandler<AddLinkCommand>
 {
     public async Task Handle(AddLinkCommand request, CancellationToken ct)
@@ -49,7 +49,7 @@ public async Task Handle(AddLinkCommand request, CancellationToken ct)
         };
 
         await repo.AddAsync(link, ct);
-        
+
         logger.LogInformation("Added a new friend link: {Title}", link.Title);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.FriendLink/DeleteLinkCommand.cs b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
index b2d9d570b..21c19807f 100644
--- a/src/Moonglade.FriendLink/DeleteLinkCommand.cs
+++ b/src/Moonglade.FriendLink/DeleteLinkCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 
@@ -6,7 +7,9 @@ namespace Moonglade.FriendLink;
 
 public record DeleteLinkCommand(Guid Id) : IRequest;
 
-public class DeleteLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<DeleteLinkCommand>
+public class DeleteLinkCommandHandler(
+    MoongladeRepository<FriendLinkEntity> repo,
+    ILogger<DeleteLinkCommandHandler> logger) : IRequestHandler<DeleteLinkCommand>
 {
     public async Task Handle(DeleteLinkCommand request, CancellationToken ct)
     {
@@ -15,5 +18,7 @@ public async Task Handle(DeleteLinkCommand request, CancellationToken ct)
         {
             await repo.DeleteAsync(link, ct);
         }
+
+        logger.LogInformation("Deleted a friend link: {Title}", link?.Title);
     }
 }
\ No newline at end of file
diff --git a/src/Moonglade.FriendLink/UpdateLinkCommand.cs b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
index 198baa571..f11dcd4e1 100644
--- a/src/Moonglade.FriendLink/UpdateLinkCommand.cs
+++ b/src/Moonglade.FriendLink/UpdateLinkCommand.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Moonglade.Data;
 using Moonglade.Data.Entities;
 using Moonglade.Utils;
@@ -7,7 +8,9 @@ namespace Moonglade.FriendLink;
 
 public record UpdateLinkCommand(Guid Id, EditLinkRequest Payload) : IRequest;
 
-public class UpdateLinkCommandHandler(MoongladeRepository<FriendLinkEntity> repo) : IRequestHandler<UpdateLinkCommand>
+public class UpdateLinkCommandHandler(
+    MoongladeRepository<FriendLinkEntity> repo,
+    ILogger<UpdateLinkCommandHandler> logger) : IRequestHandler<UpdateLinkCommand>
 {
     public async Task Handle(UpdateLinkCommand request, CancellationToken ct)
     {
@@ -25,5 +28,7 @@ public async Task Handle(UpdateLinkCommand request, CancellationToken ct)
 
             await repo.UpdateAsync(link, ct);
         }
+
+        logger.LogInformation("Updated link: {LinkId}", request.Id);
     }
 }
\ No newline at end of file

From 4469b5aced3d04f98a771fb5f3cfb0d0c5869a14 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:48:45 +0800
Subject: [PATCH 222/227] AddAzureWebAppDiagnostics only when running on App
 Service

---
 src/Moonglade.Web/Program.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index b22502c4a..6713b46f2 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -23,7 +23,11 @@
 var builder = WebApplication.CreateBuilder(args);
 builder.WriteParameterTable();
 
-builder.Logging.AddAzureWebAppDiagnostics();
+if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
+{
+    builder.Logging.AddAzureWebAppDiagnostics();
+}
+
 builder.Configuration.AddJsonFile("manifesticons.json", false, true);
 
 ConfigureServices(builder.Services);

From 070253f151b81085e52456322baf1fa30bbd458d Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:51:31 +0800
Subject: [PATCH 223/227] code refact

---
 src/Moonglade.Utils/Helper.cs              | 5 +++++
 src/Moonglade.Web/Pages/Admin/About.cshtml | 2 +-
 src/Moonglade.Web/Program.cs               | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index 706c49c07..cccf73aa7 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -41,6 +41,11 @@ public static string AppVersion
         }
     }
 
+    public static bool IsRunningOnAzureAppService()
+    {
+        return !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME"));
+    }
+
     public static string GetClientIP(HttpContext context) => context?.Connection.RemoteIpAddress?.ToString();
 
     public static int ComputeCheckSum(string input)
diff --git a/src/Moonglade.Web/Pages/Admin/About.cshtml b/src/Moonglade.Web/Pages/Admin/About.cshtml
index 2684ae7b0..576d8e852 100644
--- a/src/Moonglade.Web/Pages/Admin/About.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/About.cshtml
@@ -94,7 +94,7 @@
                     <td class="text-muted">@(Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")</td>
                 </tr>
 
-                @if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
+                @if (Helper.IsRunningOnAzureAppService())
                 {
                     <tr>
                         <td>@SharedLocalizer["Azure App Service"]</td>
diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index 6713b46f2..616926357 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -23,7 +23,7 @@
 var builder = WebApplication.CreateBuilder(args);
 builder.WriteParameterTable();
 
-if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
+if (Helper.IsRunningOnAzureAppService())
 {
     builder.Logging.AddAzureWebAppDiagnostics();
 }

From 1cd88cf68e2b3d07240af1bd2f5723fc2340a91e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:53:07 +0800
Subject: [PATCH 224/227] rename

---
 src/Moonglade.Email.Client/ServiceCollectionExtension.cs | 2 +-
 src/Moonglade.Web/Program.cs                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Email.Client/ServiceCollectionExtension.cs b/src/Moonglade.Email.Client/ServiceCollectionExtension.cs
index f247499d3..eb968cae6 100644
--- a/src/Moonglade.Email.Client/ServiceCollectionExtension.cs
+++ b/src/Moonglade.Email.Client/ServiceCollectionExtension.cs
@@ -4,7 +4,7 @@ namespace Moonglade.Email.Client;
 
 public static class ServiceCollectionExtension
 {
-    public static IServiceCollection AddEmailSending(this IServiceCollection services)
+    public static IServiceCollection AddEmailClient(this IServiceCollection services)
     {
         services.AddHttpClient<IMoongladeEmailClient, MoongladeEmailClient>();
         return services;
diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index 616926357..c3ea3cedb 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -111,7 +111,7 @@ void ConfigureServices(IServiceCollection services)
             .AddImageStorage(builder.Configuration, options => options.ContentRootPath = builder.Environment.ContentRootPath)
             .Configure<List<ManifestIcon>>(builder.Configuration.GetSection("ManifestIcons"));
 
-    services.AddEmailSending();
+    services.AddEmailClient();
     services.AddContentModerator(builder.Configuration);
 
     string dbType = builder.Configuration.GetConnectionString("DatabaseType");

From a7a11c8a7de0ab7933bc4d9cc9e1664e93f7752e Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:55:28 +0800
Subject: [PATCH 225/227] code refact

---
 src/Moonglade.Utils/Helper.cs              | 5 +++++
 src/Moonglade.Web/Pages/Admin/About.cshtml | 2 +-
 src/Moonglade.Web/Program.cs               | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Moonglade.Utils/Helper.cs b/src/Moonglade.Utils/Helper.cs
index cccf73aa7..28f492cfb 100644
--- a/src/Moonglade.Utils/Helper.cs
+++ b/src/Moonglade.Utils/Helper.cs
@@ -46,6 +46,11 @@ public static bool IsRunningOnAzureAppService()
         return !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME"));
     }
 
+    public static bool IsRunningInDocker()
+    {
+        return Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true";
+    }
+
     public static string GetClientIP(HttpContext context) => context?.Connection.RemoteIpAddress?.ToString();
 
     public static int ComputeCheckSum(string input)
diff --git a/src/Moonglade.Web/Pages/Admin/About.cshtml b/src/Moonglade.Web/Pages/Admin/About.cshtml
index 576d8e852..b35724ee1 100644
--- a/src/Moonglade.Web/Pages/Admin/About.cshtml
+++ b/src/Moonglade.Web/Pages/Admin/About.cshtml
@@ -91,7 +91,7 @@
                 </tr>
                 <tr>
                     <td>@SharedLocalizer["Docker Container"]</td>
-                    <td class="text-muted">@(Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")</td>
+                    <td class="text-muted">@Helper.IsRunningInDocker()</td>
                 </tr>
 
                 @if (Helper.IsRunningOnAzureAppService())
diff --git a/src/Moonglade.Web/Program.cs b/src/Moonglade.Web/Program.cs
index c3ea3cedb..f35c3eb51 100644
--- a/src/Moonglade.Web/Program.cs
+++ b/src/Moonglade.Web/Program.cs
@@ -241,7 +241,7 @@ void UseSmartXFFHeader(WebApplication webApplication)
         // Fix docker deployments on Azure App Service blows up with Azure AD authentication
         // https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/proxy-load-balancer?view=aspnetcore-6.0
         // "Outside of using IIS Integration when hosting out-of-process, Forwarded Headers Middleware isn't enabled by default."
-        if (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")
+        if (Helper.IsRunningInDocker())
         {
             // Fix #712
             // Adding KnownProxies will make Azure App Service boom boom with Azure AD redirect URL

From 02182792e1e597dc1e0ff67b5e3f542a0b50bda9 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Wed, 8 May 2024 15:59:04 +0800
Subject: [PATCH 226/227] Delete ItemSliceAndTotalPosition.cs

---
 .../PagedList/ItemSliceAndTotalPosition.cs      | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/Moonglade.Web/PagedList/ItemSliceAndTotalPosition.cs

diff --git a/src/Moonglade.Web/PagedList/ItemSliceAndTotalPosition.cs b/src/Moonglade.Web/PagedList/ItemSliceAndTotalPosition.cs
deleted file mode 100644
index 8f8338fbe..000000000
--- a/src/Moonglade.Web/PagedList/ItemSliceAndTotalPosition.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Moonglade.Web.PagedList;
-
-/// <summary>
-/// A two-state enum that controls the position of ItemSliceAndTotal text within PagedList items.
-/// </summary>
-public enum ItemSliceAndTotalPosition
-{
-    /// <summary>
-    /// Shows ItemSliceAndTotal info at the beginning of the PagedList items.
-    /// </summary>
-    Start,
-
-    /// <summary>
-    /// Shows ItemSliceAndTotal info at the end of the PagedList items.
-    /// </summary>
-    End
-}
\ No newline at end of file

From 07b1f980567e653a4bb009471d9efe305efbcae7 Mon Sep 17 00:00:00 2001
From: Edi Wang <Edi.Wang@outlook.com>
Date: Thu, 9 May 2024 11:52:32 +0800
Subject: [PATCH 227/227] bump version

---
 src/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 00b8272ee..a14e0a905 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,6 @@
     <Copyright>(C) 2024 edi.wang@outlook.com</Copyright>
     <AssemblyVersion>14.4.0.0</AssemblyVersion>
     <FileVersion>14.4.0.0</FileVersion>
-    <Version>14.4.0-rc.2</Version>
+    <Version>14.4.0</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file