miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2025-11-04 04:00:21 -05:00
Code Issues Actions Projects Releases Wiki Activity

Moved checks and helpers to common.py

Browse Source 
Fixes #87
This commit is contained in:
0x5c 2019-12-08 04:10:19 -05:00
parent be93561e8e
commit bb8cb1eff5
No known key found for this signature in database
GPG Key ID: 82039FC95E3FE970
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common.py
View File

@ -21,7 +21,10 @@ import discord
import discord.ext.commands as commands
__all__ = ["colours", "cat", "emojis", "error_embed_factory"]
import data.options as opt
__all__ = ["colours", "cat", "emojis", "error_embed_factory", "add_react", "check_if_owner"]
# --- Common values ---
@ -56,3 +59,19 @@ def error_embed_factory(ctx: commands.Context, exception: Exception, debug_mode:
icon_url=str(ctx.author.avatar_url))
embed.description = "```\n" + '\n'.join(fmtd_ex) + "```"
return embed
async def add_react(msg: discord.Message, react: str):
try:
await msg.add_reaction(react)
except discord.Forbidden:
print(f"[!!] Missing permissions to add reaction in '{msg.guild.id}/{msg.channel.id}'!")
# --- Checks ---
async def check_if_owner(ctx: commands.Context):
if ctx.author.id in opt.owners_uids:
return True
await add_react(ctx.message, emojis.bad)
return False

34
main.py
View File

@ -37,48 +37,30 @@ bot = commands.Bot(command_prefix=opt.prefix,
help_command=commands.MinimalHelpCommand())
# --- Helper functions ---
async def add_react(msg: discord.Message, react: str):
try:
await msg.add_reaction(react)
except discord.Forbidden:
print(f"[!!] Missing permissions to add reaction in '{msg.guild.id}/{msg.channel.id}'!")
# --- Checks ---
async def check_if_owner(ctx: commands.Context):
if ctx.author.id in opt.owners_uids:
return True
await add_react(ctx.message, cmn.emojis.bad)
return False
# --- Commands ---
@bot.command(name="restart", hidden=True)
@commands.check(check_if_owner)
@commands.check(cmn.check_if_owner)
async def _restart_bot(ctx: commands.Context):
"""Restarts the bot."""
global exit_code
await add_react(ctx.message, cmn.emojis.good)
await cmn.add_react(ctx.message, cmn.emojis.good)
exit_code = 42 # Signals to the wrapper script that the bot needs to be restarted.
await bot.logout()
@bot.command(name="shutdown", hidden=True)
@commands.check(check_if_owner)
@commands.check(cmn.check_if_owner)
async def _shutdown_bot(ctx: commands.Context):
"""Shuts down the bot."""
global exit_code
await add_react(ctx.message, cmn.emojis.good)
await cmn.add_react(ctx.message, cmn.emojis.good)
exit_code = 0 # Signals to the wrapper script that the bot should not be restarted.
await bot.logout()
@bot.group(name="extctl", hidden=True)
@commands.check(check_if_owner)
@commands.check(cmn.check_if_owner)
async def _extctl(ctx: commands.Context):
"""Extension control commands.
Defaults to `list` if no subcommand specified"""
@ -101,7 +83,7 @@ async def _extctl_list(ctx: commands.Context):
async def _extctl_load(ctx: commands.Context, extension: str):
try:
bot.load_extension(ext_dir + "." + extension)
await add_react(ctx.message, cmn.emojis.good)
await cmn.add_react(ctx.message, cmn.emojis.good)
except commands.ExtensionError as ex:
embed = cmn.error_embed_factory(ctx, ex, debug_mode)
await ctx.send(embed=embed)
@ -111,7 +93,7 @@ async def _extctl_load(ctx: commands.Context, extension: str):
async def _extctl_reload(ctx: commands.Context, extension: str):
try:
bot.reload_extension(ext_dir + "." + extension)
await add_react(ctx.message, cmn.emojis.good)
await cmn.add_react(ctx.message, cmn.emojis.good)
except commands.ExtensionError as ex:
embed = cmn.error_embed_factory(ctx, ex, debug_mode)
await ctx.send(embed=embed)
@ -121,7 +103,7 @@ async def _extctl_reload(ctx: commands.Context, extension: str):
async def _extctl_unload(ctx: commands.Context, extension: str):
try:
bot.unload_extension(ext_dir + "." + extension)
await add_react(ctx.message, cmn.emojis.good)
await cmn.add_react(ctx.message, cmn.emojis.good)
except commands.ExtensionError as ex:
embed = cmn.error_embed_factory(ctx, ex, debug_mode)
await ctx.send(embed=embed)