2 files changed, 55 insertions, 45 deletions

diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts
index 52b792a5b..add129644 100644
--- a/server/models/account/user-notification.ts
+++ b/server/models/account/user-notification.ts
@@ -469,27 +469,33 @@ export class UserNotificationModel extends Model {
       ? Object.assign(this.formatVideo(this.Video), { channel: this.formatActor(this.Video.VideoChannel) })
       : undefined
 
-    const videoImport = this.VideoImport ? {
-      id: this.VideoImport.id,
-      video: this.VideoImport.Video ? this.formatVideo(this.VideoImport.Video) : undefined,
-      torrentName: this.VideoImport.torrentName,
-      magnetUri: this.VideoImport.magnetUri,
-      targetUrl: this.VideoImport.targetUrl
-    } : undefined
-
-    const comment = this.Comment ? {
-      id: this.Comment.id,
-      threadId: this.Comment.getThreadId(),
-      account: this.formatActor(this.Comment.Account),
-      video: this.formatVideo(this.Comment.Video)
-    } : undefined
+    const videoImport = this.VideoImport
+      ? {
+        id: this.VideoImport.id,
+        video: this.VideoImport.Video ? this.formatVideo(this.VideoImport.Video) : undefined,
+        torrentName: this.VideoImport.torrentName,
+        magnetUri: this.VideoImport.magnetUri,
+        targetUrl: this.VideoImport.targetUrl
+      }
+      : undefined
+
+    const comment = this.Comment
+      ? {
+        id: this.Comment.id,
+        threadId: this.Comment.getThreadId(),
+        account: this.formatActor(this.Comment.Account),
+        video: this.formatVideo(this.Comment.Video)
+      }
+      : undefined
 
     const abuse = this.Abuse ? this.formatAbuse(this.Abuse) : undefined
 
-    const videoBlacklist = this.VideoBlacklist ? {
-      id: this.VideoBlacklist.id,
-      video: this.formatVideo(this.VideoBlacklist.Video)
-    } : undefined
+    const videoBlacklist = this.VideoBlacklist
+      ? {
+        id: this.VideoBlacklist.id,
+        video: this.formatVideo(this.VideoBlacklist.Video)
+      }
+      : undefined
 
     const account = this.Account ? this.formatActor(this.Account) : undefined
 
@@ -498,23 +504,25 @@ export class UserNotificationModel extends Model {
       Group: 'channel' as 'channel',
       Person: 'account' as 'account'
     }
-    const actorFollow = this.ActorFollow ? {
-      id: this.ActorFollow.id,
-      state: this.ActorFollow.state,
-      follower: {
-        id: this.ActorFollow.ActorFollower.Account.id,
-        displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(),
-        name: this.ActorFollow.ActorFollower.preferredUsername,
-        avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getStaticPath() } : undefined,
-        host: this.ActorFollow.ActorFollower.getHost()
-      },
-      following: {
-        type: actorFollowingType[this.ActorFollow.ActorFollowing.type],
-        displayName: (this.ActorFollow.ActorFollowing.VideoChannel || this.ActorFollow.ActorFollowing.Account).getDisplayName(),
-        name: this.ActorFollow.ActorFollowing.preferredUsername,
-        host: this.ActorFollow.ActorFollowing.getHost()
+    const actorFollow = this.ActorFollow
+      ? {
+        id: this.ActorFollow.id,
+        state: this.ActorFollow.state,
+        follower: {
+          id: this.ActorFollow.ActorFollower.Account.id,
+          displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(),
+          name: this.ActorFollow.ActorFollower.preferredUsername,
+          avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getStaticPath() } : undefined,
+          host: this.ActorFollow.ActorFollower.getHost()
+        },
+        following: {
+          type: actorFollowingType[this.ActorFollow.ActorFollowing.type],
+          displayName: (this.ActorFollow.ActorFollowing.VideoChannel || this.ActorFollow.ActorFollowing.Account).getDisplayName(),
+          name: this.ActorFollow.ActorFollowing.preferredUsername,
+          host: this.ActorFollow.ActorFollowing.getHost()
+        }
       }
-    } : undefined
+      : undefined
 
     return {
       id: this.id,
@@ -541,15 +549,17 @@ export class UserNotificationModel extends Model {
   }
 
   formatAbuse (this: UserNotificationModelForApi, abuse: UserNotificationIncludes.AbuseInclude) {
-    const commentAbuse = abuse.VideoCommentAbuse?.VideoComment ? {
-      threadId: abuse.VideoCommentAbuse.VideoComment.getThreadId(),
-
-      video: {
-        id: abuse.VideoCommentAbuse.VideoComment.Video.id,
-        name: abuse.VideoCommentAbuse.VideoComment.Video.name,
-        uuid: abuse.VideoCommentAbuse.VideoComment.Video.uuid
+    const commentAbuse = abuse.VideoCommentAbuse?.VideoComment
+      ? {
+        threadId: abuse.VideoCommentAbuse.VideoComment.getThreadId(),
+
+        video: {
+          id: abuse.VideoCommentAbuse.VideoComment.Video.id,
+          name: abuse.VideoCommentAbuse.VideoComment.Video.name,
+          uuid: abuse.VideoCommentAbuse.VideoComment.Video.uuid
+        }
       }
-    } : undefined
+      : undefined
 
     const videoAbuse = abuse.VideoAbuse?.Video ? this.formatVideo(abuse.VideoAbuse.Video) : undefined
 
diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts
index a1f022fb4..77b8bcfe3 100644
--- a/server/models/video/video-format-utils.ts
+++ b/server/models/video/video-format-utils.ts
@@ -82,9 +82,9 @@ function videoModelToFormattedJSON (video: MVideoFormattable, options?: VideoFor
     account: video.VideoChannel.Account.toFormattedSummaryJSON(),
     channel: video.VideoChannel.toFormattedSummaryJSON(),
 
-    userHistory: userHistory ? {
-      currentTime: userHistory.currentTime
-    } : undefined,
+    userHistory: userHistory
+      ? { currentTime: userHistory.currentTime }
+      : undefined,
 
     // Can be added by external plugins
     pluginData: (video as any).pluginData