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

Merge pull request #9 from ProfessorDey/patch-3

Browse source 
Fixing Duplicate Tipbot Account Issue
This commit is contained in:
Niko 2018-01-03 01:23:48 +01:00 committed by GitHub
commit 0f5a215b7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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...');
@ -122,8 +121,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);
}
@ -134,11 +133,13 @@ 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);
member.send(imessage);
if (message.author.id != message.mentions.users.first().id) {
message.mentions.users.first().send(imessage);
}
} else {
message.reply(imessage);
}