diff options
author | Chocobozzz <me@florianbigard.com> | 2019-06-07 14:34:11 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-06-07 14:35:53 +0200 |
commit | 03371ad9d049bab79445a1b35da44cb1272f6c28 (patch) | |
tree | 8d6a8332e24833aa8a9e514489553dccf11891d1 /server | |
parent | e5b432e04e6aa967fdea38ce38de959cdcc22b4d (diff) | |
download | PeerTube-03371ad9d049bab79445a1b35da44cb1272f6c28.tar.gz PeerTube-03371ad9d049bab79445a1b35da44cb1272f6c28.tar.zst PeerTube-03371ad9d049bab79445a1b35da44cb1272f6c28.zip |
Fix video import if autoblacklist is enabled
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/api/videos/import.ts | 16 | ||||
-rw-r--r-- | server/controllers/static.ts | 2 | ||||
-rw-r--r-- | server/tests/api/videos/video-blacklist.ts | 58 |
3 files changed, 63 insertions, 13 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index bfb690906..dcba0e08f 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts | |||
@@ -26,6 +26,7 @@ import { sequelizeTypescript } from '../../../initializers/database' | |||
26 | import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' | 26 | import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' |
27 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' | 27 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' |
28 | import { ThumbnailModel } from '../../../models/video/thumbnail' | 28 | import { ThumbnailModel } from '../../../models/video/thumbnail' |
29 | import { UserModel } from '../../../models/account/user' | ||
29 | 30 | ||
30 | const auditLogger = auditLoggerFactory('video-imports') | 31 | const auditLogger = auditLoggerFactory('video-imports') |
31 | const videoImportsRouter = express.Router() | 32 | const videoImportsRouter = express.Router() |
@@ -107,7 +108,8 @@ async function addTorrentImport (req: express.Request, res: express.Response, to | |||
107 | previewModel, | 108 | previewModel, |
108 | videoChannel: res.locals.videoChannel, | 109 | videoChannel: res.locals.videoChannel, |
109 | tags, | 110 | tags, |
110 | videoImportAttributes | 111 | videoImportAttributes, |
112 | user | ||
111 | }) | 113 | }) |
112 | 114 | ||
113 | // Create job to import the video | 115 | // Create job to import the video |
@@ -151,12 +153,13 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) | |||
151 | userId: user.id | 153 | userId: user.id |
152 | } | 154 | } |
153 | const videoImport = await insertIntoDB({ | 155 | const videoImport = await insertIntoDB({ |
154 | video: video, | 156 | video, |
155 | thumbnailModel, | 157 | thumbnailModel, |
156 | previewModel, | 158 | previewModel, |
157 | videoChannel: res.locals.videoChannel, | 159 | videoChannel: res.locals.videoChannel, |
158 | tags, | 160 | tags, |
159 | videoImportAttributes | 161 | videoImportAttributes, |
162 | user | ||
160 | }) | 163 | }) |
161 | 164 | ||
162 | // Create job to import the video | 165 | // Create job to import the video |
@@ -227,9 +230,10 @@ function insertIntoDB (parameters: { | |||
227 | previewModel: ThumbnailModel, | 230 | previewModel: ThumbnailModel, |
228 | videoChannel: VideoChannelModel, | 231 | videoChannel: VideoChannelModel, |
229 | tags: string[], | 232 | tags: string[], |
230 | videoImportAttributes: Partial<VideoImportModel> | 233 | videoImportAttributes: Partial<VideoImportModel>, |
234 | user: UserModel | ||
231 | }): Bluebird<VideoImportModel> { | 235 | }): Bluebird<VideoImportModel> { |
232 | let { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes } = parameters | 236 | const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters |
233 | 237 | ||
234 | return sequelizeTypescript.transaction(async t => { | 238 | return sequelizeTypescript.transaction(async t => { |
235 | const sequelizeOptions = { transaction: t } | 239 | const sequelizeOptions = { transaction: t } |
@@ -241,7 +245,7 @@ function insertIntoDB (parameters: { | |||
241 | if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) | 245 | if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) |
242 | if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) | 246 | if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) |
243 | 247 | ||
244 | await autoBlacklistVideoIfNeeded(video, videoChannel.Account.User, t) | 248 | await autoBlacklistVideoIfNeeded(video, user, t) |
245 | 249 | ||
246 | // Set tags to the video | 250 | // Set tags to the video |
247 | if (tags) { | 251 | if (tags) { |
diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 73951be2d..fb2e7742a 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts | |||
@@ -158,7 +158,7 @@ staticRouter.use('/.well-known/change-password', | |||
158 | 158 | ||
159 | staticRouter.use('/.well-known/host-meta', | 159 | staticRouter.use('/.well-known/host-meta', |
160 | (_, res: express.Response) => { | 160 | (_, res: express.Response) => { |
161 | res.type('application/xml'); | 161 | res.type('application/xml') |
162 | 162 | ||
163 | const xml = '<?xml version="1.0" encoding="UTF-8"?>\n' + | 163 | const xml = '<?xml version="1.0" encoding="UTF-8"?>\n' + |
164 | '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n' + | 164 | '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n' + |
diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index e907bbdc0..8760a4787 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts | |||
@@ -4,10 +4,11 @@ import * as chai from 'chai' | |||
4 | import { orderBy } from 'lodash' | 4 | import { orderBy } from 'lodash' |
5 | import 'mocha' | 5 | import 'mocha' |
6 | import { | 6 | import { |
7 | addVideoToBlacklist, cleanupTests, | 7 | addVideoToBlacklist, |
8 | cleanupTests, | ||
8 | createUser, | 9 | createUser, |
9 | flushAndRunMultipleServers, | 10 | flushAndRunMultipleServers, |
10 | getBlacklistedVideosList, | 11 | getBlacklistedVideosList, getMyUserInformation, |
11 | getMyVideos, | 12 | getMyVideos, |
12 | getVideosList, | 13 | getVideosList, |
13 | killallServers, | 14 | killallServers, |
@@ -16,6 +17,7 @@ import { | |||
16 | searchVideo, | 17 | searchVideo, |
17 | ServerInfo, | 18 | ServerInfo, |
18 | setAccessTokensToServers, | 19 | setAccessTokensToServers, |
20 | setDefaultVideoChannel, | ||
19 | updateVideo, | 21 | updateVideo, |
20 | updateVideoBlacklist, | 22 | updateVideoBlacklist, |
21 | uploadVideo, | 23 | uploadVideo, |
@@ -25,7 +27,8 @@ import { doubleFollow } from '../../../../shared/extra-utils/server/follows' | |||
25 | import { waitJobs } from '../../../../shared/extra-utils/server/jobs' | 27 | import { waitJobs } from '../../../../shared/extra-utils/server/jobs' |
26 | import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos' | 28 | import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos' |
27 | import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' | 29 | import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' |
28 | import { UserRole } from '../../../../shared/models/users' | 30 | import { User, UserRole, UserUpdateMe } from '../../../../shared/models/users' |
31 | import { getMagnetURI, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports' | ||
29 | 32 | ||
30 | const expect = chai.expect | 33 | const expect = chai.expect |
31 | 34 | ||
@@ -351,6 +354,7 @@ describe('Test video blacklist', function () { | |||
351 | describe('When auto blacklist videos', function () { | 354 | describe('When auto blacklist videos', function () { |
352 | let userWithoutFlag: string | 355 | let userWithoutFlag: string |
353 | let userWithFlag: string | 356 | let userWithFlag: string |
357 | let channelOfUserWithoutFlag: number | ||
354 | 358 | ||
355 | before(async function () { | 359 | before(async function () { |
356 | this.timeout(20000) | 360 | this.timeout(20000) |
@@ -380,6 +384,10 @@ describe('Test video blacklist', function () { | |||
380 | }) | 384 | }) |
381 | 385 | ||
382 | userWithoutFlag = await userLogin(servers[0], user) | 386 | userWithoutFlag = await userLogin(servers[0], user) |
387 | |||
388 | const res = await getMyUserInformation(servers[0].url, userWithoutFlag) | ||
389 | const body: User = res.body | ||
390 | channelOfUserWithoutFlag = body.videoChannels[0].id | ||
383 | } | 391 | } |
384 | 392 | ||
385 | { | 393 | { |
@@ -399,7 +407,7 @@ describe('Test video blacklist', function () { | |||
399 | await waitJobs(servers) | 407 | await waitJobs(servers) |
400 | }) | 408 | }) |
401 | 409 | ||
402 | it('Should auto blacklist a video', async function () { | 410 | it('Should auto blacklist a video on upload', async function () { |
403 | await uploadVideo(servers[0].url, userWithoutFlag, { name: 'blacklisted' }) | 411 | await uploadVideo(servers[0].url, userWithoutFlag, { name: 'blacklisted' }) |
404 | 412 | ||
405 | const res = await getBlacklistedVideosList({ | 413 | const res = await getBlacklistedVideosList({ |
@@ -412,7 +420,45 @@ describe('Test video blacklist', function () { | |||
412 | expect(res.body.data[0].video.name).to.equal('blacklisted') | 420 | expect(res.body.data[0].video.name).to.equal('blacklisted') |
413 | }) | 421 | }) |
414 | 422 | ||
415 | it('Should not auto blacklist a video', async function () { | 423 | it('Should auto blacklist a video on URL import', async function () { |
424 | const attributes = { | ||
425 | targetUrl: getYoutubeVideoUrl(), | ||
426 | name: 'URL import', | ||
427 | channelId: channelOfUserWithoutFlag | ||
428 | } | ||
429 | await importVideo(servers[ 0 ].url, userWithoutFlag, attributes) | ||
430 | |||
431 | const res = await getBlacklistedVideosList({ | ||
432 | url: servers[ 0 ].url, | ||
433 | token: servers[ 0 ].accessToken, | ||
434 | sort: 'createdAt', | ||
435 | type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED | ||
436 | }) | ||
437 | |||
438 | expect(res.body.total).to.equal(2) | ||
439 | expect(res.body.data[1].video.name).to.equal('URL import') | ||
440 | }) | ||
441 | |||
442 | it('Should auto blacklist a video on torrent import', async function () { | ||
443 | const attributes = { | ||
444 | magnetUri: getMagnetURI(), | ||
445 | name: 'Torrent import', | ||
446 | channelId: channelOfUserWithoutFlag | ||
447 | } | ||
448 | await importVideo(servers[ 0 ].url, userWithoutFlag, attributes) | ||
449 | |||
450 | const res = await getBlacklistedVideosList({ | ||
451 | url: servers[ 0 ].url, | ||
452 | token: servers[ 0 ].accessToken, | ||
453 | sort: 'createdAt', | ||
454 | type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED | ||
455 | }) | ||
456 | |||
457 | expect(res.body.total).to.equal(3) | ||
458 | expect(res.body.data[2].video.name).to.equal('Torrent import') | ||
459 | }) | ||
460 | |||
461 | it('Should not auto blacklist a video on upload if the user has the bypass blacklist flag', async function () { | ||
416 | await uploadVideo(servers[0].url, userWithFlag, { name: 'not blacklisted' }) | 462 | await uploadVideo(servers[0].url, userWithFlag, { name: 'not blacklisted' }) |
417 | 463 | ||
418 | const res = await getBlacklistedVideosList({ | 464 | const res = await getBlacklistedVideosList({ |
@@ -421,7 +467,7 @@ describe('Test video blacklist', function () { | |||
421 | type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED | 467 | type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED |
422 | }) | 468 | }) |
423 | 469 | ||
424 | expect(res.body.total).to.equal(1) | 470 | expect(res.body.total).to.equal(3) |
425 | }) | 471 | }) |
426 | }) | 472 | }) |
427 | 473 | ||