diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /shared/models/activitypub/objects/cache-file-object.ts | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'shared/models/activitypub/objects/cache-file-object.ts')
| -rw-r--r-- | shared/models/activitypub/objects/cache-file-object.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/models/activitypub/objects/cache-file-object.ts b/shared/models/activitypub/objects/cache-file-object.ts index 0a5125f5b..4b0a3a724 100644 --- a/shared/models/activitypub/objects/cache-file-object.ts +++ b/shared/models/activitypub/objects/cache-file-object.ts | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | import { ActivityVideoUrlObject } from './common-objects' | 1 | import { ActivityVideoUrlObject, ActivityPlaylistUrlObject } from './common-objects' |
| 2 | 2 | ||
| 3 | export interface CacheFileObject { | 3 | export interface CacheFileObject { |
| 4 | id: string | 4 | id: string |
| 5 | type: 'CacheFile', | 5 | type: 'CacheFile', |
| 6 | object: string | 6 | object: string |
| 7 | expires: string | 7 | expires: string |
| 8 | url: ActivityVideoUrlObject | 8 | url: ActivityVideoUrlObject | ActivityPlaylistUrlObject |
| 9 | } | 9 | } |