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

[Media] Use utils

This commit is contained in:
Hugo Sales 2020-08-14 22:36:46 +00:00 committed by Hugo Sales
parent 8cfa883c1b
commit f255d29078
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/Media/Controller/Avatar.php
View File

@ -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');
}