diff options
author | Chocobozzz <me@florianbigard.com> | 2019-08-20 13:52:49 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-08-20 14:53:42 +0200 |
commit | 0283eaac2a8e73006c66df3cf5bb9012e37450e5 (patch) | |
tree | 1fb73aeef57f984a77f47828ade23c6365ce8eb0 /server/controllers/api | |
parent | 96ca24f00e5ae5471dee9ee596489fe50af2b46f (diff) | |
download | PeerTube-0283eaac2a8e73006c66df3cf5bb9012e37450e5.tar.gz PeerTube-0283eaac2a8e73006c66df3cf5bb9012e37450e5.tar.zst PeerTube-0283eaac2a8e73006c66df3cf5bb9012e37450e5.zip |
Cleanup model types
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/search.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/videos/import.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/controllers/api/search.ts b/server/controllers/api/search.ts index 7fef7c173..349650aca 100644 --- a/server/controllers/api/search.ts +++ b/server/controllers/api/search.ts | |||
@@ -19,7 +19,7 @@ import { getOrCreateActorAndServerAndModel, getOrCreateVideoAndAccountAndChannel | |||
19 | import { logger } from '../../helpers/logger' | 19 | import { logger } from '../../helpers/logger' |
20 | import { VideoChannelModel } from '../../models/video/video-channel' | 20 | import { VideoChannelModel } from '../../models/video/video-channel' |
21 | import { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger' | 21 | import { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger' |
22 | import { MChannelAccountDefault, MVideoAccountAllFiles } from '../../typings/models' | 22 | import { MChannelAccountDefault, MVideoAccountLightBlacklistAllFiles } from '../../typings/models' |
23 | 23 | ||
24 | const searchRouter = express.Router() | 24 | const searchRouter = express.Router() |
25 | 25 | ||
@@ -138,7 +138,7 @@ async function searchVideosDB (query: VideosSearchQuery, res: express.Response) | |||
138 | } | 138 | } |
139 | 139 | ||
140 | async function searchVideoURI (url: string, res: express.Response) { | 140 | async function searchVideoURI (url: string, res: express.Response) { |
141 | let video: MVideoAccountAllFiles | 141 | let video: MVideoAccountLightBlacklistAllFiles |
142 | 142 | ||
143 | // Check if we can fetch a remote video with the URL | 143 | // Check if we can fetch a remote video with the URL |
144 | if (isUserAbleToSearchRemoteURI(res)) { | 144 | if (isUserAbleToSearchRemoteURI(res)) { |
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index a058b37ef..e7adcc35a 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts | |||
@@ -25,7 +25,7 @@ import { sequelizeTypescript } from '../../../initializers/database' | |||
25 | import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' | 25 | import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' |
26 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' | 26 | import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' |
27 | import { | 27 | import { |
28 | MChannelActorAccountDefault, | 28 | MChannelAccountDefault, |
29 | MThumbnail, | 29 | MThumbnail, |
30 | MUser, | 30 | MUser, |
31 | MVideoTag, | 31 | MVideoTag, |
@@ -234,7 +234,7 @@ function insertIntoDB (parameters: { | |||
234 | video: MVideoThumbnailAccountDefault, | 234 | video: MVideoThumbnailAccountDefault, |
235 | thumbnailModel: MThumbnail, | 235 | thumbnailModel: MThumbnail, |
236 | previewModel: MThumbnail, | 236 | previewModel: MThumbnail, |
237 | videoChannel: MChannelActorAccountDefault, | 237 | videoChannel: MChannelAccountDefault, |
238 | tags: string[], | 238 | tags: string[], |
239 | videoImportAttributes: Partial<MVideoImport>, | 239 | videoImportAttributes: Partial<MVideoImport>, |
240 | user: MUser | 240 | user: MUser |