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

Improved handling of images with links

This commit is contained in:
Michael 2023-03-15 21:15:10 +00:00
parent a41e2eb50b
commit eefebaff49
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/Post/Media.php
View File

@ -470,10 +470,12 @@ class Media
* Add media links and remove them from the body * Add media links and remove them from the body
* *
* @param integer $uriid * @param integer $uriid
* @param string $body * @param string $body
* @param bool $endmatch
* @param bool $removepicturelinks
* @return string Body without media links * @return string Body without media links
*/ */
public static function insertFromBody(int $uriid, string $body, bool $endmatch = false): string public static function insertFromBody(int $uriid, string $body, bool $endmatch = false, bool $removepicturelinks = false): string
{ {
$endmatchpattern = $endmatch ? '\z' : ''; $endmatchpattern = $endmatch ? '\z' : '';
// Simplify image codes // Simplify image codes
@ -489,7 +491,7 @@ class Media
'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => $picture[3] 'preview' => $picture[2], 'description' => $picture[3]
]; ];
} else { } elseif ($removepicturelinks) {
$body = str_replace($picture[0], '', $body); $body = str_replace($picture[0], '', $body);
$attachments[$picture[1]] = [ $attachments[$picture[1]] = [
'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1], 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1],
@ -515,7 +517,7 @@ class Media
'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => null 'preview' => $picture[2], 'description' => null
]; ];
} else { } elseif ($removepicturelinks) {
$body = str_replace($picture[0], '', $body); $body = str_replace($picture[0], '', $body);
$attachments[$picture[1]] = [ $attachments[$picture[1]] = [
'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1], 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1],
@ -587,7 +589,7 @@ class Media
{ {
do { do {
$prebody = $body; $prebody = $body;
$body = self::insertFromBody(0, $body); $body = self::insertFromBody(0, $body, false, true);
} while ($prebody != $body); } while ($prebody != $body);
return $body; return $body;
} }