Improved article body formatting

Wave/Components/Pages/Partials/ArticleEditorPartial.razor

@@ -188,24 +188,13 @@
 				Article.PublishDate = Model.PublishDate.Value;
 			if (Article.Status is ArticleStatus.Published && Article.PublishDate < DateTimeOffset.Now) {
 				// can't change slugs when the article is public
-			} else if (!string.IsNullOrWhiteSpace(Model.Slug) || string.IsNullOrWhiteSpace(Article.Slug)) {
+			} else {
-				string baseSlug = Model.Slug ?? Article.Title;
+				Article.UpdateSlug(Model.Slug);
-				baseSlug = baseSlug.ToLowerInvariant()[..Math.Min(64, baseSlug.Length)];
-				string slug = Uri.EscapeDataString(baseSlug).Replace("-", "+").Replace("%20", "-");
-				// if our escaping increases the slug length, there is a chance it ends with an escape 
-				// character, so if this overshoot is not divisible by 3, then we risk cutting of the 
-				// escape character, so we need to remove it in it's entirely if that's the case
-				int escapeTrimOvershoot = Math.Max(0, 3 - (slug.Length - baseSlug.Length) % 3);
-				// if the slug already fits 64 character, there will be no cutoff in the next operation anyway,
-				// so we don't need to fix what is described in the previous comment
-				if (slug.Length <= 64) escapeTrimOvershoot = 0;
-				Article.Slug = slug[..Math.Min(slug.Length, 64 - escapeTrimOvershoot)];
 				Model.Slug = Article.Slug;
 			}
 
 			Article.LastModified = DateTimeOffset.UtcNow;
-			Article.BodyHtml = MarkdownUtilities.Parse(Article.Body);
+			Article.UpdateBody();
-			Article.BodyPlain = HtmlUtilities.GetPlainText(Article.BodyHtml);
 			
 			await using var context = await ContextFactory.CreateDbContextAsync();
 

Wave/Data/Article.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Wave.Utilities;
 
 namespace Wave.Data;
 
@@ -21,6 +22,7 @@ public class Article : ISoftDelete {
 
 	[MaxLength(256)]
 	public required string Title { get; set; }
+	// ReSharper disable thrice EntityFramework.ModelValidation.UnlimitedStringLength
 	public required string Body { get; set; }
 	public string BodyHtml { get; set; } = string.Empty;
 	public string BodyPlain { get; set; } = string.Empty;
@@ -43,4 +45,25 @@ public class Article : ISoftDelete {
 
 	public IList<Category> Categories { get; } = [];
 	public IList<ArticleImage> Images { get; } = [];
+
+	public void UpdateSlug(string? potentialNewSlug) {
+		if (string.IsNullOrWhiteSpace(potentialNewSlug) && !string.IsNullOrWhiteSpace(Slug)) return;
+		
+		string baseSlug = potentialNewSlug ?? Title;
+		baseSlug = baseSlug.ToLowerInvariant()[..Math.Min(64, baseSlug.Length)];
+		string slug = Uri.EscapeDataString(baseSlug).Replace("-", "+").Replace("%20", "-");
+		// if our escaping increases the slug length, there is a chance it ends with an escape 
+		// character, so if this overshoot is not divisible by 3, then we risk cutting of the 
+		// escape character, so we need to remove it in it's entirely if that's the case
+		int escapeTrimOvershoot = Math.Max(0, 3 - (slug.Length - baseSlug.Length) % 3);
+		// if the slug already fits 64 character, there will be no cutoff in the next operation anyway,
+		// so we don't need to fix what is described in the previous comment
+		if (slug.Length <= 64) escapeTrimOvershoot = 0;
+		Slug = slug[..Math.Min(slug.Length, 64 - escapeTrimOvershoot)];
+	}
+
+	public void UpdateBody() {
+		BodyHtml = MarkdownUtilities.Parse(Body).Trim();
+		BodyPlain = HtmlUtilities.GetPlainText(BodyHtml).Trim();
+	}
 }