From bf985bc050672d52051751554417649197b71d86 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 25 Jul 2021 16:52:48 -0600 Subject: [PATCH] Fix issues with imports --- jarvis/__init__.py | 2 -- jarvis/cogs/modlog/__init__.py | 49 ---------------------------------- jarvis/cogs/modlog/member.py | 2 +- jarvis/cogs/modlog/utils.py | 49 ++++++++++++++++++++++++++++++++++ jarvis/tasks/unban.py | 8 +++--- jarvis/tasks/unlock.py | 8 +++--- jarvis/tasks/unmute.py | 6 ++--- jarvis/tasks/unwarn.py | 4 +-- 8 files changed, 63 insertions(+), 65 deletions(-) create mode 100644 jarvis/cogs/modlog/utils.py diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 5cc6493..3ab6737 100644 --- a/jarvis/__init__.py +++ b/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(): diff --git a/jarvis/cogs/modlog/__init__.py b/jarvis/cogs/modlog/__init__.py index 1126ef2..5a9b6de 100644 --- a/jarvis/cogs/modlog/__init__.py +++ b/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): diff --git a/jarvis/cogs/modlog/member.py b/jarvis/cogs/modlog/member.py index f5af3c2..a946847 100644 --- a/jarvis/cogs/modlog/member.py +++ b/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 diff --git a/jarvis/cogs/modlog/utils.py b/jarvis/cogs/modlog/utils.py new file mode 100644 index 0000000..64e3771 --- /dev/null +++ b/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, + ) diff --git a/jarvis/tasks/unban.py b/jarvis/tasks/unban.py index fb3524c..597edca 100644 --- a/jarvis/tasks/unban.py +++ b/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) - user = await jarvis.fetch_user(ban.user) + guild = await jarvis.jarvis.fetch_guild(ban.guild) + 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) diff --git a/jarvis/tasks/unlock.py b/jarvis/tasks/unlock.py index 536a27b..26078a9 100644 --- a/jarvis/tasks/unlock.py +++ b/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) - channel = await jarvis.fetch_channel(lock.channel) + guild = await jarvis.jarvis.fetch_guild(lock.guild) + 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) diff --git a/jarvis/tasks/unmute.py b/jarvis/tasks/unmute.py index 4070e66..064112d 100644 --- a/jarvis/tasks/unmute.py +++ b/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) diff --git a/jarvis/tasks/unwarn.py b/jarvis/tasks/unwarn.py index 50a29be..423e43f 100644 --- a/jarvis/tasks/unwarn.py +++ b/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)