Update plugin.py

This commit is contained in:
Gordon Shumway 2020-02-03 22:21:55 -05:00 committed by GitHub
parent 2faeffc679
commit c2f3d575e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions

View File

@ -143,15 +143,6 @@ class ShrinkUrl(callbacks.PluginRegexp):
return return
if self.registryValue('shrinkSnarfer', channel, network): if self.registryValue('shrinkSnarfer', channel, network):
url = match.group(0) url = match.group(0)
if self.registryValue("fetchSpiffyTitle", channel):
spiffy = irc.getCallback("SpiffyTitles")
if spiffy:
try:
result = spiffy.get_title_by_url(url, channel)
if result:
irc.reply(result, prefixNick=False)
except:
log.exception("ShrinkUrl/SpiffyTitles: failed to get title for url %s", url)
r = self.registryValue('nonSnarfingRegexp', channel, network) r = self.registryValue('nonSnarfingRegexp', channel, network)
if r and r.search(url) is not None: if r and r.search(url) is not None:
self.log.debug('Matched nonSnarfingRegexp: %u', url) self.log.debug('Matched nonSnarfingRegexp: %u', url)
@ -182,6 +173,15 @@ class ShrinkUrl(callbacks.PluginRegexp):
m = irc.reply(s, prefixNick=False) m = irc.reply(s, prefixNick=False)
if m is not None: if m is not None:
m.tag('shrunken') m.tag('shrunken')
if self.registryValue("fetchSpiffyTitle", channel):
spiffy = irc.getCallback("SpiffyTitles")
if spiffy:
try:
result = spiffy.get_title_by_url(url, channel)
if result:
irc.reply(result, prefixNick=False)
except:
log.exception("ShrinkUrl/SpiffyTitles: failed to get title for url %s", url)
shrinkSnarfer = urlSnarfer(shrinkSnarfer) shrinkSnarfer = urlSnarfer(shrinkSnarfer)
shrinkSnarfer.__doc__ = utils.web._httpUrlRe shrinkSnarfer.__doc__ = utils.web._httpUrlRe