diff --git a/config.js b/config.js index f7ab434b1..1368a06cb 100644 --- a/config.js +++ b/config.js @@ -45,7 +45,7 @@ const config = { YRBL_HAPPY_IMG_URL: process.env.YRBL_HAPPY_IMG_URL, YRBL_SAD_IMG_URL: process.env.YRBL_SAD_IMG_URL, LOGIN_IMG_URL: process.env.LOGIN_IMG_URL, - SITE_CANONICAL_URL: process.env.SITE_CANONICAL_URL, + // SITE_CANONICAL_URL: process.env.SITE_CANONICAL_URL, DEFAULT_LANGUAGE: process.env.DEFAULT_LANGUAGE, AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS, UNSYNCED_SETTINGS: process.env.UNSYNCED_SETTINGS, diff --git a/electron/index.js b/electron/index.js index b73653280..56d2aa9fa 100644 --- a/electron/index.js +++ b/electron/index.js @@ -7,7 +7,6 @@ import https from 'https'; import { app, dialog, ipcMain, session, shell, BrowserWindow } from 'electron'; import { autoUpdater } from 'electron-updater'; import Lbry from 'lbry'; -import LbryFirstInstance from './LbryFirstInstance'; import Daemon from './Daemon'; import isDev from 'electron-is-dev'; import createTray from './createTray'; @@ -100,51 +99,51 @@ const startDaemon = async () => { } }; -let isLbryFirstRunning = false; -const startLbryFirst = async () => { - if (isLbryFirstRunning) { - console.log('LbryFirst already running'); - handleLbryFirstLaunched(); - return; - } - - console.log('LbryFirst: Starting...'); - - try { - lbryFirst = new LbryFirstInstance(); - lbryFirst.on('exit', e => { - if (!isDev) { - lbryFirst = null; - isLbryFirstRunning = false; - if (!appState.isQuitting) { - dialog.showErrorBox( - 'LbryFirst has Exited', - 'The lbryFirst may have encountered an unexpected error, or another lbryFirst instance is already running. \n\n', - e - ); - } - app.quit(); - } - }); - } catch (e) { - console.log('LbryFirst: Failed to create new instance\n\n', e); - } - - console.log('LbryFirst: Running...'); - - try { - await lbryFirst.launch(); - handleLbryFirstLaunched(); - } catch (e) { - isLbryFirstRunning = false; - console.log('LbryFirst: Failed to start\n', e); - } -}; - -const handleLbryFirstLaunched = () => { - isLbryFirstRunning = true; - rendererWindow.webContents.send('lbry-first-launched'); -}; +// let isLbryFirstRunning = false; +// const startLbryFirst = async () => { +// if (isLbryFirstRunning) { +// console.log('LbryFirst already running'); +// handleLbryFirstLaunched(); +// return; +// } +// +// console.log('LbryFirst: Starting...'); +// +// try { +// lbryFirst = new LbryFirstInstance(); +// lbryFirst.on('exit', e => { +// if (!isDev) { +// lbryFirst = null; +// isLbryFirstRunning = false; +// if (!appState.isQuitting) { +// dialog.showErrorBox( +// 'LbryFirst has Exited', +// 'The lbryFirst may have encountered an unexpected error, or another lbryFirst instance is already running. \n\n', +// e +// ); +// } +// app.quit(); +// } +// }); +// } catch (e) { +// console.log('LbryFirst: Failed to create new instance\n\n', e); +// } +// +// console.log('LbryFirst: Running...'); +// +// try { +// await lbryFirst.launch(); +// handleLbryFirstLaunched(); +// } catch (e) { +// isLbryFirstRunning = false; +// console.log('LbryFirst: Failed to start\n', e); +// } +// }; +// +// const handleLbryFirstLaunched = () => { +// isLbryFirstRunning = true; +// rendererWindow.webContents.send('lbry-first-launched'); +// }; // When we are starting the app, ensure there are no other apps already running const gotSingleInstanceLock = app.requestSingleInstanceLock(); @@ -400,15 +399,15 @@ ipcMain.on('version-info-requested', () => { requestLatestRelease(); }); - -ipcMain.on('launch-lbry-first', async () => { - try { - await startLbryFirst(); - } catch (e) { - console.log('Failed to start LbryFirst'); - console.log(e); - } -}); +// +// ipcMain.on('launch-lbry-first', async () => { +// try { +// await startLbryFirst(); +// } catch (e) { +// console.log('Failed to start LbryFirst'); +// console.log(e); +// } +// }); process.on('uncaughtException', error => { console.log(error); diff --git a/extras/lbryinc/lbryio.js b/extras/lbryinc/lbryio.js index 89c0536e9..b1f687f8f 100644 --- a/extras/lbryinc/lbryio.js +++ b/extras/lbryinc/lbryio.js @@ -111,7 +111,7 @@ Lbryio.getAuthToken = () => Lbryio.getCurrentUser = () => Lbryio.call('user', 'me'); -Lbryio.authenticate = (domain, language) => { +Lbryio.authenticate = (language) => { if (!Lbryio.enabled) { const params = { id: 1, @@ -155,10 +155,7 @@ Lbryio.authenticate = (domain, language) => { .then( status => new Promise((res, rej) => { - const appId = - domain && domain !== 'lbry.tv' - ? (domain.replace(/[.]/gi, '') + status.installation_id).slice(0, 66) - : status.installation_id; + const appId = status.installation_id; Lbryio.call( 'user', 'new', diff --git a/static/app-strings.json b/static/app-strings.json index b3527b9b3..c9ee182ac 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1661,7 +1661,6 @@ "Short (< 4 minutes)": "Short (< 4 minutes)", "Long (> 20 min)": "Long (> 20 min)", "POWERED BY %lbry_link%": "POWERED BY %lbry_link%", - "Learn more about LBRY Credits on %DOMAIN%": "Learn more about LBRY Credits on %DOMAIN%", "Results boosted by %lbc%": "Results boosted by %lbc%", "This will be visible in a few minutes.": "This will be visible in a few minutes.", "Turn on notifications": "Turn on notifications", @@ -2222,5 +2221,6 @@ "Your wallet is not currently using a cloud sync service. You are in control of backing up your wallet.": "Your wallet is not currently using a cloud sync service. You are in control of backing up your wallet.", "Sending": "Sending", "You sent %lbc%": "You sent %lbc%", + "Learn more about LBRY Credits": "Learn more about LBRY Credits", "--end--": "--end--" } diff --git a/ui/component/collectionEdit/view.jsx b/ui/component/collectionEdit/view.jsx index 108e21493..824a33878 100644 --- a/ui/component/collectionEdit/view.jsx +++ b/ui/component/collectionEdit/view.jsx @@ -1,5 +1,4 @@ // @flow -import { DOMAIN } from 'config'; import React from 'react'; import classnames from 'classnames'; import Button from 'component/button'; @@ -90,7 +89,7 @@ function CollectionForm(props: Props) { onDone, } = props; const activeChannelName = activeChannelClaim && activeChannelClaim.name; - let prefix = IS_WEB ? `${DOMAIN}/` : 'lbry://'; + let prefix = 'lbry://'; if (activeChannelName && !incognito) { prefix += `${activeChannelName}/`; } diff --git a/ui/component/privacyAgreement/index.js b/ui/component/privacyAgreement/index.js index f7b4e3082..046f866bc 100644 --- a/ui/component/privacyAgreement/index.js +++ b/ui/component/privacyAgreement/index.js @@ -1,4 +1,3 @@ -import { DOMAIN } from 'config'; import { connect } from 'react-redux'; import { doSetDaemonSetting } from 'redux/actions/settings'; import { doSetWelcomeVersion, doToggle3PAnalytics, doSignOut } from 'redux/actions/app'; @@ -19,8 +18,7 @@ const perform = (dispatch) => ({ setShareDataInternal: (share) => dispatch(doSetDaemonSetting(DAEMON_SETTINGS.SHARE_USAGE_DATA, share)), setShareDataThirdParty: (share) => dispatch(doToggle3PAnalytics(share)), signOut: () => dispatch(doSignOut()), - authenticateIfSharingData: () => - dispatch(doAuthenticate(appVersion, undefined, undefined, true, undefined, undefined, DOMAIN)), + authenticateIfSharingData: () => dispatch(doAuthenticate(appVersion, undefined, undefined, true)), }); export default connect(select, perform)(PrivacyAgreement); diff --git a/ui/component/publishName/view.jsx b/ui/component/publishName/view.jsx index 3c5ff7f85..fa882e067 100644 --- a/ui/component/publishName/view.jsx +++ b/ui/component/publishName/view.jsx @@ -1,5 +1,4 @@ // @flow -import { DOMAIN } from 'config'; import { INVALID_NAME_ERROR } from 'constants/claim'; import React, { useState, useEffect } from 'react'; import { isNameValid } from 'util/lbryURI'; @@ -32,7 +31,7 @@ function PublishName(props: Props) { const [nameError, setNameError] = useState(undefined); const [blurred, setBlurred] = React.useState(false); const activeChannelName = activeChannelClaim && activeChannelClaim.name; - let prefix = IS_WEB ? `${DOMAIN}/` : 'lbry://'; + let prefix = 'lbry://'; if (activeChannelName && !incognito) { prefix += `${activeChannelName}/`; } diff --git a/ui/component/searchTopClaim/view.jsx b/ui/component/searchTopClaim/view.jsx index ab884740f..139284883 100644 --- a/ui/component/searchTopClaim/view.jsx +++ b/ui/component/searchTopClaim/view.jsx @@ -10,7 +10,6 @@ import ClaimRepostAuthor from 'component/claimRepostAuthor'; import I18nMessage from 'component/i18nMessage'; import { useHistory } from 'react-router'; import LbcSymbol from 'component/common/lbc-symbol'; -import { DOMAIN } from 'config'; type Props = { query: string, @@ -82,11 +81,7 @@ export default function SearchTopClaim(props: Props) {
{__('Uploading thumbnail')}...
} {!thumbUploaded && (- {manualInput - ? __('Enter a URL for your thumbnail.') - : __('Upload your thumbnail to %domain%. Recommended size is 16:9.', { domain: DOMAIN })} + {manualInput ? __('Enter a URL for your thumbnail.') : __('Upload your thumbnail. Recommended size is 16:9.')}
)} > diff --git a/ui/component/sideNavigation/view.jsx b/ui/component/sideNavigation/view.jsx index b2c10b8c4..b8ac38599 100644 --- a/ui/component/sideNavigation/view.jsx +++ b/ui/component/sideNavigation/view.jsx @@ -6,11 +6,9 @@ import * as KEYCODES from 'constants/keycodes'; import React from 'react'; import Button from 'component/button'; import classnames from 'classnames'; -import Icon from 'component/common/icon'; import NotificationBubble from 'component/notificationBubble'; -import I18nMessage from 'component/i18nMessage'; import ChannelThumbnail from 'component/channelThumbnail'; -import { DOMAIN, ENABLE_UI_NOTIFICATIONS } from 'config'; +import { ENABLE_UI_NOTIFICATIONS } from 'config'; import { IS_MAC } from 'component/app/view'; const HOME = { @@ -249,23 +247,6 @@ function SideNavigation(props: Props) { return () => window.removeEventListener('keydown', handleKeydown); }, [sidebarOpen, setSidebarOpen, isAbsolute]); - const unAuthNudge = - DOMAIN === 'lbry.tv' ? null : ( -