X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomlombot.py;h=e1ec06a4abf82f51a6a60a3a70c3673fe5bf53c5;hb=92520ed306f6e61d93b1c5b31cccb889002cdd7f;hp=9da116646679d15cb582a18e21ffb6026512361e;hpb=e10a95326b89d24d6f598f3b7dced59150c2fceb;p=plomlombot-irc.git
diff --git a/plomlombot.py b/plomlombot.py
index 9da1166..e1ec06a 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -109,9 +109,22 @@ def lineparser_loop(io, nickname):
io.send_line("NOTICE " + target + " :" + msg)
def url_check(msg):
- matches = re.findall("(https?://[^\s>]+)", msg)
- for i in range(len(matches)):
- url = matches[i]
+
+ def handle_url(url, show_url=False):
+
+ def mobile_twitter_hack(url):
+ re1 = 'https?://(mobile.twitter.com/)[^/]+(/status/)'
+ re2 = 'https?://mobile.twitter.com/([^/]+)/status/' \
+ + '([^\?/]+)'
+ m = re.search(re1, url)
+ if m and m.group(1) == 'mobile.twitter.com/' \
+ and m.group(2) == '/status/':
+ m = re.search(re2, url)
+ url = 'https://twitter.com/' + m.group(1) + '/status/' \
+ + m.group(2)
+ handle_url(url, True)
+ return True
+
try:
r = requests.get(url, timeout=15)
except (requests.exceptions.TooManyRedirects,
@@ -119,13 +132,22 @@ def lineparser_loop(io, nickname):
requests.exceptions.InvalidURL,
requests.exceptions.InvalidSchema) as error:
notice("TROUBLE FOLLOWING URL: " + str(error))
- continue
+ return
+ if mobile_twitter_hack(url):
+ return
title = bs4.BeautifulSoup(r.text).title
if title:
- notice("PAGE TITLE: " + title.string.strip())
+ prefix = "PAGE TITLE: "
+ if show_url:
+ prefix = "PAGE TITLE FOR <" + url + ">: "
+ notice(prefix + title.string.strip())
else:
notice("PAGE HAS NO TITLE TAG")
+ matches = re.findall("(https?://[^\s>]+)", msg)
+ for i in range(len(matches)):
+ handle_url(matches[i])
+
def command_check(msg):
if msg[0] != "!":
return
@@ -145,14 +167,26 @@ def lineparser_loop(io, nickname):
quotesfile.close()
notice("ADDED QUOTE #" + str(len(lines) - 1))
elif tokens[0] == "quote":
+ if len(tokens) > 2 or \
+ (len(tokens) == 2 and not tokens[1].isdigit()):
+ notice("SYNTAX: !quote [int]")
+ return
if not os.access(quotesfile_name, os.F_OK):
notice("NO QUOTES AVAILABLE")
return
quotesfile = open(quotesfile_name, "r")
lines = quotesfile.readlines()
quotesfile.close()
- i = random.randrange(len(lines) - 1) + 1
- notice("QUOTE #" + str(i) + ": " + lines[i])
+ lines = lines[1:]
+ if len(tokens) == 2:
+ i = int(tokens[1])
+ if i == 0 or i > len(lines):
+ notice("THERE'S NO QUOTE OF THAT INDEX")
+ return
+ i = i - 1
+ else:
+ i = random.randrange(len(lines))
+ notice("QUOTE #" + str(i + 1) + ": " + lines[i])
sender = ""
for rune in tokens[0]: