pew
/
phenny-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update snarfuri to exclude command-line lines 

* Exclude lines from being matched by snarfuri that begin with .
* Enable posted time display by the posted module
master
mutantmonkey 2014-04-08 23:45:34 -07:00
parent b20e921932
commit 5d50d54671
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/head.py
View File

@ -88,12 +88,12 @@ noteuri.priority = 'low'
def snarfuri(phenny, input): def snarfuri(phenny, input):
uri = input.group(1) uri = input.group(2)
title = gettitle(phenny, input, uri) title = gettitle(phenny, input, uri)
if title: if title:
phenny.msg(input.sender, title) phenny.msg(input.sender, title)
snarfuri.rule = r'.*(http[s]?://[^<> "\x01]+)[,.]?' snarfuri.rule = r'([^\.].*)?(http[s]?://[^<> "\x01]+)[,.]?'
snarfuri.priority = 'low' snarfuri.priority = 'low'
snarfuri.thread = True snarfuri.thread = True
@ -195,4 +195,4 @@ def gettitle(phenny, input, uri):
if __name__ == '__main__': if __name__ == '__main__':
print(__doc__.strip()) print(__doc__.strip())

6
modules/posted.py
View File

@ -61,11 +61,9 @@ def posted(phenny, input):
posted = check_posted(phenny, input, url) posted = check_posted(phenny, input, url)
if posted: if posted:
# when the day comes when you can inhibit snarfuri if modules are called phenny.reply("URL was posted {0}".format(posted))
# phenny.reply("URL was posted {0}".format(posted))
pass
else: else:
phenny.reply("I don't remember seeing this URL in this channel.") phenny.reply("I don't remember seeing this URL in this channel.")
posted.thread = False posted.thread = False
posted.commands = ["posted"] posted.commands = ["posted"]