YCC module: dusting & anchors are correctly passed; fixes #59
This commit is contained in:
parent
d16f57f8d5
commit
1a3912cc4f
@ -23,11 +23,11 @@ LAST_URLS = dict()
|
||||
|
||||
def gen_response(res, msg, srv):
|
||||
if res is None:
|
||||
return Response(msg.sender, "La situation est embarassante, il semblerait que YCC soit down :(", msg.channel)
|
||||
raise IRCException("la situation est embarassante, il semblerait que YCC soit down :(")
|
||||
elif isinstance(res, str):
|
||||
return Response(msg.sender, "URL pour %s : %s" % (srv, res), msg.channel)
|
||||
else:
|
||||
return Response(msg.sender, "Mauvaise URL : %s" % srv, msg.channel)
|
||||
raise IRCException("mauvaise URL : %s" % srv)
|
||||
|
||||
def cmd_ycc(msg):
|
||||
if len(msg.cmds) == 1:
|
||||
@ -35,14 +35,16 @@ def cmd_ycc(msg):
|
||||
if msg.channel in LAST_URLS and len(LAST_URLS[msg.channel]) > 0:
|
||||
msg.cmds.append(LAST_URLS[msg.channel].pop())
|
||||
else:
|
||||
return Response(msg.sender, "Je n'ai pas d'autre URL à réduire.", msg.channel)
|
||||
raise IRCException("je n'ai pas d'autre URL à réduire.")
|
||||
|
||||
if len(msg.cmds) > 5:
|
||||
raise IRCException("je ne peux pas réduire autant d'URL d'un seul coup.")
|
||||
|
||||
if len(msg.cmds) < 6:
|
||||
res = list()
|
||||
for url in msg.cmds[1:]:
|
||||
o = urlparse(url, "http")
|
||||
if o.scheme != "":
|
||||
snd_url = "http://ycc.fr/redirection/create/" + quote(url, "/:%#@&=?")
|
||||
snd_url = "http://ycc.fr/redirection/create/" + quote(url, "/:%@&=?")
|
||||
print_debug(snd_url)
|
||||
raw = urlopen(snd_url, timeout=10)
|
||||
if o.netloc == "":
|
||||
@ -52,9 +54,6 @@ def cmd_ycc(msg):
|
||||
else:
|
||||
res.append(gen_response(False, msg, url))
|
||||
return res
|
||||
else:
|
||||
return Response(msg.sender, "je ne peux pas réduire autant d'URL "
|
||||
"d'un seul coup.", msg.channel, nick=msg.nick)
|
||||
|
||||
def parselisten(msg):
|
||||
global LAST_URLS
|
||||
@ -67,7 +66,7 @@ def parselisten(msg):
|
||||
continue
|
||||
if msg.channel not in LAST_URLS:
|
||||
LAST_URLS[msg.channel] = list()
|
||||
LAST_URLS[msg.channel].append(o.geturl())
|
||||
LAST_URLS[msg.channel].append(url)
|
||||
except:
|
||||
pass
|
||||
return False
|
||||
|
Loading…
Reference in New Issue
Block a user