From b5f14cb5594962700a5d77940168e02f3d566629 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 14 Jul 2020 10:17:17 -0400
Subject: [PATCH 1/2] [various] Replace *_page_info function calls with
 Content\PageInfo equivalent

---
 ifttt/ifttt.php         | 5 +++--
 statusnet/statusnet.php | 5 +++--
 twitter/twitter.php     | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 45ba2bf9..6ecfc160 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -8,6 +8,7 @@
  */
 require_once 'mod/item.php';
 use Friendica\App;
+use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -185,7 +186,7 @@ function ifttt_message($uid, $item)
 	}
 
 	if ($item['type'] == 'link') {
-		$data = query_page_info($item['link']);
+		$data = PageInfo::queryUrl($item['link']);
 
 		if (isset($item['title']) && (trim($item['title']) != '')) {
 			$data['title'] = $item['title'];
@@ -195,7 +196,7 @@ function ifttt_message($uid, $item)
 			$data['text'] = $item['description'];
 		}
 
-		$_REQUEST['body'] .= add_page_info_data($data);
+		$_REQUEST['body'] .= "\n" . PageInfo::getFooterFromData($data);
 	} elseif (($item['type'] == 'photo') && ($item['image'] != '')) {
 		$_REQUEST['body'] .= "\n\n[img]" . $item['image'] . "[/img]\n";
 	}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index f75d2346..f5bb7f42 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -40,6 +40,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\PageInfo;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
@@ -896,7 +897,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 				$_REQUEST["title"] = "";
 
-				$_REQUEST["body"] = add_page_info_to_body($post->text, true);
+				$_REQUEST["body"] = PageInfo::appendToBody($post->text, true);
 				if (is_string($post->place->name)) {
 					$_REQUEST["location"] = $post->place->name;
 				}
@@ -1494,7 +1495,7 @@ function statusnet_convertmsg(App $a, $body)
 		}
 
 		if ($footerurl != "") {
-			$footer = add_page_info($footerurl);
+			$footer = "\n" . PageInfo::getFooterFromUrl($footerurl);
 		}
 
 		if (($footerlink != "") && (trim($footer) != "")) {
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4c9701d8..4139bdb9 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -67,6 +67,7 @@ use Abraham\TwitterOAuth\TwitterOAuthException;
 use Codebird\Codebird;
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
@@ -1356,7 +1357,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
 	if (empty($status->quoted_status)) {
 		$footer = '';
 		if ($attachmentUrl) {
-			$footer = add_page_info($attachmentUrl, false, $picture);
+			$footer = "\n" . PageInfo::getFooterFromUrl($attachmentUrl, false, $picture);
 		}
 
 		if (trim($footer)) {
@@ -1364,7 +1365,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
 		} elseif ($picture) {
 			$body .= "\n\n[img]" . $picture . "[/img]\n";
 		} else {
-			$body = add_page_info_to_body($body);
+			$body = PageInfo::appendToBody($body);
 		}
 	}
 
-- 
2.43.5


From 5a3620513956fe7732af47ec71b7b0a7f6c29b99 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 14 Jul 2020 10:22:01 -0400
Subject: [PATCH 2/2] [pumpio] Remove references to include/items.php

---
 pumpio/pumpio.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 87e3344d..567f64c8 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -925,8 +925,6 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 
 function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
-	require_once('include/items.php');
-
 	if (empty($post->object->id)) {
 		Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG);
 		return;
@@ -1096,8 +1094,6 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
 
 function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
-	require_once('include/items.php');
-
 	if (($post->verb == "like") || ($post->verb == "favorite")) {
 		return pumpio_dolike($a, $uid, $self, $post, $own_id);
 	}
-- 
2.43.5