diff options
author | Chocobozzz <me@florianbigard.com> | 2021-02-18 10:15:11 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-02-18 13:38:09 +0100 |
commit | d9a2a03196275065c28f4a0b7d4d7bc9992d77a1 (patch) | |
tree | 14579db95cd07506bf3d8e5c0af3ef1630e8700c /shared | |
parent | 2451916e45420fedf556913ce121f3964c4b57d6 (diff) | |
download | PeerTube-d9a2a03196275065c28f4a0b7d4d7bc9992d77a1.tar.gz PeerTube-d9a2a03196275065c28f4a0b7d4d7bc9992d77a1.tar.zst PeerTube-d9a2a03196275065c28f4a0b7d4d7bc9992d77a1.zip |
Don't guess remote tracker URL
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/activitypub/objects/common-objects.ts | 14 | ||||
-rw-r--r-- | shared/models/activitypub/objects/video-torrent-object.ts | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 43e8ea067..76f0e3bcf 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts | |||
@@ -30,7 +30,7 @@ export type ActivityPlaylistSegmentHashesObject = { | |||
30 | href: string | 30 | href: string |
31 | } | 31 | } |
32 | 32 | ||
33 | export type ActivityVideoFileMetadataObject = { | 33 | export type ActivityVideoFileMetadataUrlObject = { |
34 | type: 'Link' | 34 | type: 'Link' |
35 | rel: [ 'metadata', any ] | 35 | rel: [ 'metadata', any ] |
36 | mediaType: 'application/json' | 36 | mediaType: 'application/json' |
@@ -39,6 +39,13 @@ export type ActivityVideoFileMetadataObject = { | |||
39 | fps: number | 39 | fps: number |
40 | } | 40 | } |
41 | 41 | ||
42 | export type ActivityTrackerUrlObject = { | ||
43 | type: 'Link' | ||
44 | rel: [ 'tracker', 'websocket' | 'http' ] | ||
45 | name: string | ||
46 | href: string | ||
47 | } | ||
48 | |||
42 | export type ActivityPlaylistInfohashesObject = { | 49 | export type ActivityPlaylistInfohashesObject = { |
43 | type: 'Infohash' | 50 | type: 'Infohash' |
44 | name: string | 51 | name: string |
@@ -96,7 +103,7 @@ export type ActivityTagObject = | |||
96 | | ActivityMentionObject | 103 | | ActivityMentionObject |
97 | | ActivityBitTorrentUrlObject | 104 | | ActivityBitTorrentUrlObject |
98 | | ActivityMagnetUrlObject | 105 | | ActivityMagnetUrlObject |
99 | | ActivityVideoFileMetadataObject | 106 | | ActivityVideoFileMetadataUrlObject |
100 | 107 | ||
101 | export type ActivityUrlObject = | 108 | export type ActivityUrlObject = |
102 | ActivityVideoUrlObject | 109 | ActivityVideoUrlObject |
@@ -104,7 +111,8 @@ export type ActivityUrlObject = | |||
104 | | ActivityBitTorrentUrlObject | 111 | | ActivityBitTorrentUrlObject |
105 | | ActivityMagnetUrlObject | 112 | | ActivityMagnetUrlObject |
106 | | ActivityHtmlUrlObject | 113 | | ActivityHtmlUrlObject |
107 | | ActivityVideoFileMetadataObject | 114 | | ActivityVideoFileMetadataUrlObject |
115 | | ActivityTrackerUrlObject | ||
108 | 116 | ||
109 | export interface ActivityPubAttributedTo { | 117 | export interface ActivityPubAttributedTo { |
110 | type: 'Group' | 'Person' | 118 | type: 'Group' | 'Person' |
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts index 6d18e93d5..bfbcfb1a5 100644 --- a/shared/models/activitypub/objects/video-torrent-object.ts +++ b/shared/models/activitypub/objects/video-torrent-object.ts | |||
@@ -40,11 +40,14 @@ export interface VideoObject { | |||
40 | icon: ActivityIconObject[] | 40 | icon: ActivityIconObject[] |
41 | 41 | ||
42 | url: ActivityUrlObject[] | 42 | url: ActivityUrlObject[] |
43 | |||
43 | likes: string | 44 | likes: string |
44 | dislikes: string | 45 | dislikes: string |
45 | shares: string | 46 | shares: string |
46 | comments: string | 47 | comments: string |
48 | |||
47 | attributedTo: ActivityPubAttributedTo[] | 49 | attributedTo: ActivityPubAttributedTo[] |
50 | |||
48 | to?: string[] | 51 | to?: string[] |
49 | cc?: string[] | 52 | cc?: string[] |
50 | } | 53 | } |