mirror of
https://github.com/myned/modufur.git
synced 2024-12-25 06:37:29 +00:00
2 > 4, WIP console tweaking
This commit is contained in:
Myned
parent
9edaac7803
commit
12c577d9b1
1 changed files with 163 additions and 130 deletions
|
|
@ -5,6 +5,7 @@ import os
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
import traceback as tb
|
import traceback as tb
|
||||||
|
from contextlib import suppress
|
||||||
|
|
||||||
import discord as d
|
import discord as d
|
||||||
import pyrasite as pyr
|
import pyrasite as pyr
|
||||||
|
|
@ -17,165 +18,197 @@ from utils import utils as u
|
||||||
|
|
||||||
class Bot:
|
class Bot:
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
|
|
||||||
# Close connection to Discord - immediate offline
|
# Close connection to Discord - immediate offline
|
||||||
@commands.command(name=',die', aliases=[',d'], brief='Kills the bot', description='BOT OWNER ONLY\nCloses the connection to Discord', hidden=True)
|
@commands.command(name=',die', aliases=[',d'], brief='Kills the bot', description='BOT OWNER ONLY\nCloses the connection to Discord', hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def die(self, ctx):
|
async def die(self, ctx):
|
||||||
await ctx.message.add_reaction('\N{NEW MOON SYMBOL}')
|
await ctx.message.add_reaction('\N{NEW MOON SYMBOL}')
|
||||||
|
|
||||||
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** \N{NEW MOON SYMBOL} . . .')
|
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** \N{NEW MOON SYMBOL} . . .')
|
||||||
# loop = self.bot.loop.all_tasks()
|
# loop = self.bot.loop.all_tasks()
|
||||||
# for task in loop:
|
# for task in loop:
|
||||||
# task.cancel()
|
# task.cancel()
|
||||||
await self.bot.logout()
|
await self.bot.logout()
|
||||||
u.close(self.bot.loop)
|
u.close(self.bot.loop)
|
||||||
print('\n/ / / / / / / / / / / /\nD I S C O N N E C T E D\n\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\\n')
|
print('\n/ / / / / / / / / / / /\nD I S C O N N E C T E D\n\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\\n')
|
||||||
# u.notify('D I S C O N N E C T E D')
|
# u.notify('D I S C O N N E C T E D')
|
||||||
|
|
||||||
@commands.command(name=',restart', aliases=[',res', ',r'], hidden=True)
|
@commands.command(name=',restart', aliases=[',res', ',r'], hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def restart(self, ctx):
|
async def restart(self, ctx):
|
||||||
await ctx.message.add_reaction('\N{SLEEPING SYMBOL}')
|
await ctx.message.add_reaction('\N{SLEEPING SYMBOL}')
|
||||||
|
|
||||||
print('\n| | | | | | | | | |\nR E S T A R T I N G\n| | | | | | | | | |\n')
|
print('\n| | | | | | | | | |\nR E S T A R T I N G\n| | | | | | | | | |\n')
|
||||||
await self.bot.get_channel(u.config['info_channel']).send('**Restarting** \N{SLEEPING SYMBOL} . . .')
|
await self.bot.get_channel(u.config['info_channel']).send('**Restarting** \N{SLEEPING SYMBOL} . . .')
|
||||||
# u.notify('R E S T A R T I N G')
|
# u.notify('R E S T A R T I N G')
|
||||||
|
|
||||||
u.temp['restart_ch'] = ctx.channel.id
|
u.temp['restart_ch'] = ctx.channel.id
|
||||||
u.temp['restart_msg'] = ctx.message.id
|
u.temp['restart_msg'] = ctx.message.id
|
||||||
u.dump(u.temp, 'temp.pkl')
|
u.dump(u.temp, 'temp.pkl')
|
||||||
|
|
||||||
# loop = self.bot.loop.all_tasks()
|
# loop = self.bot.loop.all_tasks()
|
||||||
# for task in loop:
|
# for task in loop:
|
||||||
# task.cancel()
|
# task.cancel()
|
||||||
await self.bot.logout()
|
await self.bot.logout()
|
||||||
u.close(self.bot.loop)
|
u.close(self.bot.loop)
|
||||||
os.execl(sys.executable, 'python3', 'run.py')
|
os.execl(sys.executable, 'python3', 'run.py')
|
||||||
|
|
||||||
# Invite bot to bot owner's server
|
# Invite bot to bot owner's server
|
||||||
@commands.command(name=',invite', aliases=[',inv', ',link'], brief='Invite the bot', description='BOT OWNER ONLY\nInvite the bot to a server (Requires admin)', hidden=True)
|
@commands.command(name=',invite', aliases=[',inv', ',link'], brief='Invite the bot', description='BOT OWNER ONLY\nInvite the bot to a server (Requires admin)', hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def invite(self, ctx):
|
async def invite(self, ctx):
|
||||||
await ctx.message.add_reaction('\N{ENVELOPE}')
|
await ctx.message.add_reaction('\N{ENVELOPE}')
|
||||||
|
|
||||||
await ctx.send('https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}'.format(u.config['client_id'], u.config['permissions']), delete_after=10)
|
await ctx.send('https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}'.format(u.config['client_id'], u.config['permissions']), delete_after=10)
|
||||||
|
|
||||||
@commands.command(name=',status', aliases=[',presence', ',game'], hidden=True)
|
@commands.command(name=',status', aliases=[',presence', ',game'], hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def status(self, ctx, *, game=None):
|
async def status(self, ctx, *, game=None):
|
||||||
if game is not None:
|
if game is not None:
|
||||||
await self.bot.change_presence(game=d.Game(name=game))
|
await self.bot.change_presence(game=d.Game(name=game))
|
||||||
u.config['playing'] = game
|
u.config['playing'] = game
|
||||||
u.dump(u.config, 'config.json', json=True)
|
u.dump(u.config, 'config.json', json=True)
|
||||||
else:
|
else:
|
||||||
await self.bot.change_presence(game=None)
|
await self.bot.change_presence(game=None)
|
||||||
u.config['playing'] = 'None'
|
u.config['playing'] = 'None'
|
||||||
u.dump(u.config, 'config.json', json=True)
|
u.dump(u.config, 'config.json', json=True)
|
||||||
|
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
|
|
||||||
|
|
||||||
class Tools:
|
class Tools:
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
|
|
||||||
def format(self, i='', o=''):
|
def format(self, i='', o=''):
|
||||||
if len(o) > 1:
|
if len(o) > 1:
|
||||||
return '>>> {}\n{}'.format(i, o)
|
return '>>> {}\n{}'.format(i, o)
|
||||||
else:
|
else:
|
||||||
return '>>> {}'.format(i)
|
return '>>> {}'.format(i)
|
||||||
|
|
||||||
async def generate(self, d, i='', o=''):
|
async def generate(self, d, i='', o=''):
|
||||||
return await d.send('```python\n{}```'.format(self.format(i, o)))
|
return await d.send('```python\n{}```'.format(self.format(i, o)))
|
||||||
|
|
||||||
async def refresh(self, m, i='', o=''):
|
async def refresh(self, m, i='', o=''):
|
||||||
output = m.content[9:-3]
|
output = m.content[9:-3]
|
||||||
if len(re.findall('\n', output)) <= 20:
|
if len(re.findall('\n', output)) <= 20:
|
||||||
await m.edit(content='```python\n{}\n{}\n>>>```'.format(output, self.format(i, o)))
|
await m.edit(content='```python\n{}\n{}\n>>>```'.format(output, self.format(i, o)))
|
||||||
else:
|
else:
|
||||||
await m.edit(content='```python\n{}```'.format(self.format(i, o)))
|
await m.edit(content='```python\n{}```'.format(self.format(i, o)))
|
||||||
|
|
||||||
async def generate_err(self, d, o=''):
|
async def generate_err(self, d, o=''):
|
||||||
return await d.send('```\n{}```'.format(o))
|
return await d.send('```\n{}```'.format(o))
|
||||||
|
|
||||||
async def refresh_err(self, m, o=''):
|
async def refresh_err(self, m, o=''):
|
||||||
await m.edit(content='```\n{}```'.format(o))
|
await m.edit(content='```\n{}```'.format(o))
|
||||||
|
|
||||||
@commands.command(name=',console', aliases=[',con', ',c'], hidden=True)
|
@commands.command(name=',console', aliases=[',con', ',c'], hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def console(self, ctx):
|
async def console(self, ctx):
|
||||||
def execute(msg):
|
def execute(msg):
|
||||||
if msg.content == 'exit' and msg.author is ctx.author:
|
if msg.content.startswith('exe') and msg.author is ctx.author and msg.channel is ctx.channel:
|
||||||
raise exc.Abort
|
results.cancel()
|
||||||
elif msg.author is ctx.author and msg.channel is ctx.channel:
|
return True
|
||||||
return True
|
return False
|
||||||
else:
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
def evaluate(msg):
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
if msg.content.startswith('eval') and msg.author is ctx.author and msg.channel is ctx.channel:
|
||||||
|
results.cancel()
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
def exit(reaction, user):
|
||||||
|
if reaction.emoji == '\N{LEFTWARDS ARROW WITH HOOK}' and user is ctx.author and reaction.message.id == ctx.message.id:
|
||||||
|
results.cancel()
|
||||||
|
raise exc.Abort
|
||||||
|
return False
|
||||||
|
|
||||||
console = await self.generate(ctx)
|
|
||||||
exception = await self.generate_err(ctx)
|
|
||||||
while not self.bot.is_closed():
|
|
||||||
try:
|
try:
|
||||||
exe = await self.bot.wait_for('message', check=execute)
|
console = await self.generate(ctx)
|
||||||
|
exception = await self.generate_err(ctx)
|
||||||
|
|
||||||
|
await ctx.message.add_reaction('\N{LEFTWARDS ARROW WITH HOOK}')
|
||||||
|
|
||||||
|
while not self.bot.is_closed():
|
||||||
|
try:
|
||||||
|
results = await asyncio.gather([self.bot.wait_for('message', check=execute), self.bot.wait_for('message', check=evaluate), self.bot.wait_for('reaction_add', check=exit)], return_exceptions=True)
|
||||||
|
print(results)
|
||||||
|
except exc.Execute:
|
||||||
|
try:
|
||||||
|
sys.stdout = io.StringIO()
|
||||||
|
sys.stderr = io.StringIO()
|
||||||
|
exec(exe.content)
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
await self.refresh_err(exception, tb.format_exc(limit=1))
|
||||||
|
|
||||||
|
finally:
|
||||||
|
await self.refresh(console, exe.content, sys.stdout.getvalue() if sys.stdout.getvalue() != console.content else None)
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
sys.stderr = sys.__stderr__
|
||||||
|
|
||||||
|
except exc.Evaluate:
|
||||||
|
try:
|
||||||
|
sys.stdout = io.StringIO()
|
||||||
|
sys.stderr = io.StringIO()
|
||||||
|
eval(exe.content)
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
await self.refresh_err(exception, tb.format_exc(limit=1))
|
||||||
|
|
||||||
|
finally:
|
||||||
|
await self.refresh(console, exe.content, sys.stdout.getvalue() if sys.stdout.getvalue() != console.content else None)
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
sys.stderr = sys.__stderr__
|
||||||
|
|
||||||
|
finally:
|
||||||
|
with suppress(d.NotFound):
|
||||||
|
await exe.delete()
|
||||||
|
|
||||||
except exc.Abort:
|
except exc.Abort:
|
||||||
raise exc.Abort
|
pass
|
||||||
await exe.delete()
|
|
||||||
try:
|
|
||||||
sys.stdout = io.StringIO()
|
|
||||||
sys.stderr = io.StringIO()
|
|
||||||
exec(exe.content)
|
|
||||||
except Exception:
|
|
||||||
await self.refresh_err(exception, tb.format_exc(limit=1))
|
|
||||||
finally:
|
finally:
|
||||||
await self.refresh(console, exe.content, sys.stdout.getvalue())
|
sys.stdout = sys.__stdout__
|
||||||
sys.stdout = sys.__stdout__
|
sys.stderr = sys.__stderr__
|
||||||
sys.stderr = sys.__stderr__
|
print('Reset sys output.')
|
||||||
except exc.Abort:
|
|
||||||
await ctx.send('\N{LEFTWARDS ARROW WITH HOOK} **Exited console.**')
|
|
||||||
finally:
|
|
||||||
sys.stdout = sys.__stdout__
|
|
||||||
sys.stderr = sys.__stderr__
|
|
||||||
print('Reset sys output.')
|
|
||||||
|
|
||||||
@commands.command(name='arbitrary', aliases=[',arbit', ',ar'])
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
@commands.is_owner()
|
|
||||||
@checks.del_ctx()
|
|
||||||
async def arbitrary(self, ctx, *, exe):
|
|
||||||
try:
|
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
|
||||||
|
|
||||||
sys.stdout = io.StringIO()
|
@commands.command(name='arbitrary', aliases=[',arbit', ',ar'])
|
||||||
exec(exe)
|
@commands.is_owner()
|
||||||
await self.generate(ctx, exe, sys.stdout.getvalue())
|
@checks.del_ctx()
|
||||||
except Exception:
|
async def arbitrary(self, ctx, *, exe):
|
||||||
await ctx.send('```\n{}```'.format(tb.format_exc(limit=1)))
|
try:
|
||||||
tb.print_exc(limit=1)
|
sys.stdout = io.StringIO()
|
||||||
finally:
|
exec(exe)
|
||||||
sys.stdout = sys.__stdout__
|
await self.generate(ctx, exe, sys.stdout.getvalue())
|
||||||
print('Reset stdout.')
|
except Exception:
|
||||||
|
await ctx.send('```\n{}```'.format(tb.format_exc(limit=1)))
|
||||||
|
finally:
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
print('Reset stdout.')
|
||||||
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
|
|
||||||
@commands.group(aliases=[',db'], hidden=True)
|
@commands.group(aliases=[',db'], hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def debug(self, ctx):
|
async def debug(self, ctx):
|
||||||
console = await self.generate(ctx)
|
console = await self.generate(ctx)
|
||||||
|
|
||||||
@debug.command(name='inject', aliases=['inj'])
|
@debug.command(name='inject', aliases=['inj'])
|
||||||
async def _inject(self, ctx, *, input_):
|
async def _inject(self, ctx, *, input_):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@debug.command(name='inspect', aliases=['ins'])
|
@debug.command(name='inspect', aliases=['ins'])
|
||||||
async def _inspect(self, ctx, *, input_):
|
async def _inspect(self, ctx, *, input_):
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue