From f12940261d7afd7254c703d30272fdc688cb8ef7 Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Tue, 9 Oct 2018 11:42:09 +0200 Subject: Implement Halloweenify feature. --- bot/cogs/halloweenify.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 bot/cogs/halloweenify.py (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py new file mode 100644 index 00000000..0422e787 --- /dev/null +++ b/bot/cogs/halloweenify.py @@ -0,0 +1,46 @@ +from pathlib import Path +from json import load +from random import choice + + +import discord +from discord.ext import commands +from discord.ext.commands.cooldowns import BucketType + + +class Halloweenify: + + """ + A cog to change a invokers nickname to a spooky one! + """ + + def __init__(self, bot): + self.bot = bot + + @commands.cooldown(1, 300, BucketType.user) + @commands.command() + async def halloweenify(self, ctx): + with open(Path('../bot/resources', 'halloweenify.json'), 'r') as f: + data = load(f) + + # Choose a random character from our list we loaded above and set apart the nickname and image url. + character = choice(data['characters']) + nickname = ''.join([nickname for nickname in character]) + image = ''.join([character[nickname] for nickname in character]) + + # Build up a Embed + embed = discord.Embed() + embed.colour = discord.Colour.dark_orange() + embed.title = 'Wow!' + embed.description = ( + f'Your previous nickname, **{ctx.author.display_name}**, wasn\'t spooky enough for you that you have ' + f'decided to change it?! Okay, your new nickname will be **{nickname}**.\n\n' + ) + embed.set_image(url=image) + + await ctx.author.edit(nick=nickname) + await ctx.send(embed=embed) + + +def setup(bot): + bot.add_cog(Halloweenify(bot)) -- cgit v1.2.3 From a4c8da298b4b44fe222b304676029407734c77f6 Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Wed, 10 Oct 2018 11:04:24 +0200 Subject: Change message to a more friendly one. --- bot/cogs/halloweenify.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index 0422e787..58cef019 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -33,8 +33,9 @@ class Halloweenify: embed.colour = discord.Colour.dark_orange() embed.title = 'Wow!' embed.description = ( - f'Your previous nickname, **{ctx.author.display_name}**, wasn\'t spooky enough for you that you have ' - f'decided to change it?! Okay, your new nickname will be **{nickname}**.\n\n' + f'**{ctx.author.display_name}** wasn\'t spooky enough for you? That\'s understandable, ' + f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n Your ' + f'new nickname will be: \n 👻 **{nickname}** 🎃' ) embed.set_image(url=image) -- cgit v1.2.3 From 94a275c3b0222a261aa7d07b8ab37f92f9d82fd3 Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Wed, 10 Oct 2018 11:18:55 +0200 Subject: Minor changes to the Embed. --- bot/cogs/halloweenify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index 58cef019..c49e0058 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -31,11 +31,11 @@ class Halloweenify: # Build up a Embed embed = discord.Embed() embed.colour = discord.Colour.dark_orange() - embed.title = 'Wow!' + embed.title = 'Not spooky enough?' embed.description = ( f'**{ctx.author.display_name}** wasn\'t spooky enough for you? That\'s understandable, ' f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n Your ' - f'new nickname will be: \n 👻 **{nickname}** 🎃' + f'new nickname will be: \n :jack_o_lantern: **{nickname}** :ghost:' ) embed.set_image(url=image) -- cgit v1.2.3 From 8ea196581e70e149ce998d9c49bf8bf1f9a746db Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Wed, 10 Oct 2018 11:21:50 +0200 Subject: Ooops, reversed the emojis. --- bot/cogs/halloweenify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index c49e0058..226d55db 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -35,7 +35,7 @@ class Halloweenify: embed.description = ( f'**{ctx.author.display_name}** wasn\'t spooky enough for you? That\'s understandable, ' f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n Your ' - f'new nickname will be: \n :jack_o_lantern: **{nickname}** :ghost:' + f'new nickname will be: \n :ghost: **{nickname}** :jack_o_lantern:' ) embed.set_image(url=image) -- cgit v1.2.3 From ff5882981e0fcaba65f8b6ffa0dcbdd756826503 Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Wed, 10 Oct 2018 11:26:59 +0200 Subject: Missing newline. --- bot/cogs/halloweenify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index 226d55db..e4fb787c 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -35,7 +35,7 @@ class Halloweenify: embed.description = ( f'**{ctx.author.display_name}** wasn\'t spooky enough for you? That\'s understandable, ' f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n Your ' - f'new nickname will be: \n :ghost: **{nickname}** :jack_o_lantern:' + f'new nickname will be: \n\n :ghost: **{nickname}** :jack_o_lantern:' ) embed.set_image(url=image) -- cgit v1.2.3 From fb46d8f2dba8a5f00bf7914c8b4a026acbbf55fc Mon Sep 17 00:00:00 2001 From: Marko Kovačević Date: Wed, 10 Oct 2018 11:28:46 +0200 Subject: Another cosmetic mistake. --- bot/cogs/halloweenify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index e4fb787c..8a9db3df 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -34,8 +34,8 @@ class Halloweenify: embed.title = 'Not spooky enough?' embed.description = ( f'**{ctx.author.display_name}** wasn\'t spooky enough for you? That\'s understandable, ' - f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n Your ' - f'new nickname will be: \n\n :ghost: **{nickname}** :jack_o_lantern:' + f'{ctx.author.display_name} isn\'t scary at all! Let me think of something better. Hmm... I got it!\n\n ' + f'Your new nickname will be: \n :ghost: **{nickname}** :jack_o_lantern:' ) embed.set_image(url=image) -- cgit v1.2.3 From a606e483b3a42357778fc3d4979e800e8dd38739 Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Thu, 11 Oct 2018 11:44:28 +0200 Subject: Adding Pale Man, fixing all flake8 issues, converting halloweenify to use aiohttp, fixing broken logging, ignoring irrelevant loggers, and turning the script into a valid module script. --- bot/__init__.py | 19 ++++++++++++------- bot/__main__.py | 39 +++++++++++++++++++++++++++++++++++++++ bot/bot.py | 39 --------------------------------------- bot/cogs/hacktoberstats.py | 9 ++++++++- bot/cogs/halloweenify.py | 4 +--- bot/cogs/movie.py | 33 ++++++++++++++++++++------------- bot/resources/halloweenify.json | 3 +++ 7 files changed, 83 insertions(+), 63 deletions(-) create mode 100644 bot/__main__.py delete mode 100644 bot/bot.py (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/__init__.py b/bot/__init__.py index 8cbcd121..c2ea4ba0 100644 --- a/bot/__init__.py +++ b/bot/__init__.py @@ -1,8 +1,8 @@ -import os import logging.handlers +import os -# set up logging +# set up logging log_dir = 'log' log_file = log_dir + os.sep + 'hackbot.log' os.makedirs(log_dir, exist_ok=True) @@ -22,9 +22,14 @@ if root.handlers: for handler in root.handlers: root.removeHandler(handler) -# setup new logging configuration -logging.basicConfig(format='%(asctime)s - %(name)s %(levelname)s: %(message)s', datefmt="%D %H:%M:%S", - level=logging.DEBUG, - handlers=[console_handler, file_handler]) +# Silence irrelevant loggers +logging.getLogger("discord").setLevel(logging.ERROR) -logging.info('Logging Process Started') \ No newline at end of file +# setup new logging configuration +logging.basicConfig( + format='%(asctime)s - %(name)s %(levelname)s: %(message)s', + datefmt="%D %H:%M:%S", + level=logging.DEBUG, + handlers=[console_handler, file_handler] +) +logging.getLogger().info('Logging initialization complete') diff --git a/bot/__main__.py b/bot/__main__.py new file mode 100644 index 00000000..2c41d2d9 --- /dev/null +++ b/bot/__main__.py @@ -0,0 +1,39 @@ +import logging +from os import environ +from pathlib import Path +from traceback import format_exc + +from discord.ext import commands + +HACKTOBERBOT_TOKEN = environ.get('HACKTOBERBOT_TOKEN') +log = logging.getLogger() + +if HACKTOBERBOT_TOKEN: + token_dl = len(HACKTOBERBOT_TOKEN) // 8 + log.info(f'Bot token loaded: {HACKTOBERBOT_TOKEN[:token_dl]}...{HACKTOBERBOT_TOKEN[-token_dl:]}') +else: + log.error(f'Bot token not found: {HACKTOBERBOT_TOKEN}') + +ghost_unicode = "\N{GHOST}" +bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unicode} ", ghost_unicode)) + +log.info('Start loading extensions from ./cogs/') + + +if __name__ == '__main__': + # Scan for files in the /cogs/ directory and make a list of the file names. + cogs = [file.stem for file in Path('cogs').glob('*.py')] + for extension in cogs: + try: + bot.load_extension(f'cogs.{extension}') + log.info(f'Successfully loaded extension: {extension}') + except Exception as e: + log.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}') + # print(f'Failed to load extension {extension}.', file=stderr) + # print_exc() + +log.info(f'Spooky Launch Sequence Initiated...') + +bot.run(HACKTOBERBOT_TOKEN) + +log.info(f'HackBot has been slain!') diff --git a/bot/bot.py b/bot/bot.py deleted file mode 100644 index a40ed0d4..00000000 --- a/bot/bot.py +++ /dev/null @@ -1,39 +0,0 @@ -from os import environ -from pathlib import Path -from sys import stderr -from traceback import print_exc, format_exc - -from discord.ext import commands -import logging - -HACKTOBERBOT_TOKEN = environ.get('HACKTOBERBOT_TOKEN') - -if HACKTOBERBOT_TOKEN: - token_dl = len(HACKTOBERBOT_TOKEN) // 8 - logging.info(f'Bot token loaded: {HACKTOBERBOT_TOKEN[:token_dl]}...{HACKTOBERBOT_TOKEN[-token_dl:]}') -else: - logging.error(f'Bot token not found: {HACKTOBERBOT_TOKEN}') - -ghost_unicode = "\N{GHOST}" -bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unicode} ", ghost_unicode)) - -logging.info('Start loading extensions from ./cogs/') - - -if __name__ == '__main__': - # Scan for files in the /cogs/ directory and make a list of the file names. - cogs = [file.stem for file in Path('cogs').glob('*.py')] - for extension in cogs: - try: - bot.load_extension(f'cogs.{extension}') - logging.info(f'Successfully loaded extension: {extension}') - except Exception as e: - logging.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}') - # print(f'Failed to load extension {extension}.', file=stderr) - # print_exc() - -logging.info(f'Spooky Launch Sequence Initiated...') - -bot.run(HACKTOBERBOT_TOKEN) - -logging.info(f'HackBot has been slain!') \ No newline at end of file diff --git a/bot/cogs/hacktoberstats.py b/bot/cogs/hacktoberstats.py index 4e896ae9..ac81b887 100644 --- a/bot/cogs/hacktoberstats.py +++ b/bot/cogs/hacktoberstats.py @@ -95,7 +95,14 @@ class Stats: is_query = f"public+author:{username}" date_range = "2018-10-01..2018-10-31" per_page = "300" - query_url = f"{base_url}-label:{not_label}+type:{action_type}+is:{is_query}+created:{date_range}&per_page={per_page}" + query_url = ( + f"{base_url}" + f"-label:{not_label}" + f"+type:{action_type}" + f"+is:{is_query}" + f"+created:{date_range}" + f"&per_page={per_page}" + ) headers = {"user-agent": "Discord Python Hactoberbot"} async with aiohttp.ClientSession() as session: diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index 8a9db3df..ddd96bc6 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -1,15 +1,13 @@ -from pathlib import Path from json import load +from pathlib import Path from random import choice - import discord from discord.ext import commands from discord.ext.commands.cooldowns import BucketType class Halloweenify: - """ A cog to change a invokers nickname to a spooky one! """ diff --git a/bot/cogs/movie.py b/bot/cogs/movie.py index bb6f8df8..51529bc9 100644 --- a/bot/cogs/movie.py +++ b/bot/cogs/movie.py @@ -1,8 +1,10 @@ -import requests import random from os import environ -from discord.ext import commands + +import aiohttp from discord import Embed +from discord.ext import commands + TMDB_API_KEY = environ.get('TMDB_API_KEY') TMDB_TOKEN = environ.get('TMDB_TOKEN') @@ -40,19 +42,24 @@ class Movie: } # Get total page count of horror movies - response = requests.get(url=url, params=params, headers=headers) - total_pages = response.json().get('total_pages') + async with aiohttp.ClientSession() as session: + response = await session.get(url=url, params=params, headers=headers) + total_pages = await response.json() + total_pages = total_pages.get('total_pages') - # Get movie details from one random result on a random page - params['page'] = random.randint(1, total_pages) - response = requests.get(url=url, params=params, headers=headers) - selection_id = random.choice(response.json().get('results')).get('id') + # Get movie details from one random result on a random page + params['page'] = random.randint(1, total_pages) + response = await session.get(url=url, params=params, headers=headers) + response = await response.json() + selection_id = random.choice(response.get('results')).get('id') - # Get full details and credits - selection = requests.get(url='https://api.themoviedb.org/3/movie/' + str(selection_id), - params={'api_key': TMDB_API_KEY, 'append_to_response': 'credits'}) + # Get full details and credits + selection = await session.get( + url='https://api.themoviedb.org/3/movie/' + str(selection_id), + params={'api_key': TMDB_API_KEY, 'append_to_response': 'credits'} + ) - return selection.json() + return await selection.json() @staticmethod async def format_metadata(movie): @@ -72,7 +79,7 @@ class Movie: rating_count = movie.get('vote_average') / 2 rating = '' - for i in range(int(rating_count)): + for _ in range(int(rating_count)): rating += ':skull:' if (rating_count % 1) >= .5: diff --git a/bot/resources/halloweenify.json b/bot/resources/halloweenify.json index 458f9342..88c46bfc 100644 --- a/bot/resources/halloweenify.json +++ b/bot/resources/halloweenify.json @@ -74,6 +74,9 @@ }, { "Chatterer": "https://c-5uwzmx78pmca09x24quoqfx2ezivsmzx2ekwu.g00.ranker.com/g00/3_c-5eee.zivsmz.kwu_/c-5UWZMXPMCA09x24pbbx78ax3ax2fx2fquoqf.zivsmz.kwux2fvwlm_quox2f14x2f586061x2fwzqoqvitx2fkpibbmzmz-nqtu-kpizikbmza-x78pwbw-9x3fex3d438x26yx3d48x26nux3drx78ox26nqbx3dkzwx78x26kzwx78x3dnikmax22x26q98k.uizsx3dquiom_$/$/$/$/$/$" + }, + { + "Pale Man": "https://i2.wp.com/macguff.in/wp-content/uploads/2016/10/Pans-Labyrinth-Movie-Header-Image.jpg?fit=630%2C400&ssl=1" } ] } \ No newline at end of file -- cgit v1.2.3 From 3230a505b1e5aa84e79a0afc09e10da6d433120d Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Fri, 12 Oct 2018 00:36:53 +0200 Subject: Fixing halloweenify json path --- bot/cogs/halloweenify.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bot/cogs/halloweenify.py') diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index ddd96bc6..a5fe45ef 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -18,7 +18,10 @@ class Halloweenify: @commands.cooldown(1, 300, BucketType.user) @commands.command() async def halloweenify(self, ctx): - with open(Path('../bot/resources', 'halloweenify.json'), 'r') as f: + """ + Change your nickname into a much spookier one! + """ + with open(Path('./bot/resources', 'halloweenify.json'), 'r') as f: data = load(f) # Choose a random character from our list we loaded above and set apart the nickname and image url. -- cgit v1.2.3