Merge branch 'master' into undefined-og-description

This commit is contained in:
Bill Bittner 2017-11-13 13:57:09 -08:00 committed by GitHub
commit 1aa05b2b1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 713 additions and 795 deletions

View file

@ -67,12 +67,12 @@ function getAssetByLongClaimId (fullClaimId, name) {
db.Claim
.resolveClaim(name, fullClaimId)
.then(resolveResult => {
logger.debug('resolve result >> ', resolveResult.dataValues);
// if no result, return early (claim doesn't exist or isn't free)
if (!resolveResult) {
resolve(NO_CLAIM);
return;
}
logger.debug('resolve result >> ', resolveResult.dataValues);
let fileRecord = {};
// get the claim
lbryApi.getClaim(`${name}#${fullClaimId}`)