X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;f=plomlombot.py;h=3e4734fa2ec2403aa093768623e1ca9b189d5cd8;hb=d66da409aaafb766eae1e0af1a9c16ae8520510c;hp=9a8a85329ffafb3c34642fa75def9b55f57422ac;hpb=b9a1f66a57f6225f8d50c63c7827e279d598bcc7;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 9a8a853..3e4734f 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -6,8 +6,8 @@ import datetime import select import time import re -import urllib.request -import html +import requests +import bs4 # Defaults, may be overwritten by command line arguments. SERVER = "irc.freenode.net" @@ -16,9 +16,11 @@ TIMEOUT = 240 USERNAME = "plomlombot" NICKNAME = USERNAME + class ExceptionForRestart(Exception): pass + class IO: def __init__(self, server, port, timeout): @@ -44,7 +46,7 @@ class IO: if len(msg.encode("utf-8")) > 510: print("NOT SENT LINE TO SERVER (too long): " + msg) print("LINE TO SERVER: " - + str(datetime.datetime.now()) + ": " + msg) + + str(datetime.datetime.now()) + ": " + msg) msg = msg + "\r\n" msg_len = len(msg) total_sent_len = 0 @@ -64,11 +66,15 @@ class IO: self._pingtest(send_ping) return None self.last_pong = time.time() - received_runes = self.socket.recv(1024).decode("UTF-8") + received_bytes = self.socket.recv(1024) + try: + received_runes = received_bytes.decode("UTF-8") + except UnicodeDecodeError: + received_runes = received_bytes.decode("latin1") if len(received_runes) == 0: print("SOCKET CONNECTION BROKEN") raise ExceptionForRestart - self.rune_buffer += received_runes + self.rune_buffer += received_runes lines_split = str.split(self.rune_buffer, "\r\n") self.line_buffer += lines_split[:-1] self.rune_buffer = lines_split[-1] @@ -79,9 +85,10 @@ class IO: line = self._recv_line_wrapped(send_ping) if line: print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " + - line) + line) return line + def init_session(server, port, timeout, nickname, username, channel): print("CONNECTING TO " + server) io = IO(server, port, timeout) @@ -90,33 +97,31 @@ def init_session(server, port, timeout, nickname, username, channel): io.send_line("JOIN " + channel) return io + def lineparser_loop(io, nickname): def act_on_privmsg(tokens): def url_check(msg): - matches = re.findall("(https?://[^\s]+)", msg) + + def notice(msg): + io.send_line("NOTICE " + target + " :" + msg) + + matches = re.findall("(https?://[^\s>]+)", msg) for i in range(len(matches)): url = matches[i] try: - webpage = urllib.request.urlopen(url, timeout=15) - except urllib.error.HTTPError as error: - print("TROUBLE FOLLOWING URL: " + str(error)) + r = requests.get(url, timeout=15) + except (requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectionError, + requests.exceptions.InvalidSchema) as error: + notice("TROUBLE FOLLOWING URL: " + str(error)) continue - charset = webpage.info().get_content_charset() - if not charset: - charset="utf-8" - content_type = webpage.info().get_content_type() - if not content_type in ('text/html', 'text/xml', - 'application/xhtml+xml'): - print("TROUBLE INTERPRETING URL: bad content type " - + content_type) - continue - content = webpage.read().decode(charset) - title = str(content).split('