*/
namespace Friendica\Protocol;
-use Friendica\App;
+use dba;
+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\DBM;
-use Friendica\Model\GlobalContact;
+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\Contact;
-use Friendica\Util\Lock;
+use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
use Friendica\Util\XML;
-use dba;
-use DOMDocument;
-use DomXPath;
-require_once 'include/threads.php';
-require_once 'include/html2bbcode.php';
-require_once 'include/bbcode.php';
+require_once 'include/dba.php';
require_once 'include/items.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
-require_once 'include/Photo.php';
-require_once 'include/follow.php';
require_once 'include/api.php';
require_once 'mod/proxy.php';
class OStatus
{
private static $itemlist;
- private static $conv_list = array();
+ private static $conv_list = [];
/**
* @brief Fetches author data
*/
private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch)
{
- $author = array();
- $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["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["contact-id"] = $contact["id"];
+ $author["author-id"] = Contact::getIdForURL($author["author-link"]);
- $found = false;
+ $author["contact-id"] = $contact["id"];
+ $contact = null;
if ($aliaslink != '') {
- $condition = array("`uid` = ? AND `alias` = ? AND `network` != ?",
- $importer["uid"], $aliaslink, NETWORK_STATUSNET);
- $r = dba::select('contact', array(), $condition, array('limit' => 1));
-
- if (DBM::is_result($r)) {
- $found = true;
- if ($r['blocked']) {
- $r['id'] = -1;
- }
- $contact = $r;
- $author["contact-id"] = $r["id"];
- }
+ $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);
}
- if (!$found && ($author["author-link"] != "")) {
+ if (!DBM::is_result($contact) && $author["author-link"] != '') {
if ($aliaslink == "") {
$aliaslink = $author["author-link"];
}
- $condition = array("`uid` = ? AND `nurl` IN (?, ?) AND `network` != ?", $importer["uid"],
- normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET);
- $r = dba::select('contact', array(), $condition, array('limit' => 1));
-
- if (DBM::is_result($r)) {
- $found = true;
- if ($r['blocked']) {
- $r['id'] = -1;
- }
- $contact = $r;
- $author["contact-id"] = $r["id"];
- }
+ $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);
}
- if (!$found && ($addr != "")) {
- $condition = array("`uid` = ? AND `addr` = ? AND `network` != ?",
- $importer["uid"], $addr, NETWORK_STATUSNET);
- $r = dba::select('contact', array(), $condition, array('limit' => 1));
+ 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);
+ }
- if (DBM::is_result($r)) {
- $found = true;
- if ($r['blocked']) {
- $r['id'] = -1;
- }
- $contact = $r;
- $author["contact-id"] = $r["id"];
+ if (DBM::is_result($contact)) {
+ if ($contact['blocked']) {
+ $contact['id'] = -1;
}
+ $author["contact-id"] = $contact["id"];
}
- $avatarlist = array();
+ $avatarlist = [];
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
foreach ($avatars as $avatar) {
$href = "";
$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 ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
- // This contact is vital, so we awake it from the dead
- Contact::unmarkForArchival($contact);
+ if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
// Update contact data
-
$current = $contact;
unset($current['name-date']);
$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'] = datetime_convert();
+ $contact['name-date'] = DateTimeFormat::utcNow();
- dba::update('contact', $contact, array('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);
- update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
+ Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
}
// Ensure that we are having this contact (with uid=0)
- $cid = Contact::getIdForURL($aliaslink, 0);
+ $cid = Contact::getIdForURL($aliaslink, 0, true);
if ($cid) {
- $fields = array('url', 'nurl', 'name', 'nick', 'alias', 'about', 'location');
- $old_contact = dba::select('contact', $fields, array('id' => $cid), array('limit' => 1));
+ $fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
+ $old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]);
// Update it with the current values
- $fields = array('url' => $author["author-link"], 'name' => $contact["name"],
+ $fields = ['url' => $author["author-link"], 'name' => $contact["name"],
'nurl' => normalise_link($author["author-link"]),
'nick' => $contact["nick"], 'alias' => $contact["alias"],
'about' => $contact["about"], 'location' => $contact["location"],
- 'success_update' => datetime_convert(), 'last-update' => datetime_convert());
+ 'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
- dba::update('contact', $fields, array('id' => $cid), $old_contact);
+ dba::update('contact', $fields, ['id' => $cid], $old_contact);
// Update the avatar
- update_contact_avatar($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"];
- $gcid = GlobalContact::update($contact);
+ if (!empty($author["author-avatar"])) {
+ $contact["photo"] = $author["author-avatar"];
+ }
+ $gcid = GContact::update($contact);
- GlobalContact::link($gcid, $contact["uid"], $contact["id"]);
+ GContact::link($gcid, $contact["uid"], $contact["id"]);
}
return $author;
$doc = new DOMDocument();
@$doc->loadXML($xml);
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
$xpath->registerNamespace('thr', NAMESPACE_THREAD);
$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
- $entries = $xpath->query('/atom:entry');
+ $contact = ["id" => 0];
- foreach ($entries as $entry) {
- // fetch the author
- $author = self::fetchAuthor($xpath, $entry, $importer, $contact, true);
- return $author;
- }
+ // Fetch the first author
+ $authordata = $xpath->query('//author')->item(0);
+ $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, true);
+ return $author;
}
/**
*/
private static function readAttributes($element)
{
- $attribute = array();
+ $attribute = [];
foreach ($element->attributes as $attributes) {
$attribute[$attributes->name] = $attributes->textContent;
* @param array $importer user record of the importing user
* @param array $contact contact
* @param string $hub Called by reference, returns the fetched hub data
+ * @return void
*/
public static function import($xml, $importer, &$contact, &$hub)
{
*
* @param string $xml The XML
* @param array $importer user record of the importing user
- * @param array $contact
+ * @param array $contact contact
* @param string $hub Called by reference, returns the fetched hub data
* @param boolean $stored Is the post fresh imported or from the database?
* @param boolean $initialize Is it the leading post so that data has to be initialized?
private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
{
if ($initialize) {
- self::$itemlist = array();
- self::$conv_list = array();
+ self::$itemlist = [];
+ self::$conv_list = [];
}
logger("Import OStatus message", LOGGER_DEBUG);
$doc = new DOMDocument();
@$doc->loadXML($xml);
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
$xpath->registerNamespace('thr', NAMESPACE_THREAD);
$xpath->registerNamespace('georss', NAMESPACE_GEORSS);
$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 = array();
+ $header = [];
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_OSTATUS;
- $header["type"] = "remote";
+ $header["type"] = "remote-comment";
$header["wall"] = 0;
$header["origin"] = 0;
- $header["gravity"] = GRAVITY_PARENT;
+ $header["gravity"] = GRAVITY_COMMENT;
$first_child = $doc->firstChild->tagName;
$entry = $xpath->query('/atom:entry');
// Reverse the order of the entries
- $entrylist = array();
+ $entrylist = [];
foreach ($entries as $entry) {
$entrylist[] = $entry;
$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"], array('qvitter-delete-notice', ACTIVITY_DELETE, 'delete'))) {
+ if (in_array($item["verb"], ['qvitter-delete-notice', ACTIVITY_DELETE, 'delete'])) {
self::deleteNotice($item);
continue;
}
- if (in_array($item["verb"], array(NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE))) {
+ if (in_array($item["verb"], [NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE])) {
// Ignore "Unfavorite" message
logger("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 (dba::exists('item', array('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"] == ACTIVITY_FOLLOW) {
- new_follower($importer, $contact, $item, $nickname);
+ Contact::addRelationship($importer, $contact, $item, $nickname);
continue;
}
if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
- lose_follower($importer, $contact, $item, $dummy);
+ $dummy = null;
+ Contact::removeFollower($importer, $contact, $item, $dummy);
continue;
}
$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
logger("Favorite ".$orig_uri." ".print_r($item, true));
+ $item["type"] = "activity";
$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
- if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE))) {
+ if (!in_array($item["verb"], [ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE])) {
logger("Unhandled verb ".$item["verb"]." ".print_r($item, true), LOGGER_DEBUG);
}
if (!$valid) {
// 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);
+ }
+ } else {
+ logger("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
$valid = false;
- $verbs = array(ACTIVITY_POST, ACTIVITY_SHARE);
+ $verbs = [ACTIVITY_POST, ACTIVITY_SHARE];
foreach (self::$itemlist as $item) {
if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) {
$valid = true;
}
}
+ if ($valid) {
+ logger("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 = dba::exists('item', array('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);
+ }
}
if ($valid) {
}
}
foreach (self::$itemlist as $item) {
- $found = dba::exists('item', array('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_store')) {
- $ret = item_store($item);
- Lock::remove('ostatus_process_item_store');
+ 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);
} else {
- $ret = item_store($item);
+ $ret = Item::insert($item);
logger("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
}
}
}
}
- self::$itemlist = array();
+ self::$itemlist = [];
}
logger('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
}
return true;
}
+ /**
+ * @param object $item item
+ * @return void
+ */
private static function deleteNotice($item)
{
- $condition = array('uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']);
- $deleted = dba::select('item', array('id', 'parent-uri'), $condition, array('limit' => 1));
- 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;
}
- // Currently we don't have a central deletion function that we could use in this case
- // The function "item_drop" doesn't work for that case
- dba::update(
- 'item',
- array('deleted' => true, 'title' => '', 'body' => '',
- 'edited' => datetime_convert(), 'changed' => datetime_convert()),
- array('id' => $deleted["id"])
- );
-
- delete_thread($deleted["id"], $deleted["parent-uri"]);
+ Item::delete($condition);
logger('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
}
* @param object $entry The xml entry that is processed
* @param array $item The item array
* @param array $importer user record of the importing user
+ * @return void
*/
private static function processPost($xpath, $entry, &$item, $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;
-
- $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]';
+ $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
+ if (!empty($clear_text)) {
+ $item['content-warning'] = HTML::toBBCode($clear_text);
+ }
}
if (($self != '') && empty($item['protocol'])) {
self::fetchConversation($item['conversation-href'], $item['conversation-uri']);
}
- if (isset($item["parent-uri"]) && ($related != '')) {
- if (!dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item['parent-uri']))) {
- self::fetchRelated($related, $item["parent-uri"], $importer);
+ if (isset($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;
+ $item["type"] = "remote";
}
if (($item['author-link'] != '') && !empty($item['protocol'])) {
- $item = store_conversation($item);
+ $item = Conversation::insert($item);
}
self::$itemlist[] = $item;
*
* @param string $conversation The link to the conversation
* @param string $conversation_uri The conversation in "uri" format
+ * @return void
*/
private static function fetchConversation($conversation, $conversation_uri)
{
self::$conv_list[$conversation] = true;
- $conversation_data = z_fetch_url($conversation, false, $redirects, array('accept_content' => 'application/atom+xml, text/html'));
+ $conversation_data = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
if (!$conversation_data['success']) {
return;
if (!@$doc->loadHTML($conversation_data['body'])) {
return;
}
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$links = $xpath->query('//link');
if ($links) {
+ $file = '';
foreach ($links as $link) {
$attribute = self::readAttributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
}
}
if ($file != '') {
- $conversation_atom = z_fetch_url($attribute['href']);
+ $conversation_atom = Network::curl($attribute['href']);
if ($conversation_atom['success']) {
$xml = $conversation_atom['body'];
* @param string $xml The feed
* @param string $conversation conversation
* @param string $conversation_uri conversation uri
+ * @return void
*/
private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
{
$doc = new DOMDocument();
@$doc->loadXML($xml);
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
$xpath->registerNamespace('thr', NAMESPACE_THREAD);
$xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
$doc2->preserveWhiteSpace = false;
$doc2->formatOutput = true;
- $conv_data = array();
+ $conv_data = [];
$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 = array('item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED);
+ $condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
if (dba::exists('conversation', $condition)) {
logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
- dba::delete('conversation', array('item-uri' => $conv_data['uri']));
+ dba::delete('conversation', ['item-uri' => $conv_data['uri']]);
}
logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
- store_conversation($conv_data);
+ Conversation::insert($conv_data);
}
}
/**
* @brief Fetch the own post so that it can be stored later
- * @param array $item The item array
*
* We want to store the original data for later processing.
* This function is meant for cases where we process a feed with multiple entries.
* In that case we need to fetch the single posts here.
*
* @param string $self The link to the self item
+ * @param array $item The item array
+ * @return void
*/
private static function fetchSelf($self, &$item)
{
- $condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
+ $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
if (dba::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
return;
}
- $self_data = z_fetch_url($self);
+ $self_data = Network::curl($self);
if (!$self_data['success']) {
return;
* @param string $related The link to the related item
* @param string $related_uri The related item in "uri" format
* @param array $importer user record of the importing user
+ * @return void
*/
private static function fetchRelated($related, $related_uri, $importer)
{
- $condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
- $conversation = dba::select('conversation', array('source', 'protocol'), $condition, array('limit' => 1));
+ $condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
+ $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', array('item-uri' => $related_uri));
+ dba::delete('conversation', ['item-uri' => $related_uri]);
}
}
$stored = false;
- $related_data = z_fetch_url($related, false, $redirects, array('accept_content' => 'application/atom+xml, text/html'));
+ $related_data = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
if (!$related_data['success']) {
return;
if (!@$doc->loadHTML($related_data['body'])) {
return;
}
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$atom_file = '';
}
}
if ($atom_file != '') {
- $related_atom = z_fetch_url($atom_file);
+ $related_atom = Network::curl($atom_file);
if ($related_atom['success']) {
logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG);
// Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) {
- $related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
+ $related_atom = 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);
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = OStatus::convertHref($related_uri);
- $related_atom = z_fetch_url(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
+ $related_atom = 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);
// Finally we take the data that we fetched from "ostatus:conversation"
if ($xml == '') {
- $condition = array('item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV);
- $conversation = dba::select('conversation', array('source'), $condition, array('limit' => 1));
+ $condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV];
+ $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);
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
if (!is_object($activityobjects)) {
- return array();
+ return [];
}
- $link_data = array();
+ $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_contact = $contact;
- $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $orig_contact, false);
+ $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))) {
*/
private static function processLinks($links, &$item)
{
- $link_data = array('add_body' => '', 'self' => '');
+ $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'];
$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];
}
*/
private static function formatPicturePost($body)
{
- $siteinfo = get_attached_data($body);
+ $siteinfo = BBCode::getAttachedData($body);
if (($siteinfo["type"] == "photo")) {
if (isset($siteinfo["preview"])) {
$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
// Is it a local picture? Then make it smaller here
- $preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
- $preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
+ $preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
+ $preview = str_replace(["-1.jpg", "-1.png"], ["-2.jpg", "-2.png"], $preview);
if (isset($siteinfo["url"])) {
$url = $siteinfo["url"];
/**
* @brief Adds the header elements to the XML document
*
- * @param object $doc XML document
- * @param array $owner Contact data of the poster
+ * @param object $doc XML document
+ * @param array $owner Contact data of the poster
+ * @param string $filter The related feed filter (activity, posts or comments)
*
* @return object header root element
*/
- private static function addHeader($doc, $owner)
+ private static function addHeader($doc, $owner, $filter)
{
$a = get_app();
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
$root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON);
- $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+ $title = '';
+ switch ($filter) {
+ case 'activity': $title = L10n::t('%s\'s timeline', $owner['name']); break;
+ case 'posts' : $title = L10n::t('%s\'s posts' , $owner['name']); break;
+ case 'comments': $title = L10n::t('%s\'s comments', $owner['name']); break;
+ }
+
+ $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
- XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
- XML::addElement($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
+ 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, "logo", $owner["photo"]);
- 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);
$root->appendChild($author);
- $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
+ $attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
XML::addElement($doc, $root, "link", "", $attributes);
/// @TODO We have to find out what this is
self::hublinks($doc, $root, $owner["nick"]);
- $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "salmon");
+ $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"];
XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies");
+ $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"];
XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention");
+ $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"];
XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("href" => System::baseUrl()."/api/statuses/user_timeline/".$owner["nick"].".atom",
- "rel" => "self", "type" => "application/atom+xml");
+ $attributes = ["href" => System::baseUrl() . "/api/statuses/user_timeline/" . $owner["nick"] . ".atom",
+ "rel" => "self", "type" => "application/atom+xml"];
XML::addElement($doc, $root, "link", "", $attributes);
+ 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);
+ XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]);
+ }
+
return $root;
}
* @param object $doc XML document
* @param object $root XML root element where the hub links are added
* @param object $nick nick
+ * @return void
*/
public static function hublinks($doc, $root, $nick)
{
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
- XML::addElement($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
+ 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)
{
$o = "";
- $siteinfo = get_attached_data($item["body"]);
+ $siteinfo = BBCode::getAttachedData($item["body"]);
switch ($siteinfo["type"]) {
case 'photo':
- $imgdata = get_photo_info($siteinfo["image"]);
- $attributes = array("rel" => "enclosure",
- "href" => $siteinfo["image"],
- "type" => $imgdata["mime"],
- "length" => intval($imgdata["size"]));
- XML::addElement($doc, $root, "link", "", $attributes);
+ $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 = array("rel" => "enclosure",
+ $attributes = ["rel" => "enclosure",
"href" => $siteinfo["url"],
"type" => "text/html; charset=UTF-8",
"length" => "",
- "title" => $siteinfo["title"]);
+ "title" => $siteinfo["title"]];
XML::addElement($doc, $root, "link", "", $attributes);
break;
default:
}
if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
- $imgdata = get_photo_info($siteinfo["image"]);
- $attributes = array("rel" => "enclosure",
- "href" => $siteinfo["image"],
- "type" => $imgdata["mime"],
- "length" => intval($imgdata["size"]));
+ $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);
+ XML::addElement($doc, $root, "link", "", $attributes);
+ }
}
$arr = explode('[/attach],', $item['attach']);
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
- $attributes = array("rel" => "enclosure",
+ $attributes = ["rel" => "enclosure",
"href" => $matches[1],
- "type" => $matches[3]);
+ "type" => $matches[3]];
if (intval($matches[2])) {
$attributes["length"] = intval($matches[2]);
*
* @return object author element
*/
- private static function addAuthor($doc, $owner)
+ private static function addAuthor($doc, $owner, $show_profile = true)
{
- $r = q("SELECT `homepage`, `publish` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
- if (DBM::is_result($r)) {
- $profile = $r[0];
- }
+ $profile = dba::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
$author = $doc->createElement("author");
XML::addElement($doc, $author, "id", $owner["url"]);
- XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
+ if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP);
+ } else {
+ XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
+ }
XML::addElement($doc, $author, "uri", $owner["url"]);
XML::addElement($doc, $author, "name", $owner["nick"]);
XML::addElement($doc, $author, "email", $owner["addr"]);
- XML::addElement($doc, $author, "summary", bbcode($owner["about"], false, false, 7));
+ if ($show_profile) {
+ XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, 7));
+ }
- $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
+ $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
XML::addElement($doc, $author, "link", "", $attributes);
- $attributes = array(
+ $attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
"media:width" => 175,
"media:height" => 175,
- "href" => $owner["photo"]);
+ "href" => $owner["photo"]];
XML::addElement($doc, $author, "link", "", $attributes);
if (isset($owner["thumb"])) {
- $attributes = array(
+ $attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
"media:width" => 80,
"media:height" => 80,
- "href" => $owner["thumb"]);
+ "href" => $owner["thumb"]];
XML::addElement($doc, $author, "link", "", $attributes);
}
XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
- XML::addElement($doc, $author, "poco:note", bbcode($owner["about"], false, false, 7));
+ if ($show_profile) {
+ XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, 7));
- if (trim($owner["location"]) != "") {
- $element = $doc->createElement("poco:address");
- XML::addElement($doc, $element, "poco:formatted", $owner["location"]);
- $author->appendChild($element);
+ if (trim($owner["location"]) != "") {
+ $element = $doc->createElement("poco:address");
+ XML::addElement($doc, $element, "poco:formatted", $owner["location"]);
+ $author->appendChild($element);
+ }
}
- if (trim($profile["homepage"]) != "") {
- $urls = $doc->createElement("poco:urls");
- XML::addElement($doc, $urls, "poco:type", "homepage");
- XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
- XML::addElement($doc, $urls, "poco:primary", "true");
- $author->appendChild($urls);
- }
+ if (DBM::is_result($profile) && !$show_profile) {
+ if (trim($profile["homepage"]) != "") {
+ $urls = $doc->createElement("poco:urls");
+ XML::addElement($doc, $urls, "poco:type", "homepage");
+ XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
+ XML::addElement($doc, $urls, "poco:primary", "true");
+ $author->appendChild($urls);
+ }
- if (count($profile)) {
- XML::addElement($doc, $author, "followers", "", array("url" => System::baseUrl()."/viewcontacts/".$owner["nick"]));
- XML::addElement($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
- }
+ XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]);
+ XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
- if ($profile["publish"]) {
- XML::addElement($doc, $author, "mastodon:scope", "public");
+ if ($profile["publish"]) {
+ XML::addElement($doc, $author, "mastodon:scope", "public");
+ }
}
+
return $author;
}
*/
private static function constructObjecttype($item)
{
- if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT)))
+ if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
return $item['object-type'];
return ACTIVITY_OBJ_NOTE;
}
*/
private static function entry($doc, $item, $owner, $toplevel = false)
{
+ $xml = null;
+
$repeated_guid = self::getResharedGuid($item);
if ($repeated_guid != "") {
$xml = self::reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel);
if ($item["verb"] == ACTIVITY_LIKE) {
return self::likeEntry($doc, $item, $owner, $toplevel);
- } elseif (in_array($item["verb"], array(ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"))) {
+ } elseif (in_array($item["verb"], [ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"])) {
return self::followEntry($doc, $item, $owner, $toplevel);
} else {
return self::noteEntry($doc, $item, $owner, $toplevel);
$source = $doc->createElement("source");
XML::addElement($doc, $source, "id", $contact["poll"]);
XML::addElement($doc, $source, "title", $contact["name"]);
- XML::addElement($doc, $source, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]));
- XML::addElement($doc, $source, "link", "", array("rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]));
+ XML::addElement($doc, $source, "link", "", ["rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]]);
+ XML::addElement($doc, $source, "link", "", ["rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]]);
XML::addElement($doc, $source, "icon", $contact["photo"]);
- XML::addElement($doc, $source, "updated", datetime_convert("UTC", "UTC", $contact["success_update"]."+00:00", ATOM_TIME));
+ XML::addElement($doc, $source, "updated", DateTimeFormat::utc($contact["success_update"]."+00:00", DateTimeFormat::ATOM));
return $source;
}
* @param object $doc XML document
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
- * @param $repeated_guid
+ * @param string $repeated_guid guid
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
- $title = self::entryHeader($doc, $entry, $owner, $toplevel);
+ $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"];
self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false);
- $author = self::addAuthor($doc, $contact);
+ $author = self::addAuthor($doc, $contact, false);
$as_object->appendChild($author);
$as_object2 = $doc->createElement("activity:object");
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
- $title = self::entryHeader($doc, $entry, $owner, $toplevel);
+ $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
$verb = NAMESPACE_ACTIVITY_SCHEMA."favorite";
self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
$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);
XML::addElement($doc, $object, "id", $contact["alias"]);
XML::addElement($doc, $object, "title", $contact["nick"]);
- $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]);
+ $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $contact["url"]];
XML::addElement($doc, $object, "link", "", $attributes);
- $attributes = array(
+ $attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
"media:width" => 175,
"media:height" => 175,
- "href" => $contact["photo"]);
+ "href" => $contact["photo"]];
XML::addElement($doc, $object, "link", "", $attributes);
XML::addElement($doc, $object, "poco:preferredUsername", $contact["nick"]);
}
if ($item['verb'] == ACTIVITY_FOLLOW) {
- $message = t('%s is now following %s.');
- $title = t('following');
+ $message = L10n::t('%s is now following %s.');
+ $title = L10n::t('following');
$action = "subscription";
} else {
- $message = t('%s stopped following %s.');
- $title = t('stopped following');
+ $message = L10n::t('%s stopped following %s.');
+ $title = L10n::t('stopped following');
$action = "unfollow";
}
$item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
- self::entryHeader($doc, $entry, $owner, $toplevel);
+ self::entryHeader($doc, $entry, $owner, $item, $toplevel);
self::entryContent($doc, $entry, $item, $owner, $title);
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
- $title = self::entryHeader($doc, $entry, $owner, $toplevel);
+ $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
*
* @return string The title for the element
*/
- private static function entryHeader($doc, &$entry, $owner, $toplevel)
+ private static function entryHeader($doc, &$entry, $owner, $item, $toplevel)
{
/// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
$entry = $doc->createElement("entry");
$title = sprintf("New note by %s", $owner["nick"]);
+
+ if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ $contact = self::contactEntry($item['author-link'], $owner);
+ $author = self::addAuthor($doc, $contact, false);
+ $entry->appendChild($author);
+ }
} else {
$entry = $doc->createElementNS(NAMESPACE_ATOM1, "entry");
* @param string $title Title for the post
* @param string $verb The activity verb
* @param bool $complete Add the "status_net" element?
+ * @return void
*/
private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
{
$body = "[b]".$item['title']."[/b]\n\n".$body;
}
- $body = bbcode($body, false, false, 7);
+ $body = BBCode::convert($body, false, 7);
- XML::addElement($doc, $entry, "content", $body, array("type" => "html"));
+ XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
- XML::addElement($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
- "href" => System::baseUrl()."/display/".$item["guid"])
+ XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html",
+ "href" => System::baseUrl()."/display/".$item["guid"]]
);
if ($complete && ($item["id"] > 0)) {
- XML::addElement($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
+ XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]);
}
XML::addElement($doc, $entry, "activity:verb", $verb);
- 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));
}
/**
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param bool $complete default true
+ * @return void
*/
- private static function entryFooter($doc, $entry, $item, $owner, $complete = true)
+ private static function entryFooter($doc, $entry, array $item, array $owner, $complete = true)
{
- $mentioned = array();
+ $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 = array(
+ $attributes = [
"ref" => $parent_item,
- "href" => $parent_plink);
+ "href" => $parent_plink];
XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
- $attributes = array(
+ $attributes = [
"rel" => "related",
- "href" => $parent_plink);
+ "href" => $parent_plink];
XML::addElement($doc, $entry, "link", "", $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'];
}
}
}
- XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation_href));
+ XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:conversation", "href" => $conversation_href]);
- $attributes = array(
+ $attributes = [
"href" => $conversation_href,
"local_id" => $item["parent"],
- "ref" => $conversation_uri);
+ "ref" => $conversation_uri];
XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
}
- $tags = item_getfeedtags($item);
+ $tags = item::getFeedTags($item);
if (count($tags)) {
foreach ($tags as $t) {
}
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
- $newmentions = array();
+ $newmentions = [];
foreach ($mentioned as $mention) {
$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
$mentioned = $newmentions;
foreach ($mentioned as $mention) {
- $r = q(
- "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
- intval($owner["uid"]),
- dbesc(normalise_link($mention))
- );
- if ($r[0]["forum"] || $r[0]["prv"]) {
+ $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
+ $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", "",
- array(
+ [
"rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
- "href" => $mention)
+ "href" => $mention]
);
} else {
XML::addElement($doc, $entry, "link", "",
- array(
+ [
"rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
- "href" => $mention)
+ "href" => $mention]
);
}
}
+ 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']
+ ]);
+ }
+
if (!$item["private"]) {
- XML::addElement($doc, $entry, "link", "", array("rel" => "ostatus:attention",
- "href" => "http://activityschema.org/collection/public"));
- XML::addElement($doc, $entry, "link", "", array("rel" => "mentioned",
+ XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
+ "href" => "http://activityschema.org/collection/public"]);
+ XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
- "href" => "http://activityschema.org/collection/public"));
+ "href" => "http://activityschema.org/collection/public"]);
XML::addElement($doc, $entry, "mastodon:scope", "public");
}
if (count($tags)) {
foreach ($tags as $t) {
if ($t[0] != "@") {
- XML::addElement($doc, $entry, "category", "", array("term" => $t[2]));
+ XML::addElement($doc, $entry, "category", "", ["term" => $t[2]]);
}
}
}
$app = "web";
}
- $attributes = array("local_id" => $item["id"], "source" => $app);
+ $attributes = ["local_id" => $item["id"], "source" => $app];
if (isset($parent["id"])) {
$attributes["repeat_of"] = $parent["id"];
}
/**
+ * Creates the XML feed for a given nickname
+ *
+ * Supported filters:
+ * - activity (default): all the public posts
+ * - posts: all the public top-level posts
+ * - comments: all the public replies
+ *
+ * Updates the provided last_update parameter if the result comes from the
+ * cache or it is empty
+ *
* @brief Creates the XML feed for a given nickname
*
- * @param object $a The application class
* @param string $owner_nick Nickname of the feed owner
* @param string $last_update Date of the last update
* @param integer $max_items Number of maximum items to fetch
+ * @param string $filter Feed items filter (activity, posts or comments)
+ * @param boolean $nocache Wether to bypass caching
*
* @return string XML feed
*/
- public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300)
+ public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
{
$stamp = microtime(true);
- $cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
+ $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 (!is_null($result)) {
- logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created.' (cached)', LOGGER_DEBUG);
- $last_update = $result['last_update'];
- return $result['feed'];
+ // 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'];
+ }
}
- $r = q(
- "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
- dbesc($owner_nick)
- );
- if (!DBM::is_result($r)) {
- return;
+ if (!strlen($last_update)) {
+ $last_update = 'now -30 days';
}
- $owner = $r[0];
+ $check_date = DateTimeFormat::utc($last_update);
+ $authorid = Contact::getIdForURL($owner["url"], 0, true);
- if (!strlen($last_update)) {
- $last_update = 'now -30 days';
+ $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') {
+ $condition[0] .= " AND `object-type` = ? ";
+ $condition[] = ACTIVITY_OBJ_COMMENT;
}
- $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
- $authorid = Contact::getIdForURL($owner["url"], 0);
-
- $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`.`contact-id` = %d AND
- `item`.`author-id` = %d AND `item`.`created` > '%s' AND
- NOT `item`.`deleted` AND NOT `item`.`private` AND
- `thread`.`network` IN ('%s', '%s')
- ORDER BY `item`.`created` DESC LIMIT %d",
- intval($owner["uid"]), intval($owner["id"]),
- intval($authorid), dbesc($check_date),
- dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items)
- );
+ if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
+ $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;
- $root = self::addHeader($doc, $owner);
+ $root = self::addHeader($doc, $owner, $filter);
foreach ($items as $item) {
if (Config::get('system', 'ostatus_debug')) {
$feeddata = trim($doc->saveXML());
- $msg = array('feed' => $feeddata, 'last_update' => $last_update);
+ $msg = ['feed' => $feeddata, 'last_update' => $last_update];
Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
- logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created, LOGGER_DEBUG);
+ logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG);
return $feeddata;
}
projects / friendica.git / blobdiff