home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc851d6
)
Handle too-many-URLs-in-message.
author
Christian Heller
<c.heller@plomlompom.de>
Mon, 18 Apr 2016 22:44:22 +0000
(
00:44
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Mon, 18 Apr 2016 22:44:22 +0000
(
00:44
+0200)
plomlombot.py
patch
|
blob
|
history
diff --git
a/plomlombot.py
b/plomlombot.py
index ede4dca9b1dccc6b55861062daea277df26ba415..4d2f72dc33249e8a6744c8ca3568d52d6d997ad2 100755
(executable)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-352,9
+352,9
@@
def handle_url(url, notice, show_url=False):
ValueError,
requests.exceptions.InvalidSchema) as error:
notice("TROUBLE FOLLOWING URL: " + str(error))
ValueError,
requests.exceptions.InvalidSchema) as error:
notice("TROUBLE FOLLOWING URL: " + str(error))
- return
+ return
False
if mobile_twitter_hack(url):
if mobile_twitter_hack(url):
- return
+ return
True
title = bs4.BeautifulSoup(text, "html5lib").title
if title and title.string:
prefix = "PAGE TITLE: "
title = bs4.BeautifulSoup(text, "html5lib").title
if title and title.string:
prefix = "PAGE TITLE: "
@@
-363,6
+363,7
@@
def handle_url(url, notice, show_url=False):
notice(prefix + title.string.strip())
else:
notice("PAGE HAS NO TITLE TAG")
notice(prefix + title.string.strip())
else:
notice("PAGE HAS NO TITLE TAG")
+ return True
class Session:
class Session:
@@
-417,8
+418,14
@@
class Session:
target = line.receiver
msg = str.join(" ", line.tokens[3:])[1:]
matches = re.findall("(https?://[^\s>]+)", msg)
target = line.receiver
msg = str.join(" ", line.tokens[3:])[1:]
matches = re.findall("(https?://[^\s>]+)", msg)
+ url_count = 0
for i in range(len(matches)):
for i in range(len(matches)):
- handle_url(matches[i], notice)
+ if handle_url(matches[i], notice):
+ url_count += 1
+ if url_count == 3:
+ notice("MAXIMUM NUMBER OF URLs TO PARSE PER MESSAGE "
+ "REACHED")
+ break
if "!" == msg[0]:
tokens = msg[1:].split()
argument = str.join(" ", tokens[1:])
if "!" == msg[0]:
tokens = msg[1:].split()
argument = str.join(" ", tokens[1:])