Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

only show auto-title when response code is 200

Browse source
This commit is contained in:
jesopo 2019-09-20 15:56:14 +01:00
parent cf988c600d
commit 3d3b990ff6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/title.py
View file

@ -23,15 +23,15 @@ class Module(ModuleManager.BaseModule):
hostname = urllib.parse.urlparse(url).hostname hostname = urllib.parse.urlparse(url).hostname
if utils.http.is_localhost(hostname): if utils.http.is_localhost(hostname):
self.log.warn("tried to get title of localhost: %s", [url]) self.log.warn("tried to get title of localhost: %s", [url])
return None return -1, None
try: try:
page = utils.http.request(url, parse=True) page = utils.http.request(url, parse=True)
except utils.http.HTTPWrongContentTypeException: except utils.http.HTTPWrongContentTypeException:
return None return -1, None
except Exception as e: except Exception as e:
self.log.error("failed to get URL title: %s", [url], exc_info=True) self.log.error("failed to get URL title: %s", [url], exc_info=True)
return None return -1, None
if page.data.title: if page.data.title:
title = page.data.title.text.replace("\n", " ").replace( title = page.data.title.text.replace("\n", " ").replace(
"\r", "").replace(" ", " ").strip() "\r", "").replace(" ", " ").strip()
@ -39,10 +39,10 @@ class Module(ModuleManager.BaseModule):
if channel.get_setting("title-shorten", False): if channel.get_setting("title-shorten", False):
short_url = self.exports.get_one("shorturl")(server, url, short_url = self.exports.get_one("shorturl")(server, url,
context=channel) context=channel)
return "%s - %s" % (title, short_url) return page.code, "%s - %s" % (title, short_url)
return title return page.code, title
else: else:
return None return -1, None
@utils.hook("command.regex") @utils.hook("command.regex")
@utils.kwarg("ignore_action", False) @utils.kwarg("ignore_action", False)
@ -53,9 +53,9 @@ class Module(ModuleManager.BaseModule):
if event["target"].get_setting("auto-title", False): if event["target"].get_setting("auto-title", False):
event.eat() event.eat()
url = utils.http.url_sanitise(event["match"].group(0)) url = utils.http.url_sanitise(event["match"].group(0))
title = self._get_title(event["server"], event["target"], url) code, title = self._get_title(event["server"], event["target"], url)
if title: if code == 200 and title:
message = title message = title
if event["target"].get_setting("auto-title-first", False): if event["target"].get_setting("auto-title-first", False):
setting = "url-last-%s" % self._url_hash(url) setting = "url-last-%s" % self._url_hash(url)
@ -90,7 +90,7 @@ class Module(ModuleManager.BaseModule):
if not url: if not url:
raise utils.EventError("No URL provided/found.") raise utils.EventError("No URL provided/found.")
title = self._get_title(event["server"], event["target"], url) code, title = self._get_title(event["server"], event["target"], url)
if title: if title:
event["stdout"].write(title) event["stdout"].write(title)