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

[MEDIA] Move avatar fetching and adding to ouput to media component

Browse Source
This commit is contained in:
Hugo Sales
2020-08-14 15:45:08 +00:00
committed by Hugo Sales
parent 8506a0248d
commit e1002eb605
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Controller.php
View File

@@ -32,8 +32,6 @@
namespace App\Core;
use App\Core\DB\DB;
use App\Util\Common;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -62,14 +60,8 @@ class Controller extends AbstractController implements EventSubscriberInterface
$controller = $event->getController();
$request = $event->getRequest();
if (($user = Common::user()) !== null && ($avatar = DB::find('avatar', ['gsactor_id' => $user->getActor()->getId()])) != null) {
$avatar_filename = $avatar->getUrl();
} else {
$avatar_filename = '/public/assets/default_avatar.svg';
}
$this->vars = ['controler' => $controller, 'request' => $request, 'user_avatar' => $avatar_filename];
Event::handle('StartTwigPopulateVars', [&$this->vars]);
$this->vars = ['controler' => $controller, 'request' => $request];
Event::handle('start_twig_populate_vars', [&$this->vars]);
return $event;
}
@@ -83,7 +75,7 @@ class Controller extends AbstractController implements EventSubscriberInterface
}
$this->vars = array_merge_recursive($this->vars, $response);
Event::handle('EndTwigPopulateVars', [&$this->vars]);
Event::handle('end_twig_populate_vars', [&$this->vars]);
$template = $this->vars['_template'];
unset($this->vars['_template'], $this->vars['request']);