From 2c1e25c158106b62dba56dbe97873ae71ab01c78 Mon Sep 17 00:00:00 2001 From: skybldev Date: Thu, 30 Dec 2021 09:59:08 -0500 Subject: [PATCH] client: added features for camera - [client] also revised date-taken section --- client/html/post_readonly_sidebar.tpl | 17 +++++++++++++++-- client/js/models/post.js | 5 +++++ client/js/util/misc.js | 4 ---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl index bf91e8a0..deca6cf3 100644 --- a/client/html/post_readonly_sidebar.tpl +++ b/client/html/post_readonly_sidebar.tpl @@ -32,8 +32,21 @@ <% if (ctx.post.type == "image" || ctx.post.type == "video" ) { %>
- Taken on - <%= ctx.makeUserFriendlyTime(ctx.post.dateTaken) %> + <% if (ctx.post.dateTaken) { %><%= ctx.makeUserFriendlyTime(ctx.post.dateTaken) %><% } else { %>Unknown date + <% } %> +
+ +
+ <% if (ctx.post.camera) { %><%= ctx.post.camera %><% } else { %>Unknown camera + <% } %>
<% } %> diff --git a/client/js/models/post.js b/client/js/models/post.js index d8b28566..6c33c29e 100644 --- a/client/js/models/post.js +++ b/client/js/models/post.js @@ -154,6 +154,10 @@ class Post extends events.EventTarget { return this._dateTaken; } + get camera() { + return this._camera; + } + set flags(value) { this._flags = value; } @@ -497,6 +501,7 @@ class Post extends events.EventTarget { _ownFavorite: response.ownFavorite, _hasCustomThumbnail: response.hasCustomThumbnail, _dateTaken: response.dateTaken, + _camera: response.camera, }); for (let obj of [this, this._orig]) { diff --git a/client/js/util/misc.js b/client/js/util/misc.js index e6ccb825..6426da2c 100644 --- a/client/js/util/misc.js +++ b/client/js/util/misc.js @@ -97,10 +97,6 @@ function formatRelativeTime(timeString) { } function formatUserFriendlyTime(timeString) { - if (!timeString) { - return "an unknown date"; - } - return format(Date.parse(timeString), "iii, LLLL dd yyyy 'at' HH:mm:ss"); }