LBRYFoundation/lbry-wunderbot
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-wunderbot.git synced 2025-09-12 13:29:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into patch-4

Browse source
This commit is contained in:
filipnyquist 2018-06-08 17:22:54 +02:00 • committed by GitHub
commit 8d09a1994d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
bot/modules/hash.js
View file

@ -19,19 +19,19 @@ exports.timedhash = function(bot) {
if (error || response.statusCode !== 200) { if (error || response.statusCode !== 200) {
msg.channel.send('Explorer API is not available'); msg.channel.send('Explorer API is not available');
} else { } else {
var data = response.body; let data = response.body;
var height = Number(data.status.height); let height = Number(data.status.height);
var hashrate = data.status.hashrate; let hashrate = data.status.hashrate;
var difficulty = Number(data.status.difficulty); let difficulty = Number(data.status.difficulty);
needle.get('https://whattomine.com/coins/164.json', function(error, response) { needle.get('https://whattomine.com/coins/164.json', function(error, response) {
if (error || response.statusCode !== 200) { if (error || response.statusCode !== 200) {
msg.channel.send('whattomine API is not available'); msg.channel.send('whattomine API is not available');
} }
var data = response.body; let data = response.body;
var reward = Number(data.block_reward); let reward = Number(data.block_reward);
var block_time = Number(data.block_time); let block_time = Number(data.block_time);
var difficulty24 = Number(data.difficulty24); let difficulty24 = Number(data.difficulty24);
description = let description =
'Hashrate: ' + 'Hashrate: ' +
numberWithCommas(hashrate) + numberWithCommas(hashrate) +
'\n' + '\n' +
@ -75,15 +75,15 @@ exports.hash = {
usage: '', usage: '',
description: 'Displays current Hashrate of Network\n**!hash power <Mh/s>**\n Displays potential Earnings For Given Hashrate', description: 'Displays current Hashrate of Network\n**!hash power <Mh/s>**\n Displays potential Earnings For Given Hashrate',
process: function(bot, msg, suffix) { process: function(bot, msg, suffix) {
var command = '!hash'; let command = '!hash';
words = suffix let words = suffix
.trim() .trim()
.split(' ') .split(' ')
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}); });
profitcommand = words[0]; let profitcommand = words[0];
myhashrate = words[1]; let myhashrate = words[1];
if (profitcommand == 'power') { if (profitcommand == 'power') {
sendProfitInfo(bot, msg, suffix); sendProfitInfo(bot, msg, suffix);
return; return;
@ -101,19 +101,19 @@ exports.hash = {
if (error || response.statusCode !== 200) { if (error || response.statusCode !== 200) {
msg.channel.send('Explorer API is not available'); msg.channel.send('Explorer API is not available');
} else { } else {
var data = response.body; let data = response.body;
var height = Number(data.status.height); let height = Number(data.status.height);
var hashrate = data.status.hashrate; let hashrate = data.status.hashrate;
var difficulty = Number(data.status.difficulty); let difficulty = Number(data.status.difficulty);
needle.get('https://whattomine.com/coins/164.json', function(error, response) { needle.get('https://whattomine.com/coins/164.json', function(error, response) {
if (error || response.statusCode !== 200) { if (error || response.statusCode !== 200) {
msg.channel.send('whattomine API is not available'); msg.channel.send('whattomine API is not available');
} }
var data = response.body; let data = response.body;
var reward = Number(data.block_reward); let reward = Number(data.block_reward);
var block_time = Number(data.block_time); let block_time = Number(data.block_time);
var difficulty24 = Number(data.difficulty24); let difficulty24 = Number(data.difficulty24);
description = let description =
'Hashrate: ' + 'Hashrate: ' +
numberWithCommas(hashrate) + numberWithCommas(hashrate) +
'\n' + '\n' +
@ -159,18 +159,18 @@ exports.hash = {
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}); });
var myhashrate = words[1]; let myhashrate = words[1];
if (myhashrate == '' || myhashrate == null || myhashrate == undefined || myhashrate == ' ') { if (myhashrate == '' || myhashrate == null || myhashrate == undefined || myhashrate == ' ') {
myhashrate = '100'; myhashrate = '100';
} }
var Diff = response.body.difficulty24; let Diff = response.body.difficulty24;
var Reward = response.body.block_reward; let Reward = response.body.block_reward;
var myHash = Number(myhashrate); let myHash = Number(myhashrate);
var LBC = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 3600; let LBC = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 3600;
var LBC24 = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 86400; let LBC24 = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 86400;
var LBC1w = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 604800; let LBC1w = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 604800;
var LBC1m = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 2628000; let LBC1m = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 2628000;
var message = let message =
'With **' + 'With **' +
myHash + myHash +
' Mh/s** and Average 24 hour Difficulty: **' + ' Mh/s** and Average 24 hour Difficulty: **' +

10
bot/modules/lbrylink.js
View file

@ -11,7 +11,7 @@ exports.lbrylink = function(bot, msg, suffix) {
} }
if (msg.content.includes('lbry://')) { if (msg.content.includes('lbry://')) {
//Extract URL from Message //Extract URL from Message
newURL = msg.content let newURL = msg.content
.replace('lbry://', 'https://open.lbry.io/') .replace('lbry://', 'https://open.lbry.io/')
.match(/\bhttps?:\/\/\S+/gi) .match(/\bhttps?:\/\/\S+/gi)
.toString(); .toString();
@ -28,8 +28,8 @@ exports.lbrylink = function(bot, msg, suffix) {
//Check if Username Was Supplied //Check if Username Was Supplied
if (newURL.includes('>')) { if (newURL.includes('>')) {
//Get rid of ID from message //Get rid of ID from message
parseID = newURL.split('>').pop(); let parseID = newURL.split('>').pop();
newURL = 'https://open.lbry.io' + parseID; let newURL = 'https://open.lbry.io' + parseID;
if (responseDebug) { if (responseDebug) {
console.log('Username Provided!'); console.log('Username Provided!');
console.log('parseID = ' + parseID); console.log('parseID = ' + parseID);
@ -45,8 +45,8 @@ exports.lbrylink = function(bot, msg, suffix) {
//Also check obscurity in username like ``@MSFTserver` vs `@MSFTserverPics` //Also check obscurity in username like ``@MSFTserver` vs `@MSFTserverPics`
if (parseID.includes('/')) { if (parseID.includes('/')) {
//parse out extra params before `/` like `<@123456789>Pics` //parse out extra params before `/` like `<@123456789>Pics`
parseID = parseID.split('/').pop(); let parseID = parseID.split('/').pop();
newURL = 'https://open.lbry.io/' + parseID; let newURL = 'https://open.lbry.io/' + parseID;
if (responseDebug) { if (responseDebug) {
console.log('Username no / check'); console.log('Username no / check');
console.log('parseID = ' + parseID); console.log('parseID = ' + parseID);

33
bot/modules/releasenotes.js
View file

@ -12,23 +12,24 @@ exports.releasenotes = {
usage: '', usage: '',
description: 'gets current release notes from GITHUB', description: 'gets current release notes from GITHUB',
process: function(bot, msg, suffix) { process: function(bot, msg, suffix) {
var headers = { const headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'User-Agent': 'Super Agent/0.0.1' 'User-Agent': 'Super Agent/0.0.1'
}; };
// Configure the request // Configure the request
var options = { const options = {
url: 'https://api.github.com/repos/lbryio/lbry-app/releases/latest', url: 'https://api.github.com/repos/lbryio/lbry-app/releases/latest',
method: 'GET', method: 'GET',
headers: headers headers: headers
}; };
// Start the request // Start the request
let message;
request(options, function(error, response, body) { request(options, function(error, response, body) {
releasemessage = JSON.parse(body).body; let releasemessage = JSON.parse(body).body;
releasename = JSON.parse(body).name; let releasename = JSON.parse(body).name;
releasedate = JSON.parse(body).published_at; let releasedate = JSON.parse(body).published_at;
releaseurl = JSON.parse(body).html_url; let releaseurl = JSON.parse(body).html_url;
if (releasemessage.length < 2000) { if (releasemessage.length < 2000) {
message = { message = {
embed: { embed: {
@ -64,12 +65,12 @@ exports.releasenotes = {
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}); });
releasemessage1 = message[0]; let releasemessage1 = message[0];
releasemessage2 = message[1]; let releasemessage2 = message[1];
releasemessage3 = message[2]; let releasemessage3 = message[2];
releasemessage4 = message[3]; let releasemessage4 = message[3];
releasemessage5 = message[4]; let releasemessage5 = message[4];
message1 = { let message1 = {
embed: { embed: {
title: '*Download ' + releasename + ' here!*', title: '*Download ' + releasename + ' here!*',
description: releasemessage1, description: releasemessage1,
@ -86,7 +87,7 @@ exports.releasenotes = {
} }
} }
}; };
message2 = { let message2 = {
embed: { embed: {
description: releasemessage2, description: releasemessage2,
color: 7976557, color: 7976557,
@ -100,7 +101,7 @@ exports.releasenotes = {
} }
} }
}; };
message3 = { let message3 = {
embed: { embed: {
description: releasemessage3, description: releasemessage3,
color: 7976557, color: 7976557,
@ -114,7 +115,7 @@ exports.releasenotes = {
} }
} }
}; };
message4 = { let message4 = {
embed: { embed: {
description: releasemessage4, description: releasemessage4,
color: 7976557, color: 7976557,
@ -128,7 +129,7 @@ exports.releasenotes = {
} }
} }
}; };
message5 = { let message5 = {
embed: { embed: {
description: releasemessage5, description: releasemessage5,
color: 7976557, color: 7976557,

2
bot/modules/stats.js
View file

@ -56,6 +56,8 @@ exports.stats = {
} else { } else {
let data = response.body.data; let data = response.body.data;
let price_eur = Number(data.quotes.EUR.price); let price_eur = Number(data.quotes.EUR.price);
let data = response.body[0];
let price_eur = Number(data.price_eur);
let description = let description =
'**Rank: [' + '**Rank: [' +
rank + rank +