keith/friendica
1
0
Fork 0
Code Issues Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

45
include/items.php
View file

@ -18,48 +18,3 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
/**
* @deprecated since 2020.06
* @see \Friendica\Content\PageInfo::getFooterFromData
*/
function add_page_info_data(array $data, $no_photos = false)
{
return "\n" . \Friendica\Content\PageInfo::getFooterFromData($data, $no_photos);
}
/**
* @deprecated since 2020.06
* @see \Friendica\Content\PageInfo::queryUrl
*/
function query_page_info($url, $photo = "", $keywords = false, $keyword_denylist = "")
{
return \Friendica\Content\PageInfo::queryUrl($url, $photo, $keywords, $keyword_denylist);
}
/**
* @deprecated since 2020.06
* @see \Friendica\Content\PageInfo::getTagsFromUrl()
*/
function get_page_keywords($url, $photo = "", $keywords = false, $keyword_denylist = "")
{
return $keywords ? \Friendica\Content\PageInfo::getTagsFromUrl($url, $photo, $keyword_denylist) : [];
}
/**
* @deprecated since 2020.06
* @see \Friendica\Content\PageInfo::getFooterFromUrl
*/
function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_denylist = "")
{
return "\n" . \Friendica\Content\PageInfo::getFooterFromUrl($url, $no_photos, $photo, $keywords, $keyword_denylist);
}
/**
* @deprecated since 2020.06
* @see \Friendica\Content\PageInfo::appendToBody
*/
function add_page_info_to_body($body, $texturl = false, $no_photos = false)
{
return \Friendica\Content\PageInfo::appendToBody($body, $texturl, $no_photos);
}

3
mod/item.php
View file

@ -30,6 +30,7 @@
use Friendica\App;
use Friendica\Content\Item as ItemHelper;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
@ -233,7 +234,7 @@ function item_post(App $a) {
];
}
$att_bbcode = add_page_info_data($attachment);
$att_bbcode = "\n" . PageInfo::getFooterFromData($attachment);
$body .= $att_bbcode;
}

3
mod/parse_url.php
View file

@ -24,6 +24,7 @@
*/
use Friendica\App;
use Friendica\Content\PageInfo;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\System;
@ -177,7 +178,7 @@ function parse_url_content(App $a)
}
// Format it as BBCode attachment
$info = add_page_info_data($siteinfo);
$info = "\n" . PageInfo::getFooterFromData($siteinfo);
echo $info;

3
src/Module/Bookmarklet.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\PageInfo;
use Friendica\Core\ACL;
use Friendica\DI;
use Friendica\Module\Security\Login;
@ -55,7 +56,7 @@ class Bookmarklet extends BaseModule
throw new HTTPException\BadRequestException(DI::l10n()->t('This page is missing a url parameter.'));
}
$content = add_page_info($_REQUEST["url"]);
$content = "\n" . PageInfo::getFooterFromUrl($_REQUEST['url']);
$x = [
'is_owner' => true,

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":