X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=blobdiff_plain;f=plomlombot.py;h=31ea88f90e56a34397f9379369d22cb2dede5b45;hb=39a97788307a22f4b398451df11b536dbcdc744b;hp=b312eb261d6c79610acd15882a2737fb81f49aa4;hpb=c08b7611ac9227bd57c1d3eb974b043ab35645f3;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index b312eb2..31ea88f 100644 --- a/plomlombot.py +++ b/plomlombot.py @@ -1,17 +1,22 @@ import socket -import datetime +import datetime import select import time import re import urllib.request import html +servernet = "irc.freenode.net" +port = 6667 servername = "" -timeout = 480 +timeout = 240 username = "plomlombot" nickname = username channel = "#zrolaps" +class ExceptionForRestart(Exception): + pass + class IO: def __init__(self, server, port): @@ -24,7 +29,8 @@ class IO: def _pingtest(self): if self.last_pong + timeout < time.time(): - raise RuntimeError("server not answering") + print("SERVER NOT ANSWERING TO PING") + raise ExceptionForRestart self.send_line("PING " + nickname + " " + servername) def send_line(self, msg): @@ -40,7 +46,8 @@ class IO: while total_sent_len < msg_len: sent_len = self.socket.send(bytes(msg[total_sent_len:], "UTF-8")) if sent_len == 0: - raise RuntimeError("socket connection broken") + print("SOCKET CONNECTION BROKEN") + raise ExceptionForRestart total_sent_len += sent_len def recv_line_wrapped(self): @@ -54,7 +61,8 @@ class IO: self.last_pong = time.time() received_runes = self.socket.recv(1024).decode("UTF-8") if len(received_runes) == 0: - raise RuntimeError("socket connection broken") + print("SOCKET CONNECTION BROKEN") + raise ExceptionForRestart self.rune_buffer += received_runes lines_split = str.split(self.rune_buffer, "\r\n") self.line_buffer += lines_split[:-1] @@ -69,43 +77,76 @@ class IO: line) return line -io = IO("irc.freenode.net", 6667) -io.send_line("NICK " + nickname) -io.send_line("USER " + username + " 0 * : ") -io.send_line("JOIN " + channel) -servername = io.recv_line().split(" ")[0][1:] -while 1: - line = io.recv_line() - if not line: - continue - tokens = line.split(" ") - if len(tokens) > 1: - if tokens[1] == "PRIVMSG": - sender = "" - for rune in tokens[0]: - if rune == "!": - break - if rune != ":": - sender += rune - receiver = "" - for rune in tokens[2]: - if rune == "!": - break - if rune != ":": - receiver += rune - target = sender - if receiver != nickname: - target = receiver - msg = str.join(" ", tokens[3:])[1:] +def init_connection(): + print("CONNECTING TO " + servernet) + io = IO(servernet, port) + io.send_line("NICK " + nickname) + io.send_line("USER " + username + " 0 * : ") + io.send_line("JOIN " + channel) + servername = io.recv_line().split(" ")[0][1:] + return io + +def lineparser_loop(): + + def act_on_privmsg(tokens): + + def url_check(msg): matches = re.findall("(https?://[^\s]+)", msg) for i in range(len(matches)): url = matches[i] - webpage = urllib.request.urlopen(url) + try: + webpage = urllib.request.urlopen(url, timeout=15) + except urllib.error.HTTPError 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 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('