Merge pull request #3 from nikooo777/master

permit DMs to tipbot
This commit is contained in:
Alex Grin 2016-08-30 22:49:31 -04:00 committed by GitHub
commit d5c383b567

View file

@ -43,7 +43,7 @@ function respond(bot, data) {
var subcommand = words.length >= 2 ? words[1] : 'help'; var subcommand = words.length >= 2 ? words[1] : 'help';
var moveToBotSandbox = !tipper.is_admin && !tipper.is_owner && channel !== 'C1TEEBS2Z' && ['help', 'balance', 'deposit', 'withdraw'].indexOf(subcommand) != -1 var moveToBotSandbox = /*!tipper.is_admin && !tipper.is_owner && */channel !== 'C1TEEBS2Z' && ['help', 'balance', 'deposit', 'withdraw'].indexOf(subcommand) != -1 && !channel.name.startsWith("D")
if (moveToBotSandbox) { if (moveToBotSandbox) {
bot.postMessage(channel, 'Please use <#C1TEEBS2Z|bot-sandbox> to talk to bots.', globalSlackParams); bot.postMessage(channel, 'Please use <#C1TEEBS2Z|bot-sandbox> to talk to bots.', globalSlackParams);
return; return;
@ -150,7 +150,7 @@ function doTip(bot, channel, tipper, words) {
function doHelp(bot, channel) { function doHelp(bot, channel) {
bot.postMessage(channel, bot.postMessage(channel,
'*USE <#bot-sandbox> FOR EVERYTHING EXCEPT ACTUAL TIPPING*\n' + '*USE <#C1TEEBS2Z|bot-sandbox> FOR EVERYTHING EXCEPT ACTUAL TIPPING*\n' +
'`' + command + ' help`: this message\n' + '`' + command + ' help`: this message\n' +
'`' + command + ' balance`: get your balance\n' + '`' + command + ' balance`: get your balance\n' +
'`' + command + ' deposit`: get address for deposits\n' + '`' + command + ' deposit`: get address for deposits\n' +