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;
}
self::$conv_list[$conversation] = true;
- $conversation_data = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
- if (!$conversation_data['success']) {
+ if (!$curlResult->isSuccess()) {
return;
}
$xml = '';
- if (stristr($conversation_data['header'], 'Content-Type: application/atom+xml')) {
- $xml = $conversation_data['body'];
+ if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+ $xml = $curlResult->getBody();
}
if ($xml == '') {
$doc = new DOMDocument();
- if (!@$doc->loadHTML($conversation_data['body'])) {
+ if (!@$doc->loadHTML($curlResult->getBody())) {
return;
}
$xpath = new DOMXPath($doc);
if ($file != '') {
$conversation_atom = Network::curl($attribute['href']);
- if ($conversation_atom['success']) {
- $xml = $conversation_atom['body'];
+ if ($conversation_atom->isSuccess()) {
+ $xml = $conversation_atom->getBody();
}
}
}
$conv_data = [];
$conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
- $conv_data['network'] = NETWORK_OSTATUS;
+ $conv_data['network'] = Protocol::OSTATUS;
$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
return;
}
- $self_data = Network::curl($self);
+ $curlResult = Network::curl($self);
- if (!$self_data['success']) {
+ if (!$curlResult->isSuccess()) {
return;
}
// We reformat the XML to make it better readable
$doc = new DOMDocument();
- $doc->loadXML($self_data['body']);
+ $doc->loadXML($curlResult->getBody());
$doc->preserveWhiteSpace = false;
$doc->formatOutput = true;
$xml = $doc->saveXML();
}
$stored = false;
- $related_data = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
- if (!$related_data['success']) {
+ if (!$curlResult->isSuccess()) {
return;
}
$xml = '';
- if (stristr($related_data['header'], 'Content-Type: application/atom+xml')) {
- logger('Directly fetched XML for URI '.$related_uri, LOGGER_DEBUG);
- $xml = $related_data['body'];
+ if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+ logger('Directly fetched XML for URI ' . $related_uri, LOGGER_DEBUG);
+ $xml = $curlResult->getBody();
}
if ($xml == '') {
$doc = new DOMDocument();
- if (!@$doc->loadHTML($related_data['body'])) {
+ if (!@$doc->loadHTML($curlResult->getBody())) {
return;
}
$xpath = new DOMXPath($doc);
}
}
if ($atom_file != '') {
- $related_atom = Network::curl($atom_file);
+ $curlResult = Network::curl($atom_file);
- if ($related_atom['success']) {
- logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG);
- $xml = $related_atom['body'];
+ if ($curlResult->isSuccess()) {
+ logger('Fetched XML for URI ' . $related_uri, LOGGER_DEBUG);
+ $xml = $curlResult->getBody();
}
}
}
// Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) {
- $related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
+ $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
- if ($related_atom['success']) {
- logger('GNU Social workaround to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
- $xml = $related_atom['body'];
+ if ($curlResult->isSuccess()) {
+ logger('GNU Social workaround to fetch XML for URI ' . $related_uri, LOGGER_DEBUG);
+ $xml = $curlResult->getBody();
}
}
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = OStatus::convertHref($related_uri);
- $related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
+ $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
- if ($related_atom['success']) {
- logger('GNU Social workaround 2 to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
- $xml = $related_atom['body'];
+ if ($curlResult->isSuccess()) {
+ logger('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, LOGGER_DEBUG);
+ $xml = $curlResult->getBody();
}
}
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':
}
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;
}
}
$item["uri"] = $item['parent-uri'] = $item['thr-parent']
- = 'tag:'.get_app()->get_hostname().
+ = 'tag:'.get_app()->getHostName().
','.date('Y-m-d').':'.$action.':'.$owner['uid'].
':person:'.$connect_id.':'.$item['created'];
}
if (intval($item["parent"]) > 0) {
- $conversation_href = System::baseUrl()."/display/".$owner["nick"]."/".$item["parent"];
- $conversation_uri = $conversation_href;
+ $conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
if (isset($parent_item)) {
$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
$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