From ce19f164dc542e4636a3aacd1029284ce0610573 Mon Sep 17 00:00:00 2001 From: the1mason Date: Fri, 27 Sep 2024 04:29:55 +0500 Subject: [PATCH] Fixed something... It's 4:30 Idk... --- src/FastBlog.Core/Db/Migrations/202409212014_Init.cs | 1 - src/FastBlog.Core/DependencyInjection.cs | 1 - src/FastBlog.Core/Models/Blogs/BlogMeta.cs | 1 - src/FastBlog.Core/Repositories/BlogMetaRepository.cs | 11 ++++------- src/FastBlog.Web/Views/Blogs/Index.cshtml | 9 +++++++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/FastBlog.Core/Db/Migrations/202409212014_Init.cs b/src/FastBlog.Core/Db/Migrations/202409212014_Init.cs index 974a66d..4b7397a 100644 --- a/src/FastBlog.Core/Db/Migrations/202409212014_Init.cs +++ b/src/FastBlog.Core/Db/Migrations/202409212014_Init.cs @@ -18,7 +18,6 @@ public class Init : Migration .WithColumn("ModifiedAt").AsDateTime() .WithColumn("Signature").AsString().Nullable() .WithColumn("FullWidth").AsBoolean() - .WithColumn("Deleted").AsBoolean() .WithColumn("Visible").AsBoolean(); } diff --git a/src/FastBlog.Core/DependencyInjection.cs b/src/FastBlog.Core/DependencyInjection.cs index 13fc01d..3b1b5f7 100644 --- a/src/FastBlog.Core/DependencyInjection.cs +++ b/src/FastBlog.Core/DependencyInjection.cs @@ -69,7 +69,6 @@ public static class DependencyInjection ModifiedAt = DateTime.UtcNow, SourceLocation = "welcome.md", ShowDetails = false, - Deleted = false, Visible = false } }); diff --git a/src/FastBlog.Core/Models/Blogs/BlogMeta.cs b/src/FastBlog.Core/Models/Blogs/BlogMeta.cs index 2f270eb..867e7d7 100644 --- a/src/FastBlog.Core/Models/Blogs/BlogMeta.cs +++ b/src/FastBlog.Core/Models/Blogs/BlogMeta.cs @@ -12,6 +12,5 @@ public sealed class BlogMeta public DateTime ModifiedAt { get; init; } public string? Signature { get; init; } public bool FullWidth { get; init; } = false; - public bool Deleted { get; init; } = false; public bool Visible { get; init; } = false; } \ No newline at end of file diff --git a/src/FastBlog.Core/Repositories/BlogMetaRepository.cs b/src/FastBlog.Core/Repositories/BlogMetaRepository.cs index 322dc38..c7961f9 100644 --- a/src/FastBlog.Core/Repositories/BlogMetaRepository.cs +++ b/src/FastBlog.Core/Repositories/BlogMetaRepository.cs @@ -22,7 +22,6 @@ public sealed class BlogMetaRepository(SqliteConnectionFactory connectionFactory const string sql = """ select * from Blogs where (slug = @slug or id = cast(@slug as integer)) - and deleted = 0 and CreatedAt <= datetime('now') """; @@ -38,7 +37,6 @@ public sealed class BlogMetaRepository(SqliteConnectionFactory connectionFactory const string sql = """ select * from Blogs where id = @id - and deleted = 0 """; return await connection.QueryFirstOrDefaultAsync(sql, new { id }); @@ -47,8 +45,7 @@ public sealed class BlogMetaRepository(SqliteConnectionFactory connectionFactory public async Task Delete(int id) { const string sql = """ - update Blogs - set Deleted = 1 + delete from Blogs where id = @id """; @@ -62,8 +59,8 @@ public sealed class BlogMetaRepository(SqliteConnectionFactory connectionFactory using var connection = connectionFactory.Create(); const string sql = """ - insert into Blogs (Title, SourceLocation, Slug, ShowDetails, ImageUrl, CreatedAt, ModifiedAt, Signature, FullWidth, Deleted, Visible) - values (@Title, @SourceLocation, @Slug, @ShowDetails, @ImageUrl, @CreatedAt, @ModifiedAt, @Signature, @FullWidth, @Deleted, @Visible) + insert into Blogs (Title, SourceLocation, Slug, ShowDetails, ImageUrl, CreatedAt, ModifiedAt, Signature, FullWidth, Visible) + values (@Title, @SourceLocation, @Slug, @ShowDetails, @ImageUrl, @CreatedAt, @ModifiedAt, @Signature, @FullWidth, @Visible) returning * """; try @@ -85,7 +82,7 @@ public sealed class BlogMetaRepository(SqliteConnectionFactory connectionFactory const string sql = """ update Blogs - set Title = @Title, SourceLocation = @SourceLocation, Slug = @Slug, ShowDetails = @ShowDetails, ImageUrl = @ImageUrl, CreatedAt = @CreatedAt, ModifiedAt = @ModifiedAt, Signature = @Signature, FullWidth = @FullWidth, Deleted = @Deleted, Visible = @Visible + set Title = @Title, SourceLocation = @SourceLocation, Slug = @Slug, ShowDetails = @ShowDetails, ImageUrl = @ImageUrl, CreatedAt = @CreatedAt, ModifiedAt = @ModifiedAt, Signature = @Signature, FullWidth = @FullWidth, Visible = @Visible where id = @Id returning * """; diff --git a/src/FastBlog.Web/Views/Blogs/Index.cshtml b/src/FastBlog.Web/Views/Blogs/Index.cshtml index 64af888..a44c140 100644 --- a/src/FastBlog.Web/Views/Blogs/Index.cshtml +++ b/src/FastBlog.Web/Views/Blogs/Index.cshtml @@ -1,5 +1,6 @@ @using Ganss.Xss @using Markdig; +@using Markdig.Extensions.AutoIdentifiers @using Pek.Markdig.HighlightJs @model FastBlog.Core.Models.Blogs.Blog @@ -9,10 +10,14 @@ .UseSmartyPants() .UseEmojiAndSmiley() .UseAlertBlocks() - .UseAdvancedExtensions() - .UseHighlightJs(); + .UseAdvancedExtensions(); + + pipelineBuilder.Extensions.Remove(pipelineBuilder.Extensions.Find()!); + pipelineBuilder.UseAutoIdentifiers(AutoIdentifierOptions.GitHub); + pipelineBuilder.UseHighlightJs(); var sanitizer = new HtmlSanitizer(); sanitizer.AllowedAttributes.Add("class"); + sanitizer.AllowedAttributes.Add("id"); var pipeline = pipelineBuilder.Build(); }