mirror of
https://github.com/myned/modufur.git
synced 2024-12-24 14:27:27 +00:00
Merge branch 'dev'
This commit is contained in:
Myned
commit
f1082ff5c4
11 changed files with 1796 additions and 1793 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -10,40 +10,40 @@ from utils import utils as u
|
||||||
|
|
||||||
class Info:
|
class Info:
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
|
|
||||||
# @commands.command(name='helptest', aliases=['h'], hidden=True)
|
# @commands.command(name='helptest', aliases=['h'], hidden=True)
|
||||||
# async def list_commands(self, ctx):
|
# async def list_commands(self, ctx):
|
||||||
# embed = d.Embed(title='All possible commands:', color=ctx.me.color)
|
# embed = d.Embed(title='All possible commands:', color=ctx.me.color)
|
||||||
# embed.set_author(name=ctx.me.display_name, icon_url=ctx.me.avatar_url)
|
# embed.set_author(name=ctx.me.display_name, icon_url=ctx.me.avatar_url)
|
||||||
# embed.add_field(
|
# embed.add_field(
|
||||||
# name='Booru', value='\n{}bl umbrella command for managing blacklists'.format(u.config['prefix']))
|
# name='Booru', value='\n{}bl umbrella command for managing blacklists'.format(u.config['prefix']))
|
||||||
#
|
#
|
||||||
# await ctx.send(embed=embed)
|
# await ctx.send(embed=embed)
|
||||||
|
|
||||||
@commands.command(hidden=True)
|
@commands.command(hidden=True)
|
||||||
async def hi(self, ctx, *args):
|
async def hi(self, ctx, *args):
|
||||||
dest = u.get_args(ctx, args)
|
dest = u.get_args(ctx, args)
|
||||||
|
|
||||||
hello = 'Hewwo, {}.'.format(ctx.author.mention)
|
hello = 'Hewwo, {}.'.format(ctx.author.mention)
|
||||||
if ctx.author.id == checks.owner_id:
|
if ctx.author.id == checks.owner_id:
|
||||||
hello += '.. ***Master.*** uwu'
|
hello += '.. ***Master.*** uwu'
|
||||||
elif ctx.author.guild_permissions.administrator:
|
elif ctx.author.guild_permissions.administrator:
|
||||||
hello = '{} **Admin** {}'.format(hello[:7], hello[7:])
|
hello = '{} **Admin** {}'.format(hello[:7], hello[7:])
|
||||||
elif ctx.author.guild_permissions.ban_members:
|
elif ctx.author.guild_permissions.ban_members:
|
||||||
hello = '{} **Mod** {}'.format(hello[:7], hello[7:])
|
hello = '{} **Mod** {}'.format(hello[:7], hello[7:])
|
||||||
await dest.send(hello)
|
await dest.send(hello)
|
||||||
|
|
||||||
@commands.group(name='info', aliases=['i'])
|
@commands.group(name='info', aliases=['i'])
|
||||||
async def info(self, ctx):
|
async def info(self, ctx):
|
||||||
if invoked_subcommand is None:
|
if invoked_subcommand is None:
|
||||||
await ctx.send('<embed>BOT INFO</embed>')
|
await ctx.send('<embed>BOT INFO</embed>')
|
||||||
|
|
||||||
@info.command(aliases=['g', 'server', 's'], brief='Provides info about a guild', hidden=True)
|
@info.command(aliases=['g', 'server', 's'], brief='Provides info about a guild', hidden=True)
|
||||||
async def guild(self, ctx):
|
async def guild(self, ctx):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@info.command(aliases=['u', 'member', 'm'], brief='Provides info about a user', hidden=True)
|
@info.command(aliases=['u', 'member', 'm'], brief='Provides info about a user', hidden=True)
|
||||||
async def user(self, ctx):
|
async def user(self, ctx):
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
|
|
@ -13,168 +13,168 @@ from utils import utils as u
|
||||||
|
|
||||||
class Administration:
|
class Administration:
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.RATE_LIMIT = u.RATE_LIMIT
|
self.RATE_LIMIT = u.RATE_LIMIT
|
||||||
self.queue = asyncio.Queue()
|
self.queue = asyncio.Queue()
|
||||||
|
self.deleting = False
|
||||||
|
|
||||||
|
if u.tasks['auto_del']:
|
||||||
|
for channel in u.tasks['auto_del']:
|
||||||
|
temp = self.bot.get_channel(channel)
|
||||||
|
self.bot.loop.create_task(self.queue_for_deletion(temp))
|
||||||
|
print('AUTO-DELETING : #{}'.format(temp.id))
|
||||||
|
self.bot.loop.create_task(self.delete())
|
||||||
|
self.deleting = True
|
||||||
|
|
||||||
|
@commands.command(name=',prunefromguild', aliases=[',pfg', ',prunefromserver', ',pfs'], brief='Prune a user\'s messages from the guild', description='about flag centers on message 50 of 101 messages\n\npfg \{user id\} [before|after|about] [\{message id\}]\n\nExample:\npfg \{user id\} before \{message id\}')
|
||||||
|
@commands.is_owner()
|
||||||
|
@checks.del_ctx()
|
||||||
|
async def prune_all_user(self, ctx, user, when=None, reference=None):
|
||||||
|
def yes(msg):
|
||||||
|
if msg.content.lower() == 'y' and msg.channel is ctx.channel and msg.author is ctx.author:
|
||||||
|
return True
|
||||||
|
elif msg.content.lower() == 'n' and msg.channel is ctx.channel and msg.author is ctx.author:
|
||||||
|
raise exc.CheckFail
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
|
channels = ctx.guild.text_channels
|
||||||
|
if reference is not None:
|
||||||
|
for channel in channels:
|
||||||
|
try:
|
||||||
|
ref = await channel.get_message(reference)
|
||||||
|
|
||||||
|
except err.NotFound:
|
||||||
|
continue
|
||||||
|
|
||||||
|
history = []
|
||||||
|
try:
|
||||||
|
pru_sent = await ctx.send('⏳ **Pruning** <@{}>**\'s messages will take some time.**'.format(user))
|
||||||
|
ch_sent = await ctx.send('🗄 **Caching channels...**')
|
||||||
|
|
||||||
|
if when is None:
|
||||||
|
for channel in channels:
|
||||||
|
async for message in channel.history(limit=None):
|
||||||
|
if message.author.id == int(user):
|
||||||
|
history.append(message)
|
||||||
|
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
elif when == 'before':
|
||||||
|
for channel in channels:
|
||||||
|
async for message in channel.history(limit=None, before=ref.created_at):
|
||||||
|
if message.author.id == int(user):
|
||||||
|
history.append(message)
|
||||||
|
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
elif when == 'after':
|
||||||
|
for channel in channels:
|
||||||
|
async for message in channel.history(limit=None, after=ref.created_at):
|
||||||
|
if message.author.id == int(user):
|
||||||
|
history.append(message)
|
||||||
|
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
elif when == 'about':
|
||||||
|
for channel in channels:
|
||||||
|
async for message in channel.history(limit=None, about=ref.created_at):
|
||||||
|
if message.author.id == int(user):
|
||||||
|
history.append(message)
|
||||||
|
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
|
||||||
|
est_sent = await ctx.send('⏱ **Estimated time to delete history:** `{}m {}s`'.format(int(self.RATE_LIMIT * len(history) / 60), int(self.RATE_LIMIT * len(history) % 60)))
|
||||||
|
cont_sent = await ctx.send('{} **Continue?** `Y` or `N`'.format(ctx.author.mention))
|
||||||
|
await self.bot.wait_for('message', check=yes, timeout=10 * 60)
|
||||||
|
await cont_sent.delete()
|
||||||
|
del_sent = await ctx.send('🗑 **Deleting messages...**')
|
||||||
|
await del_sent.pin()
|
||||||
|
c = 0
|
||||||
|
for message in history:
|
||||||
|
with suppress(err.NotFound):
|
||||||
|
await message.delete()
|
||||||
|
c += 1
|
||||||
|
await del_sent.edit(content='🗑 **Deleted** `{}/{}` **messages.**'.format(history.index(message) + 1, len(history)))
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
await del_sent.unpin()
|
||||||
|
|
||||||
|
await ctx.send('🗑 `{}` **of** <@{}>**\'s messages left in** {}**.**'.format(len(history) - c, user, ctx.guild.name))
|
||||||
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
|
except exc.CheckFail:
|
||||||
|
await ctx.send('**Deletion aborted.**', delete_after=10)
|
||||||
|
await ctx.message.add_reaction('❌')
|
||||||
|
|
||||||
|
except TimeoutError:
|
||||||
|
await ctx.send('**Deletion timed out.**', delete_after=10)
|
||||||
|
await ctx.message.add_reaction('❌')
|
||||||
|
|
||||||
|
async def delete(self):
|
||||||
|
while self.deleting:
|
||||||
|
message = await self.queue.get()
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
with suppress(err.NotFound):
|
||||||
|
if not message.pinned:
|
||||||
|
await message.delete()
|
||||||
|
|
||||||
|
print('STOPPED : deleting')
|
||||||
|
|
||||||
|
async def queue_for_deletion(self, channel):
|
||||||
|
def check(msg):
|
||||||
|
if msg.content.lower() == 'stop' and msg.channel is channel and msg.author.guild_permissions.administrator:
|
||||||
|
raise exc.Abort
|
||||||
|
elif msg.channel is channel and not msg.pinned:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
async for message in channel.history(limit=None):
|
||||||
|
if message.content.lower() == 'stop' and message.author.guild_permissions.administrator:
|
||||||
|
raise exc.Abort
|
||||||
|
if not message.pinned:
|
||||||
|
await self.queue.put(message)
|
||||||
|
|
||||||
|
while not self.bot.is_closed():
|
||||||
|
message = await self.bot.wait_for('message', check=check)
|
||||||
|
await self.queue.put(message)
|
||||||
|
|
||||||
|
except exc.Abort:
|
||||||
|
u.tasks['auto_del'].remove(channel.id)
|
||||||
|
u.dump(u.tasks, 'cogs/tasks.pkl')
|
||||||
|
if not u.tasks['auto_del']:
|
||||||
self.deleting = False
|
self.deleting = False
|
||||||
|
print('STOPPED : deleting #{}'.format(channel.id))
|
||||||
|
await channel.send('**Stopped queueing messages for deletion in** {}**.**'.format(channel.mention), delete_after=5)
|
||||||
|
|
||||||
if u.tasks['auto_del']:
|
@commands.command(name='autodelete', aliases=['autodel', 'ad'])
|
||||||
for channel in u.tasks['auto_del']:
|
@commands.has_permissions(administrator=True)
|
||||||
temp = self.bot.get_channel(channel)
|
@checks.del_ctx()
|
||||||
self.bot.loop.create_task(self.queue_for_deletion(temp))
|
async def auto_delete(self, ctx):
|
||||||
print('AUTO-DELETING : #{}'.format(temp.id))
|
try:
|
||||||
self.bot.loop.create_task(self.delete())
|
if ctx.channel.id not in u.tasks['auto_del']:
|
||||||
self.deleting = True
|
u.tasks['auto_del'].append(ctx.channel.id)
|
||||||
|
u.dump(u.tasks, 'cogs/tasks.pkl')
|
||||||
@commands.command(name=',prunefromguild', aliases=[',pfg', ',prunefromserver', ',pfs'], brief='Prune a user\'s messages from the guild', description='about flag centers on message 50 of 101 messages\n\npfg \{user id\} [before|after|about] [\{message id\}]\n\nExample:\npfg \{user id\} before \{message id\}')
|
self.bot.loop.create_task(self.queue_for_deletion(ctx.channel))
|
||||||
@commands.is_owner()
|
if not self.deleting:
|
||||||
@checks.del_ctx()
|
self.bot.loop.create_task(self.delete())
|
||||||
async def prune_all_user(self, ctx, user, when=None, reference=None):
|
self.deleting = True
|
||||||
def yes(msg):
|
print('AUTO-DELETING : #{}'.format(ctx.channel.id))
|
||||||
if msg.content.lower() == 'y' and msg.channel is ctx.channel and msg.author is ctx.author:
|
await ctx.send('**Auto-deleting all messages in {}.**'.format(ctx.channel.mention), delete_after=5)
|
||||||
return True
|
|
||||||
elif msg.content.lower() == 'n' and msg.channel is ctx.channel and msg.author is ctx.author:
|
|
||||||
raise exc.CheckFail
|
|
||||||
else:
|
|
||||||
return False
|
|
||||||
|
|
||||||
channels = ctx.guild.text_channels
|
|
||||||
if reference is not None:
|
|
||||||
for channel in channels:
|
|
||||||
try:
|
|
||||||
ref = await channel.get_message(reference)
|
|
||||||
|
|
||||||
except err.NotFound:
|
|
||||||
continue
|
|
||||||
|
|
||||||
history = []
|
|
||||||
try:
|
|
||||||
pru_sent = await ctx.send('⏳ **Pruning** <@{}>**\'s messages will take some time.**'.format(user))
|
|
||||||
ch_sent = await ctx.send('🗄 **Caching channels...**')
|
|
||||||
|
|
||||||
if when is None:
|
|
||||||
for channel in channels:
|
|
||||||
async for message in channel.history(limit=None):
|
|
||||||
if message.author.id == int(user):
|
|
||||||
history.append(message)
|
|
||||||
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
elif when == 'before':
|
|
||||||
for channel in channels:
|
|
||||||
async for message in channel.history(limit=None, before=ref.created_at):
|
|
||||||
if message.author.id == int(user):
|
|
||||||
history.append(message)
|
|
||||||
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
elif when == 'after':
|
|
||||||
for channel in channels:
|
|
||||||
async for message in channel.history(limit=None, after=ref.created_at):
|
|
||||||
if message.author.id == int(user):
|
|
||||||
history.append(message)
|
|
||||||
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
elif when == 'about':
|
|
||||||
for channel in channels:
|
|
||||||
async for message in channel.history(limit=None, about=ref.created_at):
|
|
||||||
if message.author.id == int(user):
|
|
||||||
history.append(message)
|
|
||||||
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels.**'.format(channels.index(channel) + 1, len(channels)))
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
|
|
||||||
est_sent = await ctx.send('⏱ **Estimated time to delete history:** `{}m {}s`'.format(int(self.RATE_LIMIT * len(history) / 60), int(self.RATE_LIMIT * len(history) % 60)))
|
|
||||||
cont_sent = await ctx.send('{} **Continue?** `Y` or `N`'.format(ctx.author.mention))
|
|
||||||
await self.bot.wait_for('message', check=yes, timeout=10 * 60)
|
|
||||||
await cont_sent.delete()
|
|
||||||
del_sent = await ctx.send('🗑 **Deleting messages...**')
|
|
||||||
await del_sent.pin()
|
|
||||||
c = 0
|
|
||||||
for message in history:
|
|
||||||
with suppress(err.NotFound):
|
|
||||||
await message.delete()
|
|
||||||
c += 1
|
|
||||||
await del_sent.edit(content='🗑 **Deleted** `{}/{}` **messages.**'.format(history.index(message) + 1, len(history)))
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
await del_sent.unpin()
|
|
||||||
|
|
||||||
await ctx.send('🗑 `{}` **of** <@{}>**\'s messages left in** {}**.**'.format(len(history) - c, user, ctx.guild.name))
|
|
||||||
await ctx.message.add_reaction('✅')
|
|
||||||
|
|
||||||
except exc.CheckFail:
|
|
||||||
await ctx.send('**Deletion aborted.**', delete_after=10)
|
|
||||||
await ctx.message.add_reaction('❌')
|
|
||||||
|
|
||||||
except TimeoutError:
|
|
||||||
await ctx.send('**Deletion timed out.**', delete_after=10)
|
|
||||||
await ctx.message.add_reaction('❌')
|
|
||||||
|
|
||||||
async def delete(self):
|
|
||||||
while self.deleting:
|
|
||||||
message = await self.queue.get()
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
with suppress(err.NotFound):
|
|
||||||
if not message.pinned:
|
|
||||||
await message.delete()
|
|
||||||
|
|
||||||
print('STOPPED : deleting')
|
|
||||||
|
|
||||||
async def queue_for_deletion(self, channel):
|
|
||||||
def check(msg):
|
|
||||||
if msg.content.lower() == 'stop' and msg.channel is channel and msg.author.guild_permissions.administrator:
|
|
||||||
raise exc.Abort
|
|
||||||
elif msg.channel is channel and not msg.pinned:
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
|
||||||
async for message in channel.history(limit=None):
|
|
||||||
if message.content.lower() == 'stop' and message.author.guild_permissions.administrator:
|
|
||||||
raise exc.Abort
|
|
||||||
if not message.pinned:
|
|
||||||
await self.queue.put(message)
|
|
||||||
|
|
||||||
while not self.bot.is_closed():
|
|
||||||
message = await self.bot.wait_for('message', check=check)
|
|
||||||
await self.queue.put(message)
|
|
||||||
|
|
||||||
except exc.Abort:
|
|
||||||
u.tasks['auto_del'].remove(channel.id)
|
|
||||||
u.dump(u.tasks, 'cogs/tasks.pkl')
|
|
||||||
if not u.tasks['auto_del']:
|
|
||||||
self.deleting = False
|
|
||||||
print('STOPPED : deleting #{}'.format(channel.id))
|
|
||||||
await channel.send('**Stopped queueing messages for deletion in** {}**.**'.format(channel.mention), delete_after=5)
|
|
||||||
|
|
||||||
@commands.command(name='autodelete', aliases=['autodel', 'ad'])
|
|
||||||
@commands.has_permissions(administrator=True)
|
|
||||||
@checks.del_ctx()
|
|
||||||
async def auto_delete(self, ctx):
|
|
||||||
try:
|
|
||||||
if ctx.channel.id not in u.tasks['auto_del']:
|
|
||||||
u.tasks['auto_del'].append(ctx.channel.id)
|
|
||||||
u.dump(u.tasks, 'cogs/tasks.pkl')
|
|
||||||
self.bot.loop.create_task(self.queue_for_deletion(ctx.channel))
|
|
||||||
if not self.deleting:
|
|
||||||
self.bot.loop.create_task(self.delete())
|
|
||||||
self.deleting = True
|
|
||||||
print('AUTO-DELETING : #{}'.format(ctx.channel.id))
|
|
||||||
await ctx.send('**Auto-deleting all messages in {}.**'.format(ctx.channel.mention), delete_after=5)
|
|
||||||
await ctx.message.add_reaction('✅')
|
|
||||||
else:
|
|
||||||
raise exc.Exists
|
|
||||||
|
|
||||||
except exc.Exists:
|
|
||||||
await ctx.send('**Already auto-deleting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10)
|
|
||||||
await ctx.message.add_reaction('❌')
|
|
||||||
|
|
||||||
@commands.command(name='deletecommands', aliases=['delcmds'])
|
|
||||||
@commands.has_permissions(administrator=True)
|
|
||||||
async def delete_commands(self, ctx):
|
|
||||||
if ctx.guild.id not in u.settings['del_ctx']:
|
|
||||||
u.settings['del_ctx'].append(ctx.guild.id)
|
|
||||||
else:
|
|
||||||
u.settings['del_ctx'].remove(ctx.guild.id)
|
|
||||||
u.dump(u.settings, 'settings.pkl')
|
|
||||||
|
|
||||||
await ctx.send('**Delete command invocations:** `{}`'.format(ctx.guild.id in u.settings['del_ctx']))
|
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
|
else:
|
||||||
|
raise exc.Exists
|
||||||
|
|
||||||
|
except exc.Exists:
|
||||||
|
await ctx.send('**Already auto-deleting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10)
|
||||||
|
await ctx.message.add_reaction('❌')
|
||||||
|
|
||||||
|
@commands.command(name='deletecommands', aliases=['delcmds'])
|
||||||
|
@commands.has_permissions(administrator=True)
|
||||||
|
async def delete_commands(self, ctx):
|
||||||
|
if ctx.guild.id not in u.settings['del_ctx']:
|
||||||
|
u.settings['del_ctx'].append(ctx.guild.id)
|
||||||
|
else:
|
||||||
|
u.settings['del_ctx'].remove(ctx.guild.id)
|
||||||
|
u.dump(u.settings, 'settings.pkl')
|
||||||
|
|
||||||
|
await ctx.send('**Delete command invocations:** `{}`'.format(ctx.guild.id in u.settings['del_ctx']))
|
||||||
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
|
||||||
|
|
@ -19,166 +19,166 @@ nl = re.compile('\n')
|
||||||
|
|
||||||
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('🌙')
|
await ctx.message.add_reaction('🌙')
|
||||||
|
|
||||||
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** 🌙 . . .')
|
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** 🌙 . . .')
|
||||||
# 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('💤')
|
await ctx.message.add_reaction('💤')
|
||||||
|
|
||||||
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** 💤 . . .')
|
await self.bot.get_channel(u.config['info_channel']).send('**Restarting** 💤 . . .')
|
||||||
# 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/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('✉️')
|
await ctx.message.add_reaction('✉️')
|
||||||
|
|
||||||
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('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
|
|
||||||
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=''):
|
||||||
global nl
|
global nl
|
||||||
output = m.content[10:-2]
|
output = m.content[10:-2]
|
||||||
if len(nl.findall(output)) <= 20:
|
if len(nl.findall(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 == 'exit' and msg.author is ctx.author:
|
||||||
raise exc.Abort
|
raise exc.Abort
|
||||||
elif msg.author is ctx.author and msg.channel is ctx.channel:
|
elif msg.author is ctx.author and msg.channel is ctx.channel:
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
|
console = await self.generate(ctx)
|
||||||
|
exception = await self.generate_err(ctx)
|
||||||
|
while not self.bot.is_closed():
|
||||||
try:
|
try:
|
||||||
await ctx.message.add_reaction('✅')
|
exe = await self.bot.wait_for('message', check=execute)
|
||||||
|
|
||||||
console = await self.generate(ctx)
|
|
||||||
exception = await self.generate_err(ctx)
|
|
||||||
while not self.bot.is_closed():
|
|
||||||
try:
|
|
||||||
exe = await self.bot.wait_for('message', check=execute)
|
|
||||||
except exc.Abort:
|
|
||||||
raise exc.Abort
|
|
||||||
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:
|
|
||||||
await self.refresh(console, exe.content, sys.stdout.getvalue())
|
|
||||||
sys.stdout = sys.__stdout__
|
|
||||||
sys.stderr = sys.__stderr__
|
|
||||||
except exc.Abort:
|
except exc.Abort:
|
||||||
await ctx.send('↩️ **Exited console.**')
|
raise exc.Abort
|
||||||
finally:
|
await exe.delete()
|
||||||
sys.stdout = sys.__stdout__
|
|
||||||
sys.stderr = sys.__stderr__
|
|
||||||
print('Reset sys output.')
|
|
||||||
|
|
||||||
@commands.command(name='arbitrary', aliases=[',arbit', ',ar'])
|
|
||||||
@commands.is_owner()
|
|
||||||
@checks.del_ctx()
|
|
||||||
async def arbitrary(self, ctx, *, exe):
|
|
||||||
try:
|
try:
|
||||||
await ctx.message.add_reaction('✅')
|
sys.stdout = io.StringIO()
|
||||||
|
sys.stderr = io.StringIO()
|
||||||
sys.stdout = io.StringIO()
|
exec(exe.content)
|
||||||
exec(exe)
|
|
||||||
await self.generate(ctx, exe, sys.stdout.getvalue())
|
|
||||||
except Exception:
|
except Exception:
|
||||||
await ctx.send('```\n{}```'.format(tb.format_exc(limit=1)))
|
await self.refresh_err(exception, tb.format_exc(limit=1))
|
||||||
tb.print_exc(limit=1)
|
|
||||||
finally:
|
finally:
|
||||||
sys.stdout = sys.__stdout__
|
await self.refresh(console, exe.content, sys.stdout.getvalue())
|
||||||
print('Reset stdout.')
|
sys.stdout = sys.__stdout__
|
||||||
|
sys.stderr = sys.__stderr__
|
||||||
|
except exc.Abort:
|
||||||
|
await ctx.send('↩️ **Exited console.**')
|
||||||
|
finally:
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
sys.stderr = sys.__stderr__
|
||||||
|
print('Reset sys output.')
|
||||||
|
|
||||||
@commands.group(aliases=[',db'], hidden=True)
|
@commands.command(name='arbitrary', aliases=[',arbit', ',ar'])
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def debug(self, ctx):
|
async def arbitrary(self, ctx, *, exe):
|
||||||
console = await self.generate(ctx)
|
try:
|
||||||
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
@debug.command(name='inject', aliases=['inj'])
|
sys.stdout = io.StringIO()
|
||||||
async def _inject(self, ctx, *, input_):
|
exec(exe)
|
||||||
pass
|
await self.generate(ctx, exe, sys.stdout.getvalue())
|
||||||
|
except Exception:
|
||||||
|
await ctx.send('```\n{}```'.format(tb.format_exc(limit=1)))
|
||||||
|
tb.print_exc(limit=1)
|
||||||
|
finally:
|
||||||
|
sys.stdout = sys.__stdout__
|
||||||
|
print('Reset stdout.')
|
||||||
|
|
||||||
@debug.command(name='inspect', aliases=['ins'])
|
@commands.group(aliases=[',db'], hidden=True)
|
||||||
async def _inspect(self, ctx, *, input_):
|
@commands.is_owner()
|
||||||
pass
|
@checks.del_ctx()
|
||||||
|
async def debug(self, ctx):
|
||||||
|
console = await self.generate(ctx)
|
||||||
|
|
||||||
|
@debug.command(name='inject', aliases=['inj'])
|
||||||
|
async def _inject(self, ctx, *, input_):
|
||||||
|
pass
|
||||||
|
|
||||||
|
@debug.command(name='inspect', aliases=['ins'])
|
||||||
|
async def _inspect(self, ctx, *, input_):
|
||||||
|
pass
|
||||||
|
|
|
||||||
|
|
@ -30,88 +30,88 @@ command_dict = {}
|
||||||
|
|
||||||
class Utils:
|
class Utils:
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
|
|
||||||
@commands.command(name='last', aliases=['l', ','], brief='Reinvokes last command', description='Reinvokes previous command executed', hidden=True)
|
@commands.command(name='last', aliases=['l', ','], brief='Reinvokes last command', description='Reinvokes previous command executed', hidden=True)
|
||||||
async def last_command(self, ctx):
|
async def last_command(self, ctx):
|
||||||
global command_dict
|
global command_dict
|
||||||
|
|
||||||
if command_dict.get(str(ctx.author.id), {}).get('args', None) is not None:
|
if command_dict.get(str(ctx.author.id), {}).get('args', None) is not None:
|
||||||
args = command_dict.get(str(ctx.author.id), {})['args']
|
args = command_dict.get(str(ctx.author.id), {})['args']
|
||||||
print(command_dict)
|
print(command_dict)
|
||||||
await ctx.invoke(command_dict.get(str(ctx.author.id), {}).get('command', None), args)
|
await ctx.invoke(command_dict.get(str(ctx.author.id), {}).get('command', None), args)
|
||||||
|
|
||||||
# [prefix]ping -> Pong!
|
# [prefix]ping -> Pong!
|
||||||
@commands.command(aliases=['p'], brief='Pong!', description='Returns latency from bot to Discord servers, not to user')
|
@commands.command(aliases=['p'], brief='Pong!', description='Returns latency from bot to Discord servers, not to user')
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def ping(self, ctx):
|
async def ping(self, ctx):
|
||||||
global command_dict
|
global command_dict
|
||||||
|
|
||||||
await ctx.message.add_reaction('🏓')
|
await ctx.message.add_reaction('🏓')
|
||||||
|
|
||||||
await ctx.send(ctx.author.mention + ' 🏓 `' + str(round(self.bot.latency * 1000)) + 'ms`', delete_after=5)
|
await ctx.send(ctx.author.mention + ' 🏓 `' + str(round(self.bot.latency * 1000)) + 'ms`', delete_after=5)
|
||||||
command_dict.setdefault(str(ctx.author.id), {}).update({'command': ctx.command})
|
command_dict.setdefault(str(ctx.author.id), {}).update({'command': ctx.command})
|
||||||
|
|
||||||
@commands.command(aliases=['pre'], brief='List bot prefixes', description='Shows all used prefixes')
|
@commands.command(aliases=['pre'], brief='List bot prefixes', description='Shows all used prefixes')
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def prefix(self, ctx):
|
async def prefix(self, ctx):
|
||||||
await ctx.send('**Prefix:** `{}`'.format(u.config['prefix']))
|
await ctx.send('**Prefix:** `{}`'.format(u.config['prefix']))
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
@commands.group(name=',send', aliases=[',s'], hidden=True)
|
@commands.group(name=',send', aliases=[',s'], hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def send(self, ctx):
|
async def send(self, ctx):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@send.command(name='guild', aliases=['g', 'server', 's'])
|
@send.command(name='guild', aliases=['g', 'server', 's'])
|
||||||
async def send_guild(self, ctx, guild, channel, *, message):
|
async def send_guild(self, ctx, guild, channel, *, message):
|
||||||
await discord.utils.get(self.bot.get_all_channels(), guild__name=guild, name=channel).send(message)
|
await discord.utils.get(self.bot.get_all_channels(), guild__name=guild, name=channel).send(message)
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
@send.command(name='user', aliases=['u', 'member', 'm'])
|
@send.command(name='user', aliases=['u', 'member', 'm'])
|
||||||
async def send_user(self, ctx, user, *, message):
|
async def send_user(self, ctx, user, *, message):
|
||||||
await discord.utils.get(self.bot.get_all_members(), id=int(user)).send(message)
|
await discord.utils.get(self.bot.get_all_members(), id=int(user)).send(message)
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
|
|
||||||
@commands.command(aliases=['authenticateupload', 'authupload', 'authup', 'auth'])
|
@commands.command(aliases=['authenticateupload', 'authupload', 'authup', 'auth'])
|
||||||
async def authenticate_upload(self, ctx):
|
async def authenticate_upload(self, ctx):
|
||||||
global youtube
|
global youtube
|
||||||
flow = flow_from_clientsecrets('client_secrets.json', scope='https://www.googleapis.com/auth/youtube.upload',
|
flow = flow_from_clientsecrets('client_secrets.json', scope='https://www.googleapis.com/auth/youtube.upload',
|
||||||
login_hint='botmyned@gmail.com', redirect_uri='urn:ietf:wg:oauth:2.0:oob')
|
login_hint='botmyned@gmail.com', redirect_uri='urn:ietf:wg:oauth:2.0:oob')
|
||||||
flow.params['access_type'] = 'offline'
|
flow.params['access_type'] = 'offline'
|
||||||
webbrowser.open_new_tab(flow.step1_get_authorize_url())
|
webbrowser.open_new_tab(flow.step1_get_authorize_url())
|
||||||
credentials = flow.step2_exchange(input('Authorization code: '))
|
credentials = flow.step2_exchange(input('Authorization code: '))
|
||||||
youtube = build('youtube', 'v3', http=credentials.authorize(http.build_http()))
|
youtube = build('youtube', 'v3', http=credentials.authorize(http.build_http()))
|
||||||
print('Service built.')
|
print('Service built.')
|
||||||
|
|
||||||
@commands.command(aliases=['up', 'u', 'vid', 'v'])
|
@commands.command(aliases=['up', 'u', 'vid', 'v'])
|
||||||
@commands.has_permissions(administrator=True)
|
@commands.has_permissions(administrator=True)
|
||||||
async def upload(self, ctx):
|
async def upload(self, ctx):
|
||||||
global youtube
|
global youtube
|
||||||
attachments = ctx.message.attachments
|
attachments = ctx.message.attachments
|
||||||
try:
|
try:
|
||||||
if not attachments:
|
if not attachments:
|
||||||
raise exc.MissingAttachment
|
raise exc.MissingAttachment
|
||||||
if len(attachments) > 1:
|
if len(attachments) > 1:
|
||||||
raise exc.TooManyAttachments(len(attachments))
|
raise exc.TooManyAttachments(len(attachments))
|
||||||
mime = mimetypes.guess_type(attachments[0].filename)[0]
|
mime = mimetypes.guess_type(attachments[0].filename)[0]
|
||||||
if 'video/' in mime:
|
if 'video/' in mime:
|
||||||
with tempfile.NamedTemporaryFile() as temp:
|
with tempfile.NamedTemporaryFile() as temp:
|
||||||
await attachments[0].save(temp)
|
await attachments[0].save(temp)
|
||||||
else:
|
else:
|
||||||
raise exc.InvalidVideoFile(mime)
|
raise exc.InvalidVideoFile(mime)
|
||||||
print('https://www.youtube.com/watch?v=' + youtube.videos().insert(part='snippet',
|
print('https://www.youtube.com/watch?v=' + youtube.videos().insert(part='snippet',
|
||||||
body={'categoryId': '24', 'title': 'Test'}, media_body=http.MediaFileUpload(temp.name, chunksize=-1)))
|
body={'categoryId': '24', 'title': 'Test'}, media_body=http.MediaFileUpload(temp.name, chunksize=-1)))
|
||||||
except exc.InvalidVideoFile as e:
|
except exc.InvalidVideoFile as e:
|
||||||
await ctx.send('`' + str(e) + '` **not valid video type.**', delete_after=10)
|
await ctx.send('`' + str(e) + '` **not valid video type.**', delete_after=10)
|
||||||
except exc.TooManyAttachments as e:
|
except exc.TooManyAttachments as e:
|
||||||
await ctx.send('`' + str(e) + '` **too many attachments.** Only one attachment is permitted to upload.', delete_after=10)
|
await ctx.send('`' + str(e) + '` **too many attachments.** Only one attachment is permitted to upload.', delete_after=10)
|
||||||
except exc.MissingAttachment:
|
except exc.MissingAttachment:
|
||||||
await ctx.send('**Missing attachment.**', delete_after=10)
|
await ctx.send('**Missing attachment.**', delete_after=10)
|
||||||
|
|
||||||
@upload.error
|
@upload.error
|
||||||
async def upload_error(self, ctx, error):
|
async def upload_error(self, ctx, error):
|
||||||
pass
|
pass
|
||||||
# http.
|
# http.
|
||||||
|
|
|
||||||
|
|
@ -14,48 +14,48 @@ owner_id = u.config['owner_id']
|
||||||
|
|
||||||
|
|
||||||
def is_owner():
|
def is_owner():
|
||||||
async def predicate(ctx):
|
async def predicate(ctx):
|
||||||
return ctx.message.author.id == owner_id
|
return ctx.message.author.id == owner_id
|
||||||
return commands.check(predicate)
|
return commands.check(predicate)
|
||||||
|
|
||||||
|
|
||||||
def is_admin():
|
def is_admin():
|
||||||
def predicate(ctx):
|
def predicate(ctx):
|
||||||
return ctx.message.author.guild_permissions.administrator
|
return ctx.message.author.guild_permissions.administrator
|
||||||
return commands.check(predicate)
|
return commands.check(predicate)
|
||||||
|
|
||||||
|
|
||||||
def is_mod():
|
def is_mod():
|
||||||
def predicate(ctx):
|
def predicate(ctx):
|
||||||
return ctx.message.author.guild_permissions.ban_members
|
return ctx.message.author.guild_permissions.ban_members
|
||||||
return commands.check(predicate)
|
return commands.check(predicate)
|
||||||
|
|
||||||
|
|
||||||
def owner(ctx):
|
def owner(ctx):
|
||||||
return ctx.message.author.id == owner_id
|
return ctx.message.author.id == owner_id
|
||||||
|
|
||||||
|
|
||||||
def admin(ctx):
|
def admin(ctx):
|
||||||
return ctx.message.author.guild_permissions.administrator
|
return ctx.message.author.guild_permissions.administrator
|
||||||
|
|
||||||
|
|
||||||
def mod(ctx):
|
def mod(ctx):
|
||||||
return ctx.message.author.guild_permissions.ban_members
|
return ctx.message.author.guild_permissions.ban_members
|
||||||
|
|
||||||
|
|
||||||
def is_nsfw():
|
def is_nsfw():
|
||||||
def predicate(ctx):
|
def predicate(ctx):
|
||||||
if isinstance(ctx.message.channel, d.TextChannel):
|
if isinstance(ctx.message.channel, d.TextChannel):
|
||||||
return ctx.message.channel.is_nsfw()
|
return ctx.message.channel.is_nsfw()
|
||||||
return True
|
return True
|
||||||
return commands.check(predicate)
|
return commands.check(predicate)
|
||||||
|
|
||||||
|
|
||||||
def del_ctx():
|
def del_ctx():
|
||||||
async def predicate(ctx):
|
async def predicate(ctx):
|
||||||
with suppress(AttributeError):
|
with suppress(AttributeError):
|
||||||
if ctx.guild.id in u.settings['del_ctx'] and ctx.me.permissions_in(ctx.channel).manage_messages and isinstance(ctx.message.channel, d.TextChannel):
|
if ctx.guild.id in u.settings['del_ctx'] and ctx.me.permissions_in(ctx.channel).manage_messages and isinstance(ctx.message.channel, d.TextChannel):
|
||||||
with suppress(err.NotFound):
|
with suppress(err.NotFound):
|
||||||
await ctx.message.delete()
|
await ctx.message.delete()
|
||||||
return True
|
return True
|
||||||
return commands.check(predicate)
|
return commands.check(predicate)
|
||||||
|
|
|
||||||
|
|
@ -2,104 +2,104 @@ base = '⚠️ **An internal error has occurred.** This has been reported to my
|
||||||
|
|
||||||
|
|
||||||
async def send_error(ctx, error):
|
async def send_error(ctx, error):
|
||||||
await ctx.send('{}\n```\n{}```'.format(base, error))
|
await ctx.send('{}\n```\n{}```'.format(base, error))
|
||||||
|
|
||||||
|
|
||||||
class Left(Exception):
|
class Left(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Right(Exception):
|
class Right(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Save(Exception):
|
class Save(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class GoTo(Exception):
|
class GoTo(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Exists(Exception):
|
class Exists(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class MissingArgument(Exception):
|
class MissingArgument(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class FavoritesNotFound(Exception):
|
class FavoritesNotFound(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class PostError(Exception):
|
class PostError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ImageError(Exception):
|
class ImageError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class MatchError(Exception):
|
class MatchError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TagBlacklisted(Exception):
|
class TagBlacklisted(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class BoundsError(Exception):
|
class BoundsError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TagBoundsError(Exception):
|
class TagBoundsError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TagExists(Exception):
|
class TagExists(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TagError(Exception):
|
class TagError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class FlagError(Exception):
|
class FlagError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class BlacklistError(Exception):
|
class BlacklistError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class NotFound(Exception):
|
class NotFound(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Timeout(Exception):
|
class Timeout(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class InvalidVideoFile(Exception):
|
class InvalidVideoFile(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class MissingAttachment(Exception):
|
class MissingAttachment(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TooManyAttachments(Exception):
|
class TooManyAttachments(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class CheckFail(Exception):
|
class CheckFail(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Abort(Exception):
|
class Abort(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class Continue(Exception):
|
class Continue(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
108
src/main/run.py
108
src/main/run.py
|
|
@ -24,88 +24,90 @@ bot = commands.Bot(command_prefix=u.config['prefix'], description='Experimental
|
||||||
# Send and print ready message to #testing and console after logon
|
# Send and print ready message to #testing and console after logon
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_ready():
|
async def on_ready():
|
||||||
from cogs import booru, info, management, owner, tools
|
from cogs import booru, info, management, owner, tools
|
||||||
|
|
||||||
bot.add_cog(tools.Utils(bot))
|
bot.add_cog(tools.Utils(bot))
|
||||||
bot.add_cog(owner.Bot(bot))
|
bot.add_cog(owner.Bot(bot))
|
||||||
bot.add_cog(owner.Tools(bot))
|
bot.add_cog(owner.Tools(bot))
|
||||||
bot.add_cog(management.Administration(bot))
|
bot.add_cog(management.Administration(bot))
|
||||||
bot.add_cog(info.Info(bot))
|
bot.add_cog(info.Info(bot))
|
||||||
bot.add_cog(booru.MsG(bot))
|
bot.add_cog(booru.MsG(bot))
|
||||||
|
|
||||||
# bot.loop.create_task(u.clear(booru.temp_urls, 30*60))
|
# bot.loop.create_task(u.clear(booru.temp_urls, 30*60))
|
||||||
|
|
||||||
if u.config['playing'] is not 'None':
|
if u.config['playing'] is not 'None':
|
||||||
await bot.change_presence(game=d.Game(name=u.config['playing']))
|
await bot.change_presence(game=d.Game(name=u.config['playing']))
|
||||||
else:
|
else:
|
||||||
await bot.change_presence(game=None)
|
await bot.change_presence(game=None)
|
||||||
|
|
||||||
print('\n\\ \\ \\ \\ \\ \\ \\ \\ \\\nC O N N E C T E D : {}\n/ / / / / / / / /\n'.format(bot.user.name))
|
print('\n\\ \\ \\ \\ \\ \\ \\ \\ \\\nC O N N E C T E D : {}\n/ / / / / / / / /\n'.format(bot.user.name))
|
||||||
await bot.get_channel(u.config['info_channel']).send('**Started** ☀️ .')
|
await bot.get_channel(u.config['info_channel']).send('**Started** ☀️ .')
|
||||||
# u.notify('C O N N E C T E D')
|
# u.notify('C O N N E C T E D')
|
||||||
if u.temp:
|
if u.temp:
|
||||||
channel = bot.get_channel(u.temp['restart_ch'])
|
channel = bot.get_channel(u.temp['restart_ch'])
|
||||||
message = await channel.get_message(u.temp['restart_msg'])
|
message = await channel.get_message(u.temp['restart_msg'])
|
||||||
await message.add_reaction('✅')
|
await message.add_reaction('✅')
|
||||||
u.temp.clear()
|
u.temp.clear()
|
||||||
|
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_error(error, *args, **kwargs):
|
async def on_error(error, *args, **kwargs):
|
||||||
print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(error), file=sys.stderr)
|
print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(error), file=sys.stderr)
|
||||||
tb.print_exc()
|
tb.print_exc()
|
||||||
await bot.get_user(u.config['owner_id']).send('**ERROR** ⚠️ `{}`'.format(error))
|
await bot.get_user(u.config['owner_id']).send('**ERROR** ⚠ `{}`'.format(error))
|
||||||
await bot.get_channel(u.config['info_channel']).send('**ERROR** ⚠️ `{}`'.format(error))
|
await bot.get_channel(u.config['info_channel']).send('**ERROR** ⚠ `{}`'.format(error))
|
||||||
# u.notify('E R R O R')
|
# u.notify('E R R O R')
|
||||||
await bot.logout()
|
await bot.logout()
|
||||||
u.close(bot.loop)
|
u.close(bot.loop)
|
||||||
|
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_command_error(ctx, error):
|
async def on_command_error(ctx, error):
|
||||||
if isinstance(error, errext.CheckFailure):
|
if isinstance(error, errext.CheckFailure):
|
||||||
await ctx.send('⛔️ **Insufficient permissions.**', delete_after=10)
|
await ctx.send('⛔️ **Insufficient permissions.**', delete_after=10)
|
||||||
await ctx.message.add_reaction('⛔️')
|
await ctx.message.add_reaction('⛔️')
|
||||||
elif isinstance(error, errext.CommandNotFound):
|
elif isinstance(error, errext.CommandNotFound):
|
||||||
print('INVALID COMMAND : {}'.format(error), file=sys.stderr)
|
print('INVALID COMMAND : {}'.format(error), file=sys.stderr)
|
||||||
else:
|
await ctx.message.add_reaction('❌')
|
||||||
print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format(
|
else:
|
||||||
error), file=sys.stderr)
|
print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format(
|
||||||
tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
|
error), file=sys.stderr)
|
||||||
await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** ⚠️ `{}`'.format(error))
|
tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
|
||||||
await bot.get_channel(u.config['info_channel']).send('**COMMAND ERROR** ⚠️ `{}`'.format(error))
|
await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** ⚠ `{}`'.format(error))
|
||||||
await exc.send_error(ctx, error)
|
await bot.get_channel(u.config['info_channel']).send('**COMMAND ERROR** ⚠ `{}`'.format(error))
|
||||||
# u.notify('C O M M A N D E R R O R')
|
await exc.send_error(ctx, error)
|
||||||
|
await ctx.message.add_reaction('⚠')
|
||||||
|
# u.notify('C O M M A N D E R R O R')
|
||||||
|
|
||||||
|
|
||||||
async def on_reaction_add(r, u):
|
async def on_reaction_add(r, u):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
async def on_reaction_remove(r, u):
|
async def on_reaction_remove(r, u):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
async def reaction_add(r, u):
|
async def reaction_add(r, u):
|
||||||
bot.add_listener(on_reaction_add)
|
bot.add_listener(on_reaction_add)
|
||||||
print('Reacted')
|
print('Reacted')
|
||||||
bot.remove_listener(on_reaction_remove)
|
bot.remove_listener(on_reaction_remove)
|
||||||
|
|
||||||
|
|
||||||
async def reaction_remove(r, u):
|
async def reaction_remove(r, u):
|
||||||
bot.add_listener(on_reaction_remove)
|
bot.add_listener(on_reaction_remove)
|
||||||
print('Removed')
|
print('Removed')
|
||||||
bot.remove_listener(on_reaction_remove)
|
bot.remove_listener(on_reaction_remove)
|
||||||
|
|
||||||
|
|
||||||
@bot.command(name=',test', hidden=True)
|
@bot.command(name=',test', hidden=True)
|
||||||
@commands.is_owner()
|
@commands.is_owner()
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
async def test(ctx):
|
async def test(ctx):
|
||||||
test = await ctx.send('Test')
|
test = await ctx.send('Test')
|
||||||
raise Exception
|
raise Exception
|
||||||
# await test.add_reaction('✅')
|
# await test.add_reaction('✅')
|
||||||
# bot.add_listener(on_reaction_add)
|
# bot.add_listener(on_reaction_add)
|
||||||
# bot.add_listener(on_reaction_remove)
|
# bot.add_listener(on_reaction_remove)
|
||||||
|
|
||||||
bot.run(u.config['token'])
|
bot.run(u.config['token'])
|
||||||
|
|
|
||||||
|
|
@ -1,38 +1,38 @@
|
||||||
def tostring(i, *, random=False):
|
def tostring(i, *, random=False):
|
||||||
o = ''
|
o = ''
|
||||||
if i:
|
if i:
|
||||||
for v in i:
|
for v in i:
|
||||||
o += v + ' '
|
o += v + ' '
|
||||||
o = o[:-1]
|
o = o[:-1]
|
||||||
elif random is True:
|
elif random is True:
|
||||||
o += 'order:random'
|
o += 'order:random'
|
||||||
else:
|
else:
|
||||||
o = ' '
|
o = ' '
|
||||||
return o
|
return o
|
||||||
|
|
||||||
|
|
||||||
def tostring_commas(i):
|
def tostring_commas(i):
|
||||||
if i:
|
if i:
|
||||||
o = ','
|
o = ','
|
||||||
for v in i:
|
for v in i:
|
||||||
o += v + ','
|
o += v + ','
|
||||||
return o[:-1]
|
return o[:-1]
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
|
|
||||||
def dict_tostring(i):
|
def dict_tostring(i):
|
||||||
o = ''
|
o = ''
|
||||||
if i:
|
if i:
|
||||||
for k, v in i.items():
|
for k, v in i.items():
|
||||||
o += '**' + k + ':** `' + tostring(v) + '`\n'
|
o += '**' + k + ':** `' + tostring(v) + '`\n'
|
||||||
return o
|
return o
|
||||||
|
|
||||||
|
|
||||||
def dictelem_tostring(i):
|
def dictelem_tostring(i):
|
||||||
o = ''
|
o = ''
|
||||||
if i:
|
if i:
|
||||||
for dic, elem in i.items():
|
for dic, elem in i.items():
|
||||||
o += '**__' + dic + '__**\n'
|
o += '**__' + dic + '__**\n'
|
||||||
for k, v in elem.items():
|
for k, v in elem.items():
|
||||||
o += '***' + k + ':*** `' + tostring(v) + '`\n'
|
o += '***' + k + ':*** `' + tostring(v) + '`\n'
|
||||||
return o
|
return o
|
||||||
|
|
|
||||||
|
|
@ -8,26 +8,26 @@ from utils import utils as u
|
||||||
|
|
||||||
|
|
||||||
async def get_post(url):
|
async def get_post(url):
|
||||||
content = await u.fetch('http://iqdb.harry.lu', params={'url': url})
|
content = await u.fetch('http://iqdb.harry.lu', params={'url': url})
|
||||||
|
|
||||||
|
try:
|
||||||
|
value = BeautifulSoup(content, 'html.parser').find_all('a')[1].get('href')
|
||||||
|
if value != '#':
|
||||||
|
return value
|
||||||
|
else:
|
||||||
|
raise IndexError
|
||||||
|
except IndexError:
|
||||||
try:
|
try:
|
||||||
value = BeautifulSoup(content, 'html.parser').find_all('a')[1].get('href')
|
raise exc.MatchError(re.search('\/([^\/]+)$', url).group(1))
|
||||||
if value != '#':
|
|
||||||
return value
|
|
||||||
else:
|
|
||||||
raise IndexError
|
|
||||||
except IndexError:
|
|
||||||
try:
|
|
||||||
raise exc.MatchError(re.search('\/([^\/]+)$', url).group(1))
|
|
||||||
|
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
raise exc.MissingArgument
|
raise exc.MissingArgument
|
||||||
|
|
||||||
|
|
||||||
async def get_image(url):
|
async def get_image(url):
|
||||||
content = await u.fetch(url)
|
content = await u.fetch(url)
|
||||||
|
|
||||||
value = html.fromstring(content).xpath(
|
value = html.fromstring(content).xpath(
|
||||||
'string(/html/body/div[@id="content"]/div[@id="post-view"]/div[@class="content"]/div[2]/img/@src)')
|
'string(/html/body/div[@id="content"]/div[@id="post-view"]/div[@class="content"]/div[2]/img/@src)')
|
||||||
|
|
||||||
return value
|
return value
|
||||||
|
|
|
||||||
|
|
@ -18,46 +18,46 @@ print('\nPID : {}\n'.format(os.getpid()))
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open('config.json') as infile:
|
with open('config.json') as infile:
|
||||||
config = jsn.load(infile)
|
config = jsn.load(infile)
|
||||||
print('config.json loaded.')
|
print('config.json loaded.')
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
with open('config.json', 'w') as outfile:
|
with open('config.json', 'w') as outfile:
|
||||||
jsn.dump({'client_id': 0, 'info_channel': 0, 'owner_id': 0, 'permissions': 126016,
|
jsn.dump({'client_id': 0, 'info_channel': 0, 'owner_id': 0, 'permissions': 126016,
|
||||||
'playing': 'a game', 'prefix': ',', 'token': 'str'}, outfile, indent=4, sort_keys=True)
|
'playing': 'a game', 'prefix': ',', 'token': 'str'}, outfile, indent=4, sort_keys=True)
|
||||||
raise FileNotFoundError(
|
raise FileNotFoundError(
|
||||||
'Config file not found: config.json created with abstract values. Restart run.py with correct values.')
|
'Config file not found: config.json created with abstract values. Restart run.py with correct values.')
|
||||||
|
|
||||||
|
|
||||||
def setdefault(filename, default=None):
|
def setdefault(filename, default=None):
|
||||||
try:
|
try:
|
||||||
with open(filename, 'rb') as infile:
|
with open(filename, 'rb') as infile:
|
||||||
print('{} loaded.'.format(filename))
|
print('{} loaded.'.format(filename))
|
||||||
return pkl.load(infile)
|
return pkl.load(infile)
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
with open(filename, 'wb+') as iofile:
|
with open(filename, 'wb+') as iofile:
|
||||||
print('File not found: {} created and loaded with default values.'.format(filename))
|
print('File not found: {} created and loaded with default values.'.format(filename))
|
||||||
pkl.dump(default, iofile)
|
pkl.dump(default, iofile)
|
||||||
iofile.seek(0)
|
iofile.seek(0)
|
||||||
return pkl.load(iofile)
|
return pkl.load(iofile)
|
||||||
|
|
||||||
|
|
||||||
def load(filename, *, json=False):
|
def load(filename, *, json=False):
|
||||||
if not json:
|
if not json:
|
||||||
with open(filename, 'rb') as infile:
|
with open(filename, 'rb') as infile:
|
||||||
return pkl.load(infile)
|
return pkl.load(infile)
|
||||||
else:
|
else:
|
||||||
with open(filename) as infile:
|
with open(filename) as infile:
|
||||||
return jsn.load(infile)
|
return jsn.load(infile)
|
||||||
|
|
||||||
|
|
||||||
def dump(obj, filename, *, json=False):
|
def dump(obj, filename, *, json=False):
|
||||||
if not json:
|
if not json:
|
||||||
with open(filename, 'wb') as outfile:
|
with open(filename, 'wb') as outfile:
|
||||||
pkl.dump(obj, outfile)
|
pkl.dump(obj, outfile)
|
||||||
else:
|
else:
|
||||||
with open(filename, 'w') as outfile:
|
with open(filename, 'w') as outfile:
|
||||||
jsn.dump(obj, outfile, indent=4, sort_keys=True)
|
jsn.dump(obj, outfile, indent=4, sort_keys=True)
|
||||||
|
|
||||||
|
|
||||||
settings = setdefault('settings.pkl', {'del_ctx': []})
|
settings = setdefault('settings.pkl', {'del_ctx': []})
|
||||||
|
|
@ -85,78 +85,82 @@ session = aiohttp.ClientSession()
|
||||||
|
|
||||||
|
|
||||||
def close(loop):
|
def close(loop):
|
||||||
global session
|
global session
|
||||||
|
|
||||||
if session:
|
if session:
|
||||||
session.close()
|
session.close()
|
||||||
|
|
||||||
loop.stop()
|
loop.stop()
|
||||||
pending = asyncio.Task.all_tasks()
|
pending = asyncio.Task.all_tasks()
|
||||||
for task in pending:
|
for task in pending:
|
||||||
task.cancel()
|
task.cancel()
|
||||||
# with suppress(asyncio.CancelledError):
|
# with suppress(asyncio.CancelledError):
|
||||||
# loop.run_until_complete(task)
|
# loop.run_until_complete(task)
|
||||||
# loop.close()
|
# loop.close()
|
||||||
|
|
||||||
print('Finished cancelling tasks.')
|
print('Finished cancelling tasks.')
|
||||||
|
|
||||||
|
|
||||||
async def fetch(url, *, params={}, json=False):
|
async def fetch(url, *, params={}, json=False):
|
||||||
global session
|
global session
|
||||||
|
|
||||||
async with session.get(url, params=params, headers={'user-agent': 'Modumind/0.0.1 (Myned)'}) as r:
|
async with session.get(url, params=params, headers={'user-agent': 'Modumind/0.0.1 (Myned)'}) as r:
|
||||||
if json:
|
if json:
|
||||||
return await r.json()
|
return await r.json()
|
||||||
return await r.read()
|
return await r.read()
|
||||||
|
|
||||||
|
|
||||||
# def geneate_embed(**kwargs):
|
# def geneate_embed(**kwargs):
|
||||||
# embed = d.Embed(title=kwargs['title'], )
|
# embed = d.Embed(title=kwargs['title'], )
|
||||||
|
|
||||||
def get_args(ctx, args, *, rem=False, rm=False, lim=False):
|
def get_args(ctx, args, *, rem=False, rm=False, lim=False):
|
||||||
destination = ctx
|
destination = ctx
|
||||||
remaining = list(args[:])
|
remaining = list(args[:])
|
||||||
remove = False
|
remove = False
|
||||||
limit = 1
|
limit = lim
|
||||||
|
|
||||||
if '-d' in remaining or '-dm' in remaining:
|
if '-d' in remaining or '-dm' in remaining:
|
||||||
destination = ctx.author
|
destination = ctx.author
|
||||||
|
|
||||||
|
try:
|
||||||
|
remaining.remove('-d')
|
||||||
|
except ValueError:
|
||||||
|
remaining.remove('-dm')
|
||||||
|
|
||||||
|
if rm:
|
||||||
|
if ('-r' in remaining or '-rm' in remaining or '-remove' in remaining) and ctx.author.permissions_in(ctx.channel).manage_messages:
|
||||||
|
remove = True
|
||||||
|
print('remove')
|
||||||
|
|
||||||
|
try:
|
||||||
|
remaining.remove('-r')
|
||||||
|
except ValueError:
|
||||||
try:
|
try:
|
||||||
remaining.remove('-d')
|
remaining.remove('-rm')
|
||||||
except ValueError:
|
except ValueError:
|
||||||
remaining.remove('-dm')
|
remaining.remove('-remove')
|
||||||
|
|
||||||
|
if lim:
|
||||||
|
for arg in remaining:
|
||||||
|
if 1 <= len(arg) <= 2:
|
||||||
|
with suppress(ValueError):
|
||||||
|
if 1 <= int(arg) <= lim:
|
||||||
|
limit = int(arg)
|
||||||
|
remaining.remove(arg)
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
raise exc.BoundsError(arg)
|
||||||
|
|
||||||
|
if rem:
|
||||||
|
if rm and lim:
|
||||||
|
return destination, remaining, remove, limit
|
||||||
if rm:
|
if rm:
|
||||||
if ('-r' in remaining or '-rm' in remaining or '-remove' in remaining) and ctx.author.permissions_in(ctx.channel).manage_messages:
|
return destination, remaining, remove
|
||||||
remove = True
|
|
||||||
print('remove')
|
|
||||||
|
|
||||||
try:
|
|
||||||
remaining.remove('-r')
|
|
||||||
except ValueError:
|
|
||||||
try:
|
|
||||||
remaining.remove('-rm')
|
|
||||||
except ValueError:
|
|
||||||
remaining.remove('-remove')
|
|
||||||
|
|
||||||
if lim:
|
if lim:
|
||||||
for arg in remaining:
|
return destination, remaining, limit
|
||||||
if len(arg) == 1:
|
return destination, remaining
|
||||||
with suppress(ValueError):
|
if rm:
|
||||||
if int(arg) <= 3 and int(arg) >= 1:
|
return destination, remove
|
||||||
limit = int(arg)
|
if lim:
|
||||||
remaining.remove(arg)
|
return destination, limit
|
||||||
break
|
return destination
|
||||||
else:
|
|
||||||
raise exc.BoundsError(arg)
|
|
||||||
|
|
||||||
if rem:
|
|
||||||
if rm and lim:
|
|
||||||
return destination, remaining, remove, limit
|
|
||||||
if rm:
|
|
||||||
return destination, remaining, remove
|
|
||||||
if lim:
|
|
||||||
return destination, remaining, limit
|
|
||||||
return destination, remaining
|
|
||||||
return destination
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue