Merge branch 'master' into redux-persist
This commit is contained in:
Jeremy Kauffman
GitHub
commit
f975ef4b1b
14 changed files with 385 additions and 447 deletions
|
|
@ -1,5 +1,5 @@
|
|||
[bumpversion]
|
||||
current_version = 0.12.0
|
||||
current_version = 0.12.2rc2
|
||||
commit = True
|
||||
tag = True
|
||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ Web UI version numbers should always match the corresponding version of LBRY App
|
|||
*
|
||||
|
||||
### Changed
|
||||
*
|
||||
*
|
||||
* Upgraded to lbry daemon 0.13, including updating API signatures
|
||||
* Channels resolve much faster
|
||||
|
||||
### Fixed
|
||||
* Fix help menu force reloading whole app
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "LBRY",
|
||||
"version": "0.12.0",
|
||||
"version": "0.12.2rc2",
|
||||
"main": "main.js",
|
||||
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
https://github.com/lbryio/lbry/releases/download/v0.11.0/lbrynet-daemon-v0.11.0-OSNAME.zip
|
||||
https://github.com/lbryio/lbry/releases/download/v0.13.1rc1/lbrynet-daemon-v0.13.1rc1-OSNAME.zip
|
||||
|
|
|
|||
|
|
@ -256,23 +256,22 @@ export function doPurchaseUri(uri, purchaseModalName) {
|
|||
};
|
||||
}
|
||||
|
||||
export function doFetchClaimsByChannel(uri) {
|
||||
export function doFetchClaimsByChannel(uri, page = 1) {
|
||||
return function(dispatch, getState) {
|
||||
dispatch({
|
||||
type: types.FETCH_CHANNEL_CLAIMS_STARTED,
|
||||
data: { uri },
|
||||
});
|
||||
|
||||
lbry.resolve({ uri }).then(resolutionInfo => {
|
||||
const { claims_in_channel } = resolutionInfo
|
||||
? resolutionInfo
|
||||
: { claims_in_channel: [] };
|
||||
lbry.claim_list_by_channel({ uri, page }).then(result => {
|
||||
const claimResult = result[uri],
|
||||
claims = claimResult ? claimResult.claims_in_channel : [];
|
||||
|
||||
dispatch({
|
||||
type: types.FETCH_CHANNEL_CLAIMS_COMPLETED,
|
||||
data: {
|
||||
uri,
|
||||
claims: claims_in_channel,
|
||||
claims: claims,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ export function doDeleteFile(outpoint, deleteFromComputer) {
|
|||
|
||||
lbry.file_delete({
|
||||
outpoint: outpoint,
|
||||
delete_target_file: deleteFromComputer,
|
||||
delete_from_download_dir: deleteFromComputer,
|
||||
});
|
||||
|
||||
dispatch(doCloseModal());
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ export function doFetchTransactions() {
|
|||
type: types.FETCH_TRANSACTIONS_STARTED,
|
||||
});
|
||||
|
||||
lbry.call("transaction_list", {}, results => {
|
||||
lbry.transaction_list().then(results => {
|
||||
dispatch({
|
||||
type: types.FETCH_TRANSACTIONS_COMPLETED,
|
||||
data: {
|
||||
|
|
@ -55,7 +55,7 @@ export function doCheckAddressIsMine(address) {
|
|||
type: types.CHECK_ADDRESS_IS_MINE_STARTED,
|
||||
});
|
||||
|
||||
lbry.checkAddressIsMine(address, isMine => {
|
||||
lbry.wallet_is_address_mine({ address }).then(isMine => {
|
||||
if (!isMine) dispatch(doGetNewAddress());
|
||||
|
||||
dispatch({
|
||||
|
|
@ -103,12 +103,12 @@ export function doSendDraftTransaction() {
|
|||
dispatch(doOpenModal("transactionFailed"));
|
||||
};
|
||||
|
||||
lbry.sendToAddress(
|
||||
draftTx.amount,
|
||||
draftTx.address,
|
||||
successCallback,
|
||||
errorCallback
|
||||
);
|
||||
lbry
|
||||
.send_amount_to_address({
|
||||
amount: draftTx.amount,
|
||||
address: draftTx.address,
|
||||
})
|
||||
.then(successCallback, errorCallback);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@ class FileSelector extends React.PureComponent {
|
|||
handleButtonClick() {
|
||||
remote.dialog.showOpenDialog(
|
||||
{
|
||||
properties: [this.props.type == "file" ? "openFile" : "openDirectory"],
|
||||
properties: this.props.type == "file"
|
||||
? ["openFile"]
|
||||
: ["openDirectory", "createDirectory"],
|
||||
},
|
||||
paths => {
|
||||
if (!paths) {
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ class FileTile extends React.PureComponent {
|
|||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.resolve(this.props);
|
||||
const { isResolvingUri, claim, uri, resolveUri } = this.props;
|
||||
|
||||
if (!isResolvingUri && !claim && uri) resolveUri(uri);
|
||||
}
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
this.resolve(nextProps);
|
||||
}
|
||||
const { isResolvingUri, claim, uri, resolveUri } = this.props;
|
||||
|
||||
resolve({ isResolvingUri, claim, uri, resolveUri }) {
|
||||
if (!isResolvingUri && claim === undefined && uri) resolveUri(uri);
|
||||
}
|
||||
|
||||
|
|
|
|||
211
ui/js/lbry.js
211
ui/js/lbry.js
|
|
@ -1,15 +1,15 @@
|
|||
import lbryio from './lbryio.js';
|
||||
import lighthouse from './lighthouse.js';
|
||||
import jsonrpc from './jsonrpc.js';
|
||||
import lbryuri from './lbryuri.js';
|
||||
import { getLocal, getSession, setSession, setLocal } from './utils.js';
|
||||
import lbryio from "./lbryio.js";
|
||||
import lighthouse from "./lighthouse.js";
|
||||
import jsonrpc from "./jsonrpc.js";
|
||||
import lbryuri from "./lbryuri.js";
|
||||
import { getLocal, getSession, setSession, setLocal } from "./utils.js";
|
||||
|
||||
const { remote, ipcRenderer } = require('electron');
|
||||
const menu = remote.require('./menu/main-menu');
|
||||
const { remote, ipcRenderer } = require("electron");
|
||||
const menu = remote.require("./menu/main-menu");
|
||||
|
||||
let lbry = {
|
||||
isConnected: false,
|
||||
daemonConnectionString: 'http://localhost:5279/lbryapi',
|
||||
daemonConnectionString: "http://localhost:5279/lbryapi",
|
||||
pendingPublishTimeout: 20 * 60 * 1000,
|
||||
defaultClientSettings: {
|
||||
showNsfw: false,
|
||||
|
|
@ -18,10 +18,21 @@ let lbry = {
|
|||
useCustomLighthouseServers: false,
|
||||
customLighthouseServers: [],
|
||||
showDeveloperMenu: false,
|
||||
language: 'en'
|
||||
}
|
||||
language: "en",
|
||||
},
|
||||
};
|
||||
|
||||
function apiCall(method, params, resolve, reject) {
|
||||
return jsonrpc.call(
|
||||
lbry.daemonConnectionString,
|
||||
method,
|
||||
params,
|
||||
resolve,
|
||||
reject,
|
||||
reject
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Records a publish attempt in local storage. Returns a dictionary with all the data needed to
|
||||
* needed to make a dummy claim or file info object.
|
||||
|
|
@ -33,17 +44,17 @@ function savePendingPublish({ name, channel_name }) {
|
|||
} else {
|
||||
uri = lbryuri.build({ name: name }, false);
|
||||
}
|
||||
const pendingPublishes = getLocal('pendingPublishes') || [];
|
||||
const pendingPublishes = getLocal("pendingPublishes") || [];
|
||||
const newPendingPublish = {
|
||||
name,
|
||||
channel_name,
|
||||
claim_id: 'pending_claim_' + uri,
|
||||
txid: 'pending_' + uri,
|
||||
claim_id: "pending_claim_" + uri,
|
||||
txid: "pending_" + uri,
|
||||
nout: 0,
|
||||
outpoint: 'pending_' + uri + ':0',
|
||||
time: Date.now()
|
||||
outpoint: "pending_" + uri + ":0",
|
||||
time: Date.now(),
|
||||
};
|
||||
setLocal('pendingPublishes', [...pendingPublishes, newPendingPublish]);
|
||||
setLocal("pendingPublishes", [...pendingPublishes, newPendingPublish]);
|
||||
return newPendingPublish;
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +72,7 @@ function removePendingPublishIfNeeded({ name, channel_name, outpoint }) {
|
|||
}
|
||||
|
||||
setLocal(
|
||||
'pendingPublishes',
|
||||
"pendingPublishes",
|
||||
lbry.getPendingPublishes().filter(pub => !pubMatches(pub))
|
||||
);
|
||||
}
|
||||
|
|
@ -71,11 +82,11 @@ function removePendingPublishIfNeeded({ name, channel_name, outpoint }) {
|
|||
* removes them from the list.
|
||||
*/
|
||||
lbry.getPendingPublishes = function() {
|
||||
const pendingPublishes = getLocal('pendingPublishes') || [];
|
||||
const pendingPublishes = getLocal("pendingPublishes") || [];
|
||||
const newPendingPublishes = pendingPublishes.filter(
|
||||
pub => Date.now() - pub.time <= lbry.pendingPublishTimeout
|
||||
);
|
||||
setLocal('pendingPublishes', newPendingPublishes);
|
||||
setLocal("pendingPublishes", newPendingPublishes);
|
||||
return newPendingPublishes;
|
||||
};
|
||||
|
||||
|
|
@ -101,7 +112,7 @@ function pendingPublishToDummyClaim({
|
|||
outpoint,
|
||||
claim_id,
|
||||
txid,
|
||||
nout
|
||||
nout,
|
||||
}) {
|
||||
return { name, outpoint, claim_id, txid, nout, channel_name };
|
||||
}
|
||||
|
|
@ -110,23 +121,6 @@ function pendingPublishToDummyFileInfo({ name, outpoint, claim_id }) {
|
|||
return { name, outpoint, claim_id, metadata: null };
|
||||
}
|
||||
|
||||
lbry.call = function(
|
||||
method,
|
||||
params,
|
||||
callback,
|
||||
errorCallback,
|
||||
connectFailedCallback
|
||||
) {
|
||||
return jsonrpc.call(
|
||||
lbry.daemonConnectionString,
|
||||
method,
|
||||
params,
|
||||
callback,
|
||||
errorCallback,
|
||||
connectFailedCallback
|
||||
);
|
||||
};
|
||||
|
||||
//core
|
||||
lbry._connectPromise = null;
|
||||
lbry.connect = function() {
|
||||
|
|
@ -135,26 +129,20 @@ lbry.connect = function() {
|
|||
let tryNum = 0;
|
||||
|
||||
function checkDaemonStartedFailed() {
|
||||
if (tryNum <= 100) {
|
||||
if (tryNum <= 200) {
|
||||
// Move # of tries into constant or config option
|
||||
setTimeout(() => {
|
||||
tryNum++;
|
||||
checkDaemonStarted();
|
||||
}, tryNum < 50 ? 400 : 1000);
|
||||
} else {
|
||||
reject(new Error('Unable to connect to LBRY'));
|
||||
reject(new Error("Unable to connect to LBRY"));
|
||||
}
|
||||
}
|
||||
|
||||
// Check every half second to see if the daemon is accepting connections
|
||||
function checkDaemonStarted() {
|
||||
lbry.call(
|
||||
'status',
|
||||
{},
|
||||
resolve,
|
||||
checkDaemonStartedFailed,
|
||||
checkDaemonStartedFailed
|
||||
);
|
||||
lbry.status().then(resolve).catch(checkDaemonStartedFailed);
|
||||
}
|
||||
|
||||
checkDaemonStarted();
|
||||
|
|
@ -164,19 +152,6 @@ lbry.connect = function() {
|
|||
return lbry._connectPromise;
|
||||
};
|
||||
|
||||
lbry.checkAddressIsMine = function(address, callback) {
|
||||
lbry.call('wallet_is_address_mine', { address: address }, callback);
|
||||
};
|
||||
|
||||
lbry.sendToAddress = function(amount, address, callback, errorCallback) {
|
||||
lbry.call(
|
||||
'send_amount_to_address',
|
||||
{ amount: amount, address: address },
|
||||
callback,
|
||||
errorCallback
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Takes a LBRY URI; will first try and calculate a total cost using
|
||||
* Lighthouse. If Lighthouse can't be reached, it just retrives the
|
||||
|
|
@ -191,7 +166,7 @@ lbry.costPromiseCache = {};
|
|||
lbry.getCostInfo = function(uri) {
|
||||
if (lbry.costPromiseCache[uri] === undefined) {
|
||||
lbry.costPromiseCache[uri] = new Promise((resolve, reject) => {
|
||||
const COST_INFO_CACHE_KEY = 'cost_info_cache';
|
||||
const COST_INFO_CACHE_KEY = "cost_info_cache";
|
||||
let costInfoCache = getSession(COST_INFO_CACHE_KEY, {});
|
||||
|
||||
function cacheAndResolve(cost, includesData) {
|
||||
|
|
@ -238,15 +213,13 @@ lbry.getCostInfo = function(uri) {
|
|||
* This currently includes a work-around to cache the file in local storage so that the pending
|
||||
* publish can appear in the UI immediately.
|
||||
*/
|
||||
lbry.publish = function(
|
||||
lbry.publishDeprecated = function(
|
||||
params,
|
||||
fileListedCallback,
|
||||
publishedCallback,
|
||||
errorCallback
|
||||
) {
|
||||
lbry.call(
|
||||
'publish',
|
||||
params,
|
||||
lbry.publish(params).then(
|
||||
result => {
|
||||
if (returnedPending) {
|
||||
return;
|
||||
|
|
@ -273,7 +246,7 @@ lbry.publish = function(
|
|||
if (publishedCallback) {
|
||||
savePendingPublish({
|
||||
name: params.name,
|
||||
channel_name: params.channel_name
|
||||
channel_name: params.channel_name,
|
||||
});
|
||||
publishedCallback(true);
|
||||
}
|
||||
|
|
@ -282,7 +255,7 @@ lbry.publish = function(
|
|||
const { name, channel_name } = params;
|
||||
savePendingPublish({
|
||||
name: params.name,
|
||||
channel_name: params.channel_name
|
||||
channel_name: params.channel_name,
|
||||
});
|
||||
fileListedCallback(true);
|
||||
}
|
||||
|
|
@ -292,7 +265,7 @@ lbry.publish = function(
|
|||
lbry.getClientSettings = function() {
|
||||
var outSettings = {};
|
||||
for (let setting of Object.keys(lbry.defaultClientSettings)) {
|
||||
var localStorageVal = localStorage.getItem('setting_' + setting);
|
||||
var localStorageVal = localStorage.getItem("setting_" + setting);
|
||||
outSettings[setting] = localStorageVal === null
|
||||
? lbry.defaultClientSettings[setting]
|
||||
: JSON.parse(localStorageVal);
|
||||
|
|
@ -301,8 +274,8 @@ lbry.getClientSettings = function() {
|
|||
};
|
||||
|
||||
lbry.getClientSetting = function(setting) {
|
||||
var localStorageVal = localStorage.getItem('setting_' + setting);
|
||||
if (setting == 'showDeveloperMenu') {
|
||||
var localStorageVal = localStorage.getItem("setting_" + setting);
|
||||
if (setting == "showDeveloperMenu") {
|
||||
return true;
|
||||
}
|
||||
return localStorageVal === null
|
||||
|
|
@ -317,67 +290,49 @@ lbry.setClientSettings = function(settings) {
|
|||
};
|
||||
|
||||
lbry.setClientSetting = function(setting, value) {
|
||||
return localStorage.setItem('setting_' + setting, JSON.stringify(value));
|
||||
};
|
||||
|
||||
lbry.getSessionInfo = function(callback) {
|
||||
lbry.call('status', { session_status: true }, callback);
|
||||
};
|
||||
|
||||
lbry.reportBug = function(message, callback) {
|
||||
lbry.call(
|
||||
'report_bug',
|
||||
{
|
||||
message: message
|
||||
},
|
||||
callback
|
||||
);
|
||||
return localStorage.setItem("setting_" + setting, JSON.stringify(value));
|
||||
};
|
||||
|
||||
//utilities
|
||||
lbry.formatCredits = function(amount, precision) {
|
||||
return amount.toFixed(precision || 1).replace(/\.?0+$/, '');
|
||||
return amount.toFixed(precision || 1).replace(/\.?0+$/, "");
|
||||
};
|
||||
|
||||
lbry.formatName = function(name) {
|
||||
// Converts LBRY name to standard format (all lower case, no special characters, spaces replaced by dashes)
|
||||
name = name.replace('/s+/g', '-');
|
||||
name = name.toLowerCase().replace(/[^a-z0-9\-]/g, '');
|
||||
name = name.replace("/s+/g", "-");
|
||||
name = name.toLowerCase().replace(/[^a-z0-9\-]/g, "");
|
||||
return name;
|
||||
};
|
||||
|
||||
lbry.imagePath = function(file) {
|
||||
return 'img/' + file;
|
||||
return "img/" + file;
|
||||
};
|
||||
|
||||
lbry.getMediaType = function(contentType, fileName) {
|
||||
if (contentType) {
|
||||
return /^[^/]+/.exec(contentType)[0];
|
||||
} else if (fileName) {
|
||||
var dotIndex = fileName.lastIndexOf('.');
|
||||
var dotIndex = fileName.lastIndexOf(".");
|
||||
if (dotIndex == -1) {
|
||||
return 'unknown';
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
var ext = fileName.substr(dotIndex + 1);
|
||||
if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) {
|
||||
return 'video';
|
||||
return "video";
|
||||
} else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) {
|
||||
return 'audio';
|
||||
return "audio";
|
||||
} else if (/^html|htm|pdf|odf|doc|docx|md|markdown|txt$/i.test(ext)) {
|
||||
return 'document';
|
||||
return "document";
|
||||
} else {
|
||||
return 'unknown';
|
||||
return "unknown";
|
||||
}
|
||||
} else {
|
||||
return 'unknown';
|
||||
return "unknown";
|
||||
}
|
||||
};
|
||||
|
||||
lbry.stop = function(callback) {
|
||||
lbry.call('stop', {}, callback);
|
||||
};
|
||||
|
||||
lbry._subscribeIdCount = 0;
|
||||
lbry._balanceSubscribeCallbacks = {};
|
||||
lbry._balanceSubscribeInterval = 5000;
|
||||
|
|
@ -418,22 +373,22 @@ lbry.balanceUnsubscribe = function(subscribeId) {
|
|||
};
|
||||
|
||||
lbry.showMenuIfNeeded = function() {
|
||||
const showingMenu = sessionStorage.getItem('menuShown') || null;
|
||||
const chosenMenu = lbry.getClientSetting('showDeveloperMenu')
|
||||
? 'developer'
|
||||
: 'normal';
|
||||
const showingMenu = sessionStorage.getItem("menuShown") || null;
|
||||
const chosenMenu = lbry.getClientSetting("showDeveloperMenu")
|
||||
? "developer"
|
||||
: "normal";
|
||||
if (chosenMenu != showingMenu) {
|
||||
menu.showMenubar(chosenMenu == 'developer');
|
||||
menu.showMenubar(chosenMenu == "developer");
|
||||
}
|
||||
sessionStorage.setItem('menuShown', chosenMenu);
|
||||
sessionStorage.setItem("menuShown", chosenMenu);
|
||||
};
|
||||
|
||||
lbry.getAppVersionInfo = function() {
|
||||
return new Promise((resolve, reject) => {
|
||||
ipcRenderer.once('version-info-received', (event, versionInfo) => {
|
||||
ipcRenderer.once("version-info-received", (event, versionInfo) => {
|
||||
resolve(versionInfo);
|
||||
});
|
||||
ipcRenderer.send('version-info-requested');
|
||||
ipcRenderer.send("version-info-requested");
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -463,8 +418,8 @@ lbry.file_list = function(params = {}) {
|
|||
}
|
||||
}
|
||||
|
||||
lbry.call(
|
||||
'file_list',
|
||||
apiCall(
|
||||
"file_list",
|
||||
params,
|
||||
fileInfos => {
|
||||
removePendingPublishIfNeeded({ name, channel_name, outpoint });
|
||||
|
|
@ -474,7 +429,6 @@ lbry.file_list = function(params = {}) {
|
|||
.map(pendingPublishToDummyFileInfo);
|
||||
resolve([...fileInfos, ...dummyFileInfos]);
|
||||
},
|
||||
reject,
|
||||
reject
|
||||
);
|
||||
});
|
||||
|
|
@ -482,15 +436,15 @@ lbry.file_list = function(params = {}) {
|
|||
|
||||
lbry.claim_list_mine = function(params = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
lbry.call(
|
||||
'claim_list_mine',
|
||||
apiCall(
|
||||
"claim_list_mine",
|
||||
params,
|
||||
claims => {
|
||||
for (let { name, channel_name, txid, nout } of claims) {
|
||||
removePendingPublishIfNeeded({
|
||||
name,
|
||||
channel_name,
|
||||
outpoint: txid + ':' + nout
|
||||
outpoint: txid + ":" + nout,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -499,36 +453,26 @@ lbry.claim_list_mine = function(params = {}) {
|
|||
.map(pendingPublishToDummyClaim);
|
||||
resolve([...claims, ...dummyClaims]);
|
||||
},
|
||||
reject,
|
||||
reject
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
const claimCacheKey = 'resolve_claim_cache';
|
||||
lbry._claimCache = getSession(claimCacheKey, {});
|
||||
|
||||
lbry._resolveXhrs = {};
|
||||
lbry.resolve = function(params = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!params.uri) {
|
||||
throw __('Resolve has hacked cache on top of it that requires a URI');
|
||||
throw __("Resolve has hacked cache on top of it that requires a URI");
|
||||
}
|
||||
if (params.uri && lbry._claimCache[params.uri] !== undefined) {
|
||||
resolve(lbry._claimCache[params.uri]);
|
||||
} else {
|
||||
lbry._resolveXhrs[params.uri] = lbry.call(
|
||||
'resolve',
|
||||
lbry._resolveXhrs[params.uri] = apiCall(
|
||||
"resolve",
|
||||
params,
|
||||
function(data) {
|
||||
if (data !== undefined) {
|
||||
lbry._claimCache[params.uri] = data;
|
||||
}
|
||||
setSession(claimCacheKey, lbry._claimCache);
|
||||
resolve(data);
|
||||
resolve(data && data[params.uri] ? data[params.uri] : {});
|
||||
},
|
||||
reject
|
||||
);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -547,17 +491,10 @@ lbry = new Proxy(lbry, {
|
|||
|
||||
return function(params = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
jsonrpc.call(
|
||||
lbry.daemonConnectionString,
|
||||
name,
|
||||
params,
|
||||
resolve,
|
||||
reject,
|
||||
reject
|
||||
);
|
||||
apiCall(name, params, resolve, reject);
|
||||
});
|
||||
};
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
export default lbry;
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ class HelpPage extends React.PureComponent {
|
|||
upgradeAvailable: upgradeAvailable,
|
||||
});
|
||||
});
|
||||
lbry.call("version", {}, info => {
|
||||
lbry.version().then(info => {
|
||||
this.setState({
|
||||
versionInfo: info,
|
||||
});
|
||||
});
|
||||
lbry.getSessionInfo(info => {
|
||||
lbry.status({ session_status: true }).then(info => {
|
||||
this.setState({
|
||||
lbryId: info.lbry_id,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ class PublishPage extends React.PureComponent {
|
|||
publishArgs.file_path = this.refs.file.getValue();
|
||||
}
|
||||
|
||||
lbry.publish(
|
||||
lbry.publishDeprecated(
|
||||
publishArgs,
|
||||
message => {
|
||||
this.handlePublishStarted();
|
||||
|
|
|
|||
|
|
@ -1,37 +1,45 @@
|
|||
import React from "react";
|
||||
import Link from "component/link";
|
||||
import { FormRow } from "component/form";
|
||||
import Modal from "../component/modal.js";
|
||||
import { doShowSnackBar } from "actions/app";
|
||||
import lbry from "../lbry.js";
|
||||
|
||||
class ReportPage extends React.PureComponent {
|
||||
class ReportPage extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
submitting: false,
|
||||
modal: null,
|
||||
message: "",
|
||||
};
|
||||
}
|
||||
|
||||
submitMessage() {
|
||||
if (this._messageArea.value) {
|
||||
const message = this.state.message;
|
||||
if (message) {
|
||||
this.setState({
|
||||
submitting: true,
|
||||
});
|
||||
lbry.reportBug(this._messageArea.value, () => {
|
||||
lbry.report_bug({ message }).then(() => {
|
||||
this.setState({
|
||||
submitting: false,
|
||||
modal: "submitted",
|
||||
});
|
||||
|
||||
// Display global notice
|
||||
const action = doShowSnackBar({
|
||||
message: __("Message received! Thanks for helping."),
|
||||
isError: false,
|
||||
});
|
||||
this._messageArea.value = "";
|
||||
window.app.store.dispatch(action);
|
||||
});
|
||||
|
||||
this.setState({ message: "" });
|
||||
}
|
||||
}
|
||||
|
||||
closeModal() {
|
||||
onMessageChange(event) {
|
||||
this.setState({
|
||||
modal: null,
|
||||
message: event.target.value,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -49,9 +57,12 @@ class ReportPage extends React.PureComponent {
|
|||
<div className="form-row">
|
||||
<FormRow
|
||||
type="textarea"
|
||||
ref={t => (this._messageArea = t)}
|
||||
rows="10"
|
||||
name="message"
|
||||
value={this.state.message}
|
||||
onChange={event => {
|
||||
this.onMessageChange(event);
|
||||
}}
|
||||
placeholder={__("Description of your issue")}
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -83,17 +94,6 @@ class ReportPage extends React.PureComponent {
|
|||
/>.
|
||||
</div>
|
||||
</section>
|
||||
<Modal
|
||||
isOpen={this.state.modal == "submitted"}
|
||||
contentLabel={__("Bug report submitted")}
|
||||
onConfirmed={event => {
|
||||
this.closeModal(event);
|
||||
}}
|
||||
>
|
||||
{__(
|
||||
"Your bug report has been submitted! Thank you for your feedback."
|
||||
)}
|
||||
</Modal>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "lbry-web-ui",
|
||||
"version": "0.12.0",
|
||||
"version": "0.12.2rc2",
|
||||
"description": "LBRY UI",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
|
|
|
|||
Loading…
Reference in a new issue