Revert "Use flexible caching and improve code"

This reverts commit 1089e37.
NNTmux · Sep 13, 2024 · 6a5b1fc · 6a5b1fc
1 parent 5d59261
commit 6a5b1fc
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/Blacklight/processing/Videos.php b/Blacklight/processing/Videos.php
@@ -300,25 +300,33 @@ public function addAliases($videoId, array $aliases = []): void
         }
     }
 
+    /**
+     * Retrieves all aliases for given VideoID or VideoID for a given alias.
+     *
+     *
+     * @return VideoAlias[]|bool|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|mixed
+     */
     public function getAliases(int $videoId, string $alias = ''): mixed
     {
-        if ($videoId <= 0 && $alias === '') {
-            return false;
-        }
-
-        $cacheKey = md5($videoId.$alias);
+        $return = false;
+        $expiresAt = now()->addMinutes(config('nntmux.cache_expiry_medium'));
 
-        $sql = VideoAlias::query();
-        if ($videoId > 0) {
-            $sql->where('videos_id', $videoId);
-        } else {
-            $sql->where('title', $alias);
+        if ($videoId > 0 || $alias !== '') {
+            $aliasCache = Cache::get(md5($videoId.$alias));
+            if ($aliasCache !== null) {
+                $return = $aliasCache;
+            } else {
+                $sql = VideoAlias::query();
+                if ($videoId > 0) {
+                    $sql->where('videos_id', $videoId);
+                } elseif ($alias !== '') {
+                    $sql->where('title', $alias);
+                }
+                $return = $sql->get();
+                Cache::put(md5($videoId.$alias), $return, $expiresAt);
+            }
         }
 
-        return Cache::flexible($cacheKey, [config('nntmux.cache_expiry_medium'), config('nntmux.cache_expiry_long')], function () use ($sql) {
-            $result = $sql->get();
-
-            return $result->isEmpty() ? false : $result;
-        });
+        return $return->isEmpty() ? false : $return;
     }
 }