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

Merge branch 'dev'

Browse source
This commit is contained in:
Myned 2017-11-06 23:51:15 -05:00
commit 24d7b25bf4
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -875,6 +875,7 @@ class MsG:
keys = list(posts.keys()) keys = list(posts.keys())
values = list(posts.values()) values = list(posts.values())
if c < len(keys):
c += 1 c += 1
embed.title = values[c - 1]['artist'] embed.title = values[c - 1]['artist']
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1]) embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
@ -883,9 +884,9 @@ class MsG:
embed.set_image(url=values[c - 1]['url']) embed.set_image(url=values[c - 1]['url'])
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed) await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
else:
except IndexError:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
except exc.NotFound: except exc.NotFound:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
@ -1040,6 +1041,7 @@ class MsG:
keys = list(posts.keys()) keys = list(posts.keys())
values = list(posts.values()) values = list(posts.values())
if c < len(keys):
c += 1 c += 1
embed.title = values[c - 1]['artist'] embed.title = values[c - 1]['artist']
embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1]) embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1])
@ -1048,9 +1050,9 @@ class MsG:
embed.set_image(url=values[c - 1]['url']) embed.set_image(url=values[c - 1]['url'])
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed) await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
else:
except IndexError:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
except exc.NotFound: except exc.NotFound:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')

9
src/main/run.py
View file

@ -20,14 +20,19 @@ from utils import utils as u
# log.basicConfig(level=log.INFO) # log.basicConfig(level=log.INFO)
class HelpFormatter(commands.HelpFormatter):
async def format():
pass
def get_prefix(bot, message): def get_prefix(bot, message):
if isinstance(message.guild, d.Guild) and message.guild.id in u.settings['prefixes']: if isinstance(message.guild, d.Guild) and message.guild.id in u.settings['prefixes']:
return u.settings['prefixes'][message.guild.id] return u.settings['prefixes'][message.guild.id]
return u.config['prefix'] return u.config['prefix']
bot = commands.Bot(command_prefix=get_prefix, formatter=commands.HelpFormatter( help_formatter = HelpFormatter(show_check_failure=True)
show_check_failure=True), description='Experimental miscellaneous bot') bot = commands.Bot(command_prefix=get_prefix, formatter=help_formatter, description='Experimental miscellaneous bot')
# Send and print ready message to #testing and console after logon # Send and print ready message to #testing and console after logon