aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/typings/models/user/user-notification.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/typings/models/user/user-notification.ts')
-rw-r--r--server/typings/models/user/user-notification.ts11
1 files changed, 6 insertions, 5 deletions
diff --git a/server/typings/models/user/user-notification.ts b/server/typings/models/user/user-notification.ts
index f9daf5eb2..1cdc691b0 100644
--- a/server/typings/models/user/user-notification.ts
+++ b/server/typings/models/user/user-notification.ts
@@ -1,5 +1,5 @@
1import { UserNotificationModel } from '../../../models/account/user-notification' 1import { UserNotificationModel } from '../../../models/account/user-notification'
2import { PickWith } from '../../utils' 2import { PickWith, PickWithOpt } from '../../utils'
3import { VideoModel } from '../../../models/video/video' 3import { VideoModel } from '../../../models/video/video'
4import { ActorModel } from '../../../models/activitypub/actor' 4import { ActorModel } from '../../../models/activitypub/actor'
5import { ServerModel } from '../../../models/server/server' 5import { ServerModel } from '../../../models/server/server'
@@ -48,12 +48,13 @@ export namespace UserNotificationIncludes {
48 48
49 export type ActorFollower = Pick<ActorModel, 'preferredUsername' | 'getHost'> & 49 export type ActorFollower = Pick<ActorModel, 'preferredUsername' | 'getHost'> &
50 PickWith<ActorModel, 'Account', AccountInclude> & 50 PickWith<ActorModel, 'Account', AccountInclude> &
51 PickWith<ActorModel, 'Avatar', Pick<AvatarModel, 'filename' | 'getStaticPath'>> & 51 PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>> &
52 PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>> 52 PickWithOpt<ActorModel, 'Avatar', Pick<AvatarModel, 'filename' | 'getStaticPath'>>
53 53
54 export type ActorFollowing = Pick<ActorModel, 'preferredUsername'> & 54 export type ActorFollowing = Pick<ActorModel, 'preferredUsername' | 'type' | 'getHost'> &
55 PickWith<ActorModel, 'VideoChannel', VideoChannelInclude> & 55 PickWith<ActorModel, 'VideoChannel', VideoChannelInclude> &
56 PickWith<ActorModel, 'Account', AccountInclude> 56 PickWith<ActorModel, 'Account', AccountInclude> &
57 PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>>
57 58
58 export type ActorFollowInclude = Pick<ActorFollowModel, 'id' | 'state'> & 59 export type ActorFollowInclude = Pick<ActorFollowModel, 'id' | 'state'> &
59 PickWith<ActorFollowModel, 'ActorFollower', ActorFollower> & 60 PickWith<ActorFollowModel, 'ActorFollower', ActorFollower> &