diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/lib/activitypub/process/process-create.ts | 2 | ||||
-rw-r--r-- | server/lib/activitypub/video-comments.ts | 35 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-channel-import.ts | 22 | ||||
-rw-r--r-- | server/lib/moderation.ts | 42 | ||||
-rw-r--r-- | server/lib/schedulers/video-channel-sync-latest-scheduler.ts | 35 | ||||
-rw-r--r-- | server/lib/sync-channel.ts | 90 | ||||
-rw-r--r-- | server/middlewares/validators/videos/video-comments.ts | 5 | ||||
-rw-r--r-- | server/tests/api/notifications/moderation-notifications.ts | 2 | ||||
-rw-r--r-- | server/tests/external-plugins/akismet.ts | 160 | ||||
-rw-r--r-- | server/tests/external-plugins/index.ts | 1 | ||||
-rw-r--r-- | server/tests/fixtures/peertube-plugin-test/main.js | 9 | ||||
-rw-r--r-- | server/tests/plugins/filter-hooks.ts | 383 |
12 files changed, 525 insertions, 261 deletions
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 76ed37aae..1e6e8956c 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts | |||
@@ -109,8 +109,10 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: MAc | |||
109 | let video: MVideoAccountLightBlacklistAllFiles | 109 | let video: MVideoAccountLightBlacklistAllFiles |
110 | let created: boolean | 110 | let created: boolean |
111 | let comment: MCommentOwnerVideo | 111 | let comment: MCommentOwnerVideo |
112 | |||
112 | try { | 113 | try { |
113 | const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false }) | 114 | const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false }) |
115 | if (!resolveThreadResult) return // Comment not accepted | ||
114 | 116 | ||
115 | video = resolveThreadResult.video | 117 | video = resolveThreadResult.video |
116 | created = resolveThreadResult.commentCreated | 118 | created = resolveThreadResult.commentCreated |
diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts index 911c7cd30..b65baf0e9 100644 --- a/server/lib/activitypub/video-comments.ts +++ b/server/lib/activitypub/video-comments.ts | |||
@@ -4,7 +4,9 @@ import { logger } from '../../helpers/logger' | |||
4 | import { doJSONRequest } from '../../helpers/requests' | 4 | import { doJSONRequest } from '../../helpers/requests' |
5 | import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants' | 5 | import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants' |
6 | import { VideoCommentModel } from '../../models/video/video-comment' | 6 | import { VideoCommentModel } from '../../models/video/video-comment' |
7 | import { MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../types/models/video' | 7 | import { MComment, MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../types/models/video' |
8 | import { isRemoteVideoCommentAccepted } from '../moderation' | ||
9 | import { Hooks } from '../plugins/hooks' | ||
8 | import { getOrCreateAPActor } from './actors' | 10 | import { getOrCreateAPActor } from './actors' |
9 | import { checkUrlsSameHost } from './url' | 11 | import { checkUrlsSameHost } from './url' |
10 | import { getOrCreateAPVideo } from './videos' | 12 | import { getOrCreateAPVideo } from './videos' |
@@ -103,6 +105,10 @@ async function tryToResolveThreadFromVideo (params: ResolveThreadParams) { | |||
103 | firstReply.changed('updatedAt', true) | 105 | firstReply.changed('updatedAt', true) |
104 | firstReply.Video = video | 106 | firstReply.Video = video |
105 | 107 | ||
108 | if (await isRemoteCommentAccepted(firstReply) !== true) { | ||
109 | return undefined | ||
110 | } | ||
111 | |||
106 | comments[comments.length - 1] = await firstReply.save() | 112 | comments[comments.length - 1] = await firstReply.save() |
107 | 113 | ||
108 | for (let i = comments.length - 2; i >= 0; i--) { | 114 | for (let i = comments.length - 2; i >= 0; i--) { |
@@ -113,6 +119,10 @@ async function tryToResolveThreadFromVideo (params: ResolveThreadParams) { | |||
113 | comment.changed('updatedAt', true) | 119 | comment.changed('updatedAt', true) |
114 | comment.Video = video | 120 | comment.Video = video |
115 | 121 | ||
122 | if (await isRemoteCommentAccepted(comment) !== true) { | ||
123 | return undefined | ||
124 | } | ||
125 | |||
116 | comments[i] = await comment.save() | 126 | comments[i] = await comment.save() |
117 | } | 127 | } |
118 | 128 | ||
@@ -169,3 +179,26 @@ async function resolveRemoteParentComment (params: ResolveThreadParams) { | |||
169 | commentCreated: true | 179 | commentCreated: true |
170 | }) | 180 | }) |
171 | } | 181 | } |
182 | |||
183 | async function isRemoteCommentAccepted (comment: MComment) { | ||
184 | // Already created | ||
185 | if (comment.id) return true | ||
186 | |||
187 | const acceptParameters = { | ||
188 | comment | ||
189 | } | ||
190 | |||
191 | const acceptedResult = await Hooks.wrapFun( | ||
192 | isRemoteVideoCommentAccepted, | ||
193 | acceptParameters, | ||
194 | 'filter:activity-pub.remote-video-comment.create.accept.result' | ||
195 | ) | ||
196 | |||
197 | if (!acceptedResult || acceptedResult.accepted !== true) { | ||
198 | logger.info('Refused to create a remote comment.', { acceptedResult, acceptParameters }) | ||
199 | |||
200 | return false | ||
201 | } | ||
202 | |||
203 | return true | ||
204 | } | ||
diff --git a/server/lib/job-queue/handlers/video-channel-import.ts b/server/lib/job-queue/handlers/video-channel-import.ts index 600292844..c3dd8a688 100644 --- a/server/lib/job-queue/handlers/video-channel-import.ts +++ b/server/lib/job-queue/handlers/video-channel-import.ts | |||
@@ -5,7 +5,7 @@ import { synchronizeChannel } from '@server/lib/sync-channel' | |||
5 | import { VideoChannelModel } from '@server/models/video/video-channel' | 5 | import { VideoChannelModel } from '@server/models/video/video-channel' |
6 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' | 6 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' |
7 | import { MChannelSync } from '@server/types/models' | 7 | import { MChannelSync } from '@server/types/models' |
8 | import { VideoChannelImportPayload, VideoChannelSyncState } from '@shared/models' | 8 | import { VideoChannelImportPayload } from '@shared/models' |
9 | 9 | ||
10 | export async function processVideoChannelImport (job: Job) { | 10 | export async function processVideoChannelImport (job: Job) { |
11 | const payload = job.data as VideoChannelImportPayload | 11 | const payload = job.data as VideoChannelImportPayload |
@@ -32,17 +32,11 @@ export async function processVideoChannelImport (job: Job) { | |||
32 | 32 | ||
33 | const videoChannel = await VideoChannelModel.loadAndPopulateAccount(payload.videoChannelId) | 33 | const videoChannel = await VideoChannelModel.loadAndPopulateAccount(payload.videoChannelId) |
34 | 34 | ||
35 | try { | 35 | logger.info(`Starting importing videos from external channel "${payload.externalChannelUrl}" to "${videoChannel.name}" `) |
36 | logger.info(`Starting importing videos from external channel "${payload.externalChannelUrl}" to "${videoChannel.name}" `) | 36 | |
37 | 37 | await synchronizeChannel({ | |
38 | await synchronizeChannel({ | 38 | channel: videoChannel, |
39 | channel: videoChannel, | 39 | externalChannelUrl: payload.externalChannelUrl, |
40 | externalChannelUrl: payload.externalChannelUrl, | 40 | channelSync |
41 | channelSync | 41 | }) |
42 | }) | ||
43 | } catch (err) { | ||
44 | logger.error(`Failed to import channel ${videoChannel.name}`, { err }) | ||
45 | channelSync.state = VideoChannelSyncState.FAILED | ||
46 | await channelSync.save() | ||
47 | } | ||
48 | } | 42 | } |
diff --git a/server/lib/moderation.ts b/server/lib/moderation.ts index c23f5b6a6..3cc92ca30 100644 --- a/server/lib/moderation.ts +++ b/server/lib/moderation.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { VideoUploadFile } from 'express' | 1 | import express, { VideoUploadFile } from 'express' |
2 | import { PathLike } from 'fs-extra' | 2 | import { PathLike } from 'fs-extra' |
3 | import { Transaction } from 'sequelize/types' | 3 | import { Transaction } from 'sequelize/types' |
4 | import { AbuseAuditView, auditLoggerFactory } from '@server/helpers/audit-logger' | 4 | import { AbuseAuditView, auditLoggerFactory } from '@server/helpers/audit-logger' |
@@ -13,18 +13,15 @@ import { | |||
13 | MAbuseFull, | 13 | MAbuseFull, |
14 | MAccountDefault, | 14 | MAccountDefault, |
15 | MAccountLight, | 15 | MAccountLight, |
16 | MComment, | ||
16 | MCommentAbuseAccountVideo, | 17 | MCommentAbuseAccountVideo, |
17 | MCommentOwnerVideo, | 18 | MCommentOwnerVideo, |
18 | MUser, | 19 | MUser, |
19 | MVideoAbuseVideoFull, | 20 | MVideoAbuseVideoFull, |
20 | MVideoAccountLightBlacklistAllFiles | 21 | MVideoAccountLightBlacklistAllFiles |
21 | } from '@server/types/models' | 22 | } from '@server/types/models' |
22 | import { ActivityCreate } from '../../shared/models/activitypub' | ||
23 | import { VideoObject } from '../../shared/models/activitypub/objects' | ||
24 | import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object' | ||
25 | import { LiveVideoCreate, VideoCreate, VideoImportCreate } from '../../shared/models/videos' | 23 | import { LiveVideoCreate, VideoCreate, VideoImportCreate } from '../../shared/models/videos' |
26 | import { VideoCommentCreate } from '../../shared/models/videos/comment' | 24 | import { VideoCommentCreate } from '../../shared/models/videos/comment' |
27 | import { ActorModel } from '../models/actor/actor' | ||
28 | import { UserModel } from '../models/user/user' | 25 | import { UserModel } from '../models/user/user' |
29 | import { VideoModel } from '../models/video/video' | 26 | import { VideoModel } from '../models/video/video' |
30 | import { VideoCommentModel } from '../models/video/video-comment' | 27 | import { VideoCommentModel } from '../models/video/video-comment' |
@@ -36,7 +33,9 @@ export type AcceptResult = { | |||
36 | errorMessage?: string | 33 | errorMessage?: string |
37 | } | 34 | } |
38 | 35 | ||
39 | // Can be filtered by plugins | 36 | // --------------------------------------------------------------------------- |
37 | |||
38 | // Stub function that can be filtered by plugins | ||
40 | function isLocalVideoAccepted (object: { | 39 | function isLocalVideoAccepted (object: { |
41 | videoBody: VideoCreate | 40 | videoBody: VideoCreate |
42 | videoFile: VideoUploadFile | 41 | videoFile: VideoUploadFile |
@@ -45,6 +44,9 @@ function isLocalVideoAccepted (object: { | |||
45 | return { accepted: true } | 44 | return { accepted: true } |
46 | } | 45 | } |
47 | 46 | ||
47 | // --------------------------------------------------------------------------- | ||
48 | |||
49 | // Stub function that can be filtered by plugins | ||
48 | function isLocalLiveVideoAccepted (object: { | 50 | function isLocalLiveVideoAccepted (object: { |
49 | liveVideoBody: LiveVideoCreate | 51 | liveVideoBody: LiveVideoCreate |
50 | user: UserModel | 52 | user: UserModel |
@@ -52,7 +54,11 @@ function isLocalLiveVideoAccepted (object: { | |||
52 | return { accepted: true } | 54 | return { accepted: true } |
53 | } | 55 | } |
54 | 56 | ||
57 | // --------------------------------------------------------------------------- | ||
58 | |||
59 | // Stub function that can be filtered by plugins | ||
55 | function isLocalVideoThreadAccepted (_object: { | 60 | function isLocalVideoThreadAccepted (_object: { |
61 | req: express.Request | ||
56 | commentBody: VideoCommentCreate | 62 | commentBody: VideoCommentCreate |
57 | video: VideoModel | 63 | video: VideoModel |
58 | user: UserModel | 64 | user: UserModel |
@@ -60,7 +66,9 @@ function isLocalVideoThreadAccepted (_object: { | |||
60 | return { accepted: true } | 66 | return { accepted: true } |
61 | } | 67 | } |
62 | 68 | ||
69 | // Stub function that can be filtered by plugins | ||
63 | function isLocalVideoCommentReplyAccepted (_object: { | 70 | function isLocalVideoCommentReplyAccepted (_object: { |
71 | req: express.Request | ||
64 | commentBody: VideoCommentCreate | 72 | commentBody: VideoCommentCreate |
65 | parentComment: VideoCommentModel | 73 | parentComment: VideoCommentModel |
66 | video: VideoModel | 74 | video: VideoModel |
@@ -69,22 +77,18 @@ function isLocalVideoCommentReplyAccepted (_object: { | |||
69 | return { accepted: true } | 77 | return { accepted: true } |
70 | } | 78 | } |
71 | 79 | ||
72 | function isRemoteVideoAccepted (_object: { | 80 | // --------------------------------------------------------------------------- |
73 | activity: ActivityCreate | ||
74 | videoAP: VideoObject | ||
75 | byActor: ActorModel | ||
76 | }): AcceptResult { | ||
77 | return { accepted: true } | ||
78 | } | ||
79 | 81 | ||
82 | // Stub function that can be filtered by plugins | ||
80 | function isRemoteVideoCommentAccepted (_object: { | 83 | function isRemoteVideoCommentAccepted (_object: { |
81 | activity: ActivityCreate | 84 | comment: MComment |
82 | commentAP: VideoCommentObject | ||
83 | byActor: ActorModel | ||
84 | }): AcceptResult { | 85 | }): AcceptResult { |
85 | return { accepted: true } | 86 | return { accepted: true } |
86 | } | 87 | } |
87 | 88 | ||
89 | // --------------------------------------------------------------------------- | ||
90 | |||
91 | // Stub function that can be filtered by plugins | ||
88 | function isPreImportVideoAccepted (object: { | 92 | function isPreImportVideoAccepted (object: { |
89 | videoImportBody: VideoImportCreate | 93 | videoImportBody: VideoImportCreate |
90 | user: MUser | 94 | user: MUser |
@@ -92,6 +96,7 @@ function isPreImportVideoAccepted (object: { | |||
92 | return { accepted: true } | 96 | return { accepted: true } |
93 | } | 97 | } |
94 | 98 | ||
99 | // Stub function that can be filtered by plugins | ||
95 | function isPostImportVideoAccepted (object: { | 100 | function isPostImportVideoAccepted (object: { |
96 | videoFilePath: PathLike | 101 | videoFilePath: PathLike |
97 | videoFile: VideoFileModel | 102 | videoFile: VideoFileModel |
@@ -100,6 +105,8 @@ function isPostImportVideoAccepted (object: { | |||
100 | return { accepted: true } | 105 | return { accepted: true } |
101 | } | 106 | } |
102 | 107 | ||
108 | // --------------------------------------------------------------------------- | ||
109 | |||
103 | async function createVideoAbuse (options: { | 110 | async function createVideoAbuse (options: { |
104 | baseAbuse: FilteredModelAttributes<AbuseModel> | 111 | baseAbuse: FilteredModelAttributes<AbuseModel> |
105 | videoInstance: MVideoAccountLightBlacklistAllFiles | 112 | videoInstance: MVideoAccountLightBlacklistAllFiles |
@@ -189,12 +196,13 @@ function createAccountAbuse (options: { | |||
189 | }) | 196 | }) |
190 | } | 197 | } |
191 | 198 | ||
199 | // --------------------------------------------------------------------------- | ||
200 | |||
192 | export { | 201 | export { |
193 | isLocalLiveVideoAccepted, | 202 | isLocalLiveVideoAccepted, |
194 | 203 | ||
195 | isLocalVideoAccepted, | 204 | isLocalVideoAccepted, |
196 | isLocalVideoThreadAccepted, | 205 | isLocalVideoThreadAccepted, |
197 | isRemoteVideoAccepted, | ||
198 | isRemoteVideoCommentAccepted, | 206 | isRemoteVideoCommentAccepted, |
199 | isLocalVideoCommentReplyAccepted, | 207 | isLocalVideoCommentReplyAccepted, |
200 | isPreImportVideoAccepted, | 208 | isPreImportVideoAccepted, |
diff --git a/server/lib/schedulers/video-channel-sync-latest-scheduler.ts b/server/lib/schedulers/video-channel-sync-latest-scheduler.ts index a527f68b5..efb957fac 100644 --- a/server/lib/schedulers/video-channel-sync-latest-scheduler.ts +++ b/server/lib/schedulers/video-channel-sync-latest-scheduler.ts | |||
@@ -2,7 +2,6 @@ import { logger } from '@server/helpers/logger' | |||
2 | import { CONFIG } from '@server/initializers/config' | 2 | import { CONFIG } from '@server/initializers/config' |
3 | import { VideoChannelModel } from '@server/models/video/video-channel' | 3 | import { VideoChannelModel } from '@server/models/video/video-channel' |
4 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' | 4 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' |
5 | import { VideoChannelSyncState } from '@shared/models' | ||
6 | import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants' | 5 | import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants' |
7 | import { synchronizeChannel } from '../sync-channel' | 6 | import { synchronizeChannel } from '../sync-channel' |
8 | import { AbstractScheduler } from './abstract-scheduler' | 7 | import { AbstractScheduler } from './abstract-scheduler' |
@@ -28,26 +27,20 @@ export class VideoChannelSyncLatestScheduler extends AbstractScheduler { | |||
28 | for (const sync of channelSyncs) { | 27 | for (const sync of channelSyncs) { |
29 | const channel = await VideoChannelModel.loadAndPopulateAccount(sync.videoChannelId) | 28 | const channel = await VideoChannelModel.loadAndPopulateAccount(sync.videoChannelId) |
30 | 29 | ||
31 | try { | 30 | logger.info( |
32 | logger.info( | 31 | 'Creating video import jobs for "%s" sync with external channel "%s"', |
33 | 'Creating video import jobs for "%s" sync with external channel "%s"', | 32 | channel.Actor.preferredUsername, sync.externalChannelUrl |
34 | channel.Actor.preferredUsername, sync.externalChannelUrl | 33 | ) |
35 | ) | 34 | |
36 | 35 | const onlyAfter = sync.lastSyncAt || sync.createdAt | |
37 | const onlyAfter = sync.lastSyncAt || sync.createdAt | 36 | |
38 | 37 | await synchronizeChannel({ | |
39 | await synchronizeChannel({ | 38 | channel, |
40 | channel, | 39 | externalChannelUrl: sync.externalChannelUrl, |
41 | externalChannelUrl: sync.externalChannelUrl, | 40 | videosCountLimit: CONFIG.IMPORT.VIDEO_CHANNEL_SYNCHRONIZATION.VIDEOS_LIMIT_PER_SYNCHRONIZATION, |
42 | videosCountLimit: CONFIG.IMPORT.VIDEO_CHANNEL_SYNCHRONIZATION.VIDEOS_LIMIT_PER_SYNCHRONIZATION, | 41 | channelSync: sync, |
43 | channelSync: sync, | 42 | onlyAfter |
44 | onlyAfter | 43 | }) |
45 | }) | ||
46 | } catch (err) { | ||
47 | logger.error(`Failed to synchronize channel ${channel.Actor.preferredUsername}`, { err }) | ||
48 | sync.state = VideoChannelSyncState.FAILED | ||
49 | await sync.save() | ||
50 | } | ||
51 | } | 44 | } |
52 | } | 45 | } |
53 | 46 | ||
diff --git a/server/lib/sync-channel.ts b/server/lib/sync-channel.ts index f91599c14..35af91429 100644 --- a/server/lib/sync-channel.ts +++ b/server/lib/sync-channel.ts | |||
@@ -24,56 +24,62 @@ export async function synchronizeChannel (options: { | |||
24 | await channelSync.save() | 24 | await channelSync.save() |
25 | } | 25 | } |
26 | 26 | ||
27 | const user = await UserModel.loadByChannelActorId(channel.actorId) | 27 | try { |
28 | const youtubeDL = new YoutubeDLWrapper( | 28 | const user = await UserModel.loadByChannelActorId(channel.actorId) |
29 | externalChannelUrl, | 29 | const youtubeDL = new YoutubeDLWrapper( |
30 | ServerConfigManager.Instance.getEnabledResolutions('vod'), | 30 | externalChannelUrl, |
31 | CONFIG.TRANSCODING.ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION | 31 | ServerConfigManager.Instance.getEnabledResolutions('vod'), |
32 | ) | 32 | CONFIG.TRANSCODING.ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION |
33 | 33 | ) | |
34 | const targetUrls = await youtubeDL.getInfoForListImport({ latestVideosCount: videosCountLimit }) | ||
35 | |||
36 | logger.info( | ||
37 | 'Fetched %d candidate URLs for sync channel %s.', | ||
38 | targetUrls.length, channel.Actor.preferredUsername, { targetUrls } | ||
39 | ) | ||
40 | |||
41 | if (targetUrls.length === 0) { | ||
42 | if (channelSync) { | ||
43 | channelSync.state = VideoChannelSyncState.SYNCED | ||
44 | await channelSync.save() | ||
45 | } | ||
46 | |||
47 | return | ||
48 | } | ||
49 | 34 | ||
50 | const children: CreateJobArgument[] = [] | 35 | const targetUrls = await youtubeDL.getInfoForListImport({ latestVideosCount: videosCountLimit }) |
51 | 36 | ||
52 | for (const targetUrl of targetUrls) { | 37 | logger.info( |
53 | if (await skipImport(channel, targetUrl, onlyAfter)) continue | 38 | 'Fetched %d candidate URLs for sync channel %s.', |
39 | targetUrls.length, channel.Actor.preferredUsername, { targetUrls } | ||
40 | ) | ||
54 | 41 | ||
55 | const { job } = await buildYoutubeDLImport({ | 42 | if (targetUrls.length === 0) { |
56 | user, | 43 | if (channelSync) { |
57 | channel, | 44 | channelSync.state = VideoChannelSyncState.SYNCED |
58 | targetUrl, | 45 | await channelSync.save() |
59 | channelSync, | ||
60 | importDataOverride: { | ||
61 | privacy: VideoPrivacy.PUBLIC | ||
62 | } | 46 | } |
63 | }) | ||
64 | 47 | ||
65 | children.push(job) | 48 | return |
66 | } | 49 | } |
50 | |||
51 | const children: CreateJobArgument[] = [] | ||
52 | |||
53 | for (const targetUrl of targetUrls) { | ||
54 | if (await skipImport(channel, targetUrl, onlyAfter)) continue | ||
67 | 55 | ||
68 | // Will update the channel sync status | 56 | const { job } = await buildYoutubeDLImport({ |
69 | const parent: CreateJobArgument = { | 57 | user, |
70 | type: 'after-video-channel-import', | 58 | channel, |
71 | payload: { | 59 | targetUrl, |
72 | channelSyncId: channelSync?.id | 60 | channelSync, |
61 | importDataOverride: { | ||
62 | privacy: VideoPrivacy.PUBLIC | ||
63 | } | ||
64 | }) | ||
65 | |||
66 | children.push(job) | ||
73 | } | 67 | } |
74 | } | ||
75 | 68 | ||
76 | await JobQueue.Instance.createJobWithChildren(parent, children) | 69 | // Will update the channel sync status |
70 | const parent: CreateJobArgument = { | ||
71 | type: 'after-video-channel-import', | ||
72 | payload: { | ||
73 | channelSyncId: channelSync?.id | ||
74 | } | ||
75 | } | ||
76 | |||
77 | await JobQueue.Instance.createJobWithChildren(parent, children) | ||
78 | } catch (err) { | ||
79 | logger.error(`Failed to import channel ${channel.name}`, { err }) | ||
80 | channelSync.state = VideoChannelSyncState.FAILED | ||
81 | await channelSync.save() | ||
82 | } | ||
77 | } | 83 | } |
78 | 84 | ||
79 | // --------------------------------------------------------------------------- | 85 | // --------------------------------------------------------------------------- |
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts index 69062701b..133feb7bd 100644 --- a/server/middlewares/validators/videos/video-comments.ts +++ b/server/middlewares/validators/videos/video-comments.ts | |||
@@ -208,7 +208,8 @@ async function isVideoCommentAccepted (req: express.Request, res: express.Respon | |||
208 | const acceptParameters = { | 208 | const acceptParameters = { |
209 | video, | 209 | video, |
210 | commentBody: req.body, | 210 | commentBody: req.body, |
211 | user: res.locals.oauth.token.User | 211 | user: res.locals.oauth.token.User, |
212 | req | ||
212 | } | 213 | } |
213 | 214 | ||
214 | let acceptedResult: AcceptResult | 215 | let acceptedResult: AcceptResult |
@@ -234,7 +235,7 @@ async function isVideoCommentAccepted (req: express.Request, res: express.Respon | |||
234 | 235 | ||
235 | res.fail({ | 236 | res.fail({ |
236 | status: HttpStatusCode.FORBIDDEN_403, | 237 | status: HttpStatusCode.FORBIDDEN_403, |
237 | message: acceptedResult?.errorMessage || 'Refused local comment' | 238 | message: acceptedResult?.errorMessage || 'Comment has been rejected.' |
238 | }) | 239 | }) |
239 | return false | 240 | return false |
240 | } | 241 | } |
diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts index d8a7d576e..fc953f144 100644 --- a/server/tests/api/notifications/moderation-notifications.ts +++ b/server/tests/api/notifications/moderation-notifications.ts | |||
@@ -382,7 +382,7 @@ describe('Test moderation notifications', function () { | |||
382 | }) | 382 | }) |
383 | 383 | ||
384 | it('Should send a notification only to admin when there is a new instance follower', async function () { | 384 | it('Should send a notification only to admin when there is a new instance follower', async function () { |
385 | this.timeout(20000) | 385 | this.timeout(60000) |
386 | 386 | ||
387 | await servers[2].follows.follow({ hosts: [ servers[0].url ] }) | 387 | await servers[2].follows.follow({ hosts: [ servers[0].url ] }) |
388 | 388 | ||
diff --git a/server/tests/external-plugins/akismet.ts b/server/tests/external-plugins/akismet.ts new file mode 100644 index 000000000..974bf0011 --- /dev/null +++ b/server/tests/external-plugins/akismet.ts | |||
@@ -0,0 +1,160 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | ||
2 | |||
3 | import { expect } from 'chai' | ||
4 | import { HttpStatusCode } from '@shared/models' | ||
5 | import { | ||
6 | cleanupTests, | ||
7 | createMultipleServers, | ||
8 | doubleFollow, | ||
9 | PeerTubeServer, | ||
10 | setAccessTokensToServers, | ||
11 | waitJobs | ||
12 | } from '@shared/server-commands' | ||
13 | |||
14 | describe('Official plugin Akismet', function () { | ||
15 | let servers: PeerTubeServer[] | ||
16 | let videoUUID: string | ||
17 | |||
18 | before(async function () { | ||
19 | this.timeout(30000) | ||
20 | |||
21 | servers = await createMultipleServers(2) | ||
22 | await setAccessTokensToServers(servers) | ||
23 | |||
24 | await servers[0].plugins.install({ | ||
25 | npmName: 'peertube-plugin-akismet' | ||
26 | }) | ||
27 | |||
28 | if (!process.env.AKISMET_KEY) throw new Error('Missing AKISMET_KEY from env') | ||
29 | |||
30 | await servers[0].plugins.updateSettings({ | ||
31 | npmName: 'peertube-plugin-akismet', | ||
32 | settings: { | ||
33 | 'akismet-api-key': process.env.AKISMET_KEY | ||
34 | } | ||
35 | }) | ||
36 | |||
37 | await doubleFollow(servers[0], servers[1]) | ||
38 | }) | ||
39 | |||
40 | describe('Local threads/replies', function () { | ||
41 | |||
42 | before(async function () { | ||
43 | const { uuid } = await servers[0].videos.quickUpload({ name: 'video 1' }) | ||
44 | videoUUID = uuid | ||
45 | }) | ||
46 | |||
47 | it('Should not detect a thread as spam', async function () { | ||
48 | await servers[0].comments.createThread({ videoId: videoUUID, text: 'comment' }) | ||
49 | }) | ||
50 | |||
51 | it('Should not detect a reply as spam', async function () { | ||
52 | await servers[0].comments.addReplyToLastThread({ text: 'reply' }) | ||
53 | }) | ||
54 | |||
55 | it('Should detect a thread as spam', async function () { | ||
56 | await servers[0].comments.createThread({ | ||
57 | videoId: videoUUID, | ||
58 | text: 'akismet-guaranteed-spam', | ||
59 | expectedStatus: HttpStatusCode.FORBIDDEN_403 | ||
60 | }) | ||
61 | }) | ||
62 | |||
63 | it('Should detect a thread as spam', async function () { | ||
64 | await servers[0].comments.createThread({ videoId: videoUUID, text: 'comment' }) | ||
65 | await servers[0].comments.addReplyToLastThread({ text: 'akismet-guaranteed-spam', expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | ||
66 | }) | ||
67 | }) | ||
68 | |||
69 | describe('Remote threads/replies', function () { | ||
70 | |||
71 | before(async function () { | ||
72 | this.timeout(60000) | ||
73 | |||
74 | const { uuid } = await servers[0].videos.quickUpload({ name: 'video 1' }) | ||
75 | videoUUID = uuid | ||
76 | |||
77 | await waitJobs(servers) | ||
78 | }) | ||
79 | |||
80 | it('Should not detect a thread as spam', async function () { | ||
81 | this.timeout(30000) | ||
82 | |||
83 | await servers[1].comments.createThread({ videoId: videoUUID, text: 'remote comment 1' }) | ||
84 | await waitJobs(servers) | ||
85 | |||
86 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) | ||
87 | expect(data).to.have.lengthOf(1) | ||
88 | }) | ||
89 | |||
90 | it('Should not detect a reply as spam', async function () { | ||
91 | this.timeout(30000) | ||
92 | |||
93 | await servers[1].comments.addReplyToLastThread({ text: 'I agree with you' }) | ||
94 | await waitJobs(servers) | ||
95 | |||
96 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) | ||
97 | expect(data).to.have.lengthOf(1) | ||
98 | |||
99 | const tree = await servers[0].comments.getThread({ videoId: videoUUID, threadId: data[0].id }) | ||
100 | expect(tree.children).to.have.lengthOf(1) | ||
101 | }) | ||
102 | |||
103 | it('Should detect a thread as spam', async function () { | ||
104 | this.timeout(30000) | ||
105 | |||
106 | await servers[1].comments.createThread({ videoId: videoUUID, text: 'akismet-guaranteed-spam' }) | ||
107 | await waitJobs(servers) | ||
108 | |||
109 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) | ||
110 | expect(data).to.have.lengthOf(1) | ||
111 | }) | ||
112 | |||
113 | it('Should detect a thread as spam', async function () { | ||
114 | this.timeout(30000) | ||
115 | |||
116 | await servers[1].comments.addReplyToLastThread({ text: 'akismet-guaranteed-spam' }) | ||
117 | await waitJobs(servers) | ||
118 | |||
119 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID }) | ||
120 | expect(data).to.have.lengthOf(1) | ||
121 | |||
122 | const thread = data[0] | ||
123 | const tree = await servers[0].comments.getThread({ videoId: videoUUID, threadId: thread.id }) | ||
124 | expect(tree.children).to.have.lengthOf(1) | ||
125 | }) | ||
126 | }) | ||
127 | |||
128 | describe('Signup', function () { | ||
129 | |||
130 | before(async function () { | ||
131 | await servers[0].config.updateExistingSubConfig({ | ||
132 | newConfig: { | ||
133 | signup: { | ||
134 | enabled: true | ||
135 | } | ||
136 | } | ||
137 | }) | ||
138 | }) | ||
139 | |||
140 | it('Should allow signup', async function () { | ||
141 | await servers[0].users.register({ | ||
142 | username: 'user1', | ||
143 | displayName: 'user 1' | ||
144 | }) | ||
145 | }) | ||
146 | |||
147 | it('Should detect a signup as SPAM', async function () { | ||
148 | await servers[0].users.register({ | ||
149 | username: 'user2', | ||
150 | displayName: 'user 2', | ||
151 | email: 'akismet-guaranteed-spam@example.com', | ||
152 | expectedStatus: HttpStatusCode.FORBIDDEN_403 | ||
153 | }) | ||
154 | }) | ||
155 | }) | ||
156 | |||
157 | after(async function () { | ||
158 | await cleanupTests(servers) | ||
159 | }) | ||
160 | }) | ||
diff --git a/server/tests/external-plugins/index.ts b/server/tests/external-plugins/index.ts index 31d818b51..815bbf1da 100644 --- a/server/tests/external-plugins/index.ts +++ b/server/tests/external-plugins/index.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import './akismet' | ||
1 | import './auth-ldap' | 2 | import './auth-ldap' |
2 | import './auto-block-videos' | 3 | import './auto-block-videos' |
3 | import './auto-mute' | 4 | import './auto-mute' |
diff --git a/server/tests/fixtures/peertube-plugin-test/main.js b/server/tests/fixtures/peertube-plugin-test/main.js index 813482a27..19dccf26e 100644 --- a/server/tests/fixtures/peertube-plugin-test/main.js +++ b/server/tests/fixtures/peertube-plugin-test/main.js | |||
@@ -178,6 +178,8 @@ async function register ({ registerHook, registerSetting, settingsManager, stora | |||
178 | } | 178 | } |
179 | }) | 179 | }) |
180 | 180 | ||
181 | // --------------------------------------------------------------------------- | ||
182 | |||
181 | registerHook({ | 183 | registerHook({ |
182 | target: 'filter:api.video-thread.create.accept.result', | 184 | target: 'filter:api.video-thread.create.accept.result', |
183 | handler: ({ accepted }, { commentBody }) => checkCommentBadWord(accepted, commentBody) | 185 | handler: ({ accepted }, { commentBody }) => checkCommentBadWord(accepted, commentBody) |
@@ -189,6 +191,13 @@ async function register ({ registerHook, registerSetting, settingsManager, stora | |||
189 | }) | 191 | }) |
190 | 192 | ||
191 | registerHook({ | 193 | registerHook({ |
194 | target: 'filter:activity-pub.remote-video-comment.create.accept.result', | ||
195 | handler: ({ accepted }, { comment }) => checkCommentBadWord(accepted, comment) | ||
196 | }) | ||
197 | |||
198 | // --------------------------------------------------------------------------- | ||
199 | |||
200 | registerHook({ | ||
192 | target: 'filter:api.video-threads.list.params', | 201 | target: 'filter:api.video-threads.list.params', |
193 | handler: obj => addToCount(obj) | 202 | handler: obj => addToCount(obj) |
194 | }) | 203 | }) |
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index 026c7e856..ae4b3cf5f 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts | |||
@@ -64,232 +64,289 @@ describe('Test plugin filter hooks', function () { | |||
64 | }) | 64 | }) |
65 | }) | 65 | }) |
66 | 66 | ||
67 | it('Should run filter:api.videos.list.params', async function () { | 67 | describe('Videos', function () { |
68 | const { data } = await servers[0].videos.list({ start: 0, count: 2 }) | ||
69 | 68 | ||
70 | // 2 plugins do +1 to the count parameter | 69 | it('Should run filter:api.videos.list.params', async function () { |
71 | expect(data).to.have.lengthOf(4) | 70 | const { data } = await servers[0].videos.list({ start: 0, count: 2 }) |
72 | }) | ||
73 | 71 | ||
74 | it('Should run filter:api.videos.list.result', async function () { | 72 | // 2 plugins do +1 to the count parameter |
75 | const { total } = await servers[0].videos.list({ start: 0, count: 0 }) | 73 | expect(data).to.have.lengthOf(4) |
74 | }) | ||
76 | 75 | ||
77 | // Plugin do +1 to the total result | 76 | it('Should run filter:api.videos.list.result', async function () { |
78 | expect(total).to.equal(11) | 77 | const { total } = await servers[0].videos.list({ start: 0, count: 0 }) |
79 | }) | ||
80 | 78 | ||
81 | it('Should run filter:api.video-playlist.videos.list.params', async function () { | 79 | // Plugin do +1 to the total result |
82 | const { data } = await servers[0].playlists.listVideos({ | 80 | expect(total).to.equal(11) |
83 | count: 2, | ||
84 | playlistId: videoPlaylistUUID | ||
85 | }) | 81 | }) |
86 | 82 | ||
87 | // 1 plugin do +1 to the count parameter | 83 | it('Should run filter:api.video-playlist.videos.list.params', async function () { |
88 | expect(data).to.have.lengthOf(3) | 84 | const { data } = await servers[0].playlists.listVideos({ |
89 | }) | 85 | count: 2, |
86 | playlistId: videoPlaylistUUID | ||
87 | }) | ||
90 | 88 | ||
91 | it('Should run filter:api.video-playlist.videos.list.result', async function () { | 89 | // 1 plugin do +1 to the count parameter |
92 | const { total } = await servers[0].playlists.listVideos({ | 90 | expect(data).to.have.lengthOf(3) |
93 | count: 0, | ||
94 | playlistId: videoPlaylistUUID | ||
95 | }) | 91 | }) |
96 | 92 | ||
97 | // Plugin do +1 to the total result | 93 | it('Should run filter:api.video-playlist.videos.list.result', async function () { |
98 | expect(total).to.equal(11) | 94 | const { total } = await servers[0].playlists.listVideos({ |
99 | }) | 95 | count: 0, |
96 | playlistId: videoPlaylistUUID | ||
97 | }) | ||
100 | 98 | ||
101 | it('Should run filter:api.accounts.videos.list.params', async function () { | 99 | // Plugin do +1 to the total result |
102 | const { data } = await servers[0].videos.listByAccount({ handle: 'root', start: 0, count: 2 }) | 100 | expect(total).to.equal(11) |
101 | }) | ||
103 | 102 | ||
104 | // 1 plugin do +1 to the count parameter | 103 | it('Should run filter:api.accounts.videos.list.params', async function () { |
105 | expect(data).to.have.lengthOf(3) | 104 | const { data } = await servers[0].videos.listByAccount({ handle: 'root', start: 0, count: 2 }) |
106 | }) | ||
107 | 105 | ||
108 | it('Should run filter:api.accounts.videos.list.result', async function () { | 106 | // 1 plugin do +1 to the count parameter |
109 | const { total } = await servers[0].videos.listByAccount({ handle: 'root', start: 0, count: 2 }) | 107 | expect(data).to.have.lengthOf(3) |
108 | }) | ||
110 | 109 | ||
111 | // Plugin do +2 to the total result | 110 | it('Should run filter:api.accounts.videos.list.result', async function () { |
112 | expect(total).to.equal(12) | 111 | const { total } = await servers[0].videos.listByAccount({ handle: 'root', start: 0, count: 2 }) |
113 | }) | ||
114 | 112 | ||
115 | it('Should run filter:api.video-channels.videos.list.params', async function () { | 113 | // Plugin do +2 to the total result |
116 | const { data } = await servers[0].videos.listByChannel({ handle: 'root_channel', start: 0, count: 2 }) | 114 | expect(total).to.equal(12) |
115 | }) | ||
117 | 116 | ||
118 | // 1 plugin do +3 to the count parameter | 117 | it('Should run filter:api.video-channels.videos.list.params', async function () { |
119 | expect(data).to.have.lengthOf(5) | 118 | const { data } = await servers[0].videos.listByChannel({ handle: 'root_channel', start: 0, count: 2 }) |
120 | }) | ||
121 | 119 | ||
122 | it('Should run filter:api.video-channels.videos.list.result', async function () { | 120 | // 1 plugin do +3 to the count parameter |
123 | const { total } = await servers[0].videos.listByChannel({ handle: 'root_channel', start: 0, count: 2 }) | 121 | expect(data).to.have.lengthOf(5) |
122 | }) | ||
124 | 123 | ||
125 | // Plugin do +3 to the total result | 124 | it('Should run filter:api.video-channels.videos.list.result', async function () { |
126 | expect(total).to.equal(13) | 125 | const { total } = await servers[0].videos.listByChannel({ handle: 'root_channel', start: 0, count: 2 }) |
127 | }) | ||
128 | 126 | ||
129 | it('Should run filter:api.user.me.videos.list.params', async function () { | 127 | // Plugin do +3 to the total result |
130 | const { data } = await servers[0].videos.listMyVideos({ start: 0, count: 2 }) | 128 | expect(total).to.equal(13) |
129 | }) | ||
131 | 130 | ||
132 | // 1 plugin do +4 to the count parameter | 131 | it('Should run filter:api.user.me.videos.list.params', async function () { |
133 | expect(data).to.have.lengthOf(6) | 132 | const { data } = await servers[0].videos.listMyVideos({ start: 0, count: 2 }) |
134 | }) | ||
135 | 133 | ||
136 | it('Should run filter:api.user.me.videos.list.result', async function () { | 134 | // 1 plugin do +4 to the count parameter |
137 | const { total } = await servers[0].videos.listMyVideos({ start: 0, count: 2 }) | 135 | expect(data).to.have.lengthOf(6) |
136 | }) | ||
138 | 137 | ||
139 | // Plugin do +4 to the total result | 138 | it('Should run filter:api.user.me.videos.list.result', async function () { |
140 | expect(total).to.equal(14) | 139 | const { total } = await servers[0].videos.listMyVideos({ start: 0, count: 2 }) |
141 | }) | ||
142 | 140 | ||
143 | it('Should run filter:api.video.get.result', async function () { | 141 | // Plugin do +4 to the total result |
144 | const video = await servers[0].videos.get({ id: videoUUID }) | 142 | expect(total).to.equal(14) |
145 | expect(video.name).to.contain('<3') | 143 | }) |
146 | }) | ||
147 | 144 | ||
148 | it('Should run filter:api.video.upload.accept.result', async function () { | 145 | it('Should run filter:api.video.get.result', async function () { |
149 | await servers[0].videos.upload({ attributes: { name: 'video with bad word' }, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | 146 | const video = await servers[0].videos.get({ id: videoUUID }) |
147 | expect(video.name).to.contain('<3') | ||
148 | }) | ||
150 | }) | 149 | }) |
151 | 150 | ||
152 | it('Should run filter:api.live-video.create.accept.result', async function () { | 151 | describe('Video/live/import accept', function () { |
153 | const attributes = { | ||
154 | name: 'video with bad word', | ||
155 | privacy: VideoPrivacy.PUBLIC, | ||
156 | channelId: servers[0].store.channel.id | ||
157 | } | ||
158 | 152 | ||
159 | await servers[0].live.create({ fields: attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | 153 | it('Should run filter:api.video.upload.accept.result', async function () { |
160 | }) | 154 | await servers[0].videos.upload({ attributes: { name: 'video with bad word' }, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
161 | 155 | }) | |
162 | it('Should run filter:api.video.pre-import-url.accept.result', async function () { | ||
163 | const attributes = { | ||
164 | name: 'normal title', | ||
165 | privacy: VideoPrivacy.PUBLIC, | ||
166 | channelId: servers[0].store.channel.id, | ||
167 | targetUrl: FIXTURE_URLS.goodVideo + 'bad' | ||
168 | } | ||
169 | await servers[0].imports.importVideo({ attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | ||
170 | }) | ||
171 | 156 | ||
172 | it('Should run filter:api.video.pre-import-torrent.accept.result', async function () { | 157 | it('Should run filter:api.live-video.create.accept.result', async function () { |
173 | const attributes = { | 158 | const attributes = { |
174 | name: 'bad torrent', | 159 | name: 'video with bad word', |
175 | privacy: VideoPrivacy.PUBLIC, | 160 | privacy: VideoPrivacy.PUBLIC, |
176 | channelId: servers[0].store.channel.id, | 161 | channelId: servers[0].store.channel.id |
177 | torrentfile: 'video-720p.torrent' as any | 162 | } |
178 | } | ||
179 | await servers[0].imports.importVideo({ attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | ||
180 | }) | ||
181 | 163 | ||
182 | it('Should run filter:api.video.post-import-url.accept.result', async function () { | 164 | await servers[0].live.create({ fields: attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
183 | this.timeout(60000) | 165 | }) |
184 | 166 | ||
185 | let videoImportId: number | 167 | it('Should run filter:api.video.pre-import-url.accept.result', async function () { |
168 | const attributes = { | ||
169 | name: 'normal title', | ||
170 | privacy: VideoPrivacy.PUBLIC, | ||
171 | channelId: servers[0].store.channel.id, | ||
172 | targetUrl: FIXTURE_URLS.goodVideo + 'bad' | ||
173 | } | ||
174 | await servers[0].imports.importVideo({ attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | ||
175 | }) | ||
186 | 176 | ||
187 | { | 177 | it('Should run filter:api.video.pre-import-torrent.accept.result', async function () { |
188 | const attributes = { | 178 | const attributes = { |
189 | name: 'title with bad word', | 179 | name: 'bad torrent', |
190 | privacy: VideoPrivacy.PUBLIC, | 180 | privacy: VideoPrivacy.PUBLIC, |
191 | channelId: servers[0].store.channel.id, | 181 | channelId: servers[0].store.channel.id, |
192 | targetUrl: FIXTURE_URLS.goodVideo | 182 | torrentfile: 'video-720p.torrent' as any |
193 | } | 183 | } |
194 | const body = await servers[0].imports.importVideo({ attributes }) | 184 | await servers[0].imports.importVideo({ attributes, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
195 | videoImportId = body.id | 185 | }) |
196 | } | ||
197 | 186 | ||
198 | await waitJobs(servers) | 187 | it('Should run filter:api.video.post-import-url.accept.result', async function () { |
188 | this.timeout(60000) | ||
199 | 189 | ||
200 | { | 190 | let videoImportId: number |
201 | const body = await servers[0].imports.getMyVideoImports() | ||
202 | const videoImports = body.data | ||
203 | 191 | ||
204 | const videoImport = videoImports.find(i => i.id === videoImportId) | 192 | { |
193 | const attributes = { | ||
194 | name: 'title with bad word', | ||
195 | privacy: VideoPrivacy.PUBLIC, | ||
196 | channelId: servers[0].store.channel.id, | ||
197 | targetUrl: FIXTURE_URLS.goodVideo | ||
198 | } | ||
199 | const body = await servers[0].imports.importVideo({ attributes }) | ||
200 | videoImportId = body.id | ||
201 | } | ||
205 | 202 | ||
206 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) | 203 | await waitJobs(servers) |
207 | expect(videoImport.state.label).to.equal('Rejected') | ||
208 | } | ||
209 | }) | ||
210 | 204 | ||
211 | it('Should run filter:api.video.post-import-torrent.accept.result', async function () { | 205 | { |
212 | this.timeout(60000) | 206 | const body = await servers[0].imports.getMyVideoImports() |
207 | const videoImports = body.data | ||
213 | 208 | ||
214 | let videoImportId: number | 209 | const videoImport = videoImports.find(i => i.id === videoImportId) |
215 | 210 | ||
216 | { | 211 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) |
217 | const attributes = { | 212 | expect(videoImport.state.label).to.equal('Rejected') |
218 | name: 'title with bad word', | ||
219 | privacy: VideoPrivacy.PUBLIC, | ||
220 | channelId: servers[0].store.channel.id, | ||
221 | torrentfile: 'video-720p.torrent' as any | ||
222 | } | 213 | } |
223 | const body = await servers[0].imports.importVideo({ attributes }) | 214 | }) |
224 | videoImportId = body.id | ||
225 | } | ||
226 | 215 | ||
227 | await waitJobs(servers) | 216 | it('Should run filter:api.video.post-import-torrent.accept.result', async function () { |
217 | this.timeout(60000) | ||
228 | 218 | ||
229 | { | 219 | let videoImportId: number |
230 | const { data: videoImports } = await servers[0].imports.getMyVideoImports() | ||
231 | 220 | ||
232 | const videoImport = videoImports.find(i => i.id === videoImportId) | 221 | { |
222 | const attributes = { | ||
223 | name: 'title with bad word', | ||
224 | privacy: VideoPrivacy.PUBLIC, | ||
225 | channelId: servers[0].store.channel.id, | ||
226 | torrentfile: 'video-720p.torrent' as any | ||
227 | } | ||
228 | const body = await servers[0].imports.importVideo({ attributes }) | ||
229 | videoImportId = body.id | ||
230 | } | ||
233 | 231 | ||
234 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) | 232 | await waitJobs(servers) |
235 | expect(videoImport.state.label).to.equal('Rejected') | 233 | |
236 | } | 234 | { |
237 | }) | 235 | const { data: videoImports } = await servers[0].imports.getMyVideoImports() |
236 | |||
237 | const videoImport = videoImports.find(i => i.id === videoImportId) | ||
238 | 238 | ||
239 | it('Should run filter:api.video-thread.create.accept.result', async function () { | 239 | expect(videoImport.state.id).to.equal(VideoImportState.REJECTED) |
240 | await servers[0].comments.createThread({ | 240 | expect(videoImport.state.label).to.equal('Rejected') |
241 | videoId: videoUUID, | 241 | } |
242 | text: 'comment with bad word', | ||
243 | expectedStatus: HttpStatusCode.FORBIDDEN_403 | ||
244 | }) | 242 | }) |
245 | }) | 243 | }) |
246 | 244 | ||
247 | it('Should run filter:api.video-comment-reply.create.accept.result', async function () { | 245 | describe('Video comments accept', function () { |
248 | const created = await servers[0].comments.createThread({ videoId: videoUUID, text: 'thread' }) | ||
249 | threadId = created.id | ||
250 | 246 | ||
251 | await servers[0].comments.addReply({ | 247 | it('Should run filter:api.video-thread.create.accept.result', async function () { |
252 | videoId: videoUUID, | 248 | await servers[0].comments.createThread({ |
253 | toCommentId: threadId, | 249 | videoId: videoUUID, |
254 | text: 'comment with bad word', | 250 | text: 'comment with bad word', |
255 | expectedStatus: HttpStatusCode.FORBIDDEN_403 | 251 | expectedStatus: HttpStatusCode.FORBIDDEN_403 |
252 | }) | ||
256 | }) | 253 | }) |
257 | await servers[0].comments.addReply({ | 254 | |
258 | videoId: videoUUID, | 255 | it('Should run filter:api.video-comment-reply.create.accept.result', async function () { |
259 | toCommentId: threadId, | 256 | const created = await servers[0].comments.createThread({ videoId: videoUUID, text: 'thread' }) |
260 | text: 'comment with good word', | 257 | threadId = created.id |
261 | expectedStatus: HttpStatusCode.OK_200 | 258 | |
259 | await servers[0].comments.addReply({ | ||
260 | videoId: videoUUID, | ||
261 | toCommentId: threadId, | ||
262 | text: 'comment with bad word', | ||
263 | expectedStatus: HttpStatusCode.FORBIDDEN_403 | ||
264 | }) | ||
265 | await servers[0].comments.addReply({ | ||
266 | videoId: videoUUID, | ||
267 | toCommentId: threadId, | ||
268 | text: 'comment with good word', | ||
269 | expectedStatus: HttpStatusCode.OK_200 | ||
270 | }) | ||
262 | }) | 271 | }) |
263 | }) | ||
264 | 272 | ||
265 | it('Should run filter:api.video-threads.list.params', async function () { | 273 | it('Should run filter:activity-pub.remote-video-comment.create.accept.result on a thread creation', async function () { |
266 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID, start: 0, count: 0 }) | 274 | this.timeout(30000) |
267 | 275 | ||
268 | // our plugin do +1 to the count parameter | 276 | await servers[1].comments.createThread({ videoId: videoUUID, text: 'comment with bad word' }) |
269 | expect(data).to.have.lengthOf(1) | ||
270 | }) | ||
271 | 277 | ||
272 | it('Should run filter:api.video-threads.list.result', async function () { | 278 | await waitJobs(servers) |
273 | const { total } = await servers[0].comments.listThreads({ videoId: videoUUID, start: 0, count: 0 }) | ||
274 | 279 | ||
275 | // Plugin do +1 to the total result | 280 | { |
276 | expect(total).to.equal(2) | 281 | const thread = await servers[0].comments.listThreads({ videoId: videoUUID }) |
277 | }) | 282 | expect(thread.data).to.have.lengthOf(1) |
283 | expect(thread.data[0].text).to.not.include(' bad ') | ||
284 | } | ||
285 | |||
286 | { | ||
287 | const thread = await servers[1].comments.listThreads({ videoId: videoUUID }) | ||
288 | expect(thread.data).to.have.lengthOf(2) | ||
289 | } | ||
290 | }) | ||
278 | 291 | ||
279 | it('Should run filter:api.video-thread-comments.list.params') | 292 | it('Should run filter:activity-pub.remote-video-comment.create.accept.result on a reply creation', async function () { |
293 | this.timeout(30000) | ||
280 | 294 | ||
281 | it('Should run filter:api.video-thread-comments.list.result', async function () { | 295 | const { data } = await servers[1].comments.listThreads({ videoId: videoUUID }) |
282 | const thread = await servers[0].comments.getThread({ videoId: videoUUID, threadId }) | 296 | const threadIdServer2 = data.find(t => t.text === 'thread').id |
283 | 297 | ||
284 | expect(thread.comment.text.endsWith(' <3')).to.be.true | 298 | await servers[1].comments.addReply({ |
299 | videoId: videoUUID, | ||
300 | toCommentId: threadIdServer2, | ||
301 | text: 'comment with bad word' | ||
302 | }) | ||
303 | |||
304 | await waitJobs(servers) | ||
305 | |||
306 | { | ||
307 | const tree = await servers[0].comments.getThread({ videoId: videoUUID, threadId }) | ||
308 | expect(tree.children).to.have.lengthOf(1) | ||
309 | expect(tree.children[0].comment.text).to.not.include(' bad ') | ||
310 | } | ||
311 | |||
312 | { | ||
313 | const tree = await servers[1].comments.getThread({ videoId: videoUUID, threadId: threadIdServer2 }) | ||
314 | expect(tree.children).to.have.lengthOf(2) | ||
315 | } | ||
316 | }) | ||
285 | }) | 317 | }) |
286 | 318 | ||
287 | it('Should run filter:api.overviews.videos.list.{params,result}', async function () { | 319 | describe('Video comments', function () { |
288 | await servers[0].overviews.getVideos({ page: 1 }) | 320 | |
321 | it('Should run filter:api.video-threads.list.params', async function () { | ||
322 | const { data } = await servers[0].comments.listThreads({ videoId: videoUUID, start: 0, count: 0 }) | ||
323 | |||
324 | // our plugin do +1 to the count parameter | ||
325 | expect(data).to.have.lengthOf(1) | ||
326 | }) | ||
289 | 327 | ||
290 | // 3 because we get 3 samples per page | 328 | it('Should run filter:api.video-threads.list.result', async function () { |
291 | await servers[0].servers.waitUntilLog('Run hook filter:api.overviews.videos.list.params', 3) | 329 | const { total } = await servers[0].comments.listThreads({ videoId: videoUUID, start: 0, count: 0 }) |
292 | await servers[0].servers.waitUntilLog('Run hook filter:api.overviews.videos.list.result', 3) | 330 | |
331 | // Plugin do +1 to the total result | ||
332 | expect(total).to.equal(2) | ||
333 | }) | ||
334 | |||
335 | it('Should run filter:api.video-thread-comments.list.params') | ||
336 | |||
337 | it('Should run filter:api.video-thread-comments.list.result', async function () { | ||
338 | const thread = await servers[0].comments.getThread({ videoId: videoUUID, threadId }) | ||
339 | |||
340 | expect(thread.comment.text.endsWith(' <3')).to.be.true | ||
341 | }) | ||
342 | |||
343 | it('Should run filter:api.overviews.videos.list.{params,result}', async function () { | ||
344 | await servers[0].overviews.getVideos({ page: 1 }) | ||
345 | |||
346 | // 3 because we get 3 samples per page | ||
347 | await servers[0].servers.waitUntilLog('Run hook filter:api.overviews.videos.list.params', 3) | ||
348 | await servers[0].servers.waitUntilLog('Run hook filter:api.overviews.videos.list.result', 3) | ||
349 | }) | ||
293 | }) | 350 | }) |
294 | 351 | ||
295 | describe('filter:video.auto-blacklist.result', function () { | 352 | describe('filter:video.auto-blacklist.result', function () { |