use DOMDocument;
use DOMXPath;
+use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache\Duration;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
-use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\XML;
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
- Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
+ Contact::updateAvatar($contact["id"], $author["author-avatar"]);
}
// Ensure that we are having this contact (with uid=0)
- $cid = Contact::getIdForURL($aliaslink, 0, true);
+ $cid = Contact::getIdForURL($aliaslink, 0, false);
if ($cid) {
$fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
// Update the avatar
if (!empty($author["author-avatar"])) {
- Contact::updateAvatar($author["author-avatar"], 0, $cid);
+ Contact::updateAvatar($cid, $author["author-avatar"]);
}
}
// Only add additional data when there is no picture in the post
if (!strstr($item["body"], '[/img]')) {
- $item["body"] = add_page_info_to_body($item["body"]);
+ $item["body"] = PageInfo::searchAndAppendToBody($item["body"]);
}
Tag::storeFromBody($item['uri-id'], $item['body']);
self::$conv_list[$conversation] = true;
- $curlResult = Network::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = DI::httpRequest()->get($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
}
}
if ($file != '') {
- $conversation_atom = Network::curl($attribute['href']);
+ $conversation_atom = DI::httpRequest()->get($attribute['href']);
if ($conversation_atom->isSuccess()) {
$xml = $conversation_atom->getBody();
return;
}
- $curlResult = Network::curl($self);
+ $curlResult = DI::httpRequest()->get($self);
if (!$curlResult->isSuccess()) {
return;
}
$stored = false;
- $curlResult = Network::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = DI::httpRequest()->get($related, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
}
}
if ($atom_file != '') {
- $curlResult = Network::curl($atom_file);
+ $curlResult = DI::httpRequest()->get($atom_file);
if ($curlResult->isSuccess()) {
Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
// Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) {
- $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
+ $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
if ($curlResult->isSuccess()) {
Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = self::convertHref($related_uri);
- $curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
+ $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
if ($curlResult->isSuccess()) {
Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);
if (($item["object-type"] == Activity\ObjectType::QUESTION)
|| ($item["object-type"] == Activity\ObjectType::EVENT)
) {
- $item["body"] .= add_page_info($attribute['href']);
+ $item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
}
break;
case "ostatus:conversation":
}
$link_data['related'] = $attribute['href'];
} else {
- $item["body"] .= add_page_info($attribute['href']);
+ $item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
}
break;
case "self":
*
* @return string The guid if the post is a reshare
*/
- private static function getResharedGuid(array $item)
+ public static function getResharedGuid(array $item)
{
$reshared = Item::getShareArray($item);
if (empty($reshared['guid']) || !empty($reshared['comment'])) {
* @return string The cleaned body
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function formatPicturePost($body)
+ public static function formatPicturePost($body)
{
$siteinfo = BBCode::getAttachedData($body);
* @param DOMDocument $doc XML document
* @param array $owner Contact data of the poster
* @param string $filter The related feed filter (activity, posts or comments)
- * @param bool $feed_mode Behave like a regular feed for users if true
*
* @return object header root element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false)
+ private static function addHeader(DOMDocument $doc, array $owner, $filter)
{
$root = $doc->createElementNS(ActivityNamespace::ATOM1, 'feed');
$doc->appendChild($root);
break;
}
- if (!$feed_mode) {
- $selfUri = "/dfrn_poll/" . $owner["nick"];
- }
+ $selfUri = "/dfrn_poll/" . $owner["nick"];
$attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION];
XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
XML::addElement($doc, $root, "logo", $owner["photo"]);
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
- $author = self::addAuthor($doc, $owner);
+ $author = self::addAuthor($doc, $owner, true);
$root->appendChild($author);
$attributes = ["href" => $owner["url"], "rel" => "alternate", "type" => "text/html"];
$attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
XML::addElement($doc, $root, "link", "", $attributes);
- if ($owner['account-type'] == Contact::TYPE_COMMUNITY) {
+ if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
'archive' => false, 'hidden' => false, 'blocked' => false];
$members = DBA::count('contact', $condition);
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function getAttachment(DOMDocument $doc, $root, $item)
+ public static function getAttachment(DOMDocument $doc, $root, $item)
{
$siteinfo = BBCode::getAttachedData($item["body"]);
$attributes = ["rel" => "enclosure",
"href" => $siteinfo["url"],
"type" => "text/html; charset=UTF-8",
- "length" => "",
+ "length" => "0",
"title" => ($siteinfo["title"] ?? '') ?: $siteinfo["url"],
];
XML::addElement($doc, $root, "link", "", $attributes);
$profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]);
$author = $doc->createElement("author");
XML::addElement($doc, $author, "id", $owner["url"]);
- if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
} else {
XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON);
}
+
XML::addElement($doc, $author, "uri", $owner["url"]);
XML::addElement($doc, $author, "name", $owner["nick"]);
XML::addElement($doc, $author, "email", $owner["addr"]);
*
* @return string activity
*/
- private static function constructVerb(array $item)
+ public static function constructVerb(array $item)
{
if (!empty($item['verb'])) {
return $item['verb'];
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param bool $toplevel optional default false
- * @param bool $feed_mode Behave like a regular feed for users if true
*
* @return \DOMElement Entry element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false, $feed_mode = false)
+ private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
{
$xml = null;
} elseif (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW])) {
return self::followEntry($doc, $item, $owner, $toplevel);
} else {
- return self::noteEntry($doc, $item, $owner, $toplevel, $feed_mode);
+ return self::noteEntry($doc, $item, $owner, $toplevel);
}
}
return $source;
}
- /**
- * Fetches contact data from the contact or the gcontact table
- *
- * @param string $url URL of the contact
- * @param array $owner Contact data of the poster
- *
- * @return array Contact array
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- 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",
- DBA::escape(Strings::normaliseLink($url)),
- intval($owner["uid"])
- );
- if (DBA::isResult($r)) {
- $contact = $r[0];
- $contact["uid"] = -1;
- }
-
- if (!DBA::isResult($r)) {
- $gcontact = DBA::selectFirst('gcontact', [], ['nurl' => Strings::normaliseLink($url)]);
- if (DBA::isResult($r)) {
- $contact = $gcontact;
- $contact["uid"] = -1;
- $contact["success_update"] = $contact["updated"];
- }
- }
-
- if (!DBA::isResult($r)) {
- $contact = $owner;
- }
-
- if (!isset($contact["poll"])) {
- $data = Probe::uri($url);
- $contact["poll"] = $data["poll"];
-
- if (!$contact["alias"]) {
- $contact["alias"] = $data["alias"];
- }
- }
-
- if (!isset($contact["alias"])) {
- $contact["alias"] = $contact["url"];
- }
-
- $contact['account-type'] = $owner['account-type'];
-
- return $contact;
- }
-
/**
* Adds an entry element with reshared content
*
*/
private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
{
- if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+ if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
return false;
}
- $contact = self::contactEntry($repeated_item['author-link'], $owner);
+ $contact = Contact::getByURL($repeated_item['author-link']) ?: $owner;
$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
$entry->appendChild($as_object);
- self::entryFooter($doc, $entry, $item, $owner);
+ self::entryFooter($doc, $entry, $item, $owner, true);
return $entry;
}
*/
private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
- if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+ if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
*/
private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
- $item["id"] = $item["parent"] = 0;
+ $item["id"] = $item['parent'] = 0;
$item["created"] = $item["edited"] = date("c");
$item["private"] = Item::PRIVATE;
- $contact = Probe::uri($item['follow']);
+ $contact = Contact::getByURL($item['follow']);
+ $item['follow'] = $contact['url'];
- if ($contact['alias'] == '') {
- $contact['alias'] = $contact["url"];
- } else {
+ if ($contact['alias']) {
$item['follow'] = $contact['alias'];
+ } else {
+ $contact['alias'] = $contact['url'];
}
$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($contact["url"])];
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
- * @param bool $feed_mode Behave like a regular feed for users if true
*
* @return \DOMElement Entry element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel, $feed_mode)
+ private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
- if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+ if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::NOTE);
- self::entryContent($doc, $entry, $item, $owner, $title, '', true, $feed_mode);
+ self::entryContent($doc, $entry, $item, $owner, $title, '', true);
- self::entryFooter($doc, $entry, $item, $owner, !$feed_mode, $feed_mode);
+ self::entryFooter($doc, $entry, $item, $owner, true);
return $entry;
}
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
+ public static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
{
if (!$toplevel) {
$entry = $doc->createElement("entry");
- if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
- $contact = self::contactEntry($item['author-link'], $owner);
+ if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
+ $contact = Contact::getByURL($item['author-link']) ?: $owner;
$author = self::addAuthor($doc, $contact, false);
$entry->appendChild($author);
}
* @param string $title Title for the post
* @param string $verb The activity verb
* @param bool $complete Add the "status_net" element?
- * @param bool $feed_mode Behave like a regular feed for users if true
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
+ private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true)
{
if ($verb == "") {
$verb = self::constructVerb($item);
$body = self::formatPicturePost($item['body']);
- if (!empty($item['title']) && !$feed_mode) {
+ if (!empty($item['title'])) {
$body = "[b]".$item['title']."[/b]\n\n".$body;
}
"href" => DI::baseUrl()."/display/".$item["guid"]]
);
- if (!$feed_mode && $complete && ($item["id"] > 0)) {
+ if ($complete && ($item["id"] > 0)) {
XML::addElement($doc, $entry, "status_net", "", ["notice_id" => $item["id"]]);
}
- if (!$feed_mode) {
- XML::addElement($doc, $entry, "activity:verb", $verb);
- }
+ XML::addElement($doc, $entry, "activity:verb", $verb);
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
- * @param bool $feed_mode Behave like a regular feed for users if true
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true, $feed_mode = false)
+ 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 = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]);
+ if ($item['gravity'] != GRAVITY_PARENT) {
+ $parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
XML::addElement($doc, $entry, "link", "", $attributes);
}
- if (!$feed_mode && (intval($item["parent"]) > 0)) {
+ if (intval($item['parent']) > 0) {
$conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
if (isset($parent_item)) {
$attributes = [
"href" => $conversation_href,
- "local_id" => $item["parent"],
+ "local_id" => $item['parent'],
"ref" => $conversation_uri];
XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
$mentioned = $newmentions;
foreach ($mentioned as $mention) {
- $condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)];
- $contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
- if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
- ($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) {
+ $contact = Contact::getByURL($mention, ['contact-type']);
+ if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
XML::addElement($doc, $entry, "link", "",
[
"rel" => "mentioned",
}
}
- if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
XML::addElement($doc, $entry, "link", "", [
"rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
]);
}
- if (($item['private'] != Item::PRIVATE) && !$feed_mode) {
+ if ($item['private'] != Item::PRIVATE) {
XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
"href" => "http://activityschema.org/collection/public"]);
XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
* @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
- * @param boolean $feed_mode Behave like a regular feed for users if true
*
* @return string XML feed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false, $feed_mode = false)
+ public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
{
$stamp = microtime(true);
}
$check_date = DateTimeFormat::utc($last_update);
- $authorid = Contact::getIdForURL($owner["url"], 0, true);
+ $authorid = Contact::getIdForURL($owner["url"], 0, false);
$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
$condition[] = Activity\ObjectType::COMMENT;
}
- if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['contact-type'] != Contact::TYPE_COMMUNITY) {
$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
$condition[] = $owner["id"];
$condition[] = $authorid;
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::addHeader($doc, $owner, $filter, $feed_mode);
+ $root = self::addHeader($doc, $owner, $filter);
foreach ($items as $item) {
if (DI::config()->get('system', 'ostatus_debug')) {
$item['body'] .= '🍼';
}
- $entry = self::entry($doc, $item, $owner, false, $feed_mode);
+ if (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW, Activity::LIKE])) {
+ continue;
+ }
+
+ $entry = self::entry($doc, $item, $owner, false);
$root->appendChild($entry);
if ($last_update < $item['created']) {