X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fmodel-cache.ts;h=3651267e7c5c10028c0dcb62eec8505ed9f27aa5;hb=cc45cc9ac1d0afbe4844c34b13dd4a65dd523be1;hp=8afe3834fb755c8d6e47324d7ba8423d601396a4;hpb=7eba5e1fa81c8e54cb8fe298a96e8070afa50921;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/model-cache.ts b/server/models/model-cache.ts
index 8afe3834f..3651267e7 100644
--- a/server/models/model-cache.ts
+++ b/server/models/model-cache.ts
@@ -1,12 +1,12 @@
 import { Model } from 'sequelize-typescript'
-import * as Bluebird from 'bluebird'
 import { logger } from '@server/helpers/logger'
 
 type ModelCacheType =
   'local-account-name'
   | 'local-actor-name'
   | 'local-actor-url'
-  | 'video-immutable'
+  | 'load-video-immutable-id'
+  | 'load-video-immutable-url'
 
 type DeleteKey =
   'video'
@@ -19,7 +19,8 @@ class ModelCache {
     'local-account-name': new Map(),
     'local-actor-name': new Map(),
     'local-actor-url': new Map(),
-    'video-immutable': new Map()
+    'load-video-immutable-id': new Map(),
+    'load-video-immutable-url': new Map()
   }
 
   private readonly deleteIds: {
@@ -38,7 +39,7 @@ class ModelCache {
   doCache<T extends Model> (options: {
     cacheType: ModelCacheType
     key: string
-    fun: () => Bluebird<T>
+    fun: () => Promise<T>
     whitelist?: () => boolean
     deleteKey?: DeleteKey
   }) {
@@ -50,7 +51,7 @@ class ModelCache {
 
     if (cache.has(key)) {
       logger.debug('Model cache hit for %s -> %s.', cacheType, key)
-      return Bluebird.resolve<T>(cache.get(key))
+      return Promise.resolve<T>(cache.get(key))
     }
 
     return fun().then(m => {