mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-02-17 14:10:41 +01:00
Converted to use commands.
This commit is contained in:
parent
786d2f07fc
commit
1a6f9325dd
@ -47,10 +47,9 @@ import supybot.dbi as dbi
|
|||||||
import supybot.conf as conf
|
import supybot.conf as conf
|
||||||
import supybot.utils as utils
|
import supybot.utils as utils
|
||||||
import supybot.ircmsgs as ircmsgs
|
import supybot.ircmsgs as ircmsgs
|
||||||
|
from supybot.commands import wrap
|
||||||
import supybot.webutils as webutils
|
import supybot.webutils as webutils
|
||||||
import supybot.ircutils as ircutils
|
import supybot.ircutils as ircutils
|
||||||
import supybot.commands as commands
|
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.registry as registry
|
import supybot.registry as registry
|
||||||
import supybot.callbacks as callbacks
|
import supybot.callbacks as callbacks
|
||||||
|
|
||||||
@ -157,8 +156,10 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
|
|||||||
domain = webutils.getDomain(url)
|
domain = webutils.getDomain(url)
|
||||||
s = '%s (at %s)' % (ircutils.bold(tinyurl), domain)
|
s = '%s (at %s)' % (ircutils.bold(tinyurl), domain)
|
||||||
m = irc.reply(s, prefixName=False)
|
m = irc.reply(s, prefixName=False)
|
||||||
|
if m is None:
|
||||||
|
print irc, irc.__class__
|
||||||
m.tag('shrunken')
|
m.tag('shrunken')
|
||||||
tinyurlSnarfer = privmsgs.urlSnarfer(tinyurlSnarfer)
|
tinyurlSnarfer = wrap(tinyurlSnarfer, decorators=['urlSnarfer'])
|
||||||
|
|
||||||
_tinyRe = re.compile(r'<blockquote><b>(http://tinyurl\.com/\w+)</b>')
|
_tinyRe = re.compile(r'<blockquote><b>(http://tinyurl\.com/\w+)</b>')
|
||||||
def _getTinyUrl(self, url):
|
def _getTinyUrl(self, url):
|
||||||
@ -176,12 +177,11 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
|
|||||||
self.db.set(url, tinyurl)
|
self.db.set(url, tinyurl)
|
||||||
return tinyurl
|
return tinyurl
|
||||||
|
|
||||||
def tiny(self, irc, msg, args):
|
def tiny(self, irc, msg, args, url):
|
||||||
"""<url>
|
"""<url>
|
||||||
|
|
||||||
Returns a TinyURL.com version of <url>
|
Returns a TinyURL.com version of <url>
|
||||||
"""
|
"""
|
||||||
url = privmsgs.getArgs(args)
|
|
||||||
if len(url) < 20:
|
if len(url) < 20:
|
||||||
irc.error('Stop being a lazy-biotch and type the URL yourself.')
|
irc.error('Stop being a lazy-biotch and type the URL yourself.')
|
||||||
return
|
return
|
||||||
@ -192,7 +192,7 @@ class ShrinkUrl(callbacks.PrivmsgCommandAndRegexp):
|
|||||||
else:
|
else:
|
||||||
s = 'Could not parse the TinyURL.com results page.'
|
s = 'Could not parse the TinyURL.com results page.'
|
||||||
irc.errorPossibleBug(s)
|
irc.errorPossibleBug(s)
|
||||||
tiny = commands.wrap(tiny, decorators=['thread'])
|
tiny = wrap(tiny, ['url'], decorators=['thread'])
|
||||||
|
|
||||||
|
|
||||||
Class = ShrinkUrl
|
Class = ShrinkUrl
|
||||||
|
Loading…
x
Reference in New Issue
Block a user