From 0283eaac2a8e73006c66df3cf5bb9012e37450e5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 20 Aug 2019 13:52:49 +0200 Subject: Cleanup model types --- server/controllers/api/search.ts | 4 ++-- server/controllers/api/videos/import.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server/controllers/api') 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 import { logger } from '../../helpers/logger' import { VideoChannelModel } from '../../models/video/video-channel' import { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger' -import { MChannelAccountDefault, MVideoAccountAllFiles } from '../../typings/models' +import { MChannelAccountDefault, MVideoAccountLightBlacklistAllFiles } from '../../typings/models' const searchRouter = express.Router() @@ -138,7 +138,7 @@ async function searchVideosDB (query: VideosSearchQuery, res: express.Response) } async function searchVideoURI (url: string, res: express.Response) { - let video: MVideoAccountAllFiles + let video: MVideoAccountLightBlacklistAllFiles // Check if we can fetch a remote video with the URL 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' import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' import { - MChannelActorAccountDefault, + MChannelAccountDefault, MThumbnail, MUser, MVideoTag, @@ -234,7 +234,7 @@ function insertIntoDB (parameters: { video: MVideoThumbnailAccountDefault, thumbnailModel: MThumbnail, previewModel: MThumbnail, - videoChannel: MChannelActorAccountDefault, + videoChannel: MChannelAccountDefault, tags: string[], videoImportAttributes: Partial, user: MUser -- cgit v1.2.3