GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ImageEncoder][VideoEncoder] Properly decide when to take action

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2021-10-24 15:15:21 +01:00
parent bccafd0d7b
commit 56ba7bd845
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/ImageEncoder/ImageEncoder.php
View File

@@ -55,9 +55,13 @@ class ImageEncoder extends Plugin
return '3.0.0';
}
public static function shouldHandle (string $mimetype): bool {
return GSFile::mimetypeMajor($mimetype) === 'image';
}
public function onFileMetaAvailable(array &$event_map, string $mimetype): bool
{
if (GSFile::mimetypeMajor($mimetype) !== 'image') {
if (!self::shouldHandle($mimetype)) {
return Event::next;
}
$event_map['image'][] = [$this, 'fileMeta'];
@@ -66,7 +70,7 @@ class ImageEncoder extends Plugin
public function onFileSanitizerAvailable(array &$event_map, string $mimetype): bool
{
if (GSFile::mimetypeMajor($mimetype) !== 'image') {
if (!self::shouldHandle($mimetype)) {
return Event::next;
}
$event_map['image'][] = [$this, 'fileSanitize'];
@@ -75,7 +79,7 @@ class ImageEncoder extends Plugin
public function onFileResizerAvailable(array &$event_map, string $mimetype): bool
{
if (GSFile::mimetypeMajor($mimetype) !== 'image') {
if (!self::shouldHandle($mimetype)) {
return Event::next;
}
$event_map['image'][] = [$this, 'resizeImagePath'];
@@ -177,9 +181,10 @@ class ImageEncoder extends Plugin
*/
public function onViewAttachment(array $vars, array &$res): bool
{
if ($vars['attachment']->getMimetypeMajor() !== 'image') {
if (!self::shouldHandle($vars['attachment']->getMimetype())) {
return Event::next;
}
$res[] = Formatting::twigRenderFile(
'imageEncoder/imageEncoderView.html.twig',
[