forked from GNUsocial/gnu-social
[Media] Use utils
This commit is contained in:
parent
fe50909549
commit
30deeaf4ef
@ -22,10 +22,6 @@
|
|||||||
namespace Component\Media\Controller;
|
namespace Component\Media\Controller;
|
||||||
|
|
||||||
use App\Core\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 Component\Media\Media;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
@ -36,21 +32,8 @@ class Avatar extends Controller
|
|||||||
{
|
{
|
||||||
switch ($size) {
|
switch ($size) {
|
||||||
case 'full':
|
case 'full':
|
||||||
$result = DB::createQuery('select f.file_hash, f.mimetype, f.title ' .
|
$res = Media::getAvatarFileInfo($nickname);
|
||||||
'from App\\Entity\\File f ' .
|
return Media::sendFile($res['file_path'], $res['mimetype'], $res['title']);
|
||||||
'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']);
|
|
||||||
default:
|
default:
|
||||||
throw new Exception('Not implemented');
|
throw new Exception('Not implemented');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user