wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CORE] Fix path configuration

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-08-19 01:45:11 +01:00 committed by Hugo Sales
parent e7b985a460
commit 2b457655ea
No known key found for this signature in database
GPG Key ID: 7D0C7EAFC9D835A0
7 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
social.yaml
View File

@ -45,14 +45,12 @@ parameters:
avatar:
server:
ssl:
dir: "%kernel.project_dir%/file/avatar/"
default: "/assets/default-avatar.svg"
max_size_px: 300
cover:
server:
ssl:
dir: "%kernel.project_dir%/file/cover/"
max_size_px: 300
javascript:
@ -123,7 +121,6 @@ parameters:
width: 128
height: 128
smart_crop: false
dir: "%kernel.project_dir%/file/embed/"
theme:

2
src/Entity/Attachment.php
View File

@ -323,7 +323,7 @@ class Attachment extends Entity
public function getPath()
{
$filename = $this->getFilename();
return is_null($filename) ? null : Common::config('attachments', 'dir') . $filename;
return is_null($filename) ? null : Common::config('attachments', 'dir') . DIRECTORY_SEPARATOR . $filename;
}
public function getUrl()

2
src/Entity/AttachmentThumbnail.php
View File

@ -211,7 +211,7 @@ class AttachmentThumbnail extends Entity
public function getPath()
{
return Common::config('thumbnail', 'dir') . $this->getFilename();
return Common::config('thumbnail', 'dir') . DIRECTORY_SEPARATOR . $this->getFilename();
}
public function getUrl()

6
src/Util/Exception/NoSuchFileException.php
View File

@ -19,12 +19,10 @@
namespace App\Util\Exception;
use function App\Core\I18n\_m;
class NoSuchFileException extends NotFoundException
{
public function __construct()
public function __construct(string $m = 'No such file found.')
{
parent::__construct(_m('No such file found'));
parent::__construct($m);
}
}

2
src/Util/Exception/NotStoredLocallyException.php
View File

@ -25,6 +25,6 @@ class NotStoredLocallyException extends NoSuchFileException
{
public function __construct()
{
parent::__construct(_m('This attachment is not stored locally'));
parent::__construct(_m('This attachment is not stored locally.'));
}
}

2
tests/Controller/AdminTest.php
View File

@ -54,7 +54,7 @@ class AdminTest extends GNUsocialTestCase
public function testSiteString()
{
$this->test(['attachments', 'dir'], fn () => INSTALLDIR . '/foo');
$this->test(['attachments', 'dir'], fn () => Common::config('storage', 'dir') . 'foo' . DIRECTORY_SEPARATOR);
}
public function testSiteInt()

4
tests/Entity/AttachmentThumbnailTest.php
View File

@ -35,7 +35,7 @@ class AttachmentThumbnailTest extends GNUsocialTestCase
{
parent::bootKernel();
// Data fixture already loaded this file, but we need to get it's hash to find it
// Data fixture already loaded this file, but we need to get its hash to find it
$file = new \SplFileInfo(INSTALLDIR . '/tests/sample-uploads/attachment-lifecycle-target.jpg');
Event::handle('HashFile', [$file->getPathname(), &$hash]);
$attachment = DB::findOneBy('attachment', ['filehash' => $hash]);
@ -61,7 +61,7 @@ class AttachmentThumbnailTest extends GNUsocialTestCase
$attachment->deleteStorage();
// This was deleted earlier, an the backed storage as well, so we can't generate another thumbnail
// This was deleted earlier, and the backed storage as well, so we can't generate another thumbnail
static::assertThrows(NotStoredLocallyException::class, fn () => AttachmentThumbnail::getOrCreate($attachment, width: 4, height: 4, crop: false));
$attachment->kill();