*/
namespace Friendica\Protocol;
-use Defuse\Crypto\Crypto;
-use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
-use Defuse\Crypto\Key;
use Friendica\App;
use Friendica\Content\OEmbed;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Protocol\OStatus;
-use Friendica\Util\Crypto as FriendicaCrypto;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
use Friendica\Util\XML;
-
use dba;
use DOMDocument;
use DOMXPath;
require_once 'boot.php';
require_once 'include/dba.php';
require_once "include/enotify.php";
-require_once "include/threads.php";
require_once "include/items.php";
-require_once "include/tags.php";
require_once "include/event.php";
require_once "include/text.php";
require_once "include/html2bbcode.php";
-require_once "include/bbcode.php";
/**
* @brief This class contain functions to create and send DFRN XML files
}
}
- $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
+ $check_date = DateTimeFormat::utc($last_update);
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`,
$root = self::addHeader($doc, $owner, $author, $alternatelink, true);
/// @TODO This hook can't work anymore
- // call_hooks('atom_feed', $atom);
+ // Addon::callHooks('atom_feed', $atom);
if (!DBM::is_result($items) || $onlyheader) {
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
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", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00', ATOM_TIME));
+ XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
XML::addElement($doc, $mail, "dfrn:content", $item['body']);
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = Config::get('system', 'site_pubkey');
if (! $pubkey) {
- $res = FriendicaCrypto::newKeypair(1024);
+ $res = Crypto::newKeypair(1024);
Config::set('system', 'site_prvkey', $res['prvkey']);
Config::set('system', 'site_pubkey', $res['pubkey']);
}
/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
- XML::addElement($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+ XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
$author = self::addAuthor($doc, $owner, $authorelement, $public);
$root->appendChild($author);
$author = $doc->createElement($authorelement);
- $namdate = datetime_convert('UTC', 'UTC', $owner['name-date'].'+00:00', ATOM_TIME);
- $uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
- $picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
+ $namdate = DateTimeFormat::utc($owner['name-date'].'+00:00', DateTimeFormat::ATOM);
+ $uridate = DateTimeFormat::utc($owner['uri-date'].'+00:00', DateTimeFormat::ATOM);
+ $picdate = DateTimeFormat::utc($owner['avatar-date'].'+00:00', DateTimeFormat::ATOM);
$attributes = [];
if ($activity) {
$entry = $doc->createElement($element);
- $r = parse_xml_string($activity, false);
+ $r = XML::parseString($activity, false);
if (!$r) {
return false;
}
$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
// XML does need a single element as root element so we add a dummy element here
- $data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
+ $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
if (is_object($data)) {
foreach ($data->link as $link) {
$attributes = [];
}
}
if ($r->content) {
- XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]);
+ XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]);
}
return $entry;
}
if ($item['deleted']) {
- $attributes = ["ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME)];
+ $attributes = ["ref" => $item['uri'], "when" => DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM)];
return XML::createElement($doc, "at:deleted-entry", "", $attributes);
}
}
if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
- $body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
+ $body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
} else {
$body = $item['body'];
}
// Remove the abstract element. It is only locally important.
- $body = remove_abstract($body);
+ $body = BBCode::stripAbstract($body);
+ $htmlbody = '';
if ($type == 'html') {
$htmlbody = $body;
$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
}
- $htmlbody = bbcode($htmlbody, false, false, 7);
+ $htmlbody = BBCode::convert($htmlbody, false, 7);
}
$author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
XML::addElement($doc, $entry, "id", $item["uri"]);
XML::addElement($doc, $entry, "title", $item["title"]);
- XML::addElement($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"] . "+00:00", ATOM_TIME));
- XML::addElement($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"] . "+00:00", ATOM_TIME));
+ 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));
// "dfrn:env" is used to read the content
XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));
XML::addElement($doc, $entry, "dfrn:diaspora_signature", $sign);
}
- XML::addElement($doc, $entry, "activity:verb", construct_verb($item));
+ XML::addElement($doc, $entry, "activity:verb", self::constructVerb($item));
if ($item['object-type'] != "") {
XML::addElement($doc, $entry, "activity:object-type", $item['object-type']);
$entry->appendChild($actarg);
}
- $tags = item_getfeedtags($item);
+ $tags = Item::getFeedTags($item);
if (count($tags)) {
foreach ($tags as $t) {
logger('dfrn_deliver: ' . $url);
- $ret = z_fetch_url($url);
+ $ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return -2; // timed out
return 3;
}
- $res = parse_xml_string($xml);
+ $res = XML::parseString($xml);
if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
return (($res->status) ? $res->status : 3);
switch ($rino_remote_version) {
case 1:
- case 2:
- $rino = 1;
- $rino_remote_version = 1;
- // Deprecated rino version!
$key = openssl_random_pseudo_bytes(16);
$data = self::aesEncrypt($postvars['data'], $key);
break;
- case 3:
- try {
- $KeyObject = Key::createNewRandomKey();
- } catch (EnvironmentIsBrokenException $ex) {
- logger('Cannot safely create a key');
- return -4;
- }
-
- try {
- $data = Crypto::encrypt($postvars['data'], $key);
- } catch (EnvironmentIsBrokenException $ex) {
- logger('Cannot safely perform encryption');
- return -6;
- }
-
- $key = $KeyObject->saveToAsciiSafeString();
- break;
default:
logger("rino: invalid requested version '$rino_remote_version'");
return -8;
$postvars['rino'] = $rino_remote_version;
$postvars['data'] = bin2hex($data);
- //logger('rino: sent key = ' . $key, LOGGER_DEBUG);
-
-
if ($dfrn_version >= 2.1) {
if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
- $xml = post_url($contact['notify'], $postvars);
+ $xml = Network::post($contact['notify'], $postvars);
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
return 3;
}
- if ($contact['term-date'] > NULL_DATE) {
- logger("dfrn_deliver: $url back from the dead - removing mark for death");
- Contact::unmarkForArchival($contact);
- }
-
- $res = parse_xml_string($xml);
+ $res = XML::parseString($xml);
if (!isset($res->status)) {
return -11;
logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
}
+ if ($res->status == 200) {
+ Contact::unmarkForArchival($contact);
+ }
+
return intval($res->status);
}
"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(datetime_convert("UTC", "UTC", $birthday)),
+ dbesc(DateTimeFormat::utc($birthday)),
dbesc("birthday")
);
logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
- $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
- $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]");
+ $bdtext = L10n::t("%s\'s birthday", $contact["name"]);
+ $bdtext2 = L10n::t("Happy Birthday %s", " [url=".$contact["url"]."]".$contact["name"]."[/url]");
$r = q(
"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
intval($contact["uid"]),
intval($contact["id"]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert("UTC", "UTC", $birthday)),
- dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")),
+ dbesc(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utc($birthday)),
+ dbesc(DateTimeFormat::utc($birthday . " + 1 day ")),
dbesc($bdtext),
dbesc($bdtext2),
dbesc("birthday")
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
- $r = q(
- "SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
+ $contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`,
`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
- FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
- intval($importer["uid"]),
- dbesc(normalise_link($author["link"])),
- dbesc(NETWORK_STATUSNET)
+ FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?",
+ $importer["uid"],
+ normalise_link($author["link"]),
+ NETWORK_STATUSNET
);
- if (DBM::is_result($r)) {
- $contact = $r[0];
- $author["contact-id"] = $r[0]["id"];
- $author["network"] = $r[0]["network"];
+ if (DBM::is_result($contact_old)) {
+ $author["contact-id"] = $contact_old["id"];
+ $author["network"] = $contact_old["network"];
} else {
if (!$onlyfetch) {
logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
$width = $attributes->textContent;
}
if ($attributes->name == "updated") {
- $contact["avatar-date"] = $attributes->textContent;
+ $author["avatar-date"] = $attributes->textContent;
}
}
if (($width > 0) && ($href != "")) {
$author["avatar"] = current($avatarlist);
}
- if (DBM::is_result($r) && !$onlyfetch) {
- logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
+ if (DBM::is_result($contact_old) && !$onlyfetch) {
+ logger("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", LOGGER_DEBUG);
- $poco = ["url" => $contact["url"]];
+ $poco = ["url" => $contact_old["url"]];
// When was the last change to name or uri?
$name_element = $xpath->query($element . "/atom:name", $context)->item(0);
// If the "hide" element is present then the profile isn't searchable.
$hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
- logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG);
+ logger("Hidden status for contact " . $contact_old["url"] . ": " . $hide, LOGGER_DEBUG);
// If the contact isn't searchable then set the contact to "hidden".
// Problem: This can be manually overridden by the user.
if ($hide) {
- $contact["hidden"] = true;
+ $contact_old["hidden"] = true;
}
// Save the keywords into the contact table
}
// "dfrn:birthday" contains the birthday converted to UTC
- $old_bdyear = $contact["bdyear"];
-
$birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
if (strtotime($birthday) > time()) {
$poco["bd"] = $value;
}
- $contact = array_merge($contact, $poco);
+ $contact = array_merge($contact_old, $poco);
- if ($old_bdyear != $contact["bdyear"]) {
+ if ($contact_old["bdyear"] != $contact["bdyear"]) {
self::birthdayEvent($contact, $birthday);
}
// Get all field names
$fields = [];
- foreach ($r[0] as $field => $data) {
+ foreach ($contact_old as $field => $data) {
$fields[$field] = $data;
}
unset($fields["uid"]);
unset($fields["url"]);
unset($fields["avatar-date"]);
+ unset($fields["avatar"]);
unset($fields["name-date"]);
unset($fields["uri-date"]);
+ $update = false;
// Update check for this field has to be done differently
$datefields = ["name-date", "uri-date"];
foreach ($datefields as $field) {
- if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
- logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
+ if (strtotime($contact[$field]) > strtotime($contact_old[$field])) {
+ logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG);
$update = true;
}
}
foreach ($fields as $field => $data) {
- if ($contact[$field] != $r[0][$field]) {
- logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
+ if ($contact[$field] != $contact_old[$field]) {
+ logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG);
$update = true;
}
}
}
Contact::updateAvatar(
- $author["avatar"],
- $importer["uid"],
- $contact["id"],
- (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))
+ $author['avatar'],
+ $importer['uid'],
+ $contact['id'],
+ (strtotime($contact['avatar-date']) > strtotime($contact_old['avatar-date']) || ($author['avatar'] != $contact_old['avatar']))
);
/*
GContact::link($gcid, $importer["uid"], $contact["id"]);
}
- return($author);
+ return $author;
}
/**
$msg["contact-id"] = $importer["id"];
$msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue;
$msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue;
- $msg["created"] = $xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue;
+ $msg["created"] = DateTimeFormat::utc($xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue);
$msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue;
$msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue;
$msg["seen"] = 0;
intval($suggest["cid"]),
dbesc($suggest["body"]),
dbesc($hash),
- dbesc(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
intval(0)
);
{
$changed = false;
- if (edited_timestamp_is_newer($current, $item)) {
+ if (self::isEditedTimestampNewer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have.
- if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
+ if (DateTimeFormat::utc($item["edited"]) < $current["edited"]) {
return false;
}
$fields = ['title' => $item["title"], 'body' => $item["body"],
- 'tag' => $item["tag"], 'changed' => datetime_convert(),
- 'edited' => datetime_convert("UTC", "UTC", $item["edited"])];
+ 'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+ 'edited' => DateTimeFormat::utc($item["edited"])];
$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
- dba::update('item', $fields, $condition);
-
- create_tags_from_itemuri($item["uri"], $importer["importer_uid"]);
- update_thread_uri($item["uri"], $importer["importer_uid"]);
+ Item::update($fields, $condition);
$changed = true;
* valid community action. Also forum_mode makes it valid for sure.
* If neither, it's not.
*/
-
- /// @TODO Maybe merge these if() blocks into one?
if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
$is_a_remote_action = false;
logger("not a community action");
if (!$verb) {
return;
}
- $xo = parse_xml_string($item["object"], false);
+ $xo = XML::parseString($item["object"], false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
"to_email" => $importer["email"],
"uid" => $importer["importer_uid"],
"item" => $item,
- "link" => System::baseUrl()."/display/".urlencode(get_item_guid($posted_id)),
+ "link" => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
"source_name" => stripslashes($item["author-name"]),
"source_link" => $item["author-link"],
"source_photo" => ((link_compare($item["author-link"], $importer["url"]))
// This function once was responsible for DFRN and OStatus.
if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
logger("New follower");
- new_follower($importer, $contact, $item, $nickname);
+ Contact::addRelationship($importer, $contact, $item, $nickname);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
logger("Lost follower");
- lose_follower($importer, $contact, $item);
+ Contact::removeFollower($importer, $contact, $item);
return false;
}
if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
logger("New friend request");
- new_follower($importer, $contact, $item, $nickname, true);
+ Contact::addRelationship($importer, $contact, $item, $nickname, true);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
logger("Lost sharer");
- lose_sharer($importer, $contact, $item);
+ Contact::removeSharer($importer, $contact, $item);
return false;
}
} else {
}
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
- $xo = parse_xml_string($item["object"], false);
- $xt = parse_xml_string($item["target"], false);
+ $xo = XML::parseString($item["object"], false);
+ $xt = XML::parseString($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q(
// extract tag, if not duplicate, add to parent item
if ($xo->content) {
- if (!(stristr($r[0]["tag"], trim($xo->content)))) {
- q(
- "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
- intval($r[0]["id"])
- );
- create_tags_from_item($r[0]["id"]);
+ if (!stristr($r[0]["tag"], trim($xo->content))) {
+ $tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+ Item::update(['tag' => $tag], ['id' => $r[0]["id"]]);
}
}
}
$title = "";
foreach ($links as $link) {
foreach ($link->attributes as $attributes) {
- /// @TODO Rewrite these repeated (same) if () statements to a switch()
- if ($attributes->name == "href") {
- $href = $attributes->textContent;
- }
- if ($attributes->name == "rel") {
- $rel = $attributes->textContent;
- }
- if ($attributes->name == "type") {
- $type = $attributes->textContent;
- }
- if ($attributes->name == "length") {
- $length = $attributes->textContent;
- }
- if ($attributes->name == "title") {
- $title = $attributes->textContent;
+ switch ($attributes->name) {
+ case "href" : $href = $attributes->textContent; break;
+ case "rel" : $rel = $attributes->textContent; break;
+ case "type" : $type = $attributes->textContent; break;
+ case "length": $length = $attributes->textContent; break;
+ case "title" : $title = $attributes->textContent; break;
}
}
if (($rel != "") && ($href != "")) {
$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
- $current = q(
- "SELECT `id`, `uid`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($item["uri"]),
- intval($importer["importer_uid"])
+ $current = dba::selectFirst('item',
+ ['id', 'uid', 'edited', 'body'],
+ ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]
);
-
// Is there an existing item?
- if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item)
- && (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"])
- ) {
- logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ if (DBM::is_result($current) && !self::isEditedTimestampNewer($current, $item)) {
+ logger("Item ".$item["uri"]." (".$item['edited'].") already existed.", LOGGER_DEBUG);
return;
}
// make sure nobody is trying to sneak some html tags by us
$item["body"] = notags(base64url_decode($item["body"]));
- $item["body"] = limit_body_size($item["body"]);
+ $item["body"] = BBCode::limitBodySize($item["body"]);
/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
$item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
- // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
+ // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
$item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
- $r = parse_xml_string($item["object"], false);
+ $r = XML::parseString($item["object"], false);
if (isset($r->type)) {
$item["object-type"] = $r->type;
}
if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
$item["network"] = $author["network"];
}
-
- /// @TODO maybe remove this old-lost code then?
- // This code was taken from the old DFRN code
- // When activated, forums don't work.
- // And: Why should we disallow commenting by followers?
- // the behaviour is now similar to the Diaspora part.
- //if ($importer["rel"] == CONTACT_IS_FOLLOWER) {
- // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
- // return;
- //}
}
if ($entrytype == DFRN_REPLY_RC) {
$ev = bbtoevent($item["body"]);
if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
- /// @TODO Mixure of "/' ahead ...
- $ev["cid"] = $importer["id"];
- $ev["uid"] = $importer["uid"];
- $ev["uri"] = $item["uri"];
- $ev["edited"] = $item["edited"];
- $ev['private'] = $item['private'];
- $ev["guid"] = $item["guid"];
+ $ev["cid"] = $importer["id"];
+ $ev["uid"] = $importer["uid"];
+ $ev["uri"] = $item["uri"];
+ $ev["edited"] = $item["edited"];
+ $ev["private"] = $item["private"];
+ $ev["guid"] = $item["guid"];
$r = q(
"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
// Update content if 'updated' changes
if (DBM::is_result($current)) {
- if (self::updateContent($r[0], $item, $importer, $entrytype)) {
+ if (self::updateContent($current, $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
} else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
}
if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
- $posted_id = item_store($item);
+ $posted_id = Item::insert($item);
$parent = 0;
if ($posted_id) {
/*
* The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
* but otherwise there's a possible data mixup on the sender's system.
- * the tgroup delivery code called from item_store will correct it if it's a forum,
+ * the tgroup delivery code called from Item::insert will correct it if it's a forum,
* but we're going to unconditionally correct it here so that the post will always be owned by our contact.
*/
logger('Correcting item owner.', LOGGER_DEBUG);
$item["owner-avatar"] = $importer["thumb"];
}
- if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+ if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return;
}
// This is my contact on another system, but it's really me.
// Turn this into a wall post.
- $notify = item_is_remote_self($importer, $item);
+ $notify = Item::isRemoteSelf($importer, $item);
- $posted_id = item_store($item, false, $notify);
+ $posted_id = Item::insert($item, false, $notify);
logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
private static function processDeletion($xpath, $deletion, $importer)
{
logger("Processing deletions");
-
+ $uri = null;
foreach ($deletion->attributes as $attributes) {
if ($attributes->name == "ref") {
$uri = $attributes->textContent;
}
- if ($attributes->name == "when") {
- $when = $attributes->textContent;
- }
- }
- if ($when) {
- $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
- } else {
- $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
}
if (!$uri || !$importer["id"]) {
return false;
}
- /// @todo Only select the used fields
- $r = q(
- "SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
- WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
- dbesc($uri),
- intval($importer["uid"]),
- intval($importer["id"])
- );
- if (!DBM::is_result($r)) {
+ $condition = ["`uri` = ? AND `uid` = ? AND `contact-id` = ? AND NOT `file` LIKE '%[%'",
+ $uri, $importer["uid"], $importer["id"]];
+ $item = dba::selectFirst('item', ['id'], $condition);
+ if (!DBM::is_result($item)) {
logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
return;
- } else {
- $item = $r[0];
-
- $entrytype = self::getEntryType($importer, $item);
-
- if (!$item["deleted"]) {
- logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
- } else {
- return;
- }
-
- if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
- logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
- event_delete($item["event-id"]);
- }
-
- if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
- $xo = parse_xml_string($item["object"], false);
- $xt = parse_xml_string($item["target"], false);
-
- if ($xt->type == ACTIVITY_OBJ_NOTE) {
- $i = q(
- "SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($xt->id),
- intval($importer["importer_uid"])
- );
- if (DBM::is_result($i)) {
- // For tags, the owner cannot remove the tag on the author's copy of the post.
-
- $owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
- $author_remove = (($item["origin"] && $item["self"]) ? true : false);
- $author_copy = (($item["origin"]) ? true : false);
+ }
- if ($owner_remove && $author_copy) {
- return;
- }
- if ($author_remove || $owner_remove) {
- $tags = explode(',', $i[0]["tag"]);
- $newtags = [];
- if (count($tags)) {
- foreach ($tags as $tag) {
- if (trim($tag) !== trim($xo->body)) {
- $newtags[] = trim($tag);
- }
- }
- }
- q(
- "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc(implode(',', $newtags)),
- intval($i[0]["id"])
- );
- create_tags_from_item($i[0]["id"]);
- }
- }
- }
- }
+ $entrytype = self::getEntryType($importer, $item);
- if ($entrytype == DFRN_TOP_LEVEL) {
- $r = q(
- "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
- `body` = '', `title` = ''
- WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
- dbesc($when),
- dbesc(datetime_convert()),
- dbesc($uri),
- intval($importer["uid"])
- );
- create_tags_from_itemuri($uri, $importer["uid"]);
- Term::createFromItemURI($uri, $importer["uid"]);
- update_thread_uri($uri, $importer["uid"]);
- } else {
- $r = q(
- "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
- `body` = '', `title` = ''
- WHERE `uri` = '%s' AND `uid` IN (0, %d)",
- dbesc($when),
- dbesc(datetime_convert()),
- dbesc($uri),
- intval($importer["uid"])
- );
- create_tags_from_itemuri($uri, $importer["uid"]);
- Term::createFromItemURI($uri, $importer["uid"]);
- update_thread_uri($uri, $importer["importer_uid"]);
+ if (!$item["deleted"]) {
+ logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
+ } else {
+ return;
+ }
- // if this is a relayed delete, propagate it to other recipients
+ Item::deleteById($item["id"]);
- if ($entrytype == DFRN_REPLY_RC) {
- logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
- }
+ if ($entrytype != DFRN_TOP_LEVEL) {
+ // if this is a relayed delete, propagate it to other recipients
+ if ($entrytype == DFRN_REPLY_RC) {
+ logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
}
}
}
return;
}
+
+ /**
+ * @brief Returns the activity verb
+ *
+ * @param array $item Item array
+ *
+ * @return string activity verb
+ */
+ private static function constructVerb(array $item)
+ {
+ if ($item['verb']) {
+ return $item['verb'];
+ }
+ return ACTIVITY_POST;
+ }
+
+ private static function tgroupCheck($uid, $item)
+ {
+ $mention = false;
+
+ // check that the message originated elsewhere and is a top-level post
+
+ if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['parent-uri'])) {
+ return false;
+ }
+
+ $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($uid)
+ );
+ if (!DBM::is_result($u)) {
+ return false;
+ }
+
+ $community_page = ($u[0]['page-flags'] == PAGE_COMMUNITY);
+ $prvgroup = ($u[0]['page-flags'] == PAGE_PRVGROUP);
+
+ $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+
+ /*
+ * Diaspora uses their own hardwired link URL in @-tags
+ * instead of the one we supply with webfinger
+ */
+ $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+
+ $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
+ if ($cnt) {
+ foreach ($matches as $mtch) {
+ if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
+ $mention = true;
+ logger('mention found: ' . $mtch[2]);
+ }
+ }
+ }
+
+ if (!$mention) {
+ return false;
+ }
+
+ return $community_page || $prvgroup;
+ }
+
+ /**
+ * This function returns true if $update has an edited timestamp newer
+ * than $existing, i.e. $update contains new data which should override
+ * what's already there. If there is no timestamp yet, the update is
+ * assumed to be newer. If the update has no timestamp, the existing
+ * item is assumed to be up-to-date. If the timestamps are equal it
+ * assumes the update has been seen before and should be ignored.
+ *
+ */
+ private static function isEditedTimestampNewer($existing, $update)
+ {
+ if (!x($existing, 'edited') || !$existing['edited']) {
+ return true;
+ }
+ if (!x($update, 'edited') || !$update['edited']) {
+ return false;
+ }
+
+ $existing_edited = DateTimeFormat::utc($existing['edited']);
+ $update_edited = DateTimeFormat::utc($update['edited']);
+
+ return (strcmp($existing_edited, $update_edited) < 0);
+ }
}
projects / friendica.git / blobdiff