diff options
Diffstat (limited to 'shared/server-commands')
-rw-r--r-- | shared/server-commands/server/server.ts | 3 | ||||
-rw-r--r-- | shared/server-commands/videos/channels-command.ts | 10 | ||||
-rw-r--r-- | shared/server-commands/videos/imports-command.ts | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts index 7acbc978f..c05d16ad2 100644 --- a/shared/server-commands/server/server.ts +++ b/shared/server-commands/server/server.ts | |||
@@ -2,7 +2,7 @@ import { ChildProcess, fork } from 'child_process' | |||
2 | import { copy } from 'fs-extra' | 2 | import { copy } from 'fs-extra' |
3 | import { join } from 'path' | 3 | import { join } from 'path' |
4 | import { parallelTests, randomInt, root } from '@shared/core-utils' | 4 | import { parallelTests, randomInt, root } from '@shared/core-utils' |
5 | import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '@shared/models' | 5 | import { Video, VideoChannel, VideoChannelSync, VideoCreateResult, VideoDetails } from '@shared/models' |
6 | import { BulkCommand } from '../bulk' | 6 | import { BulkCommand } from '../bulk' |
7 | import { CLICommand } from '../cli' | 7 | import { CLICommand } from '../cli' |
8 | import { CustomPagesCommand } from '../custom-pages' | 8 | import { CustomPagesCommand } from '../custom-pages' |
@@ -80,6 +80,7 @@ export class PeerTubeServer { | |||
80 | } | 80 | } |
81 | 81 | ||
82 | channel?: VideoChannel | 82 | channel?: VideoChannel |
83 | videoChannelSync?: Partial<VideoChannelSync> | ||
83 | 84 | ||
84 | video?: Video | 85 | video?: Video |
85 | videoCreated?: VideoCreateResult | 86 | videoCreated?: VideoCreateResult |
diff --git a/shared/server-commands/videos/channels-command.ts b/shared/server-commands/videos/channels-command.ts index a688a120f..385d0fe73 100644 --- a/shared/server-commands/videos/channels-command.ts +++ b/shared/server-commands/videos/channels-command.ts | |||
@@ -6,7 +6,8 @@ import { | |||
6 | VideoChannel, | 6 | VideoChannel, |
7 | VideoChannelCreate, | 7 | VideoChannelCreate, |
8 | VideoChannelCreateResult, | 8 | VideoChannelCreateResult, |
9 | VideoChannelUpdate | 9 | VideoChannelUpdate, |
10 | VideosImportInChannelCreate | ||
10 | } from '@shared/models' | 11 | } from '@shared/models' |
11 | import { unwrapBody } from '../requests' | 12 | import { unwrapBody } from '../requests' |
12 | import { AbstractCommand, OverrideCommandOptions } from '../shared' | 13 | import { AbstractCommand, OverrideCommandOptions } from '../shared' |
@@ -182,11 +183,10 @@ export class ChannelsCommand extends AbstractCommand { | |||
182 | }) | 183 | }) |
183 | } | 184 | } |
184 | 185 | ||
185 | importVideos (options: OverrideCommandOptions & { | 186 | importVideos (options: OverrideCommandOptions & VideosImportInChannelCreate & { |
186 | channelName: string | 187 | channelName: string |
187 | externalChannelUrl: string | ||
188 | }) { | 188 | }) { |
189 | const { channelName, externalChannelUrl } = options | 189 | const { channelName, externalChannelUrl, videoChannelSyncId } = options |
190 | 190 | ||
191 | const path = `/api/v1/video-channels/${channelName}/import-videos` | 191 | const path = `/api/v1/video-channels/${channelName}/import-videos` |
192 | 192 | ||
@@ -194,7 +194,7 @@ export class ChannelsCommand extends AbstractCommand { | |||
194 | ...options, | 194 | ...options, |
195 | 195 | ||
196 | path, | 196 | path, |
197 | fields: { externalChannelUrl }, | 197 | fields: { externalChannelUrl, videoChannelSyncId }, |
198 | implicitToken: true, | 198 | implicitToken: true, |
199 | defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 | 199 | defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 |
200 | }) | 200 | }) |
diff --git a/shared/server-commands/videos/imports-command.ts b/shared/server-commands/videos/imports-command.ts index c931ac481..07d810ec1 100644 --- a/shared/server-commands/videos/imports-command.ts +++ b/shared/server-commands/videos/imports-command.ts | |||
@@ -57,15 +57,17 @@ export class ImportsCommand extends AbstractCommand { | |||
57 | getMyVideoImports (options: OverrideCommandOptions & { | 57 | getMyVideoImports (options: OverrideCommandOptions & { |
58 | sort?: string | 58 | sort?: string |
59 | targetUrl?: string | 59 | targetUrl?: string |
60 | videoChannelSyncId?: number | ||
61 | search?: string | ||
60 | } = {}) { | 62 | } = {}) { |
61 | const { sort, targetUrl } = options | 63 | const { sort, targetUrl, videoChannelSyncId, search } = options |
62 | const path = '/api/v1/users/me/videos/imports' | 64 | const path = '/api/v1/users/me/videos/imports' |
63 | 65 | ||
64 | return this.getRequestBody<ResultList<VideoImport>>({ | 66 | return this.getRequestBody<ResultList<VideoImport>>({ |
65 | ...options, | 67 | ...options, |
66 | 68 | ||
67 | path, | 69 | path, |
68 | query: { sort, targetUrl }, | 70 | query: { sort, targetUrl, videoChannelSyncId, search }, |
69 | implicitToken: true, | 71 | implicitToken: true, |
70 | defaultExpectedStatus: HttpStatusCode.OK_200 | 72 | defaultExpectedStatus: HttpStatusCode.OK_200 |
71 | }) | 73 | }) |