From 76b002fba582b89db8de1bed95d5554ebc65bb62 Mon Sep 17 00:00:00 2001 From: zeppi Date: Tue, 6 Jul 2021 16:31:20 -0400 Subject: [PATCH 1/9] changes --- flow-typed/homepage.js | 5 +++-- ui/component/selectThumbnail/view.jsx | 2 +- ui/component/sideNavigation/view.jsx | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flow-typed/homepage.js b/flow-typed/homepage.js index a2bbeb7b7..ee4b1226f 100644 --- a/flow-typed/homepage.js +++ b/flow-typed/homepage.js @@ -4,12 +4,12 @@ declare type HomepageObject = { options: any, route: string, title: string, -} +}; declare type HomepageData = { [string]: HomepageObject, default: any => any, -} +}; declare type RowDataItem = { title: any, @@ -19,6 +19,7 @@ declare type RowDataItem = { extra?: any, options?: { channelIds?: Array, + limitClaimsPerChannel?: number, pageSize: number, }, route?: string, diff --git a/ui/component/selectThumbnail/view.jsx b/ui/component/selectThumbnail/view.jsx index dcda827f2..ca8ed5a28 100644 --- a/ui/component/selectThumbnail/view.jsx +++ b/ui/component/selectThumbnail/view.jsx @@ -123,7 +123,7 @@ class SelectThumbnail extends React.PureComponent { openModal(MODALS.CONFIRM_THUMBNAIL_UPLOAD, { file })} /> diff --git a/ui/component/sideNavigation/view.jsx b/ui/component/sideNavigation/view.jsx index 7d4cdc9a3..14acaf966 100644 --- a/ui/component/sideNavigation/view.jsx +++ b/ui/component/sideNavigation/view.jsx @@ -9,7 +9,7 @@ import Icon from 'component/common/icon'; import NotificationBubble from 'component/notificationBubble'; import I18nMessage from 'component/i18nMessage'; import ChannelThumbnail from 'component/channelThumbnail'; -import { PINNED_LABEL_1, PINNED_URI_1, PINNED_URI_2, PINNED_LABEL_2, SIMPLE_SITE, DOMAIN } from 'config'; +import { PINNED_LABEL_1, PINNED_URI_1, PINNED_URI_2, PINNED_LABEL_2, SIMPLE_SITE, DOMAIN, ENABLE_UI_NOTIFICATIONS } from 'config'; // @if TARGET='app' import { IS_MAC } from 'component/app/view'; // @endif @@ -213,7 +213,7 @@ function SideNavigation(props: Props) { }); } - const notificationsEnabled = user && user.experimental_ui; + const notificationsEnabled = ENABLE_UI_NOTIFICATIONS || (user && user.experimental_ui); const isAuthenticated = Boolean(email); // SIDE LINKS: FOLLOWING, HOME, [FULL,] [EXTRA] let SIDE_LINKS: Array = []; -- 2.45.3 From db0810e906715dc1c731f550876eaebfb6bec0ce Mon Sep 17 00:00:00 2001 From: zeppi Date: Tue, 6 Jul 2021 16:33:47 -0400 Subject: [PATCH 2/9] clean --- ui/component/subscribeButton/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/component/subscribeButton/index.js b/ui/component/subscribeButton/index.js index b44b8584b..52ea92e5e 100644 --- a/ui/component/subscribeButton/index.js +++ b/ui/component/subscribeButton/index.js @@ -6,8 +6,8 @@ import { makeSelectNotificationsDisabled, } from 'redux/selectors/subscriptions'; import { makeSelectPermanentUrlForUri } from 'lbry-redux'; -import { doToast } from 'redux/actions/notifications'; import { selectUser } from 'redux/selectors/user'; +import { doToast } from 'redux/actions/notifications'; import SubscribeButton from './view'; const select = (state, props) => ({ -- 2.45.3 From 376ccea82ff6290b9a8ce8729f8f17ef722676c1 Mon Sep 17 00:00:00 2001 From: zeppi Date: Tue, 6 Jul 2021 17:19:19 -0400 Subject: [PATCH 3/9] showNoSourceClaims --- ui/component/channelContent/view.jsx | 3 ++- ui/component/claimList/view.jsx | 8 ++++---- ui/component/claimListDiscover/view.jsx | 4 ++++ ui/component/claimPreviewTile/view.jsx | 6 +++++- ui/component/claimTilesDiscover/view.jsx | 6 +++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ui/component/channelContent/view.jsx b/ui/component/channelContent/view.jsx index 2ff48cb50..4425e0e24 100644 --- a/ui/component/channelContent/view.jsx +++ b/ui/component/channelContent/view.jsx @@ -1,5 +1,5 @@ // @flow -import { SHOW_ADS } from 'config'; +import { SHOW_ADS, ENABLE_NO_SOURCE_CLAIMS } from 'config'; import * as CS from 'constants/claim_search'; import * as ICONS from 'constants/icons'; import React, { Fragment } from 'react'; @@ -136,6 +136,7 @@ function ChannelContent(props: Props) { {!channelIsMine && claimsInChannel > 0 && } ))} {!timedOut && urisLength === 0 && !loading &&
{empty || noResultMsg}
} @@ -198,7 +198,7 @@ export default function ClaimList(props: Props) { showUserBlocked={showHiddenByUser} showHiddenByUser={showHiddenByUser} collectionId={collectionId} - hideLivestreamClaims={hideLivestreamClaims} + showNoSourceClaims={showNoSourceClaims} customShouldHide={(claim: StreamClaim) => { // Hack to hide spee.ch thumbnail publishes // If it meets these requirements, it was probably uploaded here: diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx index e76334dd3..78b5cebd8 100644 --- a/ui/component/claimListDiscover/view.jsx +++ b/ui/component/claimListDiscover/view.jsx @@ -72,6 +72,7 @@ type Props = { liveLivestreamsFirst?: boolean, livestreamMap?: { [string]: any }, hasSource?: boolean, + showNoSourceClaims?: boolean, isChannel?: boolean, empty?: string, }; @@ -129,6 +130,7 @@ function ClaimListDiscover(props: Props) { livestreamMap, hasSource, isChannel = false, + showNoSourceClaims, empty, } = props; const didNavigateForward = history.action === 'PUSH'; @@ -512,6 +514,7 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst={liveLivestreamsFirst} livestreamMap={livestreamMap} searchOptions={options} + showNoSourceClaims={showNoSourceClaims} empty={empty} /> {loading && ( @@ -546,6 +549,7 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst={liveLivestreamsFirst} livestreamMap={livestreamMap} searchOptions={options} + showNoSourceClaims={showNoSourceClaims} empty={empty} /> {loading && diff --git a/ui/component/claimPreviewTile/view.jsx b/ui/component/claimPreviewTile/view.jsx index 810cd1fa9..fdf4c3a1a 100644 --- a/ui/component/claimPreviewTile/view.jsx +++ b/ui/component/claimPreviewTile/view.jsx @@ -44,6 +44,8 @@ type Props = { properties?: (Claim) => void, live?: boolean, collectionId?: string, + showNoSourceClaims?: boolean, + isLivestream: boolean, }; function ClaimPreviewTile(props: Props) { @@ -66,6 +68,8 @@ function ClaimPreviewTile(props: Props) { showHiddenByUser, properties, live, + showNoSourceClaims, + isLivestream, collectionId, } = props; const isRepost = claim && claim.repost_channel_url; @@ -149,7 +153,7 @@ function ClaimPreviewTile(props: Props) { shouldHide = blockedChannelUris.some((blockedUri) => blockedUri === claim.permanent_url); } - if (shouldHide) { + if (shouldHide || (isLivestream && !showNoSourceClaims)) { return null; } diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx index fa5224ef2..7770e5ae4 100644 --- a/ui/component/claimTilesDiscover/view.jsx +++ b/ui/component/claimTilesDiscover/view.jsx @@ -37,7 +37,7 @@ export function prioritizeActiveLivestreams( // for that channel actually point to the same source). // 2. 'liveChannelIds' needs to be pruned after being accounted for, // otherwise all livestream-claims will be "live" (we'll only take the - // latest one as "live"). + // latest one as "live" ). return ( claim && claim.value_type === 'stream' && @@ -145,7 +145,7 @@ function ClaimTilesDiscover(props: Props) { mutedUris, liveLivestreamsFirst, livestreamMap, - // pin, + // pin, // let's pin from /web folder prefixUris, } = props; @@ -240,7 +240,7 @@ function ClaimTilesDiscover(props: Props) { const isLoading = fetchingClaimSearchByQuery[mainSearchKey]; - if (liveLivestreamsFirst && livestreamMap) { + if (liveLivestreamsFirst && livestreamMap && !isLoading) { prioritizeActiveLivestreams(uris, liveUris, livestreamMap, claimsByUri, claimSearchByQuery, options); } -- 2.45.3 From 98b9ad56813e43c42cb9cb6ec492197e147bfca4 Mon Sep 17 00:00:00 2001 From: DispatchCommit Date: Mon, 5 Jul 2021 19:11:53 -0700 Subject: [PATCH 4/9] upgrade video.js to 7.13.3 Update package.json --- package.json | 2 +- yarn.lock | 125 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index b008eeb8c..9f2ad5ba8 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "unist-util-visit": "^2.0.3", "uuid": "^8.3.2", "vast-client": "^3.1.1", - "video.js": "^7.10.1", + "video.js": "^7.13.3", "videojs-contrib-quality-levels": "^2.0.9", "videojs-event-tracking": "^1.0.1", "villain-react": "^1.0.9", diff --git a/yarn.lock b/yarn.lock index 00f3dd1b1..c7a002acc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1127,17 +1127,17 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.5", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg== dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.9.2": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c" - integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg== +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.9.2": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d" + integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg== dependencies: regenerator-runtime "^0.13.4" @@ -1810,15 +1810,38 @@ mux.js "5.6.7" video.js "^6 || ^7" +"@videojs/http-streaming@2.9.1": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.9.1.tgz#16b59efe24a832b89b5bd6a6c52f0d80ad7996a2" + integrity sha512-QAtlrBBILOflrei1KE0GcSDDWiP888ZOySck6zWlQNYi/pXOm6QXTJHzOMIKiRQOndyJIZRTfLHedeUdUIDNLA== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "^3.0.2" + aes-decrypter "3.1.2" + global "^4.4.0" + m3u8-parser "4.7.0" + mpd-parser "0.17.0" + mux.js "5.11.1" + video.js "^6 || ^7" + "@videojs/vhs-utils@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-2.2.1.tgz#78ecea26652268646d5003b1b1a705c9b544f8a2" - integrity sha512-9Qbwx3LAdkG1jh2HKfninjXDxVZCeaoPcmct/bUcDRmLej68Z9XhLe5d2a9fy1qB+UuQwWg7YySASesWavYNjQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-2.3.0.tgz#490a3a00dfc1b51d85d5dcf8f8361e2d4c4d1440" + integrity sha512-ThSmm91S7tuIJ757ON50K4y7S/bvKN4+B0tu303gCOxaG57PoP1UvPfMQZ90XGhxwNgngexVojOqbBHhTvXVHQ== dependencies: "@babel/runtime" "^7.5.5" global "^4.3.2" url-toolkit "^2.1.6" +"@videojs/vhs-utils@^3.0.0", "@videojs/vhs-utils@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.2.tgz#0203418ecaaff29bc33c69b6ad707787347b7614" + integrity sha512-r8Yas1/tNGsGRNoIaDJuiWiQgM0P2yaEnobgzw5JcBiEqxnS8EXoUm4QtKH7nJtnppZ1yqBx1agBZCvBMKXA2w== + dependencies: + "@babel/runtime" "^7.12.5" + global "^4.4.0" + url-toolkit "^2.2.1" + "@videojs/xhr@2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e" @@ -2014,6 +2037,16 @@ aes-decrypter@3.1.0: global "^4.3.2" pkcs7 "^1.0.4" +aes-decrypter@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb" + integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "^3.0.0" + global "^4.4.0" + pkcs7 "^1.0.4" + agent-base@5: version "5.1.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" @@ -5770,9 +5803,10 @@ global@4.3.2: min-document "^2.19.0" process "~0.5.1" -global@^4.3.0, global@^4.3.1, global@^4.3.2, global@~4.4.0: +global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== dependencies: min-document "^2.19.0" process "^0.11.10" @@ -7586,6 +7620,15 @@ m3u8-parser@4.5.0: "@videojs/vhs-utils" "^2.2.1" global "^4.3.2" +m3u8-parser@4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.7.0.tgz#e01e8ce136098ade1b14ee691ea20fc4dc60abf6" + integrity sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "^3.0.0" + global "^4.4.0" + macos-release@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" @@ -8030,6 +8073,16 @@ mpd-parser@0.14.0: global "^4.3.2" xmldom "^0.1.27" +mpd-parser@0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.17.0.tgz#d7f3002edcb706f98993ef75846a713d056d3332" + integrity sha512-oKS5G0jCcHHJ3sHYlcLeM9Xcbuixl08eAx7QW0Th7ChlZiI0YvLtGaHE/L0aKUBJFNvtkeksIr8XgJgSBBsS4g== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "^3.0.2" + global "^4.4.0" + xmldom "^0.5.0" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -8058,6 +8111,13 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" +mux.js@5.11.1: + version "5.11.1" + resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.11.1.tgz#531192c2c5ee5e9abb6243ba58e2c1ef916b35eb" + integrity sha512-U/JKEU4GZfk2BpEQpPfmH81nF79UKK2a1QOb6PF9viPspJpexGt11YzR/nTKNWdfjWG0DGjcSU+zb2F52Z/q8w== + dependencies: + "@babel/runtime" "^7.11.2" + mux.js@5.6.7: version "5.6.7" resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.6.7.tgz#d39fc85cded5a1257de9f6eeb5cf1578c4a63eb8" @@ -9933,9 +9993,9 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== regenerator-transform@^0.14.2: version "0.14.4" @@ -11918,9 +11978,10 @@ url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" -url-toolkit@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2" +url-toolkit@^2.1.6, url-toolkit@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d" + integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug== url@^0.11.0: version "0.11.0" @@ -12050,7 +12111,26 @@ vfile@^2.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" -"video.js@^6 || ^7", video.js@^7.0.0, video.js@^7.10.1: +"video.js@^6 || ^7", video.js@^7.10.1: + version "7.13.3" + resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.13.3.tgz#5efab7bd56267406307f64d110662b2ccb3d7530" + integrity sha512-rIGPFRh3v0HqSdfj+/iByKRDBgLVqILK/4i/hW15DfjvgCGhwbw53bRBoJXy496hwh/XYeOAqckc87L2FN375g== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/http-streaming" "2.9.1" + "@videojs/vhs-utils" "^3.0.2" + "@videojs/xhr" "2.5.1" + aes-decrypter "3.1.2" + global "^4.4.0" + keycode "^2.2.0" + m3u8-parser "4.7.0" + mpd-parser "0.17.0" + mux.js "5.11.1" + safe-json-parse "4.0.0" + videojs-font "3.2.0" + videojs-vtt.js "^0.15.3" + +video.js@^7.0.0: version "7.10.2" resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.10.2.tgz#5156aabad7820e726d72ea6c32324059c68885a4" integrity sha512-kJTTrqcQn2MhPzWR8zQs6W3HPJWpowO/ZGZcKt2dcJeJdJT0dEDLYtiFdjV37SylCmu66V0flRnV8cipbthveQ== @@ -12092,10 +12172,10 @@ videojs-logo@^2.1.4: global "^4.3.2" video.js "^6 || ^7" -videojs-vtt.js@^0.15.2: - version "0.15.2" - resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.2.tgz#a828c4ea0aac6303fa471fd69bc7586a5ba1a273" - integrity sha512-kEo4hNMvu+6KhPvVYPKwESruwhHC3oFis133LwhXHO9U7nRnx0RiJYMiqbgwjgazDEXHR6t8oGJiHM6wq5XlAw== +videojs-vtt.js@^0.15.2, videojs-vtt.js@^0.15.3: + version "0.15.3" + resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993" + integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag== dependencies: global "^4.3.1" @@ -12540,6 +12620,11 @@ xmldom@^0.3.0: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a" integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g== +xmldom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== + xpipe@*: version "1.0.5" resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf" -- 2.45.3 From 7301184255de4095528727fd0b425c74401529e6 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Wed, 7 Jul 2021 14:25:48 +0800 Subject: [PATCH 5/9] yarn.lock fix for "upgrade video.js to 7.13.3" --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index c7a002acc..4a1511231 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12111,7 +12111,7 @@ vfile@^2.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" -"video.js@^6 || ^7", video.js@^7.10.1: +"video.js@^6 || ^7", video.js@^7.13.3: version "7.13.3" resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.13.3.tgz#5efab7bd56267406307f64d110662b2ccb3d7530" integrity sha512-rIGPFRh3v0HqSdfj+/iByKRDBgLVqILK/4i/hW15DfjvgCGhwbw53bRBoJXy496hwh/XYeOAqckc87L2FN375g== -- 2.45.3 From ffadae9373057493e67092cc321c0379d2337a4d Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Tue, 6 Jul 2021 09:28:20 +0800 Subject: [PATCH 6/9] Remove unused (?) selector --- ui/component/claimListDiscover/index.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ui/component/claimListDiscover/index.js b/ui/component/claimListDiscover/index.js index 49c48fb7b..db5d76259 100644 --- a/ui/component/claimListDiscover/index.js +++ b/ui/component/claimListDiscover/index.js @@ -12,14 +12,6 @@ import { doToggleTagFollowDesktop } from 'redux/actions/tags'; import { makeSelectClientSetting, selectShowMatureContent, selectLanguage } from 'redux/selectors/settings'; import { selectModerationBlockList } from 'redux/selectors/comments'; import ClaimListDiscover from './view'; -import { createSelector } from 'reselect'; - -const selectState = state => state.claims || {}; - -export const selectClaimsById = createSelector( - selectState, - state => state.byId || {} -); const select = (state) => ({ followedTags: selectFollowedTags(state), -- 2.45.3 From 60384772afa2337d83defd25df90c6c5a5cdf54d Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 6 Jul 2021 09:56:15 -0400 Subject: [PATCH 7/9] remove words like "revoke" and "claim" from abandon modal --- ui/modal/modalRevokeClaim/view.jsx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ui/modal/modalRevokeClaim/view.jsx b/ui/modal/modalRevokeClaim/view.jsx index d91fda2d7..ef68001b4 100644 --- a/ui/modal/modalRevokeClaim/view.jsx +++ b/ui/modal/modalRevokeClaim/view.jsx @@ -34,22 +34,24 @@ export default function ModalRevokeClaim(props: Props) { function getButtonLabel(type: string, isSupport: boolean) { if (isSupport && type === txnTypes.SUPPORT) { - return __('Confirm Support Revoke'); + return __('Confirm Support Removal'); } else if (type === txnTypes.SUPPORT) { return __('Confirm Tip Unlock'); + } else if (type === txnTypes.CHANNEL) { + return __('Confirm Channel Removal'); } - return __('Confirm Claim Revoke'); + return __('Confirm Removal'); } function getMsgBody(type: string, isSupport: boolean, name: string) { if (isSupport && type === txnTypes.SUPPORT) { return ( -

{__('Are you sure you want to remove this support?')}

+

{__('Are you sure you want to remove this boost?')}

}}> - These Credits are permanently yours and can be removed at any time. Removing this support will reduce the - claim's discoverability and return the %lbc% to your spendable balance. + These Credits are permanently yours and this boost can be removed at any time. Removing this boost will reduce + discoverability and return %lbc% to your spendable balance.

@@ -60,7 +62,7 @@ export default function ModalRevokeClaim(props: Props) {

{__('Are you sure you want to unlock these Credits?')}

{__( - 'These Credits are permanently yours and can be unlocked at any time. Unlocking them allows you to spend them, but can hurt the performance of your content in lookups and search results. It is recommended you leave tips locked until you need or want to spend them.' + 'These Credits are permanently yours and can be unlocked at any time. Unlocking them allows you to spend them, but reduces discoverability of your content in lookups and search results. It is recommended you leave Credits locked until you need or want to spend them.' )}

@@ -70,10 +72,10 @@ export default function ModalRevokeClaim(props: Props) {

{__( - "You're about to permanently delete a channel. Content published under this channel will be orphaned and their signing channel invalid. Content sync programs using this channel will fail." + "This will permanently remove your channel. Content published under this channel will be orphaned." )}

-

{__('Are you sure? Type %name% to confirm that you wish to delete the channel.', { name })}

+

{__('Are you sure? Type %name% to confirm that you wish to remove the channel.', { name })}

setChannelName(e.target.value)} /> ); @@ -81,11 +83,11 @@ export default function ModalRevokeClaim(props: Props) { return ( -

{__('Are you sure you want to revoke this claim?')}

+

{__('Are you sure you want to remove this?')}

}}> This will prevent others from resolving and accessing the content you published. It will return the %lbc% to - your spendable balance, less a small transaction fee. + your spendable balance.

{__('FINAL WARNING: This action is permanent and cannot be undone.')}

-- 2.45.3 From a422e857e3ce0c6b8c2619acccb60d3b164562f5 Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 7 Jul 2021 10:21:17 -0400 Subject: [PATCH 8/9] do file remove too --- ui/modal/modalRemoveFile/view.jsx | 8 ++++---- ui/modal/modalRevokeClaim/view.jsx | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ui/modal/modalRemoveFile/view.jsx b/ui/modal/modalRemoveFile/view.jsx index 329e7821f..38bdba168 100644 --- a/ui/modal/modalRemoveFile/view.jsx +++ b/ui/modal/modalRemoveFile/view.jsx @@ -32,7 +32,7 @@ function ModalRemoveFile(props: Props) { title={__('Remove File')} subtitle={ {`"${title}"`} }}> - Are you sure you'd like to remove %title% from LBRY? + Are you sure you'd like to remove %title%? } body={ @@ -55,7 +55,7 @@ function ModalRemoveFile(props: Props) { }} > - Abandon on blockchain (%lbc%) + Remove from blockchain (%lbc%) } type="checkbox" @@ -63,7 +63,7 @@ function ModalRemoveFile(props: Props) { onChange={() => setAbandonChecked(!abandonChecked)} /> {abandonChecked === true && ( -

{__('This action is permanent and cannot be undone.')}

+

{__('This action is permanent and cannot be undone')}

)} {/* @if TARGET='app' */} @@ -86,7 +86,7 @@ function ModalRemoveFile(props: Props) {