diff --git a/OliverBooth/Controllers/Blog/BlogApiController.cs b/OliverBooth/Controllers/Blog/BlogApiController.cs index c0f8704..21eb070 100644 --- a/OliverBooth/Controllers/Blog/BlogApiController.cs +++ b/OliverBooth/Controllers/Blog/BlogApiController.cs @@ -82,8 +82,9 @@ public sealed class BlogApiController : ControllerBase author = post.Author.Id, title = post.Title, published = post.Published.ToUnixTimeSeconds(), - formattedDate = post.Published.ToString("dddd, d MMMM yyyy HH:mm"), updated = post.Updated?.ToUnixTimeSeconds(), + formattedPublishDate = post.Published.ToString("dddd, d MMMM yyyy HH:mm"), + formattedUpdateDate = post.Updated?.ToString("dddd, d MMMM yyyy HH:mm"), humanizedTimestamp = post.Updated?.Humanize() ?? post.Published.Humanize(), excerpt = _blogPostService.RenderExcerpt(post, out bool trimmed), content = includeContent ? _blogPostService.RenderPost(post) : null, diff --git a/src/ts/BlogPost.ts b/src/ts/BlogPost.ts index e57e689..1186964 100644 --- a/src/ts/BlogPost.ts +++ b/src/ts/BlogPost.ts @@ -13,7 +13,8 @@ class BlogPost { private readonly _trimmed: boolean; private readonly _identifier: string; private readonly _humanizedTimestamp: string; - private readonly _formattedDate: string; + private readonly _formattedPublishDate: string; + private readonly _formattedUpdateDate: string; private readonly _tags: string[]; constructor(json: any) { @@ -29,7 +30,8 @@ class BlogPost { this._trimmed = json.trimmed; this._identifier = json.identifier; this._humanizedTimestamp = json.humanizedTimestamp; - this._formattedDate = json.formattedDate; + this._formattedPublishDate = json.formattedPublishDate; + this._formattedUpdateDate = json.formattedUpdateDate; this._tags = json.tags; } @@ -85,8 +87,12 @@ class BlogPost { return this._humanizedTimestamp; } - get formattedDate(): string { - return this._formattedDate; + get formattedPublishDate(): string { + return this._formattedPublishDate; + } + + get formattedUpdateDate(): string { + return this._formattedUpdateDate; } } diff --git a/src/ts/UI.ts b/src/ts/UI.ts index d00fae2..969fde3 100644 --- a/src/ts/UI.ts +++ b/src/ts/UI.ts @@ -50,7 +50,7 @@ class UI { excerpt: post.excerpt, url: `/blog/${post.url.year}/${post.url.month}/${post.url.day}/${post.url.slug}`, date: TimeUtility.formatRelativeTimestamp(post.published), - formattedDate: post.formattedDate, + formattedDate: post.updated ? post.formattedUpdateDate : post.formattedPublishDate, date_humanized: `${post.updated ? "Updated" : "Published"} ${post.humanizedTimestamp}`, enable_comments: post.commentsEnabled, disqus_identifier: post.identifier,