Fix multiple server tests

2 files changed, 38 insertions, 10 deletions

diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 536b6cb3e..28e5818cd 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -472,7 +472,24 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
           [Op.lt]: beforeUpdatedAt
         },
         videoId
-      }
+      },
+      include: [
+        {
+          required: true,
+          model: AccountModel.unscoped(),
+          include: [
+            {
+              required: true,
+              model: ActorModel.unscoped(),
+              where: {
+                serverId: {
+                  [Op.ne]: null
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
 
     return VideoCommentModel.destroy(query)
diff --git a/server/models/video/video-share.ts b/server/models/video/video-share.ts
index fda2d7cea..3bab3c027 100644
--- a/server/models/video/video-share.ts
+++ b/server/models/video/video-share.ts
@@ -1,4 +1,3 @@
-import * as Sequelize from 'sequelize'
 import * as Bluebird from 'bluebird'
 import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
@@ -8,6 +7,7 @@ import { ActorModel } from '../activitypub/actor'
 import { throwIfNotValid } from '../utils'
 import { VideoModel } from './video'
 import { VideoChannelModel } from './video-channel'
+import { Op, Transaction } from 'sequelize'
 
 enum ScopeNames {
   FULL = 'FULL',
@@ -88,7 +88,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
   })
   Video: VideoModel
 
-  static load (actorId: number, videoId: number, t?: Sequelize.Transaction) {
+  static load (actorId: number, videoId: number, t?: Transaction) {
     return VideoShareModel.scope(ScopeNames.WITH_ACTOR).findOne({
       where: {
         actorId,
@@ -98,7 +98,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
     })
   }
 
-  static loadByUrl (url: string, t: Sequelize.Transaction) {
+  static loadByUrl (url: string, t: Transaction) {
     return VideoShareModel.scope(ScopeNames.FULL).findOne({
       where: {
         url
@@ -107,7 +107,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
     })
   }
 
-  static loadActorsByShare (videoId: number, t: Sequelize.Transaction) {
+  static loadActorsByShare (videoId: number, t: Transaction) {
     const query = {
       where: {
         videoId
@@ -125,7 +125,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
       .then(res => res.map(r => r.Actor))
   }
 
-  static loadActorsWhoSharedVideosOf (actorOwnerId: number, t: Sequelize.Transaction): Bluebird<ActorModel[]> {
+  static loadActorsWhoSharedVideosOf (actorOwnerId: number, t: Transaction): Bluebird<ActorModel[]> {
     const query = {
       attributes: [],
       include: [
@@ -163,7 +163,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
       .then(res => res.map(r => r.Actor))
   }
 
-  static loadActorsByVideoChannel (videoChannelId: number, t: Sequelize.Transaction): Bluebird<ActorModel[]> {
+  static loadActorsByVideoChannel (videoChannelId: number, t: Transaction): Bluebird<ActorModel[]> {
     const query = {
       attributes: [],
       include: [
@@ -188,7 +188,7 @@ export class VideoShareModel extends Model<VideoShareModel> {
       .then(res => res.map(r => r.Actor))
   }
 
-  static listAndCountByVideoId (videoId: number, start: number, count: number, t?: Sequelize.Transaction) {
+  static listAndCountByVideoId (videoId: number, start: number, count: number, t?: Transaction) {
     const query = {
       offset: start,
       limit: count,
@@ -205,10 +205,21 @@ export class VideoShareModel extends Model<VideoShareModel> {
     const query = {
       where: {
         updatedAt: {
-          [Sequelize.Op.lt]: beforeUpdatedAt
+          [Op.lt]: beforeUpdatedAt
         },
         videoId
-      }
+      },
+      include: [
+        {
+          model: ActorModel.unscoped(),
+          required: true,
+          where: {
+            serverId: {
+              [ Op.ne ]: null
+            }
+          }
+        }
+      ]
     }
 
     return VideoShareModel.destroy(query)