From: Michael Date: Mon, 8 May 2023 21:32:38 +0000 (+0000) Subject: Improved preview size X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1789266859695736d3010d0f77a32afee261aafb;p=friendica.git Improved preview size --- diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 29ae473abc..d6039dae80 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -1195,21 +1195,21 @@ class Photo $smallest = 0; - $r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); - if (!$r) { + $result = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + if (!$result) { Logger::warning('Photo could not be stored', ['uid' => $user['uid'], 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]); return []; } if ($width > 640 || $height > 640) { $image->scaleDown(640); + } + + if ($width > 320 || $height > 320) { $r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 1, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if ($r) { $smallest = 1; } - } - - if ($width > 320 || $height > 320) { $image->scaleDown(320); $r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 2, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if ($r && ($smallest == 0)) { diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 4b806bcc60..cc5b16d1e7 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -463,7 +463,7 @@ class Media */ private static function isLinkToPhoto(string $page, string $preview): bool { - return preg_match('#/photo/.*-0\.#ism', $page) && preg_match('#/photo/.*-[01]\.#ism', $preview); + return preg_match('#/photo/.*-0\.#ism', $page) && preg_match('#/photo/.*-[012]\.#ism', $preview); } /** @@ -475,7 +475,7 @@ class Media */ private static function isLinkToImagePage(string $page, string $preview): bool { - return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-[01]\.#ism', $preview); + return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-[012]\.#ism', $preview); } /** @@ -489,7 +489,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], '[url=' . str_replace('-1.', '-0.', $picture[2]) . '][img=' . $picture[2] . ']' . $picture[3] . '[/img][/url]', $body); + $body = str_replace($picture[0], '[url=' . str_replace(['-1.', '-2.'], '-0.', $picture[2]) . '][img=' . $picture[2] . ']' . $picture[3] . '[/img][/url]', $body); } } } @@ -497,7 +497,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], '[url=' . str_replace('-1.', '-0.', $picture[2]) . '][img]' . $picture[2] . '[/img][/url]', $body); + $body = str_replace($picture[0], '[url=' . str_replace(['-1.', '-2.'], '-0.', $picture[2]) . '][img]' . $picture[2] . '[/img][/url]', $body); } } } @@ -525,7 +525,7 @@ class Media foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { $body = str_replace($picture[0], '', $body); - $image = str_replace('-1.', '-0.', $picture[2]); + $image = str_replace(['-1.', '-2.'], '-0.', $picture[2]); $attachments[$image] = [ 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, 'preview' => $picture[2], 'description' => $picture[3] @@ -557,7 +557,7 @@ class Media foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { $body = str_replace($picture[0], '', $body); - $image = str_replace('-1.', '-0.', $picture[2]); + $image = str_replace(['-1.', '-2.'], '-0.', $picture[2]); $attachments[$image] = [ 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, 'preview' => $picture[2], 'description' => null diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index d44fe2cd7d..8201a61a66 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -191,6 +191,7 @@ class Compose extends BaseModule 'editalic' => $this->l10n->t('Italic'), 'eduline' => $this->l10n->t('Underline'), 'edquote' => $this->l10n->t('Quote'), + '$edemojis' => $this->l10n->t('Add emojis'), 'edcode' => $this->l10n->t('Code'), 'edimg' => $this->l10n->t('Image'), 'edurl' => $this->l10n->t('Link'), diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index 988fd652e4..3b1b69ef4f 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -207,13 +207,13 @@ class Upload extends \Friendica\BaseModule if ($width > 640 || $height > 640) { $image->scaleDown(640); + } + + if ($width > 320 || $height > 320) { $result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $allow_cid); if ($result) { $smallest = 1; } - } - - if ($width > 320 || $height > 320) { $image->scaleDown(320); $result = Photo::store($image, $owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $allow_cid); if ($result && ($smallest == 0)) { diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php index 3e5b9d604c..ebbba283b2 100644 --- a/src/Module/Profile/Photos.php +++ b/src/Module/Profile/Photos.php @@ -246,14 +246,19 @@ class Photos extends \Friendica\Module\BaseProfile if ($width > 640 || $height > 640) { $image->scaleDown(640); - Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); - $smallest = 1; } if ($width > 320 || $height > 320) { + $result = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); + if ($result) { + $smallest = 1; + } + $image->scaleDown(320); - Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); - $smallest = 2; + $result = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); + if ($result && ($smallest == 0)) { + $smallest = 2; + } } $uri = Item::newURI();