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

Wpe on ody #6729

Closed
jessopb wants to merge 9 commits from wpe-on-ody into odysee
pull from: wpe-on-ody
merge into: LBRYCommunity:odysee
Conversation 0 Commits 9 Files changed 25 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ffc93936a4 - Show all commits

2
config.js
View file

@ -9,6 +9,7 @@ const config = {
WEBPACK_ELECTRON_PORT: process.env.WEBPACK_ELECTRON_PORT, WEBPACK_ELECTRON_PORT: process.env.WEBPACK_ELECTRON_PORT,
WEB_SERVER_PORT: process.env.WEB_SERVER_PORT, WEB_SERVER_PORT: process.env.WEB_SERVER_PORT,
LBRY_WEB_API: process.env.LBRY_WEB_API, //api.na-backend.odysee.com', LBRY_WEB_API: process.env.LBRY_WEB_API, //api.na-backend.odysee.com',
LBRY_WEB_PUBLISH_API: process.env.LBRY_WEB_PUBLISH_API,
LBRY_API_URL: process.env.LBRY_API_URL, //api.lbry.com', LBRY_API_URL: process.env.LBRY_API_URL, //api.lbry.com',
LBRY_WEB_STREAMING_API: process.env.LBRY_WEB_STREAMING_API, //cdn.lbryplayer.xyz', LBRY_WEB_STREAMING_API: process.env.LBRY_WEB_STREAMING_API, //cdn.lbryplayer.xyz',
LBRY_WEB_BUFFER_API: process.env.LBRY_WEB_BUFFER_API, LBRY_WEB_BUFFER_API: process.env.LBRY_WEB_BUFFER_API,
@ -41,7 +42,6 @@ const config = {
DEFAULT_LANGUAGE: process.env.DEFAULT_LANGUAGE, DEFAULT_LANGUAGE: process.env.DEFAULT_LANGUAGE,
AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS, AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS,
UNSYNCED_SETTINGS: process.env.UNSYNCED_SETTINGS, UNSYNCED_SETTINGS: process.env.UNSYNCED_SETTINGS,
// AVATAR_DEFAULT: process.env.AVATAR_DEFAULT,
// ENABLE FEATURES // ENABLE FEATURES
ENABLE_COMMENT_REACTIONS: process.env.ENABLE_COMMENT_REACTIONS === 'true', ENABLE_COMMENT_REACTIONS: process.env.ENABLE_COMMENT_REACTIONS === 'true',

4
ui/index.jsx
View file

@ -35,7 +35,7 @@ import {
doAuthTokenRefresh, doAuthTokenRefresh,
} from 'util/saved-passwords'; } from 'util/saved-passwords';
import { X_LBRY_AUTH_TOKEN } from 'constants/token'; import { X_LBRY_AUTH_TOKEN } from 'constants/token';
import { LBRY_WEB_API, DEFAULT_LANGUAGE, LBRY_API_URL } from 'config'; import { LBRY_WEB_API, DEFAULT_LANGUAGE, LBRY_API_URL, LBRY_WEB_PUBLISH_API } from 'config';
// Import 3rd-party styles before ours for the current way we are code-splitting. // Import 3rd-party styles before ours for the current way we are code-splitting.
import 'scss/third-party.scss'; import 'scss/third-party.scss';
@ -70,7 +70,7 @@ if (process.env.SDK_API_URL) {
let sdkAPIHost = process.env.SDK_API_HOST || process.env.SDK_API_URL; let sdkAPIHost = process.env.SDK_API_HOST || process.env.SDK_API_URL;
// @if TARGET='web' // @if TARGET='web'
sdkAPIHost = LBRY_WEB_API; sdkAPIHost = LBRY_WEB_PUBLISH_API || LBRY_WEB_API;
// @endif // @endif
export const SDK_API_PATH = `${sdkAPIHost}/api/v1`; export const SDK_API_PATH = `${sdkAPIHost}/api/v1`;