From ca22bbb0ccf762f84cf7fb66aca912b6fef897f2 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Mon, 25 Jun 2018 23:30:21 -0700 Subject: [PATCH] fixed extra semicolon in meta tags --- client/build/utils/metaTags.js | 2 +- client/src/utils/metaTags.js | 2 +- server/controllers/assets/serveAsset/index.js | 3 --- server/controllers/assets/serveByClaim/index.js | 3 --- server/controllers/assets/serveByIdentifierAndClaim/index.js | 3 --- server/controllers/assets/utils/getClaimIdAndServeAsset.js | 1 + 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/client/build/utils/metaTags.js b/client/build/utils/metaTags.js index 473150c1..eee75ef8 100644 --- a/client/build/utils/metaTags.js +++ b/client/build/utils/metaTags.js @@ -103,7 +103,7 @@ var createAssetMetaTags = function createAssetMetaTags(_ref3) { var contentType = claimData.contentType; var videoEmbedUrl = "".concat(siteHost, "/video-embed/").concat(claimData.name, "/").concat(claimData.claimId); var showUrl = "".concat(siteHost, "/").concat(claimData.claimId, "/").concat(claimData.name); - var source = "".concat(siteHost, "/asset/").concat(claimData.name, "/").concat(claimData.claimId, "}"); + var source = "".concat(siteHost, "/asset/").concat(claimData.name, "/").concat(claimData.claimId); var ogTitle = claimData.title || claimData.name; var ogDescription = claimData.description || defaultDescription; var ogThumbnailContentType = determineOgThumbnailContentType(claimData.thumbnail); diff --git a/client/src/utils/metaTags.js b/client/src/utils/metaTags.js index 2210e5de..b658db30 100644 --- a/client/src/utils/metaTags.js +++ b/client/src/utils/metaTags.js @@ -48,7 +48,7 @@ const createAssetMetaTags = ({siteHost, siteTitle, siteTwitter, asset, defaultDe const { contentType } = claimData; const videoEmbedUrl = `${siteHost}/video-embed/${claimData.name}/${claimData.claimId}`; const showUrl = `${siteHost}/${claimData.claimId}/${claimData.name}`; - const source = `${siteHost}/asset/${claimData.name}/${claimData.claimId}}`; + const source = `${siteHost}/asset/${claimData.name}/${claimData.claimId}`; const ogTitle = claimData.title || claimData.name; const ogDescription = claimData.description || defaultDescription; const ogThumbnailContentType = determineOgThumbnailContentType(claimData.thumbnail); diff --git a/server/controllers/assets/serveAsset/index.js b/server/controllers/assets/serveAsset/index.js index cb629a76..3f0149a8 100644 --- a/server/controllers/assets/serveAsset/index.js +++ b/server/controllers/assets/serveAsset/index.js @@ -1,6 +1,5 @@ const { sendGAServeEvent } = require('../../../utils/googleAnalytics'); const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js'); -const logRequestData = require('../utils/logRequestData.js'); /* @@ -11,8 +10,6 @@ const logRequestData = require('../utils/logRequestData.js'); const serveAsset = ({ headers, ip, originalUrl, params: { claimName, claimId } }, res) => { // send google analytics sendGAServeEvent(headers, ip, originalUrl); - // log the request data for debugging - // logRequestData(null, claimName, null, claimId); // get the claim Id and then serve the asset getClaimIdAndServeAsset(null, null, claimName, claimId, originalUrl, ip, res); }; diff --git a/server/controllers/assets/serveByClaim/index.js b/server/controllers/assets/serveByClaim/index.js index 2ec698b4..6e0e9e40 100644 --- a/server/controllers/assets/serveByClaim/index.js +++ b/server/controllers/assets/serveByClaim/index.js @@ -5,7 +5,6 @@ const lbryUri = require('../utils/lbryUri.js'); const determineRequestType = require('../utils/determineRequestType.js'); const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js'); -const logRequestData = require('../utils/logRequestData.js'); const { EMBED } = require('../constants/request_types.js'); @@ -38,8 +37,6 @@ const serveByClaim = (req, res) => { } // send google analytics sendGAServeEvent(headers, ip, originalUrl); - // log the request data for debugging - // logRequestData(requestType, claimName, null, null); // get the claim Id and then serve the asset getClaimIdAndServeAsset(null, null, claimName, null, originalUrl, ip, res); }; diff --git a/server/controllers/assets/serveByIdentifierAndClaim/index.js b/server/controllers/assets/serveByIdentifierAndClaim/index.js index 0089610d..609a1256 100644 --- a/server/controllers/assets/serveByIdentifierAndClaim/index.js +++ b/server/controllers/assets/serveByIdentifierAndClaim/index.js @@ -6,7 +6,6 @@ const lbryUri = require('../utils/lbryUri.js'); const determineRequestType = require('../utils/determineRequestType.js'); const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js'); const flipClaimNameAndId = require('../utils/flipClaimNameAndId.js'); -const logRequestData = require('../utils/logRequestData.js'); const { EMBED } = require('../constants/request_types.js'); @@ -50,8 +49,6 @@ const serverByIdentifierAndClaim = (req, res) => { } // send google analytics sendGAServeEvent(headers, ip, originalUrl); - // log the request data for debugging - // logRequestData(requestType, claimName, channelName, claimId); // get the claim Id and then serve the asset getClaimIdAndServeAsset(channelName, channelClaimId, claimName, claimId, originalUrl, ip, res); }; diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js index e391383d..83c4c770 100644 --- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js +++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js @@ -17,6 +17,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId getClaimId(channelName, channelClaimId, claimName, claimId) .then(fullClaimId => { claimId = fullClaimId; + logger.debug('FULL CLAIM ID:', fullClaimId); return db.Blocked.isNotBlocked(fullClaimId, claimName); }) .then(() => {