diff --git a/.gitignore b/.gitignore index dbccdcb73..0eda60240 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ __pycache__ data !data/trivia/* -!data/audio/playlists/* \ No newline at end of file +!data/audio/playlists/* +cogs/quote.py diff --git a/image.something b/image.something deleted file mode 100644 index b2664e32f..000000000 --- a/image.something +++ /dev/null @@ -1,94 +0,0 @@ -import discord -from discord.ext import commands -from random import randint -from imgurpython import ImgurClient -import aiohttp -import random - -class Image: - """Image related commands.""" - - def __init__(self, bot): - self.bot = bot - #Reserved for further ... stuff - - """Commands section""" - - @commands.command(no_pm=True) - async def imgur(self, *text): - """Retrieves a random imgur picture. - imgur search [keyword] - retrieves first hit of search query. - imgur [subreddit section] [top or new] - retrieves top 3 hottest or latest pictures of today for given a subreddit section, e.g. 'funny'.""" - imgurclient = ImgurClient("1fd3ef04daf8cab", "f963e574e8e3c17993c933af4f0522e1dc01e230") - if text == (): - rand = randint(0, 59) #60 results per generated page - items = imgurclient.gallery_random(page=0) - await self.bot.say(items[rand].link) - elif text[0] == "search": - items = imgurclient.gallery_search(" ".join(text[1:len(text)]), advanced=None, sort='time', window='all', page=0) - if len(items) < 1: - await self.bot.say("Your search terms gave no results.") - else: - await self.bot.say(items[0].link) - elif text[0] != (): - if text[1] == "top": - imgSort = "top" - elif text[1] == "new": - imgSort = "time" - else: - await self.bot.say("Only top or new is a valid subcommand.") - return - items = imgurclient.subreddit_gallery(text[0], sort=imgSort, window='day', page=0) - if (len(items) < 3): - await self.bot.say("This subreddit section does not exist, try 'funny'") - else: - await self.bot.say("{} {} {}".format(items[0].link, items[1].link, items[2].link)) - - @commands.command(no_pm=True) - async def gif(self, *text): - """ gif [keyword] - retrieves first search result from giphy """ - if len(text) > 0: - if len(text[0]) > 1 and len(text[0]) < 20: - try: - msg = "+".join(text) - search = "http://api.giphy.com/v1/gifs/search?q=" + msg + "&api_key=dc6zaTOxFJmzC" - async with aiohttp.get(search) as r: - result = await r.json() - if result["data"] != []: - url = result["data"][0]["url"] - await self.bot.say(url) - else: - await self.bot.say("Your search terms gave no results.") - except: - await self.bot.say("Error.") - else: - await self.bot.say("Invalid search.") - else: - await self.bot.say("gif [text]") - - @commands.command(no_pm=True) - async def gifr(self, *text): - """ gifr [keyword] - retrieves a random gif from a giphy search """ - random.seed() - if len(text) > 0: - if len(text[0]) > 1 and len(text[0]) < 20: - try: - msg = "+".join(text) - search = "http://api.giphy.com/v1/gifs/search?q=" + msg + "&api_key=dc6zaTOxFJmzC" - async with aiohttp.get(search) as r: - result = await r.json() - if result["data"] != []: - maxarray = len(result) - url = result["data"][random.randint(0,maxarray)]["url"] - await self.bot.say(url) - else: - await self.bot.say("Your search terms gave no results.") - except: - await self.bot.say("Error.") - else: - await self.bot.say("Invalid search.") - else: - await self.bot.say("gif [text]") - -def setup(bot): - bot.add_cog(Image(bot))