use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
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;
DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
- logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
+ Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
}
$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::log('Import OStatus message for user ' . $importer['uid'], Logger::DEBUG);
if ($xml == "") {
return false;
foreach ($hub_attributes as $hub_attribute) {
if ($hub_attribute->name == "href") {
$hub = $hub_attribute->textContent;
- logger("Found hub ".$hub, LOGGER_DEBUG);
+ Logger::log("Found hub ".$hub, Logger::DEBUG);
}
}
}
$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;
if (in_array($item["verb"], [NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE])) {
// Ignore "Unfavorite" message
- logger("Ignore unfavorite message ".print_r($item, true), LOGGER_DEBUG);
+ Logger::log("Ignore unfavorite message ".print_r($item, true), Logger::DEBUG);
continue;
}
// Deletions come with the same uri, so we check for duplicates after processing deletions
if (Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
- logger('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
+ Logger::log('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
continue;
} else {
- logger('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
+ Logger::log('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
}
if ($item["verb"] == ACTIVITY_JOIN) {
// ignore "Join" messages
- logger("Ignore join message ".print_r($item, true), LOGGER_DEBUG);
+ Logger::log("Ignore join message ".print_r($item, true), Logger::DEBUG);
continue;
}
if ($item["verb"] == "http://mastodon.social/schema/1.0/block") {
// ignore mastodon "block" messages
- logger("Ignore block message ".print_r($item, true), LOGGER_DEBUG);
+ Logger::log("Ignore block message ".print_r($item, true), Logger::DEBUG);
continue;
}
if ($item["verb"] == ACTIVITY_FAVORITE) {
$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
- logger("Favorite ".$orig_uri." ".print_r($item, true));
+ Logger::log("Favorite ".$orig_uri." ".print_r($item, true));
$item["verb"] = ACTIVITY_LIKE;
$item["parent-uri"] = $orig_uri;
// http://activitystrea.ms/schema/1.0/rsvp-yes
if (!in_array($item["verb"], [ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE])) {
- logger("Unhandled verb ".$item["verb"]." ".print_r($item, true), LOGGER_DEBUG);
+ Logger::log("Unhandled verb ".$item["verb"]." ".print_r($item, true), Logger::DEBUG);
}
self::processPost($xpath, $entry, $item, $importer);
// If not, then it depends on this setting
$valid = !Config::get('system', 'ostatus_full_threads');
if ($valid) {
- logger("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG);
}
} else {
- logger("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", Logger::DEBUG);
}
if ($valid) {
// Never post a thread when the only interaction by our contact was a like
}
}
if ($valid) {
- logger("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", Logger::DEBUG);
}
}
} else {
// But we will only import complete threads
$valid = Item::exists(['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
if ($valid) {
- logger("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", Logger::DEBUG);
}
}
foreach (self::$itemlist as $item) {
$found = Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]]);
if ($found) {
- logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", Logger::DEBUG);
} elseif ($item['contact-id'] < 0) {
- logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
+ Logger::log("Item with uri ".$item["uri"]." is from a blocked contact.", Logger::DEBUG);
} else {
// We are having duplicated entries. Hopefully this solves it.
if (Lock::acquire('ostatus_process_item_insert')) {
$ret = Item::insert($item);
Lock::release('ostatus_process_item_insert');
- logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
+ Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
} else {
$ret = Item::insert($item);
- logger("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
+ Logger::log("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
}
}
}
}
self::$itemlist = [];
}
- logger('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
+ Logger::log('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
}
return true;
}
{
$condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']];
if (!Item::exists($condition)) {
- logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
+ Logger::log('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
return;
}
Item::delete($condition);
- logger('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
+ Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
}
/**
self::fetchRelated($related, $item["parent-uri"], $importer);
}
} else {
- logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
+ Logger::log('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
}
} else {
$item["parent-uri"] = $item["uri"];
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'] = 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);
+ Logger::log('Delete deprecated entry for URI '.$conv_data['uri'], Logger::DEBUG);
DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
}
- logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
+ Logger::log('Store conversation data for uri '.$conv_data['uri'], Logger::DEBUG);
Conversation::insert($conv_data);
}
}
*/
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);
+ Logger::log('Conversation '.$item['uri'].' is already stored.', Logger::DEBUG);
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();
- $item["protocol"] = PROTOCOL_OSTATUS_SALMON;
+ $item["protocol"] = Conversation::PARCEL_SALMON;
$item["source"] = $xml;
- logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG);
+ Logger::log('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;
$xml = $conversation['source'];
if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
- logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
+ Logger::log('Got valid cached XML for URI '.$related_uri, Logger::DEBUG);
return;
}
- if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
- logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
+ if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
+ Logger::log('Delete invalid cached XML for URI '.$related_uri, Logger::DEBUG);
DBA::delete('conversation', ['item-uri' => $related_uri]);
}
}
$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::log('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::log('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::log('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::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);
+ $xml = $curlResult->getBody();
}
}
// 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;
- logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
+ Logger::log('Got cached XML from conversation for URI '.$related_uri, Logger::DEBUG);
$xml = $conversation['source'];
}
}
if ($xml != '') {
self::process($xml, $importer, $contact, $hub, $stored, false);
} else {
- logger("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, LOGGER_DEBUG);
+ Logger::log("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, Logger::DEBUG);
}
return;
}
*/
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':
$attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
- "media:width" => 175,
- "media:height" => 175,
+ "media:width" => 300,
+ "media:height" => 300,
"href" => $owner["photo"]];
XML::addElement($doc, $author, "link", "", $attributes);
}
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"];
}
private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
- logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+ Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
$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;
private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
- logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+ Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
$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;
}
$attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
- "media:width" => 175,
- "media:height" => 175,
+ "media:width" => 300,
+ "media:height" => 300,
"href" => $contact["photo"]];
XML::addElement($doc, $object, "link", "", $attributes);
$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'];
private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
- logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+ Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
}
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]);
if ((time() - strtotime($owner['last-item'])) < 15*60) {
$result = Cache::get($cachekey);
if (!$nocache && !is_null($result)) {
- logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
+ Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', Logger::DEBUG);
$last_update = $result['last_update'];
return $result['feed'];
}
$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` = ? ";
$feeddata = trim($doc->saveXML());
$msg = ['feed' => $feeddata, 'last_update' => $last_update];
- Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+ Cache::set($cachekey, $msg, Cache::QUARTER_HOUR);
- logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG);
+ Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, Logger::DEBUG);
return $feeddata;
}
projects / friendica.git / blobdiff