OliverBooth/Data/Web/Configuration/TemplateConfiguration.cs

@@ -11,10 +11,9 @@ internal sealed class TemplateConfiguration : IEntityTypeConfiguration<Template>
     public void Configure(EntityTypeBuilder<Template> builder)
     {
         builder.ToTable("Template");
-        builder.HasKey(e => new { e.Name, e.Variant });
+        builder.HasKey(e => e.Name);
 
-        builder.Property(e => e.Name).HasMaxLength(50).IsRequired();
-        builder.Property(e => e.Variant).HasMaxLength(50).IsRequired();
+        builder.Property(e => e.Name).IsRequired();
         builder.Property(e => e.FormatString).IsRequired();
     }
 }

OliverBooth/Data/Web/ITemplate.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Data;
 
 /// <summary>
 ///     Represents a template.
@@ -15,10 +15,4 @@ public interface ITemplate
     ///     Gets the name of the template.
     /// </summary>
     string Name { get; }
-
-    /// <summary>
-    ///     Gets the variant of the template.
-    /// </summary>
-    /// <value>The variant of the template.</value>
-    string Variant { get; }
 }

OliverBooth/Data/Web/Template.cs

@@ -11,9 +11,6 @@ public sealed class Template : ITemplate, IEquatable<Template>
     /// <inheritdoc />
     public string Name { get; private set; } = string.Empty;
 
-    /// <inheritdoc />
-    public string Variant { get; private set; } = string.Empty;
-
     /// <summary>
     ///     Returns a value indicating whether two instances of <see cref="Template" /> are equal.
     /// </summary>
@@ -49,7 +46,7 @@ public sealed class Template : ITemplate, IEquatable<Template>
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Name == other.Name && Variant == other.Variant;
+        return Name == other.Name;
     }
 
     /// <summary>
@@ -71,7 +68,7 @@ public sealed class Template : ITemplate, IEquatable<Template>
     /// <returns>The hash code.</returns>
     public override int GetHashCode()
     {
-        // ReSharper disable NonReadonlyMemberInGetHashCode
-        return HashCode.Combine(Name, Variant);
+        // ReSharper disable once NonReadonlyMemberInGetHashCode
+        return Name.GetHashCode();
     }
 }

OliverBooth/Markdown/Template/TemplateInline.cs

@@ -30,10 +30,4 @@ public sealed class TemplateInline : Inline
     /// </summary>
     /// <value>The template parameters.</value>
     public IReadOnlyDictionary<string, string> Params { get; set; } = null!;
-
-    /// <summary>
-    ///     Gets the variant of the template.
-    /// </summary>
-    /// <value>The variant of the template.</value>
-    public string Variant { get; set; } = string.Empty;
 }

OliverBooth/Markdown/Template/TemplateInlineParser.cs

@@ -37,22 +37,11 @@ public sealed class TemplateInlineParser : InlineParser
 
         template = template[2..^2]; // trim {{ and }}
         ReadOnlySpan<char> name = ReadTemplateName(template, out ReadOnlySpan<char> argumentSpan);
-        int variantIndex = name.IndexOf(':');
-        bool hasVariant = variantIndex > -1;
-        var variant = ReadOnlySpan<char>.Empty;
-
-        if (hasVariant)
-        {
-            variant = name[(variantIndex + 1)..];
-            name = name[..variantIndex];
-        }
-
         if (argumentSpan.IsEmpty)
         {
             processor.Inline = new TemplateInline
             {
                 Name = name.ToString(),
-                Variant = hasVariant ? variant.ToString() : string.Empty,
                 ArgumentString = string.Empty,
                 ArgumentList = ArraySegment<string>.Empty,
                 Params = EmptyParams
@@ -71,7 +60,6 @@ public sealed class TemplateInlineParser : InlineParser
         processor.Inline = new TemplateInline
         {
             Name = name.ToString(),
-            Variant = hasVariant ? variant.ToString() : string.Empty,
             ArgumentString = argumentSpan.ToString(),
             ArgumentList = argumentList.AsReadOnly(),
             Params = paramsList.AsReadOnly()

OliverBooth/Pages/Blog/Article.cshtml

@@ -18,7 +18,7 @@
 <nav style="--bs-breadcrumb-divider: '>';" aria-label="breadcrumb">
     <ol class="breadcrumb">
         <li class="breadcrumb-item">
-            <a asp-page="index">Blog</a>
+            <a asp-page="/index">Blog</a>
         </li>
         <li class="breadcrumb-item active" aria-current="page">@post.Title</li>
     </ol>

OliverBooth/Program.cs

@@ -10,9 +10,6 @@ using Serilog;
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()
     .WriteTo.File("logs/latest.log", rollingInterval: RollingInterval.Day)
-#if DEBUG
-    .MinimumLevel.Debug()
-#endif
     .CreateLogger();
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);

OliverBooth/Services/ITemplateService.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
 using OliverBooth.Data;
-using OliverBooth.Data.Web;
 using OliverBooth.Markdown.Template;
 
 namespace OliverBooth.Services;
@@ -30,27 +28,4 @@ public interface ITemplateService
     ///     <paramref name="templateInline" /> is <see langword="null" />.
     /// </exception>
     string RenderTemplate(TemplateInline templateInline, ITemplate? template);
-
-    /// <summary>
-    ///     Attempts to get the template with the specified name.
-    /// </summary>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="template">
-    ///     When this method returns, contains the template with the specified name, if the template is found;
-    ///     otherwise, <see langword="null" />.
-    /// </param>
-    /// <returns><see langword="true" /> if the template exists; otherwise, <see langword="false" />.</returns>
-    bool TryGetTemplate(string name, [NotNullWhen(true)] out ITemplate? template);
-
-    /// <summary>
-    ///     Attempts to get the template with the specified name and variant.
-    /// </summary>
-    /// <param name="name">The name of the template.</param>
-    /// <param name="variant">The variant of the template.</param>
-    /// <param name="template">
-    ///     When this method returns, contains the template with the specified name and variant, if the template is
-    ///     found; otherwise, <see langword="null" />.
-    /// </param>
-    /// <returns><see langword="true" /> if the template exists; otherwise, <see langword="false" />.</returns>
-    bool TryGetTemplate(string name, string variant, [NotNullWhen(true)] out ITemplate? template);
 }

OliverBooth/Services/TemplateService.cs

@@ -1,5 +1,4 @@
 using System.Buffers.Binary;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
 using OliverBooth.Data;
 using OliverBooth.Data.Web;
@@ -41,17 +40,17 @@ internal sealed class TemplateService : ITemplateService
     {
         if (templateInline is null) throw new ArgumentNullException(nameof(templateInline));
 
-        return TryGetTemplate(templateInline.Name, templateInline.Variant, out ITemplate? template)
-            ? RenderTemplate(templateInline, template)
-            : GetDefaultRender(templateInline);
+        using WebContext context = _webContextFactory.CreateDbContext();
+        Template? template = context.Templates.Find(templateInline.Name);
+        return RenderTemplate(templateInline, template);
     }
 
     /// <inheritdoc />
-    public string RenderTemplate(TemplateInline templateInline, ITemplate? template)
+    public string RenderTemplate(TemplateInline inline, ITemplate? template)
     {
         if (template is null)
         {
-            return GetDefaultRender(templateInline);
+            return $"{{{{{inline.Name}}}}}";
         }
 
         Span<byte> randomBytes = stackalloc byte[20];
@@ -59,9 +58,9 @@ internal sealed class TemplateService : ITemplateService
 
         var formatted = new
         {
-            templateInline.ArgumentList,
-            templateInline.ArgumentString,
-            templateInline.Params,
+            inline.ArgumentList,
+            inline.ArgumentString,
+            inline.Params,
             RandomInt = BinaryPrimitives.ReadInt32LittleEndian(randomBytes[..4]),
             RandomGuid = new Guid(randomBytes[4..]).ToString("N"),
         };
@@ -72,28 +71,7 @@ internal sealed class TemplateService : ITemplateService
         }
         catch
         {
-            return GetDefaultRender(templateInline);
+            return $"{{{{{inline.Name}|{inline.ArgumentString}}}}}";
         }
     }
-
-    /// <inheritdoc />
-    public bool TryGetTemplate(string name, [NotNullWhen(true)] out ITemplate? template)
-    {
-        return TryGetTemplate(name, string.Empty, out template);
-    }
-
-    /// <inheritdoc />
-    public bool TryGetTemplate(string name, string variant, [NotNullWhen(true)] out ITemplate? template)
-    {
-        using WebContext context = _webContextFactory.CreateDbContext();
-        template = context.Templates.FirstOrDefault(t => t.Name == name && t.Variant == variant);
-        return template is not null;
-    }
-
-    private static string GetDefaultRender(TemplateInline templateInline)
-    {
-        return string.IsNullOrWhiteSpace(templateInline.ArgumentString)
-            ? $"{{{{{templateInline.Name}}}}}"
-            : $"{{{{{templateInline.Name}|{templateInline.ArgumentString}}}}}";
-    }
 }