Refactor datetime_convert() into Temporal::convert()

This commit is contained in:
Hypolite Petovan 2018-01-24 21:29:09 -05:00
parent 0e987b5c4c
commit b24690e8df
11 changed files with 66 additions and 46 deletions

View file

@ -78,6 +78,7 @@ use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
require_once 'boot.php';
require_once 'include/dba.php';
@ -1016,7 +1017,7 @@ function twitter_fetch_contact($uid, $contact, $create_user)
`location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
intval($uid),
dbesc(datetime_convert()),
dbesc(Temporal::convert()),
dbesc("https://twitter.com/" . $contact->screen_name),
dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
dbesc($contact->screen_name."@twitter.com"),
@ -1060,16 +1061,16 @@ function twitter_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
intval($contact_id)
);
}
} else {
// update profile photos once every two weeks as we have no notification of when they change.
//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
$update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
//$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false);
$update_photo = ($r[0]['avatar-date'] < Temporal::convert('now -12 hours'));
// check that we have all the photos, this has been known to fail on occasion
if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@ -1095,9 +1096,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc("https://twitter.com/".$contact->screen_name),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
dbesc($contact->screen_name."@twitter.com"),
@ -1489,8 +1490,8 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
$postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"];
$postarray['created'] = datetime_convert('UTC', 'UTC', $post->created_at);
$postarray['edited'] = datetime_convert('UTC', 'UTC', $post->created_at);
$postarray['created'] = Temporal::convert($post->created_at);
$postarray['edited'] = Temporal::convert($post->created_at);
$statustext = $converted["plain"];