Little SQL optimization

1 files changed, 11 insertions, 17 deletions

diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 6b825bf93..391568df4 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -94,15 +94,25 @@ enum ScopeNames {
   [ScopeNames.WITH_ACCOUNT_DETAILS]: {
     include: [
       {
-        model: () => VideoChannelModel,
+        model: () => VideoChannelModel.unscoped(),
         required: true,
         include: [
           {
+            attributes: {
+              exclude: [ 'privateKey', 'publicKey' ]
+            },
+            model: () => ActorModel,
+            required: true
+          },
+          {
             model: () => AccountModel,
             required: true,
             include: [
               {
                 model: () => ActorModel,
+                attributes: {
+                  exclude: [ 'privateKey', 'publicKey' ]
+                },
                 required: true,
                 include: [
                   {
@@ -511,22 +521,6 @@ export class VideoModel extends Model<VideoModel> {
     return VideoModel.findById(id)
   }
 
-  static loadAndPopulateAccount (id: number) {
-    return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS ]).findById(id)
-  }
-
-  static loadByUrl (url: string, t?: Sequelize.Transaction) {
-    const query: IFindOptions<VideoModel> = {
-      where: {
-        url
-      }
-    }
-
-    if (t !== undefined) query.transaction = t
-
-    return VideoModel.findOne(query)
-  }
-
   static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
     const query: IFindOptions<VideoModel> = {
       where: {