Luminara/Lumi
Luminara/Lumi
1
Fork 0
mirror of https://github.com/wlinator/luminara.git synced 2024-10-02 18:23:12 +00:00
Code Activity

Merge pull request #31 from wlinator/patch-v2.8.9

Browse source 
Refactor moderation module
This commit is contained in:
wlinator 2024-08-14 06:51:25 -04:00
commit d0e0999dd2
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/moderation/ban.py
View file

@ -7,17 +7,18 @@ from lib.embed_builder import EmbedBuilder
from modules.moderation.utils.actionable import async_actionable
from modules.moderation.utils.case_handler import create_case
from typing import Optional
from discord.ext.commands import MemberConverter
async def ban_user(cog, ctx, target: discord.User, reason: Optional[str] = None):
# see if user is in guild
member = await cog.client.get_or_fetch_member(ctx.guild, target.id)
member = await MemberConverter().convert(ctx, str(target.id))
output_reason = reason or CONST.STRINGS["mod_no_reason"]
# member -> user is in the guild, check role hierarchy
if member:
bot_member = await cog.client.get_or_fetch_member(ctx.guild, ctx.bot.user.id)
bot_member = await MemberConverter().convert(ctx, str(ctx.bot.user.id))
await async_actionable(member, ctx.author, bot_member)
try:

4
modules/moderation/kick.py
View file

@ -7,11 +7,11 @@ from lib.embed_builder import EmbedBuilder
from modules.moderation.utils.actionable import async_actionable
from modules.moderation.utils.case_handler import create_case
from typing import Optional
from discord.ext.commands import UserConverter
from discord.ext.commands import UserConverter, MemberConverter
async def kick_user(cog, ctx, target: discord.Member, reason: Optional[str] = None):
bot_member = await cog.client.get_or_fetch_member(ctx.guild, ctx.bot.user.id)
bot_member = await MemberConverter().convert(ctx, str(ctx.bot.user.id))
await async_actionable(target, ctx.author, bot_member)
output_reason = reason or CONST.STRINGS["mod_no_reason"]

4
modules/moderation/timeout.py
View file

@ -8,7 +8,7 @@ from lib.embed_builder import EmbedBuilder
from modules.moderation.utils.actionable import async_actionable
from modules.moderation.utils.case_handler import create_case
from typing import Optional
from discord.ext.commands import UserConverter
from discord.ext.commands import UserConverter, MemberConverter
from lib.formatter import format_duration_to_seconds, format_seconds_to_duration_string
@ -19,7 +19,7 @@ async def timeout_user(
duration: str,
reason: Optional[str] = None,
):
bot_member = await cog.client.get_or_fetch_member(ctx.guild, ctx.bot.user.id)
bot_member = await MemberConverter().convert(ctx, str(ctx.bot.user.id))
await async_actionable(target, ctx.author, bot_member)
output_reason = reason or CONST.STRINGS["mod_no_reason"]