Merge branch 'master' into PEP-fixin

gwendolyn/cogs/misc_cog.py

@@ -72,7 +72,7 @@ class MiscCog(commands.Cog):
     @cog_ext.cog_slash(**params["wiki"])
     async def wiki(self, ctx: SlashContext, wiki_page=""):
         """Get a page on a fandom wiki."""
-        await self.bot.other.findWikiPage(ctx, wiki_page)
+        await self.bot.other.findWikiPage(ctx, page)
 
     @cog_ext.cog_slash(**params["add_movie"])
     async def add_movie(self, ctx: SlashContext, movie):

gwendolyn/funcs/other/plex.py

@@ -91,7 +91,7 @@ class Plex():
         buttons.append(create_button(
             style=ButtonStyle.red,
             label="X",
-            custom_id=encode_id(["plex", "movie", ""])
+            custom_id=encode_id(["plex", "movie", "x"])
             )
         )
 
@@ -114,7 +114,7 @@ class Plex():
         if not edit_message:
             await message.delete()
 
-        if imdb_id == "":
+        if imdb_id == "X":
             self.bot.log("Did not find what the user was searching for")
             message_text = "Try searching for the IMDB id"
         else:
@@ -229,7 +229,7 @@ class Plex():
         buttons.append(create_button(
             style=ButtonStyle.red,
             label="X",
-            custom_id=encode_id(["plex", "show", ""])
+            custom_id=encode_id(["plex", "show", "x"])
             )
         )
 
@@ -246,7 +246,7 @@ class Plex():
 
     async def add_show(self, message, imdb_id, edit_message = True):
         """Add the requested show to Plex."""
-        if imdb_id == "":
+        if imdb_id == "X":
             self.bot.log("Did not find what the user was searching for")
             message_text = "Try searching for the IMDB id"
         else:
@@ -345,6 +345,8 @@ class Plex():
 
             if len(torrent_list) > 0:
                 for torrent in torrent_list:
+                    if torrent['category'] not in ["radarr", "tv-sonarr"]:
+                        break
                     torrent_name = torrent["name"]
                     if len(torrent_name) > 30:
                         if torrent_name[26] == " ":