clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid proxyfying images that are removed or replaced later

This commit is contained in:
Michael 2021-07-05 07:00:35 +00:00
parent a5176cb841
commit 90588ddb8e
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/display.php
View File

@ -334,8 +334,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid); $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header // Preparing the meta header
$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true)); $description = trim(BBCode::toPlaintext($item["body"]));
$title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true)); $title = trim(BBCode::toPlaintext($item["title"]));
$author_name = $item["author-name"]; $author_name = $item["author-name"];
$image = DI::baseUrl()->remove($item["author-avatar"]); $image = DI::baseUrl()->remove($item["author-avatar"]);

4
src/Content/Text/BBCode.php
View File

@ -433,6 +433,10 @@ class BBCode
*/ */
public static function toPlaintext($text, $keep_urls = true) public static function toPlaintext($text, $keep_urls = true)
{ {
// Remove pictures in advance to avoid unneeded proxy calls
$text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", ' $2 ', $text);
$text = preg_replace("/\[img.*?\[\/img\]/ism", ' ', $text);
$naked_text = HTML::toPlaintext(self::convert($text, false, 0, true), 0, !$keep_urls); $naked_text = HTML::toPlaintext(self::convert($text, false, 0, true), 0, !$keep_urls);
return $naked_text; return $naked_text;

3
src/Model/Item.php
View File

@ -1008,9 +1008,6 @@ class Item
// Check for hashtags in the body and repair or add hashtag links // Check for hashtags in the body and repair or add hashtag links
$item['body'] = self::setHashtags($item['body']); $item['body'] = self::setHashtags($item['body']);
// Fill the cache field
self::putInCache($item);
if (stristr($item['verb'], Activity::POKE)) { if (stristr($item['verb'], Activity::POKE)) {
$notify_type = Delivery::POKE; $notify_type = Delivery::POKE;
} else { } else {

2
src/Protocol/ActivityPub/Processor.php
View File

@ -744,7 +744,7 @@ class Processor
$title = $matches[3]; $title = $matches[3];
} }
$title = trim(HTML::toPlaintext(BBCode::convert($title, false, BBCode::API, true), 0)); $title = trim(BBCode::toPlaintext($title));
if (strlen($title) > 20) { if (strlen($title) > 20) {
$title = substr($title, 0, 20) . '...'; $title = substr($title, 0, 20) . '...';

2
src/Protocol/Feed.php
View File

@ -1199,7 +1199,7 @@ class Feed
// Remove the share element before fetching the first line // Remove the share element before fetching the first line
$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$item['body'])); $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$item['body']));
$title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n"; $title = BBCode::toPlaintext($title)."\n";
$pos = strpos($title, "\n"); $pos = strpos($title, "\n");
$trailer = ""; $trailer = "";
if (($pos == 0) || ($pos > 100)) { if (($pos == 0) || ($pos > 100)) {