aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-12 15:35:30 +0100
committerChocobozzz <me@florianbigard.com>2018-01-12 15:35:30 +0100
commit9fb3abfdac5c4bffe9992a457e5210d3aa743952 (patch)
treeb2feaec75e890ea842dcb52b9760863cd64481fb /server/models
parentbd377530836474fa2a4404bd3e8bdd15f1b9ccc0 (diff)
downloadPeerTube-9fb3abfdac5c4bffe9992a457e5210d3aa743952.tar.gz
PeerTube-9fb3abfdac5c4bffe9992a457e5210d3aa743952.tar.zst
PeerTube-9fb3abfdac5c4bffe9992a457e5210d3aa743952.zip
Fix communication with mastodon
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 391568df4..3e2b4ce64 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -920,7 +920,7 @@ export class VideoModel extends Model<VideoModel> {
920 url.push({ 920 url.push({
921 type: 'Link', 921 type: 'Link',
922 mimeType: 'video/' + file.extname.replace('.', ''), 922 mimeType: 'video/' + file.extname.replace('.', ''),
923 url: this.getVideoFileUrl(file, baseUrlHttp), 923 href: this.getVideoFileUrl(file, baseUrlHttp),
924 width: file.resolution, 924 width: file.resolution,
925 size: file.size 925 size: file.size
926 }) 926 })
@@ -928,14 +928,14 @@ export class VideoModel extends Model<VideoModel> {
928 url.push({ 928 url.push({
929 type: 'Link', 929 type: 'Link',
930 mimeType: 'application/x-bittorrent', 930 mimeType: 'application/x-bittorrent',
931 url: this.getTorrentUrl(file, baseUrlHttp), 931 href: this.getTorrentUrl(file, baseUrlHttp),
932 width: file.resolution 932 width: file.resolution
933 }) 933 })
934 934
935 url.push({ 935 url.push({
936 type: 'Link', 936 type: 'Link',
937 mimeType: 'application/x-bittorrent;x-scheme-handler/magnet', 937 mimeType: 'application/x-bittorrent;x-scheme-handler/magnet',
938 url: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs), 938 href: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs),
939 width: file.resolution 939 width: file.resolution
940 }) 940 })
941 } 941 }
@@ -944,7 +944,7 @@ export class VideoModel extends Model<VideoModel> {
944 url.push({ 944 url.push({
945 type: 'Link', 945 type: 'Link',
946 mimeType: 'text/html', 946 mimeType: 'text/html',
947 url: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid 947 href: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid
948 }) 948 })
949 949
950 return { 950 return {