From 408dd029eb3b15d081bdc43ff85484f863b0db08 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 23 Jul 2021 11:34:11 -0400 Subject: [PATCH] favicon custom html fav tag remove basic meta favi missing favicon recon --- static/img/favicon.png | Bin 3009 -> 1349 bytes static/img/lbry-favicon.png | Bin 1349 -> 0 bytes static/index-web.html | 1 - ui/util/query-params.js | 4 ---- web/src/html.js | 19 ++++++++++++++++--- web/src/rss.js | 4 ++-- web/src/xml.js | 6 +++--- 7 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 static/img/lbry-favicon.png diff --git a/static/img/favicon.png b/static/img/favicon.png index 20e725d6e0b1b34e6f710d653af3f0f210b6e697..4570d22484629120b2e5e96a43145ecd78a4c7e6 100644 GIT binary patch literal 1349 zcmV-L1-kl)P)2o>J5A-I_{SCaJT$iftQ>K3!_@o=42^af;o$q5C{Z9fk3by@Sga9ggHgW z?Pw2oLMQOFPFmmR_xr|ApF!M=SxB5CC&jDR;HzXQ$y%%=vlcGG?ePTsfxtlE3-KZQ z?|lgX9u|`*@cLbQ_bFgazDt>ghV44wa=9^V+P;I*wd(L~iqvE;QHq%o5)~ce)qi>c zUy6_4O9>tj-_@x*goTIu`wkz8ojP;T;;i1VksD#Ngp{jWpYKzrBWJ0yOrO61l`1G9 zR+?`ti+3vEc`6F_ADkq zCTn!~*zt(LW5cjp zS07HEKEv+`8CfQrj~O{l{(^KJFo>}52!u%SS%=m4?Vsb&XV`EI$4{MN_x=O?9@x5b zmrB}}JJ+zTS3qZu%A zG#LvQBZua}n5omP4VgG=7M=R_r&*^i^cXw@bsLui%w4h+!ycW!LEHAE%3HvO2{wRE zoIcH+V#%u2l&n#k6uI-!vTJwt9Jrj#f|aW9j3ICb_cExL9inbK|Jdg1aFcrOgC)B3J+{{bY( znw>9_B)5rbpCQC^1Z2YW1&a_rb2gfF?rIsh%0M=Dn<`~iN85bnmB^?luEc~Hv&dS! zl*Hy^(3r8DkdH1xdqHI=b7`gw89Uy7gND&^;8APCA-neNw=b<`B+ZeV<`Q!7$WbmL zIyRQ|TejNg+JL$AyQ1_PF_H~iw^FfwBjRMpOsy8J*tUDOr4_^BQL(Yu`SKRH?=<=`+znA`cusVq<(1@Pqisovz~-#3T|j z`|z=2O7$o!i!CKO^zLgd#zm-(7?eu2*8pw5jO0|kSFBr){(lh2B|d#Gw`5N788M~T z>sxkQW#~D0s2P>G7uK@N?MAR*W?~C2gN`67IyxwH16~&&xZit1yTIdOdhPO!r_P*J z@B#dyV3v_mHS5^zn6({NHl=$LkjVb`d*77W1s@bsscqMqAKLZmZAN42oVn;Tzq+Z8 ziPdy-ijF&_J=`^cj0(8fYOm)xzz3q^UT6=$KmQl-PZIDOp0oZ0!X4`600000NkvXX Hu0mjfZEdl* literal 3009 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 DkY}81 diff --git a/static/img/lbry-favicon.png b/static/img/lbry-favicon.png deleted file mode 100644 index 4570d22484629120b2e5e96a43145ecd78a4c7e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1349 zcmV-L1-kl)P)2o>J5A-I_{SCaJT$iftQ>K3!_@o=42^af;o$q5C{Z9fk3by@Sga9ggHgW z?Pw2oLMQOFPFmmR_xr|ApF!M=SxB5CC&jDR;HzXQ$y%%=vlcGG?ePTsfxtlE3-KZQ z?|lgX9u|`*@cLbQ_bFgazDt>ghV44wa=9^V+P;I*wd(L~iqvE;QHq%o5)~ce)qi>c zUy6_4O9>tj-_@x*goTIu`wkz8ojP;T;;i1VksD#Ngp{jWpYKzrBWJ0yOrO61l`1G9 zR+?`ti+3vEc`6F_ADkq zCTn!~*zt(LW5cjp zS07HEKEv+`8CfQrj~O{l{(^KJFo>}52!u%SS%=m4?Vsb&XV`EI$4{MN_x=O?9@x5b zmrB}}JJ+zTS3qZu%A zG#LvQBZua}n5omP4VgG=7M=R_r&*^i^cXw@bsLui%w4h+!ycW!LEHAE%3HvO2{wRE zoIcH+V#%u2l&n#k6uI-!vTJwt9Jrj#f|aW9j3ICb_cExL9inbK|Jdg1aFcrOgC)B3J+{{bY( znw>9_B)5rbpCQC^1Z2YW1&a_rb2gfF?rIsh%0M=Dn<`~iN85bnmB^?luEc~Hv&dS! zl*Hy^(3r8DkdH1xdqHI=b7`gw89Uy7gND&^;8APCA-neNw=b<`B+ZeV<`Q!7$WbmL zIyRQ|TejNg+JL$AyQ1_PF_H~iw^FfwBjRMpOsy8J*tUDOr4_^BQL(Yu`SKRH?=<=`+znA`cusVq<(1@Pqisovz~-#3T|j z`|z=2O7$o!i!CKO^zLgd#zm-(7?eu2*8pw5jO0|kSFBr){(lh2B|d#Gw`5N788M~T z>sxkQW#~D0s2P>G7uK@N?MAR*W?~C2gN`67IyxwH16~&&xZit1yTIdOdhPO!r_P*J z@B#dyV3v_mHS5^zn6({NHl=$LkjVb`d*77W1s@bsscqMqAKLZmZAN42oVn;Tzq+Z8 ziPdy-ijF&_J=`^cj0(8fYOm)xzz3q^UT6=$KmQl-PZIDOp0oZ0!X4`600000NkvXX Hu0mjfZEdl* diff --git a/static/index-web.html b/static/index-web.html index f34303615..248dcd0e6 100644 --- a/static/index-web.html +++ b/static/index-web.html @@ -5,7 +5,6 @@ - diff --git a/ui/util/query-params.js b/ui/util/query-params.js index af13a036e..bf4fa6bcc 100644 --- a/ui/util/query-params.js +++ b/ui/util/query-params.js @@ -38,13 +38,9 @@ export const getSearchQueryString = (query: string, options: any = {}) => { const encodedQuery = encodeURIComponent(query); const queryParams = [ options.exact && !isSurroundedByQuotes(encodedQuery) ? `s="${encodedQuery}"` : `s=${encodedQuery}`, - `free_only=true`, `size=${options.size || DEFAULT_SEARCH_SIZE}`, `from=${options.from || DEFAULT_SEARCH_RESULT_FROM}`, - // `mediaType=${SEARCH_OPTIONS.MEDIA_VIDEO}`, - // `claimType=${SEARCH_OPTIONS.INCLUDE_FILES}`, ]; - const { isBackgroundSearch } = options; const includeUserOptions = typeof isBackgroundSearch === 'undefined' ? false : !isBackgroundSearch; diff --git a/web/src/html.js b/web/src/html.js index ed764b9f1..8463180a2 100644 --- a/web/src/html.js +++ b/web/src/html.js @@ -8,6 +8,7 @@ const { OG_IMAGE_URL, SITE_DESCRIPTION, SITE_NAME, + FAVICON, } = require('../../config.js'); const { generateEmbedUrl, generateStreamUrl, generateDirectUrl } = require('../../ui/util/web'); const PAGES = require('../../ui/constants/pages'); @@ -82,20 +83,31 @@ function buildOgMetadata(overrideOptions = {}) { function conditionallyAddPWA() { let head = ''; if (DOMAIN === 'odysee.com') { - head += ''; + head += ''; head += ''; head += ''; } return head; } +function addFavicon() { + let head = ''; + head += ``; + return head; +} + function buildHead() { - const head = '' + conditionallyAddPWA() + buildOgMetadata() + ''; + const head = + '' + + addFavicon() + + conditionallyAddPWA() + + buildOgMetadata() + + ''; return head; } function buildBasicOgMetadata() { - const head = '' + buildOgMetadata() + ''; + const head = '' + addFavicon() + buildOgMetadata() + ''; return head; } @@ -128,6 +140,7 @@ function buildClaimOgMetadata(uri, claim, overrideOptions = {}) { let head = ''; + head += `${addFavicon()}`; head += ''; head += `${title}`; head += ``; diff --git a/web/src/rss.js b/web/src/rss.js index aba49f644..98684ab89 100644 --- a/web/src/rss.js +++ b/web/src/rss.js @@ -1,5 +1,5 @@ const { generateDownloadUrl } = require('../../ui/util/web'); -const { URL, SITE_NAME, LBRY_WEB_API } = require('../../config.js'); +const { URL, SITE_NAME, LBRY_WEB_API, FAVICON } = require('../../config.js'); const { Lbry } = require('lbry-redux'); const Feed = require('feed').Feed; @@ -82,7 +82,7 @@ async function getFeed(channelClaim, feedLink) { const title = value ? value.title : channelClaim.name; const options = { - favicon: URL + '/public/favicon.png', + favicon: FAVICON || URL + '/public/favicon.png', generator: SITE_NAME + ' RSS Feed', title: title + ' on ' + SITE_NAME, description: fmtDescription(value && value.description ? value.description : ''), diff --git a/web/src/xml.js b/web/src/xml.js index bad950406..9cd48fe44 100644 --- a/web/src/xml.js +++ b/web/src/xml.js @@ -1,11 +1,11 @@ -const { URL, SITE_TITLE } = require('../../config.js'); - +const { URL, SITE_TITLE, FAVICON } = require('../../config.js'); +const favicon = FAVICON || `${URL}/public/favicon.png`; function getOpenSearchXml() { return ( `${SITE_TITLE}` + `Search ${SITE_TITLE}` + 'UTF-8' + - `${URL}/public/favicon.png` + + `${favicon}` + `` + `${URL}` );