From 2fdd629ccf3b7ebb469279ebaccc966561d9fcbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9munaire?= Date: Thu, 28 Jun 2012 19:39:00 +0200 Subject: [PATCH] =?UTF-8?q?YCC=20module:=20fix=20too=20many=20=C2=AB=20Bad?= =?UTF-8?q?=20URL=20=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ycc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/ycc.py b/modules/ycc.py index 45566c2..264c474 100644 --- a/modules/ycc.py +++ b/modules/ycc.py @@ -23,14 +23,15 @@ class Tinyfier(threading.Thread): def run(self): (status, page) = getPage("ycc.fr", "/redirection/create/" + self.url) - if status == http.client.OK: - srv = re.match(".*((ht|f)tps?://|www.)([^/]+).*", self.url) + if status == http.client.OK and len(page) < 100: + srv = re.match(".*((ht|f)tps?://|www.)([^/ ]+).*", self.url) if srv is None: self.msg.send_chn("Mauvaise URL : %s" % (self.url)) else: self.msg.send_chn("URL pour %s : %s" % (srv.group(3), page.decode())) else: print ("ERROR: ycc.fr seem down?") + self.msg.send_chn("La situation est embarassante, il semblerait que YCC soit down :(") def parseanswer(msg): global LAST_URLS @@ -48,7 +49,7 @@ def parseanswer(msg): t = Tinyfier(url, msg) t.start() else: - msg.send_chn("%s: je ne peux pas reduire autant d'URL d'un seul coup." % msg.sender) + msg.send_chn("%s: je ne peux pas réduire autant d'URL d'un seul coup." % msg.sender) return True else: return False