myned/modufur
1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-11-01 13:02:38 +00:00
Code Issues Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Myned 2017-10-14 15:30:03 -04:00
commit c780f40866
5 changed files with 100 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/main/cogs/booru.py
View file

@ -21,9 +21,10 @@ class MsG:
self.bot = bot
self.LIMIT = 100
self.favorites = u.setdefault('cogs/favorites.pkl', {})
self.blacklists = u.setdefault(
'./cogs/blacklists.pkl', {'global_blacklist': set(), 'guild_blacklist': {}, 'user_blacklist': {}})
self.aliases = u.setdefault('./cogs/aliases.pkl', {})
'cogs/blacklists.pkl', {'global_blacklist': set(), 'guild_blacklist': {}, 'user_blacklist': {}})
self.aliases = u.setdefault('cogs/aliases.pkl', {})
# Tag search
@commands.command(aliases=['tag', 't'], brief='e621 Tag search', description='e621 | NSFW\nReturn a link search for given tags')
@ -87,8 +88,10 @@ class MsG:
try:
if int(msg.content) <= len(pools) and int(msg.content) > 0 and msg.author is user and msg.channel is channel:
return True
except ValueError:
pass
else:
return False
@ -234,12 +237,14 @@ class MsG:
except exc.Abort:
try:
await paginator.edit(content='🚫 **Exited paginator.**')
except UnboundLocalError:
await ctx.send('🚫 **Exited paginator.**')
except asyncio.TimeoutError:
try:
await ctx.send(content='❌ **Paginator timed out.**')
except UnboundLocalError:
await ctx.send('❌ **Paginator timed out.**')
@ -289,6 +294,7 @@ class MsG:
raise exc.NotFound(formatter.tostring(tags))
if len(request) < limit:
limit = len(request)
for post in request:
if 'swf' in post['file_ext'] or 'webm' in post['file_ext']:
continue
@ -303,6 +309,7 @@ class MsG:
if len(posts) == limit:
break
c += 1
return posts
@commands.command(name='e621p', aliases=['e6p', '6p'])
@ -550,6 +557,57 @@ class MsG:
except exc.Timeout:
await ctx.send('❌ **Request timed out.**')
@commands.group(name='favorites', aliases=['faves', 'f'])
@checks.del_ctx()
async def favorites(self, ctx):
pass
@favorites.error
async def favorites_error(self, ctx, error):
pass
@favorites.command(name='get', aliases=['g'])
async def _get_favorites(self, ctx):
user = ctx.message.author
await ctx.send('⭐ {}**\'s favorites:**\n```\n{}```'.format(user.mention, formatter.tostring(self.favorites.get(user.id, set()))))
@favorites.command(name='add', aliases=['a'])
async def _add_favorites(self, ctx, *tags):
user = ctx.message.author
self.favorites.setdefault(user.id, set()).update(tags)
u.dump(self.favorites, 'cogs/favorites.pkl')
await ctx.send('✅ {} **added:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)))
@favorites.command(name='remove', aliases=['r'])
async def _remove_favorites(self, ctx, *tags):
user = ctx.message.author
try:
for tag in tags:
try:
self.favorites[user.id].remove(tag)
except KeyError:
raise exc.TagError(tag)
u.dump(self.favorites, 'cogs/favorites.pkl')
await ctx.send('✅ {} **removed:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5)
except exc.TagError as e:
await ctx.send('❌ `{}` **not in favorites.**'.format(e), delete_after=10)
@favorites.command(name='clear', aliases=['c'])
async def _clear_favorites(self, ctx):
user = ctx.message.author
del self.favorites[user.id]
await ctx.send('✅ {}**\'s favorites cleared.**'.format(user.mention))
# Umbrella command structure to manage global, channel, and user blacklists
@commands.group(aliases=['bl', 'b'], brief='Manage blacklists', description='Blacklist base command for managing blacklists\n\n`bl get [blacklist]` to show a blacklist\n`bl set [blacklist] [tags]` to replace a blacklist\n`bl clear [blacklist]` to clear a blacklist\n`bl add [blacklist] [tags]` to add tags to a blacklist\n`bl remove [blacklist] [tags]` to remove tags from a blacklist', usage='[flag] [blacklist] ([tags])')
@checks.del_ctx()
@ -627,8 +685,8 @@ class MsG:
if alias_request:
for dic in alias_request:
self.aliases.setdefault(tag, set()).add(dic['name'])
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.aliases, './cogs/aliases.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
u.dump(self.aliases, 'cogs/aliases.pkl')
await ctx.send('✅ **Added to global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5)
@ -646,8 +704,8 @@ class MsG:
if alias_request:
for dic in alias_request:
self.aliases.setdefault(tag, set()).add(dic['name'])
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.aliases, './cogs/aliases.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
u.dump(self.aliases, 'cogs/aliases.pkl')
await ctx.send('✅ **Added to** {} **blacklist:**\n```\n{}```'.format(channel.mention, formatter.tostring(tags)), delete_after=5)
@ -661,8 +719,8 @@ class MsG:
if alias_request:
for dic in alias_request:
self.aliases.setdefault(tag, set()).add(dic['name'])
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.aliases, './cogs/aliases.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
u.dump(self.aliases, 'cogs/aliases.pkl')
await ctx.send('✅ {} **added:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5)
@ -681,9 +739,10 @@ class MsG:
except KeyError:
raise exc.TagError(tag)
u.dump(self.blacklists, './cogs/blacklists.pkl')
await ctx.send('✅ **Removed from global blacklist:**\n```\n' + formatter.tostring(tags) + '```', delete_after=5)
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ **Removed from global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5)
except exc.TagError as e:
await ctx.send('❌ `{}` **not in blacklist.**'.format(e), delete_after=10)
@ -702,9 +761,10 @@ class MsG:
except KeyError:
raise exc.TagError(tag)
u.dump(self.blacklists, './cogs/blacklists.pkl')
await ctx.send('✅ **Removed from** ' + channel.mention + ' **blacklist:**\n```\n' + formatter.tostring(tags) + '```', delete_after=5)
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ **Removed from** {} **blacklist:**\n```\n{}```'.format(channel.mention, formatter.tostring(tags), delete_after=5))
except exc.TagError as e:
await ctx.send('❌ `{}` **not in blacklist.**'.format(e), delete_after=10)
@ -720,7 +780,8 @@ class MsG:
except KeyError:
raise exc.TagError(tag)
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ {} **removed:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5)
@ -736,7 +797,7 @@ class MsG:
@commands.is_owner()
async def __clear_global_blacklist(self, ctx):
del self.blacklists['global_blacklist']
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ **Global blacklist cleared.**', delete_after=5)
@ -748,7 +809,7 @@ class MsG:
channel = ctx.message.channel
del self.blacklists['guild_blacklist'][str(guild.id)][channel.id]
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ {} **blacklist cleared.**'.format(channel.mention), delete_after=5)
@ -757,6 +818,6 @@ class MsG:
user = ctx.message.author
del self.blacklists['user_blacklist'][user.id]
u.dump(self.blacklists, './cogs/blacklists.pkl')
u.dump(self.blacklists, 'cogs/blacklists.pkl')
await ctx.send('✅ {}**\'s blacklist cleared.**'.format(user.mention), delete_after=5)

9
src/main/cogs/management.py
View file

@ -2,6 +2,7 @@ import asyncio
import traceback as tb
import discord as d
from discord import errors as err
from discord.ext import commands
from misc import exceptions as exc
@ -80,7 +81,7 @@ class Administration:
for channel in channels:
try:
ref = await channel.get_message(reference)
except d.errors.NotFound:
except err.NotFound:
continue
history = []
try:
@ -135,7 +136,7 @@ class Administration:
try:
if not message.pinned:
await message.delete()
except d.errors.NotFound:
except err.NotFound:
pass
async def on_message(self, channel):
@ -153,7 +154,7 @@ class Administration:
await self.queue.put(message)
except exc.Abort:
u.tasks['management']['auto_delete'].remove(channel.id)
u.dump(u.tasks, './cogs/tasks.pkl')
u.dump(u.tasks, 'cogs/tasks.pkl')
print('Stopped looping {}'.format(channel.id))
await channel.send('✅ **Stopped deleting messages in** {}**.**'.format(channel.mention), delete_after=5)
except AttributeError:
@ -168,7 +169,7 @@ class Administration:
try:
if channel.id not in u.tasks.setdefault('management', {}).setdefault('auto_delete', []):
u.tasks['management']['auto_delete'].append(channel.id)
u.dump(u.tasks, './cogs/tasks.pkl')
u.dump(u.tasks, 'cogs/tasks.pkl')
self.bot.loop.create_task(self.on_message(channel))
self.bot.loop.create_task(self.delete())
print('Looping #{}'.format(channel.name))

8
src/main/cogs/owner.py
View file

@ -32,11 +32,12 @@ class Bot:
# loop = self.bot.loop.all_tasks()
# for task in loop:
# task.cancel()
await u.session.close()
if u.session:
await u.session.close()
await self.bot.logout()
await self.bot.close()
print('- - - - - - -')
print('CLOSED')
print('DISCONNECTED')
@commands.command(name=',restart', aliases=[',res', ',r'], hidden=True)
@commands.is_owner()
@ -49,7 +50,8 @@ class Bot:
# loop = self.bot.loop.all_tasks()
# for task in loop:
# task.cancel()
await u.session.close()
if u.session:
await u.session.close()
await self.bot.logout()
await self.bot.close()
os.execl(sys.executable, 'python3', 'run.py')

13
src/main/run.py
View file

@ -43,10 +43,21 @@ async def on_ready():
print('- - - - - - -')
@bot.event
async def on_error(error):
if u.session:
await u.session.close()
await bot.logout()
await bot.close()
print('- - - - - - -')
print('ERROR')
tb.print_exc()
@bot.event
async def on_command_error(ctx, error):
if not isinstance(error, commands.errors.CommandNotFound):
print(error)
tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
await ctx.send('{}\n```\n{}```'.format(exc.base, error))

2
src/main/utils/utils.py
View file

@ -42,7 +42,7 @@ def dump(obj, filename):
pkl.dump(obj, outfile)
tasks = setdefault('./cogs/tasks.pkl', {})
tasks = setdefault('cogs/tasks.pkl', {})
async def clear(obj, interval=10 * 60, replace=None):