From 7a5778005c9c8a58435d12dc589116c8a9b23a72 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Sat, 16 Sep 2017 02:44:45 +0000 Subject: [PATCH] Flickr is evil --- commands/search/flickr.js | 42 --------------------------------------- package.json | 2 +- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 commands/search/flickr.js diff --git a/commands/search/flickr.js b/commands/search/flickr.js deleted file mode 100644 index 2f9ade8f..00000000 --- a/commands/search/flickr.js +++ /dev/null @@ -1,42 +0,0 @@ -const Command = require('../../structures/Command'); -const snekfetch = require('snekfetch'); -const { FLICKR_KEY } = process.env; - -module.exports = class FlickrCommand extends Command { - constructor(client) { - super(client, { - name: 'flickr', - group: 'search', - memberName: 'flickr', - description: 'Searches Flickr for your query.', - args: [ - { - key: 'query', - prompt: 'What photo would you like to search for?', - type: 'string' - } - ] - }); - } - - async run(msg, { query }) { - try { - const { body } = await snekfetch - .get('https://api.flickr.com/services/rest/') - .query({ - api_key: FLICKR_KEY, - format: 'json', - method: 'flickr.photos.search', - text: query, - sort: 'relevance', - safe_search: msg.channel.nsfw ? 3 : 1, - nojsoncallback: true - }); - if (!body.photos.photo.length) return msg.say('Could not find any results.'); - const photo = body.photos.photo[Math.floor(Math.random() * body.photos.photo.length)]; - return msg.say(`https://farm${photo.farm}.staticflickr.com/${photo.server}/${photo.id}_${photo.secret}.jpg`); - } catch (err) { - return msg.say(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); - } - } -}; diff --git a/package.json b/package.json index f76069d5..ac16c7a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "39.1.1", + "version": "40.0.0", "description": "Your personal server companion.", "main": "Shard.js", "scripts": {