From 924fad4320cc913e5b48da6d5fe21e811192b71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Sat, 10 Jun 2017 11:22:54 +0200 Subject: [PATCH] Use ',' rather than 'and' in .select() queries This closes #11 --- logbot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logbot.py b/logbot.py index 0c1fcc5..781e389 100755 --- a/logbot.py +++ b/logbot.py @@ -115,13 +115,13 @@ def search(channel = None, nickname = None): try: channel = Channel.get(Channel.name == channel) messages = LogMessage.select() \ - .where(LogMessage.channel == channel and \ + .where(LogMessage.channel == channel, \ LogMessage.message.contains(query)) except: pass # No such channel elif nickname: messages = LogMessage.select() \ - .where(LogMessage.nickname == nickname and \ + .where(LogMessage.nickname == nickname, \ LogMessage.message.contains(query)) else: messages = LogMessage.select() \ @@ -135,13 +135,13 @@ def search(channel = None, nickname = None): @flaskapp.route("/channels//") @flaskapp.route("/channels///") -def channel(channel, day = None, query = None): +def channel(channel, day = None): channel = Channel.get(Channel.name == channel) if day: d = Day.get(Day.date == day) messages = LogMessage.select() \ - .where(LogMessage.day == d and \ + .where(LogMessage.day == d, \ LogMessage.channel == channel) return render_template("messages.html",