From 9815bf080d4ba0aa78581db0ae7ba6a911609409 Mon Sep 17 00:00:00 2001 From: Matthww Date: Tue, 2 Nov 2021 22:59:17 +0100 Subject: [PATCH] update settings cog --- cogs/settings.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cogs/settings.py b/cogs/settings.py index eae8520..29f3285 100644 --- a/cogs/settings.py +++ b/cogs/settings.py @@ -1,5 +1,7 @@ +from context import CustomContext from discord.ext import commands from utils.EmbedGenerator import EmbedGenerator +from utils.database import AutoJoin from bot import ChristmasBot from discord.ext.commands import Context @@ -10,27 +12,28 @@ class SettingsCog(commands.Cog, name="Settings"): @commands.group(aliases=["aj"], invoke_without_command=True) @commands.cooldown(rate=1, per=5, type=commands.BucketType.user) - async def autojoin(self, ctx: Context): + async def autojoin(self, ctx: CustomContext): await EmbedGenerator.Message( ctx, "Autojoin", f"Usage:\n\n`{ctx.prefix}autojoin set`\n`{ctx.prefix}autojoin unset`", ) - @autojoin.command(name="set") + @autojoin.command(name="enable") @commands.has_permissions(manage_channels=True) @commands.cooldown(rate=1, per=5, type=commands.BucketType.user) - async def autojoin_set(self, ctx: Context): - vc = ctx.author.voice.channel - await AutoJoin.update_channel(self.bot, ctx.guild.id, vc.id) + async def autojoin_set(self, ctx: CustomContext): + voicechannel_id = ctx.author.voice.channel.id + textchannel_id = ctx.message.channel.id + await AutoJoin.update_channel(ctx.get_redis(), ctx.guild.id, voicechannel_id, textchannel_id) await EmbedGenerator.Message(ctx, "Autojoin", "`enabled`") - @autojoin.command(name="unset") + @autojoin.command(name="disable") @commands.has_permissions(manage_channels=True) @commands.cooldown(rate=1, per=5, type=commands.BucketType.user) - async def autojoin_del(self, ctx: Context): + async def autojoin_del(self, ctx: CustomContext): vc = ctx.author.voice.channel - await AutoJoin.del_channel(self.bot, ctx.guild.id) + await AutoJoin.del_channel(ctx.get_redis(), ctx.guild.id) await EmbedGenerator.Message(ctx, "Autojoin", "`disabled`")