trivia - alias !trivia to !start

[erebus.git] / modules / urls.py

diff --git a/modules/urls.py b/modules/urls.py
index fc398e26913c87aa1d793ce05fed2467debb2467..0430a638e13a85c8aa9f8eb795417f4deadc85e6 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -6,7 +7,7 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1,2],
+       'compatible': [0],
        'depends': [],
        'softdeps': [],
 }
@@ -20,16 +21,27 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import re, urllib2, urlparse, json, HTMLParser
-from BeautifulSoup import BeautifulSoup
+import sys
+if sys.version_info.major < 3:
+       import urllib2
+       import urlparse
+       import HTMLParser
+       from BeautifulSoup import BeautifulSoup
+else:
+       import urllib.request as urllib2
+       import urllib.parse as urlparse
+       import html.parser as HTMLParser
+       from bs4 import BeautifulSoup
+
+import re, json
 
 html_parser = HTMLParser.HTMLParser()
 
 hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$')
-url_regex = re.compile(r'((?:https?://|spotify:)[^\s]+)')
+url_regex = re.compile(r'https?://[^/\s]+\.[^/\s]+(?:/\S+)?')
 spotify_regex = (
        re.compile(r'spotify:(?P<type>\w+):(?P<track_id>\w{22})'),
-       re.compile(r'https?://open.spotify.com/(?P<type>\w+)/(?P<track_id>\w{22})')
+       re.compile(r'https?://open.spotify.com/(?P<type>\w+)/(?P<track_id>\w+)')
 )
 youtube_regex = (
        re.compile(r'https?://(?:www\.)?youtube\.com/watch\?[a-zA-Z0-9=&_\-]+'),
@@ -87,23 +99,9 @@ def privmsg_hook(bot, textline):
 
        for match in url_regex.findall(line):
                if match:
-                       if 'open.spotify.com' in match or 'spotify:' in match:
-                               for r in spotify_regex:
-                                       for sptype, track in r.findall(match):
-                                               bot.msg(chan, gotspotify(sptype, track))
-
-                       elif 'youtube.com' in match or 'youtu.be' in match:
-                               for r in youtube_regex:
-                                       for url in r.findall(match):
-                                               bot.msg(chan, gotyoutube(url))
-
-                       elif 'twitch.tv' in match:
-                               for r in twitch_regex:
-                                       for uri in r.findall(match):
-                                               bot.msg(chan, gottwitch(uri))
-
-                       else:
-                               bot.msg(chan, goturl(match))
+                       response = goturl(match)
+                       if response is not None:
+                               bot.msg(chan, response)
 
 def unescape(line):
        return html_parser.unescape(line)
@@ -168,4 +166,4 @@ def goturl(url):
                soup = BeautifulSoup(opener.open(request, timeout=2))
                return unescape('Title: %s' % (soup.title.string))
        except:
-               return 'Invalid URL/Timeout'
+               return None