diff --git a/lbrytv/src/html.js b/lbrytv/src/html.js
index 7e5088964..adbfb927c 100644
--- a/lbrytv/src/html.js
+++ b/lbrytv/src/html.js
@@ -1,5 +1,6 @@
const { URL } = require('../../config.js');
const { generateStreamUrl } = require('../../ui/util/lbrytv');
+const PAGES = require('../../ui/constants/pages');
const { getClaim } = require('./chainquery');
const { parseURI } = require('lbry-redux');
const fs = require('fs');
@@ -7,19 +8,11 @@ const path = require('path');
let html = fs.readFileSync(path.join(__dirname, '/../dist/index.html'), 'utf8');
-const defaultHead =
- 'lbry.tv\n' +
- `\n` +
- '\n' +
- '\n' +
- '\n' +
- `\n` +
- '\n' +
- `\n` +
- '';
-
-function insertToHead(fullHtml, htmlToInsert = defaultHead) {
- return fullHtml.replace(/.*/s, htmlToInsert);
+function insertToHead(fullHtml, htmlToInsert) {
+ return fullHtml.replace(
+ /.*/s,
+ htmlToInsert || buildOgMetadata()
+ );
}
function truncateDescription(description) {
@@ -37,33 +30,63 @@ function escapeHtmlProperty(property) {
: '';
}
-function buildOgMetadata(uri, claim) {
+//
+// Normal metadata with option to override certain values
+//
+function buildOgMetadata(overrideOptions = {}) {
+ const { title, description } = overrideOptions;
+ const head =
+ 'lbry.tv\n' +
+ `\n` +
+ `\n` +
+ '\n' +
+ `\n` +
+ `\n` +
+ '\n' +
+ `\n` +
+ '';
+
+ return head;
+}
+
+//
+// Metadata used for urls that need claim information
+// Also has option to override defaults
+//
+function buildClaimOgMetadata(uri, claim, overrideOptions = {}) {
+ // Initial setup for claim based og metadata
const { isChannel, claimName } = parseURI(uri);
- const title = escapeHtmlProperty(claim.title ? claim.title : claimName);
+ const claimTitle = escapeHtmlProperty(claim.title ? claim.title : claimName);
const claimDescription =
claim.description && claim.description.length > 0
? escapeHtmlProperty(truncateDescription(claim.description))
- : `Watch ${title} on LBRY.tv`;
+ : `Watch ${claimTitle} on LBRY.tv`;
const claimLanguage = escapeHtmlProperty(claim.language) || 'en_US';
const claimThumbnail = escapeHtmlProperty(claim.thumbnail_url) || `${URL}/og.png`;
- const claimTitle = claim.channel && !isChannel ? `${title} from ${claim.channel} on LBRY.tv` : `${title} on LBRY.tv`;
+ const defaultClaimTitle =
+ claim.channel && !isChannel ? `${claimTitle} from ${claim.channel} on LBRY.tv` : `${claimTitle} on LBRY.tv`;
+
+ // Allow for ovverriding default claim based og metadata
+ const title = overrideOptions.title || claimTitle;
+ const description = overrideOptions.description || claimDescription;
let head = '';
head += '';
- head += `${claimTitle}`;
- head += ``;
+ head += `${title}`;
+ head += ``;
if (claim.tags) {
head += ``;
}
head += ``;
head += ``;
- head += ``;
+ head += ``;
head += ``;
head += ``;
head += ``;
head += ``;
- head += ``;
+ head += ``;
// below should be canonical_url, but not provided by chainquery yet
head += ``;
@@ -81,24 +104,62 @@ function buildOgMetadata(uri, claim) {
return head;
}
-module.exports.getHtml = async function getHtml(ctx) {
- const path = ctx.path;
-
- if (path.length === 0 || path[1] === '$') {
- return insertToHead(html);
- }
-
- const claimUri = path.slice(1).replace(/:/g, '#');
- const { isChannel, streamName, channelName, channelClaimId, streamClaimId } = parseURI(claimUri);
+async function getClaimFromChainquery(url) {
+ const { isChannel, streamName, channelName, channelClaimId, streamClaimId } = parseURI(url);
const claimName = isChannel ? '@' + channelName : streamName;
const claimId = isChannel ? channelClaimId : streamClaimId;
const rows = await getClaim(claimName, claimId, channelName, channelClaimId);
- if (!rows || !rows.length) {
+ if (rows && rows.length) {
+ const claim = rows[0];
+ return claim;
+ }
+
+ return undefined;
+}
+
+module.exports.getHtml = async function getHtml(ctx) {
+ const path = ctx.path;
+
+ if (path.length === 0) {
return insertToHead(html);
}
- const claim = rows[0];
- const ogMetadata = buildOgMetadata(claimUri, claim);
- return insertToHead(html, ogMetadata);
+ const invitePath = `/$/${PAGES.INVITE}/`;
+
+ if (path.includes(invitePath)) {
+ const inviteChannel = path.slice(invitePath.length).replace(/:/g, '#');
+ const inviteChannelUrl = `lbry://${inviteChannel}`;
+
+ try {
+ parseURI(inviteChannelUrl);
+ const claim = await getClaimFromChainquery(inviteChannelUrl);
+ const invitePageMetadata = buildClaimOgMetadata(inviteChannelUrl, claim, {
+ title: `Join ${claim.name} on LBRY`,
+ description: `Join ${claim.name} on LBRY, a content wonderland owned by everyone (and no one).`,
+ });
+
+ return insertToHead(html, invitePageMetadata);
+ } catch (e) {
+ // Something about the invite channel is messed up
+ // Enter generic invite metadata
+ const invitePageMetadata = buildOgMetadata({
+ title: `Join a friend on LBRY`,
+ description: `Join a friend on LBRY, a content wonderland owned by everyone (and no one).`,
+ });
+ return insertToHead(html, invitePageMetadata);
+ }
+ }
+
+ if (!path.includes('$')) {
+ const claimUri = path.slice(1).replace(/:/g, '#');
+ const claim = await getClaimFromChainquery(claimUri);
+
+ if (claim) {
+ const ogMetadata = buildClaimOgMetadata(claimUri, claim);
+ return insertToHead(html, ogMetadata);
+ }
+ }
+
+ return insertToHead(html);
};
diff --git a/package.json b/package.json
index 8afa413cc..ebeaab8c0 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
"@babel/register": "^7.0.0",
"@exponent/electron-cookies": "^2.0.0",
"@hot-loader/react-dom": "^16.8",
- "@lbry/components": "^3.0.7",
+ "@lbry/components": "^3.0.8",
"@reach/menu-button": "^0.1.18",
"@reach/rect": "^0.2.1",
"@reach/tabs": "^0.1.5",
diff --git a/static/index-web.html b/static/index-web.html
index 6338113ff..9eb25e285 100644
--- a/static/index-web.html
+++ b/static/index-web.html
@@ -6,12 +6,12 @@
-
-
-
-
-
-
+
+
+
+
+
+