diff --git a/MiaowuBot.py b/MiaowuBot.py index 02deb02..e87aaf1 100644 --- a/MiaowuBot.py +++ b/MiaowuBot.py @@ -3,6 +3,7 @@ import json from plugin import Plugin import redis +import re class MiaowuBot(Plugin): @@ -53,6 +54,7 @@ def command_received(self, command, content, messageInfo): trigger = add_message[0].strip() if len(trigger) < 2: return 'Trigger must > 2' + r = add_message[1].strip() print("add", trigger, r) return self.add_trigger(gnumber, trigger, r) @@ -86,8 +88,13 @@ def message_received(self, message): message_content = message['content'] replys = [] for key in self.get_trigger(gnumber): - if key in message_content: - replys.append(self.get_ramdom_reply(gnumber, key)) + reg_result = re.search(key, message_content) + if reg_result: + replace_string = self.get_ramdom_reply(gnumber, key) + reg_string = reg_result.group() + reply_string = re.sub(key, replace_string, reg_string) + replys.append(reply_string) + if len(replys) > 0: return random.choice(replys) return ''