X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=6031d50b3167eb62dfbe16865e1c8278efa44e41;hp=a47158c302a3341cbe3e3777410b6e073c0a485d;hb=d63f2d51ce2d1b7bee2cdf9da059d4f3319a8631;hpb=f80a0c00f5961833279e2c95ea34ff0fc5ae42f7

diff --git a/plomlombot.py b/plomlombot.py
index a47158c..6031d50 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -7,6 +7,7 @@ import select
 import time
 import re
 import urllib.request
+import http.client
 import html
 
 # Defaults, may be overwritten by command line arguments.
@@ -99,13 +100,16 @@ def lineparser_loop(io, nickname):
     def act_on_privmsg(tokens):
 
         def url_check(msg):
-            matches = re.findall("(https?://[^\s]+)", 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(url, timeout=15)
+                    webpage = urllib.request.urlopen(request, timeout=15)
                 except (urllib.error.HTTPError, urllib.error.URLError,
-                        UnicodeError) as error:
+                        UnicodeError, http.client.BadStatusLine) as error:
                     print("TROUBLE FOLLOWING URL: " + str(error))
                     continue
                 charset = webpage.info().get_content_charset()
@@ -141,7 +145,7 @@ def lineparser_loop(io, nickname):
         msg = str.join(" ", tokens[3:])[1:]
         url_check(msg)
 
-    while 1:
+    while True:
         line = io.recv_line()
         if not line:
             continue
@@ -177,7 +181,7 @@ def parse_command_line_arguments():
     return opts
 
 opts = parse_command_line_arguments()
-while 1:
+while True:
     try:
         io = init_session(opts.server, opts.port, opts.timeout, opts.nickname,
                           opts.username, opts.CHANNEL)