X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-blacklist.ts;h=67bc0114c93815bffc39ca177953f1ef4b2b8b30;hb=338eb9d33af690db716805fd2277bf68f473b58f;hp=e907bbdc0dbffd4dc69f12d5646ac698fbaa3042;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts
index e907bbdc0..67bc0114c 100644
--- a/server/tests/api/videos/video-blacklist.ts
+++ b/server/tests/api/videos/video-blacklist.ts
@@ -1,13 +1,15 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import * as chai from 'chai'
 import { orderBy } from 'lodash'
 import 'mocha'
 import {
-  addVideoToBlacklist, cleanupTests,
+  addVideoToBlacklist,
+  cleanupTests,
   createUser,
   flushAndRunMultipleServers,
   getBlacklistedVideosList,
+  getMyUserInformation,
   getMyVideos,
   getVideosList,
   killallServers,
@@ -25,7 +27,8 @@ import { doubleFollow } from '../../../../shared/extra-utils/server/follows'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos'
 import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
-import { UserRole } from '../../../../shared/models/users'
+import { User, UserRole } from '../../../../shared/models/users'
+import { getMagnetURI, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
 
 const expect = chai.expect
 
@@ -37,7 +40,7 @@ describe('Test video blacklist', function () {
     const res = await getVideosList(server.url)
 
     const videos = res.body.data
-    for (let video of videos) {
+    for (const video of videos) {
       await addVideoToBlacklist(server.url, server.accessToken, video.id, 'super reason')
     }
   }
@@ -69,7 +72,7 @@ describe('Test video blacklist', function () {
 
     it('Should not have the video blacklisted in videos list/search on server 1', async function () {
       {
-        const res = await getVideosList(servers[ 0 ].url)
+        const res = await getVideosList(servers[0].url)
 
         expect(res.body.total).to.equal(0)
         expect(res.body.data).to.be.an('array')
@@ -77,7 +80,7 @@ describe('Test video blacklist', function () {
       }
 
       {
-        const res = await searchVideo(servers[ 0 ].url, 'name')
+        const res = await searchVideo(servers[0].url, 'name')
 
         expect(res.body.total).to.equal(0)
         expect(res.body.data).to.be.an('array')
@@ -87,7 +90,7 @@ describe('Test video blacklist', function () {
 
     it('Should have the blacklisted video in videos list/search on server 2', async function () {
       {
-        const res = await getVideosList(servers[ 1 ].url)
+        const res = await getVideosList(servers[1].url)
 
         expect(res.body.total).to.equal(2)
         expect(res.body.data).to.be.an('array')
@@ -95,7 +98,7 @@ describe('Test video blacklist', function () {
       }
 
       {
-        const res = await searchVideo(servers[ 1 ].url, 'video')
+        const res = await searchVideo(servers[1].url, 'video')
 
         expect(res.body.total).to.equal(2)
         expect(res.body.data).to.be.an('array')
@@ -122,8 +125,8 @@ describe('Test video blacklist', function () {
 
     it('Should display all the blacklisted videos when applying manual type filter', async function () {
       const res = await getBlacklistedVideosList({
-        url: servers[ 0 ].url,
-        token: servers[ 0 ].accessToken,
+        url: servers[0].url,
+        token: servers[0].accessToken,
         type: VideoBlacklistType.MANUAL
       })
 
@@ -136,8 +139,8 @@ describe('Test video blacklist', function () {
 
     it('Should display nothing when applying automatic type filter', async function () {
       const res = await getBlacklistedVideosList({
-        url: servers[ 0 ].url,
-        token: servers[ 0 ].accessToken,
+        url: servers[0].url,
+        token: servers[0].accessToken,
         type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
       })
 
@@ -149,7 +152,7 @@ describe('Test video blacklist', function () {
     })
 
     it('Should get the correct sort when sorting by descending id', async function () {
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: '-id' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-id' })
       expect(res.body.total).to.equal(2)
 
       const blacklistedVideos = res.body.data
@@ -162,7 +165,7 @@ describe('Test video blacklist', function () {
     })
 
     it('Should get the correct sort when sorting by descending video name', async function () {
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: '-name' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
       expect(res.body.total).to.equal(2)
 
       const blacklistedVideos = res.body.data
@@ -175,7 +178,7 @@ describe('Test video blacklist', function () {
     })
 
     it('Should get the correct sort when sorting by ascending creation date', async function () {
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: 'createdAt' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt' })
       expect(res.body.total).to.equal(2)
 
       const blacklistedVideos = res.body.data
@@ -192,7 +195,7 @@ describe('Test video blacklist', function () {
     it('Should change the reason', async function () {
       await updateVideoBlacklist(servers[0].url, servers[0].accessToken, videoId, 'my super reason updated')
 
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: '-name' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
       const video = res.body.data.find(b => b.video.id === videoId)
 
       expect(video.reason).to.equal('my super reason updated')
@@ -228,7 +231,7 @@ describe('Test video blacklist', function () {
 
     it('Should remove a video from the blacklist on server 1', async function () {
       // Get one video in the blacklist
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: '-name' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
       videoToRemove = res.body.data[0]
       blacklist = res.body.data.slice(1)
 
@@ -249,7 +252,7 @@ describe('Test video blacklist', function () {
     })
 
     it('Should not have the ex-blacklisted video in videos blacklist list on server 1', async function () {
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: '-name' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: '-name' })
       expect(res.body.total).to.equal(1)
 
       const videos = res.body.data
@@ -271,7 +274,7 @@ describe('Test video blacklist', function () {
         video3UUID = res.body.video.uuid
       }
       {
-        const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, { name: 'Video 4' })
+        const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'Video 4' })
         video4UUID = res.body.video.uuid
       }
 
@@ -281,17 +284,17 @@ describe('Test video blacklist', function () {
     it('Should blacklist video 3 and keep it federated', async function () {
       this.timeout(10000)
 
-      await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video3UUID, 'super reason', false)
+      await addVideoToBlacklist(servers[0].url, servers[0].accessToken, video3UUID, 'super reason', false)
 
       await waitJobs(servers)
 
       {
-        const res = await getVideosList(servers[ 0 ].url)
+        const res = await getVideosList(servers[0].url)
         expect(res.body.data.find(v => v.uuid === video3UUID)).to.be.undefined
       }
 
       {
-        const res = await getVideosList(servers[ 1 ].url)
+        const res = await getVideosList(servers[1].url)
         expect(res.body.data.find(v => v.uuid === video3UUID)).to.not.be.undefined
       }
     })
@@ -299,7 +302,7 @@ describe('Test video blacklist', function () {
     it('Should unfederate the video', async function () {
       this.timeout(10000)
 
-      await addVideoToBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, 'super reason', true)
+      await addVideoToBlacklist(servers[0].url, servers[0].accessToken, video4UUID, 'super reason', true)
 
       await waitJobs(servers)
 
@@ -312,7 +315,7 @@ describe('Test video blacklist', function () {
     it('Should have the video unfederated even after an Update AP message', async function () {
       this.timeout(10000)
 
-      await updateVideo(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID, { description: 'super description' })
+      await updateVideo(servers[0].url, servers[0].accessToken, video4UUID, { description: 'super description' })
 
       await waitJobs(servers)
 
@@ -323,7 +326,7 @@ describe('Test video blacklist', function () {
     })
 
     it('Should have the correct video blacklist unfederate attribute', async function () {
-      const res = await getBlacklistedVideosList({ url: servers[ 0 ].url, token: servers[ 0 ].accessToken, sort: 'createdAt' })
+      const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt' })
 
       const blacklistedVideos: VideoBlacklist[] = res.body.data
       const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID)
@@ -336,7 +339,7 @@ describe('Test video blacklist', function () {
     it('Should remove the video from blacklist and refederate the video', async function () {
       this.timeout(10000)
 
-      await removeVideoFromBlacklist(servers[ 0 ].url, servers[ 0 ].accessToken, video4UUID)
+      await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, video4UUID)
 
       await waitJobs(servers)
 
@@ -351,6 +354,7 @@ describe('Test video blacklist', function () {
   describe('When auto blacklist videos', function () {
     let userWithoutFlag: string
     let userWithFlag: string
+    let channelOfUserWithoutFlag: number
 
     before(async function () {
       this.timeout(20000)
@@ -358,9 +362,9 @@ describe('Test video blacklist', function () {
       killallServers([ servers[0] ])
 
       const config = {
-        'auto_blacklist': {
+        auto_blacklist: {
           videos: {
-            'of_users': {
+            of_users: {
               enabled: true
             }
           }
@@ -371,8 +375,8 @@ describe('Test video blacklist', function () {
       {
         const user = { username: 'user_without_flag', password: 'password' }
         await createUser({
-          url: servers[ 0 ].url,
-          accessToken: servers[ 0 ].accessToken,
+          url: servers[0].url,
+          accessToken: servers[0].accessToken,
           username: user.username,
           adminFlags: UserAdminFlag.NONE,
           password: user.password,
@@ -380,13 +384,17 @@ describe('Test video blacklist', function () {
         })
 
         userWithoutFlag = await userLogin(servers[0], user)
+
+        const res = await getMyUserInformation(servers[0].url, userWithoutFlag)
+        const body: User = res.body
+        channelOfUserWithoutFlag = body.videoChannels[0].id
       }
 
       {
         const user = { username: 'user_with_flag', password: 'password' }
         await createUser({
-          url: servers[ 0 ].url,
-          accessToken: servers[ 0 ].accessToken,
+          url: servers[0].url,
+          accessToken: servers[0].accessToken,
           username: user.username,
           adminFlags: UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST,
           password: user.password,
@@ -399,12 +407,12 @@ describe('Test video blacklist', function () {
       await waitJobs(servers)
     })
 
-    it('Should auto blacklist a video', async function () {
+    it('Should auto blacklist a video on upload', async function () {
       await uploadVideo(servers[0].url, userWithoutFlag, { name: 'blacklisted' })
 
       const res = await getBlacklistedVideosList({
-        url: servers[ 0 ].url,
-        token: servers[ 0 ].accessToken,
+        url: servers[0].url,
+        token: servers[0].accessToken,
         type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
       })
 
@@ -412,16 +420,56 @@ describe('Test video blacklist', function () {
       expect(res.body.data[0].video.name).to.equal('blacklisted')
     })
 
-    it('Should not auto blacklist a video', async function () {
+    it('Should auto blacklist a video on URL import', async function () {
+      this.timeout(15000)
+
+      const attributes = {
+        targetUrl: getYoutubeVideoUrl(),
+        name: 'URL import',
+        channelId: channelOfUserWithoutFlag
+      }
+      await importVideo(servers[0].url, userWithoutFlag, attributes)
+
+      const res = await getBlacklistedVideosList({
+        url: servers[0].url,
+        token: servers[0].accessToken,
+        sort: 'createdAt',
+        type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
+      })
+
+      expect(res.body.total).to.equal(2)
+      expect(res.body.data[1].video.name).to.equal('URL import')
+    })
+
+    it('Should auto blacklist a video on torrent import', async function () {
+      const attributes = {
+        magnetUri: getMagnetURI(),
+        name: 'Torrent import',
+        channelId: channelOfUserWithoutFlag
+      }
+      await importVideo(servers[0].url, userWithoutFlag, attributes)
+
+      const res = await getBlacklistedVideosList({
+        url: servers[0].url,
+        token: servers[0].accessToken,
+        sort: 'createdAt',
+        type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
+      })
+
+      expect(res.body.total).to.equal(3)
+      expect(res.body.data[2].video.name).to.equal('Torrent import')
+    })
+
+    it('Should not auto blacklist a video on upload if the user has the bypass blacklist flag', async function () {
       await uploadVideo(servers[0].url, userWithFlag, { name: 'not blacklisted' })
 
       const res = await getBlacklistedVideosList({
-        url: servers[ 0 ].url,
-        token: servers[ 0 ].accessToken,
+        url: servers[0].url,
+        token: servers[0].accessToken,
         type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED
       })
 
-      expect(res.body.total).to.equal(1)
+      expect(res.body.total).to.equal(3)
     })
   })