ChCh
/
CloudBot
Archived
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfix/1.1c'

This commit is contained in:
neersighted 2012-03-01 23:02:41 -08:00
parent 53da740725 5234eac522
commit 1242feaf0e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,4 +1,4 @@
# CloudBot/1.1b
# CloudBot/1.1c
## About
@ -102,7 +102,7 @@ The programs `screen` or `daemon` are recomended for the wrapper to run optimaly
## License
CloudBot is **licensed** under the **GPL v3** license. The terms are as follows.
CloudBot/1.1b
CloudBot/1.1c
Copyright © 2011 Luke Rogers <http://www.dempltr.com/> - <lukeroge@gmail.com>

2
bot.py
View File

@ -13,7 +13,7 @@ os.chdir(sys.path[0] or '.') # do stuff relative to the install directory
class Bot(object):
pass
print 'Welcome to Cloudbot - Version 1.1b - http://git.io/cloudbot'
print 'Welcome to Cloudbot - Version 1.1c - http://git.io/cloudbot'
bot = Bot()

2
plugins/urlparse.py
View File

@ -18,7 +18,7 @@ def parse(match):
except:
return "fail"
@hook.regex(r'(^[^\.])([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)\/(.*)')
@hook.regex(r'(^[^\.])([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)(\/)?(.*)')
def urlparser(match, say=None):
url = urlnorm.normalize(match.group().encode('utf-8'))
if url[:7] != "http://":