diff options
author | Chocobozzz <me@florianbigard.com> | 2019-08-30 16:50:12 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-09-04 16:24:58 +0200 |
commit | 8424c4026afd7304880a4ce8138a04ffb3d8c938 (patch) | |
tree | 5b42625a59307b03333aa7d293b40b4c90da8f73 /server/typings/models/user | |
parent | f69ec5f340638ef577e8f5b9b1fb844778656a1f (diff) | |
download | PeerTube-8424c4026afd7304880a4ce8138a04ffb3d8c938.tar.gz PeerTube-8424c4026afd7304880a4ce8138a04ffb3d8c938.tar.zst PeerTube-8424c4026afd7304880a4ce8138a04ffb3d8c938.zip |
Add auto follow back support for instances
Diffstat (limited to 'server/typings/models/user')
-rw-r--r-- | server/typings/models/user/user-notification.ts | 11 |
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 @@ | |||
1 | import { UserNotificationModel } from '../../../models/account/user-notification' | 1 | import { UserNotificationModel } from '../../../models/account/user-notification' |
2 | import { PickWith } from '../../utils' | 2 | import { PickWith, PickWithOpt } from '../../utils' |
3 | import { VideoModel } from '../../../models/video/video' | 3 | import { VideoModel } from '../../../models/video/video' |
4 | import { ActorModel } from '../../../models/activitypub/actor' | 4 | import { ActorModel } from '../../../models/activitypub/actor' |
5 | import { ServerModel } from '../../../models/server/server' | 5 | import { 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> & |