X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=2d2d885d9436b13f97223a5bc3c897634a09e36b;hp=b312eb261d6c79610acd15882a2737fb81f49aa4;hb=189aecc91ddb9d97f00d019c9385fd6ca3be81b0;hpb=c08b7611ac9227bd57c1d3eb974b043ab35645f3

diff --git a/plomlombot.py b/plomlombot.py
index b312eb2..2d2d885 100644
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -1,13 +1,15 @@
 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"
@@ -69,7 +71,7 @@ class IO:
             line)
         return line
 
-io = IO("irc.freenode.net", 6667)
+io = IO(servernet, port)
 io.send_line("NICK " + nickname)
 io.send_line("USER " + username + " 0 * : ")
 io.send_line("JOIN " + channel)
@@ -101,6 +103,10 @@ while 1:
             for i in range(len(matches)):
                 url = matches[i]
                 webpage = urllib.request.urlopen(url)
+                content_type = webpage.info().get_content_type()
+                if 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('<title>')[1].split('</title>')[0]