From ab59d90bda454bad912f7b674275f9c329f38ac4 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 17 Jun 2020 18:12:41 +1000 Subject: [PATCH] re-enabled neko and nekogif --- src/commands/neko.js | 22 ++++++++++------------ src/commands/nekogif.js | 18 ++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/commands/neko.js b/src/commands/neko.js index 6e62f19..6594e6f 100644 --- a/src/commands/neko.js +++ b/src/commands/neko.js @@ -1,21 +1,19 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { +const fetch = require("node-fetch") +exports.run = async (client, message, args) => { message.channel.startTyping(); - try { - sfw.neko().then((json) => { - message.channel.send(json.url); + try{ + fetch(`https://purrbot.site/api/img/sfw/neko/img/`) + .then(res => res.json()) + .then(json => message.channel.send(json.link)); message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("neko.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) + } catch(err) { + message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`); message.channel.stopTyping(); }; }; exports.conf = { - enabled: false, + enabled: true, guildOnly: false, aliases: ["catgirl"], permLevel: "User", @@ -25,6 +23,6 @@ exports.conf = { exports.help = { name: "neko", category: "Image", - description: "Sends you pictures of catgirls.", + description: "Sends you cute wholesome pictures of catgirls.", usage: "neko" }; diff --git a/src/commands/nekogif.js b/src/commands/nekogif.js index cc878e8..5027723 100644 --- a/src/commands/nekogif.js +++ b/src/commands/nekogif.js @@ -1,15 +1,13 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { +const fetch = require("node-fetch") +exports.run = async (client, message, args) => { message.channel.startTyping(); - try { - sfw.nekoGif().then((json) => { - message.channel.send(json.url); + try{ + fetch(`https://purrbot.site/api/img/sfw/neko/gif/`) + .then(res => res.json()) + .then(json => message.channel.send(json.link)); message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("nekogif.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) + } catch(err) { + message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`); message.channel.stopTyping(); }; };