Fix issues with imports

jarvis/__init__.py

@@ -30,8 +30,6 @@ __version__ = "1.6.0"
 db = DBManager(get_config().mongo).mongo
 jarvis_db = db.jarvis
 
-logo = logo.get_logo(get_config().logo)
-
 
 @jarvis.event
 async def on_ready():

jarvis/cogs/modlog/__init__.py

@@ -1,53 +1,4 @@
-from datetime import datetime, timedelta
-
-import discord
-from discord.utils import find
-
 from jarvis.cogs.modlog import command, member, message
-from jarvis.utils import build_embed
-from jarvis.utils.field import Field
-
-
-def modlog_embed(
-    self,
-    member: discord.Member,
-    admin: discord.Member,
-    log: discord.AuditLogEntry,
-    title: str,
-    desc: str,
-) -> discord.Embed:
-    fields = [
-        Field(
-            name="Moderator",
-            value=f"{admin.mention} ({admin.name}"
-            + f"#{admin.discriminator})",
-        ),
-    ]
-    if log.reason:
-        fields.append(Field(name="Reason", value=log.reason, inline=False))
-    embed = build_embed(
-        title=title,
-        description=desc,
-        color="#fc9e3f",
-        fields=fields,
-        timestamp=log.created_at,
-    )
-    embed.set_author(
-        name=f"{member.name}",
-        icon_url=member.avatar_url,
-    )
-    embed.set_footer(
-        text=f"{member.name}#{member.discriminator} | {member.id}"
-    )
-    return embed
-
-
-def get_latest_log(self, auditlog, target):
-    before = datetime.utcnow() - timedelta(seconds=10)
-    return find(
-        lambda x: x.target.id == target.id and x.created_at > before,
-        auditlog,
-    )
 
 
 def setup(bot):

jarvis/cogs/modlog/member.py

@@ -5,7 +5,7 @@ import discord
 from discord.ext import commands
 from discord.utils import find
 
-from jarvis.cogs.modlog import get_latest_log, modlog_embed
+from jarvis.cogs.modlog.utils import get_latest_log, modlog_embed
 from jarvis.config import get_config
 from jarvis.db.types import Ban, Kick, MongoSort, Mute, Setting
 from jarvis.utils import build_embed

jarvis/cogs/modlog/utils.py

@@ -0,0 +1,49 @@
+from datetime import datetime, timedelta
+
+import discord
+from discord.utils import find
+
+from jarvis.utils import build_embed
+from jarvis.utils.field import Field
+
+
+def modlog_embed(
+    self,
+    member: discord.Member,
+    admin: discord.Member,
+    log: discord.AuditLogEntry,
+    title: str,
+    desc: str,
+) -> discord.Embed:
+    fields = [
+        Field(
+            name="Moderator",
+            value=f"{admin.mention} ({admin.name}"
+            + f"#{admin.discriminator})",
+        ),
+    ]
+    if log.reason:
+        fields.append(Field(name="Reason", value=log.reason, inline=False))
+    embed = build_embed(
+        title=title,
+        description=desc,
+        color="#fc9e3f",
+        fields=fields,
+        timestamp=log.created_at,
+    )
+    embed.set_author(
+        name=f"{member.name}",
+        icon_url=member.avatar_url,
+    )
+    embed.set_footer(
+        text=f"{member.name}#{member.discriminator} | {member.id}"
+    )
+    return embed
+
+
+def get_latest_log(self, auditlog, target):
+    before = datetime.utcnow() - timedelta(seconds=10)
+    return find(
+        lambda x: x.target.id == target.id and x.created_at > before,
+        auditlog,
+    )

jarvis/tasks/unban.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 import pymongo
 from discord.ext.tasks import loop
 
-from jarvis import jarvis, jarvis_db
+import jarvis
 from jarvis.db.types import Ban
 
 
@@ -15,8 +15,8 @@ async def unban():
         if ban.created_at + timedelta(
             hours=ban.duration
         ) < datetime.utcnow() + timedelta(minutes=10):
-            guild = await jarvis.fetch_guild(ban.guild)
+            guild = await jarvis.jarvis.fetch_guild(ban.guild)
-            user = await jarvis.fetch_user(ban.user)
+            user = await jarvis.jarvis.fetch_user(ban.user)
             if user:
                 guild.unban(user)
             updates.append(
@@ -31,4 +31,4 @@ async def unban():
                 )
             )
     if updates:
-        jarvis_db.bans.bulk_write(updates)
+        jarvis.jarvis_db.bans.bulk_write(updates)

jarvis/tasks/unlock.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 import pymongo
 from discord.ext.tasks import loop
 
-from jarvis import jarvis, jarvis_db
+import jarvis
 from jarvis.db.types import Lock
 
 
@@ -16,8 +16,8 @@ async def unlock():
             lock.created_at + timedelta(minutes=lock.duration)
             < datetime.utcnow()
         ):
-            guild = await jarvis.fetch_guild(lock.guild)
+            guild = await jarvis.jarvis.fetch_guild(lock.guild)
-            channel = await jarvis.fetch_channel(lock.channel)
+            channel = await jarvis.jarvis.fetch_channel(lock.channel)
             if channel:
                 roles = await guild.fetch_roles()
                 for role in roles:
@@ -37,4 +37,4 @@ async def unlock():
                 )
             )
     if updates:
-        jarvis_db.locks.bulk_write(updates)
+        jarvis.jarvis_db.locks.bulk_write(updates)

jarvis/tasks/unmute.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 import pymongo
 from discord.ext.tasks import loop
 
-from jarvis import jarvis, jarvis_db
+import jarvis
 from jarvis.db.types import Mute, Setting
 
 
@@ -20,7 +20,7 @@ async def unmute():
             mute_role = [x.value for x in mute_roles if x.guild == mute.guild][
                 0
             ]
-            guild = await jarvis.fetch_guild(mute.guild)
+            guild = await jarvis.jarvis.fetch_guild(mute.guild)
             role = guild.get_role(mute_role)
             user = await guild.fetch_member(mute.user)
             if user:
@@ -39,4 +39,4 @@ async def unmute():
                 )
             )
     if updates:
-        jarvis_db.mutes.bulk_write(updates)
+        jarvis.jarvis_db.mutes.bulk_write(updates)

jarvis/tasks/unwarn.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 import pymongo
 from discord.ext.tasks import loop
 
-from jarvis import jarvis_db
+import jarvis
 from jarvis.db.types import Warning
 
 
@@ -22,4 +22,4 @@ async def unwarn():
                 )
             )
     if updates:
-        jarvis_db.warns.bulk_write(updates)
+        jarvis.jarvis_db.warns.bulk_write(updates)