From 1756871fedbd3053283cb136521c248a5ec9bd73 Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Thu, 24 Jun 2021 17:47:53 +0200 Subject: Fix .scarymovie command(halloween) Modify the incorrect API endpoint and set HTTP parameters accordingly. --- bot/exts/halloween/scarymovie.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index f4cf41db..8be2cbaa 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -31,13 +31,14 @@ class ScaryMovie(commands.Cog): async def select_movie(self) -> dict: """Selects a random movie and returns a JSON of movie details from TMDb.""" - url = "https://api.themoviedb.org/4/discover/movie" + url = "https://api.themoviedb.org/3/discover/movie" params = { + "api_key": TMDB_API_KEY, "with_genres": "27", - "vote_count.gte": "5" + "vote_count.gte": "5", + "include_adult": "false" } headers = { - "Authorization": "Bearer " + TMDB_TOKEN, "Content-Type": "application/json;charset=utf-8" } -- cgit v1.2.3 From ba70f0d11fd53aafd7c21345bace8bdd7c7d8194 Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Thu, 24 Jun 2021 17:54:57 +0200 Subject: Remove unused variable (TMDB_TOKEN) --- bot/exts/halloween/scarymovie.py | 1 - 1 file changed, 1 deletion(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index 8be2cbaa..72f021cb 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -11,7 +11,6 @@ log = logging.getLogger(__name__) TMDB_API_KEY = environ.get("TMDB_API_KEY") -TMDB_TOKEN = environ.get("TMDB_TOKEN") class ScaryMovie(commands.Cog): -- cgit v1.2.3 From 58baaa3e40dafc28064bd234f7b68c064632e8d4 Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Fri, 25 Jun 2021 16:57:31 +0200 Subject: Update scarymovie.py to use the constants module --- bot/exts/halloween/scarymovie.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index 72f021cb..4ba6d57a 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -1,16 +1,15 @@ import logging import random -from os import environ from discord import Embed from discord.ext import commands from bot.bot import Bot - +from bot.constants import Tokens log = logging.getLogger(__name__) -TMDB_API_KEY = environ.get("TMDB_API_KEY") +TMDB_API_KEY = Tokens.tmdb class ScaryMovie(commands.Cog): -- cgit v1.2.3 From c040e726c2fedf7bc78f027f9400bed59ce5081f Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:37:59 +0200 Subject: Update bot/exts/halloween/scarymovie.py Co-authored-by: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com> --- bot/exts/halloween/scarymovie.py | 1 - 1 file changed, 1 deletion(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index 4ba6d57a..c7526569 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -9,7 +9,6 @@ from bot.constants import Tokens log = logging.getLogger(__name__) -TMDB_API_KEY = Tokens.tmdb class ScaryMovie(commands.Cog): -- cgit v1.2.3 From 89a8d465f7f67dd5e05ad99b99c4e54ab2120c7b Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:38:07 +0200 Subject: Update bot/exts/halloween/scarymovie.py Co-authored-by: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com> --- bot/exts/halloween/scarymovie.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index c7526569..99c4758a 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -30,7 +30,7 @@ class ScaryMovie(commands.Cog): """Selects a random movie and returns a JSON of movie details from TMDb.""" url = "https://api.themoviedb.org/3/discover/movie" params = { - "api_key": TMDB_API_KEY, + "api_key": Tokens.tmbd, "with_genres": "27", "vote_count.gte": "5", "include_adult": "false" -- cgit v1.2.3 From a654a782ff5b45d88a0decf155e7fc27d45011bf Mon Sep 17 00:00:00 2001 From: D0rs4n <41237606+D0rs4n@users.noreply.github.com> Date: Fri, 25 Jun 2021 18:25:12 +0200 Subject: Modify scarymovie to use the constants module everywhere in the code --- bot/exts/halloween/scarymovie.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bot') diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/halloween/scarymovie.py index 99c4758a..33659fd8 100644 --- a/bot/exts/halloween/scarymovie.py +++ b/bot/exts/halloween/scarymovie.py @@ -9,8 +9,6 @@ from bot.constants import Tokens log = logging.getLogger(__name__) - - class ScaryMovie(commands.Cog): """Selects a random scary movie and embeds info into Discord chat.""" @@ -30,7 +28,7 @@ class ScaryMovie(commands.Cog): """Selects a random movie and returns a JSON of movie details from TMDb.""" url = "https://api.themoviedb.org/3/discover/movie" params = { - "api_key": Tokens.tmbd, + "api_key": Tokens.tmdb, "with_genres": "27", "vote_count.gte": "5", "include_adult": "false" @@ -53,7 +51,7 @@ class ScaryMovie(commands.Cog): # Get full details and credits async with self.bot.http_session.get( url=f"https://api.themoviedb.org/3/movie/{selection_id}", - params={"api_key": TMDB_API_KEY, "append_to_response": "credits"} + params={"api_key": Tokens.tmdb, "append_to_response": "credits"} ) as selection: return await selection.json() -- cgit v1.2.3