From c60203b1266f3c0b555f0ad1cb8428f0be7fa60e Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 5 Nov 2017 14:05:40 +0000 Subject: [PATCH] Always respond with +1ee's name --- plusone.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/plusone.py b/plusone.py index 1729a6a..99263f6 100644 --- a/plusone.py +++ b/plusone.py @@ -68,24 +68,22 @@ class PlusOne(yaboli.Bot): self.register_trigger(self.PLUSONE_RE, self.trigger_plusone) async def trigger_plusone(self, message, match): + nick = None specific = re.match(self.MENTION_RE, match.group(3)) + if specific: nick = specific.group(3) - if similar(nick, message.sender.nick): - await self.room.send("Don't +1 yourself, that's... nasty.", message.mid) - else: - await self.db.add_point(nick) - await self.room.send(f"Point for @{mention(nick)} registered.", message.mid) elif message.parent: parent_message = await self.room.get_message(message.parent) - sender = parent_message.sender.nick - if similar(sender, message.sender.nick): - await self.room.send("Don't +1 yourself, that's... nasty.", message.mid) - else: - await self.db.add_point(sender) - await self.room.send("Point registered.", message.mid) - else: + nick = parent_message.sender.nick + + if nick is None: await self.room.send("You can't +1 nothing...", message.mid) + elif similar(nick, message.sender.nick): + await self.room.send("Don't +1 yourself, that's... nasty.", message.mid) + else: + await self.db.add_point(nick) + await self.room.send(f"Point for user {mention(nick)} registered.", message.mid) async def command_points(self, message, argstr): args = self.parse_args(argstr)