mirror of
https://github.com/LBRYFoundation/lbry-wunderbot.git
synced 2025-09-05 05:15:13 +00:00
Merge branch 'master' into patch-4
This commit is contained in:
filipnyquist
GitHub
commit
8d09a1994d
4 changed files with 55 additions and 52 deletions
|
|
@ -19,19 +19,19 @@ exports.timedhash = function(bot) {
|
|||
if (error || response.statusCode !== 200) {
|
||||
msg.channel.send('Explorer API is not available');
|
||||
} else {
|
||||
var data = response.body;
|
||||
var height = Number(data.status.height);
|
||||
var hashrate = data.status.hashrate;
|
||||
var difficulty = Number(data.status.difficulty);
|
||||
let data = response.body;
|
||||
let height = Number(data.status.height);
|
||||
let hashrate = data.status.hashrate;
|
||||
let difficulty = Number(data.status.difficulty);
|
||||
needle.get('https://whattomine.com/coins/164.json', function(error, response) {
|
||||
if (error || response.statusCode !== 200) {
|
||||
msg.channel.send('whattomine API is not available');
|
||||
}
|
||||
var data = response.body;
|
||||
var reward = Number(data.block_reward);
|
||||
var block_time = Number(data.block_time);
|
||||
var difficulty24 = Number(data.difficulty24);
|
||||
description =
|
||||
let data = response.body;
|
||||
let reward = Number(data.block_reward);
|
||||
let block_time = Number(data.block_time);
|
||||
let difficulty24 = Number(data.difficulty24);
|
||||
let description =
|
||||
'Hashrate: ' +
|
||||
numberWithCommas(hashrate) +
|
||||
'\n' +
|
||||
|
|
@ -75,15 +75,15 @@ exports.hash = {
|
|||
usage: '',
|
||||
description: 'Displays current Hashrate of Network\n**!hash power <Mh/s>**\n Displays potential Earnings For Given Hashrate',
|
||||
process: function(bot, msg, suffix) {
|
||||
var command = '!hash';
|
||||
words = suffix
|
||||
let command = '!hash';
|
||||
let words = suffix
|
||||
.trim()
|
||||
.split(' ')
|
||||
.filter(function(n) {
|
||||
return n !== '';
|
||||
});
|
||||
profitcommand = words[0];
|
||||
myhashrate = words[1];
|
||||
let profitcommand = words[0];
|
||||
let myhashrate = words[1];
|
||||
if (profitcommand == 'power') {
|
||||
sendProfitInfo(bot, msg, suffix);
|
||||
return;
|
||||
|
|
@ -101,19 +101,19 @@ exports.hash = {
|
|||
if (error || response.statusCode !== 200) {
|
||||
msg.channel.send('Explorer API is not available');
|
||||
} else {
|
||||
var data = response.body;
|
||||
var height = Number(data.status.height);
|
||||
var hashrate = data.status.hashrate;
|
||||
var difficulty = Number(data.status.difficulty);
|
||||
let data = response.body;
|
||||
let height = Number(data.status.height);
|
||||
let hashrate = data.status.hashrate;
|
||||
let difficulty = Number(data.status.difficulty);
|
||||
needle.get('https://whattomine.com/coins/164.json', function(error, response) {
|
||||
if (error || response.statusCode !== 200) {
|
||||
msg.channel.send('whattomine API is not available');
|
||||
}
|
||||
var data = response.body;
|
||||
var reward = Number(data.block_reward);
|
||||
var block_time = Number(data.block_time);
|
||||
var difficulty24 = Number(data.difficulty24);
|
||||
description =
|
||||
let data = response.body;
|
||||
let reward = Number(data.block_reward);
|
||||
let block_time = Number(data.block_time);
|
||||
let difficulty24 = Number(data.difficulty24);
|
||||
let description =
|
||||
'Hashrate: ' +
|
||||
numberWithCommas(hashrate) +
|
||||
'\n' +
|
||||
|
|
@ -159,18 +159,18 @@ exports.hash = {
|
|||
.filter(function(n) {
|
||||
return n !== '';
|
||||
});
|
||||
var myhashrate = words[1];
|
||||
let myhashrate = words[1];
|
||||
if (myhashrate == '' || myhashrate == null || myhashrate == undefined || myhashrate == ' ') {
|
||||
myhashrate = '100';
|
||||
}
|
||||
var Diff = response.body.difficulty24;
|
||||
var Reward = response.body.block_reward;
|
||||
var myHash = Number(myhashrate);
|
||||
var LBC = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 3600;
|
||||
var LBC24 = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 86400;
|
||||
var LBC1w = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 604800;
|
||||
var LBC1m = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 2628000;
|
||||
var message =
|
||||
let Diff = response.body.difficulty24;
|
||||
let Reward = response.body.block_reward;
|
||||
let myHash = Number(myhashrate);
|
||||
let LBC = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 3600;
|
||||
let LBC24 = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 86400;
|
||||
let LBC1w = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 604800;
|
||||
let LBC1m = myHash / 2000 * (1 / ((Diff * 2) ^ 32) * Reward) * 2628000;
|
||||
let message =
|
||||
'With **' +
|
||||
myHash +
|
||||
' Mh/s** and Average 24 hour Difficulty: **' +
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ exports.lbrylink = function(bot, msg, suffix) {
|
|||
}
|
||||
if (msg.content.includes('lbry://')) {
|
||||
//Extract URL from Message
|
||||
newURL = msg.content
|
||||
let newURL = msg.content
|
||||
.replace('lbry://', 'https://open.lbry.io/')
|
||||
.match(/\bhttps?:\/\/\S+/gi)
|
||||
.toString();
|
||||
|
|
@ -28,8 +28,8 @@ exports.lbrylink = function(bot, msg, suffix) {
|
|||
//Check if Username Was Supplied
|
||||
if (newURL.includes('>')) {
|
||||
//Get rid of ID from message
|
||||
parseID = newURL.split('>').pop();
|
||||
newURL = 'https://open.lbry.io' + parseID;
|
||||
let parseID = newURL.split('>').pop();
|
||||
let newURL = 'https://open.lbry.io' + parseID;
|
||||
if (responseDebug) {
|
||||
console.log('Username Provided!');
|
||||
console.log('parseID = ' + parseID);
|
||||
|
|
@ -45,8 +45,8 @@ exports.lbrylink = function(bot, msg, suffix) {
|
|||
//Also check obscurity in username like ``@MSFTserver` vs `@MSFTserverPics`
|
||||
if (parseID.includes('/')) {
|
||||
//parse out extra params before `/` like `<@123456789>Pics`
|
||||
parseID = parseID.split('/').pop();
|
||||
newURL = 'https://open.lbry.io/' + parseID;
|
||||
let parseID = parseID.split('/').pop();
|
||||
let newURL = 'https://open.lbry.io/' + parseID;
|
||||
if (responseDebug) {
|
||||
console.log('Username no / check');
|
||||
console.log('parseID = ' + parseID);
|
||||
|
|
|
|||
|
|
@ -12,23 +12,24 @@ exports.releasenotes = {
|
|||
usage: '',
|
||||
description: 'gets current release notes from GITHUB',
|
||||
process: function(bot, msg, suffix) {
|
||||
var headers = {
|
||||
const headers = {
|
||||
'Content-Type': 'application/json',
|
||||
'User-Agent': 'Super Agent/0.0.1'
|
||||
};
|
||||
// Configure the request
|
||||
var options = {
|
||||
const options = {
|
||||
url: 'https://api.github.com/repos/lbryio/lbry-app/releases/latest',
|
||||
method: 'GET',
|
||||
headers: headers
|
||||
};
|
||||
|
||||
// Start the request
|
||||
let message;
|
||||
request(options, function(error, response, body) {
|
||||
releasemessage = JSON.parse(body).body;
|
||||
releasename = JSON.parse(body).name;
|
||||
releasedate = JSON.parse(body).published_at;
|
||||
releaseurl = JSON.parse(body).html_url;
|
||||
let releasemessage = JSON.parse(body).body;
|
||||
let releasename = JSON.parse(body).name;
|
||||
let releasedate = JSON.parse(body).published_at;
|
||||
let releaseurl = JSON.parse(body).html_url;
|
||||
if (releasemessage.length < 2000) {
|
||||
message = {
|
||||
embed: {
|
||||
|
|
@ -64,12 +65,12 @@ exports.releasenotes = {
|
|||
.filter(function(n) {
|
||||
return n !== '';
|
||||
});
|
||||
releasemessage1 = message[0];
|
||||
releasemessage2 = message[1];
|
||||
releasemessage3 = message[2];
|
||||
releasemessage4 = message[3];
|
||||
releasemessage5 = message[4];
|
||||
message1 = {
|
||||
let releasemessage1 = message[0];
|
||||
let releasemessage2 = message[1];
|
||||
let releasemessage3 = message[2];
|
||||
let releasemessage4 = message[3];
|
||||
let releasemessage5 = message[4];
|
||||
let message1 = {
|
||||
embed: {
|
||||
title: '*Download ' + releasename + ' here!*',
|
||||
description: releasemessage1,
|
||||
|
|
@ -86,7 +87,7 @@ exports.releasenotes = {
|
|||
}
|
||||
}
|
||||
};
|
||||
message2 = {
|
||||
let message2 = {
|
||||
embed: {
|
||||
description: releasemessage2,
|
||||
color: 7976557,
|
||||
|
|
@ -100,7 +101,7 @@ exports.releasenotes = {
|
|||
}
|
||||
}
|
||||
};
|
||||
message3 = {
|
||||
let message3 = {
|
||||
embed: {
|
||||
description: releasemessage3,
|
||||
color: 7976557,
|
||||
|
|
@ -114,7 +115,7 @@ exports.releasenotes = {
|
|||
}
|
||||
}
|
||||
};
|
||||
message4 = {
|
||||
let message4 = {
|
||||
embed: {
|
||||
description: releasemessage4,
|
||||
color: 7976557,
|
||||
|
|
@ -128,7 +129,7 @@ exports.releasenotes = {
|
|||
}
|
||||
}
|
||||
};
|
||||
message5 = {
|
||||
let message5 = {
|
||||
embed: {
|
||||
description: releasemessage5,
|
||||
color: 7976557,
|
||||
|
|
|
|||
|
|
@ -56,6 +56,8 @@ exports.stats = {
|
|||
} else {
|
||||
let data = response.body.data;
|
||||
let price_eur = Number(data.quotes.EUR.price);
|
||||
let data = response.body[0];
|
||||
let price_eur = Number(data.price_eur);
|
||||
let description =
|
||||
'**Rank: [' +
|
||||
rank +
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue