Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 15:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace *_page_info function calls with Content\PageInfo equivalent

Browse source
This commit is contained in:
Hypolite Petovan 2020-07-14 10:15:04 -04:00
parent a1d62734fa
commit 3e25fc3a72
7 changed files with 17 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/Diaspora.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Protocol;
use Friendica\Content\Feature;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
@ -2621,7 +2622,7 @@ class Diaspora
$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
// Add OEmbed and other information to the body
$item["body"] = add_page_info_to_body($item["body"], false, true);
$item["body"] = PageInfo::appendToBody($item["body"], false, true);
return $item;
} else {
@ -2985,7 +2986,7 @@ class Diaspora
// Add OEmbed and other information to the body
if (!self::isHubzilla($contact["url"])) {
$body = add_page_info_to_body($body, false, true);
$body = PageInfo::appendToBody($body, false, true);
}
}

7
src/Protocol/Feed.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Protocol;
use DOMDocument;
use DOMXPath;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\HTML;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
@ -532,8 +533,8 @@ class Feed
// We always strip the title since it will be added in the page information
$item["title"] = "";
$item["body"] = $item["body"] . add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
$taglist = get_page_keywords($item["plink"], $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"]);
$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"]) : [];
$item["object-type"] = Activity\ObjectType::BOOKMARK;
unset($item["attach"]);
} else {
@ -543,7 +544,7 @@ class Feed
if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] == 3)) {
if (empty($taglist)) {
$taglist = get_page_keywords($item["plink"], $preview, true, $contact["ffi_keyword_denylist"]);
$taglist = PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"]);
}
$item["body"] .= "\n" . self::tagToString($taglist);
} else {

7
src/Protocol/OStatus.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Protocol;
use DOMDocument;
use DOMXPath;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache\Duration;
@ -697,7 +698,7 @@ class OStatus
// 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::appendToBody($item["body"]);
}
Tag::storeFromBody($item['uri-id'], $item['body']);
@ -1120,7 +1121,7 @@ class OStatus
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":
@ -1153,7 +1154,7 @@ class OStatus
}
$link_data['related'] = $attribute['href'];
} else {
$item["body"] .= add_page_info($attribute['href']);
$item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
}
break;
case "self":