Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 21:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 21:38:34 -05:00
parent b7a7355292
commit 5e7285b9ba
64 changed files with 568 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Protocol/OStatus.php
View file

@ -16,9 +16,9 @@ use Friendica\Model\GContact;
use Friendica\Model\Item;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Lock;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
use dba;
use DOMDocument;
@ -199,7 +199,7 @@ class OStatus
$contact["location"] = $value;
}
$contact['name-date'] = Temporal::utcNow();
$contact['name-date'] = DateTimeFormat::utcNow();
dba::update('contact', $contact, ['id' => $contact["id"]], $current);
@ -220,7 +220,7 @@ class OStatus
'nurl' => normalise_link($author["author-link"]),
'nick' => $contact["nick"], 'alias' => $contact["alias"],
'about' => $contact["about"], 'location' => $contact["location"],
'success_update' => Temporal::utcNow(), 'last-update' => Temporal::utcNow()];
'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
dba::update('contact', $fields, ['id' => $cid], $old_contact);
@ -558,7 +558,7 @@ class OStatus
dba::update(
'item',
['deleted' => true, 'title' => '', 'body' => '',
'edited' => Temporal::utcNow(), 'changed' => Temporal::utcNow()],
'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
['id' => $deleted["id"]]
);
@ -1273,7 +1273,7 @@ class OStatus
XML::addElement($doc, $root, "title", $title);
XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
XML::addElement($doc, $root, "logo", $owner["photo"]);
XML::addElement($doc, $root, "updated", Temporal::utcNow(Temporal::ATOM));
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
$author = self::addAuthor($doc, $owner);
$root->appendChild($author);
@ -1539,7 +1539,7 @@ class OStatus
XML::addElement($doc, $source, "link", "", ["rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]]);
XML::addElement($doc, $source, "link", "", ["rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]]);
XML::addElement($doc, $source, "icon", $contact["photo"]);
XML::addElement($doc, $source, "updated", Temporal::utc($contact["success_update"]."+00:00", Temporal::ATOM));
XML::addElement($doc, $source, "updated", DateTimeFormat::utc($contact["success_update"]."+00:00", DateTimeFormat::ATOM));
return $source;
}
@ -1923,8 +1923,8 @@ class OStatus
XML::addElement($doc, $entry, "activity:verb", $verb);
XML::addElement($doc, $entry, "published", Temporal::utc($item["created"]."+00:00", Temporal::ATOM));
XML::addElement($doc, $entry, "updated", Temporal::utc($item["edited"]."+00:00", Temporal::ATOM));
XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
}
/**
@ -2127,7 +2127,7 @@ class OStatus
$last_update = 'now -30 days';
}
$check_date = Temporal::utc($last_update);
$check_date = DateTimeFormat::utc($last_update);
$authorid = Contact::getIdForURL($owner["url"], 0);
$sql_extra = '';