From 160785e92c8fa02ac663edd99eba3e0a83248b49 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Sat, 15 Feb 2014 14:19:12 +1300 Subject: [PATCH] pep --- plugins/googleurlparse.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/googleurlparse.py b/plugins/googleurlparse.py index 099fa4e..cbea897 100644 --- a/plugins/googleurlparse.py +++ b/plugins/googleurlparse.py @@ -2,15 +2,21 @@ from util import hook from urllib import unquote @hook.command(autohelp=False) -def googleurl(inp, db=None, input=None): - """googleurl [nickname] - Converts Google urls (google.com/url) to normal urls where possible, in the specified nickname's last message. If nickname isn't provided, action will be performed on user's last message""" +def googleurl(inp, db=None, nick=None): + """googleurl [nickname] - Converts Google urls (google.com/url) to normal urls + where possible, in the specified nickname's last message. If nickname isn't provided, + action will be performed on user's last message""" if not inp: - inp = input.nick + inp = nick last_message = db.execute("select name, quote from seen_user where name" " like ? and chan = ?", (inp.lower(), input.chan.lower())).fetchone() if last_message: msg = last_message[1] - out = ", ".join([(unquote(a[4:]) if a[:4] == "url=" else "") for a in msg.split("&")]).replace(", ,", "").strip() + out = ", ".join([(unquote(a[4:]) if a[:4] == "url=" else "") for a in msg.split("&")])\ + .replace(", ,", "").strip() return out if out else "No matches in your last message." else: - return "You haven't said anything in this channel yet!" if inp == input.nick else "That user hasn't said anything in this channel yet!" + if inp == nick: + return "You haven't said anything in this channel yet!" + else: + return "That user hasn't said anything in this channel yet!"