Added regex to parse urls. Closes #14

This commit is contained in:
Chris Oliver 2012-02-09 22:32:52 -06:00
parent ccbdcd6d35
commit 0be9eac469

View file

@ -1,4 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# coding: utf-8
""" """
LogBot LogBot
@ -45,6 +47,15 @@ except:
from ircbot import SingleServerIRCBot from ircbot import SingleServerIRCBot
from irclib import nm_to_n from irclib import nm_to_n
import re
pat1 = re.compile(r"(^|[\n ])(([\w]+?://[\w\#$%&~.\-;:=,?@\[\]+]*)(/[\w\#$%&~/.\-;:=,?@\[\]+]*)?)", re.IGNORECASE | re.DOTALL)
#urlfinder = re.compile("(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))")
def urlify2(value):
return pat1.sub(r'\1<a href="\2" target="_blank">\3</a>', value)
#return urlfinder.sub(r'<a href="\1">\1</a>', value)
### Configuration options ### Configuration options
DEBUG = False DEBUG = False
@ -190,6 +201,7 @@ class Logbot(SingleServerIRCBot):
# Format the event properly # Format the event properly
chans = event.target() chans = event.target()
msg = self.format_event(name, event, params) msg = self.format_event(name, event, params)
msg = urlify2(msg)
# Quit goes across all channels # Quit goes across all channels
if not chans or not chans.startswith("#"): if not chans or not chans.startswith("#"):