*/
namespace Friendica\Protocol;
+use DOMDocument;
+use DOMXPath;
use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Lock;
use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\GContact;
use Friendica\Model\Item;
+use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Lock;
use Friendica\Util\Network;
use Friendica\Util\XML;
-use dba;
-use DOMDocument;
-use DOMXPath;
require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
require_once 'include/items.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
*
* @return array Array of author related entries for the item
*/
- private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch)
+ private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact, $onlyfetch)
{
$author = [];
- $author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
- $author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue;
- $addr = $xpath->evaluate('atom:author/atom:email/text()', $context)->item(0)->nodeValue;
+ $author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
+ $author["author-name"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $context);
+ $addr = XML::getFirstNodeValue($xpath, 'atom:author/atom:email/text()', $context);
$aliaslink = $author["author-link"];
- $alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
- if (is_object($alternate)) {
- foreach ($alternate as $attributes) {
+ $alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0);
+ if (is_object($alternate_item)) {
+ foreach ($alternate_item->attributes as $attributes) {
if (($attributes->name == "href") && ($attributes->textContent != "")) {
$author["author-link"] = $attributes->textContent;
}
}
}
+ $author["author-id"] = Contact::getIdForURL($author["author-link"]);
+
$author["contact-id"] = $contact["id"];
$contact = null;
$condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], $aliaslink, NETWORK_STATUSNET,
CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ $contact = DBA::selectFirst('contact', [], $condition);
}
if (!DBM::is_result($contact) && $author["author-link"] != '') {
$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ $contact = DBA::selectFirst('contact', [], $condition);
}
if (!DBM::is_result($contact) && ($addr != '')) {
$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], $addr, NETWORK_STATUSNET,
CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ $contact = DBA::selectFirst('contact', [], $condition);
}
if (DBM::is_result($contact)) {
$author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]);
}
- $displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+ $displayname = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
if ($displayname != "") {
$author["author-name"] = $displayname;
}
- $author["owner-name"] = $author["author-name"];
- $author["owner-link"] = $author["author-link"];
- $author["owner-avatar"] = $author["author-avatar"];
+ $author["owner-id"] = $author["author-id"];
// Only update the contacts if it is an OStatus contact
if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
$contact['url'] = $author["author-link"];
$contact['nurl'] = normalise_link($contact['url']);
- $value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
if ($value != "") {
$contact["alias"] = $value;
}
- $value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
if ($value != "") {
$contact["name"] = $value;
}
- $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context);
if ($value != "") {
$contact["nick"] = $value;
}
- $value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()', $context);
if ($value != "") {
- $contact["about"] = html2bbcode($value);
+ $contact["about"] = HTML::toBBCode($value);
}
- $value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()', $context);
if ($value != "") {
$contact["location"] = $value;
}
$contact['name-date'] = DateTimeFormat::utcNow();
- dba::update('contact', $contact, ['id' => $contact["id"]], $current);
+ 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);
if ($cid) {
$fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
- $old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]);
+ $old_contact = DBA::selectFirst('contact', $fields, ['id' => $cid]);
// Update it with the current values
$fields = ['url' => $author["author-link"], 'name' => $contact["name"],
'about' => $contact["about"], 'location' => $contact["location"],
'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
- dba::update('contact', $fields, ['id' => $cid], $old_contact);
+ DBA::update('contact', $fields, ['id' => $cid], $old_contact);
// Update the avatar
- Contact::updateAvatar($author["author-avatar"], 0, $cid);
+ if (!empty($author["author-avatar"])) {
+ Contact::updateAvatar($author["author-avatar"], 0, $cid);
+ }
}
$contact["generation"] = 2;
$contact["hide"] = false; // OStatus contacts are never hidden
- $contact["photo"] = $author["author-avatar"];
+ if (!empty($author["author-avatar"])) {
+ $contact["photo"] = $author["author-avatar"];
+ }
$gcid = GContact::update($contact);
GContact::link($gcid, $contact["uid"], $contact["id"]);
*
* @return array Array of author related entries for the item
*/
- public static function salmonAuthor($xml, $importer)
+ public static function salmonAuthor($xml, array $importer)
{
if ($xml == "") {
return;
* @param string $hub Called by reference, returns the fetched hub data
* @return void
*/
- public static function import($xml, $importer, &$contact, &$hub)
+ public static function import($xml, array $importer, array &$contact, &$hub)
{
self::process($xml, $importer, $contact, $hub);
}
*
* @return boolean Could the XML be processed?
*/
- private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
+ private static function process($xml, array $importer, array &$contact, &$hub, $stored = false, $initialize = true)
{
if ($initialize) {
self::$itemlist = [];
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
$hub = "";
- $hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
- if (is_object($hub_attributes)) {
- foreach ($hub_attributes as $hub_attribute) {
- if ($hub_attribute->name == "href") {
- $hub = $hub_attribute->textContent;
- logger("Found hub ".$hub, LOGGER_DEBUG);
+ $hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
+ if (is_object($hub_items)) {
+ $hub_attributes = $hub_items->attributes;
+ if (is_object($hub_attributes)) {
+ foreach ($hub_attributes as $hub_attribute) {
+ if ($hub_attribute->name == "href") {
+ $hub = $hub_attribute->textContent;
+ logger("Found hub ".$hub, LOGGER_DEBUG);
+ }
}
}
}
$header = [];
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_OSTATUS;
- $header["type"] = "remote";
$header["wall"] = 0;
$header["origin"] = 0;
- $header["gravity"] = GRAVITY_PARENT;
+ $header["gravity"] = GRAVITY_COMMENT;
$first_child = $doc->firstChild->tagName;
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
}
- $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $entry)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
if ($value != "") {
$nickname = $value;
} else {
$item = array_merge($header, $author);
- $item["uri"] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue;
+ $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
- $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
+ $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $entry);
// Delete a message
if (in_array($item["verb"], ['qvitter-delete-notice', ACTIVITY_DELETE, 'delete'])) {
}
// Deletions come with the same uri, so we check for duplicates after processing deletions
- if (dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
+ if (Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
logger('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
continue;
} else {
}
if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+ $dummy = null;
Contact::removeFollower($importer, $contact, $item, $dummy);
continue;
}
$item["verb"] = ACTIVITY_LIKE;
$item["parent-uri"] = $orig_uri;
- $item["gravity"] = GRAVITY_LIKE;
+ $item["gravity"] = GRAVITY_ACTIVITY;
+ $item["object-type"] = ACTIVITY_OBJ_NOTE;
}
// http://activitystrea.ms/schema/1.0/rsvp-yes
}
} else {
// But we will only import complete threads
- $valid = dba::exists('item', ['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
+ $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);
}
}
}
foreach (self::$itemlist as $item) {
- $found = dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]]);
+ $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);
} elseif ($item['contact-id'] < 0) {
logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
} else {
// We are having duplicated entries. Hopefully this solves it.
- if (Lock::set('ostatus_process_item_insert')) {
+ if (Lock::acquire('ostatus_process_item_insert')) {
$ret = Item::insert($item);
- Lock::remove('ostatus_process_item_insert');
+ Lock::release('ostatus_process_item_insert');
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
} else {
$ret = Item::insert($item);
}
/**
- * @param object $item item
+ * Removes notice item from database
+ * @param array $item item
* @return void
*/
- private static function deleteNotice($item)
+ private static function deleteNotice(array $item)
{
- $condition = ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']];
- $deleted = dba::selectFirst('item', ['id', 'parent-uri'], $condition);
- if (!DBM::is_result($deleted)) {
- logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it. ");
+ $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.");
return;
}
- Item::deleteById($deleted["id"]);
+ Item::delete($condition);
logger('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
}
* @param array $importer user record of the importing user
* @return void
*/
- private static function processPost($xpath, $entry, &$item, $importer)
+ private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer)
{
- $item["body"] = html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue);
- $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+ $item["body"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
+ $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry);
if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
- $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
- $item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+ $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+ $item["body"] = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
- $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+ $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
}
- $item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
- $item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
- $conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
- $item['conversation-uri'] = $conversation;
+ $item["created"] = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
+ $item["edited"] = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
+ $item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if (strlen($item["tag"])) {
+ if (!empty($item["tag"])) {
$item["tag"] .= ',';
+ } else {
+ $item["tag"] = '';
}
+
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
}
}
// Mastodon Content Warning
if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
- $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+ $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
if (!empty($clear_text)) {
- $item['content-warning'] = html2bbcode($clear_text);
+ $item['content-warning'] = HTML::toBBCode($clear_text);
}
}
}
if (isset($item["parent-uri"])) {
- if (!dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) {
+ if (!Item::exists(['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) {
if ($related != '') {
self::fetchRelated($related, $item["parent-uri"], $importer);
}
} else {
logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
}
-
- $item["type"] = 'remote-comment';
- $item["gravity"] = GRAVITY_COMMENT;
} else {
$item["parent-uri"] = $item["uri"];
+ $item["gravity"] = GRAVITY_PARENT;
}
if (($item['author-link'] != '') && !empty($item['protocol'])) {
$conv_data['protocol'] = PROTOCOL_SPLITTED_CONV;
$conv_data['network'] = NETWORK_OSTATUS;
- $conv_data['uri'] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue;
+ $conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
}
}
- $conv = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
- $conv_data['conversation-uri'] = $conv;
+ $conv_data['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
$conv_data['source'] = $doc2->saveXML();
$condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
- if (dba::exists('conversation', $condition)) {
+ if (DBA::exists('conversation', $condition)) {
logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
- dba::delete('conversation', ['item-uri' => $conv_data['uri']]);
+ DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
}
logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
* @param array $item The item array
* @return void
*/
- private static function fetchSelf($self, &$item)
+ private static function fetchSelf($self, array &$item)
{
$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
- if (dba::exists('conversation', $condition)) {
+ if (DBA::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
return;
}
private static function fetchRelated($related, $related_uri, $importer)
{
$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
- $conversation = dba::selectFirst('conversation', ['source', 'protocol'], $condition);
+ $conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
if (DBM::is_result($conversation)) {
$stored = true;
$xml = $conversation['source'];
}
if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
- dba::delete('conversation', ['item-uri' => $related_uri]);
+ 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];
- $conversation = dba::selectFirst('conversation', ['source'], $condition);
+ $conversation = DBA::selectFirst('conversation', ['source'], $condition);
if (DBM::is_result($conversation)) {
$stored = true;
logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
*
* @return array with data from links
*/
- private static function processRepeatedItem($xpath, $entry, &$item, $importer)
+ private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
{
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
$link_data = [];
- $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
+ $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobjects);
$links = $xpath->query("atom:link", $activityobjects);
if ($links) {
$link_data = self::processLinks($links, $item);
}
- $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
- $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
- $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
+ $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_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
$item["author-name"] = $orig_author["author-name"];
$item["author-link"] = $orig_author["author-link"];
- $item["author-avatar"] = $orig_author["author-avatar"];
+ $item["author-id"] = $orig_author["author-id"];
- $item["body"] = html2bbcode($orig_body);
+ $item["body"] = HTML::toBBCode($orig_body);
$item["created"] = $orig_created;
$item["edited"] = $orig_edited;
$item["uri"] = $orig_uri;
- $item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
+ $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
- $item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+ $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
if (is_object($inreplyto->item(0))) {
*
* @return array with data from the links
*/
- private static function processLinks($links, &$item)
+ private static function processLinks($links, array &$item)
{
$link_data = ['add_body' => '', 'self' => ''];
foreach ($links as $link) {
$attribute = self::readAttributes($link);
- if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
+ if (!empty($attribute['rel']) && !empty($attribute['href'])) {
switch ($attribute['rel']) {
case "alternate":
$item["plink"] = $attribute['href'];
if ($filetype == 'image') {
$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
} else {
- if (strlen($item["attach"])) {
+ if (!empty($item["attach"])) {
$item["attach"] .= ',';
+ } else {
+ $item["attach"] = '';
}
if (!isset($attribute['length'])) {
$attribute['length'] = "0";
}
- $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
}
break;
case "related":
}
break;
case "self":
- if ($item["plink"] == '') {
+ if (empty($item["plink"])) {
$item["plink"] = $attribute['href'];
}
$link_data['self'] = $attribute['href'];
*
* @return string The guid if the post is a reshare
*/
- private static function getResharedGuid($item)
+ private static function getResharedGuid(array $item)
{
$body = trim($item["body"]);
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
*
* @return object header root element
*/
- private static function addHeader($doc, $owner, $filter)
+ private static function addHeader(DOMDocument $doc, array $owner, $filter)
{
$a = get_app();
XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]);
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, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename')));
XML::addElement($doc, $root, "logo", $owner["photo"]);
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
'archive' => false, 'hidden' => false, 'blocked' => false];
- $members = dba::count('contact', $condition);
+ $members = DBA::count('contact', $condition);
XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]);
}
* @param object $nick nick
* @return void
*/
- public static function hublinks($doc, $root, $nick)
+ public static function hublinks(DOMDocument $doc, $root, $nick)
{
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]);
}
/**
- * @brief Adds attachement data to the XML document
+ * @brief Adds attachment data to the XML document
*
* @param object $doc XML document
* @param object $root XML root element where the hub links are added
* @param array $item Data of the item that is to be posted
* @return void
*/
- private static function getAttachment($doc, $root, $item)
+ private static function getAttachment(DOMDocument $doc, $root, $item)
{
$o = "";
$siteinfo = BBCode::getAttachedData($item["body"]);
switch ($siteinfo["type"]) {
case 'photo':
$imgdata = Image::getInfoFromURL($siteinfo["image"]);
- $attributes = ["rel" => "enclosure",
- "href" => $siteinfo["image"],
- "type" => $imgdata["mime"],
- "length" => intval($imgdata["size"])];
- XML::addElement($doc, $root, "link", "", $attributes);
+ 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" => "enclosure",
if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
$imgdata = Image::getInfoFromURL($siteinfo["image"]);
- $attributes = ["rel" => "enclosure",
- "href" => $siteinfo["image"],
- "type" => $imgdata["mime"],
- "length" => intval($imgdata["size"])];
+ if ($imgdata) {
+ $attributes = ["rel" => "enclosure",
+ "href" => $siteinfo["image"],
+ "type" => $imgdata["mime"],
+ "length" => intval($imgdata["size"])];
- XML::addElement($doc, $root, "link", "", $attributes);
+ XML::addElement($doc, $root, "link", "", $attributes);
+ }
}
$arr = explode('[/attach],', $item['attach']);
*
* @param object $doc XML document
* @param array $owner Contact data of the poster
+ * @param bool $show_profile Whether to show profile
*
* @return object author element
*/
- private static function addAuthor($doc, $owner, $show_profile = true)
+ private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
{
- $profile = dba::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
+ $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
$author = $doc->createElement("author");
XML::addElement($doc, $author, "id", $owner["url"]);
if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
*
* @return string activity
*/
- private static function constructVerb($item)
+ private static function constructVerb(array $item)
{
- if ($item['verb']) {
+ if (!empty($item['verb'])) {
return $item['verb'];
}
*
* @return string Object type
*/
- private static function constructObjecttype($item)
+ private static function constructObjecttype(array $item)
{
if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
return $item['object-type'];
*
* @return object Entry element
*/
- private static function entry($doc, $item, $owner, $toplevel = false)
+ private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
{
$xml = null;
*
* @return object Source element
*/
- private static function sourceEntry($doc, $contact)
+ private static function sourceEntry(DOMDocument $doc, array $contact)
{
$source = $doc->createElement("source");
XML::addElement($doc, $source, "id", $contact["poll"]);
*
* @return array Contact array
*/
- private static function contactEntry($url, $owner)
+ private static function contactEntry($url, array $owner)
{
$r = q(
"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
*
* @return object Entry element
*/
- private static function reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel)
+ 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);
$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
- $r = q(
- "SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
- intval($owner["uid"]),
- dbesc($repeated_guid),
- dbesc(NETWORK_DFRN),
- dbesc(NETWORK_DIASPORA),
- dbesc(NETWORK_OSTATUS)
- );
- if (DBM::is_result($r)) {
- $repeated_item = $r[0];
- } else {
+ $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
+ 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]];
+ $repeated_item = Item::selectFirst([], $condition);
+ if (!DBM::is_result($repeated_item)) {
return false;
}
- $contact = self::contactEntry($repeated_item['author-link'], $owner);
- $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+ $contact = self::contactEntry($repeated_item['author-link'], $owner);
+ $contact['account-type'] = $contact['contact-type'];
$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
*
* @return object Entry element with "like"
*/
- private static function likeEntry($doc, $item, $owner, $toplevel)
+ 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);
$as_object = $doc->createElement("activity:object");
- $parent = q(
- "SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
- dbesc($item["thr-parent"]),
- intval($item["uid"])
- );
- $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+ $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
- XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0]));
+ XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
- self::entryContent($doc, $as_object, $parent[0], $owner, "New entry");
+ self::entryContent($doc, $as_object, $parent, $owner, "New entry");
$entry->appendChild($as_object);
*
* @return object author element
*/
- private static function addPersonObject($doc, $owner, $contact)
+ private static function addPersonObject(DOMDocument $doc, array $owner, array $contact)
{
$object = $doc->createElement("activity:object");
XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
*
* @return object Entry element
*/
- private static function followEntry($doc, $item, $owner, $toplevel)
+ private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
$item["id"] = $item["parent"] = 0;
$item["created"] = $item["edited"] = date("c");
*
* @return object Entry element
*/
- private static function noteEntry($doc, $item, $owner, $toplevel)
+ 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);
*
* @return string The title for the element
*/
- private static function entryHeader($doc, &$entry, $owner, $item, $toplevel)
+ private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
{
/// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
* @param bool $complete Add the "status_net" element?
* @return void
*/
- private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
+ private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true)
{
if ($verb == "") {
$verb = self::constructVerb($item);
* @param bool $complete default true
* @return void
*/
- private static function entryFooter($doc, $entry, $item, $owner, $complete = true)
+ private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
{
$mentioned = [];
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
- $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+ $parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
- $thrparent = q(
- "SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
- intval($owner["uid"]),
- dbesc($parent_item)
- );
- if ($thrparent) {
- $mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
- $mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
- $parent_plink = $thrparent[0]["plink"];
+ $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
+
+ if (DBM::is_result($thrparent)) {
+ $mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
+ $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
+ $parent_plink = $thrparent["plink"];
} else {
- $mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"];
- $mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"];
- $parent_plink = System::baseUrl()."/display/".$parent[0]["guid"];
+ $mentioned[$parent["author-link"]] = $parent["author-link"];
+ $mentioned[$parent["owner-link"]] = $parent["owner-link"];
+ $parent_plink = System::baseUrl()."/display/".$parent["guid"];
}
$attributes = [
$conversation_uri = $conversation_href;
if (isset($parent_item)) {
- $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item);
- if (DBM::is_result($r)) {
- if ($r['conversation-uri'] != '') {
- $conversation_uri = $r['conversation-uri'];
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
+ if (DBM::is_result($conversation)) {
+ if ($conversation['conversation-uri'] != '') {
+ $conversation_uri = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
- $conversation_href = $r['conversation-href'];
+ if ($conversation['conversation-href'] != '') {
+ $conversation_href = $conversation['conversation-href'];
}
}
}
foreach ($mentioned as $mention) {
$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
- $contact = dba::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
+ $contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) ||
($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) {
XML::addElement($doc, $entry, "link", "",
}
if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
- XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
- "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
- "href" => $owner['url']]);
+ XML::addElement($doc, $entry, "link", "", [
+ "rel" => "mentioned",
+ "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
+ "href" => $owner['url']
+ ]);
}
if (!$item["private"]) {
{
$stamp = microtime(true);
+ $owner = User::getOwnerDataByNick($owner_nick);
+ if (!$owner) {
+ return;
+ }
+
$cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
$previous_created = $last_update;
- $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);
- $last_update = $result['last_update'];
- return $result['feed'];
- }
-
- $owner = dba::fetch_first(
- "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1",
- $owner_nick
- );
- if (!DBM::is_result($owner)) {
- return;
+ // Don't cache when the last item was posted less then 15 minutes ago (Cache duration)
+ 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);
+ $last_update = $result['last_update'];
+ return $result['feed'];
+ }
}
if (!strlen($last_update)) {
$check_date = DateTimeFormat::utc($last_update);
$authorid = Contact::getIdForURL($owner["url"], 0, true);
- $sql_extra = '';
- if ($filter === 'posts') {
- $sql_extra .= ' AND `item`.`id` = `item`.`parent` ';
- }
+ $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];
if ($filter === 'comments') {
- $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT));
+ $condition[0] .= " AND `object-type` = ? ";
+ $condition[] = ACTIVITY_OBJ_COMMENT;
}
if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
- $sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid));
- }
-
- $items = q(
- "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
- STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
- WHERE `item`.`uid` = %d
- AND `item`.`created` > '%s'
- AND NOT `item`.`deleted`
- AND NOT `item`.`private`
- AND `item`.`visible`
- AND `item`.`wall`
- AND `thread`.`network` IN ('%s', '%s')
- $sql_extra
- ORDER BY `item`.`created` DESC LIMIT %d",
- intval($owner["uid"]),
- dbesc($check_date),
- dbesc(NETWORK_OSTATUS),
- dbesc(NETWORK_DFRN),
- intval($max_items)
- );
+ $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
+ $condition[] = $owner["id"];
+ $condition[] = $authorid;
+ }
+
+ $params = ['order' => ['created' => true], 'limit' => $max_items];
+
+ if ($filter === 'posts') {
+ $ret = Item::selectThread([], $condition, $params);
+ } else {
+ $ret = Item::select([], $condition, $params);
+ }
+
+ $items = Item::inArray($ret);
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
*
* @return string XML for the salmon
*/
- public static function salmon($item, $owner)
+ public static function salmon(array $item, array $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
projects / friendica.git / blobdiff