diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js index ab0e3ce3..f5c50a1f 100644 --- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js +++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js @@ -7,7 +7,7 @@ const NO_FILE = 'NO_FILE'; const NO_CHANNEL = 'NO_CHANNEL'; const NO_CLAIM = 'NO_CLAIM'; -function serveAssetToClient (claimId, name, res) { +const serveAssetToClient = (claimId, name, res) => { return getLocalFileRecord(claimId, name) .then(fileRecord => { // check that a local record was found diff --git a/server/models/blocked.js b/server/models/blocked.js index 04adbb79..a3955c47 100644 --- a/server/models/blocked.js +++ b/server/models/blocked.js @@ -1,5 +1,7 @@ +const logger = require('winston'); + module.exports = (sequelize, { STRING }) => { - return sequelize.define( + const Blocked = sequelize.define( 'Blocked', { outpoint: { @@ -11,4 +13,26 @@ module.exports = (sequelize, { STRING }) => { freezeTableName: true, } ); + + Blocked.isBlocked = function (outpoint) { + logger.debug(`checking to see if ${outpoint} is blocked`); + return new Promise((resolve, reject) => { + this.findOne({ + where: { + outpoint, + }, + }) + .then(result => { + if (!result) { + return resolve(false); + } + resolve(true); + }) + .catch(error => { + reject(error); + }); + }); + }; + + return Blocked; }; diff --git a/server/models/claim.js b/server/models/claim.js index 1ab5f355..a5232e6d 100644 --- a/server/models/claim.js +++ b/server/models/claim.js @@ -315,7 +315,10 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => { Claim.validateLongClaimId = function (name, claimId) { return new Promise((resolve, reject) => { this.findOne({ - where: {name, claimId}, + where: { + name, + claimId, + }, }) .then(result => { if (!result) {