From b016be3a866f4f545b3afafd9edb22096edd867e Mon Sep 17 00:00:00 2001 From: filipnyquist Date: Fri, 13 Jul 2018 11:41:04 +0200 Subject: [PATCH 1/2] Moved all the help to the same msg used throughout the whole tipbot, removes the needs of specialized helpmsgs. also adds the tipbot FAQ link. --- bot/modules/tipbot.js | 88 +++------- yarn.lock | 373 +++++++++++++++++++++++------------------- 2 files changed, 223 insertions(+), 238 deletions(-) diff --git a/bot/modules/tipbot.js b/bot/modules/tipbot.js index 98523f0..65291d5 100644 --- a/bot/modules/tipbot.js +++ b/bot/modules/tipbot.js @@ -6,6 +6,28 @@ let spamchannel = config.get('sandboxchannel'); let regex = require('regex'); let lbrycrdConfig = config.get('lbrycrd'); const lbry = new bitcoin.Client(lbrycrdConfig); +const helpmsg = { + embed: { + description: + '__**TIPS**__\n\n' + + '**Balance**: `!tip balance`\n' + + '**Deposit Address**: `!tip deposit`\n' + + '**Withdraw**: `!tip withdraw
`\n' + + '**Private Tip**: `!privatetip `\n\n' + + '__**ROLE TIPS**__ Use this to tip everyone in a role.\n\n' + + '**Role Tip**: `!roletip `\n' + + '**Private Role Tip**: `!privatetip `\n\n' + + '__**MULTI TIPS**__ Use this to tip multiple people at once\n\n' + + '**Multi Tip**: `!multitip `\n' + + '**Private Multi Tip** `!multitip private `\n' + + '**Note**: Multi tips can contain any amount of users to tip.\n\n' + + '__**FURTHER INFORMATION**__\n\n' + + '**Help**: `!tip help` *Get this message.\n' + + 'Read our [Tipbot FAQ](https://lbry.io/faq/tipbot-discord) for a more details', + color: 1109218, + author: { name: '!tip' } + } +}; exports.commands = ['tip', 'multitip', 'roletip', 'tips']; exports.tip = { @@ -20,21 +42,6 @@ exports.tip = { return n !== ''; }), subcommand = words.length >= 2 ? words[1] : 'help', - helpmsgparts = [ - ['[help]', 'Get this message.'], - ['balance', 'Get your balance.'], - ['deposit', 'Get address for your deposits.'], - ['withdraw ADDRESS AMOUNT', 'Withdraw AMOUNT credits to ADDRESS'], - ['[private] ', 'Mention a user with @ and then the amount to tip them, or put private before the user to tip them privately.'], - ['Read our [**Tipbot FAQ**](https://lbry.io/faq/tipbot-discord) on how use the LBRY Discord Tipbot'] - ], - helpmsg = { - embed: { - description: formatDescriptions(helpmsgparts) + '\nKey: [] : Optionally include contained keyword, <> : Replace with appropriate value.', - color: 1109218, - author: { name: '!tip' } - } - }, channelwarning = 'Please use <#' + spamchannel + '> or DMs to talk to bots.', MultiorRole = false; switch (subcommand) { @@ -68,19 +75,6 @@ exports.multitip = { return n !== ''; }), subcommand = words.length >= 2 ? words[1] : 'help', - helpmsgparts = [ - ['[help]', 'Get this message.'], - ['+ ', 'Mention one or more users in a row, seperated by spaces, then an amount that each mentioned user will receive.'], - ['private + ', 'Put private before the user list to have each user tipped privately, without revealing other users tipped.'], - ['Read our [**Tipbot FAQ**](https://lbry.io/faq/tipbot-discord) on how use the LBRY Discord Tipbot'] - ], - helpmsg = { - embed: { - description: formatDescriptions(helpmsgparts) + '\nKey: [] : Optionally include contained keyword, <> : Replace with appropriate value, + : Value can be repeated for multiple entries.', - color: 1109218, - author: { name: '!multitip' } - } - }, channelwarning = 'Please use <#' + spamchannel + '> or DMs to talk to bots.', MultiorRole = true; switch (subcommand) { @@ -106,19 +100,6 @@ exports.roletip = { return n !== ''; }), subcommand = words.length >= 2 ? words[1] : 'help', - helpmsgparts = [ - ['[help]', 'Get this message'], - [' ', 'Mention a single role, then an amount that each user in that role will receive.'], - ['private ', 'Put private before the role to have each user tipped privately, without revealing other users tipped.'], - ['Read our [**Tipbot FAQ**](https://lbry.io/faq/tipbot-discord) on how use the LBRY Discord Tipbot'] - ], - helpmsg = { - embed: { - description: formatDescriptions(helpmsgparts) + '\nKey: [] : Optionally include contained keyword, <> : Replace with appropriate value.', - color: 1109218, - author: { name: '!roletip' } - } - }, channelwarning = `Please use <#${spamchannel}> or DMs to talk to bots.`, MultiorRole = true; switch (subcommand) { @@ -136,21 +117,6 @@ exports.tips = { usage: '', description: 'Lists all available tipbot commands with brief descriptions for each one.', process: async function(bot, msg, suffix) { - let helpmsgparts = [ - ['!tip', 'Tip a given user with an amount of LBC or perform wallet specific operations.'], - ['!multitip', 'Tip multiple users simultaneously for the same amount of LBC each.'], - ['!roletip', 'Tip every user in a given role the same amount of LBC.'], - ['!tips', 'Lists all available tipbot commands with brief descriptions for each one.'], - ['Read our [**Tipbot FAQ**](https://lbry.io/faq/tipbot-discord) on how use the LBRY Discord Tipbot'] - ], - helpmsg = { - embed: { - description: `These are all the commands that TipBot currently supports. Use \`! help\` for usage instructions. -${formatDescriptions(helpmsgparts)}`, - color: 1109218, - author: { name: 'Tipbot Commands' } - } - }; msg.reply(helpmsg); } }; @@ -375,13 +341,3 @@ function getValidatedAmount(amount) { function txLink(txId) { return ''; } - -function formatDescriptions(msgparts) { - return msgparts - .map( - elem => `\t**${elem[0]}** -\t\t${elem[1]} -` - ) - .join(''); -} diff --git a/yarn.lock b/yarn.lock index 5eca6b4..a7b4c6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,16 +90,20 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" +async@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: - lodash "^4.14.0" + lodash "^4.17.10" asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" +augment@3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/augment/-/augment-3.2.1.tgz#ec5d9e9456140efab1110fddb352cbe54e7fb31c" + aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" @@ -424,9 +428,9 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.5.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" +bluebird@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" boom@2.x.x: version "2.10.1" @@ -434,18 +438,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - brace-expansion@^1.1.7: version "1.1.8" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" @@ -465,9 +457,9 @@ bson@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c" -buffer-shims@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" +bson@~1.0.5: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.9.tgz#12319f8323b1254739b7c6bef8d3e89ae05a2f57" caseless@~0.12.0: version "0.12.0" @@ -536,9 +528,9 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -config@^1.27.0: - version "1.28.1" - resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d" +config@^1.30.0: + version "1.30.0" + resolved "https://registry.yarnpkg.com/config/-/config-1.30.0.tgz#1d60a9f35348a13c175798d384e81a5a16c3ba6e" dependencies: json5 "0.4.0" os-homedir "1.0.2" @@ -565,19 +557,13 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" dependencies: assert-plus "^1.0.0" -debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -587,6 +573,10 @@ deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -605,17 +595,17 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -discord.js@^11.2.1: - version "11.2.1" - resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-11.2.1.tgz#bfc0f5a8b6398dc372d026e503592646456053fc" +discord.js@^11.3.2: + version "11.3.2" + resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-11.3.2.tgz#3c4074c1cb1a4916582fb96ded5ffa1324411f95" dependencies: - long "^3.2.0" - prism-media "^0.0.1" - snekfetch "^3.3.0" + long "^4.0.0" + prism-media "^0.0.2" + snekfetch "^3.6.4" tweetnacl "^1.0.0" - ws "^3.1.0" + ws "^4.0.0" -ebnf-parser@~0.1.9: +ebnf-parser@0.1.x, ebnf-parser@~0.1.9: version "0.1.10" resolved "https://registry.yarnpkg.com/ebnf-parser/-/ebnf-parser-0.1.10.tgz#cd1f6ba477c5638c40c97ed9b572db5bab5d8331" @@ -625,14 +615,10 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -embed-creator@^1.1.4: +embed-creator@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/embed-creator/-/embed-creator-1.2.3.tgz#f122165d39f9ca35aed3ef7b7ae643e7dd856ea1" -es6-promise@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4" - escape-string-regexp@^1.0.2: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -646,14 +632,16 @@ escodegen@0.0.21: optionalDependencies: source-map ">= 0.1.2" -escodegen@~0.0.24: - version "0.0.28" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-0.0.28.tgz#0e4ff1715f328775d6cab51ac44a406cd7abffd3" +escodegen@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.10.0.tgz#f647395de22519fbd0d928ffcf1d17e0dec2603e" dependencies: - esprima "~1.0.2" - estraverse "~1.3.0" + esprima "^3.1.3" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" optionalDependencies: - source-map ">= 0.1.2" + source-map "~0.6.1" esprima@1.0.x, esprima@~1.0.2: version "1.0.4" @@ -663,14 +651,18 @@ esprima@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.2.tgz#76a0fd66fcfe154fd292667dc264019750b1657b" +esprima@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" + +estraverse@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" + estraverse@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-0.0.4.tgz#01a0932dfee574684a598af5a67c3bf9b6428db2" -estraverse@~1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.3.2.tgz#37c2b893ef13d723f276d878d60d8535152a6c42" - esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -709,6 +701,10 @@ fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" +fast-levenshtein@~2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + filename-regex@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" @@ -877,23 +873,10 @@ hawk@3.1.3, hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoek@4.x.x: - version "4.2.0" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" - home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -901,10 +884,6 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -hooks-fixed@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hooks-fixed/-/hooks-fixed-2.0.2.tgz#20076daa07e77d8a6106883ce3f1722e051140b0" - http-signature@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" @@ -928,7 +907,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -1046,6 +1025,18 @@ jison@0.4.13: lex-parser "~0.1.3" nomnom "1.5.2" +jison@0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/jison/-/jison-0.4.4.tgz#86b03b65efec007a91f493eceabe56f90aa6b439" + dependencies: + JSONSelect "0.4.0" + ebnf-parser "0.1.x" + escodegen "0.0.21" + esprima "1.0.x" + jison-lex "0.2.x" + lex-parser "0.1.x" + nomnom "1.5.2" + js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -1088,13 +1079,13 @@ jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" -jsonpath@^0.2.12: - version "0.2.12" - resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-0.2.12.tgz#5bf9d911fb4616c1e3370beceb9f0db24ae34cd2" +jsonpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-1.0.0.tgz#45cd9d4c4d0d6825d90bd7e40f83f1182b13dd07" dependencies: esprima "1.2.2" jison "0.4.13" - static-eval "0.2.3" + static-eval "2.0.0" underscore "1.7.0" jsprim@^1.2.2: @@ -1106,9 +1097,9 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -kareem@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.5.0.tgz#e3e4101d9dcfde299769daf4b4db64d895d17448" +kareem@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.2.1.tgz#9950809415aa3cde62ab43b4f7b919d99816e015" kind-of@^3.0.2: version "3.2.2" @@ -1122,10 +1113,21 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + lex-parser@0.1.x, lex-parser@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/lex-parser/-/lex-parser-0.1.4.tgz#64c4f025f17fd53bfb45763faeb16f015a747550" +lex@1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/lex/-/lex-1.7.4.tgz#33dd66b980a38d77a6c424d7173e6f40d602c0c5" + lodash.get@4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -1134,13 +1136,17 @@ lodash.some@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" -lodash@^4.14.0, lodash@^4.17.4: +lodash@^4.17.10: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + +lodash@^4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" -long@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" loose-envify@^1.0.0: version "1.3.1" @@ -1196,68 +1202,67 @@ minimist@^1.2.0: dependencies: minimist "0.0.8" -moment@^2.10.3, moment@^2.19.1: +moment@^2.10.3: version "2.19.2" resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe" -mongodb-core@2.1.17: - version "2.1.17" - resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8" +moment@^2.22.1: + version "2.22.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" + +mongodb-core@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.0.tgz#af91f36fd560ed785f4e61e694432df4d3698aad" dependencies: bson "~1.0.4" - require_optional "~1.0.0" + require_optional "^1.0.1" + optionalDependencies: + saslprep "^1.0.0" -mongodb@2.2.33: - version "2.2.33" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.33.tgz#b537c471d34a6651b48f36fdbf29750340e08b50" +mongodb@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.1.tgz#c018c4b277614e8b1e08426d5bcbe1a7e5cdbd74" dependencies: - es6-promise "3.2.1" - mongodb-core "2.1.17" - readable-stream "2.2.7" + mongodb-core "3.1.0" -mongoose@^4.12.3: - version "4.13.4" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.13.4.tgz#31afd5fe865911678adbc892c4d3f66d0a821dfb" +mongoose-legacy-pluralize@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4" + +mongoose@^5.0.17: + version "5.2.3" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.2.3.tgz#667b92c394a6aa81c3c9f2f45f3a8f28cea28e9c" dependencies: - async "2.1.4" - bson "~1.0.4" - hooks-fixed "2.0.2" - kareem "1.5.0" + async "2.6.1" + bson "~1.0.5" + kareem "2.2.1" lodash.get "4.4.2" - mongodb "2.2.33" - mpath "0.3.0" - mpromise "0.5.5" - mquery "2.3.2" + mongodb "3.1.1" + mongodb-core "3.1.0" + mongoose-legacy-pluralize "1.0.2" + mpath "0.4.1" + mquery "3.0.0" ms "2.0.0" - muri "1.3.0" regexp-clone "0.0.1" sliced "1.0.1" -mpath@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.3.0.tgz#7a58f789e9b5fd3c94520634157960f26bd5ef44" +mpath@0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.4.1.tgz#ed10388430380bf7bbb5be1391e5d6969cb08e89" -mpromise@0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mpromise/-/mpromise-0.5.5.tgz#f5b24259d763acc2257b0a0c8c6d866fd51732e6" - -mquery@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mquery/-/mquery-2.3.2.tgz#e2c60ad117cf080f2efb1ecdd144e7bbffbfca11" +mquery@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.0.0.tgz#e5f387dbabc0b9b69859e550e810faabe0ceabb0" dependencies: - bluebird "^3.5.0" - debug "^2.6.9" - regexp-clone "^0.0.1" + bluebird "3.5.0" + debug "2.6.9" + regexp-clone "0.0.1" sliced "0.0.5" ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -muri@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/muri/-/muri-1.3.0.tgz#aeccf3db64c56aa7c5b34e00f95b7878527a4721" - nan@^2.3.0: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" @@ -1340,6 +1345,17 @@ once@^1.3.0, once@^1.3.3: dependencies: wrappy "1" +optionator@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.4" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + wordwrap "~1.0.0" + os-homedir@1.0.2, os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -1384,17 +1400,21 @@ performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa" +prettier@^1.12.1: + version "1.13.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" -prism-media@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-0.0.1.tgz#a3425c9cabd50d1c6c02e543941a11895667bd10" +prism-media@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-0.0.2.tgz#aa917b084576c4df6488e4ea8e7d6d44aed4b411" private@^0.1.7: version "0.1.8" @@ -1432,18 +1452,6 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -readable-stream@2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.7.tgz#07057acbe2467b22042d36f98c5ad507054e95b1" - dependencies: - buffer-shims "~1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~1.0.0" - util-deprecate "~1.0.1" - readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" @@ -1479,7 +1487,16 @@ regex-cache@^0.4.2: dependencies: is-equal-shallow "^0.1.3" -regexp-clone@0.0.1, regexp-clone@^0.0.1: +regex@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/regex/-/regex-0.1.1.tgz#0580995d1846c5376a762b9d358b83068d207aef" + dependencies: + augment "3.2.1" + jison "0.4.4" + lex "1.7.4" + statemachines "0.1.0" + +regexp-clone@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589" @@ -1528,9 +1545,9 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@^2.83.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" +request@^2.85.0: + version "2.87.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -1540,7 +1557,6 @@ request@^2.83.0: forever-agent "~0.6.1" form-data "~2.3.1" har-validator "~5.0.3" - hawk "~6.0.2" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -1550,12 +1566,11 @@ request@^2.83.0: performance-now "^2.1.0" qs "~6.5.1" safe-buffer "^5.1.1" - stringstream "~0.0.5" tough-cookie "~2.3.3" tunnel-agent "^0.6.0" uuid "^3.1.0" -require_optional@~1.0.0: +require_optional@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e" dependencies: @@ -1576,6 +1591,10 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" +saslprep@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.0.tgz#2c4968a0bfbf249530cd597bc62870ccd4b41a24" + semver@^5.1.0, semver@^5.3.0: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" @@ -1604,9 +1623,9 @@ sliced@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" -snekfetch@^3.3.0: - version "3.5.8" - resolved "https://registry.yarnpkg.com/snekfetch/-/snekfetch-3.5.8.tgz#4d4e539f8435352105e74c392f62f66740a27d6c" +snekfetch@^3.6.4: + version "3.6.4" + resolved "https://registry.yarnpkg.com/snekfetch/-/snekfetch-3.6.4.tgz#d13e80a616d892f3d38daae4289f4d258a645120" sntp@1.x.x: version "1.0.9" @@ -1614,11 +1633,9 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" +sorted-array@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/sorted-array/-/sorted-array-1.1.0.tgz#61a98325e412bb90999b4bac18dfed5f3564102d" source-map-support@^0.4.15: version "0.4.18" @@ -1626,7 +1643,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -"source-map@>= 0.1.2": +"source-map@>= 0.1.2", source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -1648,11 +1665,18 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -static-eval@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.3.tgz#023f17ac9fee426ea788c12ea39206dc175f8b2a" +statemachines@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/statemachines/-/statemachines-0.1.0.tgz#b545fd3d8a55280f302b8696f19c0a11c4e33ade" dependencies: - escodegen "~0.0.24" + augment "3.2.1" + sorted-array "1.1.0" + +static-eval@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864" + dependencies: + escodegen "^1.8.1" string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" @@ -1662,13 +1686,13 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string_decoder@~1.0.0, string_decoder@~1.0.3: +string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" -stringstream@~0.0.4, stringstream@~0.0.5: +stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -1735,14 +1759,16 @@ tweetnacl@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.0.tgz#713d8b818da42068740bf68386d0479e66fc8a7b" +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + dependencies: + prelude-ls "~1.1.2" + uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" -ultron@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" - underscore@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.1.7.tgz#40bab84bad19d230096e8d6ef628bff055d83db0" @@ -1783,14 +1809,17 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2" +wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -ws@^3.1.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608" +ws@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289" dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" - ultron "~1.1.0" -- 2.45.2 From e9c30f3586e84345f75c13a5ed52b331084c31e6 Mon Sep 17 00:00:00 2001 From: filipnyquist Date: Fri, 13 Jul 2018 11:41:24 +0200 Subject: [PATCH 2/2] Moved all the help to the same msg used throughout the whole tipbot, removes the needs of specialized helpmsgs. also adds the tipbot FAQ link. --- bot/modules/tipbot.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/bot/modules/tipbot.js b/bot/modules/tipbot.js index 65291d5..401449b 100644 --- a/bot/modules/tipbot.js +++ b/bot/modules/tipbot.js @@ -9,21 +9,21 @@ const lbry = new bitcoin.Client(lbrycrdConfig); const helpmsg = { embed: { description: - '__**TIPS**__\n\n' + - '**Balance**: `!tip balance`\n' + - '**Deposit Address**: `!tip deposit`\n' + - '**Withdraw**: `!tip withdraw
`\n' + - '**Private Tip**: `!privatetip `\n\n' + - '__**ROLE TIPS**__ Use this to tip everyone in a role.\n\n' + - '**Role Tip**: `!roletip `\n' + - '**Private Role Tip**: `!privatetip `\n\n' + - '__**MULTI TIPS**__ Use this to tip multiple people at once\n\n' + - '**Multi Tip**: `!multitip `\n' + - '**Private Multi Tip** `!multitip private `\n' + - '**Note**: Multi tips can contain any amount of users to tip.\n\n' + - '__**FURTHER INFORMATION**__\n\n' + - '**Help**: `!tip help` *Get this message.\n' + - 'Read our [Tipbot FAQ](https://lbry.io/faq/tipbot-discord) for a more details', + '__**TIPS**__\n\n' + + '**Balance**: `!tip balance`\n' + + '**Deposit Address**: `!tip deposit`\n' + + '**Withdraw**: `!tip withdraw
`\n' + + '**Private Tip**: `!privatetip `\n\n' + + '__**ROLE TIPS**__ Use this to tip everyone in a role.\n\n' + + '**Role Tip**: `!roletip `\n' + + '**Private Role Tip**: `!privatetip `\n\n' + + '__**MULTI TIPS**__ Use this to tip multiple people at once\n\n' + + '**Multi Tip**: `!multitip `\n' + + '**Private Multi Tip** `!multitip private `\n' + + '**Note**: Multi tips can contain any amount of users to tip.\n\n' + + '__**FURTHER INFORMATION**__\n\n' + + '**Help**: `!tip help` *Get this message.\n' + + 'Read our [Tipbot FAQ](https://lbry.io/faq/tipbot-discord) for a more details', color: 1109218, author: { name: '!tip' } } -- 2.45.2