puma.rc/tuxbot-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactor(command|admin|delete): rewrite delete command

Browse source
This commit is contained in:
Romain J 2019-09-13 11:33:47 +02:00
parent d0a9e658a6
commit 582d254af5
2 changed files with 48 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -41,8 +41,8 @@
- [x] sayto `removed`, now : `say to` - [x] sayto `removed`, now : `say to`
- [x] sayto_dm `removed`, now : `say to` - [x] sayto_dm `removed`, now : `say to`
- [x] editsay `removed`, now : `say edit` - [x] editsay `removed`, now : `say edit`
- [x] addreaction `renamed` - [x] addreaction `renamed`, now `react add`
- [ ] delete - [x] delete
- [ ] deletefrom - [x] deletefrom `removed`, now `delete (from|to|in)`
- [ ] embed - [ ] embed

52
cogs/admin.py
View file

@ -78,7 +78,8 @@ class Admin(commands.Cog):
message_id) message_id)
await message.edit(content=content) await message.edit(content=content)
except (discord.errors.NotFound, discord.errors.Forbidden): except (discord.errors.NotFound, discord.errors.Forbidden):
await ctx.send(Texts('utils').get("Unable to find the message")) await ctx.send(Texts('utils').get("Unable to find the message"),
delete_after=5)
@_say.command(name='to') @_say.command(name='to')
async def _say_to(self, ctx: commands.Context, async def _say_to(self, ctx: commands.Context,
@ -110,9 +111,11 @@ class Admin(commands.Cog):
await ctx.send(embed=e) await ctx.send(embed=e)
except discord.Forbidden: except discord.Forbidden:
await ctx.send(Texts('admin').get("Unable to ban this user")) await ctx.send(Texts('admin').get("Unable to ban this user"),
delete_after=5)
except discord.errors.NotFound: except discord.errors.NotFound:
await ctx.send(Texts('utils').get("Unable to find the user...")) await ctx.send(Texts('utils').get("Unable to find the user..."),
delete_after=5)
"""---------------------------------------------------------------------""" """---------------------------------------------------------------------"""
@ -133,9 +136,11 @@ class Admin(commands.Cog):
await ctx.send(embed=e) await ctx.send(embed=e)
except discord.Forbidden: except discord.Forbidden:
await ctx.send(Texts('admin').get("Unable to kick this user")) await ctx.send(Texts('admin').get("Unable to kick this user"),
delete_after=5)
except discord.errors.NotFound: except discord.errors.NotFound:
await ctx.send(Texts('utils').get("Unable to find the user...")) await ctx.send(Texts('utils').get("Unable to find the user..."),
delete_after=5)
"""---------------------------------------------------------------------""" """---------------------------------------------------------------------"""
@ -166,7 +171,8 @@ class Admin(commands.Cog):
for emoji in emojis: for emoji in emojis:
await message.add_reaction(emoji) await message.add_reaction(emoji)
except discord.errors.NotFound: except discord.errors.NotFound:
await ctx.send(Texts('utils').get("Unable to find the message")) await ctx.send(Texts('utils').get("Unable to find the message"),
delete_after=5)
@_react.command(name='clear') @_react.command(name='clear')
async def _react_remove(self, ctx: commands.Context, message_id: int): async def _react_remove(self, ctx: commands.Context, message_id: int):
@ -175,10 +181,42 @@ class Admin(commands.Cog):
message_id) message_id)
await message.clear_reactions() await message.clear_reactions()
except discord.errors.NotFound: except discord.errors.NotFound:
await ctx.send(Texts('utils').get("Unable to find the message")) await ctx.send(Texts('utils').get("Unable to find the message"),
delete_after=5)
"""---------------------------------------------------------------------""" """---------------------------------------------------------------------"""
@commands.group(name='delete', invoke_without_command=True)
async def _delete(self, ctx: commands.Context, message_id: int):
try:
await ctx.message.delete()
except discord.errors.Forbidden:
pass
try:
message: discord.Message = await ctx.channel.fetch_message(
message_id)
await message.delete()
except (discord.errors.NotFound, discord.errors.Forbidden):
await ctx.send(Texts('utils').get("Unable to find the message"),
delete_after=5)
@_delete.command(name='from', aliases=['to', 'in'])
async def _delete_from(self, ctx: commands.Context,
channel: discord.TextChannel, message_id: int):
try:
await ctx.message.delete()
except discord.errors.Forbidden:
pass
try:
message: discord.Message = await channel.fetch_message(
message_id)
await message.delete()
except (discord.errors.NotFound, discord.errors.Forbidden):
await ctx.send(Texts('utils').get("Unable to find the message"),
delete_after=5)
def setup(bot: TuxBot): def setup(bot: TuxBot):
bot.add_cog(Admin(bot)) bot.add_cog(Admin(bot))