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

@ -38,6 +38,8 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
require_once 'include/enotify.php';
use Codebird\Codebird;
use CodebirdSN\CodebirdSN;
use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\BBCode;
@ -52,6 +54,7 @@ use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\User;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
function statusnet_install()
{
@ -933,7 +936,7 @@ function statusnet_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($contact->statusnet_profile_url),
dbesc(normalise_link($contact->statusnet_profile_url)),
dbesc(statusnet_address($contact)),
@ -974,13 +977,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc(datetime_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)) {
@ -1005,9 +1008,9 @@ function statusnet_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($contact->statusnet_profile_url),
dbesc(normalise_link($contact->statusnet_profile_url)),
dbesc(statusnet_address($contact)),
@ -1194,8 +1197,8 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
$postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"];
$postarray['created'] = datetime_convert('UTC', 'UTC', $content->created_at);
$postarray['edited'] = datetime_convert('UTC', 'UTC', $content->created_at);
$postarray['created'] = Temporal::convert($content->created_at);
$postarray['edited'] = Temporal::convert($content->created_at);
if (is_string($content->place->name)) {
$postarray["location"] = $content->place->name;