Change to isort on all files

jarvis/__init__.py

@@ -12,12 +12,9 @@ from mongoengine import connect
 from psutil import Process
 
 from jarvis import logo  # noqa: F401
-from jarvis import tasks
+from jarvis import tasks, utils
-from jarvis import utils
 from jarvis.config import get_config
-from jarvis.events import guild
+from jarvis.events import guild, member, message
-from jarvis.events import member
-from jarvis.events import message
 
 jconfig = get_config()
 
@@ -42,7 +39,7 @@ jarvis = commands.Bot(
     max_messages=jconfig.max_messages,
 )
 
-slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True)
+slash = SlashCommand(jarvis, sync_commands=False, sync_on_cog_reload=True)
 jarvis_self = Process()
 __version__ = "1.10.5"
 

jarvis/cogs/admin/__init__.py

@@ -1,14 +1,7 @@
 """J.A.R.V.I.S. Admin Cogs."""
 from discord.ext.commands import Bot
 
-from jarvis.cogs.admin import ban
+from jarvis.cogs.admin import ban, kick, lock, lockdown, mute, purge, roleping, warning
-from jarvis.cogs.admin import kick
-from jarvis.cogs.admin import lock
-from jarvis.cogs.admin import lockdown
-from jarvis.cogs.admin import mute
-from jarvis.cogs.admin import purge
-from jarvis.cogs.admin import roleping
-from jarvis.cogs.admin import warning
 
 
 def setup(bot: Bot) -> None:

jarvis/cogs/admin/ban.py

@@ -1,20 +1,16 @@
 """J.A.R.V.I.S. BanCog."""
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from ButtonPaginator import Paginator
 from discord import User
 from discord.ext import commands
 from discord.utils import find
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
-from discord_slash.utils.manage_commands import create_choice
+from discord_slash.utils.manage_commands import create_choice, create_option
-from discord_slash.utils.manage_commands import create_option
 
-from jarvis.db.models import Ban
+from jarvis.db.models import Ban, Unban
-from jarvis.db.models import Unban
 from jarvis.utils import build_embed
 from jarvis.utils.cachecog import CacheCog
 from jarvis.utils.field import Field

jarvis/cogs/admin/kick.py

@@ -1,8 +1,7 @@
 """J.A.R.V.I.S. KickCog."""
 from discord import User
 from discord.ext.commands import Bot
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Kick

jarvis/cogs/admin/lock.py

@@ -2,13 +2,9 @@
 from contextlib import suppress
 from typing import Union
 
-from discord import Role
+from discord import Role, TextChannel, User, VoiceChannel
-from discord import TextChannel
-from discord import User
-from discord import VoiceChannel
 from discord.ext.commands import Bot
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Lock

jarvis/cogs/admin/lockdown.py

@@ -3,8 +3,7 @@ from contextlib import suppress
 from datetime import datetime
 
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Lock

jarvis/cogs/admin/mute.py

@@ -2,12 +2,10 @@
 from discord import Member
 from discord.ext import commands
 from discord.utils import get
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
-from jarvis.db.models import Mute
+from jarvis.db.models import Mute, Setting
-from jarvis.db.models import Setting
 from jarvis.utils import build_embed
 from jarvis.utils.field import Field
 from jarvis.utils.permissions import admin_or_permissions

jarvis/cogs/admin/purge.py

@@ -1,12 +1,10 @@
 """J.A.R.V.I.S. PurgeCog."""
 from discord import TextChannel
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
-from jarvis.db.models import Autopurge
+from jarvis.db.models import Autopurge, Purge
-from jarvis.db.models import Purge
 from jarvis.utils.permissions import admin_or_permissions
 
 

jarvis/cogs/admin/roleping.py

@@ -1,13 +1,10 @@
 """J.A.R.V.I.S. RolepingCog."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from ButtonPaginator import Paginator
-from discord import Member
+from discord import Member, Role
-from discord import Role
 from discord.ext.commands import Bot
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
 from discord_slash.utils.manage_commands import create_option
 

jarvis/cogs/admin/warning.py

@@ -1,15 +1,12 @@
 """J.A.R.V.I.S. WarningCog."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from ButtonPaginator import Paginator
 from discord import User
 from discord.ext.commands import Bot
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
-from discord_slash.utils.manage_commands import create_choice
+from discord_slash.utils.manage_commands import create_choice, create_option
-from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Warning
 from jarvis.utils import build_embed

jarvis/cogs/autoreact.py

@@ -4,8 +4,7 @@ import re
 from discord import TextChannel
 from discord.ext import commands
 from discord.utils import find
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.data.unicode import emoji_list

jarvis/cogs/ctc2.py

@@ -1,15 +1,12 @@
 """J.A.R.V.I.S. Complete the Code 2 Cog."""
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 import aiohttp
 from ButtonPaginator import Paginator
-from discord import Member
+from discord import Member, User
-from discord import User
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
 
 from jarvis.db.models import Guess

jarvis/cogs/dbrand.py

@@ -3,8 +3,7 @@ import re
 
 import aiohttp
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.config import get_config

jarvis/cogs/dev.py

@@ -4,19 +4,15 @@ import hashlib
 import re
 import subprocess  # noqa: S404
 import uuid as uuidpy
-from typing import Any
+from typing import Any, Union
-from typing import Union
 
 import ulid as ulidpy
 from bson import ObjectId
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
+from discord_slash.utils.manage_commands import create_choice, create_option
-from discord_slash.utils.manage_commands import create_choice
-from discord_slash.utils.manage_commands import create_option
 
-from jarvis.utils import build_embed
+from jarvis.utils import build_embed, convert_bytesize
-from jarvis.utils import convert_bytesize
 from jarvis.utils.field import Field
 
 supported_hashes = {x for x in hashlib.algorithms_guaranteed if "shake" not in x}

jarvis/cogs/error.py

@@ -43,6 +43,7 @@ class ErrorHandlerCog(commands.Cog):
                 f"Error processing command:\n```{error}```",
                 hidden=True,
             )
+            raise error
             slash.commands[ctx.command].reset_cooldown(ctx)
 
 

jarvis/cogs/gitlab.py

@@ -1,16 +1,13 @@
 """J.A.R.V.I.S. GitLab Cog."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 import gitlab
 from ButtonPaginator import Paginator
 from discord import Embed
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
-from discord_slash.utils.manage_commands import create_choice
+from discord_slash.utils.manage_commands import create_choice, create_option
-from discord_slash.utils.manage_commands import create_option
 
 from jarvis.config import get_config
 from jarvis.utils import build_embed

jarvis/cogs/image.py

@@ -8,9 +8,7 @@ import numpy as np
 from discord import File
 from discord.ext import commands
 
-from jarvis.utils import build_embed
+from jarvis.utils import build_embed, convert_bytesize, unconvert_bytesize
-from jarvis.utils import convert_bytesize
-from jarvis.utils import unconvert_bytesize
 from jarvis.utils.field import Field
 
 

jarvis/cogs/jokes.py

@@ -6,8 +6,7 @@ from datetime import datetime
 from random import randint
 
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 
 from jarvis.db.models import Joke
 from jarvis.utils import build_embed

jarvis/cogs/modlog/__init__.py

@@ -1,9 +1,7 @@
 """J.A.R.V.I.S. Modlog Cogs."""
 from discord.ext.commands import Bot
 
-from jarvis.cogs.modlog import command
+from jarvis.cogs.modlog import command, member, message
-from jarvis.cogs.modlog import member
-from jarvis.cogs.modlog import message
 
 
 def setup(bot: Bot) -> None:

jarvis/cogs/modlog/member.py

@@ -1,20 +1,14 @@
 """J.A.R.V.I.S. ModlogMemberCog."""
 import asyncio
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 import discord
 from discord.ext import commands
 from discord.utils import find
 
-from jarvis.cogs.modlog.utils import get_latest_log
+from jarvis.cogs.modlog.utils import get_latest_log, modlog_embed
-from jarvis.cogs.modlog.utils import modlog_embed
 from jarvis.config import get_config
-from jarvis.db.models import Ban
+from jarvis.db.models import Ban, Kick, Mute, Setting, Unban
-from jarvis.db.models import Kick
-from jarvis.db.models import Mute
-from jarvis.db.models import Setting
-from jarvis.db.models import Unban
 from jarvis.utils import build_embed
 from jarvis.utils.field import Field
 

jarvis/cogs/modlog/utils.py

@@ -1,11 +1,9 @@
 """J.A.R.V.I.S. Modlog Cog Utilities."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 from typing import List
 
 import discord
-from discord import AuditLogEntry
+from discord import AuditLogEntry, Member
-from discord import Member
 from discord.utils import find
 
 from jarvis.utils import build_embed

jarvis/cogs/owner.py

@@ -7,8 +7,7 @@ from time import time
 from typing import Any
 
 import discord
-from discord import DMChannel
+from discord import DMChannel, User
-from discord import User
 from discord.ext import commands
 
 import jarvis

jarvis/cogs/remindme.py

@@ -1,22 +1,21 @@
 """J.A.R.V.I.S. Remind Me Cog."""
 import asyncio
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
+from typing import List, Optional
-from typing import List
-from typing import Optional
 
 from bson import ObjectId
 from discord import Embed
 from discord.ext.commands import Bot
 from discord.ext.tasks import loop
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
-from discord_slash.utils.manage_components import create_actionrow
+from discord_slash.utils.manage_components import (
-from discord_slash.utils.manage_components import create_select
+    create_actionrow,
-from discord_slash.utils.manage_components import create_select_option
+    create_select,
-from discord_slash.utils.manage_components import wait_for_component
+    create_select_option,
+    wait_for_component,
+)
 
 from jarvis.db.models import Reminder
 from jarvis.utils import build_embed

jarvis/cogs/rolegiver.py

@@ -1,8 +1,7 @@
 """J.A.R.V.I.S. Role Giver Cog."""
 from discord import Role
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Setting

jarvis/cogs/settings.py

@@ -1,12 +1,10 @@
 """J.A.R.V.I.S. Settings Management Cog."""
 from typing import Any
 
-from discord import Role
+from discord import Role, TextChannel
-from discord import TextChannel
 from discord.ext import commands
 from discord.utils import find
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
 from discord_slash.utils.manage_commands import create_option
 
 from jarvis.db.models import Setting

jarvis/cogs/util.py

@@ -6,28 +6,17 @@ from io import BytesIO
 
 import discord
 import discord_slash
-from discord import File
+from discord import File, Guild, Role, User
-from discord import Guild
-from discord import Role
-from discord import User
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import SlashContext, cog_ext
-from discord_slash import SlashContext
+from discord_slash.utils.manage_commands import create_choice, create_option
-from discord_slash.utils.manage_commands import create_choice
+from PIL import Image, ImageDraw
-from discord_slash.utils.manage_commands import create_option
-from PIL import Image
-from PIL import ImageDraw
 
 import jarvis
-from jarvis import jarvis_self
+from jarvis import jarvis_self, logo
-from jarvis import logo
 from jarvis.config import get_config
-from jarvis.data.robotcamo import emotes
+from jarvis.data.robotcamo import emotes, hk, names
-from jarvis.data.robotcamo import hk
+from jarvis.utils import build_embed, convert_bytesize, get_repo_hash
-from jarvis.data.robotcamo import names
-from jarvis.utils import build_embed
-from jarvis.utils import convert_bytesize
-from jarvis.utils import get_repo_hash
 from jarvis.utils.field import Field
 
 

jarvis/cogs/verify.py

@@ -2,9 +2,7 @@
 from random import randint
 
 from discord.ext import commands
-from discord_slash import cog_ext
+from discord_slash import ComponentContext, SlashContext, cog_ext
-from discord_slash import ComponentContext
-from discord_slash import SlashContext
 from discord_slash.model import ButtonStyle
 from discord_slash.utils import manage_components
 

jarvis/db/models.py

@@ -2,14 +2,16 @@
 from datetime import datetime
 
 from mongoengine import Document
-from mongoengine.fields import BooleanField
+from mongoengine.fields import (
-from mongoengine.fields import DateTimeField
+    BooleanField,
-from mongoengine.fields import DictField
+    DateTimeField,
-from mongoengine.fields import DynamicField
+    DictField,
-from mongoengine.fields import IntField
+    DynamicField,
-from mongoengine.fields import ListField
+    IntField,
-from mongoengine.fields import LongField
+    ListField,
-from mongoengine.fields import StringField
+    LongField,
+    StringField,
+)
 
 
 class SnowflakeField(LongField):

jarvis/events/member.py

@@ -2,8 +2,7 @@
 from discord import Member
 from discord.ext.commands import Bot
 
-from jarvis.db.models import Mute
+from jarvis.db.models import Mute, Setting
-from jarvis.db.models import Setting
 
 
 class MemberEventHandler(object):

jarvis/events/message.py

@@ -1,17 +1,12 @@
 """J.A.R.V.I.S. Message event handler."""
 import re
 
-from discord import DMChannel
+from discord import DMChannel, Message
-from discord import Message
 from discord.ext.commands import Bot
 from discord.utils import find
 
 from jarvis.config import get_config
-from jarvis.db.models import Autopurge
+from jarvis.db.models import Autopurge, Autoreact, Roleping, Setting, Warning
-from jarvis.db.models import Autoreact
-from jarvis.db.models import Roleping
-from jarvis.db.models import Setting
-from jarvis.db.models import Warning
 from jarvis.utils import build_embed
 from jarvis.utils.field import Field
 

jarvis/tasks/__init__.py

@@ -1,8 +1,5 @@
 """J.A.R.V.I.S. background task handlers."""
-from jarvis.tasks import unban
+from jarvis.tasks import unban, unlock, unmute, unwarn
-from jarvis.tasks import unlock
-from jarvis.tasks import unmute
-from jarvis.tasks import unwarn
 
 
 def init() -> None:

jarvis/tasks/unban.py

@@ -1,13 +1,11 @@
 """J.A.R.V.I.S. unban background task handler."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from discord.ext.tasks import loop
 
 import jarvis
 from jarvis.config import get_config
-from jarvis.db.models import Ban
+from jarvis.db.models import Ban, Unban
-from jarvis.db.models import Unban
 
 jarvis_id = get_config().client_id
 

jarvis/tasks/unlock.py

@@ -1,6 +1,5 @@
 """J.A.R.V.I.S. unlock background task handler."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from discord.ext.tasks import loop
 

jarvis/tasks/unmute.py

@@ -1,12 +1,10 @@
 """J.A.R.V.I.S. unmute background task handler."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from discord.ext.tasks import loop
 
 import jarvis
-from jarvis.db.models import Mute
+from jarvis.db.models import Mute, Setting
-from jarvis.db.models import Setting
 
 
 @loop(minutes=1)

jarvis/tasks/unwarn.py

@@ -1,6 +1,5 @@
 """J.A.R.V.I.S. unwarn background task handler."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from discord.ext.tasks import loop
 

jarvis/utils/__init__.py

@@ -3,9 +3,7 @@ from datetime import datetime
 from pkgutil import iter_modules
 
 import git
-from discord import Color
+from discord import Color, Embed, Message
-from discord import Embed
-from discord import Message
 from discord.ext import commands
 
 import jarvis.cogs

jarvis/utils/cachecog.py

@@ -1,6 +1,5 @@
 """Cog wrapper for command caching."""
-from datetime import datetime
+from datetime import datetime, timedelta
-from datetime import timedelta
 
 from discord.ext import commands
 from discord.ext.tasks import loop

run.py

@@ -1,9 +1,7 @@
 #!/bin/python3
 # flake8: noqa
 from importlib import reload as ireload
-from multiprocessing import freeze_support
+from multiprocessing import Process, Value, freeze_support
-from multiprocessing import Process
-from multiprocessing import Value
 from pathlib import Path
 from time import sleep