From f7caa5ede5cd0108aca451623b9341ec159bb35a Mon Sep 17 00:00:00 2001 From: Jeremy Zhang Date: Sat, 24 Mar 2018 08:19:46 +0000 Subject: [PATCH] Fix Titan Commands --- discordbot/titanembeds/bot.py | 4 ++-- discordbot/titanembeds/commands.py | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/discordbot/titanembeds/bot.py b/discordbot/titanembeds/bot.py index 047c952..47fc654 100644 --- a/discordbot/titanembeds/bot.py +++ b/discordbot/titanembeds/bot.py @@ -90,8 +90,8 @@ class Titan(discord.AutoShardedClient): msg_cmd = msg_arr[1].lower() # get command cmd = getattr(self.command, msg_cmd, None) #check if cmd exist, if not its none if cmd: # if cmd is not none... - await self.send_typing(message.channel) #this looks nice - await getattr(self.command, msg_cmd)(message) #actually run cmd, passing in msg obj + async with message.channel.typing(): #this looks nice + await getattr(self.command, msg_cmd)(message) #actually run cmd, passing in msg obj async def on_message_edit(self, message_before, message_after): await self.database.update_message(message_after) diff --git a/discordbot/titanembeds/commands.py b/discordbot/titanembeds/commands.py index 8f8df61..bfa5927 100644 --- a/discordbot/titanembeds/commands.py +++ b/discordbot/titanembeds/commands.py @@ -4,38 +4,38 @@ class Commands(): self.database = database async def ban(self, message): - if not message.author.server_permissions.ban_members: - await self.client.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to ban guest members.") + if not message.author.guild_permissions.ban_members: + await message.channel.send(message.author.mention + " I'm sorry, but you do not have permissions to ban guest members.") return - serverid = message.server.id + serverid = message.guild.id content = message.content.strip() if len(content.split()) == 2: - await self.client.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to ban a guest user.\nExample: `ban Titan#0001`") + await message.channel.send(message.author.mention + " Please provide a username-query (or optionally a discriminator) to ban a guest user.\nExample: `ban Titan#0001`") return content = content.split() username = content[2][:content[2].find("#")] if "#" in content[2] else content[2] discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None - reason = await self.database.ban_unauth_user_by_query(message.server.id, message.author.id, username, discriminator) - await self.client.send_message(message.channel, message.author.mention + " " + reason) + reason = await self.database.ban_unauth_user_by_query(message.guild.id, message.author.id, username, discriminator) + await message.channel.send(message.author.mention + " " + reason) async def kick(self, message): - if not message.author.server_permissions.kick_members: - await self.client.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to kick guest members.") + if not message.author.guild_permissions.kick_members: + await message.channel.send(message.author.mention + " I'm sorry, but you do not have permissions to kick guest members.") return - serverid = message.server.id + serverid = message.guild.id content = message.content.strip() if len(content.split()) == 2: - await self.client.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to kick a guest user.\nExample: `kick Titan#0001`") + await message.channel.send(message.author.mention + " Please provide a username-query (or optionally a discriminator) to kick a guest user.\nExample: `kick Titan#0001`") return content = content.split() username = content[2][:content[2].find("#")] if "#" in content[2] else content[2] discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None - reason = await self.database.revoke_unauth_user_by_query(message.server.id, username, discriminator) - await self.client.send_message(message.channel, message.author.mention + " " + reason) + reason = await self.database.revoke_unauth_user_by_query(message.guild.id, username, discriminator) + await message.channel.send(message.author.mention + " " + reason) async def invite(self, message): - await self.client.send_message(message.channel, "You can invite Titan to your server by visiting this link: https://discordapp.com/oauth2/authorize?&client_id=299403260031139840&scope=bot&permissions=641195117") + await message.channel.send("You can invite Titan to your server by visiting this link: https://discordapp.com/oauth2/authorize?&client_id=299403260031139840&scope=bot&permissions=641195117") async def server(self, message): - await self.client.send_message(message.channel, "Join the Titan Embeds Discord server! https://discord.gg/pFDDtcN") + await message.channel.send("Join the Titan Embeds Discord server! https://discord.gg/pFDDtcN")