Improved support for backfilled posts

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 31f8a8e22eeb337298ead37dee6820ed830378df..247bd0643591b5819addd2bbd1a2aa66479df630 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1090,9 +1090,9 @@ class Item
                }
 
                if ($update_commented) {
-                       $fields = ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+                       $fields = ['commented' => $posted_item['received'], 'changed' => $posted_item['received']];
                } else {
-                       $fields = ['changed' => DateTimeFormat::utcNow()];
+                       $fields = ['changed' => $posted_item['received']];
                }
 
                Post::update($fields, ['uri-id' => $posted_item['parent-uri-id'], 'uid' => $posted_item['uid']]);

diff --git a/src/Model/ItemHelper.php b/src/Model/ItemHelper.php
index 9b585fd5446d5bfd21b32f0401b602b9a2c0678d..102b0fecba9885a4b6379d464b2019d58dbac5bc 100644 (file)
--- a/src/Model/ItemHelper.php
+++ b/src/Model/ItemHelper.php
@@ -205,13 +205,25 @@ final class ItemHelper
                $item['file']          = trim($item['file'] ?? '');
 
                // Items cannot be stored before they happen ...
-               if ($item['created'] > DateTimeFormat::utcNow()) {
-                       $item['created'] = DateTimeFormat::utcNow();
+               if ($item['received'] > DateTimeFormat::utcNow()) {
+                       $item['received'] = DateTimeFormat::utcNow();
+               }
+
+               if ($item['created'] > $item['received']) {
+                       $item['created'] = $item['received'];
                }
 
                // We haven't invented time travel by now.
-               if ($item['edited'] > DateTimeFormat::utcNow()) {
-                       $item['edited'] = DateTimeFormat::utcNow();
+               if ($item['edited'] > $item['received'] ) {
+                       $item['edited'] = $item['received'] ;
+               }
+
+               if ($item['changed'] > $item['received'] ) {
+                       $item['changed'] = $item['received'] ;
+               }
+
+               if ($item['commented'] > $item['received'] ) {
+                       $item['commented'] = $item['received'] ;
                }
 
                $item['plink'] = ($item['plink'] ?? '') ?: $this->baseUrl . '/display/' . urlencode($item['guid']);