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

[UI][Attachment] Use Attachment methods to get the proper URL, rather than crafting it in a template

Browse Source
This commit is contained in:
Hugo Sales
2021-08-18 14:04:17 +01:00
parent 6799052ff5
commit 4b2a92d052
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entity/Attachment.php
View File

@@ -21,6 +21,7 @@
namespace App\Entity;
use App\Core\Router\Router;
use App\Core\DB\DB;
use App\Core\Entity;
use App\Core\GSFile;
@@ -315,9 +316,14 @@ class Attachment extends Entity
return is_null($filename) ? null : Common::config('attachments', 'dir') . $filename;
}
public function getAttachmentUrl()
public function getUrl()
{
return Router::url('attachment_thumbnail', ['id' => $this->getAttachmentId(), 'w' => Common::config('attachment', 'width'), 'h' => Common::config('attachment', 'height')]);
return Router::url('attachment_view', ['id' => $this->getId()]);
}
public function getThumbnailUrl()
{
return Router::url('attachment_thumbnail', ['id' => $this->getId(), 'w' => Common::config('thumbnail', 'width'), 'h' => Common::config('thumbnail', 'height')]);;
}
public static function schemaDef(): array