<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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\Model\Post;
use Friendica\Model\Tag;
use Friendica\Model\User;
+use Friendica\Network\HTTPClientOptions;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
use Friendica\Util\XML;
$contact['name-date'] = DateTimeFormat::utcNow();
- DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
+ Contact::update($contact, ['id' => $contact["id"]], $current);
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
'about' => $contact["about"], 'location' => $contact["location"],
'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
- DBA::update('contact', $fields, ['id' => $cid], $old_contact);
+ Contact::update($fields, ['id' => $cid], $old_contact);
// Update the avatar
if (!empty($author["author-avatar"])) {
if ($item["verb"] == Activity::O_UNFOLLOW) {
$dummy = null;
- Contact::removeFollower($importer, $contact, $item, $dummy);
+ Contact::removeFollower($contact);
continue;
}
$item["body"] .= $add_body;
- // Only add additional data when there is no picture in the post
- if (!strstr($item["body"], '[/img]')) {
- $item["body"] = PageInfo::searchAndAppendToBody($item["body"]);
- }
-
Tag::storeFromBody($item['uri-id'], $item['body']);
// Mastodon Content Warning
self::$conv_list[$conversation] = true;
- $curlResult = DI::httpRequest()->get($conversation, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = DI::httpClient()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
- if (!$curlResult->isSuccess()) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
return;
}
$xml = '';
- if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+ if ($curlResult->inHeader('Content-Type') &&
+ in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
$xml = $curlResult->getBody();
}
}
}
if ($file != '') {
- $conversation_atom = DI::httpRequest()->get($attribute['href']);
+ $conversation_atom = DI::httpClient()->get($attribute['href']);
if ($conversation_atom->isSuccess()) {
$xml = $conversation_atom->getBody();
return;
}
- $curlResult = DI::httpRequest()->get($self);
+ $curlResult = DI::httpClient()->get($self);
if (!$curlResult->isSuccess()) {
return;
}
$stored = false;
- $curlResult = DI::httpRequest()->get($related, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = DI::httpClient()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
- if (!$curlResult->isSuccess()) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
return;
}
$xml = '';
- if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+ if ($curlResult->inHeader('Content-Type') &&
+ in_array('application/atom+xml', $curlResult->getHeader('Content-Type'))) {
Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
$xml = $curlResult->getBody();
}
}
}
if ($atom_file != '') {
- $curlResult = DI::httpRequest()->get($atom_file);
+ $curlResult = DI::httpClient()->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 = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
+ $curlResult = DI::httpClient()->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 = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
+ $curlResult = DI::httpClient()->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"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
+ Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
+ 'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
+ 'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "ostatus:conversation":
}
$link_data['related'] = $attribute['href'];
} else {
- $item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
+ Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
+ 'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
+ 'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "self":
}
}
- /**
- * Checks if the current post is a reshare
- *
- * @param array $item The item array of thw post
- *
- * @return string The guid if the post is a reshare
- */
- public static function getResharedGuid(array $item)
- {
- $reshared = Item::getShareArray($item);
- if (empty($reshared['guid']) || !empty($reshared['comment'])) {
- return '';
- }
-
- return $reshared['guid'];
- }
-
/**
* Cleans the body of a post if it contains picture links
*
* @return string The cleaned body
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function formatPicturePost($body)
+ public static function formatPicturePost($body, $uriid)
{
$siteinfo = BBCode::getAttachedData($body);
}
// Is it a remote picture? Then make a smaller preview here
- $preview = ProxyUtils::proxifyUrl($preview, false, ProxyUtils::SIZE_SMALL);
+ $preview = Post\Link::getByLink($uriid, $preview, Proxy::SIZE_SMALL);
// Is it a local picture? Then make it smaller here
$preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
XML::addElement($doc, $root, "title", $title);
XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
- XML::addElement($doc, $root, "logo", $owner["photo"]);
+ XML::addElement($doc, $root, "logo", User::getAvatarUrl($owner, Proxy::SIZE_SMALL));
XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
$author = self::addAuthor($doc, $owner, true);
XML::addElement($doc, $author, "name", $owner["nick"]);
XML::addElement($doc, $author, "email", $owner["addr"]);
if ($show_profile) {
- XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
+ XML::addElement($doc, $author, "summary", BBCode::convertForUriId($owner['uri-id'], $owner["about"], BBCode::OSTATUS));
}
$attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
$attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
- "media:width" => 300,
- "media:height" => 300,
- "href" => $owner["photo"]];
+ "media:width" => Proxy::PIXEL_SMALL,
+ "media:height" => Proxy::PIXEL_SMALL,
+ "href" => User::getAvatarUrl($owner, Proxy::SIZE_SMALL)];
XML::addElement($doc, $author, "link", "", $attributes);
if (isset($owner["thumb"])) {
$attributes = [
"rel" => "avatar",
"type" => "image/jpeg", // To-Do?
- "media:width" => 80,
- "media:height" => 80,
- "href" => $owner["thumb"]];
+ "media:width" => Proxy::PIXEL_THUMB,
+ "media:height" => Proxy::PIXEL_THUMB,
+ "href" => User::getAvatarUrl($owner, Proxy::SIZE_THUMB)];
XML::addElement($doc, $author, "link", "", $attributes);
}
XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
if ($show_profile) {
- XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
+ XML::addElement($doc, $author, "poco:note", BBCode::convertForUriId($owner['uri-id'], $owner["about"], BBCode::OSTATUS));
if (trim($owner["location"]) != "") {
$element = $doc->createElement("poco:address");
*/
private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
{
- $xml = null;
-
- $repeated_guid = self::getResharedGuid($item);
- if ($repeated_guid != "") {
- $xml = self::reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel);
- }
-
- if ($xml) {
- return $xml;
- }
-
if ($item["verb"] == Activity::LIKE) {
return self::likeEntry($doc, $item, $owner, $toplevel);
} elseif (in_array($item["verb"], [Activity::FOLLOW, Activity::O_UNFOLLOW])) {
}
}
- /**
- * Adds a source entry to the XML document
- *
- * @param DOMDocument $doc XML document
- * @param array $contact Array of the contact that is added
- *
- * @return \DOMElement Source element
- * @throws \Exception
- */
- private static function sourceEntry(DOMDocument $doc, array $contact)
- {
- $source = $doc->createElement("source");
- XML::addElement($doc, $source, "id", $contact["poll"]);
- XML::addElement($doc, $source, "title", $contact["name"]);
- 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", DateTimeFormat::utc($contact["success_update"]."+00:00", DateTimeFormat::ATOM));
-
- return $source;
- }
-
- /**
- * Adds an entry element with reshared content
- *
- * @param DOMDocument $doc XML document
- * @param array $item Data of the item that is to be posted
- * @param array $owner Contact data of the poster
- * @param string $repeated_guid guid
- * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
- *
- * @return bool Entry element
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
- {
- 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);
- }
-
- $entry = self::entryHeader($doc, $owner, $item, $toplevel);
-
- $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
- 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
- $repeated_item = Post::selectFirst([], $condition);
- if (!DBA::isResult($repeated_item)) {
- return false;
- }
-
- $contact = Contact::getByURL($repeated_item['author-link']) ?: $owner;
-
- $title = $owner["nick"]." repeated a notice by ".$contact["nick"];
-
- self::entryContent($doc, $entry, $item, $owner, $title, Activity::SHARE, false);
-
- $as_object = $doc->createElement("activity:object");
-
- XML::addElement($doc, $as_object, "activity:object-type", ActivityNamespace::ACTIVITY_SCHEMA . "activity");
-
- self::entryContent($doc, $as_object, $repeated_item, $owner, "", "", false);
-
- $author = self::addAuthor($doc, $contact, false);
- $as_object->appendChild($author);
-
- $as_object2 = $doc->createElement("activity:object");
-
- XML::addElement($doc, $as_object2, "activity:object-type", self::constructObjecttype($repeated_item));
-
- $title = sprintf("New comment by %s", $contact["nick"]);
-
- self::entryContent($doc, $as_object2, $repeated_item, $owner, $title);
-
- $as_object->appendChild($as_object2);
-
- self::entryFooter($doc, $as_object, $item, $owner, false);
-
- $source = self::sourceEntry($doc, $contact);
-
- $as_object->appendChild($source);
-
- $entry->appendChild($as_object);
-
- self::entryFooter($doc, $entry, $item, $owner, true);
-
- return $entry;
- }
-
/**
* Adds an entry element with a "like"
*
if (!$toplevel) {
if (!empty($item['title'])) {
- $title = BBCode::convert($item['title'], false, BBCode::OSTATUS);
+ $title = BBCode::convertForUriId($item['uri-id'], $item['title'], BBCode::OSTATUS);
} else {
$title = sprintf("New note by %s", $owner["nick"]);
}
XML::addElement($doc, $entry, "id", $item["uri"]);
XML::addElement($doc, $entry, "title", html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
- $body = self::formatPicturePost($item['body']);
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+ $body = self::formatPicturePost($body, $item['uri-id']);
if (!empty($item['title'])) {
$body = "[b]".$item['title']."[/b]\n\n".$body;
}
- $body = BBCode::convert($body, false, BBCode::OSTATUS);
+ $body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::OSTATUS);
XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
if ($item['gravity'] != GRAVITY_PARENT) {
$parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
- $thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $item['thr-parent']]);
+ $thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]);
if (DBA::isResult($thrparent)) {
- $mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
- $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
- $parent_plink = $thrparent["plink"];
+ $mentioned[$thrparent['author-link']] = $thrparent['author-link'];
+ $mentioned[$thrparent['owner-link']] = $thrparent['owner-link'];
+ $parent_plink = $thrparent['plink'];
+ } elseif (DBA::isResult($parent)) {
+ $mentioned[$parent['author-link']] = $parent['author-link'];
+ $mentioned[$parent['owner-link']] = $parent['owner-link'];
+ $parent_plink = DI::baseUrl() . '/display/' . $parent['guid'];
} else {
- $mentioned[$parent["author-link"]] = $parent["author-link"];
- $mentioned[$parent["owner-link"]] = $parent["owner-link"];
- $parent_plink = DI::baseUrl()."/display/".$parent["guid"];
+ DI::logger()->notice('Missing parent and thr-parent for child item', ['item' => $item]);
}
- $attributes = [
- "ref" => $item['thr-parent'],
- "href" => $parent_plink];
- XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
+ if (isset($parent_plink)) {
+ $attributes = [
+ 'ref' => $item['thr-parent'],
+ 'href' => $parent_plink];
+ XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes);
- $attributes = [
- "rel" => "related",
- "href" => $parent_plink];
- XML::addElement($doc, $entry, "link", "", $attributes);
+ $attributes = [
+ 'rel' => 'related',
+ 'href' => $parent_plink];
+ XML::addElement($doc, $entry, 'link', '', $attributes);
+ }
}
if (intval($item['parent']) > 0) {