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

Use media link instead of proxy for pictures

Browse source
This commit is contained in:
Michael 2024-02-24 15:11:27 +00:00
parent 5800a973cb
commit b572b8989f
3 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Content/Text/BBCode.php
View file

@ -310,7 +310,7 @@ class BBCode
return trim($text);
}
private static function proxyUrl(string $image, int $simplehtml = self::INTERNAL, int $uriid = 0, string $size = ''): string
public static function proxyUrl(string $image, int $simplehtml = self::INTERNAL, int $uriid = 0, string $size = ''): string
{
// Only send proxied pictures to API and for internal display
if (!in_array($simplehtml, [self::INTERNAL, self::MASTODON_API, self::TWITTER_API])) {
@ -453,7 +453,7 @@ class BBCode
$return = '';
try {
if ($tryoembed && OEmbed::isAllowedURL($data['url'])) {
$return = OEmbed::getHTML($data['url'], $data['title']);
$return = OEmbed::getHTML($data['url'], $data['title'], $uriid);
} else {
throw new Exception('OEmbed is disabled for this attachment.');
}
@ -1358,12 +1358,12 @@ class BBCode
* $match[1] = $url
* $match[2] = $title or absent
*/
$try_oembed_callback = function (array $match) {
$try_oembed_callback = function (array $match) use ($uriid) {
$url = $match[1];
$title = $match[2] ?? '';
try {
$return = OEmbed::getHTML($url, $title);
$return = OEmbed::getHTML($url, $title, $uriid);
} catch (Exception $ex) {
$return = $match[0];
}
@ -1810,7 +1810,7 @@ class BBCode
}
// oembed tag
$text = OEmbed::BBCode2HTML($text);
$text = OEmbed::BBCode2HTML($text, $uriid);
// Avoid triple linefeeds through oembed
$text = str_replace("<br style='clear:left'></span><br><br>", "<br style='clear:left'></span><br>", $text);