LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Geoblock: support content claim id as well (#1096)

Browse source
This commit is contained in:
infinite-persistence 2022-03-15 11:48:26 -07:00 • committed by GitHub
parent 58c9209c96
commit 5445a95c9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/redux/selectors/claims.js
View file

@ -837,18 +837,20 @@ export const selectGeoRestrictionForUri = createCachedSelector(
selectGeoBlockLists, selectGeoBlockLists,
(claim, geoBlockLists) => { (claim, geoBlockLists) => {
const locale: LocaleInfo = window[SETTINGS.LOCALE]; // <-- NOTE: not handled by redux updates const locale: LocaleInfo = window[SETTINGS.LOCALE]; // <-- NOTE: not handled by redux updates
const channelId: ?string = getChannelIdFromClaim(claim);
if (locale && geoBlockLists && channelId && claim) { if (locale && geoBlockLists && claim) {
const claimId: ?string = claim.claim_id;
const channelId: ?string = getChannelIdFromClaim(claim);
let geoConfig: ?GeoConfig; let geoConfig: ?GeoConfig;
// --- livestreams // --- livestreams
if (isStreamPlaceholderClaim(claim)) { if (isStreamPlaceholderClaim(claim) && geoBlockLists.livestreams) {
geoConfig = geoBlockLists.livestreams && geoBlockLists.livestreams[channelId]; geoConfig = geoBlockLists.livestreams[channelId] || geoBlockLists.livestreams[claimId];
} }
// --- videos (a.k.a everything else) // --- videos (a.k.a everything else)
else { else if (geoBlockLists.videos) {
geoConfig = geoBlockLists.videos && geoBlockLists.videos[channelId]; geoConfig = geoBlockLists.videos[channelId] || geoBlockLists.videos[claimId];
} }
if (geoConfig) { if (geoConfig) {