From bb4e8716dd82a6976defb52d2f3c02d4f0d246d8 Mon Sep 17 00:00:00 2001 From: Firepup Sixfifty Date: Mon, 20 Nov 2023 20:11:44 -0600 Subject: [PATCH] Simplification --- commands.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/commands.py b/commands.py index 5cf7137..af07e74 100644 --- a/commands.py +++ b/commands.py @@ -94,22 +94,21 @@ def goatOff(bot: bare.bot, chan: str, name: str, message: str) -> None: def quote(bot: bare.bot, chan: str, name: str, message: str) -> None: - qfilter = ".*" - query = "null" + qfilter = "" + query = "" if " " in message: query = message.split(" ", 1)[1] - qfilter = f".*{query}.*".replace(" ", "\s") + qfilter = query.replace(" ", "\s") r.seed() - mm = open("mastermessages.txt", "r") - quotes = mm.readlines() - q = list(filter(lambda x: re.match(qfilter, x), quotes)) - if q == []: - q = [f'No results for "{query}" '] - sel = conf.decode_escapes( - str(r.sample(q, 1)).strip("[]'").replace("\\n", "").strip('"') - ) - bot.msg(sel, chan) - mm.close() + with open("mastermessages.txt", "r") as mm: + quotes = mm.readlines() + q = list(filter(lambda x: re.search(qfilter, x), quotes)) + if q == []: + q = [f'No results for "{query}" '] + sel = conf.decode_escapes( + str(r.sample(q, 1)).strip("[]'").replace("\\n", "").strip('"') + ) + bot.msg(sel, chan) def join(bot: bare.bot, chan: str, name: str, message: str) -> None: