Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Catch a webutils.WebError, fix whitespace, and remove a urlquote

Browse Source
This commit is contained in:
James Vega 2004-10-04 18:15:06 +00:00
parent 6a1b9ccaeb
commit b4580384ee
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ShrinkUrl.py
View File

@ -139,11 +139,14 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
url = m.group(1) url = m.group(1)
if len(url) > self.registryValue('minimumLength', channel): if len(url) > self.registryValue('minimumLength', channel):
cmd = self.registryValue('default', channel) cmd = self.registryValue('default', channel)
try:
if cmd == 'ln': if cmd == 'ln':
(shortUrl, _) = self._getLnUrl(url) (shortUrl, _) = self._getLnUrl(url)
elif cmd == 'tiny': elif cmd == 'tiny':
shortUrl = self._getTinyUrl(url) shortUrl = self._getTinyUrl(url)
text = text.replace(url, shortUrl) text = text.replace(url, shortUrl)
except webutils.WebError:
pass
newMsg = ircmsgs.privmsg(channel, text, msg=msg) newMsg = ircmsgs.privmsg(channel, text, msg=msg)
newMsg.tag('shrunken') newMsg.tag('shrunken')
irc.queueMsg(newMsg) irc.queueMsg(newMsg)
@ -192,7 +195,6 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
try: try:
return self.db.getLn(url) return self.db.getLn(url)
except KeyError: except KeyError:
url = webutils.urlquote(url)
text = webutils.getUrl('http://ln-s.net/home/api.jsp?url=%s' % url) text = webutils.getUrl('http://ln-s.net/home/api.jsp?url=%s' % url)
(code, lnurl) = text.split(None, 1) (code, lnurl) = text.split(None, 1)
lnurl = lnurl.strip() lnurl = lnurl.strip()