diff options
author | Chocobozzz <me@florianbigard.com> | 2021-10-22 14:11:58 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-10-22 14:11:58 +0200 |
commit | ab4001aade0891b70e456a215ced0f825c57fde8 (patch) | |
tree | 1690f4eecdef3f9a41c6b330852995774638eb23 /shared | |
parent | de7f11143f6d8a617f1eb15d536a3486e7e22301 (diff) | |
download | PeerTube-ab4001aade0891b70e456a215ced0f825c57fde8.tar.gz PeerTube-ab4001aade0891b70e456a215ced0f825c57fde8.tar.zst PeerTube-ab4001aade0891b70e456a215ced0f825c57fde8.zip |
Provide origin URL to client and fix remote share
Diffstat (limited to 'shared')
-rw-r--r-- | shared/extra-utils/videos/videos.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts index a1d2ba0fc..4d2784dde 100644 --- a/shared/extra-utils/videos/videos.ts +++ b/shared/extra-utils/videos/videos.ts | |||
@@ -113,7 +113,7 @@ async function completeVideoCheck ( | |||
113 | channel: { | 113 | channel: { |
114 | displayName: string | 114 | displayName: string |
115 | name: string | 115 | name: string |
116 | description | 116 | description: string |
117 | isLocal: boolean | 117 | isLocal: boolean |
118 | } | 118 | } |
119 | fixture: string | 119 | fixture: string |
@@ -151,6 +151,7 @@ async function completeVideoCheck ( | |||
151 | expect(video.dislikes).to.equal(attributes.dislikes) | 151 | expect(video.dislikes).to.equal(attributes.dislikes) |
152 | expect(video.isLocal).to.equal(attributes.isLocal) | 152 | expect(video.isLocal).to.equal(attributes.isLocal) |
153 | expect(video.duration).to.equal(attributes.duration) | 153 | expect(video.duration).to.equal(attributes.duration) |
154 | expect(video.url).to.contain(originHost) | ||
154 | expect(dateIsValid(video.createdAt)).to.be.true | 155 | expect(dateIsValid(video.createdAt)).to.be.true |
155 | expect(dateIsValid(video.publishedAt)).to.be.true | 156 | expect(dateIsValid(video.publishedAt)).to.be.true |
156 | expect(dateIsValid(video.updatedAt)).to.be.true | 157 | expect(dateIsValid(video.updatedAt)).to.be.true |
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 0e3e89f43..4a7e399a2 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -36,8 +36,7 @@ export interface Video { | |||
36 | embedPath: string | 36 | embedPath: string |
37 | embedUrl?: string | 37 | embedUrl?: string |
38 | 38 | ||
39 | // When using the search index | 39 | url: string |
40 | url?: string | ||
41 | 40 | ||
42 | views: number | 41 | views: number |
43 | likes: number | 42 | likes: number |