+import { FunctionProperties, PickWith } from '@shared/core-utils'
import { AccountModel } from '../../../models/account/account'
import {
MActor,
- MActorAP,
+ MActorAPAccount,
MActorAPI,
MActorAudience,
MActorDefault,
MActorSummary,
MActorSummaryFormattable,
MActorUrl
-} from './actor'
-import { FunctionProperties, PickWith } from '@shared/core-utils'
-import { MAccountBlocklistId } from './account-blocklist'
+} from '../actor'
import { MChannelDefault } from '../video/video-channels'
+import { MAccountBlocklistId } from './account-blocklist'
type Use<K extends keyof AccountModel, M> = PickWith<AccountModel, K, M>
export type MAccountAP =
Pick<MAccount, 'name' | 'description'> &
- Use<'Actor', MActorAP>
+ Use<'Actor', MActorAPAccount>