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

[Media] Display images and videos inline in notes

Browse Source
This commit is contained in:
Hugo Sales
2020-09-05 02:28:50 +00:00
committed by Hugo Sales
parent a9d5f8ac5b
commit 6165f7cd55
5 changed files with 98 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/Media/Controller/Avatar.php → components/Media/Controller/Media.php
View File

@@ -22,20 +22,26 @@
namespace Component\Media\Controller;
use App\Core\Controller;
use Component\Media\Media;
use Component\Media\Media as M;
use Exception;
use Symfony\Component\HttpFoundation\Request;
class Avatar extends Controller
class Media extends Controller
{
public function send(Request $request, string $nickname, string $size)
public function avatar(Request $request, string $nickname, string $size)
{
switch ($size) {
case 'full':
$res = Media::getAvatarFileInfo($nickname);
return Media::sendFile($res['file_path'], $res['mimetype'], $res['title']);
$res = M::getAvatarFileInfo($nickname);
return M::sendFile($res['file_path'], $res['mimetype'], $res['title']);
default:
throw new Exception('Not implemented');
}
}
public function attachment_inline(Request $request, int $id)
{
$res = M::getAttachmentFileInfo($id);
return M::sendFile($res['file_path'], $res['mimetype'], $res['title']);
}
}

3
components/Media/Media.php
View File

@@ -34,7 +34,8 @@ class Media extends Module
public function onAddRoute($r)
{
$r->connect('avatar', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/avatar/{size<full|big|medium|small>?full}', [Controller\Avatar::class, 'send']);
$r->connect('avatar', '/{nickname<' . Nickname::DISPLAY_FMT . '>}/avatar/{size<full|big|medium|small>?full}', [Controller\Media::class, 'avatar']);
$r->connect('attachment_inline', '/attachment/{id<\d+>}', [Controller\Media::class, 'attachment_inline']);
return Event::next;
}

70
components/Media/Utils.php
View File

@@ -86,48 +86,66 @@ abstract class Utils
return $response;
}
public static function error($res, string $nickname)
public static function error($except, $id, array $res)
{
switch (count($res)) {
case 0:
throw new NoAvatarException();
throw new $except();
case 1:
return $res[0];
default:
Log::error('Avatar query returned more than one result for nickname ' . $nickname);
Log::error('Media query returned more than one result for identifier: \"' . $id . '\"');
throw new Exception(_m('Internal server error'));
}
}
public static function getAvatar(string $nickname)
{
return self::error(
Cache::get('avatar-' . $nickname,
function () use ($nickname) {
return DB::dql('select a from App\\Entity\\Avatar a ' .
'join App\Entity\GSActor g with a.gsactor_id = g.id ' .
'where g.nickname = :nickname',
['nickname' => $nickname]);
}),
$nickname
);
return self::error(NoAvatarException::class,
$nickname,
Cache::get("avatar-{$nickname}",
function () use ($nickname) {
return DB::dql('select a from App\\Entity\\Avatar a ' .
'join App\Entity\GSActor g with a.gsactor_id = g.id ' .
'where g.nickname = :nickname',
['nickname' => $nickname]);
}));
}
public static function getFileInfo(int $id)
{
return self::error(NoSuchFileException::class,
$id,
Cache::get("file-info-{$id}",
function () use ($id) {
return DB::dql('select f.file_hash, f.mimetype, f.title ' .
'from App\\Entity\\File f ' .
'where f.id = :id',
['id' => $id]);
}));
}
public static function getAttachmentFileInfo(int $id)
{
$res = self::getFileInfo($id);
$res['file_path'] = Common::config('attachments', 'dir') . $res['file_hash'];
return $res;
}
public static function getAvatarFileInfo(string $nickname)
{
try {
$res = self::error(
Cache::get('avatar-file-info-' . $nickname,
function () use ($nickname) {
return DB::dql('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 g with g.id = a.gsactor_id ' .
'where g.nickname = :nickname',
['nickname' => $nickname]);
}),
$nickname
);
$res = self::error(NoAvatarException::class,
$nickname,
Cache::get("avatar-file-info-{$nickname}",
function () use ($nickname) {
return DB::dql('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 g with g.id = a.gsactor_id ' .
'where g.nickname = :nickname',
['nickname' => $nickname]);
}));
$res['file_path'] = Avatar::getFilePathStatic($res['file_hash']);
return $res;
} catch (Exception $e) {
@@ -146,7 +164,7 @@ abstract class Utils
throw new Exception('No user is logged in and no avatar provided to `getAvatarUrl`');
}
}
return Cache::get('avatar-url-' . $nickname, function () use ($nickname) {
return Cache::get("avatar-url-{$nickname}", function () use ($nickname) {
try {
return self::getAvatar($nickname)->getUrl();
} catch (NoAvatarException $e) {