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/account | |
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/account')
-rw-r--r-- | server/typings/models/account/actor-follow.ts | 10 | ||||
-rw-r--r-- | server/typings/models/account/actor.ts | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/server/typings/models/account/actor-follow.ts b/server/typings/models/account/actor-follow.ts index 17a47b8df..1c66eb0a0 100644 --- a/server/typings/models/account/actor-follow.ts +++ b/server/typings/models/account/actor-follow.ts | |||
@@ -2,7 +2,7 @@ import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | |||
2 | import { | 2 | import { |
3 | MActor, | 3 | MActor, |
4 | MActorAccount, | 4 | MActorAccount, |
5 | MActorAccountChannel, | 5 | MActorDefaultAccountChannel, |
6 | MActorChannelAccountActor, | 6 | MActorChannelAccountActor, |
7 | MActorDefault, | 7 | MActorDefault, |
8 | MActorFormattable, | 8 | MActorFormattable, |
@@ -37,8 +37,8 @@ export type MActorFollowActorsDefault = MActorFollow & | |||
37 | Use<'ActorFollowing', MActorDefault> | 37 | Use<'ActorFollowing', MActorDefault> |
38 | 38 | ||
39 | export type MActorFollowFull = MActorFollow & | 39 | export type MActorFollowFull = MActorFollow & |
40 | Use<'ActorFollower', MActorAccountChannel> & | 40 | Use<'ActorFollower', MActorDefaultAccountChannel> & |
41 | Use<'ActorFollowing', MActorAccountChannel> | 41 | Use<'ActorFollowing', MActorDefaultAccountChannel> |
42 | 42 | ||
43 | // ############################################################################ | 43 | // ############################################################################ |
44 | 44 | ||
@@ -51,10 +51,6 @@ export type MActorFollowActorsDefaultSubscription = MActorFollow & | |||
51 | Use<'ActorFollower', MActorDefault> & | 51 | Use<'ActorFollower', MActorDefault> & |
52 | Use<'ActorFollowing', SubscriptionFollowing> | 52 | Use<'ActorFollowing', SubscriptionFollowing> |
53 | 53 | ||
54 | export type MActorFollowFollowingFullFollowerAccount = MActorFollow & | ||
55 | Use<'ActorFollower', MActorAccount> & | ||
56 | Use<'ActorFollowing', MActorAccountChannel> | ||
57 | |||
58 | export type MActorFollowSubscriptions = MActorFollow & | 54 | export type MActorFollowSubscriptions = MActorFollow & |
59 | Use<'ActorFollowing', MActorChannelAccountActor> | 55 | Use<'ActorFollowing', MActorChannelAccountActor> |
60 | 56 | ||
diff --git a/server/typings/models/account/actor.ts b/server/typings/models/account/actor.ts index d4bcac4a3..bcacb8351 100644 --- a/server/typings/models/account/actor.ts +++ b/server/typings/models/account/actor.ts | |||
@@ -58,7 +58,7 @@ export type MActorAccount = MActor & | |||
58 | export type MActorChannel = MActor & | 58 | export type MActorChannel = MActor & |
59 | Use<'VideoChannel', MChannel> | 59 | Use<'VideoChannel', MChannel> |
60 | 60 | ||
61 | export type MActorAccountChannel = MActorAccount & MActorChannel | 61 | export type MActorDefaultAccountChannel = MActorDefault & MActorAccount & MActorChannel |
62 | 62 | ||
63 | export type MActorServer = MActor & | 63 | export type MActorServer = MActor & |
64 | Use<'Server', MServer> | 64 | Use<'Server', MServer> |