eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Embed] Local config

This commit is contained in:
Diogo Peralta Cordeiro 2021-05-01 22:03:54 +01:00 committed by Hugo Sales
parent 186e31e20d
commit a3860e6257
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/Embed/Embed.php
View File

@ -54,6 +54,7 @@ use App\Util\Exception\NotFoundException;
use App\Util\Formatting; use App\Util\Formatting;
use App\Util\TemporaryFile; use App\Util\TemporaryFile;
use Embed\Embed as LibEmbed; use Embed\Embed as LibEmbed;
use Exception;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
/** /**
@ -203,9 +204,6 @@ class Embed extends Plugin
return Event::next; return Event::next;
} }
$width = Common::config('thumbnail', 'width');
$height = Common::config('thumbnail', 'height');
$smart_crop = Common::config('thumbnail', 'smart_crop');
$attributes = $embed->getImageHTMLAttributes(['class' => 'u-photo embed']); $attributes = $embed->getImageHTMLAttributes(['class' => 'u-photo embed']);
$res[] = Formatting::twigRenderString(<<<END $res[] = Formatting::twigRenderString(<<<END
@ -339,10 +337,11 @@ END, ['embed' => $embed, 'attributes' => $attributes]);
Event::handle('HashFile', [$file->getRealPath(), &$hash]); Event::handle('HashFile', [$file->getRealPath(), &$hash]);
$filepath = Common::config('storage', 'dir') . "embed/{$hash}" . Common::config('thumbnail', 'extension'); $filepath = Common::config('storage', 'dir') . "embed/{$hash}" . Common::config('thumbnail', 'extension');
$width = Common::config('thumbnail', 'width'); $width = Common::config('plugin_embed', 'width');
$height = Common::config('thumbnail', 'height'); $height = Common::config('plugin_embed', 'height');
$smart_crop = Common::config('thumbnail', 'smart_crop'); $smart_crop = Common::config('plugin_embed', 'smart_crop');
Event::handle('ResizeImagePath', [$file->getRealPath(), $filepath, $width, $height, $smart_crop, &$mimetype]);
Event::handle('ResizeImagePath', [$file->getRealPath(), $filepath, &$width, &$height, $smart_crop, &$mimetype]);
unset($file); unset($file);
@ -489,8 +488,8 @@ END, ['embed' => $embed, 'attributes' => $attributes]);
} }
if (!isset($data['width'])) { if (!isset($data['width'])) {
$data['width'] = Common::config('thumbnail', 'width'); $data['width'] = Common::config('plugin_embed', 'width');
$data['height'] = Common::config('thumbnail', 'height'); $data['height'] = Common::config('plugin_embed', 'height');
} }
} }

7
social.yaml
View File

@ -120,6 +120,13 @@ parameters:
height: 600 height: 600
extension: '.webp' extension: '.webp'
plugin_embed:
width: 128
height: 128
smart_crop: false
dir: "%kernel.project_dir%/file/embed/"
theme: theme:
server: server:
ssl: ssl: