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 pull request #7 from nikooo777/master

Browse source 
removed ! from IDs
This commit is contained in:
Niko 2017-12-25 01:54:19 +01:00 • committed by GitHub
commit 4df306e7ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bot/modules/tipbot.js
View file

@ -12,7 +12,7 @@ exports.tip = {
usage: "<subcommand>", usage: "<subcommand>",
description: 'balance: get your balance\n deposit: get address for your deposits\n withdraw ADDRESS AMOUNT: withdraw AMOUNT credits to ADDRESS\n [private] <user> <amount>: mention a user with @ and then the amount to tip them, or put private before the user to tip them privately.\n Key: [] : Optionally include contained keyword, <> : Replace with appropriate value.', description: 'balance: get your balance\n deposit: get address for your deposits\n withdraw ADDRESS AMOUNT: withdraw AMOUNT credits to ADDRESS\n [private] <user> <amount>: mention a user with @ and then the amount to tip them, or put private before the user to tip them privately.\n Key: [] : Optionally include contained keyword, <> : Replace with appropriate value.',
process: async function (bot, msg, suffix) { process: async function (bot, msg, suffix) {
let tipper = msg.author.id, let tipper = msg.author.id.replace('!', ''),
words = msg.content.trim().split(' ').filter(function (n) { return n !== ""; }), words = msg.content.trim().split(' ').filter(function (n) { return n !== ""; }),
subcommand = words.length >= 2 ? words[1] : 'help'; subcommand = words.length >= 2 ? words[1] : 'help';
switch (subcommand) { switch (subcommand) {
@ -103,11 +103,10 @@ function doTip(message, tipper, words) {
} }
if (message.mentions.members.first().id) { if (message.mentions.members.first().id) {
let member = message.mentions.members.first(); let member = message.mentions.members.first()
sendLbc(message, tipper, member, amount, prv); sendLbc(message, tipper, member, amount, prv);
} }
else else {
{
message.reply('Sorry, I could not find a user in your tip...'); message.reply('Sorry, I could not find a user in your tip...');
} }
} }
@ -124,7 +123,7 @@ function doHelp(message) {
function sendLbc(message, tipper, member, amount, privacyFlag) { function sendLbc(message, tipper, member, amount, privacyFlag) {
getAddress(member.id, function(err, address){ getAddress(member.id.replace('!', ''), function (err, address) {
if (err) { if (err) {
message.reply(err.message); message.reply(err.message);
} }

16
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "lbry-tipbot", "name": "lbry-tipbot",
"version": "0.0.2", "version": "0.0.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -572,7 +572,7 @@
"resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-1.3.5.tgz", "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-1.3.5.tgz",
"integrity": "sha1-oklSmKMtqCvMAa2b59d++l4kQSI=", "integrity": "sha1-oklSmKMtqCvMAa2b59d++l4kQSI=",
"requires": { "requires": {
"moment": "2.19.3" "moment": "2.20.1"
} }
}, },
"cjson": { "cjson": {
@ -1290,9 +1290,9 @@
} }
}, },
"moment": { "moment": {
"version": "2.19.3", "version": "2.20.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
"integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8=" "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
}, },
"mongodb": { "mongodb": {
"version": "2.2.33", "version": "2.2.33",
@ -1330,9 +1330,9 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "4.13.6", "version": "4.13.7",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.6.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.7.tgz",
"integrity": "sha512-H+loD0D8UCwGmbOzWV7rZAf6/efRr9CPGB1Bess/IIjiWvpRQNo4zH4UHkueKoEbMWdnSYenjdEL8A0Q8p7JXg==", "integrity": "sha512-3VPcGQWaTzT/OVK+TpE9dGpNHBnEqFX2RmbFr1XvbsKmxPsL9kaRBSHqaQ8QEMd6CUeOYMRdH1pKRrlnCenRsg==",
"requires": { "requires": {
"async": "2.1.4", "async": "2.1.4",
"bson": "1.0.4", "bson": "1.0.4",

6
package.json
View file

@ -8,8 +8,8 @@
"discord.js": "^11.2.1", "discord.js": "^11.2.1",
"embed-creator": "^1.1.4", "embed-creator": "^1.1.4",
"jsonpath": "^0.2.12", "jsonpath": "^0.2.12",
"moment": "^2.19.1", "moment": "^2.20.1",
"mongoose": "^4.12.3", "mongoose": "^4.13.7",
"node-config": "^0.0.2", "node-config": "^0.0.2",
"numeral": "^2.0.6", "numeral": "^2.0.6",
"request": "^2.83.0" "request": "^2.83.0"
@ -25,7 +25,7 @@
"prettier": "1.7.4" "prettier": "1.7.4"
}, },
"name": "lbry-tipbot", "name": "lbry-tipbot",
"version": "0.0.2", "version": "0.0.3",
"description": "LBRYs tipbot for Discord", "description": "LBRYs tipbot for Discord",
"main": "app.js", "main": "app.js",
"repository": "https://github.com/lbryio/lbry-tipbot", "repository": "https://github.com/lbryio/lbry-tipbot",