X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=6031d50b3167eb62dfbe16865e1c8278efa44e41;hp=c1c23089ba01450ef5f2cd686f000580e44398cb;hb=d63f2d51ce2d1b7bee2cdf9da059d4f3319a8631;hpb=0358a1448b3b715454461917cb2570f97ff44317 diff --git a/plomlombot.py b/plomlombot.py index c1c2308..6031d50 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -100,11 +100,14 @@ 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, http.client.BadStatusLine) as error: print("TROUBLE FOLLOWING URL: " + str(error))