X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=e4a5be35aabd091204209eff379a542f206c7e4e;hp=179bc2a2221d90da84580f57898aa3b704fca0f5;hb=61a573d1cb2165c5aa7a00b999b9b5bda81caaaa;hpb=01c61f5d9bfe03ad40b4deda9f23ff97ef7ac2d8

diff --git a/plomlombot.py b/plomlombot.py
index 179bc2a..e4a5be3 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:
 
@@ -71,6 +71,24 @@ class IO:
             line)
         return line
 
+def url_check(msg):
+    matches = re.findall("(https?://[^\s]+)", msg)
+    for i in range(len(matches)):
+        url = matches[i]
+        webpage = urllib.request.urlopen(url, timeout=15)
+        content_type = webpage.info().get_content_type()
+        charset = webpage.info().get_content_charset()
+        if not charset:
+            charset="utf-8"
+        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('<title>')[1].split('</title>')[0]
+        title = html.unescape(title)
+        io.send_line("PRIVMSG " + target + " :page title for url: " + title)
+
 io = IO(servernet, port)
 io.send_line("NICK " + nickname)
 io.send_line("USER " + username + " 0 * : ")
@@ -99,15 +117,6 @@ while 1:
             if receiver != nickname:
                 target = receiver
             msg = str.join(" ", tokens[3:])[1:]
-            matches = re.findall("(https?://[^\s]+)", msg)
-            for i in range(len(matches)):
-                url = matches[i]
-                webpage = urllib.request.urlopen(url)
-                charset = webpage.info().get_content_charset()
-                content = webpage.read().decode(charset)
-                title = str(content).split('<title>')[1].split('</title>')[0]
-                title = html.unescape(title)
-                io.send_line("PRIVMSG "
-                    + target + " :page title for url: " + title)
+            url_check(msg)
         if tokens[0] == "PING":
             io.send_line("PONG " + tokens[1])