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

update livestream eligibilty

Browse source 
add CHANNEL_STAKED_LEVEL_LIVESTREAM to config set to level 5
use odysee_live_enabled tag on users insead of experimental_ui
This commit is contained in:
seanyesmunt 2021-04-08 15:19:14 -04:00 committed by Sean Yesmunt
parent 47c2d4633d
commit f5125b25c2
8 changed files with 80 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.defaults
View file

@ -32,6 +32,7 @@ ENABLE_FILE_REACTIONS=false
ENABLE_CREATOR_REACTIONS=false ENABLE_CREATOR_REACTIONS=false
ENABLE_NO_SOURCE_CLAIMS=false ENABLE_NO_SOURCE_CLAIMS=false
CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS=4 CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS=4
CHANNEL_STAKED_LEVEL_LIVESTREAM=5
# OG # OG
OG_TITLE_SUFFIX=| lbry.tv OG_TITLE_SUFFIX=| lbry.tv

1
config.js
View file

@ -37,6 +37,7 @@ const config = {
ENABLE_CREATOR_REACTIONS: process.env.ENABLE_CREATOR_REACTIONS === 'true', ENABLE_CREATOR_REACTIONS: process.env.ENABLE_CREATOR_REACTIONS === 'true',
ENABLE_NO_SOURCE_CLAIMS: process.env.ENABLE_NO_SOURCE_CLAIMS === 'true', ENABLE_NO_SOURCE_CLAIMS: process.env.ENABLE_NO_SOURCE_CLAIMS === 'true',
CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS: process.env.CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS, CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS: process.env.CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS,
CHANNEL_STAKED_LEVEL_LIVESTREAM: process.env.CHANNEL_STAKED_LEVEL_LIVESTREAM,
SIMPLE_SITE: process.env.SIMPLE_SITE === 'true', SIMPLE_SITE: process.env.SIMPLE_SITE === 'true',
SHOW_ADS: process.env.SHOW_ADS === 'true', SHOW_ADS: process.env.SHOW_ADS === 'true',
PINNED_URI_1: process.env.PINNED_URI_1, PINNED_URI_1: process.env.PINNED_URI_1,

2
flow-typed/user.js vendored
View file

@ -28,4 +28,6 @@ declare type User = {
device_types: Array<DeviceType>, device_types: Array<DeviceType>,
lbry_first_approved: boolean, lbry_first_approved: boolean,
experimental_ui: boolean, experimental_ui: boolean,
odysee_live_enabled: boolean,
odysee_live_disabled: boolean,
}; };

3
ui/component/header/index.js
View file

@ -7,7 +7,7 @@ import { doClearEmailEntry, doClearPasswordEntry } from 'redux/actions/user';
import { doSetClientSetting } from 'redux/actions/settings'; import { doSetClientSetting } from 'redux/actions/settings';
import { doSignOut, doOpenModal } from 'redux/actions/app'; import { doSignOut, doOpenModal } from 'redux/actions/app';
import { makeSelectClientSetting, selectLanguage } from 'redux/selectors/settings'; import { makeSelectClientSetting, selectLanguage } from 'redux/selectors/settings';
import { selectHasNavigated, selectActiveChannelClaim } from 'redux/selectors/app'; import { selectHasNavigated, selectActiveChannelClaim, selectActiveChannelStakedLevel } from 'redux/selectors/app';
import Header from './view'; import Header from './view';
const select = (state) => ({ const select = (state) => ({
@ -25,6 +25,7 @@ const select = (state) => ({
hasNavigated: selectHasNavigated(state), hasNavigated: selectHasNavigated(state),
user: selectUser(state), user: selectUser(state),
activeChannelClaim: selectActiveChannelClaim(state), activeChannelClaim: selectActiveChannelClaim(state),
activeChannelStakedLevel: selectActiveChannelStakedLevel(state),
}); });
const perform = (dispatch) => ({ const perform = (dispatch) => ({

11
ui/component/header/view.jsx
View file

@ -1,5 +1,5 @@
// @flow // @flow
import { LOGO_TITLE, ENABLE_NO_SOURCE_CLAIMS } from 'config'; import { LOGO_TITLE, ENABLE_NO_SOURCE_CLAIMS, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config';
import * as ICONS from 'constants/icons'; import * as ICONS from 'constants/icons';
import { SETTINGS } from 'lbry-redux'; import { SETTINGS } from 'lbry-redux';
import * as PAGES from 'constants/pages'; import * as PAGES from 'constants/pages';
@ -61,6 +61,7 @@ type Props = {
isAbsoluteSideNavHidden: boolean, isAbsoluteSideNavHidden: boolean,
hideCancel: boolean, hideCancel: boolean,
activeChannelClaim: ?ChannelClaim, activeChannelClaim: ?ChannelClaim,
activeChannelStakedLevel: number,
}; };
const Header = (props: Props) => { const Header = (props: Props) => {
@ -89,6 +90,7 @@ const Header = (props: Props) => {
user, user,
hideCancel, hideCancel,
activeChannelClaim, activeChannelClaim,
activeChannelStakedLevel,
} = props; } = props;
const isMobile = useIsMobile(); const isMobile = useIsMobile();
// on the verify page don't let anyone escape other than by closing the tab to keep session data consistent // on the verify page don't let anyone escape other than by closing the tab to keep session data consistent
@ -99,7 +101,12 @@ const Header = (props: Props) => {
const hasBackout = Boolean(backout); const hasBackout = Boolean(backout);
const { backLabel, backNavDefault, title: backTitle, simpleTitle: simpleBackTitle } = backout || {}; const { backLabel, backNavDefault, title: backTitle, simpleTitle: simpleBackTitle } = backout || {};
const notificationsEnabled = (user && user.experimental_ui) || false; const notificationsEnabled = (user && user.experimental_ui) || false;
const livestreamEnabled = (ENABLE_NO_SOURCE_CLAIMS && user && user.experimental_ui) || false; const livestreamEnabled = Boolean(
ENABLE_NO_SOURCE_CLAIMS &&
user &&
!user.odysee_live_disabled &&
(activeChannelStakedLevel >= CHANNEL_STAKED_LEVEL_LIVESTREAM || user.odysee_live_enabled)
);
const activeChannelUrl = activeChannelClaim && activeChannelClaim.permanent_url; const activeChannelUrl = activeChannelClaim && activeChannelClaim.permanent_url;
// Sign out if they click the "x" when they are on the password prompt // Sign out if they click the "x" when they are on the password prompt

8
ui/component/publishForm/index.js
View file

@ -15,7 +15,12 @@ import {
} from 'lbry-redux'; } from 'lbry-redux';
import { doPublishDesktop } from 'redux/actions/publish'; import { doPublishDesktop } from 'redux/actions/publish';
import { selectUnclaimedRewardValue } from 'redux/selectors/rewards'; import { selectUnclaimedRewardValue } from 'redux/selectors/rewards';
import { selectModal, selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app'; import {
selectModal,
selectActiveChannelClaim,
selectIncognito,
selectActiveChannelStakedLevel,
} from 'redux/selectors/app';
import { makeSelectClientSetting } from 'redux/selectors/settings'; import { makeSelectClientSetting } from 'redux/selectors/settings';
import PublishPage from './view'; import PublishPage from './view';
import { selectUser } from 'redux/selectors/user'; import { selectUser } from 'redux/selectors/user';
@ -36,6 +41,7 @@ const select = (state) => ({
enablePublishPreview: makeSelectClientSetting(SETTINGS.ENABLE_PUBLISH_PREVIEW)(state), enablePublishPreview: makeSelectClientSetting(SETTINGS.ENABLE_PUBLISH_PREVIEW)(state),
activeChannelClaim: selectActiveChannelClaim(state), activeChannelClaim: selectActiveChannelClaim(state),
incognito: selectIncognito(state), incognito: selectIncognito(state),
activeChannelStakedLevel: selectActiveChannelStakedLevel(state),
}); });
const perform = (dispatch) => ({ const perform = (dispatch) => ({

22
ui/component/publishForm/view.jsx
View file

@ -8,7 +8,7 @@
File upload is carried out in the background by that function. File upload is carried out in the background by that function.
*/ */
import { SITE_NAME, ENABLE_NO_SOURCE_CLAIMS, SIMPLE_SITE } from 'config'; import { SITE_NAME, ENABLE_NO_SOURCE_CLAIMS, SIMPLE_SITE, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config';
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { buildURI, isURIValid, isNameValid, THUMBNAIL_STATUSES } from 'lbry-redux'; import { buildURI, isURIValid, isNameValid, THUMBNAIL_STATUSES } from 'lbry-redux';
import Button from 'component/button'; import Button from 'component/button';
@ -80,7 +80,8 @@ type Props = {
enablePublishPreview: boolean, enablePublishPreview: boolean,
activeChannelClaim: ?ChannelClaim, activeChannelClaim: ?ChannelClaim,
incognito: boolean, incognito: boolean,
user: ?{ experimental_ui: boolean }, user: ?User,
activeChannelStakedLevel: number,
}; };
function PublishForm(props: Props) { function PublishForm(props: Props) {
@ -112,16 +113,21 @@ function PublishForm(props: Props) {
activeChannelClaim, activeChannelClaim,
incognito, incognito,
user, user,
activeChannelStakedLevel,
} = props; } = props;
const { replace, location } = useHistory(); const { replace, location } = useHistory();
const urlParams = new URLSearchParams(location.search); const urlParams = new URLSearchParams(location.search);
const uploadType = urlParams.get('type'); const uploadType = urlParams.get('type');
const livestreamEnabled =
ENABLE_NO_SOURCE_CLAIMS &&
user &&
!user.odysee_live_disabled &&
(activeChannelStakedLevel >= CHANNEL_STAKED_LEVEL_LIVESTREAM || user.odysee_live_enabled);
// $FlowFixMe // $FlowFixMe
const MODES = const MODES = livestreamEnabled
ENABLE_NO_SOURCE_CLAIMS && user && user.experimental_ui ? Object.values(PUBLISH_MODES)
? Object.values(PUBLISH_MODES) : Object.values(PUBLISH_MODES).filter((mode) => mode !== PUBLISH_MODES.LIVESTREAM);
: Object.values(PUBLISH_MODES).filter((mode) => mode !== PUBLISH_MODES.LIVESTREAM);
const MODE_TO_I18N_STR = { const MODE_TO_I18N_STR = {
[PUBLISH_MODES.FILE]: SIMPLE_SITE ? 'Video' : 'File', [PUBLISH_MODES.FILE]: SIMPLE_SITE ? 'Video' : 'File',
@ -304,14 +310,14 @@ function PublishForm(props: Props) {
return; return;
} }
// LiveStream publish // LiveStream publish
if (_uploadType === PUBLISH_MODES.LIVESTREAM.toLowerCase()) { if (_uploadType === PUBLISH_MODES.LIVESTREAM.toLowerCase() && livestreamEnabled) {
setMode(PUBLISH_MODES.LIVESTREAM); setMode(PUBLISH_MODES.LIVESTREAM);
return; return;
} }
// Default to standard file publish // Default to standard file publish
setMode(PUBLISH_MODES.FILE); setMode(PUBLISH_MODES.FILE);
}, [uploadType]); }, [uploadType, livestreamEnabled]);
useEffect(() => { useEffect(() => {
if (!uploadType) return; if (!uploadType) return;

73
ui/redux/selectors/app.js
View file

@ -1,11 +1,11 @@
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { selectClaimsById, selectMyChannelClaims } from 'lbry-redux'; import { selectClaimsById, selectMyChannelClaims, makeSelectStakedLevelForChannelUri } from 'lbry-redux';
export const selectState = state => state.app || {}; export const selectState = (state) => state.app || {};
export const selectPlatform = createSelector(selectState, state => state.platform); export const selectPlatform = createSelector(selectState, (state) => state.platform);
export const selectUpdateUrl = createSelector(selectPlatform, platform => { export const selectUpdateUrl = createSelector(selectPlatform, (platform) => {
switch (platform) { switch (platform) {
case 'darwin': case 'darwin':
return 'https://lbry.com/get/lbry.dmg'; return 'https://lbry.com/get/lbry.dmg';
@ -18,11 +18,11 @@ export const selectUpdateUrl = createSelector(selectPlatform, platform => {
} }
}); });
export const selectHasClickedComment = createSelector(selectState, state => state.hasClickedComment); export const selectHasClickedComment = createSelector(selectState, (state) => state.hasClickedComment);
export const selectRemoteVersion = createSelector(selectState, state => state.remoteVersion); export const selectRemoteVersion = createSelector(selectState, (state) => state.remoteVersion);
export const selectIsUpgradeAvailable = createSelector(selectState, state => state.isUpgradeAvailable); export const selectIsUpgradeAvailable = createSelector(selectState, (state) => state.isUpgradeAvailable);
export const selectUpgradeFilename = createSelector(selectPlatform, selectRemoteVersion, (platform, version) => { export const selectUpgradeFilename = createSelector(selectPlatform, selectRemoteVersion, (platform, version) => {
switch (platform) { switch (platform) {
@ -37,29 +37,29 @@ export const selectUpgradeFilename = createSelector(selectPlatform, selectRemote
} }
}); });
export const selectDownloadProgress = createSelector(selectState, state => state.downloadProgress); export const selectDownloadProgress = createSelector(selectState, (state) => state.downloadProgress);
export const selectDownloadComplete = createSelector(selectState, state => state.upgradeDownloadCompleted); export const selectDownloadComplete = createSelector(selectState, (state) => state.upgradeDownloadCompleted);
export const selectIsUpgradeSkipped = createSelector(selectState, state => state.isUpgradeSkipped); export const selectIsUpgradeSkipped = createSelector(selectState, (state) => state.isUpgradeSkipped);
export const selectUpgradeDownloadPath = createSelector(selectState, state => state.downloadPath); export const selectUpgradeDownloadPath = createSelector(selectState, (state) => state.downloadPath);
export const selectUpgradeDownloadItem = createSelector(selectState, state => state.downloadItem); export const selectUpgradeDownloadItem = createSelector(selectState, (state) => state.downloadItem);
export const selectAutoUpdateDownloaded = createSelector(selectState, state => state.autoUpdateDownloaded); export const selectAutoUpdateDownloaded = createSelector(selectState, (state) => state.autoUpdateDownloaded);
export const selectAutoUpdateDeclined = createSelector(selectState, state => state.autoUpdateDeclined); export const selectAutoUpdateDeclined = createSelector(selectState, (state) => state.autoUpdateDeclined);
export const selectDaemonVersionMatched = createSelector(selectState, state => state.daemonVersionMatched); export const selectDaemonVersionMatched = createSelector(selectState, (state) => state.daemonVersionMatched);
export const selectVolume = createSelector(selectState, state => state.volume); export const selectVolume = createSelector(selectState, (state) => state.volume);
export const selectMute = createSelector(selectState, state => state.muted); export const selectMute = createSelector(selectState, (state) => state.muted);
export const selectUpgradeTimer = createSelector(selectState, state => state.checkUpgradeTimer); export const selectUpgradeTimer = createSelector(selectState, (state) => state.checkUpgradeTimer);
export const selectModal = createSelector(selectState, state => { export const selectModal = createSelector(selectState, (state) => {
if (!state.modal) { if (!state.modal) {
return null; return null;
} }
@ -70,23 +70,23 @@ export const selectModal = createSelector(selectState, state => {
}; };
}); });
export const selectSearchOptionsExpanded = createSelector(selectState, state => state.searchOptionsExpanded); export const selectSearchOptionsExpanded = createSelector(selectState, (state) => state.searchOptionsExpanded);
export const selectWelcomeVersion = createSelector(selectState, state => state.welcomeVersion); export const selectWelcomeVersion = createSelector(selectState, (state) => state.welcomeVersion);
export const selectHasNavigated = createSelector(selectState, state => state.hasNavigated); export const selectHasNavigated = createSelector(selectState, (state) => state.hasNavigated);
export const selectAllowAnalytics = createSelector(selectState, state => state.allowAnalytics); export const selectAllowAnalytics = createSelector(selectState, (state) => state.allowAnalytics);
export const selectScrollStartingPosition = createSelector(selectState, state => state.currentScroll); export const selectScrollStartingPosition = createSelector(selectState, (state) => state.currentScroll);
export const selectIsPasswordSaved = createSelector(selectState, state => state.isPasswordSaved); export const selectIsPasswordSaved = createSelector(selectState, (state) => state.isPasswordSaved);
export const selectInterestedInYoutubeSync = createSelector(selectState, state => state.interestedInYoutubeSync); export const selectInterestedInYoutubeSync = createSelector(selectState, (state) => state.interestedInYoutubeSync);
export const selectSplashAnimationEnabled = createSelector(selectState, state => state.splashAnimationEnabled); export const selectSplashAnimationEnabled = createSelector(selectState, (state) => state.splashAnimationEnabled);
export const selectActiveChannelId = createSelector(selectState, state => state.activeChannel); export const selectActiveChannelId = createSelector(selectState, (state) => state.activeChannel);
export const selectActiveChannelClaim = createSelector( export const selectActiveChannelClaim = createSelector(
selectActiveChannelId, selectActiveChannelId,
@ -118,4 +118,19 @@ export const selectActiveChannelClaim = createSelector(
} }
); );
export const selectIncognito = createSelector(selectState, state => state.incognito); export const selectActiveChannelStakedLevel = createSelector(
(state) => state,
selectActiveChannelClaim,
(state, activeChannelClaim) => {
if (!activeChannelClaim) {
return 0;
}
const uri = activeChannelClaim.permanent_url;
const stakedLevel = makeSelectStakedLevelForChannelUri(uri)(state);
return stakedLevel;
}
);
export const selectIncognito = createSelector(selectState, (state) => state.incognito);