cswimr/SeaCogs
cswimr/SeaCogs
1
1
Fork 1
Code Issues 10 Pull requests 4 Projects 1 Packages 1 Wiki Activity Actions

WIP: Refactor Aurora (3.0.0) #29

Draft
cswimr wants to merge 347 commits from aurora-pydantic into main
pull from: aurora-pydantic
merge into: cswimr:main
Conversation 1 Commits 347 Files changed 23 +19 -18
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b85932c338 - Show all commits

37
aurora/models/moderation.py
View file

@ -7,7 +7,6 @@ from typing import Dict, Iterable, List, Optional, Tuple, Union
import discord import discord
from aiosqlite import Connection, Cursor, OperationalError, Row from aiosqlite import Connection, Cursor, OperationalError, Row
from aiosqlite import connect as aiosqlite_connect from aiosqlite import connect as aiosqlite_connect
from discord import NotFound
from redbot.core import data_manager from redbot.core import data_manager
from redbot.core.bot import Red from redbot.core.bot import Red
@ -82,26 +81,28 @@ class Moderation(AuroraGuildModel):
self.resolved_by = resolved_by self.resolved_by = resolved_by
self.resolve_reason = reason self.resolve_reason = reason
if self.type in ["UNMUTE", "UNBAN"]: await self.type.resolve_handler(self.bot, self.guild, await self.get_target(), reason)
raise TypeError("Cannot resolve an unmute or unban case!")
if self.type == "MUTE": # if self.type in ["UNMUTE", "UNBAN"]:
try: # raise TypeError("Cannot resolve an unmute or unban case!")
guild: discord.Guild = await self.bot.fetch_guild(self.guild_id)
member = await guild.fetch_member(self.target_id)
await member.timeout( # if self.type == "MUTE":
None, reason=f"Case {self.moderation_id} resolved by {resolved_by}{' for '+ reason if reason else ''}" # try:
) # guild: discord.Guild = await self.bot.fetch_guild(self.guild_id)
except NotFound: # member = await guild.fetch_member(self.target_id)
pass
if self.type in ["BAN", "TEMPBAN"]: # await member.timeout(
try: # None, reason=f"Case {self.moderation_id} resolved by {resolved_by}{' for '+ reason if reason else ''}"
guild: discord.Guild = await self.bot.fetch_guild(self.guild_id) # )
await guild.unban(await self.get_target(), reason=f"Case {self.moderation_id} resolved by {resolved_by}{' for '+ reason if reason else ''}") # except NotFound:
except NotFound: # pass
pass
# if self.type in ["BAN", "TEMPBAN"]:
# try:
# guild: discord.Guild = await self.bot.fetch_guild(self.guild_id)
# await guild.unban(await self.get_target(), reason=f"Case {self.moderation_id} resolved by {resolved_by}{' for '+ reason if reason else ''}")
# except NotFound:
# pass
if not self.changes: if not self.changes:
self.changes.append(Change.from_dict(self.bot, { self.changes.append(Change.from_dict(self.bot, {