From 9ec90aab23c35f2bbe34f1d045a19b7dd3fb3418 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 7 Jun 2023 19:03:06 +0200 Subject: [PATCH] wip #5996 @0.5 --- .env.dev | 2 +- app/Fluidbook/Link/LinksData.php | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.env.dev b/.env.dev index c95561247..088dccccb 100644 --- a/.env.dev +++ b/.env.dev @@ -2,7 +2,7 @@ APP_NAME="[DEV] Fluidbook Toolbox" APP_ENV=development APP_KEY=base64:DRIdIwSEuQNkxuUTfyyRyssizosh3D9QHWTnobrW44U= APP_DEBUG=true -DEBUGBAR_ENABLED=false +DEBUGBAR_ENABLED=true APP_URL=https://dev.toolbox.fluidbook.com HEADER_COLOR="#df4759" diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php index 95ce5c1e0..7f5f8b91a 100644 --- a/app/Fluidbook/Link/LinksData.php +++ b/app/Fluidbook/Link/LinksData.php @@ -21,6 +21,8 @@ class LinksData protected static $_testLinkCache = null; protected static $_linksKey = null; + protected static $_names = []; + protected static $_webvideoServicesMap = [0 => 'youtube', 1 => 'dailymotion', 2 => 'vimeo', 3 => 'brightcove', 'none' => 'youtube']; /** @@ -485,11 +487,7 @@ class LinksData $res = []; foreach ($updates as $timestamp => $u) { - try { - $u['name'] = User::find($u['user'])->name; - } catch (\Exception $e) { - $u['name'] = '-'; - } + $u['name'] = self::getName($u['user']); $u['date'] = date('Y-m-d H:i:s', $timestamp); $u['timestamp'] = $timestamp; $res[] = $u; @@ -498,6 +496,18 @@ class LinksData return $res; } + protected static function getName($u) + { + if (!isset(self::$_names[$u])) { + try { + self::$_names[$u] = User::find($u)->name; + } catch (\Exception $e) { + self::$_names[$u] = '-'; + } + } + return self::$_names[$u]; + } + public static function getMeta($book_id, $update = 'latest') { return json_decode(gzdecode(file_get_contents(Files::firstThatExists(self::getLinksDir($book_id) . '/' . $update . '.meta3.gz', self::getLinksDir($book_id) . '/' . $update . '.meta.gz'))), true); -- 2.39.5