From faa9d434b4d681837ff2a87603337c2623419669 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 17 Jun 2020 10:55:40 +0200
Subject: Update server dependencies

---
 server/models/video/video-abuse.ts | 2 +-
 server/models/video/video.ts       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'server/models/video')

diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts
index e0cf50b59..40f0ce12b 100644
--- a/server/models/video/video-abuse.ts
+++ b/server/models/video/video-abuse.ts
@@ -394,7 +394,7 @@ export class VideoAbuseModel extends Model<VideoAbuseModel> {
         name: video.name,
         nsfw: video.nsfw,
         deleted: !this.Video,
-        blacklisted: this.Video && this.Video.isBlacklisted(),
+        blacklisted: this.Video?.isBlacklisted() || false,
         thumbnailPath: this.Video?.getMiniatureStaticPath(),
         channel: this.Video?.VideoChannel.toFormattedJSON() || this.deletedVideo?.channel
       },
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 1f590c02d..b4efb76ee 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1605,8 +1605,7 @@ export class VideoModel extends Model<VideoModel> {
   }
 
   isBlocked () {
-    return (this.VideoChannel.Account.Actor.Server && this.VideoChannel.Account.Actor.Server.isBlocked()) ||
-      this.VideoChannel.Account.isBlocked()
+    return this.VideoChannel.Account.Actor.Server?.isBlocked() || this.VideoChannel.Account.isBlocked()
   }
 
   getQualityFileBy<T extends MVideoWithFile> (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) {
-- 
cgit v1.2.3