Merge pull request poppastring#664 from thousandtyone/main

Support for Markdown in Comments
clemensv · Dec 20, 2022 · deb7265 · deb7265
2 parents 3807103 + cb7fb94
commit deb7265
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 3 deletions.
diff --git a/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs b/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs
@@ -106,6 +106,8 @@ public interface ISiteConfig
 
         bool EnableComments { get; set; }
 
+        bool AllowMarkdownInComments {get; set;}
+
         bool EnableCommentApi { get; set; }
 
         bool EnableConfigEditService { get; set; }

diff --git a/source/DasBlog.Services/ConfigFile/SiteConfig.cs b/source/DasBlog.Services/ConfigFile/SiteConfig.cs
@@ -83,6 +83,7 @@ public SiteConfig() { }
         public string TinyMCEApiKey { get; set; }
         public bool EnableBloggerApi { get; set; }
         public bool EnableComments { get; set; }
+        public bool AllowMarkdownInComments {get; set;}
         public bool EnableCommentApi { get; set; }
         public bool EnableConfigEditService { get; set; }
         public bool EnableEditService { get; set; }

diff --git a/source/DasBlog.Tests/UnitTests/Config/site.config b/source/DasBlog.Tests/UnitTests/Config/site.config
@@ -62,6 +62,7 @@
   <DaysCommentsAllowed>360</DaysCommentsAllowed>
   <EnableCommentDays>true</EnableCommentDays>
   <EnableComments>true</EnableComments>
+  <AllowMarkdownInComments>true</AllowMarkdownInComments>
   <CommentsRequireApproval>false</CommentsRequireApproval>
   <CheesySpamQ>2+5=?</CheesySpamQ>
   <CheesySpamA>7</CheesySpamA>
@@ -83,6 +84,7 @@
     <tag name="ul" attributes="" allowed="true" />
     <tag name="ol" attributes="" allowed="true" />
     <tag name="li" attributes="" allowed="true" />
+    <tag name="p" attributes="" allowed="true" />
   </validCommentTags>
 
   <ChannelImageUrl>images/zenicon.jpg</ChannelImageUrl>
@@ -194,4 +196,4 @@
   <BypassSpamOpenIdComment>false</BypassSpamOpenIdComment>
   <AMPPagesEnabled>false</AMPPagesEnabled>
   <RSSEndPointRewrite></RSSEndPointRewrite>
-</SiteConfig>
+</SiteConfig>
diff --git a/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs b/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs
@@ -170,5 +170,6 @@ public class SiteConfigTest : ISiteConfig
 		public string DefaultSources { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 		public string MastodonServerUrl { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 		public string MastodonAccount { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-	}
+        public bool AllowMarkdownInComments { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+       }
 }
diff --git a/source/DasBlog.Web.UI/Config/site.Development.config b/source/DasBlog.Web.UI/Config/site.Development.config
@@ -65,6 +65,8 @@
   <DaysCommentsAllowed>360</DaysCommentsAllowed>
   <EnableCommentDays>true</EnableCommentDays>
   <EnableComments>true</EnableComments>
+  <AllowMarkdownInComments>false</AllowMarkdownInComments>
+
   <CommentsRequireApproval>false</CommentsRequireApproval>
   <CheesySpamQ>2+5=?</CheesySpamQ>
   <CheesySpamA>7</CheesySpamA>
@@ -87,6 +89,7 @@
     <tag name="ul" attributes="" allowed="true" />
     <tag name="ol" attributes="" allowed="true" />
     <tag name="li" attributes="" allowed="true" />
+    <tag name="p" attributes="" allowed="true" /> 
   </validCommentTags>
 
   <ChannelImageUrl>images/zenicon.jpg</ChannelImageUrl>

diff --git a/source/DasBlog.Web.UI/Config/site.config b/source/DasBlog.Web.UI/Config/site.config
@@ -65,6 +65,7 @@
   <DaysCommentsAllowed>360</DaysCommentsAllowed>
   <EnableCommentDays>true</EnableCommentDays>
   <EnableComments>true</EnableComments>
+  <AllowMarkdownInComments>false</AllowMarkdownInComments>
   <CommentsRequireApproval>false</CommentsRequireApproval>
   <CheesySpamQ>2+5=?</CheesySpamQ>
   <CheesySpamA>7</CheesySpamA>
@@ -87,6 +88,7 @@
     <tag name="ul" attributes="" allowed="true" />
     <tag name="ol" attributes="" allowed="true" />
     <tag name="li" attributes="" allowed="true" />
+    <tag name="p" attributes="" allowed="true" />
   </validCommentTags>
 
   <ChannelImageUrl>images/zenicon.jpg</ChannelImageUrl>

diff --git a/source/DasBlog.Web.UI/Controllers/BlogPostController.cs b/source/DasBlog.Web.UI/Controllers/BlogPostController.cs
@@ -19,6 +19,7 @@
 using System.Linq;
 using System.Net;
 using reCAPTCHA.AspNetCore;
+using Markdig;
 
 namespace DasBlog.Web.Controllers
 {
@@ -36,7 +37,6 @@ public class BlogPostController : DasBlogBaseController
 		private readonly IMemoryCache memoryCache;
 		private readonly IRecaptchaService recaptcha;
 
-
 		public BlogPostController(IBlogManager blogManager, IHttpContextAccessor httpContextAccessor, IDasBlogSettings dasBlogSettings,
 									IMapper mapper, ICategoryManager categoryManager, IFileSystemBinaryManager binaryManager, ILogger<BlogPostController> logger,
 									IBlogPostViewModelCreator modelViewCreator, IMemoryCache memoryCache, IRecaptchaService recaptcha)
@@ -409,6 +409,12 @@ public IActionResult AddComment(AddCommentViewModel addcomment)
 				errors.Add("Comments are disabled on the site.");
 			}
 
+            if(dasBlogSettings.SiteConfiguration.AllowMarkdownInComments)
+            {
+                var pipeline = new MarkdownPipelineBuilder().UseReferralLinks("nofollow").Build();
+                addcomment.Content = Markdown.ToHtml(addcomment.Content, pipeline);
+            }
+
 			// Optional in case of Captcha. Commenting the settings in the config file 
 			// Will disable this check. People will typically disable this when using captcha.
 			if (!string.IsNullOrEmpty(dasBlogSettings.SiteConfiguration.CheesySpamQ) &&

diff --git a/source/DasBlog.Web.UI/DasBlog.Web.csproj b/source/DasBlog.Web.UI/DasBlog.Web.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Coravel" Version="4.1.2" />
+    <PackageReference Include="Markdig" Version="0.30.4" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />

diff --git a/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs b/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs
@@ -123,6 +123,10 @@ public class SiteViewModel
 		[Description("Allow comments on your blog posts")]
 		public bool EnableComments { get; set; }
 
+        [DisplayName("Allow Markdown in comments")]
+        [Description("Allow the use of Markdown In Comments")]
+        public bool AllowMarkdownInComments { get; set; }
+
 		[DisplayName("Enable comment days limitation")]
 		[Description("Once enabled comments are allowed as defined by 'Days Comments Allowed'")]
 		public bool EnableCommentDays { get; set; }

diff --git a/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml b/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml
@@ -247,6 +247,15 @@
         </div>
     </div>
 
+    <div class="form-check row mb-3">
+        <div class="col-sm-10 offset-sm-2">
+            <div class="col-sm-10">
+                @Html.CheckBoxFor(m => @Model.SiteConfig.AllowMarkdownInComments, new { @class = "form-check-input form-check-input" })
+            </div>
+            @Html.LabelFor(m => @Model.SiteConfig.AllowMarkdownInComments, null, new { @class = "col-check-label col-sm-2" })
+        </div>
+    </div>
+
     <div class="form-check row mb-3">
         <div class="col-sm-10 offset-sm-2">
             <div class="col-sm-2">