From 30deeaf4efb10a4f4bc2b83e570790903bf897e7 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Fri, 14 Aug 2020 22:36:46 +0000 Subject: [PATCH] [Media] Use utils --- components/Media/Controller/Avatar.php | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/components/Media/Controller/Avatar.php b/components/Media/Controller/Avatar.php index 0c0e556067..b5055e4ace 100644 --- a/components/Media/Controller/Avatar.php +++ b/components/Media/Controller/Avatar.php @@ -22,10 +22,6 @@ namespace Component\Media\Controller; use App\Core\Controller; -use App\Core\DB\DB; -use function App\Core\I18n\_m; -use App\Core\Log; -use App\Entity\Avatar as EAvatar; use Component\Media\Media; use Exception; use Symfony\Component\HttpFoundation\Request; @@ -36,21 +32,8 @@ class Avatar extends Controller { switch ($size) { case 'full': - $result = DB::createQuery('select f.file_hash, f.mimetype, f.title ' . - 'from App\\Entity\\File f ' . - 'join App\\Entity\\Avatar a with f.id = a.file_id ' . - 'join App\\Entity\\GSActor p with p.id = a.gsactor_id ' . - 'where p.nickname = :nickname') - ->setParameter('nickname', $nickname) - ->getResult(); - - if (count($result) != 1) { - Log::error('Avatar query returned more than one result for nickname ' . $nickname); - throw new Exception(_m('Internal server error')); - } - - $res = $result[0]; - return Media::sendFile(EAvatar::getFilePathStatic($res['file_hash']), $res['mimetype'], $res['title']); + $res = Media::getAvatarFileInfo($nickname); + return Media::sendFile($res['file_path'], $res['mimetype'], $res['title']); default: throw new Exception('Not implemented'); }