tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Replace proxy function

Browse source
This commit is contained in:
Michael 2021-07-06 09:22:41 +00:00
parent 8bfa15cf23
commit 12173df4d3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,15 +446,15 @@ class BBCode
return $naked_text; return $naked_text;
} }
private static function proxyUrl($image, $simplehtml = self::INTERNAL, $uriid = 0) private static function proxyUrl($image, $simplehtml = self::INTERNAL, $uriid = 0, $size = '')
{ {
// Only send proxied pictures to API and for internal display // Only send proxied pictures to API and for internal display
if (!in_array($simplehtml, [self::INTERNAL, self::API])) { if (!in_array($simplehtml, [self::INTERNAL, self::API])) {
return $image; return $image;
} elseif ($uriid) { } elseif ($uriid) {
return Post\Link::getByLink($uriid, $image); return Post\Link::getByLink($uriid, $image, $size);
} else { } else {
return ProxyUtils::proxifyUrl($image); return ProxyUtils::proxifyUrl($image, $size);
} }
} }
@ -1025,7 +1025,7 @@ class BBCode
} elseif ($attributes['avatar'] && $uriid) { } elseif ($attributes['avatar'] && $uriid) {
$attributes['avatar'] = Post\Link::getByLink($uriid, $attributes['avatar'], ProxyUtils::SIZE_THUMB); $attributes['avatar'] = Post\Link::getByLink($uriid, $attributes['avatar'], ProxyUtils::SIZE_THUMB);
} elseif ($attributes['avatar']) { } elseif ($attributes['avatar']) {
$attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], ProxyUtils::SIZE_THUMB); $attributes['avatar'] = self::proxyUrl($attributes['avatar'], self::INTERNAL, $uriid, ProxyUtils::SIZE_THUMB);
} }
$content = preg_replace(Strings::autoLinkRegEx(), '<a href="$1">$1</a>', $match[3]); $content = preg_replace(Strings::autoLinkRegEx(), '<a href="$1">$1</a>', $match[3]);