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

Add Temporal::utc() shorthand to Temporal::convert()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 07:29:32 -05:00
parent ca8209a2ce
commit 35d06bd9eb
22 changed files with 173 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Protocol/DFRN.php
View file

@ -229,7 +229,7 @@ class DFRN
}
}
$check_date = Temporal::convert($last_update);
$check_date = Temporal::utc($last_update);
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`,
@ -421,7 +421,7 @@ class DFRN
XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
XML::addElement($doc, $mail, "dfrn:sentdate", Temporal::convert($item['created'] . '+00:00', 'UTC', 'UTC', Temporal::ATOM));
XML::addElement($doc, $mail, "dfrn:sentdate", Temporal::utc($item['created'] . '+00:00', Temporal::ATOM));
XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
XML::addElement($doc, $mail, "dfrn:content", $item['body']);
@ -587,7 +587,7 @@ class DFRN
/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
XML::addElement($doc, $root, "updated", Temporal::convert("now", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $root, "updated", Temporal::utcNow(Temporal::ATOM));
$author = self::addAuthor($doc, $owner, $authorelement, $public);
$root->appendChild($author);
@ -622,9 +622,9 @@ class DFRN
$author = $doc->createElement($authorelement);
$namdate = Temporal::convert($owner['name-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$uridate = Temporal::convert($owner['uri-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$picdate = Temporal::convert($owner['avatar-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$namdate = Temporal::utc($owner['name-date'].'+00:00', Temporal::ATOM);
$uridate = Temporal::utc($owner['uri-date'].'+00:00', Temporal::ATOM);
$picdate = Temporal::utc($owner['avatar-date'].'+00:00', Temporal::ATOM);
$attributes = [];
@ -903,7 +903,7 @@ class DFRN
}
if ($item['deleted']) {
$attributes = ["ref" => $item['uri'], "when" => Temporal::convert($item['edited'] . '+00:00', 'UTC', 'UTC', Temporal::ATOM)];
$attributes = ["ref" => $item['uri'], "when" => Temporal::utc($item['edited'] . '+00:00', Temporal::ATOM)];
return XML::createElement($doc, "at:deleted-entry", "", $attributes);
}
@ -983,8 +983,8 @@ class DFRN
XML::addElement($doc, $entry, "id", $item["uri"]);
XML::addElement($doc, $entry, "title", $item["title"]);
XML::addElement($doc, $entry, "published", Temporal::convert($item["created"] . "+00:00", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"] . "+00:00", "UTC", "UTC", Temporal::ATOM));
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));
// "dfrn:env" is used to read the content
XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));
@ -1388,7 +1388,7 @@ class DFRN
"SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
intval($contact["uid"]),
intval($contact["id"]),
dbesc(Temporal::convert($birthday)),
dbesc(Temporal::utc($birthday)),
dbesc("birthday")
);
@ -1408,8 +1408,8 @@ class DFRN
intval($contact["id"]),
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::convert($birthday)),
dbesc(Temporal::convert($birthday . " + 1 day ")),
dbesc(Temporal::utc($birthday)),
dbesc(Temporal::utc($birthday . " + 1 day ")),
dbesc($bdtext),
dbesc($bdtext2),
dbesc("birthday")
@ -2081,13 +2081,13 @@ class DFRN
if (self::isEditedTimestampNewer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have.
if (Temporal::convert($item["edited"]) < $current["edited"]) {
if (Temporal::utc($item["edited"]) < $current["edited"]) {
return false;
}
$fields = ['title' => $item["title"], 'body' => $item["body"],
'tag' => $item["tag"], 'changed' => Temporal::utcNow(),
'edited' => Temporal::convert($item["edited"])];
'edited' => Temporal::utc($item["edited"])];
$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
dba::update('item', $fields, $condition);
@ -2422,7 +2422,7 @@ class DFRN
// Is there an existing item?
if (DBM::is_result($current) && self::isEditedTimestampNewer($current[0], $item)
&& (Temporal::convert($item["edited"]) < $current[0]["edited"])
&& (Temporal::utc($item["edited"]) < $current[0]["edited"])
) {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
return;
@ -2753,9 +2753,9 @@ class DFRN
}
}
if ($when) {
$when = Temporal::convert($when);
$when = Temporal::utc($when);
} else {
$when = Temporal::convert("now");
$when = Temporal::utcNow();
}
if (!$uri || !$importer["id"]) {
@ -3157,8 +3157,8 @@ class DFRN
return false;
}
$existing_edited = Temporal::convert($existing['edited']);
$update_edited = Temporal::convert($update['edited']);
$existing_edited = Temporal::utc($existing['edited']);
$update_edited = Temporal::utc($update['edited']);
return (strcmp($existing_edited, $update_edited) < 0);
}

26
src/Protocol/Diaspora.php
View file

@ -1654,7 +1654,7 @@ class Diaspora
$text = unxmlify($data->text);
if (isset($data->created_at)) {
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
$created_at = Temporal::utc(notags(unxmlify($data->created_at)));
} else {
$created_at = Temporal::utcNow();
}
@ -1786,7 +1786,7 @@ class Diaspora
$msg_guid = notags(unxmlify($mesg->guid));
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
$msg_text = unxmlify($mesg->text);
$msg_created_at = Temporal::convert(notags(unxmlify($mesg->created_at)));
$msg_created_at = Temporal::utc(notags(unxmlify($mesg->created_at)));
if ($msg_conversation_guid != $guid) {
logger("message conversation guid does not belong to the current conversation.");
@ -1865,7 +1865,7 @@ class Diaspora
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
$created_at = Temporal::utc(notags(unxmlify($data->created_at)));
$participants = notags(unxmlify($data->participants));
$messages = $data->message;
@ -2098,7 +2098,7 @@ class Diaspora
$guid = notags(unxmlify($data->guid));
$conversation_guid = notags(unxmlify($data->conversation_guid));
$text = unxmlify($data->text);
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
$created_at = Temporal::utc(notags(unxmlify($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
@ -2315,7 +2315,7 @@ class Diaspora
$birthday = str_replace("1000", "1901", $birthday);
if ($birthday != "") {
$birthday = Temporal::convert($birthday, "UTC", "UTC", "Y-m-d");
$birthday = Temporal::utc($birthday, "Y-m-d");
}
// this is to prevent multiple birthday notifications in a single year
@ -2716,7 +2716,7 @@ class Diaspora
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
$created_at = Temporal::utc(notags(unxmlify($data->created_at)));
$root_author = notags(unxmlify($data->root_author));
$root_guid = notags(unxmlify($data->root_guid));
/// @todo handle unprocessed property "provider_display_name"
@ -2930,7 +2930,7 @@ class Diaspora
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
$created_at = Temporal::utc(notags(unxmlify($data->created_at)));
$public = notags(unxmlify($data->public));
$text = unxmlify($data->text);
$provider_display_name = notags(unxmlify($data->provider_display_name));
@ -3652,7 +3652,7 @@ class Diaspora
$public = (($item["private"]) ? "false" : "true");
$created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
$created = Temporal::utc($item["created"], Temporal::ATOM);
// Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
@ -3855,7 +3855,7 @@ class Diaspora
$parent = $p[0];
$text = html_entity_decode(bb2diaspora($item["body"]));
$created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
$created = Temporal::utc($item["created"], Temporal::ATOM);
$comment = ["author" => self::myHandle($owner),
"guid" => $item["guid"],
@ -4086,12 +4086,12 @@ class Diaspora
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
"created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", Temporal::ATOM),
"created_at" => Temporal::utc($cnv['created'], Temporal::ATOM),
"participants" => $cnv["recips"]
];
$body = bb2diaspora($item["body"]);
$created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
$created = Temporal::utc($item["created"], Temporal::ATOM);
$msg = [
"author" => $myaddr,
@ -4109,7 +4109,7 @@ class Diaspora
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
"created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", Temporal::ATOM),
"created_at" => Temporal::utc($cnv['created'], Temporal::ATOM),
"participants" => $cnv["recips"],
"message" => $msg];
@ -4217,7 +4217,7 @@ class Diaspora
if ($year < 1004) {
$year = 1004;
}
$dob = Temporal::convert($year . '-' . $month . '-'. $day, 'UTC', 'UTC', 'Y-m-d');
$dob = Temporal::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
}
$about = $profile['about'];

10
src/Protocol/OStatus.php
View file

@ -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::convert("now", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $root, "updated", Temporal::utcNow(Temporal::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::convert($contact["success_update"]."+00:00", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $source, "updated", Temporal::utc($contact["success_update"]."+00:00", Temporal::ATOM));
return $source;
}
@ -1923,8 +1923,8 @@ class OStatus
XML::addElement($doc, $entry, "activity:verb", $verb);
XML::addElement($doc, $entry, "published", Temporal::convert($item["created"]."+00:00", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"]."+00:00", "UTC", "UTC", Temporal::ATOM));
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));
}
/**
@ -2127,7 +2127,7 @@ class OStatus
$last_update = 'now -30 days';
}
$check_date = Temporal::convert($last_update);
$check_date = Temporal::utc($last_update);
$authorid = Contact::getIdForURL($owner["url"], 0);
$sql_extra = '';