-import { FunctionProperties, PickWith, PickWithOpt } from '@shared/core-utils'
+import { FunctionProperties, PickWith, PickWithOpt } from '@shared/typescript-utils'
import { VideoChannelModel } from '../../../models/video/video-channel'
import {
MAccountActor,
MAccountSummaryBlocks,
MAccountSummaryFormattable,
MAccountUrl,
- MAccountUserId,
+ MAccountUserId
+} from '../account'
+import {
MActor,
MActorAccountChannelId,
MActorAPChannel,
MActorSummary,
MActorSummaryFormattable,
MActorUrl
-} from '../account'
+} from '../actor'
import { MVideo } from './video'
type Use<K extends keyof VideoChannelModel, M> = PickWith<VideoChannelModel, K, M>