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

restructured handle_message and added GifJokes

Browse Source
This commit is contained in:
jsl12
2021-08-13 22:33:40 -05:00
parent 0b8ecb00b2
commit 972b5afab5
2 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
robopage.py
View File

@@ -22,7 +22,7 @@ class RoboPage(discord.Client):
def __init__(self, *args, **kwargs):
super(RoboPage, self).__init__(*args, **kwargs)
attrs = filter(lambda n: n.endswith('Joke') and not n.startswith('Joke'), dir(jokes))
attrs = filter(lambda n: n.endswith('Joke') and n not in ['Joke', 'GifJoke'], dir(jokes))
attrs = map(lambda n: getattr(jokes, n)(), attrs)
self.jokes = list(attrs)
self.most_regex = re.compile(
@@ -56,43 +56,39 @@ class RoboPage(discord.Client):
# await alive()
async def handle_message(self, message):
if hasattr(self, 'data'):
await self.data.add_msg(message)
if message.author != self.user:
if hasattr(self, 'data'):
await self.data.add_msg(message)
async with self.data.lock:
if message.author != self.user:
if (m := self.leaderboard_regex.match(message.content)) is not None:
try:
await message.reply(await self.data.emoji_leaderboard(
if (m := self.leaderboard_regex.match(message.content)) is not None:
try:
await message.reply(await self.data.emoji_leaderboard(
client=self,
emoji_name=m.group('emoji').lower(),
days=14
))
except KeyError as e:
LOGGER.exception(e)
await message.reply(f"I couldn't find any {m.group('emoji')} reactions. Leave me alone!")
return
elif (m := self.most_regex.match(message.content)) is not None:
days = m.group('days') or 14
try:
await message.reply(
await self.data.biggest_single(
client=self,
emoji_name=m.group('emoji').lower(),
days=14
emoji=m.group('emoji').lower(),
days=int(days)
))
except KeyError as e:
LOGGER.exception(e)
await message.reply(f"I couldn't find any {m.group('emoji')} reactions. Leave me alone!")
except IndexError as e:
await message.reply('NObody')
return
elif (m := self.most_regex.match(message.content)) is not None:
days = m.group('days') or 14
try:
await message.reply(
await self.data.biggest_single(client=self, emoji=m.group('emoji').lower(), days=int(days))
)
except IndexError as e:
await message.reply('NObody')
elif 'not like this' in message.content.lower():
await message.reply(self.gifs['not like this'])
elif 'beans' in message.content.lower():
await message.reply('Somebody help! I\'ve got beans in my motherboard!\n')
await message.channel.send(self.gifs['beans'])
else:
for joke in self.jokes:
if (scan_res := joke.scan(message)):
print(f'{joke.__class__.__name__} detected:\n{message.content}\n{scan_res}')
await joke.respond(message, self, scan_res)
for joke in self.jokes:
if (scan_res := joke.scan(message)):
LOGGER.info(f'{joke.__class__.__name__} detected: {message.content}, {scan_res.group()}')
await joke.respond(message, self, scan_res)
if __name__ == '__main__':
@@ -116,13 +112,15 @@ if __name__ == '__main__':
@client.event
async def on_raw_reaction_add(payload):
LOGGER.info(payload)
await client.data.update_reaction(payload=payload, client=client)
if hasattr(client, 'data'):
await client.data.update_reaction(payload=payload, client=client)
@client.event
async def on_raw_reaction_remove(payload):
LOGGER.info(payload)
await client.data.update_reaction(payload=payload, client=client)
if hasattr(client, 'data'):
await client.data.update_reaction(payload=payload, client=client)
client.run()