Merge pull request #32 from matthewflegg/dev

Reorganised utils folder and fixed dependency error

Author: v0idzdev

cogs/admin/admin_cog.py

@@ -3,11 +3,10 @@
 """
 
 import asyncio
-
 import discord
+
 from discord.ext import commands
-from utils.buttons import BlacklistClearButton, BlacklistRemoveView, ClearMessagesView, DropdownView
-from utils.functions import lift_ban, sanction
+from utils import BlacklistClearButton, BlacklistAddView, BlacklistRemoveView, ClearMessagesView, lift_ban, sanction
 
 FILEPATH = "files/blacklist.json"
 
@@ -117,7 +116,7 @@ async def blacklist(self, ctx: commands.Context, *, words: str=None):
         ```
         """
         if not words:
-            view = DropdownView(ctx)
+            view = BlacklistAddView(ctx)
             embed = discord.Embed(
                 title="🛠️ Please enter one or more words to blacklist."
             )

cogs/help/help_cog.py

@@ -3,8 +3,8 @@
 """
 
 import sys
-
 import discord
+
 from discord.ext import commands
 from .help_command import HelpCommand
 

cogs/help/help_command.py

@@ -2,9 +2,9 @@
 Sends an embedded, custom, help command.
 """
 
-from typing import Optional
 import discord
 
+from typing import Optional
 from discord.ext import commands
 from discord import app_commands
 

cogs/misc/misc_cog.py

@@ -9,7 +9,7 @@
 
 from typing import Optional
 from discord.ext import commands
-from utils.models import TwitchBroadcast
+from utils import TwitchBroadcast
 
 
 class MiscCog(commands.Cog, name="Misc"):

files/blacklist.json

@@ -1,6 +1,5 @@
 {
     "953054451999072276": [
-        "asshole",
         "arse"
     ]
 }

handlers/task_handler.py

@@ -1,6 +1,6 @@
 import threading
-
 import discord
+
 from discord.ext import commands, tasks
 
 # JSON file containing reaction role data

main.py

@@ -13,7 +13,7 @@
 import dotenv
 
 from discord.ext import commands
-from utils.models import Cache, Twitch
+from utils import Cache, Twitch
 
 
 def get_prefix(bot: commands.Bot, message: discord.Message):

requirements.txt

@@ -26,4 +26,5 @@ yarl==1.7.2
 youtube-dl==2021.12.17
 pillow==9.0.1
 humanize
+black
 jishaku @ git+https://github.com/Gorialis/jishaku

slash_cogs/misc/__init__.py

@@ -4,12 +4,12 @@
 
 import datetime
 import random
-
 import discord
 import humanize
+
 from discord import app_commands
 from discord.ext import commands
-from utils.models import TwitchBroadcast
+from utils import TwitchBroadcast
 
 
 class SlashMiscCog(commands.Cog):