From 23c6238753389c81bfa94d563b5f448552043fec Mon Sep 17 00:00:00 2001 From: kenrag24 Date: Wed, 3 Jun 2020 11:19:47 -0500 Subject: [PATCH 1/3] added a covid stats command --- package.json | 3 +- src/modules/general/commands/covidstats.js | 61 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/modules/general/commands/covidstats.js diff --git a/package.json b/package.json index 67c21a3..f77f384 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "dependencies": { "common-tags": "^1.8.0", "discord.js": "^11.5.1", - "got": "^9.6.0" + "got": "^9.6.0", + "novelcovid": "^2.2.0" }, "devDependencies": { "eslint": "^5.16.0", diff --git a/src/modules/general/commands/covidstats.js b/src/modules/general/commands/covidstats.js new file mode 100644 index 0000000..97fb4ec --- /dev/null +++ b/src/modules/general/commands/covidstats.js @@ -0,0 +1,61 @@ +const {NovelCovid} = require('novelcovid') +const track = new NovelCovid(); +const { Command } = require('../../../handler'); +const {MessageEmbed} = require('discord.js') +module.exports = class extends Command { + constructor() { + super('covid', { + aliases: ['corona'], + info: 'Get corona stats', + usage: 'covid ', + guildOnly: false, + }); + } + + async run(message) { + const args = message.content.slice(prefix.length).split(/ +/); + const command = args.shift().toLowerCase(); + + if(!args.length) { + return message.channel.send("Please give the name of country") + } + + if(args.join(" ") === "all") { + let corona = await track.all() + + let embed = new MessageEmbed() + .setTitle("Global Cases") + .setColor("#ff2050") + .setDescription("Sometimes cases number may differ from other sources") + .addField("Total Cases", corona.cases, true) + .addField("Total Deaths", corona.deaths, true) + .addField("Total Recovered", corona.recovered, true) + .addField("Today's Cases", corona.todayCases, true) + .addField("Today's Deaths", corona.todayDeaths, true) + .addField("Active Cases", corona.active, true); + + return message.channel.send(embed) + + + + } else { + let corona = await track.countries(args.join(" ")) + + let embed = new MessageEmbed() + .setTitle(`${corona.country}`) + .setColor("#ff2050") + .setDescription("Sometimes cases number may differ from small amount.") + .addField("Total Cases", corona.cases, true) + .addField("Total Deaths", corona.deaths, true) + .addField("Total Recovered", corona.recovered, true) + .addField("Today's Cases", corona.todayCases, true) + .addField("Today's Deaths", corona.todayDeaths, true) + .addField("Active Cases", corona.active, true); + + return message.channel.send(embed) + + + } + + } +}; From f83951c756c2c836694a15df287a8750d0649a94 Mon Sep 17 00:00:00 2001 From: kenrag24 Date: Thu, 2 Jul 2020 19:34:24 -0500 Subject: [PATCH 2/3] added a meme command and updated some of the code to discord.js v12 --- package.json | 3 +- src/modules/general/commands/covidstats.js | 61 ---------------------- src/modules/general/commands/help.js | 4 +- src/modules/general/commands/meme.js | 26 +++++++++ 4 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 src/modules/general/commands/covidstats.js create mode 100644 src/modules/general/commands/meme.js diff --git a/package.json b/package.json index f77f384..c4b47ac 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,9 @@ "homepage": "https://github.com/The-SourceCode/Open-SourceBot#readme", "dependencies": { "common-tags": "^1.8.0", - "discord.js": "^11.5.1", + "discord.js": "^12.2.0", "got": "^9.6.0", + "node-fetch": "^2.6.0", "novelcovid": "^2.2.0" }, "devDependencies": { diff --git a/src/modules/general/commands/covidstats.js b/src/modules/general/commands/covidstats.js deleted file mode 100644 index 97fb4ec..0000000 --- a/src/modules/general/commands/covidstats.js +++ /dev/null @@ -1,61 +0,0 @@ -const {NovelCovid} = require('novelcovid') -const track = new NovelCovid(); -const { Command } = require('../../../handler'); -const {MessageEmbed} = require('discord.js') -module.exports = class extends Command { - constructor() { - super('covid', { - aliases: ['corona'], - info: 'Get corona stats', - usage: 'covid ', - guildOnly: false, - }); - } - - async run(message) { - const args = message.content.slice(prefix.length).split(/ +/); - const command = args.shift().toLowerCase(); - - if(!args.length) { - return message.channel.send("Please give the name of country") - } - - if(args.join(" ") === "all") { - let corona = await track.all() - - let embed = new MessageEmbed() - .setTitle("Global Cases") - .setColor("#ff2050") - .setDescription("Sometimes cases number may differ from other sources") - .addField("Total Cases", corona.cases, true) - .addField("Total Deaths", corona.deaths, true) - .addField("Total Recovered", corona.recovered, true) - .addField("Today's Cases", corona.todayCases, true) - .addField("Today's Deaths", corona.todayDeaths, true) - .addField("Active Cases", corona.active, true); - - return message.channel.send(embed) - - - - } else { - let corona = await track.countries(args.join(" ")) - - let embed = new MessageEmbed() - .setTitle(`${corona.country}`) - .setColor("#ff2050") - .setDescription("Sometimes cases number may differ from small amount.") - .addField("Total Cases", corona.cases, true) - .addField("Total Deaths", corona.deaths, true) - .addField("Total Recovered", corona.recovered, true) - .addField("Today's Cases", corona.todayCases, true) - .addField("Today's Deaths", corona.todayDeaths, true) - .addField("Active Cases", corona.active, true); - - return message.channel.send(embed) - - - } - - } -}; diff --git a/src/modules/general/commands/help.js b/src/modules/general/commands/help.js index a1b5862..1bbbd50 100644 --- a/src/modules/general/commands/help.js +++ b/src/modules/general/commands/help.js @@ -1,4 +1,4 @@ -const { RichEmbed } = require('discord.js'); +const { MessageEmbed } = require('discord.js'); const got = require('got'); const Path = require('path'); const { Command } = require('../../../handler'); @@ -90,7 +90,7 @@ module.exports = class extends Command { `; } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setTitle('Need help? Here are you go!') .setDescription( `${description}\n(**[]** is optional, **<>** is required)`, diff --git a/src/modules/general/commands/meme.js b/src/modules/general/commands/meme.js new file mode 100644 index 0000000..1927051 --- /dev/null +++ b/src/modules/general/commands/meme.js @@ -0,0 +1,26 @@ +const { Command } = require('../../../handler'); +const { MessageEmbed } = require('discord.js') +const fetch = require('node-fetch') +module.exports = class extends Command { + constructor() { + super('meme', { + info: 'Get a meme', + usage: 'meme', + guildOnly: true, + }); + } + + async run(message) { + fetch("https://meme-api.herokuapp.com/gimme") + .then((res) => res.json()) + .then((body) => { + let embed = new MessageEmbed() + .setTitle(body.title) + .setImage(body.url) + .setFooter(`From r/${body.subreddit}`) + .setURL(body.postLink) + .setColor("RANDOM") + return message.util.send(embed) + }) + } +}; From 8f53366569e711b3a1ea20c016a24969d840cf8b Mon Sep 17 00:00:00 2001 From: kenrag24 Date: Thu, 2 Jul 2020 19:37:21 -0500 Subject: [PATCH 3/3] updated travis.yml file --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb110d4..3df0873 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,8 @@ language: node_js node_js: - - 10 + - 12 install: npm i cache: npm -jobs: - include: - - script: npm run lint - name: "Lint" +