Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 7545375181cf42a8c5fe73cbdedc2e53c15011a0..818c4085f715e904ea88ce8411623a0aeec97ef2 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -22,6 +22,8 @@ use Friendica\Model\Term;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use dba;
 use Text_LanguageDetect;
 
@@ -148,7 +150,7 @@ class Item extends BaseObject
 
                // Set the item to "deleted"
                dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
-                                       'edited' => datetime_convert(), 'changed' => datetime_convert()],
+                                       'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
                                ['id' => $item['id']]);
 
                create_tags_from_item($item['id']);
@@ -300,11 +302,11 @@ class Item extends BaseObject
                $arr['owner-name']    = trim(defaults($arr, 'owner-name', ''));
                $arr['owner-link']    = trim(defaults($arr, 'owner-link', ''));
                $arr['owner-avatar']  = trim(defaults($arr, 'owner-avatar', ''));
-               $arr['received']      = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert());
-               $arr['created']       = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : $arr['received']);
-               $arr['edited']        = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : $arr['created']);
-               $arr['changed']       = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : $arr['created']);
-               $arr['commented']     = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : $arr['created']);
+               $arr['received']      = ((x($arr, 'received') !== false) ? Temporal::convert($arr['received']) : Temporal::convert());
+               $arr['created']       = ((x($arr, 'created') !== false) ? Temporal::convert($arr['created']) : $arr['received']);
+               $arr['edited']        = ((x($arr, 'edited') !== false) ? Temporal::convert($arr['edited']) : $arr['created']);
+               $arr['changed']       = ((x($arr, 'changed') !== false) ? Temporal::convert($arr['changed']) : $arr['created']);
+               $arr['commented']     = ((x($arr, 'commented') !== false) ? Temporal::convert($arr['commented']) : $arr['created']);
                $arr['title']         = trim(defaults($arr, 'title', ''));
                $arr['location']      = trim(defaults($arr, 'location', ''));
                $arr['coord']         = trim(defaults($arr, 'coord', ''));
@@ -340,13 +342,13 @@ class Item extends BaseObject
                }
 
                // Items cannot be stored before they happen ...
-               if ($arr['created'] > datetime_convert()) {
-                       $arr['created'] = datetime_convert();
+               if ($arr['created'] > Temporal::convert()) {
+                       $arr['created'] = Temporal::convert();
                }
 
                // We haven't invented time travel by now.
-               if ($arr['edited'] > datetime_convert()) {
-                       $arr['edited'] = datetime_convert();
+               if ($arr['edited'] > Temporal::convert()) {
+                       $arr['edited'] = Temporal::convert();
                }
 
                if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
@@ -740,9 +742,9 @@ class Item extends BaseObject
                // update the commented timestamp on the parent
                // Only update "commented" if it is really a comment
                if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) {
-                       dba::update('item', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]);
+                       dba::update('item', ['commented' => Temporal::convert(), 'changed' => Temporal::convert()], ['id' => $parent_id]);
                } else {
-                       dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]);
+                       dba::update('item', ['changed' => Temporal::convert()], ['id' => $parent_id]);
                }
 
                if ($dsprsig) {
@@ -1642,7 +1644,7 @@ class Item extends BaseObject
                        intval($wall ? 1 : 0)
                );
                if (DBM::is_result($r)) {
-                       return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10);
+                       return substr(Temporal::convert($r[0]['created'], date_default_timezone_get()),0,10);
                }
                return false;
        }