bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

API: Improved handling of quoted posts and attachments

Browse source
This commit is contained in:
Michael 2019-12-13 10:12:40 +00:00
parent ff3a0a0eba
commit b42262f206
1 changed files with 50 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
include/api.php
View file

@ -2483,6 +2483,9 @@ function api_format_messages($item, $recipient, $sender)
function api_convert_item($item) function api_convert_item($item)
{ {
$body = $item['body']; $body = $item['body'];
$entities = api_get_entitities($statustext, $body);
// Add pictures to the attachment array and remove them from the body
$attachments = api_get_attachments($body); $attachments = api_get_attachments($body);
// Workaround for ostatus messages where the title is identically to the body // Workaround for ostatus messages where the title is identically to the body
@ -2539,8 +2542,6 @@ function api_convert_item($item)
$statushtml .= BBCode::convert($item['plink']); $statushtml .= BBCode::convert($item['plink']);
} }
$entities = api_get_entitities($statustext, $body);
return [ return [
"text" => $statustext, "text" => $statustext,
"html" => $statushtml, "html" => $statushtml,
@ -2558,17 +2559,19 @@ function api_convert_item($item)
*/ */
function api_get_attachments(&$body) function api_get_attachments(&$body)
{ {
$text = $body; $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text); $body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
$text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $text);
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
$ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images); if (!preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $body, $images)) {
if (!$ret) {
return []; return [];
} }
// Remove all embedded pictures, since they are added as attachments
foreach ($images[0] as $orig) {
$body = str_replace($orig, '', $body);
}
$attachments = []; $attachments = [];
foreach ($images[1] as $image) { foreach ($images[1] as $image) {
@ -2579,12 +2582,6 @@ function api_get_attachments(&$body)
} }
} }
if (strstr($_SERVER['HTTP_USER_AGENT'] ?? '', 'AndStatus')) {
foreach ($images[0] as $orig) {
$body = str_replace($orig, "", $body);
}
}
return $attachments; return $attachments;
} }
@ -2627,7 +2624,6 @@ function api_get_entitities(&$text, $bbcode)
$bbcode = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '#$2', $bbcode); $bbcode = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '#$2', $bbcode);
$bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $bbcode); $bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $bbcode);
//$bbcode = preg_replace("/\[url\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$bbcode);
$bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism", '[url=$1]$1[/url]', $bbcode); $bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism", '[url=$1]$1[/url]', $bbcode);
$bbcode = preg_replace( $bbcode = preg_replace(
@ -2646,12 +2642,10 @@ function api_get_entitities(&$text, $bbcode)
$bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode); $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
//preg_match_all("/\[url\]([$URLSearchString]*)\[\/url\]/ism", $bbcode, $urls1);
preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls); preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls);
$ordered_urls = []; $ordered_urls = [];
foreach ($urls[1] as $id => $url) { foreach ($urls[1] as $id => $url) {
//$start = strpos($text, $url, $offset);
$start = iconv_strpos($text, $url, 0, "UTF-8"); $start = iconv_strpos($text, $url, 0, "UTF-8");
if (!($start === false)) { if (!($start === false)) {
$ordered_urls[$start] = ["url" => $url, "title" => $urls[2][$id]]; $ordered_urls[$start] = ["url" => $url, "title" => $urls[2][$id]];
@ -2661,7 +2655,7 @@ function api_get_entitities(&$text, $bbcode)
ksort($ordered_urls); ksort($ordered_urls);
$offset = 0; $offset = 0;
//foreach ($urls[1] AS $id=>$url) {
foreach ($ordered_urls as $url) { foreach ($ordered_urls as $url) {
if ((substr($url["title"], 0, 7) != "http://") && (substr($url["title"], 0, 8) != "https://") if ((substr($url["title"], 0, 7) != "http://") && (substr($url["title"], 0, 8) != "https://")
&& !strpos($url["title"], "http://") && !strpos($url["title"], "https://") && !strpos($url["title"], "http://") && !strpos($url["title"], "https://")
@ -2676,7 +2670,6 @@ function api_get_entitities(&$text, $bbcode)
} }
} }
//$start = strpos($text, $url, $offset);
$start = iconv_strpos($text, $url["url"], $offset, "UTF-8"); $start = iconv_strpos($text, $url["url"], $offset, "UTF-8");
if (!($start === false)) { if (!($start === false)) {
$entities["urls"][] = ["url" => $url["url"], $entities["urls"][] = ["url" => $url["url"],
@ -2703,7 +2696,7 @@ function api_get_entitities(&$text, $bbcode)
$ordered_images[$start] = ['url' => $image, 'alt' => '']; $ordered_images[$start] = ['url' => $image, 'alt' => ''];
} }
} }
//$entities["media"] = array();
$offset = 0; $offset = 0;
foreach ($ordered_images as $image) { foreach ($ordered_images as $image) {
@ -3072,22 +3065,31 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
} }
if (!empty($quoted_item)) { if (!empty($quoted_item)) {
$conv_quoted = api_convert_item($quoted_item); if ($quoted_item['id'] != $item['id']) {
$quoted_status = $status; $quoted_status = api_format_item($quoted_item);
/// @todo Only remove the attachments that are also contained in the quotes status
unset($status['attachments']);
unset($status['entities']);
} else {
$conv_quoted = api_convert_item($quoted_item);
$quoted_status = $status;
unset($quoted_status['attachments']);
unset($quoted_status['entities']);
unset($quoted_status['statusnet_conversation_id']);
$quoted_status['text'] = $conv_quoted['text'];
$quoted_status['statusnet_html'] = $conv_quoted['html'];
try {
$quoted_status["user"] = api_get_user($a, $quoted_item["author-id"]);
} catch (BadRequestException $e) {
// user not found. should be found?
/// @todo check if the user should be always found
$quoted_status["user"] = [];
}
}
unset($quoted_status['friendica_author']); unset($quoted_status['friendica_author']);
unset($quoted_status['friendica_owner']); unset($quoted_status['friendica_owner']);
unset($quoted_status['friendica_activities']); unset($quoted_status['friendica_activities']);
unset($quoted_status['friendica_private']); unset($quoted_status['friendica_private']);
unset($quoted_status['statusnet_conversation_id']);
$quoted_status['text'] = $conv_quoted['text'];
$quoted_status['statusnet_html'] = $conv_quoted['html'];
try {
$quoted_status["user"] = api_get_user($a, $quoted_item["author-id"]);
} catch (BadRequestException $e) {
// user not found. should be found?
/// @todo check if the user should be always found
$quoted_status["user"] = [];
}
} }
if (!empty($retweeted_item)) { if (!empty($retweeted_item)) {
@ -5181,6 +5183,22 @@ function api_share_as_retweet(&$item)
$reshared_item["created"] = $reshared['posted']; $reshared_item["created"] = $reshared['posted'];
$reshared_item["edited"] = $reshared['posted']; $reshared_item["edited"] = $reshared['posted'];
// Try to fetch the original item
if (!empty($reshared['guid'])) {
$condition = ['guid' => $reshared['guid'], 'uid' => [0, $item['uid']]];
} elseif (!empty($reshared_item['plink']) && ($original_id = Item::searchByLink($reshared_item['plink']))) {
$condition = ['id' => $original_id];
} else {
$condition = [];
}
if (!empty($condition)) {
$original_item = Item::selectFirst([], $condition);
if (DBA::isResult($original_item)) {
$reshared_item = array_merge($reshared_item, $original_item);
}
}
return $reshared_item; return $reshared_item;
} }