Fix import order across the bot

Author: ChrisLovering

bot/__main__.py

@@ -7,9 +7,9 @@
 import aiohttp
 from discord import AllowedMentions, Intents
 
-from . import settings
-from bot.bot import Friendo
 from bot import cogs
+from bot import settings
+from bot.bot import Friendo
 
 
 def _get_cogs() -> Iterator[str]:

bot/bot.py

@@ -3,9 +3,9 @@
 import aiohttp
 from discord.ext.commands import Bot, CommandError, Context
 
-from .disable import DisableApi
-from .graphql import GraphQLClient
-from .settings import API_COGS
+from bot.disable import DisableApi
+from bot.graphql import GraphQLClient
+from bot.settings import API_COGS
 
 log = logging.getLogger(__name__)
 

bot/cogs/admin.py

@@ -1,10 +1,10 @@
 import json
 import logging
-from pathlib import Path
 import re
+from pathlib import Path
 from typing import Callable, Optional
-import aiofiles
 
+import aiofiles
 from discord import Member
 from discord.ext.commands import Cog, Context, check, command
 

bot/cogs/advent_of_code.py

@@ -1,8 +1,13 @@
-from bot.bot import Friendo
+import logging
+
 from discord import errors
 from discord.ext.commands import Cog, Context, group
+
+from bot.bot import Friendo
 from bot.settings import AOC_JOIN_CODE, AOC_LEADERBOARD_LINK, AOC_SESSION_COOKIE
 
+log = logging.getLogger(__name__)
+
 
 class AdventOfCode(Cog):
     """Cog for AOC 2021 for small features."""

bot/cogs/fun.py

@@ -1,8 +1,8 @@
 import functools
-from itertools import product
-from random import choice, randint, shuffle
 import re
 import string
+from itertools import product
+from random import choice, randint, shuffle
 from typing import List
 
 from discord.ext.commands import Cog, Context, command

bot/cogs/greetings.py

@@ -1,9 +1,8 @@
-from pathlib import Path
 import random
+from pathlib import Path
 
-from discord.ext.commands import Bot, Cog, Context, command
 import yaml
-
+from discord.ext.commands import Bot, Cog, Context, command
 
 with open(Path.cwd() / 'bot' / 'resources' / 'greetings.yaml', 'r', encoding='utf-8') as f:
     info = yaml.load(f, Loader=yaml.FullLoader)

bot/cogs/image_segmentation.py

@@ -4,12 +4,12 @@
 from typing import List, Optional
 
 import aiofiles
-from cv2 import COLOR_BGR2RGB, cvtColor, imread
 import discord
-from discord.ext.commands import Cog, Context, command
 import matplotlib.pyplot as plt
-from skimage.color import rgb2hsv
+from cv2 import COLOR_BGR2RGB, cvtColor, imread
+from discord.ext.commands import Cog, Context, command
 from numpy import ndarray
+from skimage.color import rgb2hsv
 
 from bot.bot import Friendo
 

bot/cogs/pixelate.py

@@ -1,10 +1,12 @@
-import numpy as np
-from PIL import Image
-from io import BytesIO
-from bot.bot import Friendo
 from collections import Counter
+from io import BytesIO
+
+import numpy as np
 from discord import Color, Embed, File, Member
 from discord.ext.commands import Cog, Context, command
+from PIL import Image
+
+from bot.bot import Friendo
 
 
 class Pixelate(Cog):

bot/cogs/timezone_tracker.py

@@ -1,16 +1,15 @@
 import logging
+import typing as t
 from collections import defaultdict
 from datetime import timedelta
-import typing as t
 
 import arrow
-from discord import Member
 import discord
+from discord import Member
 from discord.ext.commands import Cog, Context, group
 
 from bot.bot import Friendo
 
-
 log = logging.getLogger(__name__)
 
 

bot/cogs/todo_list.py

@@ -1,11 +1,11 @@
-from asyncio import sleep
 import json
 import logging
 import os
+from asyncio import sleep
 from pathlib import Path
 from typing import Tuple
-import aiofiles
 
+import aiofiles
 from discord import Colour, Embed
 from discord.ext import tasks
 from discord.ext.commands import Cog, Context, command

bot/cogs/user.py

@@ -1,8 +1,8 @@
-import yaml
-
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Union
-from datetime import datetime, timezone
+
+import yaml
 from dateutil.relativedelta import relativedelta
 from discord import ActivityType, Embed, Member, Spotify, Status
 from discord.ext.commands import Cog, Context, MemberConverter, MemberNotFound, command

bot/cogs/utilities.py

@@ -1,12 +1,12 @@
+import random
 from asyncio import sleep
 from pathlib import Path
-import random
 from typing import Optional
 
+import yaml
 from discord import Colour, Embed
 from discord.ext import tasks
 from discord.ext.commands import Cog, Context, command
-import yaml
 
 from bot import settings
 from bot.bot import Friendo

bot/cogs/wolfram.py

@@ -1,7 +1,9 @@
-import discord
 from io import BytesIO
 from urllib import parse
+
+import discord
 from discord.ext import commands
+
 from bot.settings import WOLFRAM_APPID
 
 

bot/cogs/wonder_twins.py

@@ -1,6 +1,7 @@
 import random
-import yaml
 from pathlib import Path
+
+import yaml
 from discord.ext.commands import Bot, Cog, Context, command
 
 with open(Path.cwd() / 'bot' / 'resources' / 'wonder_twins.yaml', 'r', encoding='utf-8') as f:

bot/meme_api/memegen.py

@@ -1,9 +1,10 @@
-import aiohttp
 import json
 import logging
 from pathlib import Path
 from typing import List
+
 import aiofiles
+import aiohttp
 
 from bot.settings import MEME_PASSWORD, MEME_USERNAME