LBRYCommunity/lbry-social-tipbot
1
0
Fork 0
Code Issues 3 Pull requests 3 Projects Releases Packages Wiki Activity

some improved error and message handling

Browse source
This commit is contained in:
Akinwale Ariwodola 2017-09-24 08:28:08 +01:00
parent 1aaa0c3ef2
commit 1ecd63245f
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app.js
View file

@ -223,9 +223,11 @@ const sendTip = (sender, recipient, amount, tipdata, callback) => {
if (senderBalance < amount || (senderBalance - amount) < 0) { if (senderBalance < amount || (senderBalance - amount) < 0) {
return sendPMUsingTemplate('onsendtip.insufficientfunds', return sendPMUsingTemplate('onsendtip.insufficientfunds',
{ how_to_use_url: config.howToUseUrl, recipient: `u/${recipient}`, amount: amount, balance: senderBalance }, { how_to_use_url: config.howToUseUrl, recipient: `u/${recipient}`, amount: amount, balance: senderBalance },
tipdata.message.data.author, () => { 'Insufficient funds to send tip', tipdata.message.data.author, () => {
markMessageRead(tipdata.message.data.name, () => {
cb(new Error('Insufficient funds'), null); cb(new Error('Insufficient funds'), null);
}); });
});
} }
return db.query('UPDATE Users SET Balance = Balance - ? WHERE Id = ?', [amount, data.senderId], cb); return db.query('UPDATE Users SET Balance = Balance - ? WHERE Id = ?', [amount, data.senderId], cb);
@ -386,13 +388,12 @@ const markMessageRead = (messageFullId, callback) => {
}); });
}; };
const sendPMUsingTemplate = (template, substitions, subject, recipient, callback) => { const sendPMUsingTemplate = (template, substitutions, subject, recipient, callback) => {
if (!messageTemplates[template]) { if (!messageTemplates[template]) {
return callback(new Error(`Message template ${template} not found.`)); return callback(new Error(`Message template ${template} not found.`));
} }
let messageText = messageTemplates[template]; let messageText = messageTemplates[template];
console.log(messageText);
for (let variable in substitutions) { for (let variable in substitutions) {
if (substitutions.hasOwnProperty(variable)) { if (substitutions.hasOwnProperty(variable)) {
const re = new RegExp(['{', variable, '}'].join(''), 'ig'); const re = new RegExp(['{', variable, '}'].join(''), 'ig');
@ -515,9 +516,11 @@ const sendGild = (sender, recipient, amount, gilddata, callback) => {
if (senderBalance < amount || (senderBalance - amount) < 0) { if (senderBalance < amount || (senderBalance - amount) < 0) {
return sendPMUsingTemplate('ongild.insufficientfunds', return sendPMUsingTemplate('ongild.insufficientfunds',
{ how_to_use_url: config.howToUseUrl, amount: amount, amount_usd: gilddata.amountUsd, balance: senderBalance }, { how_to_use_url: config.howToUseUrl, amount: amount, amount_usd: gilddata.amountUsd, balance: senderBalance },
gilddata.message.data.author, () => { 'Insufficient funds', gilddata.message.data.author, () => {
markMessageRead(gilddata.message.data.name, () => {
cb(new Error('Insufficient funds'), null); cb(new Error('Insufficient funds'), null);
}); });
});
} }
return db.query('UPDATE Users SET Balance = Balance - ? WHERE Id = ?', [amount, data.senderId], cb); return db.query('UPDATE Users SET Balance = Balance - ? WHERE Id = ?', [amount, data.senderId], cb);
@ -647,8 +650,8 @@ const doSendTip = function(body, message, callback) {
// get the amount // get the amount
amountUsd = parseFloat(parts[nameFirst ? 1 : 0].substring(1)); amountUsd = parseFloat(parts[nameFirst ? 1 : 0].substring(1));
if (isNaN(amountUsd) || amountUsd <= 0) { if (isNaN(amountUsd) || amountUsd <= 0) {
return sendPMUsingTemplate('onsendtip.invalidamount', { how_to_use_url: config.howToUseUrl }, message.data.author, () => { return sendPMUsingTemplate('onsendtip.invalidamount', { how_to_use_url: config.howToUseUrl }, 'Invalid amount for send tip', message.data.author, () => {
callback(null, null); markMessageRead(message.data.name, callback);
}); });
} }
} else if (parts.length === 3) { } else if (parts.length === 3) {
@ -784,9 +787,12 @@ const doWithdrawal = (amount, address, message, callback) => {
(balance, cb) => { (balance, cb) => {
// check sufficient balance // check sufficient balance
if (balance < amount || balance - amount < 0) { if (balance < amount || balance - amount < 0) {
return sendPMUsingTemplate('onwithdraw.insufficientfunds', { how_to_use_url: config.howToUseUrl }, message.data.author, () => { return sendPMUsingTemplate('onwithdraw.insufficientfunds', { how_to_use_url: config.howToUseUrl, amount: amount, balance: balance },
'Insufficient funds for withdrawal', message.data.author, () => {
markMessageRead(message.data.name, () => {
cb(new Error('Insufficient funds'), null); cb(new Error('Insufficient funds'), null);
}); });
});
} }
// Update the balance // Update the balance
@ -890,14 +896,15 @@ const processMessage = function(message, callback) {
const amount = parseFloat(parts[1]); const amount = parseFloat(parts[1]);
if (isNaN(amount) || amount < 0) { if (isNaN(amount) || amount < 0) {
// TODO: send a message that the withdrawal amount is invalid // TODO: send a message that the withdrawal amount is invalid
return sendPMUsingTemplate('onwithdraw.invalidamount', { how_to_use_url: config.howToUseUrl }, message.data.author, () => { return sendPMUsingTemplate('onwithdraw.invalidamount', { how_to_use_url: config.howToUseUrl }, 'Invalid amount for withdrawal', message.data.author, () => {
callback(null, null); markMessageRead(message.data.name, callback);
}); });
} }
if (amount <= config.lbrycrd.txfee) { if (amount <= config.lbrycrd.txfee) {
return sendPMUsingTemplate('onwithdraw.amountltefee', { how_to_use_url: config.howToUseUrl, amount: amount, fee: config.lbrycrd.txfee }, message.data.author, () => { return sendPMUsingTemplate('onwithdraw.amountltefee', { how_to_use_url: config.howToUseUrl, amount: amount, fee: config.lbrycrd.txfee },
callback(null, null); 'Withdrawal amount less than minimum fee', message.data.author, () => {
markMessageRead(message.data.name, callback);
}); });
} }
@ -906,8 +913,8 @@ const processMessage = function(message, callback) {
try { try {
base58.decode(address); base58.decode(address);
} catch(e) { } catch(e) {
return sendPMUsingTemplate('onwithdraw.invalidaddress', { how_to_use_url: config.howToUseUrl }, message.data.author, () => { return sendPMUsingTemplate('onwithdraw.invalidaddress', { how_to_use_url: config.howToUseUrl }, 'Invalid address for withdrawal', message.data.author, () => {
callback(null, null); markMessageRead(message.data.name, callback);
}); });
} }