john/kwaylon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now matching in-line emojis with the leaderboard regex

Browse Source
This commit is contained in:
jsl12
2021-08-15 12:09:00 -05:00
parent 9d41c2bdf1
commit 0f7c722d2b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
robopage.py
View File

@@ -30,7 +30,7 @@ class RoboPage(discord.Client):
re.IGNORECASE & re.UNICODE, re.IGNORECASE & re.UNICODE,
) )
self.leaderboard_regex = re.compile( self.leaderboard_regex = re.compile(
'^most (?P<emoji>.+)(?=(?:.+)?leaderboard)(?:.+(?P<days>\d+) days)?', '^most (?P<emoji>\S+) (leaderboard|((?:.+?(?P<days>\d+) days)))',
re.IGNORECASE & re.UNICODE re.IGNORECASE & re.UNICODE
) )
@@ -60,10 +60,11 @@ class RoboPage(discord.Client):
if (m := self.leaderboard_regex.match(message.content)) is not None: if (m := self.leaderboard_regex.match(message.content)) is not None:
days = m.group('days') or 14 days = m.group('days') or 14
emoji = m.group('emoji').lower().strip()
try: try:
await message.reply( await message.reply(
await self.data.emoji_leaderboard(client=self, emoji_name=emoji, days=int(days)) await self.data.emoji_leaderboard(client=self,
emoji_name=get_emoji_name(m.group('emoji')),
days=int(days))
) )
except KeyError as e: except KeyError as e:
LOGGER.exception(e) LOGGER.exception(e)
@@ -72,10 +73,11 @@ class RoboPage(discord.Client):
elif (m := self.most_regex.match(message.content)) is not None: elif (m := self.most_regex.match(message.content)) is not None:
days = m.group('days') or 14 days = m.group('days') or 14
emoji = m.group('emoji').lower().strip()
try: try:
await message.reply( await message.reply(
await self.data.biggest_single(client=self, emoji=emoji, days=int(days))) await self.data.biggest_single(client=self,
emoji=get_emoji_name(m.group('emoji')),
days=int(days)))
except IndexError as e: except IndexError as e:
await message.reply('NObody') await message.reply('NObody')
return return
@@ -104,6 +106,11 @@ class RoboPage(discord.Client):
await self.data.update_reaction(msg=message) await self.data.update_reaction(msg=message)
def get_emoji_name(string: str) -> str:
if (m := re.search('<:(?P<name>\w+):(?P<id>\d+)>', string)):
string = m.group('name')
return string.lower().strip()
if __name__ == '__main__': if __name__ == '__main__':
load_dotenv() load_dotenv()
@@ -112,9 +119,7 @@ if __name__ == '__main__':
@client.event @client.event
async def on_ready(): async def on_ready():
# print(len(list(client.get_all_members())))
await client.handle_ready() await client.handle_ready()
# print('\n'.join(client.data.reactions.index.get_level_values(1).drop_duplicates().sort_values()))
@client.event @client.event
@@ -128,7 +133,7 @@ if __name__ == '__main__':
@client.event @client.event
async def on_raw_reaction_remove(payload: RawReactionClearEmojiEvent): async def on_raw_reaction_remove(payload: RawReactionActionEvent):
await client.handle_raw_reaction(payload) await client.handle_raw_reaction(payload)