Cleaner warning of IP address leaking on embedded videos (#2034)

[github/Chocobozzz/PeerTube.git] / server / models / account / account-video-rate.ts

diff --git a/server/models/account/account-video-rate.ts b/server/models/account/account-video-rate.ts
index f462df4b33d78e6f498f01111862fd5acac10349..4bd8114cf6e2a718a781b89a25fd8b4d42d64bc6 100644 (file)
--- a/server/models/account/account-video-rate.ts
+++ b/server/models/account/account-video-rate.ts
@@ -1,16 +1,15 @@
 import { values } from 'lodash'
-import { Transaction, Op } from 'sequelize'
+import { FindOptions, Op, Transaction } from 'sequelize'
 import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { IFindOptions } from 'sequelize-typescript/lib/interfaces/IFindOptions'
 import { VideoRateType } from '../../../shared/models/videos'
-import { CONSTRAINTS_FIELDS, VIDEO_RATE_TYPES } from '../../initializers'
+import { CONSTRAINTS_FIELDS, VIDEO_RATE_TYPES } from '../../initializers/constants'
 import { VideoModel } from '../video/video'
 import { AccountModel } from './account'
 import { ActorModel } from '../activitypub/actor'
-import { throwIfNotValid, getSort } from '../utils'
+import { buildLocalAccountIdsIn, getSort, throwIfNotValid } from '../utils'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { AccountVideoRate } from '../../../shared'
-import { VideoChannelModel, ScopeNames as VideoChannelScopeNames } from '../video/video-channel'
+import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from '../video/video-channel'
 
 /*
   Account rates per video.
@@ -40,7 +39,7 @@ import { VideoChannelModel, ScopeNames as VideoChannelScopeNames } from '../vide
 export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
 
   @AllowNull(false)
-  @Column(DataType.ENUM(values(VIDEO_RATE_TYPES)))
+  @Column(DataType.ENUM(...values(VIDEO_RATE_TYPES)))
   type: VideoRateType
 
   @AllowNull(false)
@@ -79,7 +78,7 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
   Account: AccountModel
 
   static load (accountId: number, videoId: number, transaction?: Transaction) {
-    const options: IFindOptions<AccountVideoRateModel> = {
+    const options: FindOptions = {
       where: {
         accountId,
         videoId
@@ -90,6 +89,25 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
     return AccountVideoRateModel.findOne(options)
   }
 
+  static loadByAccountAndVideoOrUrl (accountId: number, videoId: number, url: string, transaction?: Transaction) {
+    const options: FindOptions = {
+      where: {
+        [ Op.or]: [
+          {
+            accountId,
+            videoId
+          },
+          {
+            url
+          }
+        ]
+      }
+    }
+    if (transaction) options.transaction = transaction
+
+    return AccountVideoRateModel.findOne(options)
+  }
+
   static listByAccountForApi (options: {
     start: number,
     count: number,
@@ -97,7 +115,7 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
     type?: string,
     accountId: number
   }) {
-    const query: IFindOptions<AccountVideoRateModel> = {
+    const query: FindOptions = {
       offset: options.start,
       limit: options.count,
       order: getSort(options.sort),
@@ -110,7 +128,7 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
           required: true,
           include: [
             {
-              model: VideoChannelModel.scope({ method: [VideoChannelScopeNames.SUMMARY, true] }),
+              model: VideoChannelModel.scope({ method: [VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }),
               required: true
             }
           ]
@@ -123,7 +141,7 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
   }
 
   static loadLocalAndPopulateVideo (rateType: VideoRateType, accountName: string, videoId: number, transaction?: Transaction) {
-    const options: IFindOptions<AccountVideoRateModel> = {
+    const options: FindOptions = {
       where: {
         videoId,
         type: rateType
@@ -155,7 +173,7 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
   }
 
   static loadByUrl (url: string, transaction: Transaction) {
-    const options: IFindOptions<AccountVideoRateModel> = {
+    const options: FindOptions = {
       where: {
         url
       }
@@ -201,7 +219,10 @@ export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
             [Op.lt]: beforeUpdatedAt
           },
           videoId,
-          type
+          type,
+          accountId: {
+            [Op.notIn]: buildLocalAccountIdsIn()
+          }
         },
         transaction: t
       }