X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=blobdiff_plain;f=plomlombot.py;h=9da116646679d15cb582a18e21ffb6026512361e;hb=e10a95326b89d24d6f598f3b7dced59150c2fceb;hp=4ec66463566a8205a6d89e7c9baa0a85569742d5;hpb=cb8bbcf5cd0f8a4835b6a78f4cb4b0a32a173710;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 4ec6646..9da1166 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -6,9 +6,11 @@ import datetime import select import time import re -import urllib.request -import http.client -import html +import requests +import bs4 +import random +import hashlib +import os # Defaults, may be overwritten by command line arguments. SERVER = "irc.freenode.net" @@ -67,7 +69,11 @@ 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 @@ -99,33 +105,54 @@ def lineparser_loop(io, nickname): def act_on_privmsg(tokens): + def notice(msg): + 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] - request = urllib.request.Request(url, headers={ - "User-Agent": "plomlombot" - }) try: - webpage = urllib.request.urlopen(request, timeout=15) - except (urllib.error.HTTPError, urllib.error.URLError, - UnicodeError, http.client.BadStatusLine) as error: - print("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 content_type not in ('text/html', 'text/xml', - 'application/xhtml+xml'): - print("TROUBLE INTERPRETING URL: bad content type " - + content_type) + r = requests.get(url, timeout=15) + except (requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectionError, + requests.exceptions.InvalidURL, + requests.exceptions.InvalidSchema) as error: + notice("TROUBLE FOLLOWING URL: " + str(error)) continue - content = webpage.read().decode(charset) - title = str(content).split('