use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Lock;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
$author["contact-id"] = $contact["id"];
$contact = null;
+
+/*
+ This here would be better, but we would get problems with contacts from the statusnet addon
+ This is kept here as a reminder for the future
+
+ $cid = Contact::getIdForURL($author["author-link"], $importer["uid"]);
+ if ($cid) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+ }
+*/
if ($aliaslink != '') {
$condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
- $importer["uid"], $aliaslink, NETWORK_STATUSNET,
+ $importer["uid"], $aliaslink, Protocol::STATUSNET,
Contact::SHARING, Contact::FRIEND];
$contact = DBA::selectFirst('contact', [], $condition);
}
$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
- NETWORK_STATUSNET, Contact::SHARING, Contact::FRIEND];
+ Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
$contact = DBA::selectFirst('contact', [], $condition);
}
if (!DBA::isResult($contact) && ($addr != '')) {
$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
- $importer["uid"], $addr, NETWORK_STATUSNET,
+ $importer["uid"], $addr, Protocol::STATUSNET,
Contact::SHARING, Contact::FRIEND];
$contact = DBA::selectFirst('contact', [], $condition);
}
$author["owner-id"] = $author["author-id"];
// Only update the contacts if it is an OStatus contact
- if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
+ if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == Protocol::OSTATUS)) {
// Update contact data
$current = $contact;
$gcid = GContact::update($contact);
GContact::link($gcid, $contact["uid"], $contact["id"]);
- } else {
+ } elseif ($contact["network"] != Protocol::DFRN) {
$contact = null;
}
self::$conv_list = [];
}
- logger("Import OStatus message", LOGGER_DEBUG);
+ logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG);
if ($xml == "") {
return false;
$header = [];
$header["uid"] = $importer["uid"];
- $header["network"] = NETWORK_OSTATUS;
+ $header["network"] = Protocol::OSTATUS;
$header["wall"] = 0;
$header["origin"] = 0;
$header["gravity"] = GRAVITY_COMMENT;
- if (!is_object($doc->firstChild)) {
+ if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
return false;
}
$doc2->formatOutput = true;
$xml2 = $doc2->saveXML();
- $header["protocol"] = PROTOCOL_OSTATUS_SALMON;
+ $header["protocol"] = Conversation::PARCEL_SALMON;
$header["source"] = $xml2;
} elseif (!$initialize) {
return false;
$conv_data = [];
- $conv_data['protocol'] = PROTOCOL_SPLITTED_CONV;
- $conv_data['network'] = NETWORK_OSTATUS;
+ $conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
+ $conv_data['network'] = Protocol::OSTATUS;
$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
$conv_data['source'] = $doc2->saveXML();
- $condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
+ $condition = ['item-uri' => $conv_data['uri'],'protocol' => Conversation::PARCEL_FEED];
if (DBA::exists('conversation', $condition)) {
logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
*/
private static function fetchSelf($self, array &$item)
{
- $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
+ $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
if (DBA::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
return;
$doc->formatOutput = true;
$xml = $doc->saveXML();
- $item["protocol"] = PROTOCOL_OSTATUS_SALMON;
+ $item["protocol"] = Conversation::PARCEL_SALMON;
$item["source"] = $xml;
logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG);
*/
private static function fetchRelated($related, $related_uri, $importer)
{
- $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
+ $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
$conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
if (DBA::isResult($conversation)) {
$stored = true;
logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
return;
}
- if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
+ if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
DBA::delete('conversation', ['item-uri' => $related_uri]);
}
// Finally we take the data that we fetched from "ostatus:conversation"
if ($xml == '') {
- $condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV];
+ $condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION];
$conversation = DBA::selectFirst('conversation', ['source'], $condition);
if (DBA::isResult($conversation)) {
$stored = true;
*/
private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
{
- $activityobjects = $xpath->query('activity:object', $entry)->item(0);
+ $activityobject = $xpath->query('activity:object', $entry)->item(0);
- if (!is_object($activityobjects)) {
+ if (!is_object($activityobject)) {
return [];
}
$link_data = [];
- $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobjects);
+ $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject);
- $links = $xpath->query("atom:link", $activityobjects);
+ $links = $xpath->query("atom:link", $activityobject);
if ($links) {
$link_data = self::processLinks($links, $item);
}
- $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects);
- $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects);
- $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects);
+ $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobject);
+ $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobject);
+ $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobject);
- $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
+ $orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false);
$item["author-name"] = $orig_author["author-name"];
$item["author-link"] = $orig_author["author-link"];
$item["uri"] = $orig_uri;
- $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
+ $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
- $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
+ $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
+
+ // Mastodon Content Warning
+ if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
+ $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject);
+ if (!empty($clear_text)) {
+ $item['content-warning'] = HTML::toBBCode($clear_text);
+ }
+ }
- $inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
+ $inreplyto = $xpath->query('thr:in-reply-to', $activityobject);
if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
switch ($siteinfo["type"]) {
case 'photo':
- $imgdata = Image::getInfoFromURL($siteinfo["image"]);
- if ($imgdata) {
- $attributes = ["rel" => "enclosure",
- "href" => $siteinfo["image"],
- "type" => $imgdata["mime"],
- "length" => intval($imgdata["size"])];
- XML::addElement($doc, $root, "link", "", $attributes);
+ if (!empty($siteinfo["image"])) {
+ $imgdata = Image::getInfoFromURL($siteinfo["image"]);
+ if ($imgdata) {
+ $attributes = ["rel" => "enclosure",
+ "href" => $siteinfo["image"],
+ "type" => $imgdata["mime"],
+ "length" => intval($imgdata["size"])];
+ XML::addElement($doc, $root, "link", "", $attributes);
+ }
}
break;
case 'video':
"href" => $siteinfo["url"],
"type" => "text/html; charset=UTF-8",
"length" => "",
- "title" => $siteinfo["title"]];
+ "title" => defaults($siteinfo, "title", $siteinfo["url"])];
XML::addElement($doc, $root, "link", "", $attributes);
break;
default:
}
if (!DBA::isResult($r)) {
- $r = q(
- "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- DBA::escape(normalise_link($url))
- );
+ $gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
if (DBA::isResult($r)) {
- $contact = $r[0];
+ $contact = $gcontact;
$contact["uid"] = -1;
$contact["success_update"] = $contact["updated"];
}
$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
- 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]];
+ 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
$repeated_item = Item::selectFirst([], $condition);
if (!DBA::isResult($repeated_item)) {
return false;
$object = $doc->createElement("activity:object");
XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
- if ($contact['network'] == NETWORK_PHANTOM) {
+ if ($contact['network'] == Protocol::PHANTOM) {
XML::addElement($doc, $object, "id", $contact['url']);
return $object;
}
$item['follow'] = $contact['alias'];
}
- $r = q(
- "SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
- intval($owner['uid']),
- DBA::escape(normalise_link($contact["url"]))
- );
+ $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+ $user_contact = DBA::selectFirst('contact', ['id'], $condition);
- if (DBA::isResult($r)) {
- $connect_id = $r[0]['id'];
+ if (DBA::isResult($user_contact)) {
+ $connect_id = $user_contact['id'];
} else {
$connect_id = 0;
}
$condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
- $owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN];
+ $owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
if ($filter === 'comments') {
$condition[0] .= " AND `object-type` = ? ";
projects / friendica.git / blobdiff