From 02875df5963e6c1f1411e5e047250740918b357a Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 29 Nov 2019 06:24:02 +0000 Subject: [PATCH] Show the received date along with the creation date of posts --- src/Object/Post.php | 7 ++++++- static/defaults.config.php | 10 +++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 981bf76c7d..5dbcfeeede 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -378,6 +378,11 @@ class Post extends BaseObject $tags = Term::populateTagsFromItem($item); + $ago = Temporal::getRelativeDate($item['created']); + if (Config::get('system', 'show_received') && (abs(strtotime($item['created']) - strtotime($item['received'])) > Config::get('system', 'show_received_seconds'))) { + $ago = L10n::t('%s (Received %s)', $ago, Temporal::getRelativeDate($item['received'])); + } + $tmp_item = [ 'template' => $this->getTemplate(), 'type' => implode("", array_slice(explode("/", $item['verb']), -1)), @@ -412,7 +417,7 @@ class Post extends BaseObject 'sparkle' => $sparkle, 'title' => $title_e, 'localtime' => DateTimeFormat::local($item['created'], 'r'), - 'ago' => $item['app'] ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created']), + 'ago' => $item['app'] ? L10n::t('%s from %s', $ago, $item['app']) : $ago, 'app' => $item['app'], 'created' => Temporal::getRelativeDate($item['created']), 'lock' => $lock, diff --git a/static/defaults.config.php b/static/defaults.config.php index a4fd11662f..d97e8694d2 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -374,9 +374,13 @@ return [ // When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node. 'show_global_community_hint' => false, - // show_unsupported_addons (Boolean) - // Show all addons including the unsupported ones. - 'show_unsupported_addons' => false, + // show_received (Boolean) + // Show the receive data along with the post creation date + 'show_received' => true, + + // show_received_seconds (Integer) + // Display the received date when the difference between received and created is higher than this. + 'show_received_seconds' => 500, // show_unsupported_themes (Boolean) // Show all themes including the unsupported ones.