From 067b3eb98fd8853436bf6de031dfc189c495d906 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 28 Jan 2020 14:45:47 -0500 Subject: [PATCH] it is always the embed url --- lbrytv/src/html.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lbrytv/src/html.js b/lbrytv/src/html.js index e3e1cb37a..7efc3f9c2 100644 --- a/lbrytv/src/html.js +++ b/lbrytv/src/html.js @@ -1,5 +1,5 @@ const { URL } = require('../../config.js'); -const { generateStreamUrl } = require('../../ui/util/lbrytv'); +const { generateEmbedUrl } = require('../../ui/util/lbrytv'); const PAGES = require('../../ui/constants/pages'); const { getClaim } = require('./chainquery'); const { parseURI } = require('lbry-redux'); @@ -68,7 +68,6 @@ function buildClaimOgMetadata(uri, claim, overrideOptions = {}) { // Allow for ovverriding default claim based og metadata const title = overrideOptions.title || claimTitle; const description = overrideOptions.description || claimDescription; - const embedPlayer = overrideOptions.embedPlayer; let head = ''; @@ -90,12 +89,12 @@ function buildClaimOgMetadata(uri, claim, overrideOptions = {}) { head += ``; if (claim.source_media_type && claim.source_media_type.startsWith('video/')) { - const videoUrl = generateStreamUrl(claim.name, claim.claim_id); + const videoUrl = generateEmbedUrl(claim.name, claim.claim_id); head += ``; head += ``; head += ``; head += ``; - head += ``; + head += ``; if (claim.frame_width && claim.frame_height) { head += ``; head += ``; @@ -132,7 +131,6 @@ module.exports.getHtml = async function getHtml(ctx) { const invitePath = `/$/${PAGES.INVITE}/`; const embedPath = `/$/${PAGES.EMBED}/`; - const embedPlayer = URL + path; if (path.includes(invitePath)) { const inviteChannel = path.slice(invitePath.length).replace(/:/g, '#'); @@ -163,7 +161,7 @@ module.exports.getHtml = async function getHtml(ctx) { const claim = await getClaimFromChainquery(claimUri); if (claim) { - const ogMetadata = buildClaimOgMetadata(claimUri, claim, { embedPlayer: embedPlayer}); + const ogMetadata = buildClaimOgMetadata(claimUri, claim); return insertToHead(html, ogMetadata); }