diff --git a/src/main/cogs/booru.py b/src/main/cogs/booru.py index 2661b71..8ecf07a 100644 --- a/src/main/cogs/booru.py +++ b/src/main/cogs/booru.py @@ -875,17 +875,18 @@ class MsG: keys = list(posts.keys()) values = list(posts.values()) - c += 1 - embed.title = values[c - 1]['artist'] - embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1]) - embed.set_footer(text='{} / {}'.format(c, len(posts)), - icon_url=self._get_score(values[c - 1]['score'])) - embed.set_image(url=values[c - 1]['url']) + if c < len(keys): + c += 1 + embed.title = values[c - 1]['artist'] + embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1]) + embed.set_footer(text='{} / {}'.format(c, len(posts)), + icon_url=self._get_score(values[c - 1]['score'])) + 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: + await paginator.edit(content='**No more images found**') - except IndexError: - await paginator.edit(content='**No more images found**') except exc.NotFound: await paginator.edit(content='**No more images found**') @@ -1040,17 +1041,18 @@ class MsG: keys = list(posts.keys()) values = list(posts.values()) - c += 1 - embed.title = values[c - 1]['artist'] - embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1]) - embed.set_footer(text='{} / {}'.format(c, len(posts)), - icon_url=self._get_score(values[c - 1]['score'])) - embed.set_image(url=values[c - 1]['url']) + if c < len(keys): + c += 1 + embed.title = values[c - 1]['artist'] + embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1]) + embed.set_footer(text='{} / {}'.format(c, len(posts)), + icon_url=self._get_score(values[c - 1]['score'])) + 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: + await paginator.edit(content='**No more images found**') - except IndexError: - await paginator.edit(content='**No more images found**') except exc.NotFound: await paginator.edit(content='**No more images found**') diff --git a/src/main/run.py b/src/main/run.py index 8a68558..ccf191f 100644 --- a/src/main/run.py +++ b/src/main/run.py @@ -20,14 +20,19 @@ from utils import utils as u # log.basicConfig(level=log.INFO) +class HelpFormatter(commands.HelpFormatter): + async def format(): + pass + + def get_prefix(bot, message): if isinstance(message.guild, d.Guild) and message.guild.id in u.settings['prefixes']: return u.settings['prefixes'][message.guild.id] return u.config['prefix'] -bot = commands.Bot(command_prefix=get_prefix, formatter=commands.HelpFormatter( - show_check_failure=True), description='Experimental miscellaneous bot') +help_formatter = HelpFormatter(show_check_failure=True) +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