mirror of
https://github.com/myned/modufur.git
synced 2024-12-25 06:37:29 +00:00
Merge branch 'dev'
This commit is contained in:
commit
24d7b25bf4
2 changed files with 27 additions and 20 deletions
|
@ -875,17 +875,18 @@ class MsG:
|
||||||
keys = list(posts.keys())
|
keys = list(posts.keys())
|
||||||
values = list(posts.values())
|
values = list(posts.values())
|
||||||
|
|
||||||
c += 1
|
if c < len(keys):
|
||||||
embed.title = values[c - 1]['artist']
|
c += 1
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
embed.title = values[c - 1]['artist']
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
icon_url=self._get_score(values[c - 1]['score']))
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
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:
|
except exc.NotFound:
|
||||||
await paginator.edit(content='**No more images found**')
|
await paginator.edit(content='**No more images found**')
|
||||||
|
|
||||||
|
@ -1040,17 +1041,18 @@ class MsG:
|
||||||
keys = list(posts.keys())
|
keys = list(posts.keys())
|
||||||
values = list(posts.values())
|
values = list(posts.values())
|
||||||
|
|
||||||
c += 1
|
if c < len(keys):
|
||||||
embed.title = values[c - 1]['artist']
|
c += 1
|
||||||
embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1])
|
embed.title = values[c - 1]['artist']
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
embed.url = 'https://e926.net/post/show/{}'.format(keys[c - 1])
|
||||||
icon_url=self._get_score(values[c - 1]['score']))
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
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:
|
except exc.NotFound:
|
||||||
await paginator.edit(content='**No more images found**')
|
await paginator.edit(content='**No more images found**')
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue