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

Updated doHelp() & Added Self Tip Detection #8

Merged
ProfessorDey merged 2 commits from patch-2 into master 2018-01-04 01:28:56 +01:00
Conversation 3 Commits 2 Files changed 1 +7 -8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7e22067602 - Show all commits

15
bot/modules/tipbot.js
View file

@ -102,9 +102,8 @@ function doTip(message, tipper, words) {
return;
}
if (message.mentions.members.first().id) {
let member = message.mentions.members.first()
sendLbc(message, tipper, member, amount, prv);
if (message.mentions.users.first().id) {
sendLbc(message, tipper, message.mentions.users.first().id.replace('!', ''), amount, prv);
}
else {
message.reply('Sorry, I could not find a user in your tip...');
@ -120,8 +119,8 @@ function doHelp(message) {
}
function sendLbc(message, tipper, member, amount, privacyFlag) {
getAddress(member.id.replace('!', ''), function (err, address) {
function sendLbc(message, tipper, recipient, amount, privacyFlag) {
getAddress(recipient, function (err, address) {
if (err) {
message.reply(err.message);
}
@ -132,12 +131,12 @@ function sendLbc(message, tipper, member, amount, privacyFlag) {
}
else {
var imessage =
'Wubba lubba dub dub! <@' + tipper + '> tipped <@' + member.id + '> ' + amount + ' LBC (' + txLink(txId) + '). ' +
'Wubba lubba dub dub! <@' + tipper + '> tipped <@' + recipient + '> ' + amount + ' LBC (' + txLink(txId) + '). ' +
'DM me `!tip` for tipbot instructions.'
if (privacyFlag) {
message.author.send(imessage);
if (message.author.id != member.id) {
member.send(imessage);
if (message.author.id != message.mentions.users.first().id) {
message.mentions.users.first().send(imessage);
}
} else {
message.reply(imessage);