X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=blobdiff_plain;f=plomlombot.py;h=7fa9194af8236e27fd7d547843fc1a1e3577dc8b;hb=19b5218056b02ed8454cdc095560856bdf48b8b9;hp=7d915dc2f80c79157119089aa2e0dd6e9566d16a;hpb=d074cd51f4378884e977b26490af1c6d1dcc81c8;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 7d915dc..7fa9194 100644 --- a/plomlombot.py +++ b/plomlombot.py @@ -9,10 +9,10 @@ import html servernet = "irc.freenode.net" port = 6667 servername = "" -timeout = 480 +timeout = 240 username = "plomlombot" nickname = username -channel = "#zrolaps" +channel = "#zrolaps-test" class IO: @@ -104,10 +104,10 @@ while 1: url = matches[i] webpage = urllib.request.urlopen(url) content_type = webpage.info().get_content_type() - if not content_type in ('text/html', 'text/xml', + charset = webpage.info().get_content_charset() + if not charset or not content_type in ('text/html', 'text/xml', 'application/xhtml+xml'): continue - charset = webpage.info().get_content_charset() content = webpage.read().decode(charset) title = str(content).split('