diff --git a/src/Yavsc.Org/Controllers/Generic/SettingsController.cs b/src/Yavsc.Org/Controllers/Generic/SettingsController.cs index 8c490a1c..24ac53a6 100644 --- a/src/Yavsc.Org/Controllers/Generic/SettingsController.cs +++ b/src/Yavsc.Org/Controllers/Generic/SettingsController.cs @@ -6,7 +6,6 @@ namespace Yavsc.Controllers.Generic using System.Linq; using Microsoft.EntityFrameworkCore; using Models; - using Yavsc.Helpers; using Yavsc.Server.Helpers; using Yavsc.Services; @@ -37,7 +36,7 @@ namespace Yavsc.Controllers.Generic { _context = context; } - + public async Task Index() { return View(await GetSettingsAsync(User.GetUserId())); diff --git a/src/Yavsc.Server/Models/Forms/Form.cs b/src/Yavsc.Server/Models/Forms/Form.cs index 1e1c71c3..eb6da137 100644 --- a/src/Yavsc.Server/Models/Forms/Form.cs +++ b/src/Yavsc.Server/Models/Forms/Form.cs @@ -7,6 +7,6 @@ namespace Yavsc.Models.Forms { [Key] public string Id {get; set;} - public string Summary { get; set; } + public string Summary { get; set; } } -} \ No newline at end of file +} diff --git a/src/Yavsc.Server/Services/FrontmatterParser.cs b/src/Yavsc.Server/Services/FrontmatterParser.cs index 6514c508..16b86ad4 100644 --- a/src/Yavsc.Server/Services/FrontmatterParser.cs +++ b/src/Yavsc.Server/Services/FrontmatterParser.cs @@ -6,7 +6,8 @@ namespace Yavsc.Server.Services; public static class FrontmatterParser { - public const string YamlSeparator = "---"; + public const string YamlHeader = "---\n"; + public const string YamlSeparator = "\n---"; private static readonly IDeserializer _deserializer = new DeserializerBuilder() @@ -17,14 +18,15 @@ public static class FrontmatterParser public static FrontmatterOffreResult Parse(string markdown) { // Le contenu doit commencer par ---- - if (!markdown.TrimStart().StartsWith(YamlSeparator)) + if (!markdown.TrimStart().StartsWith(YamlHeader, StringComparison.Ordinal)) return new FrontmatterOffreResult { Corps = markdown }; - var parts = markdown.TrimStart()[3..].Split(new[] { "\n"+YamlSeparator }, 2, + + var parts = markdown.Substring(YamlHeader.Length).Trim().Split(new[] { YamlSeparator }, 2, StringSplitOptions.None); if (parts.Length < 2) return new FrontmatterOffreResult { Corps = markdown }; - var yamlBlock = parts[0].Trim(); - var corps = parts[1].Trim(); + var yamlBlock = parts[0]; + var corps = parts[1]; var meta = _deserializer.Deserialize(yamlBlock); meta.Corps = corps; return meta;