Merge pull request #629 from lbryio/daemon-chainquery-fixes

Fix first load (publish) shortId's with daemon and chainquery
This commit is contained in:
Shawn K 2018-10-12 01:02:05 -05:00 committed by GitHub
commit 418dda62d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View file

@ -10,9 +10,12 @@ const publish = (publishParams, fileName, fileType) => {
let publishResults, certificateId, channelName;
// publish the file
return publishClaim(publishParams)
.then(tx => {
logger.info(`Successfully published ${publishParams.name} ${fileName}`, tx);
publishResults = tx;
.then(result => {
logger.info(`Successfully published ${publishParams.name} ${fileName}`, result);
// Support new daemon, TODO: remove
publishResults = result.output && result.output.claim_id ? result.output : result;
// get the channel information
if (publishParams.channel_name) {
logger.debug(`this claim was published in channel: ${publishParams.channel_name}`);

View file

@ -12,7 +12,7 @@ const claimShortId = async ({ ip, originalUrl, body, params }, res) => {
try {
let shortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(params.longId, params.name).catch(() => {});
if(shortId === null) {
if(!shortId) {
shortId = await db.Claim.getShortClaimIdFromLongClaimId(params.longId, params.name);
}