LBRYFoundation/lbry-tipbot
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-tipbot.git synced 2025-08-23 16:57:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ykris45-patch-3'

Browse source
This commit is contained in:
Niko Storni 2018-11-15 11:58:06 -05:00
commit ab45b1060a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bot/modules/tipbot.js
View file

@ -24,7 +24,7 @@ const helpmsg = {
'__**FURTHER INFORMATION**__\n\n' + '__**FURTHER INFORMATION**__\n\n' +
'**Help**: `!tip help` *Get this message.\n' + '**Help**: `!tip help` *Get this message.\n' +
'Read our [Tipbot FAQ](https://lbry.io/faq/tipbot-discord) for a more details', 'Read our [Tipbot FAQ](https://lbry.io/faq/tipbot-discord) for a more details',
color: 1109218, color: 1109218
} }
}; };
@ -48,7 +48,7 @@ exports.tip = {
privateOrSandboxOnly(msg, channelwarning, doHelp, [helpmsg]); privateOrSandboxOnly(msg, channelwarning, doHelp, [helpmsg]);
break; break;
case 'balance': case 'balance':
doBalance(msg, tipper); privateOrSandboxOnly(msg, channelwarning, doBalance, [tipper]);
break; break;
case 'deposit': case 'deposit':
privateOrSandboxOnly(msg, channelwarning, doDeposit, [tipper]); privateOrSandboxOnly(msg, channelwarning, doDeposit, [tipper]);
@ -161,7 +161,7 @@ function doWithdraw(message, tipper, words, helpmsg) {
amount = getValidatedAmount(words[3]); amount = getValidatedAmount(words[3]);
if (amount === null) { if (amount === null) {
message.reply("Invalid amount of credits specified... Cannot withdraw credits.").then(message => message.delete(5000)); message.reply('Invalid amount of credits specified... Cannot withdraw credits.').then(message => message.delete(5000));
return; return;
} }
@ -189,7 +189,7 @@ function doTip(bot, message, tipper, words, helpmsg, MultiorRole) {
let amount = getValidatedAmount(words[amountOffset]); let amount = getValidatedAmount(words[amountOffset]);
if (amount === null) { if (amount === null) {
return message.reply("Invalid amount of credits specified...").then(message => message.delete(5000)); return message.reply('Invalid amount of credits specified...').then(message => message.delete(5000));
} }
if (message.mentions.users.first() && message.mentions.users.first().id) { if (message.mentions.users.first() && message.mentions.users.first().id) {
@ -213,7 +213,7 @@ function doMultiTip(bot, message, tipper, words, helpmsg, MultiorRole) {
} }
let [userIDs, amount] = findUserIDsAndAmount(message, words, prv); let [userIDs, amount] = findUserIDsAndAmount(message, words, prv);
if (amount == null) { if (amount == null) {
message.reply("Invalid amount of credits specified...").then(message => message.delete(5000)); message.reply('Invalid amount of credits specified...').then(message => message.delete(5000));
return; return;
} }
if (!userIDs) { if (!userIDs) {
@ -297,7 +297,6 @@ ${tx}${msgtail}`;
usr.send(recipientmsg); usr.send(recipientmsg);
} }
} else { } else {
let generalmsg = `just tipped <@${recipient}> ${amount} LBC. let generalmsg = `just tipped <@${recipient}> ${amount} LBC.
${tx}${msgtail}`; ${tx}${msgtail}`;
message.reply(generalmsg); message.reply(generalmsg);